From 3141ce38f2150324aec1ffc26963dee8c148b3e4 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 19 Dec 2023 22:58:28 -0500 Subject: [PATCH] Added NA addresses for new symbols (#225) --- symbols/arm9.yml | 8 ++++++++ symbols/overlay01.yml | 1 + symbols/overlay10.yml | 4 ++++ symbols/overlay11.yml | 3 +++ symbols/overlay29.yml | 17 +++++++++++++++++ symbols/overlay31.yml | 1 + 6 files changed, 34 insertions(+) diff --git a/symbols/arm9.yml b/symbols/arm9.yml index 0f8991b3..9073bd53 100644 --- a/symbols/arm9.yml +++ b/symbols/arm9.yml @@ -1013,6 +1013,7 @@ arm9: - name: UpdateFadeStatus address: EU: 0x200BA18 + NA: 0x200B990 description: |- Updates the given screen_fade struct to initiate a fade for example. @@ -1024,6 +1025,7 @@ arm9: - name: HandleFades address: EU: 0x200BA90 + NA: 0x200BA08 description: |- Handles updating the screen_fade struct in all modes except dungeon mode. @@ -1034,6 +1036,7 @@ arm9: - name: GetFadeStatus address: EU: 0x200BDB4 + NA: 0x200BD2C description: |- Returns 1 if fading to black, 2 if fading to white, 0 otherwise. @@ -4941,6 +4944,7 @@ arm9: - name: DrawTextInWindow address: EU: 0x20264F8 + NA: 0x2026214 description: |- Seems to be responsible for drawing the text in a window. @@ -5007,6 +5011,7 @@ arm9: - name: ClearWindow address: EU: 0x2027E4C + NA: 0x2027B58 description: |- Clears the window, at least in the case of a text box. @@ -7976,6 +7981,7 @@ arm9: - name: ResetPlayTimer address: EU: 0x2051140 + NA: 0x2050E08 description: |- Reset the file timer. @@ -7983,6 +7989,7 @@ arm9: - name: PlayTimerTick address: EU: 0x2051150 + NA: 0x2050E18 description: |- Advance the file timer by 1 frame. @@ -7990,6 +7997,7 @@ arm9: - name: GetPlayTimeSeconds address: EU: 0x205118C + NA: 0x2050E54 description: |- Returns the current play time in seconds. diff --git a/symbols/overlay01.yml b/symbols/overlay01.yml index 4ef86665..1c543a94 100644 --- a/symbols/overlay01.yml +++ b/symbols/overlay01.yml @@ -56,6 +56,7 @@ overlay1: - name: ProcessContinueScreenContents address: EU: 0x23336D8 + NA: 0x2332EF4 description: |- Fetches the required data and creates all the strings to display the contents shown in the window when choosing continue in the main menu. diff --git a/symbols/overlay10.yml b/symbols/overlay10.yml index baa5e93c..1d78acac 100644 --- a/symbols/overlay10.yml +++ b/symbols/overlay10.yml @@ -222,6 +222,7 @@ overlay10: - name: DrawTeamStats address: EU: 0x22C1328 + NA: 0x22C09E8 description: |- Handles creating the windows, sprites, etc. for the team stats top screen display. @@ -233,6 +234,7 @@ overlay10: - name: UpdateTeamStats address: EU: 0x22C1620 + NA: 0x22C0CE0 description: |- Handles updating the team stats top screen display. @@ -240,6 +242,7 @@ overlay10: - name: FreeTeamStats address: EU: 0x22C1CF4 + NA: 0x22C13B4 description: |- Handles the procedure to close the team stats top screen display. @@ -249,6 +252,7 @@ overlay10: - name: FreeMapAndTeam address: EU: 0x22C2024 + NA: 0x22C16D8 description: |- Handles the procedure to close the map and team top screen display. diff --git a/symbols/overlay11.yml b/symbols/overlay11.yml index 6226d3f8..170bef6c 100644 --- a/symbols/overlay11.yml +++ b/symbols/overlay11.yml @@ -282,6 +282,7 @@ overlay11: - name: IsScreenFadeInProgress address: EU: 0x22EA8B8 + NA: 0x22E9F78 description: |- Used for example in the handler functions of the top screen types in ground mode to check whether the top screen fade is complete or not. @@ -556,6 +557,7 @@ overlay11: - name: HandleControlsTopScreenGround address: EU: 0x230EFB4 + NA: 0x230E618 description: |- Handles the controls top screen display in the overworld. @@ -607,6 +609,7 @@ overlay11: - name: HandleTeamStatsGround address: EU: 0x23144BC + NA: 0x2313ADC description: |- Handles the team stats top screen display in the overworld. diff --git a/symbols/overlay29.yml b/symbols/overlay29.yml index 668cba09..185aed49 100644 --- a/symbols/overlay29.yml +++ b/symbols/overlay29.yml @@ -746,6 +746,7 @@ overlay29: - name: AllocTopScreenStatus address: EU: 0x22E8874 + NA: 0x22E7EC4 description: |- Allocates and initializes the top_screen_status struct when entering dungeon mode. @@ -753,6 +754,7 @@ overlay29: - name: FreeTopScreenStatus address: EU: 0x22E88F4 + NA: 0x22E7F44 description: |- Gets called when leaving dungeon mode, calls FreeTopScreen and then also frees the allocated memory to the top_screen_status struct. @@ -760,6 +762,7 @@ overlay29: - name: InitializeTeamStats address: EU: 0x22E8AE0 + NA: 0x22E8130 description: |- Initializes the team stats top screen. @@ -767,6 +770,7 @@ overlay29: - name: UpdateTeamStatsWrapper address: EU: 0x22E8B40 + NA: 0x22E8190 description: |- Contains a check and calls UpdateTeamStats in overlay10. @@ -774,6 +778,7 @@ overlay29: - name: FreeTeamStatsWrapper address: EU: 0x22E8B98 + NA: 0x22E81E8 description: |- Calls a function that calls FreeTeamStats in overlay10. @@ -781,6 +786,7 @@ overlay29: - name: AssignTopScreenHandlers address: EU: 0x22E9078 + NA: 0x22E86C8 description: |- Sets the handler functions of the top screen type. @@ -792,6 +798,7 @@ overlay29: - name: HandleTopScreenFades address: EU: 0x22E921C + NA: 0x22E886C description: |- Used to initialize and uninitialize the top screen in dungeon mode in conjunction with handling the fade status of the screen. @@ -801,6 +808,7 @@ overlay29: - name: FreeTopScreen address: EU: 0x22E95FC + NA: 0x22E8C4C description: |- Gets called twice when fading out the top screen. First it calls the free_func of the top screen type and sets the handlers to null and on the second pass it just returns. @@ -6441,6 +6449,7 @@ overlay29: - name: GetCurrentHiddenStairsType address: EU: 0x2339280 + NA: 0x23386B0 description: |- Checks if the current floor is a secret bazaar or a secret room and returns which one it is. @@ -7686,6 +7695,7 @@ overlay29: - name: DisplayFloorCard address: EU: 0x2348ED4 + NA: 0x23482D4 description: |- Dispatches the splash screen between floors showing the dungeon name and the current floor. @@ -7695,6 +7705,7 @@ overlay29: - name: HandleFloorCard address: EU: 0x2348F0C + NA: 0x234830C description: |- Handles the display of the splash screen between floors showing the dungeon name and the current floor. @@ -8150,6 +8161,7 @@ overlay29: - name: StartFadeDungeon address: EU: 0x234D008 + NA: 0x234C408 description: |- Initiates a screen fade in dungeon mode. @@ -8161,6 +8173,7 @@ overlay29: - name: StartFadeDungeonWrapper address: EU: 0x234D268 + NA: 0x234C668 description: |- Calls StartFadeDungeon to initiate a screen fade in dungeon mode. @@ -8172,6 +8185,7 @@ overlay29: - name: HandleFadesDungeon address: EU: 0x234D3D4 + NA: 0x234C7D4 description: |- Gets called every frame for both screens in dungeon mode. Handles the status of the screen fades. @@ -8179,6 +8193,7 @@ overlay29: - name: HandleFadesDungeonBothScreens address: EU: 0x234D5E4 + NA: 0x234C9E4 description: |- Calls HandleFadesDungeon for both screens. @@ -9228,6 +9243,7 @@ overlay29: - name: TOP_SCREEN_STATUS_PTR address: EU: 0x2354154 + NA: 0x2353554 length: EU: 0x4 description: |- @@ -9357,6 +9373,7 @@ overlay29: - name: DUNGEON_FADES_PTR address: EU: 0x23543F8 + NA: 0x23537E0 length: EU: 0x4 description: "[Runtime] Pointer to the dungeon fades struct that maintains the status of screen fades in dungeon mode." diff --git a/symbols/overlay31.yml b/symbols/overlay31.yml index fb0f4c53..6512b01d 100644 --- a/symbols/overlay31.yml +++ b/symbols/overlay31.yml @@ -25,6 +25,7 @@ overlay31: - name: DrawDungeonMenuStatusWindow address: EU: 0x2383464 + NA: 0x2382864 description: |- Draws the contents shown in the main dungeon menu status window showing the player's belly, money, play time, etc.