From 90203403ddccd16f520aaab785b805bf298972bf Mon Sep 17 00:00:00 2001 From: Yanis <35189056+Yanis002@users.noreply.github.com> Date: Mon, 18 May 2026 21:14:27 +0200 Subject: [PATCH] Decompile overlay 24 (Part 1) (#65) * GameModeAdventure_001 OK * GameModeAdventure_024 17% * GameModeAdventure_024 73% * GameModeAdventure_024 99% * jp region differences * rename GameModeAdventure_024 and GameModeAdventure + UnkStruct_ov000_020d8660_024 OK * UnkActorSystem1OK * UnkActorSystem2 OK * delink more of ov024 & UnkStruct_027e0998_024 OK * improve instance stuff & UnkStruct_027e0cf8_024 OK * AdventureModeManager_160_024 OK & GameModeStartUp OK * fix regressions * fix regressions 2 * AdventureModeManager_170 OK * AdventureModeManager_174_Base OK * AdventureModeManager_174 OK * mark GameModeAdventure_024 as complete * AdventureModeManager_178 OK * AdventureModeManager_180 OK * AdventureModeManager_184_024 OK * AdventureModeManager_18C_024 OK & AdventureModeManager_190_024 OK * AdventureModeManager_15C_20_00 61% * AdventureModeManager_15C_20_00 OK * jp version differences * delink what's left in the overlay * fix regressions * AdventureModeManager_1B8_Base_024 98% * AdventureModeManager_1B8 48% and link AdventureModeManager_024 * AdventureModeManager_1B8_Base and AdventureModeManager_1B8 OK * oops * mark statics as local --- config/eur/arm9/delinks.txt | 16 +- config/eur/arm9/itcm/relocs.txt | 2 +- config/eur/arm9/itcm/symbols.txt | 2 +- config/eur/arm9/overlays/ov000/relocs.txt | 62 +- config/eur/arm9/overlays/ov000/symbols.txt | 126 +- config/eur/arm9/overlays/ov001/delinks.txt | 10 +- config/eur/arm9/overlays/ov001/relocs.txt | 23 +- config/eur/arm9/overlays/ov001/symbols.txt | 156 +-- config/eur/arm9/overlays/ov002/relocs.txt | 4 +- config/eur/arm9/overlays/ov003/relocs.txt | 8 +- config/eur/arm9/overlays/ov004/relocs.txt | 2 +- config/eur/arm9/overlays/ov006/relocs.txt | 4 +- config/eur/arm9/overlays/ov006/symbols.txt | 8 +- config/eur/arm9/overlays/ov008/symbols.txt | 2 +- config/eur/arm9/overlays/ov009/symbols.txt | 2 +- config/eur/arm9/overlays/ov010/relocs.txt | 6 +- config/eur/arm9/overlays/ov010/symbols.txt | 4 +- config/eur/arm9/overlays/ov011/relocs.txt | 8 +- config/eur/arm9/overlays/ov011/symbols.txt | 6 +- config/eur/arm9/overlays/ov012/relocs.txt | 8 +- config/eur/arm9/overlays/ov014/relocs.txt | 14 +- config/eur/arm9/overlays/ov017/relocs.txt | 8 +- config/eur/arm9/overlays/ov017/symbols.txt | 26 +- config/eur/arm9/overlays/ov018/delinks.txt | 1 + config/eur/arm9/overlays/ov018/symbols.txt | 4 +- config/eur/arm9/overlays/ov019/relocs.txt | 2 +- config/eur/arm9/overlays/ov019/symbols.txt | 12 +- config/eur/arm9/overlays/ov020/relocs.txt | 6 +- config/eur/arm9/overlays/ov021/relocs.txt | 12 +- config/eur/arm9/overlays/ov023/relocs.txt | 4 +- config/eur/arm9/overlays/ov024/delinks.txt | 155 +++ config/eur/arm9/overlays/ov024/relocs.txt | 102 +- config/eur/arm9/overlays/ov024/symbols.txt | 839 +++++++------- config/eur/arm9/overlays/ov025/relocs.txt | 6 +- config/eur/arm9/overlays/ov025/symbols.txt | 2 +- config/eur/arm9/overlays/ov026/relocs.txt | 28 +- config/eur/arm9/overlays/ov026/symbols.txt | 34 +- config/eur/arm9/overlays/ov031/relocs.txt | 8 +- config/eur/arm9/overlays/ov031/symbols.txt | 22 +- config/eur/arm9/overlays/ov037/relocs.txt | 6 +- config/eur/arm9/overlays/ov058/symbols.txt | 2 +- config/eur/arm9/overlays/ov060/relocs.txt | 2 +- config/eur/arm9/overlays/ov062/relocs.txt | 4 +- config/eur/arm9/overlays/ov062/symbols.txt | 6 +- config/eur/arm9/overlays/ov064/relocs.txt | 6 +- config/eur/arm9/overlays/ov065/relocs.txt | 2 +- config/eur/arm9/overlays/ov068/relocs.txt | 6 +- config/eur/arm9/overlays/ov071/relocs.txt | 2 +- config/eur/arm9/overlays/ov088/relocs.txt | 6 +- config/eur/arm9/overlays/ov088/symbols.txt | 4 +- config/eur/arm9/overlays/ov093/relocs.txt | 4 +- config/eur/arm9/overlays/ov093/symbols.txt | 6 +- config/eur/arm9/overlays/ov094/relocs.txt | 8 +- config/eur/arm9/overlays/ov096/relocs.txt | 6 +- config/eur/arm9/overlays/ov111/relocs.txt | 2 +- config/eur/arm9/relocs.txt | 16 +- config/eur/arm9/symbols.txt | 77 +- config/jp/arm9/delinks.txt | 16 +- config/jp/arm9/itcm/relocs.txt | 2 +- config/jp/arm9/itcm/symbols.txt | 2 +- config/jp/arm9/overlays/ov000/relocs.txt | 62 +- config/jp/arm9/overlays/ov000/symbols.txt | 152 +-- config/jp/arm9/overlays/ov001/delinks.txt | 6 + config/jp/arm9/overlays/ov001/relocs.txt | 16 +- config/jp/arm9/overlays/ov001/symbols.txt | 159 +-- config/jp/arm9/overlays/ov002/relocs.txt | 6 +- config/jp/arm9/overlays/ov002/symbols.txt | 6 +- config/jp/arm9/overlays/ov003/relocs.txt | 10 +- config/jp/arm9/overlays/ov004/relocs.txt | 8 +- config/jp/arm9/overlays/ov004/symbols.txt | 2 +- config/jp/arm9/overlays/ov006/relocs.txt | 4 +- config/jp/arm9/overlays/ov006/symbols.txt | 10 +- config/jp/arm9/overlays/ov008/symbols.txt | 4 +- config/jp/arm9/overlays/ov009/symbols.txt | 2 +- config/jp/arm9/overlays/ov010/relocs.txt | 6 +- config/jp/arm9/overlays/ov010/symbols.txt | 10 +- config/jp/arm9/overlays/ov011/relocs.txt | 8 +- config/jp/arm9/overlays/ov011/symbols.txt | 12 +- config/jp/arm9/overlays/ov012/relocs.txt | 8 +- config/jp/arm9/overlays/ov014/relocs.txt | 14 +- config/jp/arm9/overlays/ov014/symbols.txt | 2 +- config/jp/arm9/overlays/ov017/relocs.txt | 8 +- config/jp/arm9/overlays/ov017/symbols.txt | 28 +- config/jp/arm9/overlays/ov018/delinks.txt | 1 + config/jp/arm9/overlays/ov018/symbols.txt | 4 +- config/jp/arm9/overlays/ov019/relocs.txt | 8 +- config/jp/arm9/overlays/ov019/symbols.txt | 12 +- config/jp/arm9/overlays/ov020/relocs.txt | 10 +- config/jp/arm9/overlays/ov021/relocs.txt | 16 +- config/jp/arm9/overlays/ov022/relocs.txt | 4 +- config/jp/arm9/overlays/ov023/relocs.txt | 6 +- config/jp/arm9/overlays/ov024/delinks.txt | 155 +++ config/jp/arm9/overlays/ov024/relocs.txt | 110 +- config/jp/arm9/overlays/ov024/symbols.txt | 891 ++++++++------- config/jp/arm9/overlays/ov025/relocs.txt | 6 +- config/jp/arm9/overlays/ov025/symbols.txt | 2 +- config/jp/arm9/overlays/ov026/relocs.txt | 28 +- config/jp/arm9/overlays/ov026/symbols.txt | 42 +- config/jp/arm9/overlays/ov031/relocs.txt | 8 +- config/jp/arm9/overlays/ov031/symbols.txt | 22 +- config/jp/arm9/overlays/ov058/symbols.txt | 2 +- config/jp/arm9/overlays/ov060/relocs.txt | 2 +- config/jp/arm9/overlays/ov062/relocs.txt | 4 +- config/jp/arm9/overlays/ov062/symbols.txt | 6 +- config/jp/arm9/overlays/ov065/relocs.txt | 2 +- config/jp/arm9/overlays/ov071/relocs.txt | 2 +- config/jp/arm9/overlays/ov088/relocs.txt | 4 +- config/jp/arm9/overlays/ov088/symbols.txt | 4 +- config/jp/arm9/overlays/ov093/relocs.txt | 2 +- config/jp/arm9/overlays/ov093/symbols.txt | 6 +- config/jp/arm9/overlays/ov111/relocs.txt | 2 +- config/jp/arm9/relocs.txt | 20 +- config/jp/arm9/symbols.txt | 100 +- include/Actor/ActorManager.hpp | 4 +- include/Actor/ActorUnkTUTO.hpp | 3 +- include/Actor/ActorUnk_ov000_020a8bb0.hpp | 6 +- include/FileSelect/FileSelectMain.hpp | 22 +- include/FileSelect/FileSelectUnkDraw.hpp | 18 +- include/Game/GameModeAdventure.hpp | 21 + include/Game/GameModeManager.hpp | 124 +- include/Game/GameModeStartUp.hpp | 2 +- include/Item/ItemManager.hpp | 6 +- include/MainGame/AdventureMode.hpp | 1018 +++++++++++++++++ include/MainGame/CargoManager.hpp | 2 - include/MainGame/MainGame.hpp | 23 - include/MainGame/MiscAdvManager.hpp | 4 +- include/MainGame/PassengerManager.hpp | 2 - include/MainGame/UnkAdventureModeSystem1.hpp | 21 + include/Message/BMG.hpp | 1 + include/Message/BMGEnums.hpp | 213 ++++ include/Save/SaveManager.hpp | 21 +- include/System/OverlayManager.hpp | 8 + include/System/SysNew.hpp | 9 +- include/TitleScreen/TitleScreen.hpp | 83 +- include/Unknown/Common.hpp | 418 +++---- include/Unknown/UnkStruct_02049f8c.hpp | 14 + include/Unknown/UnkStruct_0204a060.hpp | 13 +- include/Unknown/UnkStruct_0204a088.hpp | 15 +- include/Unknown/UnkStruct_0204a110.hpp | 48 +- include/Unknown/UnkStruct_0204aeac.hpp | 17 - include/Unknown/UnkStruct_0204aeec.hpp | 11 - include/Unknown/UnkStruct_0204af1c.hpp | 4 +- include/Unknown/UnkStruct_020d8698.hpp | 19 +- include/Unknown/UnkStruct_027e095c.hpp | 17 + include/Unknown/UnkStruct_027e0998.hpp | 44 +- include/Unknown/UnkStruct_027e09a0.hpp | 29 +- include/Unknown/UnkStruct_027e09a4.hpp | 95 +- include/Unknown/UnkStruct_027e09ac.hpp | 85 ++ include/Unknown/UnkStruct_027e09b8.hpp | 78 +- include/Unknown/UnkStruct_027e0cd8.hpp | 6 +- include/Unknown/UnkStruct_027e0cdc.hpp | 1 + include/Unknown/UnkStruct_027e0ce0.hpp | 28 +- include/Unknown/UnkStruct_027e0cf8.hpp | 103 +- include/Unknown/UnkStruct_027e0d00.hpp | 2 +- include/Unknown/UnkStruct_027e0d34.hpp | 2 + include/Unknown/UnkStruct_ov000_02067bc4.hpp | 23 +- include/Unknown/UnkStruct_ov000_020b4eec.hpp | 2 + include/Unknown/UnkStruct_ov000_020b4f70.hpp | 20 + include/Unknown/UnkStruct_ov000_020b50c0.hpp | 6 +- include/Unknown/UnkStruct_ov000_020b5214.hpp | 3 +- include/Unknown/UnkStruct_ov000_020b52b4.hpp | 1 + include/Unknown/UnkStruct_ov017_020c3f70.hpp | 20 + include/Unknown/UnkStruct_ov024_020d8660.hpp | 67 ++ include/Unknown/UnkStruct_ov024_020d8694.hpp | 171 +++ include/Unknown/UnkStruct_ov024_020d86a0.hpp | 28 + include/Unknown/UnkStruct_ov026_02138d10.hpp | 19 + include/Unknown/UnkStruct_ov026_0213f578.hpp | 16 + include/Unknown/UnkStruct_ov026_0213f590.hpp | 16 + include/Unknown/UnkStruct_ov031_02118fa4.hpp | 16 + include/Unknown/UnkStruct_ov088_02177218.hpp | 15 + include/flags.h | 4 + include/types.h | 27 +- libs/dsprotect/include/dsprot.h | 121 ++ libs/nitro/include/nitro/math.h | 20 + .../Actor/ActorUnk_ov000_020a8bb0.cpp | 4 +- src/000_Second/Cutscene/Cutscene.cpp | 2 +- .../Game/GameModeManagerBase_104.cpp | 2 +- src/000_Second/Item/TreasureManager.cpp | 9 +- src/000_Second/MapObject/MapObject.cpp | 4 +- .../MapObject/MapObjectSwitchStep.cpp | 10 +- src/001_SceneInit/Actor/ActorManager_001.cpp | 34 +- src/001_SceneInit/CargoManager_001.cpp | 11 +- .../Game/AdventureModeManager_001.cpp | 366 ++++++ .../Game/GameModeAdventure_001.cpp | 26 + src/001_SceneInit/Item/ItemManager_001.cpp | 4 +- src/001_SceneInit/PassengerManager_001.cpp | 15 +- src/017_CourseExec/CargoManager_017.cpp | 2 +- src/018_StartUp/GameModeStartUp.cpp | 4 +- src/019_MainSelect/019_UnkSubStruct9.cpp | 2 +- src/019_MainSelect/FileSelectMain.cpp | 154 +-- src/019_MainSelect/FileSelectManager_160.cpp | 6 +- src/019_MainSelect/FileSelectManager_164.cpp | 9 +- src/019_MainSelect/FileSelectMicTest.cpp | 5 +- src/019_MainSelect/FileSelectOptions.cpp | 24 +- src/019_MainSelect/GameModeFileSelect.cpp | 2 +- .../Game/AdventureModeManager_024.cpp | 1012 ++++++++++++++++ .../AdventureModeManager_15C_20_00_024.cpp | 150 +++ .../Game/AdventureModeManager_160_024.cpp | 432 +++++++ .../Game/AdventureModeManager_170_024.cpp | 81 ++ .../Game/AdventureModeManager_174_024.cpp | 181 +++ .../AdventureModeManager_174_Base_024.cpp | 168 +++ .../Game/AdventureModeManager_178_024.cpp | 30 + .../AdventureModeManager_178_Base_024.cpp | 36 + .../Game/AdventureModeManager_180_024.cpp | 243 ++++ .../Game/AdventureModeManager_184_024.cpp | 167 +++ .../Game/AdventureModeManager_18C_024.cpp | 405 +++++++ .../Game/AdventureModeManager_190_024.cpp | 99 ++ .../AdventureModeManager_1B8_Base_024.cpp | 676 +++++++++++ .../Game/GameModeAdventure_024.cpp | 96 ++ src/024_MainGame/Game/UnkActorSystem1_024.cpp | 29 + src/024_MainGame/Game/UnkActorSystem2_024.cpp | 106 ++ .../Game/UnkStruct_027e0998_024.cpp | 166 +++ .../Game/UnkStruct_027e0cf8_024.cpp | 239 ++++ .../Game/UnkStruct_ov000_020d8660_024.cpp | 156 +++ src/024_MainGame/MiscAdvManager.cpp | 14 +- src/024_MainGame/PassengerManager.cpp | 2 +- .../UnkAdventureModeSystem1_024.cpp | 0 src/024_MainGame/UnkStruct_020d8698_024.cpp | 0 .../UnkStruct_027e0ce0_34_024.cpp | 0 .../UnkStruct_027e0cf8_00_0C_024.cpp | 0 .../UnkStruct_027e0cf8_08_024.cpp | 0 src/024_MainGame/UnkStruct_027e0d00.cpp | 0 src/024_MainGame/UnkStruct_027e0d08_024.cpp | 0 .../UnkStruct_ov024_020d8694_024.cpp | 0 .../UnkStruct_ov024_020d86a0_024.cpp | 0 src/024_MainGame/UnkTitleCardSystem1_024.cpp | 0 src/024_MainGame/code_020d16fc_024.cpp | 0 src/024_MainGame/code_020d24d4_024.cpp | 0 src/024_MainGame/code_020d3670_024.cpp | 0 src/024_MainGame/code_020d46b4_024.cpp | 0 src/024_MainGame/code_020d4e9c_024.cpp | 0 src/024_MainGame/code_020d51dc_024.cpp | 0 src/024_MainGame/code_020d54b0_024.cpp | 0 src/024_MainGame/code_020d5938_024.cpp | 0 src/024_MainGame/code_020d6650_024.cpp | 0 src/025_Title/GameModeTitleScreen.cpp | 2 +- src/025_Title/TitleScreen.cpp | 16 +- src/025_Title/TitleScreenManager.cpp | 2 +- src/031_Land/MapObject/MapObjectChestBase.cpp | 2 +- src/031_Land/MapObject/MapObjectDoorBase.cpp | 6 +- .../MapObject/MapObjectDoorDangerSpawn.cpp | 2 +- src/036_MapA5/Actor/ActorUnkGORY.cpp | 2 +- src/036_MapA5/Actor/ActorUnkSHIT.cpp | 12 +- src/037_MapA6/Actor/ActorUnkTUTO.cpp | 2 +- src/110_PlayerGet/PlayerGet.cpp | 246 ++-- .../PlayerSceneChange.cpp | 2 +- src/Main/Game/GameModeManagerBase.cpp | 22 +- tools/configure.py | 40 + tools/m2ctx.py | 1 + tools/vtable_sym.py | 134 +++ 250 files changed, 10263 insertions(+), 2619 deletions(-) create mode 100644 include/Game/GameModeAdventure.hpp create mode 100644 include/MainGame/AdventureMode.hpp delete mode 100644 include/MainGame/MainGame.hpp create mode 100644 include/MainGame/UnkAdventureModeSystem1.hpp create mode 100644 include/Message/BMGEnums.hpp create mode 100644 include/Unknown/UnkStruct_02049f8c.hpp delete mode 100644 include/Unknown/UnkStruct_0204aeac.hpp delete mode 100644 include/Unknown/UnkStruct_0204aeec.hpp create mode 100644 include/Unknown/UnkStruct_027e095c.hpp create mode 100644 include/Unknown/UnkStruct_027e09ac.hpp create mode 100644 include/Unknown/UnkStruct_ov000_020b4f70.hpp create mode 100644 include/Unknown/UnkStruct_ov017_020c3f70.hpp create mode 100644 include/Unknown/UnkStruct_ov024_020d8660.hpp create mode 100644 include/Unknown/UnkStruct_ov024_020d8694.hpp create mode 100644 include/Unknown/UnkStruct_ov024_020d86a0.hpp create mode 100644 include/Unknown/UnkStruct_ov026_02138d10.hpp create mode 100644 include/Unknown/UnkStruct_ov026_0213f578.hpp create mode 100644 include/Unknown/UnkStruct_ov026_0213f590.hpp create mode 100644 include/Unknown/UnkStruct_ov031_02118fa4.hpp create mode 100644 include/Unknown/UnkStruct_ov088_02177218.hpp create mode 100644 libs/dsprotect/include/dsprot.h create mode 100644 src/001_SceneInit/Game/AdventureModeManager_001.cpp create mode 100644 src/001_SceneInit/Game/GameModeAdventure_001.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_15C_20_00_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_160_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_170_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_174_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_174_Base_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_178_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_178_Base_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_180_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_184_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_18C_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_190_024.cpp create mode 100644 src/024_MainGame/Game/AdventureModeManager_1B8_Base_024.cpp create mode 100644 src/024_MainGame/Game/GameModeAdventure_024.cpp create mode 100644 src/024_MainGame/Game/UnkActorSystem1_024.cpp create mode 100644 src/024_MainGame/Game/UnkActorSystem2_024.cpp create mode 100644 src/024_MainGame/Game/UnkStruct_027e0998_024.cpp create mode 100644 src/024_MainGame/Game/UnkStruct_027e0cf8_024.cpp create mode 100644 src/024_MainGame/Game/UnkStruct_ov000_020d8660_024.cpp create mode 100644 src/024_MainGame/UnkAdventureModeSystem1_024.cpp create mode 100644 src/024_MainGame/UnkStruct_020d8698_024.cpp create mode 100644 src/024_MainGame/UnkStruct_027e0ce0_34_024.cpp create mode 100644 src/024_MainGame/UnkStruct_027e0cf8_00_0C_024.cpp create mode 100644 src/024_MainGame/UnkStruct_027e0cf8_08_024.cpp create mode 100644 src/024_MainGame/UnkStruct_027e0d00.cpp create mode 100644 src/024_MainGame/UnkStruct_027e0d08_024.cpp create mode 100644 src/024_MainGame/UnkStruct_ov024_020d8694_024.cpp create mode 100644 src/024_MainGame/UnkStruct_ov024_020d86a0_024.cpp create mode 100644 src/024_MainGame/UnkTitleCardSystem1_024.cpp create mode 100644 src/024_MainGame/code_020d16fc_024.cpp create mode 100644 src/024_MainGame/code_020d24d4_024.cpp create mode 100644 src/024_MainGame/code_020d3670_024.cpp create mode 100644 src/024_MainGame/code_020d46b4_024.cpp create mode 100644 src/024_MainGame/code_020d4e9c_024.cpp create mode 100644 src/024_MainGame/code_020d51dc_024.cpp create mode 100644 src/024_MainGame/code_020d54b0_024.cpp create mode 100644 src/024_MainGame/code_020d5938_024.cpp create mode 100644 src/024_MainGame/code_020d6650_024.cpp create mode 100755 tools/vtable_sym.py diff --git a/config/eur/arm9/delinks.txt b/config/eur/arm9/delinks.txt index 7471fd08..c9bb79df 100644 --- a/config/eur/arm9/delinks.txt +++ b/config/eur/arm9/delinks.txt @@ -70,14 +70,6 @@ libs/c/src/ansi_files.c: .data start:0x020446a8 end:0x0204478c .bss start:0x020517a0 end:0x02051aa0 -libs/c/src/float.c: - complete - .data start:0x0204478c end:0x02044790 - -libs/c/src/locale.c: - complete - .data start:0x02044790 end:0x020449ac - libs/c/src/arith.c: complete .text start:0x020338d4 end:0x020338ec @@ -124,6 +116,14 @@ libs/c/src/wmem.c: complete .text start:0x020341f8 end:0x02034230 +libs/c/src/float.c: + complete + .data start:0x0204478c end:0x02044790 + +libs/c/src/locale.c: + complete + .data start:0x02044790 end:0x020449ac + libs/c/src/wprintf.c: .text start:0x02034230 end:0x0203615c .data start:0x020449ac end:0x02044a2c diff --git a/config/eur/arm9/itcm/relocs.txt b/config/eur/arm9/itcm/relocs.txt index b0885908..540a408d 100644 --- a/config/eur/arm9/itcm/relocs.txt +++ b/config/eur/arm9/itcm/relocs.txt @@ -229,7 +229,7 @@ from:0x01ffd32c kind:arm_call to:0x0201ec30 module:main from:0x01ffd348 kind:arm_call to:0x0201ec30 module:main from:0x01ffd3a4 kind:load to:0x027e0cd8 module:dtcm from:0x01ffd3a8 kind:load to:0x0204a110 module:main -from:0x01ffd3ac kind:load to:0x0204af10 module:main +from:0x01ffd3ac kind:load to:0x0204a110 add:0xe00 module:main from:0x01ffd3b4 kind:arm_call to:0x01ffd400 module:itcm from:0x01ffd3d4 kind:load to:0x020b21c4 module:overlay(0) from:0x01ffd3dc kind:arm_call to:0x01ffd400 module:itcm diff --git a/config/eur/arm9/itcm/symbols.txt b/config/eur/arm9/itcm/symbols.txt index 50053d09..18f8a1d2 100644 --- a/config/eur/arm9/itcm/symbols.txt +++ b/config/eur/arm9/itcm/symbols.txt @@ -199,7 +199,7 @@ func_01fff280 kind:function(arm,size=0x28) addr:0x01fff280 func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8 func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc func_01fff2fc kind:function(arm,size=0x54) addr:0x01fff2fc -func_01fff350 kind:function(arm,size=0x64) addr:0x01fff350 +_ZN12ActorManager13func_01fff350EPvPP5Actor kind:function(arm,size=0x64) addr:0x01fff350 _ZN12ActorManager13func_01fff3b4Ei kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 _ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 diff --git a/config/eur/arm9/overlays/ov000/relocs.txt b/config/eur/arm9/overlays/ov000/relocs.txt index 646ff1ac..83e29045 100644 --- a/config/eur/arm9/overlays/ov000/relocs.txt +++ b/config/eur/arm9/overlays/ov000/relocs.txt @@ -1132,11 +1132,11 @@ from:0x0205fe1c kind:load to:0x020b1c88 module:overlay(0) from:0x0205fe48 kind:arm_call to:0x02060ec4 module:overlay(0) from:0x0205fe70 kind:arm_call to:0x0201c73c module:main from:0x0205fe80 kind:load to:0x020b1c88 module:overlay(0) -from:0x0205fe84 kind:load to:0x0204a480 module:main +from:0x0205fe84 kind:load to:0x0204a110 add:0x370 module:main from:0x0205feb0 kind:arm_call to:0x02060ec4 module:overlay(0) from:0x0205fed8 kind:arm_call to:0x0201c73c module:main from:0x0205fee8 kind:load to:0x020b1c88 module:overlay(0) -from:0x0205feec kind:load to:0x0204a480 module:main +from:0x0205feec kind:load to:0x0204a110 add:0x370 module:main from:0x0205ff20 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x0205ff38 kind:arm_call to:0x02060ec4 module:overlay(0) from:0x0205ff54 kind:arm_call to:0x01ff9b40 module:itcm @@ -1157,7 +1157,7 @@ from:0x02060034 kind:load to:0x02060038 module:overlay(0) from:0x02060050 kind:arm_call to:0x02060ec4 module:overlay(0) from:0x020600a0 kind:arm_call to:0x0201c73c module:main from:0x020600e4 kind:arm_call to:0x0201c73c module:main -from:0x020600f4 kind:load to:0x0204a480 module:main +from:0x020600f4 kind:load to:0x0204a110 add:0x370 module:main from:0x02060114 kind:arm_call to:0x02060ec4 module:overlay(0) from:0x02060138 kind:arm_call to:0x02034060 module:main from:0x02060144 kind:arm_call to:0x02033f7c module:main @@ -1181,7 +1181,7 @@ from:0x02060274 kind:arm_call_thumb to:0x0201568c module:main from:0x02060280 kind:load to:0x020b1c90 module:overlay(0) from:0x02060284 kind:load to:0x020b1c94 module:overlay(0) from:0x02060288 kind:load to:0x02043f38 add:0x8 module:main -from:0x0206028c kind:load to:0x0204a480 module:main +from:0x0206028c kind:load to:0x0204a110 add:0x370 module:main from:0x02060290 kind:load to:0x020b1c9c module:overlay(0) from:0x0206029c kind:arm_call to:0x0205fdd0 module:overlay(0) from:0x020602b0 kind:load to:0x020b1c68 module:overlay(0) @@ -1193,7 +1193,7 @@ from:0x02060318 kind:arm_call to:0x02060ec4 module:overlay(0) from:0x0206036c kind:arm_call to:0x0201c73c module:main from:0x020603ac kind:arm_call to:0x0201c73c module:main from:0x020603e8 kind:arm_call to:0x0201c73c module:main -from:0x020603fc kind:load to:0x0204a480 module:main +from:0x020603fc kind:load to:0x0204a110 add:0x370 module:main from:0x0206041c kind:arm_call to:0x02060ec4 module:overlay(0) from:0x02060440 kind:arm_call to:0x02034060 module:main from:0x0206044c kind:arm_call to:0x02033f7c module:main @@ -1227,7 +1227,7 @@ from:0x02060624 kind:arm_call_thumb to:0x0201568c module:main from:0x02060630 kind:load to:0x020b1c90 module:overlay(0) from:0x02060634 kind:load to:0x020b1c94 module:overlay(0) from:0x02060638 kind:load to:0x02043f38 add:0x8 module:main -from:0x0206063c kind:load to:0x0204a480 module:main +from:0x0206063c kind:load to:0x0204a110 add:0x370 module:main from:0x02060640 kind:load to:0x020b1c9c module:overlay(0) from:0x02060644 kind:load to:0x020b1ca0 module:overlay(0) from:0x020606a4 kind:arm_call to:0x02028c18 module:main @@ -1239,7 +1239,7 @@ from:0x02060728 kind:arm_call to:0x02060738 module:overlay(0) from:0x02060730 kind:arm_call to:0x0206075c module:overlay(0) from:0x02060770 kind:arm_call to:0x02060ec4 module:overlay(0) from:0x020607cc kind:arm_call to:0x0201c73c module:main -from:0x020607d8 kind:load to:0x0204a480 module:main +from:0x020607d8 kind:load to:0x0204a110 add:0x370 module:main from:0x02060844 kind:arm_call to:0x01ff9b40 module:itcm from:0x02060854 kind:arm_call_thumb to:0x0200ae10 module:main from:0x02060868 kind:arm_call to:0x02007944 module:main @@ -1370,7 +1370,7 @@ from:0x02061a3c kind:load to:0x0204a110 module:main from:0x02061a40 kind:load to:0x0204a088 module:main from:0x02061a44 kind:load to:0x0204e5f8 module:main from:0x02061a54 kind:arm_call to:0x01ffd294 module:itcm -from:0x02061a78 kind:load to:0x0204aedc module:main +from:0x02061a78 kind:load to:0x0204a110 add:0xdcc module:main from:0x02061a88 kind:load to:0x027e0998 module:dtcm from:0x02061a98 kind:arm_call to:0x02016694 module:main from:0x02061ab0 kind:arm_call to:0x02016694 module:main @@ -1410,9 +1410,9 @@ from:0x02061ff0 kind:arm_call to:0x02008b58 module:main from:0x020620f4 kind:arm_call to:0x02015ef8 module:main from:0x02062100 kind:arm_call to:0x0203a3c8 module:main from:0x02062124 kind:arm_call to:0x02008ce8 module:main -from:0x02062140 kind:load to:0x0204a120 module:main +from:0x02062140 kind:load to:0x0204a110 add:0x10 module:main from:0x02062160 kind:arm_call to:0x0201ccc4 module:main -from:0x02062168 kind:load to:0x0204a120 module:main +from:0x02062168 kind:load to:0x0204a110 add:0x10 module:main from:0x02062204 kind:arm_call to:0x0201a974 module:main from:0x02062224 kind:load to:0x0204af1c module:main from:0x020622b8 kind:arm_call to:0x02016028 module:main @@ -1420,16 +1420,16 @@ from:0x020622f8 kind:arm_call to:0x0201a974 module:main from:0x0206231c kind:load to:0x0204af1c module:main from:0x0206233c kind:arm_call to:0x02061f00 module:overlay(0) from:0x0206234c kind:arm_call to:0x0201cd6c module:main -from:0x02062358 kind:load to:0x0204a120 module:main +from:0x02062358 kind:load to:0x0204a110 add:0x10 module:main from:0x02062364 kind:arm_call to:0x02061ddc module:overlay(0) from:0x02062374 kind:arm_call to:0x0201cd6c module:main -from:0x0206237c kind:load to:0x0204a120 module:main +from:0x0206237c kind:load to:0x0204a110 add:0x10 module:main from:0x02062394 kind:arm_call to:0x02061e08 module:overlay(0) from:0x020623a4 kind:arm_call to:0x0201cd6c module:main -from:0x020623b0 kind:load to:0x0204a120 module:main +from:0x020623b0 kind:load to:0x0204a110 add:0x10 module:main from:0x020623bc kind:arm_call to:0x02061eb8 module:overlay(0) from:0x020623cc kind:arm_call to:0x0201cd6c module:main -from:0x020623d4 kind:load to:0x0204a120 module:main +from:0x020623d4 kind:load to:0x0204a110 add:0x10 module:main from:0x02062450 kind:arm_call to:0x02019590 module:main from:0x02062534 kind:load to:0x0204a110 module:main from:0x02062554 kind:arm_call to:0x02019590 module:main @@ -1442,7 +1442,7 @@ from:0x02062660 kind:arm_call to:0x02015ef8 module:main from:0x0206266c kind:arm_call to:0x0203a1bc module:main from:0x02062694 kind:arm_call to:0x0201cb7c module:main from:0x020626c8 kind:arm_call to:0x02061f8c module:overlay(0) -from:0x020626e0 kind:load to:0x0204a120 module:main +from:0x020626e0 kind:load to:0x0204a110 add:0x10 module:main from:0x02062730 kind:arm_call to:0x02015ef8 module:main from:0x0206273c kind:arm_call to:0x0203a1bc module:main from:0x02062760 kind:arm_call to:0x02015ef8 module:main @@ -1450,12 +1450,12 @@ from:0x02062780 kind:arm_call to:0x02015ef8 module:main from:0x0206278c kind:arm_call to:0x0203a1bc module:main from:0x020627b8 kind:arm_call to:0x0201cb7c module:main from:0x020627ec kind:arm_call to:0x02061f8c module:overlay(0) -from:0x02062804 kind:load to:0x0204a120 module:main +from:0x02062804 kind:load to:0x0204a110 add:0x10 module:main from:0x0206282c kind:arm_call to:0x02061f8c module:overlay(0) from:0x02062878 kind:arm_call to:0x02027654 module:main from:0x020628a8 kind:arm_call to:0x020251f0 module:main from:0x020628b4 kind:arm_call to:0x02025240 module:main -from:0x020628c0 kind:load to:0x0204a120 module:main +from:0x020628c0 kind:load to:0x0204a110 add:0x10 module:main from:0x020628cc kind:arm_call to:0x02061ce0 module:overlay(0) from:0x020628e0 kind:load to:0x020b1eb4 module:overlay(0) from:0x02062910 kind:arm_call to:0x020629b0 module:overlay(0) @@ -1565,7 +1565,7 @@ from:0x020639d0 kind:load to:0x0204af1c module:main from:0x020639ec kind:arm_call to:0x02063848 module:overlay(0) from:0x020639fc kind:arm_call to:0x0205fdf8 module:overlay(0) from:0x02063a28 kind:arm_call to:0x02063a3c module:overlay(0) -from:0x02063a38 kind:load to:0x020b1f2c module:overlay(0) +from:0x02063a38 kind:load to:0x020b1f24 add:0x8 module:overlay(0) from:0x02063a88 kind:arm_call to:0x02063870 module:overlay(0) from:0x02063a98 kind:arm_call to:0x02062ce0 module:overlay(0) from:0x02063aac kind:arm_call to:0x02060018 module:overlay(0) @@ -1955,7 +1955,7 @@ from:0x02068484 kind:arm_call to:0x0201bfec module:main from:0x0206849c kind:arm_call to:0x0201bfec module:main from:0x020684ac kind:arm_call_thumb to:0x0201ca28 module:main from:0x020684b8 kind:arm_call_thumb to:0x0201ca28 module:main -from:0x020684c4 kind:load to:0x0204a120 module:main +from:0x020684c4 kind:load to:0x0204a110 add:0x10 module:main from:0x020684d8 kind:load to:0x0201c0c4 module:main from:0x02068500 kind:load to:0x0204a110 module:main from:0x02068548 kind:arm_call to:0x02068504 module:overlay(0) @@ -3126,7 +3126,7 @@ from:0x02072640 kind:arm_call to:0x02018be0 module:main from:0x02072650 kind:arm_call to:0x02072f98 module:overlay(0) from:0x0207265c kind:load to:0x027e09b0 module:dtcm from:0x02072660 kind:load to:0x0203e964 module:main -from:0x02072668 kind:load to:0x0204ae10 module:main +from:0x02072668 kind:load to:0x0204a110 add:0xd00 module:main from:0x0207266c kind:load to:0x0204a110 module:main from:0x02072680 kind:load to:0x027e09b4 module:dtcm from:0x02072694 kind:load to:0x027e09b4 module:dtcm @@ -4368,12 +4368,12 @@ from:0x02080528 kind:load to:0x027e0998 module:dtcm from:0x0208052c kind:load to:0x027e0ce4 module:dtcm from:0x02080530 kind:load to:0x027e0994 module:dtcm from:0x02080534 kind:load to:0x0204a110 module:main -from:0x02080538 kind:load to:0x0204aed0 module:main +from:0x02080538 kind:load to:0x0204a110 add:0xdc0 module:main from:0x02080598 kind:arm_call to:0x0207fccc module:overlay(0) from:0x020805a8 kind:arm_call to:0x0209718c module:overlay(0) from:0x020805bc kind:arm_call to:0x020c6dec module:overlay(24) from:0x020805d4 kind:arm_call to:0x0201dd58 module:main -from:0x02080610 kind:load to:0x0204aed0 module:main +from:0x02080610 kind:load to:0x0204a110 add:0xdc0 module:main from:0x02080614 kind:load to:0x027e0994 module:dtcm from:0x02080618 kind:load to:0x027e0ce4 module:dtcm from:0x0208061c kind:load to:0x0204a110 module:main @@ -6139,7 +6139,7 @@ from:0x02093510 kind:arm_call to:0x020732dc module:overlay(0) from:0x02093544 kind:load to:0x020ad02c module:overlay(0) from:0x02093548 kind:load to:0x027e0ce0 module:dtcm from:0x0209354c kind:load to:0x0204a110 module:main -from:0x02093550 kind:load to:0x0204ae10 module:main +from:0x02093550 kind:load to:0x0204a110 add:0xd00 module:main from:0x02093554 kind:load to:0x027e09b8 module:dtcm from:0x02093558 kind:load to:0x0204a088 module:main from:0x02093588 kind:arm_call to:0x0208dad4 module:overlay(0) @@ -7405,7 +7405,7 @@ from:0x0209ed10 kind:load to:0x020b3cb4 module:overlay(0) from:0x0209ed14 kind:load to:0x020b41a0 module:overlay(0) from:0x0209ed18 kind:load to:0x0204a110 module:main from:0x0209ed1c kind:load to:0x02043f38 add:0x8 module:main -from:0x0209ed20 kind:load to:0x0204a120 module:main +from:0x0209ed20 kind:load to:0x0204a110 add:0x10 module:main from:0x0209ed4c kind:arm_call to:0x02034060 module:main from:0x0209ed58 kind:arm_call to:0x02033f7c module:main from:0x0209ed6c kind:arm_call to:0x02034060 module:main @@ -7424,7 +7424,7 @@ from:0x0209ee1c kind:load to:0x020b41a0 module:overlay(0) from:0x0209ee20 kind:load to:0x02043f38 add:0x8 module:main from:0x0209ee2c kind:arm_call to:0x0209f10c module:overlay(0) from:0x0209ee3c kind:arm_call_thumb to:0x0201c9e4 module:main -from:0x0209ee4c kind:load to:0x0204a120 module:main +from:0x0209ee4c kind:load to:0x0204a110 add:0x10 module:main from:0x0209ee70 kind:arm_call to:0x02032db0 module:main from:0x0209ee98 kind:arm_call to:0x02034060 module:main from:0x0209eea4 kind:arm_call to:0x02033f7c module:main @@ -7457,7 +7457,7 @@ from:0x0209f090 kind:load to:0x020b3cb4 module:overlay(0) from:0x0209f094 kind:load to:0x020b4174 module:overlay(0) from:0x0209f098 kind:load to:0x020b41a8 module:overlay(0) from:0x0209f09c kind:load to:0x02043f38 add:0x8 module:main -from:0x0209f0a0 kind:load to:0x0204a480 module:main +from:0x0209f0a0 kind:load to:0x0204a110 add:0x370 module:main from:0x0209f0cc kind:arm_call to:0x020575e0 module:overlay(0) from:0x0209f0e8 kind:arm_call to:0x02057610 module:overlay(0) from:0x0209f104 kind:arm_call to:0x020575b8 module:overlay(0) @@ -7510,12 +7510,12 @@ from:0x0209f540 kind:arm_call to:0x0209f958 module:overlay(0) from:0x0209f558 kind:arm_call to:0x0209ef5c module:overlay(0) from:0x0209f570 kind:arm_call to:0x0201665c module:main from:0x0209f578 kind:arm_call_thumb to:0x020154c4 module:main -from:0x0209f584 kind:load to:0x0204a120 module:main +from:0x0209f584 kind:load to:0x0204a110 add:0x10 module:main from:0x0209f588 kind:load to:0x020b43b0 module:overlay(0) from:0x0209f58c kind:load to:0x020b4888 module:overlay(0) from:0x0209f590 kind:load to:0x020b488c module:overlay(0) from:0x0209f594 kind:load to:0x02043f38 add:0x8 module:main -from:0x0209f598 kind:load to:0x0204a480 module:main +from:0x0209f598 kind:load to:0x0204a110 add:0x370 module:main from:0x0209f5c0 kind:arm_call_thumb to:0x020154b0 module:main from:0x0209f5cc kind:arm_call to:0x02016620 module:main from:0x0209f5dc kind:arm_call to:0x0209fa10 module:overlay(0) @@ -7556,7 +7556,7 @@ from:0x0209f8d8 kind:load to:0x020b43b0 module:overlay(0) from:0x0209f8dc kind:load to:0x020b4888 module:overlay(0) from:0x0209f8e0 kind:load to:0x020b488c module:overlay(0) from:0x0209f8e4 kind:load to:0x02043f38 add:0x8 module:main -from:0x0209f8e8 kind:load to:0x0204a480 module:main +from:0x0209f8e8 kind:load to:0x0204a110 add:0x370 module:main from:0x0209f8f8 kind:arm_call to:0x0209f958 module:overlay(0) from:0x0209f914 kind:arm_call to:0x0209ee50 module:overlay(0) from:0x0209f91c kind:load to:0x020b43b0 module:overlay(0) @@ -8062,7 +8062,7 @@ from:0x020a4974 kind:arm_call to:0x0201aad0 module:main from:0x020a49dc kind:arm_call to:0x0205fc20 module:overlay(0) from:0x020a49fc kind:arm_call to:0x0201aad0 module:main from:0x020a4a08 kind:load to:0x0204af1c module:main -from:0x020a4a0c kind:load to:0x0204af10 module:main +from:0x020a4a0c kind:load to:0x0204a110 add:0xe00 module:main from:0x020a4a10 kind:load to:0x020b4a48 module:overlay(0) from:0x020a4a14 kind:load to:0x0204a088 module:main from:0x020a4a3c kind:arm_call to:0x02018aac module:main @@ -8076,7 +8076,7 @@ from:0x020a4ab4 kind:load to:0x020b5214 module:overlay(0) from:0x020a4ad0 kind:arm_call to:0x02018ac4 module:main from:0x020a4adc kind:arm_call_thumb to:0x0201ca28 module:main from:0x020a4ae4 kind:load to:0x027e0994 module:dtcm -from:0x020a4ae8 kind:load to:0x0204a120 module:main +from:0x020a4ae8 kind:load to:0x0204a110 add:0x10 module:main from:0x020a4b38 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x020a4b90 kind:arm_call to:0x0206082c module:overlay(0) from:0x020a4bd8 kind:arm_call to:0x02061c5c module:overlay(0) diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt index 49746b04..62a069e8 100644 --- a/config/eur/arm9/overlays/ov000/symbols.txt +++ b/config/eur/arm9/overlays/ov000/symbols.txt @@ -192,8 +192,8 @@ _ZN26UnkStruct_StackTitleScreenC1EPKci kind:function(arm,size=0x54) addr:0x02059 _ZN26UnkStruct_StackTitleScreenD1Ev kind:function(arm,size=0x30) addr:0x02059240 _ZN26UnkStruct_StackTitleScreen19func_ov000_02059270EiPci kind:function(arm,size=0x18) addr:0x02059270 _ZN26UnkStruct_StackTitleScreen19func_ov000_02059288EiPci kind:function(arm,size=0x18) addr:0x02059288 -func_ov000_020592a0 kind:function(thumb,size=0x4c) addr:0x020592a0 -func_ov000_020592ec kind:function(thumb,size=0x70) addr:0x020592ec +_ZN18UnkStruct_027e095c19func_ov000_020592a0Ev kind:function(thumb,size=0x4c) addr:0x020592a0 +_ZN18UnkStruct_027e095c19func_ov000_020592ecEv kind:function(thumb,size=0x70) addr:0x020592ec func_ov000_0205935c kind:function(thumb,size=0xc) addr:0x0205935c func_ov000_02059368 kind:function(thumb,size=0xec) addr:0x02059368 func_ov000_02059454 kind:function(thumb,size=0x1b0) addr:0x02059454 @@ -402,7 +402,7 @@ _ZN34UnkStruct_ov019_020d24c8_28_258_0019func_ov000_0205fc20EiiPvS0_ kind:functi func_ov000_0205fd08 kind:function(arm,size=0x38) addr:0x0205fd08 func_ov000_0205fd40 kind:function(arm,size=0x90) addr:0x0205fd40 func_ov000_0205fdd0 kind:function(arm,size=0x28) addr:0x0205fdd0 -func_ov000_0205fdf8 kind:function(arm,size=0x28) addr:0x0205fdf8 +_ZN33UnkSystem2_UnkSubSystem7_Derived2C1Ev kind:function(arm,size=0x28) addr:0x0205fdf8 _ZN24UnkSystem2_UnkSubSystem7D1Ev kind:function(arm,size=0x68) addr:0x0205fe20 func_ov000_0205fe88 kind:function(arm,size=0x68) addr:0x0205fe88 func_ov000_0205fef0 kind:function(arm,size=0x128) addr:0x0205fef0 @@ -428,7 +428,7 @@ _ZN14UnkSubStruct1919func_ov000_0206082cEii kind:function(arm,size=0x124) addr:0 _ZN14UnkSubStruct1919func_ov000_02060950Ev kind:function(arm,size=0x60) addr:0x02060950 _ZN14UnkSubStruct1919func_ov000_020609b0Ev kind:function(arm,size=0x14) addr:0x020609b0 _ZN14UnkSubStruct1919func_ov000_020609c4Ev kind:function(arm,size=0xd4) addr:0x020609c4 -_ZN14UnkSubStruct1919func_ov000_02060a98Ev kind:function(arm,size=0x38) addr:0x02060a98 +_ZN14UnkSubStruct1919func_ov000_02060a98Ei kind:function(arm,size=0x38) addr:0x02060a98 _ZN14UnkSubStruct1919func_ov000_02060ad0Ev kind:function(arm,size=0x28) addr:0x02060ad0 _ZN14UnkSubStruct1919func_ov000_02060af8Ev kind:function(arm,size=0x58) addr:0x02060af8 _ZN14UnkSubStruct1919func_ov000_02060b50Ev kind:function(arm,size=0x14) addr:0x02060b50 @@ -445,11 +445,11 @@ func_ov000_02060db8 kind:function(arm,size=0x84) addr:0x02060db8 func_ov000_02060e3c kind:function(arm,size=0x88) addr:0x02060e3c func_ov000_02060ec4 kind:function(arm,size=0x20) addr:0x02060ec4 _ZN23TitleScreenManager_BaseC2Ev kind:function(arm,size=0x30) addr:0x02060ee4 -_ZN19func_ov000_02060f14D1Ev kind:function(arm,size=0x38) addr:0x02060f14 -_ZN19func_ov000_02060f4cD0Ev kind:function(arm,size=0x40) addr:0x02060f4c +_ZN23TitleScreenManager_BaseD1Ev kind:function(arm,size=0x38) addr:0x02060f14 +_ZN23TitleScreenManager_BaseD0Ev kind:function(arm,size=0x40) addr:0x02060f4c _ZN23TitleScreenManager_BaseD2Ev kind:function(arm,size=0x38) addr:0x02060f8c _ZN23TitleScreenManager_Base8vfunc_10Eiii kind:function(arm,size=0x4) addr:0x02060fc4 -func_ov000_02060fc8 kind:function(arm,size=0x68) addr:0x02060fc8 +_ZN23TitleScreenManager_Base19func_ov000_02060fc8Eiiii kind:function(arm,size=0x68) addr:0x02060fc8 _ZN23TitleScreenManager_Base8vfunc_3CEv kind:function(arm,size=0x8) addr:0x02061030 _ZN23TitleScreenManager_Base8vfunc_40Ev kind:function(arm,size=0x4) addr:0x02061038 _ZN23TitleScreenManager_Base8vfunc_44Ev kind:function(arm,size=0x4) addr:0x0206103c @@ -471,24 +471,24 @@ _ZN29FileSelectManager_UnkDrawBaseD0Ev kind:function(arm,size=0x20) addr:0x02061 _ZN29FileSelectManager_UnkDrawBaseD2Ev kind:function(arm,size=0x18) addr:0x020616c8 _ZN29FileSelectManager_UnkDrawBase8vfunc_08Ei kind:function(arm,size=0x4) addr:0x020616e0 _ZN29FileSelectManager_UnkDrawBase8vfunc_0CEi kind:function(arm,size=0x4) addr:0x020616e4 -_ZN29FileSelectManager_UnkDrawBase8vfunc_10Ev kind:function(arm,size=0x4) addr:0x020616e8 -_ZN29FileSelectManager_UnkDrawBase8vfunc_14Ev kind:function(arm,size=0x4) addr:0x020616ec +_ZN29FileSelectManager_UnkDrawBase8vfunc_10Eii kind:function(arm,size=0x4) addr:0x020616e8 +_ZN29FileSelectManager_UnkDrawBase8vfunc_14Ei kind:function(arm,size=0x4) addr:0x020616ec _ZN29FileSelectManager_UnkDrawBase8vfunc_18Ei kind:function(arm,size=0x4) addr:0x020616f0 _ZN29FileSelectManager_UnkDrawBase8vfunc_1CEi kind:function(arm,size=0x4) addr:0x020616f4 -_ZN29FileSelectManager_UnkDrawBase8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020616f8 +_ZN29FileSelectManager_UnkDrawBase8vfunc_20Eii kind:function(arm,size=0x4) addr:0x020616f8 _ZN29FileSelectManager_UnkDrawBase8vfunc_24Ev kind:function(arm,size=0x4) addr:0x020616fc -func_ov000_02061700 kind:function(thumb,size=0x24) addr:0x02061700 -func_ov000_02061724 kind:function(thumb,size=0x24) addr:0x02061724 +_ZN23UnkStruct_027e0998_BaseC2Ev kind:function(thumb,size=0x24) addr:0x02061700 +_ZN23UnkStruct_027e0998_BaseC1Ev kind:function(thumb,size=0x24) addr:0x02061724 func_ov000_02061748 kind:function(thumb,size=0x16) addr:0x02061748 -func_ov000_02061760 kind:function(thumb,size=0x2) addr:0x02061760 -func_ov000_02061764 kind:function(arm,size=0x4) addr:0x02061764 -func_ov000_02061768 kind:function(arm,size=0x4) addr:0x02061768 +_ZN23UnkStruct_027e0998_Base19func_ov000_02061760Ev kind:function(thumb,size=0x2) addr:0x02061760 +_ZN23UnkStruct_027e0998_Base19func_ov000_02061764Ev kind:function(arm,size=0x4) addr:0x02061764 +_ZN23UnkStruct_027e0998_Base19func_ov000_02061768Ev kind:function(arm,size=0x4) addr:0x02061768 func_ov000_0206176c kind:function(thumb,size=0xbc) addr:0x0206176c func_ov000_02061828 kind:function(thumb,size=0x28) addr:0x02061828 -func_ov000_02061850 kind:function(arm,size=0x18) addr:0x02061850 -func_ov000_02061868 kind:function(arm,size=0x1e0) addr:0x02061868 +_ZN23UnkStruct_027e0998_Base19func_ov000_02061850Ei kind:function(arm,size=0x18) addr:0x02061850 +_ZN23UnkStruct_027e0998_Base8vfunc_00EP5Vec3pP5Vec2sPt kind:function(arm,size=0x1e0) addr:0x02061868 func_ov000_02061a48 kind:function(arm,size=0x28) addr:0x02061a48 -_ZN18UnkStruct_027e099819func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02061a70 +_ZN23UnkStruct_027e0998_Base19func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02061a70 func_ov000_02061a7c kind:function(arm,size=0x10) addr:0x02061a7c _ZN26GameModeManagerBase_104_0CD1Ev kind:function(arm,size=0x18) addr:0x02061a8c _ZN26GameModeManagerBase_104_0CD0Ev kind:function(arm,size=0x20) addr:0x02061aa4 @@ -551,8 +551,8 @@ func_ov000_02062e44 kind:function(arm,size=0x18) addr:0x02062e44 func_ov000_02062e5c kind:function(arm,size=0x18) addr:0x02062e5c func_ov000_02062e74 kind:function(arm,size=0x54) addr:0x02062e74 _ZN24UnkSystem2_UnkSubSystem3C1EP29UnkSystem2_UnkSubSystem1_Baseiii kind:function(arm,size=0x30) addr:0x02062ec8 -func_ov000_02062ef8 kind:function(arm,size=0x20) addr:0x02062ef8 -func_ov000_02062f18 kind:function(arm,size=0x18) addr:0x02062f18 +_ZN24UnkSystem2_UnkSubSystem3C1Ev kind:function(arm,size=0x20) addr:0x02062ef8 +_ZN24UnkSystem2_UnkSubSystem319func_ov000_02062f18EPvii kind:function(arm,size=0x18) addr:0x02062f18 _ZN24UnkSystem2_UnkSubSystem319func_ov000_02062f30Ev kind:function(arm,size=0xd4) addr:0x02062f30 func_ov000_02063004 kind:function(arm,size=0x6c) addr:0x02063004 _ZN19func_ov000_02063070D1Ev kind:function(arm,size=0x14) addr:0x02063070 @@ -564,8 +564,8 @@ func_ov000_02063164 kind:function(arm,size=0xcc) addr:0x02063164 _ZN33UnkSystem2_UnkSubSystem1_Derived1C2Eiiiiii kind:function(arm,size=0x84) addr:0x02063230 _ZN33UnkSystem2_UnkSubSystem1_Derived1C1Eiiiiii kind:function(arm,size=0x84) addr:0x020632b4 func_ov000_02063338 kind:function(arm,size=0x44) addr:0x02063338 -func_ov000_0206337c kind:function(arm,size=0x44) addr:0x0206337c -func_ov000_020633c0 kind:function(arm,size=0x124) addr:0x020633c0 +_ZN33UnkSystem2_UnkSubSystem1_Derived1C1Ev kind:function(arm,size=0x44) addr:0x0206337c +_ZN33UnkSystem2_UnkSubSystem1_Derived119func_ov000_020633c0Eiiiiii kind:function(arm,size=0x124) addr:0x020633c0 func_ov000_020634e4 kind:function(arm,size=0x58) addr:0x020634e4 func_ov000_0206353c kind:function(arm,size=0xcc) addr:0x0206353c _ZN19func_ov000_02063608D1Ev kind:function(arm,size=0x14) addr:0x02063608 @@ -574,11 +574,11 @@ func_ov000_02063638 kind:function(arm,size=0xb0) addr:0x02063638 func_ov000_020636e8 kind:function(arm,size=0x130) addr:0x020636e8 _ZN19func_ov000_02063818D1Ev kind:function(arm,size=0x14) addr:0x02063818 _ZN19func_ov000_0206382cD0Ev kind:function(arm,size=0x1c) addr:0x0206382c -func_ov000_02063848 kind:function(arm,size=0x28) addr:0x02063848 +_ZN33UnkSystem2_UnkSubSystem1_Derived3C2Ev kind:function(arm,size=0x28) addr:0x02063848 func_ov000_02063870 kind:function(arm,size=0x98) addr:0x02063870 func_ov000_02063908 kind:function(arm,size=0xcc) addr:0x02063908 _ZN33UnkSystem2_UnkSubSystem1_Derived2C1Eiiiiii kind:function(arm,size=0x68) addr:0x020639d4 -func_ov000_02063a3c kind:function(arm,size=0x54) addr:0x02063a3c +_ZN33UnkSystem2_UnkSubSystem1_Derived319func_ov000_02063a3cEiiiiii kind:function(arm,size=0x54) addr:0x02063a3c func_ov000_02063a90 kind:function(arm,size=0x2c) addr:0x02063a90 func_ov000_02063abc kind:function(arm,size=0x54) addr:0x02063abc func_ov000_02063b10 kind:function(arm,size=0xc) addr:0x02063b10 @@ -665,18 +665,18 @@ func_ov000_02066190 kind:function(arm,size=0x1c) addr:0x02066190 func_ov000_020661ac kind:function(arm,size=0x3c) addr:0x020661ac _ZN19func_ov000_020661e8D1Ev kind:function(arm,size=0x14) addr:0x020661e8 _ZN19func_ov000_020661fcD0Ev kind:function(arm,size=0x1c) addr:0x020661fc -func_ov000_02066218 kind:function(arm,size=0x38) addr:0x02066218 +_ZN27AdventureModeManager_160_2819func_ov000_02066218Ei kind:function(arm,size=0x38) addr:0x02066218 func_ov000_02066250 kind:function(arm,size=0x14) addr:0x02066250 _ZN19func_ov000_02066264D1Ev kind:function(arm,size=0x14) addr:0x02066264 _ZN19func_ov000_02066278D0Ev kind:function(arm,size=0x1c) addr:0x02066278 func_ov000_02066294 kind:function(arm,size=0x24) addr:0x02066294 func_ov000_020662b8 kind:function(arm,size=0x30) addr:0x020662b8 -func_ov000_020662e8 kind:function(arm,size=0x7c) addr:0x020662e8 +_ZN24UnkStruct_ov000_020b4f7019func_ov000_020662e8Ev kind:function(arm,size=0x7c) addr:0x020662e8 func_ov000_02066364 kind:function(arm,size=0xc) addr:0x02066364 -func_ov000_02066370 kind:function(arm,size=0xec) addr:0x02066370 -func_ov000_0206645c kind:function(arm,size=0xf0) addr:0x0206645c -func_ov000_0206654c kind:function(arm,size=0x6c) addr:0x0206654c -func_ov000_020665b8 kind:function(arm,size=0x14) addr:0x020665b8 +_ZN24UnkStruct_ov000_020b4f7019func_ov000_02066370Ev kind:function(arm,size=0xec) addr:0x02066370 +_ZN24UnkStruct_ov000_020b4f7019func_ov000_0206645cEPc kind:function(arm,size=0xf0) addr:0x0206645c +_ZN24UnkStruct_ov000_020b4f7019func_ov000_0206654cEv kind:function(arm,size=0x6c) addr:0x0206654c +_ZN24UnkStruct_ov000_020b4f7019func_ov000_020665b8Ev kind:function(arm,size=0x14) addr:0x020665b8 func_ov000_020665cc kind:function(arm,size=0x10) addr:0x020665cc _ZN27UnkStruct_ov000_020b4f84_00C1Ev kind:function(arm,size=0x34) addr:0x020665dc func_ov000_02066610 kind:function(arm,size=0x4c) addr:0x02066610 @@ -720,21 +720,21 @@ func_ov000_02067970 kind:function(arm,size=0xbc) addr:0x02067970 func_ov000_02067a2c kind:function(arm,size=0x34) addr:0x02067a2c _ZN17struct_aStack_2e0C1EP24UnkStruct_ov000_020b504ci kind:function(arm,size=0x44) addr:0x02067a60 func_ov000_02067aa4 kind:function(arm,size=0x7c) addr:0x02067aa4 -func_ov000_02067b20 kind:function(arm,size=0x40) addr:0x02067b20 -func_ov000_02067b60 kind:function(arm,size=0x54) addr:0x02067b60 +_ZN24UnkStruct_ov000_020b504c19func_ov000_02067b20Ev kind:function(arm,size=0x40) addr:0x02067b20 +_ZN24UnkStruct_ov000_020b504c19func_ov000_02067b60Ev kind:function(arm,size=0x54) addr:0x02067b60 _ZN24UnkStruct_ov000_020b504c19func_ov000_02067bb4Ei kind:function(arm,size=0x10) addr:0x02067bb4 _ZN24UnkStruct_ov000_020b504c19func_ov000_02067bc4Ei kind:function(arm,size=0x1c) addr:0x02067bc4 func_ov000_02067be0 kind:function(arm,size=0x10) addr:0x02067be0 -func_ov000_02067bf0 kind:function(arm,size=0x8) addr:0x02067bf0 +_ZN24UnkStruct_ov000_020b504c19func_ov000_02067bf0Ev kind:function(arm,size=0x8) addr:0x02067bf0 func_ov000_02067bf8 kind:function(arm,size=0x8) addr:0x02067bf8 func_ov000_02067c00 kind:function(arm,size=0x98) addr:0x02067c00 func_ov000_02067c98 kind:function(arm,size=0x4) addr:0x02067c98 func_ov000_02067c9c kind:function(arm,size=0x5c) addr:0x02067c9c _ZN24UnkStruct_ov000_020b504c19func_ov000_02067cf8EiiPN24UnkStruct_ov000_02067bc410UnkStruct1E kind:function(arm,size=0x168) addr:0x02067cf8 _ZN24UnkStruct_ov000_020b504c19func_ov000_02067e60Ehi kind:function(arm,size=0xfc) addr:0x02067e60 -func_ov000_02067f5c kind:function(arm,size=0x2c) addr:0x02067f5c +_ZN24UnkStruct_ov000_020b504c19func_ov000_02067f5cEi kind:function(arm,size=0x2c) addr:0x02067f5c _ZN24UnkStruct_ov000_020b504c19func_ov000_02067f88Eii kind:function(arm,size=0xe0) addr:0x02067f88 -func_ov000_02068068 kind:function(arm,size=0x14) addr:0x02068068 +_ZN24UnkStruct_ov000_020b504c19func_ov000_02068068Ei kind:function(arm,size=0x14) addr:0x02068068 _ZN24UnkStruct_ov000_020b504c19func_ov000_0206807cEPvS0_ kind:function(arm,size=0x48) addr:0x0206807c func_ov000_020680c4 kind:function(arm,size=0xd0) addr:0x020680c4 func_ov000_02068194 kind:function(arm,size=0x98) addr:0x02068194 @@ -793,7 +793,7 @@ func_ov000_02069c44 kind:function(arm,size=0x34) addr:0x02069c44 func_ov000_02069c78 kind:function(arm,size=0x28) addr:0x02069c78 func_ov000_02069ca0 kind:function(arm,size=0x9c) addr:0x02069ca0 _ZN24UnkStruct_ov000_020b50c019func_ov000_02069d3cEi kind:function(arm,size=0x40) addr:0x02069d3c -_ZN24UnkStruct_ov000_020b50c019func_ov000_02069d7cEv kind:function(arm,size=0x40) addr:0x02069d7c +_ZN24UnkStruct_ov000_020b50c019func_ov000_02069d7cEi kind:function(arm,size=0x40) addr:0x02069d7c func_ov000_02069dbc kind:function(arm,size=0x84) addr:0x02069dbc func_ov000_02069e40 kind:function(arm,size=0xc) addr:0x02069e40 func_ov000_02069e4c kind:function(arm,size=0x50) addr:0x02069e4c @@ -960,7 +960,7 @@ _ZN24UnkStruct_ov000_020b52b419func_ov000_0206f6acEv kind:function(arm,size=0x2c func_ov000_0206f6d8 kind:function(arm,size=0x34) addr:0x0206f6d8 func_ov000_0206f70c kind:function(arm,size=0x48) addr:0x0206f70c func_ov000_0206f754 kind:function(arm,size=0x24) addr:0x0206f754 -func_ov000_0206f778 kind:function(arm,size=0x1f0) addr:0x0206f778 +_ZN24UnkStruct_ov000_020b52b419func_ov000_0206f778Eiii kind:function(arm,size=0x1f0) addr:0x0206f778 func_ov000_0206f968 kind:function(arm,size=0x18) addr:0x0206f968 func_ov000_0206f980 kind:function(arm,size=0x14) addr:0x0206f980 func_ov000_0206f994 kind:function(arm,size=0xc) addr:0x0206f994 @@ -986,12 +986,12 @@ func_ov000_02070134 kind:function(arm,size=0x14) addr:0x02070134 func_ov000_02070148 kind:function(arm,size=0x1c) addr:0x02070148 func_ov000_02070164 kind:function(arm,size=0xfc) addr:0x02070164 func_ov000_02070260 kind:function(arm,size=0x3c) addr:0x02070260 -_ZN18UnkStruct_027e09a019func_ov000_0207029cEi kind:function(arm,size=0xc) addr:0x0207029c +_ZN18UnkStruct_027e09a014GetCourseEntryEj kind:function(arm,size=0xc) addr:0x0207029c func_ov000_020702a8 kind:function(arm,size=0x14) addr:0x020702a8 -func_ov000_020702bc kind:function(arm,size=0x40) addr:0x020702bc -func_ov000_020702fc kind:function(arm,size=0x14) addr:0x020702fc +_ZN18UnkStruct_027e09a017GetRoomEntryIndexEv kind:function(arm,size=0x40) addr:0x020702bc +_ZN18UnkStruct_027e09a012GetRoomEntryEji kind:function(arm,size=0x14) addr:0x020702fc func_ov000_02070310 kind:function(arm,size=0x68) addr:0x02070310 -func_ov000_02070378 kind:function(arm,size=0x44) addr:0x02070378 +_ZN18UnkStruct_027e09a019func_ov000_02070378Ej kind:function(arm,size=0x44) addr:0x02070378 func_ov000_020703bc kind:function(arm,size=0x8) addr:0x020703bc func_ov000_020703c4 kind:function(arm,size=0x5c) addr:0x020703c4 func_ov000_02070420 kind:function(arm,size=0xa8) addr:0x02070420 @@ -1001,10 +1001,10 @@ func_ov000_02070538 kind:function(arm,size=0xc) addr:0x02070538 func_ov000_02070544 kind:function(arm,size=0x10) addr:0x02070544 func_ov000_02070554 kind:function(arm,size=0xc) addr:0x02070554 _ZN18UnkStruct_027e09a419func_ov000_02070560Ev kind:function(arm,size=0xc) addr:0x02070560 -func_ov000_0207056c kind:function(arm,size=0x14) addr:0x0207056c +_ZN18UnkStruct_027e09a419func_ov000_0207056cEv kind:function(arm,size=0x14) addr:0x0207056c func_ov000_02070580 kind:function(arm,size=0x1c) addr:0x02070580 func_ov000_0207059c kind:function(arm,size=0x4c) addr:0x0207059c -func_ov000_020705e8 kind:function(thumb,size=0x134) addr:0x020705e8 +_ZN18UnkStruct_027e09a419func_ov000_020705e8EP8SaveFilei kind:function(thumb,size=0x134) addr:0x020705e8 func_ov000_0207071c kind:function(thumb,size=0x8c) addr:0x0207071c _ZN18UnkStruct_027e09a419func_ov000_020707a8EPv kind:function(thumb,size=0x8c) addr:0x020707a8 _ZN18UnkStruct_027e09a419func_ov000_02070834EPv kind:function(arm,size=0x48) addr:0x02070834 @@ -1072,7 +1072,7 @@ func_ov000_02071e98 kind:function(arm,size=0x14) addr:0x02071e98 func_ov000_02071eac kind:function(arm,size=0x8c) addr:0x02071eac func_ov000_02071f38 kind:function(arm,size=0x50) addr:0x02071f38 func_ov000_02071f88 kind:function(arm,size=0x10) addr:0x02071f88 -func_ov000_02071f98 kind:function(arm,size=0x13c) addr:0x02071f98 +_ZN21UnkStruct_027e09ac_1419func_ov000_02071f98Ev kind:function(arm,size=0x13c) addr:0x02071f98 func_ov000_020720d4 kind:function(arm,size=0x270) addr:0x020720d4 func_ov000_02072344 kind:function(arm,size=0xb0) addr:0x02072344 func_ov000_020723f4 kind:function(arm,size=0x78) addr:0x020723f4 @@ -1080,8 +1080,8 @@ func_ov000_0207246c kind:function(arm,size=0x204) addr:0x0207246c func_ov000_02072670 kind:function(arm,size=0x14) addr:0x02072670 func_ov000_02072684 kind:function(arm,size=0x18) addr:0x02072684 func_ov000_0207269c kind:function(arm,size=0x54) addr:0x0207269c -func_ov000_020726f0 kind:function(arm,size=0x2d4) addr:0x020726f0 -func_ov000_020729c4 kind:function(arm,size=0x88) addr:0x020729c4 +_ZN18UnkStruct_027e09ac19func_ov000_020726f0Eiii kind:function(arm,size=0x2d4) addr:0x020726f0 +_ZN18UnkStruct_027e09ac19func_ov000_020729c4EP21UnkStruct_027e09ac_14ttss kind:function(arm,size=0x88) addr:0x020729c4 func_ov000_02072a4c kind:function(arm,size=0xbc) addr:0x02072a4c func_ov000_02072b08 kind:function(arm,size=0x1c) addr:0x02072b08 func_ov000_02072b24 kind:function(arm,size=0xc) addr:0x02072b24 @@ -1104,8 +1104,8 @@ func_ov000_02072f98 kind:function(arm,size=0x24) addr:0x02072f98 func_ov000_02072fbc kind:function(arm,size=0x14) addr:0x02072fbc func_ov000_02072fd0 kind:function(arm,size=0xb0) addr:0x02072fd0 func_ov000_02073080 kind:function(arm,size=0x2c) addr:0x02073080 -func_ov000_020730ac kind:function(arm,size=0x58) addr:0x020730ac -func_ov000_02073104 kind:function(arm,size=0x2c) addr:0x02073104 +_ZN17ActorUnk_vfunc_b0C1Ev kind:function(arm,size=0x58) addr:0x020730ac +_ZN20stack_ov000_02073578C1Ev kind:function(arm,size=0x2c) addr:0x02073104 func_ov000_02073130 kind:function(arm,size=0x4) addr:0x02073130 _ZN19func_ov000_02073134D0Ev kind:function(arm,size=0x14) addr:0x02073134 func_ov000_02073148 kind:function(arm,size=0x4) addr:0x02073148 @@ -1130,8 +1130,8 @@ _ZN18UnkStruct_027e09b819func_ov000_020732fcEi kind:function(arm,size=0x10) addr _ZN18UnkStruct_027e09b819func_ov000_0207330cEv kind:function(arm,size=0x20) addr:0x0207330c func_ov000_0207332c kind:function(arm,size=0x5c) addr:0x0207332c _ZN18UnkStruct_027e09b819func_ov000_02073388EPvi kind:function(arm,size=0xe8) addr:0x02073388 -func_ov000_02073470 kind:function(arm,size=0x108) addr:0x02073470 -func_ov000_02073578 kind:function(arm,size=0x98) addr:0x02073578 +_ZN18UnkStruct_027e09b819func_ov000_02073470EPvi kind:function(arm,size=0x108) addr:0x02073470 +_ZN18UnkStruct_027e09b819func_ov000_02073578EPvi kind:function(arm,size=0x98) addr:0x02073578 func_ov000_02073610 kind:function(arm,size=0xb0) addr:0x02073610 func_ov000_020736c0 kind:function(arm,size=0x10) addr:0x020736c0 func_ov000_020736d0 kind:function(arm,size=0x8) addr:0x020736d0 @@ -1628,7 +1628,7 @@ func_ov000_02081b74 kind:function(arm,size=0x10) addr:0x02081b74 func_ov000_02081b84 kind:function(arm,size=0x18) addr:0x02081b84 func_ov000_02081b9c kind:function(arm,size=0x58) addr:0x02081b9c func_ov000_02081bf4 kind:function(arm,size=0x34) addr:0x02081bf4 -func_ov000_02081c28 kind:function(arm,size=0x78) addr:0x02081c28 +_ZN18UnkStruct_027e0cd819func_ov000_02081c28Ev kind:function(arm,size=0x78) addr:0x02081c28 func_ov000_02081ca0 kind:function(arm,size=0xa8) addr:0x02081ca0 func_ov000_02081d48 kind:function(arm,size=0x10) addr:0x02081d48 func_ov000_02081d58 kind:function(arm,size=0x4) addr:0x02081d58 @@ -1642,7 +1642,7 @@ _ZN18UnkStruct_027e0cd819func_ov000_02081eecEsii kind:function(arm,size=0x50) ad _ZN18UnkStruct_027e0cd819func_ov000_02081f3cEsi kind:function(arm,size=0x4c) addr:0x02081f3c func_ov000_02081f88 kind:function(arm,size=0x90) addr:0x02081f88 func_ov000_02082018 kind:function(arm,size=0x10c) addr:0x02082018 -func_ov000_02082124 kind:function(arm,size=0x40) addr:0x02082124 +_ZN18UnkStruct_027e0cd819func_ov000_02082124Ev kind:function(arm,size=0x40) addr:0x02082124 func_ov000_02082164 kind:function(arm,size=0x2c) addr:0x02082164 func_ov000_02082190 kind:function(arm,size=0x4c) addr:0x02082190 _ZN19func_ov000_020821dcD1Ev kind:function(arm,size=0x14) addr:0x020821dc @@ -1673,7 +1673,7 @@ func_ov000_02082a08 kind:function(arm,size=0x10) addr:0x02082a08 func_ov000_02082a18 kind:function(arm,size=0x10) addr:0x02082a18 _ZN18UnkStruct_027e0cdc19func_ov000_02082a28Ei kind:function(arm,size=0x10) addr:0x02082a28 func_ov000_02082a38 kind:function(arm,size=0x10) addr:0x02082a38 -func_ov000_02082a48 kind:function(arm,size=0x10) addr:0x02082a48 +_ZN18UnkStruct_027e0cdc19func_ov000_02082a48Ei kind:function(arm,size=0x10) addr:0x02082a48 func_ov000_02082a58 kind:function(arm,size=0x48) addr:0x02082a58 func_ov000_02082aa0 kind:function(arm,size=0x10) addr:0x02082aa0 func_ov000_02082ab0 kind:function(thumb,size=0x2c) addr:0x02082ab0 @@ -2699,7 +2699,7 @@ func_ov000_020a09e0 kind:function(arm,size=0xb0) addr:0x020a09e0 func_ov000_020a0a90 kind:function(thumb,size=0x9a) addr:0x020a0a90 _ZN11SaveManager19func_ov000_020a0b2cEPFvtEi kind:function(thumb,size=0x2c) addr:0x020a0b2c func_ov000_020a0b58 kind:function(thumb,size=0x18) addr:0x020a0b58 -func_ov000_020a0b70 kind:function(thumb,size=0xa8) addr:0x020a0b70 +_ZN11SaveManager19func_ov000_020a0b70EPvi kind:function(thumb,size=0xa8) addr:0x020a0b70 func_ov000_020a0c18 kind:function(thumb,size=0x2c) addr:0x020a0c18 func_ov000_020a0c44 kind:function(thumb,size=0x34) addr:0x020a0c44 func_ov000_020a0c78 kind:function(thumb,size=0x7c) addr:0x020a0c78 @@ -2730,9 +2730,9 @@ func_ov000_020a1310 kind:function(arm,size=0x10) addr:0x020a1310 func_ov000_020a1320 kind:function(arm,size=0x10) addr:0x020a1320 func_ov000_020a1330 kind:function(arm,size=0x1b4) addr:0x020a1330 func_ov000_020a14e4 kind:function(arm,size=0x3c) addr:0x020a14e4 -func_ov000_020a1520 kind:function(arm,size=0x34) addr:0x020a1520 -_ZN19func_ov000_020a1554D1Ev kind:function(arm,size=0x28) addr:0x020a1554 -_ZN19func_ov000_020a157cD0Ev kind:function(arm,size=0x30) addr:0x020a157c +_ZN27AdventureModeManager_15C_28C1Ev kind:function(arm,size=0x34) addr:0x020a1520 +_ZN27AdventureModeManager_15C_28D1Ev kind:function(arm,size=0x28) addr:0x020a1554 +_ZN27AdventureModeManager_15C_28D0Ev kind:function(arm,size=0x30) addr:0x020a157c func_ov000_020a15ac kind:function(arm,size=0x13c) addr:0x020a15ac func_ov000_020a16e8 kind:function(arm,size=0x30) addr:0x020a16e8 func_ov000_020a1718 kind:function(arm,size=0xc) addr:0x020a1718 @@ -3093,8 +3093,8 @@ _ZN15TreasureManager19func_ov000_020a9eb0Ei kind:function(arm,size=0x9c) addr:0x _ZN15TreasureManager19func_ov000_020a9f4cEi kind:function(arm,size=0xe0) addr:0x020a9f4c _ZN15TreasureManager19func_ov000_020aa02cEi kind:function(arm,size=0x80) addr:0x020aa02c _ZN15TreasureManager19func_ov000_020aa0acEi kind:function(arm,size=0x154) addr:0x020aa0ac -_ZN15TreasureManager19func_ov000_020aa200Ev kind:function(arm,size=0x10) addr:0x020aa200 -_ZN15TreasureManager19func_ov000_020aa210Ev kind:function(arm,size=0x14) addr:0x020aa210 +_ZN8InstanceI15TreasureManagerEC2Ev kind:function(arm,size=0x10) addr:0x020aa200 +_ZN8InstanceI15TreasureManagerED2Ev kind:function(arm,size=0x14) addr:0x020aa210 func_ov000_020aa224 kind:function(arm,size=0x14) addr:0x020aa224 data_ov000_020aa238 kind:data(any) addr:0x020aa238 data_ov000_020aa240 kind:data(any) addr:0x020aa240 @@ -3465,7 +3465,7 @@ _ZTV19data_ov000_020b1ec4 kind:data(any) addr:0x020b1ec4 _ZTV19data_ov000_020b1edc kind:data(any) addr:0x020b1edc _ZTV19data_ov000_020b1ef4 kind:data(any) addr:0x020b1ef4 _ZTV19data_ov000_020b1f0c kind:data(any) addr:0x020b1f0c -data_ov000_020b1f2c kind:data(any) addr:0x020b1f2c +_ZTV33UnkSystem2_UnkSubSystem1_Derived4 kind:data(any) addr:0x020b1f24 data_ov000_020b1f44 kind:data(any) addr:0x020b1f44 _ZTV19data_ov000_020b1f54 kind:data(any) addr:0x020b1f54 data_ov000_020b1f74 kind:data(any) addr:0x020b1f74 @@ -3474,7 +3474,7 @@ data_ov000_020b1f9c kind:data(any) addr:0x020b1f9c data_ov000_020b1fac kind:data(any) addr:0x020b1fac data_ov000_020b1fbc kind:data(any) addr:0x020b1fbc data_ov000_020b1fd8 kind:data(any) addr:0x020b1fd8 -_ZTV19data_ov000_020b1fec kind:data(any) addr:0x020b1fec +_ZTV27AdventureModeManager_160_28 kind:data(any) addr:0x020b1fec data_ov000_020b2008 kind:data(any) addr:0x020b2008 data_ov000_020b2014 kind:data(any) addr:0x020b2014 data_ov000_020b2020 kind:data(any) addr:0x020b2020 @@ -4028,7 +4028,7 @@ data_ov000_020b51c0 kind:bss addr:0x020b51c0 data_ov000_020b51c4 kind:bss addr:0x020b51c4 data_ov000_020b51c8 kind:bss addr:0x020b51c8 data_ov000_020b5210 kind:bss addr:0x020b5210 -data_ov000_020b5214 kind:bss addr:0x020b5214 +data_ov000_020b5214_eur kind:bss addr:0x020b5214 data_ov000_020b52b0 kind:bss addr:0x020b52b0 data_ov000_020b52b4 kind:bss addr:0x020b52b4 data_ov000_020b52d8 kind:bss addr:0x020b52d8 @@ -4077,4 +4077,4 @@ data_ov000_020b64f4 kind:bss addr:0x020b64f4 data_ov000_020b64f8 kind:bss addr:0x020b64f8 data_ov000_020b64fc kind:bss addr:0x020b64fc data_ov000_020b6500 kind:bss addr:0x020b6500 -data_ov000_020b6510 kind:bss addr:0x020b6510 +gpTreasureManager kind:bss addr:0x020b6510 diff --git a/config/eur/arm9/overlays/ov001/delinks.txt b/config/eur/arm9/overlays/ov001/delinks.txt index f659792b..c61bcce4 100644 --- a/config/eur/arm9/overlays/ov001/delinks.txt +++ b/config/eur/arm9/overlays/ov001/delinks.txt @@ -1,5 +1,5 @@ - .text start:0x020b6520 end:0x020c0a24 kind:code align:32 - .rodata start:0x020c0a24 end:0x020c2814 kind:rodata align:4 + .text start:0x020b6520 end:0x020c25c0 kind:code align:32 + .rodata start:0x020c25c0 end:0x020c2814 kind:rodata align:4 .init start:0x020c2814 end:0x020c2900 kind:code align:4 .ctor start:0x020c2900 end:0x020c2920 kind:rodata align:4 .data start:0x020c2940 end:0x020c2fe0 kind:data align:32 @@ -19,3 +19,9 @@ src/001_SceneInit/CargoManager_001.cpp: src/001_SceneInit/PassengerManager_001.cpp: .text start:0x020bf870 end:0x020bfa50 + +src/001_SceneInit/Game/AdventureModeManager_001.cpp: + .text start:0x020bff74 end:0x020c0944 + +src/001_SceneInit/Game/GameModeAdventure_001.cpp: + .text start:0x020c0944 end:0x020c099c diff --git a/config/eur/arm9/overlays/ov001/relocs.txt b/config/eur/arm9/overlays/ov001/relocs.txt index 2d7dac82..9e5dbf2a 100644 --- a/config/eur/arm9/overlays/ov001/relocs.txt +++ b/config/eur/arm9/overlays/ov001/relocs.txt @@ -1558,7 +1558,7 @@ from:0x020bd80e kind:thumb_call to:0x020bd848 module:overlay(1) from:0x020bd824 kind:thumb_call_arm to:0x02018ac4 module:main from:0x020bd82c kind:thumb_call to:0x0201ca28 module:main from:0x020bd834 kind:load to:0x027e0994 module:dtcm -from:0x020bd838 kind:load to:0x0204a120 module:main +from:0x020bd838 kind:load to:0x0204a110 add:0x10 module:main from:0x020bd844 kind:load to:0x020d86a0 module:overlay(24) from:0x020bd850 kind:load to:0x020d86a0 module:overlay(24) from:0x020bd85c kind:thumb_call to:0x020bde6c module:overlay(1) @@ -2158,7 +2158,7 @@ from:0x020bff94 kind:thumb_call_arm to:0x02060ee4 module:overlay(0) from:0x020bffb4 kind:thumb_call_arm to:0x02011f3c module:main from:0x020bffbc kind:thumb_call to:0x020c08b8 module:overlay(1) from:0x020c0036 kind:thumb_call_arm to:0x02011f3c module:main -from:0x020c003e kind:thumb_call_arm to:0x020c6e38 module:overlays(20,24) +from:0x020c003e kind:thumb_call_arm to:0x020c6e38 module:overlay(24) from:0x020c0070 kind:thumb_call_arm to:0x020c6f68 module:overlay(24) from:0x020c0074 kind:thumb_call_arm to:0x020d1658 module:overlay(24) from:0x020c0080 kind:thumb_call_arm to:0x02011f3c module:main @@ -2299,7 +2299,7 @@ from:0x020c0968 kind:thumb_call to:0x020bd514 module:overlay(1) from:0x020c0970 kind:thumb_call to:0x020ba670 module:overlay(1) from:0x020c0976 kind:thumb_call to:0x020ba7a8 module:overlay(1) from:0x020c097c kind:thumb_call to:0x020b6520 module:overlay(1) -from:0x020c0980 kind:thumb_call_arm to:0x020c4ac0 module:overlays(20,24) +from:0x020c0980 kind:thumb_call_arm to:0x020c4ac0 module:overlay(24) from:0x020c0988 kind:load to:0x020d7b60 add:0x8 module:overlay(24) from:0x020c098c kind:load to:0x02049a2c module:main from:0x020c0990 kind:load to:0x0204a110 module:main @@ -2324,30 +2324,18 @@ from:0x020c0c44 kind:load to:0x020c2928 module:overlays(2,4) from:0x020c0cf8 kind:load to:0x020c2fc4 module:overlay(1) from:0x020c0cfc kind:load to:0x020c29a0 module:overlay(1) from:0x020c0e9c kind:load to:0x020c4701 module:overlay(1) -from:0x020c0ea8 kind:load to:0x020c1e24 module:overlay(1) from:0x020c0f14 kind:load to:0x020c4701 module:overlay(1) -from:0x020c0f20 kind:load to:0x020c1edc module:overlay(1) from:0x020c0f8c kind:load to:0x020c4701 module:overlay(1) -from:0x020c0f98 kind:load to:0x020c1f94 module:overlay(1) from:0x020c1004 kind:load to:0x020c4701 module:overlay(1) -from:0x020c1010 kind:load to:0x020c204c module:overlay(1) from:0x020c107c kind:load to:0x020c4701 module:overlay(1) -from:0x020c1088 kind:load to:0x020c2104 module:overlay(1) from:0x020c10f4 kind:load to:0x020c4701 module:overlay(1) -from:0x020c1100 kind:load to:0x020c219c module:overlay(1) -from:0x020c1114 kind:load to:0x020c2234 module:overlay(1) from:0x020c111c kind:load to:0x020c22ac module:overlay(1) -from:0x020c1124 kind:load to:0x020c2324 module:overlay(1) -from:0x020c112c kind:load to:0x020c239c module:overlay(1) -from:0x020c1134 kind:load to:0x020c2414 module:overlay(1) -from:0x020c113c kind:load to:0x020c248c module:overlay(1) from:0x020c114c kind:load to:0x020c3bf4 module:overlay(1) from:0x020c1224 kind:load to:0x020c2f4c module:overlay(1) from:0x020c1338 kind:load to:0x020c2fc4 module:overlay(1) from:0x020c1410 kind:load to:0x020c3490 module:overlay(1) from:0x020c1524 kind:load to:0x020c3508 module:overlay(1) from:0x020c1590 kind:load to:0x020c4701 module:overlay(1) -from:0x020c159c kind:load to:0x020c2550 module:overlay(1) from:0x020c1608 kind:load to:0x020c4701 module:overlay(1) from:0x020c1614 kind:load to:0x020c2624 add:0x4 module:overlay(1) from:0x020c1680 kind:load to:0x020c4701 module:overlay(1) @@ -2414,11 +2402,6 @@ from:0x020c28fc kind:load to:0x020c2fd4 module:overlay(1) from:0x020c2900 kind:load to:0x020c2815 module:overlay(1) from:0x020c2904 kind:load to:0x020c2839 module:overlay(1) from:0x020c2908 kind:load to:0x020c28f1 module:overlay(1) -from:0x020c290c kind:load to:0x020c1104 module:overlay(1) -from:0x020c2910 kind:load to:0x020c1708 module:overlay(1) -from:0x020c2914 kind:load to:0x020c19c4 module:overlay(1) -from:0x020c2918 kind:load to:0x020c2180 module:overlay(1) -from:0x020c291c kind:load to:0x020c2570 module:overlay(1) from:0x020c29fc kind:load to:0x020b83f9 module:overlay(1) from:0x020c2a00 kind:load to:0x020b8491 module:overlay(1) from:0x020c2a04 kind:load to:0x020b85cd module:overlay(1) diff --git a/config/eur/arm9/overlays/ov001/symbols.txt b/config/eur/arm9/overlays/ov001/symbols.txt index e2836261..65ce0ab2 100644 --- a/config/eur/arm9/overlays/ov001/symbols.txt +++ b/config/eur/arm9/overlays/ov001/symbols.txt @@ -144,9 +144,9 @@ func_ov001_020ba608 kind:function(thumb,size=0x18) addr:0x020ba608 func_ov001_020ba620 kind:function(thumb,size=0x20) addr:0x020ba620 func_ov001_020ba640 kind:function(thumb,size=0x16) addr:0x020ba640 func_ov001_020ba658 kind:function(thumb,size=0x18) addr:0x020ba658 -func_ov001_020ba670 kind:function(thumb,size=0x138) addr:0x020ba670 -func_ov001_020ba7a8 kind:function(thumb,size=0x20) addr:0x020ba7a8 -_ZN11SaveManager19func_ov000_020ba7c8Et kind:function(thumb,size=0x90) addr:0x020ba7c8 +_ZN11SaveManager19func_ov001_020ba670Ev kind:function(thumb,size=0x138) addr:0x020ba670 +_ZN11SaveManager19func_ov001_020ba7a8Ev kind:function(thumb,size=0x20) addr:0x020ba7a8 +_ZN11SaveManager19func_ov001_020ba7c8Et kind:function(thumb,size=0x90) addr:0x020ba7c8 func_ov001_020ba858 kind:function(thumb,size=0x15c) addr:0x020ba858 func_ov001_020ba9b4 kind:function(thumb,size=0x2) addr:0x020ba9b4 func_ov001_020ba9b8 kind:function(thumb,size=0x16) addr:0x020ba9b8 @@ -188,8 +188,8 @@ _ZN12ActorManager19func_ov001_020bb7b0EP15ZeldaObjectList kind:function(thumb,si _ZN12ActorManager19func_ov001_020bb7f0Ev kind:function(thumb,size=0x34) addr:0x020bb7f0 _ZN12ActorManager19func_ov001_020bb824Ev kind:function(thumb,size=0x20) addr:0x020bb824 _ZN12ActorManager19func_ov001_020bb844Ev kind:function(thumb,size=0x20) addr:0x020bb844 -_ZN12ActorManager11SetInstanceEPS_ kind:function(thumb,size=0xc) addr:0x020bb864 -_ZN12ActorManager13ClearInstanceEv kind:function(thumb,size=0xc) addr:0x020bb870 +_ZN8InstanceI12ActorManagerEC2Ev kind:function(thumb,size=0xc) addr:0x020bb864 +_ZN8InstanceI12ActorManagerED2Ev kind:function(thumb,size=0xc) addr:0x020bb870 func_ov001_020bb87c kind:function(thumb,size=0x3c) addr:0x020bb87c func_ov001_020bb8b8 kind:function(thumb,size=0x2) addr:0x020bb8b8 func_ov001_020bb8bc kind:function(thumb,size=0x13c) addr:0x020bb8bc @@ -274,12 +274,12 @@ _ZN23GameModeManagerBase_00419func_ov001_020bd734EPi kind:function(thumb,size=0x _ZN23GameModeManagerBase_00419func_ov001_020bd784Ev kind:function(thumb,size=0x3c) addr:0x020bd784 func_ov001_020bd7c0 kind:function(thumb,size=0x8) addr:0x020bd7c0 func_ov001_020bd7c8 kind:function(thumb,size=0x32) addr:0x020bd7c8 -func_ov001_020bd7fc kind:function(thumb,size=0x1a) addr:0x020bd7fc -func_ov001_020bd818 kind:function(thumb,size=0x24) addr:0x020bd818 +_ZN24UnkStruct_ov024_020d86a0D1Ev kind:function(thumb,size=0x1a) addr:0x020bd7fc +_ZN24UnkStruct_ov024_020d86a019func_ov001_020bd818Ev kind:function(thumb,size=0x24) addr:0x020bd818 func_ov001_020bd83c kind:function(thumb,size=0xc) addr:0x020bd83c func_ov001_020bd848 kind:function(thumb,size=0xc) addr:0x020bd848 -func_ov001_020bd854 kind:function(thumb,size=0x28) addr:0x020bd854 -func_ov001_020bd87c kind:function(thumb,size=0x30) addr:0x020bd87c +_ZN24UnkStruct_ov000_020b50c019func_ov001_020bd854Ev kind:function(thumb,size=0x28) addr:0x020bd854 +_ZN24UnkStruct_ov000_020b50c019func_ov001_020bd87cEv kind:function(thumb,size=0x30) addr:0x020bd87c _ZN24UnkStruct_ov000_020b50c019func_ov001_020bd8acEv kind:function(thumb,size=0x30) addr:0x020bd8ac _ZN24UnkStruct_ov000_020b50c019func_ov001_020bd8dcEv kind:function(thumb,size=0xc) addr:0x020bd8dc func_ov001_020bd8e8 kind:function(thumb,size=0x28) addr:0x020bd8e8 @@ -301,7 +301,7 @@ func_ov001_020be078 kind:function(thumb,size=0x60) addr:0x020be078 func_ov001_020be0d8 kind:function(thumb,size=0x14) addr:0x020be0d8 func_ov001_020be0ec kind:function(thumb,size=0x14) addr:0x020be0ec func_ov001_020be100 kind:function(thumb,size=0x2c) addr:0x020be100 -func_ov001_020be12c kind:function(thumb,size=0xc) addr:0x020be12c +_ZN24UnkStruct_ov000_020b4eec19func_ov001_020be12cEv kind:function(thumb,size=0xc) addr:0x020be12c func_ov001_020be138 kind:function(thumb,size=0xc0) addr:0x020be138 func_ov001_020be1f8 kind:function(thumb,size=0x96) addr:0x020be1f8 func_ov001_020be290 kind:function(thumb,size=0x12) addr:0x020be290 @@ -321,7 +321,7 @@ func_ov001_020be468 kind:function(thumb,size=0xc) addr:0x020be468 func_ov001_020be474 kind:function(thumb,size=0x70) addr:0x020be474 func_ov001_020be4e4 kind:function(thumb,size=0x1e) addr:0x020be4e4 func_ov001_020be504 kind:function(thumb,size=0xc) addr:0x020be504 -func_ov001_020be510 kind:function(thumb,size=0xd8) addr:0x020be510 +_ZN24UnkStruct_ov000_020b504c19func_ov001_020be510Ev kind:function(thumb,size=0xd8) addr:0x020be510 func_ov001_020be5e8 kind:function(thumb,size=0x80) addr:0x020be5e8 _ZN24UnkStruct_ov000_020b504c19func_ov001_020be668Ev kind:function(thumb,size=0x70) addr:0x020be668 func_ov001_020be6d8 kind:function(thumb,size=0x1c) addr:0x020be6d8 @@ -390,8 +390,8 @@ func_ov001_020bf7f4 kind:function(thumb,size=0xc) addr:0x020bf7f4 _ZN12CargoManagerC1Ev kind:function(thumb,size=0x22) addr:0x020bf800 _ZN12CargoManagerD1Ev kind:function(thumb,size=0xc) addr:0x020bf824 _ZN12CargoManager19func_ov001_020bf830Ev kind:function(thumb,size=0x28) addr:0x020bf830 -_ZN12CargoManager11SetInstanceEPS_ kind:function(thumb,size=0xc) addr:0x020bf858 -_ZN12CargoManager13ClearInstanceEv kind:function(thumb,size=0xc) addr:0x020bf864 +_ZN8InstanceI12CargoManagerEC2Ev kind:function(thumb,size=0xc) addr:0x020bf858 +_ZN8InstanceI12CargoManagerED2Ev kind:function(thumb,size=0xc) addr:0x020bf864 _ZN16PassengerManager19func_ov001_020bf870Ev kind:function(thumb,size=0x44) addr:0x020bf870 _ZN16PassengerManagerC1Ev kind:function(thumb,size=0x24) addr:0x020bf8b4 _ZN16PassengerManagerD1Ev kind:function(thumb,size=0xc) addr:0x020bf8d8 @@ -399,8 +399,8 @@ _ZN16PassengerManager19func_ov001_020bf8e4Ev kind:function(thumb,size=0x28) addr _ZN16PassengerManager19func_ov001_020bf90cEv kind:function(thumb,size=0x2) addr:0x020bf90c _ZN16PassengerManager19func_ov001_020bf910Ev kind:function(thumb,size=0x10c) addr:0x020bf910 _ZN16PassengerManager19func_ov001_020bfa1cEv kind:function(thumb,size=0x1c) addr:0x020bfa1c -_ZN16PassengerManager11SetInstanceEPS_ kind:function(thumb,size=0xc) addr:0x020bfa38 -_ZN16PassengerManager13ClearInstanceEv kind:function(thumb,size=0xc) addr:0x020bfa44 +_ZN8InstanceI16PassengerManagerEC2Ev kind:function(thumb,size=0xc) addr:0x020bfa38 +_ZN8InstanceI16PassengerManagerED2Ev kind:function(thumb,size=0xc) addr:0x020bfa44 func_ov001_020bfa50 kind:function(thumb,size=0xc2) addr:0x020bfa50 func_ov001_020bfb14 kind:function(thumb,size=0xc) addr:0x020bfb14 func_ov001_020bfb20 kind:function(thumb,size=0x1a0) addr:0x020bfb20 @@ -420,56 +420,78 @@ func_ov001_020bff0c kind:function(thumb,size=0x10) addr:0x020bff0c func_ov001_020bff1c kind:function(thumb,size=0x10) addr:0x020bff1c func_ov001_020bff2c kind:function(thumb,size=0x8) addr:0x020bff2c func_ov001_020bff34 kind:function(thumb,size=0x40) addr:0x020bff34 -func_ov001_020bff74 kind:function(thumb,size=0x1c) addr:0x020bff74 -func_ov001_020bff90 kind:function(thumb,size=0x134) addr:0x020bff90 -func_ov001_020c00c4 kind:function(thumb,size=0x10) addr:0x020c00c4 -func_ov001_020c00d4 kind:function(thumb,size=0x30) addr:0x020c00d4 -func_ov001_020c0104 kind:function(thumb,size=0x90) addr:0x020c0104 -func_ov001_020c0194 kind:function(thumb,size=0x7c) addr:0x020c0194 -func_ov001_020c0210 kind:function(thumb,size=0x364) addr:0x020c0210 -func_ov001_020c0574 kind:function(thumb,size=0x248) addr:0x020c0574 -func_ov001_020c07bc kind:function(thumb,size=0x40) addr:0x020c07bc -func_ov001_020c07fc kind:function(thumb,size=0x28) addr:0x020c07fc -func_ov001_020c0824 kind:function(thumb,size=0x18) addr:0x020c0824 -func_ov001_020c083c kind:function(thumb,size=0x18) addr:0x020c083c -func_ov001_020c0854 kind:function(thumb,size=0x20) addr:0x020c0854 -func_ov001_020c0874 kind:function(thumb,size=0x20) addr:0x020c0874 -func_ov001_020c0894 kind:function(thumb,size=0x18) addr:0x020c0894 -func_ov001_020c08ac kind:function(thumb,size=0xc) addr:0x020c08ac -func_ov001_020c08b8 kind:function(thumb,size=0x68) addr:0x020c08b8 -func_ov001_020c0920 kind:function(thumb,size=0x22) addr:0x020c0920 -func_ov001_020c0944 kind:function(thumb,size=0x58) addr:0x020c0944 +_ZN20AdventureModeManager6CreateEi kind:function(thumb,size=0x1c) addr:0x020bff74 +_ZN20AdventureModeManagerC1Ei kind:function(thumb,size=0x134) addr:0x020bff90 +_ZN20AdventureModeManager8vfunc_10Eiii kind:function(thumb,size=0x10) addr:0x020c00c4 +_ZN20AdventureModeManager19func_ov001_020c00d4Ev kind:function(thumb,size=0x30) addr:0x020c00d4 +_ZN20AdventureModeManager19func_ov001_020c0104Ev kind:function(thumb,size=0x90) addr:0x020c0104 +_ZN20AdventureModeManager19func_ov001_020c0194Ev kind:function(thumb,size=0x7c) addr:0x020c0194 +_ZN20AdventureModeManager8vfunc_14Ev kind:function(thumb,size=0x364) addr:0x020c0210 +_ZN20AdventureModeManager8vfunc_18Ev kind:function(thumb,size=0x248) addr:0x020c0574 +_ZN20AdventureModeManager8vfunc_1CEv kind:function(thumb,size=0x40) addr:0x020c07bc +_ZN20AdventureModeManager8vfunc_20Ev kind:function(thumb,size=0x28) addr:0x020c07fc +_ZN20AdventureModeManager19func_ov001_020c0824Ev kind:function(thumb,size=0x18) addr:0x020c0824 +_ZN20AdventureModeManager19func_ov001_020c083cEv kind:function(thumb,size=0x18) addr:0x020c083c +_ZN20AdventureModeManager19func_ov001_020c0854Ev kind:function(thumb,size=0x20) addr:0x020c0854 +_ZN20AdventureModeManager19func_ov001_020c0874Ev kind:function(thumb,size=0x20) addr:0x020c0874 +_ZN20AdventureModeManager19func_ov001_020c0894Ev kind:function(thumb,size=0x18) addr:0x020c0894 +_ZN24UnkStruct_ov000_020b4f70D1Ev kind:function(thumb,size=0xc) addr:0x020c08ac +_ZN24AdventureModeManager_15CC1Ev kind:function(thumb,size=0x68) addr:0x020c08b8 +_ZN24AdventureModeManager_15CD1Ev kind:function(thumb,size=0x22) addr:0x020c0920 +_ZN17GameModeAdventureC1Ev kind:function(thumb,size=0x58) addr:0x020c0944 func_ov001_020c099c kind:function(thumb,size=0x24) addr:0x020c099c func_ov001_020c09c0 kind:function(thumb,size=0x1c) addr:0x020c09c0 func_ov001_020c09dc kind:function(thumb,size=0x48) addr:0x020c09dc -func_ov001_020c0e34_unk kind:function(arm,size=0x0,unknown) addr:0x020c0e34 -func_ov001_020c0eac_unk kind:function(arm,size=0x0,unknown) addr:0x020c0eac -data_ov001_020c0edc kind:data(any) addr:0x020c0edc ambiguous -func_ov001_020c0f24_unk kind:function(arm,size=0x0,unknown) addr:0x020c0f24 -func_ov001_020c0f9c_unk kind:function(arm,size=0x0,unknown) addr:0x020c0f9c -func_ov001_020c1014_unk kind:function(arm,size=0x0,unknown) addr:0x020c1014 -func_ov001_020c108c_unk kind:function(arm,size=0x0,unknown) addr:0x020c108c -data_ov001_020c1104 kind:data(any) addr:0x020c1104 -data_ov001_020c1528 kind:data(any) addr:0x020c1528 -data_ov001_020c1708 kind:data(any) addr:0x020c1708 -data_ov001_020c1860 kind:data(any) addr:0x020c1860 ambiguous -data_ov001_020c19c4 kind:data(any) addr:0x020c19c4 -data_ov001_020c1e24 kind:data(any) addr:0x020c1e24 -data_ov001_020c1edc kind:data(any) addr:0x020c1edc -data_ov001_020c1f94 kind:data(any) addr:0x020c1f94 -data_ov001_020c204c kind:data(any) addr:0x020c204c -data_ov001_020c2104 kind:data(any) addr:0x020c2104 -data_ov001_020c2180 kind:data(any) addr:0x020c2180 -data_ov001_020c219c kind:data(any) addr:0x020c219c -data_ov001_020c2234 kind:data(any) addr:0x020c2234 -data_ov001_020c22ac kind:data(any) addr:0x020c22ac -data_ov001_020c2324 kind:data(any) addr:0x020c2324 -data_ov001_020c239c kind:data(any) addr:0x020c239c -data_ov001_020c2414 kind:data(any) addr:0x020c2414 -data_ov001_020c248c kind:data(any) addr:0x020c248c -data_ov001_020c2550 kind:data(any) addr:0x020c2550 -data_ov001_020c2570 kind:data(any) addr:0x020c2570 -data_ov001_020c25c0 kind:data(any) addr:0x020c25c0 +DetectFlashcart kind:function(arm,size=0xb8,unknown) addr:0x020c0a24 +DetectNotFlashcart kind:function(arm,size=0xb8,unknown) addr:0x020c0adc +DetectEmulator kind:function(arm,size=0xb8,unknown) addr:0x020c0b94 +DetectNotEmulator kind:function(arm,size=0xb8,unknown) addr:0x020c0c4c +DetectDummy kind:function(arm,size=0x98,unknown) addr:0x020c0d04 +DetectNotDummy kind:function(arm,size=0x98,unknown) addr:0x020c0d9c +DSProt_DetectFlashcart kind:function(arm,size=0x78,unknown) addr:0x020c0e34 +DSProt_DetectNotFlashcart kind:function(arm,size=0x78,unknown) addr:0x020c0eac +DSProt_DetectEmulator kind:function(arm,size=0x78,unknown) addr:0x020c0f24 +DSProt_DetectNotEmulator kind:function(arm,size=0x78,unknown) addr:0x020c0f9c +DSProt_DetectDummy kind:function(arm,size=0x78,unknown) addr:0x020c1014 +DSProt_DetectNotDummy kind:function(arm,size=0x78,unknown) addr:0x020c108c +NitroStaticInit kind:function(arm,size=0x4c,unknown) addr:0x020c1104 local +Integrity_MACOwner_IsBad kind:function(arm,size=0xd8,unknown) addr:0x020c1150 +Integrity_MACOwner_IsGood kind:function(arm,size=0x114,unknown) addr:0x020c1228 +Integrity_ROMTest_IsBad kind:function(arm,size=0xd8,unknown) addr:0x020c133c +Integrity_ROMTest_IsGood kind:function(arm,size=0x114,unknown) addr:0x020c1414 +RunEncrypted_Integrity_MACOwner_IsBad kind:function(arm,size=0x78,unknown) addr:0x020c1528 +RunEncrypted_Integrity_MACOwner_IsGood kind:function(arm,size=0x78,unknown) addr:0x020c15a0 +RunEncrypted_Integrity_ROMTest_IsBad kind:function(arm,size=0x78,unknown) addr:0x020c1618 +RunEncrypted_Integrity_ROMTest_IsGood kind:function(arm,size=0x78,unknown) addr:0x020c1690 +NitroStaticInit kind:function(arm,size=0x38,unknown) addr:0x020c1708 local +clearDataAndInstructionCache kind:function(arm,size=0x20,unknown) addr:0x020c1740 +Encryptor_CategorizeInstruction kind:function(arm,size=0x3c,unknown) addr:0x020c1760 +Encryptor_DecodeFunctionTable kind:function(arm,size=0x110,unknown) addr:0x020c179c +Encryptor_DecryptFunction kind:function(arm,size=0x88,unknown) addr:0x020c18ac +Encryptor_EncryptFunction kind:function(arm,size=0x90,unknown) addr:0x020c1934 +NitroStaticInit kind:function(arm,size=0x28,unknown) addr:0x020c19c4 local +MACOwner_IsBad kind:function(arm,size=0xb0,unknown) addr:0x020c19ec +MACOwner_IsGood kind:function(arm,size=0xb0,unknown) addr:0x020c1a9c +RunEncrypted_MACOwner_IsBad kind:function(arm,size=0x78,unknown) addr:0x020c1b4c +RunEncrypted_MACOwner_IsGood kind:function(arm,size=0x78,unknown) addr:0x020c1bc4 +ROMUtil_Read kind:function(arm,size=0x184,unknown) addr:0x020c1c3c +ROMUtil_CRC32 kind:function(arm,size=0x58,unknown) addr:0x020c1dc0 +RunEncrypted_ROMUtil_Read kind:function(arm,size=0x78,unknown) addr:0x020c1e18 +RunEncrypted_ROMUtil_CRC32 kind:function(arm,size=0x78,unknown) addr:0x020c1e90 +ROMTest_IsBad kind:function(arm,size=0xc4,unknown) addr:0x020c1f08 +ROMTest_IsGood kind:function(arm,size=0xc4,unknown) addr:0x020c1fcc +RunEncrypted_ROMTest_IsBad kind:function(arm,size=0x78,unknown) addr:0x020c2090 +RunEncrypted_ROMTest_IsGood kind:function(arm,size=0x78,unknown) addr:0x020c2108 +NitroStaticInit kind:function(arm,size=0x48,unknown) addr:0x020c2180 local +RC4_Init kind:function(arm,size=0x74,unknown) addr:0x020c21c8 +RC4_Byte kind:function(arm,size=0x4c,unknown) addr:0x020c223c +RC4_InitSBox kind:function(arm,size=0x24,unknown) addr:0x020c2288 +RC4_EncryptInstructions kind:function(arm,size=0x108,unknown) addr:0x020c22ac +RC4_DecryptInstructions kind:function(arm,size=0x10c,unknown) addr:0x020c23b4 +RC4_InitAndEncryptInstructions kind:function(arm,size=0x58,unknown) addr:0x020c24c0 +RC4_InitAndDecryptInstructions kind:function(arm,size=0x58,unknown) addr:0x020c2518 +NitroStaticInit kind:function(arm,size=0x50,unknown) addr:0x020c2570 local +bad_mac_addr kind:data(any) addr:0x020c25c0 data_ov001_020c25d4 kind:data(any) addr:0x020c25d4 data_ov001_020c25fc kind:data(any) addr:0x020c25fc data_ov001_020c2624 kind:data(any) addr:0x020c2624 @@ -489,11 +511,11 @@ __sinit_ov001_020c28f0 kind:function(thumb,size=0x10) addr:0x020c28f0 .p__sinit_ov001_020c2814 kind:data(word) addr:0x020c2900 .p__sinit_ov001_020c2838 kind:data(word) addr:0x020c2904 .p__sinit_ov001_020c28f0 kind:data(word) addr:0x020c2908 -.p__sinit_ov001_020c1104 kind:data(word) addr:0x020c290c -.p__sinit_ov001_020c1708 kind:data(word) addr:0x020c2910 -.p__sinit_ov001_020c19c4 kind:data(word) addr:0x020c2914 -.p__sinit_ov001_020c2180 kind:data(word) addr:0x020c2918 -.p__sinit_ov001_020c2570 kind:data(word) addr:0x020c291c +.p__sinit_ov001_020c1104 kind:data(word) addr:0x020c290c local +.p__sinit_ov001_020c1708 kind:data(word) addr:0x020c2910 local +.p__sinit_ov001_020c19c4 kind:data(word) addr:0x020c2914 local +.p__sinit_ov001_020c2180 kind:data(word) addr:0x020c2918 local +.p__sinit_ov001_020c2570 kind:data(word) addr:0x020c291c local data_ov001_020c2940 kind:data(any) addr:0x020c2940 data_ov001_020c2958 kind:data(any) addr:0x020c2958 data_ov001_020c2970 kind:data(any) addr:0x020c2970 diff --git a/config/eur/arm9/overlays/ov002/relocs.txt b/config/eur/arm9/overlays/ov002/relocs.txt index a1b82f88..97adc65b 100644 --- a/config/eur/arm9/overlays/ov002/relocs.txt +++ b/config/eur/arm9/overlays/ov002/relocs.txt @@ -509,7 +509,7 @@ from:0x020b928a kind:thumb_call to:0x020b9be4 module:overlay(2) from:0x020b9294 kind:thumb_call to:0x020b9ec4 module:overlay(2) from:0x020b92a4 kind:load to:0x0204af1c module:main from:0x020b92cc kind:thumb_call_arm to:0x0201c4d8 module:main -from:0x020b92d8 kind:load to:0x0204aeac module:main +from:0x020b92d8 kind:load to:0x0204a110 add:0xd9c module:main from:0x020b9354 kind:thumb_call_arm to:0x0205fc20 module:overlay(0) from:0x020b937a kind:thumb_call_arm to:0x0205fc20 module:overlay(0) from:0x020b9390 kind:thumb_call to:0x020b989c module:overlay(2) @@ -798,7 +798,7 @@ from:0x020baf36 kind:thumb_call_arm to:0x0201aad0 module:main from:0x020baf44 kind:load to:0x0204af1c module:main from:0x020baf58 kind:load to:0x020bcb60 module:overlay(2) from:0x020bafa4 kind:thumb_call_arm to:0x0201c4d8 module:main -from:0x020bafbc kind:load to:0x0204aeac module:main +from:0x020bafbc kind:load to:0x0204a110 add:0xd9c module:main from:0x020bafd2 kind:thumb_call to:0x020ba11c module:overlay(2) from:0x020bafd6 kind:thumb_call to:0x020ba1d8 module:overlay(2) from:0x020bafe8 kind:thumb_call_arm to:0x02064e24 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov003/relocs.txt b/config/eur/arm9/overlays/ov003/relocs.txt index 5b2111ec..426cff95 100644 --- a/config/eur/arm9/overlays/ov003/relocs.txt +++ b/config/eur/arm9/overlays/ov003/relocs.txt @@ -249,27 +249,27 @@ from:0x020b84c0 kind:arm_call to:0x0201967c module:main from:0x020b84cc kind:arm_call to:0x0201e6c4 module:main from:0x020b8500 kind:arm_call to:0x0201e874 module:main from:0x020b8538 kind:load to:0x0204a110 module:main -from:0x020b853c kind:load to:0x0204aeec module:main +from:0x020b853c kind:load to:0x0204a110 add:0xddc module:main from:0x020b8540 kind:load to:0x020ba020 module:overlay(3) from:0x020b8584 kind:arm_call to:0x0201967c module:main from:0x020b8590 kind:arm_call to:0x0201e6c4 module:main from:0x020b85c4 kind:arm_call to:0x0201e874 module:main from:0x020b85f8 kind:load to:0x020b9f64 module:overlay(3) from:0x020b85fc kind:load to:0x0204a110 module:main -from:0x020b8600 kind:load to:0x0204aeec module:main +from:0x020b8600 kind:load to:0x0204a110 add:0xddc module:main from:0x020b8604 kind:load to:0x020ba020 module:overlay(3) from:0x020b863c kind:arm_call to:0x0201967c module:main from:0x020b8648 kind:arm_call to:0x0201e6c4 module:main from:0x020b867c kind:arm_call to:0x0201e874 module:main from:0x020b86b4 kind:load to:0x0204a110 module:main -from:0x020b86b8 kind:load to:0x0204aeec module:main +from:0x020b86b8 kind:load to:0x0204a110 add:0xddc module:main from:0x020b86bc kind:load to:0x020ba020 module:overlay(3) from:0x020b86fc kind:arm_call to:0x0201967c module:main from:0x020b8708 kind:arm_call to:0x0201e6c4 module:main from:0x020b873c kind:arm_call to:0x0201e874 module:main from:0x020b8770 kind:load to:0x020b9d48 module:overlay(3) from:0x020b8774 kind:load to:0x0204a110 module:main -from:0x020b8778 kind:load to:0x0204aeec module:main +from:0x020b8778 kind:load to:0x0204a110 add:0xddc module:main from:0x020b877c kind:load to:0x020ba020 module:overlay(3) from:0x020b87d0 kind:arm_call to:0x02018268 module:main from:0x020b87f4 kind:arm_call to:0x020685cc module:overlay(0) diff --git a/config/eur/arm9/overlays/ov004/relocs.txt b/config/eur/arm9/overlays/ov004/relocs.txt index b9ee7ad9..3dbe5e1e 100644 --- a/config/eur/arm9/overlays/ov004/relocs.txt +++ b/config/eur/arm9/overlays/ov004/relocs.txt @@ -77,7 +77,7 @@ from:0x020b6d54 kind:load to:0x020b51b8 module:overlay(0) from:0x020b6d58 kind:load to:0x0204a110 module:main from:0x020b6d5c kind:load to:0x0204a088 module:main from:0x020b6d60 kind:load to:0x020b5214 module:overlay(0) -from:0x020b6d64 kind:load to:0x0204aeac module:main +from:0x020b6d64 kind:load to:0x0204a110 add:0xd9c module:main from:0x020b6d7c kind:arm_call to:0x020b91ac module:overlay(4) from:0x020b6d8c kind:arm_call to:0x0213bc94 module:overlay(56) from:0x020b6d9c kind:arm_call to:0x0211f0e4 module:overlay(36) diff --git a/config/eur/arm9/overlays/ov006/relocs.txt b/config/eur/arm9/overlays/ov006/relocs.txt index 4c5a4a0b..90f55495 100644 --- a/config/eur/arm9/overlays/ov006/relocs.txt +++ b/config/eur/arm9/overlays/ov006/relocs.txt @@ -234,7 +234,7 @@ from:0x020b7e20 kind:load to:0x020b7e25 module:overlay(6) from:0x020b7e5c kind:thumb_call to:0x020b8700 module:overlay(6) from:0x020b7e64 kind:thumb_call_arm to:0x0201e698 module:main from:0x020b7e6a kind:thumb_call to:0x020b84b0 module:overlay(6) -from:0x020b7eb4 kind:load to:0x0204aeec module:main +from:0x020b7eb4 kind:load to:0x0204a110 add:0xddc module:main from:0x020b7ee4 kind:load to:0x020b8a7c module:overlay(6) from:0x020b7ef2 kind:thumb_call_arm to:0x01ff9b50 module:itcm from:0x020b7f2a kind:thumb_call to:0x020b8660 module:overlay(6) @@ -272,7 +272,7 @@ from:0x020b8312 kind:thumb_call_arm to:0x0201e588 module:main from:0x020b8318 kind:thumb_call to:0x020b8454 module:overlay(6) from:0x020b8320 kind:thumb_call to:0x020b7e18 module:overlay(6) from:0x020b8328 kind:load to:0x020b504c module:overlay(0) -from:0x020b832c kind:load to:0x0204aeec module:main +from:0x020b832c kind:load to:0x0204a110 add:0xddc module:main from:0x020b8334 kind:thumb_call to:0x020b804c module:overlay(6) from:0x020b8344 kind:thumb_call to:0x020b7e18 module:overlay(6) from:0x020b8374 kind:thumb_call_arm to:0x02067cf8 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov006/symbols.txt b/config/eur/arm9/overlays/ov006/symbols.txt index c6f31079..6cb5041a 100644 --- a/config/eur/arm9/overlays/ov006/symbols.txt +++ b/config/eur/arm9/overlays/ov006/symbols.txt @@ -5,7 +5,7 @@ func_ov006_020b66b8 kind:function(thumb,size=0x2c) addr:0x020b66b8 func_ov006_020b66e4 kind:function(thumb,size=0x1f8) addr:0x020b66e4 func_ov006_020b68dc kind:function(thumb,size=0x34) addr:0x020b68dc func_ov006_020b6910 kind:function(thumb,size=0x28) addr:0x020b6910 -func_ov006_020b6938 kind:function(thumb,size=0x28) addr:0x020b6938 +_ZN27AdventureModeManager_160_1419func_ov006_020b6938Ev kind:function(thumb,size=0x28) addr:0x020b6938 func_ov006_020b6960 kind:function(thumb,size=0xf0) addr:0x020b6960 func_ov006_020b6a50 kind:function(thumb,size=0xc) addr:0x020b6a50 func_ov006_020b6a5c kind:function(thumb,size=0x44) addr:0x020b6a5c @@ -14,11 +14,11 @@ func_ov006_020b6ab0 kind:function(thumb,size=0x54) addr:0x020b6ab0 func_ov006_020b6b04 kind:function(thumb,size=0x7c) addr:0x020b6b04 func_ov006_020b6b80 kind:function(thumb,size=0xc) addr:0x020b6b80 func_ov006_020b6b8c kind:function(thumb,size=0x40) addr:0x020b6b8c -func_ov006_020b6bcc kind:function(thumb,size=0x10) addr:0x020b6bcc +_ZN27AdventureModeManager_160_1819func_ov006_020b6bccEv kind:function(thumb,size=0x10) addr:0x020b6bcc func_ov006_020b6bdc kind:function(thumb,size=0x70) addr:0x020b6bdc func_ov006_020b6c4c kind:function(thumb,size=0x28) addr:0x020b6c4c -func_ov006_020b6c74 kind:function(thumb,size=0xc) addr:0x020b6c74 -func_ov006_020b6c80 kind:function(thumb,size=0x34) addr:0x020b6c80 +_ZN27AdventureModeManager_160_1819func_ov006_020b6c74Ev kind:function(thumb,size=0xc) addr:0x020b6c74 +_ZN27AdventureModeManager_160_1819func_ov006_020b6c80Ev kind:function(thumb,size=0x34) addr:0x020b6c80 func_ov006_020b6cb4 kind:function(thumb,size=0x28) addr:0x020b6cb4 func_ov006_020b6cdc kind:function(thumb,size=0x31c) addr:0x020b6cdc func_ov006_020b6ff8 kind:function(thumb,size=0x338) addr:0x020b6ff8 diff --git a/config/eur/arm9/overlays/ov008/symbols.txt b/config/eur/arm9/overlays/ov008/symbols.txt index af193480..65731198 100644 --- a/config/eur/arm9/overlays/ov008/symbols.txt +++ b/config/eur/arm9/overlays/ov008/symbols.txt @@ -10,7 +10,7 @@ func_ov008_020b6964 kind:function(arm,size=0x20) addr:0x020b6964 func_ov008_020b6984 kind:function(arm,size=0x5c) addr:0x020b6984 func_ov008_020b69e0 kind:function(arm,size=0x48) addr:0x020b69e0 _ZN19func_ov008_020b6a28D0Ev kind:function(arm,size=0x28) addr:0x020b6a28 -func_ov008_020b6a50 kind:function(arm,size=0x4) addr:0x020b6a50 +_ZN21UnkStruct_027e0ce0_3419func_ov008_020b6a50Ev kind:function(arm,size=0x4) addr:0x020b6a50 __sinit_ov008_020b6a54 kind:function(arm,size=0x40) addr:0x020b6a54 __sinit_ov008_020b6a94 kind:function(arm,size=0x40) addr:0x020b6a94 .p__sinit_ov008_020b6a54 kind:data(word) addr:0x020b6ad4 diff --git a/config/eur/arm9/overlays/ov009/symbols.txt b/config/eur/arm9/overlays/ov009/symbols.txt index 40e23672..e003572e 100644 --- a/config/eur/arm9/overlays/ov009/symbols.txt +++ b/config/eur/arm9/overlays/ov009/symbols.txt @@ -2,7 +2,7 @@ func_ov009_020b6520 kind:function(arm,size=0x84) addr:0x020b6520 func_ov009_020b65a4 kind:function(arm,size=0x30) addr:0x020b65a4 func_ov009_020b65d4 kind:function(arm,size=0xc8) addr:0x020b65d4 func_ov009_020b669c kind:function(arm,size=0x70) addr:0x020b669c -func_ov009_020b670c kind:function(arm,size=0x50) addr:0x020b670c +_ZN24UnkStruct_ov031_02118fa419func_ov009_020b670cEi kind:function(arm,size=0x50) addr:0x020b670c func_ov009_020b675c kind:function(arm,size=0x8) addr:0x020b675c func_ov009_020b6764 kind:function(arm,size=0xf8) addr:0x020b6764 func_ov009_020b685c kind:function(arm,size=0x10) addr:0x020b685c diff --git a/config/eur/arm9/overlays/ov010/relocs.txt b/config/eur/arm9/overlays/ov010/relocs.txt index dead6f81..f3dd1831 100644 --- a/config/eur/arm9/overlays/ov010/relocs.txt +++ b/config/eur/arm9/overlays/ov010/relocs.txt @@ -314,14 +314,14 @@ from:0x020b898a kind:thumb_call to:0x0201ca28 module:main from:0x020b8990 kind:thumb_call_arm to:0x02061c5c module:overlay(0) from:0x020b8998 kind:load to:0x020b8e3c add:0x8 module:overlay(10) from:0x020b899c kind:load to:0x027e0994 module:dtcm -from:0x020b89a0 kind:load to:0x0204a120 module:main +from:0x020b89a0 kind:load to:0x0204a110 add:0x10 module:main from:0x020b89b2 kind:thumb_call_arm to:0x02018ac4 module:main from:0x020b89ba kind:thumb_call to:0x0201ca28 module:main from:0x020b89c0 kind:thumb_call_arm to:0x02061c5c module:overlay(0) from:0x020b89c6 kind:thumb_call_arm to:0x02011ff4 module:main from:0x020b89d0 kind:load to:0x020b8e3c add:0x8 module:overlay(10) from:0x020b89d4 kind:load to:0x027e0994 module:dtcm -from:0x020b89d8 kind:load to:0x0204a120 module:main +from:0x020b89d8 kind:load to:0x0204a110 add:0x10 module:main from:0x020b8a04 kind:thumb_call_arm to:0x0205fc20 module:overlay(0) from:0x020b8a2c kind:thumb_call_arm to:0x0205fc20 module:overlay(0) from:0x020b8a4a kind:thumb_call_arm to:0x0217d730 module:overlay(96) @@ -342,7 +342,7 @@ from:0x020b8b90 kind:thumb_call to:0x0201ca28 module:main from:0x020b8b98 kind:thumb_call to:0x020b8c48 module:overlay(10) from:0x020b8ba0 kind:load to:0x0204a110 module:main from:0x020b8ba4 kind:load to:0x027e0994 module:dtcm -from:0x020b8ba8 kind:load to:0x0204a120 module:main +from:0x020b8ba8 kind:load to:0x0204a110 add:0x10 module:main from:0x020b8bb4 kind:thumb_call to:0x020b8c38 module:overlay(10) from:0x020b8be0 kind:thumb_call_arm to:0x0201aa44 module:main from:0x020b8c22 kind:thumb_call_arm to:0x0201aa44 module:main diff --git a/config/eur/arm9/overlays/ov010/symbols.txt b/config/eur/arm9/overlays/ov010/symbols.txt index 5b5f5f7c..f93dd285 100644 --- a/config/eur/arm9/overlays/ov010/symbols.txt +++ b/config/eur/arm9/overlays/ov010/symbols.txt @@ -10,8 +10,8 @@ func_ov010_020b68e0 kind:function(thumb,size=0x2) addr:0x020b68e0 func_ov010_020b68e4 kind:function(thumb,size=0x2) addr:0x020b68e4 func_ov010_020b68e8 kind:function(thumb,size=0x610) addr:0x020b68e8 func_ov010_020b6ef8 kind:function(thumb,size=0x110) addr:0x020b6ef8 -func_ov010_020b7008 kind:function(thumb,size=0x4c) addr:0x020b7008 -func_ov010_020b7054 kind:function(thumb,size=0x36) addr:0x020b7054 +_ZN32AdventureModeManager_184_10_Base19func_ov010_020b7008Ev kind:function(thumb,size=0x4c) addr:0x020b7008 +_ZN32AdventureModeManager_184_10_Base19func_ov010_020b7054Ev kind:function(thumb,size=0x36) addr:0x020b7054 func_ov010_020b708c kind:function(thumb,size=0x2) addr:0x020b708c func_ov010_020b7090 kind:function(thumb,size=0x2) addr:0x020b7090 func_ov010_020b7094 kind:function(thumb,size=0x2e) addr:0x020b7094 diff --git a/config/eur/arm9/overlays/ov011/relocs.txt b/config/eur/arm9/overlays/ov011/relocs.txt index 7e755deb..e249c066 100644 --- a/config/eur/arm9/overlays/ov011/relocs.txt +++ b/config/eur/arm9/overlays/ov011/relocs.txt @@ -189,9 +189,9 @@ from:0x020b8038 kind:arm_call to:0x0201d628 module:main from:0x020b805c kind:arm_call to:0x0201673c module:main from:0x020b806c kind:arm_call to:0x020166ac module:main from:0x020b80b0 kind:arm_call to:0x020c30e4 module:overlay(17) -from:0x020b80c0 kind:load to:0x0204aeac module:main +from:0x020b80c0 kind:load to:0x0204a110 add:0xd9c module:main from:0x020b80c4 kind:load to:0x020d86a0 module:overlay(24) -from:0x020b80c8 kind:load to:0x0204aed0 module:main +from:0x020b80c8 kind:load to:0x0204a110 add:0xdc0 module:main from:0x020b80cc kind:load to:0x020b5214 module:overlay(0) from:0x020b80d0 kind:load to:0x0204a088 module:main from:0x020b80ec kind:arm_call to:0x01ff9b64 module:itcm @@ -229,8 +229,8 @@ from:0x020b85c0 kind:load to:0x020b93a0 module:overlay(11) from:0x020b85f0 kind:arm_call to:0x0201ec30 module:main from:0x020b860c kind:arm_call to:0x0201ec30 module:main from:0x020b8680 kind:load to:0x0204a110 module:main -from:0x020b8684 kind:load to:0x0204af10 module:main -from:0x020b8688 kind:load to:0x0204ae10 module:main +from:0x020b8684 kind:load to:0x0204a110 add:0xe00 module:main +from:0x020b8688 kind:load to:0x0204a110 add:0xd00 module:main from:0x020b86bc kind:arm_call to:0x02019650 module:main from:0x020b86dc kind:arm_call to:0x02019650 module:main from:0x020b86e8 kind:load to:0x0204a110 module:main diff --git a/config/eur/arm9/overlays/ov011/symbols.txt b/config/eur/arm9/overlays/ov011/symbols.txt index 5ce92637..7e909cfa 100644 --- a/config/eur/arm9/overlays/ov011/symbols.txt +++ b/config/eur/arm9/overlays/ov011/symbols.txt @@ -15,10 +15,10 @@ func_ov011_020b84f0 kind:function(arm,size=0xd4) addr:0x020b84f0 func_ov011_020b85c4 kind:function(arm,size=0xc8) addr:0x020b85c4 func_ov011_020b868c kind:function(arm,size=0x60) addr:0x020b868c func_ov011_020b86ec kind:function(arm,size=0x1c0) addr:0x020b86ec -func_ov011_020b88ac kind:function(arm,size=0xb0) addr:0x020b88ac +_ZN27AdventureModeManager_18C_1019func_ov011_020b88acEv kind:function(arm,size=0xb0) addr:0x020b88ac func_ov011_020b895c kind:function(arm,size=0x30) addr:0x020b895c func_ov011_020b898c kind:function(arm,size=0x64) addr:0x020b898c -func_ov011_020b89f0 kind:function(arm,size=0x20c) addr:0x020b89f0 +_ZN27AdventureModeManager_18C_1019func_ov011_020b89f0Ei kind:function(arm,size=0x20c) addr:0x020b89f0 func_ov011_020b8bfc kind:function(arm,size=0x94) addr:0x020b8bfc func_ov011_020b8c90 kind:function(arm,size=0xbc) addr:0x020b8c90 func_ov011_020b8d4c kind:function(arm,size=0x20) addr:0x020b8d4c @@ -29,7 +29,7 @@ func_ov011_020b8e24 kind:function(arm,size=0x30) addr:0x020b8e24 func_ov011_020b8e54 kind:function(arm,size=0x84) addr:0x020b8e54 func_ov011_020b8ed8 kind:function(arm,size=0x14) addr:0x020b8ed8 func_ov011_020b8eec kind:function(arm,size=0x34) addr:0x020b8eec -func_ov011_020b8f20 kind:function(arm,size=0x158) addr:0x020b8f20 +_ZN27AdventureModeManager_190_1019func_ov011_020b8f20Ei kind:function(arm,size=0x158) addr:0x020b8f20 _ZN19func_ov011_020b9078D0Ev kind:function(arm,size=0x1c) addr:0x020b9078 data_ov011_020b9094 kind:data(any) addr:0x020b9094 data_ov011_020b90a0 kind:data(any) addr:0x020b90a0 diff --git a/config/eur/arm9/overlays/ov012/relocs.txt b/config/eur/arm9/overlays/ov012/relocs.txt index fd75c5c6..621873fd 100644 --- a/config/eur/arm9/overlays/ov012/relocs.txt +++ b/config/eur/arm9/overlays/ov012/relocs.txt @@ -113,7 +113,7 @@ from:0x020b6d4a kind:thumb_call to:0x020154c4 module:main from:0x020b6d54 kind:load to:0x020b4464 module:overlay(0) from:0x020b6d58 kind:load to:0x020b8450 module:overlay(12) from:0x020b6d5c kind:load to:0x02043f38 add:0x8 module:main -from:0x020b6d64 kind:load to:0x0204a480 module:main +from:0x020b6d64 kind:load to:0x0204a110 add:0x370 module:main from:0x020b6d68 kind:load to:0x020b8460 module:overlay(12) from:0x020b6d70 kind:load to:0x020b45f4 module:overlay(0) from:0x020b6d74 kind:load to:0x020b8470 module:overlay(12) @@ -165,7 +165,7 @@ from:0x020b7080 kind:thumb_call_arm to:0x0206db44 module:overlay(0) from:0x020b709c kind:thumb_call_arm to:0x0201c73c module:main from:0x020b718c kind:load to:0x020b8380 module:overlay(12) from:0x020b7190 kind:load to:0x020b5214 module:overlay(0) -from:0x020b7198 kind:load to:0x0204a480 module:main +from:0x020b7198 kind:load to:0x0204a110 add:0x370 module:main from:0x020b71de kind:thumb_call_arm to:0x02070148 module:overlay(0) from:0x020b71e8 kind:thumb_call_arm to:0x0203a1bc module:main from:0x020b725c kind:thumb_call_arm to:0x02019624 module:main @@ -194,7 +194,7 @@ from:0x020b749e kind:thumb_call_arm to:0x02067f88 module:overlay(0) from:0x020b74b4 kind:thumb_call_arm to:0x0201c504 module:main from:0x020b74c2 kind:thumb_call_arm to:0x0201c504 module:main from:0x020b74c8 kind:load to:0x020b504c module:overlay(0) -from:0x020b74cc kind:load to:0x0204aeac module:main +from:0x020b74cc kind:load to:0x0204a110 add:0xd9c module:main from:0x020b74f0 kind:thumb_call_arm to:0x02028c4c module:main from:0x020b750a kind:thumb_call_arm to:0x0201edbc module:main from:0x020b753a kind:thumb_call_arm to:0x0201aa44 module:main @@ -226,7 +226,7 @@ from:0x020b787a kind:thumb_call to:0x020b7ca0 module:overlay(12) from:0x020b78aa kind:thumb_call to:0x020b7c90 module:overlay(12) from:0x020b78f8 kind:load to:0x020b827c module:overlay(12) from:0x020b78fc kind:load to:0x020b8270 module:overlay(12) -from:0x020b7904 kind:load to:0x0204a480 module:main +from:0x020b7904 kind:load to:0x0204a110 add:0x370 module:main from:0x020b7908 kind:load to:0x027e0cf0 module:dtcm from:0x020b794e kind:thumb_call_arm to:0x0205fc20 module:overlay(0) from:0x020b796e kind:thumb_call_arm to:0x0205fc20 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov014/relocs.txt b/config/eur/arm9/overlays/ov014/relocs.txt index 3e00ce30..096c23e4 100644 --- a/config/eur/arm9/overlays/ov014/relocs.txt +++ b/config/eur/arm9/overlays/ov014/relocs.txt @@ -161,7 +161,7 @@ from:0x020b71da kind:thumb_call_arm to:0x0201c73c module:main from:0x020b71e4 kind:load to:0x020b7211 module:overlay(14) from:0x020b71e8 kind:load to:0x020b7999 module:overlay(14) from:0x020b71ec kind:load to:0x020b8724 module:overlay(14) -from:0x020b720c kind:load to:0x0204a480 module:main +from:0x020b720c kind:load to:0x0204a110 add:0x370 module:main from:0x020b7214 kind:thumb_call_arm to:0x020630a0 module:overlay(0) from:0x020b7220 kind:thumb_call_arm to:0x02062be0 module:overlay(0) from:0x020b7230 kind:thumb_call_arm to:0x020166ac module:main @@ -198,7 +198,7 @@ from:0x020b7434 kind:thumb_call_arm to:0x02060a98 module:overlay(0) from:0x020b743e kind:thumb_call to:0x020b7788 module:overlay(14) from:0x020b7454 kind:thumb_call_arm to:0x02060a98 module:overlay(0) from:0x020b745e kind:thumb_call to:0x020b77f8 module:overlay(14) -from:0x020b74a4 kind:load to:0x0204ae90 module:main +from:0x020b74a4 kind:load to:0x0204a110 add:0xd80 module:main from:0x020b74ce kind:thumb_call to:0x020b7f04 module:overlay(14) from:0x020b74d6 kind:thumb_call to:0x020b82c8 module:overlay(14) from:0x020b74de kind:thumb_call to:0x020b82c8 module:overlay(14) @@ -206,13 +206,13 @@ from:0x020b74e6 kind:thumb_call_arm to:0x020609b0 module:overlay(0) from:0x020b7514 kind:thumb_call_arm to:0x02028c4c module:main from:0x020b753e kind:thumb_call_arm to:0x0201aad0 module:main from:0x020b755e kind:thumb_call_arm to:0x0201aad0 module:main -from:0x020b7568 kind:load to:0x0204ae90 module:main -from:0x020b7574 kind:load to:0x0204af10 module:main +from:0x020b7568 kind:load to:0x0204a110 add:0xd80 module:main +from:0x020b7574 kind:load to:0x0204a110 add:0xe00 module:main from:0x020b7578 kind:load to:0x0204af1c module:main from:0x020b75b8 kind:thumb_call_arm to:0x02025240 module:main from:0x020b75c4 kind:thumb_call_arm to:0x020250f8 module:main from:0x020b75e0 kind:thumb_call_arm to:0x0201c4d8 module:main -from:0x020b75ec kind:load to:0x0204aeac module:main +from:0x020b75ec kind:load to:0x0204a110 add:0xd9c module:main from:0x020b760e kind:thumb_call to:0x020b7620 module:overlay(14) from:0x020b7630 kind:thumb_call_arm to:0x020d6494 module:overlay(24) from:0x020b7638 kind:load to:0x020d86b0 module:overlay(24) @@ -289,9 +289,9 @@ from:0x020b7d4a kind:thumb_call_arm to:0x0201aa44 module:main from:0x020b7d72 kind:thumb_call_arm to:0x0201aa44 module:main from:0x020b7da4 kind:thumb_call_arm to:0x0201aa44 module:main from:0x020b7dea kind:thumb_call_arm to:0x0201aa44 module:main -from:0x020b7df8 kind:load to:0x0204af10 module:main +from:0x020b7df8 kind:load to:0x0204a110 add:0xe00 module:main from:0x020b7dfc kind:load to:0x0204af1c module:main -from:0x020b7e00 kind:load to:0x0204ae90 module:main +from:0x020b7e00 kind:load to:0x0204a110 add:0xd80 module:main from:0x020b7e12 kind:thumb_call_arm to:0x0203a1bc module:main from:0x020b7e2a kind:thumb_call_arm to:0x0205fc20 module:overlay(0) from:0x020b7e36 kind:thumb_call_arm to:0x0203a1bc module:main diff --git a/config/eur/arm9/overlays/ov017/relocs.txt b/config/eur/arm9/overlays/ov017/relocs.txt index d4762a9f..67af0e52 100644 --- a/config/eur/arm9/overlays/ov017/relocs.txt +++ b/config/eur/arm9/overlays/ov017/relocs.txt @@ -749,7 +749,7 @@ from:0x020c30ac kind:load to:0x020c2fc4 module:overlay(17) from:0x020c30fc kind:arm_call to:0x02018ac4 module:main from:0x020c3108 kind:arm_call_thumb to:0x0201ca28 module:main from:0x020c3110 kind:load to:0x027e0994 module:dtcm -from:0x020c3114 kind:load to:0x0204a120 module:main +from:0x020c3114 kind:load to:0x0204a110 add:0x10 module:main from:0x020c312c kind:arm_call to:0x020c3180 module:overlay(17) from:0x020c3134 kind:arm_call to:0x020c313c module:overlay(17) from:0x020c3168 kind:arm_call to:0x0201bb84 module:main @@ -773,7 +773,7 @@ from:0x020c3300 kind:arm_call to:0x020c555c module:overlay(24) from:0x020c3308 kind:arm_call to:0x020c53e8 module:overlay(24) from:0x020c3324 kind:arm_call to:0x020c6770 module:overlay(24) from:0x020c3360 kind:load to:0x027e0994 module:dtcm -from:0x020c3364 kind:load to:0x0204a120 module:main +from:0x020c3364 kind:load to:0x0204a110 add:0x10 module:main from:0x020c3368 kind:load to:0x027e0998 module:dtcm from:0x020c336c kind:load to:0x027e09a4 module:dtcm from:0x020c3370 kind:load to:0x027e09a0 module:dtcm @@ -806,7 +806,7 @@ from:0x020c3924 kind:arm_call to:0x0201c4d8 module:main from:0x020c3940 kind:arm_call to:0x020be8a8 module:overlay(17) from:0x020c3948 kind:arm_call to:0x020c3414 module:overlay(17) from:0x020c396c kind:arm_call to:0x020dc33c module:overlay(26) -from:0x020c3974 kind:load to:0x0204aeac module:main +from:0x020c3974 kind:load to:0x0204a110 add:0xd9c module:main from:0x020c3978 kind:load to:0x027e09a4 module:dtcm from:0x020c398c kind:arm_call to:0x020c3748 module:overlay(17) from:0x020c39a4 kind:arm_call to:0x020c3574 module:overlay(17) @@ -860,7 +860,7 @@ from:0x020c3d84 kind:load to:0x0204a110 module:main from:0x020c3d88 kind:load to:0x027e0994 module:dtcm from:0x020c3d8c kind:load to:0x027e09a4 module:dtcm from:0x020c3d90 kind:load to:0x027e0998 module:dtcm -from:0x020c3d94 kind:load to:0x0204aeac module:main +from:0x020c3d94 kind:load to:0x0204a110 add:0xd9c module:main from:0x020c3db0 kind:arm_call to:0x020ca658 module:overlay(24) from:0x020c3e4c kind:arm_call to:0x02013c24 module:main from:0x020c3e64 kind:arm_call to:0x0203ce74 module:main diff --git a/config/eur/arm9/overlays/ov017/symbols.txt b/config/eur/arm9/overlays/ov017/symbols.txt index 16042884..86fe132a 100644 --- a/config/eur/arm9/overlays/ov017/symbols.txt +++ b/config/eur/arm9/overlays/ov017/symbols.txt @@ -4,8 +4,8 @@ func_ov017_020bb934 kind:function(arm,size=0x60) addr:0x020bb934 _ZN18UnkStruct_027e09a419func_ov017_020bb994EPv kind:function(arm,size=0x8c) addr:0x020bb994 _ZN19func_ov017_020bba20D1Ev kind:function(arm,size=0x28) addr:0x020bba20 _ZN19func_ov017_020bba48D0Ev kind:function(arm,size=0x30) addr:0x020bba48 -func_ov017_020bba78 kind:function(arm,size=0x1c) addr:0x020bba78 -func_ov017_020bba94 kind:function(arm,size=0x14) addr:0x020bba94 +_ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba78Ev kind:function(arm,size=0x1c) addr:0x020bba78 +_ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba94Ev kind:function(arm,size=0x14) addr:0x020bba94 func_ov017_020bbaa8 kind:function(arm,size=0x230) addr:0x020bbaa8 func_ov017_020bbcd8 kind:function(arm,size=0x21c) addr:0x020bbcd8 func_ov017_020bbef4 kind:function(arm,size=0x78) addr:0x020bbef4 @@ -25,7 +25,7 @@ func_ov017_020bd568 kind:function(arm,size=0x5c) addr:0x020bd568 func_ov017_020bd5c4 kind:function(arm,size=0x18) addr:0x020bd5c4 func_ov017_020bd5dc kind:function(arm,size=0x68) addr:0x020bd5dc func_ov017_020bd644 kind:function(arm,size=0x58) addr:0x020bd644 -func_ov017_020bd69c kind:function(arm,size=0x1c) addr:0x020bd69c +_ZN18UnkStruct_027e0ce019func_ov017_020bd69cEv kind:function(arm,size=0x1c) addr:0x020bd69c func_ov017_020bd6b8 kind:function(arm,size=0x28) addr:0x020bd6b8 func_ov017_020bd6e0 kind:function(arm,size=0x78) addr:0x020bd6e0 func_ov017_020bd758 kind:function(arm,size=0x30) addr:0x020bd758 @@ -115,14 +115,14 @@ func_ov017_020c1104 kind:function(arm,size=0x78) addr:0x020c1104 func_ov017_020c117c kind:function(arm,size=0x180) addr:0x020c117c func_ov017_020c12fc kind:function(arm,size=0xb8) addr:0x020c12fc func_ov017_020c13b4 kind:function(arm,size=0x4ac) addr:0x020c13b4 -func_ov017_020c1860 kind:function(arm,size=0x64) addr:0x020c1860 +_ZN30AdventureModeManager_15C_20_008vfunc_10EPc kind:function(arm,size=0x64) addr:0x020c1860 func_ov017_020c18c4 kind:function(arm,size=0x20) addr:0x020c18c4 func_ov017_020c18e4 kind:function(arm,size=0xbc) addr:0x020c18e4 -func_ov017_020c19a0 kind:function(arm,size=0x2c) addr:0x020c19a0 +_ZN30AdventureModeManager_15C_20_0019func_ov017_020c19a0Ev kind:function(arm,size=0x2c) addr:0x020c19a0 func_ov017_020c19cc kind:function(arm,size=0x20) addr:0x020c19cc func_ov017_020c19ec kind:function(arm,size=0x20) addr:0x020c19ec func_ov017_020c1a0c kind:function(arm,size=0x274) addr:0x020c1a0c -func_ov017_020c1c80 kind:function(arm,size=0x1d4) addr:0x020c1c80 +_ZN30AdventureModeManager_15C_20_0019func_ov017_020c1c80Ei kind:function(arm,size=0x1d4) addr:0x020c1c80 func_ov017_020c1e54 kind:function(arm,size=0x48) addr:0x020c1e54 func_ov017_020c1e9c kind:function(arm,size=0x124) addr:0x020c1e9c func_ov017_020c1fc0 kind:function(arm,size=0x5c) addr:0x020c1fc0 @@ -140,7 +140,7 @@ func_ov017_020c2b68 kind:function(arm,size=0xa0) addr:0x020c2b68 func_ov017_020c2c08 kind:function(arm,size=0x380) addr:0x020c2c08 func_ov017_020c2f88 kind:function(arm,size=0x3c) addr:0x020c2f88 func_ov017_020c2fc4 kind:function(arm,size=0x7c) addr:0x020c2fc4 -func_ov017_020c3040 kind:function(arm,size=0x70) addr:0x020c3040 +_ZN11SaveManager19func_ov017_020c3040EPvi kind:function(arm,size=0x70) addr:0x020c3040 func_ov017_020c30b0 kind:function(arm,size=0x34) addr:0x020c30b0 func_ov017_020c30e4 kind:function(arm,size=0x34) addr:0x020c30e4 func_ov017_020c3118 kind:function(arm,size=0x24) addr:0x020c3118 @@ -155,16 +155,16 @@ func_ov017_020c3644 kind:function(arm,size=0x24) addr:0x020c3644 func_ov017_020c3668 kind:function(arm,size=0xe0) addr:0x020c3668 func_ov017_020c3748 kind:function(arm,size=0x44) addr:0x020c3748 func_ov017_020c378c kind:function(arm,size=0x180) addr:0x020c378c -func_ov017_020c390c kind:function(arm,size=0x70) addr:0x020c390c -func_ov017_020c397c kind:function(arm,size=0x58) addr:0x020c397c -func_ov017_020c39d4 kind:function(arm,size=0x1c) addr:0x020c39d4 +_ZN18UnkStruct_027e0cf819func_ov017_020c390cEv kind:function(arm,size=0x70) addr:0x020c390c +_ZN18UnkStruct_027e0cf819func_ov017_020c397cEv kind:function(arm,size=0x58) addr:0x020c397c +_ZN18UnkStruct_027e0cf819func_ov017_020c39d4Ev kind:function(arm,size=0x1c) addr:0x020c39d4 func_ov017_020c39f0 kind:function(arm,size=0x8) addr:0x020c39f0 func_ov017_020c39f8 kind:function(arm,size=0x8) addr:0x020c39f8 -func_ov017_020c3a00 kind:function(arm,size=0x38) addr:0x020c3a00 +_ZN24AdventureModeManager_15C19func_ov017_020c3a00EP5InputP12TouchControl kind:function(arm,size=0x38) addr:0x020c3a00 func_ov017_020c3a38 kind:function(arm,size=0x120) addr:0x020c3a38 func_ov017_020c3b58 kind:function(arm,size=0x68) addr:0x020c3b58 -func_ov017_020c3bc0 kind:function(arm,size=0xa4) addr:0x020c3bc0 -func_ov017_020c3c64 kind:function(arm,size=0x40) addr:0x020c3c64 +_ZN24AdventureModeManager_15C19func_ov017_020c3bc0Ev kind:function(arm,size=0xa4) addr:0x020c3bc0 +_ZN24AdventureModeManager_15C19func_ov017_020c3c64Ev kind:function(arm,size=0x40) addr:0x020c3c64 func_ov017_020c3ca4 kind:function(arm,size=0xf4) addr:0x020c3ca4 func_ov017_020c3d98 kind:function(arm,size=0x28) addr:0x020c3d98 sCargoInfos kind:data(byte[42]) addr:0x020c3dc0 local diff --git a/config/eur/arm9/overlays/ov018/delinks.txt b/config/eur/arm9/overlays/ov018/delinks.txt index 5cd6c0df..a2bbeefe 100644 --- a/config/eur/arm9/overlays/ov018/delinks.txt +++ b/config/eur/arm9/overlays/ov018/delinks.txt @@ -4,6 +4,7 @@ .bss start:0x020c5bc0 end:0x020c5c20 kind:bss align:32 src/018_StartUp/GameModeStartUp.cpp: + complete .text start:0x020c4840 end:0x020c4e8c .data start:0x020c5b20 end:0x020c5b84 .bss start:0x020c5bc0 end:0x020c5c20 diff --git a/config/eur/arm9/overlays/ov018/symbols.txt b/config/eur/arm9/overlays/ov018/symbols.txt index 789625eb..7478e9be 100644 --- a/config/eur/arm9/overlays/ov018/symbols.txt +++ b/config/eur/arm9/overlays/ov018/symbols.txt @@ -58,6 +58,6 @@ _ZTV15GameModeStartUp kind:data(any) addr:0x020c5b20 @1676 kind:data(any) addr:0x020c5b84 local @1845 kind:data(byte[32]) addr:0x020c5b8c local data_ov018_020c5bc0 kind:bss(size=0x1) addr:0x020c5bc0 local -_ZGVZN18UnkStruct_02049a2c19func_ov018_020c4ba8EvE19data_ov018_020c5bd4 kind:bss addr:0x020c5bc4 local +_ZGVZN4Game19func_ov018_020c4ba8EvE19data_ov018_020c5bd4 kind:bss addr:0x020c5bc4 local @978 kind:bss addr:0x020c5bc8 local -_ZZN18UnkStruct_02049a2c19func_ov018_020c4ba8EvE19data_ov018_020c5bd4 kind:bss(size=0x34) addr:0x020c5bd4 local +_ZZN4Game19func_ov018_020c4ba8EvE19data_ov018_020c5bd4 kind:bss(size=0x34) addr:0x020c5bd4 local diff --git a/config/eur/arm9/overlays/ov019/relocs.txt b/config/eur/arm9/overlays/ov019/relocs.txt index 231d594b..47fb698b 100644 --- a/config/eur/arm9/overlays/ov019/relocs.txt +++ b/config/eur/arm9/overlays/ov019/relocs.txt @@ -1324,7 +1324,7 @@ from:0x020d0184 kind:load to:0x020d24c8 module:overlay(19) from:0x020d01a8 kind:arm_call to:0x020cc85c module:overlay(19) from:0x020d01b0 kind:arm_call to:0x0201e698 module:main from:0x020d01b8 kind:load to:0x020d24c8 module:overlay(19) -from:0x020d01bc kind:load to:0x0204aeec module:main +from:0x020d01bc kind:load to:0x0204a110 add:0xddc module:main from:0x020d01ec kind:arm_call to:0x020cc874 module:overlay(19) from:0x020d0228 kind:arm_call to:0x02061224 module:overlay(0) from:0x020d023c kind:arm_call to:0x020cb748 module:overlay(19) diff --git a/config/eur/arm9/overlays/ov019/symbols.txt b/config/eur/arm9/overlays/ov019/symbols.txt index 14ebb6af..fb706e3a 100644 --- a/config/eur/arm9/overlays/ov019/symbols.txt +++ b/config/eur/arm9/overlays/ov019/symbols.txt @@ -217,22 +217,22 @@ _ZN21FileSelectManager_160D1Ev kind:function(arm,size=0x14) addr:0x020cfc68 _ZN21FileSelectManager_160D0Ev kind:function(arm,size=0x1c) addr:0x020cfc7c _ZN21FileSelectManager_1608vfunc_08Ei kind:function(arm,size=0x50) addr:0x020cfc98 _ZN21FileSelectManager_1608vfunc_0CEi kind:function(arm,size=0x64) addr:0x020cfce8 -_ZN21FileSelectManager_1608vfunc_14Ev kind:function(arm,size=0x4) addr:0x020cfd4c -_ZN21FileSelectManager_1608vfunc_10Ev kind:function(arm,size=0x8c) addr:0x020cfd50 +_ZN21FileSelectManager_1608vfunc_14Ei kind:function(arm,size=0x4) addr:0x020cfd4c +_ZN21FileSelectManager_1608vfunc_10Eii kind:function(arm,size=0x8c) addr:0x020cfd50 _ZN21FileSelectManager_1608vfunc_18Ei kind:function(arm,size=0x10) addr:0x020cfddc _ZN21FileSelectManager_1608vfunc_1CEi kind:function(arm,size=0x64) addr:0x020cfdec -_ZN21FileSelectManager_1608vfunc_20Ev kind:function(arm,size=0xac) addr:0x020cfe50 +_ZN21FileSelectManager_1608vfunc_20Eii kind:function(arm,size=0xac) addr:0x020cfe50 _ZN21FileSelectManager_1608vfunc_24Ev kind:function(arm,size=0x34) addr:0x020cfefc _ZN21FileSelectManager_164C1EP23GameModeManagerBase_104P14FileSelectMain kind:function(arm,size=0x4c) addr:0x020cff30 _ZN21FileSelectManager_164D1Ev kind:function(arm,size=0x3c) addr:0x020cff7c _ZN21FileSelectManager_164D0Ev kind:function(arm,size=0x44) addr:0x020cffb8 _ZN21FileSelectManager_1648vfunc_08Ei kind:function(arm,size=0x50) addr:0x020cfffc _ZN21FileSelectManager_1648vfunc_0CEi kind:function(arm,size=0x90) addr:0x020d004c -_ZN21FileSelectManager_1648vfunc_14Ev kind:function(arm,size=0x4) addr:0x020d00dc -_ZN21FileSelectManager_1648vfunc_10Ev kind:function(arm,size=0xa8) addr:0x020d00e0 +_ZN21FileSelectManager_1648vfunc_14Ei kind:function(arm,size=0x4) addr:0x020d00dc +_ZN21FileSelectManager_1648vfunc_10Eii kind:function(arm,size=0xa8) addr:0x020d00e0 _ZN21FileSelectManager_1648vfunc_18Ei kind:function(arm,size=0x38) addr:0x020d0188 _ZN21FileSelectManager_1648vfunc_1CEi kind:function(arm,size=0xa4) addr:0x020d01c0 -_ZN21FileSelectManager_1648vfunc_20Ev kind:function(arm,size=0x90) addr:0x020d0264 +_ZN21FileSelectManager_1648vfunc_20Eii kind:function(arm,size=0x90) addr:0x020d0264 _ZN21FileSelectManager_16419func_ov019_020d02f4Ev kind:function(arm,size=0x28) addr:0x020d02f4 _ZN25UnkSystem1_ov019_Derived2C1Ev kind:function(arm,size=0x40) addr:0x020d031c _ZN25UnkSystem1_ov019_Derived28vfunc_08Ei kind:function(arm,size=0x48) addr:0x020d035c diff --git a/config/eur/arm9/overlays/ov020/relocs.txt b/config/eur/arm9/overlays/ov020/relocs.txt index e05296ba..48510ba9 100644 --- a/config/eur/arm9/overlays/ov020/relocs.txt +++ b/config/eur/arm9/overlays/ov020/relocs.txt @@ -743,7 +743,7 @@ from:0x020c964c kind:arm_call to:0x0201f730 module:main from:0x020c9674 kind:arm_call to:0x02063a3c module:overlay(0) from:0x020c9684 kind:arm_call to:0x020166cc module:main from:0x020c9694 kind:load to:0x020dbc58 add:0x8 module:overlay(20) -from:0x020c969c kind:load to:0x020b1f2c module:overlay(0) +from:0x020c969c kind:load to:0x020b1f24 add:0x8 module:overlay(0) from:0x020c96a0 kind:load to:0x020e8544 module:overlay(20) from:0x020c96c8 kind:arm_call to:0x0201f498 module:main from:0x020c96d0 kind:arm_call to:0x0201f498 module:main @@ -885,7 +885,7 @@ from:0x020ca600 kind:load to:0x020dbc98 add:0x8 module:overlay(20) from:0x020ca604 kind:load to:0x020ca638 module:overlay(20) from:0x020ca608 kind:load to:0x020cddb4 module:overlay(20) from:0x020ca60c kind:load to:0x020b1f84 add:0x8 module:overlay(0) -from:0x020ca610 kind:load to:0x020b1f2c module:overlay(0) +from:0x020ca610 kind:load to:0x020b1f24 add:0x8 module:overlay(0) from:0x020ca618 kind:load to:0x020431b8 module:main from:0x020ca61c kind:load to:0x020e8b20 module:overlay(20) from:0x020ca620 kind:load to:0x020e8a5c module:overlay(20) @@ -1083,7 +1083,7 @@ from:0x020cb258 kind:arm_call to:0x02063f64 module:overlay(0) from:0x020cb264 kind:arm_call to:0x02063f64 module:overlay(0) from:0x020cb270 kind:arm_call to:0x02063f64 module:overlay(0) from:0x020cb27c kind:arm_call to:0x02063f64 module:overlay(0) -from:0x020cb3b8 kind:load to:0x0204aeac module:main +from:0x020cb3b8 kind:load to:0x0204a110 add:0xd9c module:main from:0x020cb424 kind:arm_call to:0x0201aa44 module:main from:0x020cb438 kind:arm_call to:0x0201e8d4 module:main from:0x020cb454 kind:arm_call to:0x0201aad0 module:main diff --git a/config/eur/arm9/overlays/ov021/relocs.txt b/config/eur/arm9/overlays/ov021/relocs.txt index bd836212..32799b68 100644 --- a/config/eur/arm9/overlays/ov021/relocs.txt +++ b/config/eur/arm9/overlays/ov021/relocs.txt @@ -484,7 +484,7 @@ from:0x020ed660 kind:arm_call to:0x0201aa44 module:main from:0x020ed66c kind:load to:0x0203e964 module:main from:0x020ed670 kind:load to:0x02109084 module:overlay(21) from:0x020ed674 kind:load to:0x027e0998 module:dtcm -from:0x020ed678 kind:load to:0x0204aeac module:main +from:0x020ed678 kind:load to:0x0204a110 add:0xd9c module:main from:0x020ed67c kind:load to:0x0204af1c module:main from:0x020ed680 kind:load to:0x021090bc module:overlay(21) from:0x020ed6a8 kind:arm_call to:0x01fff5d0 module:itcm @@ -2130,7 +2130,7 @@ from:0x020fc82c kind:load to:0x027e0cf4 module:dtcm from:0x020fc830 kind:load to:0x020b51b8 module:overlay(0) from:0x020fc834 kind:load to:0x027e09a4 module:dtcm from:0x020fc838 kind:load to:0x0204a110 module:main -from:0x020fc83c kind:load to:0x0204aeac module:main +from:0x020fc83c kind:load to:0x0204a110 add:0xd9c module:main from:0x020fc840 kind:load to:0x027e0ce0 module:dtcm from:0x020fc864 kind:arm_call to:0x020708d8 module:overlay(0) from:0x020fc86c kind:load to:0x027e09a4 module:dtcm @@ -2265,7 +2265,7 @@ from:0x020fdaac kind:load to:0x02108d2c module:overlay(21) from:0x020fdab0 kind:load to:0x02108d1c module:overlay(21) from:0x020fdab4 kind:load to:0x02108d3c module:overlay(21) from:0x020fdab8 kind:load to:0x02108d48 module:overlay(21) -from:0x020fdac0 kind:load to:0x0204ae10 module:main +from:0x020fdac0 kind:load to:0x0204a110 add:0xd00 module:main from:0x020fdac4 kind:load to:0x027e09ac module:dtcm from:0x020fdac8 kind:load to:0x020b4ec4 module:overlay(0) from:0x020fdacc kind:load to:0x02108cc4 module:overlay(21) @@ -2636,7 +2636,7 @@ from:0x02100ddc kind:load to:0x02108df0 module:overlay(21) from:0x02100de0 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x02100de4 kind:load to:0x02100e24 module:overlay(21) from:0x02100de8 kind:load to:0x0206337c module:overlay(0) -from:0x02100dec kind:load to:0x020b1f2c module:overlay(0) +from:0x02100dec kind:load to:0x020b1f24 add:0x8 module:overlay(0) from:0x02100df0 kind:load to:0x020e8544 module:overlay(20) from:0x02100df4 kind:load to:0x02107004 module:overlay(21) from:0x02100df8 kind:load to:0x02107010 module:overlay(21) @@ -2687,7 +2687,7 @@ from:0x02101160 kind:arm_call to:0x02063f64 module:overlay(0) from:0x02101170 kind:arm_call to:0x02063f64 module:overlay(0) from:0x0210151c kind:load to:0x020e8544 module:overlay(20) from:0x02101520 kind:load to:0x027e0994 module:dtcm -from:0x02101528 kind:load to:0x0204aeac module:main +from:0x02101528 kind:load to:0x0204a110 add:0xd9c module:main from:0x0210156c kind:arm_call to:0x02101b50 module:overlay(21) from:0x02101574 kind:arm_call to:0x01ff9b50 module:itcm from:0x02101590 kind:arm_call to:0x02101b50 module:overlay(21) @@ -2832,7 +2832,7 @@ from:0x02102938 kind:arm_call to:0x02103674 module:overlay(21) from:0x02102948 kind:load to:0x02108e7c module:overlay(21) from:0x0210294c kind:load to:0x0210299c module:overlay(21) from:0x02102950 kind:load to:0x02101e3c module:overlay(21) -from:0x02102954 kind:load to:0x020b1f2c module:overlay(0) +from:0x02102954 kind:load to:0x020b1f24 add:0x8 module:overlay(0) from:0x02102958 kind:load to:0x020b1f84 add:0x8 module:overlay(0) from:0x02102960 kind:load to:0x021098f8 module:overlay(21) from:0x02102964 kind:load to:0x020c3f70 module:overlays(1,17) diff --git a/config/eur/arm9/overlays/ov023/relocs.txt b/config/eur/arm9/overlays/ov023/relocs.txt index 08128be0..1d295b27 100644 --- a/config/eur/arm9/overlays/ov023/relocs.txt +++ b/config/eur/arm9/overlays/ov023/relocs.txt @@ -19,7 +19,7 @@ from:0x020e9b7c kind:load to:0x020f1bc0 module:overlay(23) from:0x020e9b80 kind:load to:0x02049a2c module:main from:0x020e9b84 kind:load to:0x0204a110 module:main from:0x020e9b88 kind:load to:0x020ea348 module:overlay(23) -from:0x020e9b8c kind:load to:0x0204ae10 module:main +from:0x020e9b8c kind:load to:0x0204a110 add:0xd00 module:main from:0x020e9b90 kind:load to:0x027e09ac module:dtcm from:0x020e9b94 kind:load to:0x020b62a8 module:overlay(0) from:0x020e9bac kind:arm_call to:0x020bba94 module:overlay(17) @@ -288,7 +288,7 @@ from:0x020eb4ac kind:load to:0x020a02d4 module:overlay(0) from:0x020eb4b0 kind:load to:0x020ef060 module:overlay(23) from:0x020eb4b4 kind:load to:0x020eb508 module:overlay(23) from:0x020eb4b8 kind:load to:0x020ea920 module:overlay(23) -from:0x020eb4bc kind:load to:0x020b1f2c module:overlay(0) +from:0x020eb4bc kind:load to:0x020b1f24 add:0x8 module:overlay(0) from:0x020eb4c0 kind:load to:0x020eb51c module:overlay(23) from:0x020eb4c4 kind:load to:0x0201f678 module:main from:0x020eb4c8 kind:load to:0x020b1f84 add:0x8 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov024/delinks.txt b/config/eur/arm9/overlays/ov024/delinks.txt index e50cdac5..ac4df1ed 100644 --- a/config/eur/arm9/overlays/ov024/delinks.txt +++ b/config/eur/arm9/overlays/ov024/delinks.txt @@ -5,17 +5,172 @@ .data start:0x020d7b60 end:0x020d8660 kind:data align:32 .bss start:0x020d8660 end:0x020d8720 kind:bss align:32 +src/024_MainGame/Game/GameModeAdventure_024.cpp: + complete + .text start:0x020c4840 end:0x020c4a8c + .data start:0x020d7b60 end:0x020d7b90 + +src/024_MainGame/Game/UnkStruct_ov000_020d8660_024.cpp: + complete + .text start:0x020c4a8c end:0x020c4e00 + .bss start:0x020d8660 end:0x020d8694 + +src/024_MainGame/Game/UnkActorSystem1_024.cpp: + complete + .text start:0x020c4e00 end:0x020c4e68 + .data start:0x020d7b90 end:0x020d7bc8 + +src/024_MainGame/Game/UnkActorSystem2_024.cpp: + complete + .text start:0x020c4e68 end:0x020c5158 + .data start:0x020d7bc8 end:0x020d7bec + +src/024_MainGame/Game/AdventureModeManager_024.cpp: + complete + .text start:0x020c5158 end:0x020c6edc + .data start:0x020d7bec end:0x020d7c90 + +src/024_MainGame/Game/UnkStruct_027e0998_024.cpp: + complete + .text start:0x020c6edc end:0x020c7390 + .data start:0x020d7c90 end:0x020d7c9c + +src/024_MainGame/Game/UnkStruct_027e0cf8_024.cpp: + complete + .text start:0x020c7390 end:0x020c7940 + +src/024_MainGame/Game/AdventureModeManager_160_024.cpp: + complete + .text start:0x020c7940 end:0x020c85b8 + .data start:0x020d7c9c end:0x020d7ce8 + +src/024_MainGame/Game/AdventureModeManager_170_024.cpp: + complete + .text start:0x020c85b8 end:0x020c8860 + .data start:0x020d7ce8 end:0x020d7d34 + +src/024_MainGame/Game/AdventureModeManager_174_Base_024.cpp: + complete + .text start:0x020c8860 end:0x020c8d64 + .data start:0x020d7d34 end:0x020d7d80 + +src/024_MainGame/Game/AdventureModeManager_174_024.cpp: + complete + .text start:0x020c8d64 end:0x020c9094 + .data start:0x020d7d80 end:0x020d7db0 + +src/024_MainGame/Game/AdventureModeManager_178_Base_024.cpp: + complete + .text start:0x020c9094 end:0x020c9180 + .data start:0x020d7db0 end:0x020d7de0 + +src/024_MainGame/Game/AdventureModeManager_178_024.cpp: + complete + .text start:0x020c9180 end:0x020c923c + .data start:0x020d7de0 end:0x020d7e10 + +src/024_MainGame/Game/AdventureModeManager_180_024.cpp: + complete + .text start:0x020c923c end:0x020c9628 + .data start:0x020d7e10 end:0x020d7e5c + +src/024_MainGame/Game/AdventureModeManager_184_024.cpp: + complete + .text start:0x020c9628 end:0x020c9970 + .data start:0x020d7e5c end:0x020d7e8c + +src/024_MainGame/Game/AdventureModeManager_18C_024.cpp: + complete + .text start:0x020c9970 end:0x020ca098 + .data start:0x020d7e8c end:0x020d7ed8 + +src/024_MainGame/Game/AdventureModeManager_190_024.cpp: + complete + .text start:0x020ca098 end:0x020ca320 + .data start:0x020d7ed8 end:0x020d7f40 + +src/024_MainGame/Game/AdventureModeManager_15C_20_00_024.cpp: + complete + .text start:0x020ca320 end:0x020caa58 + .data start:0x020d7f50 end:0x020d7f74 + +src/024_MainGame/UnkAdventureModeSystem1_024.cpp: + .text start:0x020caa58 end:0x020cada0 + +src/024_MainGame/UnkStruct_ov024_020d8694_024.cpp: + .text start:0x020cada0 end:0x020cb1f0 + +src/024_MainGame/UnkTitleCardSystem1_024.cpp: + .text start:0x020cb1f0 end:0x020ccd1c + +src/024_MainGame/UnkStruct_020d8698_024.cpp: + .text start:0x020ccd1c end:0x020cf968 + +src/024_MainGame/UnkStruct_027e0cf8_00_0C_024.cpp: + .text start:0x020cf968 end:0x020d05ec + +src/024_MainGame/Game/AdventureModeManager_1B8_Base_024.cpp: + complete + .text start:0x020d05ec end:0x020d1658 + .rodata start:0x020d7544 end:0x020d7550 + .init start:0x020d7a40 end:0x020d7a6c + .ctor start:0x020d7b3c end:0x020d7b40 + .data start:0x020d8200 end:0x020d8208 + .bss start:0x020d869c end:0x020d86a0 + +src/024_MainGame/UnkStruct_ov024_020d86a0_024.cpp: + .text start:0x020d1658 end:0x020d16fc + +src/024_MainGame/code_020d16fc_024.cpp: + .text start:0x020d16fc end:0x020d24d4 + +src/024_MainGame/code_020d24d4_024.cpp: + .text start:0x020d24d4 end:0x020d3158 + +src/024_MainGame/UnkStruct_027e0cf8_08_024.cpp: + .text start:0x020d3158 end:0x020d3670 + +src/024_MainGame/code_020d3670_024.cpp: + .text start:0x020d3670 end:0x020d3d20 + +src/024_MainGame/UnkStruct_027e0ce0_34_024.cpp: + .text start:0x020d3d20 end:0x020d4120 + src/024_MainGame/PassengerManager.cpp: .text start:0x020d4120 end:0x020d46b4 .rodata start:0x020d75a4 end:0x020d7624 +src/024_MainGame/code_020d46b4_024.cpp: + .text start:0x020d46b4 end:0x020d47c4 + +src/024_MainGame/UnkStruct_027e0d00.cpp: + .text start:0x020d47c4 end:0x020d4e9c + +src/024_MainGame/code_020d4e9c_024.cpp: + .text start:0x020d4e9c end:0x020d51dc + +src/024_MainGame/code_020d51dc_024.cpp: + .text start:0x020d51dc end:0x020d54b0 + +src/024_MainGame/code_020d54b0_024.cpp: + .text start:0x020d54b0 end:0x020d58b4 + src/024_MainGame/CargoManager_024.cpp: complete .text start:0x020d58b4 end:0x020d5938 +src/024_MainGame/code_020d5938_024.cpp: + .text start:0x020d5938 end:0x020d5c8c + +src/024_MainGame/UnkStruct_027e0d08_024.cpp: + .text start:0x020d5c8c end:0x020d62b4 + src/024_MainGame/MiscAdvManager.cpp: .text start:0x020d62b4 end:0x020d6650 +src/024_MainGame/code_020d6650_024.cpp: + .text start:0x020d6650 end:0x020d6e9c + src/024_MainGame/Actor/ActorUnkOBPC.cpp: .text start:0x020d6e9c end:0x020d7318 .init start:0x020d7ae4 end:0x020d7b34 diff --git a/config/eur/arm9/overlays/ov024/relocs.txt b/config/eur/arm9/overlays/ov024/relocs.txt index fbf75cc3..03e90490 100644 --- a/config/eur/arm9/overlays/ov024/relocs.txt +++ b/config/eur/arm9/overlays/ov024/relocs.txt @@ -82,7 +82,7 @@ from:0x020c4d68 kind:load to:0x027e09a4 module:dtcm from:0x020c4d6c kind:load to:0x0204a110 module:main from:0x020c4de8 kind:load to:0x020d8660 module:overlay(24) from:0x020c4dfc kind:load to:0x020d8660 module:overlay(24) -from:0x020c4e14 kind:load to:0x020d7b98 module:overlay(24) +from:0x020c4e14 kind:load to:0x020d7b90 add:0x8 module:overlay(24) from:0x020c4e24 kind:arm_call to:0x02011ff4 module:main from:0x020c4e74 kind:arm_call to:0x02061ae4 module:overlay(0) from:0x020c4e8c kind:arm_call to:0x02060804 module:overlay(0) @@ -167,7 +167,7 @@ from:0x020c553c kind:arm_call to:0x0201c494 module:main from:0x020c5540 kind:arm_call to:0x02019b3c module:main from:0x020c5544 kind:arm_call to:0x02019c4c module:main from:0x020c5548 kind:arm_call to:0x02019a74 module:main -from:0x020c5550 kind:load to:0x0204aeac module:main +from:0x020c5550 kind:load to:0x0204a110 add:0xd9c module:main from:0x020c5554 kind:load to:0x027e09a4 module:dtcm from:0x020c5558 kind:load to:0x0204a110 module:main from:0x020c5584 kind:arm_call to:0x0201867c module:main @@ -449,7 +449,7 @@ from:0x020c6f28 kind:arm_call to:0x02011ff4 module:main from:0x020c6f30 kind:load to:0x027e0998 module:dtcm from:0x020c6f44 kind:load to:0x027e0998 module:dtcm from:0x020c6f50 kind:arm_call_thumb to:0x02061700 module:overlay(0) -from:0x020c6f64 kind:load to:0x020d7c98 module:overlay(24) +from:0x020c6f64 kind:load to:0x020d7c90 add:0x8 module:overlay(24) from:0x020c6f78 kind:arm_call to:0x02011f3c module:main from:0x020c6f84 kind:arm_call to:0x020c6f48 module:overlay(24) from:0x020c6fbc kind:arm_call to:0x020a782c module:overlay(0) @@ -544,7 +544,7 @@ from:0x020c79a0 kind:arm_call to:0x0201baec module:main from:0x020c79b0 kind:arm_call to:0x0201baec module:main from:0x020c79c0 kind:arm_call to:0x0201bb38 module:main from:0x020c79e0 kind:arm_call to:0x020611dc module:overlay(0) -from:0x020c79f0 kind:load to:0x020d7cc0 module:overlay(24) +from:0x020c79f0 kind:load to:0x020d7cb8 add:0x8 module:overlay(24) from:0x020c79f4 kind:load to:0x020b1fec add:0x8 module:overlay(0) from:0x020c79f8 kind:load to:0x020d7c9c add:0x8 module:overlay(24) from:0x020c79fc kind:load to:0x0204a088 module:main @@ -571,7 +571,7 @@ from:0x020c7c58 kind:arm_call to:0x02061230 module:overlay(0) from:0x020c7c74 kind:arm_call to:0x0206c608 module:overlay(0) from:0x020c7c98 kind:arm_call to:0x0206c608 module:overlay(0) from:0x020c7ca0 kind:load to:0x0204a110 module:main -from:0x020c7ca4 kind:load to:0x0204ae10 module:main +from:0x020c7ca4 kind:load to:0x0204a110 add:0xd00 module:main from:0x020c7ca8 kind:load to:0x027e0994 module:dtcm from:0x020c7cac kind:load to:0x020b504c module:overlay(0) from:0x020c7cb0 kind:load to:0x0204a088 module:main @@ -585,7 +585,7 @@ from:0x020c7dc0 kind:arm_call to:0x0201e588 module:main from:0x020c7dc8 kind:arm_call_thumb to:0x020b6c74 module:overlay(6) from:0x020c7de4 kind:arm_call to:0x01ffd3d8 module:itcm from:0x020c7e0c kind:arm_call to:0x02019538 module:main -from:0x020c7e2c kind:load to:0x0204aeec module:main +from:0x020c7e2c kind:load to:0x0204a110 add:0xddc module:main from:0x020c7e30 kind:load to:0x027e09a4 module:dtcm from:0x020c7e34 kind:load to:0x0204a110 module:main from:0x020c7e84 kind:arm_call to:0x0206db44 module:overlay(0) @@ -619,9 +619,9 @@ from:0x020c8268 kind:arm_call to:0x0201b9a8 module:main from:0x020c8298 kind:arm_call to:0x02061230 module:overlay(0) from:0x020c82a4 kind:load to:0x0204a110 module:main from:0x020c82a8 kind:load to:0x020b62a8 module:overlay(0) -from:0x020c82ac kind:load to:0x0204aeb8 module:main -from:0x020c82b0 kind:load to:0x0204ae10 module:main -from:0x020c82b4 kind:load to:0x0204aed0 module:main +from:0x020c82ac kind:load to:0x0204a110 add:0xda8 module:main +from:0x020c82b0 kind:load to:0x0204a110 add:0xd00 module:main +from:0x020c82b4 kind:load to:0x0204a110 add:0xdc0 module:main from:0x020c82b8 kind:load to:0x0204a088 module:main from:0x020c82bc kind:load to:0x0204e5f8 module:main from:0x020c82d8 kind:arm_call to:0x02061248 module:overlay(0) @@ -640,16 +640,16 @@ from:0x020c83d4 kind:arm_call to:0x0201dd58 module:main from:0x020c83e8 kind:arm_call to:0x0201ec30 module:main from:0x020c83f8 kind:arm_call to:0x0201e8d4 module:main from:0x020c840c kind:arm_call to:0x0201e8d4 module:main -from:0x020c8420 kind:load to:0x0204aed0 module:main +from:0x020c8420 kind:load to:0x0204a110 add:0xdc0 module:main from:0x020c8424 kind:load to:0x0204a110 module:main from:0x020c8434 kind:arm_call to:0x0201e698 module:main from:0x020c843c kind:arm_call_thumb to:0x020b6c80 module:overlay(6) from:0x020c8448 kind:arm_call to:0x02019b3c module:main -from:0x020c8450 kind:load to:0x0204aeec module:main +from:0x020c8450 kind:load to:0x0204a110 add:0xddc module:main from:0x020c8464 kind:arm_call to:0x0206db44 module:overlay(0) from:0x020c846c kind:arm_call to:0x0201ced8 module:main from:0x020c847c kind:load to:0x020b5214 module:overlay(0) -from:0x020c8480 kind:load to:0x0204aeb8 module:main +from:0x020c8480 kind:load to:0x0204a110 add:0xda8 module:main from:0x020c849c kind:arm_call to:0x02061230 module:overlay(0) from:0x020c84c0 kind:load to:0x0204a088 module:main from:0x020c84dc kind:arm_call to:0x0201bb84 module:main @@ -687,7 +687,7 @@ from:0x020c8778 kind:arm_call to:0x02067bf0 module:overlay(0) from:0x020c879c kind:arm_call to:0x02019538 module:main from:0x020c87a8 kind:arm_call to:0x02061248 module:overlay(0) from:0x020c87b8 kind:arm_call to:0x020b6a50 module:overlay(8) -from:0x020c87c0 kind:arm_call to:0x020b6520 module:overlays(3,4,5,7,8,9,11,13,15,16) +from:0x020c87c0 kind:arm_call to:0x020b6520 module:overlay(8) from:0x020c87e8 kind:arm_call to:0x0206d83c module:overlay(0) from:0x020c87f0 kind:load to:0x0204a110 module:main from:0x020c87f4 kind:load to:0x0204e5f8 module:main @@ -727,12 +727,12 @@ from:0x020c89a4 kind:thumb_call_arm to:0x02068068 module:overlay(0) from:0x020c8af0 kind:thumb_call_arm to:0x020726f0 module:overlay(0) from:0x020c8af8 kind:thumb_call to:0x02014850 module:main from:0x020c8afe kind:thumb_call_arm to:0x02067b20 module:overlay(0) -from:0x020c8b08 kind:load to:0x0204aed0 module:main +from:0x020c8b08 kind:load to:0x0204a110 add:0xdc0 module:main from:0x020c8b0c kind:load to:0x0204a110 module:main from:0x020c8b10 kind:load to:0x027e095c module:dtcm from:0x020c8b14 kind:load to:0x020b504c module:overlay(0) from:0x020c8b18 kind:load to:0x0204a088 module:main -from:0x020c8b1c kind:load to:0x0204ae90 module:main +from:0x020c8b1c kind:load to:0x0204a110 add:0xd80 module:main from:0x020c8b20 kind:load to:0x020b4f70 module:overlay(0) from:0x020c8b24 kind:load to:0x027e09ac module:dtcm from:0x020c8b28 kind:load to:0x02049ba0 module:main @@ -761,7 +761,7 @@ from:0x020c8c80 kind:thumb_call_arm to:0x0201db14 module:main from:0x020c8c9c kind:thumb_call_arm to:0x02068068 module:overlay(0) from:0x020c8cb6 kind:thumb_call_arm to:0x02067b60 module:overlay(0) from:0x020c8cc0 kind:load to:0x027e09ac module:dtcm -from:0x020c8cc4 kind:load to:0x0204aed0 module:main +from:0x020c8cc4 kind:load to:0x0204a110 add:0xdc0 module:main from:0x020c8cc8 kind:load to:0x0204a110 module:main from:0x020c8ccc kind:load to:0x027e0cdc module:dtcm from:0x020c8cd0 kind:load to:0x027e095c module:dtcm @@ -770,8 +770,8 @@ from:0x020c8cd8 kind:load to:0x027e0cd8 module:dtcm from:0x020c8cdc kind:load to:0x027e09a4 module:dtcm from:0x020c8ce0 kind:load to:0x027e0994 module:dtcm from:0x020c8ce4 kind:load to:0x027e0998 module:dtcm -from:0x020c8ce8 kind:load to:0x0204aef0 module:main -from:0x020c8cec kind:load to:0x0204ae90 module:main +from:0x020c8ce8 kind:load to:0x0204a110 add:0xde0 module:main +from:0x020c8cec kind:load to:0x0204a110 add:0xd80 module:main from:0x020c8cf0 kind:load to:0x020b4f70 module:overlay(0) from:0x020c8cf4 kind:load to:0x020b504c module:overlay(0) from:0x020c8cfc kind:load to:0x02049f8c module:main @@ -828,7 +828,7 @@ from:0x020c902e kind:thumb_call_arm to:0x0201c494 module:main from:0x020c9038 kind:load to:0x0204a088 module:main from:0x020c903c kind:load to:0x0204a110 module:main from:0x020c9040 kind:load to:0x027e0994 module:dtcm -from:0x020c9044 kind:load to:0x0204aeac module:main +from:0x020c9044 kind:load to:0x0204a110 add:0xd9c module:main from:0x020c9058 kind:arm_call to:0x0201bacc module:main from:0x020c9060 kind:arm_call to:0x020616c8 module:overlay(0) from:0x020c9078 kind:arm_call to:0x0201bacc module:main @@ -892,16 +892,16 @@ from:0x020c93a2 kind:thumb_call to:0x020c957c module:overlay(24) from:0x020c93ba kind:thumb_call_arm to:0x02061230 module:overlay(0) from:0x020c93c0 kind:load to:0x0204a088 module:main from:0x020c93c4 kind:load to:0x0204a110 module:main -from:0x020c93c8 kind:load to:0x0204ae90 module:main +from:0x020c93c8 kind:load to:0x0204a110 add:0xd80 module:main from:0x020c93e6 kind:thumb_call_arm to:0x02019538 module:main from:0x020c93f0 kind:thumb_call to:0x020c9430 module:overlay(24) from:0x020c9400 kind:thumb_call_arm to:0x02019538 module:main from:0x020c940c kind:thumb_call_arm to:0x0206654c module:overlay(0) from:0x020c9424 kind:load to:0x0204a110 module:main from:0x020c9428 kind:load to:0x020b4f70 module:overlay(0) -from:0x020c942c kind:load to:0x0204aef0 module:main +from:0x020c942c kind:load to:0x0204a110 add:0xde0 module:main from:0x020c943c kind:thumb_call_arm to:0x02061248 module:overlay(0) -from:0x020c9448 kind:thumb_call to:0x020b6520 module:overlays(1,2,6,10,12,14) +from:0x020c9448 kind:thumb_call to:0x020b6520 module:overlay(14) from:0x020c9450 kind:load to:0x0204a088 module:main from:0x020c9468 kind:thumb_call_arm to:0x0201bb84 module:main from:0x020c9472 kind:thumb_call_arm to:0x0201b9a8 module:main @@ -912,7 +912,7 @@ from:0x020c94c8 kind:thumb_call_arm to:0x0201bb84 module:main from:0x020c94d2 kind:thumb_call_arm to:0x0201b9a8 module:main from:0x020c94e8 kind:thumb_call_arm to:0x02061230 module:overlay(0) from:0x020c94f0 kind:load to:0x0204a088 module:main -from:0x020c94f4 kind:load to:0x0204ae90 module:main +from:0x020c94f4 kind:load to:0x0204a110 add:0xd80 module:main from:0x020c94f8 kind:load to:0x0204e5f8 module:main from:0x020c950e kind:thumb_call_arm to:0x02061248 module:overlay(0) from:0x020c9534 kind:thumb_call_arm to:0x020c555c module:overlay(24) @@ -922,27 +922,27 @@ from:0x020c954c kind:thumb_call_arm to:0x020c671c module:overlay(24) from:0x020c9552 kind:thumb_call_arm to:0x020c66c0 module:overlay(24) from:0x020c955e kind:thumb_call_arm to:0x020665b8 module:overlay(0) from:0x020c9564 kind:load to:0x0204a088 module:main -from:0x020c9568 kind:load to:0x0204aef0 module:main +from:0x020c9568 kind:load to:0x0204a110 add:0xde0 module:main from:0x020c956c kind:load to:0x027e0994 module:dtcm from:0x020c9570 kind:load to:0x027e09a4 module:dtcm from:0x020c9574 kind:load to:0x020b4f70 module:overlay(0) from:0x020c9584 kind:thumb_call_arm to:0x0201ced8 module:main from:0x020c959c kind:thumb_call_arm to:0x01fff520 module:itcm from:0x020c95aa kind:thumb_call_arm to:0x0210b9c4 module:overlay(31) -from:0x020c95b4 kind:load to:0x0204aeb8 module:main +from:0x020c95b4 kind:load to:0x0204a110 add:0xda8 module:main from:0x020c95b8 kind:load to:0x020b34c4 module:overlay(0) from:0x020c95bc kind:load to:0x027e0ce8 module:dtcm from:0x020c95cc kind:thumb_call_arm to:0x0201cf30 module:main from:0x020c95e4 kind:thumb_call_arm to:0x01fff520 module:itcm from:0x020c95f2 kind:thumb_call_arm to:0x0210b9e0 module:overlay(31) -from:0x020c95fc kind:load to:0x0204aeb8 module:main +from:0x020c95fc kind:load to:0x0204a110 add:0xda8 module:main from:0x020c9600 kind:load to:0x020b34c4 module:overlay(0) from:0x020c9604 kind:load to:0x027e0ce8 module:dtcm from:0x020c9614 kind:arm_call to:0x0201bacc module:main from:0x020c961c kind:arm_call to:0x02011ff4 module:main from:0x020c962e kind:thumb_call_arm to:0x02061648 module:overlay(0) from:0x020c9648 kind:thumb_call_arm to:0x020611dc module:overlay(0) -from:0x020c9650 kind:load to:0x020d7e64 module:overlay(24) +from:0x020c9650 kind:load to:0x020d7e5c add:0x8 module:overlay(24) from:0x020c9654 kind:load to:0x0204a088 module:main from:0x020c965c kind:thumb_call_arm to:0x020616c8 module:overlay(0) from:0x020c9668 kind:thumb_call_arm to:0x020616c8 module:overlay(0) @@ -957,7 +957,7 @@ from:0x020c96e2 kind:thumb_call_arm to:0x01ffd3d8 module:itcm from:0x020c96ee kind:thumb_call_arm to:0x020732dc module:overlay(0) from:0x020c9704 kind:thumb_call_arm to:0x02067f88 module:overlay(0) from:0x020c9710 kind:thumb_call to:0x020b65fc module:overlay(10) -from:0x020c971a kind:thumb_call to:0x020b6520 module:overlays(1,2,6,10,12,14) +from:0x020c971a kind:thumb_call to:0x020b6520 module:overlay(10) from:0x020c9732 kind:thumb_call to:0x020b88c4 module:overlay(10) from:0x020c973a kind:thumb_call to:0x020b7008 module:overlay(10) from:0x020c9746 kind:thumb_call_arm to:0x020cd368 module:overlay(24) @@ -1015,7 +1015,7 @@ from:0x020c99a0 kind:load to:0x02061224 module:overlay(0) from:0x020c99aa kind:thumb_call_arm to:0x02061648 module:overlay(0) from:0x020c99bc kind:thumb_call to:0x020c9970 module:overlay(24) from:0x020c99fa kind:thumb_call_arm to:0x020611dc module:overlay(0) -from:0x020c9a04 kind:load to:0x020d7eb0 module:overlay(24) +from:0x020c9a04 kind:load to:0x020d7ea8 add:0x8 module:overlay(24) from:0x020c9a08 kind:load to:0x0204a088 module:main from:0x020c9a10 kind:thumb_call_arm to:0x0201bacc module:main from:0x020c9a1e kind:thumb_call_arm to:0x0201bacc module:main @@ -1034,9 +1034,9 @@ from:0x020c9b12 kind:thumb_call_arm to:0x02061230 module:overlay(0) from:0x020c9b36 kind:thumb_call to:0x020c9c6c module:overlay(24) from:0x020c9b4c kind:thumb_call_arm to:0x02061230 module:overlay(0) from:0x020c9b58 kind:load to:0x020b5214 module:overlay(0) -from:0x020c9b5c kind:load to:0x0204aeb8 module:main +from:0x020c9b5c kind:load to:0x0204a110 add:0xda8 module:main from:0x020c9b60 kind:load to:0x0204a110 module:main -from:0x020c9b64 kind:load to:0x0204ae90 module:main +from:0x020c9b64 kind:load to:0x0204a110 add:0xd80 module:main from:0x020c9b68 kind:load to:0x0204a088 module:main from:0x020c9b7c kind:thumb_call_arm to:0x02061248 module:overlay(0) from:0x020c9bb0 kind:thumb_call_arm to:0x0201dd58 module:main @@ -1047,16 +1047,16 @@ from:0x020c9bfc kind:thumb_call to:0x020c9c6c module:overlay(24) from:0x020c9c04 kind:thumb_call to:0x020c9c6c module:overlay(24) from:0x020c9c32 kind:thumb_call_arm to:0x0201db14 module:main from:0x020c9c54 kind:load to:0x0204a088 module:main -from:0x020c9c58 kind:load to:0x0204aed0 module:main -from:0x020c9c5c kind:load to:0x0204ae90 module:main +from:0x020c9c58 kind:load to:0x0204a110 add:0xdc0 module:main +from:0x020c9c5c kind:load to:0x0204a110 add:0xd80 module:main from:0x020c9c60 kind:load to:0x0204a110 module:main -from:0x020c9c64 kind:load to:0x0204aef0 module:main +from:0x020c9c64 kind:load to:0x0204a110 add:0xde0 module:main from:0x020c9c68 kind:load to:0x02049f8c module:main from:0x020c9c74 kind:thumb_call_arm to:0x020c699c module:overlay(24) from:0x020c9c80 kind:thumb_call_arm to:0x0201c0c4 module:main -from:0x020c9c94 kind:thumb_call_arm to:0x020b6520 module:overlays(3,4,5,7,8,9,11,13,15,16) +from:0x020c9c94 kind:thumb_call_arm to:0x020b6520 module:overlay(11) from:0x020c9c9c kind:thumb_call_arm to:0x020b89f0 module:overlay(11) -from:0x020c9cda kind:thumb_call_arm to:0x020b6520 module:overlays(3,4,5,7,8,9,11,13,15,16) +from:0x020c9cda kind:thumb_call_arm to:0x020b6520 module:overlay(11) from:0x020c9d10 kind:load to:0x027e0994 module:dtcm from:0x020c9d14 kind:load to:0x027e09b8 module:dtcm from:0x020c9d26 kind:thumb_call_arm to:0x020b88ac module:overlay(11) @@ -1071,12 +1071,12 @@ from:0x020c9db4 kind:thumb_call_arm to:0x0201dc10 module:main from:0x020c9dbc kind:thumb_call_arm to:0x0206db44 module:overlay(0) from:0x020c9dc2 kind:thumb_call to:0x020ca034 module:overlay(24) from:0x020c9dcc kind:load to:0x020b5214 module:overlay(0) -from:0x020c9dd0 kind:load to:0x0204aeb8 module:main -from:0x020c9dd8 kind:load to:0x0204aed0 module:main +from:0x020c9dd0 kind:load to:0x0204a110 add:0xda8 module:main +from:0x020c9dd8 kind:load to:0x0204a110 add:0xdc0 module:main from:0x020c9e10 kind:thumb_call to:0x020ca034 module:overlay(24) from:0x020c9e26 kind:thumb_call_arm to:0x02061230 module:overlay(0) from:0x020c9e40 kind:thumb_call_arm to:0x02061230 module:overlay(0) -from:0x020c9e5c kind:load to:0x0204ae90 module:main +from:0x020c9e5c kind:load to:0x0204a110 add:0xd80 module:main from:0x020c9e60 kind:load to:0x0204a088 module:main from:0x020c9e82 kind:thumb_call_arm to:0x01ffd3d8 module:itcm from:0x020c9e90 kind:thumb_call_arm to:0x0201c0c4 module:main @@ -1103,9 +1103,9 @@ from:0x020c9ffc kind:thumb_call_arm to:0x02019b3c module:main from:0x020ca004 kind:load to:0x027e0994 module:dtcm from:0x020ca008 kind:load to:0x027e09a4 module:dtcm from:0x020ca00c kind:load to:0x027e0998 module:dtcm -from:0x020ca010 kind:load to:0x0204aef0 module:main -from:0x020ca014 kind:load to:0x0204aed0 module:main -from:0x020ca01c kind:load to:0x0204ae90 module:main +from:0x020ca010 kind:load to:0x0204a110 add:0xde0 module:main +from:0x020ca014 kind:load to:0x0204a110 add:0xdc0 module:main +from:0x020ca01c kind:load to:0x0204a110 add:0xd80 module:main from:0x020ca020 kind:load to:0x02049f8c module:main from:0x020ca024 kind:load to:0x0204a088 module:main from:0x020ca040 kind:thumb_call_arm to:0x0201bb84 module:main @@ -1182,7 +1182,7 @@ from:0x020ca450 kind:arm_call to:0x020166cc module:main from:0x020ca464 kind:arm_call to:0x020166cc module:main from:0x020ca480 kind:load to:0x020d7f50 add:0x8 module:overlay(24) from:0x020ca484 kind:load to:0x020b1f84 add:0x8 module:overlay(0) -from:0x020ca488 kind:load to:0x020b1f2c module:overlay(0) +from:0x020ca488 kind:load to:0x020b1f24 add:0x8 module:overlay(0) from:0x020ca4cc kind:arm_call to:0x02063a3c module:overlay(0) from:0x020ca4e8 kind:arm_call to:0x02063a3c module:overlay(0) from:0x020ca4fc kind:arm_call to:0x02062f18 module:overlay(0) @@ -1245,9 +1245,9 @@ from:0x020caa44 kind:arm_call to:0x02061c5c module:overlay(0) from:0x020caa4c kind:arm_call to:0x02011ff4 module:main from:0x020caa7c kind:arm_call to:0x0201e6d0 module:main from:0x020caab8 kind:arm_call to:0x0201e874 module:main -from:0x020caaf8 kind:load to:0x020d7f7c module:overlay(24) +from:0x020caaf8 kind:load to:0x020d7f74 add:0x8 module:overlay(24) from:0x020cab14 kind:arm_call to:0x0201e6d0 module:main -from:0x020cab54 kind:load to:0x020d7f7c module:overlay(24) +from:0x020cab54 kind:load to:0x020d7f74 add:0x8 module:overlay(24) from:0x020cab98 kind:arm_call to:0x0201e874 module:main from:0x020cad84 kind:arm_call to:0x020caba4 module:overlay(24) from:0x020cadb4 kind:arm_call to:0x02011f3c module:main @@ -1304,7 +1304,7 @@ from:0x020cb1a0 kind:arm_call to:0x02018ac4 module:main from:0x020cb1b0 kind:arm_call_thumb to:0x0201ca28 module:main from:0x020cb1bc kind:arm_call_thumb to:0x0201ca28 module:main from:0x020cb1c4 kind:load to:0x027e0994 module:dtcm -from:0x020cb1c8 kind:load to:0x0204a120 module:main +from:0x020cb1c8 kind:load to:0x0204a110 add:0x10 module:main from:0x020cb1d8 kind:load to:0x020d8694 module:overlay(24) from:0x020cb1ec kind:load to:0x020d8694 module:overlay(24) from:0x020cb250 kind:arm_call to:0x0201e6d0 module:main @@ -1415,14 +1415,14 @@ from:0x020cc1d4 kind:arm_call to:0x0201effc module:main from:0x020cc208 kind:arm_call to:0x0201f04c module:main from:0x020cc21c kind:arm_call to:0x0201c4d8 module:main from:0x020cc224 kind:load to:0x0204e5f8 module:main -from:0x020cc228 kind:load to:0x0204aeac module:main +from:0x020cc228 kind:load to:0x0204a110 add:0xd9c module:main from:0x020cc260 kind:arm_call to:0x020cc088 module:overlay(24) from:0x020cc284 kind:arm_call to:0x0201effc module:main from:0x020cc3e4 kind:arm_call to:0x0201f04c module:main from:0x020cc3f8 kind:arm_call to:0x0201c4d8 module:main from:0x020cc43c kind:arm_call to:0x020cbeb8 module:overlay(24) from:0x020cc448 kind:arm_call to:0x020cbf98 module:overlay(24) -from:0x020cc454 kind:load to:0x0204aeac module:main +from:0x020cc454 kind:load to:0x0204a110 add:0xd9c module:main from:0x020cc460 kind:arm_call to:0x020cb8cc module:overlay(24) from:0x020cc470 kind:arm_call to:0x0201eb4c module:main from:0x020cc47c kind:load to:0x020d801c module:overlay(24) @@ -1918,7 +1918,7 @@ from:0x020d1070 kind:arm_call to:0x0206f778 module:overlay(0) from:0x020d10b8 kind:arm_call to:0x020d0744 module:overlay(24) from:0x020d10f8 kind:arm_call to:0x0206f778 module:overlay(0) from:0x020d1104 kind:arm_call to:0x020bd69c module:overlay(17) -from:0x020d1140 kind:load to:0x0204af10 module:main +from:0x020d1140 kind:load to:0x0204a110 add:0xe00 module:main from:0x020d1144 kind:load to:0x020b52b4 module:overlay(0) from:0x020d1148 kind:load to:0x027e0ce0 module:dtcm from:0x020d1178 kind:arm_call to:0x02015348 module:main @@ -1954,9 +1954,9 @@ from:0x020d15c8 kind:arm_call to:0x020d0f0c module:overlay(24) from:0x020d15e8 kind:arm_call to:0x020d0924 module:overlay(24) from:0x020d1624 kind:arm_call to:0x02028c90 module:main from:0x020d162c kind:arm_call to:0x020bba78 module:overlay(17) -from:0x020d1634 kind:load to:0x020c3f70 module:overlays(1,17) +from:0x020d1634 kind:load to:0x020c3f70 module:overlay(17) from:0x020d1644 kind:arm_call to:0x020bba94 module:overlay(17) -from:0x020d1654 kind:load to:0x020c3f70 module:overlays(1,17) +from:0x020d1654 kind:load to:0x020c3f70 module:overlay(17) from:0x020d1668 kind:arm_call to:0x02011f3c module:main from:0x020d1674 kind:arm_call_thumb to:0x020bd7c8 module:overlay(1) from:0x020d168c kind:arm_call to:0x020c31cc module:overlay(17) diff --git a/config/eur/arm9/overlays/ov024/symbols.txt b/config/eur/arm9/overlays/ov024/symbols.txt index fdf44010..f51a9bbf 100644 --- a/config/eur/arm9/overlays/ov024/symbols.txt +++ b/config/eur/arm9/overlays/ov024/symbols.txt @@ -1,322 +1,322 @@ -func_ov024_020c4840 kind:function(thumb,size=0x44) addr:0x020c4840 -_ZN19func_ov024_020c4884D0Ev kind:function(thumb,size=0x48) addr:0x020c4884 -func_ov024_020c48cc kind:function(thumb,size=0x38) addr:0x020c48cc -func_ov024_020c4904 kind:function(arm,size=0x3c) addr:0x020c4904 -func_ov024_020c4940 kind:function(arm,size=0x24) addr:0x020c4940 -func_ov024_020c4964 kind:function(arm,size=0x20) addr:0x020c4964 -func_ov024_020c4984 kind:function(arm,size=0x50) addr:0x020c4984 -func_ov024_020c49d4 kind:function(arm,size=0x24) addr:0x020c49d4 -func_ov024_020c49f8 kind:function(arm,size=0x68) addr:0x020c49f8 -func_ov024_020c4a60 kind:function(arm,size=0x2c) addr:0x020c4a60 -func_ov024_020c4a8c kind:function(arm,size=0x34) addr:0x020c4a8c -func_ov024_020c4ac0 kind:function(arm,size=0x50) addr:0x020c4ac0 -func_ov024_020c4b10 kind:function(arm,size=0x14) addr:0x020c4b10 -func_ov024_020c4b24 kind:function(arm,size=0x28) addr:0x020c4b24 -func_ov024_020c4b4c kind:function(arm,size=0x54) addr:0x020c4b4c -func_ov024_020c4ba0 kind:function(arm,size=0x128) addr:0x020c4ba0 -func_ov024_020c4cc8 kind:function(arm,size=0xac) addr:0x020c4cc8 -func_ov024_020c4d74 kind:function(arm,size=0x14) addr:0x020c4d74 -func_ov024_020c4d88 kind:function(arm,size=0x24) addr:0x020c4d88 -func_ov024_020c4dac kind:function(arm,size=0x30) addr:0x020c4dac -func_ov024_020c4ddc kind:function(arm,size=0x10) addr:0x020c4ddc -func_ov024_020c4dec kind:function(arm,size=0x14) addr:0x020c4dec -func_ov024_020c4e00 kind:function(arm,size=0x18) addr:0x020c4e00 -func_ov024_020c4e18 kind:function(arm,size=0x4) addr:0x020c4e18 -_ZN19func_ov024_020c4e1cD0Ev kind:function(arm,size=0x14) addr:0x020c4e1c -func_ov024_020c4e30 kind:function(arm,size=0x4) addr:0x020c4e30 -func_ov024_020c4e34 kind:function(arm,size=0xc) addr:0x020c4e34 -func_ov024_020c4e40 kind:function(arm,size=0xc) addr:0x020c4e40 -func_ov024_020c4e4c kind:function(arm,size=0x4) addr:0x020c4e4c -func_ov024_020c4e50 kind:function(arm,size=0x4) addr:0x020c4e50 -func_ov024_020c4e54 kind:function(arm,size=0x4) addr:0x020c4e54 -func_ov024_020c4e58 kind:function(arm,size=0x4) addr:0x020c4e58 -func_ov024_020c4e5c kind:function(arm,size=0x4) addr:0x020c4e5c -func_ov024_020c4e60 kind:function(arm,size=0x8) addr:0x020c4e60 -func_ov024_020c4e68 kind:function(arm,size=0x58) addr:0x020c4e68 -func_ov024_020c4ec0 kind:function(arm,size=0x18) addr:0x020c4ec0 -func_ov024_020c4ed8 kind:function(arm,size=0x18) addr:0x020c4ed8 -func_ov024_020c4ef0 kind:function(arm,size=0x18) addr:0x020c4ef0 -func_ov024_020c4f08 kind:function(arm,size=0x10) addr:0x020c4f08 -func_ov024_020c4f18 kind:function(arm,size=0x10) addr:0x020c4f18 -func_ov024_020c4f28 kind:function(arm,size=0x24) addr:0x020c4f28 -func_ov024_020c4f4c kind:function(arm,size=0x10) addr:0x020c4f4c -func_ov024_020c4f5c kind:function(arm,size=0x10) addr:0x020c4f5c -func_ov024_020c4f6c kind:function(arm,size=0x10) addr:0x020c4f6c -func_ov024_020c4f7c kind:function(arm,size=0x8) addr:0x020c4f7c -func_ov024_020c4f84 kind:function(arm,size=0x8c) addr:0x020c4f84 -func_ov024_020c5010 kind:function(arm,size=0xfc) addr:0x020c5010 -func_ov024_020c510c kind:function(arm,size=0x14) addr:0x020c510c -func_ov024_020c5120 kind:function(arm,size=0x8) addr:0x020c5120 -_ZN19func_ov024_020c5128D1Ev kind:function(arm,size=0x14) addr:0x020c5128 -_ZN19func_ov024_020c513cD0Ev kind:function(arm,size=0x1c) addr:0x020c513c -func_ov024_020c5158 kind:function(arm,size=0x94) addr:0x020c5158 -_ZN19func_ov024_020c51ecD0Ev kind:function(arm,size=0x9c) addr:0x020c51ec -func_ov024_020c5288 kind:function(arm,size=0x18) addr:0x020c5288 -func_ov024_020c52a0 kind:function(arm,size=0x18) addr:0x020c52a0 -func_ov024_020c52b8 kind:function(arm,size=0x3c) addr:0x020c52b8 -func_ov024_020c52f4 kind:function(arm,size=0x18) addr:0x020c52f4 -func_ov024_020c530c kind:function(arm,size=0x58) addr:0x020c530c -func_ov024_020c5364 kind:function(arm,size=0x18) addr:0x020c5364 -func_ov024_020c537c kind:function(arm,size=0x6c) addr:0x020c537c -func_ov024_020c53e8 kind:function(arm,size=0x174) addr:0x020c53e8 -func_ov024_020c555c kind:function(arm,size=0x8) addr:0x020c555c -func_ov024_020c5564 kind:function(arm,size=0x788) addr:0x020c5564 -func_ov024_020c5cec kind:function(arm,size=0xc0) addr:0x020c5cec -func_ov024_020c5dac kind:function(arm,size=0x120) addr:0x020c5dac -func_ov024_020c5ecc kind:function(arm,size=0xa4) addr:0x020c5ecc -func_ov024_020c5f70 kind:function(arm,size=0x184) addr:0x020c5f70 -func_ov024_020c60f4 kind:function(arm,size=0x148) addr:0x020c60f4 -func_ov024_020c623c kind:function(arm,size=0x8c) addr:0x020c623c -func_ov024_020c62c8 kind:function(arm,size=0x60) addr:0x020c62c8 -func_ov024_020c6328 kind:function(arm,size=0x138) addr:0x020c6328 -func_ov024_020c6460 kind:function(arm,size=0xa0) addr:0x020c6460 -func_ov024_020c6500 kind:function(arm,size=0x14) addr:0x020c6500 -func_ov024_020c6514 kind:function(arm,size=0x160) addr:0x020c6514 -func_ov024_020c6674 kind:function(arm,size=0x4c) addr:0x020c6674 -func_ov024_020c66c0 kind:function(arm,size=0x5c) addr:0x020c66c0 -func_ov024_020c671c kind:function(arm,size=0x54) addr:0x020c671c -func_ov024_020c6770 kind:function(arm,size=0xac) addr:0x020c6770 -func_ov024_020c681c kind:function(arm,size=0x24) addr:0x020c681c -func_ov024_020c6840 kind:function(arm,size=0x94) addr:0x020c6840 -func_ov024_020c68d4 kind:function(arm,size=0x18) addr:0x020c68d4 -func_ov024_020c68ec kind:function(arm,size=0x44) addr:0x020c68ec -func_ov024_020c6930 kind:function(arm,size=0x10) addr:0x020c6930 -func_ov024_020c6940 kind:function(arm,size=0x5c) addr:0x020c6940 -func_ov024_020c699c kind:function(arm,size=0x34) addr:0x020c699c -func_ov024_020c69d0 kind:function(arm,size=0x50) addr:0x020c69d0 -func_ov024_020c6a20 kind:function(arm,size=0x28) addr:0x020c6a20 -func_ov024_020c6a48 kind:function(arm,size=0xac) addr:0x020c6a48 -func_ov024_020c6af4 kind:function(arm,size=0x98) addr:0x020c6af4 -func_ov024_020c6b8c kind:function(arm,size=0xd4) addr:0x020c6b8c -func_ov024_020c6c60 kind:function(arm,size=0x74) addr:0x020c6c60 -func_ov024_020c6cd4 kind:function(arm,size=0x10) addr:0x020c6cd4 -func_ov024_020c6ce4 kind:function(arm,size=0x20) addr:0x020c6ce4 -func_ov024_020c6d04 kind:function(arm,size=0xc) addr:0x020c6d04 -func_ov024_020c6d10 kind:function(arm,size=0x10) addr:0x020c6d10 -func_ov024_020c6d20 kind:function(arm,size=0xc) addr:0x020c6d20 -func_ov024_020c6d2c kind:function(arm,size=0x38) addr:0x020c6d2c -func_ov024_020c6d64 kind:function(arm,size=0x54) addr:0x020c6d64 -func_ov024_020c6db8 kind:function(arm,size=0x34) addr:0x020c6db8 -func_ov024_020c6dec kind:function(arm,size=0x4c) addr:0x020c6dec -func_ov024_020c6e38 kind:function(arm,size=0x2c) addr:0x020c6e38 -_ZN19func_ov024_020c6e64D1Ev kind:function(arm,size=0x14) addr:0x020c6e64 -_ZN19func_ov024_020c6e78D0Ev kind:function(arm,size=0x1c) addr:0x020c6e78 -func_ov024_020c6e94 kind:function(arm,size=0x18) addr:0x020c6e94 -func_ov024_020c6eac kind:function(arm,size=0x18) addr:0x020c6eac -func_ov024_020c6ec4 kind:function(arm,size=0x18) addr:0x020c6ec4 -func_ov024_020c6edc kind:function(arm,size=0x2c) addr:0x020c6edc -func_ov024_020c6f08 kind:function(arm,size=0x2c) addr:0x020c6f08 -func_ov024_020c6f34 kind:function(arm,size=0x14) addr:0x020c6f34 -func_ov024_020c6f48 kind:function(arm,size=0x20) addr:0x020c6f48 -func_ov024_020c6f68 kind:function(arm,size=0x24) addr:0x020c6f68 -func_ov024_020c6f8c kind:function(arm,size=0x1e0) addr:0x020c6f8c -func_ov024_020c716c kind:function(arm,size=0xa8) addr:0x020c716c -func_ov024_020c7214 kind:function(arm,size=0x68) addr:0x020c7214 -func_ov024_020c727c kind:function(arm,size=0x84) addr:0x020c727c -func_ov024_020c7300 kind:function(arm,size=0x54) addr:0x020c7300 -func_ov024_020c7354 kind:function(arm,size=0x3c) addr:0x020c7354 -func_ov024_020c7390 kind:function(arm,size=0x24) addr:0x020c7390 -func_ov024_020c73b4 kind:function(arm,size=0xf0) addr:0x020c73b4 -func_ov024_020c74a4 kind:function(arm,size=0xb8) addr:0x020c74a4 -func_ov024_020c755c kind:function(arm,size=0x74) addr:0x020c755c -func_ov024_020c75d0 kind:function(arm,size=0x154) addr:0x020c75d0 -func_ov024_020c7724 kind:function(arm,size=0x2c) addr:0x020c7724 -func_ov024_020c7750 kind:function(arm,size=0x30) addr:0x020c7750 -func_ov024_020c7780 kind:function(arm,size=0x30) addr:0x020c7780 -func_ov024_020c77b0 kind:function(arm,size=0x10) addr:0x020c77b0 -func_ov024_020c77c0 kind:function(arm,size=0x10) addr:0x020c77c0 -func_ov024_020c77d0 kind:function(arm,size=0x10) addr:0x020c77d0 -func_ov024_020c77e0 kind:function(arm,size=0x24) addr:0x020c77e0 -func_ov024_020c7804 kind:function(arm,size=0x24) addr:0x020c7804 -func_ov024_020c7828 kind:function(arm,size=0x50) addr:0x020c7828 -func_ov024_020c7878 kind:function(arm,size=0xc) addr:0x020c7878 -func_ov024_020c7884 kind:function(arm,size=0x14) addr:0x020c7884 -func_ov024_020c7898 kind:function(arm,size=0x14) addr:0x020c7898 -func_ov024_020c78ac kind:function(arm,size=0x24) addr:0x020c78ac -func_ov024_020c78d0 kind:function(arm,size=0x14) addr:0x020c78d0 -func_ov024_020c78e4 kind:function(arm,size=0x1c) addr:0x020c78e4 -func_ov024_020c7900 kind:function(arm,size=0x1c) addr:0x020c7900 -func_ov024_020c791c kind:function(arm,size=0x10) addr:0x020c791c -func_ov024_020c792c kind:function(arm,size=0x14) addr:0x020c792c -func_ov024_020c7940 kind:function(arm,size=0x18) addr:0x020c7940 -func_ov024_020c7958 kind:function(arm,size=0xa8) addr:0x020c7958 -func_ov024_020c7a00 kind:function(arm,size=0x14) addr:0x020c7a00 -_ZN19func_ov024_020c7a14D1Ev kind:function(arm,size=0x30) addr:0x020c7a14 -_ZN19func_ov024_020c7a44D0Ev kind:function(arm,size=0x38) addr:0x020c7a44 -func_ov024_020c7a7c kind:function(arm,size=0x9c) addr:0x020c7a7c -func_ov024_020c7b18 kind:function(arm,size=0x1a0) addr:0x020c7b18 -func_ov024_020c7cb8 kind:function(arm,size=0x24) addr:0x020c7cb8 -func_ov024_020c7cdc kind:function(arm,size=0x20) addr:0x020c7cdc -func_ov024_020c7cfc kind:function(arm,size=0x50) addr:0x020c7cfc -func_ov024_020c7d4c kind:function(arm,size=0xf0) addr:0x020c7d4c -func_ov024_020c7e3c kind:function(arm,size=0x118) addr:0x020c7e3c -func_ov024_020c7f54 kind:function(arm,size=0x36c) addr:0x020c7f54 -func_ov024_020c82c0 kind:function(arm,size=0xf8) addr:0x020c82c0 -func_ov024_020c83b8 kind:function(arm,size=0x4) addr:0x020c83b8 -func_ov024_020c83bc kind:function(arm,size=0x6c) addr:0x020c83bc -func_ov024_020c8428 kind:function(arm,size=0x2c) addr:0x020c8428 -func_ov024_020c8454 kind:function(arm,size=0x30) addr:0x020c8454 -func_ov024_020c8484 kind:function(arm,size=0x40) addr:0x020c8484 -func_ov024_020c84c4 kind:function(arm,size=0x58) addr:0x020c84c4 -func_ov024_020c851c kind:function(arm,size=0x80) addr:0x020c851c -_ZN19func_ov024_020c859cD0Ev kind:function(arm,size=0x1c) addr:0x020c859c -func_ov024_020c85b8 kind:function(arm,size=0x18) addr:0x020c85b8 -func_ov024_020c85d0 kind:function(arm,size=0x60) addr:0x020c85d0 -func_ov024_020c8630 kind:function(arm,size=0x14) addr:0x020c8630 -_ZN19func_ov024_020c8644D1Ev kind:function(arm,size=0x20) addr:0x020c8644 -_ZN19func_ov024_020c8664D0Ev kind:function(arm,size=0x28) addr:0x020c8664 -func_ov024_020c868c kind:function(arm,size=0x38) addr:0x020c868c -func_ov024_020c86c4 kind:function(arm,size=0x74) addr:0x020c86c4 -func_ov024_020c8738 kind:function(arm,size=0xd4) addr:0x020c8738 -func_ov024_020c880c kind:function(arm,size=0xc) addr:0x020c880c -func_ov024_020c8818 kind:function(arm,size=0x2c) addr:0x020c8818 -_ZN19func_ov024_020c8844D0Ev kind:function(arm,size=0x1c) addr:0x020c8844 -func_ov024_020c8860 kind:function(thumb,size=0x10) addr:0x020c8860 -func_ov024_020c8870 kind:function(thumb,size=0x10) addr:0x020c8870 -func_ov024_020c8880 kind:function(thumb,size=0x64) addr:0x020c8880 -func_ov024_020c88e4 kind:function(thumb,size=0xc) addr:0x020c88e4 -func_ov024_020c88f0 kind:function(thumb,size=0x23c) addr:0x020c88f0 -func_ov024_020c8b2c kind:function(thumb,size=0x1d4) addr:0x020c8b2c -_ZN19func_ov024_020c8d00D0Ev kind:function(arm,size=0x1c) addr:0x020c8d00 -_ZN19func_ov024_020c8d1cD1Ev kind:function(arm,size=0x20) addr:0x020c8d1c -_ZN19func_ov024_020c8d3cD0Ev kind:function(arm,size=0x28) addr:0x020c8d3c -func_ov024_020c8d64 kind:function(thumb,size=0x2c) addr:0x020c8d64 -func_ov024_020c8d90 kind:function(thumb,size=0x58) addr:0x020c8d90 -func_ov024_020c8de8 kind:function(thumb,size=0x48) addr:0x020c8de8 -func_ov024_020c8e30 kind:function(thumb,size=0xac) addr:0x020c8e30 -func_ov024_020c8edc kind:function(thumb,size=0x6c) addr:0x020c8edc -func_ov024_020c8f48 kind:function(thumb,size=0x40) addr:0x020c8f48 -func_ov024_020c8f88 kind:function(thumb,size=0xc0) addr:0x020c8f88 -func_ov024_020c9048 kind:function(thumb,size=0x2) addr:0x020c9048 -_ZN19func_ov024_020c904cD1Ev kind:function(arm,size=0x20) addr:0x020c904c -_ZN19func_ov024_020c906cD0Ev kind:function(arm,size=0x28) addr:0x020c906c -func_ov024_020c9094 kind:function(thumb,size=0x14) addr:0x020c9094 -func_ov024_020c90a8 kind:function(thumb,size=0x2c) addr:0x020c90a8 -func_ov024_020c90d4 kind:function(thumb,size=0x1c) addr:0x020c90d4 -func_ov024_020c90f0 kind:function(thumb,size=0x2c) addr:0x020c90f0 -func_ov024_020c911c kind:function(thumb,size=0x1c) addr:0x020c911c -_ZN19func_ov024_020c9138D1Ev kind:function(arm,size=0x20) addr:0x020c9138 -_ZN19func_ov024_020c9158D0Ev kind:function(arm,size=0x28) addr:0x020c9158 -func_ov024_020c9180 kind:function(thumb,size=0x2c) addr:0x020c9180 -func_ov024_020c91ac kind:function(thumb,size=0x24) addr:0x020c91ac -func_ov024_020c91d0 kind:function(thumb,size=0x24) addr:0x020c91d0 -_ZN19func_ov024_020c91f4D1Ev kind:function(arm,size=0x20) addr:0x020c91f4 -_ZN19func_ov024_020c9214D0Ev kind:function(arm,size=0x28) addr:0x020c9214 -func_ov024_020c923c kind:function(thumb,size=0x10) addr:0x020c923c -func_ov024_020c924c kind:function(thumb,size=0x50) addr:0x020c924c -func_ov024_020c929c kind:function(thumb,size=0xc) addr:0x020c929c -func_ov024_020c92a8 kind:function(thumb,size=0x14) addr:0x020c92a8 -func_ov024_020c92bc kind:function(thumb,size=0x1a) addr:0x020c92bc -func_ov024_020c92d8 kind:function(thumb,size=0x64) addr:0x020c92d8 -func_ov024_020c933c kind:function(thumb,size=0x90) addr:0x020c933c -func_ov024_020c93cc kind:function(thumb,size=0x64) addr:0x020c93cc -func_ov024_020c9430 kind:function(thumb,size=0x24) addr:0x020c9430 -func_ov024_020c9454 kind:function(thumb,size=0x30) addr:0x020c9454 -func_ov024_020c9484 kind:function(thumb,size=0x78) addr:0x020c9484 -func_ov024_020c94fc kind:function(thumb,size=0x7c) addr:0x020c94fc -func_ov024_020c9578 kind:function(thumb,size=0x2) addr:0x020c9578 -func_ov024_020c957c kind:function(thumb,size=0x48) addr:0x020c957c -func_ov024_020c95c4 kind:function(thumb,size=0x48) addr:0x020c95c4 -_ZN19func_ov024_020c960cD0Ev kind:function(arm,size=0x1c) addr:0x020c960c -func_ov024_020c9628 kind:function(thumb,size=0x30) addr:0x020c9628 -func_ov024_020c9658 kind:function(thumb,size=0xc) addr:0x020c9658 -func_ov024_020c9664 kind:function(thumb,size=0x12) addr:0x020c9664 -func_ov024_020c9678 kind:function(thumb,size=0x20) addr:0x020c9678 -func_ov024_020c9698 kind:function(thumb,size=0xf8) addr:0x020c9698 -func_ov024_020c9790 kind:function(thumb,size=0x8) addr:0x020c9790 -func_ov024_020c9798 kind:function(thumb,size=0x2) addr:0x020c9798 -func_ov024_020c979c kind:function(thumb,size=0x94) addr:0x020c979c -func_ov024_020c9830 kind:function(thumb,size=0x7c) addr:0x020c9830 -func_ov024_020c98ac kind:function(thumb,size=0x60) addr:0x020c98ac -func_ov024_020c990c kind:function(thumb,size=0x5c) addr:0x020c990c -func_ov024_020c9968 kind:function(thumb,size=0x8) addr:0x020c9968 -func_ov024_020c9970 kind:function(thumb,size=0x14) addr:0x020c9970 -func_ov024_020c9984 kind:function(thumb,size=0x10) addr:0x020c9984 -func_ov024_020c9994 kind:function(thumb,size=0x10) addr:0x020c9994 -func_ov024_020c99a4 kind:function(thumb,size=0x68) addr:0x020c99a4 -func_ov024_020c9a0c kind:function(thumb,size=0xc) addr:0x020c9a0c -func_ov024_020c9a18 kind:function(thumb,size=0x14) addr:0x020c9a18 -func_ov024_020c9a2c kind:function(thumb,size=0x1a) addr:0x020c9a2c -func_ov024_020c9a48 kind:function(thumb,size=0x32) addr:0x020c9a48 -func_ov024_020c9a7c kind:function(thumb,size=0xf0) addr:0x020c9a7c -func_ov024_020c9b6c kind:function(thumb,size=0x100) addr:0x020c9b6c -func_ov024_020c9c6c kind:function(thumb,size=0xb4) addr:0x020c9c6c -func_ov024_020c9d20 kind:function(thumb,size=0x10) addr:0x020c9d20 -func_ov024_020c9d30 kind:function(thumb,size=0xac) addr:0x020c9d30 -func_ov024_020c9ddc kind:function(thumb,size=0x88) addr:0x020c9ddc -func_ov024_020c9e64 kind:function(thumb,size=0x1c4) addr:0x020c9e64 -func_ov024_020ca028 kind:function(thumb,size=0xa) addr:0x020ca028 -func_ov024_020ca034 kind:function(thumb,size=0x34) addr:0x020ca034 -func_ov024_020ca068 kind:function(thumb,size=0xc) addr:0x020ca068 -func_ov024_020ca074 kind:function(thumb,size=0x6) addr:0x020ca074 -_ZN19func_ov024_020ca07cD0Ev kind:function(arm,size=0x1c) addr:0x020ca07c -func_ov024_020ca098 kind:function(thumb,size=0x10) addr:0x020ca098 -func_ov024_020ca0a8 kind:function(thumb,size=0xc) addr:0x020ca0a8 -func_ov024_020ca0b4 kind:function(thumb,size=0x54) addr:0x020ca0b4 -func_ov024_020ca108 kind:function(thumb,size=0xc) addr:0x020ca108 -func_ov024_020ca114 kind:function(thumb,size=0xc) addr:0x020ca114 -func_ov024_020ca120 kind:function(thumb,size=0xc) addr:0x020ca120 -func_ov024_020ca12c kind:function(thumb,size=0x20) addr:0x020ca12c -func_ov024_020ca14c kind:function(thumb,size=0x3c) addr:0x020ca14c -func_ov024_020ca188 kind:function(thumb,size=0xc) addr:0x020ca188 -func_ov024_020ca194 kind:function(thumb,size=0x20) addr:0x020ca194 -func_ov024_020ca1b4 kind:function(thumb,size=0x68) addr:0x020ca1b4 -func_ov024_020ca21c kind:function(thumb,size=0x30) addr:0x020ca21c -func_ov024_020ca24c kind:function(thumb,size=0x34) addr:0x020ca24c -func_ov024_020ca280 kind:function(thumb,size=0x10) addr:0x020ca280 -_ZN19func_ov024_020ca290D0Ev kind:function(arm,size=0x1c) addr:0x020ca290 -_ZN19func_ov024_020ca2acD0Ev kind:function(arm,size=0x1c) addr:0x020ca2ac -_ZN19func_ov024_020ca2c8D1Ev kind:function(arm,size=0x28) addr:0x020ca2c8 -_ZN19func_ov024_020ca2f0D0Ev kind:function(arm,size=0x30) addr:0x020ca2f0 -func_ov024_020ca320 kind:function(arm,size=0x16c) addr:0x020ca320 -func_ov024_020ca48c kind:function(arm,size=0x13c) addr:0x020ca48c -func_ov024_020ca5c8 kind:function(arm,size=0x90) addr:0x020ca5c8 -func_ov024_020ca658 kind:function(arm,size=0x50) addr:0x020ca658 -func_ov024_020ca6a8 kind:function(arm,size=0x2d0) addr:0x020ca6a8 -_ZN19func_ov024_020ca978D1Ev kind:function(arm,size=0x6c) addr:0x020ca978 -_ZN19func_ov024_020ca9e4D0Ev kind:function(arm,size=0x74) addr:0x020ca9e4 -func_ov024_020caa58 kind:function(arm,size=0xa4) addr:0x020caa58 -func_ov024_020caafc kind:function(arm,size=0x5c) addr:0x020caafc -func_ov024_020cab58 kind:function(arm,size=0x4c) addr:0x020cab58 -func_ov024_020caba4 kind:function(arm,size=0x1d8) addr:0x020caba4 -func_ov024_020cad7c kind:function(arm,size=0x24) addr:0x020cad7c -func_ov024_020cada0 kind:function(arm,size=0x2c) addr:0x020cada0 -func_ov024_020cadcc kind:function(arm,size=0xec) addr:0x020cadcc -func_ov024_020caeb8 kind:function(arm,size=0x7c) addr:0x020caeb8 -_ZN19func_ov024_020caf34D0Ev kind:function(arm,size=0x84) addr:0x020caf34 -func_ov024_020cafb8 kind:function(arm,size=0x20) addr:0x020cafb8 -func_ov024_020cafd8 kind:function(arm,size=0x28) addr:0x020cafd8 -func_ov024_020cb000 kind:function(arm,size=0x20) addr:0x020cb000 -func_ov024_020cb020 kind:function(arm,size=0x20) addr:0x020cb020 -func_ov024_020cb040 kind:function(arm,size=0x14) addr:0x020cb040 -func_ov024_020cb054 kind:function(arm,size=0x58) addr:0x020cb054 -func_ov024_020cb0ac kind:function(arm,size=0x18) addr:0x020cb0ac -func_ov024_020cb0c4 kind:function(arm,size=0x30) addr:0x020cb0c4 -func_ov024_020cb0f4 kind:function(arm,size=0x3c) addr:0x020cb0f4 -func_ov024_020cb130 kind:function(arm,size=0x48) addr:0x020cb130 -func_ov024_020cb178 kind:function(arm,size=0x1c) addr:0x020cb178 -func_ov024_020cb194 kind:function(arm,size=0x38) addr:0x020cb194 +_ZN17GameModeAdventureD1Ev kind:function(thumb,size=0x44) addr:0x020c4840 +_ZN17GameModeAdventureD0Ev kind:function(thumb,size=0x48) addr:0x020c4884 +_ZN17GameModeAdventure8vfunc_08Ev kind:function(thumb,size=0x38) addr:0x020c48cc +_ZN17GameModeAdventure8vfunc_0CEv kind:function(arm,size=0x3c) addr:0x020c4904 +_ZN17GameModeAdventure8vfunc_10Ev kind:function(arm,size=0x24) addr:0x020c4940 +_ZN17GameModeAdventure8vfunc_14Ev kind:function(arm,size=0x20) addr:0x020c4964 +_ZN17GameModeAdventure8vfunc_18Ev kind:function(arm,size=0x50) addr:0x020c4984 +_ZN17GameModeAdventure8vfunc_1CEv kind:function(arm,size=0x24) addr:0x020c49d4 +_ZN17GameModeAdventure8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020c49f8 +_ZN18UnkStruct_027e09a47DestroyEv kind:function(arm,size=0x2c) addr:0x020c4a60 +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4a8cEP15UnkActorSystem1 kind:function(arm,size=0x34) addr:0x020c4a8c +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4ac0Ev kind:function(arm,size=0x50) addr:0x020c4ac0 +_ZN24UnkStruct_ov024_020d8660D1Ev kind:function(arm,size=0x14) addr:0x020c4b10 +_ZN24UnkStruct_ov024_020d8660C1Ev kind:function(arm,size=0x28) addr:0x020c4b24 +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4b4cEi kind:function(arm,size=0x54) addr:0x020c4b4c +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4ba0Ev kind:function(arm,size=0x128) addr:0x020c4ba0 +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4cc8Ev kind:function(arm,size=0xac) addr:0x020c4cc8 +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4d74Ev kind:function(arm,size=0x14) addr:0x020c4d74 +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4d88Eji kind:function(arm,size=0x24) addr:0x020c4d88 +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4dacEjiP21UnkActorSystem_Infos1 kind:function(arm,size=0x30) addr:0x020c4dac +_ZN8InstanceI24UnkStruct_ov024_020d8660EC2Ev kind:function(arm,size=0x10) addr:0x020c4ddc +_ZN8InstanceI24UnkStruct_ov024_020d8660ED2Ev kind:function(arm,size=0x14) addr:0x020c4dec +_ZN15UnkActorSystem1C1Ev kind:function(arm,size=0x18) addr:0x020c4e00 +_ZN15UnkActorSystem1D1Ev kind:function(arm,size=0x4) addr:0x020c4e18 +_ZN15UnkActorSystem1D0Ev kind:function(arm,size=0x14) addr:0x020c4e1c +_ZN15UnkActorSystem1D2Ev kind:function(arm,size=0x4) addr:0x020c4e30 +_ZN15UnkActorSystem18vfunc_08Ev kind:function(arm,size=0xc) addr:0x020c4e34 +_ZN15UnkActorSystem18vfunc_0CEv kind:function(arm,size=0xc) addr:0x020c4e40 +_ZN15UnkActorSystem18vfunc_10Ei kind:function(arm,size=0x4) addr:0x020c4e4c +_ZN15UnkActorSystem18vfunc_14Ei kind:function(arm,size=0x4) addr:0x020c4e50 +_ZN15UnkActorSystem18vfunc_18EPc kind:function(arm,size=0x4) addr:0x020c4e54 +_ZN15UnkActorSystem18vfunc_1CEi kind:function(arm,size=0x4) addr:0x020c4e58 +_ZN15UnkActorSystem18vfunc_20Ei kind:function(arm,size=0x4) addr:0x020c4e5c +_ZN15UnkActorSystem18vfunc_2CEv kind:function(arm,size=0x8) addr:0x020c4e60 +_ZN15UnkActorSystem2C1Eb kind:function(arm,size=0x58) addr:0x020c4e68 +_ZN15UnkActorSystem219func_ov024_020c4ec0Ev kind:function(arm,size=0x18) addr:0x020c4ec0 +_ZN15UnkActorSystem219func_ov024_020c4ed8Ev kind:function(arm,size=0x18) addr:0x020c4ed8 +_ZN15UnkActorSystem219func_ov024_020c4ef0Ev kind:function(arm,size=0x18) addr:0x020c4ef0 +_ZN15UnkActorSystem219func_ov024_020c4f08Ev kind:function(arm,size=0x10) addr:0x020c4f08 +_ZN15UnkActorSystem219func_ov024_020c4f18Ev kind:function(arm,size=0x10) addr:0x020c4f18 +_ZN15UnkActorSystem219func_ov024_020c4f28Ev kind:function(arm,size=0x24) addr:0x020c4f28 +_ZN15UnkActorSystem219func_ov024_020c4f4cEv kind:function(arm,size=0x10) addr:0x020c4f4c +_ZN15UnkActorSystem219func_ov024_020c4f5cEv kind:function(arm,size=0x10) addr:0x020c4f5c +_ZN15UnkActorSystem219func_ov024_020c4f6cEv kind:function(arm,size=0x10) addr:0x020c4f6c +_ZN15UnkActorSystem219func_ov024_020c4f7cEv kind:function(arm,size=0x8) addr:0x020c4f7c +_ZN15UnkActorSystem28vfunc_08EP5InputP12TouchControl kind:function(arm,size=0x8c) addr:0x020c4f84 +_ZN15UnkActorSystem28vfunc_10EPc kind:function(arm,size=0xfc) addr:0x020c5010 +_ZN15UnkActorSystem219func_ov024_020c510cEv kind:function(arm,size=0x14) addr:0x020c510c +_ZN15UnkActorSystem219func_ov024_020c5120Eb kind:function(arm,size=0x8) addr:0x020c5120 +_ZN15UnkActorSystem2D1Ev kind:function(arm,size=0x14) addr:0x020c5128 +_ZN15UnkActorSystem2D0Ev kind:function(arm,size=0x1c) addr:0x020c513c +_ZN20AdventureModeManagerD1Ev kind:function(arm,size=0x94) addr:0x020c5158 +_ZN20AdventureModeManagerD0Ev kind:function(arm,size=0x9c) addr:0x020c51ec +_ZN20AdventureModeManager19func_ov024_020c5288Ev kind:function(arm,size=0x18) addr:0x020c5288 +_ZN20AdventureModeManager19func_ov024_020c52a0Ev kind:function(arm,size=0x18) addr:0x020c52a0 +_ZN20AdventureModeManager19func_ov024_020c52b8Ev kind:function(arm,size=0x3c) addr:0x020c52b8 +_ZN20AdventureModeManager19func_ov024_020c52f4Ev kind:function(arm,size=0x18) addr:0x020c52f4 +_ZN20AdventureModeManager19func_ov024_020c530cEv kind:function(arm,size=0x58) addr:0x020c530c +_ZN20AdventureModeManager19func_ov024_020c5364Ev kind:function(arm,size=0x18) addr:0x020c5364 +_ZN20AdventureModeManager19func_ov024_020c537cEv kind:function(arm,size=0x6c) addr:0x020c537c +_ZN20AdventureModeManager19func_ov024_020c53e8Ev kind:function(arm,size=0x174) addr:0x020c53e8 +_ZN20AdventureModeManager19func_ov024_020c555cEi kind:function(arm,size=0x8) addr:0x020c555c +_ZN20AdventureModeManager8vfunc_24Ev kind:function(arm,size=0x788) addr:0x020c5564 +_ZN20AdventureModeManager19func_ov024_020c5cecEv kind:function(arm,size=0xc0) addr:0x020c5cec +_ZN20AdventureModeManager19func_ov024_020c5dacEv kind:function(arm,size=0x120) addr:0x020c5dac +_ZN20AdventureModeManager19func_ov024_020c5eccEv kind:function(arm,size=0xa4) addr:0x020c5ecc +_ZN20AdventureModeManager19func_ov024_020c5f70Ev kind:function(arm,size=0x184) addr:0x020c5f70 +_ZN20AdventureModeManager19func_ov024_020c60f4Ev kind:function(arm,size=0x148) addr:0x020c60f4 +_ZN20AdventureModeManager19func_ov024_020c623cEv kind:function(arm,size=0x8c) addr:0x020c623c +_ZN20AdventureModeManager8vfunc_28EPc kind:function(arm,size=0x60) addr:0x020c62c8 +_ZN20AdventureModeManager8vfunc_2CEPc kind:function(arm,size=0x138) addr:0x020c6328 +_ZN20AdventureModeManager8vfunc_34Eii kind:function(arm,size=0xa0) addr:0x020c6460 +_ZN20AdventureModeManager8vfunc_38Ejhss kind:function(arm,size=0x14) addr:0x020c6500 +_ZN20AdventureModeManager19func_ov024_020c6514Ejhss kind:function(arm,size=0x160) addr:0x020c6514 +_ZN20AdventureModeManager16GetMapPaintIndexEjh kind:function(arm,size=0x4c) addr:0x020c6674 +_ZN20AdventureModeManager19func_ov024_020c66c0Ev kind:function(arm,size=0x5c) addr:0x020c66c0 +_ZN20AdventureModeManager19func_ov024_020c671cEv kind:function(arm,size=0x54) addr:0x020c671c +_ZN20AdventureModeManager19func_ov024_020c6770Ejhss kind:function(arm,size=0xac) addr:0x020c6770 +_ZN20AdventureModeManager19func_ov024_020c681cEv kind:function(arm,size=0x24) addr:0x020c681c +_ZN20AdventureModeManager19func_ov024_020c6840Ej kind:function(arm,size=0x94) addr:0x020c6840 +_ZN20AdventureModeManager19func_ov024_020c68d4Ev kind:function(arm,size=0x18) addr:0x020c68d4 +_ZN20AdventureModeManager19func_ov024_020c68ecEii kind:function(arm,size=0x44) addr:0x020c68ec +_ZN20AdventureModeManager19func_ov024_020c6930Ev kind:function(arm,size=0x10) addr:0x020c6930 +_ZN20AdventureModeManager19func_ov024_020c6940Eii kind:function(arm,size=0x5c) addr:0x020c6940 +_ZN20AdventureModeManager19func_ov024_020c699cEv kind:function(arm,size=0x34) addr:0x020c699c +_ZN20AdventureModeManager19func_ov024_020c69d0Ev kind:function(arm,size=0x50) addr:0x020c69d0 +_ZN20AdventureModeManager19func_ov024_020c6a20Ev kind:function(arm,size=0x28) addr:0x020c6a20 +_ZN20AdventureModeManager19func_ov024_020c6a48Eii kind:function(arm,size=0xac) addr:0x020c6a48 +_ZN20AdventureModeManager19func_ov024_020c6af4Ei kind:function(arm,size=0x98) addr:0x020c6af4 +_ZN20AdventureModeManager19func_ov024_020c6b8cEv kind:function(arm,size=0xd4) addr:0x020c6b8c +_ZN20AdventureModeManager19func_ov024_020c6c60Ev kind:function(arm,size=0x74) addr:0x020c6c60 +_ZN20AdventureModeManager19func_ov024_020c6cd4Ev kind:function(arm,size=0x10) addr:0x020c6cd4 +_ZN20AdventureModeManager19func_ov024_020c6ce4Ev kind:function(arm,size=0x20) addr:0x020c6ce4 +_ZN20AdventureModeManager19func_ov024_020c6d04Ev kind:function(arm,size=0xc) addr:0x020c6d04 +_ZN20AdventureModeManager19func_ov024_020c6d10Ev kind:function(arm,size=0x10) addr:0x020c6d10 +_ZN20AdventureModeManager19func_ov024_020c6d20Ei kind:function(arm,size=0xc) addr:0x020c6d20 +_ZN20AdventureModeManager19func_ov024_020c6d2cEi kind:function(arm,size=0x38) addr:0x020c6d2c +_ZN20AdventureModeManager19func_ov024_020c6d64Ev kind:function(arm,size=0x54) addr:0x020c6d64 +_ZN20AdventureModeManager19func_ov024_020c6db8Ei kind:function(arm,size=0x34) addr:0x020c6db8 +_ZN20AdventureModeManager19func_ov024_020c6decEv kind:function(arm,size=0x4c) addr:0x020c6dec +_ZN24AdventureModeManager_1ACC1Ev kind:function(arm,size=0x2c) addr:0x020c6e38 +_ZN24AdventureModeManager_1ACD1Ev kind:function(arm,size=0x14) addr:0x020c6e64 +_ZN24AdventureModeManager_1ACD0Ev kind:function(arm,size=0x1c) addr:0x020c6e78 +_ZN24AdventureModeManager_1AC8vfunc_08EP5InputP12TouchControl kind:function(arm,size=0x18) addr:0x020c6e94 +_ZN24AdventureModeManager_1AC8vfunc_10EPc kind:function(arm,size=0x18) addr:0x020c6eac +_ZN24AdventureModeManager_1AC8vfunc_14EPc kind:function(arm,size=0x18) addr:0x020c6ec4 +_ZN24UnkStruct_ov024_020d86a07DestroyEv kind:function(arm,size=0x2c) addr:0x020c6edc +_ZN18UnkStruct_027e09987DestroyEv kind:function(arm,size=0x2c) addr:0x020c6f08 +_ZN18UnkStruct_027e0998D1Ev kind:function(arm,size=0x14) addr:0x020c6f34 +_ZN18UnkStruct_027e0998C1Ev kind:function(arm,size=0x20) addr:0x020c6f48 +_ZN18UnkStruct_027e09986CreateEv kind:function(arm,size=0x24) addr:0x020c6f68 +_ZN18UnkStruct_027e09988vfunc_00EP5Vec3pP5Vec2sPt kind:function(arm,size=0x1e0) addr:0x020c6f8c +_ZN18UnkStruct_027e099819func_ov024_020c716cEv kind:function(arm,size=0xa8) addr:0x020c716c +_ZN18UnkStruct_027e099819func_ov024_020c7214EP5Vec3pP5Vec2sPt kind:function(arm,size=0x68) addr:0x020c7214 +_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sPt kind:function(arm,size=0x84) addr:0x020c727c +_ZN18UnkStruct_027e099819func_ov024_020c7300Ei kind:function(arm,size=0x54) addr:0x020c7300 +_ZN18UnkStruct_027e099819func_ov024_020c7354Ev kind:function(arm,size=0x3c) addr:0x020c7354 +_ZN18UnkStruct_027e0cf86CreateEv kind:function(arm,size=0x24) addr:0x020c7390 +_ZN18UnkStruct_027e0cf8C1Ev kind:function(arm,size=0xf0) addr:0x020c73b4 +_ZN18UnkStruct_027e0cf8D1Ev kind:function(arm,size=0xb8) addr:0x020c74a4 +_ZN18UnkStruct_027e0cf819func_ov024_020c755cEPv kind:function(arm,size=0x74) addr:0x020c755c +_ZN18UnkStruct_027e0cf819func_ov024_020c75d0EPvit kind:function(arm,size=0x154) addr:0x020c75d0 +_ZN18UnkStruct_027e0cf819func_ov024_020c7724Ev kind:function(arm,size=0x2c) addr:0x020c7724 +_ZN18UnkStruct_027e0cf819func_ov024_020c7750Ev kind:function(arm,size=0x30) addr:0x020c7750 +_ZN18UnkStruct_027e0cf819func_ov024_020c7780Ev kind:function(arm,size=0x30) addr:0x020c7780 +_ZN18UnkStruct_027e0cf819func_ov024_020c77b0Ei kind:function(arm,size=0x10) addr:0x020c77b0 +_ZN18UnkStruct_027e0cf819func_ov024_020c77c0Ev kind:function(arm,size=0x10) addr:0x020c77c0 +_ZN18UnkStruct_027e0cf819func_ov024_020c77d0Ev kind:function(arm,size=0x10) addr:0x020c77d0 +_ZN18UnkStruct_027e0cf819func_ov024_020c77e0EP5Vec2s kind:function(arm,size=0x24) addr:0x020c77e0 +_ZN18UnkStruct_027e0cf819func_ov024_020c7804EP5Vec2s kind:function(arm,size=0x24) addr:0x020c7804 +_ZN18UnkStruct_027e0cf819func_ov024_020c7828Ei kind:function(arm,size=0x50) addr:0x020c7828 +_ZN18UnkStruct_027e0cf819func_ov024_020c7878Eit kind:function(arm,size=0xc) addr:0x020c7878 +_ZN18UnkStruct_027e0cf819func_ov024_020c7884Ev kind:function(arm,size=0x14) addr:0x020c7884 +_ZN18UnkStruct_027e0cf819func_ov024_020c7898Ev kind:function(arm,size=0x14) addr:0x020c7898 +_ZN18UnkStruct_027e0cf819func_ov024_020c78acEPiPs kind:function(arm,size=0x24) addr:0x020c78ac +_ZN18UnkStruct_027e0cf819func_ov024_020c78d0Ev kind:function(arm,size=0x14) addr:0x020c78d0 +_ZN18UnkStruct_027e0cf819func_ov024_020c78e4Ei kind:function(arm,size=0x1c) addr:0x020c78e4 +_ZN18UnkStruct_027e0cf819func_ov024_020c7900Ei kind:function(arm,size=0x1c) addr:0x020c7900 +_ZN8InstanceI18UnkStruct_027e0cf8EC2Ev kind:function(arm,size=0x10) addr:0x020c791c +_ZN8InstanceI18UnkStruct_027e0cf8ED2Ev kind:function(arm,size=0x14) addr:0x020c792c +_ZN27AdventureModeManager_160_4C8vfunc_0CEv kind:function(arm,size=0x18) addr:0x020c7940 +_ZN24AdventureModeManager_160C1EP23GameModeManagerBase_104P24AdventureModeManager_1B8 kind:function(arm,size=0xa8) addr:0x020c7958 +_ZN27AdventureModeManager_160_4CD1Ev kind:function(arm,size=0x14) addr:0x020c7a00 +_ZN24AdventureModeManager_160D1Ev kind:function(arm,size=0x30) addr:0x020c7a14 +_ZN24AdventureModeManager_160D0Ev kind:function(arm,size=0x38) addr:0x020c7a44 +_ZN24AdventureModeManager_1608vfunc_08Ei kind:function(arm,size=0x9c) addr:0x020c7a7c +_ZN24AdventureModeManager_1608vfunc_0CEi kind:function(arm,size=0x1a0) addr:0x020c7b18 +_ZN24AdventureModeManager_1608vfunc_10Eii kind:function(arm,size=0x24) addr:0x020c7cb8 +_ZN24AdventureModeManager_1608vfunc_14Ei kind:function(arm,size=0x20) addr:0x020c7cdc +_ZN24AdventureModeManager_16019func_ov024_020c7cfcEv kind:function(arm,size=0x50) addr:0x020c7cfc +_ZN24AdventureModeManager_16019func_ov024_020c7d4cEi kind:function(arm,size=0xf0) addr:0x020c7d4c +_ZN24AdventureModeManager_1608vfunc_18Ei kind:function(arm,size=0x118) addr:0x020c7e3c +_ZN24AdventureModeManager_1608vfunc_1CEi kind:function(arm,size=0x36c) addr:0x020c7f54 +_ZN24AdventureModeManager_1608vfunc_20Eii kind:function(arm,size=0xf8) addr:0x020c82c0 +_ZN24AdventureModeManager_1608vfunc_24Ev kind:function(arm,size=0x4) addr:0x020c83b8 +_ZN24AdventureModeManager_16019func_ov024_020c83bcEv kind:function(arm,size=0x6c) addr:0x020c83bc +_ZN24AdventureModeManager_16019func_ov024_020c8428Ev kind:function(arm,size=0x2c) addr:0x020c8428 +_ZN24AdventureModeManager_16019func_ov024_020c8454Ev kind:function(arm,size=0x30) addr:0x020c8454 +_ZN24AdventureModeManager_16019func_ov024_020c8484Ev kind:function(arm,size=0x40) addr:0x020c8484 +_ZN24AdventureModeManager_16019func_ov024_020c84c4Ev kind:function(arm,size=0x58) addr:0x020c84c4 +_ZN24AdventureModeManager_16019func_ov024_020c851cEi kind:function(arm,size=0x80) addr:0x020c851c +_ZN27AdventureModeManager_160_4CD0Ev kind:function(arm,size=0x1c) addr:0x020c859c +_ZN27AdventureModeManager_170_148vfunc_0CEv kind:function(arm,size=0x18) addr:0x020c85b8 +_ZN24AdventureModeManager_170C1EP23GameModeManagerBase_104 kind:function(arm,size=0x60) addr:0x020c85d0 +_ZN27AdventureModeManager_170_14D1Ev kind:function(arm,size=0x14) addr:0x020c8630 +_ZN24AdventureModeManager_170D1Ev kind:function(arm,size=0x20) addr:0x020c8644 +_ZN24AdventureModeManager_170D0Ev kind:function(arm,size=0x28) addr:0x020c8664 +_ZN24AdventureModeManager_1708vfunc_08Ei kind:function(arm,size=0x38) addr:0x020c868c +_ZN24AdventureModeManager_1708vfunc_0CEi kind:function(arm,size=0x74) addr:0x020c86c4 +_ZN24AdventureModeManager_1708vfunc_10Eii kind:function(arm,size=0xd4) addr:0x020c8738 +_ZN24AdventureModeManager_1708vfunc_18Ei kind:function(arm,size=0xc) addr:0x020c880c +_ZN24AdventureModeManager_1708vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020c8818 +_ZN27AdventureModeManager_170_14D0Ev kind:function(arm,size=0x1c) addr:0x020c8844 +_ZN32AdventureModeManager_174_Base_108vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c8860 +_ZN32AdventureModeManager_174_Base_108vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020c8870 +_ZN29AdventureModeManager_174_BaseC2EP23GameModeManagerBase_104 kind:function(thumb,size=0x64) addr:0x020c8880 +_ZN32AdventureModeManager_174_Base_10D1Ev kind:function(thumb,size=0xc) addr:0x020c88e4 +_ZN29AdventureModeManager_174_Base19func_ov024_020c88f0Ev kind:function(thumb,size=0x23c) addr:0x020c88f0 +_ZN29AdventureModeManager_174_Base19func_ov024_020c8b2cEv kind:function(thumb,size=0x1d4) addr:0x020c8b2c +_ZN32AdventureModeManager_174_Base_10D0Ev kind:function(arm,size=0x1c) addr:0x020c8d00 +_ZN29AdventureModeManager_174_BaseD1Ev kind:function(arm,size=0x20) addr:0x020c8d1c +_ZN29AdventureModeManager_174_BaseD0Ev kind:function(arm,size=0x28) addr:0x020c8d3c +_ZN24AdventureModeManager_174C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020c8d64 +_ZN24AdventureModeManager_1748vfunc_08Ei kind:function(thumb,size=0x58) addr:0x020c8d90 +_ZN24AdventureModeManager_1748vfunc_0CEi kind:function(thumb,size=0x48) addr:0x020c8de8 +_ZN24AdventureModeManager_1748vfunc_10Eii kind:function(thumb,size=0xac) addr:0x020c8e30 +_ZN24AdventureModeManager_1748vfunc_18Ei kind:function(thumb,size=0x6c) addr:0x020c8edc +_ZN24AdventureModeManager_1748vfunc_1CEi kind:function(thumb,size=0x40) addr:0x020c8f48 +_ZN24AdventureModeManager_1748vfunc_20Eii kind:function(thumb,size=0xc0) addr:0x020c8f88 +_ZN24AdventureModeManager_1748vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020c9048 +_ZN24AdventureModeManager_174D1Ev kind:function(arm,size=0x20) addr:0x020c904c +_ZN24AdventureModeManager_174D0Ev kind:function(arm,size=0x28) addr:0x020c906c +_ZN29AdventureModeManager_178_BaseC2EP23GameModeManagerBase_104 kind:function(thumb,size=0x14) addr:0x020c9094 +_ZN29AdventureModeManager_178_Base8vfunc_08Ei kind:function(thumb,size=0x2c) addr:0x020c90a8 +_ZN29AdventureModeManager_178_Base8vfunc_0CEi kind:function(thumb,size=0x1c) addr:0x020c90d4 +_ZN29AdventureModeManager_178_Base8vfunc_18Ei kind:function(thumb,size=0x2c) addr:0x020c90f0 +_ZN29AdventureModeManager_178_Base8vfunc_1CEi kind:function(thumb,size=0x1c) addr:0x020c911c +_ZN29AdventureModeManager_178_BaseD1Ev kind:function(arm,size=0x20) addr:0x020c9138 +_ZN29AdventureModeManager_178_BaseD0Ev kind:function(arm,size=0x28) addr:0x020c9158 +_ZN24AdventureModeManager_178C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020c9180 +_ZN24AdventureModeManager_1788vfunc_10Eii kind:function(thumb,size=0x24) addr:0x020c91ac +_ZN24AdventureModeManager_1788vfunc_20Eii kind:function(thumb,size=0x24) addr:0x020c91d0 +_ZN24AdventureModeManager_178D1Ev kind:function(arm,size=0x20) addr:0x020c91f4 +_ZN24AdventureModeManager_178D0Ev kind:function(arm,size=0x28) addr:0x020c9214 +_ZN27AdventureModeManager_180_188vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c923c +_ZN24AdventureModeManager_180C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x50) addr:0x020c924c +_ZN27AdventureModeManager_180_18D1Ev kind:function(thumb,size=0xc) addr:0x020c929c +_ZN24AdventureModeManager_180D1Ev kind:function(thumb,size=0x14) addr:0x020c92a8 +_ZN24AdventureModeManager_180D0Ev kind:function(thumb,size=0x1a) addr:0x020c92bc +_ZN24AdventureModeManager_1808vfunc_08Ei kind:function(thumb,size=0x64) addr:0x020c92d8 +_ZN24AdventureModeManager_1808vfunc_0CEi kind:function(thumb,size=0x90) addr:0x020c933c +_ZN24AdventureModeManager_1808vfunc_10Eii kind:function(thumb,size=0x64) addr:0x020c93cc +_ZN24AdventureModeManager_18019func_ov024_020c9430Eii kind:function(thumb,size=0x24) addr:0x020c9430 +_ZN24AdventureModeManager_1808vfunc_18Ei kind:function(thumb,size=0x30) addr:0x020c9454 +_ZN24AdventureModeManager_1808vfunc_1CEi kind:function(thumb,size=0x78) addr:0x020c9484 +_ZN24AdventureModeManager_1808vfunc_20Eii kind:function(thumb,size=0x7c) addr:0x020c94fc +_ZN24AdventureModeManager_1808vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020c9578 +_ZN24AdventureModeManager_18019func_ov024_020c957cEv kind:function(thumb,size=0x48) addr:0x020c957c +_ZN24AdventureModeManager_18019func_ov024_020c95c4Ev kind:function(thumb,size=0x48) addr:0x020c95c4 +_ZN27AdventureModeManager_180_18D0Ev kind:function(arm,size=0x1c) addr:0x020c960c +_ZN24AdventureModeManager_184C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x30) addr:0x020c9628 +_ZN24AdventureModeManager_184D1Ev kind:function(thumb,size=0xc) addr:0x020c9658 +_ZN24AdventureModeManager_184D0Ev kind:function(thumb,size=0x12) addr:0x020c9664 +_ZN24AdventureModeManager_1848vfunc_08Ei kind:function(thumb,size=0x20) addr:0x020c9678 +_ZN24AdventureModeManager_1848vfunc_0CEi kind:function(thumb,size=0xf8) addr:0x020c9698 +_ZN24AdventureModeManager_1848vfunc_10Eii kind:function(thumb,size=0x8) addr:0x020c9790 +_ZN24AdventureModeManager_1848vfunc_14Ei kind:function(thumb,size=0x2) addr:0x020c9798 +_ZN24AdventureModeManager_18419func_ov024_020c979cEi kind:function(thumb,size=0x94) addr:0x020c979c +_ZN24AdventureModeManager_1848vfunc_18Ei kind:function(thumb,size=0x7c) addr:0x020c9830 +_ZN24AdventureModeManager_1848vfunc_1CEi kind:function(thumb,size=0x60) addr:0x020c98ac +_ZN24AdventureModeManager_1848vfunc_20Eii kind:function(thumb,size=0x5c) addr:0x020c990c +_ZN24AdventureModeManager_1848vfunc_24Ev kind:function(thumb,size=0x8) addr:0x020c9968 +_ZN27AdventureModeManager_18C_14C1Ev kind:function(thumb,size=0x14) addr:0x020c9970 +_ZN27AdventureModeManager_18C_148vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020c9984 +_ZN27AdventureModeManager_18C_148vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020c9994 +_ZN24AdventureModeManager_18CC1EP23GameModeManagerBase_104 kind:function(thumb,size=0x68) addr:0x020c99a4 +_ZN27AdventureModeManager_18C_14D1Ev kind:function(thumb,size=0xc) addr:0x020c9a0c +_ZN24AdventureModeManager_18CD1Ev kind:function(thumb,size=0x14) addr:0x020c9a18 +_ZN24AdventureModeManager_18CD0Ev kind:function(thumb,size=0x1a) addr:0x020c9a2c +_ZN24AdventureModeManager_18C8vfunc_08Ei kind:function(thumb,size=0x32) addr:0x020c9a48 +_ZN24AdventureModeManager_18C8vfunc_0CEi kind:function(thumb,size=0xf0) addr:0x020c9a7c +_ZN24AdventureModeManager_18C8vfunc_10Eii kind:function(thumb,size=0x100) addr:0x020c9b6c +_ZN24AdventureModeManager_18C19func_ov024_020c9c6cEv kind:function(thumb,size=0xb4) addr:0x020c9c6c +_ZN24AdventureModeManager_18C8vfunc_14Ei kind:function(thumb,size=0x10) addr:0x020c9d20 +_ZN24AdventureModeManager_18C8vfunc_18Ei kind:function(thumb,size=0xac) addr:0x020c9d30 +_ZN24AdventureModeManager_18C8vfunc_1CEi kind:function(thumb,size=0x88) addr:0x020c9ddc +_ZN24AdventureModeManager_18C8vfunc_20Eii kind:function(thumb,size=0x1c4) addr:0x020c9e64 +_ZN24AdventureModeManager_18C8vfunc_24Ev kind:function(thumb,size=0xa) addr:0x020ca028 +_ZN24AdventureModeManager_18C19func_ov024_020ca034Ev kind:function(thumb,size=0x34) addr:0x020ca034 +_ZN24AdventureModeManager_18C19func_ov024_020ca068Ei kind:function(thumb,size=0xc) addr:0x020ca068 +_ZN24AdventureModeManager_18C19func_ov024_020ca074Ev kind:function(thumb,size=0x6) addr:0x020ca074 +_ZN27AdventureModeManager_18C_14D0Ev kind:function(arm,size=0x1c) addr:0x020ca07c +_ZN27AdventureModeManager_190_148vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020ca098 +_ZN27AdventureModeManager_190_388vfunc_0CEv kind:function(thumb,size=0xc) addr:0x020ca0a8 +_ZN24AdventureModeManager_190C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x54) addr:0x020ca0b4 +_ZN27AdventureModeManager_190_14D1Ev kind:function(thumb,size=0xc) addr:0x020ca108 +_ZN27AdventureModeManager_190_38D1Ev kind:function(thumb,size=0xc) addr:0x020ca114 +_ZN24AdventureModeManager_1908vfunc_08Ei kind:function(thumb,size=0xc) addr:0x020ca120 +_ZN24AdventureModeManager_1908vfunc_0CEi kind:function(thumb,size=0x20) addr:0x020ca12c +_ZN24AdventureModeManager_1908vfunc_10Eii kind:function(thumb,size=0x3c) addr:0x020ca14c +_ZN24AdventureModeManager_1908vfunc_18Ei kind:function(thumb,size=0xc) addr:0x020ca188 +_ZN24AdventureModeManager_1908vfunc_1CEi kind:function(thumb,size=0x20) addr:0x020ca194 +_ZN24AdventureModeManager_1908vfunc_20Eii kind:function(thumb,size=0x68) addr:0x020ca1b4 +_ZN24AdventureModeManager_19019func_ov024_020ca21cEv kind:function(thumb,size=0x30) addr:0x020ca21c +_ZN24AdventureModeManager_19019func_ov024_020ca24cEi kind:function(thumb,size=0x34) addr:0x020ca24c +_ZN24AdventureModeManager_19019func_ov024_020ca280Ev kind:function(thumb,size=0x10) addr:0x020ca280 +_ZN27AdventureModeManager_190_14D0Ev kind:function(arm,size=0x1c) addr:0x020ca290 +_ZN27AdventureModeManager_190_38D0Ev kind:function(arm,size=0x1c) addr:0x020ca2ac +_ZN24AdventureModeManager_190D1Ev kind:function(arm,size=0x28) addr:0x020ca2c8 +_ZN24AdventureModeManager_190D0Ev kind:function(arm,size=0x30) addr:0x020ca2f0 +_ZN30AdventureModeManager_15C_20_00C1Eb kind:function(arm,size=0x16c) addr:0x020ca320 +_ZN30AdventureModeManager_15C_20_0019func_ov024_020ca48cEv kind:function(arm,size=0x13c) addr:0x020ca48c +_ZN30AdventureModeManager_15C_20_0019func_ov024_020ca5c8Ev kind:function(arm,size=0x90) addr:0x020ca5c8 +_ZN30AdventureModeManager_15C_20_0019func_ov024_020ca658Ev kind:function(arm,size=0x50) addr:0x020ca658 +_ZN30AdventureModeManager_15C_20_008vfunc_08EP5InputP12TouchControl kind:function(arm,size=0x2d0) addr:0x020ca6a8 +_ZN30AdventureModeManager_15C_20_00D1Ev kind:function(arm,size=0x6c) addr:0x020ca978 +_ZN30AdventureModeManager_15C_20_00D0Ev kind:function(arm,size=0x74) addr:0x020ca9e4 +_ZN23UnkAdventureModeSystem1C2EPsPsi kind:function(arm,size=0xa4) addr:0x020caa58 +_ZN23UnkAdventureModeSystem1C2Ei kind:function(arm,size=0x5c) addr:0x020caafc +_ZN23UnkAdventureModeSystem119func_ov024_020cab58Ev kind:function(arm,size=0x4c) addr:0x020cab58 +_ZN23UnkAdventureModeSystem119func_ov024_020caba4Ev kind:function(arm,size=0x1d8) addr:0x020caba4 +_ZN23UnkAdventureModeSystem119func_ov024_020cad7cEv kind:function(arm,size=0x24) addr:0x020cad7c +_ZN24UnkStruct_ov024_020d86946CreateEP23GameModeManagerBase_004 kind:function(arm,size=0x2c) addr:0x020cada0 +_ZN24UnkStruct_ov024_020d8694C1Ev kind:function(arm,size=0xec) addr:0x020cadcc +_ZN24UnkStruct_ov024_020d8694D1Ev kind:function(arm,size=0x7c) addr:0x020caeb8 +_ZN24UnkStruct_ov024_020d8694D0Ev kind:function(arm,size=0x84) addr:0x020caf34 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cafb8Ev kind:function(arm,size=0x20) addr:0x020cafb8 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cafd8Ev kind:function(arm,size=0x28) addr:0x020cafd8 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb000Ev kind:function(arm,size=0x20) addr:0x020cb000 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb020Ev kind:function(arm,size=0x20) addr:0x020cb020 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb040Ev kind:function(arm,size=0x14) addr:0x020cb040 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb054Ev kind:function(arm,size=0x58) addr:0x020cb054 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb0acEv kind:function(arm,size=0x18) addr:0x020cb0ac +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb0c4Ev kind:function(arm,size=0x30) addr:0x020cb0c4 +_ZN24UnkStruct_ov024_020d86948vfunc_08EP5InputP12TouchControl kind:function(arm,size=0x3c) addr:0x020cb0f4 +_ZN24UnkStruct_ov024_020d86948vfunc_10EPc kind:function(arm,size=0x48) addr:0x020cb130 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb178Ev kind:function(arm,size=0x1c) addr:0x020cb178 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb194Ev kind:function(arm,size=0x38) addr:0x020cb194 func_ov024_020cb1cc kind:function(arm,size=0x10) addr:0x020cb1cc func_ov024_020cb1dc kind:function(arm,size=0x14) addr:0x020cb1dc -func_ov024_020cb1f0 kind:function(arm,size=0x84) addr:0x020cb1f0 +_ZN19UnkTitleCardSystem1C2EP23GameModeManagerBase_004 kind:function(arm,size=0x84) addr:0x020cb1f0 func_ov024_020cb274 kind:function(arm,size=0xc) addr:0x020cb274 func_ov024_020cb280 kind:function(arm,size=0x4) addr:0x020cb280 func_ov024_020cb284 kind:function(arm,size=0x20c) addr:0x020cb284 func_ov024_020cb490 kind:function(arm,size=0x11c) addr:0x020cb490 -func_ov024_020cb5ac kind:function(arm,size=0x8) addr:0x020cb5ac -func_ov024_020cb5b4 kind:function(arm,size=0x4) addr:0x020cb5b4 -func_ov024_020cb5b8 kind:function(arm,size=0x4) addr:0x020cb5b8 +_ZN19UnkTitleCardSystem18vfunc_08Ev kind:function(arm,size=0x8) addr:0x020cb5ac +_ZN19UnkTitleCardSystem18vfunc_0CEv kind:function(arm,size=0x4) addr:0x020cb5b4 +_ZN19UnkTitleCardSystem18vfunc_10Ev kind:function(arm,size=0x4) addr:0x020cb5b8 func_ov024_020cb5bc kind:function(arm,size=0x3c) addr:0x020cb5bc -func_ov024_020cb5f8 kind:function(arm,size=0x4) addr:0x020cb5f8 -func_ov024_020cb5fc kind:function(arm,size=0x58) addr:0x020cb5fc +_ZN19UnkTitleCardSystem18vfunc_00Ev kind:function(arm,size=0x4) addr:0x020cb5f8 +_ZN19UnkTitleCardSystem18vfunc_04Ev kind:function(arm,size=0x58) addr:0x020cb5fc func_ov024_020cb654 kind:function(arm,size=0x25c) addr:0x020cb654 -func_ov024_020cb8b0 kind:function(arm,size=0x14) addr:0x020cb8b0 -func_ov024_020cb8c4 kind:function(arm,size=0x8) addr:0x020cb8c4 -func_ov024_020cb8cc kind:function(arm,size=0x38) addr:0x020cb8cc -func_ov024_020cb904 kind:function(arm,size=0x114) addr:0x020cb904 -func_ov024_020cba18 kind:function(arm,size=0x80) addr:0x020cba18 -func_ov024_020cba98 kind:function(arm,size=0x338) addr:0x020cba98 -func_ov024_020cbdd0 kind:function(arm,size=0xc4) addr:0x020cbdd0 +_ZN19UnkTitleCardSystem18vfunc_14Ev kind:function(arm,size=0x14) addr:0x020cb8b0 +_ZN19UnkTitleCardSystem18vfunc_18Ev kind:function(arm,size=0x8) addr:0x020cb8c4 +_ZN28UnkTitleCardSystem1_Derived1C2EP23GameModeManagerBase_004 kind:function(arm,size=0x38) addr:0x020cb8cc +_ZN28UnkTitleCardSystem1_Derived18vfunc_1CEv kind:function(arm,size=0x114) addr:0x020cb904 +_ZN28UnkTitleCardSystem1_Derived18vfunc_08Ev kind:function(arm,size=0x80) addr:0x020cba18 +_ZN28UnkTitleCardSystem1_Derived18vfunc_0CEv kind:function(arm,size=0x338) addr:0x020cba98 +_ZN28UnkTitleCardSystem1_Derived18vfunc_10Ev kind:function(arm,size=0xc4) addr:0x020cbdd0 func_ov024_020cbe94 kind:function(arm,size=0x24) addr:0x020cbe94 func_ov024_020cbeb8 kind:function(arm,size=0xbc) addr:0x020cbeb8 func_ov024_020cbf74 kind:function(arm,size=0x24) addr:0x020cbf74 @@ -324,43 +324,43 @@ func_ov024_020cbf98 kind:function(arm,size=0xc4) addr:0x020cbf98 func_ov024_020cc05c kind:function(arm,size=0x2c) addr:0x020cc05c func_ov024_020cc088 kind:function(arm,size=0x2c) addr:0x020cc088 func_ov024_020cc0b4 kind:function(arm,size=0x8c) addr:0x020cc0b4 -func_ov024_020cc140 kind:function(arm,size=0x14) addr:0x020cc140 -func_ov024_020cc154 kind:function(arm,size=0x30) addr:0x020cc154 -func_ov024_020cc184 kind:function(arm,size=0xa8) addr:0x020cc184 -func_ov024_020cc22c kind:function(arm,size=0x22c) addr:0x020cc22c -func_ov024_020cc458 kind:function(arm,size=0x28) addr:0x020cc458 -func_ov024_020cc480 kind:function(arm,size=0x54) addr:0x020cc480 -func_ov024_020cc4d4 kind:function(arm,size=0x1e0) addr:0x020cc4d4 -func_ov024_020cc6b4 kind:function(arm,size=0x88) addr:0x020cc6b4 -func_ov024_020cc73c kind:function(arm,size=0x30) addr:0x020cc73c -func_ov024_020cc76c kind:function(arm,size=0x20) addr:0x020cc76c -func_ov024_020cc78c kind:function(arm,size=0x364) addr:0x020cc78c -func_ov024_020ccaf0 kind:function(arm,size=0x20) addr:0x020ccaf0 +_ZN28UnkTitleCardSystem1_Derived18vfunc_18Ev kind:function(arm,size=0x14) addr:0x020cc140 +_ZN28UnkStruct_ov024_020d8694_01CC1EP23GameModeManagerBase_004 kind:function(arm,size=0x30) addr:0x020cc154 +_ZN28UnkStruct_ov024_020d8694_01C8vfunc_1CEv kind:function(arm,size=0xa8) addr:0x020cc184 +_ZN28UnkStruct_ov024_020d8694_01C8vfunc_00Ev kind:function(arm,size=0x22c) addr:0x020cc22c +_ZN28UnkStruct_ov024_020d8694_188C1EP23GameModeManagerBase_004 kind:function(arm,size=0x28) addr:0x020cc458 +_ZN28UnkStruct_ov024_020d8694_1888vfunc_1CEv kind:function(arm,size=0x54) addr:0x020cc480 +_ZN28UnkStruct_ov024_020d8694_1888vfunc_00Ev kind:function(arm,size=0x1e0) addr:0x020cc4d4 +_ZN28UnkStruct_ov024_020d8694_1888vfunc_04Ev kind:function(arm,size=0x88) addr:0x020cc6b4 +_ZN28UnkStruct_ov024_020d8694_1888vfunc_14Ev kind:function(arm,size=0x30) addr:0x020cc73c +_ZN28UnkStruct_ov024_020d8694_2FCC1EP23GameModeManagerBase_004 kind:function(arm,size=0x20) addr:0x020cc76c +_ZN28UnkStruct_ov024_020d8694_2FC8vfunc_00Ev kind:function(arm,size=0x364) addr:0x020cc78c +_ZN28UnkStruct_ov024_020d8694_2FC8vfunc_10Ev kind:function(arm,size=0x20) addr:0x020ccaf0 func_ov024_020ccb10 kind:function(arm,size=0x17c) addr:0x020ccb10 -func_ov024_020ccc8c kind:function(arm,size=0x8) addr:0x020ccc8c -func_ov024_020ccc94 kind:function(arm,size=0x88) addr:0x020ccc94 +_ZN28UnkStruct_ov024_020d8694_2FC8vfunc_08Ev kind:function(arm,size=0x8) addr:0x020ccc8c +_ZN28UnkStruct_ov024_020d8694_2FC8vfunc_0CEv kind:function(arm,size=0x88) addr:0x020ccc94 func_ov024_020ccd1c kind:function(arm,size=0x24) addr:0x020ccd1c func_ov024_020ccd40 kind:function(arm,size=0x19c) addr:0x020ccd40 func_ov024_020ccedc kind:function(arm,size=0xd8) addr:0x020ccedc _ZN19func_ov024_020ccfb4D0Ev kind:function(arm,size=0xe0) addr:0x020ccfb4 -func_ov024_020cd094 kind:function(arm,size=0xbc) addr:0x020cd094 -func_ov024_020cd150 kind:function(arm,size=0x94) addr:0x020cd150 +_ZN18UnkStruct_020d869819func_ov024_020cd094Ev kind:function(arm,size=0xbc) addr:0x020cd094 +_ZN18UnkStruct_020d869819func_ov024_020cd150Ev kind:function(arm,size=0x94) addr:0x020cd150 func_ov024_020cd1e4 kind:function(arm,size=0x98) addr:0x020cd1e4 func_ov024_020cd27c kind:function(arm,size=0xcc) addr:0x020cd27c func_ov024_020cd348 kind:function(arm,size=0x10) addr:0x020cd348 func_ov024_020cd358 kind:function(arm,size=0x10) addr:0x020cd358 _ZN18UnkStruct_020d869819func_ov024_020cd368Ebb kind:function(arm,size=0x3c) addr:0x020cd368 -func_ov024_020cd3a4 kind:function(arm,size=0x2c) addr:0x020cd3a4 +_ZN18UnkStruct_020d869819func_ov024_020cd3a4Ev kind:function(arm,size=0x2c) addr:0x020cd3a4 _ZN18UnkStruct_020d869819func_ov024_020cd3d0Ev kind:function(arm,size=0x10) addr:0x020cd3d0 _ZN18UnkStruct_020d869819func_ov024_020cd3e0Ei kind:function(arm,size=0x10) addr:0x020cd3e0 _ZN18UnkStruct_020d869819func_ov024_020cd3f0Ei kind:function(arm,size=0x10) addr:0x020cd3f0 -func_ov024_020cd400 kind:function(arm,size=0x10) addr:0x020cd400 +_ZN18UnkStruct_020d869819func_ov024_020cd400Ev kind:function(arm,size=0x10) addr:0x020cd400 _ZN18UnkStruct_020d869819func_ov024_020cd410Ev kind:function(arm,size=0x10) addr:0x020cd410 -func_ov024_020cd420 kind:function(arm,size=0x38) addr:0x020cd420 +_ZN18UnkStruct_020d869819func_ov024_020cd420Ev kind:function(arm,size=0x38) addr:0x020cd420 _ZN18UnkStruct_020d869819func_ov024_020cd458Eji kind:function(arm,size=0x4c) addr:0x020cd458 func_ov024_020cd4a4 kind:function(arm,size=0x40) addr:0x020cd4a4 -func_ov024_020cd4e4 kind:function(arm,size=0xdc) addr:0x020cd4e4 -func_ov024_020cd5c0 kind:function(arm,size=0x44) addr:0x020cd5c0 +_ZN18UnkStruct_020d869819func_ov024_020cd4e4Et kind:function(arm,size=0xdc) addr:0x020cd4e4 +_ZN18UnkStruct_020d869819func_ov024_020cd5c0Et kind:function(arm,size=0x44) addr:0x020cd5c0 func_ov024_020cd604 kind:function(arm,size=0x6c) addr:0x020cd604 func_ov024_020cd670 kind:function(arm,size=0xf8) addr:0x020cd670 func_ov024_020cd768 kind:function(arm,size=0xc) addr:0x020cd768 @@ -406,57 +406,57 @@ func_ov024_020cf888 kind:function(arm,size=0x4) addr:0x020cf888 func_ov024_020cf88c kind:function(arm,size=0xb8) addr:0x020cf88c func_ov024_020cf944 kind:function(arm,size=0x10) addr:0x020cf944 func_ov024_020cf954 kind:function(arm,size=0x14) addr:0x020cf954 -func_ov024_020cf968 kind:function(arm,size=0x68) addr:0x020cf968 -func_ov024_020cf9d0 kind:function(arm,size=0x4) addr:0x020cf9d0 +_ZN21UnkStruct_027e0cf8_00C1Ev kind:function(arm,size=0x68) addr:0x020cf968 +_ZN21UnkStruct_027e0cf8_00D1Ev kind:function(arm,size=0x4) addr:0x020cf9d0 func_ov024_020cf9d4 kind:function(arm,size=0x1a8) addr:0x020cf9d4 -func_ov024_020cfb7c kind:function(arm,size=0x1d8) addr:0x020cfb7c +_ZN21UnkStruct_027e0cf8_0019func_ov024_020cfb7cEPvP5Vec2sitii kind:function(arm,size=0x1d8) addr:0x020cfb7c func_ov024_020cfd54 kind:function(arm,size=0xd0) addr:0x020cfd54 func_ov024_020cfe24 kind:function(arm,size=0x48) addr:0x020cfe24 func_ov024_020cfe6c kind:function(arm,size=0x28) addr:0x020cfe6c func_ov024_020cfe94 kind:function(arm,size=0x3c) addr:0x020cfe94 func_ov024_020cfed0 kind:function(arm,size=0x4c) addr:0x020cfed0 func_ov024_020cff1c kind:function(arm,size=0x2c) addr:0x020cff1c -func_ov024_020cff48 kind:function(arm,size=0x40) addr:0x020cff48 -func_ov024_020cff88 kind:function(arm,size=0x4) addr:0x020cff88 -func_ov024_020cff8c kind:function(arm,size=0x78) addr:0x020cff8c -func_ov024_020d0004 kind:function(arm,size=0x28) addr:0x020d0004 +_ZN21UnkStruct_027e0cf8_0CC1Ev kind:function(arm,size=0x40) addr:0x020cff48 +_ZN21UnkStruct_027e0cf8_0CD1Ev kind:function(arm,size=0x4) addr:0x020cff88 +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020cff8cEPvP5Vec2s kind:function(arm,size=0x78) addr:0x020cff8c +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d0004Ev kind:function(arm,size=0x28) addr:0x020d0004 func_ov024_020d002c kind:function(arm,size=0x194) addr:0x020d002c func_ov024_020d01c0 kind:function(arm,size=0x120) addr:0x020d01c0 -func_ov024_020d02e0 kind:function(arm,size=0x60) addr:0x020d02e0 -func_ov024_020d0340 kind:function(arm,size=0xb8) addr:0x020d0340 -func_ov024_020d03f8 kind:function(arm,size=0x24) addr:0x020d03f8 -func_ov024_020d041c kind:function(arm,size=0xf4) addr:0x020d041c +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d02e0Ev kind:function(arm,size=0x60) addr:0x020d02e0 +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d0340Ev kind:function(arm,size=0xb8) addr:0x020d0340 +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d03f8EP5Vec2s kind:function(arm,size=0x24) addr:0x020d03f8 +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d041cEP5Vec2s kind:function(arm,size=0xf4) addr:0x020d041c func_ov024_020d0510 kind:function(arm,size=0xa0) addr:0x020d0510 -func_ov024_020d05b0 kind:function(arm,size=0x3c) addr:0x020d05b0 -func_ov024_020d05ec kind:function(arm,size=0x94) addr:0x020d05ec -_ZN19func_ov024_020d0680D0Ev kind:function(arm,size=0x18) addr:0x020d0680 -func_ov024_020d0698 kind:function(arm,size=0x38) addr:0x020d0698 -func_ov024_020d06d0 kind:function(arm,size=0x5c) addr:0x020d06d0 -func_ov024_020d072c kind:function(arm,size=0x18) addr:0x020d072c -func_ov024_020d0744 kind:function(arm,size=0x1e0) addr:0x020d0744 -func_ov024_020d0924 kind:function(arm,size=0x140) addr:0x020d0924 -func_ov024_020d0a64 kind:function(arm,size=0x238) addr:0x020d0a64 -func_ov024_020d0c9c kind:function(arm,size=0x118) addr:0x020d0c9c -func_ov024_020d0db4 kind:function(arm,size=0x44) addr:0x020d0db4 -func_ov024_020d0df8 kind:function(arm,size=0x6c) addr:0x020d0df8 -func_ov024_020d0e64 kind:function(arm,size=0x34) addr:0x020d0e64 -func_ov024_020d0e98 kind:function(arm,size=0x28) addr:0x020d0e98 -func_ov024_020d0ec0 kind:function(arm,size=0x4c) addr:0x020d0ec0 -func_ov024_020d0f0c kind:function(arm,size=0x20) addr:0x020d0f0c -func_ov024_020d0f2c kind:function(arm,size=0x24) addr:0x020d0f2c -func_ov024_020d0f50 kind:function(arm,size=0x50) addr:0x020d0f50 -func_ov024_020d0fa0 kind:function(arm,size=0x14) addr:0x020d0fa0 -func_ov024_020d0fb4 kind:function(arm,size=0x198) addr:0x020d0fb4 -func_ov024_020d114c kind:function(arm,size=0x14) addr:0x020d114c -func_ov024_020d1160 kind:function(arm,size=0x204) addr:0x020d1160 -func_ov024_020d1364 kind:function(arm,size=0x68) addr:0x020d1364 -func_ov024_020d13cc kind:function(arm,size=0xdc) addr:0x020d13cc -func_ov024_020d14a8 kind:function(arm,size=0xbc) addr:0x020d14a8 -func_ov024_020d1564 kind:function(arm,size=0xb0) addr:0x020d1564 -func_ov024_020d1614 kind:function(arm,size=0x24) addr:0x020d1614 -func_ov024_020d1638 kind:function(arm,size=0x20) addr:0x020d1638 +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d05d0Eii kind:function(arm,size=0x3c) addr:0x020d05b0 +_ZN29AdventureModeManager_1B8_BaseC2EhbPK32AdventureModeManager_1B8_Base_1Cbb kind:function(arm,size=0x94) addr:0x020d05ec +_ZN29AdventureModeManager_1B8_BaseD2Ev kind:function(arm,size=0x18) addr:0x020d0680 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0698Ev kind:function(arm,size=0x38) addr:0x020d0698 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d06d0Ev kind:function(arm,size=0x5c) addr:0x020d06d0 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d072cEPc kind:function(arm,size=0x18) addr:0x020d072c +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0744Eiiiihh kind:function(arm,size=0x1e0) addr:0x020d0744 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0924Eiihh kind:function(arm,size=0x140) addr:0x020d0924 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0a64Ev kind:function(arm,size=0x238) addr:0x020d0a64 +_ZN29AdventureModeManager_1B8_Base13TryLoadBGCharEPvjj kind:function(arm,size=0x118) addr:0x020d0c9c +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0db4Eii kind:function(arm,size=0x44) addr:0x020d0db4 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0df8Eii kind:function(arm,size=0x6c) addr:0x020d0df8 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0e64EPvj kind:function(arm,size=0x34) addr:0x020d0e64 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0e98Ev kind:function(arm,size=0x28) addr:0x020d0e98 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0ec0EPiib kind:function(arm,size=0x4c) addr:0x020d0ec0 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0f0cEPii kind:function(arm,size=0x20) addr:0x020d0f0c +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0f2cEii kind:function(arm,size=0x24) addr:0x020d0f2c +_ZN24AdventureModeManager_1B8C1Ehbb kind:function(arm,size=0x50) addr:0x020d0f50 +_ZN24AdventureModeManager_1B8D1Ev kind:function(arm,size=0x14) addr:0x020d0fa0 +_ZN24AdventureModeManager_1B819func_ov024_020d0fb4EiihhP12TouchControl kind:function(arm,size=0x198) addr:0x020d0fb4 +_ZN24AdventureModeManager_1B819func_ov024_020d114cEv kind:function(arm,size=0x14) addr:0x020d114c +_ZN24AdventureModeManager_1B819func_ov024_020d1160Ev kind:function(arm,size=0x204) addr:0x020d1160 +_ZN24AdventureModeManager_1B819func_ov024_020d1364Ev kind:function(arm,size=0x68) addr:0x020d1364 +_ZN24AdventureModeManager_1B819func_ov024_020d13ccEi kind:function(arm,size=0xdc) addr:0x020d13cc +_ZN24AdventureModeManager_1B819func_ov024_020d14a8EP32AdventureModeManager_1B8_Base_1CiPi kind:function(arm,size=0xbc) addr:0x020d14a8 +_ZN24AdventureModeManager_1B819func_ov024_020d1564EPK32AdventureModeManager_1B8_Base_1CiPih kind:function(arm,size=0xb0) addr:0x020d1564 +_ZN24AdventureModeManager_1B819func_ov024_020d1614EPv kind:function(arm,size=0x24) addr:0x020d1614 +_ZN24AdventureModeManager_1B819func_ov024_020d1638Ev kind:function(arm,size=0x20) addr:0x020d1638 func_ov024_020d1658 kind:function(arm,size=0x24) addr:0x020d1658 -func_ov024_020d167c kind:function(arm,size=0x18) addr:0x020d167c +_ZN24UnkStruct_ov024_020d86a019func_ov024_020d167cEv kind:function(arm,size=0x18) addr:0x020d167c func_ov024_020d1694 kind:function(arm,size=0x28) addr:0x020d1694 _ZN19func_ov024_020d16bcD1Ev kind:function(arm,size=0x14) addr:0x020d16bc _ZN19func_ov024_020d16d0D0Ev kind:function(arm,size=0x1c) addr:0x020d16d0 @@ -532,16 +532,16 @@ func_ov024_020d308c kind:function(arm,size=0x74) addr:0x020d308c func_ov024_020d3100 kind:function(arm,size=0x40) addr:0x020d3100 func_ov024_020d3140 kind:function(arm,size=0x18) addr:0x020d3140 func_ov024_020d3158 kind:function(arm,size=0xa0) addr:0x020d3158 -func_ov024_020d31f8 kind:function(arm,size=0x88) addr:0x020d31f8 -func_ov024_020d3280 kind:function(arm,size=0x34) addr:0x020d3280 +_ZN21UnkStruct_027e0cf8_08C1Ev kind:function(arm,size=0x88) addr:0x020d31f8 +_ZN21UnkStruct_027e0cf8_08D1Ev kind:function(arm,size=0x34) addr:0x020d3280 func_ov024_020d32b4 kind:function(arm,size=0x24) addr:0x020d32b4 -func_ov024_020d32d8 kind:function(arm,size=0x10) addr:0x020d32d8 -func_ov024_020d32e8 kind:function(arm,size=0x3c) addr:0x020d32e8 -func_ov024_020d3324 kind:function(arm,size=0x24) addr:0x020d3324 -func_ov024_020d3348 kind:function(arm,size=0x24) addr:0x020d3348 +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d32d8Ev kind:function(arm,size=0x10) addr:0x020d32d8 +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d32e8EP5Vec2s kind:function(arm,size=0x3c) addr:0x020d32e8 +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d3324EPv kind:function(arm,size=0x24) addr:0x020d3324 +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d3348EPvitii kind:function(arm,size=0x24) addr:0x020d3348 func_ov024_020d336c kind:function(arm,size=0xa0) addr:0x020d336c -func_ov024_020d340c kind:function(arm,size=0x10) addr:0x020d340c -func_ov024_020d341c kind:function(arm,size=0xc) addr:0x020d341c +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d340cEv kind:function(arm,size=0x10) addr:0x020d340c +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d341cEi kind:function(arm,size=0xc) addr:0x020d341c func_ov024_020d3428 kind:function(arm,size=0x78) addr:0x020d3428 func_ov024_020d34a0 kind:function(arm,size=0x7c) addr:0x020d34a0 func_ov024_020d351c kind:function(arm,size=0x154) addr:0x020d351c @@ -695,8 +695,8 @@ _ZN14MiscAdvManager15GetNumPostcardsEv kind:function(arm,size=0x10) addr:0x020d6 _ZN14MiscAdvManager13GivePriceCardEi kind:function(arm,size=0x30) addr:0x020d656c _ZN14MiscAdvManager13PostPriceCardEii kind:function(arm,size=0x74) addr:0x020d659c _ZN14MiscAdvManager19func_ov024_020d6610Ev kind:function(arm,size=0x1c) addr:0x020d6610 -_ZN14MiscAdvManager11SetInstanceEPS_ kind:function(arm,size=0x10) addr:0x020d662c -_ZN14MiscAdvManager13ClearInstanceEv kind:function(arm,size=0x14) addr:0x020d663c +_ZN8InstanceI14MiscAdvManagerEC2Ev kind:function(arm,size=0x10) addr:0x020d662c +_ZN8InstanceI14MiscAdvManagerED2Ev kind:function(arm,size=0x14) addr:0x020d663c func_ov024_020d6650 kind:function(thumb,size=0x16) addr:0x020d6650 _ZN26ActorUnk_ov000_020a8bb0_ec19func_ov024_020d6668Ev kind:function(thumb,size=0x16) addr:0x020d6668 func_ov024_020d6680 kind:function(arm,size=0x40) addr:0x020d6680 @@ -732,8 +732,8 @@ data_ov024_020d740a kind:data(any) addr:0x020d740a data_ov024_020d741e kind:data(any) addr:0x020d741e data_ov024_020d7432 kind:data(any) addr:0x020d7432 data_ov024_020d7454 kind:data(any) addr:0x020d7454 -data_ov024_020d7544 kind:data(any) addr:0x020d7544 -data_ov024_020d7547 kind:data(any) addr:0x020d7547 +data_ov024_020d7544 kind:data(any) addr:0x020d7544 local +data_ov024_020d7547 kind:data(any) addr:0x020d7547 local data_ov024_020d7550 kind:data(any) addr:0x020d7550 data_ov024_020d7555 kind:data(any) addr:0x020d7555 data_ov024_020d7560 kind:data(any) addr:0x020d7560 @@ -762,48 +762,48 @@ data_ov024_020d78c0 kind:data(any) addr:0x020d78c0 ambiguous data_ov024_020d78c2 kind:data(any) addr:0x020d78c2 ambiguous __sinit_ov024_020d78e8 kind:function(arm,size=0x38) addr:0x020d78e8 __sinit_ov024_020d7920 kind:function(arm,size=0x120) addr:0x020d7920 -__sinit_ov024_020d7a40 kind:function(arm,size=0x2c) addr:0x020d7a40 +__sinit_AdventureModeManager_1B8_Base_024.cpp kind:function(arm,size=0x2c) addr:0x020d7a40 local __sinit_ov024_020d7a6c kind:function(arm,size=0x48) addr:0x020d7a6c __sinit_ov024_020d7ab4 kind:function(arm,size=0x18) addr:0x020d7ab4 __sinit_ov024_020d7acc kind:function(arm,size=0x18) addr:0x020d7acc __sinit_ActorUnkOBPC.cpp kind:function(arm,size=0x50) addr:0x020d7ae4 .p__sinit_ov024_020d78e8 kind:data(word) addr:0x020d7b34 .p__sinit_ov024_020d7920 kind:data(word) addr:0x020d7b38 -.p__sinit_ov024_020d7a40 kind:data(word) addr:0x020d7b3c +.p__sinit_AdventureModeManager_1B8_Base_024.cpp kind:data(word) addr:0x020d7b3c local .p__sinit_ov024_020d7a6c kind:data(word) addr:0x020d7b40 .p__sinit_ov024_020d7ab4 kind:data(word) addr:0x020d7b44 .p__sinit_ov024_020d7acc kind:data(word) addr:0x020d7b48 .p__sinit_ActorUnkOBPC.cpp kind:data(word) addr:0x020d7b4c -_ZTV19data_ov024_020d7b60 kind:data(any) addr:0x020d7b60 -data_ov024_020d7b98 kind:data(any) addr:0x020d7b98 -_ZTV19data_ov024_020d7bc8 kind:data(any) addr:0x020d7bc8 -_ZTV19data_ov024_020d7bec kind:data(any) addr:0x020d7bec -_ZTV19data_ov024_020d7c10 kind:data(any) addr:0x020d7c10 -data_ov024_020d7c60 kind:data(any) addr:0x020d7c60 -data_ov024_020d7c74 kind:data(any) addr:0x020d7c74 -data_ov024_020d7c78 kind:data(any) addr:0x020d7c78 -data_ov024_020d7c84 kind:data(any) addr:0x020d7c84 -data_ov024_020d7c98 kind:data(any) addr:0x020d7c98 -_ZTV19data_ov024_020d7c9c kind:data(any) addr:0x020d7c9c -data_ov024_020d7cc0 kind:data(any) addr:0x020d7cc0 -_ZTV19data_ov024_020d7ce8 kind:data(any) addr:0x020d7ce8 -_ZTV19data_ov024_020d7d04 kind:data(any) addr:0x020d7d04 -_ZTV19data_ov024_020d7d34 kind:data(any) addr:0x020d7d34 -_ZTV19data_ov024_020d7d50 kind:data(any) addr:0x020d7d50 -_ZTV19data_ov024_020d7d80 kind:data(any) addr:0x020d7d80 -_ZTV19data_ov024_020d7db0 kind:data(any) addr:0x020d7db0 -_ZTV19data_ov024_020d7de0 kind:data(any) addr:0x020d7de0 -_ZTV19data_ov024_020d7e10 kind:data(any) addr:0x020d7e10 -_ZTV19data_ov024_020d7e2c kind:data(any) addr:0x020d7e2c -data_ov024_020d7e64 kind:data(any) addr:0x020d7e64 -_ZTV19data_ov024_020d7e8c kind:data(any) addr:0x020d7e8c -data_ov024_020d7eb0 kind:data(any) addr:0x020d7eb0 -_ZTV19data_ov024_020d7ed8 kind:data(any) addr:0x020d7ed8 -_ZTV19data_ov024_020d7ef4 kind:data(any) addr:0x020d7ef4 -_ZTV19data_ov024_020d7f10 kind:data(any) addr:0x020d7f10 +_ZTV17GameModeAdventure kind:data(any) addr:0x020d7b60 +_ZTV15UnkActorSystem1 kind:data(any) addr:0x020d7b90 +_ZTV15UnkActorSystem2 kind:data(any) addr:0x020d7bc8 +_ZTV24AdventureModeManager_1AC kind:data(any) addr:0x020d7bec +_ZTV20AdventureModeManager kind:data(any) addr:0x020d7c10 +@2869 kind:data(any) addr:0x020d7c60 local +@2870 kind:data(any) addr:0x020d7c74 local +@2871 kind:data(byte[11]) addr:0x020d7c78 local +@2872 kind:data(byte[10]) addr:0x020d7c84 local +_ZTV18UnkStruct_027e0998 kind:data(any) addr:0x020d7c90 +_ZTV27AdventureModeManager_160_4C kind:data(any) addr:0x020d7c9c +_ZTV24AdventureModeManager_160 kind:data(any) addr:0x020d7cb8 +_ZTV27AdventureModeManager_170_14 kind:data(any) addr:0x020d7ce8 +_ZTV24AdventureModeManager_170 kind:data(any) addr:0x020d7d04 +_ZTV32AdventureModeManager_174_Base_10 kind:data(any) addr:0x020d7d34 +_ZTV29AdventureModeManager_174_Base kind:data(any) addr:0x020d7d50 +_ZTV24AdventureModeManager_174 kind:data(any) addr:0x020d7d80 +_ZTV29AdventureModeManager_178_Base kind:data(any) addr:0x020d7db0 +_ZTV24AdventureModeManager_178 kind:data(any) addr:0x020d7de0 +_ZTV27AdventureModeManager_180_18 kind:data(any) addr:0x020d7e10 +_ZTV24AdventureModeManager_180 kind:data(any) addr:0x020d7e2c +_ZTV24AdventureModeManager_184 kind:data(any) addr:0x020d7e5c +_ZTV27AdventureModeManager_18C_14 kind:data(any) addr:0x020d7e8c +_ZTV24AdventureModeManager_18C kind:data(any) addr:0x020d7ea8 +_ZTV27AdventureModeManager_190_38 kind:data(any) addr:0x020d7ed8 +_ZTV27AdventureModeManager_190_14 kind:data(any) addr:0x020d7ef4 +_ZTV24AdventureModeManager_190 kind:data(any) addr:0x020d7f10 data_ov024_020d7f40 kind:data(any) addr:0x020d7f40 -_ZTV19data_ov024_020d7f50 kind:data(any) addr:0x020d7f50 -data_ov024_020d7f7c kind:data(any) addr:0x020d7f7c +_ZTV30AdventureModeManager_15C_20_00 kind:data(any) addr:0x020d7f50 +_ZTV19data_ov024_020d7f7c kind:data(any) addr:0x020d7f74 _ZTV19data_ov024_020d7f80 kind:data(any) addr:0x020d7f80 data_ov024_020d7fac kind:data(any) addr:0x020d7fac data_ov024_020d7fd0 kind:data(any) addr:0x020d7fd0 @@ -817,7 +817,7 @@ data_ov024_020d8098 kind:data(any) addr:0x020d8098 data_ov024_020d809e kind:data(any) addr:0x020d809e data_ov024_020d80a2 kind:data(any) addr:0x020d80a2 data_ov024_020d80a3 kind:data(any) addr:0x020d80a3 -data_ov024_020d8200 kind:data(any) addr:0x020d8200 +data_ov024_020d8200 kind:data(any) addr:0x020d8200 local _ZTV19data_ov024_020d8208 kind:data(any) addr:0x020d8208 data_ov024_020d8224 kind:data(any) addr:0x020d8224 data_ov024_020d8244 kind:data(any) addr:0x020d8244 @@ -899,11 +899,12 @@ data_ov024_020d85bc kind:data(any) addr:0x020d85bc _ZTV19data_ov024_020d85d4 kind:data(any) addr:0x020d85d4 _ZTV19data_ov024_020d85f8 kind:data(any) addr:0x020d85f8 data_ov024_020d8660 kind:bss addr:0x020d8660 -data_ov024_020d8668 kind:bss addr:0x020d8668 -data_ov024_020d8674 kind:bss addr:0x020d8674 +_ZGVZN24UnkStruct_ov024_020d866019func_ov024_020c4ac0EvE8instance kind:bss addr:0x020d8664 local +@1365 kind:bss addr:0x020d8668 local +_ZZN24UnkStruct_ov024_020d866019func_ov024_020c4ac0EvE8instance kind:bss addr:0x020d8674 local data_ov024_020d8694 kind:bss addr:0x020d8694 data_ov024_020d8698 kind:bss addr:0x020d8698 -data_ov024_020d869c kind:bss addr:0x020d869c +data_ov024_020d869c kind:bss(size=0x2) addr:0x020d869c local data_ov024_020d86a0 kind:bss addr:0x020d86a0 data_ov024_020d86a4 kind:bss addr:0x020d86a4 data_ov024_020d86a8 kind:bss addr:0x020d86a8 diff --git a/config/eur/arm9/overlays/ov025/relocs.txt b/config/eur/arm9/overlays/ov025/relocs.txt index c25c3f22..977ecb9e 100644 --- a/config/eur/arm9/overlays/ov025/relocs.txt +++ b/config/eur/arm9/overlays/ov025/relocs.txt @@ -90,7 +90,7 @@ from:0x020c4dac kind:load to:0x020c5b1c add:0x8 module:overlay(25) from:0x020c4db0 kind:load to:0x02049be0 module:main from:0x020c4db4 kind:load to:0x020c5b4c module:overlay(25) from:0x020c4db8 kind:load to:0x020c5b60 module:overlay(25) -from:0x020c4dc0 kind:load to:0x0204aeac module:main +from:0x020c4dc0 kind:load to:0x0204a110 add:0xd9c module:main from:0x020c4ddc kind:arm_call to:0x0206d83c module:overlay(0) from:0x020c4de4 kind:arm_call to:0x020c5964 module:overlay(25) from:0x020c4dec kind:arm_call to:0x02016694 module:main @@ -139,7 +139,7 @@ from:0x020c5184 kind:arm_call to:0x020609c4 module:overlay(0) from:0x020c51d4 kind:arm_call to:0x0201c4d8 module:main from:0x020c51ec kind:arm_call to:0x0201c504 module:main from:0x020c51f8 kind:load to:0x020c5aec module:overlay(25) -from:0x020c51fc kind:load to:0x0204aeac module:main +from:0x020c51fc kind:load to:0x0204a110 add:0xd9c module:main from:0x020c5238 kind:arm_call to:0x020c4e54 module:overlay(25) from:0x020c5374 kind:arm_call to:0x0201f04c module:main from:0x020c5380 kind:arm_call to:0x02060af8 module:overlay(0) @@ -167,7 +167,7 @@ from:0x020c5664 kind:arm_call to:0x020c592c module:overlay(25) from:0x020c5670 kind:arm_call to:0x0201c494 module:main from:0x020c5684 kind:arm_call to:0x020c5964 module:overlay(25) from:0x020c5690 kind:arm_call to:0x0201c494 module:main -from:0x020c5698 kind:load to:0x0204aeac module:main +from:0x020c5698 kind:load to:0x0204a110 add:0xd9c module:main from:0x020c5700 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x020c5724 kind:arm_call to:0x0201aad0 module:main from:0x020c5750 kind:arm_call to:0x0205fc20 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov025/symbols.txt b/config/eur/arm9/overlays/ov025/symbols.txt index 72b1df50..63363463 100644 --- a/config/eur/arm9/overlays/ov025/symbols.txt +++ b/config/eur/arm9/overlays/ov025/symbols.txt @@ -16,7 +16,7 @@ _ZN18TitleScreenManager8vfunc_18Ev kind:function(arm,size=0x34) addr:0x020c4b88 _ZN18TitleScreenManager8vfunc_24Ev kind:function(arm,size=0x20) addr:0x020c4bbc _ZN18TitleScreenManager8vfunc_28EPc kind:function(arm,size=0x20) addr:0x020c4bdc _ZN18TitleScreenManager8vfunc_2CEPc kind:function(arm,size=0x20) addr:0x020c4bfc -_ZN18TitleScreenManager8vfunc_38Eiiii kind:function(arm,size=0x4) addr:0x020c4c1c +_ZN18TitleScreenManager8vfunc_38Ejhss kind:function(arm,size=0x4) addr:0x020c4c1c _ZN18TitleScreenManager19func_ov025_020c4c20Ev kind:function(arm,size=0x10) addr:0x020c4c20 _ZN18TitleScreenManager19func_ov025_020c4c30Ev kind:function(arm,size=0x10) addr:0x020c4c30 _ZN18TitleScreenManagerD1Ev kind:function(arm,size=0x14) addr:0x020c4c40 diff --git a/config/eur/arm9/overlays/ov026/relocs.txt b/config/eur/arm9/overlays/ov026/relocs.txt index 53dcaf04..fe0df21c 100644 --- a/config/eur/arm9/overlays/ov026/relocs.txt +++ b/config/eur/arm9/overlays/ov026/relocs.txt @@ -9,9 +9,9 @@ from:0x020d87a8 kind:arm_call to:0x02011ff4 module:main from:0x020d87d4 kind:arm_call to:0x02061230 module:overlay(0) from:0x020d87e0 kind:arm_call to:0x0201ced8 module:main from:0x020d87e8 kind:load to:0x0204a088 module:main -from:0x020d87ec kind:load to:0x0204aeb8 module:main +from:0x020d87ec kind:load to:0x0204a110 add:0xda8 module:main from:0x020d8814 kind:arm_call to:0x02061230 module:overlay(0) -from:0x020d881c kind:load to:0x0204ae10 module:main +from:0x020d881c kind:load to:0x0204a110 add:0xd00 module:main from:0x020d8820 kind:load to:0x0204a088 module:main from:0x020d8848 kind:arm_call to:0x02018c2c module:main from:0x020d8850 kind:arm_call to:0x020b734c module:overlay(7) @@ -23,10 +23,10 @@ from:0x020d88c0 kind:arm_call to:0x020cb0c4 module:overlay(24) from:0x020d88d8 kind:arm_call to:0x0201cf30 module:main from:0x020d88e4 kind:arm_call to:0x02018c2c module:main from:0x020d88ec kind:load to:0x020d8694 module:overlay(24) -from:0x020d88f0 kind:load to:0x0204aeb8 module:main +from:0x020d88f0 kind:load to:0x0204a110 add:0xda8 module:main from:0x020d88f4 kind:load to:0x0204a110 module:main from:0x020d8924 kind:arm_call to:0x02061230 module:overlay(0) -from:0x020d892c kind:load to:0x0204ae10 module:main +from:0x020d892c kind:load to:0x0204a110 add:0xd00 module:main from:0x020d8930 kind:load to:0x0204a088 module:main from:0x020d893c kind:arm_call to:0x020c1014 module:overlay(1) from:0x020d8964 kind:arm_call to:0x020611dc module:overlay(0) @@ -133,7 +133,7 @@ from:0x020d9254 kind:arm_call to:0x02011ff4 module:main from:0x020d9280 kind:arm_call to:0x020d92c0 module:overlay(26) from:0x020d9284 kind:arm_call to:0x0205c92c module:overlay(0) from:0x020d928c kind:arm_call to:0x020fa7c0 module:overlay(26) -from:0x020d92bc kind:load to:0x0204ae10 module:main +from:0x020d92bc kind:load to:0x0204a110 add:0xd00 module:main from:0x020d92cc kind:arm_call to:0x020d9594 module:overlay(26) from:0x020d92dc kind:arm_call to:0x020d95f0 module:overlay(26) from:0x020d92e0 kind:arm_call to:0x0205c92c module:overlay(0) @@ -146,7 +146,7 @@ from:0x020d94cc kind:arm_call to:0x0201aa44 module:main from:0x020d9500 kind:arm_call to:0x0201aa44 module:main from:0x020d9524 kind:arm_call to:0x0201aa44 module:main from:0x020d9584 kind:arm_call to:0x0201aa44 module:main -from:0x020d958c kind:load to:0x0204ae10 module:main +from:0x020d958c kind:load to:0x0204a110 add:0xd00 module:main from:0x020d9590 kind:load to:0x0204af1c module:main from:0x020d959c kind:arm_call to:0x0205c92c module:overlay(0) from:0x020d95a4 kind:arm_call to:0x020fa7c0 module:overlay(26) @@ -212,7 +212,7 @@ from:0x020d9ffc kind:arm_call to:0x020e6f70 module:overlay(26) from:0x020da044 kind:arm_call to:0x020da4ac module:overlay(26) from:0x020da04c kind:arm_call to:0x020da484 module:overlay(26) from:0x020da054 kind:load to:0x02138d10 module:overlay(26) -from:0x020da05c kind:load to:0x0204aeac module:main +from:0x020da05c kind:load to:0x0204a110 add:0xd9c module:main from:0x020da060 kind:load to:0x027e0ce0 module:dtcm from:0x020da064 kind:load to:0x027e09b8 module:dtcm from:0x020da068 kind:load to:0x020b5214 module:overlay(0) @@ -223,14 +223,14 @@ from:0x020da15c kind:arm_call to:0x0201f04c module:main from:0x020da170 kind:arm_call to:0x0201c4d8 module:main from:0x020da17c kind:load to:0x0204a110 module:main from:0x020da180 kind:load to:0x02135324 module:overlay(26) -from:0x020da184 kind:load to:0x0204aeac module:main +from:0x020da184 kind:load to:0x0204a110 add:0xd9c module:main from:0x020da204 kind:arm_call to:0x0201eed4 module:main from:0x020da240 kind:arm_call to:0x0201effc module:main from:0x020da270 kind:arm_call to:0x0201f04c module:main from:0x020da284 kind:arm_call to:0x0201c4d8 module:main from:0x020da290 kind:load to:0x0204a110 module:main from:0x020da294 kind:load to:0x02135324 module:overlay(26) -from:0x020da298 kind:load to:0x0204aeac module:main +from:0x020da298 kind:load to:0x0204a110 add:0xd9c module:main from:0x020da2dc kind:arm_call to:0x02028c4c module:main from:0x020da32c kind:arm_call to:0x0201ef78 module:main from:0x020da338 kind:arm_call to:0x0201ef78 module:main @@ -308,7 +308,7 @@ from:0x020dadb0 kind:arm_call to:0x02060028 module:overlay(0) from:0x020dadb4 kind:arm_call to:0x0205c92c module:overlay(0) from:0x020dadbc kind:arm_call to:0x020e79f4 module:overlay(26) from:0x020daddc kind:load to:0x02138d10 module:overlay(26) -from:0x020dade4 kind:load to:0x0204aeac module:main +from:0x020dade4 kind:load to:0x0204a110 add:0xd9c module:main from:0x020dade8 kind:load to:0x027e0ce0 module:dtcm from:0x020dadec kind:load to:0x027e09b8 module:dtcm from:0x020dadf0 kind:load to:0x02135384 module:overlay(26) @@ -322,13 +322,13 @@ from:0x020daf88 kind:arm_call to:0x0201effc module:main from:0x020dafbc kind:arm_call to:0x0201f04c module:main from:0x020dafd0 kind:arm_call to:0x0201c4d8 module:main from:0x020dafdc kind:load to:0x02135344 module:overlay(26) -from:0x020dafe0 kind:load to:0x0204aeac module:main +from:0x020dafe0 kind:load to:0x0204a110 add:0xd9c module:main from:0x020db024 kind:arm_call to:0x0201eed4 module:main from:0x020db060 kind:arm_call to:0x0201effc module:main from:0x020db094 kind:arm_call to:0x0201f04c module:main from:0x020db0a8 kind:arm_call to:0x0201c4d8 module:main from:0x020db0b4 kind:load to:0x02135344 module:overlay(26) -from:0x020db0b8 kind:load to:0x0204aeac module:main +from:0x020db0b8 kind:load to:0x0204a110 add:0xd9c module:main from:0x020db0f4 kind:arm_call to:0x0201667c module:main from:0x020db108 kind:arm_call to:0x020196b0 module:main from:0x020db138 kind:arm_call to:0x0205fc20 module:overlay(0) @@ -381,7 +381,7 @@ from:0x020db960 kind:arm_call to:0x0201aa44 module:main from:0x020db970 kind:arm_call to:0x0201ef78 module:main from:0x020db9f4 kind:arm_call to:0x0202851c module:main from:0x020dba3c kind:arm_call to:0x0201aa44 module:main -from:0x020dba48 kind:load to:0x0204aeac module:main +from:0x020dba48 kind:load to:0x0204a110 add:0xd9c module:main from:0x020dba4c kind:load to:0x0204af1c module:main from:0x020dba8c kind:arm_call to:0x0201eed4 module:main from:0x020dbac0 kind:load to:0x02135398 module:overlay(26) @@ -768,7 +768,7 @@ from:0x020de8f4 kind:load to:0x02135428 module:overlay(26) from:0x020de8f8 kind:load to:0x02138e64 module:overlay(26) from:0x020de8fc kind:load to:0x027e09bc module:dtcm from:0x020de900 kind:load to:0x0203e964 module:main -from:0x020de904 kind:load to:0x0204aeac module:main +from:0x020de904 kind:load to:0x0204a110 add:0xd9c module:main from:0x020de92c kind:arm_call to:0x0205c92c module:overlay(0) from:0x020de9b4 kind:load to:0x0203e964 module:main from:0x020de9b8 kind:load to:0x021323a0 module:overlay(26) diff --git a/config/eur/arm9/overlays/ov026/symbols.txt b/config/eur/arm9/overlays/ov026/symbols.txt index f4e1dd81..7bde3b99 100644 --- a/config/eur/arm9/overlays/ov026/symbols.txt +++ b/config/eur/arm9/overlays/ov026/symbols.txt @@ -1,4 +1,4 @@ -func_ov026_020d8720 kind:function(arm,size=0x64) addr:0x020d8720 +_ZN24AdventureModeManager_164C1EP23GameModeManagerBase_104P23GameModeManagerBase_004 kind:function(arm,size=0x64) addr:0x020d8720 _ZN19func_ov026_020d8784D1Ev kind:function(arm,size=0x14) addr:0x020d8784 _ZN19func_ov026_020d8798D0Ev kind:function(arm,size=0x1c) addr:0x020d8798 func_ov026_020d87b4 kind:function(arm,size=0x3c) addr:0x020d87b4 @@ -7,7 +7,7 @@ func_ov026_020d8824 kind:function(arm,size=0x84) addr:0x020d8824 func_ov026_020d88a8 kind:function(arm,size=0x50) addr:0x020d88a8 func_ov026_020d88f8 kind:function(arm,size=0x3c) addr:0x020d88f8 func_ov026_020d8934 kind:function(arm,size=0x40) addr:0x020d8934 -func_ov026_020d8974 kind:function(arm,size=0x6c) addr:0x020d8974 +_ZN24AdventureModeManager_16CC1EP23GameModeManagerBase_104 kind:function(arm,size=0x6c) addr:0x020d8974 _ZN19func_ov026_020d89e0D1Ev kind:function(arm,size=0x14) addr:0x020d89e0 _ZN19func_ov026_020d89f4D0Ev kind:function(arm,size=0x1c) addr:0x020d89f4 func_ov026_020d8a10 kind:function(arm,size=0x38) addr:0x020d8a10 @@ -18,11 +18,11 @@ func_ov026_020d8b94 kind:function(arm,size=0x38) addr:0x020d8b94 func_ov026_020d8bcc kind:function(arm,size=0x48) addr:0x020d8bcc func_ov026_020d8c14 kind:function(arm,size=0x16c) addr:0x020d8c14 func_ov026_020d8d80 kind:function(arm,size=0x54) addr:0x020d8d80 -func_ov026_020d8dd4 kind:function(arm,size=0x5c) addr:0x020d8dd4 -func_ov026_020d8e30 kind:function(arm,size=0x14) addr:0x020d8e30 -func_ov026_020d8e44 kind:function(arm,size=0x14) addr:0x020d8e44 -func_ov026_020d8e58 kind:function(arm,size=0x10) addr:0x020d8e58 -func_ov026_020d8e68 kind:function(arm,size=0x40) addr:0x020d8e68 +_ZN24AdventureModeManager_16C19func_ov026_020d8dd4Ei kind:function(arm,size=0x5c) addr:0x020d8dd4 +_ZN24AdventureModeManager_16C19func_ov026_020d8e30Ev kind:function(arm,size=0x14) addr:0x020d8e30 +_ZN24AdventureModeManager_16C19func_ov026_020d8e44Ev kind:function(arm,size=0x14) addr:0x020d8e44 +_ZN24AdventureModeManager_16C19func_ov026_020d8e58Ev kind:function(arm,size=0x10) addr:0x020d8e58 +_ZN24AdventureModeManager_19CC1EP23GameModeManagerBase_104 kind:function(arm,size=0x40) addr:0x020d8e68 func_ov026_020d8ea8 kind:function(arm,size=0x24) addr:0x020d8ea8 func_ov026_020d8ecc kind:function(arm,size=0xa8) addr:0x020d8ecc func_ov026_020d8f74 kind:function(arm,size=0x1c) addr:0x020d8f74 @@ -85,9 +85,9 @@ func_ov026_020dbfc8 kind:function(arm,size=0xd0) addr:0x020dbfc8 func_ov026_020dc098 kind:function(arm,size=0x10) addr:0x020dc098 func_ov026_020dc0a8 kind:function(arm,size=0x9c) addr:0x020dc0a8 func_ov026_020dc144 kind:function(arm,size=0x18c) addr:0x020dc144 -func_ov026_020dc2d0 kind:function(arm,size=0x10) addr:0x020dc2d0 -func_ov026_020dc2e0 kind:function(arm,size=0x20) addr:0x020dc2e0 -func_ov026_020dc300 kind:function(arm,size=0x3c) addr:0x020dc300 +_ZN25UnkStruct_027e0ce0_38_15819func_ov026_020dc2d0Ev kind:function(arm,size=0x10) addr:0x020dc2d0 +_ZN21UnkStruct_027e0cf8_04C1Ev kind:function(arm,size=0x20) addr:0x020dc2e0 +_ZN21UnkStruct_027e0cf8_0419func_ov026_020dc300Ev kind:function(arm,size=0x3c) addr:0x020dc300 func_ov026_020dc33c kind:function(arm,size=0x58) addr:0x020dc33c func_ov026_020dc394 kind:function(arm,size=0x6c) addr:0x020dc394 func_ov026_020dc400 kind:function(arm,size=0x34) addr:0x020dc400 @@ -129,14 +129,14 @@ func_ov026_020e0224 kind:function(arm,size=0xba0) addr:0x020e0224 func_ov026_020e0dc4 kind:function(arm,size=0x64) addr:0x020e0dc4 func_ov026_020e0e28 kind:function(arm,size=0x568) addr:0x020e0e28 func_ov026_020e1390 kind:function(arm,size=0x64) addr:0x020e1390 -func_ov026_020e13f4 kind:function(arm,size=0x4c) addr:0x020e13f4 -func_ov026_020e1440 kind:function(arm,size=0xdc) addr:0x020e1440 +_ZN24UnkStruct_ov026_02138d1019func_ov026_020e13f4Ev kind:function(arm,size=0x4c) addr:0x020e13f4 +_ZN24UnkStruct_ov026_02138d1019func_ov026_020e1440Ev kind:function(arm,size=0xdc) addr:0x020e1440 func_ov026_020e151c kind:function(arm,size=0x10c) addr:0x020e151c func_ov026_020e1628 kind:function(arm,size=0x18) addr:0x020e1628 func_ov026_020e1640 kind:function(arm,size=0x120) addr:0x020e1640 func_ov026_020e1760 kind:function(arm,size=0x18) addr:0x020e1760 func_ov026_020e1778 kind:function(arm,size=0x184) addr:0x020e1778 -func_ov026_020e18fc kind:function(arm,size=0x2c) addr:0x020e18fc +_ZN24UnkStruct_ov026_02138d1019func_ov026_020e18fcEv kind:function(arm,size=0x2c) addr:0x020e18fc func_ov026_020e1928 kind:function(arm,size=0x138) addr:0x020e1928 func_ov026_020e1a60 kind:function(arm,size=0x4) addr:0x020e1a60 func_ov026_020e1a64 kind:function(arm,size=0x18) addr:0x020e1a64 @@ -210,7 +210,7 @@ func_ov026_020e67a4 kind:function(arm,size=0x64) addr:0x020e67a4 func_ov026_020e6808 kind:function(arm,size=0xcc) addr:0x020e6808 func_ov026_020e68d4 kind:function(arm,size=0xcc) addr:0x020e68d4 func_ov026_020e69a0 kind:function(arm,size=0xcc) addr:0x020e69a0 -func_ov026_020e6a6c kind:function(arm,size=0x64) addr:0x020e6a6c +_ZN24UnkStruct_ov026_02138d1019func_ov026_020e6a6cEv kind:function(arm,size=0x64) addr:0x020e6a6c func_ov026_020e6ad0 kind:function(arm,size=0x38) addr:0x020e6ad0 func_ov026_020e6b08 kind:function(arm,size=0x24) addr:0x020e6b08 func_ov026_020e6b2c kind:function(arm,size=0x24) addr:0x020e6b2c @@ -681,8 +681,8 @@ _ZN19func_ov026_020f46e0D1Ev kind:function(arm,size=0x70) addr:0x020f46e0 _ZN19func_ov026_020f4750D0Ev kind:function(arm,size=0x78) addr:0x020f4750 func_ov026_020f47c8 kind:function(arm,size=0x68) addr:0x020f47c8 func_ov026_020f4830 kind:function(arm,size=0x14) addr:0x020f4830 -func_ov026_020f4844 kind:function(arm,size=0x2c) addr:0x020f4844 -func_ov026_020f4870 kind:function(arm,size=0x298) addr:0x020f4870 +_ZN24UnkStruct_ov026_0213f57819func_ov026_020f4844Ev kind:function(arm,size=0x2c) addr:0x020f4844 +_ZN24UnkStruct_027e0ce0_38_1019func_ov026_020f4870Ev kind:function(arm,size=0x298) addr:0x020f4870 func_ov026_020f4b08 kind:function(arm,size=0x24) addr:0x020f4b08 func_ov026_020f4b2c kind:function(arm,size=0x34) addr:0x020f4b2c func_ov026_020f4b60 kind:function(arm,size=0x28) addr:0x020f4b60 @@ -808,7 +808,7 @@ func_ov026_020f7b44 kind:function(arm,size=0x40) addr:0x020f7b44 func_ov026_020f7b84 kind:function(arm,size=0xe0) addr:0x020f7b84 func_ov026_020f7c64 kind:function(arm,size=0x24) addr:0x020f7c64 func_ov026_020f7c88 kind:function(arm,size=0x38) addr:0x020f7c88 -func_ov026_020f7cc0 kind:function(arm,size=0x24) addr:0x020f7cc0 +_ZN24UnkStruct_ov026_0213f59019func_ov026_020f7cc0Ev kind:function(arm,size=0x24) addr:0x020f7cc0 func_ov026_020f7ce4 kind:function(arm,size=0x74) addr:0x020f7ce4 func_ov026_020f7d58 kind:function(arm,size=0x74) addr:0x020f7d58 func_ov026_020f7dcc kind:function(arm,size=0x3c) addr:0x020f7dcc diff --git a/config/eur/arm9/overlays/ov031/relocs.txt b/config/eur/arm9/overlays/ov031/relocs.txt index e71cb7d5..450a1712 100644 --- a/config/eur/arm9/overlays/ov031/relocs.txt +++ b/config/eur/arm9/overlays/ov031/relocs.txt @@ -6113,8 +6113,8 @@ from:0x0210e6c0 kind:arm_call to:0x020d994c module:overlay(31) from:0x0210e6cc kind:load to:0x027e0994 module:dtcm from:0x0210e6d0 kind:load to:0x0204a110 module:main from:0x0210e6d4 kind:load to:0x0204a088 module:main -from:0x0210e6d8 kind:load to:0x0204aed0 module:main -from:0x0210e6e0 kind:load to:0x0204aeac module:main +from:0x0210e6d8 kind:load to:0x0204a110 add:0xdc0 module:main +from:0x0210e6e0 kind:load to:0x0204a110 add:0xd9c module:main from:0x0210e6e4 kind:load to:0x02043e50 module:main from:0x0210e6e8 kind:load to:0x021641c8 module:overlays(59,63,68,71,73,84) from:0x0210e6ec kind:load to:0x020b4f70 module:overlay(0) @@ -6147,7 +6147,7 @@ from:0x0210e8ec kind:arm_call to:0x0215ca60 module:overlay(63) from:0x0210e900 kind:arm_call to:0x020665b8 module:overlay(0) from:0x0210e954 kind:arm_call to:0x0201db14 module:main from:0x0210e970 kind:arm_call to:0x02019a74 module:main -from:0x0210e97c kind:load to:0x0204aeac module:main +from:0x0210e97c kind:load to:0x0204a110 add:0xd9c module:main from:0x0210e980 kind:load to:0x027e0d34 module:dtcm from:0x0210e984 kind:load to:0x0204a110 module:main from:0x0210e988 kind:load to:0x027e0998 module:dtcm @@ -6156,7 +6156,7 @@ from:0x0210e990 kind:load to:0x0204a088 module:main from:0x0210e994 kind:load to:0x02043e50 module:main from:0x0210e998 kind:load to:0x021641c8 module:overlay(63) from:0x0210e99c kind:load to:0x020b4f70 module:overlay(0) -from:0x0210e9a0 kind:load to:0x0204aed0 module:main +from:0x0210e9a0 kind:load to:0x0204a110 add:0xdc0 module:main from:0x0210e9a4 kind:load to:0x02049f8c module:main from:0x0210e9d4 kind:arm_call to:0x0201bb84 module:main from:0x0210e9e8 kind:arm_call to:0x0201b9a8 module:main diff --git a/config/eur/arm9/overlays/ov031/symbols.txt b/config/eur/arm9/overlays/ov031/symbols.txt index 28fcde4f..306545be 100644 --- a/config/eur/arm9/overlays/ov031/symbols.txt +++ b/config/eur/arm9/overlays/ov031/symbols.txt @@ -60,8 +60,8 @@ func_ov031_020d97a4 kind:function(arm,size=0x10) addr:0x020d97a4 func_ov031_020d97b4 kind:function(arm,size=0x10) addr:0x020d97b4 func_ov031_020d97c4 kind:function(arm,size=0x10) addr:0x020d97c4 func_ov031_020d97d4 kind:function(arm,size=0x10) addr:0x020d97d4 -func_ov031_020d97e4 kind:function(arm,size=0x10) addr:0x020d97e4 -func_ov031_020d97f4 kind:function(arm,size=0x10) addr:0x020d97f4 +_ZN18UnkStruct_027e0d3419func_ov031_020d97e4Ev kind:function(arm,size=0x10) addr:0x020d97e4 +_ZN18UnkStruct_027e0d3419func_ov031_020d97f4Ev kind:function(arm,size=0x10) addr:0x020d97f4 func_ov031_020d9804 kind:function(arm,size=0x10) addr:0x020d9804 func_ov031_020d9814 kind:function(arm,size=0x10) addr:0x020d9814 func_ov031_020d9824 kind:function(arm,size=0x10) addr:0x020d9824 @@ -1888,7 +1888,7 @@ _ZN16MapObjectUnkSWFS19func_ov031_0210d924Ev kind:function(arm,size=0x1c) addr:0 _ZN16MapObjectUnkSWFSD1Ev kind:function(arm,size=0x28) addr:0x0210d940 _ZN16MapObjectUnkSWFS19func_ov031_0210d968Ev kind:function(arm,size=0x30) addr:0x0210d968 _ZN23MapObjectProfileUnkSWFSD1Ev kind:function(arm,size=0x14) addr:0x0210d998 -func_ov031_0210d9ac kind:function(arm,size=0x58) addr:0x0210d9ac +_ZN24AdventureModeManager_168C1EP23GameModeManagerBase_104 kind:function(arm,size=0x58) addr:0x0210d9ac _ZN19func_ov031_0210da04D1Ev kind:function(arm,size=0x14) addr:0x0210da04 _ZN19func_ov031_0210da18D0Ev kind:function(arm,size=0x1c) addr:0x0210da18 func_ov031_0210da34 kind:function(arm,size=0x8c) addr:0x0210da34 @@ -1897,12 +1897,12 @@ func_ov031_0210dca8 kind:function(arm,size=0x80) addr:0x0210dca8 func_ov031_0210dd28 kind:function(arm,size=0x4) addr:0x0210dd28 func_ov031_0210dd2c kind:function(arm,size=0x38) addr:0x0210dd2c func_ov031_0210dd64 kind:function(arm,size=0x1fc) addr:0x0210dd64 -func_ov031_0210df60 kind:function(arm,size=0x10) addr:0x0210df60 -func_ov031_0210df70 kind:function(arm,size=0x5c) addr:0x0210df70 -func_ov031_0210dfcc kind:function(arm,size=0xc) addr:0x0210dfcc -func_ov031_0210dfd8 kind:function(arm,size=0x28) addr:0x0210dfd8 +_ZN24AdventureModeManager_16819func_ov031_0210df60Ei kind:function(arm,size=0x10) addr:0x0210df60 +_ZN24AdventureModeManager_16819func_ov031_0210df70Ei kind:function(arm,size=0x5c) addr:0x0210df70 +_ZN24AdventureModeManager_16819func_ov031_0210dfccEv kind:function(arm,size=0xc) addr:0x0210dfcc +_ZN24AdventureModeManager_16819func_ov031_0210dfd8Ev kind:function(arm,size=0x28) addr:0x0210dfd8 func_ov031_0210e000 kind:function(arm,size=0x18) addr:0x0210e000 -func_ov031_0210e018 kind:function(arm,size=0x5c) addr:0x0210e018 +_ZN24AdventureModeManager_188C1EP23GameModeManagerBase_104 kind:function(arm,size=0x5c) addr:0x0210e018 func_ov031_0210e074 kind:function(arm,size=0x14) addr:0x0210e074 func_ov031_0210e088 kind:function(arm,size=0x38) addr:0x0210e088 func_ov031_0210e0c0 kind:function(arm,size=0x2c) addr:0x0210e0c0 @@ -1915,7 +1915,7 @@ _ZN19func_ov031_0210e278D0Ev kind:function(arm,size=0x1c) addr:0x0210e278 _ZN19func_ov031_0210e294D1Ev kind:function(arm,size=0x20) addr:0x0210e294 _ZN19func_ov031_0210e2b4D0Ev kind:function(arm,size=0x28) addr:0x0210e2b4 func_ov031_0210e2dc kind:function(arm,size=0x104) addr:0x0210e2dc -func_ov031_0210e3e0 kind:function(arm,size=0x74) addr:0x0210e3e0 +_ZN24AdventureModeManager_194C1EP23GameModeManagerBase_104 kind:function(arm,size=0x74) addr:0x0210e3e0 func_ov031_0210e454 kind:function(arm,size=0x14) addr:0x0210e454 func_ov031_0210e468 kind:function(arm,size=0x50) addr:0x0210e468 func_ov031_0210e4b8 kind:function(arm,size=0xc8) addr:0x0210e4b8 @@ -1943,8 +1943,8 @@ func_ov031_0210f930 kind:function(arm,size=0xac) addr:0x0210f930 func_ov031_0210f9dc kind:function(arm,size=0x4c) addr:0x0210f9dc _ZN19func_ov031_0210fa28D1Ev kind:function(arm,size=0x14) addr:0x0210fa28 _ZN19func_ov031_0210fa3cD0Ev kind:function(arm,size=0x1c) addr:0x0210fa3c -func_ov031_0210fa58 kind:function(arm,size=0x78) addr:0x0210fa58 -func_ov031_0210fad0 kind:function(arm,size=0x114) addr:0x0210fad0 +_ZN24AdventureModeManager_1B0C1Ev kind:function(arm,size=0x78) addr:0x0210fa58 +_ZN24AdventureModeManager_1B019func_ov031_0210fad0Ev kind:function(arm,size=0x114) addr:0x0210fad0 func_ov031_0210fbe4 kind:function(arm,size=0x4) addr:0x0210fbe4 func_ov031_0210fbe8 kind:function(arm,size=0x104) addr:0x0210fbe8 _ZN19func_ov031_0210fcecD1Ev kind:function(arm,size=0x14) addr:0x0210fcec diff --git a/config/eur/arm9/overlays/ov037/relocs.txt b/config/eur/arm9/overlays/ov037/relocs.txt index 8ab7deab..3a361b80 100644 --- a/config/eur/arm9/overlays/ov037/relocs.txt +++ b/config/eur/arm9/overlays/ov037/relocs.txt @@ -22,7 +22,7 @@ from:0x021191ac kind:arm_call to:0x0211a2c0 module:overlay(37) from:0x021191bc kind:arm_call to:0x02011f3c module:main from:0x021191c8 kind:arm_call to:0x0211ae5c module:overlay(37) from:0x021191e0 kind:arm_call to:0x02011f3c module:main -from:0x021191f0 kind:arm_call to:0x020c4e68 module:overlays(18,24) +from:0x021191f0 kind:arm_call to:0x020c4e68 module:overlay(24) from:0x02119204 kind:arm_call to:0x0211b3f0 module:overlay(37) from:0x02119214 kind:arm_call to:0x020c5120 module:overlay(24) from:0x0211922c kind:arm_call to:0x020c6a48 module:overlay(24) @@ -47,7 +47,7 @@ from:0x0211938c kind:arm_call to:0x020c6a48 module:overlay(24) from:0x0211939c kind:arm_call to:0x020c6a48 module:overlay(24) from:0x021193d4 kind:arm_call to:0x0207e184 module:overlay(0) from:0x021193dc kind:arm_call to:0x021193f8 module:overlay(37) -from:0x021193e4 kind:arm_call to:0x020c4e40 module:overlays(20,24) +from:0x021193e4 kind:arm_call to:0x020c4e40 module:overlay(24) from:0x021193ec kind:load to:0x020b504c module:overlay(0) from:0x021193f0 kind:load to:0x027e0994 module:dtcm from:0x021193f4 kind:load to:0x027e09c0 module:dtcm @@ -115,7 +115,7 @@ from:0x0211a100 kind:arm_call to:0x02072fd0 module:overlay(0) from:0x0211a11c kind:arm_call to:0x02073388 module:overlay(0) from:0x0211a12c kind:load to:0x020b62a8 module:overlay(0) from:0x0211a130 kind:load to:0x027e09b8 module:dtcm -from:0x0211a174 kind:arm_call to:0x020c4f08 module:overlays(20,24) +from:0x0211a174 kind:arm_call to:0x020c4f08 module:overlay(24) from:0x0211a180 kind:arm_call to:0x0211b3f0 module:overlay(37) from:0x0211a190 kind:arm_call to:0x020c4f5c module:overlay(24) from:0x0211a1ac kind:arm_call to:0x02019538 module:main diff --git a/config/eur/arm9/overlays/ov058/symbols.txt b/config/eur/arm9/overlays/ov058/symbols.txt index b28e9f14..08179ab0 100644 --- a/config/eur/arm9/overlays/ov058/symbols.txt +++ b/config/eur/arm9/overlays/ov058/symbols.txt @@ -639,7 +639,7 @@ _ZN23MapObjectProfileUnkSWCBD1Ev kind:function(arm,size=0x14) addr:0x02152954 func_ov058_02152968 kind:function(thumb,size=0x5a) addr:0x02152968 func_ov058_021529c4 kind:function(arm,size=0x60) addr:0x021529c4 _ZN27UnkStruct_ov000_0208f820_2819func_ov058_02152a24Ev kind:function(thumb,size=0x64) addr:0x02152a24 -func_ov058_02152a88 kind:function(arm,size=0x60) addr:0x02152a88 +_ZN24AdventureModeManager_198C1EP23GameModeManagerBase_104 kind:function(arm,size=0x60) addr:0x02152a88 _ZN19func_ov058_02152ae8D1Ev kind:function(arm,size=0x20) addr:0x02152ae8 _ZN19func_ov058_02152b08D0Ev kind:function(arm,size=0x28) addr:0x02152b08 func_ov058_02152b30 kind:function(arm,size=0x14) addr:0x02152b30 diff --git a/config/eur/arm9/overlays/ov060/relocs.txt b/config/eur/arm9/overlays/ov060/relocs.txt index 63f50fb7..4aec90e3 100644 --- a/config/eur/arm9/overlays/ov060/relocs.txt +++ b/config/eur/arm9/overlays/ov060/relocs.txt @@ -216,7 +216,7 @@ from:0x0215a23c kind:load to:0x021631c4 module:overlay(60) from:0x0215a240 kind:load to:0x0203e964 module:main from:0x0215a244 kind:load to:0x021631b8 module:overlay(60) from:0x0215a248 kind:load to:0x027e0998 module:dtcm -from:0x0215a24c kind:load to:0x0204aeac module:main +from:0x0215a24c kind:load to:0x0204a110 add:0xd9c module:main from:0x0215a250 kind:load to:0x0204af1c module:main from:0x0215a254 kind:load to:0x021631f4 module:overlay(60) from:0x0215a260 kind:arm_call to:0x020e84b4 module:overlay(31) diff --git a/config/eur/arm9/overlays/ov062/relocs.txt b/config/eur/arm9/overlays/ov062/relocs.txt index 26ae3465..5946d08c 100644 --- a/config/eur/arm9/overlays/ov062/relocs.txt +++ b/config/eur/arm9/overlays/ov062/relocs.txt @@ -821,7 +821,7 @@ from:0x0215ce84 kind:arm_call to:0x0206082c module:overlay(0) from:0x0215ceb8 kind:arm_call to:0x0205fc20 module:overlay(0) from:0x0215ced0 kind:arm_call to:0x0215d804 module:overlay(62) from:0x0215cee0 kind:load to:0x021608bc add:0x8 module:overlay(62) -from:0x0215cee4 kind:load to:0x0204aeac module:main +from:0x0215cee4 kind:load to:0x0204a110 add:0xd9c module:main from:0x0215cee8 kind:load to:0x0204a110 module:main from:0x0215ceec kind:load to:0x02160914 module:overlay(62) from:0x0215cef0 kind:load to:0x02160928 module:overlay(62) @@ -954,7 +954,7 @@ from:0x0215d4fc kind:arm_call to:0x0215e54c module:overlay(62) from:0x0215d504 kind:arm_call to:0x0215e2e8 module:overlay(62) from:0x0215d50c kind:arm_call to:0x0215e2e8 module:overlay(62) from:0x0215d518 kind:arm_call to:0x0215e2e8 module:overlay(62) -from:0x0215d530 kind:load to:0x0204aeac module:main +from:0x0215d530 kind:load to:0x0204a110 add:0xd9c module:main from:0x0215d534 kind:load to:0x020b51b8 module:overlay(0) from:0x0215d538 kind:load to:0x027e0ce0 module:dtcm from:0x0215d53c kind:load to:0x020b6510 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov062/symbols.txt b/config/eur/arm9/overlays/ov062/symbols.txt index e4be5300..5c07fbb5 100644 --- a/config/eur/arm9/overlays/ov062/symbols.txt +++ b/config/eur/arm9/overlays/ov062/symbols.txt @@ -247,12 +247,12 @@ func_ov062_0215c054 kind:function(arm,size=0x24) addr:0x0215c054 func_ov062_0215c078 kind:function(arm,size=0x4) addr:0x0215c078 func_ov062_0215c07c kind:function(arm,size=0x94) addr:0x0215c07c func_ov062_0215c110 kind:function(arm,size=0x3c) addr:0x0215c110 -func_ov062_0215c14c kind:function(arm,size=0x40) addr:0x0215c14c +_ZN24AdventureModeManager_17CC1EP23GameModeManagerBase_104 kind:function(arm,size=0x40) addr:0x0215c14c func_ov062_0215c18c kind:function(arm,size=0x28) addr:0x0215c18c func_ov062_0215c1b4 kind:function(arm,size=0x1c) addr:0x0215c1b4 _ZN19func_ov062_0215c1d0D1Ev kind:function(arm,size=0x20) addr:0x0215c1d0 _ZN19func_ov062_0215c1f0D0Ev kind:function(arm,size=0x28) addr:0x0215c1f0 -func_ov062_0215c218 kind:function(arm,size=0x40) addr:0x0215c218 +_ZN24AdventureModeManager_1A0C1EP23GameModeManagerBase_104 kind:function(arm,size=0x40) addr:0x0215c218 func_ov062_0215c258 kind:function(arm,size=0x38) addr:0x0215c258 func_ov062_0215c290 kind:function(arm,size=0x28) addr:0x0215c290 func_ov062_0215c2b8 kind:function(arm,size=0x28) addr:0x0215c2b8 @@ -261,7 +261,7 @@ func_ov062_0215c318 kind:function(arm,size=0x28) addr:0x0215c318 func_ov062_0215c340 kind:function(arm,size=0x1c) addr:0x0215c340 _ZN19func_ov062_0215c35cD1Ev kind:function(arm,size=0x20) addr:0x0215c35c _ZN19func_ov062_0215c37cD0Ev kind:function(arm,size=0x28) addr:0x0215c37c -func_ov062_0215c3a4 kind:function(arm,size=0x40) addr:0x0215c3a4 +_ZN24AdventureModeManager_1A4C1EP23GameModeManagerBase_104 kind:function(arm,size=0x40) addr:0x0215c3a4 func_ov062_0215c3e4 kind:function(arm,size=0x38) addr:0x0215c3e4 func_ov062_0215c41c kind:function(arm,size=0x28) addr:0x0215c41c func_ov062_0215c444 kind:function(arm,size=0x28) addr:0x0215c444 diff --git a/config/eur/arm9/overlays/ov064/relocs.txt b/config/eur/arm9/overlays/ov064/relocs.txt index e35c5ac2..41ba8848 100644 --- a/config/eur/arm9/overlays/ov064/relocs.txt +++ b/config/eur/arm9/overlays/ov064/relocs.txt @@ -14,7 +14,7 @@ from:0x02157f58 kind:arm_call to:0x021589a4 module:overlay(64) from:0x02157f68 kind:arm_call to:0x02011f3c module:main from:0x02157f74 kind:arm_call to:0x02158c0c module:overlay(64) from:0x02157f8c kind:arm_call to:0x02011f3c module:main -from:0x02157f9c kind:arm_call to:0x020c4e68 module:overlays(18,24) +from:0x02157f9c kind:arm_call to:0x020c4e68 module:overlay(24) from:0x02157fac kind:arm_call to:0x02159124 module:overlay(64) from:0x02157fb8 kind:arm_call to:0x020c5120 module:overlay(24) from:0x02157fdc kind:arm_call to:0x020166cc module:main @@ -34,7 +34,7 @@ from:0x021580f0 kind:arm_call to:0x020c6a48 module:overlay(24) from:0x02158100 kind:arm_call to:0x020c6a48 module:overlay(24) from:0x0215810c kind:arm_call to:0x02067bc4 module:overlay(0) from:0x02158120 kind:arm_call to:0x02158148 module:overlay(64) -from:0x02158128 kind:arm_call to:0x020c4e40 module:overlays(20,24) +from:0x02158128 kind:arm_call to:0x020c4e40 module:overlay(24) from:0x02158130 kind:load to:0x0204a110 module:main from:0x02158134 kind:load to:0x027e0ce0 module:dtcm from:0x02158138 kind:load to:0x027e0d34 module:dtcm @@ -97,7 +97,7 @@ from:0x0215864c kind:arm_call to:0x02158f70 module:overlay(64) from:0x02158694 kind:load to:0x0215adc0 module:overlay(64) from:0x021586a0 kind:load to:0x020b62a8 module:overlay(0) from:0x02158708 kind:arm_call to:0x0206c9a8 module:overlay(0) -from:0x02158744 kind:arm_call to:0x020c4f08 module:overlays(20,24) +from:0x02158744 kind:arm_call to:0x020c4f08 module:overlay(24) from:0x0215875c kind:arm_call to:0x02159124 module:overlay(64) from:0x0215876c kind:arm_call to:0x020c4f5c module:overlay(24) from:0x02158788 kind:arm_call to:0x02019538 module:main diff --git a/config/eur/arm9/overlays/ov065/relocs.txt b/config/eur/arm9/overlays/ov065/relocs.txt index ebf016de..84d8dd5c 100644 --- a/config/eur/arm9/overlays/ov065/relocs.txt +++ b/config/eur/arm9/overlays/ov065/relocs.txt @@ -275,7 +275,7 @@ from:0x021598b4 kind:arm_call to:0x0201aa44 module:main from:0x021598c0 kind:load to:0x027e09a4 module:dtcm from:0x021598c4 kind:load to:0x027e0998 module:dtcm from:0x021598c8 kind:load to:0x0215b73c module:overlay(65) -from:0x021598cc kind:load to:0x0204af10 module:main +from:0x021598cc kind:load to:0x0204a110 add:0xe00 module:main from:0x021598d4 kind:load to:0x0204af1c module:main from:0x021598d8 kind:load to:0x0215b74c module:overlay(65) from:0x021598e4 kind:arm_call to:0x02098488 module:overlay(0) diff --git a/config/eur/arm9/overlays/ov068/relocs.txt b/config/eur/arm9/overlays/ov068/relocs.txt index 016ddc95..01ecac1c 100644 --- a/config/eur/arm9/overlays/ov068/relocs.txt +++ b/config/eur/arm9/overlays/ov068/relocs.txt @@ -655,7 +655,7 @@ from:0x0215d90c kind:arm_call to:0x02011ff4 module:main from:0x0215d920 kind:arm_call to:0x02097724 module:overlay(0) from:0x0215d934 kind:arm_call to:0x020c4e00 module:overlay(24) from:0x0215d970 kind:arm_call to:0x02161748 module:overlay(68) -from:0x0215d97c kind:arm_call to:0x020c4e68 module:overlays(18,24) +from:0x0215d97c kind:arm_call to:0x020c4e68 module:overlay(24) from:0x0215d9b8 kind:load to:0x02163058 module:overlay(68) from:0x0215d9bc kind:load to:0x02163fe0 module:overlay(68) from:0x0215d9d0 kind:arm_call to:0x0215dcb0 module:overlay(68) @@ -697,7 +697,7 @@ from:0x0215dc3c kind:load to:0x027e0cfc module:dtcm from:0x0215dc6c kind:arm_call to:0x020c6a48 module:overlay(24) from:0x0215dc90 kind:arm_call to:0x0208bc9c module:overlay(0) from:0x0215dc98 kind:arm_call to:0x0215dcb0 module:overlay(68) -from:0x0215dca0 kind:arm_call to:0x020c4e40 module:overlays(20,24) +from:0x0215dca0 kind:arm_call to:0x020c4e40 module:overlay(24) from:0x0215dca8 kind:load to:0x027e0ce0 module:dtcm from:0x0215dcac kind:load to:0x027e0994 module:dtcm from:0x0215dce4 kind:arm_call to:0x0215dcb4 module:overlay(68) @@ -715,7 +715,7 @@ from:0x0215dea0 kind:load to:0x02049b18 module:main from:0x0215dec8 kind:arm_call to:0x01ffd420 module:itcm from:0x0215dedc kind:arm_call to:0x0215dccc module:overlay(68) from:0x0215dee4 kind:load to:0x027e09b8 module:dtcm -from:0x0215df68 kind:arm_call to:0x020c4f08 module:overlays(20,24) +from:0x0215df68 kind:arm_call to:0x020c4f08 module:overlay(24) from:0x0215df78 kind:arm_call to:0x02161b5c module:overlay(68) from:0x0215df88 kind:arm_call to:0x020c5120 module:overlay(24) from:0x0215dfa0 kind:arm_call to:0x020c4f5c module:overlay(24) diff --git a/config/eur/arm9/overlays/ov071/relocs.txt b/config/eur/arm9/overlays/ov071/relocs.txt index acc08140..348cb528 100644 --- a/config/eur/arm9/overlays/ov071/relocs.txt +++ b/config/eur/arm9/overlays/ov071/relocs.txt @@ -980,7 +980,7 @@ from:0x0215a13c kind:arm_call to:0x0201aa44 module:main from:0x0215a148 kind:load to:0x0203e964 module:main from:0x0215a14c kind:load to:0x02165100 module:overlay(71) from:0x0215a150 kind:load to:0x027e0998 module:dtcm -from:0x0215a154 kind:load to:0x0204aeac module:main +from:0x0215a154 kind:load to:0x0204a110 add:0xd9c module:main from:0x0215a158 kind:load to:0x0204af1c module:main from:0x0215a15c kind:load to:0x0216511c module:overlay(71) from:0x0215a20c kind:arm_call to:0x0201aa44 module:main diff --git a/config/eur/arm9/overlays/ov088/relocs.txt b/config/eur/arm9/overlays/ov088/relocs.txt index 7ad14ea7..5383e18b 100644 --- a/config/eur/arm9/overlays/ov088/relocs.txt +++ b/config/eur/arm9/overlays/ov088/relocs.txt @@ -817,7 +817,7 @@ from:0x0216c780 kind:arm_call to:0x020d485c module:overlay(24) from:0x0216c794 kind:arm_call to:0x020d485c module:overlay(24) from:0x0216c7a8 kind:arm_call to:0x020d485c module:overlay(24) from:0x0216c7bc kind:arm_call to:0x02011f3c module:main -from:0x0216c7d0 kind:arm_call to:0x020d48c8 module:overlays(20,24) +from:0x0216c7d0 kind:arm_call to:0x020d48c8 module:overlay(24) from:0x0216c7e8 kind:arm_call_thumb to:0x02058c48 module:overlay(0) from:0x0216c800 kind:arm_call to:0x02011f3c module:main from:0x0216c814 kind:load to:0x027e0d00 module:dtcm @@ -1845,10 +1845,10 @@ from:0x021733dc kind:arm_call to:0x0205fc20 module:overlay(0) from:0x021733f8 kind:arm_call to:0x0201effc module:main from:0x02173420 kind:arm_call to:0x0201f04c module:main from:0x02173434 kind:arm_call to:0x0201c4d8 module:main -from:0x0217343c kind:load to:0x0204aeac module:main +from:0x0217343c kind:load to:0x0204a110 add:0xd9c module:main from:0x02173570 kind:arm_call to:0x0201f04c module:main from:0x02173584 kind:arm_call to:0x0201c4d8 module:main -from:0x021735e0 kind:load to:0x0204aeac module:main +from:0x021735e0 kind:load to:0x0204a110 add:0xd9c module:main from:0x021735e4 kind:load to:0x021760c0 module:overlay(88) from:0x02173610 kind:arm_call to:0x0201aa44 module:main from:0x02173618 kind:load to:0x0204af1c module:main diff --git a/config/eur/arm9/overlays/ov088/symbols.txt b/config/eur/arm9/overlays/ov088/symbols.txt index 99622b3b..275e2bd1 100644 --- a/config/eur/arm9/overlays/ov088/symbols.txt +++ b/config/eur/arm9/overlays/ov088/symbols.txt @@ -520,7 +520,7 @@ _ZN12ActorUnkRMM219func_ov088_02172298Ev kind:function(arm,size=0x8) addr:0x0217 _ZN12ActorUnkRMM2D1Ev kind:function(arm,size=0x28) addr:0x021722a0 _ZN12ActorUnkRMM2D0Ev kind:function(arm,size=0x30) addr:0x021722c8 _ZN19ActorProfileUnkRMM2D1Ev kind:function(arm,size=0x14) addr:0x021722f8 -func_ov088_0217230c kind:function(arm,size=0x30) addr:0x0217230c +_ZN23GameModeManagerBase_10419func_ov088_0217230cEv kind:function(arm,size=0x30) addr:0x0217230c func_ov088_0217233c kind:function(arm,size=0x158) addr:0x0217233c func_ov088_02172494 kind:function(arm,size=0x74) addr:0x02172494 _ZN19func_ov088_02172508D0Ev kind:function(arm,size=0x7c) addr:0x02172508 @@ -556,7 +556,7 @@ func_ov088_021733ac kind:function(arm,size=0x94) addr:0x021733ac func_ov088_02173440 kind:function(arm,size=0x1a8) addr:0x02173440 func_ov088_021735e8 kind:function(arm,size=0x34) addr:0x021735e8 func_ov088_0217361c kind:function(arm,size=0x14) addr:0x0217361c -func_ov088_02173630 kind:function(arm,size=0x50) addr:0x02173630 +_ZN24AdventureModeManager_1A8C1EP23GameModeManagerBase_104 kind:function(arm,size=0x50) addr:0x02173630 func_ov088_02173680 kind:function(arm,size=0x4c) addr:0x02173680 func_ov088_021736cc kind:function(arm,size=0x3c) addr:0x021736cc func_ov088_02173708 kind:function(arm,size=0x5c) addr:0x02173708 diff --git a/config/eur/arm9/overlays/ov093/relocs.txt b/config/eur/arm9/overlays/ov093/relocs.txt index 17e7e24f..7e2b2ec9 100644 --- a/config/eur/arm9/overlays/ov093/relocs.txt +++ b/config/eur/arm9/overlays/ov093/relocs.txt @@ -280,7 +280,7 @@ from:0x02168e0c kind:load to:0x0204e5f8 module:main from:0x02168e14 kind:load to:0x027e09a4 module:dtcm from:0x02168e18 kind:load to:0x02178d60 module:overlay(93) from:0x02168e1c kind:load to:0x021787a0 module:overlay(93) -from:0x02168e20 kind:load to:0x0204aeac module:main +from:0x02168e20 kind:load to:0x0204a110 add:0xd9c module:main from:0x02168e5c kind:arm_call to:0x0208ba60 module:overlay(0) from:0x02168e80 kind:arm_call to:0x02168484 module:overlay(93) from:0x02168e8c kind:load to:0x027e0ce0 module:dtcm @@ -1572,7 +1572,7 @@ from:0x0217550c kind:thumb_call_arm to:0x020d0680 module:overlay(24) from:0x0217551c kind:arm_call to:0x020d0698 module:overlay(24) from:0x02175568 kind:arm_call to:0x01ffd294 module:itcm from:0x0217559c kind:arm_call to:0x020d0924 module:overlay(24) -from:0x021755c4 kind:arm_call to:0x020d0744 module:overlays(20,24) +from:0x021755c4 kind:arm_call to:0x020d0744 module:overlay(24) from:0x021755e0 kind:load to:0x027e0998 module:dtcm from:0x0217560c kind:arm_call to:0x0201ec30 module:main from:0x0217561c kind:arm_call to:0x0201e8d4 module:main diff --git a/config/eur/arm9/overlays/ov093/symbols.txt b/config/eur/arm9/overlays/ov093/symbols.txt index 1071110d..38366725 100644 --- a/config/eur/arm9/overlays/ov093/symbols.txt +++ b/config/eur/arm9/overlays/ov093/symbols.txt @@ -382,9 +382,9 @@ func_ov093_02175404 kind:function(arm,size=0x1c) addr:0x02175404 func_ov093_02175420 kind:function(arm,size=0xc) addr:0x02175420 func_ov093_0217542c kind:function(arm,size=0x34) addr:0x0217542c func_ov093_02175460 kind:function(arm,size=0x68) addr:0x02175460 -func_ov093_021754c8 kind:function(thumb,size=0x40) addr:0x021754c8 -func_ov093_02175508 kind:function(thumb,size=0xc) addr:0x02175508 -func_ov093_02175514 kind:function(arm,size=0x34) addr:0x02175514 +_ZN24AdventureModeManager_1BCC1Ev kind:function(thumb,size=0x40) addr:0x021754c8 +_ZN24AdventureModeManager_1BCD1Ev kind:function(thumb,size=0xc) addr:0x02175508 +_ZN24AdventureModeManager_1BC19func_ov093_02175514Ev kind:function(arm,size=0x34) addr:0x02175514 func_ov093_02175548 kind:function(arm,size=0x9c) addr:0x02175548 func_ov093_021755e4 kind:function(arm,size=0xd8) addr:0x021755e4 func_ov093_021756bc kind:function(thumb,size=0x20) addr:0x021756bc diff --git a/config/eur/arm9/overlays/ov094/relocs.txt b/config/eur/arm9/overlays/ov094/relocs.txt index 2446d762..e8e15aff 100644 --- a/config/eur/arm9/overlays/ov094/relocs.txt +++ b/config/eur/arm9/overlays/ov094/relocs.txt @@ -13,7 +13,7 @@ from:0x02165980 kind:arm_call to:0x02011ff4 module:main from:0x0216598c kind:load to:0x02176ee8 module:overlay(94) from:0x02165998 kind:arm_call to:0x020c4e34 module:overlay(24) from:0x021659ac kind:arm_call to:0x02011f3c module:main -from:0x021659bc kind:arm_call to:0x020c4e68 module:overlays(18,24) +from:0x021659bc kind:arm_call to:0x020c4e68 module:overlay(24) from:0x021659d0 kind:arm_call to:0x02011f3c module:main from:0x021659dc kind:arm_call to:0x021505c0 module:overlay(30) from:0x02165a00 kind:arm_call to:0x0215083c module:overlay(30) @@ -24,7 +24,7 @@ from:0x02165a80 kind:arm_call to:0x020c6a48 module:overlay(24) from:0x02165a94 kind:arm_call to:0x020c6a48 module:overlay(24) from:0x02165aa4 kind:arm_call to:0x020c6a48 module:overlay(24) from:0x02165ab4 kind:arm_call to:0x020c6a48 module:overlay(24) -from:0x02165ac8 kind:arm_call to:0x020c4ed8 module:overlays(20,24) +from:0x02165ac8 kind:arm_call to:0x020c4ed8 module:overlay(24) from:0x02165ad0 kind:arm_call to:0x020c4f18 module:overlay(24) from:0x02165ad8 kind:arm_call to:0x020c4f4c module:overlay(24) from:0x02165af4 kind:load to:0x020b62a8 module:overlay(0) @@ -35,7 +35,7 @@ from:0x02165b34 kind:arm_call to:0x020c6a48 module:overlay(24) from:0x02165b44 kind:arm_call to:0x020c6a48 module:overlay(24) from:0x02165b50 kind:arm_call to:0x02067bc4 module:overlay(0) from:0x02165b7c kind:arm_call to:0x02165d54 module:overlay(94) -from:0x02165b84 kind:arm_call to:0x020c4e40 module:overlays(20,24) +from:0x02165b84 kind:arm_call to:0x020c4e40 module:overlay(24) from:0x02165b8c kind:load to:0x027e0994 module:dtcm from:0x02165b90 kind:load to:0x020b504c module:overlay(0) from:0x02165b94 kind:load to:0x020b62a8 module:overlay(0) @@ -61,7 +61,7 @@ from:0x02165de0 kind:arm_call to:0x0215083c module:overlay(30) from:0x02165e30 kind:arm_call to:0x020730ac module:overlay(0) from:0x02165e64 kind:arm_call to:0x02073470 module:overlay(0) from:0x02165e84 kind:arm_call to:0x020732ec module:overlay(0) -from:0x02165eac kind:arm_call to:0x020c4f08 module:overlays(20,24) +from:0x02165eac kind:arm_call to:0x020c4f08 module:overlay(24) from:0x02165ec4 kind:arm_call to:0x020c4f5c module:overlay(24) from:0x02165ee0 kind:arm_call to:0x02019538 module:main from:0x02165eec kind:arm_call to:0x020c6cd4 module:overlay(24) diff --git a/config/eur/arm9/overlays/ov096/relocs.txt b/config/eur/arm9/overlays/ov096/relocs.txt index 201275a5..02d0aa7b 100644 --- a/config/eur/arm9/overlays/ov096/relocs.txt +++ b/config/eur/arm9/overlays/ov096/relocs.txt @@ -411,7 +411,7 @@ from:0x0217d288 kind:arm_call to:0x02098488 module:overlay(0) from:0x0217d290 kind:arm_call to:0x02011ff4 module:main from:0x0217d2a4 kind:arm_call to:0x0209790c module:overlay(0) from:0x0217d2b8 kind:arm_call to:0x020c4e00 module:overlay(24) -from:0x0217d2d0 kind:arm_call to:0x020c4e68 module:overlays(18,24) +from:0x0217d2d0 kind:arm_call to:0x020c4e68 module:overlay(24) from:0x0217d2e4 kind:arm_call to:0x0217d95c module:overlay(96) from:0x0217d330 kind:load to:0x0217e200 module:overlay(96) from:0x0217d334 kind:load to:0x020b62a8 module:overlay(0) @@ -448,7 +448,7 @@ from:0x0217d56c kind:arm_call to:0x0217dab0 module:overlay(96) from:0x0217d580 kind:arm_call to:0x02067bc4 module:overlay(0) from:0x0217d5a4 kind:arm_call to:0x02067bc4 module:overlay(0) from:0x0217d60c kind:arm_call to:0x0217d49c module:overlay(96) -from:0x0217d61c kind:arm_call to:0x020c4e40 module:overlays(20,24) +from:0x0217d61c kind:arm_call to:0x020c4e40 module:overlay(24) from:0x0217d628 kind:load to:0x027e0ce0 module:dtcm from:0x0217d62c kind:load to:0x020d8660 module:overlay(24) from:0x0217d640 kind:load to:0x0217e40c module:overlay(96) @@ -463,7 +463,7 @@ from:0x0217d688 kind:arm_call to:0x0217d690 module:overlay(96) from:0x0217d6e8 kind:arm_call to:0x0206c9a8 module:overlay(0) from:0x0217d6fc kind:load to:0x020b51b8 module:overlay(0) from:0x0217d710 kind:arm_call to:0x0217d718 module:overlay(96) -from:0x0217d814 kind:arm_call to:0x020c4f08 module:overlays(20,24) +from:0x0217d814 kind:arm_call to:0x020c4f08 module:overlay(24) from:0x0217d83c kind:arm_call to:0x020c4f5c module:overlay(24) from:0x0217d854 kind:arm_call to:0x02019538 module:main from:0x0217d860 kind:arm_call to:0x020cd150 module:overlay(24) diff --git a/config/eur/arm9/overlays/ov111/relocs.txt b/config/eur/arm9/overlays/ov111/relocs.txt index 90b2a219..f344d754 100644 --- a/config/eur/arm9/overlays/ov111/relocs.txt +++ b/config/eur/arm9/overlays/ov111/relocs.txt @@ -59,7 +59,7 @@ from:0x021850b4 kind:load to:0x027e09bc module:dtcm from:0x021850b8 kind:load to:0x0204e5f8 module:main from:0x021850bc kind:load to:0x0204a088 module:main from:0x021850c0 kind:load to:0x0204a110 module:main -from:0x021850c4 kind:load to:0x0204ae10 module:main +from:0x021850c4 kind:load to:0x0204a110 add:0xd00 module:main from:0x021850c8 kind:load to:0x027e09ac module:dtcm from:0x021850cc kind:load to:0x027e0ce0 module:dtcm from:0x021850d0 kind:load to:0x027e09a4 module:dtcm diff --git a/config/eur/arm9/relocs.txt b/config/eur/arm9/relocs.txt index d8504c5d..77d89f74 100644 --- a/config/eur/arm9/relocs.txt +++ b/config/eur/arm9/relocs.txt @@ -2683,7 +2683,7 @@ from:0x0201bf78 kind:arm_call to:0x0201c2e0 module:main from:0x0201bfa8 kind:arm_call to:0x0209f6fc module:overlay(0) from:0x0201bfc4 kind:arm_call_thumb to:0x0201ca14 module:main from:0x0201bfd4 kind:arm_call_thumb to:0x0201ca14 module:main -from:0x0201bfe8 kind:load to:0x0204a120 module:main +from:0x0201bfe8 kind:load to:0x0204a110 add:0x10 module:main from:0x0201bff8 kind:arm_call to:0x0201c26c module:main from:0x0201c004 kind:arm_call to:0x0209f724 module:overlay(0) from:0x0201c048 kind:arm_call to:0x0201c3a4 module:main @@ -2765,7 +2765,7 @@ from:0x0201d280 kind:arm_call to:0x02024934 module:main from:0x0201d2bc kind:arm_call to:0x02024934 module:main from:0x0201d2d8 kind:arm_call to:0x02024934 module:main from:0x0201d2f4 kind:load to:0x0204a110 module:main -from:0x0201d2fc kind:load to:0x0204af10 module:main +from:0x0201d2fc kind:load to:0x0204a110 add:0xe00 module:main from:0x0201d310 kind:load to:0x027e0120 module:dtcm from:0x0201d318 kind:load to:0x0204e640 module:main from:0x0201d330 kind:arm_call to:0x01ff9f14 module:itcm @@ -2788,12 +2788,12 @@ from:0x0201d764 kind:arm_call to:0x0201e8d4 module:main from:0x0201d780 kind:arm_call to:0x02024934 module:main from:0x0201d78c kind:load to:0x027e0120 module:dtcm from:0x0201d790 kind:load to:0x0204a110 module:main -from:0x0201d794 kind:load to:0x0204af10 module:main +from:0x0201d794 kind:load to:0x0204a110 add:0xe00 module:main from:0x0201d8dc kind:arm_call to:0x0201e8d4 module:main from:0x0201d8f8 kind:arm_call to:0x0201e8d4 module:main from:0x0201da20 kind:arm_call to:0x0201ec30 module:main from:0x0201da2c kind:arm_call to:0x01ffb428 module:itcm -from:0x0201da48 kind:load to:0x0204af10 module:main +from:0x0201da48 kind:load to:0x0204a110 add:0xe00 module:main from:0x0201da74 kind:arm_call to:0x0201e8d4 module:main from:0x0201da84 kind:arm_call to:0x0201e8d4 module:main from:0x0201daa8 kind:arm_call to:0x02024934 module:main @@ -2829,9 +2829,9 @@ from:0x0201e09c kind:arm_call to:0x0201e8d4 module:main from:0x0201e0b8 kind:arm_call to:0x02024934 module:main from:0x0201e0cc kind:load to:0x0204a110 module:main from:0x0201e0dc kind:load to:0x027e0120 module:dtcm -from:0x0201e0e0 kind:load to:0x0204af10 module:main +from:0x0201e0e0 kind:load to:0x0204a110 add:0xe00 module:main from:0x0201e234 kind:arm_call to:0x0201e8d4 module:main -from:0x0201e254 kind:load to:0x0204af10 module:main +from:0x0201e254 kind:load to:0x0204a110 add:0xe00 module:main from:0x0201e28c kind:arm_call to:0x0201e8d4 module:main from:0x0201e29c kind:arm_call to:0x0201e8d4 module:main from:0x0201e2d0 kind:arm_call to:0x0201e8d4 module:main @@ -3062,9 +3062,9 @@ from:0x0202036c kind:arm_call to:0x02061f60 module:overlay(0) from:0x02020374 kind:arm_call to:0x02011ff4 module:main from:0x02020398 kind:load to:0x020443e8 module:main from:0x02020454 kind:arm_call to:0x02062144 module:overlay(0) -from:0x02020484 kind:load to:0x0204aeac module:main +from:0x02020484 kind:load to:0x0204a110 add:0xd9c module:main from:0x02020488 kind:load to:0x0201c4d8 module:main -from:0x020204b8 kind:load to:0x0204ae10 module:main +from:0x020204b8 kind:load to:0x0204a110 add:0xd00 module:main from:0x020204bc kind:load to:0x0204a110 module:main from:0x020204c8 kind:arm_call to:0x02019590 module:main from:0x020204dc kind:load to:0x0204a110 module:main diff --git a/config/eur/arm9/symbols.txt b/config/eur/arm9/symbols.txt index 49e50649..5e21f7a0 100644 --- a/config/eur/arm9/symbols.txt +++ b/config/eur/arm9/symbols.txt @@ -638,7 +638,7 @@ func_02012fd0 kind:function(arm,size=0x28) addr:0x02012fd0 func_02012ff8 kind:function(arm,size=0x1c) addr:0x02012ff8 _ZN18UnkStruct_02011e1013func_02013014Ev kind:function(arm,size=0x5c) addr:0x02013014 _ZN18UnkStruct_02011e1013func_02013070Ev kind:function(arm,size=0x64) addr:0x02013070 -func_020130d4 kind:function(arm,size=0x1c) addr:0x020130d4 +_ZN18UnkStruct_02011e1013func_020130d4Ei kind:function(arm,size=0x1c) addr:0x020130d4 func_020130f0 kind:function(arm,size=0x28) addr:0x020130f0 func_02013118 kind:function(arm,size=0x30) addr:0x02013118 func_02013148 kind:function(arm,size=0x1c) addr:0x02013148 @@ -830,7 +830,7 @@ _ZN20GameModeLinkListNode13func_020166acEPS_ kind:function(arm,size=0x20) addr:0 _ZN20GameModeLinkListNode13func_020166ccEPS_ kind:function(arm,size=0x28) addr:0x020166cc _ZN20GameModeLinkListNode13func_020166f4EPS_ kind:function(arm,size=0x2c) addr:0x020166f4 func_02016720 kind:function(arm,size=0x1c) addr:0x02016720 -func_0201673c kind:function(arm,size=0x28) addr:0x0201673c +_ZN20GameModeLinkListNode13func_0201673cEv kind:function(arm,size=0x28) addr:0x0201673c func_02016764 kind:function(arm,size=0x34) addr:0x02016764 func_02016798 kind:function(arm,size=0x10) addr:0x02016798 func_020167a8 kind:function(arm,size=0x4) addr:0x020167a8 @@ -933,7 +933,7 @@ _ZN19GameModeManagerBase8vfunc_18Ev kind:function(thumb,size=0x2) addr:0x020185d _ZN19GameModeManagerBase8vfunc_1CEv kind:function(thumb,size=0x2) addr:0x020185d8 _ZN19GameModeManagerBase8vfunc_20Ev kind:function(thumb,size=0x2) addr:0x020185dc _ZN19GameModeManagerBase8vfunc_00Ev kind:function(arm,size=0x2c) addr:0x020185e0 -_ZN19GameModeManagerBase8vfunc_04Ev kind:function(arm,size=0x28) addr:0x0201860c +_ZN19GameModeManagerBase8vfunc_04Ei kind:function(arm,size=0x28) addr:0x0201860c _ZN19GameModeManagerBase13func_02018634Et kind:function(arm,size=0x48) addr:0x02018634 _ZN19GameModeManagerBase8vfunc_24Ev kind:function(arm,size=0x18) addr:0x0201867c _ZN19GameModeManagerBase8vfunc_28EPc kind:function(arm,size=0x10) addr:0x02018694 @@ -958,13 +958,13 @@ _ZN19GameModeManagerBase13func_02018ad4Ev kind:function(arm,size=0x1c) addr:0x02 _ZN19GameModeManagerBase13func_02018af0EP16GameModeLinkListI23GameModeManagerBase_104E kind:function(arm,size=0x64) addr:0x02018af0 _ZN19GameModeManagerBase13func_02018b54EP16GameModeLinkListI23GameModeManagerBase_104E kind:function(arm,size=0x3c) addr:0x02018b54 _ZN19GameModeManagerBase13func_02018b90EP16GameModeLinkListI23GameModeManagerBase_104EPc kind:function(arm,size=0x34) addr:0x02018b90 -func_02018bc4 kind:function(arm,size=0x1c) addr:0x02018bc4 -func_02018be0 kind:function(arm,size=0x4c) addr:0x02018be0 -func_02018c2c kind:function(arm,size=0x4c) addr:0x02018c2c +_ZN19GameModeManagerBase13func_02018bc4Ei kind:function(arm,size=0x1c) addr:0x02018bc4 +_ZN18UnkStruct_0204a11013func_02018be0Ei kind:function(arm,size=0x4c) addr:0x02018be0 +_ZN18UnkStruct_0204a11013func_02018c2cEv kind:function(arm,size=0x4c) addr:0x02018c2c _ZN18UnkStruct_0204a11013func_02018c78Ei kind:function(arm,size=0x18) addr:0x02018c78 _ZN18UnkStruct_0204a11013func_02018c90Ei kind:function(arm,size=0xa4) addr:0x02018c90 _ZN18UnkStruct_0204a11013func_02018d34Ev kind:function(arm,size=0x44) addr:0x02018d34 -func_02018d78 kind:function(arm,size=0x174) addr:0x02018d78 +_ZN18UnkStruct_0204a11013func_02018d78Ei kind:function(arm,size=0x174) addr:0x02018d78 func_02018eec kind:function(arm,size=0xac) addr:0x02018eec func_02018f98 kind:function(arm,size=0x368) addr:0x02018f98 _ZN18UnkStruct_0204a11013func_02019300Ei kind:function(arm,size=0x40) addr:0x02019300 @@ -974,9 +974,9 @@ _ZN18UnkStruct_0204a11013func_02019408Ev kind:function(arm,size=0x4c) addr:0x020 _ZN18UnkStruct_0204a11013func_02019454Ev kind:function(arm,size=0x88) addr:0x02019454 _ZN18UnkStruct_0204a11013func_020194dcEv kind:function(arm,size=0x38) addr:0x020194dc _ZN18UnkStruct_0204a11013func_02019514Ev kind:function(arm,size=0x14) addr:0x02019514 -func_02019528 kind:function(arm,size=0x10) addr:0x02019528 +_ZN18UnkStruct_0204a11013func_02019528Ev kind:function(arm,size=0x10) addr:0x02019528 _ZN18UnkStruct_0204a11013func_02019538Eii kind:function(arm,size=0x10) addr:0x02019538 -func_02019548 kind:function(arm,size=0x10) addr:0x02019548 +_ZN18UnkStruct_0204a11013func_02019548Ev kind:function(arm,size=0x10) addr:0x02019548 func_02019558 kind:function(arm,size=0x28) addr:0x02019558 func_02019580 kind:function(arm,size=0x10) addr:0x02019580 func_02019590 kind:function(arm,size=0x10) addr:0x02019590 @@ -1012,7 +1012,7 @@ func_0201a87c kind:function(arm,size=0xf8) addr:0x0201a87c func_0201a974 kind:function(arm,size=0xd0) addr:0x0201a974 _ZN18UnkStruct_0204af1c13func_0201aa44EPvS0_iS0_ kind:function(arm,size=0x48) addr:0x0201aa44 func_0201aa8c kind:function(arm,size=0x44) addr:0x0201aa8c -_ZN18UnkStruct_0204af1c13func_0201aad0EPvS0_iS0_ kind:function(arm,size=0x1a0) addr:0x0201aad0 +_ZN18UnkStruct_0204af1c13func_0201aad0EP14UnkSubStruct19PviS2_ kind:function(arm,size=0x1a0) addr:0x0201aad0 func_0201ac70 kind:function(arm,size=0x13c) addr:0x0201ac70 func_0201adac kind:function(arm,size=0x50) addr:0x0201adac func_0201adfc kind:function(arm,size=0xb0) addr:0x0201adfc @@ -1041,17 +1041,17 @@ _ZN24UnkStruct_0204a060_Base2C1Ev kind:function(arm,size=0x2c) addr:0x0201ba3c _ZN24UnkStruct_0204a060_Base3C1Ev kind:function(arm,size=0x2c) addr:0x0201ba68 _ZN24UnkStruct_0204a060_Base2D1Ev kind:function(arm,size=0x18) addr:0x0201ba94 _ZN24UnkStruct_0204a060_Base2D0Ev kind:function(arm,size=0x20) addr:0x0201baac -_ZN23UnkStruct_0204a060_BaseD2Ev kind:function(arm,size=0x18) addr:0x0201bacc +_ZN24UnkStruct_0204a060_Base2D2Ev kind:function(arm,size=0x18) addr:0x0201bacc _ZN24UnkStruct_0204a060_Base28vfunc_08Ei kind:function(arm,size=0x8) addr:0x0201bae4 _ZN23UnkStruct_0204a060_BaseC2Ev kind:function(arm,size=0x4c) addr:0x0201baec _ZN23UnkStruct_0204a060_BaseC1Ev kind:function(arm,size=0x4c) addr:0x0201bb38 _ZN23UnkStruct_0204a060_Base13func_0201bb84Eiii kind:function(arm,size=0x20) addr:0x0201bb84 _ZN23UnkStruct_0204a060_Base13func_0201bba4Eii kind:function(arm,size=0x28) addr:0x0201bba4 -_ZN23UnkStruct_0204a060_Base13func_0201bbccEv kind:function(arm,size=0x18) addr:0x0201bbcc +_ZN23UnkStruct_0204a060_Base13func_0201bbccEii kind:function(arm,size=0x18) addr:0x0201bbcc _ZN23UnkStruct_0204a060_Base8vfunc_08Ei kind:function(arm,size=0x1a4) addr:0x0201bbe4 _ZN23UnkStruct_0204a060_Base8vfunc_0CEi kind:function(arm,size=0x4) addr:0x0201bd88 _ZN23UnkStruct_0204a060_Base8vfunc_10Ev kind:function(arm,size=0x4) addr:0x0201bd8c -_ZN13func_0201bd90D1Ev kind:function(arm,size=0x14) addr:0x0201bd90 +_ZN23UnkStruct_0204a060_BaseD1Ev kind:function(arm,size=0x14) addr:0x0201bd90 _ZN23UnkStruct_0204a060_BaseD0Ev kind:function(arm,size=0x1c) addr:0x0201bda4 func_0201bdc0 kind:function(arm,size=0x10) addr:0x0201bdc0 func_0201bdd0 kind:function(arm,size=0x38) addr:0x0201bdd0 @@ -1067,8 +1067,8 @@ _ZN23GameModeManagerBase_00413func_0201bfecEv kind:function(arm,size=0x20) addr: _ZN23GameModeManagerBase_00413func_0201c00cEii kind:function(arm,size=0x5c) addr:0x0201c00c _ZN23GameModeManagerBase_00413func_0201c068Es kind:function(arm,size=0x3c) addr:0x0201c068 func_0201c0a4 kind:function(arm,size=0x20) addr:0x0201c0a4 -func_0201c0c4 kind:function(arm,size=0x20) addr:0x0201c0c4 -func_0201c0e4 kind:function(arm,size=0x40) addr:0x0201c0e4 +_ZN23GameModeManagerBase_00413func_0201c0c4Ei kind:function(arm,size=0x20) addr:0x0201c0c4 +_ZN23GameModeManagerBase_00413func_0201c0e4Ev kind:function(arm,size=0x40) addr:0x0201c0e4 _ZN23GameModeManagerBase_00413func_0201c124Eiiiii kind:function(arm,size=0x78) addr:0x0201c124 _ZN23GameModeManagerBase_00413func_0201c19cEv kind:function(arm,size=0x48) addr:0x0201c19c _ZN23GameModeManagerBase_00413func_0201c1e4Ev kind:function(arm,size=0x48) addr:0x0201c1e4 @@ -1079,10 +1079,10 @@ func_0201c2e0 kind:function(arm,size=0xc4) addr:0x0201c2e0 func_0201c3a4 kind:function(arm,size=0xac) addr:0x0201c3a4 _ZN23UnkStruct_0204a110_Sub5C1Ev kind:function(thumb,size=0x10) addr:0x0201c450 func_0201c460 kind:function(thumb,size=0x34) addr:0x0201c460 -_ZN18UnkStruct_0204aeac13func_0201c494Ei kind:function(arm,size=0x14) addr:0x0201c494 +_ZN23UnkStruct_0204a110_Sub513func_0201c494Ei kind:function(arm,size=0x14) addr:0x0201c494 func_0201c4a8 kind:function(arm,size=0x30) addr:0x0201c4a8 -_ZN18UnkStruct_0204aeac13func_0201c4d8Eiii kind:function(arm,size=0x2c) addr:0x0201c4d8 -_ZN18UnkStruct_0204aeac13func_0201c504Eiiii kind:function(arm,size=0x2c) addr:0x0201c504 +_ZN23UnkStruct_0204a110_Sub513func_0201c4d8Eiii kind:function(arm,size=0x2c) addr:0x0201c4d8 +_ZN23UnkStruct_0204a110_Sub513func_0201c504Eiiii kind:function(arm,size=0x2c) addr:0x0201c504 func_0201c530 kind:function(arm,size=0x19c) addr:0x0201c530 func_0201c6cc kind:function(thumb,size=0x6e) addr:0x0201c6cc func_0201c73c kind:function(arm,size=0x44) addr:0x0201c73c @@ -1108,22 +1108,22 @@ _ZN23UnkStruct_0204a110_Sub4C1Ev kind:function(arm,size=0x58) addr:0x0201cd80 func_0201cdd8 kind:function(arm,size=0x88) addr:0x0201cdd8 func_0201ce60 kind:function(arm,size=0x40) addr:0x0201ce60 func_0201cea0 kind:function(arm,size=0x38) addr:0x0201cea0 -func_0201ced8 kind:function(arm,size=0x58) addr:0x0201ced8 -func_0201cf30 kind:function(arm,size=0x58) addr:0x0201cf30 +_ZN23UnkStruct_0204a110_Sub613func_0201ced8Ev kind:function(arm,size=0x58) addr:0x0201ced8 +_ZN23UnkStruct_0204a110_Sub613func_0201cf30Ev kind:function(arm,size=0x58) addr:0x0201cf30 func_0201cf88 kind:function(arm,size=0x394) addr:0x0201cf88 func_0201d31c kind:function(arm,size=0x30c) addr:0x0201d31c -func_0201d628 kind:function(arm,size=0x174) addr:0x0201d628 +_ZN23UnkStruct_0204a110_Sub713func_0201d628Ev kind:function(arm,size=0x174) addr:0x0201d628 func_0201d79c kind:function(arm,size=0x2b0) addr:0x0201d79c func_0201da4c kind:function(arm,size=0xc8) addr:0x0201da4c -func_0201db14 kind:function(arm,size=0xfc) addr:0x0201db14 -func_0201dc10 kind:function(arm,size=0x148) addr:0x0201dc10 -func_0201dd58 kind:function(arm,size=0xcc) addr:0x0201dd58 +_ZN23UnkStruct_0204a110_Sub713func_0201db14EiiP5Vec2sS1_ii kind:function(arm,size=0xfc) addr:0x0201db14 +_ZN23UnkStruct_0204a110_Sub713func_0201dc10EPsii kind:function(arm,size=0x148) addr:0x0201dc10 +_ZN23UnkStruct_0204a110_Sub713func_0201dd58Eii kind:function(arm,size=0xcc) addr:0x0201dd58 func_0201de24 kind:function(arm,size=0x2c0) addr:0x0201de24 func_0201e0e4 kind:function(arm,size=0x174) addr:0x0201e0e4 func_0201e258 kind:function(arm,size=0x330) addr:0x0201e258 -func_0201e588 kind:function(arm,size=0x88) addr:0x0201e588 +_ZN23UnkStruct_0204a110_Sub813func_0201e588Eiiiii kind:function(arm,size=0x88) addr:0x0201e588 func_0201e610 kind:function(arm,size=0x88) addr:0x0201e610 -_ZN18UnkStruct_0204aeec13func_0201e698Ev kind:function(arm,size=0x2c) addr:0x0201e698 +_ZN23UnkStruct_0204a110_Sub813func_0201e698Ev kind:function(arm,size=0x2c) addr:0x0201e698 func_0201e6c4 kind:function(arm,size=0xc) addr:0x0201e6c4 _ZN24UnkSystem2_UnkSubSystem9C1Ev kind:function(arm,size=0x84) addr:0x0201e6d0 func_0201e754 kind:function(arm,size=0x90) addr:0x0201e754 @@ -1133,24 +1133,24 @@ func_0201e8d4 kind:function(arm,size=0x24) addr:0x0201e8d4 func_0201e8f8 kind:function(arm,size=0x94) addr:0x0201e8f8 func_0201e98c kind:function(arm,size=0x14) addr:0x0201e98c func_0201e9a0 kind:function(arm,size=0x14) addr:0x0201e9a0 -_ZN13UnkSubStruct1C1Ev kind:function(arm,size=0x60) addr:0x0201e9b4 +_ZN18UnkSubStruct1_BaseC1Ev kind:function(arm,size=0x60) addr:0x0201e9b4 func_0201ea14 kind:function(arm,size=0x54) addr:0x0201ea14 -_ZN13UnkSubStruct113func_0201ea68Eiiii kind:function(arm,size=0x38) addr:0x0201ea68 -_ZN13UnkSubStruct113func_0201eaa0Ev kind:function(arm,size=0x14) addr:0x0201eaa0 +_ZN18UnkSubStruct1_Base13func_0201ea68Eiiii kind:function(arm,size=0x38) addr:0x0201ea68 +_ZN18UnkSubStruct1_Base13func_0201eaa0Ev kind:function(arm,size=0x14) addr:0x0201eaa0 func_0201eab4 kind:function(arm,size=0x70) addr:0x0201eab4 func_0201eb24 kind:function(arm,size=0x14) addr:0x0201eb24 func_0201eb38 kind:function(arm,size=0x14) addr:0x0201eb38 _ZN26UnkStruct_0204a110_Sub7_08C1Ev kind:function(arm,size=0x60) addr:0x0201eb4c func_0201ebac kind:function(arm,size=0x4c) addr:0x0201ebac func_0201ebf8 kind:function(arm,size=0x38) addr:0x0201ebf8 -func_0201ec30 kind:function(arm,size=0x8) addr:0x0201ec30 +_ZN26UnkStruct_0204a110_Sub7_0813func_0201ec30Ev kind:function(arm,size=0x8) addr:0x0201ec30 func_0201ec38 kind:function(arm,size=0x70) addr:0x0201ec38 func_0201eca8 kind:function(arm,size=0x14) addr:0x0201eca8 func_0201ecbc kind:function(arm,size=0x14) addr:0x0201ecbc -func_0201ecd0 kind:function(arm,size=0x60) addr:0x0201ecd0 +_ZN22UnkSubStruct1_Derived1C1Ev kind:function(arm,size=0x60) addr:0x0201ecd0 func_0201ed30 kind:function(arm,size=0x54) addr:0x0201ed30 func_0201ed84 kind:function(arm,size=0x38) addr:0x0201ed84 -func_0201edbc kind:function(arm,size=0x14) addr:0x0201edbc +_ZN18UnkSubStruct1_Base13func_0201edbcEv kind:function(arm,size=0x14) addr:0x0201edbc func_0201edd0 kind:function(arm,size=0x70) addr:0x0201edd0 func_0201ee40 kind:function(arm,size=0x14) addr:0x0201ee40 func_0201ee54 kind:function(arm,size=0x14) addr:0x0201ee54 @@ -1365,7 +1365,7 @@ G2_func_0006 kind:function(arm,size=0x58) addr:0x02024894 G2S_func_0006 kind:function(arm,size=0x48) addr:0x020248ec G2_SetBGAffine kind:function(arm,size=0xa0) addr:0x02024934 _G2_SetBlend kind:function(arm,size=0x1c) addr:0x020249d4 -func_020249f0 kind:function(arm,size=0x24) addr:0x020249f0 +GX_func_0008 kind:function(arm,size=0x24) addr:0x020249f0 func_02024a14 kind:function(arm,size=0x1c) addr:0x02024a14 func_02024a30 kind:function(arm,size=0x1c) addr:0x02024a30 func_02024a4c kind:function(arm,size=0x1c) addr:0x02024a4c @@ -2745,17 +2745,6 @@ data_0204a060 kind:bss addr:0x0204a060 data_0204a088 kind:bss addr:0x0204a088 data_0204a090 kind:bss addr:0x0204a090 data_0204a110 kind:bss addr:0x0204a110 -data_0204a120 kind:bss addr:0x0204a120 -data_0204a480 kind:bss addr:0x0204a480 -data_0204ae10 kind:bss addr:0x0204ae10 -data_0204ae90 kind:bss addr:0x0204ae90 -data_0204aeac kind:bss addr:0x0204aeac -data_0204aeb8 kind:bss addr:0x0204aeb8 -data_0204aed0 kind:bss addr:0x0204aed0 -data_0204aedc kind:bss addr:0x0204aedc -data_0204aeec kind:bss addr:0x0204aeec -data_0204aef0 kind:bss addr:0x0204aef0 -data_0204af10 kind:bss addr:0x0204af10 data_0204af18 kind:bss addr:0x0204af18 data_0204af1c kind:bss addr:0x0204af1c data_0204c3ac kind:bss addr:0x0204c3ac diff --git a/config/jp/arm9/delinks.txt b/config/jp/arm9/delinks.txt index 545e74e1..53f95b86 100644 --- a/config/jp/arm9/delinks.txt +++ b/config/jp/arm9/delinks.txt @@ -70,14 +70,6 @@ libs/c/src/ansi_files.c: .data start:0x02045c1c end:0x02045d00 .bss start:0x02052d20 end:0x02053020 -libs/c/src/float.c: - complete - .data start:0x02045d00 end:0x02045d04 - -libs/c/src/locale.c: - complete - .data start:0x02045d04 end:0x02045f20 - libs/c/src/arith.c: complete .text start:0x02034e04 end:0x02034e1c @@ -124,6 +116,14 @@ libs/c/src/wmem.c: complete .text start:0x02035728 end:0x02035760 +libs/c/src/float.c: + complete + .data start:0x02045d00 end:0x02045d04 + +libs/c/src/locale.c: + complete + .data start:0x02045d04 end:0x02045f20 + libs/c/src/wprintf.c: .text start:0x02035760 end:0x0203768c .data start:0x02045f20 end:0x02045fa0 diff --git a/config/jp/arm9/itcm/relocs.txt b/config/jp/arm9/itcm/relocs.txt index 1bca6bfd..a31bac28 100644 --- a/config/jp/arm9/itcm/relocs.txt +++ b/config/jp/arm9/itcm/relocs.txt @@ -229,7 +229,7 @@ from:0x01ffd32c kind:arm_call to:0x0201ea20 module:main from:0x01ffd348 kind:arm_call to:0x0201ea20 module:main from:0x01ffd3a4 kind:load to:0x027e0cd8 module:dtcm from:0x01ffd3a8 kind:load to:0x0204b690 module:main -from:0x01ffd3ac kind:load to:0x0204c490 module:main +from:0x01ffd3ac kind:load to:0x0204b690 add:0xe00 module:main from:0x01ffd3b4 kind:arm_call to:0x01ffd400 module:itcm from:0x01ffd3d4 kind:load to:0x020b39c4 module:overlay(0) from:0x01ffd3dc kind:arm_call to:0x01ffd400 module:itcm diff --git a/config/jp/arm9/itcm/symbols.txt b/config/jp/arm9/itcm/symbols.txt index 50053d09..18f8a1d2 100644 --- a/config/jp/arm9/itcm/symbols.txt +++ b/config/jp/arm9/itcm/symbols.txt @@ -199,7 +199,7 @@ func_01fff280 kind:function(arm,size=0x28) addr:0x01fff280 func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8 func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc func_01fff2fc kind:function(arm,size=0x54) addr:0x01fff2fc -func_01fff350 kind:function(arm,size=0x64) addr:0x01fff350 +_ZN12ActorManager13func_01fff350EPvPP5Actor kind:function(arm,size=0x64) addr:0x01fff350 _ZN12ActorManager13func_01fff3b4Ei kind:function(arm,size=0x8c) addr:0x01fff3b4 func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440 _ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458 diff --git a/config/jp/arm9/overlays/ov000/relocs.txt b/config/jp/arm9/overlays/ov000/relocs.txt index 03d26ad8..c806569e 100644 --- a/config/jp/arm9/overlays/ov000/relocs.txt +++ b/config/jp/arm9/overlays/ov000/relocs.txt @@ -1132,11 +1132,11 @@ from:0x020613a4 kind:load to:0x020b3488 module:overlay(0) from:0x020613d0 kind:arm_call to:0x0206244c module:overlay(0) from:0x020613f8 kind:arm_call to:0x0201c52c module:main from:0x02061408 kind:load to:0x020b3488 module:overlay(0) -from:0x0206140c kind:load to:0x0204ba00 module:main +from:0x0206140c kind:load to:0x0204b690 add:0x370 module:main from:0x02061438 kind:arm_call to:0x0206244c module:overlay(0) from:0x02061460 kind:arm_call to:0x0201c52c module:main from:0x02061470 kind:load to:0x020b3488 module:overlay(0) -from:0x02061474 kind:load to:0x0204ba00 module:main +from:0x02061474 kind:load to:0x0204b690 add:0x370 module:main from:0x020614a8 kind:arm_call to:0x020611a8 module:overlay(0) from:0x020614c0 kind:arm_call to:0x0206244c module:overlay(0) from:0x020614dc kind:arm_call to:0x01ff9b40 module:itcm @@ -1157,7 +1157,7 @@ from:0x020615bc kind:load to:0x020615c0 module:overlay(0) from:0x020615d8 kind:arm_call to:0x0206244c module:overlay(0) from:0x02061628 kind:arm_call to:0x0201c52c module:main from:0x0206166c kind:arm_call to:0x0201c52c module:main -from:0x0206167c kind:load to:0x0204ba00 module:main +from:0x0206167c kind:load to:0x0204b690 add:0x370 module:main from:0x0206169c kind:arm_call to:0x0206244c module:overlay(0) from:0x020616c0 kind:arm_call to:0x02035590 module:main from:0x020616cc kind:arm_call to:0x020354ac module:main @@ -1181,7 +1181,7 @@ from:0x020617fc kind:arm_call_thumb to:0x02015624 module:main from:0x02061808 kind:load to:0x020b3490 module:overlay(0) from:0x0206180c kind:load to:0x020b3494 module:overlay(0) from:0x02061810 kind:load to:0x0204547c add:0x8 module:main -from:0x02061814 kind:load to:0x0204ba00 module:main +from:0x02061814 kind:load to:0x0204b690 add:0x370 module:main from:0x02061818 kind:load to:0x020b349c module:overlay(0) from:0x02061824 kind:arm_call to:0x02061358 module:overlay(0) from:0x02061838 kind:load to:0x020b3468 module:overlay(0) @@ -1193,7 +1193,7 @@ from:0x020618a0 kind:arm_call to:0x0206244c module:overlay(0) from:0x020618f4 kind:arm_call to:0x0201c52c module:main from:0x02061934 kind:arm_call to:0x0201c52c module:main from:0x02061970 kind:arm_call to:0x0201c52c module:main -from:0x02061984 kind:load to:0x0204ba00 module:main +from:0x02061984 kind:load to:0x0204b690 add:0x370 module:main from:0x020619a4 kind:arm_call to:0x0206244c module:overlay(0) from:0x020619c8 kind:arm_call to:0x02035590 module:main from:0x020619d4 kind:arm_call to:0x020354ac module:main @@ -1227,7 +1227,7 @@ from:0x02061bac kind:arm_call_thumb to:0x02015624 module:main from:0x02061bb8 kind:load to:0x020b3490 module:overlay(0) from:0x02061bbc kind:load to:0x020b3494 module:overlay(0) from:0x02061bc0 kind:load to:0x0204547c add:0x8 module:main -from:0x02061bc4 kind:load to:0x0204ba00 module:main +from:0x02061bc4 kind:load to:0x0204b690 add:0x370 module:main from:0x02061bc8 kind:load to:0x020b349c module:overlay(0) from:0x02061bcc kind:load to:0x020b34a0 module:overlay(0) from:0x02061c2c kind:arm_call to:0x0202a148 module:main @@ -1239,7 +1239,7 @@ from:0x02061cb0 kind:arm_call to:0x02061cc0 module:overlay(0) from:0x02061cb8 kind:arm_call to:0x02061ce4 module:overlay(0) from:0x02061cf8 kind:arm_call to:0x0206244c module:overlay(0) from:0x02061d54 kind:arm_call to:0x0201c52c module:main -from:0x02061d60 kind:load to:0x0204ba00 module:main +from:0x02061d60 kind:load to:0x0204b690 add:0x370 module:main from:0x02061dcc kind:arm_call to:0x01ff9b40 module:itcm from:0x02061ddc kind:arm_call_thumb to:0x0200ae10 module:main from:0x02061df0 kind:arm_call to:0x02007944 module:main @@ -1370,7 +1370,7 @@ from:0x02062fc4 kind:load to:0x0204b690 module:main from:0x02062fc8 kind:load to:0x0204b608 module:main from:0x02062fcc kind:load to:0x0204fb78 module:main from:0x02062fdc kind:arm_call to:0x01ffd294 module:itcm -from:0x02063000 kind:load to:0x0204c45c module:main +from:0x02063000 kind:load to:0x0204b690 add:0xdcc module:main from:0x02063010 kind:load to:0x027e0998 module:dtcm from:0x02063020 kind:arm_call to:0x0201662c module:main from:0x02063038 kind:arm_call to:0x0201662c module:main @@ -1410,9 +1410,9 @@ from:0x02063578 kind:arm_call to:0x02008b58 module:main from:0x0206367c kind:arm_call to:0x02015e90 module:main from:0x02063688 kind:arm_call to:0x0203b8f8 module:main from:0x020636ac kind:arm_call to:0x02008ce8 module:main -from:0x020636c8 kind:load to:0x0204b6a0 module:main +from:0x020636c8 kind:load to:0x0204b690 add:0x10 module:main from:0x020636e8 kind:arm_call to:0x0201cab4 module:main -from:0x020636f0 kind:load to:0x0204b6a0 module:main +from:0x020636f0 kind:load to:0x0204b690 add:0x10 module:main from:0x0206378c kind:arm_call to:0x0201a90c module:main from:0x020637ac kind:load to:0x0204c49c module:main from:0x02063840 kind:arm_call to:0x02015fc0 module:main @@ -1420,16 +1420,16 @@ from:0x02063880 kind:arm_call to:0x0201a90c module:main from:0x020638a4 kind:load to:0x0204c49c module:main from:0x020638c4 kind:arm_call to:0x02063488 module:overlay(0) from:0x020638d4 kind:arm_call to:0x0201cb5c module:main -from:0x020638e0 kind:load to:0x0204b6a0 module:main +from:0x020638e0 kind:load to:0x0204b690 add:0x10 module:main from:0x020638ec kind:arm_call to:0x02063364 module:overlay(0) from:0x020638fc kind:arm_call to:0x0201cb5c module:main -from:0x02063904 kind:load to:0x0204b6a0 module:main +from:0x02063904 kind:load to:0x0204b690 add:0x10 module:main from:0x0206391c kind:arm_call to:0x02063390 module:overlay(0) from:0x0206392c kind:arm_call to:0x0201cb5c module:main -from:0x02063938 kind:load to:0x0204b6a0 module:main +from:0x02063938 kind:load to:0x0204b690 add:0x10 module:main from:0x02063944 kind:arm_call to:0x02063440 module:overlay(0) from:0x02063954 kind:arm_call to:0x0201cb5c module:main -from:0x0206395c kind:load to:0x0204b6a0 module:main +from:0x0206395c kind:load to:0x0204b690 add:0x10 module:main from:0x020639d8 kind:arm_call to:0x02019528 module:main from:0x02063abc kind:load to:0x0204b690 module:main from:0x02063adc kind:arm_call to:0x02019528 module:main @@ -1442,7 +1442,7 @@ from:0x02063be8 kind:arm_call to:0x02015e90 module:main from:0x02063bf4 kind:arm_call to:0x0203b6ec module:main from:0x02063c1c kind:arm_call to:0x0201c96c module:main from:0x02063c50 kind:arm_call to:0x02063514 module:overlay(0) -from:0x02063c68 kind:load to:0x0204b6a0 module:main +from:0x02063c68 kind:load to:0x0204b690 add:0x10 module:main from:0x02063cb8 kind:arm_call to:0x02015e90 module:main from:0x02063cc4 kind:arm_call to:0x0203b6ec module:main from:0x02063ce8 kind:arm_call to:0x02015e90 module:main @@ -1450,12 +1450,12 @@ from:0x02063d08 kind:arm_call to:0x02015e90 module:main from:0x02063d14 kind:arm_call to:0x0203b6ec module:main from:0x02063d40 kind:arm_call to:0x0201c96c module:main from:0x02063d74 kind:arm_call to:0x02063514 module:overlay(0) -from:0x02063d8c kind:load to:0x0204b6a0 module:main +from:0x02063d8c kind:load to:0x0204b690 add:0x10 module:main from:0x02063db4 kind:arm_call to:0x02063514 module:overlay(0) from:0x02063e00 kind:arm_call to:0x02028b84 module:main from:0x02063e30 kind:arm_call to:0x02026720 module:main from:0x02063e3c kind:arm_call to:0x02026770 module:main -from:0x02063e48 kind:load to:0x0204b6a0 module:main +from:0x02063e48 kind:load to:0x0204b690 add:0x10 module:main from:0x02063e54 kind:arm_call to:0x02063268 module:overlay(0) from:0x02063e68 kind:load to:0x020b36b4 module:overlay(0) from:0x02063e98 kind:arm_call to:0x02063f38 module:overlay(0) @@ -1565,7 +1565,7 @@ from:0x02064f58 kind:load to:0x0204c49c module:main from:0x02064f74 kind:arm_call to:0x02064dd0 module:overlay(0) from:0x02064f84 kind:arm_call to:0x02061380 module:overlay(0) from:0x02064fb0 kind:arm_call to:0x02064fc4 module:overlay(0) -from:0x02064fc0 kind:load to:0x020b372c module:overlay(0) +from:0x02064fc0 kind:load to:0x020b3724 add:0x8 module:overlay(0) from:0x02065010 kind:arm_call to:0x02064df8 module:overlay(0) from:0x02065020 kind:arm_call to:0x02064268 module:overlay(0) from:0x02065034 kind:arm_call to:0x020615a0 module:overlay(0) @@ -1955,7 +1955,7 @@ from:0x02069a28 kind:arm_call to:0x0201bddc module:main from:0x02069a40 kind:arm_call to:0x0201bddc module:main from:0x02069a50 kind:arm_call_thumb to:0x0201c818 module:main from:0x02069a5c kind:arm_call_thumb to:0x0201c818 module:main -from:0x02069a68 kind:load to:0x0204b6a0 module:main +from:0x02069a68 kind:load to:0x0204b690 add:0x10 module:main from:0x02069a7c kind:load to:0x0201beb4 module:main from:0x02069aa4 kind:load to:0x0204b690 module:main from:0x02069aec kind:arm_call to:0x02069aa8 module:overlay(0) @@ -3126,7 +3126,7 @@ from:0x02073cf8 kind:arm_call to:0x02018b78 module:main from:0x02073d08 kind:arm_call to:0x02074650 module:overlay(0) from:0x02073d14 kind:load to:0x027e09b0 module:dtcm from:0x02073d18 kind:load to:0x0203feb0 module:main -from:0x02073d20 kind:load to:0x0204c390 module:main +from:0x02073d20 kind:load to:0x0204b690 add:0xd00 module:main from:0x02073d24 kind:load to:0x0204b690 module:main from:0x02073d38 kind:load to:0x027e09b4 module:dtcm from:0x02073d4c kind:load to:0x027e09b4 module:dtcm @@ -4368,12 +4368,12 @@ from:0x02081be0 kind:load to:0x027e0998 module:dtcm from:0x02081be4 kind:load to:0x027e0ce4 module:dtcm from:0x02081be8 kind:load to:0x027e0994 module:dtcm from:0x02081bec kind:load to:0x0204b690 module:main -from:0x02081bf0 kind:load to:0x0204c450 module:main +from:0x02081bf0 kind:load to:0x0204b690 add:0xdc0 module:main from:0x02081c50 kind:arm_call to:0x02081384 module:overlay(0) from:0x02081c60 kind:arm_call to:0x02098940 module:overlay(0) from:0x02081c74 kind:arm_call to:0x020c863c module:overlay(24) from:0x02081c8c kind:arm_call to:0x0201db48 module:main -from:0x02081cc8 kind:load to:0x0204c450 module:main +from:0x02081cc8 kind:load to:0x0204b690 add:0xdc0 module:main from:0x02081ccc kind:load to:0x027e0994 module:dtcm from:0x02081cd0 kind:load to:0x027e0ce4 module:dtcm from:0x02081cd4 kind:load to:0x0204b690 module:main @@ -6140,7 +6140,7 @@ from:0x02094bec kind:arm_call to:0x02074994 module:overlay(0) from:0x02094c20 kind:load to:0x020ae82c module:overlay(0) from:0x02094c24 kind:load to:0x027e0ce0 module:dtcm from:0x02094c28 kind:load to:0x0204b690 module:main -from:0x02094c2c kind:load to:0x0204c390 module:main +from:0x02094c2c kind:load to:0x0204b690 add:0xd00 module:main from:0x02094c30 kind:load to:0x027e09b8 module:dtcm from:0x02094c34 kind:load to:0x0204b608 module:main from:0x02094c64 kind:arm_call to:0x0208f1b0 module:overlay(0) @@ -7406,7 +7406,7 @@ from:0x020a04e8 kind:load to:0x020b54b4 module:overlay(0) from:0x020a04ec kind:load to:0x020b59a0 module:overlay(0) from:0x020a04f0 kind:load to:0x0204b690 module:main from:0x020a04f4 kind:load to:0x0204547c add:0x8 module:main -from:0x020a04f8 kind:load to:0x0204b6a0 module:main +from:0x020a04f8 kind:load to:0x0204b690 add:0x10 module:main from:0x020a0524 kind:arm_call to:0x02035590 module:main from:0x020a0530 kind:arm_call to:0x020354ac module:main from:0x020a0544 kind:arm_call to:0x02035590 module:main @@ -7425,7 +7425,7 @@ from:0x020a05f4 kind:load to:0x020b59a0 module:overlay(0) from:0x020a05f8 kind:load to:0x0204547c add:0x8 module:main from:0x020a0604 kind:arm_call to:0x020a08e4 module:overlay(0) from:0x020a0614 kind:arm_call_thumb to:0x0201c7d4 module:main -from:0x020a0624 kind:load to:0x0204b6a0 module:main +from:0x020a0624 kind:load to:0x0204b690 add:0x10 module:main from:0x020a0648 kind:arm_call to:0x020342e0 module:main from:0x020a0670 kind:arm_call to:0x02035590 module:main from:0x020a067c kind:arm_call to:0x020354ac module:main @@ -7458,7 +7458,7 @@ from:0x020a0868 kind:load to:0x020b54b4 module:overlay(0) from:0x020a086c kind:load to:0x020b5974 module:overlay(0) from:0x020a0870 kind:load to:0x020b59a8 module:overlay(0) from:0x020a0874 kind:load to:0x0204547c add:0x8 module:main -from:0x020a0878 kind:load to:0x0204ba00 module:main +from:0x020a0878 kind:load to:0x0204b690 add:0x370 module:main from:0x020a08a4 kind:arm_call to:0x02058b60 module:overlay(0) from:0x020a08c0 kind:arm_call to:0x02058b90 module:overlay(0) from:0x020a08dc kind:arm_call to:0x02058b38 module:overlay(0) @@ -7511,12 +7511,12 @@ from:0x020a0d18 kind:arm_call to:0x020a1130 module:overlay(0) from:0x020a0d30 kind:arm_call to:0x020a0734 module:overlay(0) from:0x020a0d48 kind:arm_call to:0x020165f4 module:main from:0x020a0d50 kind:arm_call_thumb to:0x0201545c module:main -from:0x020a0d5c kind:load to:0x0204b6a0 module:main +from:0x020a0d5c kind:load to:0x0204b690 add:0x10 module:main from:0x020a0d60 kind:load to:0x020b5bb0 module:overlay(0) from:0x020a0d64 kind:load to:0x020b6088 module:overlay(0) from:0x020a0d68 kind:load to:0x020b608c module:overlay(0) from:0x020a0d6c kind:load to:0x0204547c add:0x8 module:main -from:0x020a0d70 kind:load to:0x0204ba00 module:main +from:0x020a0d70 kind:load to:0x0204b690 add:0x370 module:main from:0x020a0d98 kind:arm_call_thumb to:0x02015448 module:main from:0x020a0da4 kind:arm_call to:0x020165b8 module:main from:0x020a0db4 kind:arm_call to:0x020a11e8 module:overlay(0) @@ -7557,7 +7557,7 @@ from:0x020a10b0 kind:load to:0x020b5bb0 module:overlay(0) from:0x020a10b4 kind:load to:0x020b6088 module:overlay(0) from:0x020a10b8 kind:load to:0x020b608c module:overlay(0) from:0x020a10bc kind:load to:0x0204547c add:0x8 module:main -from:0x020a10c0 kind:load to:0x0204ba00 module:main +from:0x020a10c0 kind:load to:0x0204b690 add:0x370 module:main from:0x020a10d0 kind:arm_call to:0x020a1130 module:overlay(0) from:0x020a10ec kind:arm_call to:0x020a0628 module:overlay(0) from:0x020a10f4 kind:load to:0x020b5bb0 module:overlay(0) @@ -8064,7 +8064,7 @@ from:0x020a6174 kind:arm_call to:0x0201aa68 module:main from:0x020a61dc kind:arm_call to:0x020611a8 module:overlay(0) from:0x020a61fc kind:arm_call to:0x0201aa68 module:main from:0x020a6208 kind:load to:0x0204c49c module:main -from:0x020a620c kind:load to:0x0204c490 module:main +from:0x020a620c kind:load to:0x0204b690 add:0xe00 module:main from:0x020a6210 kind:load to:0x020b6248 module:overlay(0) from:0x020a6214 kind:load to:0x0204b608 module:main from:0x020a623c kind:arm_call to:0x02018a44 module:main @@ -8078,7 +8078,7 @@ from:0x020a62b4 kind:load to:0x020b6a14 module:overlay(0) from:0x020a62d0 kind:arm_call to:0x02018a5c module:main from:0x020a62dc kind:arm_call_thumb to:0x0201c818 module:main from:0x020a62e4 kind:load to:0x027e0994 module:dtcm -from:0x020a62e8 kind:load to:0x0204b6a0 module:main +from:0x020a62e8 kind:load to:0x0204b690 add:0x10 module:main from:0x020a6338 kind:arm_call to:0x020611a8 module:overlay(0) from:0x020a6390 kind:arm_call to:0x02061db4 module:overlay(0) from:0x020a63d8 kind:arm_call to:0x020631e4 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov000/symbols.txt b/config/jp/arm9/overlays/ov000/symbols.txt index 03d44ca8..e2f22444 100644 --- a/config/jp/arm9/overlays/ov000/symbols.txt +++ b/config/jp/arm9/overlays/ov000/symbols.txt @@ -192,8 +192,8 @@ _ZN26UnkStruct_StackTitleScreenC1EPKci kind:function(arm,size=0x54) addr:0x0205a _ZN26UnkStruct_StackTitleScreenD1Ev kind:function(arm,size=0x30) addr:0x0205a7c0 _ZN26UnkStruct_StackTitleScreen19func_ov000_02059270EiPci kind:function(arm,size=0x18) addr:0x0205a7f0 _ZN26UnkStruct_StackTitleScreen19func_ov000_02059288EiPci kind:function(arm,size=0x18) addr:0x0205a808 -func_ov000_0205a820 kind:function(thumb,size=0x46) addr:0x0205a820 -func_ov000_0205a868 kind:function(thumb,size=0x7c) addr:0x0205a868 +_ZN18UnkStruct_027e095c19func_ov000_020592a0Ev kind:function(thumb,size=0x46) addr:0x0205a820 +_ZN18UnkStruct_027e095c19func_ov000_020592ecEv kind:function(thumb,size=0x7c) addr:0x0205a868 func_ov000_0205a8e4 kind:function(thumb,size=0xc) addr:0x0205a8e4 func_ov000_0205a8f0 kind:function(thumb,size=0xec) addr:0x0205a8f0 func_ov000_0205a9dc kind:function(thumb,size=0x1b0) addr:0x0205a9dc @@ -250,8 +250,8 @@ _ZN19func_ov000_0205bd8cD1Ev kind:function(arm,size=0x14) addr:0x0205bd8c _ZN19func_ov000_0205bda0D0Ev kind:function(arm,size=0x1c) addr:0x0205bda0 func_ov000_0205bdbc kind:function(thumb,size=0xaa) addr:0x0205bdbc func_ov000_0205be68 kind:function(thumb,size=0x64) addr:0x0205be68 -func_ov000_0205becc kind:function(thumb,size=0xc) addr:0x0205becc -func_ov000_0205bed8 kind:function(thumb,size=0xe) addr:0x0205bed8 +func_ov000_0205a944 kind:function(thumb,size=0xc) addr:0x0205becc +func_ov000_0205a950 kind:function(thumb,size=0xe) addr:0x0205bed8 func_ov000_0205bee8 kind:function(thumb,size=0x40) addr:0x0205bee8 func_ov000_0205bf28 kind:function(arm,size=0x70) addr:0x0205bf28 func_ov000_0205bf98 kind:function(arm,size=0x60) addr:0x0205bf98 @@ -402,7 +402,7 @@ _ZN34UnkStruct_ov019_020d24c8_28_258_0019func_ov000_0205fc20EiiPvS0_ kind:functi func_ov000_02061290 kind:function(arm,size=0x38) addr:0x02061290 func_ov000_020612c8 kind:function(arm,size=0x90) addr:0x020612c8 func_ov000_02061358 kind:function(arm,size=0x28) addr:0x02061358 -func_ov000_02061380 kind:function(arm,size=0x28) addr:0x02061380 +_ZN33UnkSystem2_UnkSubSystem7_Derived2C1Ev kind:function(arm,size=0x28) addr:0x02061380 _ZN24UnkSystem2_UnkSubSystem7D1Ev kind:function(arm,size=0x68) addr:0x020613a8 func_ov000_02061410 kind:function(arm,size=0x68) addr:0x02061410 func_ov000_02061478 kind:function(arm,size=0x128) addr:0x02061478 @@ -428,7 +428,7 @@ _ZN14UnkSubStruct1919func_ov000_0206082cEii kind:function(arm,size=0x124) addr:0 _ZN14UnkSubStruct1919func_ov000_02060950Ev kind:function(arm,size=0x60) addr:0x02061ed8 _ZN14UnkSubStruct1919func_ov000_020609b0Ev kind:function(arm,size=0x14) addr:0x02061f38 _ZN14UnkSubStruct1919func_ov000_020609c4Ev kind:function(arm,size=0xd4) addr:0x02061f4c -_ZN14UnkSubStruct1919func_ov000_02060a98Ev kind:function(arm,size=0x38) addr:0x02062020 +_ZN14UnkSubStruct1919func_ov000_02060a98Ei kind:function(arm,size=0x38) addr:0x02062020 _ZN14UnkSubStruct1919func_ov000_02060ad0Ev kind:function(arm,size=0x28) addr:0x02062058 _ZN14UnkSubStruct1919func_ov000_02060af8Ev kind:function(arm,size=0x58) addr:0x02062080 _ZN14UnkSubStruct1919func_ov000_02060b50Ev kind:function(arm,size=0x14) addr:0x020620d8 @@ -445,11 +445,11 @@ func_ov000_02062340 kind:function(arm,size=0x84) addr:0x02062340 func_ov000_020623c4 kind:function(arm,size=0x88) addr:0x020623c4 func_ov000_0206244c kind:function(arm,size=0x20) addr:0x0206244c _ZN23TitleScreenManager_BaseC2Ev kind:function(arm,size=0x30) addr:0x0206246c -_ZN19func_ov000_0206249cD1Ev kind:function(arm,size=0x38) addr:0x0206249c -_ZN19func_ov000_020624d4D0Ev kind:function(arm,size=0x40) addr:0x020624d4 +_ZN23TitleScreenManager_BaseD1Ev kind:function(arm,size=0x38) addr:0x0206249c +_ZN23TitleScreenManager_BaseD0Ev kind:function(arm,size=0x40) addr:0x020624d4 _ZN23TitleScreenManager_BaseD2Ev kind:function(arm,size=0x38) addr:0x02062514 _ZN23TitleScreenManager_Base8vfunc_10Eiii kind:function(arm,size=0x4) addr:0x0206254c -func_ov000_02062550 kind:function(arm,size=0x68) addr:0x02062550 +_ZN23TitleScreenManager_Base19func_ov000_02060fc8Eiiii kind:function(arm,size=0x68) addr:0x02062550 _ZN23TitleScreenManager_Base8vfunc_3CEv kind:function(arm,size=0x8) addr:0x020625b8 _ZN23TitleScreenManager_Base8vfunc_40Ev kind:function(arm,size=0x4) addr:0x020625c0 _ZN23TitleScreenManager_Base8vfunc_44Ev kind:function(arm,size=0x4) addr:0x020625c4 @@ -471,24 +471,24 @@ _ZN29FileSelectManager_UnkDrawBaseD0Ev kind:function(arm,size=0x20) addr:0x02062 _ZN29FileSelectManager_UnkDrawBaseD2Ev kind:function(arm,size=0x18) addr:0x02062c50 _ZN29FileSelectManager_UnkDrawBase8vfunc_08Ei kind:function(arm,size=0x4) addr:0x02062c68 _ZN29FileSelectManager_UnkDrawBase8vfunc_0CEi kind:function(arm,size=0x4) addr:0x02062c6c -_ZN29FileSelectManager_UnkDrawBase8vfunc_10Ev kind:function(arm,size=0x4) addr:0x02062c70 -_ZN29FileSelectManager_UnkDrawBase8vfunc_14Ev kind:function(arm,size=0x4) addr:0x02062c74 +_ZN29FileSelectManager_UnkDrawBase8vfunc_10Eii kind:function(arm,size=0x4) addr:0x02062c70 +_ZN29FileSelectManager_UnkDrawBase8vfunc_14Ei kind:function(arm,size=0x4) addr:0x02062c74 _ZN29FileSelectManager_UnkDrawBase8vfunc_18Ei kind:function(arm,size=0x4) addr:0x02062c78 _ZN29FileSelectManager_UnkDrawBase8vfunc_1CEi kind:function(arm,size=0x4) addr:0x02062c7c -_ZN29FileSelectManager_UnkDrawBase8vfunc_20Ev kind:function(arm,size=0x4) addr:0x02062c80 +_ZN29FileSelectManager_UnkDrawBase8vfunc_20Eii kind:function(arm,size=0x4) addr:0x02062c80 _ZN29FileSelectManager_UnkDrawBase8vfunc_24Ev kind:function(arm,size=0x4) addr:0x02062c84 -func_ov000_02062c88 kind:function(thumb,size=0x24) addr:0x02062c88 -func_ov000_02062cac kind:function(thumb,size=0x24) addr:0x02062cac +_ZN23UnkStruct_027e0998_BaseC2Ev kind:function(thumb,size=0x24) addr:0x02062c88 +_ZN23UnkStruct_027e0998_BaseC1Ev kind:function(thumb,size=0x24) addr:0x02062cac func_ov000_02062cd0 kind:function(thumb,size=0x16) addr:0x02062cd0 -func_ov000_02062ce8 kind:function(thumb,size=0x2) addr:0x02062ce8 -func_ov000_02062cec kind:function(arm,size=0x4) addr:0x02062cec -func_ov000_02062cf0 kind:function(arm,size=0x4) addr:0x02062cf0 +_ZN23UnkStruct_027e0998_Base19func_ov000_02061760Ev kind:function(thumb,size=0x2) addr:0x02062ce8 +_ZN23UnkStruct_027e0998_Base19func_ov000_02061764Ev kind:function(arm,size=0x4) addr:0x02062cec +_ZN23UnkStruct_027e0998_Base19func_ov000_02061768Ev kind:function(arm,size=0x4) addr:0x02062cf0 func_ov000_02062cf4 kind:function(thumb,size=0xbc) addr:0x02062cf4 func_ov000_02062db0 kind:function(thumb,size=0x28) addr:0x02062db0 -func_ov000_02062dd8 kind:function(arm,size=0x18) addr:0x02062dd8 -func_ov000_02062df0 kind:function(arm,size=0x1e0) addr:0x02062df0 +_ZN23UnkStruct_027e0998_Base19func_ov000_02061850Ei kind:function(arm,size=0x18) addr:0x02062dd8 +_ZN23UnkStruct_027e0998_Base8vfunc_00EP5Vec3pP5Vec2sPt kind:function(arm,size=0x1e0) addr:0x02062df0 func_ov000_02062fd0 kind:function(arm,size=0x28) addr:0x02062fd0 -_ZN18UnkStruct_027e099819func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02062ff8 +_ZN23UnkStruct_027e0998_Base19func_ov000_02061a70Ev kind:function(arm,size=0xc) addr:0x02062ff8 func_ov000_02063004 kind:function(arm,size=0x10) addr:0x02063004 _ZN26GameModeManagerBase_104_0CD1Ev kind:function(arm,size=0x18) addr:0x02063014 _ZN26GameModeManagerBase_104_0CD0Ev kind:function(arm,size=0x20) addr:0x0206302c @@ -551,8 +551,8 @@ func_ov000_020643cc kind:function(arm,size=0x18) addr:0x020643cc func_ov000_020643e4 kind:function(arm,size=0x18) addr:0x020643e4 func_ov000_020643fc kind:function(arm,size=0x54) addr:0x020643fc _ZN24UnkSystem2_UnkSubSystem3C1EP29UnkSystem2_UnkSubSystem1_Baseiii kind:function(arm,size=0x30) addr:0x02064450 -func_ov000_02064480 kind:function(arm,size=0x20) addr:0x02064480 -func_ov000_020644a0 kind:function(arm,size=0x18) addr:0x020644a0 +_ZN24UnkSystem2_UnkSubSystem3C1Ev kind:function(arm,size=0x20) addr:0x02064480 +_ZN24UnkSystem2_UnkSubSystem319func_ov000_02062f18EPvii kind:function(arm,size=0x18) addr:0x020644a0 _ZN24UnkSystem2_UnkSubSystem319func_ov000_02062f30Ev kind:function(arm,size=0xd4) addr:0x020644b8 func_ov000_0206458c kind:function(arm,size=0x6c) addr:0x0206458c _ZN19func_ov000_020645f8D1Ev kind:function(arm,size=0x14) addr:0x020645f8 @@ -574,11 +574,11 @@ func_ov000_02064bc0 kind:function(arm,size=0xb0) addr:0x02064bc0 func_ov000_02064c70 kind:function(arm,size=0x130) addr:0x02064c70 _ZN19func_ov000_02064da0D1Ev kind:function(arm,size=0x14) addr:0x02064da0 _ZN19func_ov000_02064db4D0Ev kind:function(arm,size=0x1c) addr:0x02064db4 -func_ov000_02064dd0 kind:function(arm,size=0x28) addr:0x02064dd0 +_ZN33UnkSystem2_UnkSubSystem1_Derived3C2Ev kind:function(arm,size=0x28) addr:0x02064dd0 func_ov000_02064df8 kind:function(arm,size=0x98) addr:0x02064df8 func_ov000_02064e90 kind:function(arm,size=0xcc) addr:0x02064e90 _ZN33UnkSystem2_UnkSubSystem1_Derived2C1Eiiiiii kind:function(arm,size=0x68) addr:0x02064f5c -func_ov000_02064fc4 kind:function(arm,size=0x54) addr:0x02064fc4 +_ZN33UnkSystem2_UnkSubSystem1_Derived319func_ov000_02063a3cEiiiiii kind:function(arm,size=0x54) addr:0x02064fc4 func_ov000_02065018 kind:function(arm,size=0x2c) addr:0x02065018 func_ov000_02065044 kind:function(arm,size=0x54) addr:0x02065044 func_ov000_02065098 kind:function(arm,size=0xc) addr:0x02065098 @@ -665,18 +665,18 @@ func_ov000_02067718 kind:function(arm,size=0x1c) addr:0x02067718 func_ov000_02067734 kind:function(arm,size=0x3c) addr:0x02067734 _ZN19func_ov000_02067770D1Ev kind:function(arm,size=0x14) addr:0x02067770 _ZN19func_ov000_02067784D0Ev kind:function(arm,size=0x1c) addr:0x02067784 -func_ov000_020677a0 kind:function(arm,size=0x38) addr:0x020677a0 +_ZN27AdventureModeManager_160_2819func_ov000_02066218Ei kind:function(arm,size=0x38) addr:0x020677a0 func_ov000_020677d8 kind:function(arm,size=0x14) addr:0x020677d8 _ZN19func_ov000_020677ecD1Ev kind:function(arm,size=0x14) addr:0x020677ec _ZN19func_ov000_02067800D0Ev kind:function(arm,size=0x1c) addr:0x02067800 func_ov000_0206781c kind:function(arm,size=0x24) addr:0x0206781c func_ov000_02067840 kind:function(arm,size=0x30) addr:0x02067840 -func_ov000_02067870 kind:function(arm,size=0x7c) addr:0x02067870 +_ZN24UnkStruct_ov000_020b4f7019func_ov000_020662e8Ev kind:function(arm,size=0x7c) addr:0x02067870 func_ov000_020678ec kind:function(arm,size=0xc) addr:0x020678ec -func_ov000_020678f8 kind:function(arm,size=0xec) addr:0x020678f8 -func_ov000_020679e4 kind:function(arm,size=0xf0) addr:0x020679e4 -func_ov000_02067ad4 kind:function(arm,size=0x6c) addr:0x02067ad4 -func_ov000_02067b40 kind:function(arm,size=0x14) addr:0x02067b40 +_ZN24UnkStruct_ov000_020b4f7019func_ov000_02066370Ev kind:function(arm,size=0xec) addr:0x020678f8 +_ZN24UnkStruct_ov000_020b4f7019func_ov000_0206645cEPc kind:function(arm,size=0xf0) addr:0x020679e4 +_ZN24UnkStruct_ov000_020b4f7019func_ov000_0206654cEv kind:function(arm,size=0x6c) addr:0x02067ad4 +_ZN24UnkStruct_ov000_020b4f7019func_ov000_020665b8Ev kind:function(arm,size=0x14) addr:0x02067b40 func_ov000_02067b54 kind:function(arm,size=0x10) addr:0x02067b54 _ZN27UnkStruct_ov000_020b4f84_00C1Ev kind:function(arm,size=0x34) addr:0x02067b64 func_ov000_02067b98 kind:function(arm,size=0x4c) addr:0x02067b98 @@ -720,12 +720,12 @@ func_ov000_02068f0c kind:function(arm,size=0xbc) addr:0x02068f0c func_ov000_02068fc8 kind:function(arm,size=0x34) addr:0x02068fc8 _ZN17struct_aStack_2e0C1EP24UnkStruct_ov000_020b504ci kind:function(arm,size=0x44) addr:0x02068ffc func_ov000_02069040 kind:function(arm,size=0x7c) addr:0x02069040 -func_ov000_020690bc kind:function(arm,size=0x40) addr:0x020690bc -func_ov000_020690fc kind:function(arm,size=0x54) addr:0x020690fc +_ZN24UnkStruct_ov000_020b504c19func_ov000_02067b20Ev kind:function(arm,size=0x40) addr:0x020690bc +_ZN24UnkStruct_ov000_020b504c19func_ov000_02067b60Ev kind:function(arm,size=0x54) addr:0x020690fc _ZN24UnkStruct_ov000_02067bc419func_ov000_02067bb4Ei kind:function(arm,size=0x10) addr:0x02069150 _ZN24UnkStruct_ov000_020b504c19func_ov000_02067bc4Ei kind:function(arm,size=0x1c) addr:0x02069160 func_ov000_0206917c kind:function(arm,size=0x10) addr:0x0206917c -func_ov000_0206918c kind:function(arm,size=0x8) addr:0x0206918c +_ZN24UnkStruct_ov000_020b504c19func_ov000_02067bf0Ev kind:function(arm,size=0x8) addr:0x0206918c func_ov000_02069194 kind:function(arm,size=0x8) addr:0x02069194 func_ov000_0206919c kind:function(arm,size=0x8) addr:0x0206919c func_ov000_020691a4 kind:function(arm,size=0x98) addr:0x020691a4 @@ -733,9 +733,9 @@ func_ov000_0206923c kind:function(arm,size=0x4) addr:0x0206923c func_ov000_02069240 kind:function(arm,size=0x5c) addr:0x02069240 _ZN24UnkStruct_ov000_020b504c19func_ov000_02067cf8EiiPN24UnkStruct_ov000_02067bc410UnkStruct1E kind:function(arm,size=0x168) addr:0x0206929c _ZN24UnkStruct_ov000_020b504c19func_ov000_02067e60Ehi kind:function(arm,size=0xfc) addr:0x02069404 -func_ov000_02069500 kind:function(arm,size=0x2c) addr:0x02069500 +_ZN24UnkStruct_ov000_020b504c19func_ov000_02067f5cEi kind:function(arm,size=0x2c) addr:0x02069500 _ZN24UnkStruct_ov000_020b504c19func_ov000_02067f88Eii kind:function(arm,size=0xe0) addr:0x0206952c -func_ov000_0206960c kind:function(arm,size=0x14) addr:0x0206960c +_ZN24UnkStruct_ov000_020b504c19func_ov000_02068068Ei kind:function(arm,size=0x14) addr:0x0206960c _ZN24UnkStruct_ov000_020b504c19func_ov000_0206807cEPvS0_ kind:function(arm,size=0x48) addr:0x02069620 func_ov000_02069668 kind:function(arm,size=0xd0) addr:0x02069668 func_ov000_02069738 kind:function(arm,size=0x98) addr:0x02069738 @@ -794,7 +794,7 @@ func_ov000_0206b1e8 kind:function(arm,size=0x34) addr:0x0206b1e8 func_ov000_0206b21c kind:function(arm,size=0x28) addr:0x0206b21c func_ov000_0206b244 kind:function(arm,size=0x9c) addr:0x0206b244 _ZN24UnkStruct_ov000_020b50c019func_ov000_02069d3cEi kind:function(arm,size=0x40) addr:0x0206b2e0 -_ZN24UnkStruct_ov000_020b50c019func_ov000_02069d7cEv kind:function(arm,size=0x40) addr:0x0206b320 +_ZN24UnkStruct_ov000_020b50c019func_ov000_02069d7cEi kind:function(arm,size=0x40) addr:0x0206b320 func_ov000_0206b360 kind:function(arm,size=0x84) addr:0x0206b360 func_ov000_0206b3e4 kind:function(arm,size=0xc) addr:0x0206b3e4 func_ov000_0206b3f0 kind:function(arm,size=0x50) addr:0x0206b3f0 @@ -961,7 +961,7 @@ _ZN24UnkStruct_ov000_020b52b419func_ov000_0206f6acEv kind:function(arm,size=0x2c func_ov000_02070d50 kind:function(arm,size=0x34) addr:0x02070d50 func_ov000_02070d84 kind:function(arm,size=0x48) addr:0x02070d84 func_ov000_02070dcc kind:function(arm,size=0x24) addr:0x02070dcc -func_ov000_02070df0 kind:function(arm,size=0x1f0) addr:0x02070df0 +_ZN24UnkStruct_ov000_020b52b419func_ov000_0206f778Eiii kind:function(arm,size=0x1f0) addr:0x02070df0 func_ov000_02070fe0 kind:function(arm,size=0x18) addr:0x02070fe0 func_ov000_02070ff8 kind:function(arm,size=0x14) addr:0x02070ff8 func_ov000_0207100c kind:function(arm,size=0xc) addr:0x0207100c @@ -987,12 +987,12 @@ func_ov000_020717ec kind:function(arm,size=0x14) addr:0x020717ec func_ov000_02071800 kind:function(arm,size=0x1c) addr:0x02071800 func_ov000_0207181c kind:function(arm,size=0xfc) addr:0x0207181c func_ov000_02071918 kind:function(arm,size=0x3c) addr:0x02071918 -_ZN18UnkStruct_027e09a019func_ov000_0207029cEi kind:function(arm,size=0xc) addr:0x02071954 +_ZN18UnkStruct_027e09a014GetCourseEntryEj kind:function(arm,size=0xc) addr:0x02071954 func_ov000_02071960 kind:function(arm,size=0x14) addr:0x02071960 -func_ov000_02071974 kind:function(arm,size=0x40) addr:0x02071974 -func_ov000_020719b4 kind:function(arm,size=0x14) addr:0x020719b4 +_ZN18UnkStruct_027e09a017GetRoomEntryIndexEv kind:function(arm,size=0x40) addr:0x02071974 +_ZN18UnkStruct_027e09a012GetRoomEntryEji kind:function(arm,size=0x14) addr:0x020719b4 func_ov000_020719c8 kind:function(arm,size=0x68) addr:0x020719c8 -func_ov000_02071a30 kind:function(arm,size=0x44) addr:0x02071a30 +_ZN18UnkStruct_027e09a019func_ov000_02070378Ej kind:function(arm,size=0x44) addr:0x02071a30 func_ov000_02071a74 kind:function(arm,size=0x8) addr:0x02071a74 func_ov000_02071a7c kind:function(arm,size=0x5c) addr:0x02071a7c func_ov000_02071ad8 kind:function(arm,size=0xa8) addr:0x02071ad8 @@ -1002,10 +1002,10 @@ func_ov000_02071bf0 kind:function(arm,size=0xc) addr:0x02071bf0 func_ov000_02071bfc kind:function(arm,size=0x10) addr:0x02071bfc func_ov000_02071c0c kind:function(arm,size=0xc) addr:0x02071c0c _ZN18UnkStruct_027e09a419func_ov000_02070560Ev kind:function(arm,size=0xc) addr:0x02071c18 -func_ov000_02071c24 kind:function(arm,size=0x14) addr:0x02071c24 +_ZN18UnkStruct_027e09a419func_ov000_0207056cEv kind:function(arm,size=0x14) addr:0x02071c24 func_ov000_02071c38 kind:function(arm,size=0x1c) addr:0x02071c38 func_ov000_02071c54 kind:function(arm,size=0x4c) addr:0x02071c54 -func_ov000_02071ca0 kind:function(thumb,size=0x134) addr:0x02071ca0 +_ZN18UnkStruct_027e09a419func_ov000_020705e8EP8SaveFilei kind:function(thumb,size=0x134) addr:0x02071ca0 func_ov000_02071dd4 kind:function(thumb,size=0x8c) addr:0x02071dd4 _ZN18UnkStruct_027e09a419func_ov000_020707a8EPv kind:function(thumb,size=0x8c) addr:0x02071e60 _ZN18UnkStruct_027e09a419func_ov000_02070834EPv kind:function(arm,size=0x48) addr:0x02071eec @@ -1073,7 +1073,7 @@ func_ov000_02073550 kind:function(arm,size=0x14) addr:0x02073550 func_ov000_02073564 kind:function(arm,size=0x8c) addr:0x02073564 func_ov000_020735f0 kind:function(arm,size=0x50) addr:0x020735f0 func_ov000_02073640 kind:function(arm,size=0x10) addr:0x02073640 -func_ov000_02073650 kind:function(arm,size=0x13c) addr:0x02073650 +_ZN21UnkStruct_027e09ac_1419func_ov000_02071f98Ev kind:function(arm,size=0x13c) addr:0x02073650 func_ov000_0207378c kind:function(arm,size=0x270) addr:0x0207378c func_ov000_020739fc kind:function(arm,size=0xb0) addr:0x020739fc func_ov000_02073aac kind:function(arm,size=0x78) addr:0x02073aac @@ -1081,8 +1081,8 @@ func_ov000_02073b24 kind:function(arm,size=0x204) addr:0x02073b24 func_ov000_02073d28 kind:function(arm,size=0x14) addr:0x02073d28 func_ov000_02073d3c kind:function(arm,size=0x18) addr:0x02073d3c func_ov000_02073d54 kind:function(arm,size=0x54) addr:0x02073d54 -func_ov000_02073da8 kind:function(arm,size=0x2d4) addr:0x02073da8 -func_ov000_0207407c kind:function(arm,size=0x88) addr:0x0207407c +_ZN18UnkStruct_027e09ac19func_ov000_020726f0Eiii kind:function(arm,size=0x2d4) addr:0x02073da8 +_ZN18UnkStruct_027e09ac19func_ov000_020729c4EP21UnkStruct_027e09ac_14ttss kind:function(arm,size=0x88) addr:0x0207407c func_ov000_02074104 kind:function(arm,size=0xbc) addr:0x02074104 func_ov000_020741c0 kind:function(arm,size=0x1c) addr:0x020741c0 func_ov000_020741dc kind:function(arm,size=0xc) addr:0x020741dc @@ -1105,8 +1105,8 @@ func_ov000_02074650 kind:function(arm,size=0x24) addr:0x02074650 func_ov000_02074674 kind:function(arm,size=0x14) addr:0x02074674 func_ov000_02074688 kind:function(arm,size=0xb0) addr:0x02074688 func_ov000_02074738 kind:function(arm,size=0x2c) addr:0x02074738 -func_ov000_02074764 kind:function(arm,size=0x58) addr:0x02074764 -func_ov000_020747bc kind:function(arm,size=0x2c) addr:0x020747bc +_ZN17ActorUnk_vfunc_b0C1Ev kind:function(arm,size=0x58) addr:0x02074764 +_ZN20stack_ov000_02073578C1Ev kind:function(arm,size=0x2c) addr:0x020747bc func_ov000_020747e8 kind:function(arm,size=0x4) addr:0x020747e8 _ZN19func_ov000_020747ecD0Ev kind:function(arm,size=0x14) addr:0x020747ec func_ov000_02074800 kind:function(arm,size=0x4) addr:0x02074800 @@ -1131,10 +1131,10 @@ _ZN18UnkStruct_027e09b819func_ov000_020732fcEi kind:function(arm,size=0x10) addr _ZN18UnkStruct_027e09b819func_ov000_0207330cEv kind:function(arm,size=0x20) addr:0x020749c4 func_ov000_020749e4 kind:function(arm,size=0x5c) addr:0x020749e4 _ZN18UnkStruct_027e09b819func_ov000_02073388EPvi kind:function(arm,size=0xe8) addr:0x02074a40 -func_ov000_02074b28 kind:function(arm,size=0x108) addr:0x02074b28 -func_ov000_02074c30 kind:function(arm,size=0x98) addr:0x02074c30 +_ZN18UnkStruct_027e09b819func_ov000_02073470EPvi kind:function(arm,size=0x108) addr:0x02074b28 +_ZN18UnkStruct_027e09b819func_ov000_02073578EPvi kind:function(arm,size=0x98) addr:0x02074c30 func_ov000_02074cc8 kind:function(arm,size=0xb0) addr:0x02074cc8 -func_ov000_02074d78 kind:function(arm,size=0x10) addr:0x02074d78 +_ZN18UnkStruct_027e09b819func_ov000_02074d78Ei kind:function(arm,size=0x10) addr:0x02074d78 func_ov000_02074d88 kind:function(arm,size=0x8) addr:0x02074d88 func_ov000_02074d90 kind:function(arm,size=0x8) addr:0x02074d90 func_ov000_02074d98 kind:function(arm,size=0x38) addr:0x02074d98 @@ -1626,7 +1626,7 @@ func_ov000_0208322c kind:function(arm,size=0x10) addr:0x0208322c func_ov000_0208323c kind:function(arm,size=0x18) addr:0x0208323c func_ov000_02083254 kind:function(arm,size=0x58) addr:0x02083254 func_ov000_020832ac kind:function(arm,size=0x34) addr:0x020832ac -func_ov000_020832e0 kind:function(arm,size=0x78) addr:0x020832e0 +_ZN18UnkStruct_027e0cd819func_ov000_02081c28Ev kind:function(arm,size=0x78) addr:0x020832e0 func_ov000_02083358 kind:function(arm,size=0xa8) addr:0x02083358 func_ov000_02083400 kind:function(arm,size=0x10) addr:0x02083400 func_ov000_02083410 kind:function(arm,size=0x4) addr:0x02083410 @@ -1640,7 +1640,7 @@ _ZN18UnkStruct_027e0cd819func_ov000_02081eecEsii kind:function(arm,size=0x50) ad _ZN18UnkStruct_027e0cd819func_ov000_02081f3cEsi kind:function(arm,size=0x4c) addr:0x020835f4 func_ov000_02083640 kind:function(arm,size=0x90) addr:0x02083640 func_ov000_020836d0 kind:function(arm,size=0x10c) addr:0x020836d0 -func_ov000_020837dc kind:function(arm,size=0x40) addr:0x020837dc +_ZN18UnkStruct_027e0cd819func_ov000_02082124Ev kind:function(arm,size=0x40) addr:0x020837dc func_ov000_0208381c kind:function(arm,size=0x2c) addr:0x0208381c func_ov000_02083848 kind:function(arm,size=0x4c) addr:0x02083848 _ZN19func_ov000_02083894D1Ev kind:function(arm,size=0x14) addr:0x02083894 @@ -1671,7 +1671,7 @@ func_ov000_020840c4 kind:function(arm,size=0x10) addr:0x020840c4 func_ov000_020840d4 kind:function(arm,size=0x10) addr:0x020840d4 _ZN18UnkStruct_027e0cdc19func_ov000_02082a28Ei kind:function(arm,size=0x10) addr:0x020840e4 func_ov000_020840f4 kind:function(arm,size=0x10) addr:0x020840f4 -func_ov000_02084104 kind:function(arm,size=0x10) addr:0x02084104 +_ZN18UnkStruct_027e0cdc19func_ov000_02082a48Ei kind:function(arm,size=0x10) addr:0x02084104 func_ov000_02084114 kind:function(arm,size=0x48) addr:0x02084114 func_ov000_0208415c kind:function(arm,size=0x10) addr:0x0208415c func_ov000_0208416c kind:function(thumb,size=0x2c) addr:0x0208416c @@ -2697,7 +2697,7 @@ func_ov000_020a21b8 kind:function(arm,size=0xb0) addr:0x020a21b8 func_ov000_020a2268 kind:function(thumb,size=0x9a) addr:0x020a2268 _ZN11SaveManager19func_ov000_020a0b2cEPFvtEi kind:function(thumb,size=0x2c) addr:0x020a2304 func_ov000_020a2330 kind:function(thumb,size=0x18) addr:0x020a2330 -func_ov000_020a2348 kind:function(thumb,size=0xa8) addr:0x020a2348 +_ZN11SaveManager19func_ov000_020a0b70EPvi kind:function(thumb,size=0xa8) addr:0x020a2348 func_ov000_020a23f0 kind:function(thumb,size=0x2c) addr:0x020a23f0 func_ov000_020a241c kind:function(thumb,size=0x34) addr:0x020a241c func_ov000_020a2450 kind:function(thumb,size=0x7c) addr:0x020a2450 @@ -2728,9 +2728,9 @@ func_ov000_020a2ae8 kind:function(arm,size=0x10) addr:0x020a2ae8 func_ov000_020a2af8 kind:function(arm,size=0x10) addr:0x020a2af8 func_ov000_020a2b08 kind:function(arm,size=0x1b4) addr:0x020a2b08 func_ov000_020a2cbc kind:function(arm,size=0x3c) addr:0x020a2cbc -func_ov000_020a2cf8 kind:function(arm,size=0x34) addr:0x020a2cf8 -_ZN19func_ov000_020a2d2cD1Ev kind:function(arm,size=0x28) addr:0x020a2d2c -_ZN19func_ov000_020a2d54D0Ev kind:function(arm,size=0x30) addr:0x020a2d54 +_ZN27AdventureModeManager_15C_28C1Ev kind:function(arm,size=0x34) addr:0x020a2cf8 +_ZN27AdventureModeManager_15C_28D1Ev kind:function(arm,size=0x28) addr:0x020a2d2c +_ZN27AdventureModeManager_15C_28D0Ev kind:function(arm,size=0x30) addr:0x020a2d54 func_ov000_020a2d84 kind:function(arm,size=0x13c) addr:0x020a2d84 func_ov000_020a2ec0 kind:function(arm,size=0x30) addr:0x020a2ec0 func_ov000_020a2ef0 kind:function(arm,size=0xc) addr:0x020a2ef0 @@ -3092,8 +3092,8 @@ _ZN15TreasureManager19func_ov000_020a9eb0Ei kind:function(arm,size=0x9c) addr:0x _ZN15TreasureManager19func_ov000_020a9f4cEi kind:function(arm,size=0xe0) addr:0x020ab74c _ZN15TreasureManager19func_ov000_020aa02cEi kind:function(arm,size=0x80) addr:0x020ab82c _ZN15TreasureManager19func_ov000_020aa0acEi kind:function(arm,size=0x154) addr:0x020ab8ac -func_ov000_020aba00 kind:function(arm,size=0x10) addr:0x020aba00 -func_ov000_020aba10 kind:function(arm,size=0x14) addr:0x020aba10 +_ZN8InstanceI15TreasureManagerEC2Ev kind:function(arm,size=0x10) addr:0x020aba00 +_ZN8InstanceI15TreasureManagerED2Ev kind:function(arm,size=0x14) addr:0x020aba10 func_ov000_020aba24 kind:function(arm,size=0x14) addr:0x020aba24 data_ov000_020aba38 kind:data(any) addr:0x020aba38 data_ov000_020aba40 kind:data(any) addr:0x020aba40 @@ -3465,16 +3465,16 @@ _ZTV19data_ov000_020b36c4 kind:data(any) addr:0x020b36c4 _ZTV19data_ov000_020b36dc kind:data(any) addr:0x020b36dc _ZTV19data_ov000_020b36f4 kind:data(any) addr:0x020b36f4 _ZTV19data_ov000_020b370c kind:data(any) addr:0x020b370c -data_ov000_020b372c kind:data(any) addr:0x020b372c +_ZTV33UnkSystem2_UnkSubSystem1_Derived4 kind:data(any) addr:0x020b3724 data_ov000_020b3744 kind:data(any) addr:0x020b3744 _ZTV19data_ov000_020b3754 kind:data(any) addr:0x020b3754 data_ov000_020b3774 kind:data(any) addr:0x020b3774 -_ZTV24UnkSystem2_UnkSubSystem8 kind:data(any) addr:0x020b378c +_ZTV24UnkSystem2_UnkSubSystem8 kind:data(any) addr:0x020b3784 data_ov000_020b379c kind:data(any) addr:0x020b379c data_ov000_020b37ac kind:data(any) addr:0x020b37ac data_ov000_020b37bc kind:data(any) addr:0x020b37bc data_ov000_020b37d8 kind:data(any) addr:0x020b37d8 -_ZTV19data_ov000_020b37ec kind:data(any) addr:0x020b37ec +_ZTV27AdventureModeManager_160_28 kind:data(any) addr:0x020b37ec data_ov000_020b3808 kind:data(any) addr:0x020b3808 data_ov000_020b3814 kind:data(any) addr:0x020b3814 data_ov000_020b3820 kind:data(any) addr:0x020b3820 @@ -3655,7 +3655,7 @@ _ZTV19data_ov000_020b47b4 kind:data(any) addr:0x020b47b4 data_ov000_020b47dc kind:data(any) addr:0x020b47dc data_ov000_020b47e8 kind:data(any) addr:0x020b47e8 data_ov000_020b47f4 kind:data(any) addr:0x020b47f4 -data_ov000_020b4800 kind:data(any) addr:0x020b4800 +data_ov000_020b3000 kind:data(any) addr:0x020b4800 data_ov000_020b480c kind:data(any) addr:0x020b480c data_ov000_020b4818 kind:data(any) addr:0x020b4818 data_ov000_020b483c kind:data(any) addr:0x020b483c @@ -3684,7 +3684,7 @@ _ZTV14ActorEventIcon kind:data(any) addr:0x020b4bd0 _ZTV19ActorProfileUnkEFIK kind:data(any) addr:0x020b4c2c _ZTV12ActorUnkEFIK kind:data(any) addr:0x020b4c50 data_ov000_020b4cb8 kind:data(any) addr:0x020b4cb0 -data_ov000_020b4cc4 kind:data(any) addr:0x020b4cc4 +data_ov000_020b34c4 kind:data(any) addr:0x020b4cc4 _ZTV25MapObjectProfile_Derived4 kind:data(any) addr:0x020b4cc8 _ZTV25MapObjectProfile_Derived3 kind:data(any) addr:0x020b4ce4 _ZTV25MapObjectProfile_Derived2 kind:data(any) addr:0x020b4d00 @@ -3727,7 +3727,7 @@ data_ov000_020b502c kind:data(any) addr:0x020b502c data_ov000_020b5034 kind:data(any) addr:0x020b5034 data_ov000_020b503c kind:data(any) addr:0x020b503c data_ov000_020b5044 kind:data(any) addr:0x020b5044 -data_ov000_020b504c kind:data(any) addr:0x020b504c +data_ov000_020b504c_jp kind:data(any) addr:0x020b504c data_ov000_020b5054 kind:data(any) addr:0x020b5054 data_ov000_020b505c kind:data(any) addr:0x020b505c data_ov000_020b5064 kind:data(any) addr:0x020b5064 @@ -3804,7 +3804,7 @@ data_ov000_020b5294 kind:data(any) addr:0x020b5294 data_ov000_020b529c kind:data(any) addr:0x020b529c data_ov000_020b52a4 kind:data(any) addr:0x020b52a4 data_ov000_020b52ac kind:data(any) addr:0x020b52ac -data_ov000_020b52b4 kind:data(any) addr:0x020b52b4 +data_ov000_020b52b4_jp kind:data(any) addr:0x020b52b4 data_ov000_020b52bc kind:data(any) addr:0x020b52bc data_ov000_020b52c4 kind:data(any) addr:0x020b52c4 data_ov000_020b52cc kind:data(any) addr:0x020b52cc @@ -3987,7 +3987,7 @@ data_ov000_020b64d8 kind:data(any) addr:0x020b64d8 data_ov000_020b64e0 kind:data(any) addr:0x020b64e0 data_ov000_020b64e8 kind:data(any) addr:0x020b64e8 data_ov000_020b64f0 kind:data(any) addr:0x020b64f0 -data_ov000_020b64f8 kind:data(any) addr:0x020b64f8 +data_ov000_020b64f8_jp kind:data(any) addr:0x020b64f8 data_ov000_020b6500 kind:data(any) addr:0x020b6500 data_ov000_020b6508 kind:data(any) addr:0x020b6508 data_ov000_020b6510 kind:data(any) addr:0x020b6510 @@ -4011,16 +4011,16 @@ data_ov000_020b66d4 kind:bss addr:0x020b66d4 data_ov000_020b66e0 kind:bss addr:0x020b66e0 data_ov000_020b66e4 kind:bss addr:0x020b66e4 data_ov000_020b66e8 kind:bss addr:0x020b66e8 -data_ov000_020b66ec kind:bss addr:0x020b66ec -data_ov000_020b6770 kind:bss addr:0x020b6770 +data_ov000_020b4eec kind:bss addr:0x020b66ec +data_ov000_020b4f70 kind:bss addr:0x020b6770 data_ov000_020b6774 kind:bss addr:0x020b6774 data_ov000_020b6778 kind:bss addr:0x020b6778 data_ov000_020b6784 kind:bss addr:0x020b6784 data_ov000_020b6848 kind:bss addr:0x020b6848 -data_ov000_020b684c kind:bss addr:0x020b684c +data_ov000_020b504c kind:bss addr:0x020b684c data_ov000_020b68a8 kind:bss addr:0x020b68a8 data_ov000_020b68bc kind:bss addr:0x020b68bc -data_ov000_020b68c0 kind:bss addr:0x020b68c0 +data_ov000_020b50c0 kind:bss addr:0x020b68c0 data_ov000_020b69a8 kind:bss addr:0x020b69a8 data_ov000_020b69ac kind:bss addr:0x020b69ac data_ov000_020b51b8 kind:bss addr:0x020b69b8 @@ -4028,9 +4028,9 @@ data_ov000_020b69c0 kind:bss addr:0x020b69c0 data_ov000_020b69c4 kind:bss addr:0x020b69c4 data_ov000_020b69c8 kind:bss addr:0x020b69c8 data_ov000_020b6a10 kind:bss addr:0x020b6a10 -data_ov000_020b6a14 kind:bss addr:0x020b6a14 +data_ov000_020b5214_eur kind:bss addr:0x020b6a14 data_ov000_020b6ab0 kind:bss addr:0x020b6ab0 -data_ov000_020b6ab4 kind:bss addr:0x020b6ab4 +data_ov000_020b52b4 kind:bss addr:0x020b6ab4 data_ov000_020b6ad8 kind:bss addr:0x020b6ad8 data_ov000_020b6adc kind:bss addr:0x020b6adc data_ov000_020b6ae8 kind:bss addr:0x020b6ae8 @@ -4074,7 +4074,7 @@ data_ov000_020b7ab4 kind:bss addr:0x020b7ab4 gSaveManager kind:bss addr:0x020b7ab8 data_ov000_020b7d00 kind:bss addr:0x020b7d00 data_ov000_020b7d04 kind:bss addr:0x020b7d04 -data_ov000_020b7d08 kind:bss addr:0x020b7d08 +data_ov000_020b64f8 kind:bss addr:0x020b7d08 data_ov000_020b7d0c kind:bss addr:0x020b7d0c data_ov000_020b7d10 kind:bss addr:0x020b7d10 -data_ov000_020b7d20 kind:bss addr:0x020b7d20 +gpTreasureManager kind:bss addr:0x020b7d20 diff --git a/config/jp/arm9/overlays/ov001/delinks.txt b/config/jp/arm9/overlays/ov001/delinks.txt index 5b3fbd11..5c1171bb 100644 --- a/config/jp/arm9/overlays/ov001/delinks.txt +++ b/config/jp/arm9/overlays/ov001/delinks.txt @@ -19,3 +19,9 @@ src/001_SceneInit/CargoManager_001.cpp: src/001_SceneInit/PassengerManager_001.cpp: .text start:0x020c10c4 end:0x020c12a4 + +src/001_SceneInit/Game/AdventureModeManager_001.cpp: + .text start:0x020c17c8 end:0x020c2198 + +src/001_SceneInit/Game/GameModeAdventure_001.cpp: + .text start:0x020c2198 end:0x020c21f0 diff --git a/config/jp/arm9/overlays/ov001/relocs.txt b/config/jp/arm9/overlays/ov001/relocs.txt index 8485b1b6..6bd09e51 100644 --- a/config/jp/arm9/overlays/ov001/relocs.txt +++ b/config/jp/arm9/overlays/ov001/relocs.txt @@ -1559,7 +1559,7 @@ from:0x020bf056 kind:thumb_call to:0x020bf090 module:overlay(1) from:0x020bf06c kind:thumb_call_arm to:0x02018a5c module:main from:0x020bf074 kind:thumb_call to:0x0201c818 module:main from:0x020bf07c kind:load to:0x027e0994 module:dtcm -from:0x020bf080 kind:load to:0x0204b6a0 module:main +from:0x020bf080 kind:load to:0x0204b690 add:0x10 module:main from:0x020bf08c kind:load to:0x020da040 module:overlay(24) from:0x020bf098 kind:load to:0x020da040 module:overlay(24) from:0x020bf0a4 kind:thumb_call to:0x020bf6c0 module:overlay(1) @@ -2161,7 +2161,7 @@ from:0x020c17e8 kind:thumb_call_arm to:0x0206246c module:overlay(0) from:0x020c1808 kind:thumb_call_arm to:0x02011f3c module:main from:0x020c1810 kind:thumb_call to:0x020c210c module:overlay(1) from:0x020c188a kind:thumb_call_arm to:0x02011f3c module:main -from:0x020c1892 kind:thumb_call_arm to:0x020c8688 module:overlays(20,24) +from:0x020c1892 kind:thumb_call_arm to:0x020c8688 module:overlay(24) from:0x020c18c4 kind:thumb_call_arm to:0x020c87b8 module:overlay(24) from:0x020c18c8 kind:thumb_call_arm to:0x020d2fac module:overlay(24) from:0x020c18d4 kind:thumb_call_arm to:0x02011f3c module:main @@ -2327,30 +2327,18 @@ from:0x020c2498 kind:load to:0x020c417c module:overlays(2,4) from:0x020c254c kind:load to:0x020c4818 module:overlay(1) from:0x020c2550 kind:load to:0x020c41f4 module:overlay(1) from:0x020c26f0 kind:load to:0x020c5f41 module:overlay(1) -from:0x020c26fc kind:load to:0x020c3678 module:overlay(1) from:0x020c2768 kind:load to:0x020c5f41 module:overlay(1) -from:0x020c2774 kind:load to:0x020c3730 module:overlay(1) from:0x020c27e0 kind:load to:0x020c5f41 module:overlay(1) -from:0x020c27ec kind:load to:0x020c37e8 module:overlay(1) from:0x020c2858 kind:load to:0x020c5f41 module:overlay(1) -from:0x020c2864 kind:load to:0x020c38a0 module:overlay(1) from:0x020c28d0 kind:load to:0x020c5f41 module:overlay(1) -from:0x020c28dc kind:load to:0x020c3958 module:overlay(1) from:0x020c2948 kind:load to:0x020c5f41 module:overlay(1) -from:0x020c2954 kind:load to:0x020c39f0 module:overlay(1) -from:0x020c2968 kind:load to:0x020c3a88 module:overlay(1) from:0x020c2970 kind:load to:0x020c3b00 module:overlay(1) -from:0x020c2978 kind:load to:0x020c3b78 module:overlay(1) -from:0x020c2980 kind:load to:0x020c3bf0 module:overlay(1) -from:0x020c2988 kind:load to:0x020c3c68 module:overlay(1) -from:0x020c2990 kind:load to:0x020c3ce0 module:overlay(1) from:0x020c29a0 kind:load to:0x020c5448 module:overlay(1) from:0x020c2a78 kind:load to:0x020c47a0 module:overlay(1) from:0x020c2b8c kind:load to:0x020c4818 module:overlay(1) from:0x020c2c64 kind:load to:0x020c4ce4 module:overlay(1) from:0x020c2d78 kind:load to:0x020c4d5c module:overlay(1) from:0x020c2de4 kind:load to:0x020c5f41 module:overlay(1) -from:0x020c2df0 kind:load to:0x020c3da4 module:overlay(1) from:0x020c2e5c kind:load to:0x020c5f41 module:overlay(1) from:0x020c2e68 kind:load to:0x020c3e78 add:0x4 module:overlay(1) from:0x020c2ed4 kind:load to:0x020c5f41 module:overlay(1) diff --git a/config/jp/arm9/overlays/ov001/symbols.txt b/config/jp/arm9/overlays/ov001/symbols.txt index 068a2e7e..accc84ae 100644 --- a/config/jp/arm9/overlays/ov001/symbols.txt +++ b/config/jp/arm9/overlays/ov001/symbols.txt @@ -144,9 +144,9 @@ func_ov001_020bbe44 kind:function(thumb,size=0x18) addr:0x020bbe44 func_ov001_020bbe5c kind:function(thumb,size=0x20) addr:0x020bbe5c func_ov001_020bbe7c kind:function(thumb,size=0x16) addr:0x020bbe7c func_ov001_020bbe94 kind:function(thumb,size=0x18) addr:0x020bbe94 -func_ov001_020bbeac kind:function(thumb,size=0x138) addr:0x020bbeac -func_ov001_020bbfe4 kind:function(thumb,size=0x20) addr:0x020bbfe4 -_ZN11SaveManager19func_ov000_020ba7c8Et kind:function(thumb,size=0x90) addr:0x020bc004 +_ZN11SaveManager19func_ov001_020ba670Ev kind:function(thumb,size=0x138) addr:0x020bbeac +_ZN11SaveManager19func_ov001_020ba7a8Ev kind:function(thumb,size=0x20) addr:0x020bbfe4 +_ZN11SaveManager19func_ov001_020ba7c8Et kind:function(thumb,size=0x90) addr:0x020bc004 func_ov001_020bc094 kind:function(thumb,size=0x15c) addr:0x020bc094 func_ov001_020bc1f0 kind:function(thumb,size=0x2) addr:0x020bc1f0 func_ov001_020bc1f4 kind:function(thumb,size=0x16) addr:0x020bc1f4 @@ -188,8 +188,8 @@ _ZN12ActorManager19func_ov001_020bb7b0EP15ZeldaObjectList kind:function(thumb,si _ZN12ActorManager19func_ov001_020bb7f0Ev kind:function(thumb,size=0x34) addr:0x020bd038 _ZN12ActorManager19func_ov001_020bb824Ev kind:function(thumb,size=0x20) addr:0x020bd06c _ZN12ActorManager19func_ov001_020bb844Ev kind:function(thumb,size=0x20) addr:0x020bd08c -_ZN12ActorManager11SetInstanceEPS_ kind:function(thumb,size=0xc) addr:0x020bd0ac -_ZN12ActorManager13ClearInstanceEv kind:function(thumb,size=0xc) addr:0x020bd0b8 +_ZN8InstanceI12ActorManagerEC2Ev kind:function(thumb,size=0xc) addr:0x020bd0ac +_ZN8InstanceI12ActorManagerED2Ev kind:function(thumb,size=0xc) addr:0x020bd0b8 func_ov001_020bd0c4 kind:function(thumb,size=0x3c) addr:0x020bd0c4 func_ov001_020bd100 kind:function(thumb,size=0x2) addr:0x020bd100 func_ov001_020bd104 kind:function(thumb,size=0x13c) addr:0x020bd104 @@ -274,12 +274,12 @@ _ZN23GameModeManagerBase_00419func_ov001_020bd734EPi kind:function(thumb,size=0x _ZN23GameModeManagerBase_00419func_ov001_020bd784Ev kind:function(thumb,size=0x3c) addr:0x020befcc func_ov001_020bf008 kind:function(thumb,size=0x8) addr:0x020bf008 func_ov001_020bf010 kind:function(thumb,size=0x32) addr:0x020bf010 -func_ov001_020bf044 kind:function(thumb,size=0x1a) addr:0x020bf044 -func_ov001_020bf060 kind:function(thumb,size=0x24) addr:0x020bf060 +_ZN24UnkStruct_ov024_020d86a0D1Ev kind:function(thumb,size=0x1a) addr:0x020bf044 +_ZN24UnkStruct_ov024_020d86a019func_ov001_020bd818Ev kind:function(thumb,size=0x24) addr:0x020bf060 func_ov001_020bf084 kind:function(thumb,size=0xc) addr:0x020bf084 func_ov001_020bf090 kind:function(thumb,size=0xc) addr:0x020bf090 -func_ov001_020bf09c kind:function(thumb,size=0x28) addr:0x020bf09c -func_ov001_020bf0c4 kind:function(thumb,size=0x30) addr:0x020bf0c4 +_ZN24UnkStruct_ov000_020b50c019func_ov001_020bd854Ev kind:function(thumb,size=0x28) addr:0x020bf09c +_ZN24UnkStruct_ov000_020b50c019func_ov001_020bd87cEv kind:function(thumb,size=0x30) addr:0x020bf0c4 _ZN24UnkStruct_ov000_020b50c019func_ov001_020bd8acEv kind:function(thumb,size=0x30) addr:0x020bf0f4 _ZN24UnkStruct_ov000_020b50c019func_ov001_020bd8dcEv kind:function(thumb,size=0xc) addr:0x020bf124 func_ov001_020bf130 kind:function(thumb,size=0x28) addr:0x020bf130 @@ -301,7 +301,7 @@ func_ov001_020be054 kind:function(thumb,size=0x24) addr:0x020bf908 func_ov001_020be0d8 kind:function(thumb,size=0x14) addr:0x020bf92c func_ov001_020be0ec kind:function(thumb,size=0x14) addr:0x020bf940 func_ov001_020bf954 kind:function(thumb,size=0x2c) addr:0x020bf954 -func_ov001_020bf980 kind:function(thumb,size=0xc) addr:0x020bf980 +_ZN24UnkStruct_ov000_020b4eec19func_ov001_020be12cEv kind:function(thumb,size=0xc) addr:0x020bf980 func_ov001_020bf98c kind:function(thumb,size=0xc0) addr:0x020bf98c func_ov001_020bfa4c kind:function(thumb,size=0x96) addr:0x020bfa4c func_ov001_020bfae4 kind:function(thumb,size=0x12) addr:0x020bfae4 @@ -321,11 +321,11 @@ func_ov001_020bfcbc kind:function(thumb,size=0xc) addr:0x020bfcbc func_ov001_020bfcc8 kind:function(thumb,size=0x70) addr:0x020bfcc8 func_ov001_020bfd38 kind:function(thumb,size=0x1e) addr:0x020bfd38 func_ov001_020bfd58 kind:function(thumb,size=0xc) addr:0x020bfd58 -func_ov001_020bfd64 kind:function(thumb,size=0xd8) addr:0x020bfd64 +_ZN24UnkStruct_ov000_020b504c19func_ov001_020be510Ev kind:function(thumb,size=0xd8) addr:0x020bfd64 func_ov001_020bfe3c kind:function(thumb,size=0x80) addr:0x020bfe3c -_ZN24UnkStruct_ov000_02067bc419func_ov001_020be668Ev kind:function(thumb,size=0x70) addr:0x020bfebc +_ZN24UnkStruct_ov000_020b504c19func_ov001_020be668Ev kind:function(thumb,size=0x70) addr:0x020bfebc func_ov001_020bff2c kind:function(thumb,size=0x1c) addr:0x020bff2c -_ZN24UnkStruct_ov000_02067bc419func_ov001_020be6f4Ev kind:function(thumb,size=0xa8) addr:0x020bff48 +_ZN24UnkStruct_ov000_020b504c19func_ov001_020be6f4Ev kind:function(thumb,size=0xa8) addr:0x020bff48 func_ov001_020bfff0 kind:function(thumb,size=0x90) addr:0x020bfff0 func_ov001_020c0080 kind:function(thumb,size=0x54) addr:0x020c0080 func_ov001_020c00d4 kind:function(thumb,size=0x60) addr:0x020c00d4 @@ -390,8 +390,8 @@ func_ov001_020c1048 kind:function(thumb,size=0xc) addr:0x020c1048 _ZN12CargoManagerC1Ev kind:function(thumb,size=0x22) addr:0x020c1054 _ZN12CargoManagerD1Ev kind:function(thumb,size=0xc) addr:0x020c1078 _ZN12CargoManager19func_ov001_020bf830Ev kind:function(thumb,size=0x28) addr:0x020c1084 -_ZN12CargoManager11SetInstanceEPS_ kind:function(thumb,size=0xc) addr:0x020c10ac -_ZN12CargoManager13ClearInstanceEv kind:function(thumb,size=0xc) addr:0x020c10b8 +_ZN8InstanceI12CargoManagerEC2Ev kind:function(thumb,size=0xc) addr:0x020c10ac +_ZN8InstanceI12CargoManagerED2Ev kind:function(thumb,size=0xc) addr:0x020c10b8 _ZN16PassengerManager19func_ov001_020bf870Ev kind:function(thumb,size=0x44) addr:0x020c10c4 _ZN16PassengerManagerC1Ev kind:function(thumb,size=0x24) addr:0x020c1108 _ZN16PassengerManagerD1Ev kind:function(thumb,size=0xc) addr:0x020c112c @@ -399,8 +399,8 @@ _ZN16PassengerManager19func_ov001_020bf8e4Ev kind:function(thumb,size=0x28) addr _ZN16PassengerManager19func_ov001_020bf90cEv kind:function(thumb,size=0x2) addr:0x020c1160 _ZN16PassengerManager19func_ov001_020bf910Ev kind:function(thumb,size=0x10c) addr:0x020c1164 _ZN16PassengerManager19func_ov001_020bfa1cEv kind:function(thumb,size=0x1c) addr:0x020c1270 -_ZN16PassengerManager11SetInstanceEPS_ kind:function(thumb,size=0xc) addr:0x020c128c -_ZN16PassengerManager13ClearInstanceEv kind:function(thumb,size=0xc) addr:0x020c1298 +_ZN8InstanceI16PassengerManagerEC2Ev kind:function(thumb,size=0xc) addr:0x020c128c +_ZN8InstanceI16PassengerManagerED2Ev kind:function(thumb,size=0xc) addr:0x020c1298 func_ov001_020c12a4 kind:function(thumb,size=0xc2) addr:0x020c12a4 func_ov001_020c1368 kind:function(thumb,size=0xc) addr:0x020c1368 func_ov001_020c1374 kind:function(thumb,size=0x1a0) addr:0x020c1374 @@ -420,55 +420,78 @@ func_ov001_020c1760 kind:function(thumb,size=0x10) addr:0x020c1760 func_ov001_020c1770 kind:function(thumb,size=0x10) addr:0x020c1770 func_ov001_020c1780 kind:function(thumb,size=0x8) addr:0x020c1780 func_ov001_020c1788 kind:function(thumb,size=0x40) addr:0x020c1788 -func_ov001_020c17c8 kind:function(thumb,size=0x1c) addr:0x020c17c8 -func_ov001_020c17e4 kind:function(thumb,size=0x134) addr:0x020c17e4 -func_ov001_020c1918 kind:function(thumb,size=0x10) addr:0x020c1918 -func_ov001_020c1928 kind:function(thumb,size=0x30) addr:0x020c1928 -func_ov001_020c1958 kind:function(thumb,size=0x90) addr:0x020c1958 -func_ov001_020c19e8 kind:function(thumb,size=0x7c) addr:0x020c19e8 -func_ov001_020c1a64 kind:function(thumb,size=0x364) addr:0x020c1a64 -func_ov001_020c1dc8 kind:function(thumb,size=0x248) addr:0x020c1dc8 -func_ov001_020c2010 kind:function(thumb,size=0x40) addr:0x020c2010 -func_ov001_020c2050 kind:function(thumb,size=0x28) addr:0x020c2050 -func_ov001_020c2078 kind:function(thumb,size=0x18) addr:0x020c2078 -func_ov001_020c2090 kind:function(thumb,size=0x18) addr:0x020c2090 -func_ov001_020c20a8 kind:function(thumb,size=0x20) addr:0x020c20a8 -func_ov001_020c20c8 kind:function(thumb,size=0x20) addr:0x020c20c8 -func_ov001_020c20e8 kind:function(thumb,size=0x18) addr:0x020c20e8 -func_ov001_020c2100 kind:function(thumb,size=0xc) addr:0x020c2100 -func_ov001_020c210c kind:function(thumb,size=0x68) addr:0x020c210c -func_ov001_020c2174 kind:function(thumb,size=0x22) addr:0x020c2174 -func_ov001_020c2198 kind:function(thumb,size=0x58) addr:0x020c2198 +_ZN20AdventureModeManager6CreateEi kind:function(thumb,size=0x1c) addr:0x020c17c8 +_ZN20AdventureModeManagerC1Ei kind:function(thumb,size=0x134) addr:0x020c17e4 +_ZN20AdventureModeManager8vfunc_10Eiii kind:function(thumb,size=0x10) addr:0x020c1918 +_ZN20AdventureModeManager19func_ov001_020c00d4Ev kind:function(thumb,size=0x30) addr:0x020c1928 +_ZN20AdventureModeManager19func_ov001_020c0104Ev kind:function(thumb,size=0x90) addr:0x020c1958 +_ZN20AdventureModeManager19func_ov001_020c0194Ev kind:function(thumb,size=0x7c) addr:0x020c19e8 +_ZN20AdventureModeManager8vfunc_14Ev kind:function(thumb,size=0x364) addr:0x020c1a64 +_ZN20AdventureModeManager8vfunc_18Ev kind:function(thumb,size=0x248) addr:0x020c1dc8 +_ZN20AdventureModeManager8vfunc_1CEv kind:function(thumb,size=0x40) addr:0x020c2010 +_ZN20AdventureModeManager8vfunc_20Ev kind:function(thumb,size=0x28) addr:0x020c2050 +_ZN20AdventureModeManager19func_ov001_020c0824Ev kind:function(thumb,size=0x18) addr:0x020c2078 +_ZN20AdventureModeManager19func_ov001_020c083cEv kind:function(thumb,size=0x18) addr:0x020c2090 +_ZN20AdventureModeManager19func_ov001_020c0854Ev kind:function(thumb,size=0x20) addr:0x020c20a8 +_ZN20AdventureModeManager19func_ov001_020c0874Ev kind:function(thumb,size=0x20) addr:0x020c20c8 +_ZN20AdventureModeManager19func_ov001_020c0894Ev kind:function(thumb,size=0x18) addr:0x020c20e8 +_ZN24UnkStruct_ov000_020b4f70D1Ev kind:function(thumb,size=0xc) addr:0x020c2100 +_ZN24AdventureModeManager_15CC1Ev kind:function(thumb,size=0x68) addr:0x020c210c +_ZN24AdventureModeManager_15CD1Ev kind:function(thumb,size=0x22) addr:0x020c2174 +_ZN17GameModeAdventureC1Ev kind:function(thumb,size=0x58) addr:0x020c2198 func_ov001_020c21f0 kind:function(thumb,size=0x24) addr:0x020c21f0 func_ov001_020c2214 kind:function(thumb,size=0x1c) addr:0x020c2214 func_ov001_020c2230 kind:function(thumb,size=0x48) addr:0x020c2230 -func_ov001_020c2688_unk kind:function(arm,size=0x0,unknown) addr:0x020c2688 -func_ov001_020c2700_unk kind:function(arm,size=0x0,unknown) addr:0x020c2700 -data_ov001_020c2708 kind:data(any) addr:0x020c2708 ambiguous -func_ov001_020c2778_unk kind:function(arm,size=0x0,unknown) addr:0x020c2778 -func_ov001_020c27f0_unk kind:function(arm,size=0x0,unknown) addr:0x020c27f0 -func_ov001_020c2868_unk kind:function(arm,size=0x0,unknown) addr:0x020c2868 -func_ov001_020c28e0_unk kind:function(arm,size=0x0,unknown) addr:0x020c28e0 -data_ov001_020c2958 kind:data(any) addr:0x020c2958 -data_ov001_020c2f5c kind:data(any) addr:0x020c2f5c -data_ov001_020c308c kind:data(any) addr:0x020c308c ambiguous -data_ov001_020c3218 kind:data(any) addr:0x020c3218 -data_ov001_020c3678 kind:data(any) addr:0x020c3678 -data_ov001_020c3730 kind:data(any) addr:0x020c3730 -data_ov001_020c37e8 kind:data(any) addr:0x020c37e8 -data_ov001_020c38a0 kind:data(any) addr:0x020c38a0 -data_ov001_020c3958 kind:data(any) addr:0x020c3958 -data_ov001_020c39d4 kind:data(any) addr:0x020c39d4 -data_ov001_020c39f0 kind:data(any) addr:0x020c39f0 -data_ov001_020c3a88 kind:data(any) addr:0x020c3a88 -data_ov001_020c3b00 kind:data(any) addr:0x020c3b00 -data_ov001_020c3b78 kind:data(any) addr:0x020c3b78 -data_ov001_020c3bf0 kind:data(any) addr:0x020c3bf0 -data_ov001_020c3c68 kind:data(any) addr:0x020c3c68 -data_ov001_020c3ce0 kind:data(any) addr:0x020c3ce0 -data_ov001_020c3da4 kind:data(any) addr:0x020c3da4 -data_ov001_020c3dc4 kind:data(any) addr:0x020c3dc4 -data_ov001_020c3e14 kind:data(any) addr:0x020c3e14 +DetectFlashcart kind:function(arm,size=0xb8,unknown) addr:0x020c2278 +DetectNotFlashcart kind:function(arm,size=0xb8,unknown) addr:0x020c2330 +DetectEmulator kind:function(arm,size=0xb8,unknown) addr:0x020c23e8 +DetectNotEmulator kind:function(arm,size=0xb8,unknown) addr:0x020c24a0 +DetectDummy kind:function(arm,size=0x98,unknown) addr:0x020c2558 +DetectNotDummy kind:function(arm,size=0x98,unknown) addr:0x020c25f0 +DSProt_DetectFlashcart kind:function(arm,size=0x78,unknown) addr:0x020c2688 +DSProt_DetectNotFlashcart kind:function(arm,size=0x78,unknown) addr:0x020c2700 +DSProt_DetectEmulator kind:function(arm,size=0x78,unknown) addr:0x020c2778 +DSProt_DetectNotEmulator kind:function(arm,size=0x78,unknown) addr:0x020c27f0 +DSProt_DetectDummy kind:function(arm,size=0x78,unknown) addr:0x020c2868 +DSProt_DetectNotDummy kind:function(arm,size=0x78,unknown) addr:0x020c28e0 +NitroStaticInit kind:function(arm,size=0x4c,unknown) addr:0x020c2958 local +Integrity_MACOwner_IsBad kind:function(arm,size=0xd8,unknown) addr:0x020c29a4 +Integrity_MACOwner_IsGood kind:function(arm,size=0x114,unknown) addr:0x020c2a7c +Integrity_ROMTest_IsBad kind:function(arm,size=0xd8,unknown) addr:0x020c2b90 +Integrity_ROMTest_IsGood kind:function(arm,size=0x114,unknown) addr:0x020c2c68 +RunEncrypted_Integrity_MACOwner_IsBad kind:function(arm,size=0x78,unknown) addr:0x020c2d7c +RunEncrypted_Integrity_MACOwner_IsGood kind:function(arm,size=0x78,unknown) addr:0x020c2df4 +RunEncrypted_Integrity_ROMTest_IsBad kind:function(arm,size=0x78,unknown) addr:0x020c2e6c +RunEncrypted_Integrity_ROMTest_IsGood kind:function(arm,size=0x78,unknown) addr:0x020c2ee4 +NitroStaticInit kind:function(arm,size=0x38,unknown) addr:0x020c2f5c local +clearDataAndInstructionCache kind:function(arm,size=0x20,unknown) addr:0x020c2f94 +Encryptor_CategorizeInstruction kind:function(arm,size=0x3c,unknown) addr:0x020c2fb4 +Encryptor_DecodeFunctionTable kind:function(arm,size=0x110,unknown) addr:0x020c2ff0 +Encryptor_DecryptFunction kind:function(arm,size=0x88,unknown) addr:0x020c3100 +Encryptor_EncryptFunction kind:function(arm,size=0x90,unknown) addr:0x020c3188 +NitroStaticInit kind:function(arm,size=0x28,unknown) addr:0x020c3218 local +MACOwner_IsBad kind:function(arm,size=0xb0,unknown) addr:0x020c3240 +MACOwner_IsGood kind:function(arm,size=0xb0,unknown) addr:0x020c32f0 +RunEncrypted_MACOwner_IsBad kind:function(arm,size=0x78,unknown) addr:0x020c33a0 +RunEncrypted_MACOwner_IsGood kind:function(arm,size=0x78,unknown) addr:0x020c3418 +ROMUtil_Read kind:function(arm,size=0x184,unknown) addr:0x020c3490 +ROMUtil_CRC32 kind:function(arm,size=0x58,unknown) addr:0x020c3614 +RunEncrypted_ROMUtil_Read kind:function(arm,size=0x78,unknown) addr:0x020c366c +RunEncrypted_ROMUtil_CRC32 kind:function(arm,size=0x78,unknown) addr:0x020c36e4 +ROMTest_IsBad kind:function(arm,size=0xc4,unknown) addr:0x020c375c +ROMTest_IsGood kind:function(arm,size=0xc4,unknown) addr:0x020c3820 +RunEncrypted_ROMTest_IsBad kind:function(arm,size=0x78,unknown) addr:0x020c38e4 +RunEncrypted_ROMTest_IsGood kind:function(arm,size=0x78,unknown) addr:0x020c395c +NitroStaticInit kind:function(arm,size=0x48,unknown) addr:0x020c39d4 local +RC4_Init kind:function(arm,size=0x74,unknown) addr:0x020c3a1c +RC4_Byte kind:function(arm,size=0x4c,unknown) addr:0x020c3a90 +RC4_InitSBox kind:function(arm,size=0x24,unknown) addr:0x020c3adc +RC4_EncryptInstructions kind:function(arm,size=0x108,unknown) addr:0x020c3b00 +RC4_DecryptInstructions kind:function(arm,size=0x10c,unknown) addr:0x020c3c08 +RC4_InitAndEncryptInstructions kind:function(arm,size=0x58,unknown) addr:0x020c3d14 +RC4_InitAndDecryptInstructions kind:function(arm,size=0x58,unknown) addr:0x020c3d6c +NitroStaticInit kind:function(arm,size=0x50,unknown) addr:0x020c3dc4 local +bad_mac_addr kind:data(any) addr:0x020c3e14 data_ov001_020c3e28 kind:data(any) addr:0x020c3e28 data_ov001_020c3e50 kind:data(any) addr:0x020c3e50 data_ov001_020c3e78 kind:data(any) addr:0x020c3e78 @@ -489,11 +512,11 @@ __sinit_ov001_020c4144 kind:function(thumb,size=0x10) addr:0x020c4144 .p__sinit_ov001_020c4068 kind:data(word) addr:0x020c4154 .p__sinit_ov001_020c408c kind:data(word) addr:0x020c4158 .p__sinit_ov001_020c4144 kind:data(word) addr:0x020c415c -.p__sinit_ov001_020c2958 kind:data(word) addr:0x020c4160 -.p__sinit_ov001_020c2f5c kind:data(word) addr:0x020c4164 -.p__sinit_ov001_020c3218 kind:data(word) addr:0x020c4168 -.p__sinit_ov001_020c39d4 kind:data(word) addr:0x020c416c -.p__sinit_ov001_020c3dc4 kind:data(word) addr:0x020c4170 +.p__sinit_ov001_020c2958 kind:data(word) addr:0x020c4160 local +.p__sinit_ov001_020c2f5c kind:data(word) addr:0x020c4164 local +.p__sinit_ov001_020c3218 kind:data(word) addr:0x020c4168 local +.p__sinit_ov001_020c39d4 kind:data(word) addr:0x020c416c local +.p__sinit_ov001_020c3dc4 kind:data(word) addr:0x020c4170 local data_ov001_020c4180 kind:data(any) addr:0x020c4180 data_ov001_020c4198 kind:data(any) addr:0x020c4198 data_ov001_020c41b0 kind:data(any) addr:0x020c41b0 diff --git a/config/jp/arm9/overlays/ov002/relocs.txt b/config/jp/arm9/overlays/ov002/relocs.txt index a1027993..14983f96 100644 --- a/config/jp/arm9/overlays/ov002/relocs.txt +++ b/config/jp/arm9/overlays/ov002/relocs.txt @@ -304,7 +304,7 @@ from:0x020b95c6 kind:thumb_call to:0x02015624 module:main from:0x020b95cc kind:thumb_call to:0x0201545c module:main from:0x020b95f8 kind:load to:0x020be60c module:overlay(2) from:0x020b9600 kind:load to:0x020be630 module:overlay(2) -from:0x020b9604 kind:load to:0x020b378c module:overlay(0) +from:0x020b9604 kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020b9608 kind:load to:0x020ba29d module:overlay(2) from:0x020b9610 kind:load to:0x020b91f5 module:overlay(2) from:0x020b9614 kind:load to:0x020ba2a9 module:overlay(2) @@ -509,7 +509,7 @@ from:0x020baaaa kind:thumb_call to:0x020bb404 module:overlay(2) from:0x020baab4 kind:thumb_call to:0x020bb6e4 module:overlay(2) from:0x020baac4 kind:load to:0x0204c49c module:main from:0x020baaec kind:thumb_call_arm to:0x0201c2c8 module:main -from:0x020baaf8 kind:load to:0x0204c42c module:main +from:0x020baaf8 kind:load to:0x0204b690 add:0xd9c module:main from:0x020bab74 kind:thumb_call_arm to:0x020611a8 module:overlay(0) from:0x020bab9a kind:thumb_call_arm to:0x020611a8 module:overlay(0) from:0x020babb0 kind:thumb_call to:0x020bb0bc module:overlay(2) @@ -798,7 +798,7 @@ from:0x020bc756 kind:thumb_call_arm to:0x0201aa68 module:main from:0x020bc764 kind:load to:0x0204c49c module:main from:0x020bc778 kind:load to:0x020be384 module:overlay(2) from:0x020bc7c4 kind:thumb_call_arm to:0x0201c2c8 module:main -from:0x020bc7dc kind:load to:0x0204c42c module:main +from:0x020bc7dc kind:load to:0x0204b690 add:0xd9c module:main from:0x020bc7f2 kind:thumb_call to:0x020bb93c module:overlay(2) from:0x020bc7f6 kind:thumb_call to:0x020bb9f8 module:overlay(2) from:0x020bc808 kind:thumb_call_arm to:0x020663ac module:overlay(0) diff --git a/config/jp/arm9/overlays/ov002/symbols.txt b/config/jp/arm9/overlays/ov002/symbols.txt index a24aff5e..28099877 100644 --- a/config/jp/arm9/overlays/ov002/symbols.txt +++ b/config/jp/arm9/overlays/ov002/symbols.txt @@ -27,9 +27,9 @@ func_ov002_020b84c0 kind:function(thumb,size=0x12) addr:0x020b84c0 func_ov002_020b84d4 kind:function(thumb,size=0xc) addr:0x020b84d4 func_ov002_020b84e0 kind:function(thumb,size=0x12) addr:0x020b84e0 func_ov002_020b84f4 kind:function(thumb,size=0x20) addr:0x020b84f4 -func_ov002_020b8514 kind:function(thumb,size=0x5c) addr:0x020b8514 -func_ov002_020b8570 kind:function(thumb,size=0x18) addr:0x020b8570 -func_ov002_020b8588 kind:function(thumb,size=0x18) addr:0x020b8588 +func_ov002_020b6cf4 kind:function(thumb,size=0x5c) addr:0x020b8514 +func_ov002_020b6d50 kind:function(thumb,size=0x18) addr:0x020b8570 +func_ov002_020b6d68 kind:function(thumb,size=0x18) addr:0x020b8588 func_ov002_020b85a0 kind:function(thumb,size=0x70) addr:0x020b85a0 func_ov002_020b8610 kind:function(thumb,size=0x50) addr:0x020b8610 _ZN19func_ov002_020b8660D0Ev kind:function(thumb,size=0x54) addr:0x020b8660 diff --git a/config/jp/arm9/overlays/ov003/relocs.txt b/config/jp/arm9/overlays/ov003/relocs.txt index 1bac0cd4..acf68b65 100644 --- a/config/jp/arm9/overlays/ov003/relocs.txt +++ b/config/jp/arm9/overlays/ov003/relocs.txt @@ -82,7 +82,7 @@ from:0x020b855c kind:arm_call to:0x02016664 module:main from:0x020b856c kind:load to:0x020bb81c add:0x8 module:overlay(3) from:0x020b8570 kind:load to:0x020b8580 module:overlay(3) from:0x020b8574 kind:load to:0x02064904 module:overlay(0) -from:0x020b857c kind:load to:0x020b378c module:overlay(0) +from:0x020b857c kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020b8588 kind:arm_call to:0x02064168 module:overlay(0) from:0x020b85a8 kind:arm_call to:0x02011ff4 module:main from:0x020b85b0 kind:arm_call to:0x02011ff4 module:main @@ -249,27 +249,27 @@ from:0x020b9ce0 kind:arm_call to:0x02019614 module:main from:0x020b9cec kind:arm_call to:0x0201e4b4 module:main from:0x020b9d20 kind:arm_call to:0x0201e664 module:main from:0x020b9d58 kind:load to:0x0204b690 module:main -from:0x020b9d5c kind:load to:0x0204c46c module:main +from:0x020b9d5c kind:load to:0x0204b690 add:0xddc module:main from:0x020b9d60 kind:load to:0x020bb840 module:overlay(3) from:0x020b9da4 kind:arm_call to:0x02019614 module:main from:0x020b9db0 kind:arm_call to:0x0201e4b4 module:main from:0x020b9de4 kind:arm_call to:0x0201e664 module:main from:0x020b9e18 kind:load to:0x020bb784 module:overlay(3) from:0x020b9e1c kind:load to:0x0204b690 module:main -from:0x020b9e20 kind:load to:0x0204c46c module:main +from:0x020b9e20 kind:load to:0x0204b690 add:0xddc module:main from:0x020b9e24 kind:load to:0x020bb840 module:overlay(3) from:0x020b9e5c kind:arm_call to:0x02019614 module:main from:0x020b9e68 kind:arm_call to:0x0201e4b4 module:main from:0x020b9e9c kind:arm_call to:0x0201e664 module:main from:0x020b9ed4 kind:load to:0x0204b690 module:main -from:0x020b9ed8 kind:load to:0x0204c46c module:main +from:0x020b9ed8 kind:load to:0x0204b690 add:0xddc module:main from:0x020b9edc kind:load to:0x020bb840 module:overlay(3) from:0x020b9f1c kind:arm_call to:0x02019614 module:main from:0x020b9f28 kind:arm_call to:0x0201e4b4 module:main from:0x020b9f5c kind:arm_call to:0x0201e664 module:main from:0x020b9f90 kind:load to:0x020bb568 module:overlay(3) from:0x020b9f94 kind:load to:0x0204b690 module:main -from:0x020b9f98 kind:load to:0x0204c46c module:main +from:0x020b9f98 kind:load to:0x0204b690 add:0xddc module:main from:0x020b9f9c kind:load to:0x020bb840 module:overlay(3) from:0x020b9ff0 kind:arm_call to:0x02018200 module:main from:0x020ba014 kind:arm_call to:0x02069b70 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov004/relocs.txt b/config/jp/arm9/overlays/ov004/relocs.txt index 2e6a8dc7..74833d05 100644 --- a/config/jp/arm9/overlays/ov004/relocs.txt +++ b/config/jp/arm9/overlays/ov004/relocs.txt @@ -77,7 +77,7 @@ from:0x020b8574 kind:load to:0x020b69b8 module:overlay(0) from:0x020b8578 kind:load to:0x0204b690 module:main from:0x020b857c kind:load to:0x0204b608 module:main from:0x020b8580 kind:load to:0x020b6a14 module:overlay(0) -from:0x020b8584 kind:load to:0x0204c42c module:main +from:0x020b8584 kind:load to:0x0204b690 add:0xd9c module:main from:0x020b859c kind:arm_call to:0x020ba9cc module:overlay(4) from:0x020b85ac kind:arm_call to:0x0213d81c module:overlay(56) from:0x020b85bc kind:arm_call to:0x02120e88 module:overlay(36) @@ -107,7 +107,7 @@ from:0x020b881c kind:arm_call to:0x020654c8 module:overlay(0) from:0x020b882c kind:arm_call to:0x0201e4c0 module:main from:0x020b8834 kind:arm_call to:0x02061d8c module:overlay(0) from:0x020b8858 kind:load to:0x020bb6a4 module:overlay(4) -from:0x020b885c kind:load to:0x020b378c module:overlay(0) +from:0x020b885c kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020b8894 kind:arm_call to:0x0203e690 module:main from:0x020b889c kind:arm_call to:0x020b97e0 module:overlay(4) from:0x020b88a8 kind:arm_call to:0x02065bec module:overlay(0) @@ -234,7 +234,7 @@ from:0x020b9b78 kind:arm_call to:0x0201fb4c module:main from:0x020b9b84 kind:arm_call to:0x020654c8 module:overlay(0) from:0x020b9b94 kind:arm_call to:0x0201e4c0 module:main from:0x020b9b9c kind:arm_call to:0x020640c4 module:overlay(0) -from:0x020b9bc0 kind:load to:0x020b378c module:overlay(0) +from:0x020b9bc0 kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020b9bd0 kind:arm_call to:0x02064138 module:overlay(0) from:0x020b9bd8 kind:arm_call to:0x020634e8 module:overlay(0) from:0x020b9be0 kind:arm_call to:0x0201f0bc module:main @@ -320,7 +320,7 @@ from:0x020ba5e8 kind:arm_call to:0x020611a8 module:overlay(0) from:0x020ba61c kind:arm_call to:0x020611a8 module:overlay(0) from:0x020ba674 kind:arm_call to:0x0201e664 module:main from:0x020ba680 kind:arm_call to:0x020b7d78 module:overlay(4) -from:0x020ba690 kind:load to:0x020b378c module:overlay(0) +from:0x020ba690 kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020ba694 kind:load to:0x0204b690 module:main from:0x020ba698 kind:load to:0x020bb6b4 module:overlay(4) from:0x020ba69c kind:load to:0x020bb6cc module:overlay(4) diff --git a/config/jp/arm9/overlays/ov004/symbols.txt b/config/jp/arm9/overlays/ov004/symbols.txt index b3235c75..4ca4bc86 100644 --- a/config/jp/arm9/overlays/ov004/symbols.txt +++ b/config/jp/arm9/overlays/ov004/symbols.txt @@ -8,7 +8,7 @@ func_ov004_020b7e98 kind:function(arm,size=0xac) addr:0x020b7e98 func_ov004_020b7f44 kind:function(arm,size=0x8c) addr:0x020b7f44 func_ov004_020b7fd0 kind:function(arm,size=0xdc) addr:0x020b7fd0 func_ov004_020b80ac kind:function(arm,size=0xf0) addr:0x020b80ac -func_ov004_020b819c kind:function(arm,size=0xac) addr:0x020b819c +func_ov004_020b697c kind:function(arm,size=0xac) addr:0x020b819c func_ov004_020b8248 kind:function(arm,size=0x10c) addr:0x020b8248 func_ov004_020b8354 kind:function(arm,size=0xa0) addr:0x020b8354 _ZN19func_ov004_020b83f4D0Ev kind:function(arm,size=0xa8) addr:0x020b83f4 diff --git a/config/jp/arm9/overlays/ov006/relocs.txt b/config/jp/arm9/overlays/ov006/relocs.txt index b4a402b3..ac39e4b7 100644 --- a/config/jp/arm9/overlays/ov006/relocs.txt +++ b/config/jp/arm9/overlays/ov006/relocs.txt @@ -236,7 +236,7 @@ from:0x020b9670 kind:load to:0x020b9675 module:overlay(6) from:0x020b96ac kind:thumb_call to:0x020b9f50 module:overlay(6) from:0x020b96b4 kind:thumb_call_arm to:0x0201e488 module:main from:0x020b96ba kind:thumb_call to:0x020b9d00 module:overlay(6) -from:0x020b9704 kind:load to:0x0204c46c module:main +from:0x020b9704 kind:load to:0x0204b690 add:0xddc module:main from:0x020b9734 kind:load to:0x020ba2bc module:overlay(6) from:0x020b9742 kind:thumb_call_arm to:0x01ff9b50 module:itcm from:0x020b977a kind:thumb_call to:0x020b9eb0 module:overlay(6) @@ -274,7 +274,7 @@ from:0x020b9b62 kind:thumb_call_arm to:0x0201e378 module:main from:0x020b9b68 kind:thumb_call to:0x020b9ca4 module:overlay(6) from:0x020b9b70 kind:thumb_call to:0x020b9668 module:overlay(6) from:0x020b9b78 kind:load to:0x020b684c module:overlay(0) -from:0x020b9b7c kind:load to:0x0204c46c module:main +from:0x020b9b7c kind:load to:0x0204b690 add:0xddc module:main from:0x020b9b84 kind:thumb_call to:0x020b989c module:overlay(6) from:0x020b9b94 kind:thumb_call to:0x020b9668 module:overlay(6) from:0x020b9bc4 kind:thumb_call_arm to:0x0206929c module:overlay(0) diff --git a/config/jp/arm9/overlays/ov006/symbols.txt b/config/jp/arm9/overlays/ov006/symbols.txt index 92c3b991..e5b5ff59 100644 --- a/config/jp/arm9/overlays/ov006/symbols.txt +++ b/config/jp/arm9/overlays/ov006/symbols.txt @@ -5,20 +5,20 @@ func_ov006_020b7ee4 kind:function(thumb,size=0x2c) addr:0x020b7ee4 func_ov006_020b7f10 kind:function(thumb,size=0x1f8) addr:0x020b7f10 func_ov006_020b8108 kind:function(thumb,size=0x34) addr:0x020b8108 func_ov006_020b813c kind:function(thumb,size=0x28) addr:0x020b813c -func_ov006_020b8164 kind:function(thumb,size=0x28) addr:0x020b8164 +_ZN27AdventureModeManager_160_1419func_ov006_020b6938Ev kind:function(thumb,size=0x28) addr:0x020b8164 func_ov006_020b818c kind:function(thumb,size=0xf0) addr:0x020b818c func_ov006_020b827c kind:function(thumb,size=0xc) addr:0x020b827c func_ov006_020b8288 kind:function(thumb,size=0x44) addr:0x020b8288 func_ov006_020b82cc kind:function(thumb,size=0x10) addr:0x020b82cc -func_ov006_020b82dc kind:function(thumb,size=0x54) addr:0x020b82dc +func_ov006_020b6ab0 kind:function(thumb,size=0x54) addr:0x020b82dc func_ov006_020b8330 kind:function(thumb,size=0x7c) addr:0x020b8330 func_ov006_020b83ac kind:function(thumb,size=0xc) addr:0x020b83ac func_ov006_020b83b8 kind:function(thumb,size=0x40) addr:0x020b83b8 -func_ov006_020b83f8 kind:function(thumb,size=0x10) addr:0x020b83f8 +_ZN27AdventureModeManager_160_1819func_ov006_020b6bccEv kind:function(thumb,size=0x10) addr:0x020b83f8 func_ov006_020b8408 kind:function(thumb,size=0x70) addr:0x020b8408 func_ov006_020b8478 kind:function(thumb,size=0x28) addr:0x020b8478 -func_ov006_020b84a0 kind:function(thumb,size=0xc) addr:0x020b84a0 -func_ov006_020b84ac kind:function(thumb,size=0x34) addr:0x020b84ac +_ZN27AdventureModeManager_160_1819func_ov006_020b6c74Ev kind:function(thumb,size=0xc) addr:0x020b84a0 +_ZN27AdventureModeManager_160_1819func_ov006_020b6c80Ev kind:function(thumb,size=0x34) addr:0x020b84ac func_ov006_020b84e0 kind:function(thumb,size=0x28) addr:0x020b84e0 func_ov006_020b8508 kind:function(thumb,size=0x31c) addr:0x020b8508 func_ov006_020b8824 kind:function(thumb,size=0x338) addr:0x020b8824 diff --git a/config/jp/arm9/overlays/ov008/symbols.txt b/config/jp/arm9/overlays/ov008/symbols.txt index 705dad79..512a1ef7 100644 --- a/config/jp/arm9/overlays/ov008/symbols.txt +++ b/config/jp/arm9/overlays/ov008/symbols.txt @@ -1,4 +1,4 @@ -func_ov008_020b7d40 kind:function(arm,size=0xa8) addr:0x020b7d40 +func_ov008_020b6520 kind:function(arm,size=0xa8) addr:0x020b7d40 func_ov008_020b7de8 kind:function(arm,size=0xe0) addr:0x020b7de8 _ZN19func_ov008_020b7ec8D1Ev kind:function(arm,size=0x44) addr:0x020b7ec8 _ZN19func_ov008_020b7f0cD0Ev kind:function(arm,size=0x4c) addr:0x020b7f0c @@ -10,7 +10,7 @@ func_ov008_020b8184 kind:function(arm,size=0x20) addr:0x020b8184 func_ov008_020b81a4 kind:function(arm,size=0x5c) addr:0x020b81a4 func_ov008_020b8200 kind:function(arm,size=0x48) addr:0x020b8200 _ZN19func_ov008_020b8248D0Ev kind:function(arm,size=0x28) addr:0x020b8248 -func_ov008_020b8270 kind:function(arm,size=0x4) addr:0x020b8270 +_ZN21UnkStruct_027e0ce0_3419func_ov008_020b6a50Ev kind:function(arm,size=0x4) addr:0x020b8270 __sinit_ov008_020b8274 kind:function(arm,size=0x40) addr:0x020b8274 __sinit_ov008_020b82b4 kind:function(arm,size=0x40) addr:0x020b82b4 .p__sinit_ov008_020b8274 kind:data(word) addr:0x020b82f4 diff --git a/config/jp/arm9/overlays/ov009/symbols.txt b/config/jp/arm9/overlays/ov009/symbols.txt index 55e96822..84292014 100644 --- a/config/jp/arm9/overlays/ov009/symbols.txt +++ b/config/jp/arm9/overlays/ov009/symbols.txt @@ -2,7 +2,7 @@ func_ov009_020b7d40 kind:function(arm,size=0x84) addr:0x020b7d40 func_ov009_020b7dc4 kind:function(arm,size=0x30) addr:0x020b7dc4 func_ov009_020b7df4 kind:function(arm,size=0xc8) addr:0x020b7df4 func_ov009_020b7ebc kind:function(arm,size=0x70) addr:0x020b7ebc -func_ov009_020b7f2c kind:function(arm,size=0x50) addr:0x020b7f2c +_ZN24UnkStruct_ov031_02118fa419func_ov009_020b670cEi kind:function(arm,size=0x50) addr:0x020b7f2c func_ov009_020b7f7c kind:function(arm,size=0x8) addr:0x020b7f7c func_ov009_020b7f84 kind:function(arm,size=0x15c) addr:0x020b7f84 func_ov009_020b80e0 kind:function(arm,size=0x10) addr:0x020b80e0 diff --git a/config/jp/arm9/overlays/ov010/relocs.txt b/config/jp/arm9/overlays/ov010/relocs.txt index d2ff7f32..3ec3e793 100644 --- a/config/jp/arm9/overlays/ov010/relocs.txt +++ b/config/jp/arm9/overlays/ov010/relocs.txt @@ -316,14 +316,14 @@ from:0x020ba1fa kind:thumb_call to:0x0201c818 module:main from:0x020ba200 kind:thumb_call_arm to:0x020631e4 module:overlay(0) from:0x020ba208 kind:load to:0x020ba6dc add:0x8 module:overlay(10) from:0x020ba20c kind:load to:0x027e0994 module:dtcm -from:0x020ba210 kind:load to:0x0204b6a0 module:main +from:0x020ba210 kind:load to:0x0204b690 add:0x10 module:main from:0x020ba222 kind:thumb_call_arm to:0x02018a5c module:main from:0x020ba22a kind:thumb_call to:0x0201c818 module:main from:0x020ba230 kind:thumb_call_arm to:0x020631e4 module:overlay(0) from:0x020ba236 kind:thumb_call_arm to:0x02011ff4 module:main from:0x020ba240 kind:load to:0x020ba6dc add:0x8 module:overlay(10) from:0x020ba244 kind:load to:0x027e0994 module:dtcm -from:0x020ba248 kind:load to:0x0204b6a0 module:main +from:0x020ba248 kind:load to:0x0204b690 add:0x10 module:main from:0x020ba274 kind:thumb_call_arm to:0x020611a8 module:overlay(0) from:0x020ba29c kind:thumb_call_arm to:0x020611a8 module:overlay(0) from:0x020ba2ba kind:thumb_call_arm to:0x0217fa04 module:overlay(96) @@ -347,7 +347,7 @@ from:0x020ba434 kind:thumb_call to:0x0201c818 module:main from:0x020ba43c kind:thumb_call to:0x020ba4ec module:overlay(10) from:0x020ba444 kind:load to:0x0204b690 module:main from:0x020ba448 kind:load to:0x027e0994 module:dtcm -from:0x020ba44c kind:load to:0x0204b6a0 module:main +from:0x020ba44c kind:load to:0x0204b690 add:0x10 module:main from:0x020ba458 kind:thumb_call to:0x020ba4dc module:overlay(10) from:0x020ba484 kind:thumb_call_arm to:0x0201a9dc module:main from:0x020ba4c6 kind:thumb_call_arm to:0x0201a9dc module:main diff --git a/config/jp/arm9/overlays/ov010/symbols.txt b/config/jp/arm9/overlays/ov010/symbols.txt index ac6d9304..1875050a 100644 --- a/config/jp/arm9/overlays/ov010/symbols.txt +++ b/config/jp/arm9/overlays/ov010/symbols.txt @@ -1,8 +1,8 @@ -func_ov010_020b7d40 kind:function(thumb,size=0x5c) addr:0x020b7d40 +func_ov010_020b6520 kind:function(thumb,size=0x5c) addr:0x020b7d40 func_ov010_020b7d9c kind:function(thumb,size=0x68) addr:0x020b7d9c func_ov010_020b7e04 kind:function(thumb,size=0xc) addr:0x020b7e04 func_ov010_020b7e10 kind:function(thumb,size=0xc) addr:0x020b7e10 -func_ov010_020b7e1c kind:function(thumb,size=0x5c) addr:0x020b7e1c +func_ov010_020b65fc kind:function(thumb,size=0x5c) addr:0x020b7e1c func_ov010_020b7e78 kind:function(thumb,size=0x38) addr:0x020b7e78 func_ov010_020b7eb0 kind:function(thumb,size=0xc4) addr:0x020b7eb0 func_ov010_020b7f74 kind:function(thumb,size=0x18c) addr:0x020b7f74 @@ -10,8 +10,8 @@ func_ov010_020b8100 kind:function(thumb,size=0x2) addr:0x020b8100 func_ov010_020b8104 kind:function(thumb,size=0x2) addr:0x020b8104 func_ov010_020b8108 kind:function(thumb,size=0x610) addr:0x020b8108 func_ov010_020b8718 kind:function(thumb,size=0x110) addr:0x020b8718 -func_ov010_020b8828 kind:function(thumb,size=0x4c) addr:0x020b8828 -func_ov010_020b8874 kind:function(thumb,size=0x36) addr:0x020b8874 +_ZN32AdventureModeManager_184_10_Base19func_ov010_020b7008Ev kind:function(thumb,size=0x4c) addr:0x020b8828 +_ZN32AdventureModeManager_184_10_Base19func_ov010_020b7054Ev kind:function(thumb,size=0x36) addr:0x020b8874 func_ov010_020b88ac kind:function(thumb,size=0x2) addr:0x020b88ac func_ov010_020b88b0 kind:function(thumb,size=0x2) addr:0x020b88b0 func_ov010_020b88b4 kind:function(thumb,size=0x2e) addr:0x020b88b4 @@ -43,7 +43,7 @@ func_ov010_020ba090 kind:function(thumb,size=0x24) addr:0x020ba090 func_ov010_020ba0b4 kind:function(thumb,size=0x34) addr:0x020ba0b4 func_ov010_020ba0e8 kind:function(thumb,size=0x38) addr:0x020ba0e8 func_ov010_020ba120 kind:function(thumb,size=0x12) addr:0x020ba120 -func_ov010_020ba134 kind:function(thumb,size=0x54) addr:0x020ba134 +func_ov010_020b88c4 kind:function(thumb,size=0x54) addr:0x020ba134 func_ov010_020ba188 kind:function(thumb,size=0x5c) addr:0x020ba188 func_ov010_020ba1e4 kind:function(thumb,size=0x30) addr:0x020ba1e4 func_ov010_020ba214 kind:function(thumb,size=0x38) addr:0x020ba214 diff --git a/config/jp/arm9/overlays/ov011/relocs.txt b/config/jp/arm9/overlays/ov011/relocs.txt index 5d611ec4..b14808e7 100644 --- a/config/jp/arm9/overlays/ov011/relocs.txt +++ b/config/jp/arm9/overlays/ov011/relocs.txt @@ -188,9 +188,9 @@ from:0x020b9788 kind:arm_call to:0x0201d418 module:main from:0x020b97ac kind:arm_call to:0x020166d4 module:main from:0x020b97bc kind:arm_call to:0x02016644 module:main from:0x020b9800 kind:arm_call to:0x020c4910 module:overlay(17) -from:0x020b9810 kind:load to:0x0204c42c module:main +from:0x020b9810 kind:load to:0x0204b690 add:0xd9c module:main from:0x020b9814 kind:load to:0x020da040 module:overlay(24) -from:0x020b9818 kind:load to:0x0204c450 module:main +from:0x020b9818 kind:load to:0x0204b690 add:0xdc0 module:main from:0x020b981c kind:load to:0x020b6a14 module:overlay(0) from:0x020b9820 kind:load to:0x0204b608 module:main from:0x020b983c kind:arm_call to:0x01ff9b64 module:itcm @@ -228,8 +228,8 @@ from:0x020b9d10 kind:load to:0x020bab00 module:overlay(11) from:0x020b9d40 kind:arm_call to:0x0201ea20 module:main from:0x020b9d5c kind:arm_call to:0x0201ea20 module:main from:0x020b9dd0 kind:load to:0x0204b690 module:main -from:0x020b9dd4 kind:load to:0x0204c490 module:main -from:0x020b9dd8 kind:load to:0x0204c390 module:main +from:0x020b9dd4 kind:load to:0x0204b690 add:0xe00 module:main +from:0x020b9dd8 kind:load to:0x0204b690 add:0xd00 module:main from:0x020b9e0c kind:arm_call to:0x020195e8 module:main from:0x020b9e2c kind:arm_call to:0x020195e8 module:main from:0x020b9e38 kind:load to:0x0204b690 module:main diff --git a/config/jp/arm9/overlays/ov011/symbols.txt b/config/jp/arm9/overlays/ov011/symbols.txt index 0da8c176..12220cbb 100644 --- a/config/jp/arm9/overlays/ov011/symbols.txt +++ b/config/jp/arm9/overlays/ov011/symbols.txt @@ -1,4 +1,4 @@ -func_ov011_020b7d40 kind:function(arm,size=0x84) addr:0x020b7d40 +func_ov011_020b6520 kind:function(arm,size=0x84) addr:0x020b7d40 func_ov011_020b7dc4 kind:function(arm,size=0x5c) addr:0x020b7dc4 func_ov011_020b7e20 kind:function(arm,size=0x14) addr:0x020b7e20 func_ov011_020b7e34 kind:function(arm,size=0x14) addr:0x020b7e34 @@ -11,14 +11,14 @@ func_ov011_020b8fbc kind:function(arm,size=0x324) addr:0x020b8fbc func_ov011_020b92e0 kind:function(arm,size=0x544) addr:0x020b92e0 func_ov011_020b9824 kind:function(arm,size=0x2d0) addr:0x020b9824 func_ov011_020b9af4 kind:function(arm,size=0x14c) addr:0x020b9af4 -func_ov011_020b9c40 kind:function(arm,size=0xd4) addr:0x020b9c40 +func_ov011_020b84f0 kind:function(arm,size=0xd4) addr:0x020b9c40 func_ov011_020b9d14 kind:function(arm,size=0xc8) addr:0x020b9d14 func_ov011_020b9ddc kind:function(arm,size=0x60) addr:0x020b9ddc func_ov011_020b9e3c kind:function(arm,size=0x1d0) addr:0x020b9e3c -func_ov011_020ba00c kind:function(arm,size=0xb0) addr:0x020ba00c +_ZN27AdventureModeManager_18C_1019func_ov011_020b88acEv kind:function(arm,size=0xb0) addr:0x020ba00c func_ov011_020ba0bc kind:function(arm,size=0x30) addr:0x020ba0bc func_ov011_020ba0ec kind:function(arm,size=0x64) addr:0x020ba0ec -func_ov011_020ba150 kind:function(arm,size=0x20c) addr:0x020ba150 +_ZN27AdventureModeManager_18C_1019func_ov011_020b89f0Ei kind:function(arm,size=0x20c) addr:0x020ba150 func_ov011_020ba35c kind:function(arm,size=0x94) addr:0x020ba35c func_ov011_020ba3f0 kind:function(arm,size=0xbc) addr:0x020ba3f0 func_ov011_020ba4ac kind:function(arm,size=0x20) addr:0x020ba4ac @@ -26,10 +26,10 @@ _ZN19func_ov011_020ba4ccD0Ev kind:function(arm,size=0x1c) addr:0x020ba4cc _ZN19func_ov011_020ba4e8D0Ev kind:function(arm,size=0x64) addr:0x020ba4e8 func_ov011_020ba54c kind:function(arm,size=0x38) addr:0x020ba54c func_ov011_020ba584 kind:function(arm,size=0x30) addr:0x020ba584 -func_ov011_020ba5b4 kind:function(arm,size=0x84) addr:0x020ba5b4 +func_ov011_020b8e54 kind:function(arm,size=0x84) addr:0x020ba5b4 func_ov011_020ba638 kind:function(arm,size=0x14) addr:0x020ba638 func_ov011_020ba64c kind:function(arm,size=0x34) addr:0x020ba64c -func_ov011_020ba680 kind:function(arm,size=0x158) addr:0x020ba680 +_ZN27AdventureModeManager_190_1019func_ov011_020b8f20Ei kind:function(arm,size=0x158) addr:0x020ba680 _ZN19func_ov011_020ba7d8D0Ev kind:function(arm,size=0x1c) addr:0x020ba7d8 data_ov011_020ba7f4 kind:data(any) addr:0x020ba7f4 data_ov011_020ba800 kind:data(any) addr:0x020ba800 diff --git a/config/jp/arm9/overlays/ov012/relocs.txt b/config/jp/arm9/overlays/ov012/relocs.txt index 9988c541..f0719079 100644 --- a/config/jp/arm9/overlays/ov012/relocs.txt +++ b/config/jp/arm9/overlays/ov012/relocs.txt @@ -113,7 +113,7 @@ from:0x020b856a kind:thumb_call to:0x0201545c module:main from:0x020b8574 kind:load to:0x020b5c64 module:overlay(0) from:0x020b8578 kind:load to:0x020b9c70 module:overlay(12) from:0x020b857c kind:load to:0x0204547c add:0x8 module:main -from:0x020b8584 kind:load to:0x0204ba00 module:main +from:0x020b8584 kind:load to:0x0204b690 add:0x370 module:main from:0x020b8588 kind:load to:0x020b9c80 module:overlay(12) from:0x020b8590 kind:load to:0x020b5df4 module:overlay(0) from:0x020b8594 kind:load to:0x020b9c90 module:overlay(12) @@ -167,7 +167,7 @@ from:0x020b88ac kind:thumb_call_arm to:0x0206f100 module:overlay(0) from:0x020b88c8 kind:thumb_call_arm to:0x0201c52c module:main from:0x020b89b8 kind:load to:0x020b9ba0 module:overlay(12) from:0x020b89bc kind:load to:0x020b6a14 module:overlay(0) -from:0x020b89c4 kind:load to:0x0204ba00 module:main +from:0x020b89c4 kind:load to:0x0204b690 add:0x370 module:main from:0x020b8a0a kind:thumb_call_arm to:0x02071800 module:overlay(0) from:0x020b8a14 kind:thumb_call_arm to:0x0203b6ec module:main from:0x020b8a88 kind:thumb_call_arm to:0x020195bc module:main @@ -196,7 +196,7 @@ from:0x020b8cca kind:thumb_call_arm to:0x0206952c module:overlay(0) from:0x020b8ce0 kind:thumb_call_arm to:0x0201c2f4 module:main from:0x020b8cee kind:thumb_call_arm to:0x0201c2f4 module:main from:0x020b8cf4 kind:load to:0x020b684c module:overlay(0) -from:0x020b8cf8 kind:load to:0x0204c42c module:main +from:0x020b8cf8 kind:load to:0x0204b690 add:0xd9c module:main from:0x020b8d1c kind:thumb_call_arm to:0x0202a17c module:main from:0x020b8d36 kind:thumb_call_arm to:0x0201ebac module:main from:0x020b8d66 kind:thumb_call_arm to:0x0201a9dc module:main @@ -228,7 +228,7 @@ from:0x020b9098 kind:thumb_call to:0x020b94c0 module:overlay(12) from:0x020b90c2 kind:thumb_call to:0x020b94a8 module:overlay(12) from:0x020b9110 kind:load to:0x020b9aa4 module:overlay(12) from:0x020b9114 kind:load to:0x020b9a98 module:overlay(12) -from:0x020b911c kind:load to:0x0204ba00 module:main +from:0x020b911c kind:load to:0x0204b690 add:0x370 module:main from:0x020b9120 kind:load to:0x027e0cf0 module:dtcm from:0x020b9166 kind:thumb_call_arm to:0x020611a8 module:overlay(0) from:0x020b9186 kind:thumb_call_arm to:0x020611a8 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov014/relocs.txt b/config/jp/arm9/overlays/ov014/relocs.txt index 72d6b2bb..7ac7de00 100644 --- a/config/jp/arm9/overlays/ov014/relocs.txt +++ b/config/jp/arm9/overlays/ov014/relocs.txt @@ -161,7 +161,7 @@ from:0x020b89fa kind:thumb_call_arm to:0x0201c52c module:main from:0x020b8a04 kind:load to:0x020b8a31 module:overlay(14) from:0x020b8a08 kind:load to:0x020b91b9 module:overlay(14) from:0x020b8a0c kind:load to:0x020b9f44 module:overlay(14) -from:0x020b8a2c kind:load to:0x0204ba00 module:main +from:0x020b8a2c kind:load to:0x0204b690 add:0x370 module:main from:0x020b8a34 kind:thumb_call_arm to:0x02064628 module:overlay(0) from:0x020b8a40 kind:thumb_call_arm to:0x02064168 module:overlay(0) from:0x020b8a50 kind:thumb_call_arm to:0x02016644 module:main @@ -198,7 +198,7 @@ from:0x020b8c54 kind:thumb_call_arm to:0x02062020 module:overlay(0) from:0x020b8c5e kind:thumb_call to:0x020b8fa8 module:overlay(14) from:0x020b8c74 kind:thumb_call_arm to:0x02062020 module:overlay(0) from:0x020b8c7e kind:thumb_call to:0x020b9018 module:overlay(14) -from:0x020b8cc4 kind:load to:0x0204c410 module:main +from:0x020b8cc4 kind:load to:0x0204b690 add:0xd80 module:main from:0x020b8cee kind:thumb_call to:0x020b9724 module:overlay(14) from:0x020b8cf6 kind:thumb_call to:0x020b9ae8 module:overlay(14) from:0x020b8cfe kind:thumb_call to:0x020b9ae8 module:overlay(14) @@ -206,13 +206,13 @@ from:0x020b8d06 kind:thumb_call_arm to:0x02061f38 module:overlay(0) from:0x020b8d34 kind:thumb_call_arm to:0x0202a17c module:main from:0x020b8d5e kind:thumb_call_arm to:0x0201aa68 module:main from:0x020b8d7e kind:thumb_call_arm to:0x0201aa68 module:main -from:0x020b8d88 kind:load to:0x0204c410 module:main -from:0x020b8d94 kind:load to:0x0204c490 module:main +from:0x020b8d88 kind:load to:0x0204b690 add:0xd80 module:main +from:0x020b8d94 kind:load to:0x0204b690 add:0xe00 module:main from:0x020b8d98 kind:load to:0x0204c49c module:main from:0x020b8dd8 kind:thumb_call_arm to:0x02026770 module:main from:0x020b8de4 kind:thumb_call_arm to:0x02026628 module:main from:0x020b8e00 kind:thumb_call_arm to:0x0201c2c8 module:main -from:0x020b8e0c kind:load to:0x0204c42c module:main +from:0x020b8e0c kind:load to:0x0204b690 add:0xd9c module:main from:0x020b8e2e kind:thumb_call to:0x020b8e40 module:overlay(14) from:0x020b8e50 kind:thumb_call_arm to:0x020d7e38 module:overlay(24) from:0x020b8e58 kind:load to:0x020da050 module:overlay(24) @@ -289,9 +289,9 @@ from:0x020b956a kind:thumb_call_arm to:0x0201a9dc module:main from:0x020b9592 kind:thumb_call_arm to:0x0201a9dc module:main from:0x020b95c4 kind:thumb_call_arm to:0x0201a9dc module:main from:0x020b960a kind:thumb_call_arm to:0x0201a9dc module:main -from:0x020b9618 kind:load to:0x0204c490 module:main +from:0x020b9618 kind:load to:0x0204b690 add:0xe00 module:main from:0x020b961c kind:load to:0x0204c49c module:main -from:0x020b9620 kind:load to:0x0204c410 module:main +from:0x020b9620 kind:load to:0x0204b690 add:0xd80 module:main from:0x020b9632 kind:thumb_call_arm to:0x0203b6ec module:main from:0x020b964a kind:thumb_call_arm to:0x020611a8 module:overlay(0) from:0x020b9656 kind:thumb_call_arm to:0x0203b6ec module:main diff --git a/config/jp/arm9/overlays/ov014/symbols.txt b/config/jp/arm9/overlays/ov014/symbols.txt index a3af1385..41a830a5 100644 --- a/config/jp/arm9/overlays/ov014/symbols.txt +++ b/config/jp/arm9/overlays/ov014/symbols.txt @@ -1,4 +1,4 @@ -func_ov014_020b7d40 kind:function(thumb,size=0x74) addr:0x020b7d40 +func_ov014_020b6520 kind:function(thumb,size=0x74) addr:0x020b7d40 func_ov014_020b7db4 kind:function(thumb,size=0x350) addr:0x020b7db4 func_ov014_020b8104 kind:function(thumb,size=0x60) addr:0x020b8104 func_ov014_020b8164 kind:function(thumb,size=0x68) addr:0x020b8164 diff --git a/config/jp/arm9/overlays/ov017/relocs.txt b/config/jp/arm9/overlays/ov017/relocs.txt index 99ed843d..18c50ecf 100644 --- a/config/jp/arm9/overlays/ov017/relocs.txt +++ b/config/jp/arm9/overlays/ov017/relocs.txt @@ -749,7 +749,7 @@ from:0x020c48d8 kind:load to:0x020c47f0 module:overlay(17) from:0x020c4928 kind:arm_call to:0x02018a5c module:main from:0x020c4934 kind:arm_call_thumb to:0x0201c818 module:main from:0x020c493c kind:load to:0x027e0994 module:dtcm -from:0x020c4940 kind:load to:0x0204b6a0 module:main +from:0x020c4940 kind:load to:0x0204b690 add:0x10 module:main from:0x020c4958 kind:arm_call to:0x020c49ac module:overlay(17) from:0x020c4960 kind:arm_call to:0x020c4968 module:overlay(17) from:0x020c4994 kind:arm_call to:0x0201b974 module:main @@ -773,7 +773,7 @@ from:0x020c4b2c kind:arm_call to:0x020c6dd0 module:overlay(24) from:0x020c4b34 kind:arm_call to:0x020c6c5c module:overlay(24) from:0x020c4b50 kind:arm_call to:0x020c7f90 module:overlay(24) from:0x020c4b8c kind:load to:0x027e0994 module:dtcm -from:0x020c4b90 kind:load to:0x0204b6a0 module:main +from:0x020c4b90 kind:load to:0x0204b690 add:0x10 module:main from:0x020c4b94 kind:load to:0x027e0998 module:dtcm from:0x020c4b98 kind:load to:0x027e09a4 module:dtcm from:0x020c4b9c kind:load to:0x027e09a0 module:dtcm @@ -806,7 +806,7 @@ from:0x020c5150 kind:arm_call to:0x0201c2c8 module:main from:0x020c516c kind:arm_call to:0x020c00d4 module:overlay(17) from:0x020c5174 kind:arm_call to:0x020c4c40 module:overlay(17) from:0x020c5198 kind:arm_call to:0x020ddcf4 module:overlay(26) -from:0x020c51a0 kind:load to:0x0204c42c module:main +from:0x020c51a0 kind:load to:0x0204b690 add:0xd9c module:main from:0x020c51a4 kind:load to:0x027e09a4 module:dtcm from:0x020c51b8 kind:arm_call to:0x020c4f74 module:overlay(17) from:0x020c51d0 kind:arm_call to:0x020c4da0 module:overlay(17) @@ -860,7 +860,7 @@ from:0x020c55b0 kind:load to:0x0204b690 module:main from:0x020c55b4 kind:load to:0x027e0994 module:dtcm from:0x020c55b8 kind:load to:0x027e09a4 module:dtcm from:0x020c55bc kind:load to:0x027e0998 module:dtcm -from:0x020c55c0 kind:load to:0x0204c42c module:main +from:0x020c55c0 kind:load to:0x0204b690 add:0xd9c module:main from:0x020c55dc kind:arm_call to:0x020cbea8 module:overlay(24) from:0x020c5678 kind:arm_call to:0x02013c28 module:main from:0x020c5690 kind:arm_call to:0x0203e3a4 module:main diff --git a/config/jp/arm9/overlays/ov017/symbols.txt b/config/jp/arm9/overlays/ov017/symbols.txt index bec6d87d..86e48a06 100644 --- a/config/jp/arm9/overlays/ov017/symbols.txt +++ b/config/jp/arm9/overlays/ov017/symbols.txt @@ -4,8 +4,8 @@ func_ov017_020bd154 kind:function(arm,size=0x60) addr:0x020bd154 _ZN18UnkStruct_027e09a419func_ov017_020bb994EPv kind:function(arm,size=0x8c) addr:0x020bd1b4 _ZN19func_ov017_020bd240D1Ev kind:function(arm,size=0x28) addr:0x020bd240 _ZN19func_ov017_020bd268D0Ev kind:function(arm,size=0x30) addr:0x020bd268 -func_ov017_020bd298 kind:function(arm,size=0x1c) addr:0x020bd298 -func_ov017_020bd2b4 kind:function(arm,size=0x14) addr:0x020bd2b4 +_ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba78Ev kind:function(arm,size=0x1c) addr:0x020bd298 +_ZN24UnkStruct_ov017_020c3f7019func_ov017_020bba94Ev kind:function(arm,size=0x14) addr:0x020bd2b4 func_ov017_020bd2c8 kind:function(arm,size=0x230) addr:0x020bd2c8 func_ov017_020bd4f8 kind:function(arm,size=0x21c) addr:0x020bd4f8 func_ov017_020bd714 kind:function(arm,size=0x78) addr:0x020bd714 @@ -25,7 +25,7 @@ func_ov017_020bed88 kind:function(arm,size=0x5c) addr:0x020bed88 func_ov017_020bede4 kind:function(arm,size=0x18) addr:0x020bede4 func_ov017_020bedfc kind:function(arm,size=0x68) addr:0x020bedfc func_ov017_020bee64 kind:function(arm,size=0x58) addr:0x020bee64 -func_ov017_020beebc kind:function(arm,size=0x1c) addr:0x020beebc +_ZN18UnkStruct_027e0ce019func_ov017_020bd69cEv kind:function(arm,size=0x1c) addr:0x020beebc func_ov017_020beed8 kind:function(arm,size=0x28) addr:0x020beed8 func_ov017_020bef00 kind:function(arm,size=0x78) addr:0x020bef00 func_ov017_020bef78 kind:function(arm,size=0x30) addr:0x020bef78 @@ -115,14 +115,14 @@ func_ov017_020c2930 kind:function(arm,size=0x78) addr:0x020c2930 func_ov017_020c29a8 kind:function(arm,size=0x180) addr:0x020c29a8 func_ov017_020c2b28 kind:function(arm,size=0xb8) addr:0x020c2b28 func_ov017_020c2be0 kind:function(arm,size=0x4ac) addr:0x020c2be0 -func_ov017_020c308c kind:function(arm,size=0x64) addr:0x020c308c +_ZN30AdventureModeManager_15C_20_008vfunc_10EPc kind:function(arm,size=0x64) addr:0x020c308c func_ov017_020c30f0 kind:function(arm,size=0x20) addr:0x020c30f0 func_ov017_020c3110 kind:function(arm,size=0xbc) addr:0x020c3110 -func_ov017_020c31cc kind:function(arm,size=0x2c) addr:0x020c31cc +_ZN30AdventureModeManager_15C_20_0019func_ov017_020c19a0Ev kind:function(arm,size=0x2c) addr:0x020c31cc func_ov017_020c31f8 kind:function(arm,size=0x20) addr:0x020c31f8 func_ov017_020c3218 kind:function(arm,size=0x20) addr:0x020c3218 func_ov017_020c3238 kind:function(arm,size=0x274) addr:0x020c3238 -func_ov017_020c34ac kind:function(arm,size=0x1d4) addr:0x020c34ac +_ZN30AdventureModeManager_15C_20_0019func_ov017_020c1c80Ei kind:function(arm,size=0x1d4) addr:0x020c34ac func_ov017_020c3680 kind:function(arm,size=0x48) addr:0x020c3680 func_ov017_020c36c8 kind:function(arm,size=0x124) addr:0x020c36c8 func_ov017_020c37ec kind:function(arm,size=0x5c) addr:0x020c37ec @@ -140,7 +140,7 @@ func_ov017_020c4394 kind:function(arm,size=0xa0) addr:0x020c4394 func_ov017_020c4434 kind:function(arm,size=0x380) addr:0x020c4434 func_ov017_020c47b4 kind:function(arm,size=0x3c) addr:0x020c47b4 func_ov017_020c47f0 kind:function(arm,size=0x7c) addr:0x020c47f0 -func_ov017_020c486c kind:function(arm,size=0x70) addr:0x020c486c +_ZN11SaveManager19func_ov017_020c3040EPvi kind:function(arm,size=0x70) addr:0x020c486c func_ov017_020c48dc kind:function(arm,size=0x34) addr:0x020c48dc func_ov017_020c4910 kind:function(arm,size=0x34) addr:0x020c4910 func_ov017_020c4944 kind:function(arm,size=0x24) addr:0x020c4944 @@ -155,16 +155,16 @@ func_ov017_020c4e70 kind:function(arm,size=0x24) addr:0x020c4e70 func_ov017_020c4e94 kind:function(arm,size=0xe0) addr:0x020c4e94 func_ov017_020c4f74 kind:function(arm,size=0x44) addr:0x020c4f74 func_ov017_020c4fb8 kind:function(arm,size=0x180) addr:0x020c4fb8 -func_ov017_020c5138 kind:function(arm,size=0x70) addr:0x020c5138 -func_ov017_020c51a8 kind:function(arm,size=0x58) addr:0x020c51a8 -func_ov017_020c5200 kind:function(arm,size=0x1c) addr:0x020c5200 +_ZN18UnkStruct_027e0cf819func_ov017_020c390cEv kind:function(arm,size=0x70) addr:0x020c5138 +_ZN18UnkStruct_027e0cf819func_ov017_020c397cEv kind:function(arm,size=0x58) addr:0x020c51a8 +_ZN18UnkStruct_027e0cf819func_ov017_020c39d4Ev kind:function(arm,size=0x1c) addr:0x020c5200 func_ov017_020c521c kind:function(arm,size=0x8) addr:0x020c521c func_ov017_020c5224 kind:function(arm,size=0x8) addr:0x020c5224 -func_ov017_020c522c kind:function(arm,size=0x38) addr:0x020c522c +_ZN24AdventureModeManager_15C19func_ov017_020c3a00EP5InputP12TouchControl kind:function(arm,size=0x38) addr:0x020c522c func_ov017_020c5264 kind:function(arm,size=0x120) addr:0x020c5264 func_ov017_020c5384 kind:function(arm,size=0x68) addr:0x020c5384 -func_ov017_020c53ec kind:function(arm,size=0xa4) addr:0x020c53ec -func_ov017_020c5490 kind:function(arm,size=0x40) addr:0x020c5490 +_ZN24AdventureModeManager_15C19func_ov017_020c3bc0Ev kind:function(arm,size=0xa4) addr:0x020c53ec +_ZN24AdventureModeManager_15C19func_ov017_020c3c64Ev kind:function(arm,size=0x40) addr:0x020c5490 func_ov017_020c54d0 kind:function(arm,size=0xf4) addr:0x020c54d0 func_ov017_020c55c4 kind:function(arm,size=0x28) addr:0x020c55c4 sCargoInfos kind:data(byte[42]) addr:0x020c55ec local @@ -181,5 +181,5 @@ data_ov017_020c575c kind:data(any) addr:0x020c575c data_ov017_020c5760 kind:data(any) addr:0x020c5760 data_ov017_020c5780 kind:bss addr:0x020c5780 data_ov017_020c5784 kind:bss addr:0x020c5784 -data_ov017_020c5790 kind:bss addr:0x020c5790 +data_ov017_020c3f70 kind:bss addr:0x020c5790 data_ov017_020c585c kind:bss addr:0x020c585c diff --git a/config/jp/arm9/overlays/ov018/delinks.txt b/config/jp/arm9/overlays/ov018/delinks.txt index 024062ba..f9c6008a 100644 --- a/config/jp/arm9/overlays/ov018/delinks.txt +++ b/config/jp/arm9/overlays/ov018/delinks.txt @@ -4,6 +4,7 @@ .bss start:0x020c7400 end:0x020c7460 kind:bss align:32 src/018_StartUp/GameModeStartUp.cpp: + complete .text start:0x020c6060 end:0x020c66ac .data start:0x020c7360 end:0x020c73c4 .bss start:0x020c7400 end:0x020c7460 diff --git a/config/jp/arm9/overlays/ov018/symbols.txt b/config/jp/arm9/overlays/ov018/symbols.txt index 240094e0..1fd29306 100644 --- a/config/jp/arm9/overlays/ov018/symbols.txt +++ b/config/jp/arm9/overlays/ov018/symbols.txt @@ -58,6 +58,6 @@ _ZTV15GameModeStartUp kind:data(any) addr:0x020c7360 @1289 kind:data(any) addr:0x020c73c4 local @1544 kind:data(byte[32]) addr:0x020c73cc local data_ov018_020c5bc0 kind:bss(size=0x1) addr:0x020c7400 local -_ZGVZN18UnkStruct_02049a2c19func_ov018_020c4ba8EvE19data_ov018_020c5bd4 kind:bss addr:0x020c7404 local +_ZGVZN4Game19func_ov018_020c4ba8EvE19data_ov018_020c5bd4 kind:bss addr:0x020c7404 local @729 kind:bss addr:0x020c7408 local -_ZZN18UnkStruct_02049a2c19func_ov018_020c4ba8EvE19data_ov018_020c5bd4 kind:bss(size=0x34) addr:0x020c7414 local +_ZZN4Game19func_ov018_020c4ba8EvE19data_ov018_020c5bd4 kind:bss(size=0x34) addr:0x020c7414 local diff --git a/config/jp/arm9/overlays/ov019/relocs.txt b/config/jp/arm9/overlays/ov019/relocs.txt index 36772c89..30fbd71f 100644 --- a/config/jp/arm9/overlays/ov019/relocs.txt +++ b/config/jp/arm9/overlays/ov019/relocs.txt @@ -269,7 +269,7 @@ from:0x020c7798 kind:arm_call to:0x02016664 module:main from:0x020c77a0 kind:arm_call to:0x020c7bfc module:overlay(19) from:0x020c77a8 kind:arm_call to:0x020c8530 module:overlay(19) from:0x020c77b8 kind:load to:0x020d36d8 add:0x8 module:overlay(19) -from:0x020c77c0 kind:load to:0x020b378c module:overlay(0) +from:0x020c77c0 kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020c77c8 kind:load to:0x020d33dc module:overlay(19) from:0x020c77cc kind:load to:0x020d366c module:overlay(19) from:0x020c77d0 kind:load to:0x020d3ce0 module:overlay(19) @@ -815,7 +815,7 @@ from:0x020ce304 kind:arm_call to:0x02063960 module:overlay(0) from:0x020ce314 kind:arm_call to:0x02063960 module:overlay(0) from:0x020ce31c kind:arm_call to:0x020ce560 module:overlay(19) from:0x020ce32c kind:load to:0x020d3a18 add:0x8 module:overlay(19) -from:0x020ce334 kind:load to:0x020b378c module:overlay(0) +from:0x020ce334 kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020ce350 kind:arm_call to:0x0201f288 module:main from:0x020ce35c kind:arm_call to:0x0201f288 module:main from:0x020ce368 kind:arm_call to:0x0201f288 module:main @@ -1072,7 +1072,7 @@ from:0x020d0154 kind:arm_call to:0x0201f520 module:main from:0x020d0164 kind:arm_call to:0x020643cc module:overlay(0) from:0x020d01a4 kind:arm_call to:0x020d0294 module:overlay(19) from:0x020d01b4 kind:load to:0x020d3a9c add:0x8 module:overlay(19) -from:0x020d01b8 kind:load to:0x020b378c module:overlay(0) +from:0x020d01b8 kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020d01c0 kind:load to:0x020d3a68 module:overlay(19) from:0x020d01d8 kind:arm_call to:0x0201f288 module:main from:0x020d01e0 kind:arm_call to:0x0201f288 module:main @@ -1324,7 +1324,7 @@ from:0x020d19a4 kind:load to:0x020d3ce8 module:overlay(19) from:0x020d19c8 kind:arm_call to:0x020ce07c module:overlay(19) from:0x020d19d0 kind:arm_call to:0x0201e488 module:main from:0x020d19d8 kind:load to:0x020d3ce8 module:overlay(19) -from:0x020d19dc kind:load to:0x0204c46c module:main +from:0x020d19dc kind:load to:0x0204b690 add:0xddc module:main from:0x020d1a0c kind:arm_call to:0x020ce094 module:overlay(19) from:0x020d1a48 kind:arm_call to:0x020627ac module:overlay(0) from:0x020d1a5c kind:arm_call to:0x020ccf68 module:overlay(19) diff --git a/config/jp/arm9/overlays/ov019/symbols.txt b/config/jp/arm9/overlays/ov019/symbols.txt index bfde7d9f..bb19222e 100644 --- a/config/jp/arm9/overlays/ov019/symbols.txt +++ b/config/jp/arm9/overlays/ov019/symbols.txt @@ -217,22 +217,22 @@ _ZN21FileSelectManager_160D1Ev kind:function(arm,size=0x14) addr:0x020d1488 _ZN21FileSelectManager_160D0Ev kind:function(arm,size=0x1c) addr:0x020d149c _ZN21FileSelectManager_1608vfunc_08Ei kind:function(arm,size=0x50) addr:0x020d14b8 _ZN21FileSelectManager_1608vfunc_0CEi kind:function(arm,size=0x64) addr:0x020d1508 -_ZN21FileSelectManager_1608vfunc_14Ev kind:function(arm,size=0x4) addr:0x020d156c -_ZN21FileSelectManager_1608vfunc_10Ev kind:function(arm,size=0x8c) addr:0x020d1570 +_ZN21FileSelectManager_1608vfunc_14Ei kind:function(arm,size=0x4) addr:0x020d156c +_ZN21FileSelectManager_1608vfunc_10Eii kind:function(arm,size=0x8c) addr:0x020d1570 _ZN21FileSelectManager_1608vfunc_18Ei kind:function(arm,size=0x10) addr:0x020d15fc _ZN21FileSelectManager_1608vfunc_1CEi kind:function(arm,size=0x64) addr:0x020d160c -_ZN21FileSelectManager_1608vfunc_20Ev kind:function(arm,size=0xac) addr:0x020d1670 +_ZN21FileSelectManager_1608vfunc_20Eii kind:function(arm,size=0xac) addr:0x020d1670 _ZN21FileSelectManager_1608vfunc_24Ev kind:function(arm,size=0x34) addr:0x020d171c _ZN21FileSelectManager_164C1EP23GameModeManagerBase_104P14FileSelectMain kind:function(arm,size=0x4c) addr:0x020d1750 _ZN21FileSelectManager_164D1Ev kind:function(arm,size=0x3c) addr:0x020d179c _ZN21FileSelectManager_164D0Ev kind:function(arm,size=0x44) addr:0x020d17d8 _ZN21FileSelectManager_1648vfunc_08Ei kind:function(arm,size=0x50) addr:0x020d181c _ZN21FileSelectManager_1648vfunc_0CEi kind:function(arm,size=0x90) addr:0x020d186c -_ZN21FileSelectManager_1648vfunc_14Ev kind:function(arm,size=0x4) addr:0x020d18fc -_ZN21FileSelectManager_1648vfunc_10Ev kind:function(arm,size=0xa8) addr:0x020d1900 +_ZN21FileSelectManager_1648vfunc_14Ei kind:function(arm,size=0x4) addr:0x020d18fc +_ZN21FileSelectManager_1648vfunc_10Eii kind:function(arm,size=0xa8) addr:0x020d1900 _ZN21FileSelectManager_1648vfunc_18Ei kind:function(arm,size=0x38) addr:0x020d19a8 _ZN21FileSelectManager_1648vfunc_1CEi kind:function(arm,size=0xa4) addr:0x020d19e0 -_ZN21FileSelectManager_1648vfunc_20Ev kind:function(arm,size=0x90) addr:0x020d1a84 +_ZN21FileSelectManager_1648vfunc_20Eii kind:function(arm,size=0x90) addr:0x020d1a84 _ZN21FileSelectManager_16419func_ov019_020d02f4Ev kind:function(arm,size=0x28) addr:0x020d1b14 _ZN25UnkSystem1_ov019_Derived2C1Ev kind:function(arm,size=0x40) addr:0x020d1b3c _ZN25UnkSystem1_ov019_Derived28vfunc_08Ei kind:function(arm,size=0x48) addr:0x020d1b7c diff --git a/config/jp/arm9/overlays/ov020/relocs.txt b/config/jp/arm9/overlays/ov020/relocs.txt index 9e460db6..ffcad1ba 100644 --- a/config/jp/arm9/overlays/ov020/relocs.txt +++ b/config/jp/arm9/overlays/ov020/relocs.txt @@ -743,7 +743,7 @@ from:0x020cae6c kind:arm_call to:0x0201f520 module:main from:0x020cae94 kind:arm_call to:0x02064fc4 module:overlay(0) from:0x020caea4 kind:arm_call to:0x02016664 module:main from:0x020caeb4 kind:load to:0x020dd4d8 add:0x8 module:overlay(20) -from:0x020caebc kind:load to:0x020b372c module:overlay(0) +from:0x020caebc kind:load to:0x020b3724 add:0x8 module:overlay(0) from:0x020caec0 kind:load to:0x020e9dc4 module:overlay(20) from:0x020caee8 kind:arm_call to:0x0201f288 module:main from:0x020caef0 kind:arm_call to:0x0201f288 module:main @@ -884,8 +884,8 @@ from:0x020cbe04 kind:arm_call to:0x020cf698 module:overlay(20) from:0x020cbe20 kind:load to:0x020dd518 add:0x8 module:overlay(20) from:0x020cbe24 kind:load to:0x020cbe58 module:overlay(20) from:0x020cbe28 kind:load to:0x020cf63c module:overlay(20) -from:0x020cbe2c kind:load to:0x020b378c module:overlay(0) -from:0x020cbe30 kind:load to:0x020b372c module:overlay(0) +from:0x020cbe2c kind:load to:0x020b3784 add:0x8 module:overlay(0) +from:0x020cbe30 kind:load to:0x020b3724 add:0x8 module:overlay(0) from:0x020cbe38 kind:load to:0x02044704 module:main from:0x020cbe3c kind:load to:0x020ea3a0 module:overlay(20) from:0x020cbe40 kind:load to:0x020ea2dc module:overlay(20) @@ -1083,7 +1083,7 @@ from:0x020cca78 kind:arm_call to:0x020654ec module:overlay(0) from:0x020cca84 kind:arm_call to:0x020654ec module:overlay(0) from:0x020cca90 kind:arm_call to:0x020654ec module:overlay(0) from:0x020cca9c kind:arm_call to:0x020654ec module:overlay(0) -from:0x020ccbd8 kind:load to:0x0204c42c module:main +from:0x020ccbd8 kind:load to:0x0204b690 add:0xd9c module:main from:0x020ccc44 kind:arm_call to:0x0201a9dc module:main from:0x020ccc58 kind:arm_call to:0x0201e6c4 module:main from:0x020ccc74 kind:arm_call to:0x0201aa68 module:main @@ -1447,7 +1447,7 @@ from:0x020cf644 kind:arm_call to:0x020648c0 module:overlay(0) from:0x020cf65c kind:arm_call to:0x020654c8 module:overlay(0) from:0x020cf66c kind:arm_call to:0x0201e4c0 module:main from:0x020cf690 kind:load to:0x020dd508 module:overlay(20) -from:0x020cf694 kind:load to:0x020b378c module:overlay(0) +from:0x020cf694 kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020cf6ec kind:arm_call to:0x020611a8 module:overlay(0) from:0x020cf710 kind:arm_call to:0x020655a0 module:overlay(0) from:0x020cf724 kind:arm_call to:0x020655bc module:overlay(0) diff --git a/config/jp/arm9/overlays/ov021/relocs.txt b/config/jp/arm9/overlays/ov021/relocs.txt index de37534a..eadf60ba 100644 --- a/config/jp/arm9/overlays/ov021/relocs.txt +++ b/config/jp/arm9/overlays/ov021/relocs.txt @@ -484,7 +484,7 @@ from:0x020eeee0 kind:arm_call to:0x0201a9dc module:main from:0x020eeeec kind:load to:0x0203feb0 module:main from:0x020eeef0 kind:load to:0x0210ac64 module:overlay(21) from:0x020eeef4 kind:load to:0x027e0998 module:dtcm -from:0x020eeef8 kind:load to:0x0204c42c module:main +from:0x020eeef8 kind:load to:0x0204b690 add:0xd9c module:main from:0x020eeefc kind:load to:0x0204c49c module:main from:0x020eef00 kind:load to:0x0210ac9c module:overlay(21) from:0x020eef28 kind:arm_call to:0x01fff5d0 module:itcm @@ -2133,7 +2133,7 @@ from:0x020fe234 kind:load to:0x027e0cf4 module:dtcm from:0x020fe238 kind:load to:0x020b69b8 module:overlay(0) from:0x020fe23c kind:load to:0x027e09a4 module:dtcm from:0x020fe240 kind:load to:0x0204b690 module:main -from:0x020fe244 kind:load to:0x0204c42c module:main +from:0x020fe244 kind:load to:0x0204b690 add:0xd9c module:main from:0x020fe248 kind:load to:0x027e0ce0 module:dtcm from:0x020fe26c kind:arm_call to:0x02071f90 module:overlay(0) from:0x020fe274 kind:load to:0x027e09a4 module:dtcm @@ -2268,7 +2268,7 @@ from:0x020ff4b4 kind:load to:0x0210a90c module:overlay(21) from:0x020ff4b8 kind:load to:0x0210a8fc module:overlay(21) from:0x020ff4bc kind:load to:0x0210a91c module:overlay(21) from:0x020ff4c0 kind:load to:0x0210a928 module:overlay(21) -from:0x020ff4c8 kind:load to:0x0204c390 module:main +from:0x020ff4c8 kind:load to:0x0204b690 add:0xd00 module:main from:0x020ff4cc kind:load to:0x027e09ac module:dtcm from:0x020ff4d0 kind:load to:0x020b66c4 module:overlay(0) from:0x020ff4d4 kind:load to:0x0210a8a4 module:overlay(21) @@ -2644,10 +2644,10 @@ from:0x02102938 kind:arm_call to:0x0201f520 module:main from:0x0210294c kind:arm_call to:0x0201f520 module:main from:0x021029b0 kind:arm_call to:0x02025f04 module:main from:0x021029c0 kind:load to:0x0210a9d0 module:overlay(21) -from:0x021029c4 kind:load to:0x020b378c module:overlay(0) +from:0x021029c4 kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x021029c8 kind:load to:0x02102a08 module:overlay(21) from:0x021029cc kind:load to:0x02064904 module:overlay(0) -from:0x021029d0 kind:load to:0x020b372c module:overlay(0) +from:0x021029d0 kind:load to:0x020b3724 add:0x8 module:overlay(0) from:0x021029d4 kind:load to:0x020e9dc4 module:overlay(20) from:0x021029d8 kind:load to:0x02108be8 module:overlay(21) from:0x021029dc kind:load to:0x02108bf4 module:overlay(21) @@ -2698,7 +2698,7 @@ from:0x02102d44 kind:arm_call to:0x020654ec module:overlay(0) from:0x02102d54 kind:arm_call to:0x020654ec module:overlay(0) from:0x02103100 kind:load to:0x020e9dc4 module:overlay(20) from:0x02103104 kind:load to:0x027e0994 module:dtcm -from:0x0210310c kind:load to:0x0204c42c module:main +from:0x0210310c kind:load to:0x0204b690 add:0xd9c module:main from:0x02103150 kind:arm_call to:0x02103734 module:overlay(21) from:0x02103158 kind:arm_call to:0x01ff9b50 module:itcm from:0x02103174 kind:arm_call to:0x02103734 module:overlay(21) @@ -2843,8 +2843,8 @@ from:0x0210451c kind:arm_call to:0x02105258 module:overlay(21) from:0x0210452c kind:load to:0x0210aa5c module:overlay(21) from:0x02104530 kind:load to:0x02104580 module:overlay(21) from:0x02104534 kind:load to:0x02103a20 module:overlay(21) -from:0x02104538 kind:load to:0x020b372c module:overlay(0) -from:0x0210453c kind:load to:0x020b378c module:overlay(0) +from:0x02104538 kind:load to:0x020b3724 add:0x8 module:overlay(0) +from:0x0210453c kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x02104544 kind:load to:0x0210b4d8 module:overlay(21) from:0x02104548 kind:load to:0x020c5790 module:overlays(1,17) from:0x0210454c kind:load to:0x02103904 module:overlay(21) diff --git a/config/jp/arm9/overlays/ov022/relocs.txt b/config/jp/arm9/overlays/ov022/relocs.txt index c70cdca3..10d85dfb 100644 --- a/config/jp/arm9/overlays/ov022/relocs.txt +++ b/config/jp/arm9/overlays/ov022/relocs.txt @@ -316,7 +316,7 @@ from:0x020ece64 kind:load to:0x020edd9c module:overlay(22) from:0x020ece68 kind:load to:0x020ecea8 module:overlay(22) from:0x020ece6c kind:load to:0x020ece80 module:overlay(22) from:0x020ece70 kind:load to:0x020efa90 module:overlay(22) -from:0x020ece74 kind:load to:0x020b378c module:overlay(0) +from:0x020ece74 kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020ece7c kind:load to:0x020ef954 module:overlay(22) from:0x020ece88 kind:arm_call to:0x02064050 module:overlay(0) from:0x020ece98 kind:arm_call to:0x02061d8c module:overlay(0) @@ -516,7 +516,7 @@ from:0x020edea0 kind:arm_call to:0x0201fc68 module:main from:0x020edf1c kind:arm_call to:0x02064218 module:overlay(0) from:0x020edf68 kind:arm_call to:0x020ee5cc module:overlay(22) from:0x020edfc4 kind:load to:0x020efac0 module:overlay(22) -from:0x020edfc8 kind:load to:0x020b378c module:overlay(0) +from:0x020edfc8 kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020edfcc kind:load to:0x020efaa0 add:0x8 module:overlay(22) from:0x020edfd0 kind:load to:0x020efb6c module:overlay(22) from:0x020edfd4 kind:load to:0x020efc28 module:overlay(22) diff --git a/config/jp/arm9/overlays/ov023/relocs.txt b/config/jp/arm9/overlays/ov023/relocs.txt index e929f635..d434d7f2 100644 --- a/config/jp/arm9/overlays/ov023/relocs.txt +++ b/config/jp/arm9/overlays/ov023/relocs.txt @@ -19,7 +19,7 @@ from:0x020eb3fc kind:load to:0x020f3440 module:overlay(23) from:0x020eb400 kind:load to:0x0204afac module:main from:0x020eb404 kind:load to:0x0204b690 module:main from:0x020eb408 kind:load to:0x020ebbc8 module:overlay(23) -from:0x020eb40c kind:load to:0x0204c390 module:main +from:0x020eb40c kind:load to:0x0204b690 add:0xd00 module:main from:0x020eb410 kind:load to:0x027e09ac module:dtcm from:0x020eb414 kind:load to:0x020b7ab8 module:overlay(0) from:0x020eb42c kind:arm_call to:0x020bd2b4 module:overlay(17) @@ -288,10 +288,10 @@ from:0x020ecd2c kind:load to:0x020a1aac module:overlay(0) from:0x020ecd30 kind:load to:0x020f08e0 module:overlay(23) from:0x020ecd34 kind:load to:0x020ecd88 module:overlay(23) from:0x020ecd38 kind:load to:0x020ec1a0 module:overlay(23) -from:0x020ecd3c kind:load to:0x020b372c module:overlay(0) +from:0x020ecd3c kind:load to:0x020b3724 add:0x8 module:overlay(0) from:0x020ecd40 kind:load to:0x020ecd9c module:overlay(23) from:0x020ecd44 kind:load to:0x0201f468 module:main -from:0x020ecd48 kind:load to:0x020b378c module:overlay(0) +from:0x020ecd48 kind:load to:0x020b3784 add:0x8 module:overlay(0) from:0x020ecd4c kind:load to:0x020f3104 module:overlay(23) from:0x020ecd50 kind:load to:0x020f3118 module:overlay(23) from:0x020ecd54 kind:load to:0x02044704 module:main diff --git a/config/jp/arm9/overlays/ov024/delinks.txt b/config/jp/arm9/overlays/ov024/delinks.txt index c9ba6ffb..90f188d8 100644 --- a/config/jp/arm9/overlays/ov024/delinks.txt +++ b/config/jp/arm9/overlays/ov024/delinks.txt @@ -5,17 +5,172 @@ .data start:0x020d9500 end:0x020da000 kind:data align:32 .bss start:0x020da000 end:0x020da0c0 kind:bss align:32 +src/024_MainGame/Game/GameModeAdventure_024.cpp: + complete + .text start:0x020c6060 end:0x020c62cc + .data start:0x020d9500 end:0x020d9530 + +src/024_MainGame/Game/UnkStruct_ov000_020d8660_024.cpp: + complete + .text start:0x020c62cc end:0x020c6674 + .bss start:0x020da000 end:0x020da034 + +src/024_MainGame/Game/UnkActorSystem1_024.cpp: + complete + .text start:0x020c6674 end:0x020c66dc + .data start:0x020d9530 end:0x020d9568 + +src/024_MainGame/Game/UnkActorSystem2_024.cpp: + complete + .text start:0x020c66dc end:0x020c69cc + .data start:0x020d9568 end:0x020d958c + +src/024_MainGame/Game/AdventureModeManager_024.cpp: + complete + .text start:0x020c69cc end:0x020c872c + .data start:0x020d958c end:0x020d9630 + +src/024_MainGame/Game/UnkStruct_027e0998_024.cpp: + complete + .text start:0x020c872c end:0x020c8be0 + .data start:0x020d9630 end:0x020d963c + +src/024_MainGame/Game/UnkStruct_027e0cf8_024.cpp: + complete + .text start:0x020c8be0 end:0x020c9190 + +src/024_MainGame/Game/AdventureModeManager_160_024.cpp: + complete + .text start:0x020c9190 end:0x020c9e08 + .data start:0x020d963c end:0x020d9688 + +src/024_MainGame/Game/AdventureModeManager_170_024.cpp: + complete + .text start:0x020c9e08 end:0x020ca0b0 + .data start:0x020d9688 end:0x020d96d4 + +src/024_MainGame/Game/AdventureModeManager_174_Base_024.cpp: + complete + .text start:0x020ca0b0 end:0x020ca5b4 + .data start:0x020d96d4 end:0x020d9720 + +src/024_MainGame/Game/AdventureModeManager_174_024.cpp: + complete + .text start:0x020ca5b4 end:0x020ca8e4 + .data start:0x020d9720 end:0x020d9750 + +src/024_MainGame/Game/AdventureModeManager_178_Base_024.cpp: + complete + .text start:0x020ca8e4 end:0x020ca9d0 + .data start:0x020d9750 end:0x020d9780 + +src/024_MainGame/Game/AdventureModeManager_178_024.cpp: + complete + .text start:0x020ca9d0 end:0x020caa8c + .data start:0x020d9780 end:0x020d97b0 + +src/024_MainGame/Game/AdventureModeManager_180_024.cpp: + complete + .text start:0x020caa8c end:0x020cae78 + .data start:0x020d97b0 end:0x020d97fc + +src/024_MainGame/Game/AdventureModeManager_184_024.cpp: + complete + .text start:0x020cae78 end:0x020cb1c0 + .data start:0x020d97fc end:0x020d982c + +src/024_MainGame/Game/AdventureModeManager_18C_024.cpp: + complete + .text start:0x020cb1c0 end:0x020cb8e8 + .data start:0x020d982c end:0x020d9878 + +src/024_MainGame/Game/AdventureModeManager_190_024.cpp: + complete + .text start:0x020cb8e8 end:0x020cbb70 + .data start:0x020d9878 end:0x020d98e0 + +src/024_MainGame/Game/AdventureModeManager_15C_20_00_024.cpp: + complete + .text start:0x020cbb70 end:0x020cc2a8 + .data start:0x020d98f0 end:0x020d9914 + +src/024_MainGame/UnkAdventureModeSystem1_024.cpp: + .text start:0x020cc2a8 end:0x020cc5f0 + +src/024_MainGame/UnkStruct_ov024_020d8694_024.cpp: + .text start:0x020cc5f0 end:0x020cca40 + +src/024_MainGame/UnkTitleCardSystem1_024.cpp: + .text start:0x020cca40 end:0x020ce56c + +src/024_MainGame/UnkStruct_020d8698_024.cpp: + .text start:0x020ce56c end:0x020d129c + +src/024_MainGame/UnkStruct_027e0cf8_00_0C_024.cpp: + .text start:0x020d129c end:0x020d1f40 + +src/024_MainGame/Game/AdventureModeManager_1B8_Base_024.cpp: + complete + .text start:0x020d1f40 end:0x020d2fac + .rodata start:0x020d8ee8 end:0x020d8ef4 + .init start:0x020d93e4 end:0x020d9410 + .ctor start:0x020d94e0 end:0x020d94e4 + .data start:0x020d9ba0 end:0x020d9ba8 + .bss start:0x020da03c end:0x020da040 + +src/024_MainGame/UnkStruct_ov024_020d86a0_024.cpp: + .text start:0x020d2fac end:0x020d3050 + +src/024_MainGame/code_020d16fc_024.cpp: + .text start:0x020d3050 end:0x020d3e28 + +src/024_MainGame/code_020d24d4_024.cpp: + .text start:0x020d3e28 end:0x020d4aac + +src/024_MainGame/UnkStruct_027e0cf8_08_024.cpp: + .text start:0x020d4aac end:0x020d4fc4 + +src/024_MainGame/code_020d3670_024.cpp: + .text start:0x020d4fc4 end:0x020d5674 + +src/024_MainGame/UnkStruct_027e0ce0_34_024.cpp: + .text start:0x020d5674 end:0x020d5a74 + src/024_MainGame/PassengerManager.cpp: .text start:0x020d5a74 end:0x020d6008 .rodata start:0x020d8f48 end:0x020d8fc8 +src/024_MainGame/code_020d46b4_024.cpp: + .text start:0x020d6008 end:0x020d6118 + +src/024_MainGame/UnkStruct_027e0d00.cpp: + .text start:0x020d6118 end:0x020d6840 + +src/024_MainGame/code_020d4e9c_024.cpp: + .text start:0x020d6840 end:0x020d6b80 + +src/024_MainGame/code_020d51dc_024.cpp: + .text start:0x020d6b80 end:0x020d6e54 + +src/024_MainGame/code_020d54b0_024.cpp: + .text start:0x020d6e54 end:0x020d7258 + src/024_MainGame/CargoManager_024.cpp: complete .text start:0x020d7258 end:0x020d72dc +src/024_MainGame/code_020d5938_024.cpp: + .text start:0x020d72dc end:0x020d7630 + +src/024_MainGame/UnkStruct_027e0d08_024.cpp: + .text start:0x020d7630 end:0x020d7c58 + src/024_MainGame/MiscAdvManager.cpp: .text start:0x020d7c58 end:0x020d7ff4 +src/024_MainGame/code_020d6650_024.cpp: + .text start:0x020d7ff4 end:0x020d8840 + src/024_MainGame/Actor/ActorUnkOBPC.cpp: .text start:0x020d8840 end:0x020d8cbc .init start:0x020d9488 end:0x020d94d8 diff --git a/config/jp/arm9/overlays/ov024/relocs.txt b/config/jp/arm9/overlays/ov024/relocs.txt index dc7f861a..984bb474 100644 --- a/config/jp/arm9/overlays/ov024/relocs.txt +++ b/config/jp/arm9/overlays/ov024/relocs.txt @@ -83,10 +83,10 @@ from:0x020c65c0 kind:arm_call to:0x0201c284 module:main from:0x020c65d0 kind:arm_call to:0x0201c284 module:main from:0x020c65d8 kind:load to:0x027e09a4 module:dtcm from:0x020c65dc kind:load to:0x0204b690 module:main -from:0x020c65e4 kind:load to:0x0204c42c module:main +from:0x020c65e4 kind:load to:0x0204b690 add:0xd9c module:main from:0x020c665c kind:load to:0x020da000 module:overlay(24) from:0x020c6670 kind:load to:0x020da000 module:overlay(24) -from:0x020c6688 kind:load to:0x020d9538 module:overlay(24) +from:0x020c6688 kind:load to:0x020d9530 add:0x8 module:overlay(24) from:0x020c6698 kind:arm_call to:0x02011ff4 module:main from:0x020c66e8 kind:arm_call to:0x0206306c module:overlay(0) from:0x020c6700 kind:arm_call to:0x02061d8c module:overlay(0) @@ -171,7 +171,7 @@ from:0x020c6db0 kind:arm_call to:0x0201c284 module:main from:0x020c6db4 kind:arm_call to:0x02019ad4 module:main from:0x020c6db8 kind:arm_call to:0x02019be4 module:main from:0x020c6dbc kind:arm_call to:0x02019a0c module:main -from:0x020c6dc4 kind:load to:0x0204c42c module:main +from:0x020c6dc4 kind:load to:0x0204b690 add:0xd9c module:main from:0x020c6dc8 kind:load to:0x027e09a4 module:dtcm from:0x020c6dcc kind:load to:0x0204b690 module:main from:0x020c6df8 kind:arm_call to:0x02018614 module:main @@ -451,7 +451,7 @@ from:0x020c8778 kind:arm_call to:0x02011ff4 module:main from:0x020c8780 kind:load to:0x027e0998 module:dtcm from:0x020c8794 kind:load to:0x027e0998 module:dtcm from:0x020c87a0 kind:arm_call_thumb to:0x02062c88 module:overlay(0) -from:0x020c87b4 kind:load to:0x020d9638 module:overlay(24) +from:0x020c87b4 kind:load to:0x020d9630 add:0x8 module:overlay(24) from:0x020c87c8 kind:arm_call to:0x02011f3c module:main from:0x020c87d4 kind:arm_call to:0x020c8798 module:overlay(24) from:0x020c880c kind:arm_call to:0x020a902c module:overlay(0) @@ -546,7 +546,7 @@ from:0x020c91f0 kind:arm_call to:0x0201b8dc module:main from:0x020c9200 kind:arm_call to:0x0201b8dc module:main from:0x020c9210 kind:arm_call to:0x0201b928 module:main from:0x020c9230 kind:arm_call to:0x02062764 module:overlay(0) -from:0x020c9240 kind:load to:0x020d9660 module:overlay(24) +from:0x020c9240 kind:load to:0x020d9658 add:0x8 module:overlay(24) from:0x020c9244 kind:load to:0x020b37ec add:0x8 module:overlay(0) from:0x020c9248 kind:load to:0x020d963c add:0x8 module:overlay(24) from:0x020c924c kind:load to:0x0204b608 module:main @@ -573,7 +573,7 @@ from:0x020c94a8 kind:arm_call to:0x020627b8 module:overlay(0) from:0x020c94c4 kind:arm_call to:0x0206dbbc module:overlay(0) from:0x020c94e8 kind:arm_call to:0x0206dbbc module:overlay(0) from:0x020c94f0 kind:load to:0x0204b690 module:main -from:0x020c94f4 kind:load to:0x0204c390 module:main +from:0x020c94f4 kind:load to:0x0204b690 add:0xd00 module:main from:0x020c94f8 kind:load to:0x027e0994 module:dtcm from:0x020c94fc kind:load to:0x020b684c module:overlay(0) from:0x020c9500 kind:load to:0x0204b608 module:main @@ -587,7 +587,7 @@ from:0x020c9610 kind:arm_call to:0x0201e378 module:main from:0x020c9618 kind:arm_call_thumb to:0x020b84a0 module:overlay(6) from:0x020c9634 kind:arm_call to:0x01ffd3d8 module:itcm from:0x020c965c kind:arm_call to:0x020194d0 module:main -from:0x020c967c kind:load to:0x0204c46c module:main +from:0x020c967c kind:load to:0x0204b690 add:0xddc module:main from:0x020c9680 kind:load to:0x027e09a4 module:dtcm from:0x020c9684 kind:load to:0x0204b690 module:main from:0x020c96d4 kind:arm_call to:0x0206f100 module:overlay(0) @@ -621,9 +621,9 @@ from:0x020c9ab8 kind:arm_call to:0x0201b798 module:main from:0x020c9ae8 kind:arm_call to:0x020627b8 module:overlay(0) from:0x020c9af4 kind:load to:0x0204b690 module:main from:0x020c9af8 kind:load to:0x020b7ab8 module:overlay(0) -from:0x020c9afc kind:load to:0x0204c438 module:main -from:0x020c9b00 kind:load to:0x0204c390 module:main -from:0x020c9b04 kind:load to:0x0204c450 module:main +from:0x020c9afc kind:load to:0x0204b690 add:0xda8 module:main +from:0x020c9b00 kind:load to:0x0204b690 add:0xd00 module:main +from:0x020c9b04 kind:load to:0x0204b690 add:0xdc0 module:main from:0x020c9b08 kind:load to:0x0204b608 module:main from:0x020c9b0c kind:load to:0x0204fb78 module:main from:0x020c9b28 kind:arm_call to:0x020627d0 module:overlay(0) @@ -642,16 +642,16 @@ from:0x020c9c24 kind:arm_call to:0x0201db48 module:main from:0x020c9c38 kind:arm_call to:0x0201ea20 module:main from:0x020c9c48 kind:arm_call to:0x0201e6c4 module:main from:0x020c9c5c kind:arm_call to:0x0201e6c4 module:main -from:0x020c9c70 kind:load to:0x0204c450 module:main +from:0x020c9c70 kind:load to:0x0204b690 add:0xdc0 module:main from:0x020c9c74 kind:load to:0x0204b690 module:main from:0x020c9c84 kind:arm_call to:0x0201e488 module:main from:0x020c9c8c kind:arm_call_thumb to:0x020b84ac module:overlays(6,14) from:0x020c9c98 kind:arm_call to:0x02019ad4 module:main -from:0x020c9ca0 kind:load to:0x0204c46c module:main +from:0x020c9ca0 kind:load to:0x0204b690 add:0xddc module:main from:0x020c9cb4 kind:arm_call to:0x0206f100 module:overlay(0) from:0x020c9cbc kind:arm_call to:0x0201ccc8 module:main from:0x020c9ccc kind:load to:0x020b6a14 module:overlay(0) -from:0x020c9cd0 kind:load to:0x0204c438 module:main +from:0x020c9cd0 kind:load to:0x0204b690 add:0xda8 module:main from:0x020c9cec kind:arm_call to:0x020627b8 module:overlay(0) from:0x020c9d10 kind:load to:0x0204b608 module:main from:0x020c9d2c kind:arm_call to:0x0201b974 module:main @@ -689,7 +689,7 @@ from:0x020c9fc8 kind:arm_call to:0x0206918c module:overlay(0) from:0x020c9fec kind:arm_call to:0x020194d0 module:main from:0x020c9ff8 kind:arm_call to:0x020627d0 module:overlay(0) from:0x020ca008 kind:arm_call to:0x020b8270 module:overlay(8) -from:0x020ca010 kind:arm_call to:0x020b7d40 module:overlays(3,4,5,7,8,9,11,13,15,16) +from:0x020ca010 kind:arm_call to:0x020b7d40 module:overlay(8) from:0x020ca038 kind:arm_call to:0x0206edf8 module:overlay(0) from:0x020ca040 kind:load to:0x0204b690 module:main from:0x020ca044 kind:load to:0x0204fb78 module:main @@ -729,12 +729,12 @@ from:0x020ca1f4 kind:thumb_call_arm to:0x0206960c module:overlay(0) from:0x020ca340 kind:thumb_call_arm to:0x02073da8 module:overlay(0) from:0x020ca348 kind:thumb_call to:0x02014854 module:main from:0x020ca34e kind:thumb_call_arm to:0x020690bc module:overlay(0) -from:0x020ca358 kind:load to:0x0204c450 module:main +from:0x020ca358 kind:load to:0x0204b690 add:0xdc0 module:main from:0x020ca35c kind:load to:0x0204b690 module:main from:0x020ca360 kind:load to:0x027e095c module:dtcm from:0x020ca364 kind:load to:0x020b684c module:overlay(0) from:0x020ca368 kind:load to:0x0204b608 module:main -from:0x020ca36c kind:load to:0x0204c410 module:main +from:0x020ca36c kind:load to:0x0204b690 add:0xd80 module:main from:0x020ca370 kind:load to:0x020b6770 module:overlay(0) from:0x020ca374 kind:load to:0x027e09ac module:dtcm from:0x020ca378 kind:load to:0x0204b120 module:main @@ -763,7 +763,7 @@ from:0x020ca4d0 kind:thumb_call_arm to:0x0201d904 module:main from:0x020ca4ec kind:thumb_call_arm to:0x0206960c module:overlay(0) from:0x020ca506 kind:thumb_call_arm to:0x020690fc module:overlay(0) from:0x020ca510 kind:load to:0x027e09ac module:dtcm -from:0x020ca514 kind:load to:0x0204c450 module:main +from:0x020ca514 kind:load to:0x0204b690 add:0xdc0 module:main from:0x020ca518 kind:load to:0x0204b690 module:main from:0x020ca51c kind:load to:0x027e0cdc module:dtcm from:0x020ca520 kind:load to:0x027e095c module:dtcm @@ -772,8 +772,8 @@ from:0x020ca528 kind:load to:0x027e0cd8 module:dtcm from:0x020ca52c kind:load to:0x027e09a4 module:dtcm from:0x020ca530 kind:load to:0x027e0994 module:dtcm from:0x020ca534 kind:load to:0x027e0998 module:dtcm -from:0x020ca538 kind:load to:0x0204c470 module:main -from:0x020ca53c kind:load to:0x0204c410 module:main +from:0x020ca538 kind:load to:0x0204b690 add:0xde0 module:main +from:0x020ca53c kind:load to:0x0204b690 add:0xd80 module:main from:0x020ca540 kind:load to:0x020b6770 module:overlay(0) from:0x020ca544 kind:load to:0x020b684c module:overlay(0) from:0x020ca54c kind:load to:0x0204b50c module:main @@ -830,7 +830,7 @@ from:0x020ca87e kind:thumb_call_arm to:0x0201c284 module:main from:0x020ca888 kind:load to:0x0204b608 module:main from:0x020ca88c kind:load to:0x0204b690 module:main from:0x020ca890 kind:load to:0x027e0994 module:dtcm -from:0x020ca894 kind:load to:0x0204c42c module:main +from:0x020ca894 kind:load to:0x0204b690 add:0xd9c module:main from:0x020ca8a8 kind:arm_call to:0x0201b8bc module:main from:0x020ca8b0 kind:arm_call to:0x02062c50 module:overlay(0) from:0x020ca8c8 kind:arm_call to:0x0201b8bc module:main @@ -894,16 +894,16 @@ from:0x020cabf2 kind:thumb_call to:0x020cadcc module:overlay(24) from:0x020cac0a kind:thumb_call_arm to:0x020627b8 module:overlay(0) from:0x020cac10 kind:load to:0x0204b608 module:main from:0x020cac14 kind:load to:0x0204b690 module:main -from:0x020cac18 kind:load to:0x0204c410 module:main +from:0x020cac18 kind:load to:0x0204b690 add:0xd80 module:main from:0x020cac36 kind:thumb_call_arm to:0x020194d0 module:main from:0x020cac40 kind:thumb_call to:0x020cac80 module:overlay(24) from:0x020cac50 kind:thumb_call_arm to:0x020194d0 module:main from:0x020cac5c kind:thumb_call_arm to:0x02067ad4 module:overlay(0) from:0x020cac74 kind:load to:0x0204b690 module:main from:0x020cac78 kind:load to:0x020b6770 module:overlay(0) -from:0x020cac7c kind:load to:0x0204c470 module:main +from:0x020cac7c kind:load to:0x0204b690 add:0xde0 module:main from:0x020cac8c kind:thumb_call_arm to:0x020627d0 module:overlay(0) -from:0x020cac98 kind:thumb_call to:0x020b7d40 module:overlays(1,2,6,10,12,14) +from:0x020cac98 kind:thumb_call to:0x020b7d40 module:overlay(14) from:0x020caca0 kind:load to:0x0204b608 module:main from:0x020cacb8 kind:thumb_call_arm to:0x0201b974 module:main from:0x020cacc2 kind:thumb_call_arm to:0x0201b798 module:main @@ -914,7 +914,7 @@ from:0x020cad18 kind:thumb_call_arm to:0x0201b974 module:main from:0x020cad22 kind:thumb_call_arm to:0x0201b798 module:main from:0x020cad38 kind:thumb_call_arm to:0x020627b8 module:overlay(0) from:0x020cad40 kind:load to:0x0204b608 module:main -from:0x020cad44 kind:load to:0x0204c410 module:main +from:0x020cad44 kind:load to:0x0204b690 add:0xd80 module:main from:0x020cad48 kind:load to:0x0204fb78 module:main from:0x020cad5e kind:thumb_call_arm to:0x020627d0 module:overlay(0) from:0x020cad84 kind:thumb_call_arm to:0x020c6dd0 module:overlay(24) @@ -924,27 +924,27 @@ from:0x020cad9c kind:thumb_call_arm to:0x020c7f3c module:overlay(24) from:0x020cada2 kind:thumb_call_arm to:0x020c7ee0 module:overlay(24) from:0x020cadae kind:thumb_call_arm to:0x02067b40 module:overlay(0) from:0x020cadb4 kind:load to:0x0204b608 module:main -from:0x020cadb8 kind:load to:0x0204c470 module:main +from:0x020cadb8 kind:load to:0x0204b690 add:0xde0 module:main from:0x020cadbc kind:load to:0x027e0994 module:dtcm from:0x020cadc0 kind:load to:0x027e09a4 module:dtcm from:0x020cadc4 kind:load to:0x020b6770 module:overlay(0) from:0x020cadd4 kind:thumb_call_arm to:0x0201ccc8 module:main from:0x020cadec kind:thumb_call_arm to:0x01fff520 module:itcm from:0x020cadfa kind:thumb_call_arm to:0x0210d72c module:overlay(31) -from:0x020cae04 kind:load to:0x0204c438 module:main +from:0x020cae04 kind:load to:0x0204b690 add:0xda8 module:main from:0x020cae08 kind:load to:0x020b4cc4 module:overlay(0) from:0x020cae0c kind:load to:0x027e0ce8 module:dtcm from:0x020cae1c kind:thumb_call_arm to:0x0201cd20 module:main from:0x020cae34 kind:thumb_call_arm to:0x01fff520 module:itcm from:0x020cae42 kind:thumb_call_arm to:0x0210d748 module:overlay(31) -from:0x020cae4c kind:load to:0x0204c438 module:main +from:0x020cae4c kind:load to:0x0204b690 add:0xda8 module:main from:0x020cae50 kind:load to:0x020b4cc4 module:overlay(0) from:0x020cae54 kind:load to:0x027e0ce8 module:dtcm from:0x020cae64 kind:arm_call to:0x0201b8bc module:main from:0x020cae6c kind:arm_call to:0x02011ff4 module:main from:0x020cae7e kind:thumb_call_arm to:0x02062bd0 module:overlay(0) from:0x020cae98 kind:thumb_call_arm to:0x02062764 module:overlay(0) -from:0x020caea0 kind:load to:0x020d9804 module:overlay(24) +from:0x020caea0 kind:load to:0x020d97fc add:0x8 module:overlay(24) from:0x020caea4 kind:load to:0x0204b608 module:main from:0x020caeac kind:thumb_call_arm to:0x02062c50 module:overlay(0) from:0x020caeb8 kind:thumb_call_arm to:0x02062c50 module:overlay(0) @@ -959,7 +959,7 @@ from:0x020caf32 kind:thumb_call_arm to:0x01ffd3d8 module:itcm from:0x020caf3e kind:thumb_call_arm to:0x02074994 module:overlay(0) from:0x020caf54 kind:thumb_call_arm to:0x0206952c module:overlay(0) from:0x020caf60 kind:thumb_call to:0x020b7e1c module:overlay(10) -from:0x020caf6a kind:thumb_call to:0x020b7d40 module:overlays(1,2,6,10,12,14) +from:0x020caf6a kind:thumb_call to:0x020b7d40 module:overlay(10) from:0x020caf82 kind:thumb_call to:0x020ba134 module:overlay(10) from:0x020caf8a kind:thumb_call to:0x020b8828 module:overlay(10) from:0x020caf96 kind:thumb_call_arm to:0x020cebb8 module:overlay(24) @@ -1017,7 +1017,7 @@ from:0x020cb1f0 kind:load to:0x020627ac module:overlay(0) from:0x020cb1fa kind:thumb_call_arm to:0x02062bd0 module:overlay(0) from:0x020cb20c kind:thumb_call to:0x020cb1c0 module:overlay(24) from:0x020cb24a kind:thumb_call_arm to:0x02062764 module:overlay(0) -from:0x020cb254 kind:load to:0x020d9850 module:overlay(24) +from:0x020cb254 kind:load to:0x020d9848 add:0x8 module:overlay(24) from:0x020cb258 kind:load to:0x0204b608 module:main from:0x020cb260 kind:thumb_call_arm to:0x0201b8bc module:main from:0x020cb26e kind:thumb_call_arm to:0x0201b8bc module:main @@ -1036,9 +1036,9 @@ from:0x020cb362 kind:thumb_call_arm to:0x020627b8 module:overlay(0) from:0x020cb386 kind:thumb_call to:0x020cb4bc module:overlay(24) from:0x020cb39c kind:thumb_call_arm to:0x020627b8 module:overlay(0) from:0x020cb3a8 kind:load to:0x020b6a14 module:overlay(0) -from:0x020cb3ac kind:load to:0x0204c438 module:main +from:0x020cb3ac kind:load to:0x0204b690 add:0xda8 module:main from:0x020cb3b0 kind:load to:0x0204b690 module:main -from:0x020cb3b4 kind:load to:0x0204c410 module:main +from:0x020cb3b4 kind:load to:0x0204b690 add:0xd80 module:main from:0x020cb3b8 kind:load to:0x0204b608 module:main from:0x020cb3cc kind:thumb_call_arm to:0x020627d0 module:overlay(0) from:0x020cb400 kind:thumb_call_arm to:0x0201db48 module:main @@ -1049,16 +1049,16 @@ from:0x020cb44c kind:thumb_call to:0x020cb4bc module:overlay(24) from:0x020cb454 kind:thumb_call to:0x020cb4bc module:overlay(24) from:0x020cb482 kind:thumb_call_arm to:0x0201d904 module:main from:0x020cb4a4 kind:load to:0x0204b608 module:main -from:0x020cb4a8 kind:load to:0x0204c450 module:main -from:0x020cb4ac kind:load to:0x0204c410 module:main +from:0x020cb4a8 kind:load to:0x0204b690 add:0xdc0 module:main +from:0x020cb4ac kind:load to:0x0204b690 add:0xd80 module:main from:0x020cb4b0 kind:load to:0x0204b690 module:main -from:0x020cb4b4 kind:load to:0x0204c470 module:main +from:0x020cb4b4 kind:load to:0x0204b690 add:0xde0 module:main from:0x020cb4b8 kind:load to:0x0204b50c module:main from:0x020cb4c4 kind:thumb_call_arm to:0x020c81ec module:overlay(24) from:0x020cb4d0 kind:thumb_call_arm to:0x0201beb4 module:main -from:0x020cb4e4 kind:thumb_call_arm to:0x020b7d40 module:overlays(3,4,5,7,8,9,11,13,15,16) -from:0x020cb4ec kind:thumb_call_arm to:0x020ba150 module:overlays(3,11) -from:0x020cb52a kind:thumb_call_arm to:0x020b7d40 module:overlays(3,4,5,7,8,9,11,13,15,16) +from:0x020cb4e4 kind:thumb_call_arm to:0x020b7d40 module:overlay(11) +from:0x020cb4ec kind:thumb_call_arm to:0x020ba150 module:overlay(11) +from:0x020cb52a kind:thumb_call_arm to:0x020b7d40 module:overlay(11) from:0x020cb560 kind:load to:0x027e0994 module:dtcm from:0x020cb564 kind:load to:0x027e09b8 module:dtcm from:0x020cb576 kind:thumb_call_arm to:0x020ba00c module:overlay(11) @@ -1073,12 +1073,12 @@ from:0x020cb604 kind:thumb_call_arm to:0x0201da00 module:main from:0x020cb60c kind:thumb_call_arm to:0x0206f100 module:overlay(0) from:0x020cb612 kind:thumb_call to:0x020cb884 module:overlay(24) from:0x020cb61c kind:load to:0x020b6a14 module:overlay(0) -from:0x020cb620 kind:load to:0x0204c438 module:main -from:0x020cb628 kind:load to:0x0204c450 module:main +from:0x020cb620 kind:load to:0x0204b690 add:0xda8 module:main +from:0x020cb628 kind:load to:0x0204b690 add:0xdc0 module:main from:0x020cb660 kind:thumb_call to:0x020cb884 module:overlay(24) from:0x020cb676 kind:thumb_call_arm to:0x020627b8 module:overlay(0) from:0x020cb690 kind:thumb_call_arm to:0x020627b8 module:overlay(0) -from:0x020cb6ac kind:load to:0x0204c410 module:main +from:0x020cb6ac kind:load to:0x0204b690 add:0xd80 module:main from:0x020cb6b0 kind:load to:0x0204b608 module:main from:0x020cb6d2 kind:thumb_call_arm to:0x01ffd3d8 module:itcm from:0x020cb6e0 kind:thumb_call_arm to:0x0201beb4 module:main @@ -1105,9 +1105,9 @@ from:0x020cb84c kind:thumb_call_arm to:0x02019ad4 module:main from:0x020cb854 kind:load to:0x027e0994 module:dtcm from:0x020cb858 kind:load to:0x027e09a4 module:dtcm from:0x020cb85c kind:load to:0x027e0998 module:dtcm -from:0x020cb860 kind:load to:0x0204c470 module:main -from:0x020cb864 kind:load to:0x0204c450 module:main -from:0x020cb86c kind:load to:0x0204c410 module:main +from:0x020cb860 kind:load to:0x0204b690 add:0xde0 module:main +from:0x020cb864 kind:load to:0x0204b690 add:0xdc0 module:main +from:0x020cb86c kind:load to:0x0204b690 add:0xd80 module:main from:0x020cb870 kind:load to:0x0204b50c module:main from:0x020cb874 kind:load to:0x0204b608 module:main from:0x020cb890 kind:thumb_call_arm to:0x0201b974 module:main @@ -1154,7 +1154,7 @@ from:0x020cba98 kind:load to:0x0204fb78 module:main from:0x020cbaaa kind:thumb_call_arm to:0x0201b974 module:main from:0x020cbac4 kind:thumb_call_arm to:0x0201b798 module:main from:0x020cbacc kind:load to:0x0204fb78 module:main -from:0x020cbadc kind:load to:0x020ba680 module:overlays(5,6,7,11,12,13,14) +from:0x020cbadc kind:load to:0x020ba680 module:overlay(11) from:0x020cbae8 kind:arm_call to:0x0201b8bc module:main from:0x020cbaf0 kind:arm_call to:0x02011ff4 module:main from:0x020cbb04 kind:arm_call to:0x0201b8bc module:main @@ -1183,8 +1183,8 @@ from:0x020cbc28 kind:arm_call to:0x02064480 module:overlay(0) from:0x020cbca0 kind:arm_call to:0x02016664 module:main from:0x020cbcb4 kind:arm_call to:0x02016664 module:main from:0x020cbcd0 kind:load to:0x020d98f0 add:0x8 module:overlay(24) -from:0x020cbcd4 kind:load to:0x020b378c module:overlay(0) -from:0x020cbcd8 kind:load to:0x020b372c module:overlay(0) +from:0x020cbcd4 kind:load to:0x020b3784 add:0x8 module:overlay(0) +from:0x020cbcd8 kind:load to:0x020b3724 add:0x8 module:overlay(0) from:0x020cbd1c kind:arm_call to:0x02064fc4 module:overlay(0) from:0x020cbd38 kind:arm_call to:0x02064fc4 module:overlay(0) from:0x020cbd4c kind:arm_call to:0x020644a0 module:overlay(0) @@ -1247,9 +1247,9 @@ from:0x020cc294 kind:arm_call to:0x020631e4 module:overlay(0) from:0x020cc29c kind:arm_call to:0x02011ff4 module:main from:0x020cc2cc kind:arm_call to:0x0201e4c0 module:main from:0x020cc308 kind:arm_call to:0x0201e664 module:main -from:0x020cc348 kind:load to:0x020d991c module:overlay(24) +from:0x020cc348 kind:load to:0x020d9914 add:0x8 module:overlay(24) from:0x020cc364 kind:arm_call to:0x0201e4c0 module:main -from:0x020cc3a4 kind:load to:0x020d991c module:overlay(24) +from:0x020cc3a4 kind:load to:0x020d9914 add:0x8 module:overlay(24) from:0x020cc3e8 kind:arm_call to:0x0201e664 module:main from:0x020cc5d4 kind:arm_call to:0x020cc3f4 module:overlay(24) from:0x020cc604 kind:arm_call to:0x02011f3c module:main @@ -1306,7 +1306,7 @@ from:0x020cc9f0 kind:arm_call to:0x02018a5c module:main from:0x020cca00 kind:arm_call_thumb to:0x0201c818 module:main from:0x020cca0c kind:arm_call_thumb to:0x0201c818 module:main from:0x020cca14 kind:load to:0x027e0994 module:dtcm -from:0x020cca18 kind:load to:0x0204b6a0 module:main +from:0x020cca18 kind:load to:0x0204b690 add:0x10 module:main from:0x020cca28 kind:load to:0x020da034 module:overlay(24) from:0x020cca3c kind:load to:0x020da034 module:overlay(24) from:0x020ccaa0 kind:arm_call to:0x0201e4c0 module:main @@ -1417,14 +1417,14 @@ from:0x020cda24 kind:arm_call to:0x0201edec module:main from:0x020cda58 kind:arm_call to:0x0201ee3c module:main from:0x020cda6c kind:arm_call to:0x0201c2c8 module:main from:0x020cda74 kind:load to:0x0204fb78 module:main -from:0x020cda78 kind:load to:0x0204c42c module:main +from:0x020cda78 kind:load to:0x0204b690 add:0xd9c module:main from:0x020cdab0 kind:arm_call to:0x020cd8d8 module:overlay(24) from:0x020cdad4 kind:arm_call to:0x0201edec module:main from:0x020cdc34 kind:arm_call to:0x0201ee3c module:main from:0x020cdc48 kind:arm_call to:0x0201c2c8 module:main from:0x020cdc8c kind:arm_call to:0x020cd708 module:overlay(24) from:0x020cdc98 kind:arm_call to:0x020cd7e8 module:overlay(24) -from:0x020cdca4 kind:load to:0x0204c42c module:main +from:0x020cdca4 kind:load to:0x0204b690 add:0xd9c module:main from:0x020cdcb0 kind:arm_call to:0x020cd11c module:overlay(24) from:0x020cdcc0 kind:arm_call to:0x0201e93c module:main from:0x020cdccc kind:load to:0x020d99bc module:overlay(24) @@ -1923,7 +1923,7 @@ from:0x020d29c4 kind:arm_call to:0x02070df0 module:overlay(0) from:0x020d2a0c kind:arm_call to:0x020d2098 module:overlay(24) from:0x020d2a4c kind:arm_call to:0x02070df0 module:overlay(0) from:0x020d2a58 kind:arm_call to:0x020beebc module:overlay(17) -from:0x020d2a94 kind:load to:0x0204c490 module:main +from:0x020d2a94 kind:load to:0x0204b690 add:0xe00 module:main from:0x020d2a98 kind:load to:0x020b6ab4 module:overlay(0) from:0x020d2a9c kind:load to:0x027e0ce0 module:dtcm from:0x020d2acc kind:arm_call to:0x020152e0 module:main @@ -1959,9 +1959,9 @@ from:0x020d2f1c kind:arm_call to:0x020d2860 module:overlay(24) from:0x020d2f3c kind:arm_call to:0x020d2278 module:overlay(24) from:0x020d2f78 kind:arm_call to:0x0202a1c0 module:main from:0x020d2f80 kind:arm_call to:0x020bd298 module:overlay(17) -from:0x020d2f88 kind:load to:0x020c5790 module:overlays(1,17) +from:0x020d2f88 kind:load to:0x020c5790 module:overlay(17) from:0x020d2f98 kind:arm_call to:0x020bd2b4 module:overlay(17) -from:0x020d2fa8 kind:load to:0x020c5790 module:overlays(1,17) +from:0x020d2fa8 kind:load to:0x020c5790 module:overlay(17) from:0x020d2fbc kind:arm_call to:0x02011f3c module:main from:0x020d2fc8 kind:arm_call_thumb to:0x020bf010 module:overlay(1) from:0x020d2fe0 kind:arm_call to:0x020c49f8 module:overlay(17) diff --git a/config/jp/arm9/overlays/ov024/symbols.txt b/config/jp/arm9/overlays/ov024/symbols.txt index 80f7a5bd..872dbcfc 100644 --- a/config/jp/arm9/overlays/ov024/symbols.txt +++ b/config/jp/arm9/overlays/ov024/symbols.txt @@ -1,366 +1,366 @@ -func_ov024_020c6060 kind:function(thumb,size=0x44) addr:0x020c6060 -_ZN19func_ov024_020c60a4D0Ev kind:function(thumb,size=0x48) addr:0x020c60a4 -func_ov024_020c60ec kind:function(thumb,size=0x58) addr:0x020c60ec -func_ov024_020c6144 kind:function(arm,size=0x3c) addr:0x020c6144 -func_ov024_020c6180 kind:function(arm,size=0x24) addr:0x020c6180 -func_ov024_020c61a4 kind:function(arm,size=0x20) addr:0x020c61a4 -func_ov024_020c61c4 kind:function(arm,size=0x50) addr:0x020c61c4 -func_ov024_020c6214 kind:function(arm,size=0x24) addr:0x020c6214 -func_ov024_020c6238 kind:function(arm,size=0x68) addr:0x020c6238 -func_ov024_020c62a0 kind:function(arm,size=0x2c) addr:0x020c62a0 -func_ov024_020c62cc kind:function(arm,size=0x34) addr:0x020c62cc -func_ov024_020c6300 kind:function(arm,size=0x50) addr:0x020c6300 -func_ov024_020c6350 kind:function(arm,size=0x14) addr:0x020c6350 -func_ov024_020c6364 kind:function(arm,size=0x28) addr:0x020c6364 -func_ov024_020c638c kind:function(arm,size=0x54) addr:0x020c638c -func_ov024_020c63e0 kind:function(arm,size=0x128) addr:0x020c63e0 -func_ov024_020c6508 kind:function(arm,size=0xe0) addr:0x020c6508 -func_ov024_020c65e8 kind:function(arm,size=0x14) addr:0x020c65e8 -func_ov024_020c65fc kind:function(arm,size=0x24) addr:0x020c65fc -func_ov024_020c6620 kind:function(arm,size=0x30) addr:0x020c6620 -func_ov024_020c6650 kind:function(arm,size=0x10) addr:0x020c6650 -func_ov024_020c6660 kind:function(arm,size=0x14) addr:0x020c6660 -func_ov024_020c6674 kind:function(arm,size=0x18) addr:0x020c6674 -func_ov024_020c668c kind:function(arm,size=0x4) addr:0x020c668c -_ZN19func_ov024_020c6690D0Ev kind:function(arm,size=0x14) addr:0x020c6690 -func_ov024_020c66a4 kind:function(arm,size=0x4) addr:0x020c66a4 -func_ov024_020c66a8 kind:function(arm,size=0xc) addr:0x020c66a8 -func_ov024_020c66b4 kind:function(arm,size=0xc) addr:0x020c66b4 -func_ov024_020c66c0 kind:function(arm,size=0x4) addr:0x020c66c0 -func_ov024_020c66c4 kind:function(arm,size=0x4) addr:0x020c66c4 -func_ov024_020c66c8 kind:function(arm,size=0x4) addr:0x020c66c8 -func_ov024_020c66cc kind:function(arm,size=0x4) addr:0x020c66cc -func_ov024_020c66d0 kind:function(arm,size=0x4) addr:0x020c66d0 -func_ov024_020c66d4 kind:function(arm,size=0x8) addr:0x020c66d4 -func_ov024_020c66dc kind:function(arm,size=0x58) addr:0x020c66dc -func_ov024_020c6734 kind:function(arm,size=0x18) addr:0x020c6734 -func_ov024_020c674c kind:function(arm,size=0x18) addr:0x020c674c -func_ov024_020c6764 kind:function(arm,size=0x18) addr:0x020c6764 -func_ov024_020c677c kind:function(arm,size=0x10) addr:0x020c677c -func_ov024_020c678c kind:function(arm,size=0x10) addr:0x020c678c -func_ov024_020c679c kind:function(arm,size=0x24) addr:0x020c679c -func_ov024_020c67c0 kind:function(arm,size=0x10) addr:0x020c67c0 -func_ov024_020c67d0 kind:function(arm,size=0x10) addr:0x020c67d0 -func_ov024_020c67e0 kind:function(arm,size=0x10) addr:0x020c67e0 -func_ov024_020c67f0 kind:function(arm,size=0x8) addr:0x020c67f0 -func_ov024_020c67f8 kind:function(arm,size=0x8c) addr:0x020c67f8 -func_ov024_020c6884 kind:function(arm,size=0xfc) addr:0x020c6884 -func_ov024_020c6980 kind:function(arm,size=0x14) addr:0x020c6980 -func_ov024_020c6994 kind:function(arm,size=0x8) addr:0x020c6994 -_ZN19func_ov024_020c699cD1Ev kind:function(arm,size=0x14) addr:0x020c699c -_ZN19func_ov024_020c69b0D0Ev kind:function(arm,size=0x1c) addr:0x020c69b0 -func_ov024_020c69cc kind:function(arm,size=0x94) addr:0x020c69cc -_ZN19func_ov024_020c6a60D0Ev kind:function(arm,size=0x9c) addr:0x020c6a60 -func_ov024_020c6afc kind:function(arm,size=0x18) addr:0x020c6afc -func_ov024_020c6b14 kind:function(arm,size=0x18) addr:0x020c6b14 -func_ov024_020c6b2c kind:function(arm,size=0x3c) addr:0x020c6b2c -func_ov024_020c6b68 kind:function(arm,size=0x18) addr:0x020c6b68 -func_ov024_020c6b80 kind:function(arm,size=0x58) addr:0x020c6b80 -func_ov024_020c6bd8 kind:function(arm,size=0x18) addr:0x020c6bd8 -func_ov024_020c6bf0 kind:function(arm,size=0x6c) addr:0x020c6bf0 -func_ov024_020c6c5c kind:function(arm,size=0x174) addr:0x020c6c5c -func_ov024_020c6dd0 kind:function(arm,size=0x8) addr:0x020c6dd0 -func_ov024_020c6dd8 kind:function(arm,size=0x734) addr:0x020c6dd8 -func_ov024_020c750c kind:function(arm,size=0xc0) addr:0x020c750c -func_ov024_020c75cc kind:function(arm,size=0x120) addr:0x020c75cc -func_ov024_020c76ec kind:function(arm,size=0xa4) addr:0x020c76ec -func_ov024_020c7790 kind:function(arm,size=0x184) addr:0x020c7790 -func_ov024_020c7914 kind:function(arm,size=0x148) addr:0x020c7914 -func_ov024_020c7a5c kind:function(arm,size=0x8c) addr:0x020c7a5c -func_ov024_020c7ae8 kind:function(arm,size=0x60) addr:0x020c7ae8 -func_ov024_020c7b48 kind:function(arm,size=0x138) addr:0x020c7b48 -func_ov024_020c7c80 kind:function(arm,size=0xa0) addr:0x020c7c80 -func_ov024_020c7d20 kind:function(arm,size=0x14) addr:0x020c7d20 -func_ov024_020c7d34 kind:function(arm,size=0x160) addr:0x020c7d34 -func_ov024_020c7e94 kind:function(arm,size=0x4c) addr:0x020c7e94 -func_ov024_020c7ee0 kind:function(arm,size=0x5c) addr:0x020c7ee0 -func_ov024_020c7f3c kind:function(arm,size=0x54) addr:0x020c7f3c -func_ov024_020c7f90 kind:function(arm,size=0xac) addr:0x020c7f90 -func_ov024_020c803c kind:function(arm,size=0x24) addr:0x020c803c -func_ov024_020c8060 kind:function(arm,size=0x94) addr:0x020c8060 -func_ov024_020c80f4 kind:function(arm,size=0x18) addr:0x020c80f4 -func_ov024_020c810c kind:function(arm,size=0x44) addr:0x020c810c -func_ov024_020c8150 kind:function(arm,size=0x10) addr:0x020c8150 -func_ov024_020c8160 kind:function(arm,size=0x8c) addr:0x020c8160 -func_ov024_020c81ec kind:function(arm,size=0x34) addr:0x020c81ec -func_ov024_020c8220 kind:function(arm,size=0x50) addr:0x020c8220 -func_ov024_020c8270 kind:function(arm,size=0x28) addr:0x020c8270 -func_ov024_020c8298 kind:function(arm,size=0xac) addr:0x020c8298 -func_ov024_020c8344 kind:function(arm,size=0x98) addr:0x020c8344 -func_ov024_020c83dc kind:function(arm,size=0xd4) addr:0x020c83dc -func_ov024_020c84b0 kind:function(arm,size=0x74) addr:0x020c84b0 -func_ov024_020c8524 kind:function(arm,size=0x10) addr:0x020c8524 -func_ov024_020c8534 kind:function(arm,size=0x20) addr:0x020c8534 -func_ov024_020c8554 kind:function(arm,size=0xc) addr:0x020c8554 -func_ov024_020c8560 kind:function(arm,size=0x10) addr:0x020c8560 -func_ov024_020c8570 kind:function(arm,size=0xc) addr:0x020c8570 -func_ov024_020c857c kind:function(arm,size=0x38) addr:0x020c857c -func_ov024_020c85b4 kind:function(arm,size=0x54) addr:0x020c85b4 -func_ov024_020c8608 kind:function(arm,size=0x34) addr:0x020c8608 -func_ov024_020c863c kind:function(arm,size=0x4c) addr:0x020c863c -func_ov024_020c8688 kind:function(arm,size=0x2c) addr:0x020c8688 -_ZN19func_ov024_020c86b4D1Ev kind:function(arm,size=0x14) addr:0x020c86b4 -_ZN19func_ov024_020c86c8D0Ev kind:function(arm,size=0x1c) addr:0x020c86c8 -func_ov024_020c86e4 kind:function(arm,size=0x18) addr:0x020c86e4 -func_ov024_020c86fc kind:function(arm,size=0x18) addr:0x020c86fc -func_ov024_020c8714 kind:function(arm,size=0x18) addr:0x020c8714 -func_ov024_020c872c kind:function(arm,size=0x2c) addr:0x020c872c -func_ov024_020c8758 kind:function(arm,size=0x2c) addr:0x020c8758 -func_ov024_020c8784 kind:function(arm,size=0x14) addr:0x020c8784 -func_ov024_020c8798 kind:function(arm,size=0x20) addr:0x020c8798 -func_ov024_020c87b8 kind:function(arm,size=0x24) addr:0x020c87b8 -func_ov024_020c87dc kind:function(arm,size=0x1e0) addr:0x020c87dc -func_ov024_020c89bc kind:function(arm,size=0xa8) addr:0x020c89bc -func_ov024_020c8a64 kind:function(arm,size=0x68) addr:0x020c8a64 -func_ov024_020c8acc kind:function(arm,size=0x84) addr:0x020c8acc -func_ov024_020c8b50 kind:function(arm,size=0x54) addr:0x020c8b50 -func_ov024_020c8ba4 kind:function(arm,size=0x3c) addr:0x020c8ba4 -func_ov024_020c8be0 kind:function(arm,size=0x24) addr:0x020c8be0 -func_ov024_020c8c04 kind:function(arm,size=0xf0) addr:0x020c8c04 -func_ov024_020c8cf4 kind:function(arm,size=0xb8) addr:0x020c8cf4 -func_ov024_020c8dac kind:function(arm,size=0x74) addr:0x020c8dac -func_ov024_020c8e20 kind:function(arm,size=0x154) addr:0x020c8e20 -func_ov024_020c8f74 kind:function(arm,size=0x2c) addr:0x020c8f74 -func_ov024_020c8fa0 kind:function(arm,size=0x30) addr:0x020c8fa0 -func_ov024_020c8fd0 kind:function(arm,size=0x30) addr:0x020c8fd0 -func_ov024_020c9000 kind:function(arm,size=0x10) addr:0x020c9000 -func_ov024_020c9010 kind:function(arm,size=0x10) addr:0x020c9010 -func_ov024_020c9020 kind:function(arm,size=0x10) addr:0x020c9020 -func_ov024_020c9030 kind:function(arm,size=0x24) addr:0x020c9030 -func_ov024_020c9054 kind:function(arm,size=0x24) addr:0x020c9054 -func_ov024_020c9078 kind:function(arm,size=0x50) addr:0x020c9078 -func_ov024_020c90c8 kind:function(arm,size=0xc) addr:0x020c90c8 -func_ov024_020c90d4 kind:function(arm,size=0x14) addr:0x020c90d4 -func_ov024_020c90e8 kind:function(arm,size=0x14) addr:0x020c90e8 -func_ov024_020c90fc kind:function(arm,size=0x24) addr:0x020c90fc -func_ov024_020c9120 kind:function(arm,size=0x14) addr:0x020c9120 -func_ov024_020c9134 kind:function(arm,size=0x1c) addr:0x020c9134 -func_ov024_020c9150 kind:function(arm,size=0x1c) addr:0x020c9150 -func_ov024_020c916c kind:function(arm,size=0x10) addr:0x020c916c -func_ov024_020c917c kind:function(arm,size=0x14) addr:0x020c917c -func_ov024_020c9190 kind:function(arm,size=0x18) addr:0x020c9190 -func_ov024_020c91a8 kind:function(arm,size=0xa8) addr:0x020c91a8 -func_ov024_020c9250 kind:function(arm,size=0x14) addr:0x020c9250 -_ZN19func_ov024_020c9264D1Ev kind:function(arm,size=0x30) addr:0x020c9264 -_ZN19func_ov024_020c9294D0Ev kind:function(arm,size=0x38) addr:0x020c9294 -func_ov024_020c92cc kind:function(arm,size=0x9c) addr:0x020c92cc -func_ov024_020c9368 kind:function(arm,size=0x1a0) addr:0x020c9368 -func_ov024_020c9508 kind:function(arm,size=0x24) addr:0x020c9508 -func_ov024_020c952c kind:function(arm,size=0x20) addr:0x020c952c -func_ov024_020c954c kind:function(arm,size=0x50) addr:0x020c954c -func_ov024_020c959c kind:function(arm,size=0xf0) addr:0x020c959c -func_ov024_020c968c kind:function(arm,size=0x118) addr:0x020c968c -func_ov024_020c97a4 kind:function(arm,size=0x36c) addr:0x020c97a4 -func_ov024_020c9b10 kind:function(arm,size=0xf8) addr:0x020c9b10 -func_ov024_020c9c08 kind:function(arm,size=0x4) addr:0x020c9c08 -func_ov024_020c9c0c kind:function(arm,size=0x6c) addr:0x020c9c0c -func_ov024_020c9c78 kind:function(arm,size=0x2c) addr:0x020c9c78 -func_ov024_020c9ca4 kind:function(arm,size=0x30) addr:0x020c9ca4 -func_ov024_020c9cd4 kind:function(arm,size=0x40) addr:0x020c9cd4 -func_ov024_020c9d14 kind:function(arm,size=0x58) addr:0x020c9d14 -func_ov024_020c9d6c kind:function(arm,size=0x80) addr:0x020c9d6c -_ZN19func_ov024_020c9decD0Ev kind:function(arm,size=0x1c) addr:0x020c9dec -func_ov024_020c9e08 kind:function(arm,size=0x18) addr:0x020c9e08 -func_ov024_020c9e20 kind:function(arm,size=0x60) addr:0x020c9e20 -func_ov024_020c9e80 kind:function(arm,size=0x14) addr:0x020c9e80 -_ZN19func_ov024_020c9e94D1Ev kind:function(arm,size=0x20) addr:0x020c9e94 -_ZN19func_ov024_020c9eb4D0Ev kind:function(arm,size=0x28) addr:0x020c9eb4 -func_ov024_020c9edc kind:function(arm,size=0x38) addr:0x020c9edc -func_ov024_020c9f14 kind:function(arm,size=0x74) addr:0x020c9f14 -func_ov024_020c9f88 kind:function(arm,size=0xd4) addr:0x020c9f88 -func_ov024_020ca05c kind:function(arm,size=0xc) addr:0x020ca05c -func_ov024_020ca068 kind:function(arm,size=0x2c) addr:0x020ca068 -_ZN19func_ov024_020ca094D0Ev kind:function(arm,size=0x1c) addr:0x020ca094 -func_ov024_020ca0b0 kind:function(thumb,size=0x10) addr:0x020ca0b0 -func_ov024_020ca0c0 kind:function(thumb,size=0x10) addr:0x020ca0c0 -func_ov024_020ca0d0 kind:function(thumb,size=0x64) addr:0x020ca0d0 -func_ov024_020ca134 kind:function(thumb,size=0xc) addr:0x020ca134 -func_ov024_020ca140 kind:function(thumb,size=0x23c) addr:0x020ca140 -func_ov024_020ca37c kind:function(thumb,size=0x1d4) addr:0x020ca37c -_ZN19func_ov024_020ca550D0Ev kind:function(arm,size=0x1c) addr:0x020ca550 -_ZN19func_ov024_020ca56cD1Ev kind:function(arm,size=0x20) addr:0x020ca56c -_ZN19func_ov024_020ca58cD0Ev kind:function(arm,size=0x28) addr:0x020ca58c -func_ov024_020ca5b4 kind:function(thumb,size=0x2c) addr:0x020ca5b4 -func_ov024_020ca5e0 kind:function(thumb,size=0x58) addr:0x020ca5e0 -func_ov024_020ca638 kind:function(thumb,size=0x48) addr:0x020ca638 -func_ov024_020ca680 kind:function(thumb,size=0xac) addr:0x020ca680 -func_ov024_020ca72c kind:function(thumb,size=0x6c) addr:0x020ca72c -func_ov024_020ca798 kind:function(thumb,size=0x40) addr:0x020ca798 -func_ov024_020ca7d8 kind:function(thumb,size=0xc0) addr:0x020ca7d8 -func_ov024_020ca898 kind:function(thumb,size=0x2) addr:0x020ca898 -_ZN19func_ov024_020ca89cD1Ev kind:function(arm,size=0x20) addr:0x020ca89c -_ZN19func_ov024_020ca8bcD0Ev kind:function(arm,size=0x28) addr:0x020ca8bc -func_ov024_020ca8e4 kind:function(thumb,size=0x14) addr:0x020ca8e4 -func_ov024_020ca8f8 kind:function(thumb,size=0x2c) addr:0x020ca8f8 -func_ov024_020ca924 kind:function(thumb,size=0x1c) addr:0x020ca924 -func_ov024_020ca940 kind:function(thumb,size=0x2c) addr:0x020ca940 -func_ov024_020ca96c kind:function(thumb,size=0x1c) addr:0x020ca96c -_ZN19func_ov024_020ca988D1Ev kind:function(arm,size=0x20) addr:0x020ca988 -_ZN19func_ov024_020ca9a8D0Ev kind:function(arm,size=0x28) addr:0x020ca9a8 -func_ov024_020ca9d0 kind:function(thumb,size=0x2c) addr:0x020ca9d0 -func_ov024_020ca9fc kind:function(thumb,size=0x24) addr:0x020ca9fc -func_ov024_020caa20 kind:function(thumb,size=0x24) addr:0x020caa20 -_ZN19func_ov024_020caa44D1Ev kind:function(arm,size=0x20) addr:0x020caa44 -_ZN19func_ov024_020caa64D0Ev kind:function(arm,size=0x28) addr:0x020caa64 -func_ov024_020caa8c kind:function(thumb,size=0x10) addr:0x020caa8c -func_ov024_020caa9c kind:function(thumb,size=0x50) addr:0x020caa9c -func_ov024_020caaec kind:function(thumb,size=0xc) addr:0x020caaec -func_ov024_020caaf8 kind:function(thumb,size=0x14) addr:0x020caaf8 -func_ov024_020cab0c kind:function(thumb,size=0x1a) addr:0x020cab0c -func_ov024_020cab28 kind:function(thumb,size=0x64) addr:0x020cab28 -func_ov024_020cab8c kind:function(thumb,size=0x90) addr:0x020cab8c -func_ov024_020cac1c kind:function(thumb,size=0x64) addr:0x020cac1c -func_ov024_020cac80 kind:function(thumb,size=0x24) addr:0x020cac80 -func_ov024_020caca4 kind:function(thumb,size=0x30) addr:0x020caca4 -func_ov024_020cacd4 kind:function(thumb,size=0x78) addr:0x020cacd4 -func_ov024_020cad4c kind:function(thumb,size=0x7c) addr:0x020cad4c -func_ov024_020cadc8 kind:function(thumb,size=0x2) addr:0x020cadc8 -func_ov024_020cadcc kind:function(thumb,size=0x48) addr:0x020cadcc -func_ov024_020cae14 kind:function(thumb,size=0x48) addr:0x020cae14 -_ZN19func_ov024_020cae5cD0Ev kind:function(arm,size=0x1c) addr:0x020cae5c -func_ov024_020cae78 kind:function(thumb,size=0x30) addr:0x020cae78 -func_ov024_020caea8 kind:function(thumb,size=0xc) addr:0x020caea8 -func_ov024_020caeb4 kind:function(thumb,size=0x12) addr:0x020caeb4 -func_ov024_020caec8 kind:function(thumb,size=0x20) addr:0x020caec8 -func_ov024_020caee8 kind:function(thumb,size=0xf8) addr:0x020caee8 -func_ov024_020cafe0 kind:function(thumb,size=0x8) addr:0x020cafe0 -func_ov024_020cafe8 kind:function(thumb,size=0x2) addr:0x020cafe8 -func_ov024_020cafec kind:function(thumb,size=0x94) addr:0x020cafec -func_ov024_020cb080 kind:function(thumb,size=0x7c) addr:0x020cb080 -func_ov024_020cb0fc kind:function(thumb,size=0x60) addr:0x020cb0fc -func_ov024_020cb15c kind:function(thumb,size=0x5c) addr:0x020cb15c -func_ov024_020cb1b8 kind:function(thumb,size=0x8) addr:0x020cb1b8 -func_ov024_020cb1c0 kind:function(thumb,size=0x14) addr:0x020cb1c0 -func_ov024_020cb1d4 kind:function(thumb,size=0x10) addr:0x020cb1d4 -func_ov024_020cb1e4 kind:function(thumb,size=0x10) addr:0x020cb1e4 -func_ov024_020cb1f4 kind:function(thumb,size=0x68) addr:0x020cb1f4 -func_ov024_020cb25c kind:function(thumb,size=0xc) addr:0x020cb25c -func_ov024_020cb268 kind:function(thumb,size=0x14) addr:0x020cb268 -func_ov024_020cb27c kind:function(thumb,size=0x1a) addr:0x020cb27c -func_ov024_020cb298 kind:function(thumb,size=0x32) addr:0x020cb298 -func_ov024_020cb2cc kind:function(thumb,size=0xf0) addr:0x020cb2cc -func_ov024_020cb3bc kind:function(thumb,size=0x100) addr:0x020cb3bc -func_ov024_020cb4bc kind:function(thumb,size=0xb4) addr:0x020cb4bc -func_ov024_020cb570 kind:function(thumb,size=0x10) addr:0x020cb570 -func_ov024_020cb580 kind:function(thumb,size=0xac) addr:0x020cb580 -func_ov024_020cb62c kind:function(thumb,size=0x88) addr:0x020cb62c -func_ov024_020cb6b4 kind:function(thumb,size=0x1c4) addr:0x020cb6b4 -func_ov024_020cb878 kind:function(thumb,size=0xa) addr:0x020cb878 -func_ov024_020cb884 kind:function(thumb,size=0x34) addr:0x020cb884 -func_ov024_020cb8b8 kind:function(thumb,size=0xc) addr:0x020cb8b8 -func_ov024_020cb8c4 kind:function(thumb,size=0x6) addr:0x020cb8c4 -_ZN19func_ov024_020cb8ccD0Ev kind:function(arm,size=0x1c) addr:0x020cb8cc -func_ov024_020cb8e8 kind:function(thumb,size=0x10) addr:0x020cb8e8 -func_ov024_020cb8f8 kind:function(thumb,size=0xc) addr:0x020cb8f8 -func_ov024_020cb904 kind:function(thumb,size=0x54) addr:0x020cb904 -func_ov024_020cb958 kind:function(thumb,size=0xc) addr:0x020cb958 -func_ov024_020cb964 kind:function(thumb,size=0xc) addr:0x020cb964 -func_ov024_020cb970 kind:function(thumb,size=0xc) addr:0x020cb970 -func_ov024_020cb97c kind:function(thumb,size=0x20) addr:0x020cb97c -func_ov024_020cb99c kind:function(thumb,size=0x3c) addr:0x020cb99c -func_ov024_020cb9d8 kind:function(thumb,size=0xc) addr:0x020cb9d8 -func_ov024_020cb9e4 kind:function(thumb,size=0x20) addr:0x020cb9e4 -func_ov024_020cba04 kind:function(thumb,size=0x68) addr:0x020cba04 -func_ov024_020cba6c kind:function(thumb,size=0x30) addr:0x020cba6c -func_ov024_020cba9c kind:function(thumb,size=0x34) addr:0x020cba9c -func_ov024_020cbad0 kind:function(thumb,size=0x10) addr:0x020cbad0 -_ZN19func_ov024_020cbae0D0Ev kind:function(arm,size=0x1c) addr:0x020cbae0 -_ZN19func_ov024_020cbafcD0Ev kind:function(arm,size=0x1c) addr:0x020cbafc -_ZN19func_ov024_020cbb18D1Ev kind:function(arm,size=0x28) addr:0x020cbb18 -_ZN19func_ov024_020cbb40D0Ev kind:function(arm,size=0x30) addr:0x020cbb40 -func_ov024_020cbb70 kind:function(arm,size=0x16c) addr:0x020cbb70 -func_ov024_020cbcdc kind:function(arm,size=0x13c) addr:0x020cbcdc -func_ov024_020cbe18 kind:function(arm,size=0x90) addr:0x020cbe18 -func_ov024_020cbea8 kind:function(arm,size=0x50) addr:0x020cbea8 -func_ov024_020cbef8 kind:function(arm,size=0x2d0) addr:0x020cbef8 -_ZN19func_ov024_020cc1c8D1Ev kind:function(arm,size=0x6c) addr:0x020cc1c8 -_ZN19func_ov024_020cc234D0Ev kind:function(arm,size=0x74) addr:0x020cc234 -func_ov024_020cc2a8 kind:function(arm,size=0xa4) addr:0x020cc2a8 -func_ov024_020cc34c kind:function(arm,size=0x5c) addr:0x020cc34c -func_ov024_020cc3a8 kind:function(arm,size=0x4c) addr:0x020cc3a8 -func_ov024_020cc3f4 kind:function(arm,size=0x1d8) addr:0x020cc3f4 -func_ov024_020cc5cc kind:function(arm,size=0x24) addr:0x020cc5cc -func_ov024_020cc5f0 kind:function(arm,size=0x2c) addr:0x020cc5f0 -func_ov024_020cc61c kind:function(arm,size=0xec) addr:0x020cc61c -func_ov024_020cc708 kind:function(arm,size=0x7c) addr:0x020cc708 -_ZN19func_ov024_020cc784D0Ev kind:function(arm,size=0x84) addr:0x020cc784 -func_ov024_020cc808 kind:function(arm,size=0x20) addr:0x020cc808 -func_ov024_020cc828 kind:function(arm,size=0x28) addr:0x020cc828 -func_ov024_020cc850 kind:function(arm,size=0x20) addr:0x020cc850 -func_ov024_020cc870 kind:function(arm,size=0x20) addr:0x020cc870 -func_ov024_020cc890 kind:function(arm,size=0x14) addr:0x020cc890 -func_ov024_020cc8a4 kind:function(arm,size=0x58) addr:0x020cc8a4 -func_ov024_020cc8fc kind:function(arm,size=0x18) addr:0x020cc8fc -func_ov024_020cc914 kind:function(arm,size=0x30) addr:0x020cc914 -func_ov024_020cc944 kind:function(arm,size=0x3c) addr:0x020cc944 -func_ov024_020cc980 kind:function(arm,size=0x48) addr:0x020cc980 -func_ov024_020cc9c8 kind:function(arm,size=0x1c) addr:0x020cc9c8 -func_ov024_020cc9e4 kind:function(arm,size=0x38) addr:0x020cc9e4 -func_ov024_020cca1c kind:function(arm,size=0x10) addr:0x020cca1c -func_ov024_020cca2c kind:function(arm,size=0x14) addr:0x020cca2c -func_ov024_020cca40 kind:function(arm,size=0x84) addr:0x020cca40 -func_ov024_020ccac4 kind:function(arm,size=0xc) addr:0x020ccac4 -func_ov024_020ccad0 kind:function(arm,size=0x4) addr:0x020ccad0 -func_ov024_020ccad4 kind:function(arm,size=0x20c) addr:0x020ccad4 -func_ov024_020ccce0 kind:function(arm,size=0x11c) addr:0x020ccce0 -func_ov024_020ccdfc kind:function(arm,size=0x8) addr:0x020ccdfc -func_ov024_020cce04 kind:function(arm,size=0x4) addr:0x020cce04 -func_ov024_020cce08 kind:function(arm,size=0x4) addr:0x020cce08 -func_ov024_020cce0c kind:function(arm,size=0x3c) addr:0x020cce0c -func_ov024_020cce48 kind:function(arm,size=0x4) addr:0x020cce48 -func_ov024_020cce4c kind:function(arm,size=0x58) addr:0x020cce4c -func_ov024_020ccea4 kind:function(arm,size=0x25c) addr:0x020ccea4 -func_ov024_020cd100 kind:function(arm,size=0x14) addr:0x020cd100 -func_ov024_020cd114 kind:function(arm,size=0x8) addr:0x020cd114 -func_ov024_020cd11c kind:function(arm,size=0x38) addr:0x020cd11c -func_ov024_020cd154 kind:function(arm,size=0x114) addr:0x020cd154 -func_ov024_020cd268 kind:function(arm,size=0x80) addr:0x020cd268 -func_ov024_020cd2e8 kind:function(arm,size=0x338) addr:0x020cd2e8 -func_ov024_020cd620 kind:function(arm,size=0xc4) addr:0x020cd620 -func_ov024_020cd6e4 kind:function(arm,size=0x24) addr:0x020cd6e4 -func_ov024_020cd708 kind:function(arm,size=0xbc) addr:0x020cd708 -func_ov024_020cd7c4 kind:function(arm,size=0x24) addr:0x020cd7c4 -func_ov024_020cd7e8 kind:function(arm,size=0xc4) addr:0x020cd7e8 -func_ov024_020cd8ac kind:function(arm,size=0x2c) addr:0x020cd8ac -func_ov024_020cd8d8 kind:function(arm,size=0x2c) addr:0x020cd8d8 -func_ov024_020cd904 kind:function(arm,size=0x8c) addr:0x020cd904 -func_ov024_020cd990 kind:function(arm,size=0x14) addr:0x020cd990 -func_ov024_020cd9a4 kind:function(arm,size=0x30) addr:0x020cd9a4 -func_ov024_020cd9d4 kind:function(arm,size=0xa8) addr:0x020cd9d4 -func_ov024_020cda7c kind:function(arm,size=0x22c) addr:0x020cda7c -func_ov024_020cdca8 kind:function(arm,size=0x28) addr:0x020cdca8 -func_ov024_020cdcd0 kind:function(arm,size=0x54) addr:0x020cdcd0 -func_ov024_020cdd24 kind:function(arm,size=0x1e0) addr:0x020cdd24 -func_ov024_020cdf04 kind:function(arm,size=0x88) addr:0x020cdf04 -func_ov024_020cdf8c kind:function(arm,size=0x30) addr:0x020cdf8c -func_ov024_020cdfbc kind:function(arm,size=0x20) addr:0x020cdfbc -func_ov024_020cdfdc kind:function(arm,size=0x364) addr:0x020cdfdc -func_ov024_020ce340 kind:function(arm,size=0x20) addr:0x020ce340 -func_ov024_020ce360 kind:function(arm,size=0x17c) addr:0x020ce360 -func_ov024_020ce4dc kind:function(arm,size=0x8) addr:0x020ce4dc -func_ov024_020ce4e4 kind:function(arm,size=0x88) addr:0x020ce4e4 +_ZN17GameModeAdventureD1Ev kind:function(thumb,size=0x44) addr:0x020c6060 +_ZN17GameModeAdventureD0Ev kind:function(thumb,size=0x48) addr:0x020c60a4 +_ZN17GameModeAdventure8vfunc_08Ev kind:function(thumb,size=0x58) addr:0x020c60ec +_ZN17GameModeAdventure8vfunc_0CEv kind:function(arm,size=0x3c) addr:0x020c6144 +_ZN17GameModeAdventure8vfunc_10Ev kind:function(arm,size=0x24) addr:0x020c6180 +_ZN17GameModeAdventure8vfunc_14Ev kind:function(arm,size=0x20) addr:0x020c61a4 +_ZN17GameModeAdventure8vfunc_18Ev kind:function(arm,size=0x50) addr:0x020c61c4 +_ZN17GameModeAdventure8vfunc_1CEv kind:function(arm,size=0x24) addr:0x020c6214 +_ZN17GameModeAdventure8vfunc_20Ev kind:function(arm,size=0x68) addr:0x020c6238 +_ZN18UnkStruct_027e09a47DestroyEv kind:function(arm,size=0x2c) addr:0x020c62a0 +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4a8cEP15UnkActorSystem1 kind:function(arm,size=0x34) addr:0x020c62cc +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4ac0Ev kind:function(arm,size=0x50) addr:0x020c6300 +_ZN24UnkStruct_ov024_020d8660D1Ev kind:function(arm,size=0x14) addr:0x020c6350 +_ZN24UnkStruct_ov024_020d8660C1Ev kind:function(arm,size=0x28) addr:0x020c6364 +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4b4cEi kind:function(arm,size=0x54) addr:0x020c638c +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4ba0Ev kind:function(arm,size=0x128) addr:0x020c63e0 +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4cc8Ev kind:function(arm,size=0xe0) addr:0x020c6508 +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4d74Ev kind:function(arm,size=0x14) addr:0x020c65e8 +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4d88Eji kind:function(arm,size=0x24) addr:0x020c65fc +_ZN24UnkStruct_ov024_020d866019func_ov024_020c4dacEjiP21UnkActorSystem_Infos1 kind:function(arm,size=0x30) addr:0x020c6620 +_ZN8InstanceI24UnkStruct_ov024_020d8660EC2Ev kind:function(arm,size=0x10) addr:0x020c6650 +_ZN8InstanceI24UnkStruct_ov024_020d8660ED2Ev kind:function(arm,size=0x14) addr:0x020c6660 +_ZN15UnkActorSystem1C1Ev kind:function(arm,size=0x18) addr:0x020c6674 +_ZN15UnkActorSystem1D1Ev kind:function(arm,size=0x4) addr:0x020c668c +_ZN15UnkActorSystem1D0Ev kind:function(arm,size=0x14) addr:0x020c6690 +_ZN15UnkActorSystem1D2Ev kind:function(arm,size=0x4) addr:0x020c66a4 +_ZN15UnkActorSystem18vfunc_08Ev kind:function(arm,size=0xc) addr:0x020c66a8 +_ZN15UnkActorSystem18vfunc_0CEv kind:function(arm,size=0xc) addr:0x020c66b4 +_ZN15UnkActorSystem18vfunc_10Ei kind:function(arm,size=0x4) addr:0x020c66c0 +_ZN15UnkActorSystem18vfunc_14Ei kind:function(arm,size=0x4) addr:0x020c66c4 +_ZN15UnkActorSystem18vfunc_18EPc kind:function(arm,size=0x4) addr:0x020c66c8 +_ZN15UnkActorSystem18vfunc_1CEi kind:function(arm,size=0x4) addr:0x020c66cc +_ZN15UnkActorSystem18vfunc_20Ei kind:function(arm,size=0x4) addr:0x020c66d0 +_ZN15UnkActorSystem18vfunc_2CEv kind:function(arm,size=0x8) addr:0x020c66d4 +_ZN15UnkActorSystem2C1Eb kind:function(arm,size=0x58) addr:0x020c66dc +_ZN15UnkActorSystem219func_ov024_020c4ec0Ev kind:function(arm,size=0x18) addr:0x020c6734 +_ZN15UnkActorSystem219func_ov024_020c4ed8Ev kind:function(arm,size=0x18) addr:0x020c674c +_ZN15UnkActorSystem219func_ov024_020c4ef0Ev kind:function(arm,size=0x18) addr:0x020c6764 +_ZN15UnkActorSystem219func_ov024_020c4f08Ev kind:function(arm,size=0x10) addr:0x020c677c +_ZN15UnkActorSystem219func_ov024_020c4f18Ev kind:function(arm,size=0x10) addr:0x020c678c +_ZN15UnkActorSystem219func_ov024_020c4f28Ev kind:function(arm,size=0x24) addr:0x020c679c +_ZN15UnkActorSystem219func_ov024_020c4f4cEv kind:function(arm,size=0x10) addr:0x020c67c0 +_ZN15UnkActorSystem219func_ov024_020c4f5cEv kind:function(arm,size=0x10) addr:0x020c67d0 +_ZN15UnkActorSystem219func_ov024_020c4f6cEv kind:function(arm,size=0x10) addr:0x020c67e0 +_ZN15UnkActorSystem219func_ov024_020c4f7cEv kind:function(arm,size=0x8) addr:0x020c67f0 +_ZN15UnkActorSystem28vfunc_08EP5InputP12TouchControl kind:function(arm,size=0x8c) addr:0x020c67f8 +_ZN15UnkActorSystem28vfunc_10EPc kind:function(arm,size=0xfc) addr:0x020c6884 +_ZN15UnkActorSystem219func_ov024_020c510cEv kind:function(arm,size=0x14) addr:0x020c6980 +_ZN15UnkActorSystem219func_ov024_020c5120Eb kind:function(arm,size=0x8) addr:0x020c6994 +_ZN15UnkActorSystem2D1Ev kind:function(arm,size=0x14) addr:0x020c699c +_ZN15UnkActorSystem2D0Ev kind:function(arm,size=0x1c) addr:0x020c69b0 +_ZN20AdventureModeManagerD1Ev kind:function(arm,size=0x94) addr:0x020c69cc +_ZN20AdventureModeManagerD0Ev kind:function(arm,size=0x9c) addr:0x020c6a60 +_ZN20AdventureModeManager19func_ov024_020c5288Ev kind:function(arm,size=0x18) addr:0x020c6afc +_ZN20AdventureModeManager19func_ov024_020c52a0Ev kind:function(arm,size=0x18) addr:0x020c6b14 +_ZN20AdventureModeManager19func_ov024_020c52b8Ev kind:function(arm,size=0x3c) addr:0x020c6b2c +_ZN20AdventureModeManager19func_ov024_020c52f4Ev kind:function(arm,size=0x18) addr:0x020c6b68 +_ZN20AdventureModeManager19func_ov024_020c530cEv kind:function(arm,size=0x58) addr:0x020c6b80 +_ZN20AdventureModeManager19func_ov024_020c5364Ev kind:function(arm,size=0x18) addr:0x020c6bd8 +_ZN20AdventureModeManager19func_ov024_020c537cEv kind:function(arm,size=0x6c) addr:0x020c6bf0 +_ZN20AdventureModeManager19func_ov024_020c53e8Ev kind:function(arm,size=0x174) addr:0x020c6c5c +_ZN20AdventureModeManager19func_ov024_020c555cEi kind:function(arm,size=0x8) addr:0x020c6dd0 +_ZN20AdventureModeManager8vfunc_24Ev kind:function(arm,size=0x734) addr:0x020c6dd8 +_ZN20AdventureModeManager19func_ov024_020c5cecEv kind:function(arm,size=0xc0) addr:0x020c750c +_ZN20AdventureModeManager19func_ov024_020c5dacEv kind:function(arm,size=0x120) addr:0x020c75cc +_ZN20AdventureModeManager19func_ov024_020c5eccEv kind:function(arm,size=0xa4) addr:0x020c76ec +_ZN20AdventureModeManager19func_ov024_020c5f70Ev kind:function(arm,size=0x184) addr:0x020c7790 +_ZN20AdventureModeManager19func_ov024_020c60f4Ev kind:function(arm,size=0x148) addr:0x020c7914 +_ZN20AdventureModeManager19func_ov024_020c623cEv kind:function(arm,size=0x8c) addr:0x020c7a5c +_ZN20AdventureModeManager8vfunc_28EPc kind:function(arm,size=0x60) addr:0x020c7ae8 +_ZN20AdventureModeManager8vfunc_2CEPc kind:function(arm,size=0x138) addr:0x020c7b48 +_ZN20AdventureModeManager8vfunc_34Eii kind:function(arm,size=0xa0) addr:0x020c7c80 +_ZN20AdventureModeManager8vfunc_38Ejhss kind:function(arm,size=0x14) addr:0x020c7d20 +_ZN20AdventureModeManager19func_ov024_020c6514Ejhss kind:function(arm,size=0x160) addr:0x020c7d34 +_ZN20AdventureModeManager16GetMapPaintIndexEjh kind:function(arm,size=0x4c) addr:0x020c7e94 +_ZN20AdventureModeManager19func_ov024_020c66c0Ev kind:function(arm,size=0x5c) addr:0x020c7ee0 +_ZN20AdventureModeManager19func_ov024_020c671cEv kind:function(arm,size=0x54) addr:0x020c7f3c +_ZN20AdventureModeManager19func_ov024_020c6770Ejhss kind:function(arm,size=0xac) addr:0x020c7f90 +_ZN20AdventureModeManager19func_ov024_020c681cEv kind:function(arm,size=0x24) addr:0x020c803c +_ZN20AdventureModeManager19func_ov024_020c6840Ej kind:function(arm,size=0x94) addr:0x020c8060 +_ZN20AdventureModeManager19func_ov024_020c68d4Ev kind:function(arm,size=0x18) addr:0x020c80f4 +_ZN20AdventureModeManager19func_ov024_020c68ecEii kind:function(arm,size=0x44) addr:0x020c810c +_ZN20AdventureModeManager19func_ov024_020c6930Ev kind:function(arm,size=0x10) addr:0x020c8150 +_ZN20AdventureModeManager19func_ov024_020c6940Eii kind:function(arm,size=0x8c) addr:0x020c8160 +_ZN20AdventureModeManager19func_ov024_020c699cEv kind:function(arm,size=0x34) addr:0x020c81ec +_ZN20AdventureModeManager19func_ov024_020c69d0Ev kind:function(arm,size=0x50) addr:0x020c8220 +_ZN20AdventureModeManager19func_ov024_020c6a20Ev kind:function(arm,size=0x28) addr:0x020c8270 +_ZN20AdventureModeManager19func_ov024_020c6a48Eii kind:function(arm,size=0xac) addr:0x020c8298 +_ZN20AdventureModeManager19func_ov024_020c6af4Ei kind:function(arm,size=0x98) addr:0x020c8344 +_ZN20AdventureModeManager19func_ov024_020c6b8cEv kind:function(arm,size=0xd4) addr:0x020c83dc +_ZN20AdventureModeManager19func_ov024_020c6c60Ev kind:function(arm,size=0x74) addr:0x020c84b0 +_ZN20AdventureModeManager19func_ov024_020c6cd4Ev kind:function(arm,size=0x10) addr:0x020c8524 +_ZN20AdventureModeManager19func_ov024_020c6ce4Ev kind:function(arm,size=0x20) addr:0x020c8534 +_ZN20AdventureModeManager19func_ov024_020c6d04Ev kind:function(arm,size=0xc) addr:0x020c8554 +_ZN20AdventureModeManager19func_ov024_020c6d10Ev kind:function(arm,size=0x10) addr:0x020c8560 +_ZN20AdventureModeManager19func_ov024_020c6d20Ei kind:function(arm,size=0xc) addr:0x020c8570 +_ZN20AdventureModeManager19func_ov024_020c6d2cEi kind:function(arm,size=0x38) addr:0x020c857c +_ZN20AdventureModeManager19func_ov024_020c6d64Ev kind:function(arm,size=0x54) addr:0x020c85b4 +_ZN20AdventureModeManager19func_ov024_020c6db8Ei kind:function(arm,size=0x34) addr:0x020c8608 +_ZN20AdventureModeManager19func_ov024_020c6decEv kind:function(arm,size=0x4c) addr:0x020c863c +_ZN24AdventureModeManager_1ACC1Ev kind:function(arm,size=0x2c) addr:0x020c8688 +_ZN24AdventureModeManager_1ACD1Ev kind:function(arm,size=0x14) addr:0x020c86b4 +_ZN24AdventureModeManager_1ACD0Ev kind:function(arm,size=0x1c) addr:0x020c86c8 +_ZN24AdventureModeManager_1AC8vfunc_08EP5InputP12TouchControl kind:function(arm,size=0x18) addr:0x020c86e4 +_ZN24AdventureModeManager_1AC8vfunc_10EPc kind:function(arm,size=0x18) addr:0x020c86fc +_ZN24AdventureModeManager_1AC8vfunc_14EPc kind:function(arm,size=0x18) addr:0x020c8714 +_ZN24UnkStruct_ov024_020d86a07DestroyEv kind:function(arm,size=0x2c) addr:0x020c872c +_ZN18UnkStruct_027e09987DestroyEv kind:function(arm,size=0x2c) addr:0x020c8758 +_ZN18UnkStruct_027e0998D1Ev kind:function(arm,size=0x14) addr:0x020c8784 +_ZN18UnkStruct_027e0998C1Ev kind:function(arm,size=0x20) addr:0x020c8798 +_ZN18UnkStruct_027e09986CreateEv kind:function(arm,size=0x24) addr:0x020c87b8 +_ZN18UnkStruct_027e09988vfunc_00EP5Vec3pP5Vec2sPt kind:function(arm,size=0x1e0) addr:0x020c87dc +_ZN18UnkStruct_027e099819func_ov024_020c716cEv kind:function(arm,size=0xa8) addr:0x020c89bc +_ZN18UnkStruct_027e099819func_ov024_020c7214EP5Vec3pP5Vec2sPt kind:function(arm,size=0x68) addr:0x020c8a64 +_ZN18UnkStruct_027e099819func_ov024_020c727cEP5Vec2sPt kind:function(arm,size=0x84) addr:0x020c8acc +_ZN18UnkStruct_027e099819func_ov024_020c7300Ei kind:function(arm,size=0x54) addr:0x020c8b50 +_ZN18UnkStruct_027e099819func_ov024_020c7354Ev kind:function(arm,size=0x3c) addr:0x020c8ba4 +_ZN18UnkStruct_027e0cf86CreateEv kind:function(arm,size=0x24) addr:0x020c8be0 +_ZN18UnkStruct_027e0cf8C1Ev kind:function(arm,size=0xf0) addr:0x020c8c04 +_ZN18UnkStruct_027e0cf8D1Ev kind:function(arm,size=0xb8) addr:0x020c8cf4 +_ZN18UnkStruct_027e0cf819func_ov024_020c755cEPv kind:function(arm,size=0x74) addr:0x020c8dac +_ZN18UnkStruct_027e0cf819func_ov024_020c75d0EPvit kind:function(arm,size=0x154) addr:0x020c8e20 +_ZN18UnkStruct_027e0cf819func_ov024_020c7724Ev kind:function(arm,size=0x2c) addr:0x020c8f74 +_ZN18UnkStruct_027e0cf819func_ov024_020c7750Ev kind:function(arm,size=0x30) addr:0x020c8fa0 +_ZN18UnkStruct_027e0cf819func_ov024_020c7780Ev kind:function(arm,size=0x30) addr:0x020c8fd0 +_ZN18UnkStruct_027e0cf819func_ov024_020c77b0Ei kind:function(arm,size=0x10) addr:0x020c9000 +_ZN18UnkStruct_027e0cf819func_ov024_020c77c0Ev kind:function(arm,size=0x10) addr:0x020c9010 +_ZN18UnkStruct_027e0cf819func_ov024_020c77d0Ev kind:function(arm,size=0x10) addr:0x020c9020 +_ZN18UnkStruct_027e0cf819func_ov024_020c77e0EP5Vec2s kind:function(arm,size=0x24) addr:0x020c9030 +_ZN18UnkStruct_027e0cf819func_ov024_020c7804EP5Vec2s kind:function(arm,size=0x24) addr:0x020c9054 +_ZN18UnkStruct_027e0cf819func_ov024_020c7828Ei kind:function(arm,size=0x50) addr:0x020c9078 +_ZN18UnkStruct_027e0cf819func_ov024_020c7878Eit kind:function(arm,size=0xc) addr:0x020c90c8 +_ZN18UnkStruct_027e0cf819func_ov024_020c7884Ev kind:function(arm,size=0x14) addr:0x020c90d4 +_ZN18UnkStruct_027e0cf819func_ov024_020c7898Ev kind:function(arm,size=0x14) addr:0x020c90e8 +_ZN18UnkStruct_027e0cf819func_ov024_020c78acEPiPs kind:function(arm,size=0x24) addr:0x020c90fc +_ZN18UnkStruct_027e0cf819func_ov024_020c78d0Ev kind:function(arm,size=0x14) addr:0x020c9120 +_ZN18UnkStruct_027e0cf819func_ov024_020c78e4Ei kind:function(arm,size=0x1c) addr:0x020c9134 +_ZN18UnkStruct_027e0cf819func_ov024_020c7900Ei kind:function(arm,size=0x1c) addr:0x020c9150 +_ZN8InstanceI18UnkStruct_027e0cf8EC2Ev kind:function(arm,size=0x10) addr:0x020c916c +_ZN8InstanceI18UnkStruct_027e0cf8ED2Ev kind:function(arm,size=0x14) addr:0x020c917c +_ZN27AdventureModeManager_160_4C8vfunc_0CEv kind:function(arm,size=0x18) addr:0x020c9190 +_ZN24AdventureModeManager_160C1EP23GameModeManagerBase_104P24AdventureModeManager_1B8 kind:function(arm,size=0xa8) addr:0x020c91a8 +_ZN27AdventureModeManager_160_4CD1Ev kind:function(arm,size=0x14) addr:0x020c9250 +_ZN24AdventureModeManager_160D1Ev kind:function(arm,size=0x30) addr:0x020c9264 +_ZN24AdventureModeManager_160D0Ev kind:function(arm,size=0x38) addr:0x020c9294 +_ZN24AdventureModeManager_1608vfunc_08Ei kind:function(arm,size=0x9c) addr:0x020c92cc +_ZN24AdventureModeManager_1608vfunc_0CEi kind:function(arm,size=0x1a0) addr:0x020c9368 +_ZN24AdventureModeManager_1608vfunc_10Eii kind:function(arm,size=0x24) addr:0x020c9508 +_ZN24AdventureModeManager_1608vfunc_14Ei kind:function(arm,size=0x20) addr:0x020c952c +_ZN24AdventureModeManager_16019func_ov024_020c7cfcEv kind:function(arm,size=0x50) addr:0x020c954c +_ZN24AdventureModeManager_16019func_ov024_020c7d4cEi kind:function(arm,size=0xf0) addr:0x020c959c +_ZN24AdventureModeManager_1608vfunc_18Ei kind:function(arm,size=0x118) addr:0x020c968c +_ZN24AdventureModeManager_1608vfunc_1CEi kind:function(arm,size=0x36c) addr:0x020c97a4 +_ZN24AdventureModeManager_1608vfunc_20Eii kind:function(arm,size=0xf8) addr:0x020c9b10 +_ZN24AdventureModeManager_1608vfunc_24Ev kind:function(arm,size=0x4) addr:0x020c9c08 +_ZN24AdventureModeManager_16019func_ov024_020c83bcEv kind:function(arm,size=0x6c) addr:0x020c9c0c +_ZN24AdventureModeManager_16019func_ov024_020c8428Ev kind:function(arm,size=0x2c) addr:0x020c9c78 +_ZN24AdventureModeManager_16019func_ov024_020c8454Ev kind:function(arm,size=0x30) addr:0x020c9ca4 +_ZN24AdventureModeManager_16019func_ov024_020c8484Ev kind:function(arm,size=0x40) addr:0x020c9cd4 +_ZN24AdventureModeManager_16019func_ov024_020c84c4Ev kind:function(arm,size=0x58) addr:0x020c9d14 +_ZN24AdventureModeManager_16019func_ov024_020c851cEi kind:function(arm,size=0x80) addr:0x020c9d6c +_ZN27AdventureModeManager_160_4CD0Ev kind:function(arm,size=0x1c) addr:0x020c9dec +_ZN27AdventureModeManager_170_148vfunc_0CEv kind:function(arm,size=0x18) addr:0x020c9e08 +_ZN24AdventureModeManager_170C1EP23GameModeManagerBase_104 kind:function(arm,size=0x60) addr:0x020c9e20 +_ZN27AdventureModeManager_170_14D1Ev kind:function(arm,size=0x14) addr:0x020c9e80 +_ZN24AdventureModeManager_170D1Ev kind:function(arm,size=0x20) addr:0x020c9e94 +_ZN24AdventureModeManager_170D0Ev kind:function(arm,size=0x28) addr:0x020c9eb4 +_ZN24AdventureModeManager_1708vfunc_08Ei kind:function(arm,size=0x38) addr:0x020c9edc +_ZN24AdventureModeManager_1708vfunc_0CEi kind:function(arm,size=0x74) addr:0x020c9f14 +_ZN24AdventureModeManager_1708vfunc_10Eii kind:function(arm,size=0xd4) addr:0x020c9f88 +_ZN24AdventureModeManager_1708vfunc_18Ei kind:function(arm,size=0xc) addr:0x020ca05c +_ZN24AdventureModeManager_1708vfunc_24Ev kind:function(arm,size=0x2c) addr:0x020ca068 +_ZN27AdventureModeManager_170_14D0Ev kind:function(arm,size=0x1c) addr:0x020ca094 +_ZN32AdventureModeManager_174_Base_108vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020ca0b0 +_ZN32AdventureModeManager_174_Base_108vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020ca0c0 +_ZN29AdventureModeManager_174_BaseC2EP23GameModeManagerBase_104 kind:function(thumb,size=0x64) addr:0x020ca0d0 +_ZN32AdventureModeManager_174_Base_10D1Ev kind:function(thumb,size=0xc) addr:0x020ca134 +_ZN29AdventureModeManager_174_Base19func_ov024_020c88f0Ev kind:function(thumb,size=0x23c) addr:0x020ca140 +_ZN29AdventureModeManager_174_Base19func_ov024_020c8b2cEv kind:function(thumb,size=0x1d4) addr:0x020ca37c +_ZN32AdventureModeManager_174_Base_10D0Ev kind:function(arm,size=0x1c) addr:0x020ca550 +_ZN29AdventureModeManager_174_BaseD1Ev kind:function(arm,size=0x20) addr:0x020ca56c +_ZN29AdventureModeManager_174_BaseD0Ev kind:function(arm,size=0x28) addr:0x020ca58c +_ZN24AdventureModeManager_174C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020ca5b4 +_ZN24AdventureModeManager_1748vfunc_08Ei kind:function(thumb,size=0x58) addr:0x020ca5e0 +_ZN24AdventureModeManager_1748vfunc_0CEi kind:function(thumb,size=0x48) addr:0x020ca638 +_ZN24AdventureModeManager_1748vfunc_10Eii kind:function(thumb,size=0xac) addr:0x020ca680 +_ZN24AdventureModeManager_1748vfunc_18Ei kind:function(thumb,size=0x6c) addr:0x020ca72c +_ZN24AdventureModeManager_1748vfunc_1CEi kind:function(thumb,size=0x40) addr:0x020ca798 +_ZN24AdventureModeManager_1748vfunc_20Eii kind:function(thumb,size=0xc0) addr:0x020ca7d8 +_ZN24AdventureModeManager_1748vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020ca898 +_ZN24AdventureModeManager_174D1Ev kind:function(arm,size=0x20) addr:0x020ca89c +_ZN24AdventureModeManager_174D0Ev kind:function(arm,size=0x28) addr:0x020ca8bc +_ZN29AdventureModeManager_178_BaseC2EP23GameModeManagerBase_104 kind:function(thumb,size=0x14) addr:0x020ca8e4 +_ZN29AdventureModeManager_178_Base8vfunc_08Ei kind:function(thumb,size=0x2c) addr:0x020ca8f8 +_ZN29AdventureModeManager_178_Base8vfunc_0CEi kind:function(thumb,size=0x1c) addr:0x020ca924 +_ZN29AdventureModeManager_178_Base8vfunc_18Ei kind:function(thumb,size=0x2c) addr:0x020ca940 +_ZN29AdventureModeManager_178_Base8vfunc_1CEi kind:function(thumb,size=0x1c) addr:0x020ca96c +_ZN29AdventureModeManager_178_BaseD1Ev kind:function(arm,size=0x20) addr:0x020ca988 +_ZN29AdventureModeManager_178_BaseD0Ev kind:function(arm,size=0x28) addr:0x020ca9a8 +_ZN24AdventureModeManager_178C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x2c) addr:0x020ca9d0 +_ZN24AdventureModeManager_1788vfunc_10Eii kind:function(thumb,size=0x24) addr:0x020ca9fc +_ZN24AdventureModeManager_1788vfunc_20Eii kind:function(thumb,size=0x24) addr:0x020caa20 +_ZN24AdventureModeManager_178D1Ev kind:function(arm,size=0x20) addr:0x020caa44 +_ZN24AdventureModeManager_178D0Ev kind:function(arm,size=0x28) addr:0x020caa64 +_ZN27AdventureModeManager_180_188vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020caa8c +_ZN24AdventureModeManager_180C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x50) addr:0x020caa9c +_ZN27AdventureModeManager_180_18D1Ev kind:function(thumb,size=0xc) addr:0x020caaec +_ZN24AdventureModeManager_180D1Ev kind:function(thumb,size=0x14) addr:0x020caaf8 +_ZN24AdventureModeManager_180D0Ev kind:function(thumb,size=0x1a) addr:0x020cab0c +_ZN24AdventureModeManager_1808vfunc_08Ei kind:function(thumb,size=0x64) addr:0x020cab28 +_ZN24AdventureModeManager_1808vfunc_0CEi kind:function(thumb,size=0x90) addr:0x020cab8c +_ZN24AdventureModeManager_1808vfunc_10Eii kind:function(thumb,size=0x64) addr:0x020cac1c +_ZN24AdventureModeManager_18019func_ov024_020c9430Eii kind:function(thumb,size=0x24) addr:0x020cac80 +_ZN24AdventureModeManager_1808vfunc_18Ei kind:function(thumb,size=0x30) addr:0x020caca4 +_ZN24AdventureModeManager_1808vfunc_1CEi kind:function(thumb,size=0x78) addr:0x020cacd4 +_ZN24AdventureModeManager_1808vfunc_20Eii kind:function(thumb,size=0x7c) addr:0x020cad4c +_ZN24AdventureModeManager_1808vfunc_24Ev kind:function(thumb,size=0x2) addr:0x020cadc8 +_ZN24AdventureModeManager_18019func_ov024_020c957cEv kind:function(thumb,size=0x48) addr:0x020cadcc +_ZN24AdventureModeManager_18019func_ov024_020c95c4Ev kind:function(thumb,size=0x48) addr:0x020cae14 +_ZN27AdventureModeManager_180_18D0Ev kind:function(arm,size=0x1c) addr:0x020cae5c +_ZN24AdventureModeManager_184C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x30) addr:0x020cae78 +_ZN24AdventureModeManager_184D1Ev kind:function(thumb,size=0xc) addr:0x020caea8 +_ZN24AdventureModeManager_184D0Ev kind:function(thumb,size=0x12) addr:0x020caeb4 +_ZN24AdventureModeManager_1848vfunc_08Ei kind:function(thumb,size=0x20) addr:0x020caec8 +_ZN24AdventureModeManager_1848vfunc_0CEi kind:function(thumb,size=0xf8) addr:0x020caee8 +_ZN24AdventureModeManager_1848vfunc_10Eii kind:function(thumb,size=0x8) addr:0x020cafe0 +_ZN24AdventureModeManager_1848vfunc_14Ei kind:function(thumb,size=0x2) addr:0x020cafe8 +_ZN24AdventureModeManager_18419func_ov024_020c979cEi kind:function(thumb,size=0x94) addr:0x020cafec +_ZN24AdventureModeManager_1848vfunc_18Ei kind:function(thumb,size=0x7c) addr:0x020cb080 +_ZN24AdventureModeManager_1848vfunc_1CEi kind:function(thumb,size=0x60) addr:0x020cb0fc +_ZN24AdventureModeManager_1848vfunc_20Eii kind:function(thumb,size=0x5c) addr:0x020cb15c +_ZN24AdventureModeManager_1848vfunc_24Ev kind:function(thumb,size=0x8) addr:0x020cb1b8 +_ZN27AdventureModeManager_18C_14C1Ev kind:function(thumb,size=0x14) addr:0x020cb1c0 +_ZN27AdventureModeManager_18C_148vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020cb1d4 +_ZN27AdventureModeManager_18C_148vfunc_10Ev kind:function(thumb,size=0x10) addr:0x020cb1e4 +_ZN24AdventureModeManager_18CC1EP23GameModeManagerBase_104 kind:function(thumb,size=0x68) addr:0x020cb1f4 +_ZN27AdventureModeManager_18C_14D1Ev kind:function(thumb,size=0xc) addr:0x020cb25c +_ZN24AdventureModeManager_18CD1Ev kind:function(thumb,size=0x14) addr:0x020cb268 +_ZN24AdventureModeManager_18CD0Ev kind:function(thumb,size=0x1a) addr:0x020cb27c +_ZN24AdventureModeManager_18C8vfunc_08Ei kind:function(thumb,size=0x32) addr:0x020cb298 +_ZN24AdventureModeManager_18C8vfunc_0CEi kind:function(thumb,size=0xf0) addr:0x020cb2cc +_ZN24AdventureModeManager_18C8vfunc_10Eii kind:function(thumb,size=0x100) addr:0x020cb3bc +_ZN24AdventureModeManager_18C19func_ov024_020c9c6cEv kind:function(thumb,size=0xb4) addr:0x020cb4bc +_ZN24AdventureModeManager_18C8vfunc_14Ei kind:function(thumb,size=0x10) addr:0x020cb570 +_ZN24AdventureModeManager_18C8vfunc_18Ei kind:function(thumb,size=0xac) addr:0x020cb580 +_ZN24AdventureModeManager_18C8vfunc_1CEi kind:function(thumb,size=0x88) addr:0x020cb62c +_ZN24AdventureModeManager_18C8vfunc_20Eii kind:function(thumb,size=0x1c4) addr:0x020cb6b4 +_ZN24AdventureModeManager_18C8vfunc_24Ev kind:function(thumb,size=0xa) addr:0x020cb878 +_ZN24AdventureModeManager_18C19func_ov024_020ca034Ev kind:function(thumb,size=0x34) addr:0x020cb884 +_ZN24AdventureModeManager_18C19func_ov024_020ca068Ei kind:function(thumb,size=0xc) addr:0x020cb8b8 +_ZN24AdventureModeManager_18C19func_ov024_020ca074Ev kind:function(thumb,size=0x6) addr:0x020cb8c4 +_ZN27AdventureModeManager_18C_14D0Ev kind:function(arm,size=0x1c) addr:0x020cb8cc +_ZN27AdventureModeManager_190_148vfunc_0CEv kind:function(thumb,size=0x10) addr:0x020cb8e8 +_ZN27AdventureModeManager_190_388vfunc_0CEv kind:function(thumb,size=0xc) addr:0x020cb8f8 +_ZN24AdventureModeManager_190C1EP23GameModeManagerBase_104 kind:function(thumb,size=0x54) addr:0x020cb904 +_ZN27AdventureModeManager_190_14D1Ev kind:function(thumb,size=0xc) addr:0x020cb958 +_ZN27AdventureModeManager_190_38D1Ev kind:function(thumb,size=0xc) addr:0x020cb964 +_ZN24AdventureModeManager_1908vfunc_08Ei kind:function(thumb,size=0xc) addr:0x020cb970 +_ZN24AdventureModeManager_1908vfunc_0CEi kind:function(thumb,size=0x20) addr:0x020cb97c +_ZN24AdventureModeManager_1908vfunc_10Eii kind:function(thumb,size=0x3c) addr:0x020cb99c +_ZN24AdventureModeManager_1908vfunc_18Ei kind:function(thumb,size=0xc) addr:0x020cb9d8 +_ZN24AdventureModeManager_1908vfunc_1CEi kind:function(thumb,size=0x20) addr:0x020cb9e4 +_ZN24AdventureModeManager_1908vfunc_20Eii kind:function(thumb,size=0x68) addr:0x020cba04 +_ZN24AdventureModeManager_19019func_ov024_020ca21cEv kind:function(thumb,size=0x30) addr:0x020cba6c +_ZN24AdventureModeManager_19019func_ov024_020ca24cEi kind:function(thumb,size=0x34) addr:0x020cba9c +_ZN24AdventureModeManager_19019func_ov024_020ca280Ev kind:function(thumb,size=0x10) addr:0x020cbad0 +_ZN27AdventureModeManager_190_14D0Ev kind:function(arm,size=0x1c) addr:0x020cbae0 +_ZN27AdventureModeManager_190_38D0Ev kind:function(arm,size=0x1c) addr:0x020cbafc +_ZN24AdventureModeManager_190D1Ev kind:function(arm,size=0x28) addr:0x020cbb18 +_ZN24AdventureModeManager_190D0Ev kind:function(arm,size=0x30) addr:0x020cbb40 +_ZN30AdventureModeManager_15C_20_00C1Eb kind:function(arm,size=0x16c) addr:0x020cbb70 +_ZN30AdventureModeManager_15C_20_0019func_ov024_020ca48cEv kind:function(arm,size=0x13c) addr:0x020cbcdc +_ZN30AdventureModeManager_15C_20_0019func_ov024_020ca5c8Ev kind:function(arm,size=0x90) addr:0x020cbe18 +_ZN30AdventureModeManager_15C_20_0019func_ov024_020ca658Ev kind:function(arm,size=0x50) addr:0x020cbea8 +_ZN30AdventureModeManager_15C_20_008vfunc_08EP5InputP12TouchControl kind:function(arm,size=0x2d0) addr:0x020cbef8 +_ZN30AdventureModeManager_15C_20_00D1Ev kind:function(arm,size=0x6c) addr:0x020cc1c8 +_ZN30AdventureModeManager_15C_20_00D0Ev kind:function(arm,size=0x74) addr:0x020cc234 +_ZN23UnkAdventureModeSystem1C2EPsPsi kind:function(arm,size=0xa4) addr:0x020cc2a8 +_ZN23UnkAdventureModeSystem1C2Ei kind:function(arm,size=0x5c) addr:0x020cc34c +_ZN23UnkAdventureModeSystem119func_ov024_020cab58Ev kind:function(arm,size=0x4c) addr:0x020cc3a8 +_ZN23UnkAdventureModeSystem119func_ov024_020caba4Ev kind:function(arm,size=0x1d8) addr:0x020cc3f4 +_ZN23UnkAdventureModeSystem119func_ov024_020cad7cEv kind:function(arm,size=0x24) addr:0x020cc5cc +_ZN24UnkStruct_ov024_020d86946CreateEP23GameModeManagerBase_004 kind:function(arm,size=0x2c) addr:0x020cc5f0 +_ZN24UnkStruct_ov024_020d8694C1Ev kind:function(arm,size=0xec) addr:0x020cc61c +_ZN24UnkStruct_ov024_020d8694D1Ev kind:function(arm,size=0x7c) addr:0x020cc708 +_ZN24UnkStruct_ov024_020d8694D0Ev kind:function(arm,size=0x84) addr:0x020cc784 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cafb8Ev kind:function(arm,size=0x20) addr:0x020cc808 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cafd8Ev kind:function(arm,size=0x28) addr:0x020cc828 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb000Ev kind:function(arm,size=0x20) addr:0x020cc850 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb020Ev kind:function(arm,size=0x20) addr:0x020cc870 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb040Ev kind:function(arm,size=0x14) addr:0x020cc890 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb054Ev kind:function(arm,size=0x58) addr:0x020cc8a4 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb0acEv kind:function(arm,size=0x18) addr:0x020cc8fc +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb0c4Ev kind:function(arm,size=0x30) addr:0x020cc914 +_ZN24UnkStruct_ov024_020d86948vfunc_08EP5InputP12TouchControl kind:function(arm,size=0x3c) addr:0x020cc944 +_ZN24UnkStruct_ov024_020d86948vfunc_10EPc kind:function(arm,size=0x48) addr:0x020cc980 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb178Ev kind:function(arm,size=0x1c) addr:0x020cc9c8 +_ZN24UnkStruct_ov024_020d869419func_ov024_020cb194Ev kind:function(arm,size=0x38) addr:0x020cc9e4 +func_ov024_020cb1cc kind:function(arm,size=0x10) addr:0x020cca1c +func_ov024_020cb1dc kind:function(arm,size=0x14) addr:0x020cca2c +_ZN19UnkTitleCardSystem1C2EP23GameModeManagerBase_004 kind:function(arm,size=0x84) addr:0x020cca40 +func_ov024_020cb274 kind:function(arm,size=0xc) addr:0x020ccac4 +func_ov024_020cb280 kind:function(arm,size=0x4) addr:0x020ccad0 +func_ov024_020cb284 kind:function(arm,size=0x20c) addr:0x020ccad4 +func_ov024_020cb490 kind:function(arm,size=0x11c) addr:0x020ccce0 +_ZN19UnkTitleCardSystem18vfunc_08Ev kind:function(arm,size=0x8) addr:0x020ccdfc +_ZN19UnkTitleCardSystem18vfunc_0CEv kind:function(arm,size=0x4) addr:0x020cce04 +_ZN19UnkTitleCardSystem18vfunc_10Ev kind:function(arm,size=0x4) addr:0x020cce08 +func_ov024_020cb5bc kind:function(arm,size=0x3c) addr:0x020cce0c +_ZN19UnkTitleCardSystem18vfunc_00Ev kind:function(arm,size=0x4) addr:0x020cce48 +_ZN19UnkTitleCardSystem18vfunc_04Ev kind:function(arm,size=0x58) addr:0x020cce4c +func_ov024_020cb654 kind:function(arm,size=0x25c) addr:0x020ccea4 +_ZN19UnkTitleCardSystem18vfunc_14Ev kind:function(arm,size=0x14) addr:0x020cd100 +_ZN19UnkTitleCardSystem18vfunc_18Ev kind:function(arm,size=0x8) addr:0x020cd114 +_ZN28UnkTitleCardSystem1_Derived1C2EP23GameModeManagerBase_004 kind:function(arm,size=0x38) addr:0x020cd11c +_ZN28UnkTitleCardSystem1_Derived18vfunc_1CEv kind:function(arm,size=0x114) addr:0x020cd154 +_ZN28UnkTitleCardSystem1_Derived18vfunc_08Ev kind:function(arm,size=0x80) addr:0x020cd268 +_ZN28UnkTitleCardSystem1_Derived18vfunc_0CEv kind:function(arm,size=0x338) addr:0x020cd2e8 +_ZN28UnkTitleCardSystem1_Derived18vfunc_10Ev kind:function(arm,size=0xc4) addr:0x020cd620 +func_ov024_020cbe94 kind:function(arm,size=0x24) addr:0x020cd6e4 +func_ov024_020cbeb8 kind:function(arm,size=0xbc) addr:0x020cd708 +func_ov024_020cbf74 kind:function(arm,size=0x24) addr:0x020cd7c4 +func_ov024_020cbf98 kind:function(arm,size=0xc4) addr:0x020cd7e8 +func_ov024_020cc05c kind:function(arm,size=0x2c) addr:0x020cd8ac +func_ov024_020cc088 kind:function(arm,size=0x2c) addr:0x020cd8d8 +func_ov024_020cc0b4 kind:function(arm,size=0x8c) addr:0x020cd904 +_ZN28UnkTitleCardSystem1_Derived18vfunc_18Ev kind:function(arm,size=0x14) addr:0x020cd990 +_ZN28UnkStruct_ov024_020d8694_01CC1EP23GameModeManagerBase_004 kind:function(arm,size=0x30) addr:0x020cd9a4 +_ZN28UnkStruct_ov024_020d8694_01C8vfunc_1CEv kind:function(arm,size=0xa8) addr:0x020cd9d4 +_ZN28UnkStruct_ov024_020d8694_01C8vfunc_00Ev kind:function(arm,size=0x22c) addr:0x020cda7c +_ZN28UnkStruct_ov024_020d8694_188C1EP23GameModeManagerBase_004 kind:function(arm,size=0x28) addr:0x020cdca8 +_ZN28UnkStruct_ov024_020d8694_1888vfunc_1CEv kind:function(arm,size=0x54) addr:0x020cdcd0 +_ZN28UnkStruct_ov024_020d8694_1888vfunc_00Ev kind:function(arm,size=0x1e0) addr:0x020cdd24 +_ZN28UnkStruct_ov024_020d8694_1888vfunc_04Ev kind:function(arm,size=0x88) addr:0x020cdf04 +_ZN28UnkStruct_ov024_020d8694_1888vfunc_14Ev kind:function(arm,size=0x30) addr:0x020cdf8c +_ZN28UnkStruct_ov024_020d8694_2FCC1EP23GameModeManagerBase_004 kind:function(arm,size=0x20) addr:0x020cdfbc +_ZN28UnkStruct_ov024_020d8694_2FC8vfunc_00Ev kind:function(arm,size=0x364) addr:0x020cdfdc +_ZN28UnkStruct_ov024_020d8694_2FC8vfunc_10Ev kind:function(arm,size=0x20) addr:0x020ce340 +func_ov024_020ccb10 kind:function(arm,size=0x17c) addr:0x020ce360 +_ZN28UnkStruct_ov024_020d8694_2FC8vfunc_08Ev kind:function(arm,size=0x8) addr:0x020ce4dc +_ZN28UnkStruct_ov024_020d8694_2FC8vfunc_0CEv kind:function(arm,size=0x88) addr:0x020ce4e4 func_ov024_020ce56c kind:function(arm,size=0x24) addr:0x020ce56c func_ov024_020ce590 kind:function(arm,size=0x19c) addr:0x020ce590 func_ov024_020ce72c kind:function(arm,size=0xd8) addr:0x020ce72c _ZN19func_ov024_020ce804D0Ev kind:function(arm,size=0xe0) addr:0x020ce804 -func_ov024_020ce8e4 kind:function(arm,size=0xbc) addr:0x020ce8e4 -func_ov024_020ce9a0 kind:function(arm,size=0x94) addr:0x020ce9a0 +_ZN18UnkStruct_020d869819func_ov024_020cd094Ev kind:function(arm,size=0xbc) addr:0x020ce8e4 +_ZN18UnkStruct_020d869819func_ov024_020cd150Ev kind:function(arm,size=0x94) addr:0x020ce9a0 func_ov024_020cea34 kind:function(arm,size=0x98) addr:0x020cea34 func_ov024_020ceacc kind:function(arm,size=0xcc) addr:0x020ceacc func_ov024_020ceb98 kind:function(arm,size=0x10) addr:0x020ceb98 func_ov024_020ceba8 kind:function(arm,size=0x10) addr:0x020ceba8 _ZN18UnkStruct_020d869819func_ov024_020cd368Ebb kind:function(arm,size=0x3c) addr:0x020cebb8 -func_ov024_020cebf4 kind:function(arm,size=0x2c) addr:0x020cebf4 +_ZN18UnkStruct_020d869819func_ov024_020cd3a4Ev kind:function(arm,size=0x2c) addr:0x020cebf4 _ZN18UnkStruct_020d869819func_ov024_020cd3d0Ev kind:function(arm,size=0x10) addr:0x020cec20 _ZN18UnkStruct_020d869819func_ov024_020cd3e0Ei kind:function(arm,size=0x10) addr:0x020cec30 _ZN18UnkStruct_020d869819func_ov024_020cd3f0Ei kind:function(arm,size=0x10) addr:0x020cec40 -func_ov024_020cec50 kind:function(arm,size=0x10) addr:0x020cec50 +_ZN18UnkStruct_020d869819func_ov024_020cd400Ev kind:function(arm,size=0x10) addr:0x020cec50 _ZN18UnkStruct_020d869819func_ov024_020cd410Ev kind:function(arm,size=0x10) addr:0x020cec60 -func_ov024_020cec70 kind:function(arm,size=0x38) addr:0x020cec70 +_ZN18UnkStruct_020d869819func_ov024_020cd420Ev kind:function(arm,size=0x38) addr:0x020cec70 _ZN18UnkStruct_020d869819func_ov024_020cd458Eji kind:function(arm,size=0x4c) addr:0x020ceca8 func_ov024_020cecf4 kind:function(arm,size=0x40) addr:0x020cecf4 -func_ov024_020ced34 kind:function(arm,size=0xdc) addr:0x020ced34 -func_ov024_020cee10 kind:function(arm,size=0x44) addr:0x020cee10 +_ZN18UnkStruct_020d869819func_ov024_020cd4e4Et kind:function(arm,size=0xdc) addr:0x020ced34 +_ZN18UnkStruct_020d869819func_ov024_020cd5c0Et kind:function(arm,size=0x44) addr:0x020cee10 func_ov024_020cee54 kind:function(arm,size=0x6c) addr:0x020cee54 func_ov024_020ceec0 kind:function(arm,size=0xf8) addr:0x020ceec0 func_ov024_020cefb8 kind:function(arm,size=0xc) addr:0x020cefb8 @@ -406,57 +406,57 @@ func_ov024_020d11bc kind:function(arm,size=0x4) addr:0x020d11bc func_ov024_020d11c0 kind:function(arm,size=0xb8) addr:0x020d11c0 func_ov024_020d1278 kind:function(arm,size=0x10) addr:0x020d1278 func_ov024_020d1288 kind:function(arm,size=0x14) addr:0x020d1288 -func_ov024_020d129c kind:function(arm,size=0x68) addr:0x020d129c -func_ov024_020d1304 kind:function(arm,size=0x4) addr:0x020d1304 +_ZN21UnkStruct_027e0cf8_00C1Ev kind:function(arm,size=0x68) addr:0x020d129c +_ZN21UnkStruct_027e0cf8_00D1Ev kind:function(arm,size=0x4) addr:0x020d1304 func_ov024_020d1308 kind:function(arm,size=0x1a8) addr:0x020d1308 -func_ov024_020d14b0 kind:function(arm,size=0x1d8) addr:0x020d14b0 +_ZN21UnkStruct_027e0cf8_0019func_ov024_020cfb7cEPvP5Vec2sitii kind:function(arm,size=0x1d8) addr:0x020d14b0 func_ov024_020d1688 kind:function(arm,size=0xd0) addr:0x020d1688 func_ov024_020d1758 kind:function(arm,size=0x48) addr:0x020d1758 func_ov024_020d17a0 kind:function(arm,size=0x28) addr:0x020d17a0 func_ov024_020d17c8 kind:function(arm,size=0x3c) addr:0x020d17c8 func_ov024_020d1804 kind:function(arm,size=0x4c) addr:0x020d1804 func_ov024_020d1850 kind:function(arm,size=0x2c) addr:0x020d1850 -func_ov024_020d187c kind:function(arm,size=0x40) addr:0x020d187c -func_ov024_020d18bc kind:function(arm,size=0x4) addr:0x020d18bc -func_ov024_020d18c0 kind:function(arm,size=0x78) addr:0x020d18c0 -func_ov024_020d1938 kind:function(arm,size=0x28) addr:0x020d1938 +_ZN21UnkStruct_027e0cf8_0CC1Ev kind:function(arm,size=0x40) addr:0x020d187c +_ZN21UnkStruct_027e0cf8_0CD1Ev kind:function(arm,size=0x4) addr:0x020d18bc +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020cff8cEPvP5Vec2s kind:function(arm,size=0x78) addr:0x020d18c0 +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d0004Ev kind:function(arm,size=0x28) addr:0x020d1938 func_ov024_020d1960 kind:function(arm,size=0x1b4) addr:0x020d1960 func_ov024_020d1b14 kind:function(arm,size=0x120) addr:0x020d1b14 -func_ov024_020d1c34 kind:function(arm,size=0x60) addr:0x020d1c34 -func_ov024_020d1c94 kind:function(arm,size=0xb8) addr:0x020d1c94 -func_ov024_020d1d4c kind:function(arm,size=0x24) addr:0x020d1d4c -func_ov024_020d1d70 kind:function(arm,size=0xf4) addr:0x020d1d70 +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d02e0Ev kind:function(arm,size=0x60) addr:0x020d1c34 +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d0340Ev kind:function(arm,size=0xb8) addr:0x020d1c94 +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d03f8EP5Vec2s kind:function(arm,size=0x24) addr:0x020d1d4c +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d041cEP5Vec2s kind:function(arm,size=0xf4) addr:0x020d1d70 func_ov024_020d1e64 kind:function(arm,size=0xa0) addr:0x020d1e64 -func_ov024_020d1f04 kind:function(arm,size=0x3c) addr:0x020d1f04 -func_ov024_020d1f40 kind:function(arm,size=0x94) addr:0x020d1f40 -_ZN19func_ov024_020d1fd4D0Ev kind:function(arm,size=0x18) addr:0x020d1fd4 -func_ov024_020d1fec kind:function(arm,size=0x38) addr:0x020d1fec -func_ov024_020d2024 kind:function(arm,size=0x5c) addr:0x020d2024 -func_ov024_020d2080 kind:function(arm,size=0x18) addr:0x020d2080 -func_ov024_020d2098 kind:function(arm,size=0x1e0) addr:0x020d2098 -func_ov024_020d2278 kind:function(arm,size=0x140) addr:0x020d2278 -func_ov024_020d23b8 kind:function(arm,size=0x238) addr:0x020d23b8 -func_ov024_020d25f0 kind:function(arm,size=0x118) addr:0x020d25f0 -func_ov024_020d2708 kind:function(arm,size=0x44) addr:0x020d2708 -func_ov024_020d274c kind:function(arm,size=0x6c) addr:0x020d274c -func_ov024_020d27b8 kind:function(arm,size=0x34) addr:0x020d27b8 -func_ov024_020d27ec kind:function(arm,size=0x28) addr:0x020d27ec -func_ov024_020d2814 kind:function(arm,size=0x4c) addr:0x020d2814 -func_ov024_020d2860 kind:function(arm,size=0x20) addr:0x020d2860 -func_ov024_020d2880 kind:function(arm,size=0x24) addr:0x020d2880 -func_ov024_020d28a4 kind:function(arm,size=0x50) addr:0x020d28a4 -func_ov024_020d28f4 kind:function(arm,size=0x14) addr:0x020d28f4 -func_ov024_020d2908 kind:function(arm,size=0x198) addr:0x020d2908 -func_ov024_020d2aa0 kind:function(arm,size=0x14) addr:0x020d2aa0 -func_ov024_020d2ab4 kind:function(arm,size=0x204) addr:0x020d2ab4 -func_ov024_020d2cb8 kind:function(arm,size=0x68) addr:0x020d2cb8 -func_ov024_020d2d20 kind:function(arm,size=0xdc) addr:0x020d2d20 -func_ov024_020d2dfc kind:function(arm,size=0xbc) addr:0x020d2dfc -func_ov024_020d2eb8 kind:function(arm,size=0xb0) addr:0x020d2eb8 -func_ov024_020d2f68 kind:function(arm,size=0x24) addr:0x020d2f68 -func_ov024_020d2f8c kind:function(arm,size=0x20) addr:0x020d2f8c +_ZN21UnkStruct_027e0cf8_0C19func_ov024_020d05d0Eii kind:function(arm,size=0x3c) addr:0x020d1f04 +_ZN29AdventureModeManager_1B8_BaseC2EhbPK32AdventureModeManager_1B8_Base_1Cbb kind:function(arm,size=0x94) addr:0x020d1f40 +_ZN29AdventureModeManager_1B8_BaseD2Ev kind:function(arm,size=0x18) addr:0x020d1fd4 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0698Ev kind:function(arm,size=0x38) addr:0x020d1fec +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d06d0Ev kind:function(arm,size=0x5c) addr:0x020d2024 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d072cEPc kind:function(arm,size=0x18) addr:0x020d2080 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0744Eiiiihh kind:function(arm,size=0x1e0) addr:0x020d2098 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0924Eiihh kind:function(arm,size=0x140) addr:0x020d2278 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0a64Ev kind:function(arm,size=0x238) addr:0x020d23b8 +_ZN29AdventureModeManager_1B8_Base13TryLoadBGCharEPvjj kind:function(arm,size=0x118) addr:0x020d25f0 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0db4Eii kind:function(arm,size=0x44) addr:0x020d2708 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0df8Eii kind:function(arm,size=0x6c) addr:0x020d274c +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0e64EPvj kind:function(arm,size=0x34) addr:0x020d27b8 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0e98Ev kind:function(arm,size=0x28) addr:0x020d27ec +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0ec0EPiib kind:function(arm,size=0x4c) addr:0x020d2814 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0f0cEPii kind:function(arm,size=0x20) addr:0x020d2860 +_ZN29AdventureModeManager_1B8_Base19func_ov024_020d0f2cEii kind:function(arm,size=0x24) addr:0x020d2880 +_ZN24AdventureModeManager_1B8C1Ehbb kind:function(arm,size=0x50) addr:0x020d28a4 +_ZN24AdventureModeManager_1B8D1Ev kind:function(arm,size=0x14) addr:0x020d28f4 +_ZN24AdventureModeManager_1B819func_ov024_020d0fb4EiihhP12TouchControl kind:function(arm,size=0x198) addr:0x020d2908 +_ZN24AdventureModeManager_1B819func_ov024_020d114cEv kind:function(arm,size=0x14) addr:0x020d2aa0 +_ZN24AdventureModeManager_1B819func_ov024_020d1160Ev kind:function(arm,size=0x204) addr:0x020d2ab4 +_ZN24AdventureModeManager_1B819func_ov024_020d1364Ev kind:function(arm,size=0x68) addr:0x020d2cb8 +_ZN24AdventureModeManager_1B819func_ov024_020d13ccEi kind:function(arm,size=0xdc) addr:0x020d2d20 +_ZN24AdventureModeManager_1B819func_ov024_020d14a8EP32AdventureModeManager_1B8_Base_1CiPi kind:function(arm,size=0xbc) addr:0x020d2dfc +_ZN24AdventureModeManager_1B819func_ov024_020d1564EPK32AdventureModeManager_1B8_Base_1CiPih kind:function(arm,size=0xb0) addr:0x020d2eb8 +_ZN24AdventureModeManager_1B819func_ov024_020d1614EPv kind:function(arm,size=0x24) addr:0x020d2f68 +_ZN24AdventureModeManager_1B819func_ov024_020d1638Ev kind:function(arm,size=0x20) addr:0x020d2f8c func_ov024_020d2fac kind:function(arm,size=0x24) addr:0x020d2fac -func_ov024_020d2fd0 kind:function(arm,size=0x18) addr:0x020d2fd0 +_ZN24UnkStruct_ov024_020d86a019func_ov024_020d167cEv kind:function(arm,size=0x18) addr:0x020d2fd0 func_ov024_020d2fe8 kind:function(arm,size=0x28) addr:0x020d2fe8 _ZN19func_ov024_020d3010D1Ev kind:function(arm,size=0x14) addr:0x020d3010 _ZN19func_ov024_020d3024D0Ev kind:function(arm,size=0x1c) addr:0x020d3024 @@ -507,11 +507,11 @@ func_ov024_020d3d90 kind:function(arm,size=0xc) addr:0x020d3d90 func_ov024_020d3d9c kind:function(arm,size=0x1c) addr:0x020d3d9c func_ov024_020d3db8 kind:function(arm,size=0x2c) addr:0x020d3db8 func_ov024_020d3de4 kind:function(arm,size=0x44) addr:0x020d3de4 -func_ov024_020d3e28 kind:function(arm,size=0x44) addr:0x020d3e28 -func_ov024_020d3e6c kind:function(arm,size=0x4) addr:0x020d3e6c +func_ov024_020d24d4 kind:function(arm,size=0x44) addr:0x020d3e28 +func_ov024_020d2518 kind:function(arm,size=0x4) addr:0x020d3e6c func_ov024_020d3e70 kind:function(arm,size=0x4) addr:0x020d3e70 func_ov024_020d3e74 kind:function(arm,size=0x18) addr:0x020d3e74 -func_ov024_020d3e8c kind:function(arm,size=0x2c) addr:0x020d3e8c +func_ov024_020d2538 kind:function(arm,size=0x2c) addr:0x020d3e8c func_ov024_020d3eb8 kind:function(arm,size=0x28) addr:0x020d3eb8 func_ov024_020d3ee0 kind:function(arm,size=0x124) addr:0x020d3ee0 func_ov024_020d4004 kind:function(arm,size=0xcc) addr:0x020d4004 @@ -532,16 +532,16 @@ func_ov024_020d49e0 kind:function(arm,size=0x74) addr:0x020d49e0 func_ov024_020d4a54 kind:function(arm,size=0x40) addr:0x020d4a54 func_ov024_020d4a94 kind:function(arm,size=0x18) addr:0x020d4a94 func_ov024_020d4aac kind:function(arm,size=0xa0) addr:0x020d4aac -func_ov024_020d4b4c kind:function(arm,size=0x88) addr:0x020d4b4c -func_ov024_020d4bd4 kind:function(arm,size=0x34) addr:0x020d4bd4 +_ZN21UnkStruct_027e0cf8_08C1Ev kind:function(arm,size=0x88) addr:0x020d4b4c +_ZN21UnkStruct_027e0cf8_08D1Ev kind:function(arm,size=0x34) addr:0x020d4bd4 func_ov024_020d4c08 kind:function(arm,size=0x24) addr:0x020d4c08 -func_ov024_020d4c2c kind:function(arm,size=0x10) addr:0x020d4c2c -func_ov024_020d4c3c kind:function(arm,size=0x3c) addr:0x020d4c3c -func_ov024_020d4c78 kind:function(arm,size=0x24) addr:0x020d4c78 -func_ov024_020d4c9c kind:function(arm,size=0x24) addr:0x020d4c9c +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d32d8Ev kind:function(arm,size=0x10) addr:0x020d4c2c +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d32e8EP5Vec2s kind:function(arm,size=0x3c) addr:0x020d4c3c +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d3324EPv kind:function(arm,size=0x24) addr:0x020d4c78 +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d3348EPvitii kind:function(arm,size=0x24) addr:0x020d4c9c func_ov024_020d4cc0 kind:function(arm,size=0xa0) addr:0x020d4cc0 -func_ov024_020d4d60 kind:function(arm,size=0x10) addr:0x020d4d60 -func_ov024_020d4d70 kind:function(arm,size=0xc) addr:0x020d4d70 +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d340cEv kind:function(arm,size=0x10) addr:0x020d4d60 +_ZN21UnkStruct_027e0cf8_0819func_ov024_020d341cEi kind:function(arm,size=0xc) addr:0x020d4d70 func_ov024_020d4d7c kind:function(arm,size=0x78) addr:0x020d4d7c func_ov024_020d4df4 kind:function(arm,size=0x7c) addr:0x020d4df4 func_ov024_020d4e70 kind:function(arm,size=0x154) addr:0x020d4e70 @@ -637,11 +637,11 @@ func_ov024_020d6b04 kind:function(arm,size=0x14) addr:0x020d6b04 func_ov024_020d6b18 kind:function(arm,size=0x1c) addr:0x020d6b18 _ZN19func_ov024_020d6b34D0Ev kind:function(arm,size=0x30) addr:0x020d6b34 _ZN19func_ov024_020d6b64D0Ev kind:function(arm,size=0x1c) addr:0x020d6b64 -func_ov024_020d6b80 kind:function(arm,size=0x70) addr:0x020d6b80 -func_ov024_020d6bf0 kind:function(arm,size=0xb8) addr:0x020d6bf0 -func_ov024_020d6ca8 kind:function(arm,size=0x3c) addr:0x020d6ca8 +func_ov024_020d51dc kind:function(arm,size=0x70) addr:0x020d6b80 +func_ov024_020d524c kind:function(arm,size=0xb8) addr:0x020d6bf0 +func_ov024_020d5304 kind:function(arm,size=0x3c) addr:0x020d6ca8 func_ov024_020d6ce4 kind:function(arm,size=0x14) addr:0x020d6ce4 -func_ov024_020d6cf8 kind:function(arm,size=0x5c) addr:0x020d6cf8 +func_ov024_020d5354 kind:function(arm,size=0x5c) addr:0x020d6cf8 func_ov024_020d6d54 kind:function(arm,size=0x60) addr:0x020d6d54 func_ov024_020d6db4 kind:function(arm,size=0x24) addr:0x020d6db4 func_ov024_020d6dd8 kind:function(arm,size=0x24) addr:0x020d6dd8 @@ -695,8 +695,8 @@ _ZN14MiscAdvManager15GetNumPostcardsEv kind:function(arm,size=0x10) addr:0x020d7 _ZN14MiscAdvManager13GivePriceCardEi kind:function(arm,size=0x30) addr:0x020d7f10 _ZN14MiscAdvManager13PostPriceCardEii kind:function(arm,size=0x74) addr:0x020d7f40 _ZN14MiscAdvManager19func_ov024_020d6610Ev kind:function(arm,size=0x1c) addr:0x020d7fb4 -_ZN14MiscAdvManager11SetInstanceEPS_ kind:function(arm,size=0x10) addr:0x020d7fd0 -_ZN14MiscAdvManager13ClearInstanceEv kind:function(arm,size=0x14) addr:0x020d7fe0 +_ZN8InstanceI14MiscAdvManagerEC2Ev kind:function(arm,size=0x10) addr:0x020d7fd0 +_ZN8InstanceI14MiscAdvManagerED2Ev kind:function(arm,size=0x14) addr:0x020d7fe0 func_ov024_020d7ff4 kind:function(thumb,size=0x16) addr:0x020d7ff4 _ZN26ActorUnk_ov000_020a8bb0_ec19func_ov024_020d6668Ev kind:function(thumb,size=0x16) addr:0x020d800c func_ov024_020d8024 kind:function(arm,size=0x40) addr:0x020d8024 @@ -732,8 +732,8 @@ data_ov024_020d8dae kind:data(any) addr:0x020d8dae data_ov024_020d8dc2 kind:data(any) addr:0x020d8dc2 data_ov024_020d8dd6 kind:data(any) addr:0x020d8dd6 data_ov024_020d8df8 kind:data(any) addr:0x020d8df8 -data_ov024_020d8ee8 kind:data(any) addr:0x020d8ee8 -data_ov024_020d8eeb kind:data(any) addr:0x020d8eeb +data_ov024_020d7544 kind:data(any) addr:0x020d8ee8 local +data_ov024_020d7547 kind:data(any) addr:0x020d8eeb local data_ov024_020d8ef4 kind:data(any) addr:0x020d8ef4 data_ov024_020d8ef9 kind:data(any) addr:0x020d8ef9 data_ov024_020d8f04 kind:data(any) addr:0x020d8f04 @@ -762,48 +762,48 @@ data_ov024_020d9264 kind:data(any) addr:0x020d9264 ambiguous data_ov024_020d9266 kind:data(any) addr:0x020d9266 ambiguous __sinit_ov024_020d928c kind:function(arm,size=0x38) addr:0x020d928c __sinit_ov024_020d92c4 kind:function(arm,size=0x120) addr:0x020d92c4 -__sinit_ov024_020d93e4 kind:function(arm,size=0x2c) addr:0x020d93e4 +__sinit_AdventureModeManager_1B8_Base_024.cpp kind:function(arm,size=0x2c) addr:0x020d93e4 local __sinit_ov024_020d9410 kind:function(arm,size=0x48) addr:0x020d9410 __sinit_ov024_020d9458 kind:function(arm,size=0x18) addr:0x020d9458 __sinit_ov024_020d9470 kind:function(arm,size=0x18) addr:0x020d9470 __sinit_ActorUnkOBPC.cpp kind:function(arm,size=0x50) addr:0x020d9488 .p__sinit_ov024_020d928c kind:data(word) addr:0x020d94d8 .p__sinit_ov024_020d92c4 kind:data(word) addr:0x020d94dc -.p__sinit_ov024_020d93e4 kind:data(word) addr:0x020d94e0 +.p__sinit_AdventureModeManager_1B8_Base_024.cpp kind:data(word) addr:0x020d94e0 local .p__sinit_ov024_020d9410 kind:data(word) addr:0x020d94e4 .p__sinit_ov024_020d9458 kind:data(word) addr:0x020d94e8 .p__sinit_ov024_020d9470 kind:data(word) addr:0x020d94ec .p__sinit_ActorUnkOBPC.cpp kind:data(word) addr:0x020d94f0 -_ZTV19data_ov024_020d9500 kind:data(any) addr:0x020d9500 -data_ov024_020d9538 kind:data(any) addr:0x020d9538 -_ZTV19data_ov024_020d9568 kind:data(any) addr:0x020d9568 -_ZTV19data_ov024_020d958c kind:data(any) addr:0x020d958c -_ZTV19data_ov024_020d95b0 kind:data(any) addr:0x020d95b0 -data_ov024_020d9600 kind:data(any) addr:0x020d9600 -data_ov024_020d9614 kind:data(any) addr:0x020d9614 -data_ov024_020d9618 kind:data(any) addr:0x020d9618 -data_ov024_020d9624 kind:data(any) addr:0x020d9624 -data_ov024_020d9638 kind:data(any) addr:0x020d9638 -_ZTV19data_ov024_020d963c kind:data(any) addr:0x020d963c -data_ov024_020d9660 kind:data(any) addr:0x020d9660 -_ZTV19data_ov024_020d9688 kind:data(any) addr:0x020d9688 -_ZTV19data_ov024_020d96a4 kind:data(any) addr:0x020d96a4 -_ZTV19data_ov024_020d96d4 kind:data(any) addr:0x020d96d4 -_ZTV19data_ov024_020d96f0 kind:data(any) addr:0x020d96f0 -_ZTV19data_ov024_020d9720 kind:data(any) addr:0x020d9720 -_ZTV19data_ov024_020d9750 kind:data(any) addr:0x020d9750 -_ZTV19data_ov024_020d9780 kind:data(any) addr:0x020d9780 -_ZTV19data_ov024_020d97b0 kind:data(any) addr:0x020d97b0 -_ZTV19data_ov024_020d97cc kind:data(any) addr:0x020d97cc -data_ov024_020d9804 kind:data(any) addr:0x020d9804 -_ZTV19data_ov024_020d982c kind:data(any) addr:0x020d982c -data_ov024_020d9850 kind:data(any) addr:0x020d9850 -_ZTV19data_ov024_020d9878 kind:data(any) addr:0x020d9878 -_ZTV19data_ov024_020d9894 kind:data(any) addr:0x020d9894 -_ZTV19data_ov024_020d98b0 kind:data(any) addr:0x020d98b0 +_ZTV17GameModeAdventure kind:data(any) addr:0x020d9500 +_ZTV15UnkActorSystem1 kind:data(any) addr:0x020d9530 +_ZTV15UnkActorSystem2 kind:data(any) addr:0x020d9568 +_ZTV24AdventureModeManager_1AC kind:data(any) addr:0x020d958c +_ZTV20AdventureModeManager kind:data(any) addr:0x020d95b0 +@2869 kind:data(any) addr:0x020d9600 local +@2870 kind:data(any) addr:0x020d9614 local +@2871 kind:data(byte[11]) addr:0x020d9618 local +@2872 kind:data(byte[10]) addr:0x020d9624 local +_ZTV18UnkStruct_027e0998 kind:data(any) addr:0x020d9630 +_ZTV27AdventureModeManager_160_4C kind:data(any) addr:0x020d963c +_ZTV24AdventureModeManager_160 kind:data(any) addr:0x020d9658 +_ZTV27AdventureModeManager_170_14 kind:data(any) addr:0x020d9688 +_ZTV24AdventureModeManager_170 kind:data(any) addr:0x020d96a4 +_ZTV32AdventureModeManager_174_Base_10 kind:data(any) addr:0x020d96d4 +_ZTV29AdventureModeManager_174_Base kind:data(any) addr:0x020d96f0 +_ZTV24AdventureModeManager_174 kind:data(any) addr:0x020d9720 +_ZTV29AdventureModeManager_178_Base kind:data(any) addr:0x020d9750 +_ZTV24AdventureModeManager_178 kind:data(any) addr:0x020d9780 +_ZTV27AdventureModeManager_180_18 kind:data(any) addr:0x020d97b0 +_ZTV24AdventureModeManager_180 kind:data(any) addr:0x020d97cc +_ZTV24AdventureModeManager_184 kind:data(any) addr:0x020d97fc +_ZTV27AdventureModeManager_18C_14 kind:data(any) addr:0x020d982c +_ZTV24AdventureModeManager_18C kind:data(any) addr:0x020d9848 +_ZTV27AdventureModeManager_190_38 kind:data(any) addr:0x020d9878 +_ZTV27AdventureModeManager_190_14 kind:data(any) addr:0x020d9894 +_ZTV24AdventureModeManager_190 kind:data(any) addr:0x020d98b0 data_ov024_020d98e0 kind:data(any) addr:0x020d98e0 -_ZTV19data_ov024_020d98f0 kind:data(any) addr:0x020d98f0 -data_ov024_020d991c kind:data(any) addr:0x020d991c +_ZTV30AdventureModeManager_15C_20_00 kind:data(any) addr:0x020d98f0 +_ZTV19data_ov024_020d7f7c kind:data(any) addr:0x020d9914 _ZTV19data_ov024_020d9920 kind:data(any) addr:0x020d9920 data_ov024_020d994c kind:data(any) addr:0x020d994c data_ov024_020d9970 kind:data(any) addr:0x020d9970 @@ -817,7 +817,7 @@ data_ov024_020d9a38 kind:data(any) addr:0x020d9a38 data_ov024_020d9a3e kind:data(any) addr:0x020d9a3e data_ov024_020d9a42 kind:data(any) addr:0x020d9a42 data_ov024_020d9a43 kind:data(any) addr:0x020d9a43 -data_ov024_020d9ba0 kind:data(any) addr:0x020d9ba0 +data_ov024_020d8200 kind:data(any) addr:0x020d9ba0 local _ZTV19data_ov024_020d9ba8 kind:data(any) addr:0x020d9ba8 data_ov024_020d9bc4 kind:data(any) addr:0x020d9bc4 data_ov024_020d9be4 kind:data(any) addr:0x020d9be4 @@ -898,13 +898,14 @@ data_ov024_020d9f48 kind:data(any) addr:0x020d9f48 data_ov024_020d9f5c kind:data(any) addr:0x020d9f5c _ZTV19data_ov024_020d9f74 kind:data(any) addr:0x020d9f74 _ZTV19data_ov024_020d9f98 kind:data(any) addr:0x020d9f98 -data_ov024_020da000 kind:bss addr:0x020da000 -data_ov024_020da008 kind:bss addr:0x020da008 -data_ov024_020da014 kind:bss addr:0x020da014 -data_ov024_020da034 kind:bss addr:0x020da034 +data_ov024_020d8660 kind:bss addr:0x020da000 +_ZGVZN24UnkStruct_ov024_020d866019func_ov024_020c4ac0EvE8instance kind:bss addr:0x020da004 local +@1365 kind:bss addr:0x020da008 local +_ZZN24UnkStruct_ov024_020d866019func_ov024_020c4ac0EvE8instance kind:bss addr:0x020da014 local +data_ov024_020d8694 kind:bss addr:0x020da034 data_ov024_020d8698 kind:bss addr:0x020da038 -data_ov024_020da03c kind:bss addr:0x020da03c -data_ov024_020da040 kind:bss addr:0x020da040 +data_ov024_020d869c kind:bss(size=0x2) addr:0x020da03c local +data_ov024_020d86a0 kind:bss addr:0x020da040 data_ov024_020da044 kind:bss addr:0x020da044 data_ov024_020da048 kind:bss addr:0x020da048 data_ov024_020da04c kind:bss addr:0x020da04c diff --git a/config/jp/arm9/overlays/ov025/relocs.txt b/config/jp/arm9/overlays/ov025/relocs.txt index 574cfab7..60564d45 100644 --- a/config/jp/arm9/overlays/ov025/relocs.txt +++ b/config/jp/arm9/overlays/ov025/relocs.txt @@ -90,7 +90,7 @@ from:0x020c65cc kind:load to:0x020c73cc add:0x8 module:overlay(25) from:0x020c65d0 kind:load to:0x0204b15c module:main from:0x020c65d4 kind:load to:0x020c73fc module:overlay(25) from:0x020c65d8 kind:load to:0x020c7410 module:overlay(25) -from:0x020c65e0 kind:load to:0x0204c42c module:main +from:0x020c65e0 kind:load to:0x0204b690 add:0xd9c module:main from:0x020c65fc kind:arm_call to:0x0206edf8 module:overlay(0) from:0x020c6604 kind:arm_call to:0x020c71ec module:overlay(25) from:0x020c660c kind:arm_call to:0x0201662c module:main @@ -139,7 +139,7 @@ from:0x020c69a4 kind:arm_call to:0x02061f4c module:overlay(0) from:0x020c69f4 kind:arm_call to:0x0201c2c8 module:main from:0x020c6a0c kind:arm_call to:0x0201c2f4 module:main from:0x020c6a18 kind:load to:0x020c739c module:overlay(25) -from:0x020c6a1c kind:load to:0x0204c42c module:main +from:0x020c6a1c kind:load to:0x0204b690 add:0xd9c module:main from:0x020c6a58 kind:arm_call to:0x020c6674 module:overlay(25) from:0x020c6b94 kind:arm_call to:0x0201ee3c module:main from:0x020c6ba0 kind:arm_call to:0x02062080 module:overlay(0) @@ -167,7 +167,7 @@ from:0x020c6e84 kind:arm_call to:0x020c71b4 module:overlay(25) from:0x020c6e90 kind:arm_call to:0x0201c284 module:main from:0x020c6ea4 kind:arm_call to:0x020c71ec module:overlay(25) from:0x020c6eb0 kind:arm_call to:0x0201c284 module:main -from:0x020c6eb8 kind:load to:0x0204c42c module:main +from:0x020c6eb8 kind:load to:0x0204b690 add:0xd9c module:main from:0x020c6f20 kind:arm_call to:0x020611a8 module:overlay(0) from:0x020c6f44 kind:arm_call to:0x0201aa68 module:main from:0x020c6f70 kind:arm_call to:0x020611a8 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov025/symbols.txt b/config/jp/arm9/overlays/ov025/symbols.txt index 9435c2f2..d7b00fb9 100644 --- a/config/jp/arm9/overlays/ov025/symbols.txt +++ b/config/jp/arm9/overlays/ov025/symbols.txt @@ -16,7 +16,7 @@ _ZN18TitleScreenManager8vfunc_18Ev kind:function(arm,size=0x34) addr:0x020c63a8 _ZN18TitleScreenManager8vfunc_24Ev kind:function(arm,size=0x20) addr:0x020c63dc _ZN18TitleScreenManager8vfunc_28EPc kind:function(arm,size=0x20) addr:0x020c63fc _ZN18TitleScreenManager8vfunc_2CEPc kind:function(arm,size=0x20) addr:0x020c641c -_ZN18TitleScreenManager8vfunc_38Eiiii kind:function(arm,size=0x4) addr:0x020c643c +_ZN18TitleScreenManager8vfunc_38Ejhss kind:function(arm,size=0x4) addr:0x020c643c _ZN18TitleScreenManager19func_ov025_020c4c20Ev kind:function(arm,size=0x10) addr:0x020c6440 _ZN18TitleScreenManager19func_ov025_020c4c30Ev kind:function(arm,size=0x10) addr:0x020c6450 _ZN18TitleScreenManagerD1Ev kind:function(arm,size=0x14) addr:0x020c6460 diff --git a/config/jp/arm9/overlays/ov026/relocs.txt b/config/jp/arm9/overlays/ov026/relocs.txt index 29cee2c9..6db46750 100644 --- a/config/jp/arm9/overlays/ov026/relocs.txt +++ b/config/jp/arm9/overlays/ov026/relocs.txt @@ -9,9 +9,9 @@ from:0x020da148 kind:arm_call to:0x02011ff4 module:main from:0x020da174 kind:arm_call to:0x020627b8 module:overlay(0) from:0x020da180 kind:arm_call to:0x0201ccc8 module:main from:0x020da188 kind:load to:0x0204b608 module:main -from:0x020da18c kind:load to:0x0204c438 module:main +from:0x020da18c kind:load to:0x0204b690 add:0xda8 module:main from:0x020da1b4 kind:arm_call to:0x020627b8 module:overlay(0) -from:0x020da1bc kind:load to:0x0204c390 module:main +from:0x020da1bc kind:load to:0x0204b690 add:0xd00 module:main from:0x020da1c0 kind:load to:0x0204b608 module:main from:0x020da1e8 kind:arm_call to:0x02018bc4 module:main from:0x020da1f0 kind:arm_call to:0x020b8b6c module:overlay(7) @@ -23,10 +23,10 @@ from:0x020da260 kind:arm_call to:0x020cc914 module:overlay(24) from:0x020da278 kind:arm_call to:0x0201cd20 module:main from:0x020da284 kind:arm_call to:0x02018bc4 module:main from:0x020da28c kind:load to:0x020da034 module:overlay(24) -from:0x020da290 kind:load to:0x0204c438 module:main +from:0x020da290 kind:load to:0x0204b690 add:0xda8 module:main from:0x020da294 kind:load to:0x0204b690 module:main from:0x020da2c4 kind:arm_call to:0x020627b8 module:overlay(0) -from:0x020da2cc kind:load to:0x0204c390 module:main +from:0x020da2cc kind:load to:0x0204b690 add:0xd00 module:main from:0x020da2d0 kind:load to:0x0204b608 module:main from:0x020da2dc kind:arm_call to:0x020c2868 module:overlay(1) from:0x020da304 kind:arm_call to:0x02062764 module:overlay(0) @@ -133,7 +133,7 @@ from:0x020dabf4 kind:arm_call to:0x02011ff4 module:main from:0x020dac20 kind:arm_call to:0x020dac60 module:overlay(26) from:0x020dac24 kind:arm_call to:0x0205deb4 module:overlay(0) from:0x020dac2c kind:arm_call to:0x020fc870 module:overlay(26) -from:0x020dac5c kind:load to:0x0204c390 module:main +from:0x020dac5c kind:load to:0x0204b690 add:0xd00 module:main from:0x020dac6c kind:arm_call to:0x020daf34 module:overlay(26) from:0x020dac7c kind:arm_call to:0x020daf90 module:overlay(26) from:0x020dac80 kind:arm_call to:0x0205deb4 module:overlay(0) @@ -146,7 +146,7 @@ from:0x020dae6c kind:arm_call to:0x0201a9dc module:main from:0x020daea0 kind:arm_call to:0x0201a9dc module:main from:0x020daec4 kind:arm_call to:0x0201a9dc module:main from:0x020daf24 kind:arm_call to:0x0201a9dc module:main -from:0x020daf2c kind:load to:0x0204c390 module:main +from:0x020daf2c kind:load to:0x0204b690 add:0xd00 module:main from:0x020daf30 kind:load to:0x0204c49c module:main from:0x020daf3c kind:arm_call to:0x0205deb4 module:overlay(0) from:0x020daf44 kind:arm_call to:0x020fc870 module:overlay(26) @@ -212,7 +212,7 @@ from:0x020db99c kind:arm_call to:0x020e8f08 module:overlay(26) from:0x020db9e4 kind:arm_call to:0x020dbe4c module:overlay(26) from:0x020db9ec kind:arm_call to:0x020dbe24 module:overlay(26) from:0x020db9f4 kind:load to:0x0213b0b0 module:overlay(26) -from:0x020db9fc kind:load to:0x0204c42c module:main +from:0x020db9fc kind:load to:0x0204b690 add:0xd9c module:main from:0x020dba00 kind:load to:0x027e0ce0 module:dtcm from:0x020dba04 kind:load to:0x027e09b8 module:dtcm from:0x020dba08 kind:load to:0x020b6a14 module:overlay(0) @@ -223,14 +223,14 @@ from:0x020dbafc kind:arm_call to:0x0201ee3c module:main from:0x020dbb10 kind:arm_call to:0x0201c2c8 module:main from:0x020dbb1c kind:load to:0x0204b690 module:main from:0x020dbb20 kind:load to:0x021376a4 module:overlay(26) -from:0x020dbb24 kind:load to:0x0204c42c module:main +from:0x020dbb24 kind:load to:0x0204b690 add:0xd9c module:main from:0x020dbba4 kind:arm_call to:0x0201ecc4 module:main from:0x020dbbe0 kind:arm_call to:0x0201edec module:main from:0x020dbc10 kind:arm_call to:0x0201ee3c module:main from:0x020dbc24 kind:arm_call to:0x0201c2c8 module:main from:0x020dbc30 kind:load to:0x0204b690 module:main from:0x020dbc34 kind:load to:0x021376a4 module:overlay(26) -from:0x020dbc38 kind:load to:0x0204c42c module:main +from:0x020dbc38 kind:load to:0x0204b690 add:0xd9c module:main from:0x020dbc7c kind:arm_call to:0x0202a17c module:main from:0x020dbccc kind:arm_call to:0x0201ed68 module:main from:0x020dbcd8 kind:arm_call to:0x0201ed68 module:main @@ -308,7 +308,7 @@ from:0x020dc758 kind:arm_call to:0x020615b0 module:overlay(0) from:0x020dc75c kind:arm_call to:0x0205deb4 module:overlay(0) from:0x020dc764 kind:arm_call to:0x020e998c module:overlay(26) from:0x020dc784 kind:load to:0x0213b0b0 module:overlay(26) -from:0x020dc78c kind:load to:0x0204c42c module:main +from:0x020dc78c kind:load to:0x0204b690 add:0xd9c module:main from:0x020dc790 kind:load to:0x027e0ce0 module:dtcm from:0x020dc794 kind:load to:0x027e09b8 module:dtcm from:0x020dc798 kind:load to:0x02137704 module:overlay(26) @@ -322,13 +322,13 @@ from:0x020dc930 kind:arm_call to:0x0201edec module:main from:0x020dc964 kind:arm_call to:0x0201ee3c module:main from:0x020dc978 kind:arm_call to:0x0201c2c8 module:main from:0x020dc984 kind:load to:0x021376c4 module:overlay(26) -from:0x020dc988 kind:load to:0x0204c42c module:main +from:0x020dc988 kind:load to:0x0204b690 add:0xd9c module:main from:0x020dc9cc kind:arm_call to:0x0201ecc4 module:main from:0x020dca08 kind:arm_call to:0x0201edec module:main from:0x020dca3c kind:arm_call to:0x0201ee3c module:main from:0x020dca50 kind:arm_call to:0x0201c2c8 module:main from:0x020dca5c kind:load to:0x021376c4 module:overlay(26) -from:0x020dca60 kind:load to:0x0204c42c module:main +from:0x020dca60 kind:load to:0x0204b690 add:0xd9c module:main from:0x020dca9c kind:arm_call to:0x02016614 module:main from:0x020dcab0 kind:arm_call to:0x02019648 module:main from:0x020dcae0 kind:arm_call to:0x020611a8 module:overlay(0) @@ -381,7 +381,7 @@ from:0x020dd308 kind:arm_call to:0x0201a9dc module:main from:0x020dd318 kind:arm_call to:0x0201ed68 module:main from:0x020dd39c kind:arm_call to:0x02029a4c module:main from:0x020dd3e4 kind:arm_call to:0x0201a9dc module:main -from:0x020dd3f0 kind:load to:0x0204c42c module:main +from:0x020dd3f0 kind:load to:0x0204b690 add:0xd9c module:main from:0x020dd3f4 kind:load to:0x0204c49c module:main from:0x020dd434 kind:arm_call to:0x0201ecc4 module:main from:0x020dd468 kind:load to:0x02137718 module:overlay(26) @@ -775,7 +775,7 @@ from:0x020e03e0 kind:load to:0x0213b09c module:overlay(26) from:0x020e03e4 kind:load to:0x0213b214 module:overlay(26) from:0x020e03e8 kind:load to:0x027e09bc module:dtcm from:0x020e03ec kind:load to:0x0203feb0 module:main -from:0x020e03f0 kind:load to:0x0204c42c module:main +from:0x020e03f0 kind:load to:0x0204b690 add:0xd9c module:main from:0x020e0418 kind:arm_call to:0x0205deb4 module:overlay(0) from:0x020e04a0 kind:load to:0x0203feb0 module:main from:0x020e04a4 kind:load to:0x02134718 module:overlay(26) diff --git a/config/jp/arm9/overlays/ov026/symbols.txt b/config/jp/arm9/overlays/ov026/symbols.txt index 5b9bf9c6..a77db2e8 100644 --- a/config/jp/arm9/overlays/ov026/symbols.txt +++ b/config/jp/arm9/overlays/ov026/symbols.txt @@ -1,4 +1,4 @@ -func_ov026_020da0c0 kind:function(arm,size=0x64) addr:0x020da0c0 +_ZN24AdventureModeManager_164C1EP23GameModeManagerBase_104P23GameModeManagerBase_004 kind:function(arm,size=0x64) addr:0x020da0c0 _ZN19func_ov026_020da124D1Ev kind:function(arm,size=0x14) addr:0x020da124 _ZN19func_ov026_020da138D0Ev kind:function(arm,size=0x1c) addr:0x020da138 func_ov026_020da154 kind:function(arm,size=0x3c) addr:0x020da154 @@ -7,7 +7,7 @@ func_ov026_020da1c4 kind:function(arm,size=0x84) addr:0x020da1c4 func_ov026_020da248 kind:function(arm,size=0x50) addr:0x020da248 func_ov026_020da298 kind:function(arm,size=0x3c) addr:0x020da298 func_ov026_020da2d4 kind:function(arm,size=0x40) addr:0x020da2d4 -func_ov026_020da314 kind:function(arm,size=0x6c) addr:0x020da314 +_ZN24AdventureModeManager_16CC1EP23GameModeManagerBase_104 kind:function(arm,size=0x6c) addr:0x020da314 _ZN19func_ov026_020da380D1Ev kind:function(arm,size=0x14) addr:0x020da380 _ZN19func_ov026_020da394D0Ev kind:function(arm,size=0x1c) addr:0x020da394 func_ov026_020da3b0 kind:function(arm,size=0x38) addr:0x020da3b0 @@ -18,11 +18,11 @@ func_ov026_020da534 kind:function(arm,size=0x38) addr:0x020da534 func_ov026_020da56c kind:function(arm,size=0x48) addr:0x020da56c func_ov026_020da5b4 kind:function(arm,size=0x16c) addr:0x020da5b4 func_ov026_020da720 kind:function(arm,size=0x54) addr:0x020da720 -func_ov026_020da774 kind:function(arm,size=0x5c) addr:0x020da774 -func_ov026_020da7d0 kind:function(arm,size=0x14) addr:0x020da7d0 -func_ov026_020da7e4 kind:function(arm,size=0x14) addr:0x020da7e4 -func_ov026_020da7f8 kind:function(arm,size=0x10) addr:0x020da7f8 -func_ov026_020da808 kind:function(arm,size=0x40) addr:0x020da808 +_ZN24AdventureModeManager_16C19func_ov026_020d8dd4Ei kind:function(arm,size=0x5c) addr:0x020da774 +_ZN24AdventureModeManager_16C19func_ov026_020d8e30Ev kind:function(arm,size=0x14) addr:0x020da7d0 +_ZN24AdventureModeManager_16C19func_ov026_020d8e44Ev kind:function(arm,size=0x14) addr:0x020da7e4 +_ZN24AdventureModeManager_16C19func_ov026_020d8e58Ev kind:function(arm,size=0x10) addr:0x020da7f8 +_ZN24AdventureModeManager_19CC1EP23GameModeManagerBase_104 kind:function(arm,size=0x40) addr:0x020da808 func_ov026_020da848 kind:function(arm,size=0x24) addr:0x020da848 func_ov026_020da86c kind:function(arm,size=0xa8) addr:0x020da86c func_ov026_020da914 kind:function(arm,size=0x1c) addr:0x020da914 @@ -85,9 +85,9 @@ func_ov026_020dd970 kind:function(arm,size=0xe0) addr:0x020dd970 func_ov026_020dda50 kind:function(arm,size=0x10) addr:0x020dda50 func_ov026_020dda60 kind:function(arm,size=0x9c) addr:0x020dda60 func_ov026_020ddafc kind:function(arm,size=0x18c) addr:0x020ddafc -func_ov026_020ddc88 kind:function(arm,size=0x10) addr:0x020ddc88 -func_ov026_020ddc98 kind:function(arm,size=0x20) addr:0x020ddc98 -func_ov026_020ddcb8 kind:function(arm,size=0x3c) addr:0x020ddcb8 +_ZN25UnkStruct_027e0ce0_38_15819func_ov026_020dc2d0Ev kind:function(arm,size=0x10) addr:0x020ddc88 +_ZN21UnkStruct_027e0cf8_04C1Ev kind:function(arm,size=0x20) addr:0x020ddc98 +_ZN21UnkStruct_027e0cf8_0419func_ov026_020dc300Ev kind:function(arm,size=0x3c) addr:0x020ddcb8 func_ov026_020ddcf4 kind:function(arm,size=0x58) addr:0x020ddcf4 func_ov026_020ddd4c kind:function(arm,size=0x6c) addr:0x020ddd4c func_ov026_020dddb8 kind:function(arm,size=0x34) addr:0x020dddb8 @@ -129,14 +129,14 @@ func_ov026_020e206c kind:function(arm,size=0xba0) addr:0x020e206c func_ov026_020e2c0c kind:function(arm,size=0x64) addr:0x020e2c0c func_ov026_020e2c70 kind:function(arm,size=0x568) addr:0x020e2c70 func_ov026_020e31d8 kind:function(arm,size=0x64) addr:0x020e31d8 -func_ov026_020e323c kind:function(arm,size=0x4c) addr:0x020e323c -func_ov026_020e3288 kind:function(arm,size=0xdc) addr:0x020e3288 +_ZN24UnkStruct_ov026_02138d1019func_ov026_020e13f4Ev kind:function(arm,size=0x4c) addr:0x020e323c +_ZN24UnkStruct_ov026_02138d1019func_ov026_020e1440Ev kind:function(arm,size=0xdc) addr:0x020e3288 func_ov026_020e3364 kind:function(arm,size=0x10c) addr:0x020e3364 func_ov026_020e3470 kind:function(arm,size=0x18) addr:0x020e3470 func_ov026_020e3488 kind:function(arm,size=0x120) addr:0x020e3488 func_ov026_020e35a8 kind:function(arm,size=0x18) addr:0x020e35a8 func_ov026_020e35c0 kind:function(arm,size=0x184) addr:0x020e35c0 -func_ov026_020e3744 kind:function(arm,size=0x2c) addr:0x020e3744 +_ZN24UnkStruct_ov026_02138d1019func_ov026_020e18fcEv kind:function(arm,size=0x2c) addr:0x020e3744 func_ov026_020e3770 kind:function(arm,size=0x14c) addr:0x020e3770 func_ov026_020e38bc kind:function(arm,size=0x4) addr:0x020e38bc func_ov026_020e38c0 kind:function(arm,size=0x18) addr:0x020e38c0 @@ -210,7 +210,7 @@ func_ov026_020e873c kind:function(arm,size=0x64) addr:0x020e873c func_ov026_020e87a0 kind:function(arm,size=0xcc) addr:0x020e87a0 func_ov026_020e886c kind:function(arm,size=0xcc) addr:0x020e886c func_ov026_020e8938 kind:function(arm,size=0xcc) addr:0x020e8938 -func_ov026_020e8a04 kind:function(arm,size=0x64) addr:0x020e8a04 +_ZN24UnkStruct_ov026_02138d1019func_ov026_020e6a6cEv kind:function(arm,size=0x64) addr:0x020e8a04 func_ov026_020e8a68 kind:function(arm,size=0x38) addr:0x020e8a68 func_ov026_020e8aa0 kind:function(arm,size=0x24) addr:0x020e8aa0 func_ov026_020e8ac4 kind:function(arm,size=0x24) addr:0x020e8ac4 @@ -682,8 +682,8 @@ _ZN19func_ov026_020f6610D1Ev kind:function(arm,size=0x70) addr:0x020f6610 _ZN19func_ov026_020f6680D0Ev kind:function(arm,size=0x78) addr:0x020f6680 func_ov026_020f66f8 kind:function(arm,size=0x68) addr:0x020f66f8 func_ov026_020f6760 kind:function(arm,size=0x14) addr:0x020f6760 -func_ov026_020f6774 kind:function(arm,size=0x2c) addr:0x020f6774 -func_ov026_020f67a0 kind:function(arm,size=0x298) addr:0x020f67a0 +_ZN24UnkStruct_ov026_0213f57819func_ov026_020f4844Ev kind:function(arm,size=0x2c) addr:0x020f6774 +_ZN24UnkStruct_027e0ce0_38_1019func_ov026_020f4870Ev kind:function(arm,size=0x298) addr:0x020f67a0 func_ov026_020f6a38 kind:function(arm,size=0x24) addr:0x020f6a38 func_ov026_020f6a5c kind:function(arm,size=0x34) addr:0x020f6a5c func_ov026_020f6a90 kind:function(arm,size=0x28) addr:0x020f6a90 @@ -809,7 +809,7 @@ func_ov026_020f9a74 kind:function(arm,size=0x40) addr:0x020f9a74 func_ov026_020f9ab4 kind:function(arm,size=0xe0) addr:0x020f9ab4 func_ov026_020f9b94 kind:function(arm,size=0x24) addr:0x020f9b94 func_ov026_020f9bb8 kind:function(arm,size=0x38) addr:0x020f9bb8 -func_ov026_020f9bf0 kind:function(arm,size=0x24) addr:0x020f9bf0 +_ZN24UnkStruct_ov026_0213f59019func_ov026_020f7cc0Ev kind:function(arm,size=0x24) addr:0x020f9bf0 func_ov026_020f9c14 kind:function(arm,size=0x74) addr:0x020f9c14 func_ov026_020f9c88 kind:function(arm,size=0x74) addr:0x020f9c88 func_ov026_020f9cfc kind:function(arm,size=0x3c) addr:0x020f9cfc @@ -2730,7 +2730,7 @@ data_ov026_02138c78 kind:data(any) addr:0x02138c78 data_ov026_02138c94 kind:data(any) addr:0x02138c94 data_ov026_02138cbc kind:data(any) addr:0x02138cbc data_ov026_02138ce4 kind:data(any) addr:0x02138ce4 -data_ov026_02138d10 kind:data(any) addr:0x02138d10 +data_ov026_02138d10_jp kind:data(any) addr:0x02138d10 data_ov026_02138d58 kind:data(any) addr:0x02138d58 data_ov026_02138d6c kind:data(any) addr:0x02138d6c data_ov026_02138d88 kind:data(any) addr:0x02138d88 @@ -2936,7 +2936,7 @@ data_ov026_0213b0a0 kind:bss addr:0x0213b0a0 data_ov026_0213b0a4 kind:bss addr:0x0213b0a4 data_ov026_0213b0a8 kind:bss addr:0x0213b0a8 data_ov026_0213b0ac kind:bss addr:0x0213b0ac -data_ov026_0213b0b0 kind:bss addr:0x0213b0b0 +data_ov026_02138d10 kind:bss addr:0x0213b0b0 data_ov026_0213b0b4 kind:bss addr:0x0213b0b4 data_ov026_0213b0b8 kind:bss addr:0x0213b0b8 data_ov026_0213b0bc kind:bss addr:0x0213b0bc @@ -3016,10 +3016,10 @@ data_ov026_0214151c kind:bss addr:0x0214151c ambiguous data_ov026_021418e4 kind:bss addr:0x021418e4 data_ov026_021418ec kind:bss addr:0x021418ec data_ov026_021418f4 kind:bss addr:0x021418f4 -data_ov026_021418f8 kind:bss addr:0x021418f8 +data_ov026_0213f578 kind:bss addr:0x021418f8 data_ov026_021418fc kind:bss addr:0x021418fc data_ov026_02141904 kind:bss addr:0x02141904 -data_ov026_02141910 kind:bss addr:0x02141910 +data_ov026_0213f590 kind:bss addr:0x02141910 data_ov026_0214196c kind:bss addr:0x0214196c data_ov026_02141974 kind:bss addr:0x02141974 data_ov026_02141980 kind:bss addr:0x02141980 diff --git a/config/jp/arm9/overlays/ov031/relocs.txt b/config/jp/arm9/overlays/ov031/relocs.txt index d74bfb77..b024009d 100644 --- a/config/jp/arm9/overlays/ov031/relocs.txt +++ b/config/jp/arm9/overlays/ov031/relocs.txt @@ -6124,8 +6124,8 @@ from:0x02110430 kind:arm_call to:0x020db2ec module:overlay(31) from:0x0211043c kind:load to:0x027e0994 module:dtcm from:0x02110440 kind:load to:0x0204b690 module:main from:0x02110444 kind:load to:0x0204b608 module:main -from:0x02110448 kind:load to:0x0204c450 module:main -from:0x02110450 kind:load to:0x0204c42c module:main +from:0x02110448 kind:load to:0x0204b690 add:0xdc0 module:main +from:0x02110450 kind:load to:0x0204b690 add:0xd9c module:main from:0x02110454 kind:load to:0x020453b0 module:main from:0x02110458 kind:load to:0x02165fe8 module:overlays(59,63,68,84) from:0x0211045c kind:load to:0x020b6770 module:overlay(0) @@ -6158,7 +6158,7 @@ from:0x0211065c kind:arm_call to:0x0215e7f4 module:overlays(63,66,84) from:0x02110670 kind:arm_call to:0x02067b40 module:overlay(0) from:0x021106c4 kind:arm_call to:0x0201d904 module:main from:0x021106e0 kind:arm_call to:0x02019a0c module:main -from:0x021106ec kind:load to:0x0204c42c module:main +from:0x021106ec kind:load to:0x0204b690 add:0xd9c module:main from:0x021106f0 kind:load to:0x027e0d34 module:dtcm from:0x021106f4 kind:load to:0x0204b690 module:main from:0x021106f8 kind:load to:0x027e0998 module:dtcm @@ -6167,7 +6167,7 @@ from:0x02110700 kind:load to:0x0204b608 module:main from:0x02110704 kind:load to:0x020453b0 module:main from:0x02110708 kind:load to:0x02165fe8 module:overlays(59,63,68,84) from:0x0211070c kind:load to:0x020b6770 module:overlay(0) -from:0x02110710 kind:load to:0x0204c450 module:main +from:0x02110710 kind:load to:0x0204b690 add:0xdc0 module:main from:0x02110714 kind:load to:0x0204b50c module:main from:0x02110744 kind:arm_call to:0x0201b974 module:main from:0x02110758 kind:arm_call to:0x0201b798 module:main diff --git a/config/jp/arm9/overlays/ov031/symbols.txt b/config/jp/arm9/overlays/ov031/symbols.txt index 716ea259..07cca00b 100644 --- a/config/jp/arm9/overlays/ov031/symbols.txt +++ b/config/jp/arm9/overlays/ov031/symbols.txt @@ -60,8 +60,8 @@ func_ov031_020db144 kind:function(arm,size=0x10) addr:0x020db144 func_ov031_020db154 kind:function(arm,size=0x10) addr:0x020db154 func_ov031_020db164 kind:function(arm,size=0x10) addr:0x020db164 func_ov031_020db174 kind:function(arm,size=0x10) addr:0x020db174 -func_ov031_020db184 kind:function(arm,size=0x10) addr:0x020db184 -func_ov031_020db194 kind:function(arm,size=0x10) addr:0x020db194 +_ZN18UnkStruct_027e0d3419func_ov031_020d97e4Ev kind:function(arm,size=0x10) addr:0x020db184 +_ZN18UnkStruct_027e0d3419func_ov031_020d97f4Ev kind:function(arm,size=0x10) addr:0x020db194 func_ov031_020db1a4 kind:function(arm,size=0x10) addr:0x020db1a4 func_ov031_020db1b4 kind:function(arm,size=0x10) addr:0x020db1b4 func_ov031_020db1c4 kind:function(arm,size=0x10) addr:0x020db1c4 @@ -1888,7 +1888,7 @@ _ZN16MapObjectUnkSWFS19func_ov031_0210d924Ev kind:function(arm,size=0x1c) addr:0 _ZN16MapObjectUnkSWFSD1Ev kind:function(arm,size=0x28) addr:0x0210f6b0 _ZN16MapObjectUnkSWFS19func_ov031_0210d968Ev kind:function(arm,size=0x30) addr:0x0210f6d8 _ZN23MapObjectProfileUnkSWFSD1Ev kind:function(arm,size=0x14) addr:0x0210f708 -func_ov031_0210d9ac kind:function(arm,size=0x58) addr:0x0210f71c +_ZN24AdventureModeManager_168C1EP23GameModeManagerBase_104 kind:function(arm,size=0x58) addr:0x0210f71c _ZN19func_ov031_0210da04D1Ev kind:function(arm,size=0x14) addr:0x0210f774 _ZN19func_ov031_0210da18D0Ev kind:function(arm,size=0x1c) addr:0x0210f788 func_ov031_0210da34 kind:function(arm,size=0x8c) addr:0x0210f7a4 @@ -1897,12 +1897,12 @@ func_ov031_0210dca8 kind:function(arm,size=0x80) addr:0x0210fa18 func_ov031_0210dd28 kind:function(arm,size=0x4) addr:0x0210fa98 func_ov031_0210dd2c kind:function(arm,size=0x38) addr:0x0210fa9c func_ov031_0210dd64 kind:function(arm,size=0x1fc) addr:0x0210fad4 -func_ov031_0210df60 kind:function(arm,size=0x10) addr:0x0210fcd0 -func_ov031_0210df70 kind:function(arm,size=0x5c) addr:0x0210fce0 -func_ov031_0210dfcc kind:function(arm,size=0xc) addr:0x0210fd3c -func_ov031_0210dfd8 kind:function(arm,size=0x28) addr:0x0210fd48 +_ZN24AdventureModeManager_16819func_ov031_0210df60Ei kind:function(arm,size=0x10) addr:0x0210fcd0 +_ZN24AdventureModeManager_16819func_ov031_0210df70Ei kind:function(arm,size=0x5c) addr:0x0210fce0 +_ZN24AdventureModeManager_16819func_ov031_0210dfccEv kind:function(arm,size=0xc) addr:0x0210fd3c +_ZN24AdventureModeManager_16819func_ov031_0210dfd8Ev kind:function(arm,size=0x28) addr:0x0210fd48 func_ov031_0210e000 kind:function(arm,size=0x18) addr:0x0210fd70 -func_ov031_0210e018 kind:function(arm,size=0x5c) addr:0x0210fd88 +_ZN24AdventureModeManager_188C1EP23GameModeManagerBase_104 kind:function(arm,size=0x5c) addr:0x0210fd88 func_ov031_0210e074 kind:function(arm,size=0x14) addr:0x0210fde4 func_ov031_0210e088 kind:function(arm,size=0x38) addr:0x0210fdf8 func_ov031_0210e0c0 kind:function(arm,size=0x2c) addr:0x0210fe30 @@ -1915,7 +1915,7 @@ _ZN19func_ov031_0210e278D0Ev kind:function(arm,size=0x1c) addr:0x0210ffe8 _ZN19func_ov031_0210e294D1Ev kind:function(arm,size=0x20) addr:0x02110004 _ZN19func_ov031_0210e2b4D0Ev kind:function(arm,size=0x28) addr:0x02110024 func_ov031_0210e2dc kind:function(arm,size=0x104) addr:0x0211004c -func_ov031_0210e3e0 kind:function(arm,size=0x74) addr:0x02110150 +_ZN24AdventureModeManager_194C1EP23GameModeManagerBase_104 kind:function(arm,size=0x74) addr:0x02110150 func_ov031_0210e454 kind:function(arm,size=0x14) addr:0x021101c4 func_ov031_0210e468 kind:function(arm,size=0x50) addr:0x021101d8 func_ov031_0210e4b8 kind:function(arm,size=0xc8) addr:0x02110228 @@ -1943,8 +1943,8 @@ func_ov031_0210f930 kind:function(arm,size=0xac) addr:0x021116a0 func_ov031_0210f9dc kind:function(arm,size=0x4c) addr:0x0211174c _ZN19func_ov031_0210fa28D1Ev kind:function(arm,size=0x14) addr:0x02111798 _ZN19func_ov031_0210fa3cD0Ev kind:function(arm,size=0x1c) addr:0x021117ac -func_ov031_0210fa58 kind:function(arm,size=0x78) addr:0x021117c8 -func_ov031_0210fad0 kind:function(arm,size=0x114) addr:0x02111840 +_ZN24AdventureModeManager_1B0C1Ev kind:function(arm,size=0x78) addr:0x021117c8 +_ZN24AdventureModeManager_1B019func_ov031_0210fad0Ev kind:function(arm,size=0x114) addr:0x02111840 func_ov031_0210fbe4 kind:function(arm,size=0x4) addr:0x02111954 func_ov031_0210fbe8 kind:function(arm,size=0x104) addr:0x02111958 _ZN19func_ov031_0210fcecD1Ev kind:function(arm,size=0x14) addr:0x02111a5c diff --git a/config/jp/arm9/overlays/ov058/symbols.txt b/config/jp/arm9/overlays/ov058/symbols.txt index 4c082664..c4eebe36 100644 --- a/config/jp/arm9/overlays/ov058/symbols.txt +++ b/config/jp/arm9/overlays/ov058/symbols.txt @@ -640,7 +640,7 @@ _ZN23MapObjectProfileUnkSWCBD1Ev kind:function(arm,size=0x14) addr:0x02154690 func_ov058_021546a4 kind:function(thumb,size=0x5a) addr:0x021546a4 func_ov058_02154700 kind:function(arm,size=0x60) addr:0x02154700 _ZN27UnkStruct_ov000_0208f820_2819func_ov058_02152a24Ev kind:function(thumb,size=0x64) addr:0x02154760 -func_ov058_021547c4 kind:function(arm,size=0x60) addr:0x021547c4 +_ZN24AdventureModeManager_198C1EP23GameModeManagerBase_104 kind:function(arm,size=0x60) addr:0x021547c4 _ZN19func_ov058_02154824D1Ev kind:function(arm,size=0x20) addr:0x02154824 _ZN19func_ov058_02154844D0Ev kind:function(arm,size=0x28) addr:0x02154844 func_ov058_0215486c kind:function(arm,size=0x14) addr:0x0215486c diff --git a/config/jp/arm9/overlays/ov060/relocs.txt b/config/jp/arm9/overlays/ov060/relocs.txt index fe9ac1fd..cca3ca26 100644 --- a/config/jp/arm9/overlays/ov060/relocs.txt +++ b/config/jp/arm9/overlays/ov060/relocs.txt @@ -216,7 +216,7 @@ from:0x0215bf7c kind:load to:0x02164f04 module:overlay(60) from:0x0215bf80 kind:load to:0x0203feb0 module:main from:0x0215bf84 kind:load to:0x02164ef8 module:overlay(60) from:0x0215bf88 kind:load to:0x027e0998 module:dtcm -from:0x0215bf8c kind:load to:0x0204c42c module:main +from:0x0215bf8c kind:load to:0x0204b690 add:0xd9c module:main from:0x0215bf90 kind:load to:0x0204c49c module:main from:0x0215bf94 kind:load to:0x02164f34 module:overlay(60) from:0x0215bfa0 kind:arm_call to:0x020e9ea0 module:overlay(31) diff --git a/config/jp/arm9/overlays/ov062/relocs.txt b/config/jp/arm9/overlays/ov062/relocs.txt index 1d5e65ca..3100d114 100644 --- a/config/jp/arm9/overlays/ov062/relocs.txt +++ b/config/jp/arm9/overlays/ov062/relocs.txt @@ -821,7 +821,7 @@ from:0x0215ebc4 kind:arm_call to:0x02061db4 module:overlay(0) from:0x0215ebf8 kind:arm_call to:0x020611a8 module:overlay(0) from:0x0215ec10 kind:arm_call to:0x0215f544 module:overlay(62) from:0x0215ec20 kind:load to:0x021625fc add:0x8 module:overlay(62) -from:0x0215ec24 kind:load to:0x0204c42c module:main +from:0x0215ec24 kind:load to:0x0204b690 add:0xd9c module:main from:0x0215ec28 kind:load to:0x0204b690 module:main from:0x0215ec2c kind:load to:0x02162654 module:overlay(62) from:0x0215ec30 kind:load to:0x02162668 module:overlay(62) @@ -954,7 +954,7 @@ from:0x0215f23c kind:arm_call to:0x0216028c module:overlay(62) from:0x0215f244 kind:arm_call to:0x02160028 module:overlay(62) from:0x0215f24c kind:arm_call to:0x02160028 module:overlay(62) from:0x0215f258 kind:arm_call to:0x02160028 module:overlay(62) -from:0x0215f270 kind:load to:0x0204c42c module:main +from:0x0215f270 kind:load to:0x0204b690 add:0xd9c module:main from:0x0215f274 kind:load to:0x020b69b8 module:overlay(0) from:0x0215f278 kind:load to:0x027e0ce0 module:dtcm from:0x0215f27c kind:load to:0x020b7d20 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov062/symbols.txt b/config/jp/arm9/overlays/ov062/symbols.txt index 5e008a70..b40a9f56 100644 --- a/config/jp/arm9/overlays/ov062/symbols.txt +++ b/config/jp/arm9/overlays/ov062/symbols.txt @@ -247,12 +247,12 @@ func_ov062_0215dd94 kind:function(arm,size=0x24) addr:0x0215dd94 func_ov062_0215ddb8 kind:function(arm,size=0x4) addr:0x0215ddb8 func_ov062_0215ddbc kind:function(arm,size=0x94) addr:0x0215ddbc func_ov062_0215de50 kind:function(arm,size=0x3c) addr:0x0215de50 -func_ov062_0215de8c kind:function(arm,size=0x40) addr:0x0215de8c +_ZN24AdventureModeManager_17CC1EP23GameModeManagerBase_104 kind:function(arm,size=0x40) addr:0x0215de8c func_ov062_0215decc kind:function(arm,size=0x28) addr:0x0215decc func_ov062_0215def4 kind:function(arm,size=0x1c) addr:0x0215def4 _ZN19func_ov062_0215df10D1Ev kind:function(arm,size=0x20) addr:0x0215df10 _ZN19func_ov062_0215df30D0Ev kind:function(arm,size=0x28) addr:0x0215df30 -func_ov062_0215df58 kind:function(arm,size=0x40) addr:0x0215df58 +_ZN24AdventureModeManager_1A0C1EP23GameModeManagerBase_104 kind:function(arm,size=0x40) addr:0x0215df58 func_ov062_0215df98 kind:function(arm,size=0x38) addr:0x0215df98 func_ov062_0215dfd0 kind:function(arm,size=0x28) addr:0x0215dfd0 func_ov062_0215dff8 kind:function(arm,size=0x28) addr:0x0215dff8 @@ -261,7 +261,7 @@ func_ov062_0215e058 kind:function(arm,size=0x28) addr:0x0215e058 func_ov062_0215e080 kind:function(arm,size=0x1c) addr:0x0215e080 _ZN19func_ov062_0215e09cD1Ev kind:function(arm,size=0x20) addr:0x0215e09c _ZN19func_ov062_0215e0bcD0Ev kind:function(arm,size=0x28) addr:0x0215e0bc -func_ov062_0215e0e4 kind:function(arm,size=0x40) addr:0x0215e0e4 +_ZN24AdventureModeManager_1A4C1EP23GameModeManagerBase_104 kind:function(arm,size=0x40) addr:0x0215e0e4 func_ov062_0215e124 kind:function(arm,size=0x38) addr:0x0215e124 func_ov062_0215e15c kind:function(arm,size=0x28) addr:0x0215e15c func_ov062_0215e184 kind:function(arm,size=0x28) addr:0x0215e184 diff --git a/config/jp/arm9/overlays/ov065/relocs.txt b/config/jp/arm9/overlays/ov065/relocs.txt index 6803a539..06a3d086 100644 --- a/config/jp/arm9/overlays/ov065/relocs.txt +++ b/config/jp/arm9/overlays/ov065/relocs.txt @@ -275,7 +275,7 @@ from:0x0215b5f4 kind:arm_call to:0x0201a9dc module:main from:0x0215b600 kind:load to:0x027e09a4 module:dtcm from:0x0215b604 kind:load to:0x027e0998 module:dtcm from:0x0215b608 kind:load to:0x0215d47c module:overlay(65) -from:0x0215b60c kind:load to:0x0204c490 module:main +from:0x0215b60c kind:load to:0x0204b690 add:0xe00 module:main from:0x0215b614 kind:load to:0x0204c49c module:main from:0x0215b618 kind:load to:0x0215d48c module:overlay(65) from:0x0215b624 kind:arm_call to:0x02099c30 module:overlay(0) diff --git a/config/jp/arm9/overlays/ov071/relocs.txt b/config/jp/arm9/overlays/ov071/relocs.txt index 3ab4ee94..497fb624 100644 --- a/config/jp/arm9/overlays/ov071/relocs.txt +++ b/config/jp/arm9/overlays/ov071/relocs.txt @@ -990,7 +990,7 @@ from:0x0215c2b8 kind:arm_call to:0x0201a9dc module:main from:0x0215c2c4 kind:load to:0x0203feb0 module:main from:0x0215c2c8 kind:load to:0x02167360 module:overlay(71) from:0x0215c2cc kind:load to:0x027e0998 module:dtcm -from:0x0215c2d0 kind:load to:0x0204c42c module:main +from:0x0215c2d0 kind:load to:0x0204b690 add:0xd9c module:main from:0x0215c2d4 kind:load to:0x0204c49c module:main from:0x0215c2d8 kind:load to:0x0216737c module:overlay(71) from:0x0215c388 kind:arm_call to:0x0201a9dc module:main diff --git a/config/jp/arm9/overlays/ov088/relocs.txt b/config/jp/arm9/overlays/ov088/relocs.txt index a6a0ed52..c51e0338 100644 --- a/config/jp/arm9/overlays/ov088/relocs.txt +++ b/config/jp/arm9/overlays/ov088/relocs.txt @@ -1845,10 +1845,10 @@ from:0x0217563c kind:arm_call to:0x020611a8 module:overlay(0) from:0x02175658 kind:arm_call to:0x0201edec module:main from:0x02175680 kind:arm_call to:0x0201ee3c module:main from:0x02175694 kind:arm_call to:0x0201c2c8 module:main -from:0x0217569c kind:load to:0x0204c42c module:main +from:0x0217569c kind:load to:0x0204b690 add:0xd9c module:main from:0x021757d0 kind:arm_call to:0x0201ee3c module:main from:0x021757e4 kind:arm_call to:0x0201c2c8 module:main -from:0x02175840 kind:load to:0x0204c42c module:main +from:0x02175840 kind:load to:0x0204b690 add:0xd9c module:main from:0x02175844 kind:load to:0x02178320 module:overlay(88) from:0x02175870 kind:arm_call to:0x0201a9dc module:main from:0x02175878 kind:load to:0x0204c49c module:main diff --git a/config/jp/arm9/overlays/ov088/symbols.txt b/config/jp/arm9/overlays/ov088/symbols.txt index c74cddd1..a566fd53 100644 --- a/config/jp/arm9/overlays/ov088/symbols.txt +++ b/config/jp/arm9/overlays/ov088/symbols.txt @@ -520,7 +520,7 @@ _ZN12ActorUnkRMM219func_ov088_02172298Ev kind:function(arm,size=0x8) addr:0x0217 _ZN12ActorUnkRMM2D1Ev kind:function(arm,size=0x28) addr:0x02174500 _ZN12ActorUnkRMM2D0Ev kind:function(arm,size=0x30) addr:0x02174528 _ZN19ActorProfileUnkRMM2D1Ev kind:function(arm,size=0x14) addr:0x02174558 -func_ov088_0217456c kind:function(arm,size=0x30) addr:0x0217456c +_ZN23GameModeManagerBase_10419func_ov088_0217230cEv kind:function(arm,size=0x30) addr:0x0217456c func_ov088_0217459c kind:function(arm,size=0x158) addr:0x0217459c func_ov088_021746f4 kind:function(arm,size=0x74) addr:0x021746f4 _ZN19func_ov088_02174768D0Ev kind:function(arm,size=0x7c) addr:0x02174768 @@ -556,7 +556,7 @@ func_ov088_0217560c kind:function(arm,size=0x94) addr:0x0217560c func_ov088_021756a0 kind:function(arm,size=0x1a8) addr:0x021756a0 func_ov088_02175848 kind:function(arm,size=0x34) addr:0x02175848 func_ov088_0217587c kind:function(arm,size=0x14) addr:0x0217587c -func_ov088_02175890 kind:function(arm,size=0x50) addr:0x02175890 +_ZN24AdventureModeManager_1A8C1EP23GameModeManagerBase_104 kind:function(arm,size=0x50) addr:0x02175890 func_ov088_021758e0 kind:function(arm,size=0x4c) addr:0x021758e0 func_ov088_0217592c kind:function(arm,size=0x3c) addr:0x0217592c func_ov088_02175968 kind:function(arm,size=0x5c) addr:0x02175968 diff --git a/config/jp/arm9/overlays/ov093/relocs.txt b/config/jp/arm9/overlays/ov093/relocs.txt index f5379937..687dc012 100644 --- a/config/jp/arm9/overlays/ov093/relocs.txt +++ b/config/jp/arm9/overlays/ov093/relocs.txt @@ -281,7 +281,7 @@ from:0x0216b098 kind:load to:0x0204fb78 module:main from:0x0216b0a0 kind:load to:0x027e09a4 module:dtcm from:0x0216b0a4 kind:load to:0x0217b7c0 module:overlay(93) from:0x0216b0a8 kind:load to:0x0217b1e0 module:overlay(93) -from:0x0216b0ac kind:load to:0x0204c42c module:main +from:0x0216b0ac kind:load to:0x0204b690 add:0xd9c module:main from:0x0216b0e8 kind:arm_call to:0x0208d134 module:overlay(0) from:0x0216b10c kind:arm_call to:0x0216a710 module:overlay(93) from:0x0216b118 kind:load to:0x027e0ce0 module:dtcm diff --git a/config/jp/arm9/overlays/ov093/symbols.txt b/config/jp/arm9/overlays/ov093/symbols.txt index 6dda1c85..e566d39b 100644 --- a/config/jp/arm9/overlays/ov093/symbols.txt +++ b/config/jp/arm9/overlays/ov093/symbols.txt @@ -390,9 +390,9 @@ func_ov093_02177bb4 kind:function(arm,size=0x1c8) addr:0x02177bb4 func_ov093_02177d7c kind:function(arm,size=0x11c) addr:0x02177d7c _ZN19func_ov093_02177e98D1Ev kind:function(arm,size=0x14) addr:0x02177e98 _ZN19func_ov093_02177eacD0Ev kind:function(arm,size=0x1c) addr:0x02177eac -func_ov093_02177ec8 kind:function(thumb,size=0x40) addr:0x02177ec8 -func_ov093_02177f08 kind:function(thumb,size=0xc) addr:0x02177f08 -func_ov093_02177f14 kind:function(arm,size=0x34) addr:0x02177f14 +_ZN24AdventureModeManager_1BCC1Ev kind:function(thumb,size=0x40) addr:0x02177ec8 +_ZN24AdventureModeManager_1BCD1Ev kind:function(thumb,size=0xc) addr:0x02177f08 +_ZN24AdventureModeManager_1BC19func_ov093_02175514Ev kind:function(arm,size=0x34) addr:0x02177f14 func_ov093_02177f48 kind:function(arm,size=0x9c) addr:0x02177f48 func_ov093_02177fe4 kind:function(arm,size=0xd8) addr:0x02177fe4 func_ov093_021780bc kind:function(thumb,size=0x20) addr:0x021780bc diff --git a/config/jp/arm9/overlays/ov111/relocs.txt b/config/jp/arm9/overlays/ov111/relocs.txt index 5c808b8c..f54fd12c 100644 --- a/config/jp/arm9/overlays/ov111/relocs.txt +++ b/config/jp/arm9/overlays/ov111/relocs.txt @@ -59,7 +59,7 @@ from:0x02186c34 kind:load to:0x027e09bc module:dtcm from:0x02186c38 kind:load to:0x0204fb78 module:main from:0x02186c3c kind:load to:0x0204b608 module:main from:0x02186c40 kind:load to:0x0204b690 module:main -from:0x02186c44 kind:load to:0x0204c390 module:main +from:0x02186c44 kind:load to:0x0204b690 add:0xd00 module:main from:0x02186c48 kind:load to:0x027e09ac module:dtcm from:0x02186c4c kind:load to:0x027e0ce0 module:dtcm from:0x02186c50 kind:load to:0x027e09a4 module:dtcm diff --git a/config/jp/arm9/relocs.txt b/config/jp/arm9/relocs.txt index 43cd5d4b..d5fdebc8 100644 --- a/config/jp/arm9/relocs.txt +++ b/config/jp/arm9/relocs.txt @@ -2683,7 +2683,7 @@ from:0x0201bd68 kind:arm_call to:0x0201c0d0 module:main from:0x0201bd98 kind:arm_call to:0x020a0ed4 module:overlay(0) from:0x0201bdb4 kind:arm_call_thumb to:0x0201c804 module:main from:0x0201bdc4 kind:arm_call_thumb to:0x0201c804 module:main -from:0x0201bdd8 kind:load to:0x0204b6a0 module:main +from:0x0201bdd8 kind:load to:0x0204b690 add:0x10 module:main from:0x0201bde8 kind:arm_call to:0x0201c05c module:main from:0x0201bdf4 kind:arm_call to:0x020a0efc module:overlay(0) from:0x0201be38 kind:arm_call to:0x0201c194 module:main @@ -2765,7 +2765,7 @@ from:0x0201d070 kind:arm_call to:0x02025e64 module:main from:0x0201d0ac kind:arm_call to:0x02025e64 module:main from:0x0201d0c8 kind:arm_call to:0x02025e64 module:main from:0x0201d0e4 kind:load to:0x0204b690 module:main -from:0x0201d0ec kind:load to:0x0204c490 module:main +from:0x0201d0ec kind:load to:0x0204b690 add:0xe00 module:main from:0x0201d100 kind:load to:0x027e0120 module:dtcm from:0x0201d108 kind:load to:0x0204fbc0 module:main from:0x0201d120 kind:arm_call to:0x01ff9f14 module:itcm @@ -2788,12 +2788,12 @@ from:0x0201d554 kind:arm_call to:0x0201e6c4 module:main from:0x0201d570 kind:arm_call to:0x02025e64 module:main from:0x0201d57c kind:load to:0x027e0120 module:dtcm from:0x0201d580 kind:load to:0x0204b690 module:main -from:0x0201d584 kind:load to:0x0204c490 module:main +from:0x0201d584 kind:load to:0x0204b690 add:0xe00 module:main from:0x0201d6cc kind:arm_call to:0x0201e6c4 module:main from:0x0201d6e8 kind:arm_call to:0x0201e6c4 module:main from:0x0201d810 kind:arm_call to:0x0201ea20 module:main from:0x0201d81c kind:arm_call to:0x01ffb428 module:itcm -from:0x0201d838 kind:load to:0x0204c490 module:main +from:0x0201d838 kind:load to:0x0204b690 add:0xe00 module:main from:0x0201d864 kind:arm_call to:0x0201e6c4 module:main from:0x0201d874 kind:arm_call to:0x0201e6c4 module:main from:0x0201d898 kind:arm_call to:0x02025e64 module:main @@ -2829,9 +2829,9 @@ from:0x0201de8c kind:arm_call to:0x0201e6c4 module:main from:0x0201dea8 kind:arm_call to:0x02025e64 module:main from:0x0201debc kind:load to:0x0204b690 module:main from:0x0201decc kind:load to:0x027e0120 module:dtcm -from:0x0201ded0 kind:load to:0x0204c490 module:main +from:0x0201ded0 kind:load to:0x0204b690 add:0xe00 module:main from:0x0201e024 kind:arm_call to:0x0201e6c4 module:main -from:0x0201e044 kind:load to:0x0204c490 module:main +from:0x0201e044 kind:load to:0x0204b690 add:0xe00 module:main from:0x0201e07c kind:arm_call to:0x0201e6c4 module:main from:0x0201e08c kind:arm_call to:0x0201e6c4 module:main from:0x0201e0c0 kind:arm_call to:0x0201e6c4 module:main @@ -3062,9 +3062,9 @@ from:0x02020180 kind:arm_call to:0x020634e8 module:overlay(0) from:0x02020188 kind:arm_call to:0x02011ff4 module:main from:0x020201ac kind:load to:0x0204592c module:main from:0x02020268 kind:arm_call to:0x020636cc module:overlay(0) -from:0x02020298 kind:load to:0x0204c42c module:main +from:0x02020298 kind:load to:0x0204b690 add:0xd9c module:main from:0x0202029c kind:load to:0x0201c2c8 module:main -from:0x020202cc kind:load to:0x0204c390 module:main +from:0x020202cc kind:load to:0x0204b690 add:0xd00 module:main from:0x020202d0 kind:load to:0x0204b690 module:main from:0x020202dc kind:arm_call to:0x02019528 module:main from:0x020202f0 kind:load to:0x0204b690 module:main @@ -3375,7 +3375,7 @@ from:0x02023558 kind:arm_call to:0x02063310 module:overlay(0) from:0x0202358c kind:arm_call to:0x0202a160 module:main from:0x020236f0 kind:arm_call to:0x0202370c module:main from:0x02023704 kind:arm_call to:0x02023ad8 module:main -from:0x02023738 kind:load to:0x0204c390 module:main +from:0x02023738 kind:load to:0x0204b690 add:0xd00 module:main from:0x0202373c kind:load to:0x0204b690 module:main from:0x02023770 kind:arm_call to:0x02023780 module:main from:0x02023778 kind:arm_call to:0x0201f224 module:main @@ -5856,7 +5856,7 @@ from:0x0203f094 kind:arm_call to:0x020c6a70 module:overlay(18) from:0x0203f0a8 kind:load to:0x0204b608 module:main from:0x0203f0ac kind:load to:0x0204b690 module:main from:0x0203f0c8 kind:arm_call to:0x020c6ba0 module:overlay(18) -from:0x0203f0dc kind:load to:0x0204c498 module:main +from:0x0203f0dc kind:load to:0x0204b690 add:0xe08 module:main from:0x0203f0e0 kind:load to:0x0204c49c module:main from:0x0203f100 kind:arm_call to:0x020c6c10 module:overlay(18) from:0x0203f110 kind:arm_call to:0x0203e3a4 module:main diff --git a/config/jp/arm9/symbols.txt b/config/jp/arm9/symbols.txt index 776be859..a0ae58eb 100644 --- a/config/jp/arm9/symbols.txt +++ b/config/jp/arm9/symbols.txt @@ -638,7 +638,7 @@ func_02012fd0 kind:function(arm,size=0x28) addr:0x02012fd0 func_02012ff8 kind:function(arm,size=0x1c) addr:0x02012ff8 _ZN18UnkStruct_02011e1013func_02013014Ev kind:function(arm,size=0x5c) addr:0x02013014 _ZN18UnkStruct_02011e1013func_02013070Ev kind:function(arm,size=0x64) addr:0x02013070 -func_020130d4 kind:function(arm,size=0x1c) addr:0x020130d4 +_ZN18UnkStruct_02011e1013func_020130d4Ei kind:function(arm,size=0x1c) addr:0x020130d4 func_020130f0 kind:function(arm,size=0x28) addr:0x020130f0 func_02013118 kind:function(arm,size=0x30) addr:0x02013118 func_02013148 kind:function(arm,size=0x1c) addr:0x02013148 @@ -830,7 +830,7 @@ _ZN20GameModeLinkListNode13func_020166acEPS_ kind:function(arm,size=0x20) addr:0 _ZN20GameModeLinkListNode13func_020166ccEPS_ kind:function(arm,size=0x28) addr:0x02016664 _ZN20GameModeLinkListNode13func_020166f4EPS_ kind:function(arm,size=0x2c) addr:0x0201668c func_020166b8 kind:function(arm,size=0x1c) addr:0x020166b8 -func_020166d4 kind:function(arm,size=0x28) addr:0x020166d4 +_ZN20GameModeLinkListNode13func_0201673cEv kind:function(arm,size=0x28) addr:0x020166d4 func_020166fc kind:function(arm,size=0x34) addr:0x020166fc func_02016730 kind:function(arm,size=0x10) addr:0x02016730 func_02016740 kind:function(arm,size=0x4) addr:0x02016740 @@ -933,7 +933,7 @@ _ZN19GameModeManagerBase8vfunc_18Ev kind:function(thumb,size=0x2) addr:0x0201856 _ZN19GameModeManagerBase8vfunc_1CEv kind:function(thumb,size=0x2) addr:0x02018570 _ZN19GameModeManagerBase8vfunc_20Ev kind:function(thumb,size=0x2) addr:0x02018574 _ZN19GameModeManagerBase8vfunc_00Ev kind:function(arm,size=0x2c) addr:0x02018578 -_ZN19GameModeManagerBase8vfunc_04Ev kind:function(arm,size=0x28) addr:0x020185a4 +_ZN19GameModeManagerBase8vfunc_04Ei kind:function(arm,size=0x28) addr:0x020185a4 _ZN19GameModeManagerBase13func_02018634Et kind:function(arm,size=0x48) addr:0x020185cc _ZN19GameModeManagerBase8vfunc_24Ev kind:function(arm,size=0x18) addr:0x02018614 _ZN19GameModeManagerBase8vfunc_28EPc kind:function(arm,size=0x10) addr:0x0201862c @@ -958,13 +958,13 @@ _ZN19GameModeManagerBase13func_02018ad4Ev kind:function(arm,size=0x1c) addr:0x02 _ZN19GameModeManagerBase13func_02018af0EP16GameModeLinkListI23GameModeManagerBase_104E kind:function(arm,size=0x64) addr:0x02018a88 _ZN19GameModeManagerBase13func_02018b54EP16GameModeLinkListI23GameModeManagerBase_104E kind:function(arm,size=0x3c) addr:0x02018aec _ZN19GameModeManagerBase13func_02018b90EP16GameModeLinkListI23GameModeManagerBase_104EPc kind:function(arm,size=0x34) addr:0x02018b28 -func_02018b5c kind:function(arm,size=0x1c) addr:0x02018b5c -func_02018b78 kind:function(arm,size=0x4c) addr:0x02018b78 -func_02018bc4 kind:function(arm,size=0x4c) addr:0x02018bc4 +_ZN19GameModeManagerBase13func_02018bc4Ei kind:function(arm,size=0x1c) addr:0x02018b5c +_ZN18UnkStruct_0204a11013func_02018be0Ei kind:function(arm,size=0x4c) addr:0x02018b78 +_ZN18UnkStruct_0204a11013func_02018c2cEv kind:function(arm,size=0x4c) addr:0x02018bc4 _ZN18UnkStruct_0204a11013func_02018c78Ei kind:function(arm,size=0x18) addr:0x02018c10 _ZN18UnkStruct_0204a11013func_02018c90Ei kind:function(arm,size=0xa4) addr:0x02018c28 _ZN18UnkStruct_0204a11013func_02018d34Ev kind:function(arm,size=0x44) addr:0x02018ccc -func_02018d10 kind:function(arm,size=0x174) addr:0x02018d10 +_ZN18UnkStruct_0204a11013func_02018d78Ei kind:function(arm,size=0x174) addr:0x02018d10 func_02018e84 kind:function(arm,size=0xac) addr:0x02018e84 func_02018f30 kind:function(arm,size=0x368) addr:0x02018f30 _ZN18UnkStruct_0204a11013func_02019300Ei kind:function(arm,size=0x40) addr:0x02019298 @@ -974,9 +974,9 @@ _ZN18UnkStruct_0204a11013func_02019408Ev kind:function(arm,size=0x4c) addr:0x020 _ZN18UnkStruct_0204a11013func_02019454Ev kind:function(arm,size=0x88) addr:0x020193ec _ZN18UnkStruct_0204a11013func_020194dcEv kind:function(arm,size=0x38) addr:0x02019474 _ZN18UnkStruct_0204a11013func_02019514Ev kind:function(arm,size=0x14) addr:0x020194ac -func_020194c0 kind:function(arm,size=0x10) addr:0x020194c0 +_ZN18UnkStruct_0204a11013func_02019528Ev kind:function(arm,size=0x10) addr:0x020194c0 _ZN18UnkStruct_0204a11013func_02019538Eii kind:function(arm,size=0x10) addr:0x020194d0 -func_020194e0 kind:function(arm,size=0x10) addr:0x020194e0 +_ZN18UnkStruct_0204a11013func_02019548Ev kind:function(arm,size=0x10) addr:0x020194e0 func_020194f0 kind:function(arm,size=0x28) addr:0x020194f0 func_02019518 kind:function(arm,size=0x10) addr:0x02019518 func_02019528 kind:function(arm,size=0x10) addr:0x02019528 @@ -987,9 +987,9 @@ _ZN18UnkStruct_0204a11013func_0201967cEiiiii kind:function(arm,size=0x34) addr:0 func_02019648 kind:function(arm,size=0x4c) addr:0x02019648 func_02019694 kind:function(arm,size=0x238) addr:0x02019694 func_020198cc kind:function(arm,size=0x140) addr:0x020198cc -func_02019a0c kind:function(arm,size=0xc8) addr:0x02019a0c -func_02019ad4 kind:function(arm,size=0x110) addr:0x02019ad4 -func_02019be4 kind:function(arm,size=0xa0) addr:0x02019be4 +func_02019a74 kind:function(arm,size=0xc8) addr:0x02019a0c +func_02019b3c kind:function(arm,size=0x110) addr:0x02019ad4 +func_02019c4c kind:function(arm,size=0xa0) addr:0x02019be4 func_02019c84 kind:function(arm,size=0x28) addr:0x02019c84 func_02019cac kind:function(arm,size=0x9c) addr:0x02019cac func_02019d48 kind:function(arm,size=0xf4) addr:0x02019d48 @@ -1012,7 +1012,7 @@ func_0201a814 kind:function(arm,size=0xf8) addr:0x0201a814 func_0201a90c kind:function(arm,size=0xd0) addr:0x0201a90c _ZN18UnkStruct_0204af1c13func_0201aa44EPvS0_iS0_ kind:function(arm,size=0x48) addr:0x0201a9dc func_0201aa24 kind:function(arm,size=0x44) addr:0x0201aa24 -_ZN18UnkStruct_0204af1c13func_0201aad0EPvS0_iS0_ kind:function(arm,size=0x1a0) addr:0x0201aa68 +_ZN18UnkStruct_0204af1c13func_0201aad0EP14UnkSubStruct19PviS2_ kind:function(arm,size=0x1a0) addr:0x0201aa68 func_0201ac08 kind:function(arm,size=0x13c) addr:0x0201ac08 func_0201ad44 kind:function(arm,size=0x50) addr:0x0201ad44 func_0201ad94 kind:function(arm,size=0xb0) addr:0x0201ad94 @@ -1041,17 +1041,17 @@ _ZN24UnkStruct_0204a060_Base2C1Ev kind:function(arm,size=0x2c) addr:0x0201b82c _ZN24UnkStruct_0204a060_Base3C1Ev kind:function(arm,size=0x2c) addr:0x0201b858 _ZN24UnkStruct_0204a060_Base2D1Ev kind:function(arm,size=0x18) addr:0x0201b884 _ZN24UnkStruct_0204a060_Base2D0Ev kind:function(arm,size=0x20) addr:0x0201b89c -_ZN23UnkStruct_0204a060_BaseD2Ev kind:function(arm,size=0x18) addr:0x0201b8bc +_ZN24UnkStruct_0204a060_Base2D2Ev kind:function(arm,size=0x18) addr:0x0201b8bc _ZN24UnkStruct_0204a060_Base28vfunc_08Ei kind:function(arm,size=0x8) addr:0x0201b8d4 _ZN23UnkStruct_0204a060_BaseC2Ev kind:function(arm,size=0x4c) addr:0x0201b8dc _ZN23UnkStruct_0204a060_BaseC1Ev kind:function(arm,size=0x4c) addr:0x0201b928 _ZN23UnkStruct_0204a060_Base13func_0201bb84Eiii kind:function(arm,size=0x20) addr:0x0201b974 _ZN23UnkStruct_0204a060_Base13func_0201bba4Eii kind:function(arm,size=0x28) addr:0x0201b994 -_ZN23UnkStruct_0204a060_Base13func_0201bbccEv kind:function(arm,size=0x18) addr:0x0201b9bc +_ZN23UnkStruct_0204a060_Base13func_0201bbccEii kind:function(arm,size=0x18) addr:0x0201b9bc _ZN23UnkStruct_0204a060_Base8vfunc_08Ei kind:function(arm,size=0x1a4) addr:0x0201b9d4 _ZN23UnkStruct_0204a060_Base8vfunc_0CEi kind:function(arm,size=0x4) addr:0x0201bb78 _ZN23UnkStruct_0204a060_Base8vfunc_10Ev kind:function(arm,size=0x4) addr:0x0201bb7c -_ZN13func_0201bb80D1Ev kind:function(arm,size=0x14) addr:0x0201bb80 +_ZN23UnkStruct_0204a060_BaseD1Ev kind:function(arm,size=0x14) addr:0x0201bb80 _ZN23UnkStruct_0204a060_BaseD0Ev kind:function(arm,size=0x1c) addr:0x0201bb94 func_0201bbb0 kind:function(arm,size=0x10) addr:0x0201bbb0 func_0201bbc0 kind:function(arm,size=0x38) addr:0x0201bbc0 @@ -1067,8 +1067,8 @@ _ZN23GameModeManagerBase_00413func_0201bfecEv kind:function(arm,size=0x20) addr: _ZN23GameModeManagerBase_00413func_0201c00cEii kind:function(arm,size=0x5c) addr:0x0201bdfc _ZN23GameModeManagerBase_00413func_0201c068Es kind:function(arm,size=0x3c) addr:0x0201be58 func_0201be94 kind:function(arm,size=0x20) addr:0x0201be94 -func_0201beb4 kind:function(arm,size=0x20) addr:0x0201beb4 -func_0201bed4 kind:function(arm,size=0x40) addr:0x0201bed4 +_ZN23GameModeManagerBase_00413func_0201c0c4Ei kind:function(arm,size=0x20) addr:0x0201beb4 +_ZN23GameModeManagerBase_00413func_0201c0e4Ev kind:function(arm,size=0x40) addr:0x0201bed4 _ZN23GameModeManagerBase_00413func_0201c124Eiiiii kind:function(arm,size=0x78) addr:0x0201bf14 _ZN23GameModeManagerBase_00413func_0201c19cEv kind:function(arm,size=0x48) addr:0x0201bf8c _ZN23GameModeManagerBase_00413func_0201c1e4Ev kind:function(arm,size=0x48) addr:0x0201bfd4 @@ -1079,10 +1079,10 @@ func_0201c0d0 kind:function(arm,size=0xc4) addr:0x0201c0d0 func_0201c194 kind:function(arm,size=0xac) addr:0x0201c194 _ZN23UnkStruct_0204a110_Sub5C1Ev kind:function(thumb,size=0x10) addr:0x0201c240 func_0201c250 kind:function(thumb,size=0x34) addr:0x0201c250 -_ZN18UnkStruct_0204aeac13func_0201c494Ei kind:function(arm,size=0x14) addr:0x0201c284 +_ZN23UnkStruct_0204a110_Sub513func_0201c494Ei kind:function(arm,size=0x14) addr:0x0201c284 func_0201c298 kind:function(arm,size=0x30) addr:0x0201c298 -_ZN18UnkStruct_0204aeac13func_0201c4d8Eiii kind:function(arm,size=0x2c) addr:0x0201c2c8 -_ZN18UnkStruct_0204aeac13func_0201c504Eiiii kind:function(arm,size=0x2c) addr:0x0201c2f4 +_ZN23UnkStruct_0204a110_Sub513func_0201c4d8Eiii kind:function(arm,size=0x2c) addr:0x0201c2c8 +_ZN23UnkStruct_0204a110_Sub513func_0201c504Eiiii kind:function(arm,size=0x2c) addr:0x0201c2f4 func_0201c320 kind:function(arm,size=0x19c) addr:0x0201c320 func_0201c4bc kind:function(thumb,size=0x6e) addr:0x0201c4bc func_0201c52c kind:function(arm,size=0x44) addr:0x0201c52c @@ -1108,49 +1108,49 @@ _ZN23UnkStruct_0204a110_Sub4C1Ev kind:function(arm,size=0x58) addr:0x0201cb70 func_0201cbc8 kind:function(arm,size=0x88) addr:0x0201cbc8 func_0201cc50 kind:function(arm,size=0x40) addr:0x0201cc50 func_0201cc90 kind:function(arm,size=0x38) addr:0x0201cc90 -func_0201ccc8 kind:function(arm,size=0x58) addr:0x0201ccc8 -func_0201cd20 kind:function(arm,size=0x58) addr:0x0201cd20 +_ZN23UnkStruct_0204a110_Sub613func_0201ced8Ev kind:function(arm,size=0x58) addr:0x0201ccc8 +_ZN23UnkStruct_0204a110_Sub613func_0201cf30Ev kind:function(arm,size=0x58) addr:0x0201cd20 func_0201cd78 kind:function(arm,size=0x394) addr:0x0201cd78 func_0201d10c kind:function(arm,size=0x30c) addr:0x0201d10c -func_0201d418 kind:function(arm,size=0x174) addr:0x0201d418 +_ZN23UnkStruct_0204a110_Sub713func_0201d628Ev kind:function(arm,size=0x174) addr:0x0201d418 func_0201d58c kind:function(arm,size=0x2b0) addr:0x0201d58c func_0201d83c kind:function(arm,size=0xc8) addr:0x0201d83c -func_0201d904 kind:function(arm,size=0xfc) addr:0x0201d904 -func_0201da00 kind:function(arm,size=0x148) addr:0x0201da00 -func_0201db48 kind:function(arm,size=0xcc) addr:0x0201db48 +_ZN23UnkStruct_0204a110_Sub713func_0201db14EiiP5Vec2sS1_ii kind:function(arm,size=0xfc) addr:0x0201d904 +_ZN23UnkStruct_0204a110_Sub713func_0201dc10EPsii kind:function(arm,size=0x148) addr:0x0201da00 +_ZN23UnkStruct_0204a110_Sub713func_0201dd58Eii kind:function(arm,size=0xcc) addr:0x0201db48 func_0201dc14 kind:function(arm,size=0x2c0) addr:0x0201dc14 func_0201ded4 kind:function(arm,size=0x174) addr:0x0201ded4 func_0201e048 kind:function(arm,size=0x330) addr:0x0201e048 -func_0201e378 kind:function(arm,size=0x88) addr:0x0201e378 +_ZN23UnkStruct_0204a110_Sub813func_0201e588Eiiiii kind:function(arm,size=0x88) addr:0x0201e378 func_0201e400 kind:function(arm,size=0x88) addr:0x0201e400 -_ZN18UnkStruct_0204aeec13func_0201e698Ev kind:function(arm,size=0x2c) addr:0x0201e488 +_ZN23UnkStruct_0204a110_Sub813func_0201e698Ev kind:function(arm,size=0x2c) addr:0x0201e488 func_0201e4b4 kind:function(arm,size=0xc) addr:0x0201e4b4 _ZN24UnkSystem2_UnkSubSystem9C1Ev kind:function(arm,size=0x84) addr:0x0201e4c0 func_0201e544 kind:function(arm,size=0x90) addr:0x0201e544 func_0201e5d4 kind:function(arm,size=0x90) addr:0x0201e5d4 _ZN24UnkSystem2_UnkSubSystem913func_0201e874EiPvS0_i kind:function(arm,size=0x60) addr:0x0201e664 -func_0201e6c4 kind:function(arm,size=0x24) addr:0x0201e6c4 +func_0201e8d4 kind:function(arm,size=0x24) addr:0x0201e6c4 func_0201e6e8 kind:function(arm,size=0x94) addr:0x0201e6e8 func_0201e77c kind:function(arm,size=0x14) addr:0x0201e77c func_0201e790 kind:function(arm,size=0x14) addr:0x0201e790 -_ZN13UnkSubStruct1C1Ev kind:function(arm,size=0x60) addr:0x0201e7a4 +_ZN18UnkSubStruct1_BaseC1Ev kind:function(arm,size=0x60) addr:0x0201e7a4 func_0201e804 kind:function(arm,size=0x54) addr:0x0201e804 -_ZN13UnkSubStruct113func_0201ea68Eiiii kind:function(arm,size=0x38) addr:0x0201e858 -_ZN13UnkSubStruct113func_0201eaa0Ev kind:function(arm,size=0x14) addr:0x0201e890 +_ZN18UnkSubStruct1_Base13func_0201ea68Eiiii kind:function(arm,size=0x38) addr:0x0201e858 +_ZN18UnkSubStruct1_Base13func_0201eaa0Ev kind:function(arm,size=0x14) addr:0x0201e890 func_0201e8a4 kind:function(arm,size=0x70) addr:0x0201e8a4 func_0201e914 kind:function(arm,size=0x14) addr:0x0201e914 func_0201e928 kind:function(arm,size=0x14) addr:0x0201e928 _ZN26UnkStruct_0204a110_Sub7_08C1Ev kind:function(arm,size=0x60) addr:0x0201e93c func_0201e99c kind:function(arm,size=0x4c) addr:0x0201e99c func_0201e9e8 kind:function(arm,size=0x38) addr:0x0201e9e8 -func_0201ea20 kind:function(arm,size=0x8) addr:0x0201ea20 +_ZN26UnkStruct_0204a110_Sub7_0813func_0201ec30Ev kind:function(arm,size=0x8) addr:0x0201ea20 func_0201ea28 kind:function(arm,size=0x70) addr:0x0201ea28 func_0201ea98 kind:function(arm,size=0x14) addr:0x0201ea98 func_0201eaac kind:function(arm,size=0x14) addr:0x0201eaac -func_0201eac0 kind:function(arm,size=0x60) addr:0x0201eac0 +_ZN22UnkSubStruct1_Derived1C1Ev kind:function(arm,size=0x60) addr:0x0201eac0 func_0201eb20 kind:function(arm,size=0x54) addr:0x0201eb20 func_0201eb74 kind:function(arm,size=0x38) addr:0x0201eb74 -func_0201ebac kind:function(arm,size=0x14) addr:0x0201ebac +_ZN18UnkSubStruct1_Base13func_0201edbcEv kind:function(arm,size=0x14) addr:0x0201ebac func_0201ebc0 kind:function(arm,size=0x70) addr:0x0201ebc0 func_0201ec30 kind:function(arm,size=0x14) addr:0x0201ec30 func_0201ec44 kind:function(arm,size=0x14) addr:0x0201ec44 @@ -1386,7 +1386,7 @@ G2_func_0006 kind:function(arm,size=0x58) addr:0x02025dc4 G2S_func_0006 kind:function(arm,size=0x48) addr:0x02025e1c G2_SetBGAffine kind:function(arm,size=0xa0) addr:0x02025e64 _G2_SetBlend kind:function(arm,size=0x1c) addr:0x02025f04 -func_02025f20 kind:function(arm,size=0x24) addr:0x02025f20 +GX_func_0008 kind:function(arm,size=0x24) addr:0x02025f20 func_02025f44 kind:function(arm,size=0x1c) addr:0x02025f44 func_02025f60 kind:function(arm,size=0x1c) addr:0x02025f60 func_02025f7c kind:function(arm,size=0x1c) addr:0x02025f7c @@ -1572,7 +1572,7 @@ OS_func_0081 kind:function(arm,size=0x14) addr:0x02028ef0 OS_func_0082 kind:function(arm,size=0x8) addr:0x02028f04 OS_func_0083 kind:function(arm,size=0x8) addr:0x02028f0c OS_func_0084 kind:function(thumb,size=0x44) addr:0x02028f14 -func_02028f58 kind:function(arm,size=0x14) addr:0x02028f58 +func_02027a28 kind:function(arm,size=0x14) addr:0x02028f58 OS_func_0085 kind:function(arm,size=0x74) addr:0x02028f6c OS_func_0086 kind:function(arm,size=0x14) addr:0x02028fe0 OS_func_0087 kind:function(arm,size=0x90) addr:0x02028ff4 @@ -1642,12 +1642,12 @@ MI_CpuCopy8 kind:function(arm,size=0x130) addr:0x0202a360 Zero288 kind:function(thumb,size=0xe) addr:0x0202a490 MI_Swap kind:function(arm,size=0x8) addr:0x0202a4a0 func_0202a4a8 kind:function(arm,size=0xe0) addr:0x0202a4a8 -func_0202a588 kind:function(arm,size=0xd8) addr:0x0202a588 +func_02029058 kind:function(arm,size=0xd8) addr:0x0202a588 MI_func_0008 kind:function(arm,size=0x74) addr:0x0202a660 func_0202a6d4 kind:function(arm,size=0x44) addr:0x0202a6d4 func_0202a718 kind:function(arm,size=0x184) addr:0x0202a718 func_0202a89c kind:function(arm,size=0x1f0) addr:0x0202a89c -func_0202aa8c kind:function(thumb,size=0x4e4) addr:0x0202aa8c +func_0202955c kind:function(thumb,size=0x4e4) addr:0x0202aa8c func_0202af70 kind:function(thumb,size=0x1e8) addr:0x0202af70 func_0202b158 kind:function(thumb,size=0x7c) addr:0x0202b158 func_0202b1d4 kind:function(thumb,size=0x68) addr:0x0202b1d4 @@ -1794,7 +1794,7 @@ FS_func_0032 kind:function(arm,size=0x6c) addr:0x0202e994 FS_func_0033 kind:function(arm,size=0x8) addr:0x0202ea00 FS_func_0034 kind:function(arm,size=0x8) addr:0x0202ea08 FS_AddRomVolume kind:function(arm,size=0x144) addr:0x0202ea10 -func_0202eb54 kind:function(arm,size=0x20) addr:0x0202eb54 +func_0202d624 kind:function(arm,size=0x20) addr:0x0202eb54 func_0202eb74 kind:function(arm,size=0x30) addr:0x0202eb74 func_0202eba4 kind:function(arm,size=0x1c) addr:0x0202eba4 func_0202ebc0 kind:function(arm,size=0x3c) addr:0x0202ebc0 @@ -1934,7 +1934,7 @@ CARD_func_0029 kind:function(arm,size=0x50) addr:0x02033164 CARD_func_0030 kind:function(arm,size=0x144) addr:0x020331b4 CARD_func_0031 kind:function(arm,size=0x2c) addr:0x020332f8 CARD_func_0032 kind:function(arm,size=0x54) addr:0x02033324 -func_02033378 kind:function(arm,size=0x10) addr:0x02033378 +func_02031e48 kind:function(arm,size=0x10) addr:0x02033378 CARD_func_0033 kind:function(arm,size=0x10) addr:0x02033388 CARD_func_0034 kind:function(arm,size=0x8c) addr:0x02033398 CARD_func_0035 kind:function(arm,size=0x60) addr:0x02033424 @@ -2768,26 +2768,14 @@ data_0204b17c kind:bss addr:0x0204b17c data_0204b480 kind:bss addr:0x0204b480 data_0204b484 kind:bss addr:0x0204b484 data_0204b508 kind:bss addr:0x0204b508 -data_0204b50c kind:bss addr:0x0204b50c +data_02049f8c kind:bss addr:0x0204b50c data_0204b5d0 kind:bss addr:0x0204b5d0 data_0204b5d4 kind:bss addr:0x0204b5d4 data_0204a060 kind:bss addr:0x0204b5e0 data_0204a088 kind:bss addr:0x0204b608 data_0204a090 kind:bss addr:0x0204b610 data_0204a110 kind:bss addr:0x0204b690 -data_0204b6a0 kind:bss addr:0x0204b6a0 -data_0204ba00 kind:bss addr:0x0204ba00 -data_0204c390 kind:bss addr:0x0204c390 -data_0204c410 kind:bss addr:0x0204c410 -data_0204c42c kind:bss addr:0x0204c42c -data_0204c438 kind:bss addr:0x0204c438 -data_0204c450 kind:bss addr:0x0204c450 -data_0204c45c kind:bss addr:0x0204c45c -data_0204c46c kind:bss addr:0x0204c46c -data_0204c470 kind:bss addr:0x0204c470 -data_0204c490 kind:bss addr:0x0204c490 -data_0204c498 kind:bss addr:0x0204c498 -data_0204c49c kind:bss addr:0x0204c49c +data_0204af1c kind:bss addr:0x0204c49c data_0204d92c kind:bss addr:0x0204d92c data_0204e360 kind:bss addr:0x0204e360 data_0204e378 kind:bss addr:0x0204e378 diff --git a/include/Actor/ActorManager.hpp b/include/Actor/ActorManager.hpp index fe4ffeb9..03b8b442 100644 --- a/include/Actor/ActorManager.hpp +++ b/include/Actor/ActorManager.hpp @@ -14,7 +14,7 @@ struct UnkStruct_func_ov001_020bb018_param2 { /* 08 */ u16 mUnk_0A; }; -class ActorManager : public SysObject { +class ActorManager : public AutoInstance { public: /* 00 */ Actor **mActorTable; /* 04 */ Actor **mActorTableEnd; @@ -50,7 +50,6 @@ public: unk32 func_ov000_0209704c(); unk32 func_ov000_020970c8(u16 param1, unk32 *param2); - int ClearInstance(); void func_ov001_020bafdc(); void func_ov001_020bb018(UnkStruct_func_ov001_020bb018_param2 *param1); void func_ov001_020bb488(); @@ -60,7 +59,6 @@ public: void func_ov001_020bb7b0(ZeldaObjectList *pObjList); void func_ov001_020bb7f0(); - static void SetInstance(ActorManager *instance); static ActorManager *Create(); static void Destroy(); static void func_ov001_020bb414(ActorManager *instance); diff --git a/include/Actor/ActorUnkTUTO.hpp b/include/Actor/ActorUnkTUTO.hpp index 68c4a94d..c3237fdb 100644 --- a/include/Actor/ActorUnkTUTO.hpp +++ b/include/Actor/ActorUnkTUTO.hpp @@ -27,7 +27,6 @@ public: /* 4C */ virtual ~ActorUnkTUTO() override; void func_ov037_02120a10(void); - void func_ov037_02120a64(void); void func_ov037_02120afc(void); void func_ov037_02120b10(void); void func_ov037_02120ba8(void); @@ -58,6 +57,8 @@ public: void func_ov037_02121ab0(void); void func_ov037_02121af0(void); void func_ov037_02121b2c(void); + + static unk32 func_ov037_02120a64(void); }; class ActorProfileUnkTUTO : public ActorProfile { diff --git a/include/Actor/ActorUnk_ov000_020a8bb0.hpp b/include/Actor/ActorUnk_ov000_020a8bb0.hpp index afae65c1..14800d89 100644 --- a/include/Actor/ActorUnk_ov000_020a8bb0.hpp +++ b/include/Actor/ActorUnk_ov000_020a8bb0.hpp @@ -15,11 +15,11 @@ public: /* 16 */ unk16 mUnk_16; /* 18 */ unk32 mUnk_18; /* 1C */ unk32 mUnk_1C; - /* 20 */ unk8 mUnk_20; - /* 21 */ unk8 mUnk_21; + /* 20 */ bool mUnk_20; + /* 21 */ bool mUnk_21; /* 22 */ unk8 mUnk_22; /* 23 */ unk8 mUnk_23; - /* 24 */ void *mUnk_24; + /* 24 */ Actor *mpActor; /* 28 */ unk32 mUnk_28; /* 2C */ unk32 mUnk_2C; /* 30 */ unk16 mUnk_30; diff --git a/include/FileSelect/FileSelectMain.hpp b/include/FileSelect/FileSelectMain.hpp index a2129359..3975bcb6 100644 --- a/include/FileSelect/FileSelectMain.hpp +++ b/include/FileSelect/FileSelectMain.hpp @@ -55,6 +55,26 @@ enum FileSelectExitMode_ { /* 0x03 */ FileSelectExitMode_Unk_3 = 3, }; +class FileSelectMain_UnkSubStruct1 : public UnkSubStruct1_Base { +public: + /* 00 (base) */ + /* 20 */ unk32 mUnk_20; + /* 24 */ unk32 mUnk_24; + /* 28 */ unk32 mUnk_28; + /* 2C */ unk32 mUnk_2C; + /* 30 */ + + void Subprocess1_UnkValueSets() { + this->mUnk_10 = this->mUnk_18; + } + + void Subprocess2_UnkValueSets() { + this->mUnk_10 = this->mUnk_14; + } + + UnkSubStruct1_Methods; +}; + class FileSelectMain : public GameModeManagerBase_104 { // 022E5F70 public: /* 0000 (base) */ @@ -65,7 +85,7 @@ public: /* 0026 */ unk8 mUnk_0026; /* 0027 */ unk8 mUnk_0027; /* 0028 */ unk32 mUnk_0028; - /* 002C */ UnkSubStruct1 mUnk_002C; + /* 002C */ FileSelectMain_UnkSubStruct1 mUnk_002C; /* 005C */ UnkSystem2_UnkSubSystem1_Derived1 mUnk_005C; /* 00BC */ UnkSystem2_UnkSubSystem9 mUnk_00BC; diff --git a/include/FileSelect/FileSelectUnkDraw.hpp b/include/FileSelect/FileSelectUnkDraw.hpp index 81054031..ed8b057f 100644 --- a/include/FileSelect/FileSelectUnkDraw.hpp +++ b/include/FileSelect/FileSelectUnkDraw.hpp @@ -17,11 +17,11 @@ public: /* 00 */ virtual ~FileSelectManager_UnkDrawBase(); /* 08 */ virtual void vfunc_08(unk32 param1); /* 0C */ virtual void vfunc_0C(unk32 param1); - /* 10 */ virtual void vfunc_10(); - /* 14 */ virtual void vfunc_14(); + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2); + /* 14 */ virtual void vfunc_14(unk32 param1); /* 18 */ virtual void vfunc_18(unk32 param1); /* 1C */ virtual void vfunc_1C(unk32 param1); - /* 20 */ virtual void vfunc_20(); + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2); /* 24 */ virtual void vfunc_24(); /* 28 */ }; @@ -42,11 +42,11 @@ public: /* 00 */ virtual ~FileSelectManager_160() override; /* 08 */ virtual void vfunc_08(unk32 param1) override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10() override; - /* 14 */ virtual void vfunc_14() override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 18 */ virtual void vfunc_18(unk32 param1) override; /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; /* 24 */ virtual void vfunc_24() override; /* 28 */ }; @@ -66,11 +66,11 @@ public: /* 04 */ virtual ~FileSelectManager_164() override; /* 08 */ virtual void vfunc_08(unk32 param1) override; /* 0C */ virtual void vfunc_0C(unk32 param1) override; - /* 10 */ virtual void vfunc_10() override; - /* 14 */ virtual void vfunc_14() override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; /* 18 */ virtual void vfunc_18(unk32 param1) override; /* 1C */ virtual void vfunc_1C(unk32 param1) override; - /* 20 */ virtual void vfunc_20() override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; static void func_ov019_020d02f4(); }; diff --git a/include/Game/GameModeAdventure.hpp b/include/Game/GameModeAdventure.hpp new file mode 100644 index 00000000..f9b2944c --- /dev/null +++ b/include/Game/GameModeAdventure.hpp @@ -0,0 +1,21 @@ +#pragma once + +#include "Game/GameMode.hpp" +// #include "Unknown/UnkStruct_0204a060.hpp" +#include "global.h" +#include "types.h" + +class GameModeAdventure : public GameModeBase { +public: + GameModeAdventure(); + + // data_ov024_020d7b68 vtable + /* 00 */ virtual ~GameModeAdventure() override; + /* 08 */ virtual void vfunc_08() override; // Init + /* 0C */ virtual void vfunc_0C() override; // Update + /* 10 */ virtual void vfunc_10() override; + /* 14 */ virtual void vfunc_14() override; + /* 18 */ virtual void vfunc_18() override; + /* 1C */ virtual void vfunc_1C() override; + /* 20 */ virtual void vfunc_20() override; +}; diff --git a/include/Game/GameModeManager.hpp b/include/Game/GameModeManager.hpp index 55710d5c..06aebbfd 100644 --- a/include/Game/GameModeManager.hpp +++ b/include/Game/GameModeManager.hpp @@ -26,6 +26,8 @@ public: void func_0201bfec(); void func_0201c00c(unk32 param1, unk32 param2); void func_0201c068(unk16 param1); + void func_0201c0c4(unk32 param1); + void func_0201c0e4(); void func_0201c19c(); void func_0201c124(unk32 param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5); void func_0201c1e4(); @@ -44,22 +46,67 @@ public: GameModeLinkListNode(); ~GameModeLinkListNode(); + GameModeLinkListNode *GetNode() { + GameModeLinkListNode *node = (GameModeLinkListNode *) this; + if (node != NULL) { + node = (GameModeLinkListNode *) ((u32 *) node + 1); + } + return node; + } + + GameModeLinkListNode *GetNext() { + GameModeLinkListNode *next = mNext; + if (next != NULL) { + next = (GameModeLinkListNode *) ((u32 *) next - 1); + } + return next; + } + + GameModeLinkListNode *GetNext3() { + GameModeLinkListNode *next = this; + if (next != NULL) { + next = (GameModeLinkListNode *) ((u32 *) next - 1); + } + return next; + } + + GameModeLinkListNode *GetUnk() { + GameModeLinkListNode *prev = (GameModeLinkListNode *) *((u32 *) this + 2); + if (prev != NULL) { + prev = (GameModeLinkListNode *) ((u32 *) prev - 1); + } + return prev; + } + + GameModeLinkListNode *GetUnk2() { + GameModeLinkListNode *prev = (GameModeLinkListNode *) *((u32 *) this + 1); + if (prev != NULL) { + prev = (GameModeLinkListNode *) ((u32 *) prev - 1); + } + return prev; + } + + GameModeLinkListNode *GetPrev() { + GameModeLinkListNode *prev = mPrev; + if (prev != NULL) { + prev = (GameModeLinkListNode *) ((u32 *) prev - 1); + } + return prev; + } + + template T *GetTarget() { + return (T *) this; + } + void func_020166cc(GameModeLinkListNode *param1); void func_020166f4(GameModeLinkListNode *param1); + unk32 func_0201673c(); static void func_020166ac(GameModeLinkListNode *param1); }; template class GameModeLinkList : public GameModeLinkListNode { public: - GameModeLinkList *GetNext() { - GameModeLinkListNode *next = mNext; - if (next != NULL) { - next = (GameModeLinkListNode *) ((u32 *) next - 1); - } - return (GameModeLinkList *) next; - } - GameModeLinkList *GetNext2() { GameModeLinkListNode *next = (GameModeLinkListNode *) *((u8 **) this + 2); if (next != NULL) { @@ -68,12 +115,12 @@ public: return (GameModeLinkList *) next; } - GameModeLinkList *GetPrev() { - GameModeLinkListNode *prev = mPrev; - if (prev != NULL) { - prev = (GameModeLinkListNode *) ((u32 *) prev - 1); - } - return (GameModeLinkList *) prev; + GameModeLinkList *GetNextList() { + return (GameModeLinkList *) this->GetNext(); + } + + GameModeLinkList *GetPrevList() { + return (GameModeLinkList *) this->GetPrev(); } T *GetTarget() { @@ -89,6 +136,14 @@ public: return (GameModeLinkList *) this; } + GameModeLinkListNode *GetUnk3() { + GameModeLinkListNode *prev = (GameModeLinkListNode *) *((u32 *) this - 1); + if (prev != NULL) { + prev = (GameModeLinkListNode *) ((u32 *) prev - 1); + } + return prev; + } + // data_ov000_020b1e48 vtable /* 00 */ virtual ~GameModeManagerBase_104_0C(); /* 08 */ virtual void vfunc_08(void *param1); @@ -103,19 +158,30 @@ public: /* 0C */ GameModeManagerBase_104_0C mUnk_0C; }; +class AdventureModeManager_160_14; +class AdventureModeManager_160_18; +class AdventureModeManager_1B8; + class GameModeManagerBase_104 : public GameModeManagerBase_104_00 { public: /* 00 (vtable) */ /* 18 */ bool mUnk_18; /* 19 */ bool mUnk_19; /* 1A */ bool mUnk_1A; - /* 1B */ unk8 mUnk_1B; /* 1C */ GameModeLinkList *GetOrigin() { return (GameModeLinkList *) this; } + GameModeLinkListNode *GetNode() { + GameModeLinkListNode *node = (GameModeLinkListNode *) this; + if (node != NULL) { + node = (GameModeLinkListNode *) ((u32 *) node + 1); + } + return node; + } + GameModeManagerBase_104(); // data_ov000_020b1e60 vtable @@ -125,6 +191,8 @@ public: /* 10 */ virtual void vfunc_10(unk8 *param1); /* 14 */ virtual void vfunc_14(unk8 *param1); /* 18 */ virtual void vfunc_18(void); + + void func_ov088_0217230c(); }; class GameModeManagerBase : public SysObject { @@ -180,10 +248,11 @@ public: bool func_02018af0(GameModeLinkList *param1); bool func_02018b54(GameModeLinkList *param1); bool func_02018b90(GameModeLinkList *param1, unk8 *param2); + void func_02018bc4(unk32 param1); // data_02044064 vtable /* 00 */ virtual void vfunc_00(); - /* 04 */ virtual void vfunc_04(); + /* 04 */ virtual void vfunc_04(unk32 param1); /* 08 */ virtual ~GameModeManagerBase(); /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2, unk32 param3); /* 14 */ virtual void vfunc_14(); @@ -199,32 +268,29 @@ public: static GameModeManagerBase *Create(unk32 param1); }; -class TitleScreen; -class MainGame; - class TitleScreenManager_Base : public GameModeManagerBase { public: /* 000 (base) */ - /* 154 */ GameModeBase *mpGameMode; + /* 154 */ TitleScreenManager_Base(); - TitleScreen *GetTitleScreen() { - return (TitleScreen *) this->mpGameMode; - } - - MainGame *GetMainGame() { - return (MainGame *) this->mpGameMode; - } - // data_ov000_020b1d14 vtable /* 08 */ virtual ~TitleScreenManager_Base() override; /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2, unk32 param3) override; - /* 38 */ virtual void vfunc_38(unk32 param1, unk32 param2, unk32 param3, unk32 param4); + /* 38 */ virtual void vfunc_38(u32 param1, u8 param2, unk16 param3, unk16 param4); /* 3C */ virtual void vfunc_3C(); /* 40 */ virtual void vfunc_40(); /* 44 */ virtual void vfunc_44(); /* 48 */ + + void func_ov000_02060fc8(unk32 param1, unk32 param2, unk32 param3, unk32 param4); }; extern TitleScreenManager_Base *data_027e0994; + +class AdventureModeManager; + +static inline AdventureModeManager *GetAdventureModeManager() { + return (AdventureModeManager *) data_027e0994; +} diff --git a/include/Game/GameModeStartUp.hpp b/include/Game/GameModeStartUp.hpp index e80962d0..82897796 100644 --- a/include/Game/GameModeStartUp.hpp +++ b/include/Game/GameModeStartUp.hpp @@ -19,7 +19,7 @@ public: GameModeStartUp(); // data_ov018_020c5b28 vtable - /* 00 */ virtual ~GameModeStartUp() override {} + // /* 00 */ virtual ~GameModeStartUp() override {} /* 0C */ virtual void vfunc_0C() override; /* 20 */ virtual void vfunc_20() override; diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index efc1426b..a1298b16 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -116,7 +116,7 @@ public: static AdventureFlag GetAdvFlagFromItem(ItemId itemId); }; -class TreasureManager : public ItemManager { +class TreasureManager : public AutoInstance, public ItemManager { public: /* 28 */ unk8 mUnk_28[0x3C - 0x28]; /* 3C */ s16 mUnk_3C[TreasureType_Max]; // treasures @@ -145,11 +145,9 @@ public: static unk32 func_ov000_020a9f4c(unk32 param1); ItemId func_ov000_020aa02c(ItemId itemId); void func_ov000_020aa0ac(ItemId itemId); - void func_ov000_020aa200(); - bool func_ov000_020aa210(); }; -extern TreasureManager *data_ov000_020b6510; +extern TreasureManager *gpTreasureManager; extern UnkStruct_ov000_020afc48 data_ov000_020afc48[ItemFlag_EQUIP_COUNT]; extern const u8 gQuiverCapacities[UpgradeCapacity_Max]; extern const u8 gBombBagCapacities[UpgradeCapacity_Max]; diff --git a/include/MainGame/AdventureMode.hpp b/include/MainGame/AdventureMode.hpp new file mode 100644 index 00000000..b13b8db8 --- /dev/null +++ b/include/MainGame/AdventureMode.hpp @@ -0,0 +1,1018 @@ +#pragma once + +#include "FileSelect/FileSelectUnkDraw.hpp" +#include "Game/GameModeManager.hpp" +#include "Player/TouchControl.hpp" +#include "Unknown/Common.hpp" +#include "Unknown/UnkStruct_0204a060.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_027e09ac.hpp" +#include "Unknown/UnkSystem1.hpp" + +class AdventureModeManager_1B8; + +class AdventureModeManager_15C_20_00 : public GameModeManagerBase_104 { +public: + /* 000 (vtable) */ + /* 01C */ unk32 mUnk_01C; + /* 020 */ UnkSystem2_UnkSubSystem1_Base *mUnk_020; + /* 024 */ UnkSystem2_UnkSubSystem1_Base *mUnk_024; + /* 028 */ UnkSystem2_UnkSubSystem8 mUnk_028; + /* 078 */ UnkSystem2_UnkSubSystem8 mUnk_078; + /* 0C8 */ UnkSubStruct1_Derived1 mUnk_0C8; + /* 0F8 */ UnkSystem2_UnkSubSystem1_Derived1 mUnk_0F8; + /* 158 */ UnkSystem2_UnkSubSystem1_Derived1 mUnk_158; + /* 1B8 */ UnkSystem2_UnkSubSystem1_Derived4 mUnk_1B8; + /* 1EC */ UnkSystem2_UnkSubSystem7_Derived2 mUnk_1EC; + /* 250 */ UnkSystem2_UnkSubSystem1_Derived4 mUnk_250; + /* 284 */ UnkSystem2_UnkSubSystem7_Derived2 mUnk_284; + /* 2E8 */ UnkStruct_ov019_020d24c8_28_258 mUnk_2E8; + /* 300 */ UnkSystem2_UnkSubSystem3 mUnk_300; + /* 53C */ UnkSystem2_UnkSubSystem3 mUnk_53C; + /* 778 */ bool mUnk_778; + /* 779 */ bool mUnk_779; + /* 77A */ unk16 mUnk_77A; + /* 77C */ + + AdventureModeManager_15C_20_00(bool param1); + + /* 00 */ virtual ~AdventureModeManager_15C_20_00() override; + /* 08 */ virtual void vfunc_08(Input *pButtons, TouchControl *pTouchControl) override; + /* 10 */ virtual void vfunc_10(unk8 *param1) override; + + // overlay 17 + bool func_ov017_020c19a0(); + void func_ov017_020c1c80(unk32 param1); + + // overlay 24 + void func_ov024_020ca48c(); + void func_ov024_020ca5c8(); + void func_ov024_020ca658(); +}; + +class AdventureModeManager_15C_28 : public UnkSystem1_ov000_Derived1 { +public: + /* 00 (base) */ + /* 14 */ unk32 mUnk_14; + /* 18 */ unk8 mUnk_18; + /* 19 */ unk8 mUnk_19; // pad? + /* 1A */ unk8 mUnk_1A; // pad? + /* 1B */ unk8 mUnk_1B; // pad? + /* 1C */ + + AdventureModeManager_15C_28(); + + // data_ov000_020b48d0 + /* 00 */ virtual void vfunc_00(unk32 param1) override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 18 */ virtual void vfunc_18() override; + /* 1C */ virtual unk32 vfunc_1C(u32 param1, unk32 param2, unk32 param3) override; + /* 24 */ virtual ~AdventureModeManager_15C_28() override; +}; + +class AdventureModeManager_15C_20 { +public: + AdventureModeManager_15C_20_00 *mUnk_00; + GameModeManagerBase_104 *mUnk_04; + + AdventureModeManager_15C_20(GameModeManagerBase_104 *param1) { + this->mUnk_04 = param1; + this->mUnk_00 = NULL; + } +}; + +class AdventureModeManager_15C { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ GameModeManagerBase_104 mUnk_04; + /* 20 */ AdventureModeManager_15C_20 mUnk_20; + /* 28 */ AdventureModeManager_15C_28 mUnk_28; + /* 44 */ unk8 mUnk_44; + /* 45 */ unk8 mUnk_45; + /* 46 */ unk8 mUnk_46; + /* 47 */ bool mUnk_47; + /* 48 */ unk32 mUnk_48; + /* 4C */ + + AdventureModeManager_15C(); + ~AdventureModeManager_15C(); + + void func_ov001_020c0920(); + + unk32 func_ov017_020c3a00(Input *pButtons, TouchControl *pTouchControl); + void func_ov017_020c3bc0(); + void func_ov017_020c3c64(); +}; + +class AdventureModeManager_160_28 : public UnkStruct_0204a060_Base { +public: + AdventureModeManager_160_28() {} + + // data_ov000_020b1ff4 + /* 08 */ virtual bool vfunc_08(unk32 param1) override; + /* 10 */ virtual bool vfunc_10(void) override; + + void func_ov000_02066218(unk32 param1); +}; + +class AdventureModeManager_160_18 { +public: + /* 00 (vtable) */ + /* 04 */ + + /* 00 */ virtual void vfunc_00(); + /* 04 */ virtual void vfunc_04(); + /* 08 */ virtual void vfunc_08(); + /* 0C */ virtual void vfunc_0C(); + /* 10 */ virtual void vfunc_10(); + /* 14 */ virtual void vfunc_14(); + /* 18 */ virtual void vfunc_18(); + + void func_ov006_020b6bcc(); + void func_ov006_020b6c74(); + void func_ov006_020b6c80(); +}; + +class AdventureModeManager_160_14 { +public: + /* 00 */ STRUCT_PAD(0x00, 0x1C); + /* 1C */ unk32 mUnk_1C; + /* 20 */ STRUCT_PAD(0x20, 0x40); + /* 40 */ AdventureModeManager_160_18 *mUnk_40; + /* 44 */ unk32 mUnk_44; + /* 48 */ unk32 mUnk_48; + /* 4C */ unk32 mUnk_4C; + /* 50 */ unk8 mUnk_50; + /* 51 */ bool mUnk_51; + + void func_ov006_020b6938(); +}; + +class AdventureModeManager_160_4C : public UnkStruct_0204a060_Base { +public: + AdventureModeManager_160_4C() {} + + // data_ov024_020d7ca4 + /* 0C */ virtual bool vfunc_0C(void) override; +}; + +class AdventureModeManager_160_70 { +public: + /* 00 */ UnkStruct_0204a060_Base mUnk_00; + /* 24 */ u8 mUnk_24; + /* 25 */ bool mUnk_25; + /* 26 */ bool mUnk_26; + /* 27 */ bool mUnk_27; + /* 28 */ + + AdventureModeManager_160_70() { + this->mUnk_25 = false; + this->mUnk_26 = false; + this->mUnk_27 = false; + } +}; + +class AdventureModeManager_160 : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ unk32 mUnk_0C; + /* 10 */ GameModeManagerBase_104 *mUnk_10; + /* 14 */ AdventureModeManager_160_14 *mUnk_14; + /* 18 */ AdventureModeManager_160_18 *mUnk_18; + /* 1C */ AdventureModeManager_1B8 *mUnk_1C; + /* 20 */ unk32 mUnk_20; + /* 24 */ Vec2s mUnk_24; + /* 28 */ AdventureModeManager_160_28 mUnk_28; + /* 4C */ AdventureModeManager_160_4C mUnk_4C; + /* 70 */ AdventureModeManager_160_70 mUnk_70; + /* 98 */ + + AdventureModeManager_160(GameModeManagerBase_104 *param1, AdventureModeManager_1B8 *param2); + + // data_ov024_020d7cc0 + /* 00 */ virtual ~AdventureModeManager_160() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_24() override; + + void func_ov024_020c7cfc(); + void func_ov024_020c7d4c(unk32 param1); + void func_ov024_020c83bc(); + void func_ov024_020c8428(); + void func_ov024_020c8454(); + void func_ov024_020c8484(); + void func_ov024_020c84c4(); + void func_ov024_020c851c(unk32 param1); +}; + +class AdventureModeManager_164 : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ STRUCT_PAD(0x0C, 0x1C); + /* 1C */ + + AdventureModeManager_164(GameModeManagerBase_104 *param1, GameModeManagerBase_004 *param2); // overlay 26 + + // data_ov026_0213528c + /* 00 */ virtual ~AdventureModeManager_164() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; +}; + +class AdventureModeManager_168 : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ STRUCT_PAD(0x0C, 0x20); + /* 20 */ bool mUnk_20; + /* 21 */ bool mUnk_21; + /* 24 */ + + AdventureModeManager_168(GameModeManagerBase_104 *param1); // overlay 31 + + // data_ov031_02116254 + /* 00 */ virtual ~AdventureModeManager_168() override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + + void func_ov031_0210df60(unk32 param1); + void func_ov031_0210df70(unk32 param1); + unk32 func_ov031_0210dfcc(); + unk32 func_ov031_0210dfd8(); +}; + +class AdventureModeManager_16C : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ STRUCT_PAD(0x0C, 0x1C); + /* 1C */ bool mUnk_1C; + /* 20 */ + + AdventureModeManager_16C(GameModeManagerBase_104 *param1); // overlay 26 + + // data_ov026_021352bc + /* 00 */ virtual ~AdventureModeManager_16C() override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + + void func_ov026_020d8dd4(unk32 param1); + unk32 func_ov026_020d8e30(); + unk32 func_ov026_020d8e44(); + void func_ov026_020d8e58(); +}; + +class AdventureModeManager_170_14 : public UnkStruct_0204a060_Base { +public: + /* 00 (base) */ + /* 24 */ + + /* 0C */ virtual bool vfunc_0C(void) override; +}; + +class AdventureModeManager_170 : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ GameModeManagerBase_104 *mUnk_0C; // related to game over, set to data_ov008_020b6b5c + /* 10 */ GameModeManagerBase_104 *mUnk_10; + /* 14 */ AdventureModeManager_170_14 mUnk_14; + /* 38 */ unk32 mUnk_38; + /* 3C */ + + AdventureModeManager_170(GameModeManagerBase_104 *param1); // overlay 24 + + // data_ov024_020d7d0c + /* 00 */ virtual ~AdventureModeManager_170() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 24 */ virtual void vfunc_24() override; +}; + +class AdventureModeManager_174_Base_10 : public UnkStruct_0204a060_Base { +public: + /* 00 (base) */ + /* 24 */ + + /* 0C */ virtual bool vfunc_0C(void) override; + /* 10 */ virtual bool vfunc_10(void) override; +}; + +class AdventureModeManager_174_Base : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ GameModeManagerBase_104 *mUnk_0C; + /* 10 */ AdventureModeManager_174_Base_10 mUnk_10; + /* 34 */ unk32 mUnk_34; + /* 38 */ u16 mUnk_38; + /* 3A */ unk16 mUnk_3A; + /* 3C */ UnkStruct_027e09ac_14 mUnk_3C; + /* A4 */ u16 mUnk_A4; + /* A6 */ u16 mUnk_A6; + /* A8 */ unk16 mUnk_A8; + /* AA */ unk16 mUnk_AA; + /* AC */ unk32 mUnk_AC; + /* B0 */ unk32 mUnk_B0; + /* B4 */ Vec2s mUnk_B4; + /* B8 */ + + AdventureModeManager_174_Base(GameModeManagerBase_104 *param1); + + // data_ov024_020d7d58 (vtable) + + void func_ov024_020c88f0(); + void func_ov024_020c8b2c(); +}; + +class AdventureModeManager_178_Base : public AdventureModeManager_174_Base { +public: + /* 00 (base) */ + /* B8 */ + + AdventureModeManager_178_Base(GameModeManagerBase_104 *param1); + + // data_ov024_020d7db8 + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; +}; + +class AdventureModeManager_174 : public AdventureModeManager_174_Base { +public: + /* 00 (base) */ + /* B8 */ unk32 mUnk_B8; + /* BC */ unk32 mUnk_BC; + /* C0 */ + + AdventureModeManager_174(GameModeManagerBase_104 *param1); // overlay 24 + + // data_ov024_020d7d88 + /* 00 */ virtual ~AdventureModeManager_174() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_24() override; +}; + +class AdventureModeManager_178 : public AdventureModeManager_178_Base { +public: + /* 00 (base) */ + /* B8 */ unk32 mUnk_B8; + /* BC */ + + AdventureModeManager_178(GameModeManagerBase_104 *param1); // overlay 24 + + // data_ov024_020d7de8 + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; +}; + +class AdventureModeManager_17C : public AdventureModeManager_178_Base { +public: + /* 00 (base) */ + /* B8 */ unk32 mUnk_B8; + /* BC */ + + AdventureModeManager_17C(GameModeManagerBase_104 *param1); // overlay 62 + + // data_ov062_02160790 + /* 00 */ virtual ~AdventureModeManager_17C() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; +}; + +class AdventureModeManager_180_18 : public UnkStruct_0204a060_Base { +public: + /* 00 (base) */ + /* 24 */ + + AdventureModeManager_180_18() {} + + // data_ov024_020d7e18 vtable + /* 0C */ virtual bool vfunc_0C(void); +}; + +class AdventureModeManager_180 : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ unk32 mUnk_0C; + /* 10 */ unk32 mUnk_10; + /* 14 */ GameModeManagerBase_104 *mUnk_14; + /* 18 */ AdventureModeManager_180_18 mUnk_18; + /* 3C */ unk32 mUnk_3C; + /* 40 */ unk32 mUnk_40; + /* 44 */ bool mUnk_44; + /* 44 */ bool mUnk_45; + /* 48 */ + + AdventureModeManager_180(GameModeManagerBase_104 *param1); // overlay 24 + + // data_ov024_020d7e34 + /* 00 */ virtual ~AdventureModeManager_180() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_24() override; + + void func_ov024_020c9430(unk32 param1, unk32 param2); + void func_ov024_020c957c(); + void func_ov024_020c95c4(); +}; + +class AdventureModeManager_184_10_Base : public GameModeManagerBase_104 { +public: + /* 00 (vtable) */ + + AdventureModeManager_184_10_Base(); // func_ov010_020b6690 + + // data_ov010_020b8dd0 vtable + /* 00 */ virtual ~AdventureModeManager_184_10_Base() override; + /* 08 */ virtual void vfunc_08(Input *pButtons, TouchControl *pTouchControl) override; + /* 10 */ virtual void vfunc_10(unk8 *param1) override; + /* 1C */ virtual void vfunc_1C(); + /* 20 */ virtual bool vfunc_20(); + /* 24 */ virtual void vfunc_24(); + /* 28 */ virtual void vfunc_28(); + /* 2C */ virtual void vfunc_2C(); + /* 30 */ virtual void vfunc_30(); + /* 34 */ virtual void vfunc_34(); + + void func_ov010_020b7008(); + void func_ov010_020b7054(); +}; + +class AdventureModeManager_184_10 : public AdventureModeManager_184_10_Base { +public: + /* 00 (base) */ +}; + +class AdventureModeManager_184_14 { +public: + /* 00 */ +}; + +class AdventureModeManager_184 : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ GameModeManagerBase_104 *mUnk_0C; + /* 10 */ AdventureModeManager_184_10 *mUnk_10; + /* 14 */ AdventureModeManager_184_14 *mUnk_14; + /* 18 */ bool mUnk_18; + /* 19 */ unk8 mUnk_19; // pad? + /* 1A */ unk8 mUnk_1A; // pad? + /* 1B */ unk8 mUnk_1B; // pad? + + AdventureModeManager_184(GameModeManagerBase_104 *param1); // overlay 24 + + // data_ov024_020d7e64 + /* 00 */ virtual ~AdventureModeManager_184(); + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_24() override; + + void func_ov024_020c979c(unk32 param1); +}; + +class AdventureModeManager_188 : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ STRUCT_PAD(0x0C, 0x38); + + AdventureModeManager_188(GameModeManagerBase_104 *param1); // overlay 31 + + // data_ov031_021162a0 + /* 00 */ virtual ~AdventureModeManager_188() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; +}; + +class AdventureModeManager_18C_14 : public UnkStruct_0204a060_Base { +public: + /* 00 (base) */ + /* 24 */ + + AdventureModeManager_18C_14(); + + /* 0C */ virtual bool vfunc_0C(void) override; + /* 10 */ virtual bool vfunc_10(void) override; +}; + +class AdventureModeManager_18C_10 { +public: + /* 0000 */ STRUCT_PAD(0x0000, 0x10E9); + /* 10E9 */ u8 mUnk_10E9; + /* 10EA */ unk8 mUnk_10EA; // pad? + /* 10EB */ unk8 mUnk_10EB; // pad? + /* 10EC */ u32 mUnk_10EC; + + void func_ov011_020b88ac(); + void func_ov011_020b89f0(unk32 param1); +}; + +class AdventureModeManager_18C : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ GameModeManagerBase_104 *mUnk_0C; + /* 0C */ AdventureModeManager_18C_10 *mUnk_10; + /* 14 */ AdventureModeManager_18C_14 mUnk_14; + /* 38 */ bool mUnk_38; + /* 39 */ bool mUnk_39; + /* 3A */ bool mUnk_3A; + /* 3B */ unk8 mUnk_3B; + /* 3C */ unk32 mUnk_3C; + /* 40 */ Vec2s mUnk_40; + /* 44 */ unk32 mUnk_44; + /* 48 */ Vec2s mUnk_48; + /* 4C */ unk32 mUnk_4C; + /* 50 */ unk16 mUnk_50; + /* 52 */ unk16 mUnk_52; + /* 50 */ unk32 mUnk_54; + + AdventureModeManager_18C(GameModeManagerBase_104 *param1); + + // data_ov024_020d7eb0 + /* 00 */ virtual ~AdventureModeManager_18C() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_24() override; + + void func_ov024_020c9c6c(); + void func_ov024_020ca034(); + void func_ov024_020ca068(unk32 param1); + bool func_ov024_020ca074(); +}; + +class AdventureModeManager_190_10 { +public: + bool func_ov011_020b8f20(unk32 param1); +}; + +class AdventureModeManager_190_14 : public UnkStruct_0204a060_Base { +public: + /* 00 (base) */ + /* 24 */ + + // data_ov024_020d7efc + /* 0C */ virtual bool vfunc_0C(void) override; +}; + +class AdventureModeManager_190; +class AdventureModeManager_190_38 : public UnkStruct_0204a060_Base { +public: + /* 00 (base) */ + /* 24 */ AdventureModeManager_190 *mpParent; + /* 28 */ + + AdventureModeManager_190_38(AdventureModeManager_190 *pParent) { + this->mpParent = pParent; + } + + // data_ov024_020d7ee0 + /* 0C */ virtual bool vfunc_0C(void) override; +}; + +class AdventureModeManager_190 : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ GameModeManagerBase_104 *mUnk_0C; + /* 10 */ AdventureModeManager_190_10 *mUnk_10; + /* 14 */ AdventureModeManager_190_14 mUnk_14; + /* 38 */ AdventureModeManager_190_38 mUnk_38; + /* 60 */ unk32 mUnk_60; + /* 64 */ + + AdventureModeManager_190(GameModeManagerBase_104 *param1); // overlay 24 + + // data_ov024_020d7f18 + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + + void func_ov024_020ca21c(); + bool func_ov024_020ca24c(unk32 param1); + bool func_ov024_020ca280(); +}; + +class AdventureModeManager_194 : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ unk32 mUnk_0C; + /* 10 */ STRUCT_PAD(0x10, 0x48); + /* 48 */ + + AdventureModeManager_194(GameModeManagerBase_104 *param1); + + // data_ov031_021162ec + /* 00 */ virtual ~AdventureModeManager_194() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; + /* 24 */ virtual void vfunc_24() override; +}; + +class AdventureModeManager_198 : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ STRUCT_PAD(0x0C, 0x3C); + + AdventureModeManager_198(GameModeManagerBase_104 *param1); // overlay 58 + + // data_ov058_02155e08 + /* 00 */ virtual ~AdventureModeManager_198() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; +}; + +class AdventureModeManager_19C : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ STRUCT_PAD(0x0C, 0x14); + /* 14 */ + + AdventureModeManager_19C(GameModeManagerBase_104 *param1); // overlay 26 + + // data_ov026_021352ec + /* 00 */ virtual ~AdventureModeManager_19C() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 24 */ virtual void vfunc_24() override; +}; + +class AdventureModeManager_1A0 : public AdventureModeManager_174_Base { +public: + /* 00 (base) */ + /* 0C */ STRUCT_PAD(0x0C, 0xBC); + + AdventureModeManager_1A0(GameModeManagerBase_104 *param1); // overlay 62 + + // data_ov062_021607c0 + /* 00 */ virtual ~AdventureModeManager_1A0() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; +}; + +class AdventureModeManager_1A4 : public AdventureModeManager_174_Base { +public: + /* 00 (base) */ + /* 0C */ STRUCT_PAD(0x0C, 0xBC); + + AdventureModeManager_1A4(GameModeManagerBase_104 *param1); // overlay 62 + + // data_ov062_021607f0 + /* 00 */ virtual ~AdventureModeManager_1A4() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 0C */ virtual void vfunc_0C(unk32 param1) override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 1C */ virtual void vfunc_1C(unk32 param1) override; + /* 20 */ virtual void vfunc_20(unk32 param1, unk32 param2) override; +}; + +class AdventureModeManager_1A8 : public FileSelectManager_UnkDrawBase { +public: + /* 00 (base) */ + /* 0C */ STRUCT_PAD(0x0C, 0x38); + + AdventureModeManager_1A8(GameModeManagerBase_104 *param1); // overlay 88 + + // data_ov088_02176068 + /* 00 */ virtual ~AdventureModeManager_1A8() override; + /* 08 */ virtual void vfunc_08(unk32 param1) override; + /* 14 */ virtual void vfunc_14(unk32 param1) override; + /* 18 */ virtual void vfunc_18(unk32 param1) override; + /* 24 */ virtual void vfunc_24() override; +}; + +// AdventureMode? +class AdventureModeManager_1AC : public GameModeManagerBase_104 { +public: + /* 00 (base) */ + /* 1C */ + + AdventureModeManager_1AC(); // overlay 24 + + // data_ov024_020d7bf4 + /* 00 */ virtual ~AdventureModeManager_1AC() override; + /* 08 */ virtual void vfunc_08(Input *pButtons, TouchControl *pTouchControl) override; + /* 10 */ virtual void vfunc_10(unk8 *param1) override; + /* 14 */ virtual void vfunc_14(unk8 *param1) override; +}; + +class AdventureModeManager_1B0 : public GameModeManagerBase_104 { +public: + /* 1C */ UnkStruct_ov019_020d24c8_28_258 mUnk_1C; + /* 34 */ STRUCT_PAD(0x34, 0x50); + /* 50 */ + + GameModeLinkListNode *GetNode() { + GameModeLinkListNode *node = (GameModeLinkListNode *) this; + if (node != NULL) { + node = (GameModeLinkListNode *) ((u32 *) node + 1); + } + return node; + } + + AdventureModeManager_1B0(); // overlay 31 + void func_ov031_0210fad0(); + + // data_ov031_02116358 + /* 00 */ virtual ~AdventureModeManager_1B0() override; + /* 08 */ virtual void vfunc_08(Input *pButtons, TouchControl *pTouchControl) override; + /* 10 */ virtual void vfunc_10(unk8 *param1) override; +}; + +struct AdventureModeManager_1B8_Base_1C { + /* 00 */ unk16 mUnk_00; + /* 02 */ s16 mUnk_02; + /* 04 */ unk16 mUnk_04; + /* 06 */ s16 mUnk_06; + + AdventureModeManager_1B8_Base_1C() {} + AdventureModeManager_1B8_Base_1C(unk16 param1, unk16 param2, unk16 param3, unk16 param4) { + this->mUnk_00 = param1; + this->mUnk_02 = param2; + this->mUnk_04 = param3; + this->mUnk_06 = param4; + } +}; + +#define ADVMGR_UNK -0x8000 +class AdventureModeManager_1B8_Base { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ bool mUnk_08; + /* 09 */ bool mUnk_09; + /* 0A */ bool mUnk_0A; + /* 0B */ u8 mUnk_0B; + /* 0C */ u8 mUnk_0C; + /* 0C */ bool mUnk_0D; + /* 0E */ u8 mBGType; + /* 0F */ bool mIsTopScreen; + /* 10 */ bool mUnk_10; + /* 11 */ unk8 mUnk_11; // pad? + /* 12 */ unk8 mUnk_12; // pad? + /* 13 */ unk8 mUnk_13; // pad? + /* 14 */ s32 mUnk_14; + /* 18 */ u8 *mUnk_18; + /* 1C */ AdventureModeManager_1B8_Base_1C mUnk_1C; + /* 24 */ + + s32 GetUnkValue_ImplS(s32 val, bool cond) { + if (cond) { + return (val * 256) / 2; + } + + return val * 256; + } + + u32 GetUnkValue(u32 val) { + if (this->mUnk_10) { + return (val * 256) / 2; + } + + return val * 256; + } + + u32 GetUnkValue2() { + if (this->mUnk_08) { + return 0x2000; + } + + return 0; + } + + AdventureModeManager_1B8_Base(u8 bgType, bool param2, const AdventureModeManager_1B8_Base_1C *param3, bool param4, + bool param5); + ~AdventureModeManager_1B8_Base(); + + void func_ov024_020d0698(); + void func_ov024_020d06d0(); + void func_ov024_020d072c(unk8 *param1); + bool func_ov024_020d0744(s32 arg1, s32 arg2, s32 arg3, s32 arg4, u8 arg5, u8 arg6); + bool func_ov024_020d0924(unk32 param1, unk32 param2, u8 param3, u8 param4); + void func_ov024_020d0a64(); + void TryLoadBGChar(void *ptr, u32 offset, u32 size); + unk32 func_ov024_020d0db4(unk32 param1, unk32 param2); + bool func_ov024_020d0df8(unk32 param1, unk32 param2); + void func_ov024_020d0e64(void *ptr, u32 size); + bool func_ov024_020d0e98(); + static void func_ov024_020d0ec0(s32 *pFlags, s32 position, bool doSet); + static bool func_ov024_020d0f0c(s32 *pFlags, s32 position); + static unk32 func_ov024_020d0f2c(unk32 param1, unk32 param2); +}; + +class AdventureModeManager_1B8 : public AdventureModeManager_1B8_Base { +public: + /* 00 (base) */ + /* 24 */ u16 mUnk_24; + /* 24 */ unk16 mUnk_26; // pad? + /* 24 */ void *mUnk_28; + /* 2C */ + + AdventureModeManager_1B8(u8 bgType, bool param2, bool param3); // overlay 24 + ~AdventureModeManager_1B8(); + + void func_ov024_020d0fb4(unk32 param1, unk32 param2, u8 param3, u8 param4, TouchControl *param5); + void func_ov024_020d114c(); + bool func_ov024_020d1160(); + void func_ov024_020d1364(); + void func_ov024_020d13cc(s32 param1); + bool func_ov024_020d14a8(AdventureModeManager_1B8_Base_1C *param1, unk32 param2, s32 *pFlags); + void func_ov024_020d1564(const AdventureModeManager_1B8_Base_1C *param1, unk32 param2, s32 *pFlags, const u8 param4); + void func_ov024_020d1614(void *param1); + void func_ov024_020d1638(); +}; + +class AdventureModeManager_1BC : public AdventureModeManager_1B8_Base { +public: + /* 00 (base) */ + /* 24 */ STRUCT_PAD(0x24, 0x34); + /* 34 */ bool mUnk_34; + /* 35 */ unk8 mUnk_35; + /* 36 */ unk8 mUnk_36; + /* 37 */ unk8 mUnk_37; + /* 38 */ + + AdventureModeManager_1BC(); // overlay 93 + ~AdventureModeManager_1BC(); + + void func_ov093_02175514(); +}; + +struct SceneInfos { + /* 00 */ u32 sceneIndex; // scene index + /* 04 */ u8 unk_04; + /* 05 */ unk8 unk_05; // pad? + /* 06 */ unk16 unk_06; +}; + +class AdventureModeManager : public TitleScreenManager_Base { +public: + /* 000 (base) */ + /* 154 */ unk32 mUnk_154; + /* 158 */ GameModeManagerBase_104 *mUnk_158; + /* 15C */ AdventureModeManager_15C *mUnk_15C; + /* 160 */ AdventureModeManager_160 *mUnk_160; // related to the minimap? + /* 164 */ AdventureModeManager_164 *mUnk_164; + /* 168 */ AdventureModeManager_168 *mUnk_168; + /* 16C */ AdventureModeManager_16C *mUnk_16C; + /* 170 */ AdventureModeManager_170 *mUnk_170; // related to game over? + /* 174 */ AdventureModeManager_174 *mUnk_174; // related to the minimap? + /* 178 */ AdventureModeManager_178 *mUnk_178; // related to factory ovl? + /* 17C */ AdventureModeManager_17C *mUnk_17C; + /* 180 */ AdventureModeManager_180 *mUnk_180; // related to stamps? + /* 184 */ AdventureModeManager_184 *mUnk_184; // related to WDST actor? + /* 188 */ AdventureModeManager_188 *mUnk_188; + /* 18C */ AdventureModeManager_18C *mUnk_18C; // related to world map? + /* 190 */ AdventureModeManager_190 *mUnk_190; // related to world map? + /* 194 */ AdventureModeManager_194 *mUnk_194; + /* 198 */ AdventureModeManager_198 *mUnk_198; + /* 19C */ AdventureModeManager_19C *mUnk_19C; + /* 1A0 */ AdventureModeManager_1A0 *mUnk_1A0; + /* 1A4 */ AdventureModeManager_1A4 *mUnk_1A4; + /* 1A8 */ AdventureModeManager_1A8 *mUnk_1A8; + /* 1AC */ AdventureModeManager_1AC *mUnk_1AC; + /* 1B0 */ AdventureModeManager_1B0 *mUnk_1B0; + /* 1B4 */ bool mUnk_1B4; + /* 1B4 */ bool mUnk_1B5; + /* 1B4 */ unk8 mUnk_1B6; // pad? + /* 1B4 */ unk8 mUnk_1B7; // pad? + /* 1B8 */ AdventureModeManager_1B8 *mUnk_1B8; + /* 1BC */ AdventureModeManager_1BC *mUnk_1BC; + /* 1C0 */ bool mUnk_1C0; + /* 1C1 */ bool mAllowMapPaint; + /* 1C2 */ unk8 mUnk_1C2; // pad? + /* 1C3 */ unk8 mUnk_1C3; // pad? + /* 1C4 */ SceneInfos mUnk_1C4; + /* 1C4 */ SceneInfos mUnk_1CC; + /* 1D4 */ + + AdventureModeManager(unk32 param1); + + // data_ov024_020d7c18 vtable + /* 08 */ virtual ~AdventureModeManager() override; + /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2, unk32 param3) override; + /* 14 */ virtual void vfunc_14() override; + /* 18 */ virtual void vfunc_18() override; + /* 1C */ virtual void vfunc_1C() override; + /* 20 */ virtual void vfunc_20() override; + /* 24 */ virtual void vfunc_24() override; + /* 28 */ virtual void vfunc_28(unk8 *param1) override; + /* 2C */ virtual void vfunc_2C(unk8 *param1) override; + /* 34 */ virtual void vfunc_34(unk32 param1, unk32 param2) override; + /* 38 */ virtual void vfunc_38(u32 param1, u8 param2, unk16 param3, unk16 param4) override; + + void func_ov001_020c08b8(); + + void func_ov024_020c5288(); + void func_ov024_020c52a0(); + void func_ov024_020c52b8(); + void func_ov024_020c52f4(); + void func_ov024_020c530c(); + void func_ov024_020c5364(); + void func_ov024_020c537c(); + void func_ov024_020c53e8(); + void func_ov024_020c555c(unk32 param1); + void func_ov024_020c5cec(); + bool func_ov024_020c5dac(); + bool func_ov024_020c5ecc(); + bool func_ov024_020c5f70(); + bool func_ov024_020c60f4(); + bool func_ov024_020c623c(); + void func_ov024_020c6514(SceneIndex sceneIndex, u8 param2, unk16 param3, unk16 param4); + u8 GetMapPaintIndex(SceneIndex sceneIndex, u8 param2); + void func_ov024_020c66c0(); + void func_ov024_020c671c(); + void func_ov024_020c6770(SceneIndex sceneIndex, u8 param2, unk16 param3, unk16 param4); + bool func_ov024_020c681c(); + void func_ov024_020c6840(SceneIndex sceneIndex); + void func_ov024_020c68d4(); + bool func_ov024_020c68ec(unk32 param1, unk32 param2); + void func_ov024_020c6930(); + bool func_ov024_020c6940(unk32 param1, unk32 param2); + unk32 func_ov024_020c69d0(); + unk32 func_ov024_020c6a20(); + void func_ov024_020c6a48(unk32 param1, unk32 param2); + bool func_ov024_020c6af4(unk32 param1); + void func_ov024_020c6b8c(); + void func_ov024_020c6c60(); + void func_ov024_020c6cd4(); + bool func_ov024_020c6ce4(); + unk32 func_ov024_020c6d04(); + void func_ov024_020c6d10(); + void func_ov024_020c6d20(unk32 param1); + void func_ov024_020c6d2c(unk32 param1); + bool func_ov024_020c6d64(); + void func_ov024_020c6db8(unk32 param1); + bool func_ov024_020c6dec(); + void func_ov024_020c699c(); + + static AdventureModeManager *Create(unk32 param1); + static void func_ov001_020c00d4(); + static void func_ov001_020c0104(); + static void func_ov001_020c0194(); + static void func_ov001_020c0824(); + static void func_ov001_020c083c(); + static void func_ov001_020c0854(); + static void func_ov001_020c0874(); + static void func_ov001_020c0894(); +}; diff --git a/include/MainGame/CargoManager.hpp b/include/MainGame/CargoManager.hpp index 88b7599a..f3af851c 100644 --- a/include/MainGame/CargoManager.hpp +++ b/include/MainGame/CargoManager.hpp @@ -52,8 +52,6 @@ public: void func_ov001_020bf830(); - static void SetInstance(CargoManager *pInstance); - static bool ClearInstance(); static void Destroy(); // func_ov001_020bf428 // overlay 17 diff --git a/include/MainGame/MainGame.hpp b/include/MainGame/MainGame.hpp deleted file mode 100644 index f8a3e15b..00000000 --- a/include/MainGame/MainGame.hpp +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "Game/GameModeManager.hpp" - -class MainGameManager : public TitleScreenManager_Base { -public: - /* 000 (base) */ - /* 154 */ - - // data_ov024_020d7c18 vtable - /* 08 */ virtual ~MainGameManager() override; - /* 10 */ virtual void vfunc_10(unk32 param1, unk32 param2, unk32 param3) override; - /* 14 */ virtual void vfunc_14() override; - /* 18 */ virtual void vfunc_18() override; - /* 1C */ virtual void vfunc_1C() override; - /* 20 */ virtual void vfunc_20() override; - /* 24 */ virtual void vfunc_24() override; - /* 28 */ virtual void vfunc_28(unk8 *param1) override; - /* 2C */ virtual void vfunc_2C(unk8 *param1) override; - /* 30 */ virtual void vfunc_30(unk32 param1) override; - /* 34 */ virtual void vfunc_34(unk32 param1, unk32 param2) override; - /* 38 */ virtual void vfunc_38(unk32 param1, unk32 param2, unk32 param3, unk32 param4) override; -}; diff --git a/include/MainGame/MiscAdvManager.hpp b/include/MainGame/MiscAdvManager.hpp index 85185205..28537b13 100644 --- a/include/MainGame/MiscAdvManager.hpp +++ b/include/MainGame/MiscAdvManager.hpp @@ -59,7 +59,7 @@ enum StampType_ { /* 20 */ StampType_Max = 20, }; -class MiscAdvManager { +class MiscAdvManager : public AutoInstance { public: /* 00 */ u16 mStampDates[StampType_Max]; /* 28 */ u16 mUnk_28; @@ -105,8 +105,6 @@ public: void func_ov024_020d6610(); static MiscAdvManager *Create(); - static void SetInstance(MiscAdvManager *pInstance); - static int ClearInstance(); }; extern MiscAdvManager *gpMiscAdvManager; diff --git a/include/MainGame/PassengerManager.hpp b/include/MainGame/PassengerManager.hpp index cb0a982d..d1fd75e3 100644 --- a/include/MainGame/PassengerManager.hpp +++ b/include/MainGame/PassengerManager.hpp @@ -56,8 +56,6 @@ public: bool func_ov001_020bfa1c(); static bool func_ov001_020bf870(); - static void SetInstance(PassengerManager *pInstance); // func_ov001_020bfa38 - static bool ClearInstance(); // func_ov001_020bfa44 // overlay 24 void func_ov024_020d41bc(UnkStruct_Param1 *pActorId); diff --git a/include/MainGame/UnkAdventureModeSystem1.hpp b/include/MainGame/UnkAdventureModeSystem1.hpp new file mode 100644 index 00000000..df9a70f0 --- /dev/null +++ b/include/MainGame/UnkAdventureModeSystem1.hpp @@ -0,0 +1,21 @@ +#pragma once + +#include "Unknown/Common.hpp" +#include "types.h" + +class UnkAdventureModeSystem1 { +public: + /* 00 (vtable) */ + /* 04 */ UnkSystem2_UnkSubSystem9 mUnk_04; + /* 48 */ + + UnkAdventureModeSystem1(unk16 *param1, unk16 *param2, unk32 param3); + UnkAdventureModeSystem1(unk32 param3); + + // data_ov024_020d7f7c + /* 00 */ virtual void vfunc_00() = 0; + + void func_ov024_020cab58(); + void func_ov024_020caba4(); + void func_ov024_020cad7c(); +}; diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp index ed4cf9d1..3544e9d7 100644 --- a/include/Message/BMG.hpp +++ b/include/Message/BMG.hpp @@ -1,5 +1,6 @@ #pragma once +#include "Message/BMGEnums.hpp" #include "System/SysNew.hpp" #include "global.h" #include "types.h" diff --git a/include/Message/BMGEnums.hpp b/include/Message/BMGEnums.hpp new file mode 100644 index 00000000..a8acc561 --- /dev/null +++ b/include/Message/BMGEnums.hpp @@ -0,0 +1,213 @@ +#pragma once + +#include "versions.h" + +enum MsgIndex_ { + // BMGGroup_maingame + MsgIndex_ViewTrain, + MsgIndex_GetItemNothing, + MsgIndex_GetItemNormalShield, + MsgIndex_GetItemBombBag, + MsgIndex_Empty_04, + MsgIndex_GetItemSmallKey, + MsgIndex_Empty_06, + MsgIndex_GetItemGreenRupee, + MsgIndex_GetItemBlueRupee, + MsgIndex_GetItemRedRupee, + MsgIndex_GetItemBigGreenRupee, + MsgIndex_GetItemBigRedRupee, + MsgIndex_GetItemBigGoldRupee, + MsgIndex_GetItemForceGem_18, + MsgIndex_GetItemForceGem_19, + MsgIndex_GetItemForceGem_20, + MsgIndex_GetItemFinalTrack, + MsgIndex_Empty_11, + MsgIndex_Empty_12, + MsgIndex_Empty_13, + MsgIndex_Empty_14, + MsgIndex_GetItemForceGem_35, + MsgIndex_GetItemForceGem_36, + MsgIndex_GetItemForceGem_37, + MsgIndex_GetItemLetter, + MsgIndex_GetItemHeartContainer, + MsgIndex_GetItemMediumQuiver, + MsgIndex_GetItemMediumBombBag, + MsgIndex_GetItemForceGem_43, + MsgIndex_GetItemForceGem_44, + MsgIndex_GetItemForceGem_45, + MsgIndex_GetItemForceGem_46, + MsgIndex_GetItemForceGem_47, + MsgIndex_GetItemForceGem_48, + MsgIndex_GetItemForceGem_49, + MsgIndex_GetItemForceGem_50, + MsgIndex_GetItemForceGem_51, + MsgIndex_GetItemForceGem_52, + MsgIndex_GetItemForceGem_53, + MsgIndex_GetItemForceGem_54, + MsgIndex_GetItemForceGem_55, + MsgIndex_GetItemForceGem_56, + MsgIndex_GetItemForceGem_57, + MsgIndex_Empty_2B, + MsgIndex_Empty_2C, + MsgIndex_Empty_2D, + MsgIndex_Empty_2E, + MsgIndex_Empty_2F, + MsgIndex_Empty_30, + MsgIndex_GetItemTenPriceCard, + MsgIndex_GetItemRedPotion, + MsgIndex_GetItemPurplePotion, + MsgIndex_GetItemYellowPotion, + MsgIndex_GetItemDemonFossil, + MsgIndex_GetItemStalfosSkull, + MsgIndex_GetItemStarFragment, + MsgIndex_GetItemBeeLarvae, + MsgIndex_GetItemWoodHeart, + MsgIndex_GetItemDarkPearlLoop, + MsgIndex_GetItemWhitePearlLoop, + MsgIndex_GetItemRutoCrown, + MsgIndex_GetItemDragonScale, + MsgIndex_GetItemPirateNecklace, + MsgIndex_GetItemPalaceDish, + MsgIndex_GetItemGoronAmber, + MsgIndex_GetItemMysticJade, + MsgIndex_GetItemAncientCoin, + MsgIndex_GetItemPricelessStone, + MsgIndex_GetItemRegalRing, + MsgIndex_Empty_45, + MsgIndex_Empty_46, + MsgIndex_Empty_47, + MsgIndex_GetItemLargeQuiver, + MsgIndex_GetItemLargeBombBag, + MsgIndex_Empty_4A, + MsgIndex_Empty_4B, + MsgIndex_Empty_4C, + MsgIndex_Empty_4D, + MsgIndex_GetItemScrollSpinAttack, + MsgIndex_GetItemScrollBeam, + MsgIndex_GetItemRabbitNet, + MsgIndex_GetItemBeedleCard, + MsgIndex_GetItemSilverCard, + MsgIndex_GetItemGoldCard, + MsgIndex_GetItemPlatinumCard, + MsgIndex_GetItemDiamondCard, + MsgIndex_GetItemFreebieCard, + MsgIndex_GetItemQuintupleCard, + MsgIndex_GetItemCarbenLetter, +#if !IS_JP + MsgIndex_GetItemRecruitUniform2, + MsgIndex_GetItemEngineerUniform, +#endif + MsgIndex_Empty_5B, + MsgIndex_Empty_5C, + MsgIndex_ShopSell, + MsgIndex_ShopQuit, + MsgIndex_ShopOK, + MsgIndex_Empty_60, + MsgIndex_Empty_61, + MsgIndex_Continue1, + MsgIndex_SaveAndQuit1, + MsgIndex_Continue2, + MsgIndex_SaveAndQuit2, + MsgIndex_Skip1, + MsgIndex_Skip2, + MsgIndex_Empty_68, + MsgIndex_Empty_69, + MsgIndex_Empty_6A, + MsgIndex_Empty_6B, + MsgIndex_Empty_6C, + MsgIndex_Empty_6D, + MsgIndex_MapPaintNotAllowed, + MsgIndex_SaveAsk, + MsgIndex_SaveProgress, + MsgIndex_SaveDone, + MsgIndex_CantReadSign, + MsgIndex_Empty_73, + MsgIndex_SaveAskQuit, +#if IS_JP + MsgIndex_TooDarkToRead, +#endif + MsgIndex_MiniGameQuit, + MsgIndex_ItLooksDifferent, + MsgIndex_NothingHappened, + MsgIndex_AskDrinkPotion, + MsgIndex_PlayedSongAwakening, + MsgIndex_PlayedSongRecovery, + MsgIndex_PlayedSongBirds, + MsgIndex_PlayedSongLight, + MsgIndex_PlayedSongDiscovery, + MsgIndex_CantHealMore, + MsgIndex_NothingToWake, + MsgIndex_CantHealHere, + MsgIndex_NoBirds, + MsgIndex_NoLight, + MsgIndex_NothingHidden, + MsgIndex_Empty_84, + MsgIndex_Empty_85, + MsgIndex_Empty_86, + MsgIndex_Empty_87, + MsgIndex_Empty_88, + MsgIndex_FairyHeal, + MsgIndex_FairyHealFirstTimePart1, + MsgIndex_FairyHealFirstTimePart2, + MsgIndex_Undefined, + MsgIndex_GossipStoneAskTreasures, + MsgIndex_GossipStoneNoTreasures, + MsgIndex_GossipStoneChoice2, + MsgIndex_GossipStoneChoice1SaidNo, + MsgIndex_GossipStoneChoice2SaidNo, + MsgIndex_GossipStoneNoMoney, + MsgIndex_GossipStonePaid, + MsgIndex_StampStand, + MsgIndex_StampStandNoBook, + MsgIndex_Empty_96, + MsgIndex_Empty_97, + MsgIndex_ForestLand, + MsgIndex_SnowLand, + MsgIndex_OceanLand, + MsgIndex_FireLand, + MsgIndex_TowerOfSpirits, + MsgIndex_TunnelToTheTower, + MsgIndex_WoodedTemple, + MsgIndex_BlizzardTemple, + MsgIndex_MarineTemple, + MsgIndex_MountainTemple, + MsgIndex_DesertTemple, + MsgIndex_PirateHideout, + MsgIndex_HyruleCastle, + MsgIndex_CastleTown, + MsgIndex_Mayscore, + MsgIndex_AnoukiVillage, + MsgIndex_PapuziaVillage, + MsgIndex_GoronVillage, + MsgIndex_TradingPost, + MsgIndex_IcySpring, + MsgIndex_OutsetVillage, + MsgIndex_WoodlandSanctuary, + MsgIndex_SnowfallSanctuary, + MsgIndex_IslandSanctuary, + MsgIndex_ValleySanctuary, + MsgIndex_DuneSanctuary, + MsgIndex_BridgeWorkersHouse, + MsgIndex_BossStagnox, + MsgIndex_BossFraaz, + MsgIndex_BossCactops, + MsgIndex_BossVulcano, + MsgIndex_BossCapbone, + MsgIndex_BossGhostTrain, + MsgIndex_BossStaven, + MsgIndex_BossMalladus1, + MsgIndex_BossMalladus2, + MsgIndex_GoronTargetRange, + MsgIndex_SnowdriftStation, + MsgIndex_LostAtSeaStation, + MsgIndex_DisorientationStation, + MsgIndex_EndsOfTheEarthStation, + MsgIndex_DarOreMine, + MsgIndex_RabbitHaven, + MsgIndex_SlipperyStation, + MsgIndex_ThreeQuestionMarks, + MsgIndex_Floor1, + MsgIndex_Floor2, + MsgIndex_Floor3, + MsgIndex_ZeldaPhantomTooFar, +}; diff --git a/include/Save/SaveManager.hpp b/include/Save/SaveManager.hpp index 2aaeb52b..934c32db 100644 --- a/include/Save/SaveManager.hpp +++ b/include/Save/SaveManager.hpp @@ -181,8 +181,8 @@ public: /* 00C */ unk32 mUnk_00C; /* 010 */ unk32 mUnk_010; /* 014 */ unk16 mUnk_014; - /* 016 */ unk16 mSceneIndex; - /* 018 */ u8 mInteriorIndex; // "house" index but could be more? + /* 016 */ u16 mSceneIndex; + /* 018 */ u8 mRoomIndex; // "house" index but could be more? /* 019 */ u8 mSpawnIndex; /* 01A */ unk16 mUnk_01A; /* 01C */ unk32 mUnk_01C; @@ -374,7 +374,8 @@ struct SaveManager_36 { struct SaveManager_00 { /* 000 */ STRUCT_PAD(0x00, 0x36); /* 036 */ SaveManager_36 mUnk_36[0x60]; - /* 336 */ + /* 336 */ STRUCT_PAD(0x336, 0xB30); + /* B30 */ unk32 mUnk_B30[1]; // flags, at least 1 /* BB8 */ }; @@ -398,11 +399,11 @@ public: /* 244 */ unk32 mUnk_244; bool IsUnk20A() { - return mUnk_20A == 0; + return this->mUnk_20A == 0; } - unk32 IsUnk210() { - return mUnk_210 == 0; + BOOL IsUnk210() { + return this->mUnk_210 == 0; } SaveSlot *GetSaveSlot(int saveSlotIndex) { @@ -416,7 +417,13 @@ public: SaveManager(); void func_ov000_020a0b2c(UnkCallback param1, unk32 param2); - void func_ov000_020ba7c8(u16 saveSlotIndex); + bool func_ov000_020a0b70(void *param1, unk32 param2); + + void func_ov001_020ba670(); + void func_ov001_020ba7a8(); + void func_ov001_020ba7c8(u16 saveSlotIndex); + + void func_ov017_020c3040(void *param1, unk32 param2); void func_ov019_020d08fc(unk32 param1, PTMF::PTMFCallback param2); bool func_ov019_020d0964(void); diff --git a/include/System/OverlayManager.hpp b/include/System/OverlayManager.hpp index 55953e85..f3efcffb 100644 --- a/include/System/OverlayManager.hpp +++ b/include/System/OverlayManager.hpp @@ -387,6 +387,14 @@ public: /* 00 */ OverlayIndex mLoadedOverlays[OverlaySlot_COUNT]; /* 48 */ + bool IsPlayerSub() { + return this->mLoadedOverlays[OverlaySlot_9] == OverlayIndex_PlayerSub; + } + + bool IsMapA6() { + return this->mLoadedOverlays[OverlaySlot_13] == OverlayIndex_MapA6; + } + void Load(OverlaySlot slot, OverlayIndex index); void LoadIfNotLoaded(OverlaySlot slot, OverlayIndex index); void Unload(OverlaySlot slot); diff --git a/include/System/SysNew.hpp b/include/System/SysNew.hpp index 0cc78696..7c0c8d43 100644 --- a/include/System/SysNew.hpp +++ b/include/System/SysNew.hpp @@ -40,6 +40,10 @@ public: void *operator new(size_t length, u32 id, u32 idLength = 4); void *operator new[](size_t length, u32 id, u32 idLength = 4); +static inline void *operator new(size_t length, void *ptr = nullptr) { +#pragma unused(length) + return ptr; +} class UnkStruct_02011e10_Sub1 { public: @@ -79,8 +83,9 @@ public: /* 82 */ unk8 mUnk_82; /* 83 */ unk8 mUnk_83; - void func_02013014(); - void func_02013070(); + unk32 func_02013014(); + bool func_02013070(); + void func_020130d4(unk32 param1); void func_ov001_020ba588(unk32 param1, unk32 param2); diff --git a/include/TitleScreen/TitleScreen.hpp b/include/TitleScreen/TitleScreen.hpp index d898dbc3..38ff08a2 100644 --- a/include/TitleScreen/TitleScreen.hpp +++ b/include/TitleScreen/TitleScreen.hpp @@ -46,82 +46,30 @@ public: }; // similar to UnkSubStruct1 -class TitleScreen_Sub3 { +class TitleScreen_Sub3 : public UnkSubStruct1_Base { public: - /* 00 (vtable) */ - /* 04 */ u16 mUnk_04; - /* 04 */ u16 mUnk_06; - /* 08 */ u16 mUnk_08; // 220 - /* 08 */ bool mUnk_0A; // 222 - /* 08 */ bool mUnk_0B; // 223 - /* 0C */ bool mUnk_0C; // 224 - /* 0C */ bool mUnk_0D; - /* 0C */ bool mUnk_0E; - /* 0C */ bool mUnk_0F; - /* 10 */ unk32 mUnk_10; - /* 14 */ unk32 mUnk_14; - /* 18 */ unk32 mUnk_18; - /* 1C */ unk32 mUnk_1C; + /* 00 (base) */ /* 20 */ unk32 mUnk_20; + /* 24 */ TitleScreen_Sub3(); void func_0201effc(unk32 param1, unk32 param2, unk32 param3); bool func_0201f04c(); // data_020442d4 vtable - /* 00 */ virtual void vfunc_00(); - /* 04 */ virtual void vfunc_04(); - /* 08 */ virtual void vfunc_08(); - /* 0C */ + /* 00 */ virtual void vfunc_00() override; + /* 04 */ virtual void vfunc_04() override; + /* 08 */ virtual void vfunc_08() override; - void UnkOperations() { - int iVar1; - - if (this->mUnk_08 != 0) { - iVar1 = this->mUnk_08 - this->mUnk_0D; - this->mUnk_08 = CLAMP(iVar1, 0, 0xFFFF); - } else { - if (this->mUnk_0A) { - if (this->mUnk_04 < this->mUnk_06) { - iVar1 = this->mUnk_04 + this->mUnk_0D; - - if (iVar1 > this->mUnk_06) { - iVar1 = this->mUnk_06; - } else if (iVar1 < 0) { - iVar1 = 0; - } - - this->mUnk_04 = iVar1; - this->vfunc_00(); - - if (this->mUnk_04 >= this->mUnk_06) { - this->mUnk_10 = this->mUnk_18; - this->mUnk_0A = false; - this->mUnk_0C = true; - } - } - } else { - if (this->mUnk_0B && this->mUnk_04 != 0) { - iVar1 = this->mUnk_04 - this->mUnk_0D; - - if (iVar1 > this->mUnk_06) { - iVar1 = this->mUnk_06; - } else if (iVar1 < 0) { - iVar1 = 0; - } - - this->mUnk_04 = iVar1; - this->vfunc_04(); - - if (this->mUnk_04 == 0) { - this->mUnk_10 = this->mUnk_14; - this->mUnk_0B = false; - this->mUnk_0C = true; - } - } - } - } + void Subprocess1_UnkValueSets() { + this->mUnk_10 = this->mUnk_18; } + + void Subprocess2_UnkValueSets() { + this->mUnk_10 = this->mUnk_14; + } + + UnkSubStruct1_Methods; }; class TitleScreen : public SysObject, public GameModeManagerBase_104 { // 0233c6d4 @@ -181,6 +129,7 @@ public: class TitleScreenManager : public TitleScreenManager_Base { public: /* 000 (base) */ + /* 154 */ GameModeBase *mpGameMode; /* 158 */ TitleScreenManager(unk32 param1) NO_INLINE { @@ -200,7 +149,7 @@ public: /* 24 */ virtual void vfunc_24() override; /* 28 */ virtual void vfunc_28(unk8 *param1) override; /* 2C */ virtual void vfunc_2C(unk8 *param1) override; - /* 38 */ virtual void vfunc_38(unk32 param1, unk32 param2, unk32 param3, unk32 param4) override; + /* 38 */ virtual void vfunc_38(u32 param1, u8 param2, unk16 param3, unk16 param4) override; static TitleScreenManager *Create(unk32 param1); }; diff --git a/include/Unknown/Common.hpp b/include/Unknown/Common.hpp index 65930d56..5ab42579 100644 --- a/include/Unknown/Common.hpp +++ b/include/Unknown/Common.hpp @@ -11,31 +11,116 @@ extern "C" void func_0201e8d4(void *param1, void *param2); -class UnkSubStruct1 : public SysObject { +//! TODO: make this work with templates? +#define UnkSubStruct1_Methods \ + int GetUnkValue1(bool isAdding) { \ + int targetLimit; \ + int nextValue; \ + \ + targetLimit = this->mUnk_06; \ + \ + if (isAdding) { \ + nextValue = this->mUnk_04 + this->mUnk_0D; \ + } else { \ + nextValue = this->mUnk_04 - this->mUnk_0D; \ + } \ + \ + if (nextValue > targetLimit) { \ + nextValue = targetLimit; \ + } else if (nextValue < 0) { \ + nextValue = 0; \ + } \ + \ + return nextValue; \ + } \ + \ + void Subprocess1() { \ + if (this->mUnk_04 < this->mUnk_06) { \ + this->mUnk_04 = this->GetUnkValue1(true); \ + this->vfunc_00(); \ + \ + if (this->mUnk_04 >= this->mUnk_06) { \ + this->Subprocess1_UnkValueSets(); \ + this->mUnk_0A = false; \ + this->mUnk_0C = true; \ + } \ + } \ + } \ + \ + void Subprocess2() { \ + if (this->mUnk_0B) { \ + if (this->mUnk_04 != 0) { \ + this->mUnk_04 = this->GetUnkValue1(false); \ + this->vfunc_04(); \ + \ + if (this->mUnk_04 == 0) { \ + this->Subprocess2_UnkValueSets(); \ + this->mUnk_0B = false; \ + this->mUnk_0C = true; \ + } \ + } \ + } \ + } \ + \ + bool UnkCheck1() { \ + bool value = true; \ + \ + if (this->mUnk_0A == false && this->mUnk_0B == false) { \ + value = false; \ + } \ + \ + return value; \ + } \ + \ + void UpdateLogic() { \ + s32 diff; \ + \ + if (this->mUnk_08 != 0) { \ + diff = this->mUnk_08 - this->mUnk_0D; \ + \ + if (diff > 0xFFFF) { \ + diff = 0xFFFF; \ + } else if (diff < 0) { \ + diff = 0; \ + } \ + \ + this->mUnk_08 = diff; \ + } else { \ + if (this->mUnk_0A) { \ + this->Subprocess1(); \ + } else { \ + this->Subprocess2(); \ + } \ + } \ + } \ + \ + void UpdatePosition(Vec2s *pOutPos) { \ + Vec2us fetch; \ + func_0201e8d4(&fetch, this); \ + Vec2s_SetU(pOutPos, &fetch); \ + } \ + \ + void Update(Vec2s *pOutPos) { \ + this->UpdateLogic(); \ + this->UpdatePosition(pOutPos); \ + } + +class UnkSubStruct1_Base { public: - /* 00 (vtable) */ /* 04 */ u16 mUnk_04; /* 06 */ u16 mUnk_06; /* 08 */ u16 mUnk_08; /* 0A */ bool mUnk_0A; /* 0B */ bool mUnk_0B; /* 0C */ bool mUnk_0C; - /* 0D */ bool mUnk_0D; - /* 0E */ unk8 mUnk_0E; - /* 0F */ unk8 mUnk_0F; + /* 0D */ u8 mUnk_0D; /* 10 */ unk32 mUnk_10; // brightness (in this context: of the background) /* 14 */ unk32 mUnk_14; /* 18 */ unk32 mUnk_18; /* 1C */ unk32 mUnk_1C; - /* 20 */ unk32 mUnk_20; - /* 24 */ unk32 mUnk_24; - /* 28 */ unk32 mUnk_28; - /* 2C */ unk32 mUnk_2C; - /* 30 */ + /* 20 */ - UnkSubStruct1(); - void func_0201ea68(unk32 param1, unk32 param2, unk32 param3, unk32 param4); - u16 func_0201eaa0(); + UnkSubStruct1_Base(); // data_02044330 vtable /* 00 */ virtual void vfunc_00(); @@ -43,197 +128,54 @@ public: /* 08 */ virtual void vfunc_08(); /* 0C */ - bool UnkCheck1() { - bool value = true; + void func_0201ea68(unk32 param1, unk32 param2, unk32 param3, unk32 param4); + u16 func_0201eaa0(); + unk32 func_0201edbc(); +}; - if (mUnk_0A == false && mUnk_0B == false) { - value = false; - } +class UnkSubStruct1 : public UnkSubStruct1_Base { +public: + /* 00 (base) */ + /* 20 */ unk32 mUnk_20; + /* 24 */ unk32 mUnk_24; + /* 28 */ unk32 mUnk_28; + /* 2C */ unk32 mUnk_2C; + /* 30 */ - return value; + UnkSubStruct1() {} + + void Subprocess1_UnkValueSets() { + this->mUnk_10 = this->mUnk_20; + this->mUnk_14 = this->mUnk_24; } - void UnkOperations(Vec2s *pPos, bool doSetPos) { - int iVar1; - - if (this->mUnk_08 != 0) { - iVar1 = this->mUnk_08 - this->mUnk_0D; - this->mUnk_08 = CLAMP(iVar1, 0, 0xFFFF); - } else { - if (this->mUnk_0A) { - if (this->mUnk_04 < this->mUnk_06) { - iVar1 = this->mUnk_04 + this->mUnk_0D; - - if (iVar1 > this->mUnk_06) { - iVar1 = this->mUnk_06; - } else if (iVar1 < 0) { - iVar1 = 0; - } - - this->mUnk_04 = iVar1; - this->vfunc_00(); - - if (this->mUnk_04 >= this->mUnk_06) { - this->mUnk_10 = this->mUnk_20; - this->mUnk_14 = this->mUnk_24; - this->mUnk_0A = false; - this->mUnk_0C = true; - } - } - } else { - if (this->mUnk_0B && this->mUnk_04 != 0) { - iVar1 = this->mUnk_04 - this->mUnk_0D; - - if (iVar1 > this->mUnk_06) { - iVar1 = this->mUnk_06; - } else if (iVar1 < 0) { - iVar1 = 0; - } - - this->mUnk_04 = iVar1; - this->vfunc_04(); - - if (this->mUnk_04 == 0) { - this->mUnk_10 = this->mUnk_18; - this->mUnk_14 = this->mUnk_1C; - this->mUnk_0B = false; - this->mUnk_0C = true; - } - } - } - } - - if (doSetPos) { - Vec2us local_4c; - func_0201e8d4(&local_4c, this); - - u16 x = local_4c.x; - u16 y = local_4c.y; - - // necessary to flip r1 and r2 - pPos->x = 0; - pPos->y = 0; - - pPos->x = x; - pPos->y = y; - } + void Subprocess2_UnkValueSets() { + this->mUnk_10 = this->mUnk_18; + this->mUnk_14 = this->mUnk_1C; } - void UnkOperations2(Vec2s *pPos, bool doSetPos) { - int iVar1; + UnkSubStruct1_Methods; +}; - if (this->mUnk_08 != 0) { - iVar1 = this->mUnk_08 - this->mUnk_0D; - this->mUnk_08 = CLAMP2(iVar1, 0, 0xFFFF); - } else { - if (this->mUnk_0A) { - if (this->mUnk_04 < this->mUnk_06) { - iVar1 = this->mUnk_04 + this->mUnk_0D; +class UnkSubStruct1_Derived1 : public UnkSubStruct1_Base { +public: + /* 20 */ unk32 mUnk_20; + /* 24 */ unk32 mUnk_24; + /* 28 */ unk32 mUnk_28; + /* 2C */ unk32 mUnk_2C; + /* 30 */ - if (iVar1 > this->mUnk_06) { - iVar1 = this->mUnk_06; - } else if (iVar1 < 0) { - iVar1 = 0; - } + UnkSubStruct1_Derived1(); - this->mUnk_04 = iVar1; - this->vfunc_00(); - - if (this->mUnk_04 >= this->mUnk_06) { - this->mUnk_10 = this->mUnk_20; - this->mUnk_14 = this->mUnk_24; - this->mUnk_0A = false; - this->mUnk_0C = true; - } - } - } else { - if (this->mUnk_0B && this->mUnk_04 != 0) { - iVar1 = this->mUnk_04 - this->mUnk_0D; - - if (iVar1 > this->mUnk_06) { - iVar1 = this->mUnk_06; - } else if (iVar1 < 0) { - iVar1 = 0; - } - - this->mUnk_04 = iVar1; - this->vfunc_04(); - - if (this->mUnk_04 == 0) { - this->mUnk_10 = this->mUnk_18; - this->mUnk_14 = this->mUnk_1C; - this->mUnk_0B = false; - this->mUnk_0C = true; - } - } - } - } - - if (doSetPos) { - Vec2us local_4c; - func_0201e8d4(&local_4c, this); - - u16 x = local_4c.x; - u16 y = local_4c.y; - - // necessary to flip r1 and r2 - pPos->x = 0; - pPos->y = 0; - - pPos->x = x; - pPos->y = y; - } + void Subprocess1_UnkValueSets() { + this->mUnk_10 = this->mUnk_18; } - void UnkOperations3() { - int test; - int iVar1; - - if (this->mUnk_08 != 0) { - iVar1 = this->mUnk_08 - this->mUnk_0D; - this->mUnk_08 = CLAMP(iVar1, 0, 0xFFFF); - } else { - if (this->mUnk_0A) { - if (this->mUnk_04 < this->mUnk_06) { - iVar1 = this->mUnk_04 + this->mUnk_0D; - - if (iVar1 > this->mUnk_06) { - iVar1 = this->mUnk_06; - } else if (iVar1 < 0) { - iVar1 = 0; - } - - this->mUnk_04 = iVar1; - this->vfunc_00(); - - if (this->mUnk_04 >= this->mUnk_06) { - this->mUnk_10 = this->mUnk_18; - this->mUnk_0A = false; - this->mUnk_0C = true; - } - } - } else { - if (this->mUnk_0B && this->mUnk_04 != 0) { - int iVar1 = this->mUnk_04 - this->mUnk_0D; - - if (iVar1 > this->mUnk_06) { - iVar1 = this->mUnk_06; - } else if (iVar1 < 0) { - iVar1 = 0; - } - - this->mUnk_04 = iVar1; - this->vfunc_04(); - - if (this->mUnk_04 == 0) { - this->mUnk_10 = this->mUnk_14; - this->mUnk_0B = false; - this->mUnk_0C = true; - } - } - } - } + void Subprocess2_UnkValueSets() { + this->mUnk_10 = this->mUnk_14; } + + UnkSubStruct1_Methods; }; struct UnkStruct_ov019_020d24c8_28_258_00 { @@ -254,7 +196,7 @@ public: Vec2s mPos; Vec2us mPosU; }; - /* 0E */ unk16 mUnk_0E; + /* 0E */ s16 mUnk_0E; /* 10 */ unk16 mUnk_10; /* 12 */ unk16 mUnk_12; /* 14 */ unk16 mUnk_14; @@ -364,6 +306,8 @@ public: #define BTN_ID_RAIL_MAP_OCEAN_LOST_AT_SEA_STATION 0x77 #define BTN_ID_RAIL_MAP_SNOW_SLIPPERY_STATION 0x78 +#define BTN_ID_UNK_80 0x80 + #define BTN_ID_SHOP_QUIT 0x81 // quit shop #define BTN_ID_SHOP_RETURN 0x82 // quit item preview #define BTN_ID_SHOP_BUY 0x83 @@ -469,14 +413,15 @@ public: #define BTN_ID_BATTLE_MENU_JOIN_GROUP 0xBB #define BTN_ID_BATTLE_MENU_PLAYER_LIST 0xBD -class UnkSystem2_UnkSubSystem1_Base { +class UnkSystem2_UnkSubSystem1_Base : public GameModeLinkList { public: /* 00 (vtable) */ - /* 04 */ GameModeLinkList mUnk_04; /* 0C */ void *mUnk_0C; /* 10 */ unk32 mButtonID; /* 14 */ Vec2s mPos; // image position (among other things) - /* 18 */ STRUCT_PAD(0x18, 0x24); + /* 18 */ unk32 mUnk_18; + /* 1C */ unk32 mUnk_1C; + /* 20 */ unk32 mUnk_20; /* 24 */ Vec2us mPosOffset; // used to shift the button when selected /* 28 */ bool mUnk_28; // selected highlight effect when set to true /* 29 */ bool mUnk_29; // related to having the button selected @@ -513,13 +458,30 @@ public: /* 0C */ virtual void vfunc_0C() override; }; -class UnkSystem2_UnkSubSystem7 { +class UnkSystem2_UnkSubSystem7_Base { public: - /* 00 */ unk32 mUnk_00; + /* 00 (vtable) */ + + // data_ov000_020b1c88 + /* 00 */ virtual void vfunc_00(); + /* 00 */ virtual void vfunc_04(); +}; + +class UnkSystem2_UnkSubSystem7 : public UnkSystem2_UnkSubSystem7_Base { +public: + /* 00 (base) */ ~UnkSystem2_UnkSubSystem7(); }; +class UnkSystem2_UnkSubSystem7_Derived2 { +public: + /* 00 */ UnkSystem2_UnkSubSystem7 mUnk_00; + /* 04 */ STRUCT_PAD(0x04, 0x64); + + UnkSystem2_UnkSubSystem7_Derived2(); +}; + //! TODO: conflicts with UnkSystem2_UnkSubSystem1_Derived1? mUnk_34 type differs for some reasons class UnkSystem2_UnkSubSystem1_Derived2 : public UnkSystem2_UnkSubSystem1_Base { public: @@ -549,6 +511,30 @@ public: /* 0C */ virtual void vfunc_0C() override; }; +class UnkSystem2_UnkSubSystem1_Derived3 : public UnkSystem2_UnkSubSystem1_Base { +public: + /* 00 (base) */ + /* 30 */ unk32 mUnk_30; + /* 34 */ + + UnkSystem2_UnkSubSystem1_Derived3(); + + // data_ov000_020b1f5c + /* 00 */ virtual ~UnkSystem2_UnkSubSystem1_Derived3() override {} + /* 0C */ virtual void vfunc_0C() override; + + void func_ov000_02063a3c(unk32 param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6); +}; + +class UnkSystem2_UnkSubSystem1_Derived4 : public UnkSystem2_UnkSubSystem1_Derived3 { +public: + UnkSystem2_UnkSubSystem1_Derived4() {} + + // data_ov000_020b1f2c + /* 00 */ virtual ~UnkSystem2_UnkSubSystem1_Derived4() override {} + /* 0C */ virtual void vfunc_0C() override; +}; + class UnkSystem2_UnkSubSystem5_Base_10 { public: /* 000 (vtable) */ @@ -687,15 +673,17 @@ public: /* 00 */ UnkSystem2_UnkSubSystem1_Base *mUnk_00; /* 04 */ UnkSystem2_UnkSubSystem5 mUnk_04; + UnkSystem2_UnkSubSystem3(); UnkSystem2_UnkSubSystem3(UnkSystem2_UnkSubSystem1_Base *param1, unk32 param2, unk32 param3, unk32 param4); void func_ov000_02062f30(); + void func_ov000_02062f18(void *param1, unk32 param2, unk32 param3); }; class UnkSystem2_UnkSubSystem8_Base { public: /* 00 (vtable) */ - /* 04 */ UnkSystem2_UnkSubSystem1_Derived2 *mUnk_04; + /* 04 */ UnkSystem2_UnkSubSystem1_Base *mUnk_04; /* 08 */ bool mUnk_08; /* 09 */ unk8 mUnk_09; /* 0A */ unk8 mUnk_0A; @@ -850,7 +838,7 @@ public: void func_ov000_02060950(); void func_ov000_020609b0(); void func_ov000_020609c4(void); - void func_ov000_02060a98(); + bool func_ov000_02060a98(unk32 param1); void func_ov000_02060ad0(); unk32 func_ov000_02060af8(void); void func_ov000_02060b50(); @@ -1115,3 +1103,33 @@ public: UnkStruct_PlayerGet_ec(); ~UnkStruct_PlayerGet_ec(); }; + +class UnkActorSystem2 : public GameModeManagerBase_104 { +public: + /* 000 (base) */ + /* 01B */ bool mUnk_01B; + /* 01C */ UnkSubStruct19 mUnk_01C; + /* 094 */ UnkSubStruct19 mUnk_094; + /* 10C */ bool mUnk_10C; + /* 10C */ bool mUnk_10D; + + UnkActorSystem2(bool param1); + + // data_ov024_020d7bd0 + /* 00 */ virtual ~UnkActorSystem2() override; + /* 08 */ virtual void vfunc_08(Input *pButtons, TouchControl *pTouchControl) override; + /* 10 */ virtual void vfunc_10(unk8 *param1) override; + + void func_ov024_020c4ec0(); + void func_ov024_020c4ed8(); + void func_ov024_020c4ef0(); + void func_ov024_020c4f08(); + void func_ov024_020c4f18(); + void func_ov024_020c4f28(); + void func_ov024_020c4f4c(); + void func_ov024_020c4f5c(); + void func_ov024_020c4f6c(); + bool func_ov024_020c4f7c(); + bool func_ov024_020c510c(); + void func_ov024_020c5120(bool param1); +}; diff --git a/include/Unknown/UnkStruct_02049f8c.hpp b/include/Unknown/UnkStruct_02049f8c.hpp new file mode 100644 index 00000000..1cbe181a --- /dev/null +++ b/include/Unknown/UnkStruct_02049f8c.hpp @@ -0,0 +1,14 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_02049f8c { +public: + /* 00 */ unk32 mUnk_00; + + UnkStruct_02049f8c(); + ~UnkStruct_02049f8c(); +}; + +extern UnkStruct_02049f8c data_02049f8c; diff --git a/include/Unknown/UnkStruct_0204a060.hpp b/include/Unknown/UnkStruct_0204a060.hpp index 58d73984..87bb0eb7 100644 --- a/include/Unknown/UnkStruct_0204a060.hpp +++ b/include/Unknown/UnkStruct_0204a060.hpp @@ -12,7 +12,7 @@ class GameModeFileSelect; class UnkStruct_0204a060_Base3 : public SysObject { public: /* 00 (vtable) */ - /* 04 */ GameModeLinkListNode mUnk_04; + /* 04 */ GameModeLinkList mUnk_04; /* 0C */ bool mUnk_0C; /* 0D */ unk8 mUnk_0D; /* 0E */ unk8 mUnk_0E; @@ -35,6 +35,9 @@ public: /* 14 */ UnkStruct_0204a060_Base2(); + + /* 00 */ virtual ~UnkStruct_0204a060_Base2() override; + void func_0201ba68(); }; @@ -42,8 +45,8 @@ class UnkStruct_0204a060_Base : public UnkStruct_0204a060_Base2 { public: /* 00 (base) */ /* 14 */ unk32 mUnk_14; - /* 18 */ unk8 mUnk_18; - /* 19 */ unk8 mUnk_19; + /* 18 */ bool mUnk_18; + /* 19 */ bool mUnk_19; /* 1A */ u16 mUnk_1A; /* 1C */ unk16 mUnk_1C; /* 1E */ unk16 mUnk_1E; @@ -54,10 +57,10 @@ public: UnkStruct_0204a060_Base(); void func_0201bb84(unk32 param1, unk32 param2, unk32 param3); void func_0201bba4(unk32 param1, unk32 param2); - void func_0201bbcc(); + void func_0201bbcc(unk32 param1, unk32 param2); // data_02044108 vtable - /* 00 */ virtual ~UnkStruct_0204a060_Base() override; + /* 00 */ WEAK virtual ~UnkStruct_0204a060_Base() override {} /* 08 */ virtual bool vfunc_08(unk32 param1) override; /* 0C */ virtual bool vfunc_0C(void); /* 10 */ virtual bool vfunc_10(void); diff --git a/include/Unknown/UnkStruct_0204a088.hpp b/include/Unknown/UnkStruct_0204a088.hpp index ed103389..de8e90be 100644 --- a/include/Unknown/UnkStruct_0204a088.hpp +++ b/include/Unknown/UnkStruct_0204a088.hpp @@ -4,9 +4,6 @@ #include "System/SysNew.hpp" #include "types.h" -class UnkStruct_0204a088; -extern UnkStruct_0204a088 *data_0204a088; - class UnkStruct_0204a088_Base : public SysObject { public: UnkStruct_0204a088_Base(); @@ -22,12 +19,18 @@ public: /* 00C */ FileSelectManager_UnkDrawBase mUnk_0C[23]; // 23 possible overlays /* 120 */ u16 mUnk_120; /* 122 */ unk16 mUnk_122; - /* 123 */ unk8 mUnk_123; + /* 124 */ unk8 mUnk_124; + /* 125 */ unk8 mUnk_125; + /* 126 */ unk8 mUnk_126; + /* 127 */ bool mUnk_127; + /* 128 */ unk16 mUnk_128; void func_ov000_02061098(void); void func_ov000_020611dc(void *param1, unk32 param2); - void func_ov000_020611fc(unk32 param2); // sets new index - void func_ov000_02061224(void); + bool func_ov000_020611fc(unk32 param2); // sets new index + bool func_ov000_02061224(void); void func_ov000_02061230(void); void func_ov000_02061248(void); }; + +extern UnkStruct_0204a088 *data_0204a088; diff --git a/include/Unknown/UnkStruct_0204a110.hpp b/include/Unknown/UnkStruct_0204a110.hpp index 099a2fe9..c972476c 100644 --- a/include/Unknown/UnkStruct_0204a110.hpp +++ b/include/Unknown/UnkStruct_0204a110.hpp @@ -104,6 +104,10 @@ public: /* 04 */ unk32 mUnk_04; UnkStruct_0204a110_Sub5(); + + void func_0201c494(unk32 param1); + void func_0201c4d8(unk32 param1, unk32 param2, unk32 param3); + void func_0201c504(unk32 param1, unk32 param2, unk32 param3, unk32 param4); }; class UnkStruct_0204a110_Sub6 { @@ -122,12 +126,17 @@ public: // data_020442b4 vtable /* 00 */ virtual void vfunc_00(); /* 04 */ virtual void vfunc_04(); + + void func_0201ced8(); + void func_0201cf30(); }; class UnkStruct_0204a110_Sub7_08 : public SysObject { public: /* 00 (vtable) */ - /* 04 */ STRUCT_PAD(0x04, 0x30); + /* 04 */ STRUCT_PAD(0x04, 0x0A); + /* 0A */ bool mUnk_0A; + /* 0B */ STRUCT_PAD(0x0B, 0x30); /* 30 */ UnkStruct_0204a110_Sub7_08(); @@ -136,6 +145,8 @@ public: /* 00 */ virtual void vfunc_00(); /* 04 */ virtual void vfunc_04(); /* 08 */ virtual void vfunc_08(); + + unk32 func_0201ec30(); }; struct UnkStruct_027e0120 { @@ -147,7 +158,7 @@ extern UnkStruct_027e0120 data_027e0120; class UnkStruct_0204a110_Sub7 { public: - /* 00 */ unk8 mUnk_00; + /* 00 */ bool mUnk_00; /* 01 */ unk8 mUnk_01; /* 02 */ unk8 mUnk_02; /* 03 */ unk8 mUnk_03; @@ -157,6 +168,11 @@ public: /* 1C */ UnkStruct_0204a110_Sub7(); + + void func_0201db14(unk32 param1, unk32 param2, Vec2s *param3, Vec2s *param4, unk32 param5, unk32 param6); + void func_0201dd58(unk32 param1, unk32 param2); + void func_0201dc10(s16 *param1, unk32 param2, unk32 param3); + void func_0201d628(); }; class UnkStruct_0204a110_Sub8 { @@ -169,7 +185,14 @@ public: /* 08 */ unk8 mUnk_0B; /* 0C */ UnkSystem2_UnkSubSystem9 *mUnk_0C; + UnkSystem2_UnkSubSystem9 *GetUnk0C() { + return this->mUnk_0C; + } + UnkStruct_0204a110_Sub8(); + + void func_0201e588(unk32 param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5); + void func_0201e698(void); }; class UnkStruct_0204a110 { @@ -189,31 +212,44 @@ public: /* DA6 */ unk8 mUnk_DA6; /* DA7 */ unk8 mUnk_DA7; /* DA8 */ UnkStruct_0204a110_Sub6 mUnk_DA8; - /* DAC */ STRUCT_PAD(0xDBC, 0xDC0); + /* DBC */ STRUCT_PAD(0xDBC, 0xDC0); /* DC0 */ UnkStruct_0204a110_Sub7 mUnk_DC0; /* DDC */ UnkStruct_0204a110_Sub8 mUnk_DDC; /* DEC */ GameModeManagerBase *mUnk_DEC; - /* DF0 */ unk16 mUnk_DF0; + /* DF0 */ u16 mUnk_DF0; /* DF2 */ unk8 mUnk_DF2; /* DF3 */ unk8 mUnk_DF3; /* DF4 */ unk32 mUnk_DF4; /* DF8 */ unk32 mUnk_DF8; /* DFC */ unk8 mUnk_DFC; /* DFD */ unk8 mUnk_DFD; - /* DFE */ unk8 mUnk_DFE; + /* DFE */ bool mUnk_DFE; /* DFF */ unk8 mUnk_DFF; /* E00 */ unk8 mUnk_E00; /* E00 */ unk8 mUnk_E01; /* E02 */ unk16 mUnk_E02; /* E04 */ unk16 mUnk_E04; + /* E06 */ unk16 mUnk_E06; // pad? + /* E08 */ + + UnkStruct_0204a110_Sub5 *GetUnkD9C() { + return &this->mUnk_D9C; + } + + UnkStruct_0204a110_Sub8 *GetUnkDDC() { + return &this->mUnk_DDC; + } UnkStruct_0204a110(); unk32 func_01ff9b50(); + void func_02018be0(unk32 param1); + void func_02018c2c(); void func_02018c78(unk32 param1); void func_02018c90(unk32 param1); void func_02018d34(); + void func_02018d78(unk32 param1); void func_020195a0(const char *param1, unk32 param2, unk32 param3, unk32 param4); void func_0201967c(unk32 param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6); void func_02019538(unk32 param1, unk32 param2); @@ -223,6 +259,8 @@ public: void func_02019408(); void func_02019454(); unk32 func_02019514(); + void func_02019528(); + bool func_02019548(); void func_ov001_020bd514(unk32 param1, void *param2, unk32 param3, unk32 param4); void func_ov001_020bd58c(void); diff --git a/include/Unknown/UnkStruct_0204aeac.hpp b/include/Unknown/UnkStruct_0204aeac.hpp deleted file mode 100644 index 73aee95c..00000000 --- a/include/Unknown/UnkStruct_0204aeac.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "global.h" -#include "types.h" - -class UnkStruct_0204aeac { -public: - /* 00 */ unk32 mUnk_00; - - UnkStruct_0204aeac(); - ~UnkStruct_0204aeac(); - void func_0201c494(unk32 param1); - void func_0201c4d8(unk32 param1, unk32 param2, unk32 param3); - void func_0201c504(unk32 param1, unk32 param2, unk32 param3, unk32 param4); -}; - -extern UnkStruct_0204aeac data_0204aeac; diff --git a/include/Unknown/UnkStruct_0204aeec.hpp b/include/Unknown/UnkStruct_0204aeec.hpp deleted file mode 100644 index a2bd3fe8..00000000 --- a/include/Unknown/UnkStruct_0204aeec.hpp +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "System/SysNew.hpp" -#include "types.h" - -class UnkStruct_0204aeec : public SysObject { -public: - void func_0201e698(void); -}; - -extern UnkStruct_0204aeec data_0204aeec; diff --git a/include/Unknown/UnkStruct_0204af1c.hpp b/include/Unknown/UnkStruct_0204af1c.hpp index e5469444..5e229fc1 100644 --- a/include/Unknown/UnkStruct_0204af1c.hpp +++ b/include/Unknown/UnkStruct_0204af1c.hpp @@ -2,6 +2,8 @@ #include "types.h" +class UnkSubStruct19; + class UnkStruct_0204af1c_00 { public: /* 0000 */ unk8 mUnk_0000[0x1490]; @@ -20,7 +22,7 @@ public: UnkStruct_0204af1c(); void func_0201a800(); void func_0201aa44(void *param1, void *param2, unk32 param3, void *param4); - void func_0201aad0(void *param1, void *param2, unk32 param3, void *param4); + void func_0201aad0(UnkSubStruct19 *param1, void *param2, unk32 param3, void *param4); }; extern UnkStruct_0204af1c data_0204af1c; diff --git a/include/Unknown/UnkStruct_020d8698.hpp b/include/Unknown/UnkStruct_020d8698.hpp index 6a042243..ae2d6a7d 100644 --- a/include/Unknown/UnkStruct_020d8698.hpp +++ b/include/Unknown/UnkStruct_020d8698.hpp @@ -1,16 +1,31 @@ #pragma once +#include "Game/GameModeManager.hpp" #include "Item/Item.hpp" #include "types.h" -class UnkStruct_020d8698 { +class UnkStruct_020d8698 : public GameModeManagerBase_104 { public: - void func_ov024_020cd458(ItemFlag itemFlag, unk32 param2); + void func_ov024_020cd094(); + void func_ov024_020cd150(); void func_ov024_020cd368(bool param1, bool param2); void func_ov024_020cd3d0(); void func_ov024_020cd3e0(unk32 param1); void func_ov024_020cd3f0(unk32 param1); void func_ov024_020cd410(); + void func_ov024_020cd420(); + void func_ov024_020cd458(ItemFlag itemFlag, unk32 param2); + void func_ov024_020cd4e4(u16 param1); + bool func_ov024_020cd5c0(u16 param1); + void func_ov024_020cd3a4(); + void func_ov024_020cd400(); + + /* 00 */ virtual ~UnkStruct_020d8698(); + /* 08 */ virtual void vfunc_08(); + /* 0C */ virtual void vfunc_0C(); + /* 10 */ virtual void vfunc_10(); + /* 14 */ virtual void vfunc_14(); + /* 18 */ virtual void vfunc_18(); }; extern UnkStruct_020d8698 *data_ov024_020d8698; diff --git a/include/Unknown/UnkStruct_027e095c.hpp b/include/Unknown/UnkStruct_027e095c.hpp new file mode 100644 index 00000000..8c750a6a --- /dev/null +++ b/include/Unknown/UnkStruct_027e095c.hpp @@ -0,0 +1,17 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_027e095c : public AutoInstance { +public: + /* 00 */ unk32 mUnk_00; + + UnkStruct_027e095c(); + ~UnkStruct_027e095c(); + + void func_ov000_020592ec(); + void func_ov000_020592a0(); +}; + +extern UnkStruct_027e095c *data_027e095c; diff --git a/include/Unknown/UnkStruct_027e0998.hpp b/include/Unknown/UnkStruct_027e0998.hpp index b09c7c05..b8583da8 100644 --- a/include/Unknown/UnkStruct_027e0998.hpp +++ b/include/Unknown/UnkStruct_027e0998.hpp @@ -4,17 +4,51 @@ #include "types.h" #include -class UnkStruct_027e0998 { +class UnkStruct_027e0998_Base { public: - /* 00 */ unk32 mUnk_00; + /* 00 (vtable) */ + /* 04 */ unk16 mUnk_04; + /* 06 */ STRUCT_PAD(0x06, 0x42); + /* 42 */ unk16 mUnk_42; + /* 44 */ unk32 mUnk_44; + /* 48 */ unk16 mUnk_48; + /* 4A */ unk16 mUnk_4A; // pad? + /* 4C */ - UnkStruct_027e0998(); - ~UnkStruct_027e0998(); + UnkStruct_027e0998_Base(); - /* 00 */ virtual bool vfunc_00(Vec3p *pPos, void *param2, void *param3); + // data_ov000_020b1e08 + /* 00 */ virtual bool vfunc_00(Vec3p *pPos, Vec2s *param2, u16 *param3); /* 04 */ + void func_ov000_02061760(); + void func_ov000_02061764(); + void func_ov000_02061768(); + void func_ov000_02061850(unk32 param1); unk32 func_ov000_02061a70(); + + static void SetInstance(UnkStruct_027e0998_Base *pInstance); +}; + +class UnkStruct_027e0998 : public UnkStruct_027e0998_Base { +public: + /* 00 (base) */ + + UnkStruct_027e0998(); + ~UnkStruct_027e0998(); // ClearInstance + + // data_ov024_020d7c98 + /* 00 */ virtual bool vfunc_00(Vec3p *pPos, Vec2s *param2, u16 *param3) override; + /* 04 */ + + bool func_ov024_020c716c(); + bool func_ov024_020c7214(Vec3p *pPos, Vec2s *param2, u16 *param3); + bool func_ov024_020c727c(Vec2s *param1, u16 *param2); + bool func_ov024_020c7300(unk32 param1); + bool func_ov024_020c7354(); + + static void Destroy(); + static UnkStruct_027e0998 *Create(); }; extern UnkStruct_027e0998 *data_027e0998; diff --git a/include/Unknown/UnkStruct_027e09a0.hpp b/include/Unknown/UnkStruct_027e09a0.hpp index ef70e44c..ed4c4ae4 100644 --- a/include/Unknown/UnkStruct_027e09a0.hpp +++ b/include/Unknown/UnkStruct_027e09a0.hpp @@ -80,14 +80,26 @@ struct UnkStruct_func_ov000_020702a8 { /* 20 */ unk16 mUnk_20; }; -class CourseEntry { -public: - /* 00 */ STRUCT_PAD(0x00, 0x17); +struct CourseRoomEntry { + u8 roomIndex; + u8 mapPaintIndex; + u8 unk_02; + u8 unk_03; +}; + +struct CourseEntry { + /* 00 */ const char name[16]; + /* 10 */ unk32 unk_10; + /* 14 */ unk8 mNumRooms; + /* 15 */ unk8 unk_15; + /* 16 */ unk8 unk_16; /* 17 */ u8 mSaveCourseIndex; /* 18 */ STRUCT_PAD(0x18, 0x1D); - /* 1D */ u8 mUnk_1D; - /* 1E */ STRUCT_PAD(0x1E, 0x2C); - /* 2C */ + /* 1D */ u8 unk_1D; + /* 1E */ u8 unk_1E; + /* 1F */ u8 unk_1F; + /* 20 */ u8 defaultMapPaintIndex; + /* 24 */ CourseRoomEntry roomEntries[]; }; class UnkStruct_027e09a0 { @@ -97,8 +109,11 @@ public: UnkStruct_027e09a0(); ~UnkStruct_027e09a0(); - CourseEntry *func_ov000_0207029c(unk32 param1); + CourseEntry *GetCourseEntry(u32 sceneIndex); UnkStruct_func_ov000_020702a8 *func_ov000_020702a8(unk32 param1); + unk32 GetRoomEntryIndex(); + CourseRoomEntry *GetRoomEntry(u32 sceneIndex, unk32 param2); + bool func_ov000_02070378(u32 param1); }; extern UnkStruct_027e09a0 *data_027e09a0; diff --git a/include/Unknown/UnkStruct_027e09a4.hpp b/include/Unknown/UnkStruct_027e09a4.hpp index 4a85d63e..443683c5 100644 --- a/include/Unknown/UnkStruct_027e09a4.hpp +++ b/include/Unknown/UnkStruct_027e09a4.hpp @@ -6,6 +6,8 @@ #include "global.h" #include "types.h" +struct SaveFile; + /* naming scheme: - test_xxx: debug area @@ -18,6 +20,7 @@ naming scheme: typedef u32 SceneIndex; typedef u16 SceneIndex_Half; enum SceneIndex_ { + /* -1 */ SceneIndex_None = -1, /* 0 */ SceneIndex_test_trn = 0x00, // /* 1 */ SceneIndex_test_trn2 = 0x01, // /* 2 */ SceneIndex_test_pre = 0x02, // @@ -152,16 +155,19 @@ struct UnkStruct_func_01ffd400 { /* 1B */ u8 mUnk_1B; }; -struct UnkStruct_SceneChange1 { - /* 00 */ unk32 mNextSceneIndex; +struct UnkStruct_SceneChange1_Base { + /* 00 */ unk32 mSceneIndex; /* 04 */ unk32 mUnk_04; /* 08 */ unk16 mUnk_08; /* 0A */ u8 mRoomIndex; /* 0B */ u8 mSpawnIndex; - /* 0C */ bool mNextIsCS; + /* 0C */ bool mIsCS; /* 0D */ unk8 mUnk_0D; - /* 0E */ unk8 mCutsceneIndex; + /* 0E */ u8 mCutsceneIndex; /* 0F */ unk8 mUnk_0F; +}; + +struct UnkStruct_SceneChange1 : public UnkStruct_SceneChange1_Base { /* 10 */ unk8 mUnk_10; /* 11 */ unk8 mUnk_11; /* 12 */ unk8 mUnk_12; @@ -169,13 +175,13 @@ struct UnkStruct_SceneChange1 { /* 14 */ UnkStruct_SceneChange1() { - this->mNextSceneIndex = SceneIndex_Max; - this->mUnk_04 = 0; - this->mUnk_08 = 0; - this->mRoomIndex = 0xFF; // this changes when you enter a house, it's not clear if it has another purpose yet - this->mSpawnIndex = 0; // changing this then saving will change your spawn location after opening the save again - // (not the area) - this->mNextIsCS = false; + this->mSceneIndex = SceneIndex_Max; + this->mUnk_04 = 0; + this->mUnk_08 = 0; + this->mRoomIndex = 0xFF; // this changes when you enter a house, it's not clear if it has another purpose yet + this->mSpawnIndex = 0; // changing this then saving will change your spawn location after opening the save again + // (not the area) + this->mIsCS = false; this->mUnk_0D = 0; this->mCutsceneIndex = CutsceneIndex_None; this->mUnk_0F = 0; @@ -188,16 +194,16 @@ struct UnkStruct_SceneChange1 { u8 spawnIndex = pEntry->mSpawnIndex; u8 roomIndex = pEntry->mRoomIndex; - this->mNextSceneIndex = sceneIndex; - this->mUnk_04 = 0; - this->mUnk_08 = 0; - this->mRoomIndex = roomIndex; - this->mSpawnIndex = spawnIndex; - this->mNextIsCS = nextIsCS; - this->mUnk_0D = 0; - this->mCutsceneIndex = cutsceneIndex; - this->mUnk_0F = 0; - this->mUnk_10 = 0; + this->mSceneIndex = sceneIndex; + this->mUnk_04 = 0; + this->mUnk_08 = 0; + this->mRoomIndex = roomIndex; + this->mSpawnIndex = spawnIndex; + this->mIsCS = nextIsCS; + this->mUnk_0D = 0; + this->mCutsceneIndex = cutsceneIndex; + this->mUnk_0F = 0; + this->mUnk_10 = 0; } }; @@ -213,16 +219,14 @@ public: class UnkStruct_027e09a4 : public SysObject { public: - /* 00 */ unk32 mSceneIndex; // the scene index of the current area, this isn't saved when you save the game - /* 04 */ unk32 mUnk_04; - /* 08 */ unk32 mUnk_08; - /* 0C */ u8 mUnk_0C; - /* 0D */ unk8 mUnk_0D; - /* 0E */ u8 mCutsceneIndex; - /* 0F */ unk8 mUnk_0F; + /* 00 */ UnkStruct_SceneChange1_Base mUnk_00; // the infos of the current area, this isn't saved when you save the game /* 10 */ unk32 *mUnk_10; /* 14 */ UnkStruct_SceneChange1 mUnk_14; - /* 32 */ STRUCT_PAD(0x28, 0x54); + /* 28 */ unk32 mUnk_28; + /* 2C */ s16 mUnk_2C; + /* 2C */ unk16 mUnk_2E; + /* 30 */ Vec3p mUnk_30; + /* 3C */ STRUCT_PAD(0x3C, 0x54); /* 54 */ void *mUnk_54; // vtable /* 58 */ UnkStruct_WarpUnk1 *mpWarpUnk1; /* 5C */ unk32 mUnk_5C; @@ -230,6 +234,18 @@ public: /* 64 */ unk32 mUnk_64; /* 68 */ + bool IsCutscene() { + return this->mUnk_00.mIsCS == true; + } + + bool IsNotCutscene() { + return this->mUnk_00.mIsCS != true; + } + + u8 CurrentCSIndex() { + return this->mUnk_00.mCutsceneIndex; + } + bool UnkCheck(unk32 sceneIndex) { switch (sceneIndex) { case SceneIndex_test_iwa: @@ -253,9 +269,25 @@ public: return false; } + SceneIndex CurrentSceneIndex() { + return this->mUnk_00.mSceneIndex; + } + + bool IsDarkRealm() { + return this->mUnk_00.mSceneIndex <= SceneIndex_t_eviltrain3 && this->mUnk_00.mSceneIndex >= SceneIndex_t_eviltrain; + } + + bool IsPirate() { + return this->mUnk_00.mSceneIndex == SceneIndex_f_pirate; + } + + bool IsPassenger() { + return this->mUnk_00.mSceneIndex == SceneIndex_f_passenger; + } + ~UnkStruct_027e09a4(); - unk32 func_01ffd3d8(); + bool func_01ffd3d8(); UnkStruct_func_01ffd400 *func_01ffd400(); unk8 func_ov000_02070bd0(unk32 csIndex, unk32 param2); @@ -270,12 +302,15 @@ public: unk16 *func_ov000_02070538(); bool func_ov000_02070a9c(UnkStruct_SceneChange1 *param1); bool func_ov000_02072154(UnkStruct_SceneChange1 *param1, unk32 param2); + void func_ov000_0207056c(); + void func_ov000_020705e8(SaveFile *param1, unk32 param2); void func_ov017_020bb994(void *param1); void func_ov017_020bb994(unk32 param1); void func_ov017_020bb994(void *, void *); static void func_ov025_020c4a60(); + static void Destroy(); }; extern UnkStruct_027e09a4 *data_027e09a4; diff --git a/include/Unknown/UnkStruct_027e09ac.hpp b/include/Unknown/UnkStruct_027e09ac.hpp new file mode 100644 index 00000000..4615c100 --- /dev/null +++ b/include/Unknown/UnkStruct_027e09ac.hpp @@ -0,0 +1,85 @@ +#pragma once + +#include "Unknown/UnkMemFuncs.h" +#include "global.h" +#include "types.h" + +#include + +struct UnkStruct_027e09ac_Base_00 { + /* 00 */ unk16 mUnk_00[2]; + /* 04 */ unk16 mUnk_04[3]; + /* 0A */ unk16 mUnk_0A; + /* 0C */ unk32 mUnk_0C; +}; + +class UnkStruct_027e09ac_Base { +public: + /* 000 */ UnkStruct_027e09ac_Base_00 mUnk_000; + /* 010 */ bool mUnk_010; + /* 011 */ unk8 mUnk_011; // pad? + /* 012 */ unk8 mUnk_012; // pad? + /* 013 */ unk8 mUnk_013; // pad? + /* 014 */ + + UnkStruct_027e09ac_Base(); +}; + +class UnkStruct_027e09ac_14 { +public: + /* 00 */ u16 mUnk_00; + /* 02 */ u16 mUnk_02; + /* 04 */ u16 mUnk_04; + /* 06 */ u16 mUnk_06; + /* 08 */ u16 mUnk_08; + /* 0A */ u16 mUnk_0A; + /* 0C */ u16 mUnk_0C; + /* 0E */ u16 mUnk_0E; + /* 10 */ u16 mUnk_10; + /* 12 */ u16 mUnk_12; + /* 14 */ u16 mUnk_14; + /* 16 */ u16 mUnk_16; + /* 18 */ u16 mUnk_18; + /* 1A */ u16 mUnk_1A; + /* 1C */ u16 mUnk_1C; + /* 1E */ u16 mUnk_1E; + /* 20 */ u16 mUnk_20; + /* 22 */ u16 mUnk_22; + /* 24 */ u16 mUnk_24; + /* 26 */ u16 mUnk_26; + /* 28 */ u16 mUnk_28; + /* 2A */ u16 mUnk_2A[10]; + /* 3E */ u16 mUnk_3E; + /* 40 */ u32 mUnk_40[8]; + /* 60 */ u16 mUnk_60; + /* 62 */ u16 mUnk_62; + /* 64 */ u16 mUnk_64; + /* 66 */ u16 mUnk_66; + /* 68 */ + + void func_ov000_02071f98(); +}; + +class UnkStruct_027e09ac : public AutoInstance, public UnkStruct_027e09ac_Base { +public: + /* 000 (base) */ + /* 014 */ UnkStruct_027e09ac_14 mUnk_014; + /* 07C */ UnkStruct_027e09ac_14 mUnk_07C; //! TODO: type unsure but the size is consistent with the gap + /* 0E4 */ UnkStruct_027e09ac_14 mUnk_0E4; + /* 14C */ u16 mUnk_14C; + /* 14E */ u16 mUnk_14E; + /* 150 */ s16 mUnk_150; + /* 152 */ s16 mUnk_152; + /* 154 */ unk16 mUnk_154; + /* 156 */ bool mUnk_156; + /* 157 */ unk8 mUnk_157; // pad? + /* 158 */ + + UnkStruct_027e09ac(); + ~UnkStruct_027e09ac(); + + void func_ov000_020726f0(unk32 param1, unk32 param2, unk32 param3); + void func_ov000_020729c4(UnkStruct_027e09ac_14 *param1, u16 param2, u16 param3, s16 param4, s16 param5); +}; + +extern UnkStruct_027e09ac *data_027e09ac; diff --git a/include/Unknown/UnkStruct_027e09b8.hpp b/include/Unknown/UnkStruct_027e09b8.hpp index 53a76ce3..84a9d589 100644 --- a/include/Unknown/UnkStruct_027e09b8.hpp +++ b/include/Unknown/UnkStruct_027e09b8.hpp @@ -1,20 +1,94 @@ #pragma once +#include "MapObject/MapObject.hpp" +#include "Save/AdventureFlags.hpp" #include "types.h" +#include "versions.h" + +struct stack_ov000_02073578 { + unk8 unk_00; + unk32 unk_04; + unk32 unk_08; + + stack_ov000_02073578(); +}; + +class UnkStruct_027e09b8_00 { +public: + /* 000 */ STRUCT_PAD(0x000, 0xFD4); + /* FD4 */ + + UnkStruct_027e09b8_00(); + ~UnkStruct_027e09b8_00(); +}; + +class UnkStruct_027e09b8_04 { +public: + /* 00 */ STRUCT_PAD(0x00, 0x64); + /* 64 */ + + UnkStruct_027e09b8_04(); + ~UnkStruct_027e09b8_04(); +}; + +class UnkStruct_027e09b8_08 { +public: + /* 00 */ STRUCT_PAD(0x00, 0x00); + /* 00 */ + + UnkStruct_027e09b8_08(); + ~UnkStruct_027e09b8_08(); +}; + +class UnkStruct_027e09b8_0C { +public: + /* 00 */ STRUCT_PAD(0x00, 0xC4); + /* C4 */ MapObjectId mMapObjId; + /* C8 */ + + UnkStruct_027e09b8_0C(); + ~UnkStruct_027e09b8_0C(); +}; + +class UnkStruct_027e09b8_10 { +public: + /* 00 */ STRUCT_PAD(0x00, 0x18); + /* 18 */ + + UnkStruct_027e09b8_10(); + ~UnkStruct_027e09b8_10(); +}; class UnkStruct_027e09b8 { public: - /* 00 */ unk8 mUnk_00[0x14]; + /* 00 */ UnkStruct_027e09b8_00 *mUnk_00; + /* 04 */ UnkStruct_027e09b8_04 *mUnk_04; + /* 08 */ UnkStruct_027e09b8_08 *mUnk_08; + /* 0C */ UnkStruct_027e09b8_0C *mUnk_0C; + /* 10 */ UnkStruct_027e09b8_10 *mUnk_10; /* 14 */ u32 mAdventureFlags[32]; //! TODO +#if IS_JP + //! TODO: figure out if the other versions got these too + /* 94 */ u16 mUnk_94; +#endif + + bool HasAdventureFlag(AdventureFlag flag) { + return GET_FLAG(this->mAdventureFlags, flag); + } unk32 func_01ffd420(); unk32 func_ov000_020732ec(unk32 param1); unk32 func_ov000_020732fc(unk32 param1); - unk32 func_ov000_020732dc(unk32 param1); + bool func_ov000_020732dc(unk32 param1); unk32 func_ov000_0207330c(); unk32 func_ov000_02073470(void *param1, unk32 param2); unk32 func_ov000_02073388(void *param1, unk32 param2); + void func_ov000_02073578(void *param1, unk32 param2); + +#if IS_JP + void func_ov000_02074d78(unk32 param1); +#endif }; extern UnkStruct_027e09b8 *data_027e09b8; diff --git a/include/Unknown/UnkStruct_027e0cd8.hpp b/include/Unknown/UnkStruct_027e0cd8.hpp index 9dd21d9d..0e88c45b 100644 --- a/include/Unknown/UnkStruct_027e0cd8.hpp +++ b/include/Unknown/UnkStruct_027e0cd8.hpp @@ -134,7 +134,9 @@ public: /* 08 */ unk32 mUnk_08; /* 0C */ UnkStruct_027e0cd8_0c *mUnk_0C; // related to train? /* 10 */ MapObjectManager *mUnk_10; - /* 14 */ STRUCT_PAD(0x14, 0x4C); + /* 14 */ STRUCT_PAD(0x14, 0x24); + /* 24 */ Vec3p mUnk_24; + /* 34 */ STRUCT_PAD(0x34, 0x4C); /* 4C */ bool func_ov000_02081e30(unk32 param1, unk32 param2); @@ -143,6 +145,8 @@ public: void func_ov000_02081eec(unk16 param1, unk32 param2, unk32 param3); bool func_ov000_02081f3c(unk16 param1, unk32 param2); unk32 func_ov000_02081d5c(); + bool func_ov000_02082124(); + bool func_ov000_02081c28(); }; extern UnkStruct_027e0cd8 *data_027e0cd8; diff --git a/include/Unknown/UnkStruct_027e0cdc.hpp b/include/Unknown/UnkStruct_027e0cdc.hpp index bc69e2b5..739a47c1 100644 --- a/include/Unknown/UnkStruct_027e0cdc.hpp +++ b/include/Unknown/UnkStruct_027e0cdc.hpp @@ -11,6 +11,7 @@ public: ~UnkStruct_027e0cdc(); unk32 func_ov000_02082a28(unk32 param1); + unk32 func_ov000_02082a48(unk32 param1); }; extern UnkStruct_027e0cdc *data_027e0cdc; diff --git a/include/Unknown/UnkStruct_027e0ce0.hpp b/include/Unknown/UnkStruct_027e0ce0.hpp index 534b6608..bbdd66ef 100644 --- a/include/Unknown/UnkStruct_027e0ce0.hpp +++ b/include/Unknown/UnkStruct_027e0ce0.hpp @@ -22,6 +22,8 @@ public: /* 2C */ unk32 mUnk_2C; /* 30 */ + void func_ov008_020b6a50(); + void func_ov024_020d3d98(unk32 param1, unk32 param2); void func_ov024_020d3ee8(unk32 param1, u16 param2, unk32 param3); unk32 func_ov024_020d3dcc(); @@ -29,6 +31,26 @@ public: void func_ov110_02185d3c(ItemId itemId); }; +class UnkStruct_027e0ce0_38_10 { +public: + void func_ov026_020f4870(); +}; + +class UnkStruct_027e0ce0_38_158 { +public: + void func_ov026_020dc2d0(); +}; + +class UnkStruct_027e0ce0_38 { +public: + /* 000 */ STRUCT_PAD(0x00, 0x10); + /* 010 */ UnkStruct_027e0ce0_38_10 *mUnk_010; + /* 014 */ STRUCT_PAD(0x14, 0x158); + /* 158 */ UnkStruct_027e0ce0_38_158 *mUnk_158; + + // data_ov026_0213562c +}; + // PlayerManager? class UnkStruct_027e0ce0 { public: @@ -49,7 +71,7 @@ public: /* 2C */ ItemManager *mUnk_2C; // same as above /* 30 */ unk32 *mUnk_30; // ? /* 34 */ UnkStruct_027e0ce0_34 *mUnk_34; - /* 38 */ unk32 *mUnk_38; // pointer to data_027e0478 when on the train + /* 38 */ UnkStruct_027e0ce0_38 *mUnk_38; // pointer to data_027e0478 when on the train /* 3C */ unk32 mUnk_3C; /* 40 */ unk32 *mUnk_40; // pointer to data_027e0478 when not on the train /* 44 */ @@ -57,12 +79,16 @@ public: Vec3p *func_01fff148(unk32 param1); bool func_01fff1a4(); + // overlay 0 void func_ov000_0208a318(unk32 param1, unk32 param2, unk32 param3); void func_ov000_0208bbd4(unk32 param1, Vec3p *param2, u16 param3); void func_ov000_0208bbd4(unk32 param1, Vec3p *param2, void *param3); static UnkStruct_027e0ce0_34 *func_ov000_0205c904(); + + // overlay 17 + void func_ov017_020bd69c(); }; extern UnkStruct_027e0ce0 *data_027e0ce0; diff --git a/include/Unknown/UnkStruct_027e0cf8.hpp b/include/Unknown/UnkStruct_027e0cf8.hpp index 0086be8e..fbb618b6 100644 --- a/include/Unknown/UnkStruct_027e0cf8.hpp +++ b/include/Unknown/UnkStruct_027e0cf8.hpp @@ -1,16 +1,115 @@ #pragma once +#include "Unknown/Common.hpp" #include "global.h" #include "types.h" -class UnkStruct_027e0cf8 { +struct UnkStruct_027e0cf8_00_18 { + /* 00 */ UnkSubStruct19 mUnk_00; + /* 78 */ unk32 mUnk_78; + /* 7C */ unk32 mUnk_7C; + /* 80 */ unk32 mUnk_80; +}; + +class UnkStruct_027e0cf8_00 { public: - /* 00 */ unk32 mUnk_00; + /* 0000 */ STRUCT_PAD(0x00, 0x18); + /* 0018 */ UnkStruct_027e0cf8_00_18 mUnk_0018[48]; + /* 18D8 */ STRUCT_PAD(0x18D8, 0x2258); + /* 2258 */ + + UnkStruct_027e0cf8_00(); + ~UnkStruct_027e0cf8_00(); + + void func_ov024_020cfb7c(void *param1, Vec2s *param2, unk32 param3, u16 param4, unk32 param5, unk32 param6); +}; + +class UnkStruct_027e0cf8_04 { +public: + /* 00 */ STRUCT_PAD(0x00, 0x1C); + + UnkStruct_027e0cf8_04(); + + void func_ov026_020dc300(); +}; + +class UnkStruct_027e0cf8_08 { +public: + /* 000 */ STRUCT_PAD(0x00, 0x26C); + + UnkStruct_027e0cf8_08(); + ~UnkStruct_027e0cf8_08(); + + void func_ov024_020d32d8(); + void func_ov024_020d32e8(Vec2s *param1); + void func_ov024_020d3324(void *param1); + void func_ov024_020d3348(void *param1, unk32 param2, u16 param3, unk32 param4, unk32 param5); + void func_ov024_020d340c(); + void func_ov024_020d341c(unk32 param1); +}; + +class UnkStruct_027e0cf8_0C { +public: + /* 000 */ STRUCT_PAD(0x00, 0x170); + + UnkStruct_027e0cf8_0C(); + ~UnkStruct_027e0cf8_0C(); + + void func_ov024_020cff8c(void *param1, Vec2s *param2); + void func_ov024_020d0004(); + void func_ov024_020d02e0(); + void func_ov024_020d0340(); + void func_ov024_020d03f8(Vec2s *param1); + void func_ov024_020d041c(Vec2s *param1); + void func_ov024_020d05d0(unk32 param1, unk32 param2); +}; + +class UnkStruct_027e0cf8 : AutoInstance { +public: + /* 00 */ UnkStruct_027e0cf8_00 *mUnk_00; + /* 04 */ UnkStruct_027e0cf8_04 *mUnk_04; + /* 08 */ UnkStruct_027e0cf8_08 *mUnk_08; + /* 0C */ UnkStruct_027e0cf8_0C *mUnk_0C; + /* 10 */ Vec2s mUnk_10; + /* 14 */ Vec2s mUnk_14; + /* 18 */ unk32 mUnk_18; + /* 1C */ bool mUnk_1C; + /* 1D */ unk8 mUnk_1D; + /* 1E */ unk8 mUnk_1E; + /* 1F */ unk8 mUnk_1F; + /* 20 */ unk32 mUnk_20; + /* 24 */ unk32 mUnk_24; + /* 28 */ u16 mUnk_28; + /* 2A */ u16 mUnk_2A; + /* 2C */ UnkStruct_027e0cf8(); ~UnkStruct_027e0cf8(); + void func_ov017_020c390c(); + void func_ov017_020c397c(); + void func_ov017_020c39d4(); + + void func_ov024_020c755c(void *param1); + void func_ov024_020c75d0(void *param1, unk32 param2, u16 param3); + void func_ov024_020c7724(); + void func_ov024_020c7750(); + void func_ov024_020c7780(); + void func_ov024_020c77b0(unk32 param1); + void func_ov024_020c77c0(); + void func_ov024_020c77d0(); + void func_ov024_020c77e0(Vec2s *param1); + void func_ov024_020c7804(Vec2s *param1); void func_ov024_020c7828(unk32 param1); + void func_ov024_020c7878(unk32 param1, u16 param2); + void func_ov024_020c7884(); + void func_ov024_020c7898(); + bool func_ov024_020c78ac(unk32 *param1, unk16 *param2); + void func_ov024_020c78d0(); + void func_ov024_020c78e4(unk32 param1); + void func_ov024_020c7900(unk32 param1); + + static UnkStruct_027e0cf8 *Create(); }; extern UnkStruct_027e0cf8 *data_027e0cf8; diff --git a/include/Unknown/UnkStruct_027e0d00.hpp b/include/Unknown/UnkStruct_027e0d00.hpp index a64ac32d..a8068c9e 100644 --- a/include/Unknown/UnkStruct_027e0d00.hpp +++ b/include/Unknown/UnkStruct_027e0d00.hpp @@ -3,7 +3,7 @@ #include "global.h" #include "types.h" -class UnkStruct_027e0d00 { +class UnkStruct_027e0d00 : public AutoInstance { public: /* 00 */ unk32 mUnk_00; diff --git a/include/Unknown/UnkStruct_027e0d34.hpp b/include/Unknown/UnkStruct_027e0d34.hpp index 1c2c26fe..b8150b32 100644 --- a/include/Unknown/UnkStruct_027e0d34.hpp +++ b/include/Unknown/UnkStruct_027e0d34.hpp @@ -17,6 +17,8 @@ public: UnkStruct_027e0d34(); ~UnkStruct_027e0d34(); + bool func_ov031_020d97e4(); + bool func_ov031_020d97f4(); void func_ov031_020d9844(); bool TryItemGive(ItemId itemId); }; diff --git a/include/Unknown/UnkStruct_ov000_02067bc4.hpp b/include/Unknown/UnkStruct_ov000_02067bc4.hpp index 5abd8565..6a8931f0 100644 --- a/include/Unknown/UnkStruct_ov000_02067bc4.hpp +++ b/include/Unknown/UnkStruct_ov000_02067bc4.hpp @@ -101,6 +101,20 @@ public: void func_ov000_020676f8(const char *bmgFileName, unk32 param2); }; +class UnkStruct_ov000_020b504c_Sub4_00 { +public: + /* 00 (vtable) */ + /* 04 */ + + /* 00 */ virtual void vfunc_00(); + /* 04 */ virtual void vfunc_04(); + /* 08 */ virtual void vfunc_08(); + /* 0C */ virtual void vfunc_0C(); + /* 10 */ virtual void vfunc_10(); + /* 14 */ virtual void vfunc_14(); + /* 18 */ virtual void vfunc_18(unk32 param1); +}; + class UnkStruct_ov000_020b504c_Sub4 { public: /* 00 */ unk32 mUnk_00; @@ -130,6 +144,11 @@ public: unk8 func_ov000_02067cf8(unk32 param1, unk32 param2, UnkStruct_ov000_02067bc4::UnkStruct1 *param3); // ShowText? void func_ov000_02067e60(u8 param1, unk32 param2); unk32 func_ov000_020682c0(unk32 param1); + void func_ov000_02067f5c(unk32 param1); + unk32 func_ov000_02067f88(unk32 param1, unk32 param2); + UnkStruct_ov000_020b504c_Sub4_00 *func_ov000_02067bf0(); + void func_ov000_02067b20(); + void func_ov000_02068068(unk32 param1); //! TODO: figure this out void func_ov000_0206807c(unk32 param1, void *param2, unk32 param3, unk32 param4); @@ -137,9 +156,9 @@ public: void func_ov000_0206807c(unk32 param1, void *param2); void func_ov000_0206807c(void *param1, void *param2); void func_ov000_0206807c(void *param1, unk32 param2); + void func_ov000_02067b60(); - unk32 func_ov000_02067f88(unk32 param1, unk32 param2); - + void func_ov001_020be510(); void func_ov001_020be668(void); void func_ov001_020be6f4(void); }; diff --git a/include/Unknown/UnkStruct_ov000_020b4eec.hpp b/include/Unknown/UnkStruct_ov000_020b4eec.hpp index d5de5e58..52d54bee 100644 --- a/include/Unknown/UnkStruct_ov000_020b4eec.hpp +++ b/include/Unknown/UnkStruct_ov000_020b4eec.hpp @@ -9,6 +9,8 @@ public: /* 84 */ UnkStruct_ov000_020b4eec(); + + SaveFile *func_ov001_020be12c(); }; extern UnkStruct_ov000_020b4eec data_ov000_020b4eec; diff --git a/include/Unknown/UnkStruct_ov000_020b4f70.hpp b/include/Unknown/UnkStruct_ov000_020b4f70.hpp new file mode 100644 index 00000000..490b3128 --- /dev/null +++ b/include/Unknown/UnkStruct_ov000_020b4f70.hpp @@ -0,0 +1,20 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_ov000_020b4f70 { +public: + /* 00 */ unk32 mUnk_00; + + UnkStruct_ov000_020b4f70(); + ~UnkStruct_ov000_020b4f70(); + + void func_ov000_020662e8(); + void func_ov000_02066370(); + void func_ov000_0206645c(unk8 *param1); + void func_ov000_0206654c(); + void func_ov000_020665b8(); +}; + +extern UnkStruct_ov000_020b4f70 *data_ov000_020b4f70; diff --git a/include/Unknown/UnkStruct_ov000_020b50c0.hpp b/include/Unknown/UnkStruct_ov000_020b50c0.hpp index 5be00515..223bf432 100644 --- a/include/Unknown/UnkStruct_ov000_020b50c0.hpp +++ b/include/Unknown/UnkStruct_ov000_020b50c0.hpp @@ -44,15 +44,17 @@ public: UnkStruct_ov000_020b50c0(); void func_ov000_02069d3c(unk32 param1); - void func_ov000_02069d7c(void); + void func_ov000_02069d7c(unk32 param1); void func_ov000_02069f58(void); unk32 func_ov000_0206a5d8(unk32 param1); void func_ov000_0206a6a4(unk32 param1); void func_ov000_0206a758(void); void func_ov000_0206a77c(void); - void func_ov001_020bd8ac(void); + void func_ov001_020bd854(); + void func_ov001_020bd87c(void); void func_ov001_020bd8dc(void); + void func_ov001_020bd8ac(void); UnkStruct_ov018_020c5ac0 *func_ov018_020c5718(void); }; diff --git a/include/Unknown/UnkStruct_ov000_020b5214.hpp b/include/Unknown/UnkStruct_ov000_020b5214.hpp index 4578cb46..1349194f 100644 --- a/include/Unknown/UnkStruct_ov000_020b5214.hpp +++ b/include/Unknown/UnkStruct_ov000_020b5214.hpp @@ -51,4 +51,5 @@ public: void func_ov000_0206e7e8(unk32 param1); }; -extern UnkStruct_ov000_020b5214 data_ov000_020b5214; +extern UnkStruct_ov000_020b5214 data_ov000_020b5214_eur; +#define data_ov000_020b5214 data_ov000_020b5214_eur diff --git a/include/Unknown/UnkStruct_ov000_020b52b4.hpp b/include/Unknown/UnkStruct_ov000_020b52b4.hpp index 74d7df83..7d036e11 100644 --- a/include/Unknown/UnkStruct_ov000_020b52b4.hpp +++ b/include/Unknown/UnkStruct_ov000_020b52b4.hpp @@ -19,6 +19,7 @@ public: ~UnkStruct_ov000_020b52b4(); void func_ov000_0206f6ac(); + void func_ov000_0206f778(unk32 param1, unk32 param2, unk32 param3); }; extern UnkStruct_ov000_020b52b4 data_ov000_020b52b4; diff --git a/include/Unknown/UnkStruct_ov017_020c3f70.hpp b/include/Unknown/UnkStruct_ov017_020c3f70.hpp new file mode 100644 index 00000000..fd577996 --- /dev/null +++ b/include/Unknown/UnkStruct_ov017_020c3f70.hpp @@ -0,0 +1,20 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_ov017_020c3f70 { +public: + /* 00 */ unk32 mUnk_00; + + UnkStruct_ov017_020c3f70(); + + // data_ov017_020c3f08 + /* 00 */ virtual ~UnkStruct_ov017_020c3f70(); + /* 08 */ virtual void vfunc_08(); //! TODO: probably inherited? + + void func_ov017_020bba78(); + void func_ov017_020bba94(); +}; + +extern UnkStruct_ov017_020c3f70 data_ov017_020c3f70; diff --git a/include/Unknown/UnkStruct_ov024_020d8660.hpp b/include/Unknown/UnkStruct_ov024_020d8660.hpp new file mode 100644 index 00000000..237bdad2 --- /dev/null +++ b/include/Unknown/UnkStruct_ov024_020d8660.hpp @@ -0,0 +1,67 @@ +#pragma once + +#include "Actor/ActorId.hpp" +#include "global.h" +#include "types.h" + +class UnkActorSystem1 { +public: + /* 00 (vtable) */ + /* 04 */ bool mUnk_04; + + UnkActorSystem1(); + + // data_ov024_020d7b98 + /* 00 */ virtual ~UnkActorSystem1(); + /* 08 */ virtual void vfunc_08(); + /* 0C */ virtual void vfunc_0C(); + /* 10 */ virtual void vfunc_10(unk32 param1); + /* 14 */ virtual void vfunc_14(unk32 param1); + /* 18 */ virtual void vfunc_18(unk8 *param1); + /* 1C */ virtual void vfunc_1C(unk32 param1); + /* 20 */ virtual void vfunc_20(unk32 param1); + /* 24 */ virtual unk32 vfunc_24() = 0; + /* 28 */ virtual unk32 vfunc_28() = 0; + /* 2C */ virtual bool vfunc_2C(); + /* 30 */ +}; + +struct UnkActorSystem_Infos1 { + /* 0C */ s16 mUnk_00; + /* 0E */ unk16 mUnk_02; + /* 10 */ unk32 mUnk_04; + /* 14 */ unk32 mUnk_08; + /* 18 */ bool mUnk_0C; + /* 19 */ bool mUnk_0D; + /* 1A */ unk8 mUnk_0E; // pad? + /* 1B */ unk8 mUnk_0F; // pad? +}; + +class UnkStruct_ov024_020d8660 : public AutoInstance { +public: + /* 00 */ UnkActorSystem1 *mUnk_00; + /* 04 */ ActorId mActorId; + /* 08 */ unk32 mUnk_08; + /* 0C */ UnkActorSystem_Infos1 mUnk_0C; + /* 1C */ unk32 mUnk_1C; + + UnkStruct_ov024_020d8660(); + ~UnkStruct_ov024_020d8660(); + + void func_ov024_020c4a8c(UnkActorSystem1 *param1); + void func_ov024_020c4ac0(); + void func_ov024_020c4b10(); + void func_ov024_020c4b24(); + void func_ov024_020c4b4c(unk32 param1); + void func_ov024_020c4ba0(); + void func_ov024_020c4cc8(); + bool func_ov024_020c4d74(); + void func_ov024_020c4d88(ActorId actorId, unk32 param2); + void func_ov024_020c4dac(ActorId actorId, unk32 param2, UnkActorSystem_Infos1 *param3); + + static void SetInstance(UnkStruct_ov024_020d8660 *pInstance); + static bool ClearInstance(); +}; + +// related to minigames +extern UnkStruct_ov024_020d8660 *data_ov024_020d8660; diff --git a/include/Unknown/UnkStruct_ov024_020d8694.hpp b/include/Unknown/UnkStruct_ov024_020d8694.hpp new file mode 100644 index 00000000..5028f331 --- /dev/null +++ b/include/Unknown/UnkStruct_ov024_020d8694.hpp @@ -0,0 +1,171 @@ +#pragma once + +#include "Player/TouchControl.hpp" +#include "TitleScreen/TitleScreen.hpp" +#include "Unknown/Common.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "global.h" +#include "types.h" + +#include + +class UnkTitleCardSystem1 { +public: + /* 000 (vtable) */ + /* 004 */ unk16 mUnk_004; + /* 006 */ unk16 mUnk_006; // pad? + /* 008 */ unk32 mUnk_008; + /* 00C */ unk32 mUnk_00C; + /* 010 */ unk32 mUnk_010; + /* 014 */ GameModeManagerBase_004 *mUnk_014; + /* 018 */ unk32 mUnk_018; + /* 01C */ unk32 mUnk_01C; + /* 020 */ unk16 mUnk_020; + /* 022 */ unk16 mUnk_022; + /* 024 */ unk16 mUnk_024; + /* 026 */ unk16 mUnk_026; + /* 028 */ unk32 mUnk_028; + /* 02C */ unk32 mUnk_02C; + /* 030 */ unk16 mUnk_030; + /* 034 */ unk16 mUnk_034; + /* 036 */ unk16 mUnk_036; + /* 038 */ unk16 mUnk_038; + /* 03A */ unk16 mUnk_03A; + /* 03C */ unk16 mUnk_03C; + /* 03E */ unk16 mUnk_03E; + /* 040 */ unk32 mUnk_040; + /* 044 */ unk32 mUnk_044; + /* 048 */ unk16 mUnk_048; + /* 04A */ unk16 mUnk_04A; + /* 04C */ unk16 mUnk_04C; + /* 04E */ unk16 mUnk_04E; + /* 050 */ unk16 mUnk_050; + /* 052 */ unk16 mUnk_052; + /* 054 */ unk16 mUnk_054; + /* 056 */ unk16 mUnk_056; + /* 058 */ unk32 mUnk_058; + /* 05C */ unk32 mUnk_05C; + /* 060 */ unk32 mUnk_060; + /* 064 */ UnkSystem2_UnkSubSystem9 mUnk_064; + /* 0A8 */ UnkSystem2_UnkSubSystem9 mUnk_0A8; + /* 0EC */ UnkSystem2_UnkSubSystem9 mUnk_0EC; + /* 130 */ unk32 mUnk_130; + /* 134 */ bool mUnk_134; + /* 135 */ unk8 mUnk_135; // pad? + /* 136 */ unk8 mUnk_136; // pad? + /* 137 */ unk8 mUnk_137; // pad? + /* 138 */ + + UnkTitleCardSystem1(GameModeManagerBase_004 *param1); + + // data_ov024_020d7fd0 + /* 00 */ virtual void vfunc_00(); + /* 04 */ virtual void vfunc_04(); + /* 08 */ virtual void vfunc_08(); + /* 0C */ virtual void vfunc_0C(); + /* 10 */ virtual void vfunc_10(); + /* 14 */ virtual void vfunc_14(); + /* 18 */ virtual void vfunc_18(); + /* 1C */ +}; + +class UnkTitleCardSystem1_Derived1 : public UnkTitleCardSystem1 { +public: + /* 000 (base) */ + /* 138 */ unk32 mUnk_138; + /* 13C */ unk16 mUnk_13C; + /* 13E */ unk16 mUnk_13E; + /* 140 */ bool mUnk_140; + /* 141 */ unk8 mUnk_141; // pad? + /* 142 */ unk8 mUnk_142; // pad? + /* 143 */ unk8 mUnk_143; // pad? + /* 144 */ + + UnkTitleCardSystem1_Derived1(GameModeManagerBase_004 *param1); + + // data_ov024_020d8044 + /* 08 */ virtual void vfunc_08() override; + /* 0C */ virtual void vfunc_0C() override; + /* 10 */ virtual void vfunc_10() override; + /* 18 */ virtual void vfunc_18() override; + /* 1C */ virtual void vfunc_1C(); + /* 20 */ +}; + +class UnkStruct_ov024_020d8694_01C : public UnkTitleCardSystem1_Derived1 { +public: + /* 000 (base) */ + /* 144 */ TitleScreen_Sub3 mUnk_144; + /* 168 */ bool mUnk_168; + /* 169 */ unk8 mUnk_169; // pad? + /* 16A */ unk8 mUnk_16A; // pad? + /* 16B */ unk8 mUnk_16B; // pad? + /* 16C */ + + UnkStruct_ov024_020d8694_01C(GameModeManagerBase_004 *param1); + + // data_ov024_020d7ff4 + /* 00 */ virtual void vfunc_00() override; + /* 1C */ virtual void vfunc_1C() override; +}; + +class UnkStruct_ov024_020d8694_188 : public UnkTitleCardSystem1_Derived1 { +public: + /* 000 (base) */ + /* 144 */ UnkStruct_0204a110_Sub7_08 mUnk_144; + /* 174 */ + + UnkStruct_ov024_020d8694_188(GameModeManagerBase_004 *param1); + + // data_ov024_020d801c + /* 00 */ virtual void vfunc_00() override; + /* 04 */ virtual void vfunc_04() override; + /* 14 */ virtual void vfunc_14() override; + /* 1C */ virtual void vfunc_1C() override; +}; + +class UnkStruct_ov024_020d8694_2FC : public UnkTitleCardSystem1 { +public: + /* 000 (base) */ + /* 138 */ + + UnkStruct_ov024_020d8694_2FC(GameModeManagerBase_004 *param1); + + // data_ov024_020d7fac + /* 00 */ virtual void vfunc_00() override; + /* 08 */ virtual void vfunc_08() override; + /* 0C */ virtual void vfunc_0C() override; + /* 10 */ virtual void vfunc_10() override; +}; + +class UnkStruct_ov024_020d8694 : public AutoInstance, public GameModeManagerBase_104 { +public: + /* 000 (vtable) */ + /* 01C */ UnkStruct_ov024_020d8694_01C mUnk_01C; + /* 188 */ UnkStruct_ov024_020d8694_188 mUnk_188; + /* 2FC */ UnkStruct_ov024_020d8694_2FC mUnk_2FC; + /* 440 */ + + UnkStruct_ov024_020d8694(GameModeManagerBase_004 *param1); + + // data_ov024_020d7f88 + /* 00 */ virtual ~UnkStruct_ov024_020d8694(); + /* 08 */ virtual void vfunc_08(Input *pButtons, TouchControl *pTouchControl); + /* 10 */ virtual void vfunc_10(unk8 *param1); + + void func_ov024_020cafb8(); + void func_ov024_020cafd8(); + void func_ov024_020cb000(); + void func_ov024_020cb020(); + void func_ov024_020cb040(); + void func_ov024_020cb054(); + void func_ov024_020cb0ac(); + void func_ov024_020cb0c4(); + void func_ov024_020cb178(); + void func_ov024_020cb194(); + + static UnkStruct_ov024_020d8694 *Create(GameModeManagerBase_004 *param1); +}; + +// related to title cards +extern UnkStruct_ov024_020d8694 *data_ov024_020d8694; diff --git a/include/Unknown/UnkStruct_ov024_020d86a0.hpp b/include/Unknown/UnkStruct_ov024_020d86a0.hpp new file mode 100644 index 00000000..742a22ed --- /dev/null +++ b/include/Unknown/UnkStruct_ov024_020d86a0.hpp @@ -0,0 +1,28 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_ov024_020d86a0 : public AutoInstance { +public: + /* 00 */ unk32 mUnk_00; + /* 04 */ unk32 mUnk_04; + /* 08 */ unk32 mUnk_08; + /* 0C */ unk8 mUnk_0C; + /* 0D */ unk8 mUnk_0D; + /* 0E */ unk8 mUnk_0E; + /* 0F */ bool mUnk_0F; + + UnkStruct_ov024_020d86a0(); + ~UnkStruct_ov024_020d86a0(); + + void func_ov001_020bd818(); + + void func_ov024_020d167c(); + + static void Destroy(); + static void SetInstance(UnkStruct_ov024_020d86a0 *pInstance); + static bool ClearInstance(); +}; + +extern UnkStruct_ov024_020d86a0 *data_ov024_020d86a0; diff --git a/include/Unknown/UnkStruct_ov026_02138d10.hpp b/include/Unknown/UnkStruct_ov026_02138d10.hpp new file mode 100644 index 00000000..5dba7120 --- /dev/null +++ b/include/Unknown/UnkStruct_ov026_02138d10.hpp @@ -0,0 +1,19 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_ov026_02138d10 { +public: + /* 00 */ unk32 mUnk_00; + + UnkStruct_ov026_02138d10(); + ~UnkStruct_ov026_02138d10(); + + unk32 func_ov026_020e13f4(); + unk32 func_ov026_020e18fc(); + void func_ov026_020e1440(); + bool func_ov026_020e6a6c(); +}; + +extern UnkStruct_ov026_02138d10 *data_ov026_02138d10; diff --git a/include/Unknown/UnkStruct_ov026_0213f578.hpp b/include/Unknown/UnkStruct_ov026_0213f578.hpp new file mode 100644 index 00000000..d5aa6296 --- /dev/null +++ b/include/Unknown/UnkStruct_ov026_0213f578.hpp @@ -0,0 +1,16 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_ov026_0213f578 { +public: + /* 00 */ unk32 mUnk_00; + + UnkStruct_ov026_0213f578(); + ~UnkStruct_ov026_0213f578(); + + void func_ov026_020f4844(); +}; + +extern UnkStruct_ov026_0213f578 *data_ov026_0213f578; diff --git a/include/Unknown/UnkStruct_ov026_0213f590.hpp b/include/Unknown/UnkStruct_ov026_0213f590.hpp new file mode 100644 index 00000000..9daf0a17 --- /dev/null +++ b/include/Unknown/UnkStruct_ov026_0213f590.hpp @@ -0,0 +1,16 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_ov026_0213f590 { +public: + /* 00 */ unk32 mUnk_00; + + UnkStruct_ov026_0213f590(); + ~UnkStruct_ov026_0213f590(); + + unk32 func_ov026_020f7cc0(); +}; + +extern UnkStruct_ov026_0213f590 data_ov026_0213f590; diff --git a/include/Unknown/UnkStruct_ov031_02118fa4.hpp b/include/Unknown/UnkStruct_ov031_02118fa4.hpp new file mode 100644 index 00000000..5afcfd99 --- /dev/null +++ b/include/Unknown/UnkStruct_ov031_02118fa4.hpp @@ -0,0 +1,16 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_ov031_02118fa4 { +public: + /* 00 */ unk32 mUnk_00; + + UnkStruct_ov031_02118fa4(); + ~UnkStruct_ov031_02118fa4(); + + unk32 func_ov009_020b670c(unk32 param1); +}; + +extern UnkStruct_ov031_02118fa4 *data_ov031_02118fa4; diff --git a/include/Unknown/UnkStruct_ov088_02177218.hpp b/include/Unknown/UnkStruct_ov088_02177218.hpp new file mode 100644 index 00000000..4979ed8d --- /dev/null +++ b/include/Unknown/UnkStruct_ov088_02177218.hpp @@ -0,0 +1,15 @@ +#pragma once + +#include "global.h" +#include "types.h" + +class UnkStruct_ov088_02177218 { +public: + /* 00 (vtable) */ + + UnkStruct_ov088_02177218(); + + /* 00 */ virtual ~UnkStruct_ov088_02177218(); +}; + +extern UnkStruct_ov088_02177218 *data_ov088_02177218; diff --git a/include/flags.h b/include/flags.h index 097cceb1..585172ea 100644 --- a/include/flags.h +++ b/include/flags.h @@ -16,6 +16,10 @@ #define UNSET_FLAG(arr, pos) ((arr)[((u32) (pos)) >> 5] &= ~(1 << ((pos) & 0x1F))) #define FLAG(index, pos) (((index) << 5) | ((pos) & 0x1F)) +#define GET_FLAG_ALT(arr, pos) (((arr)[(pos) >> 5] & (1 << ((0x1F - ((pos) & 0x1F))))) != 0) +#define SET_FLAG_ALT(arr, pos) ((arr)[(pos) >> 5] |= 1 << ((0x1F - ((pos) & 0x1F)))) +#define UNSET_FLAG_ALT(arr, pos) ((arr)[(pos) >> 5] &= ~(1 << ((0x1F - ((pos) & 0x1F))))) + //! TODO: improve or remove? idk #define VA_NARGS_IMPL(_1, _2, _3, _4, N, ...) N #define VA_NARGS(...) VA_NARGS_IMPL(__VA_ARGS__, 4, 3, 2, 1) diff --git a/include/types.h b/include/types.h index a52a8516..e8457207 100644 --- a/include/types.h +++ b/include/types.h @@ -68,16 +68,27 @@ typedef s32 unk32; DECL_PTMF(PTMF); typedef void (*UnkCallback)(u16 param1); -template class AutoInstance { +template class Instance { public: - AutoInstance() { - T::SetInstance((T *) this); - } - - ~AutoInstance() { - T::ClearInstance(); - } + Instance(); + ~Instance(); }; + +template class AutoInstance : public Instance { +public: + AutoInstance() {} + ~AutoInstance() {} +}; + + #define DECL_INSTANCE(T, gpInstance) \ + template Instance::Instance() { \ + gpInstance = (T *) this; \ + } \ + template Instance::~Instance() { \ + gpInstance = NULL; \ + } \ + template class Instance + #endif #endif diff --git a/libs/dsprotect/include/dsprot.h b/libs/dsprotect/include/dsprot.h new file mode 100644 index 00000000..2819af4f --- /dev/null +++ b/libs/dsprotect/include/dsprot.h @@ -0,0 +1,121 @@ +//================================================================================================= +/** + * dsprot.h + * + * Header file for the DS Protect library + * Version 1.23z + */ +//================================================================================================= + +#ifndef DSPROT_H +#define DSPROT_H + +#define DSP_VERSION (123) +#define DSP_VERSION_STR "1.23z" + +#ifndef SDK_ASM + + #ifndef DSP_NO_NITRO + + #include // For u32 + + #else /* DSP_NO_NITRO */ + +// Assumption for convenience-- make sure this is matching if you use it! +typedef unsigned long __dsp_u32; + #define u32 __dsp_u32 + + #endif /* DSP_NO_NITRO */ + + #ifdef __cplusplus +extern "C" { + #endif /* __cplusplus */ + +//================================================================================================= +/** + * Detect if the current environment is a flashcart. + * + * @param callback Function to be called if the environment is determined to be a flashcart. + * May be NULL. + * + * @return 1 if the environment is determined to be a flashcart, 0 otherwise + */ +//================================================================================================= +extern u32 DSProt_DetectFlashcart(void *callback); + +//================================================================================================= +/** + * Detect if the current environment is NOT a flashcart. + * + * @param callback Function to be called if the environment is determined to NOT be a flashcart. + * May be NULL. + * + * @return 1 if the environment is determined to NOT be a flashcart, 0 otherwise + */ +//================================================================================================= +extern u32 DSProt_DetectNotFlashcart(void *callback); + +//================================================================================================= +/** + * Detect if the current environment is an emulator. + * + * @param callback Function to be called if the environment is determined to be an emulator. + * May be NULL. + * + * @return 1 if the environment is determined to be an emulator, 0 otherwise + */ +//================================================================================================= +extern u32 DSProt_DetectEmulator(void *callback); + +//================================================================================================= +/** + * Detect if the current environment is NOT an emulator. + * + * @param callback Function to be called if the environment is determined to NOT be an emulator. + * May be NULL. + * + * @return 1 if the environment is determined to NOT be an emulator, 0 otherwise + */ +//================================================================================================= +extern u32 DSProt_DetectNotEmulator(void *callback); + +//================================================================================================= +/** + * Dummy environment detection function that does not do anything. Will always fail. + * + * @param callback Dummy callback function which will never be called. May be NULL. + * + * @return 0 + */ +//================================================================================================= +extern u32 DSProt_DetectDummy(void *callback); + +//================================================================================================= +/** + * Dummy environment detection function that does not do anything. Will always succeed. + * + * @param callback Dummy callback function which will always be called. May be NULL. + * + * @return 1 + */ +//================================================================================================= +extern u32 DSProt_DetectNotDummy(void *callback); + + #ifdef __cplusplus +} + #endif /* __cplusplus */ + + #ifdef DSP_NO_NITRO + + #undef u32 + + #endif /* DSP_NO_NITRO */ + +#else /* SDK_ASM */ + +.public DSProt_DetectFlashcart.public DSProt_DetectNotFlashcart.public DSProt_DetectEmulator.public DSProt_DetectNotEmulator + .public DSProt_DetectDummy.public DSProt_DetectNotDummy + +#endif /* SDK_ASM */ + +#endif /* DSPROT_H */ diff --git a/libs/nitro/include/nitro/math.h b/libs/nitro/include/nitro/math.h index 4f9fc4e0..f6724728 100644 --- a/libs/nitro/include/nitro/math.h +++ b/libs/nitro/include/nitro/math.h @@ -223,6 +223,26 @@ struct Mat4p { wColumn = W; } }; + +extern "C" static inline void Vec2s_Clear(Vec2s *pVec) { + s16 x = 0, y = 0; + + pVec->x = *(s16 *) &x; + pVec->y = *(s16 *) &y; +} + +extern "C" static inline void Vec2s_SetU(Vec2s *dest, Vec2us *src) { + u16 x = src->x; + u16 y = src->y; + + // clear current data + dest->x = 0; + dest->y = 0; + + // set new data + dest->x = x; + dest->y = y; +} extern "C" { #else typedef struct Vec2b { diff --git a/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp b/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp index 9b9082bb..211a4a61 100644 --- a/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp +++ b/src/000_Second/Actor/ActorUnk_ov000_020a8bb0.cpp @@ -124,7 +124,7 @@ ARM void ActorUnk_ov000_020a8bb0::func_ov000_020a8e9c(Vec3p *param1) { ARM void ActorUnk_ov000_020a8bb0::vfunc_b0() { if (data_027e09b8->func_01ffd420() == 0) { ActorUnk_vfunc_b0 auStack_60; - auStack_60.mUnk_24 = this; + auStack_60.mpActor = this; auStack_60.mUnk_0C = this->mUnk_5C.mUnk_20; auStack_60.mUnk_14 = 0; auStack_60.mUnk_18 = -1; @@ -238,7 +238,7 @@ ARM void ActorUnk_ov000_020a8bb0::vfunc_20() {} // non-matching ARM void ActorUnk_ov000_020a8bb0::vfunc_24() { - if (data_027e09b8->func_ov000_020732dc(3) == 0 || !(this->mUnk_0B0 & 4)) { + if (!data_027e09b8->func_ov000_020732dc(3) || !(this->mUnk_0B0 & 4)) { this->vfunc_20(); } diff --git a/src/000_Second/Cutscene/Cutscene.cpp b/src/000_Second/Cutscene/Cutscene.cpp index 65b1b8e8..dbeec752 100644 --- a/src/000_Second/Cutscene/Cutscene.cpp +++ b/src/000_Second/Cutscene/Cutscene.cpp @@ -835,5 +835,5 @@ bool Cutscene_IsAdventureFlagSet(s32 csIndex) { return false; } - return GET_FLAG(data_027e09b8->mAdventureFlags, pEntry->mFlag); + return data_027e09b8->HasAdventureFlag(pEntry->mFlag); } diff --git a/src/000_Second/Game/GameModeManagerBase_104.cpp b/src/000_Second/Game/GameModeManagerBase_104.cpp index 8a699f98..dfa40d53 100644 --- a/src/000_Second/Game/GameModeManagerBase_104.cpp +++ b/src/000_Second/Game/GameModeManagerBase_104.cpp @@ -6,7 +6,7 @@ ARM GameModeManagerBase_104::GameModeManagerBase_104() : mUnk_1A(false) {} ARM GameModeManagerBase_104::~GameModeManagerBase_104() { - GameModeLinkList *pNode = this->mUnk_0C.mList.GetPrev(); + GameModeLinkList *pNode = this->mUnk_0C.mList.GetPrevList(); GameModeLinkList *pOrigin = (GameModeLinkList *) ((u8 *) this + offsetof(GameModeManagerBase_104, mUnk_0C)); diff --git a/src/000_Second/Item/TreasureManager.cpp b/src/000_Second/Item/TreasureManager.cpp index ccecbbb8..bd2bd178 100644 --- a/src/000_Second/Item/TreasureManager.cpp +++ b/src/000_Second/Item/TreasureManager.cpp @@ -341,11 +341,4 @@ ARM void TreasureManager::func_ov000_020aa0ac(ItemId itemId) { } } -void TreasureManager::func_ov000_020aa200() { - data_ov000_020b6510 = this; -} - -bool TreasureManager::func_ov000_020aa210() { - data_ov000_020b6510 = NULL; - //! @bug: no return value -} +DECL_INSTANCE(TreasureManager, gpTreasureManager); diff --git a/src/000_Second/MapObject/MapObject.cpp b/src/000_Second/MapObject/MapObject.cpp index cb8e390f..53ecc5c7 100644 --- a/src/000_Second/MapObject/MapObject.cpp +++ b/src/000_Second/MapObject/MapObject.cpp @@ -196,7 +196,7 @@ struct stack_struct { }; ARM void MapObject::func_ov000_0209d434(s8 *param1, UnkStruct_ov019_020d24c8_28_258_00 *param2, unk32 param3) { - unk32 sp10; + Vec2s sp10; stack_struct spC; s32 var_r2; @@ -214,7 +214,7 @@ ARM void MapObject::func_ov000_0209d434(s8 *param1, UnkStruct_ov019_020d24c8_28_ return; } - if (data_027e0998->vfunc_00(&this->mPos, &sp10, &this->mUnk_38)) { + if (data_027e0998->vfunc_00(&this->mPos, &sp10, (u16 *) &this->mUnk_38)) { spC.mUnk_06 = 0x00; MI_CpuFill32(0, &spC, sizeof(spC)); spC.mUnk_05 = -1; diff --git a/src/000_Second/MapObject/MapObjectSwitchStep.cpp b/src/000_Second/MapObject/MapObjectSwitchStep.cpp index 9ed55ba6..b0d42fd6 100644 --- a/src/000_Second/MapObject/MapObjectSwitchStep.cpp +++ b/src/000_Second/MapObject/MapObjectSwitchStep.cpp @@ -118,7 +118,7 @@ ARM bool MapObjectSwitchStep::vfunc_00(void) { this->func_ov000_0209e11c(0, 1); } - if (data_027e09a4->mSceneIndex >= SceneIndex_battle01 && data_027e09a4->mSceneIndex < SceneIndex_Max) { + if (data_027e09a4->mUnk_00.mSceneIndex >= SceneIndex_battle01 && data_027e09a4->mUnk_00.mSceneIndex < SceneIndex_Max) { MapObjectSwitchStep_data_020b6118.func_ov000_0205fc20(0x78, 0x0C, NULL, NULL); SET_FLAG(this->mFlags, MapObjFlag_5); } @@ -203,15 +203,15 @@ ARM void MapObjectSwitchStep::vfunc_18(s8 *param1, s8 param2) { return; } - if (data_027e09a4->mSceneIndex >= SceneIndex_battle01 && data_027e09a4->mSceneIndex < SceneIndex_Max) { - unk32 sp10; + if (data_027e09a4->mUnk_00.mSceneIndex >= SceneIndex_battle01 && data_027e09a4->mUnk_00.mSceneIndex < SceneIndex_Max) { + Vec2s sp10; stack_struct sp8; - unk32 sp4; + u32 sp4; //! TODO: fake match? sp4 = *(u32 *) &this->mUnk_38; - if (data_027e0998->vfunc_00(&this->mPos, &sp10, &sp4)) { + if (data_027e0998->vfunc_00(&this->mPos, &sp10, (u16 *) &sp4)) { sp8.mUnk_06 = 0x00; MI_CpuFill32(0, &sp8, sizeof(sp8)); sp8.mUnk_05 = -1; diff --git a/src/001_SceneInit/Actor/ActorManager_001.cpp b/src/001_SceneInit/Actor/ActorManager_001.cpp index 2d2e9215..2369e077 100644 --- a/src/001_SceneInit/Actor/ActorManager_001.cpp +++ b/src/001_SceneInit/Actor/ActorManager_001.cpp @@ -38,7 +38,6 @@ THUMB ActorManager *ActorManager::Create() { } THUMB ActorManager::ActorManager() { - this->SetInstance(this); this->mUnk_20 = 0; this->mUnk_21 = 0; this->mUnk_22 = 0; @@ -63,8 +62,6 @@ THUMB ActorManager::~ActorManager() { if (this->mActorTable != NULL) { delete this->mActorTable; } - - this->ClearInstance(); } THUMB void ActorManager::func_ov001_020bafdc() { @@ -98,7 +95,7 @@ THUMB void ActorManager::func_ov001_020bb018(UnkStruct_func_ov001_020bb018_param int aligned0A = ALIGN_NEXT(unk_0A, 8); int aligned08 = ALIGN_NEXT(unk_08, 8); - int iVar5 = data_027e09a0->func_ov000_020702a8(data_027e09a4->mSceneIndex)->mUnk_20; + int iVar5 = data_027e09a0->func_ov000_020702a8(data_027e09a4->mUnk_00.mSceneIndex)->mUnk_20; s32 allocCount; if (data_027e09a4->mUnk_60 == 0) { @@ -124,7 +121,7 @@ THUMB void ActorManager::func_ov001_020bb018(UnkStruct_func_ov001_020bb018_param unk32 iVar5; if (func_01ffd3b0() != 0) { - iVar5 = data_027e09a4->mSceneIndex; + iVar5 = data_027e09a4->mUnk_00.mSceneIndex; if (iVar5 == SceneIndex_f_rabbit) { this->mUnk_34 = 0xFFFFECCD; // ~0x1332 @@ -154,8 +151,8 @@ THUMB void ActorManager::func_ov001_020bb018(UnkStruct_func_ov001_020bb018_param auStack_28.func_ov000_02059270(0x24, "drop4", 0x2D200000); auStack_28.func_ov000_02059270(0x25, "drop5", 0x2D200000); - CourseEntry *ptr = data_027e09a0->func_ov000_0207029c(iVar5); - if ((ptr->mUnk_1D - 1) == 1) { + CourseEntry *ptr = data_027e09a0->GetCourseEntry(iVar5); + if ((ptr->unk_1D - 1) == 1) { auStack_28.func_ov000_02059270(0x38, "mic_0", 0x35B00000); auStack_28.func_ov000_02059270(0x39, "mic_1", 0x35B00000); auStack_28.func_ov000_02059270(0x3A, "mic_on", 0x35B00000); @@ -199,7 +196,7 @@ THUMB void ActorManager::func_ov001_020bb018(UnkStruct_func_ov001_020bb018_param } } - if (data_027e09a4->UnkCheck(data_027e09a4->mSceneIndex)) { + if (data_027e09a4->UnkCheck(data_027e09a4->mUnk_00.mSceneIndex)) { func_ov071_0215e8d4(); } @@ -212,7 +209,7 @@ THUMB void ActorManager::func_ov001_020bb018(UnkStruct_func_ov001_020bb018_param THUMB void ActorManager::func_ov001_020bb414(ActorManager *instance) { func_ov001_020ba59c(&data_0204999c); - if (data_027e09a4->UnkCheck(data_027e09a4->mSceneIndex)) { + if (data_027e09a4->UnkCheck(data_027e09a4->mUnk_00.mSceneIndex)) { instance->func_ov001_020bb844(); } @@ -225,7 +222,7 @@ THUMB void ActorManager::func_ov001_020bb414(ActorManager *instance) { } THUMB void ActorManager::func_ov001_020bb488() { - if (data_027e09a4->mUnk_0C != 1) { + if (data_027e09a4->IsNotCutscene()) { switch (data_027e09a4->func_01ffd400()->mUnk_10) { case 0x00: case 0x01: @@ -244,7 +241,7 @@ THUMB void ActorManager::func_ov001_020bb488() { data_027e0cf4->func_ov021_020f8cdc(); } - if (data_027e09a4->UnkCheck(data_027e09a4->mSceneIndex)) { + if (data_027e09a4->UnkCheck(data_027e09a4->mUnk_00.mSceneIndex)) { data_027e0d70->func_ov071_0215e8f8(); } } @@ -264,7 +261,7 @@ THUMB void ActorManager::func_ov001_020bb548() { i++; } - unk32 value = data_027e09a4->mSceneIndex; + unk32 value = data_027e09a4->mUnk_00.mSceneIndex; if (data_027e09a4->UnkCheck(value)) { data_027e0d70->func_ov071_0215e9ac(); @@ -321,7 +318,7 @@ THUMB void ActorManager::func_ov001_020bb6b0(UnkStruct_SceneChange1 *param1) { for (int i = 0; i < ARRAY_LEN(data_ov000_020ab1ac); i++) { UnkStruct_ov000_020ab1ac *pEntry = &data_ov000_020ab1ac[i]; - if (pEntry->mUnk_00 == iVar5->mActorId && pEntry->mUnk_04 == param1->mNextSceneIndex && + if (pEntry->mUnk_00 == iVar5->mActorId && pEntry->mUnk_04 == param1->mSceneIndex && pEntry->mUnk_08 == param1->mRoomIndex) { (*piVar1)->mUnk_39 = 1; (*piVar1)->vfunc_08(); @@ -337,7 +334,7 @@ THUMB void ActorManager::func_ov001_020bb6b0(UnkStruct_SceneChange1 *param1) { THUMB bool ActorManager::func_ov001_020bb728(s32 param1) { UnkStruct_SceneChange1 *piVar1 = data_027e09a4->func_ov000_02070560(); - if (piVar1->mNextSceneIndex != SceneIndex_f_water || piVar1->mRoomIndex != 0) { + if (piVar1->mSceneIndex != SceneIndex_f_water || piVar1->mRoomIndex != 0) { return false; } @@ -402,11 +399,4 @@ THUMB void ActorManager::func_ov001_020bb844() { } } -THUMB void ActorManager::SetInstance(ActorManager *instance) { - gpActorManager = instance; -} - -THUMB int ActorManager::ClearInstance() { - gpActorManager = NULL; - //! @bug: the function expects a return value (though it seems unused) -} +DECL_INSTANCE(ActorManager, gpActorManager); diff --git a/src/001_SceneInit/CargoManager_001.cpp b/src/001_SceneInit/CargoManager_001.cpp index 8ebdd187..abcd18cf 100644 --- a/src/001_SceneInit/CargoManager_001.cpp +++ b/src/001_SceneInit/CargoManager_001.cpp @@ -12,7 +12,7 @@ CargoManager::CargoManager() { CargoManager::~CargoManager() {} void CargoManager::func_ov001_020bf830() { - if (this->mCargo.mAmount == 0 && data_027e09a4->func_01ffd3d8() == 0) { + if (this->mCargo.mAmount == 0 && !data_027e09a4->func_01ffd3d8()) { this->mCargo.mType = CargoType_None; } @@ -20,13 +20,6 @@ void CargoManager::func_ov001_020bf830() { this->mUnk_1C = 0; } -void CargoManager::SetInstance(CargoManager *pInstance) { - gpCargoManager = pInstance; -} - -bool CargoManager::ClearInstance() { - gpCargoManager = NULL; - //! @bug: missing return -} +DECL_INSTANCE(CargoManager, gpCargoManager); THUMB_END diff --git a/src/001_SceneInit/Game/AdventureModeManager_001.cpp b/src/001_SceneInit/Game/AdventureModeManager_001.cpp new file mode 100644 index 00000000..872119a5 --- /dev/null +++ b/src/001_SceneInit/Game/AdventureModeManager_001.cpp @@ -0,0 +1,366 @@ +#include "Game/Game.hpp" +#include "Game/GameModeAdventure.hpp" +#include "MainGame/AdventureMode.hpp" +#include "Save/SaveManager.hpp" +#include "System/OverlayManager.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_020d8698.hpp" +#include "Unknown/UnkStruct_027e0998.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_027e0cf8.hpp" +#include "Unknown/UnkStruct_ov000_020b4f70.hpp" +#include "Unknown/UnkStruct_ov024_020d8694.hpp" +#include "Unknown/UnkStruct_ov024_020d86a0.hpp" +#include "Unknown/UnkStruct_ov088_02177218.hpp" + +#include + +extern "C" { +void *func_ov024_020d1658(); +void *func_ov000_02066294(); +void *func_ov024_020ccd1c(); +void GX_SetGraphicsMode(unk32 param1, unk32 param2, unk32 param3); +void GXS_SetGraphicsMode(unk32 param1); +} + +extern int data_ov001_020c27a8; +extern int data_ov001_020c276c; + +THUMB_BEGIN + +AdventureModeManager *AdventureModeManager::Create(unk32 param1) { + return new(HeapIndex_1) AdventureModeManager(param1); +} + +AdventureModeManager::AdventureModeManager(unk32 param1) { + this->mUnk_154 = 0; + this->mUnk_158 = &this->mUnk_104; + this->mUnk_15C = new(HeapIndex_1) AdventureModeManager_15C(); + this->mUnk_160 = NULL; + this->mUnk_164 = NULL; + this->mUnk_168 = NULL; + this->mUnk_16C = NULL; + this->mUnk_174 = NULL; + this->mUnk_178 = NULL; + this->mUnk_17C = NULL; + this->mUnk_180 = NULL; + this->mUnk_184 = NULL; + this->mUnk_188 = NULL; + this->mUnk_18C = NULL; + this->mUnk_190 = NULL; + this->mUnk_194 = NULL; + this->mUnk_198 = NULL; + this->mUnk_19C = NULL; + this->mUnk_1A0 = NULL; + this->mUnk_1A4 = NULL; + this->mUnk_1A8 = NULL; + this->mUnk_1AC = new(HeapIndex_1) AdventureModeManager_1AC(); + this->mUnk_1B0 = NULL; + this->mUnk_1B4 = false; + this->mUnk_1B5 = false; + this->mUnk_1B8 = NULL; + this->mUnk_1BC = NULL; + this->mUnk_1C0 = 0; + this->mAllowMapPaint = false; + + UnkStruct_027e0998::Create(); + func_ov024_020d1658(); + + this->mUnk_170 = new(HeapIndex_1) AdventureModeManager_170(&this->mUnk_104); + + GX_SetGraphicsMode(1, 0, 1); + GXS_SetGraphicsMode(5); + + this->mUnk_1C4.sceneIndex = SceneIndex_None; + this->mUnk_1C4.unk_04 = 0; + this->mUnk_1C4.unk_06 = -1; +} + +void AdventureModeManager::vfunc_10(unk32 param1, unk32 param2, unk32 param3) { + data_027e0998->func_ov000_02061760(); +} + +void AdventureModeManager::func_ov001_020c00d4() { + GetAdventureModeManager()->mUnk_16C = new(HeapIndex_1) AdventureModeManager_16C(&GetAdventureModeManager()->mUnk_104); +} + +void AdventureModeManager::func_ov001_020c0104() { + GetAdventureModeManager()->mUnk_1B8 = new(HeapIndex_1) AdventureModeManager_1B8(2, 1, 1); + GetAdventureModeManager()->mUnk_1B8->mUnk_08 = 1; + GetAdventureModeManager()->mUnk_164 = + new(HeapIndex_1) AdventureModeManager_164(&GetAdventureModeManager()->mUnk_104, &GetAdventureModeManager()->mUnk_004); + GetAdventureModeManager()->mUnk_19C = new(HeapIndex_1) AdventureModeManager_19C(&GetAdventureModeManager()->mUnk_104); + + if (DSProt_DetectNotDummy(NULL) != 0) { + DSProt_DetectNotFlashcart(AdventureModeManager::func_ov001_020c00d4); + } +} + +void AdventureModeManager::func_ov001_020c0194() { + GetAdventureModeManager()->mUnk_1B8 = new(HeapIndex_1) AdventureModeManager_1B8(2, 1, 1); + GetAdventureModeManager()->mUnk_1B8->mUnk_08 = 1; + GetAdventureModeManager()->mUnk_164 = + new(HeapIndex_1) AdventureModeManager_164(&GetAdventureModeManager()->mUnk_104, &GetAdventureModeManager()->mUnk_004); + GetAdventureModeManager()->mUnk_19C = new(HeapIndex_1) AdventureModeManager_19C(&GetAdventureModeManager()->mUnk_104); +} + +void AdventureModeManager::vfunc_14() { + data_027e09a4->func_ov000_0207056c(); + UnkStruct_027e0cf8::Create(); + + if (data_027e09a4->func_01ffd3d8()) { + this->mUnk_004.func_ov001_020bd734(&data_ov001_020c276c); + + if (data_027e09a4->IsNotCutscene()) { + if (data_027e09a4->IsDarkRealm()) { + this->mUnk_004.func_0201c00c(6, 1); + } else { + this->mUnk_004.func_0201c00c(4, 1); + } + } + } else { + this->mUnk_004.func_ov001_020bd734(&data_ov001_020c27a8); + if (data_027e09a4->IsNotCutscene()) { + this->mUnk_004.func_0201c00c(0, 1); + } + } + + if (data_027e09a4->func_01ffd3d8()) { + if (DSProt_DetectEmulator(AdventureModeManager::func_ov001_020c0194) == 0) { + AdventureModeManager::func_ov001_020c0104(); + } + } else { + if (gOverlayManager.mLoadedOverlays[OverlaySlot_9] == OverlayIndex_PlayerSub) { + this->mUnk_1BC = new(HeapIndex_1) AdventureModeManager_1BC(); + } + + this->mUnk_1B8 = new(HeapIndex_1) AdventureModeManager_1B8(2, 1, 0); + + if (data_027e09a4->IsNotCutscene()) { + this->mUnk_168 = new(HeapIndex_1) AdventureModeManager_168(&this->mUnk_104); + } + + this->mUnk_188 = new(HeapIndex_1) AdventureModeManager_188(&this->mUnk_104); + + if (gOverlayManager.mLoadedOverlays[OverlaySlot_6] == OverlayIndex_Land) { + this->mUnk_194 = new(HeapIndex_1) AdventureModeManager_194(&this->mUnk_104); + } + + if (gOverlayManager.mLoadedOverlays[OverlaySlot_7] == OverlayIndex_Field) { + this->mUnk_198 = new(HeapIndex_1) AdventureModeManager_198(&this->mUnk_104); + } + + if (gOverlayManager.mLoadedOverlays[OverlaySlot_8] == OverlayIndex_Village) { + this->mUnk_17C = new(HeapIndex_1) AdventureModeManager_17C(&this->mUnk_104); + this->mUnk_1A0 = new(HeapIndex_1) AdventureModeManager_1A0(&this->mUnk_104); + this->mUnk_1A4 = new(HeapIndex_1) AdventureModeManager_1A4(&this->mUnk_104); + } + + if (data_027e09a4->IsCutscene()) { + this->mUnk_1A8 = new(HeapIndex_1) AdventureModeManager_1A8(&this->mUnk_104); + } + + AdventureModeManager_1B0 *var_r5 = new(HeapIndex_1) AdventureModeManager_1B0(); + this->mUnk_1B0 = var_r5; + + if (data_027e09a4->IsNotCutscene()) { + //! TODO: fake match? + GameModeLinkListNode *pList = (GameModeLinkListNode *) &this->mUnk_104; + ((GameModeLinkListNode *) ((u8 *) pList + 4))->func_020166cc(var_r5->GetNode()); + + var_r5->vfunc_18(); + this->mUnk_1B5 = true; + } + + if (data_027e09a4->IsCutscene()) { + this->mUnk_104.func_ov088_0217230c(); + } + + func_ov000_02066294(); + } + + func_ov024_020ccd1c(); + + if (data_027e09a4->IsNotCutscene()) { + GameModeManagerBase_104 *ptr = &this->mUnk_104; + GameModeLinkListNode *origin = data_ov024_020d8698->GetOrigin(); + ptr->mList.func_020166cc(data_ov024_020d8698->GetNode()); + ((UnkStruct_020d8698 *) origin)->vfunc_18(); + this->mUnk_1B4 = true; + } + + this->mUnk_160 = new(HeapIndex_1) AdventureModeManager_160(&this->mUnk_104, this->mUnk_1B8); + this->mUnk_184 = new(HeapIndex_1) AdventureModeManager_184(&this->mUnk_104); + this->mUnk_174 = new(HeapIndex_1) AdventureModeManager_174(&this->mUnk_104); + this->mUnk_178 = new(HeapIndex_1) AdventureModeManager_178(&this->mUnk_104); + this->mUnk_180 = new(HeapIndex_1) AdventureModeManager_180(&this->mUnk_104); + this->mUnk_18C = new(HeapIndex_1) AdventureModeManager_18C(&this->mUnk_104); + this->mUnk_190 = new(HeapIndex_1) AdventureModeManager_190(&this->mUnk_104); + + UnkStruct_ov024_020d8694::Create(&this->mUnk_004); + data_ov024_020d86a0->func_ov001_020bd818(); +} + +void AdventureModeManager::vfunc_18() { + delete this->mUnk_1B8; + this->mUnk_1B8 = NULL; + + delete this->mUnk_160; + this->mUnk_160 = NULL; + + delete this->mUnk_190; + this->mUnk_190 = NULL; + + delete this->mUnk_18C; + this->mUnk_18C = NULL; + + delete this->mUnk_180; + this->mUnk_180 = NULL; + + delete this->mUnk_17C; + this->mUnk_17C = NULL; + + delete this->mUnk_178; + this->mUnk_178 = NULL; + + delete this->mUnk_174; + this->mUnk_174 = NULL; + + delete this->mUnk_184; + this->mUnk_184 = NULL; + + AdventureModeManager::func_ov001_020c083c(); + if (data_ov024_020d8698 != NULL) { + AdventureModeManager::func_ov001_020c0894(); + this->mUnk_1B4 = false; + } + + if (data_027e09a4->func_01ffd3d8()) { + delete this->mUnk_16C; + this->mUnk_16C = NULL; + + delete this->mUnk_19C; + this->mUnk_19C = NULL; + + delete this->mUnk_164; + this->mUnk_164 = NULL; + } else { + if (data_027e09a4->IsCutscene()) { + AdventureModeManager::func_ov001_020c0824(); + } + + delete this->mUnk_1B0; + this->mUnk_1B0 = NULL; + this->mUnk_1B5 = false; + + if (this->mUnk_168 != NULL) { + delete this->mUnk_168; + this->mUnk_168 = NULL; + } + + delete this->mUnk_188; + this->mUnk_188 = NULL; + + AdventureModeManager::func_ov001_020c0854(); + + delete this->mUnk_1BC; + this->mUnk_1BC = NULL; + + delete this->mUnk_198; + this->mUnk_198 = NULL; + + delete this->mUnk_194; + this->mUnk_194 = NULL; + + if (gOverlayManager.mLoadedOverlays[8] == OverlayIndex_Village) { + delete this->mUnk_1A0; + this->mUnk_1A0 = NULL; + + delete this->mUnk_1A4; + this->mUnk_1A4 = NULL; + } + + if (data_027e09a4->IsCutscene()) { + delete this->mUnk_1A8; + this->mUnk_1A8 = NULL; + } + } + + AdventureModeManager::func_ov001_020c0874(); + this->mUnk_004.func_ov001_020bd784(); +} + +void AdventureModeManager::vfunc_1C() { + if (this->mUnk_1BC != NULL) { + this->mUnk_1BC->func_ov093_02175514(); + } + + data_ov024_020d8698->func_ov024_020cd094(); + data_ov024_020d8698->func_ov024_020cd150(); + + if (!data_027e09a4->func_01ffd3d8()) { + this->mUnk_1B0->func_ov031_0210fad0(); + } +} + +void AdventureModeManager::vfunc_20() { + if (data_ov000_020b4f70 != NULL) { + data_ov000_020b4f70->func_ov000_020662e8(); + } + + this->func_ov024_020c699c(); + data_ov024_020d8694->func_ov024_020cb0c4(); +} + +void AdventureModeManager::func_ov001_020c0824() { + if (data_ov088_02177218 != NULL) { + delete data_ov088_02177218; + } +} + +void AdventureModeManager::func_ov001_020c083c() { + if (data_ov024_020d8694 != NULL) { + delete data_ov024_020d8694; + } +} + +void AdventureModeManager::func_ov001_020c0854() { + if (data_ov000_020b4f70 != NULL) { + delete data_ov000_020b4f70; + } +} + +void AdventureModeManager::func_ov001_020c0874() { + if (data_027e0cf8 != NULL) { + delete data_027e0cf8; + } +} + +void AdventureModeManager::func_ov001_020c0894() { + if (data_ov024_020d8698 != NULL) { + delete data_ov024_020d8698; + } +} + +UnkStruct_ov000_020b4f70::~UnkStruct_ov000_020b4f70() { + data_ov000_020b4f70 = NULL; +} + +AdventureModeManager_15C::AdventureModeManager_15C() : + mUnk_00(0), + mUnk_20(&this->mUnk_04) { + this->mUnk_44 = 0; + this->mUnk_45 = 0; + this->mUnk_46 = 0; + this->mUnk_47 = 0; + + unk32 value = data_0204999c.func_02013014(); + this->mUnk_20.mUnk_00 = new(HeapIndex_1) AdventureModeManager_15C_20_00(0); + data_0204999c.func_020130d4(value); +} + +AdventureModeManager_15C::~AdventureModeManager_15C() { + delete this->mUnk_20.mUnk_00; +} + +THUMB_END diff --git a/src/001_SceneInit/Game/GameModeAdventure_001.cpp b/src/001_SceneInit/Game/GameModeAdventure_001.cpp new file mode 100644 index 00000000..8005cb22 --- /dev/null +++ b/src/001_SceneInit/Game/GameModeAdventure_001.cpp @@ -0,0 +1,26 @@ +#include "Game/Game.hpp" +#include "Game/GameModeAdventure.hpp" +#include "MainGame/AdventureMode.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" + +extern "C" { +void *func_ov001_020b6520(unk32 param1); +void func_ov020_020c4ac0(void *); +void func_0201659c(); +} + +extern int data_ov001_020c27a8; +extern int data_ov001_020c276c; + +THUMB_BEGIN + +GameModeAdventure::GameModeAdventure() { + func_0201659c(); + gGame.func_02013370(2); + data_0204a110.func_ov001_020bd514(0, AdventureModeManager::Create, 0, 1); + gSaveManager.func_ov001_020ba670(); + gSaveManager.func_ov001_020ba7a8(); + func_ov020_020c4ac0(func_ov001_020b6520(0)); +} + +THUMB_END diff --git a/src/001_SceneInit/Item/ItemManager_001.cpp b/src/001_SceneInit/Item/ItemManager_001.cpp index 2247cde3..990569d7 100644 --- a/src/001_SceneInit/Item/ItemManager_001.cpp +++ b/src/001_SceneInit/Item/ItemManager_001.cpp @@ -5,11 +5,11 @@ #include "Unknown/UnkStruct_027e09a4.hpp" THUMB void ItemManager::func_ov001_020bb9f8() { - if (data_027e09a4->mUnk_0C != 1 && gOverlayManager.mLoadedOverlays[OverlaySlot_10] != OverlayIndex_PlayerPhantom) { + if (data_027e09a4->IsNotCutscene() && gOverlayManager.mLoadedOverlays[OverlaySlot_10] != OverlayIndex_PlayerPhantom) { this->mTearsAmount = 0; } - CourseEntry *pEntry = data_027e09a0->func_ov000_0207029c(data_027e09a4->mSceneIndex); + CourseEntry *pEntry = data_027e09a0->GetCourseEntry(data_027e09a4->mUnk_00.mSceneIndex); if (pEntry->mSaveCourseIndex < SaveCourseIndex_Max) { this->mKeyAmount = gSaveManager.mUnk_000->mUnk_36[pEntry->mSaveCourseIndex].mKeyAmount; diff --git a/src/001_SceneInit/PassengerManager_001.cpp b/src/001_SceneInit/PassengerManager_001.cpp index df6c1c85..77f82ca3 100644 --- a/src/001_SceneInit/PassengerManager_001.cpp +++ b/src/001_SceneInit/PassengerManager_001.cpp @@ -26,7 +26,7 @@ inline bool Test3(s32 val) { bool ret = true; if (!Test2(val)) { - if (*((volatile unk32 *) &data_027e09a4->mSceneIndex) != 36) { + if (*((volatile unk32 *) &data_027e09a4->mUnk_00.mSceneIndex) != 36) { ret = false; } } @@ -36,11 +36,11 @@ inline bool Test3(s32 val) { // https://decomp.me/scratch/svwnb bool PassengerManager::func_ov001_020bf870() { - s32 sceneIndex = data_027e09a4->mSceneIndex; + s32 sceneIndex = data_027e09a4->mUnk_00.mSceneIndex; bool ret = true; if (!Test3(sceneIndex)) { - if (*((volatile unk32 *) &data_027e09a4->mSceneIndex) != 37) { + if (*((volatile unk32 *) &data_027e09a4->mUnk_00.mSceneIndex) != 37) { ret = false; } } @@ -78,13 +78,6 @@ bool PassengerManager::func_ov001_020bfa1c() { return !((date2 << 0x1B) & 1); } -void PassengerManager::SetInstance(PassengerManager *pInstance) { - gpPassengerManager = pInstance; -} - -bool PassengerManager::ClearInstance() { - gpPassengerManager = NULL; - //! @bug missing return -} +DECL_INSTANCE(PassengerManager, gpPassengerManager); THUMB_END diff --git a/src/017_CourseExec/CargoManager_017.cpp b/src/017_CourseExec/CargoManager_017.cpp index c759fb4f..f29ee4b5 100644 --- a/src/017_CourseExec/CargoManager_017.cpp +++ b/src/017_CourseExec/CargoManager_017.cpp @@ -172,7 +172,7 @@ void CargoManager::RemoveAmount(unk32 decr) { } bool CargoManager::func_ov017_020bec9c() { - if (data_027e09a4->func_01ffd3d8() != 0) { + if (data_027e09a4->func_01ffd3d8()) { return data_027e0cd8->mUnk_0C->mUnk_160->func_ov026_02106aa8(); } diff --git a/src/018_StartUp/GameModeStartUp.cpp b/src/018_StartUp/GameModeStartUp.cpp index a3581e4d..98cc5347 100644 --- a/src/018_StartUp/GameModeStartUp.cpp +++ b/src/018_StartUp/GameModeStartUp.cpp @@ -96,9 +96,9 @@ ARM void UnkStruct_02011e10::func_ov018_020c4980() { this->mUnk_00[HeapIndex_Main] = func_020012e0(arenaLo, arenaHi - arenaLo, 2); unk32 length = func_0202d624(NULL, 0); - void *ptr = ::operator new(length, 0); + void *ptr = ::operator new(length, 0, 4); func_0202d624(ptr, length); - ptr = ::operator new(0xBE000, 0); + ptr = ::operator new(0xBE000, 0, 4); void *uVar3 = func_02001fd4(ptr, 0xBE000); this->mUnk_24[0] = (unk32) uVar3; diff --git a/src/019_MainSelect/019_UnkSubStruct9.cpp b/src/019_MainSelect/019_UnkSubStruct9.cpp index d45b038b..36e1365b 100644 --- a/src/019_MainSelect/019_UnkSubStruct9.cpp +++ b/src/019_MainSelect/019_UnkSubStruct9.cpp @@ -44,7 +44,7 @@ ARM UnkSubStruct9::UnkSubStruct9(stack_struct1 param1) : } stack = &this->mUnk_004; - func_020166cc(&this->mUnk_004.mUnk_04, &stack, param1.param1); + func_020166cc(&this->mUnk_004, &stack, param1.param1); this->mUnk_004.mUnk_2C = 1; } diff --git a/src/019_MainSelect/FileSelectMain.cpp b/src/019_MainSelect/FileSelectMain.cpp index 101e0861..b5684462 100644 --- a/src/019_MainSelect/FileSelectMain.cpp +++ b/src/019_MainSelect/FileSelectMain.cpp @@ -30,15 +30,15 @@ public: UnkStruct_ov019_020d24c0 data_ov019_020d24c0(-0x100, 0, 0x100, 0); -UnkStruct_ov019_020d1e4c UnkStruct_ov019_020d1e70::data_ov019_020d1e4c = { - 0x14, 0x14, 0x14, 0x04, 0x03, -0x47, 0x00, 0x0281, -0x47, {0x00, 0x00}, 0x0281, -}; +static const UnkStruct_ov019_020d1e70 data_ov019_020d1e70; UnkStruct_ov019_020d1e94 UnkStruct_ov019_020d1e70::data_ov019_020d1e94 = { 0x00, 0x00, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, }; -static const UnkStruct_ov019_020d1e70 data_ov019_020d1e70; +UnkStruct_ov019_020d1e4c UnkStruct_ov019_020d1e70::data_ov019_020d1e4c = { + 0x14, 0x14, 0x14, 0x04, 0x03, -0x47, 0x00, 0x0281, -0x47, {0x00, 0x00}, 0x0281, +}; static PTMF data_ov019_020d1f94[FileSelectState_Max] = { FileSelectMain::func_ov019_020c8290, // FileSelectState_Unk_00 @@ -66,32 +66,6 @@ static PTMF data_ov019_020d1f94[FileSelectState_Max] = { FileSelectMain::func_ov019_020c80f4, // FileSelectState_OptionsFromChooseMode }; -static PTMF data_ov019_020d1edc[FileSelectState_Max] = { - FileSelectMain::func_ov019_020c6d0c, // FileSelectState_Unk_00 - FileSelectMain::func_ov019_020c6d48, // FileSelectState_Init - FileSelectMain::func_ov019_020c6e14, // FileSelectState_SlotSelectIdle - FileSelectMain::func_ov019_020c717c, // FileSelectState_SlotSelectToFileManager - FileSelectMain::func_ov019_020c71f0, // FileSelectState_FileManagerFromSlotSelect - FileSelectMain::func_ov019_020c7210, // FileSelectState_FileManagerToSlotSelect - FileSelectMain::func_ov019_020c71d0, // FileSelectState_SlotSelectFromFileManager - FileSelectMain::func_ov019_020c7274, // FileSelectState_FileManagerIdle - FileSelectMain::func_ov019_020c7768, // FileSelectState_FileManagerToChooseMode - FileSelectMain::func_ov019_020c77b8, // FileSelectState_ChooseModeFromFileManager - FileSelectMain::func_ov019_020c7804, // FileSelectState_ChooseModeToFileManager - FileSelectMain::func_ov019_020c7858, // FileSelectState_FileManagerFromChooseMode - FileSelectMain::func_ov019_020c7878, // FileSelectState_ChooseModeIdle - FileSelectMain::func_ov019_020c78ac, // FileSelectState_ChooseModeToEnterGameMode - FileSelectMain::func_ov019_020c7910, // FileSelectState_EnterGameMode - FileSelectMain::func_ov019_020c7c3c, // FileSelectState_SlotSelectToNewFile - FileSelectMain::func_ov019_020c7c48, // FileSelectState_NewFileToSlotSelect - FileSelectMain::func_ov019_020c7c70, // FileSelectState_FileManagerToCopyErase - FileSelectMain::func_ov019_020c7d3c, // FileSelectState_CopyEraseFromFileManager - FileSelectMain::func_ov019_020c80dc, // FileSelectState_ChooseModeToContactMode - FileSelectMain::func_ov019_020c80e8, // FileSelectState_OptionsToChooseMode - FileSelectMain::func_ov019_020c6d08, // FileSelectState_NewFileFromSlotSelect - FileSelectMain::func_ov019_020c6d08, // FileSelectState_OptionsFromChooseMode -}; - static PTMF data_ov019_020d204c[FileSelectState_Max] = { FileSelectMain::func_ov019_020cb26c, // FileSelectState_Unk_00 FileSelectMain::func_ov019_020cb4bc, // FileSelectState_Init @@ -118,6 +92,32 @@ static PTMF data_ov019_020d204c[FileSelectState_Max] = { FileSelectMain::func_ov019_020cb268, // FileSelectState_OptionsFromChooseMode }; +static PTMF data_ov019_020d1edc[FileSelectState_Max] = { + FileSelectMain::func_ov019_020c6d0c, // FileSelectState_Unk_00 + FileSelectMain::func_ov019_020c6d48, // FileSelectState_Init + FileSelectMain::func_ov019_020c6e14, // FileSelectState_SlotSelectIdle + FileSelectMain::func_ov019_020c717c, // FileSelectState_SlotSelectToFileManager + FileSelectMain::func_ov019_020c71f0, // FileSelectState_FileManagerFromSlotSelect + FileSelectMain::func_ov019_020c7210, // FileSelectState_FileManagerToSlotSelect + FileSelectMain::func_ov019_020c71d0, // FileSelectState_SlotSelectFromFileManager + FileSelectMain::func_ov019_020c7274, // FileSelectState_FileManagerIdle + FileSelectMain::func_ov019_020c7768, // FileSelectState_FileManagerToChooseMode + FileSelectMain::func_ov019_020c77b8, // FileSelectState_ChooseModeFromFileManager + FileSelectMain::func_ov019_020c7804, // FileSelectState_ChooseModeToFileManager + FileSelectMain::func_ov019_020c7858, // FileSelectState_FileManagerFromChooseMode + FileSelectMain::func_ov019_020c7878, // FileSelectState_ChooseModeIdle + FileSelectMain::func_ov019_020c78ac, // FileSelectState_ChooseModeToEnterGameMode + FileSelectMain::func_ov019_020c7910, // FileSelectState_EnterGameMode + FileSelectMain::func_ov019_020c7c3c, // FileSelectState_SlotSelectToNewFile + FileSelectMain::func_ov019_020c7c48, // FileSelectState_NewFileToSlotSelect + FileSelectMain::func_ov019_020c7c70, // FileSelectState_FileManagerToCopyErase + FileSelectMain::func_ov019_020c7d3c, // FileSelectState_CopyEraseFromFileManager + FileSelectMain::func_ov019_020c80dc, // FileSelectState_ChooseModeToContactMode + FileSelectMain::func_ov019_020c80e8, // FileSelectState_OptionsToChooseMode + FileSelectMain::func_ov019_020c6d08, // FileSelectState_NewFileFromSlotSelect + FileSelectMain::func_ov019_020c6d08, // FileSelectState_OptionsFromChooseMode +}; + const unk32 data_ov019_020d1bbc[] = {0x00000000, 0x00000000, 0x00000000, 0x00000001}; //! TODO: move to class @@ -156,7 +156,7 @@ ARM FileSelectMain::FileSelectMain() : params.param1 = &this->mUnk_0C; this->mUnk_03E0.Init(¶ms); - this->mUnk_0C.mList.func_020166cc(&this->mUnk_0100.mUnk_04); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_0100); this->mUnk_0100.mUnk_2A = 0; this->mUnk_0488.mUnk_2C = 1; this->mUnk_07E4.mUnk_2C = 1; @@ -188,7 +188,7 @@ ARM FileSelectMain::FileSelectMain() : REG_DISPCNT &= 0xFFFFE0FF; REG_DISPCNT |= 0x00001C00; _G2_SetBlend(®_BLDCNT, 4, 8, 0, 0x10); - this->mUnk_0C.mList.func_020166cc(&this->mUnk_005C.mUnk_04); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_005C); this->func_ov019_020c63dc(); this->func_ov019_020c6d10(); } @@ -200,31 +200,31 @@ ARM FileSelectMain::~FileSelectMain() { ARM void FileSelectMain::func_ov019_020c6c14() {} ARM void FileSelectMain::func_ov019_020c6c18() { - this->mUnk_0C.mList.func_020166cc(&this->mUnk_0488.mUnk_04); - this->mUnk_0C.mList.func_020166cc(&this->mUnk_07E4.mUnk_04); - this->mUnk_0C.mList.func_020166cc(&this->mUnk_0AC4.mUnk_04); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_0488); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_07E4); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_0AC4); } ARM void FileSelectMain::func_ov019_020c6c54() { - this->mUnk_0C.mList.func_020166cc(&this->mUnk_0DA4.mUnk_04); - this->mUnk_0C.mList.func_020166cc(&this->mUnk_11BC.mUnk_04); - this->mUnk_0C.mList.func_020166cc(&this->mUnk_15D4.mUnk_04); - this->mUnk_0C.mList.func_020166cc(&this->mUnk_18EC.mUnk_04); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_0DA4); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_11BC); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_15D4); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_18EC); } ARM void FileSelectMain::func_ov019_020c6c9c() {} ARM void FileSelectMain::func_ov019_020c6ca0() { - GameModeLinkListNode::func_020166ac(&this->mUnk_0488.mUnk_04); - GameModeLinkListNode::func_020166ac(&this->mUnk_07E4.mUnk_04); - GameModeLinkListNode::func_020166ac(&this->mUnk_0AC4.mUnk_04); + GameModeLinkListNode::func_020166ac(&this->mUnk_0488); + GameModeLinkListNode::func_020166ac(&this->mUnk_07E4); + GameModeLinkListNode::func_020166ac(&this->mUnk_0AC4); } ARM void FileSelectMain::func_ov019_020c6cd0() { - GameModeLinkListNode::func_020166ac(&this->mUnk_0DA4.mUnk_04); - GameModeLinkListNode::func_020166ac(&this->mUnk_11BC.mUnk_04); - GameModeLinkListNode::func_020166ac(&this->mUnk_15D4.mUnk_04); - GameModeLinkListNode::func_020166ac(&this->mUnk_18EC.mUnk_04); + GameModeLinkListNode::func_020166ac(&this->mUnk_0DA4); + GameModeLinkListNode::func_020166ac(&this->mUnk_11BC); + GameModeLinkListNode::func_020166ac(&this->mUnk_15D4); + GameModeLinkListNode::func_020166ac(&this->mUnk_18EC); } ARM void FileSelectMain::func_ov019_020c6d08() {} @@ -981,10 +981,10 @@ ARM void FileSelectMain::func_ov019_020c7dc8() { Vec2us sp10_sp12[2]; // sp4 sp6 sp10 sp12 if (this->mState == FileSelectState_ChooseModeToContactMode) { - UnkSystem2_UnkSubSystem1_Derived2 *pUVar5 = this->mUnk_03E8[this->mSaveSlotIndex].mUnk_04; - sp10_sp12[0].x = pUVar5->mPos.x + data_ov019_020d1e70.mUnk_20.x; - sp10_sp12[0].y = pUVar5->mPos.y + data_ov019_020d1e70.mUnk_20.y; - sp10_sp12[1] = sp10_sp12[0]; + UnkSystem2_UnkSubSystem1_Base *pUVar5 = this->mUnk_03E8[this->mSaveSlotIndex].mUnk_04; + sp10_sp12[0].x = pUVar5->mPos.x + data_ov019_020d1e70.mUnk_20.x; + sp10_sp12[0].y = pUVar5->mPos.y + data_ov019_020d1e70.mUnk_20.y; + sp10_sp12[1] = sp10_sp12[0]; var_r1 = UnkStruct_ov019_020d1e70::data_ov019_020d1e4c.mUnk_14; var_r2 = UnkStruct_ov019_020d1e70::data_ov019_020d1e4c.mUnk_18; @@ -1126,7 +1126,7 @@ ARM void FileSelectMain::vfunc_08(Input *pButtons, TouchControl *pTouchControl) } CALL_PTMF(PTMF, data_ov019_020d1f94[this->mState]); - this->mUnk_002C.UnkOperations3(); + this->mUnk_002C.UpdateLogic(); REG_BLDALPHA = this->mUnk_002C.func_0201eaa0() | 0x1000; } @@ -1138,7 +1138,7 @@ ARM void FileSelectMain::func_ov019_020c8290() { // non-matching ARM void FileSelectMain::func_ov019_020c82c4() { - this->mUnk_039C.UnkOperations(&this->mUnk_0100.mPos, true); + this->mUnk_039C.Update(&this->mUnk_0100.mPos); if (!this->func_ov019_020cb238() && this->mUnk_039C.mUnk_0C) { this->SetState(FileSelectState_SlotSelectIdle); @@ -1180,10 +1180,10 @@ ARM void FileSelectMain::func_ov019_020c854c() { this->GetUnk03E0(i).mUnk_004.mUnk_2A = false; } - this->mUnk_075C.UnkOperations2(&this->mUnk_0488.mPos, true); - this->mUnk_0A80.UnkOperations2(&this->mUnk_07E4.mPos, true); - this->mUnk_0D60.UnkOperations2(&this->mUnk_0AC4.mPos, true); - this->mUnk_00BC.UnkOperations2(&this->mUnk_005C.mPos, true); + this->mUnk_075C.Update(&this->mUnk_0488.mPos); + this->mUnk_0A80.Update(&this->mUnk_07E4.mPos); + this->mUnk_0D60.Update(&this->mUnk_0AC4.mPos); + this->mUnk_00BC.Update(&this->mUnk_005C.mPos); } ARM void FileSelectMain::func_ov019_020c8aac() { @@ -1250,11 +1250,11 @@ ARM void FileSelectMain::func_ov019_020c8c4c() { this->GetUnk03E0(i).mUnk_004.mUnk_2A = false; } - this->mUnk_039C.UnkOperations2(&this->mUnk_0100.mPos, true); - this->mUnk_07A0.UnkOperations2(&this->mUnk_0488.mPos, true); - this->mUnk_0A80.UnkOperations2(&this->mUnk_07E4.mPos, true); - this->mUnk_0D60.UnkOperations2(&this->mUnk_0AC4.mPos, true); - this->mUnk_00BC.UnkOperations2(&this->mUnk_005C.mPos, true); + this->mUnk_039C.Update(&this->mUnk_0100.mPos); + this->mUnk_07A0.Update(&this->mUnk_0488.mPos); + this->mUnk_0A80.Update(&this->mUnk_07E4.mPos); + this->mUnk_0D60.Update(&this->mUnk_0AC4.mPos); + this->mUnk_00BC.Update(&this->mUnk_005C.mPos); } ARM void FileSelectMain::func_ov019_020c92dc() { @@ -1262,9 +1262,9 @@ ARM void FileSelectMain::func_ov019_020c92dc() { this->GetUnk03E0(i).mUnk_004.mUnk_2A = false; } - this->mUnk_00BC.UnkOperations2(&this->mUnk_005C.mPos, true); + this->mUnk_00BC.Update(&this->mUnk_005C.mPos); - this->mUnk_1078.UnkOperations2(&this->mUnk_0DA4.mPos, true); + this->mUnk_1078.Update(&this->mUnk_0DA4.mPos); UnkStruct_ov019_020d24c8_28_258 local_30(0x8B, 0x06); Vec2s local_5c; Vec2s local_58; @@ -1273,7 +1273,7 @@ ARM void FileSelectMain::func_ov019_020c92dc() { this->mUnk_1144.mUnk_5C.x = local_58.x + local_30.mPos.x - local_5c.x; this->mUnk_1144.mUnk_5C.y = local_58.y + local_30.mPos.y - local_5c.y; - this->mUnk_1490.UnkOperations2(&this->mUnk_11BC.mPos, true); + this->mUnk_1490.Update(&this->mUnk_11BC.mPos); UnkStruct_ov019_020d24c8_28_258 local_48(0x8B, 0x06); Vec2s local_60; Vec2s local_64; @@ -1282,8 +1282,8 @@ ARM void FileSelectMain::func_ov019_020c92dc() { this->mUnk_1144.mUnk_5C.x = local_64.x + local_48.mPos.x - local_60.x; this->mUnk_1144.mUnk_5C.y = local_64.y + local_48.mPos.y - local_60.y; - this->mUnk_18A8.UnkOperations2(&this->mUnk_15D4.mPos, true); - this->mUnk_1BC0.UnkOperations2(&this->mUnk_18EC.mPos, true); + this->mUnk_18A8.Update(&this->mUnk_15D4.mPos); + this->mUnk_1BC0.Update(&this->mUnk_18EC.mPos); this->mUnk_1144.func_ov000_020609c4(); this->mUnk_155C.func_ov000_020609c4(); @@ -1378,9 +1378,9 @@ ARM void FileSelectMain::func_ov019_020c9d88() { } ARM void FileSelectMain::func_ov019_020c9e08() { - this->mUnk_00BC.UnkOperations2(&this->mUnk_005C.mPos, true); + this->mUnk_00BC.Update(&this->mUnk_005C.mPos); - this->mUnk_1100.UnkOperations2(&this->mUnk_0DA4.mPos, true); + this->mUnk_1100.Update(&this->mUnk_0DA4.mPos); UnkStruct_ov019_020d24c8_28_258 local_30(0x8B, 0x06); Vec2s local_5c; Vec2s local_58; @@ -1389,7 +1389,7 @@ ARM void FileSelectMain::func_ov019_020c9e08() { this->mUnk_1144.mUnk_5C.x = local_58.x + local_30.mPos.x - local_5c.x; this->mUnk_1144.mUnk_5C.y = local_58.y + local_30.mPos.y - local_5c.y; - this->mUnk_1518.UnkOperations2(&this->mUnk_11BC.mPos, true); + this->mUnk_1518.Update(&this->mUnk_11BC.mPos); UnkStruct_ov019_020d24c8_28_258 local_48(0x8B, 0x05); Vec2s local_6c; Vec2s local_68; @@ -1398,8 +1398,8 @@ ARM void FileSelectMain::func_ov019_020c9e08() { this->mUnk_155C.mUnk_5C.x = local_68.x + local_48.mPos.x - local_6c.x; this->mUnk_155C.mUnk_5C.y = local_68.y + local_48.mPos.y - local_6c.y; - this->mUnk_18A8.UnkOperations2(&this->mUnk_15D4.mPos, true); - this->mUnk_1BC0.UnkOperations2(&this->mUnk_18EC.mPos, true); + this->mUnk_18A8.Update(&this->mUnk_15D4.mPos); + this->mUnk_1BC0.Update(&this->mUnk_18EC.mPos); this->mUnk_1144.func_ov000_020609c4(); this->mUnk_155C.func_ov000_020609c4(); @@ -1414,7 +1414,7 @@ ARM void FileSelectMain::func_ov019_020c9e08() { } ARM void FileSelectMain::func_ov019_020ca6a4() { - this->mUnk_039C.UnkOperations(&this->mUnk_0100.mPos, true); + this->mUnk_039C.Update(&this->mUnk_0100.mPos); } ARM void FileSelectMain::func_ov019_020ca80c() { @@ -1465,9 +1465,9 @@ ARM void FileSelectMain::func_ov019_020ca940() { this->GetUnk03E0(i).mUnk_004.mUnk_2A = false; } - this->mUnk_00BC.UnkOperations2(&this->mUnk_005C.mPos, true); + this->mUnk_00BC.Update(&this->mUnk_005C.mPos); - this->mUnk_1100.UnkOperations2(&this->mUnk_0DA4.mPos, true); + this->mUnk_1100.Update(&this->mUnk_0DA4.mPos); UnkStruct_ov019_020d24c8_28_258 local_30(0x8B, 0x06); Vec2s local_5c; Vec2s local_58; @@ -1476,7 +1476,7 @@ ARM void FileSelectMain::func_ov019_020ca940() { this->mUnk_1144.mUnk_5C.x = local_58.x + local_30.mPos.x - local_5c.x; this->mUnk_1144.mUnk_5C.y = local_58.y + local_30.mPos.y - local_5c.y; - this->mUnk_1518.UnkOperations2(&this->mUnk_11BC.mPos, true); + this->mUnk_1518.Update(&this->mUnk_11BC.mPos); UnkStruct_ov019_020d24c8_28_258 local_48(0x8B, 0x05); Vec2s local_6c; Vec2s local_68; @@ -1485,8 +1485,8 @@ ARM void FileSelectMain::func_ov019_020ca940() { this->mUnk_155C.mUnk_5C.x = local_68.x + local_48.mPos.x - local_6c.x; this->mUnk_155C.mUnk_5C.y = local_68.y + local_48.mPos.y - local_6c.y; - this->mUnk_18A8.UnkOperations2(&this->mUnk_15D4.mPos, true); - this->mUnk_1BC0.UnkOperations2(&this->mUnk_18EC.mPos, true); + this->mUnk_18A8.Update(&this->mUnk_15D4.mPos); + this->mUnk_1BC0.Update(&this->mUnk_18EC.mPos); this->mUnk_1144.func_ov000_020609c4(); this->mUnk_155C.func_ov000_020609c4(); diff --git a/src/019_MainSelect/FileSelectManager_160.cpp b/src/019_MainSelect/FileSelectManager_160.cpp index e2381b51..1ffef098 100644 --- a/src/019_MainSelect/FileSelectManager_160.cpp +++ b/src/019_MainSelect/FileSelectManager_160.cpp @@ -41,9 +41,9 @@ ARM void FileSelectManager_160::vfunc_0C(unk32 param1) { } } -ARM void FileSelectManager_160::vfunc_14() {} +ARM void FileSelectManager_160::vfunc_14(unk32 param1) {} -ARM void FileSelectManager_160::vfunc_10() { +ARM void FileSelectManager_160::vfunc_10(unk32 param1, unk32 param2) { data_0204999c.func_02013014(); data_0204999c.mUnk_60 = 0xD6D8; data_0204a088->func_ov000_02061248(); @@ -80,7 +80,7 @@ ARM void FileSelectManager_160::vfunc_1C(unk32 param1) { } } -ARM void FileSelectManager_160::vfunc_20() { +ARM void FileSelectManager_160::vfunc_20(unk32 param1, unk32 param2) { data_0204999c.func_02013014(); data_0204999c.mUnk_60 = 0xD6D8; this->mUnk_14 = NULL; diff --git a/src/019_MainSelect/FileSelectManager_164.cpp b/src/019_MainSelect/FileSelectManager_164.cpp index eb6b816c..578551c3 100644 --- a/src/019_MainSelect/FileSelectManager_164.cpp +++ b/src/019_MainSelect/FileSelectManager_164.cpp @@ -2,7 +2,6 @@ #include "FileSelect/FileSelectOptionsManager.hpp" #include "Unknown/UnkStruct_0204a088.hpp" #include "Unknown/UnkStruct_0204a110.hpp" -#include "Unknown/UnkStruct_0204aeec.hpp" #include "Unknown/UnkStruct_ov000_020b50c0.hpp" ARM FileSelectManager_164::FileSelectManager_164(GameModeManagerBase_104 *param1, FileSelectMain *param2) { @@ -44,9 +43,9 @@ ARM void FileSelectManager_164::vfunc_0C(unk32 param1) { } } -ARM void FileSelectManager_164::vfunc_14() {} +ARM void FileSelectManager_164::vfunc_14(unk32 param1) {} -ARM void FileSelectManager_164::vfunc_10() { +ARM void FileSelectManager_164::vfunc_10(unk32 param1, unk32 param2) { data_0204999c.func_02013014(); data_0204999c.mUnk_60 = 0xD6D8; data_ov000_020b50c0.func_ov000_0206a758(); @@ -66,7 +65,7 @@ ARM void FileSelectManager_164::vfunc_18(unk32 param1) { if (param1 == 0) { this->mUnk_0C = 1; gpFSOptionsManager->func_ov019_020cc85c(2); - data_0204aeec.func_0201e698(); + data_0204a110.GetUnkDDC()->func_0201e698(); } } @@ -90,7 +89,7 @@ ARM void FileSelectManager_164::vfunc_1C(unk32 param1) { } } -ARM void FileSelectManager_164::vfunc_20() { +ARM void FileSelectManager_164::vfunc_20(unk32 param1, unk32 param2) { data_0204999c.func_02013014(); data_0204999c.mUnk_60 = 0xD6D8; FileSelectManager_164::func_ov019_020d02f4(); diff --git a/src/019_MainSelect/FileSelectMicTest.cpp b/src/019_MainSelect/FileSelectMicTest.cpp index 4c7b0f59..b661d458 100644 --- a/src/019_MainSelect/FileSelectMicTest.cpp +++ b/src/019_MainSelect/FileSelectMicTest.cpp @@ -55,7 +55,7 @@ ARM FileSelectMicTest::FileSelectMicTest() : mUnk_304(BTN_ID_RETURN, 0x8E, 0x00, 0x01, 0x8E, 0x00), mUnk_3F8(0x8D, 0x01), mUnk_630(1) { - this->mUnk_0C.mList.func_020166cc(&this->mUnk_304.mUnk_044.mUnk_04); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_304.mUnk_044); this->mUnk_020.func_0201f730(BMG_ID(BMGGroup_select, 0x06)); this->mUnk_3F8.mUnk_14E = 1; this->mUnk_3F8.func_0201f730(BMG_ID(BMGGroup_select, 0x43)); @@ -131,7 +131,6 @@ ARM void FileSelectMicTest::func_ov019_020ceaac() { } ARM void FileSelectMicTest::func_ov019_020cebcc() { - this->mUnk_304.mUnk_000.mUnk_0A = false; this->mUnk_304.mUnk_000.mUnk_0B = true; this->mUnk_304.mUnk_000.mUnk_0C = false; @@ -181,7 +180,7 @@ ARM void FileSelectMicTest::vfunc_08(Input *pButtons, TouchControl *pTouchContro } if (this->mState - 1 <= FSMicTestState_OptionsToMicTest) { - this->mUnk_304.mUnk_000.UnkOperations(NULL, false); + this->mUnk_304.mUnk_000.UpdateLogic(); UnkStruct_ov019_020d24c8_28_258 local_2c(0x8D, 0x01); volatile Vec2us result; diff --git a/src/019_MainSelect/FileSelectOptions.cpp b/src/019_MainSelect/FileSelectOptions.cpp index c27ebc5d..68ba4f6e 100644 --- a/src/019_MainSelect/FileSelectOptions.cpp +++ b/src/019_MainSelect/FileSelectOptions.cpp @@ -179,10 +179,10 @@ ARM FileSelectOptions::FileSelectOptions(s32 saveSlotIndex) : mUnk_1A68(&mUnk_19D0), mUnk_1AB8(&mUnk_19D0, 0x8C, 0x09, BMG_ID(BMGGroup_select, 0x07)) { this->mUnk_1CF5 = false; - this->mUnk_0C.mList.func_020166cc(&this->mUnk_10A8.mUnk_04); - this->mUnk_0C.mList.func_020166cc(&this->mUnk_19D0.mUnk_04); - this->mUnk_0C.mList.func_020166cc(&this->mUnk_1388.mUnk_04); - this->mUnk_0C.mList.func_020166cc(&this->mUnk_16AC.mUnk_04); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_10A8); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_19D0); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_1388); + this->mUnk_0C.mList.func_020166cc(&this->mUnk_16AC); this->mUnk_10A8.mUnk_2A = false; this->mUnk_1388.mUnk_2C = true; this->mUnk_16AC.mUnk_2C = true; @@ -505,11 +505,11 @@ ARM void FileSelectOptions::func_ov019_020cd7f8() { } ARM void FileSelectOptions::func_ov019_020cd8d4() { - this->mUnk_1064.UnkOperations(&this->mUnk_0024.mUnk_004, true); + this->mUnk_1064.Update(&this->mUnk_0024.mUnk_004); this->mUnk_1420.func_ov000_02063f64(); this->mUnk_1744.func_ov000_02063f64(); this->mUnk_1A68.func_ov000_02063f64(); - this->mUnk_1344.UnkOperations2(&this->mUnk_10A8.mPos, true); + this->mUnk_1344.Update(&this->mUnk_10A8.mPos); } ARM bool FileSelectOptions::func_ov019_020cdbdc() { @@ -634,12 +634,12 @@ ARM UnkStruct_ov019_020d24c8_2C_24::UnkStruct_ov019_020d24c8_2C_24(GameModeManag this->mUnk_FC3[0].mUnk_00 = *src; this->mUnk_103E = pSaveSub17->mUnk_7E; - param1->mList.func_020166cc(&this->mUnk_490.mUnk_04); - param1->mList.func_020166cc(&this->mUnk_4F0.mUnk_04); - param1->mList.func_020166cc(&this->mUnk_9C0.mUnk_04); - param1->mList.func_020166cc(&this->mUnk_A20.mUnk_04); - param1->mList.func_020166cc(&this->mUnk_EF0.mUnk_04); - param1->mList.func_020166cc(&this->mUnk_F50.mUnk_04); + param1->mList.func_020166cc(&this->mUnk_490); + param1->mList.func_020166cc(&this->mUnk_4F0); + param1->mList.func_020166cc(&this->mUnk_9C0); + param1->mList.func_020166cc(&this->mUnk_A20); + param1->mList.func_020166cc(&this->mUnk_EF0); + param1->mList.func_020166cc(&this->mUnk_F50); this->mUnk_490.mPosOffset.x = 0; this->mUnk_490.mPosOffset.y = 0; diff --git a/src/019_MainSelect/GameModeFileSelect.cpp b/src/019_MainSelect/GameModeFileSelect.cpp index bd38437f..940418ce 100644 --- a/src/019_MainSelect/GameModeFileSelect.cpp +++ b/src/019_MainSelect/GameModeFileSelect.cpp @@ -23,7 +23,7 @@ ARM GameModeFileSelect *GameModeFileSelect::Create() { ARM GameModeFileSelect::~GameModeFileSelect() { data_0204a088->func_ov000_02061098(); - gSaveManager.func_ov000_020ba7c8(this->mSaveSlotIndex); + gSaveManager.func_ov001_020ba7c8(this->mSaveSlotIndex); data_ov000_020b504c.func_ov001_020be6f4(); data_02049bd4.func_02014c60(2); data_ov000_020b51b8.func_ov000_0206d0bc(1); diff --git a/src/024_MainGame/Game/AdventureModeManager_024.cpp b/src/024_MainGame/Game/AdventureModeManager_024.cpp new file mode 100644 index 00000000..3f95b7da --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_024.cpp @@ -0,0 +1,1012 @@ +#include "Actor/ActorUnkTUTO.hpp" +#include "Game/GameModeAdventure.hpp" +#include "MainGame/AdventureMode.hpp" +#include "System/OverlayManager.hpp" +#include "Unknown/Common.hpp" +#include "Unknown/UnkFileSystem.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_0204e5f8.hpp" +#include "Unknown/UnkStruct_020d8698.hpp" +#include "Unknown/UnkStruct_027e0998.hpp" +#include "Unknown/UnkStruct_027e09a0.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" +#include "Unknown/UnkStruct_027e0cf8.hpp" +#include "Unknown/UnkStruct_027e0d34.hpp" +#include "Unknown/UnkStruct_ov000_020b4f70.hpp" +#include "Unknown/UnkStruct_ov000_020b5214.hpp" +#include "Unknown/UnkStruct_ov024_020d8660.hpp" +#include "Unknown/UnkStruct_ov024_020d8694.hpp" +#include "Unknown/UnkStruct_ov024_020d86a0.hpp" +#include "Unknown/UnkStruct_ov026_02138d10.hpp" +#include "Unknown/UnkStruct_ov026_0213f578.hpp" +#include "Unknown/UnkStruct_ov026_0213f590.hpp" +#include "Unknown/UnkStruct_ov031_02118fa4.hpp" +#include "regs.h" +#include "versions.h" + +extern "C" { +void GX_SetGraphicsMode(unk32 param1, unk32 param2, unk32 param3); +void GXS_SetGraphicsMode(unk32 param1); +void DC_FlushAll(); +void func_02019b3c(); +void func_02019c4c(); +void func_02019a74(); +unk32 func_ov024_020d5304(unk32 sceneIndex); +void func_0200a7b0(unk32 param1, void *param2, void *param3, void *param4, unk32 param5, unk32 param6, unk32 param7, + unk32 param8); +void func_ov024_020d24d4(void *); +void func_ov024_020d2538(void *, SceneIndex, unk32, void *); +void func_ov024_020d2518(void *); +} + +extern void *data_ov000_020b64f8; + +struct InputInformations { + void *unk_00; + void *unk_04; + void *unk_08; + void *unk_0C; +}; + +AdventureModeManager::~AdventureModeManager() { + delete this->mUnk_1B8; + delete this->mUnk_170; + delete this->mUnk_15C; + delete this->mUnk_1AC; + + UnkStruct_ov024_020d86a0::Destroy(); + UnkStruct_027e0998::Destroy(); +} + +void AdventureModeManager::func_ov024_020c5288() { + REG_DISPCNT &= ~0x1F00; + REG_DISPCNT |= 0x1100; +} + +void AdventureModeManager::func_ov024_020c52a0() { + REG_DISPCNT &= ~0x1F00; + REG_DISPCNT |= 0x1100; +} + +void AdventureModeManager::func_ov024_020c52b8() { + this->func_ov024_020c52f4(); + + if (gOverlayManager.IsPlayerSub()) { + this->func_ov024_020c6d2c(0); + this->func_ov024_020c6db8(0x1E); + } +} + +void AdventureModeManager::func_ov024_020c52f4() { + this->func_ov024_020c52a0(); + this->func_ov024_020c530c(); +} + +void AdventureModeManager::func_ov024_020c530c() { + GXS_SetGraphicsMode(5); + REG_BG2CNT_SUB = (REG_BG2CNT_SUB & 0x43) | 0x4d08; + REG_BG3CNT_SUB = (REG_BG3CNT_SUB & 0x43) | 0x4e14; + this->func_ov024_020c6db8(0x1C); +} + +void AdventureModeManager::func_ov024_020c5364() { + this->func_ov024_020c52a0(); + this->func_ov024_020c537c(); +} + +void AdventureModeManager::func_ov024_020c537c() { + GXS_SetGraphicsMode(3); + REG_BG0CNT_SUB = (REG_BG0CNT_SUB & 0x43) | 0x1800; + this->func_ov024_020c6d2c(1); + REG_BG2CNT_SUB = (REG_BG2CNT_SUB & 0x43) | 0x1a0c; + REG_BG3CNT_SUB = (REG_BG3CNT_SUB & 0x43) | 0x5b14; + this->func_ov024_020c6db8(0x1f); +} + +void AdventureModeManager::func_ov024_020c53e8() { + switch (this->mUnk_154) { + case 0: + this->func_ov024_020c52b8(); + data_0204a110.mUnk_D9C.func_0201c494(0); + break; + case 1: + this->func_ov024_020c5364(); + data_0204a110.mUnk_D9C.func_0201c494(1); + break; + case 2: + this->func_ov024_020c52a0(); + this->func_ov024_020c6db8(0x18); + data_0204a110.mUnk_D9C.func_0201c494(1); + break; + case 3: + if (data_027e09a4->func_01ffd3d8()) { + this->func_ov024_020c5364(); + } else { + this->func_ov024_020c52f4(); + } + + this->func_ov024_020c6db8(0x1C); + data_0204a110.mUnk_D9C.func_0201c494(0); + + if (data_0204a110.mUnk_008 == 5) { + REG_DISPCNT &= ~0x1F00; + REG_DISPCNT |= 0x0200; + } + break; + case 4: + if (data_027e09a4->func_01ffd3d8()) { + this->func_ov024_020c5364(); + } else { + this->func_ov024_020c52f4(); + this->func_ov024_020c6d2c(0); + } + + this->func_ov024_020c6db8(0x1E); + data_0204a110.mUnk_D9C.func_0201c494(1); + + if (data_0204a110.mUnk_008 == 5) { + REG_DISPCNT &= ~0x1F00; + REG_DISPCNT |= 0x0200; + } + break; + case 5: + if (data_027e09a4->func_01ffd3d8()) { + this->func_ov024_020c537c(); + } else { + this->func_ov024_020c530c(); + } + + this->func_ov024_020c6db8(0x1C); + data_0204a110.mUnk_D9C.func_0201c494(0); + break; + default: + break; + } + + func_02019b3c(); + func_02019c4c(); + func_02019a74(); +} + +void AdventureModeManager::func_ov024_020c555c(unk32 param1) { + this->mUnk_154 = param1; +} + +struct UnkNodeStruct5 { + virtual void vfunc_00(); + virtual void vfunc_04(); + virtual void vfunc_08(InputInformations *); +}; + +void AdventureModeManager::vfunc_24() { + u16 press; + + this->GameModeManagerBase::vfunc_24(); + + if (this->mUnk_150) { + if (this->mUnk_15C->mUnk_47 && this->mUnk_15C->func_ov017_020c3a00(&this->mButtons, &this->mTouchControl)) { + this->GameModeManagerBase::vfunc_04(0); + this->func_ov024_020c5cec(); + } + + if (CHECK_BUTTON_COMBO(this->mButtons.press, BTN_START) && this->mUnk_15C->mUnk_47) { + this->mUnk_15C->func_ov017_020c3c64(); + } + + if (data_027e09a4->func_01ffd3d8()) { + data_ov026_0213f578->func_ov026_020f4844(); + } + + InputInformations sp24; + sp24.unk_00 = &this->mNextButtonID; + sp24.unk_04 = &this->mButtonID; + sp24.unk_08 = &this->mButtons; + sp24.unk_0C = &this->mTouchControl; + + GameModeLinkListNode *var_r4 = this->mUnk_15C->mUnk_04.mList.mNext->GetNext3(); + + while (var_r4 != this->mUnk_15C->mUnk_04.GetOrigin()) { + GameModeManagerBase_104 *pTarget = var_r4->GetTarget(); + GameModeLinkListNode *var_r9 = pTarget->mUnk_0C.mList.GetNext(); + + while (var_r9 != pTarget->mUnk_0C.GetOrigin()) { + //! TODO: figure out which class it is + var_r9->GetTarget()->vfunc_08(&sp24); + var_r9 = var_r9->GetUnk2(); + } + + var_r4 = var_r4->GetUnk2(); + } + + GameModeLinkListNode *var_r4_2 = this->mUnk_15C->mUnk_04.mList.mNext->GetNext3(); + + while (var_r4_2 != this->mUnk_15C->mUnk_04.GetOrigin()) { + var_r4_2->GetTarget()->vfunc_08(&this->mButtons, &this->mTouchControl); + var_r4_2 = var_r4_2->GetUnk2(); + } + + if (!this->mTouchControl.mState.touch) { + this->mNextButtonID = -1; + } + + return; + } + + bool var_r0; + if (CHECK_BUTTON_COMBO(this->mButtons.press, BTN_START) && data_027e09a4->IsNotCutscene()) { + if (!data_027e09b8->func_ov000_020732dc(0) && !data_027e09b8->func_ov000_020732dc(1)) { + if (!data_027e09b8->func_ov000_020732dc(2) && data_0204e5f8.mUnk_3A == 0 && data_0204e5f8.mUnk_3E == 0 && + !data_0204e5f8.mUnk_18) { + unk32 temp_r0_2 = data_0204a088->mUnk_00; + if ((temp_r0_2 == 1 || temp_r0_2 == 6) && !data_0204a088->mUnk_127 && + data_0204999c.mUnk_00[HeapIndex_8] != NULL) { + this->mNextButtonID = -1; + this->vfunc_00(); + this->mUnk_15C->func_ov017_020c3bc0(); + data_ov024_020d8694->func_ov024_020cb0c4(); + + if (data_0204a110.mUnk_008 == 1) { + data_ov000_020b504c.func_ov000_02067f5c(0); + } + + var_r0 = true; + } else { + goto play_sound; + } + } else { + goto play_sound; + } + } else { + play_sound: + data_ov000_020b5214.func_ov000_0206db44(0xA4); + goto do_return; + } + } else { + do_return: + var_r0 = false; + } + + if (var_r0) { + return; + } + + if (data_027e09a4->func_01ffd3d8()) { + data_027e0ce0->mUnk_38->mUnk_010->func_ov026_020f4870(); + } + + this->func_0201875c(); + this->func_02018908(); + + if (this->mTouchControl.mState.touch) { + bool var_r2 = true; + + if (data_0204a088->mUnk_04 == -1 && data_0204a088->mUnk_08 == -1) { + var_r2 = false; + } + + if (var_r2 && data_0204a088->mUnk_08 != 1) { + goto reset_button_id; + } + } else { + reset_button_id: + this->mNextButtonID = -1; + } + + if (this->mUnk_1C0) { + this->mUnk_1C0 = false; + this->func_ov024_020c6b8c(); + } + + data_ov024_020d8694->vfunc_08(&this->mButtons, &this->mTouchControl); + data_ov024_020d86a0->func_ov024_020d167c(); + data_027e0998->func_ov000_02061764(); + + if (data_ov000_020b4f70 != NULL && data_027e09b8 != NULL) { + if (data_027e09b8->func_01ffd420() == 0) { + data_ov000_020b4f70->func_ov000_02066370(); + } + } + + if (data_027e09a4->IsCutscene()) { + return; + } + + bool var_r2_2 = true; + if (data_0204a088->mUnk_04 == -1 && data_0204a088->mUnk_08 == -1) { + var_r2_2 = false; + } + + if (!var_r2_2 && !data_0204a088->mUnk_127) { + if (data_0204a110.func_01ff9b50() == BTN_ID_UNK_80) { + return; + } + + if (data_0204e5f8.mUnk_3A == 0 && data_0204e5f8.mUnk_3E == 0 && !data_0204e5f8.mUnk_18) { + // should we open the menu + press = this->mButtons.press; + if (CHECK_BUTTON_COMBO(press, BTN_DRIGHT) || CHECK_BUTTON_COMBO(press, BTN_Y)) { + if (this->func_ov024_020c5dac() != 0) { + if (data_0204a088->mUnk_00 != 1) { + return; + } + + stack_ov000_02073578 sp18; + sp18.unk_08 = 0x06; + sp18.unk_00 = 0x0A; + data_027e09b8->func_ov000_02073578(&sp18, 1); + return; + } + + if (data_0204a088->mUnk_00 == 1) { + data_ov000_020b5214.func_ov000_0206db44(0xA4); + } + } + + // should we switch to the map screen + press = this->mButtons.press; + if (CHECK_BUTTON_COMBO(press, BTN_DDOWN) || CHECK_BUTTON_COMBO(press, BTN_B)) { + if (this->func_ov024_020c5f70() != 0) { + switch (data_0204a088->mUnk_00) { + case 1: + stack_ov000_02073578 spC; + spC.unk_08 = 0x02; + spC.unk_00 = 0x0B; + data_027e09b8->func_ov000_02073578(&spC, 1); + + data_ov000_020b5214.func_ov000_0206db44(0x37); + break; +#if !IS_JP + case 7: + if (data_ov031_02118fa4 == 0) { + return; + } + + if (data_ov031_02118fa4->func_ov009_020b670c(1) == 0) { + return; + } + + data_0204a088->func_ov000_020611fc(2); + data_ov000_020b5214.func_ov000_0206db44(0x37); + break; +#endif + case 6: + data_0204a088->func_ov000_020611fc(2); + data_ov000_020b5214.func_ov000_0206db44(0x37); + break; + default: + break; + } + + return; + } + + unk32 value = data_0204a088->mUnk_00; + if (!(value != 1 && value != 7 && value != 6)) { + data_ov000_020b5214.func_ov000_0206db44(0xA4); + } + } + + // should we open the collection + if (CHECK_BUTTON_COMBO(this->mButtons.press, BTN_SELECT)) { + if (this->func_ov024_020c60f4()) { + switch (data_0204a088->mUnk_00) { + case 1: + stack_ov000_02073578 stack; + stack.unk_08 = 0x05; + data_027e09b8->func_ov000_02073578(&stack, 1); + data_ov000_020b5214.func_ov000_0206db44(0x37); + break; + case 6: + data_0204a088->func_ov000_020611fc(5); + data_ov000_020b5214.func_ov000_0206db44(0x37); + break; + default: + break; + } + + return; + } + + switch (data_0204a088->mUnk_00) { + case 1: + case 6: + data_ov000_020b5214.func_ov000_0206db44(0xA4); + break; + default: + break; + } + } + + if (!data_027e09a4->func_01ffd3d8()) { + return; + } + + // should we open the rail map + press = this->mButtons.press; + if (!CHECK_BUTTON_COMBO(press, BTN_DLEFT)) { + if (!CHECK_BUTTON_COMBO(press, BTN_A)) { + return; + } + + if (data_ov000_020b504c.func_ov000_02067bc4(0)->vfunc_08() != 0) { + return; + } + } + + if (this->func_ov024_020c5ecc() != 0) { + if (data_0204a088->mUnk_00 == 1) { + data_ov026_02138d10->func_ov026_020e1440(); + data_ov000_020b5214.func_ov000_0206db44(0x9019); + data_ov000_020b5214.func_ov000_0206db44(0x3B); + } + } else if (data_0204a088->mUnk_00 == 1) { + data_ov000_020b5214.func_ov000_0206db44(0xA4); + } + } + } +} + +void AdventureModeManager::func_ov024_020c5cec() { + data_ov024_020d8698->func_ov024_020cd420(); + + if (!data_027e09a4->func_01ffd3d8()) { + data_ov024_020d8698->func_ov024_020cd458(data_027e0ce0->mUnk_2C->mEquippedItem, 1); + + if (gOverlayManager.IsPlayerSub() && data_0204a088->mUnk_00 == OverlayIndex_SceneInit) { + this->mUnk_168->func_ov031_0210df60(1); + } + } + + if (this->mUnk_160 != NULL && this->mUnk_160->mUnk_18 != NULL) { + AdventureModeManager_160_18 *ptr = this->mUnk_160->mUnk_18; + GameModeLinkListNode *pUVar3 = (GameModeLinkListNode *) ptr; + this->mUnk_104.mList.func_020166cc(pUVar3->GetNode()); + ptr->vfunc_18(); + } +} + +bool AdventureModeManager::func_ov024_020c5dac() { + int unk_00 = data_0204a088->mUnk_00; + + if (this->func_ov024_020c6af4(4)) { + if (!data_027e09b8->func_ov000_020732dc(0) && !data_027e09b8->func_ov000_020732dc(1) && + !data_027e09b8->func_ov000_020732dc(3) && !data_027e09b8->func_ov000_020732dc(4)) { + GameModeLinkListNode *node = data_0204e5f8.mUnk_00.mUnk_04.GetNext(); + + if ((void *) node == (void *) &data_0204e5f8 && (unk_00 != 1 || this->func_ov024_020c69d0() != 0) && + (data_027e09a4->func_01ffd3d8() || this->mUnk_168->func_ov031_0210dfd8() == 0) && + (!data_027e09a4->func_01ffd3d8() || data_ov026_02138d10->func_ov026_020e18fc() != 0)) { + return true; + } + } + } + + return false; +} + +bool AdventureModeManager::func_ov024_020c5ecc() { + if (data_ov026_02138d10->func_ov026_020e13f4() != 0 && data_027e09b8->func_01ffd420() == 0 && + func_ov024_020d5304(data_027e09a4->mUnk_00.mSceneIndex) != 0 && + (data_ov024_020d8660 == NULL || data_ov024_020d8660->mUnk_00 == NULL) && this->func_ov024_020c6a20() != 0 && + data_ov026_0213f590.func_ov026_020f7cc0() == 0) { + return true; + } + + return false; +} + +bool AdventureModeManager::func_ov024_020c5f70() { + bool var_r4 = false; + + if (data_027e09a4->func_01ffd3d8()) { + var_r4 = true; + } else if (data_027e0d34 != NULL) { + var_r4 = data_027e0d34->func_ov031_020d97f4(); + } + + u32 unk_00 = data_0204a088->mUnk_00; + if (var_r4) { + if (this->func_ov024_020c6af4(4) && data_0204a110.mUnk_008 != 1 && !data_027e09b8->func_ov000_020732dc(0) && + !data_027e09b8->func_ov000_020732dc(1) && !data_027e09b8->func_ov000_020732dc(4)) { + GameModeLinkListNode *node = data_0204e5f8.mUnk_00.mUnk_04.GetNext(); + + if ((void *) node == (void *) &data_0204e5f8 && (unk_00 == 1 || unk_00 - 6 <= 1) && + (unk_00 != 1 || this->func_ov024_020c69d0() != 0) && + (data_ov024_020d8660 == NULL || data_ov024_020d8660->mUnk_00 == NULL) && + (data_027e09a4->func_01ffd3d8() || this->mUnk_168->func_ov031_0210dfd8() == 0) && + !data_027e09a4->IsDarkRealm()) { + return true; + } + } + } + + return false; +} + +bool AdventureModeManager::func_ov024_020c60f4() { + bool var_r4 = false; + + if (data_027e09a4->func_01ffd3d8()) { + var_r4 = true; + } else if (data_027e0d34 != NULL) { + var_r4 = data_027e0d34->func_ov031_020d97e4(); + } + + u32 unk_00 = data_0204a088->mUnk_00; + + if (var_r4 && this->func_ov024_020c6af4(4) && !data_027e09b8->func_ov000_020732dc(0) && + !data_027e09b8->func_ov000_020732dc(1) && !data_027e09b8->func_ov000_020732dc(2) && + !data_027e09b8->func_ov000_020732dc(4) && (unk_00 == 1 || unk_00 == 6) && + (unk_00 != 1 || this->func_ov024_020c69d0() != 0) && data_ov024_020d8660->mUnk_00 == NULL && + (data_ov024_020d8660 == NULL || data_ov024_020d8660->mUnk_00 == NULL) && !data_027e09a4->IsDarkRealm()) { + return true; + } + + return false; +} + +bool AdventureModeManager::func_ov024_020c623c() { + u32 scene = data_027e09a4->mUnk_00.mSceneIndex; + + if ((gOverlayManager.IsMapA6() && ActorUnkTUTO::func_ov037_02120a64() != 0) || + (data_027e09a4->func_01ffd400()->mUnk_10 == 6 && scene == SceneIndex_f_trnnpc) || + (data_ov024_020d8660 != NULL && data_ov024_020d8660->mUnk_00 != NULL) || (scene - SceneIndex_b_last1 <= 3)) { + return false; + } + + return true; +} + +void AdventureModeManager::vfunc_28(unk8 *param1) { + this->GameModeManagerBase::vfunc_28(param1); + data_027e0998->func_ov000_02061768(); + this->func_02018a14(param1); + + if (this->mUnk_1BC != NULL) { + this->mUnk_1BC->func_ov024_020d072c(param1); + } + + if (data_ov000_020b4f70 != NULL) { + data_ov000_020b4f70->func_ov000_0206645c(param1); + } +} + +void AdventureModeManager::vfunc_2C(unk8 *param1) { + s8 value = *param1; + + this->func_02018984(param1); + this->func_02018830(param1); + data_ov024_020d8694->vfunc_10(param1); + + if (this->mUnk_150 && value != -1) { + if (this->mUnk_15C->mUnk_47) { + u32 savedUnk[2]; + savedUnk[1] = this->mNextButtonID; + savedUnk[0] = (u32) param1; + + GameModeLinkListNode *var_r4 = this->mUnk_15C->mUnk_04.mUnk_0C.GetUnk3(); + + while (var_r4 != this->mUnk_15C->mUnk_04.GetOrigin()) { + GameModeManagerBase_104 *pTarget = var_r4->GetTarget(); + GameModeLinkListNode *var_r9 = pTarget->mUnk_0C.mList.GetPrev(); + + while (var_r9 != pTarget->mUnk_0C.GetOrigin()) { + var_r9->GetTarget()->vfunc_0C(savedUnk); + var_r9 = var_r9->GetUnk(); + } + + var_r4 = var_r4->GetUnk(); + } + + GameModeLinkListNode *var_r4_2 = this->mUnk_15C->mUnk_04.mUnk_0C.GetUnk3(); + + while (var_r4_2 != this->mUnk_15C->mUnk_04.GetOrigin()) { + var_r4_2->GetTarget()->vfunc_10(param1); + var_r4_2 = var_r4_2->GetUnk(); + } + } + } +} + +void AdventureModeManager::vfunc_34(unk32 param1, unk32 param2) { + this->mUnk_004.func_0201c0e4(); + + switch (param1) { + case 0: + this->func_ov024_020c53e8(); + + if (param2 == 1) { + data_027e0998->func_ov000_02061850(0); + + if (this->mUnk_1B8 != 0) { + this->mUnk_1B8->func_ov024_020d06d0(); + } + + if (this->mUnk_1BC != 0) { + this->mUnk_1BC->func_ov024_020d06d0(); + } + + if (data_027e0cf8 != NULL && data_027e0cf8->mUnk_1C != 0) { + data_027e0cf8->func_ov024_020c7780(); + } + } + + break; + case 1: + this->func_ov024_020c5288(); + break; + default: + break; + } +} + +void AdventureModeManager::vfunc_38(u32 param1, u8 param2, unk16 param3, unk16 param4) { + this->func_ov024_020c6514(param1, param2, param3, param4); +} + +void AdventureModeManager::func_ov024_020c6514(SceneIndex sceneIndex, u8 param2, unk16 param3, unk16 param4) { + if (data_027e09a4->IsDarkRealm()) { + UnkStruct2 auStack_34("Screen/Bg/Darea.bin", 1); + auStack_34.func_020154ec("DAR"); + DC_FlushAll(); + + UnkResult auStack_44("DAR:Darea3", "DAR:Darea", "DAR:Darea"); + func_0200a7b0(7, auStack_44.mUnk_00, auStack_44.mUnk_04, auStack_44.mUnk_08, 0, 0, 0x1B, 5); + + data_027e0998->mUnk_44 = param4; + } else { + this->func_ov000_02060fc8(sceneIndex, param2, param3, param4); + } + + s32 var_r1 = this->GetMapPaintIndex(sceneIndex, param2); + bool var_r2; + var_r2 = true; + if (var_r1 != 0xFF) { + var_r2 = false; + } + this->mAllowMapPaint = var_r2; + + this->mUnk_1B8->func_ov024_020d13cc(var_r1); + this->mUnk_1B8->func_ov024_020d06d0(); + this->mUnk_1CC.sceneIndex = sceneIndex; + this->mUnk_1CC.unk_04 = param2; + this->mUnk_1CC.unk_06 = param4; + + if (param3 != 0) { + this->mUnk_1C4.sceneIndex = sceneIndex; + this->mUnk_1C4.unk_04 = param2; + this->mUnk_1C4.unk_06 = param4; + } +} + +u8 AdventureModeManager::GetMapPaintIndex(SceneIndex sceneIndex, u8 param2) { + if (param2 == 99) { + return data_027e09a0->GetCourseEntry(sceneIndex)->defaultMapPaintIndex; + } + + return data_027e09a0->GetRoomEntry(sceneIndex, data_027e09a0->GetRoomEntryIndex())->mapPaintIndex; +} + +void AdventureModeManager::func_ov024_020c66c0() { + this->vfunc_38(this->mUnk_1C4.sceneIndex, this->mUnk_1C4.unk_04, 1, this->mUnk_1C4.unk_06); + + if (this->mUnk_1BC != NULL) { + this->mUnk_1BC->func_ov024_020d06d0(); + this->func_ov024_020c6db8(0x1E); + } + + this->func_ov024_020c699c(); +} + +void AdventureModeManager::func_ov024_020c671c() { + this->func_ov024_020c6770(this->mUnk_1C4.sceneIndex, this->mUnk_1C4.unk_04, 1, this->mUnk_1C4.unk_06); + + if (data_027e09a4->func_01ffd3d8()) { + data_027e0ce0->mUnk_38->mUnk_158->func_ov026_020dc2d0(); + } +} + +void AdventureModeManager::func_ov024_020c6770(SceneIndex sceneIndex, u8 param2, unk16 param3, unk16 param4) { + this->func_ov024_020c6514(sceneIndex, param2, param3, param4); + + if (data_027e09a4->func_01ffd3d8()) { + data_027e0cf8->func_ov024_020c77b0(1); + } else { + data_027e0cf8->func_ov024_020c77b0(0); + } + + this->func_ov024_020c6840(sceneIndex); + data_027e0cf8->func_ov024_020c7780(); + + if (this->mUnk_1AC->mList.func_0201673c() == 0) { + GameModeLinkListNode *origin = this->mUnk_1AC->GetOrigin(); + this->mUnk_158->mList.func_020166cc(origin->GetNode()); + origin->GetTarget()->vfunc_18(); + } +} + +bool AdventureModeManager::func_ov024_020c681c() { + if (this->mUnk_1C4.sceneIndex == this->mUnk_1CC.sceneIndex && this->mUnk_1C4.unk_04 == this->mUnk_1CC.unk_04) { + return true; + } + + return false; +} + +struct SomeSaveFileStruct { + /* 00 */ SaveFile *mpSaveFiles[MAX_SAVE_SLOTS]; + STRUCT_PAD(0x00, 0xCC); + + SomeSaveFileStruct(unk32 param1); + ~SomeSaveFileStruct(); +}; + +void AdventureModeManager::func_ov024_020c6840(SceneIndex sceneIndex) { + if (this->func_ov024_020c6d64() != 0) { + return; + } + + if (data_027e0cf8->mUnk_1C) { + data_027e0cf8->func_ov024_020c7724(); + } + + { + //! TODO: fake match most likely + SomeSaveFileStruct uStack_e8(0x1770); + func_ov024_020d24d4(&uStack_e8.mpSaveFiles[1]); + func_ov024_020d2538(&uStack_e8.mpSaveFiles[1], sceneIndex, 0, uStack_e8.mpSaveFiles[0]); + data_027e0cf8->func_ov024_020c755c(&uStack_e8.mpSaveFiles[1]); + func_ov024_020d2518(&uStack_e8.mpSaveFiles[1]); + } +} + +void AdventureModeManager::func_ov024_020c68d4() { + data_027e0cf8->func_ov024_020c77d0(); +} + +bool AdventureModeManager::func_ov024_020c68ec(unk32 param1, unk32 param2) { + if (param1 != 0) { + this->mUnk_18C->func_ov024_020ca068(param2); + return data_0204a088->func_ov000_020611fc(8); + } + + return data_0204a088->func_ov000_020611fc(1); +} + +void AdventureModeManager::func_ov024_020c6930() { + this->mUnk_18C->func_ov024_020ca074(); +} + +bool AdventureModeManager::func_ov024_020c6940(unk32 param1, unk32 param2) { + if (param1 != 0) { + if (data_0204a088->mUnk_00 == 1) { + +#if IS_JP + if (data_027e09b8->mUnk_94 & 8) { + data_027e09b8->func_ov000_02074d78(3); + } +#endif + + this->mUnk_190->mUnk_60 = param2; + return data_0204a088->func_ov000_020611fc(21); + } + + return this->mUnk_190->func_ov024_020ca24c(param2); + } + + return data_0204a088->func_ov000_020611fc(1); +} + +void AdventureModeManager::func_ov024_020c699c() { + if (data_027e0cf8->mUnk_1C) { + data_027e0cf8->func_ov024_020c7724(); + GameModeLinkListNode::func_020166ac(&this->mUnk_1AC->mList); + } +} + +unk32 AdventureModeManager::func_ov024_020c69d0() { + if (data_027e09a4->func_01ffd3d8()) { + unk32 uVar2 = 0; + + if (this->mUnk_16C != NULL && this->mUnk_16C->func_ov026_020d8e30() != 0) { + uVar2 = 1; + } + + return uVar2; + } + + return this->mUnk_168->func_ov031_0210dfcc(); +} + +unk32 AdventureModeManager::func_ov024_020c6a20() { + unk32 uVar2 = 0; + + if (this->mUnk_16C != NULL && this->mUnk_16C->func_ov026_020d8e44() != 0) { + uVar2 = 1; + } + + return uVar2; +} + +void AdventureModeManager::func_ov024_020c6a48(unk32 param1, unk32 param2) { + switch (param1) { + case 0: + case 1: + case 2: + case 3: + data_ov024_020d8698->func_ov024_020cd4e4(param1); + break; + case 4: + if (data_027e09a4->func_01ffd3d8()) { + this->mUnk_16C->func_ov026_020d8dd4(param2); + } else { + this->mUnk_168->func_ov031_0210df70(param2); + } + break; + case 5: + data_ov024_020d8698->func_ov024_020cd4e4(param1); + this->func_ov024_020c6a48(4, param2); + break; + default: + break; + } +} + +bool AdventureModeManager::func_ov024_020c6af4(unk32 param1) { + switch (param1) { + case 0: + case 1: + case 2: + case 3: + if (data_ov024_020d8698 == NULL) { + return false; + } + + return data_ov024_020d8698->func_ov024_020cd5c0(param1); + case 4: + if (data_027e09a4->func_01ffd3d8()) { + if (this->mUnk_16C != NULL) { + return this->mUnk_16C->mUnk_1C; + } + + return false; + } + + if (this->mUnk_168 != NULL) { + return this->mUnk_168->mUnk_20; + } + + return false; + default: + break; + } + + return false; +} + +void AdventureModeManager::func_ov024_020c6b8c() { + if (this->mUnk_1B4 && data_ov024_020d8698 != NULL) { + GameModeLinkListNode::func_020166ac(&data_ov024_020d8698->mList); + } + + if (data_ov024_020d8698 != NULL) { + GameModeLinkListNode *origin = data_ov024_020d8698->GetOrigin(); + this->mUnk_104.mList.func_020166cc(data_ov024_020d8698->GetNode()); + origin->GetTarget()->vfunc_18(); + + if (!this->mUnk_1B4) { + data_ov024_020d8698->func_ov024_020cd094(); + } + + this->mUnk_1B4 = true; + } + + if (!data_027e09a4->func_01ffd3d8()) { + if (!this->mUnk_1B5 && this->mUnk_1B0 != NULL) { + GameModeLinkListNode *origin = this->mUnk_1B0->GetOrigin(); + this->mUnk_104.mList.func_020166cc(this->mUnk_1B0->GetNode()); + origin->GetTarget()->vfunc_18(); + + this->mUnk_1B5 = true; + } + } +} + +void AdventureModeManager::func_ov024_020c6c60() { + if (this->mUnk_1B4 && data_ov024_020d8698 != NULL) { + GameModeLinkListNode::func_020166ac(&data_ov024_020d8698->mList); + this->mUnk_1B4 = false; + } + + if (!data_027e09a4->func_01ffd3d8()) { + if (this->mUnk_1B5 && this->mUnk_1B0 != NULL) { + GameModeLinkListNode::func_020166ac(&this->mUnk_1B0->mList); + this->mUnk_1B5 = false; + } + } +} + +void AdventureModeManager::func_ov024_020c6cd4() { + this->mUnk_16C->func_ov026_020d8e58(); +} + +bool AdventureModeManager::func_ov024_020c6ce4() { + if (data_0204a110.mUnk_008 == 5 || data_0204a110.mUnk_008 == 3) { + return true; + } + + return false; +} + +unk32 AdventureModeManager::func_ov024_020c6d04() { + return this->mUnk_194->mUnk_0C; +} + +void AdventureModeManager::func_ov024_020c6d10() { + this->mUnk_168->mUnk_21 = true; +} + +void AdventureModeManager::func_ov024_020c6d20(unk32 param1) { + this->mUnk_180->mUnk_40 = param1; +} + +void AdventureModeManager::func_ov024_020c6d2c(unk32 param1) { + if (param1) { + REG_BG1CNT_SUB = (REG_BG1CNT_SUB & 0x43) | 0x1904; + } else { + REG_BG1CNT_SUB = (REG_BG1CNT_SUB & 0x43) | 0x0C00; + } +} + +bool AdventureModeManager::func_ov024_020c6d64() { + if (data_027e09a4 != NULL && data_ov000_020b64f8 != NULL) { + if (data_027e09a4->IsCutscene() && Cutscene_GetParamEntry(data_027e09a4->mUnk_00.mCutsceneIndex)->mUnk_18 == 1) { + return true; + } + } + + return false; +} + +void AdventureModeManager::func_ov024_020c6db8(unk32 param1) { + if (this->func_ov024_020c6d64()) { + this->func_02018bc4(0x10); + } else { + this->func_02018bc4(param1); + } +} + +bool AdventureModeManager::func_ov024_020c6dec() { + if (this->mUnk_1CC.sceneIndex == data_027e09a4->mUnk_00.mSceneIndex) { + if (this->mUnk_1CC.sceneIndex == data_027e09a4->mUnk_00.mSceneIndex) { + if (this->mUnk_1CC.unk_04 == data_027e0cd8->func_ov000_02081d5c()) { + return true; + } + } + } + + return false; +} + +AdventureModeManager_1AC::AdventureModeManager_1AC() { + this->mUnk_18 = true; + this->mUnk_19 = true; +} + +AdventureModeManager_1AC::~AdventureModeManager_1AC() {} + +void AdventureModeManager_1AC::vfunc_08(Input *pButtons, TouchControl *pTouchControl) { + data_027e0cf8->func_ov017_020c390c(); +} + +void AdventureModeManager_1AC::vfunc_10(unk8 *param1) { + data_027e0cf8->func_ov017_020c397c(); +} + +void AdventureModeManager_1AC::vfunc_14(unk8 *param1) { + data_027e0cf8->func_ov017_020c39d4(); +} diff --git a/src/024_MainGame/Game/AdventureModeManager_15C_20_00_024.cpp b/src/024_MainGame/Game/AdventureModeManager_15C_20_00_024.cpp new file mode 100644 index 00000000..686e4ada --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_15C_20_00_024.cpp @@ -0,0 +1,150 @@ +#include "MainGame/AdventureMode.hpp" +#include "Message/BMG.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_0204e5f8.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_ov000_020b5214.hpp" +#include "Unknown/UnkStruct_ov024_020d8660.hpp" +#include "regs.h" +#include "versions.h" + +extern "C" void GX_func_0008(void *, unk32, unk32); + +AdventureModeManager_15C_20_00::AdventureModeManager_15C_20_00(bool param1) : + mUnk_778(false), + mUnk_779(param1), + mUnk_77A(-1) { + if (param1 != 0) { + this->mUnk_1B8.mUnk_20 = 2; + this->mUnk_250.mUnk_20 = 2; + this->mUnk_020 = &this->mUnk_1B8; + this->mUnk_024 = &this->mUnk_250; + this->mUnk_01C = 3; + } else { + this->mUnk_0F8.mUnk_20 = 2; + this->mUnk_158.mUnk_20 = 2; + this->mUnk_020 = &this->mUnk_0F8; + this->mUnk_024 = &this->mUnk_158; + this->mUnk_01C = 0; + } + + this->mUnk_0C.mList.func_020166cc(this->mUnk_020); + this->mUnk_0C.mList.func_020166cc(this->mUnk_024); + + this->mUnk_028.mUnk_04 = this->mUnk_020; + this->mUnk_078.mUnk_04 = this->mUnk_024; +} + +void AdventureModeManager_15C_20_00::func_ov024_020ca48c() { + if (this->mUnk_779) { + this->mUnk_1B8.func_ov000_02063a3c(0x28, 0x57, 0, 0x0A, 0x57, 0); + this->mUnk_250.func_ov000_02063a3c(0x29, 0x57, 1, 0x0B, 0x57, 1); + this->mUnk_300.func_ov000_02062f18(this->mUnk_020, 0x57, 0); + this->mUnk_53C.func_ov000_02062f18(this->mUnk_024, 0x57, 1); + this->mUnk_2E8.UnknownAction(0x57, 0x02); + } else { + this->mUnk_0F8.func_ov000_020633c0(0x28, 0x56, 1, 0x03, 0x56, 1); + this->mUnk_158.func_ov000_020633c0(0x29, 0x56, 2, 0x03, 0x56, 0); + this->mUnk_300.func_ov000_02062f18(this->mUnk_020, 0x56, 0); + this->mUnk_53C.func_ov000_02062f18(this->mUnk_024, 0x56, 1); + } +} + +void AdventureModeManager_15C_20_00::func_ov024_020ca5c8() { + this->mUnk_020->mUnk_2B = true; + this->mUnk_020->mUnk_2A = true; + this->mUnk_024->mUnk_2B = true; + this->mUnk_024->mUnk_2A = true; + + if (data_ov024_020d8660 != NULL && data_ov024_020d8660->mUnk_00 != NULL) { + this->mUnk_300.mUnk_04.func_0201f730(BMG_ID(BMGGroup_maingame, MsgIndex_Continue1)); + this->mUnk_53C.mUnk_04.func_0201f730(BMG_ID(BMGGroup_maingame, MsgIndex_MiniGameQuit)); + } else { + this->mUnk_300.mUnk_04.func_0201f730(BMG_ID(BMGGroup_maingame, MsgIndex_Continue1)); + this->mUnk_53C.mUnk_04.func_0201f730(BMG_ID(BMGGroup_maingame, MsgIndex_SaveAndQuit1)); + } + + this->mUnk_778 = true; +} + +void AdventureModeManager_15C_20_00::func_ov024_020ca658() { + if (this->mUnk_778) { + this->mUnk_020->mUnk_2B = false; + this->mUnk_020->mUnk_2A = false; + this->mUnk_024->mUnk_2B = false; + this->mUnk_024->mUnk_2A = false; + this->mUnk_53C.mUnk_04.func_0201f498(); + this->mUnk_300.mUnk_04.func_0201f498(); + this->mUnk_778 = false; + } +} + +void AdventureModeManager_15C_20_00::vfunc_08(Input *pButtons, TouchControl *pTouchControl) { + switch (this->mUnk_01C) { + case 1: + case 2: + this->mUnk_028.func_ov000_02063f64(); + this->mUnk_078.func_ov000_02063f64(); + + if (!this->mUnk_779 && !this->mUnk_0C8.mUnk_0C) { + this->mUnk_0C8.UpdateLogic(); + +#if IS_JP + GX_func_0008(®_BLDCNT, 0x2F, this->mUnk_0C8.func_0201edbc()); + + if (data_0204a110.mUnk_008 != 1) { + GX_func_0008(®_BLDCNT_SUB, 0x3F, this->mUnk_0C8.func_0201edbc()); + } +#else + GX_func_0008(®_BLDCNT, 0x0F, this->mUnk_0C8.func_0201edbc()); + + if (data_0204a110.mUnk_008 != 1) { + GX_func_0008(®_BLDCNT_SUB, 0x1F, this->mUnk_0C8.func_0201edbc()); + } +#endif + } + + if (!this->func_ov017_020c19a0()) { + if (this->mUnk_01C == 1) { + this->mUnk_01C = 3; + } else { + this->mUnk_01C = 0; + + if (data_ov024_020d8660->func_ov024_020c4d74() && this->mUnk_77A == 0x2A) { + data_ov024_020d8660->mUnk_00->vfunc_28(); + } + } + } + + break; + case 3: { + switch (data_0204a110.func_01ff9b50()) { + case 0x28: + data_ov000_020b5214.func_ov000_0206db44(0x04); + this->mUnk_77A = data_0204a110.func_01ff9b50(); + this->func_ov017_020c1c80(1); + break; + case 0x29: + if (data_ov024_020d8660 != NULL && data_ov024_020d8660->func_ov024_020c4d74()) { + data_ov000_020b5214.func_ov000_0206db44(0x04); + this->mUnk_77A = 0x2A; + this->func_ov017_020c1c80(0); + } else { + data_ov000_020b5214.func_ov000_0206db44(0x04); + this->mUnk_77A = data_0204a110.func_01ff9b50(); + this->func_ov017_020c1c80(0); + } + break; + default: + break; + } + + break; + } + default: + break; + } +} + +AdventureModeManager_15C_20_00::~AdventureModeManager_15C_20_00() {} diff --git a/src/024_MainGame/Game/AdventureModeManager_160_024.cpp b/src/024_MainGame/Game/AdventureModeManager_160_024.cpp new file mode 100644 index 00000000..c3693e62 --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_160_024.cpp @@ -0,0 +1,432 @@ +#include "MainGame/AdventureMode.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_0204e5f8.hpp" +#include "Unknown/UnkStruct_027e09a0.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_ov000_02067bc4.hpp" +#include "Unknown/UnkStruct_ov000_020b51b8.hpp" +#include "Unknown/UnkStruct_ov024_020d86a0.hpp" +#include "regs.h" + +extern "C" void func_02019b3c(); +extern "C" AdventureModeManager_160_18 *func_ov006_020b6ab0(void *, void *); + +//! TODO: this is fake according to GameModeTitleScreen::GameModeTitleScreen() +extern "C" AdventureModeManager_160_14 *func_ov001_020b6520(void *, void *, int); + +bool AdventureModeManager_160_4C::vfunc_0C() { + return data_0204a088->func_ov000_02061224(); +} + +AdventureModeManager_160::AdventureModeManager_160(GameModeManagerBase_104 *param1, AdventureModeManager_1B8 *param2) : + mUnk_0C(0), + mUnk_10(param1), + mUnk_14(NULL), + mUnk_18(0), + mUnk_1C(param2), + mUnk_20(0x1000), + mUnk_24(0, 0) { + data_0204a088->func_ov000_020611dc(this, 2); + this->mUnk_70.mUnk_00.mUnk_18 = 0; +} + +AdventureModeManager_160::~AdventureModeManager_160() {} + +void AdventureModeManager_160::vfunc_08(unk32 param1) { + switch (param1) { + case 1: + case 6: + case 7: + case 10: + if (data_0204a110.mUnk_008 == 1) { + this->mUnk_28.func_ov000_02066218(0x14); + this->mUnk_0C = 3; + this->mUnk_70.mUnk_26 = true; + } else if (data_0204a110.mUnk_DC0.mUnk_00) { + this->func_ov024_020c83bc(); + } else { + this->func_ov024_020c8454(); + } + return; + case 5: + case 8: + this->mUnk_0C = 0; + break; + default: + break; + } +} + +void AdventureModeManager_160::vfunc_0C(unk32 param1) { + switch (param1) { + case 1: + case 5: + case 6: + case 7: + case 8: + case 10: + switch (this->mUnk_0C) { + case 0: + case 1: + case 2: + break; + case 3: + if (this->mUnk_28.mUnk_0D == this->mUnk_28.mUnk_10) { + if (data_0204a110.mUnk_DC0.mUnk_00) { + this->func_ov024_020c83bc(); + } else { + this->func_ov024_020c8454(); + } + } + break; + case 4: + if (!data_0204a110.mUnk_DC0.mUnk_00) { + this->func_ov024_020c8454(); + } + break; + case 5: + if (data_0204a110.mUnk_DA8.mUnk_0C < 0) { + if (GetAdventureModeManager()->mAllowMapPaint) { + this->func_ov024_020c7cfc(); + } else { + this->func_ov024_020c7d4c(param1); + } + } + break; + case 6: + if (data_ov000_020b504c.func_ov000_02067f88(0, 1) != 0) { + this->func_ov024_020c7d4c(param1); + } + break; + case 7: + if (!data_0204a110.GetUnkDDC()->GetUnk0C()->UnkCheck1()) { + data_0204a088->func_ov000_02061230(); + } + break; + default: + break; + } + break; + case 0: + case 2: + case 3: + case 4: + case 9: + default: + break; + } + + if (param1 == 5) { + data_ov000_020b51b8.func_ov000_0206c608(2, 0, 0x1000); + } + + if (data_0204a110.mUnk_008 == 5) { + data_ov000_020b51b8.func_ov000_0206c608(2, 0, 0x1000); + } +} + +void AdventureModeManager_160::vfunc_10(unk32 param1, unk32 param2) { + if ((param1 == 5 || param1 == 8) && param2 == 2) { + this->func_ov024_020c7d4c(param1); + } +} + +void AdventureModeManager_160::vfunc_14(unk32 param1) { + if (param1 == 10) { + this->mUnk_14->mUnk_1C = 1; + this->mUnk_70.mUnk_25 = true; + } + + this->mUnk_0C = 8; +} + +void AdventureModeManager_160::func_ov024_020c7cfc() { + this->mUnk_0C = 6; + + UnkStruct_ov000_02067bc4::UnkStruct1 stack; + stack.mUnk_0D = 1; + data_ov000_020b504c.func_ov000_02067cf8(BMG_ID(BMGGroup_maingame, MsgIndex_MapPaintNotAllowed), 1, &stack); +} + +void AdventureModeManager_160::func_ov024_020c7d4c(unk32 param1) { + this->func_ov024_020c851c(param1); + + UnkStruct_ov019_020d24c8_28_258 local_30(0x5F, 0); + data_0204a110.GetUnkDDC()->func_0201e588(1, (s16) (-local_30.mUnk_0E / 2), 0, 8, 0); + this->mUnk_18->func_ov006_020b6c74(); + this->mUnk_0C = 7; + + if (param1 == 6) { + if (data_027e09a4->func_01ffd3d8()) { + data_0204a110.func_02019538(4, 1); + } else { + data_0204a110.func_02019538(0, 1); + } + } + + REG_BG2CNT_SUB = (REG_BG2CNT_SUB & ~0x03) | 0x01; +} + +void AdventureModeManager_160::vfunc_18(unk32 param1) { + this->mUnk_14 = NULL; + + switch (param1) { + case 1: + data_ov000_020b5214.func_ov000_0206db44(0x3C); + this->mUnk_1C->func_ov024_020d1364(); + this->func_ov024_020c8428(); + + if (!GetAdventureModeManager()->func_ov024_020c681c() && !data_ov024_020d86a0->mUnk_0F) { + this->mUnk_70.mUnk_27 = true; + } + break; + case 8: + data_ov000_020b5214.func_ov000_0206db44(0x49); + // fallthrough + case 5: + this->mUnk_1C->func_ov024_020d1364(); + this->func_ov024_020c8428(); + this->mUnk_70.mUnk_00.mUnk_1A = 0x14; + this->mUnk_70.mUnk_00.func_0201bbcc(-1, 1); + data_0204e5f8.func_0201b9a8(&this->mUnk_70); + this->mUnk_70.mUnk_24 = 2; + break; + case 7: + data_ov000_020b5214.func_ov000_0206db44(0x3C); + this->mUnk_1C->func_ov024_020d1364(); + this->func_ov024_020c8428(); + break; + default: + break; + } + + data_ov000_020b504c.func_ov000_02067e60(0, 1); +} + +void AdventureModeManager_160::vfunc_1C(unk32 param1) { + switch (param1) { + case 1: + case 7: + switch (this->mUnk_0C) { + case 9: + if (!data_0204a110.GetUnkDDC()->GetUnk0C()->UnkCheck1() && gSaveManager.IsUnk210()) { + data_0204a110.mUnk_DA8.func_0201cf30(); + this->mUnk_18 = 0; + this->mUnk_0C = 10; + } + + break; + case 10: + if (data_0204a110.mUnk_DA8.mUnk_0C < 0) { + if (this->mUnk_70.mUnk_27 || this->mUnk_70.mUnk_25) { + this->func_ov024_020c84c4(); + } else { + unk32 temp = this->mUnk_20; + + if (temp != 0x1000) { + Vec2s copy; + copy.x = this->mUnk_24.x; + copy.y = this->mUnk_24.y; + + Vec2s sp18; + sp18.x = copy.x; + sp18.y = copy.y; + + Vec2s sp14; + sp14.x = 0; + sp14.y = 0; + + data_0204a110.mUnk_DC0.func_0201db14(0x1000, temp, &sp14, &sp18, 6, 3); + } + + this->mUnk_0C = 11; + } + } + + break; + case 1: + if (this->mUnk_4C.mUnk_0D == this->mUnk_4C.mUnk_10) { + unk32 temp = this->mUnk_20; + + if (temp != 0x1000) { + Vec2s copy; + copy.x = this->mUnk_24.x; + copy.y = this->mUnk_24.y; + + Vec2s sp10; + sp10.x = copy.x; + sp10.y = copy.y; + + Vec2s spC; + spC.x = 0; + spC.y = 0; + + data_0204a110.mUnk_DC0.func_0201db14(0x1000, temp, &spC, &sp10, 6, 3); + } + + this->mUnk_0C = 11; + } + + break; + case 11: + if (!data_0204a110.mUnk_DC0.mUnk_08->mUnk_0A) { + if (this->mUnk_70.mUnk_26) { + this->mUnk_28.func_ov000_02066218(0x14); + this->mUnk_0C = 12; + } else { + this->func_ov024_020c8484(); + } + } + + break; + case 12: + if (this->mUnk_28.mUnk_0D == this->mUnk_28.mUnk_10) { + this->func_ov024_020c8484(); + } + + break; + default: + break; + } + break; + case 5: + case 8: + switch (this->mUnk_0C) { + case 9: + if (!data_0204a110.GetUnkDDC()->GetUnk0C()->UnkCheck1() && gSaveManager.IsUnk210()) { + if (this->mUnk_70.mUnk_00.mUnk_0D == this->mUnk_70.mUnk_00.mUnk_10) { + this->mUnk_70.mUnk_24--; + + if (this->mUnk_70.mUnk_24 == 0) { + this->mUnk_18 = 0; + data_0204a088->func_ov000_02061224(); + this->mUnk_70.mUnk_00.func_0201bba4(0, 0x14); + data_0204e5f8.func_0201b9a8(&this->mUnk_70); + this->mUnk_0C = 2; + } + } + } + + break; + case 2: + if (this->mUnk_70.mUnk_00.mUnk_0D == this->mUnk_70.mUnk_00.mUnk_10) { + data_0204a088->func_ov000_02061230(); + } + + break; + } + break; + default: + break; + } +} + +void AdventureModeManager_160::vfunc_20(unk32 param1, unk32 param2) { + if (param1 != 1) { + return; + } + + data_0204a088->func_ov000_02061248(); + + if (this->mUnk_70.mUnk_27) { + this->mUnk_70.mUnk_27 = false; + SceneIndex sceneIndex = GetAdventureModeManager()->mUnk_1C4.sceneIndex; + + if (data_027e09a4->func_01ffd3d8()) { + GetAdventureModeManager()->func_ov024_020c555c(1); + } else { + if (data_027e09a0->func_ov000_02070378(sceneIndex)) { + GetAdventureModeManager()->func_ov024_020c555c(4); + } else { + GetAdventureModeManager()->func_ov024_020c555c(0); + } + } + + GetAdventureModeManager()->func_ov024_020c53e8(); + + if (data_027e09a0->func_ov000_02070378(sceneIndex)) { + GetAdventureModeManager()->func_ov024_020c671c(); + } else { + GetAdventureModeManager()->func_ov024_020c66c0(); + } + + if (this->mUnk_70.mUnk_26) { + this->mUnk_28.vfunc_0C(); + } + } else { + this->mUnk_70.mUnk_25 = false; + } +} + +void AdventureModeManager_160::vfunc_24() {} + +void AdventureModeManager_160::func_ov024_020c83bc() { + data_0204a110.mUnk_DC0.func_0201dd58(6, 3); + this->mUnk_0C = 4; + + this->mUnk_20 = data_0204a110.mUnk_DC0.mUnk_08->func_0201ec30(); + + Vec2s local_14; + func_0201e8d4(&local_14, data_0204a110.mUnk_DC0.mUnk_04); + this->mUnk_24.x = local_14.x; + + Vec2s local_18; + func_0201e8d4(&local_18, data_0204a110.mUnk_DC0.mUnk_04); + this->mUnk_24.y = local_18.y; +} + +void AdventureModeManager_160::func_ov024_020c8428() { + data_0204a110.GetUnkDDC()->func_0201e698(); + this->mUnk_18->func_ov006_020b6c80(); + this->mUnk_0C = 9; + func_02019b3c(); +} + +void AdventureModeManager_160::func_ov024_020c8454() { + data_ov000_020b5214.func_ov000_0206db44(0x3B); + data_0204a110.mUnk_DA8.func_0201ced8(); + this->mUnk_0C = 5; +} + +void AdventureModeManager_160::func_ov024_020c8484() { + this->mUnk_0C = 0; + data_0204a088->func_ov000_02061230(); + this->mUnk_70.mUnk_26 = false; + this->mUnk_20 = 0x1000; + Vec2s_Clear(&this->mUnk_24); +} + +void AdventureModeManager_160::func_ov024_020c84c4() { + this->mUnk_4C.func_0201bb84(0x14, 2, 0x14); + + if (this->mUnk_70.mUnk_25) { + this->mUnk_4C.mUnk_18 = true; + this->mUnk_4C.mUnk_19 = false; + } else { + this->mUnk_4C.mUnk_18 = false; + this->mUnk_4C.mUnk_19 = true; + } + + data_0204e5f8.func_0201b9a8(&this->mUnk_4C); + this->mUnk_0C = 1; +} + +void AdventureModeManager_160::func_ov024_020c851c(unk32 param1) { + data_0204a088->func_ov000_02061248(); + + //! TODO: fake match + this->mUnk_14 = func_ov001_020b6520(&this->mUnk_10, this->mUnk_1C, param1); + this->mUnk_18 = func_ov006_020b6ab0(&this->mUnk_10, this->mUnk_1C); + + if (param1 == 1 || param1 == 6) { + this->mUnk_18->func_ov006_020b6bcc(); + } + + this->mUnk_14->mUnk_40 = this->mUnk_18; + + if (param1 == 10) { + this->mUnk_14->mUnk_51 = true; + this->mUnk_14->func_ov006_020b6938(); + } +} diff --git a/src/024_MainGame/Game/AdventureModeManager_170_024.cpp b/src/024_MainGame/Game/AdventureModeManager_170_024.cpp new file mode 100644 index 00000000..3131fa32 --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_170_024.cpp @@ -0,0 +1,81 @@ +#include "MainGame/AdventureMode.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_0204e5f8.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" +#include "Unknown/UnkStruct_ov000_02067bc4.hpp" +#include "Unknown/UnkStruct_ov000_020b4f70.hpp" +#include "Unknown/UnkStruct_ov000_020b5214.hpp" +#include "regs.h" + +extern "C" GameModeManagerBase_104 *func_ov008_020b6520(void *); + +bool AdventureModeManager_170_14::vfunc_0C() { + return data_0204a088->func_ov000_02061224(); +} + +AdventureModeManager_170::AdventureModeManager_170(GameModeManagerBase_104 *param1) : + mUnk_0C(0), + mUnk_10(param1), + mUnk_38(0) { + data_0204a088->func_ov000_020611dc(this, 4); +} + +AdventureModeManager_170::~AdventureModeManager_170() {} + +void AdventureModeManager_170::vfunc_08(unk32 param1) { + if (param1 == 1) { + this->mUnk_14.func_0201bb84(0x3C, 2, 0x3C); + data_0204e5f8.func_0201b9a8(&this->mUnk_14); + } +} + +void AdventureModeManager_170::vfunc_0C(unk32 param1) { + if (param1 != 1) { + return; + } + + if (this->mUnk_14.mUnk_0D == this->mUnk_14.mUnk_10) { + data_0204a088->func_ov000_02061230(); + } + + if (this->mUnk_38 > 0) { + this->mUnk_38--; + + if (this->mUnk_38 == 0) { + REG_DISPCNT = (REG_DISPCNT & ~0x1F00) | 0x1000; + REG_DISPCNT_SUB = (REG_DISPCNT_SUB & ~0x1F00) | 0x1000; + } + } +} + +void AdventureModeManager_170::vfunc_10(unk32 param1, unk32 param2) { + if (data_0204a110.mUnk_008 == 1) { + data_0204a110.mUnk_DFE = true; + } + + data_0204e5f8.mUnk_38 = 0; + + if (data_ov000_020b4f70 != NULL) { + data_ov000_020b4f70->func_ov000_020662e8(); + } + + data_ov000_020b504c.func_ov000_02067bf0()->vfunc_18(1); + data_0204a110.func_02019538(0x1C, 1); + data_0204a088->func_ov000_02061248(); + data_027e0ce0->mUnk_34->func_ov008_020b6a50(); + + this->mUnk_0C = func_ov008_020b6520(&this->mUnk_10); + data_0204a088->mUnk_120 = 0; + this->mUnk_38 = 2; + data_ov000_020b5214.func_ov000_0206d83c(0x0A); +} + +void AdventureModeManager_170::vfunc_18(unk32 param1) { + this->mUnk_0C = 0; +} + +void AdventureModeManager_170::vfunc_24() { + data_0204e5f8.mUnk_38 = true; + data_0204a088->mUnk_120 = -1; +} diff --git a/src/024_MainGame/Game/AdventureModeManager_174_024.cpp b/src/024_MainGame/Game/AdventureModeManager_174_024.cpp new file mode 100644 index 00000000..73c7c715 --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_174_024.cpp @@ -0,0 +1,181 @@ +#include "MainGame/AdventureMode.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_0204e5f8.hpp" + +extern "C" void func_ov002_020b6d50(void *); +extern "C" void func_ov002_020b6d68(void *); +extern "C" unk32 func_ov002_020b6cf4(void *, unk32 param1); + +THUMB_BEGIN + +AdventureModeManager_174::AdventureModeManager_174(GameModeManagerBase_104 *param1) : + AdventureModeManager_174_Base(param1), + mUnk_B8(0) { + data_0204a088->func_ov000_020611dc(this, 5); +} + +void AdventureModeManager_174::vfunc_08(unk32 param1) { + switch (param1) { + case 1: + case 6: + this->mUnk_10.func_0201bb84(0x14, 2, 0x14); + this->mUnk_10.mUnk_18 = 1; + data_0204e5f8.func_0201b9a8(&this->mUnk_10); + break; + case 0: + case 2: + case 3: + case 4: + case 5: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + default: + break; + } +} + +void AdventureModeManager_174::vfunc_0C(unk32 param1) { + switch (param1) { + case 1: + case 6: + if (this->mUnk_10.mUnk_0D == this->mUnk_10.mUnk_10) { + data_0204a088->func_ov000_02061230(); + } + break; + case 0: + case 2: + case 3: + case 4: + case 5: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + default: + break; + } +} + +void AdventureModeManager_174::vfunc_10(unk32 param1, unk32 param2) { + if (param2 != 1) { + return; + } + + GetAdventureModeManager()->func_ov024_020c699c(); + + switch (param1) { + case 1: + case 6: + this->func_ov024_020c88f0(); + this->mUnk_B8 = func_ov002_020b6cf4(&this->mUnk_0C, 0); + func_ov002_020b6d50(&this->mUnk_BC); + break; + case 2: + case 8: + data_0204a110.func_02019528(); + data_0204a110.func_02018d78(3); + data_0204a088->func_ov000_02061248(); + func_ov002_020b6d68(&this->mUnk_BC); + this->mUnk_B8 = func_ov002_020b6cf4(&this->mUnk_0C, 2); + break; + case 12: + case 13: + this->mUnk_B8 = func_ov002_020b6cf4(&this->mUnk_0C, 0); + break; + case 0: + case 3: + case 4: + case 5: + case 7: + case 9: + case 10: + case 11: + default: + break; + } +} + +void AdventureModeManager_174::vfunc_18(unk32 param1) { + switch (param1) { + case 1: + this->mUnk_10.func_0201bb84(0x14, 2, 0x14); + this->mUnk_10.mUnk_18 = 1; + data_0204e5f8.func_0201b9a8(&this->mUnk_10); + break; + case 2: + this->mUnk_10.func_0201bb84(0x14, 2, 0x14); + this->mUnk_10.mUnk_18 = 0; + data_0204e5f8.func_0201b9a8(&this->mUnk_10); + break; + case 8: + case 12: + case 13: + default: + break; + } +} + +void AdventureModeManager_174::vfunc_1C(unk32 param1) { + switch (param1) { + case 1: + case 2: + if (this->mUnk_10.mUnk_0D == this->mUnk_10.mUnk_10) { + data_0204a088->func_ov000_02061230(); + } + break; + case 8: + case 12: + case 13: + default: + break; + } +} + +void AdventureModeManager_174::vfunc_20(unk32 param1, unk32 param2) { + if (param2 != 1) { + return; + } + + this->mUnk_B8 = 0; + + switch (param1) { + case 1: + this->func_ov024_020c8b2c(); + break; + case 2: + func_ov002_020b6d50(&this->mUnk_BC); + data_0204a088->func_ov000_02061248(); + data_0204a110.func_02018d78(5); + GetAdventureModeManager()->func_ov024_020c555c(5); + GetAdventureModeManager()->func_ov024_020c53e8(); + GetAdventureModeManager()->vfunc_38(SceneIndex_f_hyral, 0, 0, 0); + data_0204a110.func_02019528(); + data_0204a110.func_02019538(0x0F, 1); + break; + case 8: + data_0204a110.func_02018d78(5); + func_ov002_020b6d50(&this->mUnk_BC); + data_0204a088->func_ov000_02061248(); + data_0204a110.func_02019528(); + data_0204a110.func_02019538(0x0F, 1); + data_0204a110.GetUnkD9C()->func_0201c494(0); + break; + default: + break; + } +} + +void AdventureModeManager_174::vfunc_24() {} + +THUMB_END + +AdventureModeManager_174::~AdventureModeManager_174() {} diff --git a/src/024_MainGame/Game/AdventureModeManager_174_Base_024.cpp b/src/024_MainGame/Game/AdventureModeManager_174_Base_024.cpp new file mode 100644 index 00000000..9a326623 --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_174_Base_024.cpp @@ -0,0 +1,168 @@ +#include "MainGame/AdventureMode.hpp" +#include "System/OverlayManager.hpp" +#include "Unknown/UnkStruct_02049f8c.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_027e095c.hpp" +#include "Unknown/UnkStruct_027e0998.hpp" +#include "Unknown/UnkStruct_027e09ac.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "Unknown/UnkStruct_027e0cdc.hpp" +#include "Unknown/UnkStruct_ov000_020b4f70.hpp" + +THUMB_BEGIN + +bool AdventureModeManager_174_Base_10::vfunc_0C() { + data_0204a088->func_ov000_02061224(); +} + +bool AdventureModeManager_174_Base_10::vfunc_10() { + data_0204a088->func_ov000_02061224(); +} + +AdventureModeManager_174_Base::AdventureModeManager_174_Base(GameModeManagerBase_104 *param1) : + mUnk_0C(param1) { + this->mUnk_A4 = 99; + this->mUnk_A6 = 99; + this->mUnk_A8 = 0; + this->mUnk_AA = 0; + this->mUnk_B0 = 0x1000; + this->mUnk_B4.x = 0; + this->mUnk_B4.y = 0; + this->mUnk_3C.func_ov000_02071f98(); +} + +void AdventureModeManager_174_Base::func_ov024_020c88f0() { + this->mUnk_38 = data_0204a110.mUnk_DF0; + if (data_0204a110.mUnk_DF0 != 0) { + data_0204a110.func_02018be0(0); + } + + data_027e095c->func_ov000_020592ec(); + data_027e095c->func_ov000_020592a0(); + data_ov000_020b504c.func_ov000_02067bf0()->vfunc_18(1); + data_0204a110.func_02019528(); + this->mUnk_34 = data_0204a110.mUnk_008; + data_0204a110.func_02018d78(3); + data_0204a088->func_ov000_02061248(); + + if (data_0204a110.mUnk_DF4 == 0) { + data_0204a110.func_02018c2c(); + } + + if (data_ov000_020b4f70 != NULL) { + data_ov000_020b4f70->func_ov000_0206654c(); + } + + if (data_0204a110.mUnk_DC0.mUnk_00) { + data_0204a110.mUnk_DC0.func_0201dd58(1, 3); + this->mUnk_B0 = data_0204a110.mUnk_DC0.mUnk_08->func_0201ec30(); + + Vec2s auStack_14; + func_0201e8d4(&auStack_14, data_0204a110.mUnk_DC0.mUnk_04); + this->mUnk_B4.x = auStack_14.x; + + Vec2s auStack_18; + func_0201e8d4(&auStack_18, data_0204a110.mUnk_DC0.mUnk_04); + this->mUnk_B4.y = auStack_18.y; + } + + data_ov000_020b504c.func_ov000_02068068(1); + data_0204a088->mUnk_120 = NULL; + + UnkStruct_027e09ac *ptr = data_027e09ac; + this->mUnk_3C = data_027e09ac->mUnk_014; + this->mUnk_A4 = ptr->mUnk_14C; + this->mUnk_A6 = ptr->mUnk_14E; + this->mUnk_A8 = ptr->mUnk_150; + this->mUnk_AA = ptr->mUnk_152; + + ptr->func_ov000_020726f0(0x21, 0, 0); + data_02049ba0.Unload(OverlaySlot_17); + data_ov000_020b504c.func_ov000_02067b20(); +} + +void AdventureModeManager_174_Base::func_ov024_020c8b2c() { + data_027e09ac->func_ov000_020729c4(&this->mUnk_3C, this->mUnk_A6, this->mUnk_A4, this->mUnk_A8, this->mUnk_AA); + + if (this->mUnk_38 != data_0204a110.mUnk_DF0) { + data_0204a110.func_02018be0(this->mUnk_38); + } + + data_027e0cdc->func_ov000_02082a48(0); + data_027e095c->func_ov000_020592ec(); + data_027e095c->func_ov000_020592a0(); + data_0204a088->func_ov000_02061248(); + data_027e0cd8->func_ov000_02081c28(); + + AdventureModeManager *pAdvMgr = GetAdventureModeManager(); + if (data_027e09a4->func_01ffd3d8()) { + GetAdventureModeManager()->func_ov024_020c555c(1); + } else { + if (data_027e0998->func_ov024_020c7354()) { + GetAdventureModeManager()->func_ov024_020c555c(4); + } else { + GetAdventureModeManager()->func_ov024_020c555c(0); + } + } + + GetAdventureModeManager()->func_ov024_020c53e8(); + data_0204a110.func_02019528(); + data_0204a110.func_02018d78(0); + + if (this->mUnk_34 == 1) { + data_0204a110.mUnk_DFE = true; + } + + if (data_027e09a4->IsDarkRealm()) { + data_0204a110.func_02019538(6, 1); + } else { + if (data_027e09a4->func_01ffd3d8()) { + data_0204a110.func_02019538(4, 1); + } else { + data_0204a110.func_02019538(0, 1); + } + } + + if (data_027e09a4->func_01ffd3d8() || data_027e0998->func_ov024_020c7354()) { + pAdvMgr->func_ov024_020c671c(); + } else { + pAdvMgr->func_ov024_020c66c0(); + } + + if (data_0204a110.mUnk_DF4 == 1) { + data_0204a110.func_02018c2c(); + } + + if (data_ov000_020b4f70 != NULL) { + data_ov000_020b4f70->func_ov000_020665b8(); + } + + unk32 temp = this->mUnk_B0; + if (this->mUnk_B0 != 0x1000) { + Vec2s copy; + copy.x = this->mUnk_B4.x; + copy.y = this->mUnk_B4.y; + + Vec2s sp18; + sp18.x = copy.x; + sp18.y = copy.y; + + Vec2s sp14; + sp14.x = 0; + sp14.y = 0; + + data_0204a110.mUnk_DC0.func_0201db14(0x1000, temp, &sp14, &sp18, 1, 3); + + this->mUnk_B0 = 0x1000; + this->mUnk_B4.x = 0; + this->mUnk_B4.y = 0; + } + + data_ov000_020b504c.func_ov000_02068068(0); + data_0204a088->mUnk_120 = 0xffff; + data_02049f8c.mUnk_00 = this->mUnk_AC; + data_ov000_020b504c.func_ov000_02067b60(); +} + +THUMB_END diff --git a/src/024_MainGame/Game/AdventureModeManager_178_024.cpp b/src/024_MainGame/Game/AdventureModeManager_178_024.cpp new file mode 100644 index 00000000..904e60ff --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_178_024.cpp @@ -0,0 +1,30 @@ +#include "MainGame/AdventureMode.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" + +extern "C" unk32 func_ov004_020b697c(void *, unk32 param1); + +THUMB_BEGIN + +AdventureModeManager_178::AdventureModeManager_178(GameModeManagerBase_104 *param1) : + AdventureModeManager_178_Base(param1), + mUnk_B8(0) { + data_0204a088->func_ov000_020611dc(this, 0x0D); +} + +void AdventureModeManager_178::vfunc_10(unk32 param1, unk32 param2) { + if (param2 == 1) { + data_0204a088->func_ov000_02061248(); + this->mUnk_B8 = func_ov004_020b697c(&this->mUnk_0C, 0); + } +} + +void AdventureModeManager_178::vfunc_20(unk32 param1, unk32 param2) { + if (param2 == 1) { + this->mUnk_B8 = 0; + data_0204a088->func_ov000_02061248(); + data_0204a110.func_02019528(); + } +} + +THUMB_END diff --git a/src/024_MainGame/Game/AdventureModeManager_178_Base_024.cpp b/src/024_MainGame/Game/AdventureModeManager_178_Base_024.cpp new file mode 100644 index 00000000..0747dc12 --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_178_Base_024.cpp @@ -0,0 +1,36 @@ +#include "MainGame/AdventureMode.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204e5f8.hpp" + +THUMB_BEGIN + +AdventureModeManager_178_Base::AdventureModeManager_178_Base(GameModeManagerBase_104 *param1) : + AdventureModeManager_174_Base(param1) {} + +void AdventureModeManager_178_Base::vfunc_08(unk32 param1) { + if (param1 == 1 || param1 == 5) { + this->mUnk_10.func_0201bb84(0x14, 2, 0x14); + data_0204e5f8.func_0201b9a8(&this->mUnk_10); + } +} + +void AdventureModeManager_178_Base::vfunc_0C(unk32 param1) { + if (this->mUnk_10.mUnk_0D == this->mUnk_10.mUnk_10) { + data_0204a088->func_ov000_02061230(); + } +} + +void AdventureModeManager_178_Base::vfunc_18(unk32 param1) { + if (param1 == 1 || param1 == 5) { + this->mUnk_10.func_0201bb84(0x14, 2, 0x14); + data_0204e5f8.func_0201b9a8(&this->mUnk_10); + } +} + +void AdventureModeManager_178_Base::vfunc_1C(unk32 param1) { + if (this->mUnk_10.mUnk_0D == this->mUnk_10.mUnk_10) { + data_0204a088->func_ov000_02061230(); + } +} + +THUMB_END diff --git a/src/024_MainGame/Game/AdventureModeManager_180_024.cpp b/src/024_MainGame/Game/AdventureModeManager_180_024.cpp new file mode 100644 index 00000000..04fa9f69 --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_180_024.cpp @@ -0,0 +1,243 @@ +#include "MainGame/AdventureMode.hpp" +#include "MapObject/MapObjectManager.hpp" +#include "MapObject/MapObjectUnkSPTB.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_0204e5f8.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_ov000_020b4f70.hpp" + +extern "C" unk32 func_ov014_020b6520(void *, int, int); + +THUMB_BEGIN + +bool AdventureModeManager_180_18::vfunc_0C(void) { + data_0204a088->func_ov000_02061224(); +} + +AdventureModeManager_180::AdventureModeManager_180(GameModeManagerBase_104 *param1) : + mUnk_0C(0), + mUnk_10(0), + mUnk_14(param1), + mUnk_40(0x14), + mUnk_44(false), + mUnk_45(false) { + data_0204a088->func_ov000_020611dc(this, 0x0C); +} + +AdventureModeManager_180::~AdventureModeManager_180() {} + +void AdventureModeManager_180::vfunc_08(unk32 param1) { + this->mUnk_0C = 1; + + switch (param1) { + case 5: + this->mUnk_18.mUnk_18 = true; + this->mUnk_18.mUnk_19 = true; + this->mUnk_18.func_0201bb84(0x10, 2, 0x10); + data_0204e5f8.func_0201b9a8(&this->mUnk_18); + break; + case 1: + this->mUnk_18.mUnk_18 = false; + this->mUnk_18.mUnk_19 = true; + this->mUnk_18.func_0201bb84(0x14, 2, 0x14); + data_0204e5f8.func_0201b9a8(&this->mUnk_18); + break; + default: + break; + } +} + +void AdventureModeManager_180::vfunc_0C(unk32 param1) { + switch (param1) { + case 5: + if (this->mUnk_18.mUnk_0D == this->mUnk_18.mUnk_10) { + this->mUnk_0C = 0; + data_0204a088->func_ov000_02061230(); + } + break; + case 1: + switch (this->mUnk_0C) { + case 1: + if (data_0204a110.mUnk_008 != 1 && this->mUnk_44) { + this->mUnk_44 = false; + this->func_ov024_020c9430(1, this->mUnk_40); + } + + if (this->mUnk_18.mUnk_0D == this->mUnk_18.mUnk_10) { + this->mUnk_0C = 2; + this->func_ov024_020c957c(); + } + break; + case 2: + if (data_0204a110.mUnk_DA8.mUnk_0C < 0) { + this->mUnk_0C = 0; + data_0204a088->func_ov000_02061230(); + } + break; + default: + break; + } + break; + default: + break; + } +} + +#pragma opt_dead_assignments off +void AdventureModeManager_180::vfunc_10(unk32 param1, unk32 param2) { + if (param2 != 1) { + return; + } + + unk32 r6 = 0; + + switch (param1) { + case 5: + data_0204a110.func_02019538(0x0D, 1); + this->func_ov024_020c9430(0, -1); + break; + case 1: + this->mUnk_44 = true; + data_0204a110.func_02019538(0x0E, 1); + + if (data_ov000_020b4f70 != NULL) { + data_ov000_020b4f70->func_ov000_0206654c(); + } + + if (data_0204a110.mUnk_008 == 1) { + this->mUnk_45 = true; + data_0204a110.mUnk_DFE = true; + } + break; + default: + break; + } +} +#pragma opt_dead_assignments reset + +void AdventureModeManager_180::func_ov024_020c9430(unk32 param1, unk32 param2) { + data_0204a088->func_ov000_02061248(); + this->mUnk_10 = func_ov014_020b6520(&this->mUnk_14, param1, param2); +} + +void AdventureModeManager_180::vfunc_18(unk32 param1) { + switch (param1) { + case 5: + this->mUnk_18.func_0201bb84(0x10, 2, 0x10); + data_0204e5f8.func_0201b9a8(&this->mUnk_18); + break; + case 1: + this->func_ov024_020c95c4(); + break; + default: + break; + } +} + +void AdventureModeManager_180::vfunc_1C(unk32 param1) { + switch (param1) { + case 5: + if (this->mUnk_18.mUnk_0D == this->mUnk_18.mUnk_10) { + data_0204a088->func_ov000_02061230(); + } + break; + case 1: + switch (this->mUnk_0C) { + case 3: + if (data_0204a110.mUnk_DA8.mUnk_0C < 0) { + this->mUnk_0C = 1; + this->mUnk_18.func_0201bb84(0x14, 2, 0x14); + data_0204e5f8.func_0201b9a8(&this->mUnk_18); + } + break; + case 1: + if (this->mUnk_18.mUnk_0D == this->mUnk_18.mUnk_10) { + data_0204a088->func_ov000_02061230(); + } + break; + default: + break; + } + break; + default: + break; + } +} + +void AdventureModeManager_180::vfunc_20(unk32 param1, unk32 param2) { + if (param2 != 1) { + return; + } + + this->mUnk_10 = 0; + data_0204a088->func_ov000_02061248(); + + switch (param1) { + case 5: + break; + case 1: + if (this->mUnk_45) { + this->mUnk_45 = false; + data_0204a110.mUnk_DFE = true; + } + + GetAdventureModeManager()->func_ov024_020c555c(0); + GetAdventureModeManager()->func_ov024_020c53e8(); + + if (data_027e09a4->func_01ffd3d8()) { + GetAdventureModeManager()->func_ov024_020c671c(); + } else { + GetAdventureModeManager()->func_ov024_020c66c0(); + } + + if (data_ov000_020b4f70 != NULL) { + data_ov000_020b4f70->func_ov000_020665b8(); + } + break; + default: + break; + } +} + +void AdventureModeManager_180::vfunc_24() {} + +void AdventureModeManager_180::func_ov024_020c957c() { + data_0204a110.mUnk_DA8.func_0201ced8(); + this->mUnk_0C = 2; + + struct { + void *ptr; + unk32 actorId; + } local_10; + local_10.ptr = &data_ov000_020b34c4; + local_10.actorId = MapObjectId_SPTB; + + MapObject **ppMapObj = + gpMapObjManager->func_01fff520((UnkStruct_ov000_020b34c4 *) &local_10, gpMapObjManager->mMapObjTable); + if (gpMapObjManager->mUnk_08 != ppMapObj) { + MapObjectUnkSPTB *pStampStation = (MapObjectUnkSPTB *) *ppMapObj; + pStampStation->func_ov031_0210b9c4(); + } +} + +void AdventureModeManager_180::func_ov024_020c95c4() { + data_0204a110.mUnk_DA8.func_0201cf30(); + this->mUnk_0C = 3; + + struct { + void *ptr; + unk32 actorId; + } local_10; + local_10.ptr = &data_ov000_020b34c4; + local_10.actorId = MapObjectId_SPTB; + + MapObject **ppMapObj = + gpMapObjManager->func_01fff520((UnkStruct_ov000_020b34c4 *) &local_10, gpMapObjManager->mMapObjTable); + if (gpMapObjManager->mUnk_08 != ppMapObj) { + MapObjectUnkSPTB *pStampStation = (MapObjectUnkSPTB *) *ppMapObj; + pStampStation->func_ov031_0210b9e0(); + } +} + +THUMB_END diff --git a/src/024_MainGame/Game/AdventureModeManager_184_024.cpp b/src/024_MainGame/Game/AdventureModeManager_184_024.cpp new file mode 100644 index 00000000..87ade45b --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_184_024.cpp @@ -0,0 +1,167 @@ +#include "MainGame/AdventureMode.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_0204e5f8.hpp" +#include "Unknown/UnkStruct_020d8698.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_ov000_02067bc4.hpp" +#include "Unknown/UnkStruct_ov000_020b4f70.hpp" +#include "Unknown/UnkStruct_ov024_020d8660.hpp" + +extern "C" AdventureModeManager_184_10 *func_ov010_020b65fc(void *); +extern "C" AdventureModeManager_184_10 *func_ov010_020b6520(void *); +extern "C" AdventureModeManager_184_14 *func_ov010_020b88c4(void *); + +THUMB_BEGIN + +AdventureModeManager_184::AdventureModeManager_184(GameModeManagerBase_104 *param1) { + this->mUnk_0C = param1; + this->mUnk_10 = NULL; + this->mUnk_14 = NULL; + this->mUnk_18 = false; + data_0204a088->func_ov000_020611dc(this, 6); +} + +AdventureModeManager_184::~AdventureModeManager_184() {} + +void AdventureModeManager_184::vfunc_08(unk32 param1) { + if (!data_027e09a4->func_01ffd3d8()) { + this->func_ov024_020c979c(param1); + } +} + +void AdventureModeManager_184::vfunc_0C(unk32 param1) { + if (this->mUnk_10 == NULL && this->mUnk_18 && data_0204a110.func_02019548()) { + this->mUnk_18 = false; + + if (data_ov024_020d8660->mUnk_1C == 5) { + data_027e0994->mUnk_004.func_0201c0c4(0x25); + } + + data_0204a088->func_ov000_02061248(); + MapObjectId mapObjId = data_027e09b8->mUnk_0C->mMapObjId; + + if (data_027e09a4->func_01ffd3d8() || + (data_027e09b8->func_ov000_020732dc(2) && + (mapObjId != MapObjectId_WDST || + (mapObjId == MapObjectId_WDST && !data_ov000_020b504c.func_ov000_02067f88(0, 0))))) { + this->mUnk_10 = func_ov010_020b65fc(&this->mUnk_0C); + } else { + this->mUnk_10 = func_ov010_020b6520(&this->mUnk_0C); + } + + if (data_ov024_020d8660 != NULL && data_ov024_020d8660->mUnk_1C == 5) { + this->mUnk_14 = func_ov010_020b88c4(&this->mUnk_0C); + } + + this->mUnk_10->func_ov010_020b7008(); + data_ov024_020d8698->func_ov024_020cd368(0, 0); + data_ov024_020d8698->func_ov024_020cd3f0(0); + } + + if (this->mUnk_10 != NULL && this->mUnk_10->vfunc_20()) { + data_0204a088->func_ov000_02061230(); + } +} + +void AdventureModeManager_184::vfunc_10(unk32 param1, unk32 param2) { + this->func_ov024_020c979c(param1); +} + +void AdventureModeManager_184::vfunc_14(unk32 param1) {} + +void AdventureModeManager_184::func_ov024_020c979c(unk32 param1) { + this->mUnk_18 = true; + + if (param1 != 1) { + return; + } + + MapObjectId mapObjId = data_027e09b8->mUnk_0C->mMapObjId; + + if (data_027e09a4->func_01ffd3d8()) { + if (data_027e09a4->IsDarkRealm()) { + data_0204a110.func_02019538(7, 0); + } else { + data_0204a110.func_02019538(5, 0); + } + } else if (data_027e09b8->func_ov000_020732dc(2) && + (mapObjId != MapObjectId_WDST || + (mapObjId == MapObjectId_WDST && !data_ov000_020b504c.func_ov000_02067f88(0, 0)))) { + data_0204a110.func_02019538(2, 0); + } else { + data_0204a110.func_02019538(1, 0); + } +} + +void AdventureModeManager_184::vfunc_18(unk32 param1) { + switch (param1) { + case 1: + this->mUnk_10->func_ov010_020b7054(); + + if (data_ov000_020b504c.func_ov000_02067f88(0, 0)) { + data_ov024_020d8698->func_ov024_020cd3a4(); + data_ov024_020d8698->func_ov024_020cd400(); + } + break; + case 2: + data_ov024_020d8698->func_ov024_020cd3a4(); + data_ov024_020d8698->func_ov024_020cd400(); + GetAdventureModeManager()->func_ov024_020c6c60(); + data_ov000_020b504c.func_ov000_02067f5c(0); + break; + default: + break; + } + + if (GetAdventureModeManager()->mUnk_1BC != NULL && param1 != 1 && param1 != 2) { + GetAdventureModeManager()->mUnk_1BC->mUnk_34 = 0; + } +} + +void AdventureModeManager_184::vfunc_1C(unk32 param1) { + switch (param1) { + case 1: + if (this->mUnk_10 != NULL && this->mUnk_10->vfunc_20()) { + if (data_027e09a4->func_01ffd3d8()) { + data_0204a088->func_ov000_02061224(); + } else { + data_0204a088->func_ov000_02061230(); + } + } + break; + case 5: + case 8: + case 9: + break; + default: + break; + } +} + +void AdventureModeManager_184::vfunc_20(unk32 param1, unk32 param2) { + switch (param1) { + case 1: + this->mUnk_10 = NULL; + this->mUnk_14 = NULL; + break; + case 5: + case 8: + case 9: + data_ov024_020d8698->func_ov024_020cd3a4(); + data_ov024_020d8698->func_ov024_020cd400(); + GetAdventureModeManager()->func_ov024_020c6c60(); + data_ov000_020b504c.func_ov000_02067f5c(0); + break; + default: + break; + } +} + +void AdventureModeManager_184::vfunc_24() { + this->mUnk_10 = NULL; + this->mUnk_14 = NULL; +} + +THUMB_END diff --git a/src/024_MainGame/Game/AdventureModeManager_18C_024.cpp b/src/024_MainGame/Game/AdventureModeManager_18C_024.cpp new file mode 100644 index 00000000..e11b9409 --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_18C_024.cpp @@ -0,0 +1,405 @@ +#include "MainGame/AdventureMode.hpp" +#include "Save/AdventureFlags.hpp" +#include "Unknown/UnkStruct_02049f8c.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_0204e5f8.hpp" +#include "Unknown/UnkStruct_027e0998.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_ov000_020b5214.hpp" +#include "regs.h" + +extern "C" AdventureModeManager_18C_10 *func_ov011_020b6520(void *, int); +extern "C" void func_ov011_020b84f0(s16 *param1, void *, unk32 param2); +extern "C" void func_02019b3c(); + +THUMB_BEGIN + +AdventureModeManager_18C_14::AdventureModeManager_18C_14() {} + +bool AdventureModeManager_18C_14::vfunc_0C(void) { + return data_0204a088->func_ov000_02061224(); +} + +bool AdventureModeManager_18C_14::vfunc_10(void) { + return data_0204a088->func_ov000_02061224(); +} + +AdventureModeManager_18C::AdventureModeManager_18C(GameModeManagerBase_104 *param1) : + mUnk_0C(param1), + mUnk_10(NULL), + mUnk_38(false), + mUnk_39(false), + mUnk_3A(false), + mUnk_3C(0x1000) { + this->mUnk_40.x = 0; + this->mUnk_40.y = 0; + this->mUnk_44 = 0x1000; + this->mUnk_48.x = 0; + this->mUnk_48.y = 0; + data_0204a088->func_ov000_020611dc(this, 8); +} + +AdventureModeManager_18C::~AdventureModeManager_18C() {} + +void AdventureModeManager_18C::vfunc_08(unk32 param1) { + switch (param1) { + case 1: + this->func_ov024_020ca034(); + break; + case 6: + this->func_ov024_020ca034(); + break; + case 2: + break; + case 5: + this->func_ov024_020ca034(); + break; + default: + break; + } +} + +void AdventureModeManager_18C::vfunc_0C(unk32 param1) { + switch (param1) { + case 6: + switch (this->mUnk_54) { + case 1: + if (this->mUnk_14.mUnk_0D == this->mUnk_14.mUnk_10) { + data_ov000_020b5214.func_ov000_0206db44(0x43); + data_0204a110.mUnk_DA8.func_0201ced8(); + this->mUnk_54 = 2; + } + + if (data_0204a110.mUnk_008 != 1 && this->mUnk_38) { + this->mUnk_38 = false; + this->func_ov024_020c9c6c(); + } + break; + case 2: + if (data_0204a110.mUnk_DA8.mUnk_0C < 0) { + data_0204a088->func_ov000_02061230(); + this->mUnk_54 = 3; + } + break; + default: + break; + } + break; + case 1: + if (this->mUnk_14.mUnk_0D == this->mUnk_14.mUnk_10) { + data_0204a088->func_ov000_02061230(); + this->mUnk_54 = 3; + } + + if (data_0204a110.mUnk_008 != 1 && this->mUnk_38) { + this->mUnk_38 = false; + this->func_ov024_020c9c6c(); + } + break; + case 2: + break; + case 5: + if (this->mUnk_14.mUnk_0D == this->mUnk_14.mUnk_10) { + data_0204a088->func_ov000_02061230(); + this->mUnk_54 = 3; + } + break; + default: + break; + } +} + +void AdventureModeManager_18C::vfunc_10(unk32 param1, unk32 param2) { + if (param2 != 1) { + return; + } + + data_0204a088->func_ov000_02061248(); + + switch (param1) { + case 1: + case 6: + this->mUnk_38 = 1; + + if (data_0204a110.mUnk_DC0.mUnk_00) { + data_0204a110.mUnk_DC0.func_0201dd58(1, 3); + this->mUnk_3C = data_0204a110.mUnk_DC0.mUnk_08->func_0201ec30(); + + Vec2s auStack_14; + func_0201e8d4(&auStack_14, data_0204a110.mUnk_DC0.mUnk_04); + this->mUnk_40.x = auStack_14.x; + + Vec2s auStack_18; + func_0201e8d4(&auStack_18, data_0204a110.mUnk_DC0.mUnk_04); + this->mUnk_40.y = auStack_18.y; + } + + if (data_0204a110.mUnk_008 == 1) { + this->mUnk_39 = true; + data_0204a110.mUnk_DFE = true; + } + break; + case 5: + this->func_ov024_020c9c6c(); + break; + case 2: { + this->func_ov024_020c9c6c(); + unk32 temp = this->mUnk_44; + + Vec2s copy; + copy.x = this->mUnk_48.x; + copy.y = this->mUnk_48.y; + + Vec2s sp14; + sp14.x = 0; + sp14.y = 0; + + Vec2s sp18; + sp18.x = copy.x; + sp18.y = copy.y; + + data_0204a110.mUnk_DC0.func_0201db14(temp, 0x1000, &sp18, &sp14, 8, 4); + + this->mUnk_44 = 0x1000; + this->mUnk_48.x = 0; + this->mUnk_48.y = 0; + break; + } + + default: + break; + } + + this->mUnk_50 = data_02049f8c.mUnk_00; + data_02049f8c.mUnk_00 = 0; +} + +void AdventureModeManager_18C::func_ov024_020c9c6c() { + GetAdventureModeManager()->func_ov024_020c699c(); + data_027e0994->mUnk_004.func_0201c0c4(0x65); + + if (this->mUnk_3A) { + this->mUnk_10 = func_ov011_020b6520(&this->mUnk_0C, this->mUnk_4C); + this->mUnk_10->func_ov011_020b89f0(this->mUnk_4C); + } else { + unk32 var_r4 = -1; + + if (data_027e09b8->HasAdventureFlag(AdventureFlag_ObtainedFireGlyph)) { + var_r4 = 3; + } else if (data_027e09b8->HasAdventureFlag(AdventureFlag_ObtainedOceanGlyph)) { + var_r4 = 2; + } else if (data_027e09b8->HasAdventureFlag(AdventureFlag_ObtainedSnowGlyph)) { + var_r4 = 1; + } else if (data_027e09b8->HasAdventureFlag(AdventureFlag_ObtainedForestGlyph)) { + var_r4 = 0; + } + + this->mUnk_10 = func_ov011_020b6520(&this->mUnk_0C, var_r4); + } + + REG_DISPCNT_SUB = (REG_DISPCNT_SUB & ~0x1F00) | 0x1C00; + REG_BG2CNT_SUB = (REG_BG2CNT_SUB & ~0x03) | 0x03; + REG_BG3CNT_SUB = (REG_BG3CNT_SUB & ~0x03) | 0x02; +} + +void AdventureModeManager_18C::vfunc_14(unk32 param1) { + this->mUnk_10->func_ov011_020b88ac(); + this->mUnk_54 = 3; +} + +void AdventureModeManager_18C::vfunc_18(unk32 param1) { + switch (param1) { + case 1: + data_ov000_020b5214.func_ov000_0206db44(0x44); + data_ov000_020b5214.func_ov000_0206db44(0x45); + + if (this->mUnk_3A) { + this->func_ov024_020ca034(); + } else { + data_0204a110.mUnk_DA8.func_0201cf30(); + this->mUnk_54 = 4; + } + break; + case 5: + data_ov000_020b5214.func_ov000_0206db44(0x44); + this->func_ov024_020ca034(); + break; + case 2: { + if (this->mUnk_10->mUnk_10EC - 4 <= 3) { + s16 stack[4]; + func_ov011_020b84f0(stack, this->mUnk_10, this->mUnk_10->mUnk_10EC); + data_0204a110.mUnk_DC0.func_0201dc10(stack, 8, 4); + } + data_ov000_020b5214.func_ov000_0206db44(0x48); + this->func_ov024_020ca034(); + break; + } + case 0: + default: + break; + } +} + +void AdventureModeManager_18C::vfunc_1C(unk32 param1) { + switch (param1) { + case 1: + switch (this->mUnk_54) { + case 4: + if (data_0204a110.mUnk_DA8.mUnk_0C < 0) { + this->func_ov024_020ca034(); + } + break; + case 1: + if (this->mUnk_14.mUnk_0D == this->mUnk_14.mUnk_10) { + data_0204a088->func_ov000_02061230(); + this->mUnk_54 = 0; + } + break; + default: + break; + } + + break; + case 5: + if (this->mUnk_14.mUnk_0D == this->mUnk_14.mUnk_10) { + data_0204a088->func_ov000_02061230(); + this->mUnk_54 = 0; + } + + break; + case 2: + if (this->mUnk_14.mUnk_0D == this->mUnk_14.mUnk_10) { + this->mUnk_54 = 0; + } + + break; + case 0: + default: + break; + } +} + +void AdventureModeManager_18C::vfunc_20(unk32 param1, unk32 param2) { + if (param2 != 1) { + return; + } + + switch (param1) { + case 1: { + if (!data_027e09a4->func_01ffd3d8()) { + GetAdventureModeManager()->mUnk_004.func_0201c0c4(0x68); + } + + if (data_027e09a4->func_01ffd3d8()) { + GetAdventureModeManager()->func_ov024_020c555c(1); + } else if (data_027e0998->func_ov024_020c7354()) { + GetAdventureModeManager()->func_ov024_020c555c(4); + } else { + GetAdventureModeManager()->func_ov024_020c555c(0); + } + + GetAdventureModeManager()->func_ov024_020c53e8(); + + if (data_027e09a4->func_01ffd3d8() || data_027e0998->func_ov024_020c7354()) { + GetAdventureModeManager()->func_ov024_020c671c(); + } else { + GetAdventureModeManager()->func_ov024_020c66c0(); + } + + if (this->mUnk_39 != 0) { + this->mUnk_39 = false; + data_0204a110.mUnk_DFE = true; + } + + unk32 temp = this->mUnk_3C; + + if (temp != 0x1000) { + Vec2s copy; + copy.x = this->mUnk_40.x; + copy.y = this->mUnk_40.y; + + Vec2s sp18; + sp18.x = copy.x; + sp18.y = copy.y; + + Vec2s sp14; + sp14.x = 0; + sp14.y = 0; + + data_0204a110.mUnk_DC0.func_0201db14(0x1000, temp, &sp14, &sp18, 1, 3); + + this->mUnk_3C = 0x1000; + this->mUnk_40.x = 0; + this->mUnk_40.y = 0; + } + + break; + } + case 2: { + u32 temp_r6 = this->mUnk_10->mUnk_10EC; + u8 temp_r7 = this->mUnk_10->mUnk_10E9; + + switch (temp_r6) { + case 4: + case 5: + case 6: + case 7: + this->mUnk_44 = data_0204a110.mUnk_DC0.mUnk_08->func_0201ec30(); + + Vec2s auStack_14; + func_0201e8d4(&auStack_14, data_0204a110.mUnk_DC0.mUnk_04); + this->mUnk_48.x = auStack_14.x; + + Vec2s auStack_18; + func_0201e8d4(&auStack_18, data_0204a110.mUnk_DC0.mUnk_04); + this->mUnk_48.y = auStack_18.y; + + data_0204a110.mUnk_DC0.func_0201d628(); + GetAdventureModeManager()->func_ov024_020c555c(4); + GetAdventureModeManager()->func_ov024_020c53e8(); + GetAdventureModeManager()->func_ov024_020c6770(temp_r6, temp_r7, 0, 4); + break; + default: + GetAdventureModeManager()->func_ov024_020c555c(3); + GetAdventureModeManager()->func_ov024_020c53e8(); + GetAdventureModeManager()->vfunc_38(temp_r6, temp_r7, 0, 0); + break; + } + + break; + } + case 5: + default: + break; + } + + data_02049f8c.mUnk_00 = this->mUnk_50; + data_0204a088->func_ov000_02061248(); + func_02019b3c(); +} + +void AdventureModeManager_18C::vfunc_24() { + this->mUnk_10 = NULL; + this->mUnk_3A = false; +} + +void AdventureModeManager_18C::func_ov024_020ca034() { + this->mUnk_14.func_0201bb84(0x14, 2, 0x14); + this->mUnk_14.mUnk_18 = false; + this->mUnk_14.mUnk_19 = true; + data_0204e5f8.func_0201b9a8(&this->mUnk_14); + this->mUnk_54 = true; +} + +void AdventureModeManager_18C::func_ov024_020ca068(unk32 param1) { + this->mUnk_3A = true; + this->mUnk_4C = param1; +} + +bool AdventureModeManager_18C::func_ov024_020ca074() { + return this->mUnk_3A; +} + +THUMB_END diff --git a/src/024_MainGame/Game/AdventureModeManager_190_024.cpp b/src/024_MainGame/Game/AdventureModeManager_190_024.cpp new file mode 100644 index 00000000..221b9a70 --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_190_024.cpp @@ -0,0 +1,99 @@ +#include "MainGame/AdventureMode.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204e5f8.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "regs.h" + +extern "C" AdventureModeManager_190_10 *func_ov011_020b8e54(void *, int); + +THUMB_BEGIN + +bool AdventureModeManager_190_14::vfunc_0C() { + return data_0204a088->func_ov000_02061224(); +} + +bool AdventureModeManager_190_38::vfunc_0C() { + return this->mpParent->func_ov024_020ca280(); +} + +AdventureModeManager_190::AdventureModeManager_190(GameModeManagerBase_104 *param1) : + mUnk_0C(param1), + mUnk_10(NULL), + mUnk_38(this), + mUnk_60(-1) { + data_0204a088->func_ov000_020611dc(this, 0x15); +} + +void AdventureModeManager_190::vfunc_08(unk32 param1) { + if (param1 == 1) { + this->func_ov024_020ca21c(); + } +} + +void AdventureModeManager_190::vfunc_0C(unk32 param1) { + if (param1 == 1 && this->mUnk_14.mUnk_0D == this->mUnk_14.mUnk_10) { + data_0204a088->func_ov000_02061230(); + } +} + +void AdventureModeManager_190::vfunc_10(unk32 param1, unk32 param2) { + if (param1 == 1) { + data_0204a088->func_ov000_02061248(); + this->mUnk_10 = func_ov011_020b8e54(&this->mUnk_0C, this->mUnk_60); + REG_DISPCNT_SUB = (REG_DISPCNT_SUB & ~0x1F00) | 0x1800; + } +} + +void AdventureModeManager_190::vfunc_18(unk32 param1) { + if (param1 == 1) { + this->func_ov024_020ca21c(); + } +} + +void AdventureModeManager_190::vfunc_1C(unk32 param1) { + if (param1 == 1 && this->mUnk_14.mUnk_0D == this->mUnk_14.mUnk_10) { + data_0204a088->func_ov000_02061230(); + } +} + +void AdventureModeManager_190::vfunc_20(unk32 param1, unk32 param2) { + if (param1 == 1) { + this->mUnk_10 = NULL; + data_0204a088->func_ov000_02061248(); + + if (data_027e09a4->func_01ffd3d8()) { + GetAdventureModeManager()->func_ov024_020c555c(1); + GetAdventureModeManager()->func_ov024_020c53e8(); + } else { + GetAdventureModeManager()->func_ov024_020c555c(0); + GetAdventureModeManager()->func_ov024_020c53e8(); + } + + if (data_027e09a4->func_01ffd3d8()) { + GetAdventureModeManager()->func_ov024_020c671c(); + } else { + GetAdventureModeManager()->func_ov024_020c66c0(); + } + } +} + +void AdventureModeManager_190::func_ov024_020ca21c() { + this->mUnk_14.func_0201bb84(0x14, 2, 0x14); + this->mUnk_14.mUnk_18 = false; + this->mUnk_14.mUnk_19 = true; + data_0204e5f8.func_0201b9a8(&this->mUnk_14); +} + +bool AdventureModeManager_190::func_ov024_020ca24c(unk32 param1) { + this->mUnk_60 = param1; + this->mUnk_38.func_0201bb84(0x14, 2, 0x14); + this->mUnk_38.mUnk_18 = false; + this->mUnk_38.mUnk_19 = true; + data_0204e5f8.func_0201b9a8(&this->mUnk_38); +} + +bool AdventureModeManager_190::func_ov024_020ca280() { + return this->mUnk_10->func_ov011_020b8f20(this->mUnk_60); +} + +THUMB_END diff --git a/src/024_MainGame/Game/AdventureModeManager_1B8_Base_024.cpp b/src/024_MainGame/Game/AdventureModeManager_1B8_Base_024.cpp new file mode 100644 index 00000000..b4e66334 --- /dev/null +++ b/src/024_MainGame/Game/AdventureModeManager_1B8_Base_024.cpp @@ -0,0 +1,676 @@ +#include "MainGame/AdventureMode.hpp" +#include "Save/SaveManager.hpp" +#include "System/SysNew.hpp" +#include "Unknown/UnkMemFuncs.h" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_027e0ce0.hpp" +#include "Unknown/UnkStruct_ov000_020b52b4.hpp" +#include "Unknown/UnkStruct_ov017_020c3f70.hpp" + +extern "C" { +void GX_LoadBG0Char(void *ptr, u32 offset, u32 size); +void GX_LoadBG1Char(void *ptr, u32 offset, u32 size); +void GX_LoadBG2Char(void *ptr, u32 offset, u32 size); +void GX_LoadBG3Char(void *ptr, u32 offset, u32 size); + +void GXS_LoadBG0Char(void *ptr, u32 offset, u32 size); +void GXS_LoadBG1Char(void *ptr, u32 offset, u32 size); +void GXS_LoadBG2Char(void *ptr, u32 offset, u32 size); +void GXS_LoadBG3Char(void *ptr, u32 offset, u32 size); + +void GXS_BeginLoadBGExtPltt(void); +void GXS_LoadBGExtPltt(void *ptr, u32 offset, u32 size); +void GXS_EndLoadBGExtPltt(void); + +void DC_func_0004(void *, int); +void DC_func_0002(); + +void func_ov000_0205a950(u8 bgType, bool isTopScreen, bool); +void func_ov000_0205a944(u8 bgType, bool isTopScreen, bool); +void func_01ffb644(q20 x, q20 y); +unk32 func_01ffb558(); + +void func_02029058(void *, void *); +u32 func_0202955c(void *, int, void *, int, void *); +} + +static const bool data_ov024_020d7544[] = {true, false, true}; +static const u8 data_ov024_020d7547[] = {0x03, 0x01, 0x02, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00}; +static u16 data_ov024_020d869c; + +//! TODO figure this out +struct SomeSaveFileStruct { + /* 00 */ void *unk_00; + + SomeSaveFileStruct(unk32 param1); + ~SomeSaveFileStruct(); +}; + +static const AdventureModeManager_1B8_Base_1C data_ov024_020d8200(0x14, 0x08, 0xD8, 0xB0); + +AdventureModeManager_1B8_Base::AdventureModeManager_1B8_Base(u8 bgType, bool param2, + const AdventureModeManager_1B8_Base_1C *param3, bool param4, + bool param5) { + this->mUnk_00 = ADVMGR_UNK; + this->mUnk_04 = ADVMGR_UNK; + this->mUnk_08 = false; + this->mUnk_09 = param5; + this->mUnk_0A = false; + this->mUnk_0B = 0xBF; + this->mUnk_0C = 0x00; + this->mBGType = bgType; + this->mIsTopScreen = param2; + this->mUnk_10 = param4; + this->mUnk_14 = GetUnkValue_ImplS(param3->mUnk_06, param4); + this->mUnk_18 = (u8 *) ::operator new(this->mUnk_14, HeapIndex_1, 4); + MI_CpuCopy16((void *) param3, &this->mUnk_1C, sizeof(AdventureModeManager_1B8_Base_1C)); + this->func_ov024_020d0698(); +} + +AdventureModeManager_1B8_Base::~AdventureModeManager_1B8_Base() { + delete this->mUnk_18; +} + +void AdventureModeManager_1B8_Base::func_ov024_020d0698() { + _MI_CpuFill(0, this->mUnk_18, this->mUnk_14); + this->mUnk_0A = true; + this->mUnk_0D = true; + this->mUnk_00 = ADVMGR_UNK; + this->mUnk_04 = ADVMGR_UNK; +} + +void AdventureModeManager_1B8_Base::func_ov024_020d06d0() { + if (this->mIsTopScreen && data_0204a110.mUnk_008 == 1) { + return; + } + + if (this->mUnk_08) { + func_ov000_0205a950(this->mBGType, this->mIsTopScreen, this->mUnk_09); + } else { + func_ov000_0205a944(this->mBGType, this->mIsTopScreen, this->mUnk_09); + } + + this->mUnk_0D = true; + this->func_ov024_020d0a64(); +} + +void AdventureModeManager_1B8_Base::func_ov024_020d072c(unk8 *param1) { + if (this->mUnk_0A) { + this->func_ov024_020d0a64(); + } +} + +static inline void SetUnkValue4(int a, int b, int *pVal) { + if (a <= b) { + if (*pVal < 0) { + *pVal = -*pVal; + } + } else if (*pVal > 0) { + *pVal = -*pVal; + } +} + +// https://decomp.me/scratch/LhXwS +bool AdventureModeManager_1B8_Base::func_ov024_020d0744(s32 arg1, s32 arg2, s32 arg3, s32 arg4, u8 arg5, u8 arg6) { + bool sp10; + s32 sp8; + s32 temp_r1; + s32 temp_r2; + s32 var_r11; + + sp10 = false; + + if (arg6 == 0) { + return false; + } + + temp_r2 = arg3 - arg1; + temp_r1 = arg4 - arg2; + + if (temp_r2 == 0 && temp_r1 == 0) { + sp10 = this->func_ov024_020d0924(arg3, arg4, arg5, arg6); + } else { + if (temp_r2 >= 0) { + sp8 = temp_r2; + } else { + sp8 = -temp_r2; + } + + s32 var_r11 = (temp_r1 >= 0) ? temp_r1 : -temp_r1; + + if (sp8 >= var_r11) { + func_01ffb644(INT_TO_Q20(temp_r1), INT_TO_Q20(temp_r2)); + s32 var_r11_2 = (arg1 <= arg3) ? 1 : -1; + unk32 var_r5 = INT_TO_Q20(arg2); + unk32 var_r6 = func_01ffb558(); + SetUnkValue4(arg2, arg4, &var_r6); + + for (int i = 0; i <= sp8; i++) { + if (this->func_ov024_020d0924(arg1, ROUND_Q20(var_r5), arg5, arg6)) { + sp10 = true; + } + + arg1 += var_r11_2; + var_r5 += var_r6; + } + } else { + func_01ffb644(INT_TO_Q20(temp_r2), INT_TO_Q20(temp_r1)); + unk32 var_r5 = INT_TO_Q20(arg1); + s32 var_r11_2 = (arg2 <= arg4) ? 1 : -1; + unk32 var_r6 = func_01ffb558(); + SetUnkValue4(arg1, arg3, &var_r6); + + for (int i = 0; i <= var_r11; i++) { + if (this->func_ov024_020d0924(ROUND_Q20(var_r5), arg2, arg5, arg6)) { + sp10 = true; + } + + var_r5 += var_r6; + arg2 += var_r11_2; + } + } + } + + return sp10; +} + +bool AdventureModeManager_1B8_Base::func_ov024_020d0924(unk32 param1, unk32 param2, u8 param3, u8 param4) { + unk32 var_r4; + unk32 var_r5; + unk32 var_r6; + unk32 var_r7; + unk32 var_r7_2; + unk32 var_r8; + + if (param4 == 0) { + return false; + } + + if (this->mUnk_10 && param3 >= 0x10) { + param3 &= 0x0F; + } + + unk32 temp = param4 >> 1; + + if ((param4 & 1) == 0) { + var_r7 = temp - 1; + } else { + var_r7 = temp; + } + + var_r5 = param1 - var_r7; + if (var_r5 <= this->mUnk_1C.mUnk_00) { + var_r5 = this->mUnk_1C.mUnk_00; + } + + var_r6 = param1 + temp; + if (var_r6 >= this->mUnk_1C.mUnk_00 + this->mUnk_1C.mUnk_04 - 1) { + var_r6 = this->mUnk_1C.mUnk_00 + this->mUnk_1C.mUnk_04 - 1; + } + + if (var_r5 > var_r6) { + return false; + } + + var_r7_2 = param2 - var_r7; + var_r8 = param2 + temp; + + if (var_r7_2 <= this->mUnk_1C.mUnk_02) { + var_r7_2 = this->mUnk_1C.mUnk_02; + } + + if (var_r8 >= this->mUnk_1C.mUnk_02 + this->mUnk_1C.mUnk_06 - 1) { + var_r8 = this->mUnk_1C.mUnk_02 + this->mUnk_1C.mUnk_06 - 1; + } + + if (var_r7_2 > var_r8) { + return false; + } + + for (; var_r7_2 <= var_r8; var_r7_2++) { + for (var_r4 = var_r5; var_r4 <= var_r6; var_r4++) { + unk32 index = this->func_ov024_020d0db4(var_r4, var_r7_2); + u8 *pBuffer = this->mUnk_18; + + if (this->mUnk_10) { + u8 value = pBuffer[index]; + + if (var_r4 & 1) { + pBuffer[index] = (value & 0x0F) | (param3 * 16); + } else { + pBuffer[index] = (value & 0xF0) | param3; + } + } else { + pBuffer[index] = param3; + } + } + + if (var_r7_2 < this->mUnk_0B) { + this->mUnk_0B = var_r7_2; + } + + if (var_r7_2 > this->mUnk_0C) { + this->mUnk_0C = var_r7_2; + } + } + + this->mUnk_0A = true; + return true; +} + +// https://decomp.me/scratch/e7SZ5 +void AdventureModeManager_1B8_Base::func_ov024_020d0a64() { + u32 var_r2; + s32 var_r2_2; + s32 var_r3; + u32 var_r6; + s32 var_r6_2; + s32 var_r7; + u8 *temp_r7; + s32 var_r8; + + if (this->mUnk_0D) { + this->mUnk_0B = this->mUnk_1C.mUnk_02; + this->mUnk_0C = 0xBF - this->mUnk_1C.mUnk_02; + + if (this->func_ov024_020d0e98()) { + if (this->mUnk_10) { + var_r6 = (this->mUnk_1C.mUnk_02 * 0x100) / 2; + } else { + var_r6 = this->mUnk_1C.mUnk_02 * 0x100; + } + + if (var_r6 != 0) { + SomeSaveFileStruct sp4(var_r6); + _MI_CpuFill(0, sp4.unk_00, var_r6); + this->TryLoadBGChar(sp4.unk_00, GetUnkValue2(), var_r6); + } + + var_r6 = this->mUnk_1C.mUnk_02 + this->mUnk_1C.mUnk_06; + var_r7 = GetUnkValue(0xC0 - var_r6); + + if (var_r7 != 0) { + SomeSaveFileStruct sp0(var_r7); + _MI_CpuFill(0, sp0.unk_00, var_r7); + this->TryLoadBGChar(sp0.unk_00, GetUnkValue2() + GetUnkValue(var_r6), var_r7); + } + } + + this->mUnk_0D = false; + } + + if (this->func_ov024_020d0e98()) { + this->mUnk_0B = this->mUnk_0B - this->mUnk_1C.mUnk_02; + this->mUnk_0C = this->mUnk_0C - this->mUnk_1C.mUnk_02; + } + + this->mUnk_0B = (this->mUnk_0B / 8) * 8; + this->mUnk_0C = (((this->mUnk_0C / 8) + 1) * 8) - 1; + + if (this->mUnk_10) { + var_r6_2 = (this->mUnk_0B * 256) / 2; + } else { + var_r6_2 = (this->mUnk_0B * 256); + } + + temp_r7 = &this->mUnk_18[var_r6_2]; + + if (this->func_ov024_020d0e98()) { + if (this->mUnk_10) { + var_r6_2 += (this->mUnk_1C.mUnk_02 * 0x100) / 2; + } else { + var_r6_2 += this->mUnk_1C.mUnk_02 * 0x100; + } + } + + var_r2_2 = GetUnkValue2(); + + if (this->mUnk_10) { + var_r3 = ((this->mUnk_0C - this->mUnk_0B + 1) * 0x100) / 2; + } else { + var_r3 = (this->mUnk_0C - this->mUnk_0B + 1) * 0x100; + } + + this->TryLoadBGChar(temp_r7, var_r6_2 + var_r2_2, var_r3); + + this->mUnk_0A = false; + this->mUnk_0B = 0xBF; + this->mUnk_0C = 0; +} + +void AdventureModeManager_1B8_Base::TryLoadBGChar(void *ptr, u32 offset, u32 size) { + DC_func_0002(); + + if (!this->mIsTopScreen) { + switch (this->mBGType) { + case 0: + GX_LoadBG0Char(ptr, offset, size); + break; + case 1: + GX_LoadBG1Char(ptr, offset, size); + break; + case 2: + GX_LoadBG2Char(ptr, offset, size); + break; + case 3: + GX_LoadBG3Char(ptr, offset, size); + break; + default: + break; + } + } else if (data_0204a110.mUnk_008 != 1) { + switch (this->mBGType) { + case 0: + GXS_LoadBG0Char(ptr, offset, size); + break; + case 1: + GXS_LoadBG1Char(ptr, offset, size); + break; + case 2: + GXS_LoadBG2Char(ptr, offset, size); + break; + case 3: + GXS_LoadBG3Char(ptr, offset, size); + break; + default: + break; + } + } +} + +unk32 AdventureModeManager_1B8_Base::func_ov024_020d0db4(unk32 param1, unk32 param2) { + u32 temp_r0; + s32 temp_r2; + s32 temp_r3; + + temp_r3 = param2 - this->mUnk_1C.mUnk_02; + temp_r2 = (param1 >> 3) + ((temp_r3 >> 3) << 5); + temp_r0 = temp_r3 << 0x1D; + + if (this->mUnk_10) { + return (temp_r2 << 5) + (temp_r0 >> 0x1B) + ((param1 & 0x07) >> 1); + } + + return (param1 & 0x07) + ((temp_r2 << 6) + (temp_r0 >> 0x1A)); +} + +bool AdventureModeManager_1B8_Base::func_ov024_020d0df8(unk32 param1, unk32 param2) { + bool var_r4 = false; + + if (param1 >= 0 && param1 < 0x100 && param2 >= 0 && param2 < 0xC0) { + u8 temp_r0 = this->mUnk_18[this->func_ov024_020d0db4(param1, param2)]; + + if (this->mUnk_10) { + if (param1 & 1) { + if (temp_r0 & 0xF0) { + var_r4 = true; + } + } else { + if (temp_r0 & 0x0F) { + var_r4 = true; + } + } + } else { + if (temp_r0 != 0) { + var_r4 = true; + } + } + } + + return var_r4; +} + +void AdventureModeManager_1B8_Base::func_ov024_020d0e64(void *ptr, u32 size) { + DC_func_0004(ptr, size * 2); + GXS_BeginLoadBGExtPltt(); + GXS_LoadBGExtPltt(ptr, 0x4000, size * 2); + GXS_EndLoadBGExtPltt(); +} + +bool AdventureModeManager_1B8_Base::func_ov024_020d0e98() { + if (this->mUnk_1C.mUnk_02 > 0 || this->mUnk_1C.mUnk_06 < 0xC0) { + return true; + } + + return false; +} + +void AdventureModeManager_1B8_Base::func_ov024_020d0ec0(s32 *pFlags, s32 position, bool doSet) { + if (doSet) { + SET_FLAG_ALT(pFlags, position); + } else { + UNSET_FLAG_ALT(pFlags, position); + } +} + +bool AdventureModeManager_1B8_Base::func_ov024_020d0f0c(s32 *pFlags, s32 position) { + if (GET_FLAG_ALT(pFlags, position)) { + return true; + } + + return false; +} + +unk32 AdventureModeManager_1B8_Base::func_ov024_020d0f2c(unk32 param1, unk32 param2) { + return data_ov024_020d8200.mUnk_04 * (param2 - data_ov024_020d8200.mUnk_02) + (param1 - data_ov024_020d8200.mUnk_00); +} + +AdventureModeManager_1B8::AdventureModeManager_1B8(u8 bgType, bool param2, bool param3) : + AdventureModeManager_1B8_Base(bgType, param2, &data_ov024_020d8200, param3, false) { + this->mUnk_24 = 0xFF; + this->mUnk_28 = NULL; + this->func_ov024_020d0e64(&data_ov024_020d869c, sizeof(data_ov024_020d869c)); +} + +AdventureModeManager_1B8::~AdventureModeManager_1B8() {} + +void AdventureModeManager_1B8::func_ov024_020d0fb4(unk32 param1, unk32 param2, u8 param3, u8 param4, TouchControl *param5) { + param1 -= data_0204a110.mUnk_E02; + + if (CHECK_TOUCH_FLAGS(param5, TouchFlag_TouchedNow) || + (param5->mState.touch && this->mUnk_00 == ADVMGR_UNK && this->mUnk_04 == ADVMGR_UNK)) { + if (this->func_ov024_020d0924(param1, param2, param3, param4)) { + this->mUnk_00 = param1; + this->mUnk_04 = param2; + + if (param3 == 0) { + data_ov000_020b52b4.func_ov000_0206f778(param1, param2, 0x42); + } else { + data_ov000_020b52b4.func_ov000_0206f778(param1, param2, 0x41); + } + } else { + this->mUnk_00 = ADVMGR_UNK; + this->mUnk_04 = ADVMGR_UNK; + } + } else if (param5->mState.touch) { + if (this->func_ov024_020d0744(this->mUnk_00, this->mUnk_04, param1, param2, param3, param4)) { + this->mUnk_00 = param1; + this->mUnk_04 = param2; + + if (param3 == 0) { + data_ov000_020b52b4.func_ov000_0206f778(param1, param2, 0x42); + } else { + data_ov000_020b52b4.func_ov000_0206f778(param1, param2, 0x41); + } + + data_027e0ce0->func_ov017_020bd69c(); + } else { + this->mUnk_00 = ADVMGR_UNK; + this->mUnk_04 = ADVMGR_UNK; + } + } else { + this->mUnk_00 = ADVMGR_UNK; + this->mUnk_04 = ADVMGR_UNK; + } +} + +void AdventureModeManager_1B8::func_ov024_020d114c() { + this->mUnk_00 = ADVMGR_UNK; + this->mUnk_04 = ADVMGR_UNK; +} + +bool AdventureModeManager_1B8::func_ov024_020d1160() { + SomeSaveFileStruct sp1C(0x4A90); + + s32 *unk_00 = (s32 *) sp1C.unk_00; + void *sp14 = (void *) ((u8 *) sp1C.unk_00 + 0x1290); + void *unk_28 = this->mUnk_28; + + this->func_ov024_020d14a8((AdventureModeManager_1B8_Base_1C *) &data_ov024_020d8200, 0x1290, unk_00); + + for (int spC = 0; spC < 4; spC++) { + u32 temp_r0 = func_0202955c(unk_00, 0x1290, unk_28, 4, sp14); + + if (temp_r0 != 0 && temp_r0 <= 0xFFC) { + if (0xFFC - temp_r0 != 0) { + MI_CpuFill8((void *) ((u8 *) unk_28 + temp_r0), 0, 0xFFC - temp_r0); + } + + return true; + } + + if (spC < 3) { + int sp8 = data_ov024_020d8200.mUnk_00 + data_ov024_020d8200.mUnk_04; + int sp4 = data_ov024_020d8200.mUnk_02 + data_ov024_020d8200.mUnk_06; + int var_r5; + int var_r6; + int var_r7; + int var_r8; + bool var_r9; + int var_r10; + + for (var_r8 = data_ov024_020d8200.mUnk_02; var_r8 < sp4; var_r8 += 2) { + for (var_r10 = data_ov024_020d8200.mUnk_00; var_r10 < sp8; var_r10 += 2) { + var_r7 = 0; + + for (var_r5 = 0; var_r5 < 2; var_r5++) { + for (var_r6 = 0; var_r6 < 2; var_r6++) { + int result = AdventureModeManager_1B8_Base::func_ov024_020d0f2c(var_r10 + var_r6, var_r8 + var_r5); + if (AdventureModeManager_1B8_Base::func_ov024_020d0f0c(unk_00, result)) { + var_r7++; + } + } + } + + if (data_ov024_020d7547[spC] == var_r7) { + var_r9 = data_ov024_020d7544[spC]; + + for (var_r5 = 0; var_r5 < 2; var_r5++) { + for (var_r6 = 0; var_r6 < 2; var_r6++) { + int result = + AdventureModeManager_1B8_Base::func_ov024_020d0f2c(var_r10 + var_r6, var_r8 + var_r5); + AdventureModeManager_1B8_Base::func_ov024_020d0ec0(unk_00, result, var_r9); + } + } + } + } + } + } + } + + return false; +} + +void AdventureModeManager_1B8::func_ov024_020d1364() { + if (this->mUnk_24 == 0xFF) { + return; + } + + if (this->mUnk_24 >= 0x78) { + return; + } + + if (!this->func_ov024_020d1160()) { + return; + } + + gSaveManager.func_ov017_020c3040(this->mUnk_28, this->mUnk_24); + SET_FLAG(gSaveManager.mUnk_000->mUnk_B30, this->mUnk_24); +} + +void AdventureModeManager_1B8::func_ov024_020d13cc(s32 param1) { + this->mUnk_24 = param1; + this->func_ov024_020d0698(); + + if (this->mUnk_24 == 0xFF) { + return; + } + + if (this->mUnk_24 >= 0x78) { + return; + } + + if (GET_FLAG(gSaveManager.mUnk_000->mUnk_B30, this->mUnk_24)) { + SomeSaveFileStruct sp4(0x2290); + void *unk_00 = sp4.unk_00; + + if (gSaveManager.func_ov000_020a0b70(unk_00, this->mUnk_24)) { + s32 *ptr = (s32 *) ((u8 *) sp4.unk_00 + 0x1000); + func_02029058(unk_00, ptr); + this->func_ov024_020d1564(&data_ov024_020d8200, 0x1290, ptr, 1); + return; // this is required + } + } +} + +bool AdventureModeManager_1B8::func_ov024_020d14a8(AdventureModeManager_1B8_Base_1C *param1, unk32 param2, s32 *pFlags) { + int i; + int var_r5; + int temp_r6; + int var_r7; + int temp_r1; + bool ret = false; + + MI_CpuFill8(pFlags, 0, param2); + + temp_r6 = param1->mUnk_00 + param1->mUnk_04; + var_r5 = param1->mUnk_02; + temp_r1 = var_r5 + param1->mUnk_06; + + var_r7 = 0; + + for (; var_r5 < temp_r1; var_r5++) { + for (i = param1->mUnk_00; i < temp_r6; var_r7++, i++) { + if (this->func_ov024_020d0df8(i, var_r5)) { + this->func_ov024_020d0ec0(pFlags, var_r7, 1); + ret = true; + } + } + } + + return ret; +} + +void AdventureModeManager_1B8::func_ov024_020d1564(const AdventureModeManager_1B8_Base_1C *param1, unk32 param2, s32 *pFlags, + const u8 param4) { + int i; + int var_r5; + int temp_r6; + int var_r7; + int temp_r1; + + temp_r6 = param1->mUnk_00 + param1->mUnk_04; + var_r5 = param1->mUnk_02; + temp_r1 = var_r5 + param1->mUnk_06; + + var_r7 = 0; + + for (; var_r5 < temp_r1; var_r5++) { + for (i = param1->mUnk_00; i < temp_r6; var_r7++, i++) { + if (AdventureModeManager_1B8_Base::func_ov024_020d0f0c(pFlags, var_r7)) { + this->func_ov024_020d0924(i, var_r5, param4, 1); + } + } + } +} + +void AdventureModeManager_1B8::func_ov024_020d1614(void *param1) { + this->mUnk_28 = param1; + _MI_CpuFill(0, this->mUnk_28, 0x1000); + data_ov017_020c3f70.func_ov017_020bba78(); +} + +void AdventureModeManager_1B8::func_ov024_020d1638() { + data_ov017_020c3f70.func_ov017_020bba94(); + this->mUnk_28 = NULL; +} diff --git a/src/024_MainGame/Game/GameModeAdventure_024.cpp b/src/024_MainGame/Game/GameModeAdventure_024.cpp new file mode 100644 index 00000000..193d9731 --- /dev/null +++ b/src/024_MainGame/Game/GameModeAdventure_024.cpp @@ -0,0 +1,96 @@ +#include "Game/GameModeAdventure.hpp" +#include "Save/SaveManager.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_ov000_02067bc4.hpp" +#include "Unknown/UnkStruct_ov000_020b4eec.hpp" +#include "Unknown/UnkStruct_ov000_020b50c0.hpp" +#include "Unknown/UnkStruct_ov024_020d8660.hpp" +#include "versions.h" + +extern "C" { +unk32 func_0200e234(); +} + +THUMB_BEGIN + +GameModeAdventure::~GameModeAdventure() { + UnkStruct_027e09a4::Destroy(); + + delete gSaveManager.mUnk_000; + gSaveManager.mUnk_000 = NULL; + + func_0200e234(); + + data_ov000_020b504c.func_ov001_020be6f4(); + data_ov000_020b50c0.func_ov001_020bd87c(); +} + +void GameModeAdventure::vfunc_08() { + this->GameModeBase::vfunc_08(); + + data_ov000_020b504c.func_ov001_020be510(); + data_ov000_020b50c0.func_ov001_020bd854(); + + SaveFile *pSaveFile = data_ov000_020b4eec.func_ov001_020be12c(); + +#if IS_JP + SaveInfoData *pSaveInfoData = &pSaveFile->mSlots[0].mSaveInfo.mSaveInfoData[0]; + + if (pSaveInfoData->mSceneIndex == SceneIndex_f_ajito2) { + pSaveInfoData->mSceneIndex = SceneIndex_f_ajito; + pSaveInfoData->mRoomIndex = 0; + pSaveInfoData->mSpawnIndex = 0; + UNSET_FLAG(pSaveInfoData->mAdventureFlags.data, AdventureFlag_WadatsumiMinigameSequence); + } +#endif + + data_027e09a4->func_ov000_020705e8(pSaveFile, 0); +} + +THUMB_END + +void GameModeAdventure::vfunc_0C() { + unk32 value = data_0204a110.mUnk_DF8; + data_027e09a4->func_ov000_0207087c(value); + data_ov024_020d8660->func_ov024_020c4b4c(value); +} + +void GameModeAdventure::vfunc_10() { + data_027e09a4->func_ov000_020708d8(data_0204a110.mUnk_DF8); +} + +void GameModeAdventure::vfunc_14() { + data_027e09a4->func_ov000_02070834(&data_0204a110.mUnk_DF2); +} + +void GameModeAdventure::vfunc_18() { + unk32 value = data_0204a110.mUnk_DF8; + data_027e09a4->func_ov000_02070938(value); + + if (data_ov024_020d8660->mUnk_00 != NULL) { + data_ov024_020d8660->mUnk_00->vfunc_1C(value); + } +} + +void GameModeAdventure::vfunc_1C() { + data_027e09a4->func_ov000_02070a4c(data_0204a110.mUnk_DF8); +} + +void GameModeAdventure::vfunc_20() { + UnkStruct_027e09a4 *temp = data_027e09a4; + unk8 *ptr = &data_0204a110.mUnk_DF2; + + if (data_0204a088->mUnk_120 & 1) { + temp->func_ov017_020bb994(ptr); + } + + if (data_ov024_020d8660->mUnk_00 != NULL) { + data_ov024_020d8660->mUnk_00->vfunc_18(ptr); + } +} + +void UnkStruct_027e09a4::Destroy() { + delete data_027e09a4; +} diff --git a/src/024_MainGame/Game/UnkActorSystem1_024.cpp b/src/024_MainGame/Game/UnkActorSystem1_024.cpp new file mode 100644 index 00000000..953d675c --- /dev/null +++ b/src/024_MainGame/Game/UnkActorSystem1_024.cpp @@ -0,0 +1,29 @@ +#include "Unknown/UnkStruct_ov024_020d8660.hpp" + +UnkActorSystem1::UnkActorSystem1() { + this->mUnk_04 = false; +} + +UnkActorSystem1::~UnkActorSystem1() {} + +void UnkActorSystem1::vfunc_08() { + this->mUnk_04 = true; +} + +void UnkActorSystem1::vfunc_0C() { + this->mUnk_04 = false; +} + +void UnkActorSystem1::vfunc_10(unk32 param1) {} + +void UnkActorSystem1::vfunc_14(unk32 param1) {} + +void UnkActorSystem1::vfunc_18(unk8 *param1) {} + +void UnkActorSystem1::vfunc_1C(unk32 param1) {} + +void UnkActorSystem1::vfunc_20(unk32 param1) {} + +bool UnkActorSystem1::vfunc_2C() { + return this->mUnk_04; +} diff --git a/src/024_MainGame/Game/UnkActorSystem2_024.cpp b/src/024_MainGame/Game/UnkActorSystem2_024.cpp new file mode 100644 index 00000000..d1e82ca7 --- /dev/null +++ b/src/024_MainGame/Game/UnkActorSystem2_024.cpp @@ -0,0 +1,106 @@ +#include "Unknown/Common.hpp" +#include "Unknown/UnkStruct_0204af1c.hpp" +#include "Unknown/UnkStruct_ov000_020b5214.hpp" + +UnkActorSystem2::UnkActorSystem2(bool param1) : + mUnk_01B(true), + mUnk_10C(false), + mUnk_10D(false) { + if (param1) { + this->func_ov024_020c4ec0(); + } +} + +void UnkActorSystem2::func_ov024_020c4ec0() { + this->func_ov024_020c4ed8(); + this->mUnk_18 = true; +} + +void UnkActorSystem2::func_ov024_020c4ed8() { + this->mUnk_01C.func_ov000_0206082c(0x4D, 0); +} + +void UnkActorSystem2::func_ov024_020c4ef0() { + this->mUnk_094.func_ov000_0206082c(0x53, 0); +} + +void UnkActorSystem2::func_ov024_020c4f08() { + this->mUnk_10C = true; + this->mUnk_01C.mUnk_6E = true; +} + +void UnkActorSystem2::func_ov024_020c4f18() { + this->mUnk_10C = false; + this->mUnk_01C.mUnk_6E = false; +} + +void UnkActorSystem2::func_ov024_020c4f28() { + this->mUnk_10D = true; + this->mUnk_094.mUnk_6E = true; + data_ov000_020b5214.func_ov000_0206db44(0xA8); +} + +void UnkActorSystem2::func_ov024_020c4f4c() { + this->mUnk_10D = false; + this->mUnk_094.mUnk_6E = false; +} + +void UnkActorSystem2::func_ov024_020c4f5c() { + this->mUnk_01C.func_ov000_02060af8(); +} + +void UnkActorSystem2::func_ov024_020c4f6c() { + this->mUnk_094.func_ov000_02060af8(); +} + +bool UnkActorSystem2::func_ov024_020c4f7c() { + return this->mUnk_094.mUnk_6E; +} + +void UnkActorSystem2::vfunc_08(Input *pButtons, TouchControl *pTouchControl) { + this->mUnk_01C.func_ov000_020609c4(); + this->mUnk_094.func_ov000_020609c4(); + + if (this->mUnk_01C.func_ov000_02060a98(0x04000) || this->mUnk_01C.func_ov000_02060a98(0x40000) || + this->mUnk_01C.func_ov000_02060a98(0x7C000)) { + data_ov000_020b5214.func_ov000_0206db44(0xA6); + } else if (this->mUnk_01C.func_ov000_02060a98(0xB8000)) { + data_ov000_020b5214.func_ov000_0206db44(0xA7); + } +} + +void UnkActorSystem2::vfunc_10(unk8 *param1) { + Vec2us vec; + + if (this->func_ov024_020c510c()) { + return; + } + + if (this->mUnk_10C) { + UnkStruct_ov019_020d24c8_28_258 UStack_30(0x4D, 0); + vec.x = UStack_30.mPosU.x; + vec.y = UStack_30.mPosU.y; + data_0204af1c.func_0201aad0(&this->mUnk_01C, &vec, 0, NULL); + } + + if (this->mUnk_10D) { + UnkStruct_ov019_020d24c8_28_258 UStack_30(0x4D, 0); + vec.x = UStack_30.mPosU.x; + vec.y = UStack_30.mPosU.y; + data_0204af1c.func_0201aad0(&this->mUnk_094, &vec, 0, NULL); + } +} + +bool UnkActorSystem2::func_ov024_020c510c() { + if (!this->mUnk_01B) { + return true; + } + + return false; +} + +void UnkActorSystem2::func_ov024_020c5120(bool param1) { + this->mUnk_01B = param1; +} + +UnkActorSystem2::~UnkActorSystem2() {} diff --git a/src/024_MainGame/Game/UnkStruct_027e0998_024.cpp b/src/024_MainGame/Game/UnkStruct_027e0998_024.cpp new file mode 100644 index 00000000..23d0c50f --- /dev/null +++ b/src/024_MainGame/Game/UnkStruct_027e0998_024.cpp @@ -0,0 +1,166 @@ +#include "Cutscene/Cutscene.hpp" +#include "MainGame/AdventureMode.hpp" +#include "System/SysNew.hpp" +#include "Unknown/UnkStruct_0204a088.hpp" +#include "Unknown/UnkStruct_027e0998.hpp" +#include "Unknown/UnkStruct_027e0cd8.hpp" +#include "Unknown/UnkStruct_ov024_020d86a0.hpp" +#include "Unknown/UnkStruct_ov026_02138d10.hpp" + +extern "C" void func_ov024_020d51dc(Vec2s *param1, u32 param2); + +void UnkStruct_ov024_020d86a0::Destroy() { + delete data_ov024_020d86a0; +} + +void UnkStruct_027e0998::Destroy() { + delete data_027e0998; +} + +UnkStruct_027e0998::~UnkStruct_027e0998() { + data_027e0998 = NULL; +} + +UnkStruct_027e0998::UnkStruct_027e0998() {} + +UnkStruct_027e0998 *UnkStruct_027e0998::Create() { + return new(HeapIndex_1) UnkStruct_027e0998(); +} + +bool UnkStruct_027e0998::vfunc_00(Vec3p *pPos, Vec2s *param2, u16 *param3) { + if (data_027e09a4->IsCutscene()) { + CutsceneParamsEntry *pEntry = Cutscene_GetParamEntry(data_027e09a4->CurrentCSIndex()); + + if (pEntry->mUnk_18 == 1) { + return false; + } + } + + if (data_027e09a4->IsPassenger()) { + return false; + } + + if (data_027e09a4->func_01ffd3d8() && data_ov026_02138d10->func_ov026_020e6a6c()) { + return false; + } + + if (!this->func_ov024_020c716c()) { + return false; + } + + switch (this->mUnk_44) { + case 3: + return this->func_ov024_020c727c(param2, param3); + case 4: + if (data_027e09a4->func_01ffd3d8()) { + u32 value = *(u32 *) param3; + + // position? param3 could be a Vec2us + u16 stack[4]; + stack[2] = 0x200; + stack[3] = 0x000; + + if (*(u32 *) &stack[2] != value) { + return false; + } + + return this->func_ov024_020c7214(pPos, param2, param3); + } + + return this->func_ov024_020c727c(param2, param3); + default: + break; + } + + if (data_027e0cd8->func_ov000_02082124()) { + bool var_r2 = true; + + if (*param3 != 0x100 && *param3 != 0x101) { + var_r2 = false; + } + + if (!var_r2) { + return false; + } + + Vec3p pos; + pos.x = data_027e0cd8->mUnk_24.x; + pos.y = data_027e0cd8->mUnk_24.y; + pos.z = data_027e0cd8->mUnk_24.z; + return this->UnkStruct_027e0998_Base::vfunc_00(&pos, param2, param3); + } + + return this->func_ov024_020c7214(pPos, param2, param3); +} + +bool UnkStruct_027e0998::func_ov024_020c716c() { + if (GetAdventureModeManager()->func_ov024_020c681c() && + (this->func_ov024_020c7300(0x01) || this->func_ov024_020c7300(0x06) || this->func_ov024_020c7300(0x07) || + this->func_ov024_020c7300(0x02) || this->func_ov024_020c7300(0x03) || this->func_ov024_020c7300(0x0A))) { + return true; + } + + return false; +} + +bool UnkStruct_027e0998::func_ov024_020c7214(Vec3p *pPos, Vec2s *param2, u16 *param3) { + bool temp_r4 = this->UnkStruct_027e0998_Base::vfunc_00(pPos, param2, param3); + + if (data_027e09a4->func_01ffd3d8()) { + Vec2s sp0; + func_ov024_020d51dc(&sp0, data_027e09a4->CurrentSceneIndex()); + + param2->x += sp0.x; + param2->y += sp0.y; + } + + return temp_r4; +} + +bool UnkStruct_027e0998::func_ov024_020c727c(Vec2s *param1, u16 *param2) { + bool var_r2 = true; + + if (*param2 != 0x100 && *param2 != 0x101) { + var_r2 = false; + } + + if (!var_r2) { + return false; + } + + bool temp_r4 = this->UnkStruct_027e0998_Base::vfunc_00(&data_027e09a4->mUnk_30, param1, param2); + Vec2s sp0; + func_ov024_020d51dc(&sp0, data_027e09a4->mUnk_2C); + + param1->x += sp0.x; + param1->y += sp0.y; + return temp_r4; +} + +bool UnkStruct_027e0998::func_ov024_020c7300(unk32 param1) { + UnkStruct_0204a088 *ptr = data_0204a088; + + unk32 unk_00; + unk32 unk_04; + unk32 unk_08; + u16 temp_ip; + + temp_ip = ptr->mUnk_128; + unk_00 = ptr->mUnk_00; + unk_04 = ptr->mUnk_04; + unk_08 = ptr->mUnk_08; + + if (unk_00 == param1 || (unk_04 == param1 && temp_ip == 0) || (unk_08 == param1 && temp_ip != 0)) { + return true; + } + + return false; +} + +bool UnkStruct_027e0998::func_ov024_020c7354() { + if (data_027e09a4->func_01ffd400()->mUnk_10 == 6 && !data_027e09a4->IsPirate()) { + return true; + } + + return false; +} diff --git a/src/024_MainGame/Game/UnkStruct_027e0cf8_024.cpp b/src/024_MainGame/Game/UnkStruct_027e0cf8_024.cpp new file mode 100644 index 00000000..ba96c276 --- /dev/null +++ b/src/024_MainGame/Game/UnkStruct_027e0cf8_024.cpp @@ -0,0 +1,239 @@ +#include "MainGame/AdventureMode.hpp" +#include "System/SysNew.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_027e0cf8.hpp" + +extern "C" bool func_ov024_020d5354(unk32 *param1, unk16 *param2, ItemId itemId); +extern "C" void func_ov024_020d524c(Vec2us *param1, unk32 param2); +extern "C" void func_ov024_020d51dc(Vec2us *param1, unk32 param2); + +UnkStruct_027e0cf8 *UnkStruct_027e0cf8::Create() { + return new(HeapIndex_1) UnkStruct_027e0cf8(); +} + +UnkStruct_027e0cf8::UnkStruct_027e0cf8() { + this->mUnk_00 = new(HeapIndex_1) UnkStruct_027e0cf8_00(); + this->mUnk_04 = NULL; + this->mUnk_08 = new(HeapIndex_1) UnkStruct_027e0cf8_08(); + this->mUnk_0C = new(HeapIndex_1) UnkStruct_027e0cf8_0C(); + this->mUnk_10.x = 0; + this->mUnk_10.y = 0; + this->mUnk_14.x = 0; + this->mUnk_14.y = 0; + this->mUnk_18 = -1; + this->mUnk_1C = false; + this->mUnk_20 = -1; + this->mUnk_24 = -1; + this->mUnk_28 = 0; + this->mUnk_2A = 0; + + if (data_027e09a4->IsDarkRealm()) { + this->mUnk_04 = new(HeapIndex_1) UnkStruct_027e0cf8_04(); + } +} + +UnkStruct_027e0cf8::~UnkStruct_027e0cf8() { + this->func_ov024_020c7750(); + + if (data_027e09a4->IsDarkRealm()) { + delete this->mUnk_04; + this->mUnk_04 = NULL; + } + + delete this->mUnk_0C; + this->mUnk_0C = NULL; + + delete this->mUnk_08; + this->mUnk_08 = NULL; + + delete this->mUnk_00; + this->mUnk_00 = NULL; +} + +void UnkStruct_027e0cf8::func_ov024_020c755c(void *param1) { + unk32 local_1c = -1; + unk16 local_20 = 0; + + if (this->func_ov024_020c78ac(&local_1c, &local_20)) { + this->mUnk_18 = 0; + this->func_ov024_020c75d0(param1, local_1c, local_20); + } else { + this->mUnk_18 = -1; + this->func_ov024_020c75d0(param1, -1, 0); + } +} + +//! TODO: figure this out +struct SomeSaveFileStruct { + /* 00 */ SaveFile *mpSaveFiles[MAX_SAVE_SLOTS]; + /* 08 */ STRUCT_PAD(0x00, 0xC4); + /* CC */ unk32 mUnk_CC; + + SomeSaveFileStruct(unk32 param1); + ~SomeSaveFileStruct(); +}; + +void UnkStruct_027e0cf8::func_ov024_020c75d0(void *param1, unk32 param2, u16 param3) { + if (this->mUnk_1C) { + UnkStruct_027e0cf8::func_ov024_020c7724(); + } + + unk32 uVar1 = ((SomeSaveFileStruct *) param1)->mUnk_CC; + + volatile Vec2us local_1c; + func_ov024_020d524c((Vec2us *) &local_1c, uVar1); + + Vec2us result; + result.x = local_1c.x; + result.y = local_1c.y; + this->mUnk_10.x = result.x; + this->mUnk_10.y = result.y; + + volatile Vec2us local_20; + func_ov024_020d51dc((Vec2us *) &local_20, uVar1); + + result.x = local_20.x; + result.y = local_20.y; + this->mUnk_14.x = result.x; + this->mUnk_14.y = result.y; + + Vec2s local_24; + local_24.x = this->mUnk_10.x; + local_24.y = this->mUnk_10.y; + this->mUnk_08->func_ov024_020d32e8(&local_24); + + Vec2s local_28; + local_28.x = this->mUnk_14.x; + local_28.y = this->mUnk_14.y; + this->mUnk_0C->func_ov024_020cff8c(param1, &local_28); + + Vec2s local_2c; + local_2c.x = this->mUnk_14.x; + local_2c.y = this->mUnk_14.y; + + Vec2s vec; + vec.x = 0x1E; + vec.y = 0x96; + this->mUnk_00->func_ov024_020cfb7c(param1, &local_2c, param2, param3, 0x1E, 0x96); + + if (data_027e09a4->IsDarkRealm()) { + this->mUnk_04->func_ov026_020dc300(); + } + + this->func_ov024_020c7750(); + + if (param2 == -1) { + this->mUnk_08->func_ov024_020d3324(param1); + } else { + this->mUnk_08->func_ov024_020d3348(param1, param2, param3, 0x28, 0x5A); + } + + this->mUnk_1C = true; +} + +void UnkStruct_027e0cf8::func_ov024_020c7724() { + this->mUnk_1C = 0; + + if (this->mUnk_18 >= 0) { + this->func_ov024_020c78d0(); + } + + this->mUnk_0C->func_ov024_020d0004(); +} + +void UnkStruct_027e0cf8::func_ov024_020c7750() { + if (!data_027e09a4->IsDarkRealm()) { + this->mUnk_08->func_ov024_020d340c(); + } +} + +void UnkStruct_027e0cf8::func_ov024_020c7780() { + if (!data_027e09a4->IsDarkRealm()) { + this->mUnk_08->func_ov024_020d32d8(); + } +} + +void UnkStruct_027e0cf8::func_ov024_020c77b0(unk32 param1) { + this->mUnk_08->func_ov024_020d341c(param1); +} + +void UnkStruct_027e0cf8::func_ov024_020c77c0() { + this->mUnk_0C->func_ov024_020d02e0(); +} + +void UnkStruct_027e0cf8::func_ov024_020c77d0() { + this->mUnk_0C->func_ov024_020d0340(); +} + +void UnkStruct_027e0cf8::func_ov024_020c77e0(Vec2s *param1) { + UnkStruct_027e0cf8_0C *ptr = this->mUnk_0C; + Vec2s local_8; + local_8.x = param1->x; + local_8.y = param1->y; + ptr->func_ov024_020d03f8(&local_8); +} + +void UnkStruct_027e0cf8::func_ov024_020c7804(Vec2s *param1) { + UnkStruct_027e0cf8_0C *ptr = this->mUnk_0C; + Vec2s local_8; + local_8.x = param1->x; + local_8.y = param1->y; + ptr->func_ov024_020d041c(&local_8); +} + +void UnkStruct_027e0cf8::func_ov024_020c7828(ItemId itemId) { + unk32 local_c = -1; + unk16 local_10 = 0; + + if (func_ov024_020d5354(&local_c, &local_10, itemId)) { + this->func_ov024_020c7878(local_c, local_10); + } +} + +void UnkStruct_027e0cf8::func_ov024_020c7878(unk32 param1, u16 param2) { + this->mUnk_20 = param1; + this->mUnk_28 = param2; +} + +void UnkStruct_027e0cf8::func_ov024_020c7884() { + this->mUnk_24 = this->mUnk_20; + this->mUnk_2A = this->mUnk_28; +} + +void UnkStruct_027e0cf8::func_ov024_020c7898() { + this->mUnk_20 = this->mUnk_24; + this->mUnk_28 = this->mUnk_2A; +} + +bool UnkStruct_027e0cf8::func_ov024_020c78ac(unk32 *param1, unk16 *param2) { + if (this->mUnk_20 != -1) { + u16 temp = this->mUnk_28; + + if (temp != 0) { + *param1 = this->mUnk_20; + *param2 = temp; + return true; + } + } + + return false; +} + +void UnkStruct_027e0cf8::func_ov024_020c78d0() { + this->mUnk_20 = -1; + this->mUnk_28 = 0; +} + +void UnkStruct_027e0cf8::func_ov024_020c78e4(unk32 param1) { + if (this->mUnk_0C != NULL) { + this->mUnk_0C->func_ov024_020d05d0(param1, 1); + } +} + +void UnkStruct_027e0cf8::func_ov024_020c7900(unk32 param1) { + if (this->mUnk_0C != NULL) { + this->mUnk_0C->func_ov024_020d05d0(param1, 0); + } +} + +DECL_INSTANCE(UnkStruct_027e0cf8, data_027e0cf8); diff --git a/src/024_MainGame/Game/UnkStruct_ov000_020d8660_024.cpp b/src/024_MainGame/Game/UnkStruct_ov000_020d8660_024.cpp new file mode 100644 index 00000000..aab210c4 --- /dev/null +++ b/src/024_MainGame/Game/UnkStruct_ov000_020d8660_024.cpp @@ -0,0 +1,156 @@ +#include "Actor/Actor.hpp" +#include "Actor/ActorManager.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" +#include "Unknown/UnkStruct_020d8698.hpp" +#include "Unknown/UnkStruct_027e09a4.hpp" +#include "Unknown/UnkStruct_027e09b8.hpp" +#include "Unknown/UnkStruct_ov000_020b51b8.hpp" +#include "Unknown/UnkStruct_ov024_020d8660.hpp" +#include "regs.h" +#include "versions.h" + +extern "C" { +void GX_func_0008(void *, unk32, unk32); +} + +extern unk32 data_ov000_020b3000; + +UnkStruct_ov024_020d8660 *data_ov024_020d8660 = NULL; + +void UnkStruct_ov024_020d8660::func_ov024_020c4a8c(UnkActorSystem1 *param1) { + this->mUnk_00 = param1; + this->mUnk_1C = this->mUnk_00->vfunc_24(); + data_ov000_020b51b8.func_ov000_0206d0bc(0x14); +} + +void UnkStruct_ov024_020d8660::func_ov024_020c4ac0() { + // this will automatically assign the instance pointer to `data_ov024_020d8660` + static UnkStruct_ov024_020d8660 instance; +} + +UnkStruct_ov024_020d8660::~UnkStruct_ov024_020d8660() {} + +UnkStruct_ov024_020d8660::UnkStruct_ov024_020d8660() { + this->mUnk_00 = NULL; + this->mActorId = ActorId_None; + this->mUnk_08 = 0; + this->mUnk_1C = 0; +} + +void UnkStruct_ov024_020d8660::func_ov024_020c4b4c(unk32 param1) { + if (this->mUnk_00 != NULL) { + if (data_027e09b8->func_01ffd420() == 0) { + this->mUnk_00->vfunc_10(param1); + } else { + this->mUnk_00->vfunc_14(param1); + } + } +} + +void UnkStruct_ov024_020d8660::func_ov024_020c4ba0() { + if (this->mUnk_00 != NULL) { + this->mUnk_00->vfunc_20(1); + data_ov024_020d8698->func_ov024_020cd150(); + } + + if (this->mUnk_00 != NULL && !this->mUnk_00->mUnk_04) { + this->mUnk_00->vfunc_08(); + } + + if (this->mActorId != 0) { + struct { + void *ptr; + unk32 actorId; + } uStack_68; + uStack_68.actorId = this->mActorId; + uStack_68.ptr = &data_ov000_020b3000; + + Actor **ppActor = gpActorManager->func_01fff350(&uStack_68, gpActorManager->mActorTable); + Actor *pActor = NULL; + + if (ppActor != gpActorManager->mUnk_08) { + pActor = *ppActor; + } + + if (pActor != NULL) { + ActorUnk_vfunc_b0 auStack_60; + auStack_60.mUnk_0C = this->mUnk_08; + auStack_60.mUnk_14 = this->mUnk_0C.mUnk_00; + auStack_60.mUnk_18 = this->mUnk_0C.mUnk_04; + auStack_60.mUnk_1C = this->mUnk_0C.mUnk_08; + auStack_60.mUnk_20 = this->mUnk_0C.mUnk_0C; + auStack_60.mUnk_21 = this->mUnk_0C.mUnk_0D; + auStack_60.mUnk_32 = 2; + auStack_60.mpActor = pActor; + auStack_60.mUnk_30 = 0; + data_027e09b8->func_ov000_02073470(&auStack_60, 0); + } + + this->mActorId = ActorId_None; + this->mUnk_08 = 0; + } +} + +void UnkStruct_ov024_020d8660::func_ov024_020c4cc8() { + if (this->mUnk_00 == NULL) { + return; + } + + if (!this->mUnk_00->vfunc_2C()) { + return; + } + + this->mUnk_00->vfunc_0C(); + this->mUnk_00 = NULL; + this->mUnk_1C = 0; + + if (data_027e09a4->func_01ffd3d8()) { + data_0204a110.func_02019538(4, 1); + } else { + data_0204a110.func_02019538(0, 1); + } + +#if IS_JP + GX_func_0008(®_BLDCNT, 0x2F, 0); + GX_func_0008(®_BLDCNT_SUB, 0x3F, 0); + + if (data_027e09a4->func_01ffd3d8()) { + data_0204a110.mUnk_D9C.func_0201c494(1); + } else { + data_0204a110.mUnk_D9C.func_0201c494(0); + } +#else + GX_func_0008(®_BLDCNT, 0x0F, 0); + GX_func_0008(®_BLDCNT_SUB, 0x1F, 0); +#endif +} + +bool UnkStruct_ov024_020d8660::func_ov024_020c4d74() { + if (this->mUnk_00 != NULL) { + return true; + } + + return false; +} + +void UnkStruct_ov024_020d8660::func_ov024_020c4d88(ActorId actorId, unk32 param2) { + this->mActorId = actorId; + this->mUnk_08 = param2; + this->mUnk_0C.mUnk_00 = 0; + this->mUnk_0C.mUnk_04 = -1; + this->mUnk_0C.mUnk_08 = -1; + this->mUnk_0C.mUnk_0C = false; + this->mUnk_0C.mUnk_0D = false; +} + +void UnkStruct_ov024_020d8660::func_ov024_020c4dac(ActorId actorId, unk32 param2, UnkActorSystem_Infos1 *param3) { + this->mActorId = actorId; + this->mUnk_08 = param2; + this->mUnk_0C.mUnk_00 = param3->mUnk_00; + this->mUnk_0C.mUnk_04 = param3->mUnk_04; + this->mUnk_0C.mUnk_08 = param3->mUnk_08; + this->mUnk_0C.mUnk_0C = param3->mUnk_0C; + this->mUnk_0C.mUnk_0D = param3->mUnk_0D; +} + +DECL_INSTANCE(UnkStruct_ov024_020d8660, data_ov024_020d8660); diff --git a/src/024_MainGame/MiscAdvManager.cpp b/src/024_MainGame/MiscAdvManager.cpp index 847d6710..dbc7808b 100644 --- a/src/024_MainGame/MiscAdvManager.cpp +++ b/src/024_MainGame/MiscAdvManager.cpp @@ -11,15 +11,12 @@ MiscAdvManager *MiscAdvManager::Create() { } MiscAdvManager::MiscAdvManager() { - MiscAdvManager::SetInstance(this); this->mLettersRead = 0; this->mStampsFlag = 0; this->mSongs = 0; } -MiscAdvManager::~MiscAdvManager() { - MiscAdvManager::ClearInstance(); -} +MiscAdvManager::~MiscAdvManager() {} void MiscAdvManager::func_ov024_020d6310(MiscAdvManager *pSrc) { u16 local_10; @@ -193,11 +190,4 @@ void MiscAdvManager::func_ov024_020d6610() { this->func_ov024_020d6530(); } -void MiscAdvManager::SetInstance(MiscAdvManager *pInstance) { - gpMiscAdvManager = pInstance; -} - -int MiscAdvManager::ClearInstance() { - gpMiscAdvManager = NULL; - //! @bug: missing return -} +DECL_INSTANCE(MiscAdvManager, gpMiscAdvManager); diff --git a/src/024_MainGame/PassengerManager.cpp b/src/024_MainGame/PassengerManager.cpp index edd2383f..8a50ef8c 100644 --- a/src/024_MainGame/PassengerManager.cpp +++ b/src/024_MainGame/PassengerManager.cpp @@ -275,7 +275,7 @@ bool PassengerManager::CanCompleteTrip() { bool result = false; if (this->mPassenger.mActorId != ActorId_None && this->mPassenger.mUnk_04 == 0 && - data_027e09a4->mSceneIndex != SceneIndex_t_minigame) { + data_027e09a4->mUnk_00.mSceneIndex != SceneIndex_t_minigame) { result = true; } diff --git a/src/024_MainGame/UnkAdventureModeSystem1_024.cpp b/src/024_MainGame/UnkAdventureModeSystem1_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/UnkStruct_020d8698_024.cpp b/src/024_MainGame/UnkStruct_020d8698_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/UnkStruct_027e0ce0_34_024.cpp b/src/024_MainGame/UnkStruct_027e0ce0_34_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/UnkStruct_027e0cf8_00_0C_024.cpp b/src/024_MainGame/UnkStruct_027e0cf8_00_0C_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/UnkStruct_027e0cf8_08_024.cpp b/src/024_MainGame/UnkStruct_027e0cf8_08_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/UnkStruct_027e0d00.cpp b/src/024_MainGame/UnkStruct_027e0d00.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/UnkStruct_027e0d08_024.cpp b/src/024_MainGame/UnkStruct_027e0d08_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/UnkStruct_ov024_020d8694_024.cpp b/src/024_MainGame/UnkStruct_ov024_020d8694_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/UnkStruct_ov024_020d86a0_024.cpp b/src/024_MainGame/UnkStruct_ov024_020d86a0_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/UnkTitleCardSystem1_024.cpp b/src/024_MainGame/UnkTitleCardSystem1_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/code_020d16fc_024.cpp b/src/024_MainGame/code_020d16fc_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/code_020d24d4_024.cpp b/src/024_MainGame/code_020d24d4_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/code_020d3670_024.cpp b/src/024_MainGame/code_020d3670_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/code_020d46b4_024.cpp b/src/024_MainGame/code_020d46b4_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/code_020d4e9c_024.cpp b/src/024_MainGame/code_020d4e9c_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/code_020d51dc_024.cpp b/src/024_MainGame/code_020d51dc_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/code_020d54b0_024.cpp b/src/024_MainGame/code_020d54b0_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/code_020d5938_024.cpp b/src/024_MainGame/code_020d5938_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/024_MainGame/code_020d6650_024.cpp b/src/024_MainGame/code_020d6650_024.cpp new file mode 100644 index 00000000..e69de29b diff --git a/src/025_Title/GameModeTitleScreen.cpp b/src/025_Title/GameModeTitleScreen.cpp index b6bb2930..26098c34 100644 --- a/src/025_Title/GameModeTitleScreen.cpp +++ b/src/025_Title/GameModeTitleScreen.cpp @@ -9,7 +9,7 @@ extern "C" { void func_0201659c(); void func_0200e234(); -void func_ov001_020b6520(unk32 param1); +void *func_ov001_020b6520(unk32 param1); } ARM GameModeTitleScreen::GameModeTitleScreen() { diff --git a/src/025_Title/TitleScreen.cpp b/src/025_Title/TitleScreen.cpp index d05f500f..34b48a80 100644 --- a/src/025_Title/TitleScreen.cpp +++ b/src/025_Title/TitleScreen.cpp @@ -2,7 +2,7 @@ #include "Game/GameMode.hpp" #include "Unknown/UnkStruct_02049be0.hpp" #include "Unknown/UnkStruct_0204a060.hpp" -#include "Unknown/UnkStruct_0204aeac.hpp" +#include "Unknown/UnkStruct_0204a110.hpp" #include "Unknown/UnkStruct_0204af1c.hpp" #include "Unknown/UnkStruct_027e0954.hpp" #include "Unknown/UnkStruct_ov000_020b5214.hpp" @@ -62,7 +62,7 @@ TitleScreen::TitleScreen() : auStack_68.func_ov000_02059270(0x3E, "title", 0x32500000); } - data_0204aeac.func_0201c494(3); + data_0204a110.mUnk_D9C.func_0201c494(3); this->mUnk_218.func_0201effc(0x0F, 1, 0x1F); } @@ -171,8 +171,8 @@ void TitleScreen::vfunc_08(Input *pButtons, TouchControl *pTouchControl) { } CALL_PTMF(TitleScreenPTMF, data_ov025_020c5aec[this->mState], pButtons, pTouchControl); - data_0204aeac.func_0201c4d8(0, 0x0B, 8); - data_0204aeac.func_0201c504(1, 10, 0x10, 8); + data_0204a110.mUnk_D9C.func_0201c4d8(0, 0x0B, 8); + data_0204a110.mUnk_D9C.func_0201c504(1, 10, 0x10, 8); } void TitleScreen::func_ov025_020c5200(Input *pButtons, TouchControl *pTouchControl) {} @@ -193,7 +193,7 @@ test: } void TitleScreen::func_ov025_020c5240(Input *pButtons, TouchControl *pTouchControl) { - this->mUnk_218.UnkOperations(); + this->mUnk_218.UpdateLogic(); this->mUnk_204.mUnk_10 = this->mUnk_218.func_0201f04c(); if (this->mUnk_024.func_ov000_02060af8() == 0) { @@ -230,7 +230,7 @@ void TitleScreen::func_ov025_020c53d0(Input *pButtons, TouchControl *pTouchContr this->mUnk_18C.mUnk_6E = true; } - this->mUnk_218.UnkOperations(); + this->mUnk_218.UpdateLogic(); this->mUnk_204.mUnk_10 = this->mUnk_218.func_0201f04c(); if (this->mUnk_218.mUnk_0C) { @@ -284,12 +284,12 @@ void TitleScreen::func_ov025_020c55e4(Input *pButtons, TouchControl *pTouchContr void TitleScreen::vfunc_14(unk8 *param1) { if (param1[1] == 0) { this->func_ov025_020c592c(); - data_0204aeac.func_0201c494(3); + data_0204a110.mUnk_D9C.func_0201c494(3); } if (param1[0] == 0) { this->func_ov025_020c5964(); - data_0204aeac.func_0201c494(0); + data_0204a110.mUnk_D9C.func_0201c494(0); } } diff --git a/src/025_Title/TitleScreenManager.cpp b/src/025_Title/TitleScreenManager.cpp index 17cdd818..52776c62 100644 --- a/src/025_Title/TitleScreenManager.cpp +++ b/src/025_Title/TitleScreenManager.cpp @@ -45,7 +45,7 @@ ARM void TitleScreenManager::vfunc_2C(unk8 *param1) { this->func_02018830(param1); } -ARM void TitleScreenManager::vfunc_38(unk32 param1, unk32 param2, unk32 param3, unk32 param4) {} +ARM void TitleScreenManager::vfunc_38(u32 param1, u8 param2, unk16 param3, unk16 param4) {} ARM void TitleScreenManager::func_ov025_020c4c20() { ((TitleScreen *) this->mpGameMode)->func_ov025_020c4e6c(); diff --git a/src/031_Land/MapObject/MapObjectChestBase.cpp b/src/031_Land/MapObject/MapObjectChestBase.cpp index e6e5dcf7..36a16d27 100644 --- a/src/031_Land/MapObject/MapObjectChestBase.cpp +++ b/src/031_Land/MapObject/MapObjectChestBase.cpp @@ -159,7 +159,7 @@ ARM void MapObjectChestBase::vfunc_04() { sp48.z -= FLOAT_TO_Q20(0.5f); } - if (data_027e09a4->mSceneIndex == SceneIndex_d_flame) { + if (data_027e09a4->mUnk_00.mSceneIndex == SceneIndex_d_flame) { local_64.x = this->mUnk_3A.x; local_66.y = this->mUnk_3A.y; diff --git a/src/031_Land/MapObject/MapObjectDoorBase.cpp b/src/031_Land/MapObject/MapObjectDoorBase.cpp index b9b6c112..616a2f15 100644 --- a/src/031_Land/MapObject/MapObjectDoorBase.cpp +++ b/src/031_Land/MapObject/MapObjectDoorBase.cpp @@ -555,9 +555,9 @@ extern "C" void func_01ff9fbc(Mat2p *, unk32, Mat2p *); extern q4 data_0203f964[]; ARM void MapObjectDoorBase::func_ov031_020fcb78(s8 *param1, s8 param2) { - unk32 sp10; + Vec2s sp10; stack_struct sp8; - unk32 sp4; + u32 sp4; bool var_r2; if (!GET_FLAG(this->mFlags, MapObjFlag_5)) { @@ -575,7 +575,7 @@ ARM void MapObjectDoorBase::func_ov031_020fcb78(s8 *param1, s8 param2) { //! TODO: fake match? sp4 = *(u32 *) &this->mUnk_38; - if (data_027e0998->vfunc_00(&this->mPos, &sp10, &sp4) && uVar4 != 0) { + if (data_027e0998->vfunc_00(&this->mPos, &sp10, (u16 *) &sp4) && uVar4 != 0) { Mat2p m; if (this->IsOrientedVertically()) { diff --git a/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp index 952eb79a..3392d074 100644 --- a/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp +++ b/src/031_Land/MapObject/MapObjectDoorDangerSpawn.cpp @@ -364,7 +364,7 @@ ARM void MapObjectDoorDangerSpawn::vfunc_5C(unk32 param1, unk32 param2) { this->MapObjectDoorBase::vfunc_5C(param1, param2); var_r6 = 1; - temp_r8 = data_027e09a4->mSceneIndex; + temp_r8 = data_027e09a4->mUnk_00.mSceneIndex; if (param2 != 0 && (temp_r8 - SceneIndex_tekiya00) > 4) { var_r6 = 0; diff --git a/src/036_MapA5/Actor/ActorUnkGORY.cpp b/src/036_MapA5/Actor/ActorUnkGORY.cpp index fb04290c..f5c94365 100644 --- a/src/036_MapA5/Actor/ActorUnkGORY.cpp +++ b/src/036_MapA5/Actor/ActorUnkGORY.cpp @@ -31,7 +31,7 @@ ARM ItemId ActorUnkGORY::func_ov036_0211bcb0(unk32 param1) { case 3: return ItemId_NormalShield; case 4: - if (GET_FLAG(data_027e09b8->mAdventureFlags, AdventureFlag_BoughtGoronShopQuiver)) { + if (data_027e09b8->HasAdventureFlag(AdventureFlag_BoughtGoronShopQuiver)) { return ItemId_TenPriceCard; } diff --git a/src/036_MapA5/Actor/ActorUnkSHIT.cpp b/src/036_MapA5/Actor/ActorUnkSHIT.cpp index 5ef26679..9617c96b 100644 --- a/src/036_MapA5/Actor/ActorUnkSHIT.cpp +++ b/src/036_MapA5/Actor/ActorUnkSHIT.cpp @@ -78,7 +78,7 @@ ARM u16 ActorUnkSHIT::func_ov036_0211ceec(void) { case ItemId_AncientCoin: case ItemId_PricelessStone: case ItemId_RegalRing: { - return data_ov000_020b6510->func_ov000_020a9b4c(this->mItemId - ItemId_DemonFossil) * 2; + return gpTreasureManager->func_ov000_020a9b4c(this->mItemId - ItemId_DemonFossil) * 2; } case ItemId_HeartContainer: return 2000; @@ -210,7 +210,7 @@ ARM bool ActorUnkSHIT::func_ov036_0211d2dc(void) { case ItemId_GoronAmber: case ItemId_MysticJade: case ItemId_AncientCoin: - if (data_ov000_020b6510->func_ov000_020a9ca4(this->mItemId - ItemId_DemonFossil)) { + if (gpTreasureManager->func_ov000_020a9ca4(this->mItemId - ItemId_DemonFossil)) { return false; } @@ -220,11 +220,11 @@ ARM bool ActorUnkSHIT::func_ov036_0211d2dc(void) { return false; case ItemId_HeartContainer: if (this->mUnk_5C.mParams[3] == 5) { - if (GET_FLAG(data_027e09b8->mAdventureFlags, AdventureFlag_Unk_10F)) { + if (data_027e09b8->HasAdventureFlag(AdventureFlag_Unk_10F)) { return false; } } else { - if (GET_FLAG(data_027e09b8->mAdventureFlags, AdventureFlag_Unk_10E)) { + if (data_027e09b8->HasAdventureFlag(AdventureFlag_Unk_10E)) { return false; } } @@ -262,7 +262,7 @@ ARM bool ActorUnkSHIT::func_ov036_0211d2dc(void) { return false; } - if (GET_FLAG(data_027e09b8->mAdventureFlags, AdventureFlag_BoughtGoronShopQuiver)) { + if (data_027e09b8->HasAdventureFlag(AdventureFlag_BoughtGoronShopQuiver)) { return false; } @@ -270,7 +270,7 @@ ARM bool ActorUnkSHIT::func_ov036_0211d2dc(void) { case ItemId_BombBag: case ItemId_BombBagMedium: case ItemId_BombBagLarge: - if (GET_FLAG(data_027e09b8->mAdventureFlags, AdventureFlag_BoughtBombBagFromBeedle)) { + if (data_027e09b8->HasAdventureFlag(AdventureFlag_BoughtBombBagFromBeedle)) { return false; } diff --git a/src/037_MapA6/Actor/ActorUnkTUTO.cpp b/src/037_MapA6/Actor/ActorUnkTUTO.cpp index 845c33b9..45211205 100644 --- a/src/037_MapA6/Actor/ActorUnkTUTO.cpp +++ b/src/037_MapA6/Actor/ActorUnkTUTO.cpp @@ -15,7 +15,7 @@ ARM ActorProfileUnkTUTO::ActorProfileUnkTUTO() : ARM ActorUnkTUTO::ActorUnkTUTO() {} ARM void ActorUnkTUTO::func_ov037_02120a10(void) {} -ARM void ActorUnkTUTO::func_ov037_02120a64(void) {} +ARM unk32 ActorUnkTUTO::func_ov037_02120a64(void) {} ARM void ActorUnkTUTO::func_ov037_02120afc(void) {} ARM void ActorUnkTUTO::func_ov037_02120b10(void) {} ARM void ActorUnkTUTO::func_ov037_02120ba8(void) {} diff --git a/src/110_PlayerGet/PlayerGet.cpp b/src/110_PlayerGet/PlayerGet.cpp index 7de31356..dbbf06dc 100644 --- a/src/110_PlayerGet/PlayerGet.cpp +++ b/src/110_PlayerGet/PlayerGet.cpp @@ -175,7 +175,7 @@ ARM bool ItemManager::func_ov110_02184a40(ItemId itemId) { } data_027e0ce0->mUnk_34->func_ov110_02185d3c(itemId); - data_ov000_020b6510->func_ov000_020aa0ac(itemId); + gpTreasureManager->func_ov000_020aa0ac(itemId); gpMiscAdvManager->GiveLetterOrPriceCard(itemId); if (!GET_FLAG(this->mFlags, ItemFlag_LokomoSword) && itemId == ItemId_TearLight && @@ -188,123 +188,129 @@ ARM bool ItemManager::func_ov110_02184a40(ItemId itemId) { // BMG IDs static const u32 sBMGItemMap[] = { - BMG_ID(BMGGroup_maingame, 0x01), // ItemId_Nothing - BMG_ID(BMGGroup_maingame, 0x02), // ItemId_NormalShield - BMG_ID(BMGGroup_castle, 0xD6), // ItemId_NormalSword - BMG_ID(BMGGroup_dungeon, 0x7A), // ItemId_Whirlwind - BMG_ID(BMGGroup_maingame, 0x03), // ItemId_BombBag - BMG_ID(BMGGroup_dungeon, 0x7B), // ItemId_NormalBow - BMG_ID(BMGGroup_dungeon, 0x7C), // ItemId_Boomerang - BMG_ID(BMGGroup_dungeon, 0x7D), // ItemId_Whip - BMG_ID(BMGGroup_dungeon, 0x7E), // ItemId_SandRod - BMG_ID(BMGGroup_maingame, 0x04), // ItemId_9 - BMG_ID(BMGGroup_maingame, 0x05), // ItemId_NormalKey - BMG_ID(BMGGroup_maingame, 0x06), // ItemId_BossKey - BMG_ID(BMGGroup_maingame, 0x07), // ItemId_GreenRupee - BMG_ID(BMGGroup_maingame, 0x08), // ItemId_BlueRupee - BMG_ID(BMGGroup_maingame, 0x09), // ItemId_RedRupee - BMG_ID(BMGGroup_maingame, 0x0A), // ItemId_BigGreenRupee - BMG_ID(BMGGroup_maingame, 0x0B), // ItemId_BigRedRupee - BMG_ID(BMGGroup_maingame, 0x0C), // ItemId_BigGoldRupee - BMG_ID(BMGGroup_maingame, 0x0D), // ItemId_ForceGem_18 - BMG_ID(BMGGroup_maingame, 0x0E), // ItemId_ForceGem_19 - BMG_ID(BMGGroup_maingame, 0x0F), // ItemId_ForceGem_20 - BMG_ID(BMGGroup_tower, 0x00), // ItemId_ForestGlyph - BMG_ID(BMGGroup_tower, 0x01), // ItemId_SnowGlyph - BMG_ID(BMGGroup_tower, 0x02), // ItemId_OceanGlyph - BMG_ID(BMGGroup_tower, 0x03), // ItemId_FireGlyph - BMG_ID(BMGGroup_forest, 0xEB), // ItemId_RestoredForestGlyph - BMG_ID(BMGGroup_snow, 0x00), // ItemId_RestoredSnowGlyph - BMG_ID(BMGGroup_water, 0x00), // ItemId_RestoredOceanGlyph - BMG_ID(BMGGroup_flame_fld, 0x8E), // ItemId_RestoredFireGlyph - BMG_ID(BMGGroup_desert, 0x48), // ItemId_RestoredDesertOceanGlyph - BMG_ID(BMGGroup_maingame, 0x10), // ItemId_FinalTrack - BMG_ID(BMGGroup_maingame, 0x11), // ItemId_SpiritTrain - BMG_ID(BMGGroup_maingame, 0x12), // ItemId_TrainCannon - BMG_ID(BMGGroup_maingame, 0x13), // ItemId_SpiritTrainCar - BMG_ID(BMGGroup_maingame, 0x14), // ItemId_TrainWagon - BMG_ID(BMGGroup_maingame, 0x15), // ItemId_ForceGem_35 - BMG_ID(BMGGroup_maingame, 0x16), // ItemId_ForceGem_36 - BMG_ID(BMGGroup_maingame, 0x17), // ItemId_ForceGem_37 - BMG_ID(BMGGroup_castle, 0xD7), // ItemId_RecruitUniform - BMG_ID(BMGGroup_maingame, 0x18), // ItemId_PostmasterLetter - BMG_ID(BMGGroup_maingame, 0x19), // ItemId_HeartContainer - BMG_ID(BMGGroup_maingame, 0x1A), // ItemId_QuiverMedium - BMG_ID(BMGGroup_maingame, 0x1B), // ItemId_BombBagMedium - BMG_ID(BMGGroup_maingame, 0x1C), // ItemId_ForceGem_43 - BMG_ID(BMGGroup_maingame, 0x1D), // ItemId_ForceGem_44 - BMG_ID(BMGGroup_maingame, 0x1E), // ItemId_ForceGem_45 - BMG_ID(BMGGroup_maingame, 0x1F), // ItemId_ForceGem_46 - BMG_ID(BMGGroup_maingame, 0x20), // ItemId_ForceGem_47 - BMG_ID(BMGGroup_maingame, 0x21), // ItemId_ForceGem_48 - BMG_ID(BMGGroup_maingame, 0x22), // ItemId_ForceGem_49 - BMG_ID(BMGGroup_maingame, 0x23), // ItemId_ForceGem_50 - BMG_ID(BMGGroup_maingame, 0x24), // ItemId_ForceGem_51 - BMG_ID(BMGGroup_maingame, 0x25), // ItemId_ForceGem_52 - BMG_ID(BMGGroup_maingame, 0x26), // ItemId_ForceGem_53 - BMG_ID(BMGGroup_maingame, 0x27), // ItemId_ForceGem_54 - BMG_ID(BMGGroup_maingame, 0x28), // ItemId_ForceGem_55 - BMG_ID(BMGGroup_maingame, 0x29), // ItemId_ForceGem_56 - BMG_ID(BMGGroup_maingame, 0x2A), // ItemId_ForceGem_57 - BMG_ID(BMGGroup_maingame, 0x2B), // ItemId_ForceGem_58 - BMG_ID(BMGGroup_maingame, 0x2C), // ItemId_ForceGem_59 - BMG_ID(BMGGroup_maingame, 0x2D), // ItemId_ForceGem_60 - BMG_ID(BMGGroup_maingame, 0x2E), // ItemId_ForceGem_61 - BMG_ID(BMGGroup_maingame, 0x2F), // ItemId_PanFlute - BMG_ID(BMGGroup_village, 0xF7), // ItemId_StampBook - BMG_ID(BMGGroup_dungeon, 0x7F), // ItemId_LightBow - BMG_ID(BMGGroup_maingame, 0x30), // ItemId_LokomoSword - BMG_ID(BMGGroup_maingame, 0x31), // ItemId_TenPriceCard - BMG_ID(BMGGroup_maingame, 0x32), // ItemId_RedPotion - BMG_ID(BMGGroup_maingame, 0x33), // ItemId_PurplePotion - BMG_ID(BMGGroup_maingame, 0x34), // ItemId_YellowPotion - BMG_ID(BMGGroup_maingame, 0x35), // ItemId_DemonFossil - BMG_ID(BMGGroup_maingame, 0x36), // ItemId_StalfosSkull - BMG_ID(BMGGroup_maingame, 0x37), // ItemId_StarFragment - BMG_ID(BMGGroup_maingame, 0x38), // ItemId_BeeLarvae - BMG_ID(BMGGroup_maingame, 0x39), // ItemId_WoodHeart - BMG_ID(BMGGroup_maingame, 0x3A), // ItemId_DarkPearlLoop - BMG_ID(BMGGroup_maingame, 0x3B), // ItemId_WhitePearlLoop - BMG_ID(BMGGroup_maingame, 0x3C), // ItemId_RutoCrown - BMG_ID(BMGGroup_maingame, 0x3D), // ItemId_DragonScale - BMG_ID(BMGGroup_maingame, 0x3E), // ItemId_PirateNecklace - BMG_ID(BMGGroup_maingame, 0x3F), // ItemId_PalaceDish - BMG_ID(BMGGroup_maingame, 0x40), // ItemId_GoronAmber - BMG_ID(BMGGroup_maingame, 0x41), // ItemId_MysticJade - BMG_ID(BMGGroup_maingame, 0x42), // ItemId_AncientCoin - BMG_ID(BMGGroup_maingame, 0x43), // ItemId_PricelessStone - BMG_ID(BMGGroup_maingame, 0x44), // ItemId_RegalRing - BMG_ID(BMGGroup_maingame, 0x45), // ItemId_ArrowsRefill - BMG_ID(BMGGroup_maingame, 0x46), // ItemId_BombsRefill - BMG_ID(BMGGroup_maingame, 0x47), // ItemId_SoldOutSign - BMG_ID(BMGGroup_village, 0xF8), // ItemId_AncientShield - BMG_ID(BMGGroup_maingame, 0x48), // ItemId_QuiverLarge - BMG_ID(BMGGroup_maingame, 0x49), // ItemId_BombBagLarge - BMG_ID(BMGGroup_maingame, 0x4A), // ItemId_RandCommonTreasure - BMG_ID(BMGGroup_maingame, 0x4B), // ItemId_RandUncommonTreasure - BMG_ID(BMGGroup_maingame, 0x4C), // ItemId_RandRareTreasure - BMG_ID(BMGGroup_maingame, 0x4D), // ItemId_RandLegendaryTreasure - BMG_ID(BMGGroup_tower, 0x04), // ItemId_TearLight - BMG_ID(BMGGroup_tower, 0x05), // ItemId_LightCompass - BMG_ID(BMGGroup_maingame, 0x4E), // ItemId_ScrollSpinAttack - BMG_ID(BMGGroup_maingame, 0x4F), // ItemId_ScrollBeam - BMG_ID(BMGGroup_village, 0xF9), // ItemId_LinebeckLetter - BMG_ID(BMGGroup_forest, 0xEC), // ItemId_PanFluteSong_101 - BMG_ID(BMGGroup_dungeon, 0x80), // ItemId_PanFluteSong_102 - BMG_ID(BMGGroup_water, 0x01), // ItemId_PanFluteSong_103 - BMG_ID(BMGGroup_village, 0xFA), // ItemId_PanFluteSong_104 - BMG_ID(BMGGroup_snow, 0x01), // ItemId_PanFluteSong_105 - BMG_ID(BMGGroup_maingame, 0x50), // ItemId_RabbitNet - BMG_ID(BMGGroup_maingame, 0x51), // ItemId_BeedleCard - BMG_ID(BMGGroup_maingame, 0x52), // ItemId_SilverCard - BMG_ID(BMGGroup_maingame, 0x53), // ItemId_GoldCard - BMG_ID(BMGGroup_maingame, 0x54), // ItemId_PlatinumCard - BMG_ID(BMGGroup_maingame, 0x55), // ItemId_DiamondCard - BMG_ID(BMGGroup_maingame, 0x56), // ItemId_FreebieCard - BMG_ID(BMGGroup_maingame, 0x57), // ItemId_QuintupleCard - BMG_ID(BMGGroup_maingame, 0x58), // ItemId_CarbenLetter - BMG_ID(BMGGroup_maingame, 0x59), // ItemId_RecruitUniform2 - BMG_ID(BMGGroup_maingame, 0x5A), // ItemId_EngineerUniform + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemNothing), // ItemId_Nothing + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemNormalShield), // ItemId_NormalShield + BMG_ID(BMGGroup_castle, 0xD6), // ItemId_NormalSword + BMG_ID(BMGGroup_dungeon, 0x7A), // ItemId_Whirlwind + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemBombBag), // ItemId_BombBag + BMG_ID(BMGGroup_dungeon, 0x7B), // ItemId_NormalBow + BMG_ID(BMGGroup_dungeon, 0x7C), // ItemId_Boomerang + BMG_ID(BMGGroup_dungeon, 0x7D), // ItemId_Whip + BMG_ID(BMGGroup_dungeon, 0x7E), // ItemId_SandRod + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_04), // ItemId_9 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemSmallKey), // ItemId_NormalKey + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_06), // ItemId_BossKey + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemGreenRupee), // ItemId_GreenRupee + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemBlueRupee), // ItemId_BlueRupee + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemRedRupee), // ItemId_RedRupee + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemBigGreenRupee), // ItemId_BigGreenRupee + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemBigRedRupee), // ItemId_BigRedRupee + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemBigGoldRupee), // ItemId_BigGoldRupee + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_18), // ItemId_ForceGem_18 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_19), // ItemId_ForceGem_19 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_20), // ItemId_ForceGem_20 + BMG_ID(BMGGroup_tower, 0x00), // ItemId_ForestGlyph + BMG_ID(BMGGroup_tower, 0x01), // ItemId_SnowGlyph + BMG_ID(BMGGroup_tower, 0x02), // ItemId_OceanGlyph + BMG_ID(BMGGroup_tower, 0x03), // ItemId_FireGlyph + BMG_ID(BMGGroup_forest, 0xEB), // ItemId_RestoredForestGlyph + BMG_ID(BMGGroup_snow, 0x00), // ItemId_RestoredSnowGlyph + BMG_ID(BMGGroup_water, 0x00), // ItemId_RestoredOceanGlyph + BMG_ID(BMGGroup_flame_fld, 0x8E), // ItemId_RestoredFireGlyph + BMG_ID(BMGGroup_desert, 0x48), // ItemId_RestoredDesertOceanGlyph + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemFinalTrack), // ItemId_FinalTrack + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_11), // ItemId_SpiritTrain + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_12), // ItemId_TrainCannon + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_13), // ItemId_SpiritTrainCar + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_14), // ItemId_TrainWagon + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_35), // ItemId_ForceGem_35 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_36), // ItemId_ForceGem_36 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_37), // ItemId_ForceGem_37 + BMG_ID(BMGGroup_castle, 0xD7), // ItemId_RecruitUniform + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemLetter), // ItemId_PostmasterLetter + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemHeartContainer), // ItemId_HeartContainer + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemMediumQuiver), // ItemId_QuiverMedium + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemMediumBombBag), // ItemId_BombBagMedium + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_43), // ItemId_ForceGem_43 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_44), // ItemId_ForceGem_44 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_45), // ItemId_ForceGem_45 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_46), // ItemId_ForceGem_46 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_47), // ItemId_ForceGem_47 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_48), // ItemId_ForceGem_48 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_49), // ItemId_ForceGem_49 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_50), // ItemId_ForceGem_50 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_51), // ItemId_ForceGem_51 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_52), // ItemId_ForceGem_52 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_53), // ItemId_ForceGem_53 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_54), // ItemId_ForceGem_54 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_55), // ItemId_ForceGem_55 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_56), // ItemId_ForceGem_56 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemForceGem_57), // ItemId_ForceGem_57 + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_2B), // ItemId_ForceGem_58 + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_2C), // ItemId_ForceGem_59 + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_2D), // ItemId_ForceGem_60 + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_2E), // ItemId_ForceGem_61 + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_2F), // ItemId_PanFlute + BMG_ID(BMGGroup_village, 0xF7), // ItemId_StampBook + BMG_ID(BMGGroup_dungeon, 0x7F), // ItemId_LightBow + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_30), // ItemId_LokomoSword + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemTenPriceCard), // ItemId_TenPriceCard + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemRedPotion), // ItemId_RedPotion + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemPurplePotion), // ItemId_PurplePotion + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemYellowPotion), // ItemId_YellowPotion + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemDemonFossil), // ItemId_DemonFossil + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemStalfosSkull), // ItemId_StalfosSkull + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemStarFragment), // ItemId_StarFragment + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemBeeLarvae), // ItemId_BeeLarvae + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemWoodHeart), // ItemId_WoodHeart + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemDarkPearlLoop), // ItemId_DarkPearlLoop + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemWhitePearlLoop), // ItemId_WhitePearlLoop + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemRutoCrown), // ItemId_RutoCrown + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemDragonScale), // ItemId_DragonScale + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemPirateNecklace), // ItemId_PirateNecklace + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemPalaceDish), // ItemId_PalaceDish + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemGoronAmber), // ItemId_GoronAmber + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemMysticJade), // ItemId_MysticJade + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemAncientCoin), // ItemId_AncientCoin + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemPricelessStone), // ItemId_PricelessStone + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemRegalRing), // ItemId_RegalRing + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_45), // ItemId_ArrowsRefill + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_46), // ItemId_BombsRefill + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_47), // ItemId_SoldOutSign + BMG_ID(BMGGroup_village, 0xF8), // ItemId_AncientShield + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemLargeQuiver), // ItemId_QuiverLarge + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemLargeBombBag), // ItemId_BombBagLarge + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_4A), // ItemId_RandCommonTreasure + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_4B), // ItemId_RandUncommonTreasure + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_4C), // ItemId_RandRareTreasure + BMG_ID(BMGGroup_maingame, MsgIndex_Empty_4D), // ItemId_RandLegendaryTreasure + BMG_ID(BMGGroup_tower, 0x04), // ItemId_TearLight + BMG_ID(BMGGroup_tower, 0x05), // ItemId_LightCompass + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemScrollSpinAttack), // ItemId_ScrollSpinAttack + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemScrollBeam), // ItemId_ScrollBeam + BMG_ID(BMGGroup_village, 0xF9), // ItemId_LinebeckLetter + BMG_ID(BMGGroup_forest, 0xEC), // ItemId_PanFluteSong_101 + BMG_ID(BMGGroup_dungeon, 0x80), // ItemId_PanFluteSong_102 + BMG_ID(BMGGroup_water, 0x01), // ItemId_PanFluteSong_103 + BMG_ID(BMGGroup_village, 0xFA), // ItemId_PanFluteSong_104 + BMG_ID(BMGGroup_snow, 0x01), // ItemId_PanFluteSong_105 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemRabbitNet), // ItemId_RabbitNet + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemBeedleCard), // ItemId_BeedleCard + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemSilverCard), // ItemId_SilverCard + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemGoldCard), // ItemId_GoldCard + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemPlatinumCard), // ItemId_PlatinumCard + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemDiamondCard), // ItemId_DiamondCard + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemFreebieCard), // ItemId_FreebieCard + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemQuintupleCard), // ItemId_QuintupleCard + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemCarbenLetter), // ItemId_CarbenLetter + +#if IS_JP + BMG_ID(BMGGroup_village, 0xFB), // ItemId_RecruitUniform2 + BMG_ID(BMGGroup_village, 0xFC), // ItemId_EngineerUniform +#else + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemRecruitUniform2), // ItemId_RecruitUniform2 + BMG_ID(BMGGroup_maingame, MsgIndex_GetItemEngineerUniform), // ItemId_EngineerUniform +#endif }; // Adventure Flags @@ -534,7 +540,7 @@ ARM void PlayerGet::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1) { } break; default: - itemId = data_ov000_020b6510->func_ov000_020aa02c(itemId); + itemId = gpTreasureManager->func_ov000_020aa02c(itemId); break; } @@ -882,7 +888,7 @@ ARM void PlayerGet::vfunc_10(unk32 param1, unk32 param2) { break; case ItemId_RecruitUniform2: case ItemId_EngineerUniform: - if (data_027e09a4->mSceneIndex == SceneIndex_f_first) { + if (data_027e09a4->mUnk_00.mSceneIndex == SceneIndex_f_first) { this->mUnk_28->func_ov058_02152a24(); } break; diff --git a/src/112_PlayerSceneChange/PlayerSceneChange.cpp b/src/112_PlayerSceneChange/PlayerSceneChange.cpp index 625cb2a7..effefcf2 100644 --- a/src/112_PlayerSceneChange/PlayerSceneChange.cpp +++ b/src/112_PlayerSceneChange/PlayerSceneChange.cpp @@ -302,7 +302,7 @@ ARM void PlayerSceneChange::vfunc_0c(UnkStruct_PlayerGet_vfunc_0c_param1 *param1 this->mUnk_68 = data_027e09a4->func_ov000_02070554(); } - SceneIndex eScene = data_027e09a4->mSceneIndex; + SceneIndex eScene = data_027e09a4->mUnk_00.mSceneIndex; if (eScene == SceneIndex_tekiya07) { this->mUnk_68 = 0x18; } else { diff --git a/src/Main/Game/GameModeManagerBase.cpp b/src/Main/Game/GameModeManagerBase.cpp index fa22f8fc..b95a12ca 100644 --- a/src/Main/Game/GameModeManagerBase.cpp +++ b/src/Main/Game/GameModeManagerBase.cpp @@ -44,8 +44,8 @@ ARM void GameModeManagerBase::vfunc_00() { } } -ARM void GameModeManagerBase::vfunc_04() { - data_ov000_020b50c0.func_ov000_02069d7c(); +ARM void GameModeManagerBase::vfunc_04(unk32 param1) { + data_ov000_020b50c0.func_ov000_02069d7c(param1); if (this->mUnk_150) { this->mUnk_150 = false; @@ -71,7 +71,7 @@ ARM void GameModeManagerBase::vfunc_2C(unk8 *param1) {} ARM void GameModeManagerBase::vfunc_30(unk32 param1) { GameModeLinkList *pNode; - for (pNode = this->mUnk_104.mList.GetNext(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetPrev()) { + for (pNode = this->mUnk_104.mList.GetNextList(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetPrevList()) { pNode->GetTarget()->vfunc_0C(param1); } } @@ -122,10 +122,10 @@ ARM void GameModeManagerBase::func_0201875c(void) { local_30.c = &this->mButtons; local_30.d = &this->mTouchControl; - for (pNode = this->mUnk_104.mList.GetNext(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetPrev()) { + for (pNode = this->mUnk_104.mList.GetNextList(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetPrevList()) { if (this->func_02018af0(pNode) && this->func_02018b54(pNode)) { - for (pNode2 = pNode->GetTarget()->mUnk_0C.mList.GetNext(); pNode2 != pNode->GetTarget()->mUnk_0C.GetOrigin(); - pNode2 = pNode2->GetPrev()) { + for (pNode2 = pNode->GetTarget()->mUnk_0C.mList.GetNextList(); pNode2 != pNode->GetTarget()->mUnk_0C.GetOrigin(); + pNode2 = pNode2->GetPrevList()) { pNode2->GetTarget()->vfunc_08(&local_30); } } @@ -146,9 +146,9 @@ ARM void GameModeManagerBase::func_02018830(unk8 *param1) { local_28.a = this->mNextButtonID; local_28.b = param1; - for (pNode = this->mUnk_104.mList.GetPrev(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetNext2()) { + for (pNode = this->mUnk_104.mList.GetPrevList(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetNext2()) { if (this->func_02018af0(pNode) && this->func_02018b54(pNode) && this->func_02018b90(pNode, (unk8 *) param1)) { - for (pNode2 = pNode->GetTarget()->mUnk_0C.mList.GetPrev(); pNode2 != pNode->GetTarget()->mUnk_0C.GetOrigin(); + for (pNode2 = pNode->GetTarget()->mUnk_0C.mList.GetPrevList(); pNode2 != pNode->GetTarget()->mUnk_0C.GetOrigin(); pNode2 = pNode2->GetNext2()) { pNode2->GetTarget()->vfunc_0C(&local_28); } @@ -159,7 +159,7 @@ ARM void GameModeManagerBase::func_02018830(unk8 *param1) { ARM void GameModeManagerBase::func_02018908() { GameModeLinkList *pNode; - for (pNode = this->mUnk_104.mList.GetNext(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetPrev()) { + for (pNode = this->mUnk_104.mList.GetNextList(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetPrevList()) { if (this->func_02018af0(pNode) && this->func_02018b54(pNode)) { pNode->GetTarget()->vfunc_08(&this->mButtons, &this->mTouchControl); } @@ -169,7 +169,7 @@ ARM void GameModeManagerBase::func_02018908() { ARM void GameModeManagerBase::func_02018984(unk8 *param1) { GameModeLinkList *pNode; - for (pNode = this->mUnk_104.mList.GetPrev(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetNext2()) { + for (pNode = this->mUnk_104.mList.GetPrevList(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetNext2()) { if (this->func_02018af0(pNode) && this->func_02018b54(pNode) && this->func_02018b90(pNode, param1)) { pNode->GetTarget()->vfunc_10(param1); } @@ -179,7 +179,7 @@ ARM void GameModeManagerBase::func_02018984(unk8 *param1) { ARM void GameModeManagerBase::func_02018a14(unk8 *param1) { GameModeLinkList *pNode; - for (pNode = this->mUnk_104.mList.GetNext(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetPrev()) { + for (pNode = this->mUnk_104.mList.GetNextList(); pNode != this->mUnk_104.GetOrigin(); pNode = pNode->GetPrevList()) { if (this->func_02018af0(pNode) && this->func_02018b54(pNode)) { pNode->GetTarget()->vfunc_14(param1); } diff --git a/tools/configure.py b/tools/configure.py index b4076567..aa270cc9 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -188,6 +188,8 @@ config.libs = [ Object("001_SceneInit/Item/ItemManager_001.cpp"), Object("001_SceneInit/CargoManager_001.cpp"), Object("001_SceneInit/PassengerManager_001.cpp"), + Object("001_SceneInit/Game/AdventureModeManager_001.cpp"), + Object("001_SceneInit/Game/GameModeAdventure_001.cpp"), ] ), GameLib( @@ -241,9 +243,47 @@ config.libs = [ GameLib( "Overlay 24", [ + Object("024_MainGame/Game/GameModeAdventure_024.cpp"), + Object("024_MainGame/Game/UnkStruct_ov000_020d8660_024.cpp"), + Object("024_MainGame/Game/UnkActorSystem1_024.cpp"), + Object("024_MainGame/Game/UnkActorSystem2_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_024.cpp"), + Object("024_MainGame/Game/UnkStruct_027e0998_024.cpp"), + Object("024_MainGame/Game/UnkStruct_027e0cf8_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_160_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_170_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_174_Base_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_174_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_178_Base_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_178_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_180_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_184_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_18C_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_190_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_15C_20_00_024.cpp"), + Object("024_MainGame/UnkAdventureModeSystem1_024.cpp"), + Object("024_MainGame/UnkStruct_ov024_020d8694_024.cpp"), + Object("024_MainGame/UnkTitleCardSystem1_024.cpp"), + Object("024_MainGame/UnkStruct_020d8698_024.cpp"), + Object("024_MainGame/UnkStruct_027e0cf8_00_0C_024.cpp"), + Object("024_MainGame/Game/AdventureModeManager_1B8_Base_024.cpp"), + Object("024_MainGame/UnkStruct_ov024_020d86a0_024.cpp"), + Object("024_MainGame/code_020d16fc_024.cpp"), + Object("024_MainGame/code_020d24d4_024.cpp"), + Object("024_MainGame/UnkStruct_027e0cf8_08_024.cpp"), + Object("024_MainGame/code_020d3670_024.cpp"), + Object("024_MainGame/UnkStruct_027e0ce0_34_024.cpp"), Object("024_MainGame/PassengerManager.cpp"), + Object("024_MainGame/code_020d46b4_024.cpp"), + Object("024_MainGame/UnkStruct_027e0d00.cpp"), + Object("024_MainGame/code_020d4e9c_024.cpp"), + Object("024_MainGame/code_020d51dc_024.cpp"), + Object("024_MainGame/code_020d54b0_024.cpp"), Object("024_MainGame/CargoManager_024.cpp"), + Object("024_MainGame/code_020d5938_024.cpp"), + Object("024_MainGame/UnkStruct_027e0d08_024.cpp"), Object("024_MainGame/MiscAdvManager.cpp"), + Object("024_MainGame/code_020d6650_024.cpp"), Object("024_MainGame/Actor/ActorUnkOBPC.cpp"), ] ), diff --git a/tools/m2ctx.py b/tools/m2ctx.py index cce376ec..7abe93c7 100755 --- a/tools/m2ctx.py +++ b/tools/m2ctx.py @@ -26,6 +26,7 @@ CXX_FLAGS = [ '-Ilibs/runtime/include', '-Ilibs/nitro/include', '-Ilibs/nns/include', + '-Ilibs/dsprotect/include', f'-DVERSION={args.version}', '-D__MWERKS__', ] diff --git a/tools/vtable_sym.py b/tools/vtable_sym.py new file mode 100755 index 00000000..1b846730 --- /dev/null +++ b/tools/vtable_sym.py @@ -0,0 +1,134 @@ +#!/usr/bin/env python3 + +# made by Aetias + +import argparse +from pathlib import Path +import re + +def main(): + parser = argparse.ArgumentParser(description='Define vtable symbols and update relocations') + parser.add_argument('old_name', help='The old name of the vtable symbol') + parser.add_argument('new_name', help='The new name of the vtable symbol') + parser.add_argument('--dry', action='store_true', help='Print the changes without writing to files') + parser.add_argument("-v", "--version", help='version', default="eur") + args = parser.parse_args() + + old_name: str = args.old_name + new_name: str = args.new_name + dry_run: bool = args.dry + + file_write_buffer: list[tuple[Path, list[str]]] = [] + manual_changes: list[str] = [] + + current_path = Path(__file__).parent + root_path = current_path.parent + base_config_path = root_path / "config" / args.version + for config_path in base_config_path.iterdir(): + if config_path.is_file(): + continue + + old_address = None + new_address = None + dest_module = None + for symbol_file in config_path.glob("**/symbols.txt"): + with symbol_file.open("r") as f: + lines = f.readlines() + + for row, line in enumerate(lines): + if not line.startswith(old_name): + continue + print(f"Updating symbol {old_name} in {symbol_file}:{row + 1}") + address = get_attr_value(line, "addr") + if address is None: + print(f"Error: Could not find symbol address at {symbol_file}:{row + 1}") + exit(1) + address = int(address, 16) + old_address = address + new_address = address - 8 + line = line.replace(old_name, new_name, 1) + line = set_attr_value(line, "addr", f"0x{new_address:08x}") + print(f"-> {line}") + lines[row] = line + + if old_address is None or new_address is None: + # Try next symbols.txt file + continue + + file_name = str(symbol_file.relative_to(config_path)) + if file_name.endswith("dtcm/symbols.txt"): + dest_module = ("dtcm", 0) + elif file_name.endswith("itcm/symbols.txt"): + dest_module = ("itcm", 0) + elif file_name.endswith("arm9/symbols.txt"): + dest_module = ("main", 0) + else: + overlay_id = re.search(r"ov(\d+)/symbols.txt", file_name) + if overlay_id is None: + print(f"Error: Could not determine module for {symbol_file}") + exit(1) + dest_module = ("overlay", int(overlay_id.group(1))) + + file_write_buffer.append((symbol_file, lines)) + break + + if old_address is None or new_address is None or dest_module is None: + print(f"Error: Could not find symbol {old_name} in any symbols.txt file in {config_path}") + exit(1) + + for relocs_file in config_path.glob("**/relocs.txt"): + with relocs_file.open("r") as f: + lines = f.readlines() + + any_change = False + for row, line in enumerate(lines): + to_addr = get_attr_value(line, "to") + if to_addr is None: + continue + to_addr = int(to_addr, 16) + if to_addr != old_address: + continue + reloc_module = get_attr_value(line, "module") + if reloc_module is None: + continue + if dest_module[0] == "overlay" and reloc_module.startswith("overlays"): + print(f"Warning: Found ambiguous relocation for {old_name} in {relocs_file}, it will require manual review.") + manual_changes.append(f"{relocs_file}:{row + 1}") + if not reloc_module.startswith(dest_module[0]): + continue + + print(f"Updating relocation for {old_name} in {relocs_file}:{row + 1}") + line = set_attr_value(line, "to", f"0x{new_address:08x}") + line = set_attr_value(line, "add", "0x8") + print(f"-> {line}") + lines[row] = line + any_change = True + + if any_change: + file_write_buffer.append((relocs_file, lines)) + + if not dry_run: + for symbol_file, lines in file_write_buffer: + with symbol_file.open("w") as f: + f.writelines(lines) + print(f"Changes written to {len(file_write_buffer)} files:") + else: + print(f"Dry run complete. {len(file_write_buffer)} files would be updated:") + for symbol_file, _ in file_write_buffer: + print(f"- {symbol_file}") + +def get_attr_value(line: str, attr: str) -> str | None: + match = re.search(rf"{attr}:(\S+)", line) + if match is None: + return None + return match.group(1) + +def set_attr_value(line: str, attr: str, value: str) -> str: + pattern = rf"{attr}:\S+" + if not re.search(pattern, line): + line = line.strip() + f" {attr}:{value}\n" + return line + return re.sub(rf"{attr}:\S+", f"{attr}:{value}", line, count=1) + +if __name__ == "__main__": + main()