From 82bd336cdc41c0133ab026617675cb89c84a9c1e Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Mon, 20 Nov 2023 21:06:18 -0600 Subject: [PATCH] Supported EU syncing from pmdsky-debug --- asm/include/dtcm.inc | 8 +- asm/include/main_02000C6C.inc | 16 +- asm/include/overlay_00.inc | 10 +- asm/include/overlay_01.inc | 30 +- asm/include/overlay_02.inc | 2 +- asm/include/overlay_03.inc | 14 +- asm/include/overlay_04.inc | 20 +- asm/include/overlay_05.inc | 4 +- asm/include/overlay_07.inc | 10 +- asm/include/overlay_09.inc | 16 +- asm/include/overlay_10.inc | 10 +- asm/include/overlay_11.inc | 52 +- asm/include/overlay_13.inc | 20 +- asm/include/overlay_14.inc | 24 +- asm/include/overlay_15.inc | 22 +- asm/include/overlay_16.inc | 22 +- asm/include/overlay_17.inc | 20 +- asm/include/overlay_18.inc | 22 +- asm/include/overlay_19.inc | 30 +- asm/include/overlay_20.inc | 18 +- asm/include/overlay_21.inc | 28 +- asm/include/overlay_22.inc | 24 +- asm/include/overlay_23.inc | 28 +- asm/include/overlay_24.inc | 22 +- asm/include/overlay_25.inc | 22 +- asm/include/overlay_26.inc | 8 +- asm/include/overlay_27.inc | 22 +- asm/include/overlay_28.inc | 2 +- asm/include/overlay_29_022DC240.inc | 2 +- asm/include/overlay_29_022E0378.inc | 2 +- asm/include/overlay_29_022E37DC.inc | 2 +- asm/include/overlay_29_022E9618.inc | 2 +- asm/include/overlay_29_022EAB50.inc | 2 +- asm/include/overlay_29_022F05B4.inc | 10 +- asm/include/overlay_29_022F52B0.inc | 2 +- asm/include/overlay_29_022F62CC.inc | 4 +- asm/include/overlay_29_022F7388.inc | 8 +- asm/include/overlay_29_022FE4BC.inc | 4 +- asm/include/overlay_29_022FEDBC.inc | 2 +- asm/include/overlay_29_0231CBEC.inc | 2 +- asm/include/overlay_29_0231EDFC.inc | 2 +- asm/include/overlay_29_02320788.inc | 2 +- asm/include/overlay_29_023350FC.inc | 4 +- asm/include/overlay_29_02337CCC.inc | 2 +- asm/include/overlay_29_023456BC.inc | 4 +- asm/include/overlay_29_02347BC8.inc | 4 +- asm/include/overlay_29_023498A0.inc | 10 +- asm/include/overlay_29_0234EC38.inc | 8 +- asm/include/overlay_31.inc | 24 +- asm/include/overlay_34.inc | 8 +- asm/main_02000C6C.s | 6 +- asm/main_0200C4CC.s | 1662 ++++++++--------- asm/overlay_00.s | 6 +- asm/overlay_01.s | 152 +- asm/overlay_03.s | 8 +- asm/overlay_04.s | 4 +- asm/overlay_07.s | 10 +- asm/overlay_09.s | 186 +- asm/overlay_10.s | 116 +- asm/overlay_11.s | 490 ++--- asm/overlay_13.s | 124 +- asm/overlay_14.s | 64 +- asm/overlay_15.s | 82 +- asm/overlay_16.s | 158 +- asm/overlay_17.s | 54 +- asm/overlay_18.s | 124 +- asm/overlay_19.s | 6 +- asm/overlay_20.s | 46 +- asm/overlay_21.s | 140 +- asm/overlay_22.s | 242 +-- asm/overlay_23.s | 106 +- asm/overlay_24.s | 122 +- asm/overlay_25.s | 70 +- asm/overlay_26.s | 10 +- asm/overlay_27.s | 130 +- asm/overlay_28.s | 2 +- asm/overlay_29_022E0378.s | 4 +- asm/overlay_29_022E37DC.s | 2 +- asm/overlay_29_022EAB50.s | 2 +- asm/overlay_29_022F05B4.s | 22 +- asm/overlay_29_022F52B0.s | 2 +- asm/overlay_29_022F62CC.s | 12 +- asm/overlay_29_022F7388.s | 46 +- asm/overlay_29_022FE4BC.s | 8 +- asm/overlay_29_022FEDBC.s | 14 +- asm/overlay_29_02300108.s | 12 +- asm/overlay_29_0231CBEC.s | 2 +- asm/overlay_29_0231EDFC.s | 8 +- asm/overlay_29_02320788.s | 4 +- asm/overlay_29_023350FC.s | 2 +- asm/overlay_29_02337CCC.s | 6 +- asm/overlay_29_023456BC.s | 2 +- asm/overlay_29_02347BC8.s | 12 +- asm/overlay_29_023498A0.s | 12 +- asm/overlay_29_0234EC38.s | 14 +- asm/overlay_31.s | 64 +- asm/overlay_34.s | 16 +- sub/asm/include/main.inc | 8 +- sub/asm/main.s | 72 +- sub/asm/wram.s | 176 +- sub/lib/asm/crt0.s | 8 +- sub/lib/asm/include/crt0.inc | 4 +- .../sync_pmdsky_debug/pmdsky_debug_reader.py | 75 +- .../sync_from_pmdsky_debug.py | 144 +- tools/sync_pmdsky_debug/xmap_reader.py | 33 +- 105 files changed, 2801 insertions(+), 2741 deletions(-) diff --git a/asm/include/dtcm.inc b/asm/include/dtcm.inc index 9c0d5129..86075e3e 100644 --- a/asm/include/dtcm.inc +++ b/asm/include/dtcm.inc @@ -1,11 +1,11 @@ #pragma once .public sub_02078974 -.public sub_02078A40 -.public sub_02078A50 -.public sub_02078A60 -.public sub_02078A70 .public sub_02078974 .public sub_02078A00 .public sub_02078A10 .public sub_02078A20 .public sub_02078A30 +.public sub_02078A40 +.public sub_02078A50 +.public sub_02078A60 +.public sub_02078A70 diff --git a/asm/include/main_02000C6C.inc b/asm/include/main_02000C6C.inc index 031a3045..42e5a6af 100644 --- a/asm/include/main_02000C6C.inc +++ b/asm/include/main_02000C6C.inc @@ -1,8 +1,4 @@ #pragma once -.public __addsf3 -.public __divsi3 -.public __floatsisf -.public __mulsf3 .public _0200A314 .public _0200A314 .public _0200A344 @@ -96,6 +92,8 @@ .public _020AF5E8 .public _020AF694 .public _020AF698 +.public _020AFF38_EU +.public _020AFF3C_EU .public _020B2B98 .public _020B3380 .public _020B3384 @@ -177,6 +175,10 @@ .public _022A3805 .public _022A3806 .public _022B966C +.public __addsf3 +.public __divsi3 +.public __floatsisf +.public __mulsf3 .public abs .public ArrayFill32Fast .public CART_REMOVED_IMG_DATA @@ -197,9 +199,11 @@ .public MEMORY_ALLOCATION_ARENA_GETTERS .public NATURAL_LOG_VALUE_TABLE .public OS_IRQTable +.public PlayBgmById .public PRNG_SEQUENCE_NUM .public sprintf .public sqrtf +.public StopBgmCommand .public strcat .public strcmp .public strcpy @@ -215,8 +219,6 @@ .public strncpy .public sub_02017D20 .public sub_02017DB4 -.public sub_02017DF4 -.public sub_02017EE8 .public sub_02017FF0 .public sub_02018024 .public sub_02018118 @@ -337,5 +339,3 @@ .public sub_02085180 .public vsprintf .public WaitForInterrupt -.public _020AFF38_EU -.public _020AFF3C_EU diff --git a/asm/include/overlay_00.inc b/asm/include/overlay_00.inc index ffd67a0c..ce566686 100644 --- a/asm/include/overlay_00.inc +++ b/asm/include/overlay_00.inc @@ -1,6 +1,4 @@ #pragma once -.public __divsi3 -.public __udivsi3 .public _02000AAC .public _02000BDC .public _02000BF4 @@ -12,6 +10,8 @@ .public _020AEDB0 .public _022B966C .public _022BCA70 +.public __divsi3 +.public __udivsi3 .public _start_AutoloadDoneCallback .public abs .public ArrayCopy16 @@ -23,6 +23,8 @@ .public EnableIrqFlag .public FileInit .public GetDebugFlag +.public GetLanguage +.public GetProcessorMode .public LoadOverlay .public MemAlloc .public memcmp @@ -60,6 +62,7 @@ .public ov09_0233CA80 .public ov09_0233CBC8 .public ov09_0233CBF8 +.public PlayBgmByIdVeneer .public RandInt .public SetIrqFlag .public snprintf @@ -101,7 +104,6 @@ .public sub_02017A68 .public sub_02017A80 .public sub_02017ACC -.public sub_02017B58 .public sub_020184B4 .public sub_020184C0 .public sub_0201BE28 @@ -175,7 +177,6 @@ .public sub_0207B040 .public sub_0207B17C .public sub_0207B1E8 -.public sub_0207B848 .public sub_0207B854 .public sub_0207B9EC .public sub_0207BA08 @@ -238,4 +239,3 @@ .public UnloadOverlay .public WaitForever2 .public wcslen -.public GetLanguage diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index 1abfd85a..69b12b5f 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -1,7 +1,7 @@ #pragma once +.public _020B0A5C .public __divsi3 .public __udivsi3 -.public _020B0A5C .public ArrayCopy32 .public BAG_ITEMS_PTR_MIRROR .public CardBackupError @@ -12,15 +12,18 @@ .public CopyMovesetFrom .public CopyMovesetTo .public CreateAdvancedMenu -.public CreateDBox -.public CreateNormalMenu +.public CreateAdvancedTextBox1 +.public CreateControlsChart +.public CreateDialogueBox +.public CreateSimpleMenuWrapper +.public CreateTextBox1 .public DebugPrint0 .public DeleteWanTableEntryVeneer .public EnableIrqFlag .public FemaleToMaleForm .public FreeAdvancedMenu -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox +.public FreeSimpleMenu .public GetAdvancedMenuCurrentOption .public GetAdvancedMenuResult .public GetAdventureLogCompleted @@ -48,10 +51,10 @@ .public GetNbPokemonJoined .public GetNbRecycled .public GetNbSkyGiftsSent -.public GetNormalMenuResult .public GetPerformanceFlagWithChecks .public GetPressedButtons .public GetReleasedStylus +.public GetSimpleMenuResult .public GetSosMailCount .public GetSpecialEpisodeType .public GetSpeciesString @@ -60,13 +63,14 @@ .public GetTeamMember .public GetVictoriesOnOneFloor .public InitAnimationControl +.public InitAnimationControlWithSet__0201C14C .public InitPreprocessorArgs .public IsAdvancedMenuActive .public IsAdventureLogNotEmpty -.public IsDBoxActive +.public IsDialogueBoxActive .public IsItemInTimeDarkness .public IsMovesetValid -.public IsNormalMenuActive +.public IsSimpleMenuActive .public LoadScriptVariableValueAtIndex .public LoadWanTableEntry .public LoadWanTableEntryFromPack @@ -207,6 +211,7 @@ .public ov07_0233F6E0 .public ov07_0233F758 .public ov07_0233FCD8 +.public PlaySeVolumeWrapper .public PreprocessString .public PreprocessStringFromMessageId .public PrintClearMark @@ -217,8 +222,8 @@ .public SetScenarioScriptVar .public SetSpriteIdForAnimationControl .public ShowKeyboard -.public ShowMessageInDBox -.public ShowStringInDBox +.public ShowMessageInDialogueBox +.public ShowStringInDialogueBox .public sprintf .public strcmp .public strcpy @@ -242,9 +247,7 @@ .public sub_0200DFBC .public sub_0200DFE4 .public sub_0200EB64 -.public sub_02017CCC .public sub_0201C000 -.public sub_0201C0B0 .public sub_0201C138 .public sub_0201CF5C .public sub_0201D110 @@ -284,14 +287,11 @@ .public sub_0202BD48 .public sub_0202C38C .public sub_0202F334 -.public sub_0202F8C4 .public sub_0202F8FC .public sub_0202F954 .public sub_0202FB9C -.public sub_0202FE2C .public sub_0202FED4 .public sub_0202FEF0 -.public sub_020305B4 .public sub_0203088C .public sub_020308A0 .public sub_020308C4 diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index 38533cf1..401c0bab 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -1,7 +1,7 @@ #pragma once +.public _020AE224 .public __divsi3 .public __udivsi3 -.public _020AE224 .public ArrayCopy16 .public ArrayCopy32 .public ArrayCopy32Fast diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc index 533ddd26..27c82361 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03.inc @@ -1,6 +1,11 @@ #pragma once +.public AddItemToStorage .public CanSendItem +.public ConvertStorageItemAtIdxToBulkItem +.public ConvertStorageItemAtIdxToItem .public CreateAdvancedMenu +.public CreateAdvancedTextBox1 +.public CreateScrollBox1 .public DebugPrint0 .public FreeAdvancedMenu .public GetAdvancedMenuCurrentOption @@ -11,6 +16,7 @@ .public GetKeyboardStatus .public GetKeyboardStringResult .public GetLanguageType +.public GetMainTeamNameWithCheck .public GetMaxItemsAllowed .public GetMaxReachedFloor .public GetMaxRescueAttempts @@ -20,7 +26,6 @@ .public GetSosMailCount .public GetStringFromFileVeneer .public GetTeamMember -.public GetMainTeamNameWithCheck .public IncrementNbSkyGiftsSent .public InitPreprocessorArgs .public InitStandardItem @@ -100,6 +105,7 @@ .public ov01_023398B0 .public ov01_02339988 .public ov01_0233C1B4 +.public PlaySeVolumeWrapper .public PrintIqSkillsMenu .public RandInt .public SetQuestionMarks @@ -112,12 +118,8 @@ .public sub_02006BFC .public sub_02006C8C .public sub_0200D310 -.public ConvertStorageItemAtIdxToBulkItem -.public ConvertStorageItemAtIdxToItem .public sub_02010044 .public sub_02010154 -.public AddItemToStorage -.public sub_02017CCC .public sub_02025404 .public sub_0202561C .public sub_02026214 @@ -125,10 +127,8 @@ .public sub_02029F88 .public sub_02029FBC .public sub_0202BCBC -.public sub_0202E3CC .public sub_0202E6C8 .public sub_0202E6E4 -.public sub_020305B4 .public sub_020308A0 .public sub_020308C4 .public sub_02030A18 diff --git a/asm/include/overlay_04.inc b/asm/include/overlay_04.inc index 514049f0..a1e9f506 100644 --- a/asm/include/overlay_04.inc +++ b/asm/include/overlay_04.inc @@ -1,10 +1,16 @@ #pragma once +.public AddItemToStorage .public CanSendItem +.public ConvertStorageItemAtIdxToBulkItem +.public ConvertStorageItemAtIdxToItem +.public CountNbOfItemsInStorage +.public CreateScrollBox1 .public GetItemCategory .public GetLanguageType -.public GetPressedButtons -.public GetStringFromFileVeneer .public GetMainTeamNameWithCheck +.public GetPressedButtons +.public GetRankStorageSize +.public GetStringFromFileVeneer .public IncrementNbSkyGiftsSent .public InitPreprocessorArgs .public InitStandardItem @@ -33,7 +39,9 @@ .public ov01_02337DD0 .public ov01_02337E0C .public ov01_0233C1DC +.public PlaySeVolumeWrapper .public RandInt +.public RemoveItemAtIdxInStorage .public StrncpySimpleNoPadSafe .public sub_02003B5C .public sub_02003B94 @@ -43,18 +51,11 @@ .public sub_0200D310 .public sub_0200D8E4 .public sub_0200FD48 -.public CountNbOfItemsInStorage -.public ConvertStorageItemAtIdxToBulkItem -.public ConvertStorageItemAtIdxToItem .public sub_02010044 .public sub_0201007C .public sub_02010154 -.public RemoveItemAtIdxInStorage -.public AddItemToStorage -.public sub_02017CCC .public sub_02029F88 .public sub_02029FBC -.public sub_0202E3CC .public sub_0202E6C8 .public sub_0202E6E4 .public sub_0203D438 @@ -86,6 +87,5 @@ .public sub_02046C78 .public sub_02046D20 .public sub_0204A018 -.public GetRankStorageSize .public sub_0206351C .public UnloadFile diff --git a/asm/include/overlay_05.inc b/asm/include/overlay_05.inc index f00e00da..599aad2f 100644 --- a/asm/include/overlay_05.inc +++ b/asm/include/overlay_05.inc @@ -4,13 +4,14 @@ .public GetAdvancedMenuCurrentOption .public GetAdvancedMenuResult .public GetAdventureLogDungeonFloor +.public GetExplorerMazeTeamName .public GetFirstNotRealMoveInTimeDarkness .public GetHeldButtons .public GetLanguageType +.public GetMainTeamNameWithCheck .public GetReleasedStylus .public GetStringFromFileVeneer .public GetTeamMember -.public GetMainTeamNameWithCheck .public InitPreprocessorArgs .public IsMovesetValid .public MemAlloc @@ -101,7 +102,6 @@ .public sub_02057030 .public sub_02058FA4 .public sub_02058FCC -.public GetExplorerMazeTeamName .public sub_020590C0 .public sub_020590DC .public sub_0205BD78 diff --git a/asm/include/overlay_07.inc b/asm/include/overlay_07.inc index a1ca748f..d8267d85 100644 --- a/asm/include/overlay_07.inc +++ b/asm/include/overlay_07.inc @@ -1,10 +1,13 @@ #pragma once .public __divsi3 +.public CreateCollectionMenu +.public CreateOptionsMenu +.public CreateTextBox1 .public GetKeyboardStatus .public GetKeyboardStringResult .public GetLanguageType -.public GetStringFromFileVeneer .public GetMainTeamNameWithCheck +.public GetStringFromFileVeneer .public InitPreprocessorArgs .public MemAlloc .public MemcpySimple @@ -95,6 +98,7 @@ .public ov01_02339888 .public ov01_023398A4 .public ov01_02339988 +.public PlaySeVolumeWrapper .public PreprocessStringFromMessageId .public ShowKeyboard .public strcat @@ -103,7 +107,6 @@ .public sub_02003B94 .public sub_02003BC8 .public sub_02003BFC -.public sub_02017CCC .public sub_0202065C .public sub_02026214 .public sub_020264F8 @@ -112,19 +115,16 @@ .public sub_0202836C .public sub_02029F88 .public sub_02029FBC -.public sub_0202C3A8 .public sub_0202C620 .public sub_0202C70C .public sub_0202C728 .public sub_0202C748 .public sub_0202C75C .public sub_0202D07C -.public sub_0202D1F0 .public sub_0202D530 .public sub_0202D55C .public sub_0202D59C .public sub_0202D5E4 -.public sub_0202F8C4 .public sub_0202F8FC .public sub_0202F954 .public sub_02037468 diff --git a/asm/include/overlay_09.inc b/asm/include/overlay_09.inc index 1f8009e1..8dbdcc95 100644 --- a/asm/include/overlay_09.inc +++ b/asm/include/overlay_09.inc @@ -1,14 +1,15 @@ #pragma once -.public CreateDBox -.public FreeDBox -.public GetDialogBoxField0xC +.public CreateDialogueBox +.public FreeDialogueBox .public GetPressedButtons .public GetStringFromFileVeneer +.public GetWindowContents .public InitPreprocessorArgs -.public IsDBoxActive +.public IsDialogueBoxActive .public IsMenuOptionActive .public MemAlloc .public MemFree +.public NewWindowScreenCheck .public ov00_022BE57C .public ov00_022BE5C8 .public ov00_022BE680 @@ -19,8 +20,10 @@ .public ov01_02330E00 .public ov01_02330E38 .public ov01_023310B8 +.public PlayBgmByIdVeneer +.public PlayMenuOptionSound .public PreprocessStringFromMessageId -.public ShowMessageInDBox +.public ShowMessageInDialogueBox .public sub_02003B5C .public sub_02003BAC .public sub_02003BC8 @@ -28,13 +31,11 @@ .public sub_02006C8C .public sub_02017B0C .public sub_02017B18 -.public sub_02017B58 .public sub_02017B70 .public sub_02017B7C .public sub_02026214 .public sub_020263C8 .public sub_020265A8 -.public sub_02027648 .public sub_02027AF0 .public sub_02027B1C .public sub_0202810C @@ -61,7 +62,6 @@ .public sub_02032594 .public sub_02032684 .public sub_020328D8 -.public sub_02032960 .public sub_02032984 .public sub_02033758 .public sub_0204CA1C diff --git a/asm/include/overlay_10.inc b/asm/include/overlay_10.inc index 697dc7e9..466a0317 100644 --- a/asm/include/overlay_10.inc +++ b/asm/include/overlay_10.inc @@ -1,12 +1,13 @@ #pragma once -.public __divsi3 .public _020AFC4C .public _020B0A5C +.public __divsi3 .public abs .public AllocAndLoadFileInPack .public BAG_ITEMS_PTR_MIRROR .public CleanStickyItemsInBag .public CreatePortraitBox +.public CreateTextBox1 .public DebugPrint0 .public DecompressAtFromMemoryPointerVeneer .public DecompressAtNormalVeneer @@ -158,7 +159,6 @@ .public GetBodySize .public GetCurrentBagCapacity .public GetDebugFlag -.public GetDialogBoxField0xC .public GetDungeonGroup .public GetDungeonMode .public GetDungeonModeSpecial @@ -170,10 +170,12 @@ .public GetNbFloors .public GetNbFloorsDungeonGroup .public GetNbPrecedingFloors +.public GetWindowContents .public GroundMainLoop .public HandleSir0Translation .public HidePortraitBox .public IncrementNbFriendRescues +.public InitAnimationControlWithSet__0201C14C .public InitEventFlagScriptVars .public InitPortraitBox .public InitPortraitBoxWithMonsterId @@ -193,6 +195,7 @@ .public MemsetSimple .public MemZero .public MultiplyByFixedPoint +.public NewWindowScreenCheck .public ov11_023061CC .public ov11_02306C64 .public ov11_02306C9C @@ -231,7 +234,6 @@ .public sub_02017ACC .public sub_02017C80 .public sub_0201B43C -.public sub_0201C0B0 .public sub_0201C108 .public sub_0201C138 .public sub_0201CF5C @@ -253,7 +255,6 @@ .public sub_02026214 .public sub_020263C8 .public sub_020265A8 -.public sub_02027648 .public sub_02027AF0 .public sub_02027B1C .public sub_02027B58 @@ -267,7 +268,6 @@ .public sub_020287C4 .public sub_02028980 .public sub_0202A0B0 -.public sub_0202F8C4 .public sub_0202F8FC .public sub_0202F918 .public sub_0203299C diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index f13c922b..cd586622 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -1,11 +1,11 @@ #pragma once +.public _020A1870 +.public _020A548A +.public _020A5490 .public __divsf3 .public __divsi3 .public __fixsfsi .public __floatsisf -.public _020A1870 -.public _020A548A -.public _020A5490 .public abs .public AddBulkItemToStorage .public AddItemToBagNoHeld @@ -15,6 +15,7 @@ .public ApplyGummiBoostsToTeamMember .public BAG_ITEMS_PTR_MIRROR .public CheckMissionRestrictions +.public CheckTeamMemberIdx .public ClampComponentAbs .public CloseSynthBin .public ComputeSpecialCounters @@ -24,11 +25,17 @@ .public CountNbItemsOfTypeInBag .public CountNbItemsOfTypeInStorage .public CreateAdvancedMenu -.public CreateDBox +.public CreateAdvancedTextBox1 +.public CreateCollectionMenu +.public CreateControlsChart +.public CreateDialogueBox +.public CreateDynamicTextBox .public CreateMemArena .public CreateMonsterSummaryFromTeamMember -.public CreateNormalMenu .public CreatePortraitBox +.public CreateScrollBox1 +.public CreateSimpleMenuWrapper +.public CreateTextBox1 .public DataTransferInit .public DataTransferStop .public DebugPrint @@ -53,9 +60,9 @@ .public FileRead .public FileSeek .public FreeAdvancedMenu -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GenerateDailyMissions .public GenerateKecleonItems1 .public GenerateKecleonItems2 @@ -70,7 +77,6 @@ .public GetDebugFlag .public GetDebugLogFlag .public GetDexNumber -.public GetDialogBoxField0xC .public GetDungeonMode .public GetDungeonModeSpecial .public GetExclusiveItemType @@ -97,7 +103,6 @@ .public GetNameRaw .public GetNameWithGender .public GetNbItemsInBag -.public GetNormalMenuResult .public GetPartner .public GetPartyMembers .public GetPerformanceFlagWithChecks @@ -106,15 +111,18 @@ .public GetRankupPoints .public GetReleasedStylus .public GetScenarioBalance +.public GetSimpleMenuResult .public GetSosMailCount .public GetSpriteIndex__02052724 .public GetStringFromFileVeneer .public GetTalkLine .public GetTeamMember .public GetType +.public GetWindowContents .public IncrementNbBigTreasureWins .public IncrementNbDungeonsCleared .public IncrementNbSkyGiftsSent +.public InitAnimationControlWithSet__0201C14C .public InitBulkItem .public InitMainTeamAfterQuiz .public InitMove @@ -128,11 +136,11 @@ .public IqSkillFlagTest .public IsAdvancedMenuActive .public IsBagFull -.public IsDBoxActive +.public IsDialogueBoxActive .public IsGummi .public IsHM .public IsMonsterOnTeam -.public IsNormalMenuActive +.public IsSimpleMenuActive .public IsStorageFull .public ItemAtTableIdx .public ItemZInit @@ -155,6 +163,7 @@ .public MemFree .public MemsetSimple .public MemZero +.public NewWindowScreenCheck .public ov10_022BCC60 .public ov10_022BCC7C .public ov10_022BCCB0 @@ -280,6 +289,9 @@ .public ov27_0238BB80 .public ov28_0238A140 .public OverlayIsLoaded +.public PlayBgmByIdVeneer +.public PlayBgmByIdVolumeVeneer +.public PlaySeVolumeWrapper .public PointsToZero .public PreprocessString .public PreprocessStringFromMessageId @@ -312,11 +324,11 @@ .public SetSpriteIdForAnimationControl .public SetTeamSetupHeroAndPartnerOnly .public SetTeamSetupHeroOnly -.public ShowDBox +.public ShowDialogueBox .public ShowKeyboard -.public ShowMessageInDBox +.public ShowMessageInDialogueBox .public ShowPortraitBox -.public ShowStringInDBox +.public ShowStringInDialogueBox .public SortItemsInBag .public SpecialProcAddItemToBag .public sprintf @@ -431,13 +443,11 @@ .public sub_02017AB0 .public sub_02017ACC .public sub_02017B18 -.public sub_02017B58 .public sub_02017B70 .public sub_02017B7C .public sub_02017B88 .public sub_02017B94 .public sub_02017BD4 -.public sub_02017BE0 .public sub_02017BEC .public sub_02017BF8 .public sub_02017C04 @@ -452,7 +462,6 @@ .public sub_02017CA8 .public sub_02017CB4 .public sub_02017CC0 -.public sub_02017CCC .public sub_02017FB0 .public sub_0201BCCC .public sub_0201BCF4 @@ -462,7 +471,6 @@ .public sub_0201BF4C .public sub_0201BF64 .public sub_0201C000 -.public sub_0201C0B0 .public sub_0201C108 .public sub_0201CF5C .public sub_0201CF90 @@ -488,7 +496,6 @@ .public sub_02026268 .public sub_020262E0 .public sub_020265A8 -.public sub_02027648 .public sub_02027AF0 .public sub_02027B1C .public sub_0202810C @@ -517,7 +524,6 @@ .public sub_0202B1AC .public sub_0202BBF0 .public sub_0202BCBC -.public sub_0202C3A8 .public sub_0202C620 .public sub_0202C70C .public sub_0202C728 @@ -528,7 +534,6 @@ .public sub_0202D07C .public sub_0202D0EC .public sub_0202D114 -.public sub_0202E3CC .public sub_0202E6C8 .public sub_0202E6E4 .public sub_0202F16C @@ -536,18 +541,14 @@ .public sub_0202F2C4 .public sub_0202F334 .public sub_0202F3F8 -.public sub_0202F8C4 .public sub_0202F8FC .public sub_0202F918 .public sub_0202F954 -.public sub_0202FBBC .public sub_0202FD3C .public sub_0202FD50 .public sub_0202FD6C -.public sub_0202FE2C .public sub_0202FED4 .public sub_0202FEF0 -.public sub_020305B4 .public sub_020307EC .public sub_020308A0 .public sub_020308C4 @@ -706,7 +707,6 @@ .public sub_02055DD0 .public sub_02055FCC .public sub_02056094 -.public sub_02056264 .public sub_0205633C .public sub_02056410 .public sub_020564B0 diff --git a/asm/include/overlay_13.inc b/asm/include/overlay_13.inc index 4df16cc6..0e63693b 100644 --- a/asm/include/overlay_13.inc +++ b/asm/include/overlay_13.inc @@ -1,14 +1,15 @@ #pragma once .public __divsi3 .public CreateAdvancedMenu -.public CreateDBox -.public CreateNormalMenu +.public CreateDialogueBox .public CreatePortraitBox +.public CreateSimpleMenuWrapper +.public CreateTextBox1 .public FemaleToMaleForm .public FreeAdvancedMenu -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetAdvancedMenuCurrentOption .public GetAdvancedMenuResult .public GetDebugFlag @@ -16,9 +17,9 @@ .public GetKeyboardStringResult .public GetMonsterGenderVeneer .public GetNameRaw -.public GetNormalMenuResult .public GetPressedButtons .public GetReleasedStylus +.public GetSimpleMenuResult .public GetStringFromFileVeneer .public GetType .public HidePortraitBox @@ -26,8 +27,8 @@ .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs .public IsAdvancedMenuActive -.public IsDBoxActive -.public IsNormalMenuActive +.public IsDialogueBoxActive +.public IsSimpleMenuActive .public MemAlloc .public MemFree .public ov11_022E6E68 @@ -45,9 +46,9 @@ .public SetPortraitEmotion .public SetPortraitLayout .public SetPortraitOffset -.public ShowDBox +.public ShowDialogueBox .public ShowKeyboard -.public ShowMessageInDBox +.public ShowMessageInDialogueBox .public ShowPortraitBox .public StrcpyName .public StrcpySimple @@ -63,7 +64,6 @@ .public sub_0202836C .public sub_02028770 .public sub_0202F2C4 -.public sub_0202F8C4 .public sub_0202F8FC .public sub_020348E4 .public sub_02037468 diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc index a34fcb15..0815bcce 100644 --- a/asm/include/overlay_14.inc +++ b/asm/include/overlay_14.inc @@ -3,31 +3,33 @@ .public AnimRelatedFunction__022F6F14 .public AnimRelatedFunction__022F7064 .public CreateAdvancedMenu -.public CreateDBox -.public CreateNormalMenu +.public CreateDialogueBox .public CreatePortraitBox +.public CreateSimpleMenuWrapper +.public CreateTextBox1 .public DebugPrint0 .public FemaleToMaleForm .public FreeAdvancedMenu -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetHero .public GetHeroMemberIdx .public GetLanguage .public GetNameRaw -.public GetNormalMenuResult .public GetPartner .public GetPartnerMemberIdx .public GetPressedButtons .public GetReleasedStylus .public GetSentryDutyGamePoints +.public GetSimpleMenuResult .public HidePortraitBox +.public InitAnimDataFromOtherAnimDataVeneer .public InitPortraitBox .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs -.public IsDBoxActive -.public IsNormalMenuActive +.public IsDialogueBoxActive +.public IsSimpleMenuActive .public LoadObjectAnimData .public MemAlloc .public MemFree @@ -35,9 +37,9 @@ .public ov11_022F4990 .public ov11_022F5BBC .public ov11_022F6EFC -.public ov11_022F6F08 .public ov11_022F6FE0 .public ov11_022F7058 +.public PlayBgmByIdVeneer .public PreprocessString .public RandRange .public SENTRY_DUTY_MONSTER_IDS @@ -47,13 +49,12 @@ .public SetPortraitLayout .public SetPortraitOffset .public SetSentryDutyGamePoints -.public ShowDBox -.public ShowMessageInDBox +.public ShowDialogueBox +.public ShowMessageInDialogueBox .public ShowPortraitBox .public StringFromMessageId .public strlen .public sub_020063F4 -.public sub_02017B58 .public sub_02017B70 .public sub_02017B7C .public sub_02017C80 @@ -64,7 +65,6 @@ .public sub_0202BCBC .public sub_0202F334 .public sub_0202F66C -.public sub_0202F8C4 .public sub_0202F8FC .public sub_0202F954 .public sub_0202FB9C diff --git a/asm/include/overlay_15.inc b/asm/include/overlay_15.inc index 36ca31a0..55d4b105 100644 --- a/asm/include/overlay_15.inc +++ b/asm/include/overlay_15.inc @@ -1,31 +1,33 @@ #pragma once .public AddMoneyCarried .public AddMoneyStored -.public CreateDBox -.public CreateNormalMenu +.public CreateAdvancedTextBox1 +.public CreateDialogueBox .public CreatePortraitBox +.public CreateSimpleMenuWrapper +.public CreateTextBox1 .public DebugPrint0 -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetMoneyCarried .public GetMoneyStored -.public GetNormalMenuResult +.public GetSimpleMenuResult .public HidePortraitBox .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs -.public IsDBoxActive +.public IsDialogueBoxActive .public MemAlloc .public MemFree .public ov11_022E6E68 +.public PlaySeVolumeWrapper .public PreprocessStringFromMessageId .public SetPortraitEmotion .public SetPortraitLayout -.public ShowDBox -.public ShowMessageInDBox +.public ShowDialogueBox +.public ShowMessageInDialogueBox .public ShowPortraitBox .public sub_02017C80 -.public sub_02017CCC .public sub_02026214 .public sub_02026268 .public sub_02027AF0 @@ -33,10 +35,8 @@ .public sub_0202836C .public sub_020288DC .public sub_0202F2C4 -.public sub_0202F8C4 .public sub_0202F8FC .public sub_0202F954 -.public sub_020305B4 .public sub_020307A4 .public sub_0203083C .public sub_0203088C diff --git a/asm/include/overlay_16.inc b/asm/include/overlay_16.inc index 0c091a46..2067d0dd 100644 --- a/asm/include/overlay_16.inc +++ b/asm/include/overlay_16.inc @@ -1,17 +1,17 @@ #pragma once .public __divsi3 .public CreateAdvancedMenu -.public CreateDBox -.public CreateNormalMenu +.public CreateDialogueBox .public CreatePortraitBox +.public CreateSimpleMenuWrapper .public DebugPrint0 .public EVOLUTION_HP_BONUS .public EVOLUTION_PHYSICAL_STAT_BONUSES .public EVOLUTION_SPECIAL_STAT_BONUSES .public FreeAdvancedMenu -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetActiveTeamMember .public GetAdvancedMenuResult .public GetEvolutionPossibilities @@ -22,18 +22,18 @@ .public GetMainCharacter1MemberIdx .public GetNameRaw .public GetNameString -.public GetNormalMenuResult .public GetPressedButtons +.public GetSimpleMenuResult .public GetTeamMember .public IncrementNbEvolutions .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs .public IsAdvancedMenuActive -.public IsDBoxActive +.public IsDialogueBoxActive .public IsMainCharacter .public IsMonsterNotNicknamed .public IsMonsterOnTeam -.public IsNormalMenuActive +.public IsSimpleMenuActive .public IsValidTeamMember .public MemAlloc .public MemFree @@ -44,23 +44,23 @@ .public ov11_02310BDC .public PreprocessString .public Rand16Bit +.public RemoveItemInStorage .public RemoveItemNoHole .public SetPokemonJoined .public SetPortraitEmotion .public SetPortraitLayout .public SetTeamSetupHeroOnly -.public ShowDBox +.public ShowDialogueBox .public ShowKeyboard -.public ShowMessageInDBox +.public ShowMessageInDialogueBox .public ShowPortraitBox .public StrcpySimple +.public StrncpyName .public StrncpySimple .public StrncpySimpleNoPadSafe -.public RemoveItemInStorage .public sub_02017C50 .public sub_02017C74 .public sub_02017CB4 -.public StrncpyName .public sub_0202836C .public sub_0202F2C4 .public sub_02037468 diff --git a/asm/include/overlay_17.inc b/asm/include/overlay_17.inc index f9101882..16b0c1ef 100644 --- a/asm/include/overlay_17.inc +++ b/asm/include/overlay_17.inc @@ -1,38 +1,38 @@ #pragma once -.public CreateDBox -.public CreateNormalMenu +.public CreateDialogueBox .public CreatePortraitBox -.public FreeDBox -.public FreeNormalMenu +.public CreateSimpleMenuWrapper +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetActiveRosterIndex .public GetGameMode .public GetMainCharacter1MemberIdx -.public GetNormalMenuResult .public GetPartnerMemberIdx .public GetPerformanceFlagWithChecks .public GetPressedButtons +.public GetSimpleMenuResult .public GetTeamMember .public HidePortraitBox .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs -.public IsDBoxActive +.public IsDialogueBoxActive .public IsMainCharacter -.public IsNormalMenuActive +.public IsSimpleMenuActive .public MemAlloc .public MemFree .public ov11_022DC504 .public ov11_022E6E68 .public ov11_0238A08C +.public PlaySeVolumeWrapper .public PrintIqSkillsMenu .public SetPortraitEmotion .public SetPortraitLayout -.public ShowDBox -.public ShowMessageInDBox +.public ShowDialogueBox +.public ShowMessageInDialogueBox .public ShowPortraitBox .public sub_02017C10 .public sub_02017C50 -.public sub_02017CCC .public sub_0202E6B0 .public sub_0202E6C8 .public sub_0202E6E4 diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc index 0aa2409d..02ad91ac 100644 --- a/asm/include/overlay_18.inc +++ b/asm/include/overlay_18.inc @@ -1,13 +1,14 @@ #pragma once .public AddMoneyCarried .public CreateAdvancedMenu -.public CreateDBox -.public CreateNormalMenu +.public CreateDialogueBox .public CreatePortraitBox +.public CreateSimpleMenuWrapper +.public CreateTextBox1 .public FreeAdvancedMenu -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetAdvancedMenuCurrentOption .public GetAdvancedMenuResult .public GetEncodedHalfword @@ -15,29 +16,29 @@ .public GetMoneyCarried .public GetMoveName .public GetMovesetLevelUpPtr -.public GetNormalMenuResult .public GetPressedButtons +.public GetSimpleMenuResult .public HidePortraitBox .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs -.public IsDBoxActive -.public IsNormalMenuActive +.public IsDialogueBoxActive +.public IsSimpleMenuActive .public MemAlloc .public memcpy .public MemFree .public ov11_022E6E68 .public ov11_0238A090 +.public PlaySeVolumeWrapper .public PreprocessString .public PrintIqSkillsMenu .public SetPortraitEmotion .public SetPortraitLayout -.public ShowDBox -.public ShowMessageInDBox +.public ShowDialogueBox +.public ShowMessageInDialogueBox .public ShowPortraitBox .public StrncpySimpleNoPadSafe .public sub_02017C74 .public sub_02017C80 -.public sub_02017CCC .public sub_02026214 .public sub_02026268 .public sub_02027AF0 @@ -51,7 +52,6 @@ .public sub_0202E6E4 .public sub_0202F334 .public sub_0202F66C -.public sub_0202F8C4 .public sub_0202F8FC .public sub_0202F954 .public sub_0202FB9C diff --git a/asm/include/overlay_19.inc b/asm/include/overlay_19.inc index 717c8858..b6df5a90 100644 --- a/asm/include/overlay_19.inc +++ b/asm/include/overlay_19.inc @@ -1,7 +1,18 @@ #pragma once .public abs +.public ApplyCalciumBoostToGroundMonster +.public ApplyGinsengToGroundMonster +.public ApplyGravelyrockBoostToGroundMonster +.public ApplyGummiBoostsToGroundMonster +.public ApplyIronBoostToGroundMonster +.public ApplyLifeSeedBoostToGroundMonster +.public ApplyNectarBoostToGroundMonster +.public ApplyProteinBoostToGroundMonster +.public ApplySitrusBerryBoostToGroundMonster +.public ApplyZincBoostToGroundMonster .public CanMonsterBeUsedForMissionWrapper .public CreatePortraitBox +.public CreateScrollBox1 .public DebugPrint0 .public DungeonSwapIdToIdx .public EnableIqSkill @@ -26,6 +37,8 @@ .public InitRandomNpcJobs .public IsGummi .public IsMainCharacter +.public IsMonsterAffectedByGravelyrockGroundMode +.public ItemToBulkItem .public MemAlloc .public MemcpySimple .public MemFree @@ -53,10 +66,10 @@ .public ov11_0230D220 .public ov11_02311D6C .public ov11_02324DB0 +.public PlaySeVolumeWrapper .public PreprocessString .public PreprocessStringFromMessageId .public PrintIqSkillsMenu -.public ApplyGinsengToGroundMonster .public RandInt .public RandRange .public RemoveItemNoHole @@ -64,26 +77,13 @@ .public SetPortraitLayout .public SetPortraitOffset .public ShowPortraitBox -.public strcat -.public ItemToBulkItem .public SortItemsInBag +.public strcat .public sub_0201077C -.public ApplyGummiBoostsToGroundMonster -.public ApplySitrusBerryBoostToGroundMonster -.public ApplyLifeSeedBoostToGroundMonster -.public ApplyProteinBoostToGroundMonster -.public ApplyCalciumBoostToGroundMonster -.public ApplyIronBoostToGroundMonster -.public ApplyZincBoostToGroundMonster -.public ApplyNectarBoostToGroundMonster -.public IsMonsterAffectedByGravelyrockGroundMode -.public ApplyGravelyrockBoostToGroundMonster .public sub_02017C50 .public sub_02017C74 -.public sub_02017CCC .public sub_02020868 .public sub_0202A66C -.public sub_0202E3CC .public sub_0202E6C8 .public sub_0202E6E4 .public sub_020308A0 diff --git a/asm/include/overlay_20.inc b/asm/include/overlay_20.inc index 8c0d9529..6da89cb6 100644 --- a/asm/include/overlay_20.inc +++ b/asm/include/overlay_20.inc @@ -1,19 +1,23 @@ #pragma once .public __divsi3 .public AddItemToBagNoHeld +.public AddItemToStorage .public Arm9LoadUnkFieldNa0x2029EC8 -.public CreateNormalMenu +.public CreateCollectionMenu .public CreatePortraitBox -.public FreeNormalMenu +.public CreateScrollBox1 +.public CreateSimpleMenuWrapper +.public CreateTextBox2 .public FreePortraitBox +.public FreeSimpleMenu .public GetItemAtIdx -.public GetNormalMenuResult +.public GetSimpleMenuResult .public HidePortraitBox .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs .public InitStandardItem .public IsBagFull -.public IsNormalMenuActive +.public IsSimpleMenuActive .public IsTicketItem .public MemAlloc .public MemFree @@ -26,6 +30,7 @@ .public ov11_0230D220 .public ov11_0230D71C .public ov11_0230DB58 +.public PlaySeVolumeWrapper .public PreprocessStringFromMessageId .public Rand16Bit .public SetPortraitEmotion @@ -36,7 +41,6 @@ .public sub_020037A4 .public sub_0200D670 .public sub_02010044 -.public AddItemToStorage .public sub_02011CF4 .public sub_02011D9C .public sub_02011DB8 @@ -61,7 +65,6 @@ .public sub_02012874 .public sub_02017C10 .public sub_02017C50 -.public sub_02017CCC .public sub_02025D50 .public sub_02026214 .public sub_02027AF0 @@ -73,7 +76,6 @@ .public sub_0202B544 .public sub_0202B558 .public sub_0202B568 -.public sub_0202C3A8 .public sub_0202C620 .public sub_0202C70C .public sub_0202C728 @@ -85,10 +87,8 @@ .public sub_0202C7E4 .public sub_0202D0EC .public sub_0202D16C -.public sub_0202E3CC .public sub_0202E6C8 .public sub_0202E6E4 -.public sub_0202F8DC .public sub_0202F8FC .public sub_0202F9B8 .public sub_020327CC diff --git a/asm/include/overlay_21.inc b/asm/include/overlay_21.inc index e1ded6c0..01dfe53a 100644 --- a/asm/include/overlay_21.inc +++ b/asm/include/overlay_21.inc @@ -1,23 +1,26 @@ #pragma once .public AddBulkItemToStorage .public AddMoneyCarried -.public CreateDBox -.public CreateNormalMenu +.public CreateDialogueBox .public CreatePortraitBox +.public CreateScrollBox1 +.public CreateSimpleMenuWrapper +.public CreateTextBox1 .public DebugPrint0 -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetMoneyCarried -.public GetNormalMenuResult .public GetPressedButtons +.public GetSimpleMenuResult .public GetTeamMember .public HidePortraitBox .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs .public InitRandomNpcJobs .public IsBagFull -.public IsDBoxActive +.public IsDialogueBoxActive +.public ItemToBulkItem .public MemAlloc .public MemcpySimple .public MemFree @@ -45,35 +48,32 @@ .public ov11_0230D220 .public ov11_0230D92C .public ov11_02310C2C +.public PlaySeVolumeWrapper .public PreprocessString .public PrintIqSkillsMenu +.public RemoveBulkItemInStorage .public RemoveEmptyItemsInBag .public RemoveItem +.public RemoveItemAtIdxInStorage .public RemoveItemByIdAndStackNoHole -.public RemoveBulkItemInStorage .public SetPortraitEmotion .public SetPortraitLayout -.public ShowDBox -.public ShowMessageInDBox +.public ShowDialogueBox +.public ShowMessageInDialogueBox .public ShowPortraitBox .public SpecialProcAddItemToBag -.public ItemToBulkItem .public sub_0201007C -.public RemoveItemAtIdxInStorage .public sub_02013150 .public sub_02017C74 .public sub_02017C80 -.public sub_02017CCC .public sub_02026214 .public sub_02026268 .public sub_02027AF0 .public sub_02027B1C .public sub_0202836C -.public sub_0202E3CC .public sub_0202E6C8 .public sub_0202E6E4 .public sub_0202F2C4 -.public sub_0202F8C4 .public sub_0202F8FC .public sub_020308A0 .public sub_02039C2C diff --git a/asm/include/overlay_22.inc b/asm/include/overlay_22.inc index 11921462..f177dc3b 100644 --- a/asm/include/overlay_22.inc +++ b/asm/include/overlay_22.inc @@ -3,41 +3,44 @@ .public Arm9LoadUnkFieldNa0x2029EC8 .public Arm9StoreUnkFieldNa0x2029ED8 .public BAG_ITEMS_PTR_MIRROR -.public CreateDBox -.public CreateNormalMenu +.public CreateCollectionMenu +.public CreateDialogueBox .public CreatePortraitBox +.public CreateScrollBox1 +.public CreateSimpleMenuWrapper .public DebugPrint0 -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetActualBuyPrice .public GetActualSellPrice .public GetCurrentBagCapacity -.public GetMoneyCarried .public GetItemAtIdx +.public GetMoneyCarried .public GetNbItemsInBag -.public GetNormalMenuResult .public GetPressedButtons +.public GetSimpleMenuResult .public HidePortraitBox .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs .public InitStandardItem .public IsBagFull -.public IsDBoxActive +.public IsDialogueBoxActive .public IsShoppableItem .public MemAlloc .public MemFree .public ov11_022DC504 .public ov11_022E6E68 .public ov11_0238A130 +.public PlaySeVolumeWrapper .public PreprocessString .public RemoveEmptyItemsInBag .public RemoveItem .public RemoveItemNoHoleCheck .public SetPortraitEmotion .public SetPortraitLayout -.public ShowDBox -.public ShowMessageInDBox +.public ShowDialogueBox +.public ShowMessageInDialogueBox .public ShowPortraitBox .public SpecialProcAddItemToBag .public strcat @@ -54,9 +57,7 @@ .public sub_02010BC0 .public sub_02017C74 .public sub_02017C80 -.public sub_02017CCC .public sub_0202836C -.public sub_0202C3A8 .public sub_0202C5F4 .public sub_0202C620 .public sub_0202C70C @@ -66,7 +67,6 @@ .public sub_0202C7D0 .public sub_0202D114 .public sub_0202D16C -.public sub_0202E3CC .public sub_0202E6C8 .public sub_0202E6E4 .public sub_0202F2C4 diff --git a/asm/include/overlay_23.inc b/asm/include/overlay_23.inc index 0058509d..b4d94b25 100644 --- a/asm/include/overlay_23.inc +++ b/asm/include/overlay_23.inc @@ -1,49 +1,49 @@ #pragma once +.public AddItemToStorage .public BAG_ITEMS_PTR_MIRROR +.public ConvertStorageItemAtIdxToBulkItem +.public ConvertStorageItemAtIdxToItem .public CopyItemAtIdx -.public CreateDBox -.public CreateNormalMenu +.public CreateDialogueBox .public CreatePortraitBox +.public CreateScrollBox1 +.public CreateSimpleMenuWrapper .public DebugPrint0 -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetItemAtIdx .public GetNbItemsInBag -.public GetNormalMenuResult .public GetPressedButtons +.public GetSimpleMenuResult .public HasStorableItems .public HidePortraitBox .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs .public IsBagFull -.public IsDBoxActive +.public IsDialogueBoxActive .public IsStorableItem .public MemAlloc .public MemFree .public ov11_022DC504 .public ov11_022E6E68 .public ov11_0238A134 +.public PlaySeVolumeWrapper .public PreprocessString .public RemoveEmptyItemsInBag .public RemoveItem +.public RemoveItemAtIdxInStorage .public RemoveItemNoHole .public SetPortraitEmotion .public SetPortraitLayout -.public ShowDBox -.public ShowMessageInDBox +.public ShowDialogueBox +.public ShowMessageInDialogueBox .public ShowPortraitBox .public SpecialProcAddItemToBag .public sub_0200D670 -.public ConvertStorageItemAtIdxToBulkItem -.public ConvertStorageItemAtIdxToItem .public sub_0201007C .public sub_02010154 -.public RemoveItemAtIdxInStorage -.public AddItemToStorage -.public sub_02017CCC .public sub_0202836C -.public sub_0202E3CC .public sub_0202E6C8 .public sub_0202E6E4 .public sub_0202F2C4 diff --git a/asm/include/overlay_24.inc b/asm/include/overlay_24.inc index 3311df81..3d9ea4f0 100644 --- a/asm/include/overlay_24.inc +++ b/asm/include/overlay_24.inc @@ -1,28 +1,28 @@ #pragma once -.public __divsi3 .public _020A1868 .public _020A18E0 -.public CreateDBox -.public CreateNormalMenu +.public __divsi3 +.public CreateDialogueBox .public CreatePortraitBox +.public CreateSimpleMenuWrapper .public EGG_HP_BONUS .public EGG_STAT_BONUSES -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetAdventureLogCompleted .public GetFirstEmptyMemberIdx .public GetKeyboardStatus .public GetKeyboardStringResult .public GetNameRaw .public GetNameWithGender -.public GetNormalMenuResult +.public GetSimpleMenuResult .public HidePortraitBox .public IncrementNbEggsHatched .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs .public IsBagFull -.public IsDBoxActive +.public IsDialogueBoxActive .public MemAlloc .public MemFree .public ov11_022DC504 @@ -36,13 +36,13 @@ .public SetPokemonJoined .public SetPortraitEmotion .public SetPortraitLayout -.public ShowDBox +.public ShowDialogueBox .public ShowKeyboard -.public ShowMessageInDBox +.public ShowMessageInDialogueBox .public ShowPortraitBox .public SpecialProcAddItemToBag -.public StrcpyName .public strcpy +.public StrcpyName .public StrcpySimple .public StrncpySimple .public StrncpySimpleNoPadSafe @@ -69,4 +69,4 @@ .public sub_02052F8C .public sub_02053B60 .public sub_02055DD0 -.public sub_0206351C \ No newline at end of file +.public sub_0206351C diff --git a/asm/include/overlay_25.inc b/asm/include/overlay_25.inc index 58f61e09..14ca6f4d 100644 --- a/asm/include/overlay_25.inc +++ b/asm/include/overlay_25.inc @@ -1,21 +1,24 @@ #pragma once .public AddItemToBagNoHeld .public AddMoneyCarried -.public CreateDBox -.public CreateNormalMenu +.public CreateDialogueBox .public CreatePortraitBox -.public FreeDBox -.public FreeNormalMenu +.public CreateScrollBox1 +.public CreateSimpleMenuWrapper +.public CreateTextBox1 +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetMoneyCarried .public GetNbItemsInBag -.public GetNormalMenuResult .public GetPressedButtons +.public GetSimpleMenuResult .public HidePortraitBox .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs -.public IsDBoxActive +.public IsDialogueBoxActive .public IsThrownItem +.public ItemToBulkItem .public MemAlloc .public MemFree .public ov11_022DC504 @@ -34,10 +37,9 @@ .public RemoveItemByIdAndStackNoHole .public SetPortraitEmotion .public SetPortraitLayout -.public ShowDBox -.public ShowMessageInDBox +.public ShowDialogueBox +.public ShowMessageInDialogueBox .public ShowPortraitBox -.public ItemToBulkItem .public sub_0200D670 .public sub_02017C74 .public sub_02017C80 @@ -46,10 +48,8 @@ .public sub_02027AF0 .public sub_02027B1C .public sub_0202836C -.public sub_0202E3CC .public sub_0202E6C8 .public sub_0202E6E4 .public sub_0202F2C4 -.public sub_0202F8C4 .public sub_0202F8FC .public sub_0202F918 diff --git a/asm/include/overlay_26.inc b/asm/include/overlay_26.inc index 3143abef..8a725887 100644 --- a/asm/include/overlay_26.inc +++ b/asm/include/overlay_26.inc @@ -1,8 +1,8 @@ #pragma once -.public CreateDBox +.public CreateDialogueBox .public CreatePortraitBox .public DebugPrint0 -.public FreeDBox +.public FreeDialogueBox .public FreePortraitBox .public GetAcceptedMission .public GetGameMode @@ -15,7 +15,7 @@ .public InitPortraitBox .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs -.public IsDBoxActive +.public IsDialogueBoxActive .public IsMoneyAllowed .public IsMonsterOnTeam .public LoadScriptVariableValue @@ -31,7 +31,7 @@ .public SaveScriptVariableValue .public SetChallengeLetterCleared .public SetMoneyCarried -.public ShowMessageInDBox +.public ShowMessageInDialogueBox .public ShowPortraitBox .public sub_0203D438 .public sub_0203D538 diff --git a/asm/include/overlay_27.inc b/asm/include/overlay_27.inc index f4e98f7f..0c20b0bd 100644 --- a/asm/include/overlay_27.inc +++ b/asm/include/overlay_27.inc @@ -7,22 +7,23 @@ .public ConvertStorageItemAtIdxToItem .public CopyItemAtIdx .public CountNbOfItemsInStorage -.public CreateDBox -.public CreateNormalMenu +.public CreateDialogueBox +.public CreateScrollBox1 +.public CreateSimpleMenuWrapper .public DebugPrint0 -.public FreeDBox -.public FreeNormalMenu +.public FreeDialogueBox .public FreePortraitBox +.public FreeSimpleMenu .public GetItemAtIdx .public GetMoneyCarried .public GetMoneyStored .public GetNbItemsInBag -.public GetNormalMenuResult .public GetPressedButtons .public GetRankStorageSize +.public GetSimpleMenuResult .public InitPortraitBoxWithMonsterId .public InitPreprocessorArgs -.public IsDBoxActive +.public IsDialogueBoxActive .public IsStorableItem .public MemAlloc .public MemFree @@ -32,6 +33,7 @@ .public ov11_022E6EC8 .public ov11_0230CE58 .public ov11_02324DB8 +.public PlaySeVolumeWrapper .public PreprocessString .public PreprocessStringFromMessageId .public RemoveEmptyItemsInBag @@ -39,17 +41,15 @@ .public RemoveItemAtIdxInStorage .public RemoveItemNoHole .public SetPortraitLayout -.public ShowDBox -.public ShowMessageInDBox -.public ShowStringInDBox +.public ShowDialogueBox +.public ShowMessageInDialogueBox +.public ShowStringInDialogueBox .public sub_0200D670 .public sub_0200FD48 .public sub_0201007C .public sub_02010154 -.public sub_02017CCC .public sub_0202836C .public sub_0202A66C -.public sub_0202E3CC .public sub_0202E6C8 .public sub_0202E6E4 .public sub_0202F2C4 diff --git a/asm/include/overlay_28.inc b/asm/include/overlay_28.inc index 5db11e6f..fde0cb60 100644 --- a/asm/include/overlay_28.inc +++ b/asm/include/overlay_28.inc @@ -2,7 +2,7 @@ .public GetStringFromFileVeneer .public MemAlloc .public MemFree -.public NewDialogBox +.public NewWindow .public ov11_022E6E8C .public ov11_022E6EC8 .public strcpy diff --git a/asm/include/overlay_29_022DC240.inc b/asm/include/overlay_29_022DC240.inc index 2b597d5d..ac00a328 100644 --- a/asm/include/overlay_29_022DC240.inc +++ b/asm/include/overlay_29_022DC240.inc @@ -1,7 +1,7 @@ #pragma once -.public __divsi3 .public _020AFC4C .public _020AFC70 +.public __divsi3 .public AllocAndLoadFileInPack .public ChangeGiratinaFormIfSkyDungeon .public ClearHiddenStairs diff --git a/asm/include/overlay_29_022E0378.inc b/asm/include/overlay_29_022E0378.inc index afb6a017..d1f7bc91 100644 --- a/asm/include/overlay_29_022E0378.inc +++ b/asm/include/overlay_29_022E0378.inc @@ -22,6 +22,7 @@ .public GetTileSafe .public HandleFaint .public HandleSir0Translation +.public InitAnimationControlWithSet__0201C168 .public IsCurrentTilesetBackground .public IsExperienceLocked .public IsFloorOver @@ -84,7 +85,6 @@ .public sub_020094C4 .public sub_0201B43C .public sub_0201BFF0 -.public sub_0201C0CC .public sub_0201E380 .public sub_0201F598 .public sub_0204AE80 diff --git a/asm/include/overlay_29_022E37DC.inc b/asm/include/overlay_29_022E37DC.inc index 4f30e333..b226e46c 100644 --- a/asm/include/overlay_29_022E37DC.inc +++ b/asm/include/overlay_29_022E37DC.inc @@ -7,6 +7,7 @@ .public ChangeDungeonMusic .public CheckActiveChallengeRequest .public CheckSpawnThreshold +.public CreateTextBox1 .public DIRECTIONS_XY .public DUNGEON_PTR .public DungeonFloorToGroupFloor @@ -163,7 +164,6 @@ .public sub_0201D034 .public sub_02026214 .public sub_02027AF0 -.public sub_0202F8C4 .public sub_0202F918 .public sub_02048384 .public sub_020483B8 diff --git a/asm/include/overlay_29_022E9618.inc b/asm/include/overlay_29_022E9618.inc index 1aa6a4ac..2ee5babf 100644 --- a/asm/include/overlay_29_022E9618.inc +++ b/asm/include/overlay_29_022E9618.inc @@ -1,6 +1,6 @@ #pragma once -.public __divsi3 .public _020AFC4C +.public __divsi3 .public abs .public DIRECTIONS_XY .public DISPLACEMENTS_WITHIN_2_LARGEST_FIRST diff --git a/asm/include/overlay_29_022EAB50.inc b/asm/include/overlay_29_022EAB50.inc index 7d658bdb..4f986dd8 100644 --- a/asm/include/overlay_29_022EAB50.inc +++ b/asm/include/overlay_29_022EAB50.inc @@ -53,6 +53,7 @@ .public ov29_0237C920 .public ov29_0237C922 .public ov29_0237C96C +.public PlayBgmByIdVeneer .public RANDOM_MUSIC_ID_TABLE .public RemoveEmptyItemsInBagWrapper .public RemoveEquivItemNoHole @@ -71,7 +72,6 @@ .public sub_0200D208 .public sub_02017ACC .public sub_02017B18 -.public sub_02017B58 .public sub_02017B70 .public sub_02017B7C .public sub_02017C50 diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc index 95315a06..a9fdc0dc 100644 --- a/asm/include/overlay_29_022F05B4.inc +++ b/asm/include/overlay_29_022F05B4.inc @@ -1,6 +1,6 @@ #pragma once -.public __divsi3 .public _020AFC4C +.public __divsi3 .public abs .public AddHeldItemToBag .public AddItemToBag @@ -13,8 +13,8 @@ .public CanSeeTarget .public CeilFixedPoint .public CheckTeamItemsFlags -.public CheckTeamMemberIdxVeneer .public CheckTouchscreenArea +.public CreateTextBox1 .public DIRECTIONS_XY .public DrawTileGrid .public DUNGEON_PTR @@ -94,6 +94,7 @@ .public ov29_022F670C .public ov29_022F87C0 .public ov29_022F89AC +.public ov29_022F9C34 .public ov29_022F9C4C .public ov29_022F9EA0 .public ov29_022FA2F0 @@ -106,8 +107,8 @@ .public ov29_022FF958 .public ov29_022FFA94 .public ov29_023009CC -.public ov29_02300E78 .public ov29_02300FCC +.public ov29_0230105C .public ov29_02301158 .public ov29_0230175C .public ov29_023049A8 @@ -162,6 +163,7 @@ .public ov29_0237C6A4 .public ov29_0237C9A4 .public ov29_0237CFBB +.public PlaySeVolumeWrapper .public PointCameraToMonster .public PositionHasMonster .public PreprocessString @@ -179,14 +181,12 @@ .public sub_02001AB0 .public sub_02006B70 .public sub_02017C80 -.public sub_02017CCC .public sub_0201B9F8 .public sub_0201CF90 .public sub_02026214 .public sub_02026268 .public sub_02027AF0 .public sub_02027B1C -.public sub_0202F8C4 .public sub_0202F8FC .public sub_0204AEA0 .public sub_0204AEB0 diff --git a/asm/include/overlay_29_022F52B0.inc b/asm/include/overlay_29_022F52B0.inc index 01cb7f47..fc0713c7 100644 --- a/asm/include/overlay_29_022F52B0.inc +++ b/asm/include/overlay_29_022F52B0.inc @@ -4,6 +4,7 @@ .public ApplyItemEffect .public AreMovesEnabled .public CanMonsterUseItem +.public CheckTeamMemberIdxVeneer .public DecrementStackItem .public DIRECTIONS_XY .public DisplayMessage @@ -49,7 +50,6 @@ .public ov29_022F3B8C .public ov29_022F6748 .public ov29_022F87C0 -.public ov29_022F9C40 .public ov29_022FA574 .public ov29_0230040C .public ov29_02300818 diff --git a/asm/include/overlay_29_022F62CC.inc b/asm/include/overlay_29_022F62CC.inc index 02b61b20..4092846d 100644 --- a/asm/include/overlay_29_022F62CC.inc +++ b/asm/include/overlay_29_022F62CC.inc @@ -4,7 +4,6 @@ .public AnimationDelayOrSomething .public BAG_ITEMS_PTR_MIRROR .public CalcSpeedStageWrapper -.public CannotStandOnTile .public DeleteWanTableEntryVeneer .public DisplayMessage2 .public DUNGEON_PTR @@ -27,6 +26,7 @@ .public IsFloorOver .public IsShaymin .public IsShoppableItem +.public LOADED_ATTACK_SPRITE_FILE_INDEX .public LoadMissionMonsterSprites .public LoadMonsterSprite .public LoadWanTableEntryFromPackUseProvidedMemory @@ -38,6 +38,7 @@ .public ov10_022C4800 .public ov29_022EACCC .public ov29_022F6210 +.public ov29_022FF764 .public ov29_023009CC .public ov29_02304A00 .public ov29_02304A48 @@ -46,7 +47,6 @@ .public ov29_0234B09C .public ov29_02352760 .public ov29_023535A8 -.public ov29_023535AC .public ov29_0237C9AC .public ov29_0237C9B0 .public RemoveGroundItem diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc index 89ff9594..0653a3ed 100644 --- a/asm/include/overlay_29_022F7388.inc +++ b/asm/include/overlay_29_022F7388.inc @@ -1,6 +1,6 @@ #pragma once -.public __divsi3 .public _020A1870 +.public __divsi3 .public AbilityIsActiveVeneer .public AdvanceFrame .public AiMovement @@ -59,6 +59,7 @@ .public GetMaxPp .public GetMaxPpWrapper .public GetMinimapData +.public GetMinimapDataE447 .public GetMobilityType .public GetMonsterEvoStatus .public GetMonsterGender @@ -91,6 +92,7 @@ .public GroundToDungeonMoveset .public HasHeldItem .public HasMaxGinsengBoost99 +.public InitAnimationControlWithSet__0201C168 .public InitMoveCheckId .public InitTeamMember .public IQ_SKILLS @@ -171,7 +173,6 @@ .public ov29_02337EC0 .public ov29_02338F24 .public ov29_02339F88 -.public ov29_0233AE00_EU .public ov29_02344B44 .public ov29_02348100 .public ov29_02349688 @@ -206,13 +207,12 @@ .public sub_0200F9B4 .public sub_0201405C .public sub_02017C50 -.public sub_0201C0CC .public sub_0204AEF0 .public sub_02050FF8 .public sub_02052E2C .public sub_02053250 .public sub_0205349C -.public sub_02056264 +.public sub_02056228 .public sub_020566C4 .public sub_020585B4 .public sub_02058674 diff --git a/asm/include/overlay_29_022FE4BC.inc b/asm/include/overlay_29_022FE4BC.inc index 7d8c3933..695d595c 100644 --- a/asm/include/overlay_29_022FE4BC.inc +++ b/asm/include/overlay_29_022FE4BC.inc @@ -2,6 +2,8 @@ .public AbilityIsActiveVeneer .public AdvanceFrame .public AnimationDelayOrSomething +.public CanMonsterMoveInDirection +.public CannotStandOnTile .public DIRECTIONS_XY .public DisplayActions .public DUNGEON_PTR @@ -41,9 +43,7 @@ .public ov29_022FBD08 .public ov29_022FEDBC .public ov29_022FEFC8 -.public ov29_022FFC9C .public ov29_02300DCC -.public ov29_02300E78 .public ov29_02302368 .public ov29_02304D20 .public ov29_023085DC diff --git a/asm/include/overlay_29_022FEDBC.inc b/asm/include/overlay_29_022FEDBC.inc index b58a895e..33b99562 100644 --- a/asm/include/overlay_29_022FEDBC.inc +++ b/asm/include/overlay_29_022FEDBC.inc @@ -1,6 +1,7 @@ #pragma once .public AbilityIsActive .public ActivateFlashFire +.public CanMonsterMoveInDirection .public CanMonsterUseMove .public ChooseAiMove .public DUNGEON_PTR @@ -27,7 +28,6 @@ .public ov29_022E655C .public ov29_022FAA04 .public ov29_02300DCC -.public ov29_02300E78 .public ov29_0230F654 .public ov29_02318D58 .public ov29_02322374 diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index 2da2d843..48ba9833 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -10,7 +10,6 @@ .public CeilFixedPoint .public ChangeDungeonMusic .public ChangeShayminForme -.public CheckTeamMemberIdxVeneer .public ClearMonsterActionFields .public DetermineTileWalkableNeighbors .public DIRECTIONS_XY @@ -87,6 +86,7 @@ .public ov29_022F0780 .public ov29_022F085C .public ov29_022F8830 +.public ov29_022F9C34 .public ov29_022F9C74 .public ov29_022FA02C .public ov29_022FBA54 diff --git a/asm/include/overlay_29_0231EDFC.inc b/asm/include/overlay_29_0231EDFC.inc index 272ec8cc..23f0c078 100644 --- a/asm/include/overlay_29_0231EDFC.inc +++ b/asm/include/overlay_29_0231EDFC.inc @@ -3,7 +3,6 @@ .public AbilityIsActiveVeneer .public AdvanceFrame .public CalcDamageFixedNoCategory -.public CannotStandOnTile .public CanSeeTarget .public DIRECTIONS_XY .public DUNGEON_PTR @@ -20,6 +19,7 @@ .public ov29_022E9298 .public ov29_022EA370 .public ov29_022EACCC +.public ov29_022FF764 .public ov29_0230175C .public ov29_023049A8 .public ov29_02304A48 diff --git a/asm/include/overlay_29_02320788.inc b/asm/include/overlay_29_02320788.inc index e8441639..ad8110b1 100644 --- a/asm/include/overlay_29_02320788.inc +++ b/asm/include/overlay_29_02320788.inc @@ -4,6 +4,7 @@ .public AreTileJumpsAllowed .public CalcDamageFixedNoCategory .public CanMonsterUseMove +.public CannotStandOnTile .public DetermineTileWalkableNeighbors .public DiscoverMinimap .public DUNGEON_PTR @@ -32,7 +33,6 @@ .public ov29_022F9C74 .public ov29_022FAA04 .public ov29_022FF958 -.public ov29_022FFC9C .public ov29_02304A48 .public ov29_02305814 .public ov29_02307BDC diff --git a/asm/include/overlay_29_023350FC.inc b/asm/include/overlay_29_023350FC.inc index 121e4298..e05e9996 100644 --- a/asm/include/overlay_29_023350FC.inc +++ b/asm/include/overlay_29_023350FC.inc @@ -1,6 +1,6 @@ #pragma once -.public __divsi3 .public _020AFC70 +.public __divsi3 .public AbilityIsActiveVeneer .public CalcSpeedStageWrapper .public CalcStatusDuration @@ -28,6 +28,7 @@ .public GetWeatherColorTable .public HasLowHealth .public InitRender3dElement64 +.public InitTilesetBuffer .public IsBackgroundTileset .public IsCurrentFixedRoomBossFight .public IsGoldenChamber @@ -40,7 +41,6 @@ .public ov10_022C2638 .public ov10_022C2654 .public ov10_022C26A0 -.public ov10_022C26BC .public ov10_022C2720 .public ov29_022DE0EC .public ov29_022DE608 diff --git a/asm/include/overlay_29_02337CCC.inc b/asm/include/overlay_29_02337CCC.inc index 919b492e..5c500aa3 100644 --- a/asm/include/overlay_29_02337CCC.inc +++ b/asm/include/overlay_29_02337CCC.inc @@ -1,7 +1,7 @@ #pragma once -.public __divsi3 .public _020AFC4C .public _020AFC70 +.public __divsi3 .public abs .public AllocAndLoadFileInPack .public CORNER_CARDINAL_NEIGHBOR_IS_OPEN diff --git a/asm/include/overlay_29_023456BC.inc b/asm/include/overlay_29_023456BC.inc index 3f6b8f93..231b4133 100644 --- a/asm/include/overlay_29_023456BC.inc +++ b/asm/include/overlay_29_023456BC.inc @@ -1,6 +1,6 @@ #pragma once -.public __divsi3 .public _020AFC4C +.public __divsi3 .public AbilityIsActiveVeneer .public abs .public AddMoneyCarried @@ -13,6 +13,7 @@ .public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST .public DISPLACEMENTS_WITHIN_3 .public DisplayMessage2 +.public DoesProjectileHitTarget .public DrawMinimapTile .public DUNGEON_PTR .public DungeonRand16Bit @@ -79,7 +80,6 @@ .public ov29_02344B44 .public ov29_02344B70 .public ov29_02344BF8 -.public ov29_02348020 .public ov29_0234B084 .public ov29_0234B4CC .public ov29_023516FC diff --git a/asm/include/overlay_29_02347BC8.inc b/asm/include/overlay_29_02347BC8.inc index 786d139f..e54f0530 100644 --- a/asm/include/overlay_29_02347BC8.inc +++ b/asm/include/overlay_29_02347BC8.inc @@ -1,6 +1,6 @@ #pragma once -.public __divsi3 .public _020A1878 +.public __divsi3 .public abs .public AdvanceFrame .public ApplyItemEffect @@ -34,7 +34,6 @@ .public MemAlloc .public MemFree .public MemZero -.public ov10_022C46B0 .public ov10_022C48E4 .public ov29_022E09E8 .public ov29_022E0DD8 @@ -82,6 +81,7 @@ .public sub_02051DFC .public sub_02051EB8 .public SubstitutePlaceholderStringTags +.public THROWN_ITEM_HIT_CHANCE .public TrySpawnGoldenChamber .public TwoTurnMoveForcedMiss .public YesNoMenu diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc index 626e54b3..f555ec29 100644 --- a/asm/include/overlay_29_023498A0.inc +++ b/asm/include/overlay_29_023498A0.inc @@ -5,7 +5,8 @@ .public BAG_ITEMS_PTR_MIRROR .public CanSeeTarget .public ChangeDungeonMusic -.public CreateDBox +.public CreateAlertBox +.public CreateDialogueBox .public CreatePortraitBox .public DebugPrint0 .public DUNGEON_PTR @@ -17,7 +18,7 @@ .public EntityIsValid__0234987C .public FemaleToMaleForm .public FixedRoomIsSubstituteRoom -.public FreeDBox +.public FreeDialogueBox .public FreePortraitBox .public GetAcceptedMission .public GetDungeonPtrMaster @@ -48,10 +49,10 @@ .public IsCherrim .public IsCurrentMissionType .public IsCurrentMissionTypeExact -.public IsDBoxActive .public IsDestinationFloor .public IsDestinationFloorWithFleeingOutlaw .public IsDestinationFloorWithHiddenOutlaw +.public IsDialogueBoxActive .public IsExperienceLocked .public IsFullFloorFixedRoom .public IsFutureDungeon @@ -194,7 +195,7 @@ .public ShouldDisplayEntityWrapper .public ShouldMonsterHeadToStairs .public ShowPortraitBox -.public ShowStringInDBox +.public ShowStringInDialogueBox .public StringFromMessageId .public strlen .public strncmp @@ -254,7 +255,6 @@ .public sub_0202ABB0 .public sub_0202F334 .public sub_0202F474 -.public sub_0202FFB0 .public sub_02030044 .public sub_0203010C .public sub_020301F4 diff --git a/asm/include/overlay_29_0234EC38.inc b/asm/include/overlay_29_0234EC38.inc index 1ad3a590..8c925601 100644 --- a/asm/include/overlay_29_0234EC38.inc +++ b/asm/include/overlay_29_0234EC38.inc @@ -2,7 +2,9 @@ .public AdvanceFrame .public Arm9LoadUnkFieldNa0x2029EC8 .public Arm9StoreUnkFieldNa0x2029ED8 -.public CheckTeamMemberIdxVeneer +.public CheckTeamMemberIdx +.public CreateAdvancedTextBox2 +.public CreateTextBox1 .public DisplayMessage .public DungeonGoesUp .public DungeonRequestsDoneWrapper @@ -56,6 +58,7 @@ .public ov29_022EA370 .public ov29_022EA428 .public ov29_022F0C98 +.public ov29_022F9C34 .public ov29_02300818 .public ov29_0230D704 .public ov29_0230D70C @@ -95,10 +98,8 @@ .public sub_0202AB40 .public sub_0202AB80 .public sub_0202ABB0 -.public sub_0202F8C4 .public sub_0202F8FC .public sub_0202F954 -.public sub_020305E4 .public sub_0203083C .public sub_020308A0 .public sub_020348E4 @@ -109,7 +110,6 @@ .public sub_0204E114 .public sub_0204F10C .public sub_0204F1B4 -.public sub_02056264 .public sub_0205B77C .public sub_02061DC8 .public sub_02061F44 diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index 4c825643..84cbeed4 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -12,10 +12,14 @@ .public CanAiUseMove .public CanMonsterSpawn .public CeilFixedPoint -.public CheckTeamMemberIdx .public CheckTeamMemberIdxVeneer -.public CreateDBox +.public CreateAdvancedTextBox1 +.public CreateDialogueBox +.public CreateInventoryMenu .public CreateMonsterSummaryFromMonster +.public CreateScrollBox1 +.public CreateTextBox1 +.public CreateTextBox2 .public DebugPrint0 .public DisableDungeonSubMenuOption .public DisplayMessage @@ -23,7 +27,7 @@ .public DUNGEON_PTR .public FormatMoveString .public FormatMoveStringMore -.public FreeDBox +.public FreeDialogueBox .public GetActiveTeamMember .public GetApparentWeather .public GetCurrentBagCapacity @@ -72,7 +76,6 @@ .public memset .public MemZero .public MonsterHasEmbargoStatus -.public ov10_022BCA80 .public ov10_022BCC60 .public ov10_022BCC7C .public ov10_022BCCB0 @@ -117,7 +120,7 @@ .public ov29_022EBC2C .public ov29_022ECDE4 .public ov29_022F0B9C -.public ov29_022F9C40 +.public ov29_022F9C34 .public ov29_023002F0 .public ov29_02300818 .public ov29_02300B40 @@ -145,13 +148,15 @@ .public ov29_0237C91C .public ov29_0238280C .public OVERLAY31_UNKNOWN_STRING_IDS +.public PlayMenuOptionSound +.public PlaySeVolumeWrapper .public PositionHasItem .public PreprocessString .public PreprocessStringFromMessageId .public PrintIqSkillsMenu .public SetMonsterActionFields .public ShouldMonsterRunAwayVariation -.public ShowStringInDBox +.public ShowStringInDialogueBox .public SortItemsInBag .public SpecificRecruitCheck .public strcpy @@ -162,7 +167,6 @@ .public sub_0200D894 .public sub_02017C74 .public sub_02017C80 -.public sub_02017CCC .public sub_02025888 .public sub_02026214 .public sub_020265A8 @@ -185,18 +189,14 @@ .public sub_0202AB94 .public sub_0202ABB0 .public sub_0202B030 -.public sub_0202E3CC .public sub_0202E6C8 .public sub_0202E6E4 .public sub_0202F334 .public sub_0202F474 -.public sub_0202F8C4 -.public sub_0202F8DC .public sub_0202F8FC .public sub_0202F918 .public sub_0202F954 .public sub_0202F9B8 -.public sub_020305B4 .public sub_020307A4 .public sub_020307EC .public sub_0203083C @@ -206,7 +206,6 @@ .public sub_020308C4 .public sub_02030A18 .public sub_02030A2C -.public sub_02032960 .public sub_020348E4 .public sub_020355DC .public sub_02035CE4 @@ -241,6 +240,7 @@ .public sub_0204F9E0 .public sub_02053CA0 .public sub_02054F44 +.public sub_02056228 .public sub_020585B4 .public TryPointCameraToMonster .public UpdateMapSurveyorFlag diff --git a/asm/include/overlay_34.inc b/asm/include/overlay_34.inc index 155ab6c9..dddcb0fe 100644 --- a/asm/include/overlay_34.inc +++ b/asm/include/overlay_34.inc @@ -1,11 +1,11 @@ #pragma once -.public CreateDBox -.public FreeDBox +.public CreateDialogueBox +.public FreeDialogueBox .public GetDebugFlag -.public IsDBoxActive +.public IsDialogueBoxActive .public MemAlloc .public MemFree -.public ShowMessageInDBox +.public ShowMessageInDialogueBox .public sub_02002878 .public sub_0200383C .public sub_020038D8 diff --git a/asm/main_02000C6C.s b/asm/main_02000C6C.s index 94cb5230..3d6a2e8f 100644 --- a/asm/main_02000C6C.s +++ b/asm/main_02000C6C.s @@ -3947,7 +3947,7 @@ sub_02003BFC: ; 0x02003BFC bl DebugPrint0 ldr r0, _02003CBC ; =_0229B21C ldrh r0, [r0, #2] - bl sub_02017DF4 + bl PlayBgmById ldr r0, _02003CBC ; =_0229B21C ldrh r0, [r0] bl sub_02018024 @@ -3969,7 +3969,7 @@ _02003C5C: bl sub_02017FF0 ldr r1, _02003CBC ; =_0229B21C strh r0, [r1] - bl sub_02017EE8 + bl StopBgmCommand bl sub_02018118 bl sub_02018278 mov r0, #0x3f00 @@ -4002,7 +4002,7 @@ SoundResume: ; 0x02003CC4 bl DebugPrint0 ldr r0, _02003D28 ; =_0229B21C ldrh r0, [r0, #2] - bl sub_02017DF4 + bl PlayBgmById ldr r0, _02003D28 ; =_0229B21C ldrh r0, [r0] bl sub_02018024 diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index 1c116026..16a751bf 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -13850,7 +13850,7 @@ sub_02016EAC: ; 0x02016EAC ldr r0, _0201712C ; =_020AF760 ldr r0, [r0, #8] add r0, r0, #0x98 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r0, _0201712C ; =_020AF760 ldr r1, [r0, #8] add r0, r1, #0x98 @@ -13889,7 +13889,7 @@ _02016FB0: mov r0, #0x7c mla r8, sb, r0, r6 mov r0, r8 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldrsh r1, [r7, #0x94] mov r0, r8 bl SetSpriteIdForAnimationControl @@ -13931,7 +13931,7 @@ _02017054: mov r0, #0x7c mla r8, sb, r0, r6 mov r0, r8 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldrsh r1, [r7, #0x96] mov r0, r8 bl SetSpriteIdForAnimationControl @@ -14776,7 +14776,7 @@ _02017AAC: .word _022A4BE8 arm_func_start sub_02017AB0 sub_02017AB0: ; 0x02017AB0 stmdb sp!, {r3, lr} - bl sub_02017EE8 + bl StopBgmCommand bl sub_02018118 bl sub_02018278 mov r0, #0x3f00 @@ -14841,13 +14841,13 @@ _02017B4C: _02017B54: .word 0x000003E7 arm_func_end sub_02017B18 - arm_func_start sub_02017B58 -sub_02017B58: ; 0x02017B58 - ldr ip, _02017B60 ; =sub_02017DF4 + arm_func_start PlayBgmByIdVeneer +PlayBgmByIdVeneer: ; 0x02017B58 + ldr ip, _02017B60 ; =PlayBgmById bx ip .align 2, 0 -_02017B60: .word sub_02017DF4 - arm_func_end sub_02017B58 +_02017B60: .word PlayBgmById + arm_func_end PlayBgmByIdVeneer arm_func_start SendAudioCommandWrapperVeneer SendAudioCommandWrapperVeneer: ; 0x02017B64 @@ -14859,10 +14859,10 @@ _02017B6C: .word SendAudioCommandWrapper arm_func_start sub_02017B70 sub_02017B70: ; 0x02017B70 - ldr ip, _02017B78 ; =sub_02017EE8 + ldr ip, _02017B78 ; =StopBgmCommand bx ip .align 2, 0 -_02017B78: .word sub_02017EE8 +_02017B78: .word StopBgmCommand arm_func_end sub_02017B70 arm_func_start sub_02017B7C @@ -14912,13 +14912,13 @@ sub_02017BD4: ; 0x02017BD4 _02017BDC: .word sub_02018024 arm_func_end sub_02017BD4 - arm_func_start sub_02017BE0 -sub_02017BE0: ; 0x02017BE0 - ldr ip, _02017BE8 ; =sub_020180A0 + arm_func_start PlayBgmByIdVolumeVeneer +PlayBgmByIdVolumeVeneer: ; 0x02017BE0 + ldr ip, _02017BE8 ; =PlayBgmByIdVolume bx ip .align 2, 0 -_02017BE8: .word sub_020180A0 - arm_func_end sub_02017BE0 +_02017BE8: .word PlayBgmByIdVolume + arm_func_end PlayBgmByIdVolumeVeneer arm_func_start sub_02017BEC sub_02017BEC: ; 0x02017BEC @@ -14993,19 +14993,19 @@ _02017C70: .word sub_020182AC arm_func_start sub_02017C74 sub_02017C74: ; 0x02017C74 - ldr ip, _02017C7C ; =sub_020182B8 + ldr ip, _02017C7C ; =PlaySeByIdVolume bx ip .align 2, 0 -_02017C7C: .word sub_020182B8 +_02017C7C: .word PlaySeByIdVolume arm_func_end sub_02017C74 arm_func_start sub_02017C80 sub_02017C80: ; 0x02017C80 - ldr ip, _02017C8C ; =sub_020182B8 + ldr ip, _02017C8C ; =PlaySeByIdVolume mov r1, #0x100 bx ip .align 2, 0 -_02017C8C: .word sub_020182B8 +_02017C8C: .word PlaySeByIdVolume arm_func_end sub_02017C80 arm_func_start sub_02017C90 @@ -15048,18 +15048,18 @@ sub_02017CC0: ; 0x02017CC0 _02017CC8: .word sub_02018460 arm_func_end sub_02017CC0 - arm_func_start sub_02017CCC -sub_02017CCC: ; 0x02017CCC + arm_func_start PlaySeVolumeWrapper +PlaySeVolumeWrapper: ; 0x02017CCC ldr r1, _02017CE4 ; =_0209915C mov r0, r0, lsl #1 ldrh r0, [r1, r0] - ldr ip, _02017CE8 ; =sub_020182B8 + ldr ip, _02017CE8 ; =PlaySeByIdVolume mov r1, #0x100 bx ip .align 2, 0 _02017CE4: .word _0209915C -_02017CE8: .word sub_020182B8 - arm_func_end sub_02017CCC +_02017CE8: .word PlaySeByIdVolume + arm_func_end PlaySeVolumeWrapper arm_func_start sub_02017CEC sub_02017CEC: ; 0x02017CEC @@ -15072,7 +15072,7 @@ sub_02017CEC: ; 0x02017CEC mov r3, #3 mov r1, #0x100 strh r3, [r2] - bl sub_020182B8 + bl PlaySeByIdVolume ldmia sp!, {r3, pc} .align 2, 0 _02017D18: .word _022A4BE8 @@ -15146,14 +15146,14 @@ _02017DE4: .word _022A4BEC arm_func_start sub_02017DE8 sub_02017DE8: ; 0x02017DE8 - ldr ip, _02017DF0 ; =sub_02019850 + ldr ip, _02017DF0 ; =IsSongOver bx ip .align 2, 0 -_02017DF0: .word sub_02019850 +_02017DF0: .word IsSongOver arm_func_end sub_02017DE8 - arm_func_start sub_02017DF4 -sub_02017DF4: ; 0x02017DF4 + arm_func_start PlayBgmById +PlayBgmById: ; 0x02017DF4 stmdb sp!, {r3, r4, r5, lr} ldr r1, _02017E68 ; =0x000003E7 mov r5, r0 @@ -15186,7 +15186,7 @@ sub_02017DF4: ; 0x02017DF4 .align 2, 0 _02017E68: .word 0x000003E7 _02017E6C: .word _022A4BEC - arm_func_end sub_02017DF4 + arm_func_end PlayBgmById arm_func_start SendAudioCommandWrapper SendAudioCommandWrapper: ; 0x02017E70 @@ -15223,8 +15223,8 @@ _02017EE0: .word 0x000003E7 _02017EE4: .word _022A4BEC arm_func_end SendAudioCommandWrapper - arm_func_start sub_02017EE8 -sub_02017EE8: ; 0x02017EE8 + arm_func_start StopBgmCommand +StopBgmCommand: ; 0x02017EE8 stmdb sp!, {r3, lr} bl sub_02018B50 ldr r0, _02017F20 ; =0x000003E7 @@ -15242,7 +15242,7 @@ sub_02017EE8: ; 0x02017EE8 .align 2, 0 _02017F20: .word 0x000003E7 _02017F24: .word _022A4BEC - arm_func_end sub_02017EE8 + arm_func_end StopBgmCommand arm_func_start sub_02017F28 sub_02017F28: ; 0x02017F28 @@ -15368,8 +15368,8 @@ _02018098: .word 0x000003E7 _0201809C: .word _022A4BEC arm_func_end sub_02018024 - arm_func_start sub_020180A0 -sub_020180A0: ; 0x020180A0 + arm_func_start PlayBgmByIdVolume +PlayBgmByIdVolume: ; 0x020180A0 stmdb sp!, {r3, r4, r5, r6, r7, lr} ldr r3, _02018110 ; =0x000003E7 mov r6, r0 @@ -15401,7 +15401,7 @@ sub_020180A0: ; 0x020180A0 .align 2, 0 _02018110: .word 0x000003E7 _02018114: .word _022A4BEC - arm_func_end sub_020180A0 + arm_func_end PlayBgmByIdVolume arm_func_start sub_02018118 sub_02018118: ; 0x02018118 @@ -15542,8 +15542,8 @@ sub_020182AC: ; 0x020182AC _020182B4: .word sub_0201A480 arm_func_end sub_020182AC - arm_func_start sub_020182B8 -sub_020182B8: ; 0x020182B8 + arm_func_start PlaySeByIdVolume +PlaySeByIdVolume: ; 0x020182B8 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -15566,11 +15566,11 @@ sub_020182B8: ; 0x020182B8 movne r5, #0 mov r0, r4 strh r5, [r4, #8] - bl sub_02018AE4 + bl SendAudioCommand2 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02018318: .word _0209916C - arm_func_end sub_020182B8 + arm_func_end PlaySeByIdVolume arm_func_start sub_0201831C sub_0201831C: ; 0x0201831C @@ -15603,7 +15603,7 @@ sub_0201831C: ; 0x0201831C strh r6, [r4, #8] mov r0, r4 strh r5, [r4, #0xa] - bl sub_02018AE4 + bl SendAudioCommand2 _02018394: add sp, sp, #8 ldmia sp!, {r4, r5, r6, r7, r8, pc} @@ -15627,7 +15627,7 @@ sub_020183A0: ; 0x020183A0 strh r6, [r0, #4] strh r5, [r0, #6] strh r4, [r0, #8] - bl sub_02018AE4 + bl SendAudioCommand2 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _020183E0: .word _020991C8 @@ -15649,7 +15649,7 @@ sub_020183E4: ; 0x020183E4 strh r6, [r0, #4] strh r5, [r0, #6] strh r4, [r0, #0xa] - bl sub_02018AE4 + bl SendAudioCommand2 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02018424: .word _020991F0 @@ -15668,7 +15668,7 @@ sub_02018428: ; 0x02018428 strh r4, [r0, #4] mov r1, #0 strh r1, [r0, #6] - bl sub_02018AE4 + bl SendAudioCommand2 ldmia sp!, {r4, pc} .align 2, 0 _0201845C: .word _02099210 @@ -15688,7 +15688,7 @@ sub_02018460: ; 0x02018460 bl sub_02018A78 strh r5, [r0, #4] strh r4, [r0, #6] - bl sub_02018AE4 + bl SendAudioCommand2 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02018498: .word _02099224 @@ -16190,8 +16190,8 @@ _02018ADC: .word _020AF7E4 _02018AE0: .word _022A4C50 arm_func_end sub_02018A78 - arm_func_start sub_02018AE4 -sub_02018AE4: ; 0x02018AE4 + arm_func_start SendAudioCommand2 +SendAudioCommand2: ; 0x02018AE4 stmdb sp!, {r4, lr} ldr r1, _02018B3C ; =_022A4C00 mov r4, r0 @@ -16221,7 +16221,7 @@ _02018B40: .word _022A4C00 _02018B44: .word _02099240 _02018B48: .word _020AF7C0 _02018B4C: .word _020AF780 - arm_func_end sub_02018AE4 + arm_func_end SendAudioCommand2 arm_func_start sub_02018B50 sub_02018B50: ; 0x02018B50 @@ -17181,8 +17181,8 @@ _02019848: .word _020AFB28 _0201984C: .word _022A4E58 arm_func_end sub_02019824 - arm_func_start sub_02019850 -sub_02019850: ; 0x02019850 + arm_func_start IsSongOver +IsSongOver: ; 0x02019850 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 ldr r0, _020198B0 ; =_020AFB28 @@ -17211,7 +17211,7 @@ _0201989C: .align 2, 0 _020198B0: .word _020AFB28 _020198B4: .word _022A4E58 - arm_func_end sub_02019850 + arm_func_end IsSongOver arm_func_start PlayBgm PlayBgm: ; 0x020198B8 @@ -20245,8 +20245,8 @@ InitAnimationControl: ; 0x0201C050 ldmia sp!, {r4, pc} arm_func_end InitAnimationControl - arm_func_start sub_0201C0B0 -sub_0201C0B0: ; 0x0201C0B0 + arm_func_start InitAnimationControlWithSet__0201C14C +InitAnimationControlWithSet__0201C14C: ; 0x0201C0B0 stmdb sp!, {r4, lr} mov r4, r0 bl InitAnimationControl @@ -20254,10 +20254,10 @@ sub_0201C0B0: ; 0x0201C0B0 orr r0, r0, #1 strh r0, [r4, #2] ldmia sp!, {r4, pc} - arm_func_end sub_0201C0B0 + arm_func_end InitAnimationControlWithSet__0201C14C - arm_func_start sub_0201C0CC -sub_0201C0CC: ; 0x0201C0CC + arm_func_start InitAnimationControlWithSet__0201C168 +InitAnimationControlWithSet__0201C168: ; 0x0201C0CC stmdb sp!, {r4, lr} mov r4, r0 bl InitAnimationControl @@ -20265,7 +20265,7 @@ sub_0201C0CC: ; 0x0201C0CC orr r0, r0, #1 strh r0, [r4, #2] ldmia sp!, {r4, pc} - arm_func_end sub_0201C0CC + arm_func_end InitAnimationControlWithSet__0201C168 arm_func_start SetSpriteIdForAnimationControl SetSpriteIdForAnimationControl: ; 0x0201C0E8 @@ -23431,8 +23431,8 @@ _0201E9C0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} arm_func_end Render3d64Texture0x7 - arm_func_start Render3d64Border -Render3d64Border: ; 0x0201E9EC + arm_func_start Render3d64WindowFrame +Render3d64WindowFrame: ; 0x0201E9EC stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x4c mov sl, r0 @@ -23606,7 +23606,7 @@ _0201EA04: bl EnqueueRender3d64Tiling add sp, sp, #0x4c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} - arm_func_end Render3d64Border + arm_func_end Render3d64WindowFrame arm_func_start EnqueueRender3d64Tiling EnqueueRender3d64Tiling: ; 0x0201EC9C @@ -34806,8 +34806,8 @@ sub_02027624: ; 0x02027624 _02027644: .word _022A88DC arm_func_end sub_02027624 - arm_func_start sub_02027648 -sub_02027648: ; 0x02027648 + arm_func_start NewWindowScreenCheck +NewWindowScreenCheck: ; 0x02027648 stmdb sp!, {r4, lr} mov r4, #0 ldr ip, _020276B8 ; =_022A88DC @@ -34836,15 +34836,15 @@ _02027678: ldreq r2, _020276BC ; =_022A7A6C moveq r3, #1 streqh r3, [r2, #0xa] - bl NewDialogBox + bl NewWindow ldmia sp!, {r4, pc} .align 2, 0 _020276B8: .word _022A88DC _020276BC: .word _022A7A6C - arm_func_end sub_02027648 + arm_func_end NewWindowScreenCheck - arm_func_start NewDialogBox -NewDialogBox: ; 0x020276C0 + arm_func_start NewWindow +NewWindow: ; 0x020276C0 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r8, r0 mov r7, r1 @@ -34957,7 +34957,7 @@ _02027704: strh r1, [r5, #0x78] add r0, r5, #0xbc strh r1, [r5, #0x7a] - bl InitDialogBoxTrailer + bl InitWindowTrailer mov r0, #0 strb r0, [r6] add r0, r6, #4 @@ -34971,7 +34971,7 @@ _02027898: .word _022A88DC _0202789C: .word _022A7B1C _020278A0: .word _022A7A74 _020278A4: .word _022A7A6C - arm_func_end NewDialogBox + arm_func_end NewWindow arm_func_start sub_020278A8 sub_020278A8: ; 0x020278A8 @@ -35426,7 +35426,7 @@ sub_02027E30: ; 0x02027E30 mov r0, #0xe0 mla r0, r1, r0, r2 add r0, r0, #0xbc - bl InitDialogBoxTrailer + bl InitWindowTrailer ldrsb r0, [r4] cmp r0, #0 blt _02027F20 @@ -35539,7 +35539,7 @@ _0202801C: mov r0, #0xe0 mla r0, r1, r0, r2 add r0, r0, #0xbc - bl InitDialogBoxTrailer + bl InitWindowTrailer mov r0, #0 strh r0, [r7, #0x3a] strh r0, [r7, #0x38] @@ -35810,8 +35810,8 @@ sub_02028324: ; 0x02028324 _02028338: .word _022A88E4 arm_func_end sub_02028324 - arm_func_start GetDialogBoxField0xC -GetDialogBoxField0xC: ; 0x0202833C + arm_func_start GetWindowContents +GetWindowContents: ; 0x0202833C ldr r2, _02028350 ; =_022A88DC mov r1, #0xe0 mla r1, r0, r1, r2 @@ -35819,7 +35819,7 @@ GetDialogBoxField0xC: ; 0x0202833C bx lr .align 2, 0 _02028350: .word _022A88DC - arm_func_end GetDialogBoxField0xC + arm_func_end GetWindowContents arm_func_start sub_02028354 sub_02028354: ; 0x02028354 @@ -36257,12 +36257,12 @@ sub_020288DC: ; 0x020288DC ldr r2, _020288F4 ; =_022A88DC mov r1, #0xe0 mla r1, r0, r1, r2 - ldr ip, _020288F8 ; =InitDialogBoxTrailer + ldr ip, _020288F8 ; =InitWindowTrailer add r0, r1, #0xbc bx ip .align 2, 0 _020288F4: .word _022A88DC -_020288F8: .word InitDialogBoxTrailer +_020288F8: .word InitWindowTrailer arm_func_end sub_020288DC arm_func_start sub_020288FC @@ -37230,7 +37230,7 @@ LoadCursors: ; 0x0202950C mov r2, #0xe bl sub_0201D9C8 ldr r0, _02029668 ; =_022AAC80 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r0, _02029668 ; =_022AAC80 ldr r1, _02029660 ; =_022AAC64 ldrsh r1, [r1, #2] @@ -37252,7 +37252,7 @@ LoadCursors: ; 0x0202950C strh r1, [r0, #0x38] bl sub_0201C108 ldr r0, _0202966C ; =_022AACFC - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r0, _0202966C ; =_022AACFC ldr r1, _02029660 ; =_022AAC64 ldrsh r1, [r1] @@ -37285,15 +37285,15 @@ _02029668: .word _022AAC80 _0202966C: .word _022AACFC arm_func_end LoadCursors - arm_func_start InitDialogBoxTrailer -InitDialogBoxTrailer: ; 0x02029670 + arm_func_start InitWindowTrailer +InitWindowTrailer: ; 0x02029670 mov r1, #0 str r1, [r0] strb r1, [r0, #4] strb r1, [r0, #0x19] strb r1, [r0, #0x18] bx lr - arm_func_end InitDialogBoxTrailer + arm_func_end InitWindowTrailer arm_func_start sub_02029688 sub_02029688: ; 0x02029688 @@ -37922,7 +37922,7 @@ LoadAlert: ; 0x02029EE8 ldr r1, _02029F7C ; =_022AAD78 strh r0, [r1] ldr r0, _02029F80 ; =_022AAD7C - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r1, _02029F7C ; =_022AAD78 ldr r0, _02029F80 ; =_022AAD7C ldrsh r1, [r1] @@ -38411,7 +38411,7 @@ _0202A504: _0202A564: add r0, sp, #0x18 mov r1, #0 - bl sub_0202F8C4 + bl CreateTextBox1 mov r1, #0 mov r4, r0 bl sub_02027A08 @@ -38483,7 +38483,7 @@ _0202A638: mov r2, r7 mov r3, r4 str r6, [r5, #0x100] - bl sub_0202A75C + bl CreateParentMenu ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} arm_func_end sub_0202A5CC @@ -38544,7 +38544,7 @@ _0202A6FC: mov r2, r7 mov r3, r4 str r6, [r5, #0x100] - bl sub_0202A75C + bl CreateParentMenu ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} arm_func_end sub_0202A690 @@ -38556,7 +38556,7 @@ sub_0202A730: ; 0x0202A730 mvn r1, #1 cmp r4, r1 beq _0202A754 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #1 strb r1, [r0, #0x1b0] _0202A754: @@ -38564,8 +38564,8 @@ _0202A754: ldmia sp!, {r4, pc} arm_func_end sub_0202A730 - arm_func_start sub_0202A75C -sub_0202A75C: ; 0x0202A75C + arm_func_start CreateParentMenu +CreateParentMenu: ; 0x0202A75C stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x2c mov r6, r0 @@ -38585,7 +38585,7 @@ sub_0202A75C: ; 0x0202A75C addne ip, sp, #0x1c ldmneia r6, {r0, r1, r2, r3} stmneia ip, {r0, r1, r2, r3} - ldrne r0, _0202A94C ; =sub_0202ABFC + ldrne r0, _0202A94C ; =UpdateParentMenu mov r5, r8 strne r0, [sp, #0x1c] bne _0202A7CC @@ -38657,7 +38657,7 @@ _0202A880: ldrneb r0, [sp, #0x23] subne r0, r1, r0 strneb r0, [sp, #0x21] - ldr r0, _0202A94C ; =sub_0202ABFC + ldr r0, _0202A94C ; =UpdateParentMenu cmp sb, #0 str r0, [r4] str sl, [r4, #0xfc] @@ -38685,7 +38685,7 @@ _0202A8DC: add r0, sp, #0x1c mov r1, #3 strb r2, [sp, #0x24] - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #0xc mov r6, r0 bl sub_02028284 @@ -38701,14 +38701,14 @@ _0202A8DC: add sp, sp, #0x2c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0202A94C: .word sub_0202ABFC +_0202A94C: .word UpdateParentMenu _0202A950: .word _0209AE90 - arm_func_end sub_0202A75C + arm_func_end CreateParentMenu arm_func_start sub_0202A954 sub_0202A954: ; 0x0202A954 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #1 str r1, [r0, #0x19c] mov r1, #0 @@ -38808,7 +38808,7 @@ _0202AA3C: arm_func_start sub_0202AAA8 sub_0202AAA8: ; 0x0202AAA8 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #7 str r1, [r0, #0x19c] ldmia sp!, {r3, pc} @@ -38818,7 +38818,7 @@ sub_0202AAA8: ; 0x0202AAA8 sub_0202AABC: ; 0x0202AABC stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #0x198] bl MemFree @@ -38833,7 +38833,7 @@ sub_0202AABC: ; 0x0202AABC sub_0202AAE8: ; 0x0202AAE8 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #0x19c] cmp r0, #4 @@ -38858,7 +38858,7 @@ sub_0202AAE8: ; 0x0202AAE8 arm_func_start sub_0202AB40 sub_0202AB40: ; 0x0202AB40 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x19c] cmp r0, #8 cmpne r0, #9 @@ -38870,7 +38870,7 @@ sub_0202AB40: ; 0x0202AB40 arm_func_start sub_0202AB60 sub_0202AB60: ; 0x0202AB60 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r0, [r0, #0x1a0] cmp r0, #0 moveq r0, #1 @@ -38882,7 +38882,7 @@ sub_0202AB60: ; 0x0202AB60 arm_func_start sub_0202AB80 sub_0202AB80: ; 0x0202AB80 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02032558 ldmia sp!, {r3, pc} @@ -38892,7 +38892,7 @@ sub_0202AB80: ; 0x0202AB80 sub_0202AB94: ; 0x0202AB94 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r4 add r0, r0, #4 bl sub_02032684 @@ -38902,7 +38902,7 @@ sub_0202AB94: ; 0x0202AB94 arm_func_start sub_0202ABB0 sub_0202ABB0: ; 0x0202ABB0 stmdb sp!, {r4, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1a0] ldr r4, [r0, #0x198] cmp r1, #0 @@ -38925,8 +38925,8 @@ _0202ABF4: ldmia sp!, {r4, pc} arm_func_end sub_0202ABB0 - arm_func_start sub_0202ABFC -sub_0202ABFC: ; 0x0202ABFC + arm_func_start UpdateParentMenu +UpdateParentMenu: ; 0x0202ABFC stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x30 mov r6, r0 @@ -39078,7 +39078,7 @@ _0202ADF8: bne _0202AE2C add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _0202AE2C: mov r1, #1 mov r0, #0 @@ -39094,14 +39094,14 @@ _0202AE2C: _0202AE58: add r0, r4, #4 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0202AED8 _0202AE68: tst r1, #2 add r0, r4, #4 beq _0202AEA4 mov r1, #1 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #1 strb r0, [r4, #0x1a0] strb r0, [r4, #0x1a1] @@ -39174,7 +39174,7 @@ _0202AF6C: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0202AF74: .word 0x00000408 - arm_func_end sub_0202ABFC + arm_func_end UpdateParentMenu arm_func_start sub_0202AF78 sub_0202AF78: ; 0x0202AF78 @@ -39233,7 +39233,7 @@ _0202B008: sub_0202B030: ; 0x0202B030 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 add r0, r4, #4 bl IsMenuOptionActive @@ -39244,7 +39244,7 @@ sub_0202B030: ; 0x0202B030 bne _0202B068 add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _0202B068: mov r2, #1 mov r1, #0 @@ -39260,7 +39260,7 @@ _0202B068: _0202B094: add r0, r4, #4 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound ldmia sp!, {r3, r4, r5, pc} arm_func_end sub_0202B030 @@ -39268,7 +39268,7 @@ _0202B094: sub_0202B0A4: ; 0x0202B0A4 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 cmp r5, #0 add r0, r4, #4 @@ -39287,8 +39287,8 @@ _0202B0D8: ldmia sp!, {r3, r4, r5, pc} arm_func_end sub_0202B0A4 - arm_func_start CreateNormalMenu -CreateNormalMenu: ; 0x0202B0EC + arm_func_start CreateSimpleMenuWrapper +CreateSimpleMenuWrapper: ; 0x0202B0EC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r7, r3 mov sb, r1 @@ -39338,11 +39338,11 @@ _0202B16C: mov r2, r8 mov r3, r5 str r4, [sp] - bl sub_0202B284 + bl CreateSimpleMenu ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0202B1A8: .word 0x0000C402 - arm_func_end CreateNormalMenu + arm_func_end CreateSimpleMenuWrapper arm_func_start sub_0202B1AC sub_0202B1AC: ; 0x0202B1AC @@ -39403,13 +39403,13 @@ _0202B248: mov r2, r7 mov r3, r4 str r6, [sp] - bl sub_0202B284 + bl CreateSimpleMenu add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} arm_func_end sub_0202B1AC - arm_func_start sub_0202B284 -sub_0202B284: ; 0x0202B284 + arm_func_start CreateSimpleMenu +CreateSimpleMenu: ; 0x0202B284 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x2c mov r6, r0 @@ -39429,7 +39429,7 @@ sub_0202B284: ; 0x0202B284 addne ip, sp, #0x1c ldmneia r6, {r0, r1, r2, r3} stmneia ip, {r0, r1, r2, r3} - ldrne r0, _0202B488 ; =sub_0202B5C8 + ldrne r0, _0202B488 ; =UpdateSimpleMenu mov r5, r8 orr sl, sl, #0x8000 strne r0, [sp, #0x1c] @@ -39506,7 +39506,7 @@ _0202B3BC: ldrneb r0, [sp, #0x23] subne r0, r1, r0 strneb r0, [sp, #0x21] - ldr r0, _0202B488 ; =sub_0202B5C8 + ldr r0, _0202B488 ; =UpdateSimpleMenu cmp sb, #0 str r0, [r4] str sl, [r4, #0xfc] @@ -39533,7 +39533,7 @@ _0202B418: add r0, sp, #0x1c mov r1, #3 strb r2, [sp, #0x24] - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #0xc mov r6, r0 bl sub_02028284 @@ -39550,14 +39550,14 @@ _0202B418: add sp, sp, #0x2c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0202B488: .word sub_0202B5C8 +_0202B488: .word UpdateSimpleMenu _0202B48C: .word _0209AEA0 - arm_func_end sub_0202B284 + arm_func_end CreateSimpleMenu arm_func_start sub_0202B490 sub_0202B490: ; 0x0202B490 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #1 str r1, [r0, #0x19c] mov r1, #0 @@ -39571,11 +39571,11 @@ sub_0202B490: ; 0x0202B490 ldmia sp!, {r3, pc} arm_func_end sub_0202B490 - arm_func_start FreeNormalMenu -FreeNormalMenu: ; 0x0202B4C4 + arm_func_start FreeSimpleMenu +FreeSimpleMenu: ; 0x0202B4C4 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #0x198] bl MemFree @@ -39584,24 +39584,24 @@ FreeNormalMenu: ; 0x0202B4C4 mov r0, r5 bl sub_02028194 ldmia sp!, {r3, r4, r5, pc} - arm_func_end FreeNormalMenu + arm_func_end FreeSimpleMenu - arm_func_start IsNormalMenuActive -IsNormalMenuActive: ; 0x0202B4F0 + arm_func_start IsSimpleMenuActive +IsSimpleMenuActive: ; 0x0202B4F0 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x19c] cmp r0, #7 cmpne r0, #8 movne r0, #1 moveq r0, #0 ldmia sp!, {r3, pc} - arm_func_end IsNormalMenuActive + arm_func_end IsSimpleMenuActive arm_func_start sub_0202B510 sub_0202B510: ; 0x0202B510 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r0, [r0, #0x1a0] cmp r0, #0 moveq r0, #1 @@ -39613,7 +39613,7 @@ sub_0202B510: ; 0x0202B510 arm_func_start sub_0202B530 sub_0202B530: ; 0x0202B530 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02032558 ldmia sp!, {r3, pc} @@ -39622,7 +39622,7 @@ sub_0202B530: ; 0x0202B530 arm_func_start sub_0202B544 sub_0202B544: ; 0x0202B544 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02032560 ldmia sp!, {r3, pc} @@ -39631,7 +39631,7 @@ sub_0202B544: ; 0x0202B544 arm_func_start sub_0202B558 sub_0202B558: ; 0x0202B558 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x1a4] ldmia sp!, {r3, pc} arm_func_end sub_0202B558 @@ -39639,16 +39639,16 @@ sub_0202B558: ; 0x0202B558 arm_func_start sub_0202B568 sub_0202B568: ; 0x0202B568 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_0203259C ldmia sp!, {r3, pc} arm_func_end sub_0202B568 - arm_func_start GetNormalMenuResult -GetNormalMenuResult: ; 0x0202B57C + arm_func_start GetSimpleMenuResult +GetSimpleMenuResult: ; 0x0202B57C stmdb sp!, {r4, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1a0] ldr r4, [r0, #0x198] cmp r1, #0 @@ -39669,10 +39669,10 @@ _0202B5B0: _0202B5C0: mov r0, #0 ldmia sp!, {r4, pc} - arm_func_end GetNormalMenuResult + arm_func_end GetSimpleMenuResult - arm_func_start sub_0202B5C8 -sub_0202B5C8: ; 0x0202B5C8 + arm_func_start UpdateSimpleMenu +UpdateSimpleMenu: ; 0x0202B5C8 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x30 mov r6, r0 @@ -39825,7 +39825,7 @@ _0202B7C8: bne _0202B7FC add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _0202B7FC: mov r1, #1 mov r0, #0 @@ -39841,14 +39841,14 @@ _0202B7FC: _0202B828: add r0, r4, #4 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0202B8A8 _0202B838: tst r1, #2 add r0, r4, #4 beq _0202B874 mov r1, #1 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #1 strb r0, [r4, #0x1a0] strb r0, [r4, #0x1a1] @@ -39914,7 +39914,7 @@ _0202B928: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0202B930: .word 0x00000408 - arm_func_end sub_0202B5C8 + arm_func_end UpdateSimpleMenu arm_func_start sub_0202B934 sub_0202B934: ; 0x0202B934 @@ -39982,7 +39982,7 @@ _0202B9F4: sub_0202BA0C: ; 0x0202BA0C stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents str r4, [r0, #0x1ac] ldmia sp!, {r4, pc} arm_func_end sub_0202BA0C @@ -40007,7 +40007,7 @@ CreateAdvancedMenu: ; 0x0202BA20 stmeqia r4, {r0, r1, r2, r3} ldmneia r6, {r0, r1, r2, r3} stmneia r4, {r0, r1, r2, r3} - ldrne r0, _0202BBEC ; =sub_0202BD64 + ldrne r0, _0202BBEC ; =UpdateAdvancedMenu orr sl, sl, #0x8000 strne r0, [sp, #0x18] ldrb r0, [sp, #0x1e] @@ -40068,7 +40068,7 @@ _0202BB1C: ldrneb r0, [sp, #0x1f] subne r0, r1, r0 strneb r0, [sp, #0x1d] - ldr r0, _0202BBEC ; =sub_0202BD64 + ldr r0, _0202BBEC ; =UpdateAdvancedMenu cmp sb, #0 str r0, [r5] str sl, [r5, #0xfc] @@ -40094,7 +40094,7 @@ _0202BB78: add r0, sp, #0x18 mov r1, #3 str r2, [r5, #0x1ac] - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #8 mov r6, r0 bl sub_02028284 @@ -40113,13 +40113,13 @@ _0202BB78: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _0202BBE8: .word _0209AEB0 -_0202BBEC: .word sub_0202BD64 +_0202BBEC: .word UpdateAdvancedMenu arm_func_end CreateAdvancedMenu arm_func_start sub_0202BBF0 sub_0202BBF0: ; 0x0202BBF0 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #1 str r1, [r0, #0x19c] mov r1, #0 @@ -40137,7 +40137,7 @@ sub_0202BBF0: ; 0x0202BBF0 arm_func_start sub_0202BC28 sub_0202BC28: ; 0x0202BC28 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r1, [r0, #0x19c] cmp r1, #3 moveq r1, #2 @@ -40149,7 +40149,7 @@ sub_0202BC28: ; 0x0202BC28 FreeAdvancedMenu: ; 0x0202BC44 stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 @@ -40160,7 +40160,7 @@ FreeAdvancedMenu: ; 0x0202BC44 sub_0202BC60: ; 0x0202BC60 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #0x19c] cmp r0, #3 @@ -40186,7 +40186,7 @@ sub_0202BC60: ; 0x0202BC60 arm_func_start sub_0202BCBC sub_0202BCBC: ; 0x0202BCBC stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x19c] cmp r0, #7 cmpne r0, #8 @@ -40198,7 +40198,7 @@ sub_0202BCBC: ; 0x0202BCBC arm_func_start IsAdvancedMenuActive IsAdvancedMenuActive: ; 0x0202BCDC stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r0, [r0, #0x1a0] cmp r0, #0 moveq r0, #1 @@ -40210,7 +40210,7 @@ IsAdvancedMenuActive: ; 0x0202BCDC arm_func_start GetAdvancedMenuCurrentOption GetAdvancedMenuCurrentOption: ; 0x0202BCFC stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02032578 ldmia sp!, {r3, pc} @@ -40219,7 +40219,7 @@ GetAdvancedMenuCurrentOption: ; 0x0202BCFC arm_func_start GetAdvancedMenuResult GetAdvancedMenuResult: ; 0x0202BD10 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1a0] cmp r1, #0 beq _0202BD40 @@ -40239,15 +40239,15 @@ _0202BD40: sub_0202BD48: ; 0x0202BD48 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r4 add r0, r0, #4 bl sub_02032684 ldmia sp!, {r4, pc} arm_func_end sub_0202BD48 - arm_func_start sub_0202BD64 -sub_0202BD64: ; 0x0202BD64 + arm_func_start UpdateAdvancedMenu +UpdateAdvancedMenu: ; 0x0202BD64 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x30 mov r6, r0 @@ -40377,7 +40377,7 @@ _0202BF14: bne _0202BF48 add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _0202BF48: mov r1, #1 mov r0, #0 @@ -40393,14 +40393,14 @@ _0202BF48: _0202BF74: add r0, r4, #4 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0202C0E8 _0202BF84: tst r1, #2 beq _0202BFC0 add r0, r4, #4 mov r1, #1 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #1 strb r0, [r4, #0x1a0] strb r0, [r4, #0x1a1] @@ -40419,7 +40419,7 @@ _0202BFC0: beq _0202C00C add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound mov r1, #1 mov r0, #0 strb r1, [r4, #0x1a0] @@ -40439,7 +40439,7 @@ _0202C00C: beq _0202C058 add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound mov r1, #1 mov r0, #0 strb r1, [r4, #0x1a0] @@ -40458,7 +40458,7 @@ _0202C058: add r0, r4, #4 beq _0202C080 mov r1, #5 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [r4, #0x18c] blx r0 b _0202C0E8 @@ -40563,13 +40563,13 @@ _0202C1D8: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0202C1E0: .word 0x00000408 - arm_func_end sub_0202BD64 + arm_func_end UpdateAdvancedMenu arm_func_start sub_0202C1E4 sub_0202C1E4: ; 0x0202C1E4 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 add r0, r4, #4 bl IsMenuOptionActive @@ -40580,7 +40580,7 @@ sub_0202C1E4: ; 0x0202C1E4 bne _0202C21C add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _0202C21C: mov r2, #1 mov r1, #0 @@ -40597,7 +40597,7 @@ _0202C21C: _0202C24C: add r0, r4, #4 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #0 ldmia sp!, {r3, r4, r5, pc} arm_func_end sub_0202C1E4 @@ -40690,7 +40690,7 @@ _0202C36C: arm_func_start sub_0202C38C sub_0202C38C: ; 0x0202C38C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1a0] cmp r1, #0 ldrne r0, [r0, #0x1a4] @@ -40698,8 +40698,8 @@ sub_0202C38C: ; 0x0202C38C ldmia sp!, {r3, pc} arm_func_end sub_0202C38C - arm_func_start sub_0202C3A8 -sub_0202C3A8: ; 0x0202C3A8 + arm_func_start CreateCollectionMenu +CreateCollectionMenu: ; 0x0202C3A8 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x2c sub sp, sp, #0x400 @@ -40720,7 +40720,7 @@ sub_0202C3A8: ; 0x0202C3A8 addne r6, sp, #0x1c ldmneia r4, {r0, r1, r2, r3} stmneia r6, {r0, r1, r2, r3} - ldrne r0, _0202C5D8 ; =sub_0202C808 + ldrne r0, _0202C5D8 ; =UpdateCollectionMenu strne r0, [sp, #0x1c] bne _0202C418 ldr r0, _0202C5DC ; =_0209AEC0 @@ -40788,7 +40788,7 @@ _0202C4C4: ldrneb r0, [sp, #0x23] subne r0, r1, r0 strneb r0, [sp, #0x21] - ldr r1, _0202C5D8 ; =sub_0202C808 + ldr r1, _0202C5D8 ; =UpdateCollectionMenu mov r0, #0 str r1, [r5] str sl, [r5, #0xfc] @@ -40831,7 +40831,7 @@ _0202C528: strb r3, [r5, #0x1c9] str r3, [r5, #0x1a4] str r3, [r5, #0x1a0] - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #0xc mov r6, r0 bl sub_02028284 @@ -40850,15 +40850,15 @@ _0202C528: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0202C5D4: .word 0x10008004 -_0202C5D8: .word sub_0202C808 +_0202C5D8: .word UpdateCollectionMenu _0202C5DC: .word _0209AEC0 - arm_func_end sub_0202C3A8 + arm_func_end CreateCollectionMenu arm_func_start sub_0202C5E0 sub_0202C5E0: ; 0x0202C5E0 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents str r4, [r0, #0x1bc] ldmia sp!, {r4, pc} arm_func_end sub_0202C5E0 @@ -40881,7 +40881,7 @@ sub_0202C5F4: ; 0x0202C5F4 arm_func_start sub_0202C620 sub_0202C620: ; 0x0202C620 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #1 str r1, [r0, #0x1ac] mov r1, #0 @@ -40903,7 +40903,7 @@ sub_0202C654: ; 0x0202C654 mov r7, r1 mov r6, r2 mov r5, r3 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, #1 str r0, [r4, #0x1ac] @@ -40913,7 +40913,7 @@ sub_0202C654: ; 0x0202C654 cmp r5, #0 bne _0202C6A4 mov r0, r8 - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02032578 str r0, [r4, #0x100] @@ -40936,7 +40936,7 @@ _0202C6A4: sub_0202C6D4: ; 0x0202C6D4 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r4 add r0, r0, #4 bl sub_0203271C @@ -40948,7 +40948,7 @@ sub_0202C6F0: ; 0x0202C6F0 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 - bl GetDialogBoxField0xC + bl GetWindowContents str r5, [r0, #0x1b4] str r4, [r0, #0x1b8] ldmia sp!, {r3, r4, r5, pc} @@ -40958,7 +40958,7 @@ sub_0202C6F0: ; 0x0202C6F0 sub_0202C70C: ; 0x0202C70C stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 @@ -40968,7 +40968,7 @@ sub_0202C70C: ; 0x0202C70C arm_func_start sub_0202C728 sub_0202C728: ; 0x0202C728 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x1ac] cmp r0, #6 cmpne r0, #7 @@ -40980,7 +40980,7 @@ sub_0202C728: ; 0x0202C728 arm_func_start sub_0202C748 sub_0202C748: ; 0x0202C748 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02032578 ldmia sp!, {r3, pc} @@ -40989,7 +40989,7 @@ sub_0202C748: ; 0x0202C748 arm_func_start sub_0202C75C sub_0202C75C: ; 0x0202C75C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1b0] cmp r1, #0 beq _0202C78C @@ -41009,7 +41009,7 @@ _0202C78C: sub_0202C794: ; 0x0202C794 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents strb r4, [r0, #0x1c8] ldmia sp!, {r4, pc} arm_func_end sub_0202C794 @@ -41018,7 +41018,7 @@ sub_0202C794: ; 0x0202C794 sub_0202C7A8: ; 0x0202C7A8 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents str r4, [r0, #0x1a0] ldmia sp!, {r4, pc} arm_func_end sub_0202C7A8 @@ -41027,7 +41027,7 @@ sub_0202C7A8: ; 0x0202C7A8 sub_0202C7BC: ; 0x0202C7BC stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents str r4, [r0, #0x1a4] ldmia sp!, {r4, pc} arm_func_end sub_0202C7BC @@ -41036,7 +41036,7 @@ sub_0202C7BC: ; 0x0202C7BC sub_0202C7D0: ; 0x0202C7D0 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents str r4, [r0, #0x1a8] ldmia sp!, {r4, pc} arm_func_end sub_0202C7D0 @@ -41044,7 +41044,7 @@ sub_0202C7D0: ; 0x0202C7D0 arm_func_start sub_0202C7E4 sub_0202C7E4: ; 0x0202C7E4 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r1, [r0, #0x1ac] cmp r1, #3 moveq r1, #2 @@ -41054,8 +41054,8 @@ sub_0202C7E4: ; 0x0202C7E4 ldmia sp!, {r3, pc} arm_func_end sub_0202C7E4 - arm_func_start sub_0202C808 -sub_0202C808: ; 0x0202C808 + arm_func_start UpdateCollectionMenu +UpdateCollectionMenu: ; 0x0202C808 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x30 mov r4, r0 @@ -41214,7 +41214,7 @@ _0202C994: _0202CA54: add r0, r5, #4 mov r1, #3 - bl sub_02032960 + bl PlayMenuOptionSound _0202CA60: mov r1, r7 add r0, r5, #4 @@ -41264,7 +41264,7 @@ _0202CAF0: bne _0202CB10 add r0, r5, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _0202CB10: mov r1, #1 mov r0, #0 @@ -41278,14 +41278,14 @@ _0202CB10: _0202CB34: add r0, r5, #4 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0202CC94 _0202CB44: tst r0, #2 beq _0202CB94 add r0, r5, #4 mov r1, #1 - bl sub_02032960 + bl PlayMenuOptionSound ldr r1, [r5, #0x1a0] cmp r1, #0 beq _0202CB74 @@ -41313,7 +41313,7 @@ _0202CB94: beq _0202CBC0 add r0, r5, #4 mov r1, #5 - bl sub_02032960 + bl PlayMenuOptionSound _0202CBC0: mov r1, #1 mov r0, #0 @@ -41333,7 +41333,7 @@ _0202CBE8: beq _0202CC30 add r0, r5, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound mov r1, #1 mov r0, #0 strb r1, [r5, #0x1b0] @@ -41351,7 +41351,7 @@ _0202CC30: beq _0202CC74 add r0, r5, #4 mov r1, #5 - bl sub_02032960 + bl PlayMenuOptionSound mov r1, #1 mov r0, #0 strb r1, [r5, #0x1b0] @@ -41517,7 +41517,7 @@ _0202CE94: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0202CE9C: .word 0x00000408 - arm_func_end sub_0202C808 + arm_func_end UpdateCollectionMenu arm_func_start sub_0202CEA0 sub_0202CEA0: ; 0x0202CEA0 @@ -41652,7 +41652,7 @@ _0202D058: sub_0202D068: ; 0x0202D068 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents str r4, [r0, #0x18c] ldmia sp!, {r4, pc} arm_func_end sub_0202D068 @@ -41661,7 +41661,7 @@ sub_0202D068: ; 0x0202D068 sub_0202D07C: ; 0x0202D07C stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents ldr r1, [r0, #0xfc] ands r2, r1, #0x10000000 cmpne r4, #0 @@ -41689,7 +41689,7 @@ _0202D0B0: sub_0202D0D8: ; 0x0202D0D8 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents strb r4, [r0, #0x1b2] ldmia sp!, {r4, pc} arm_func_end sub_0202D0D8 @@ -41697,7 +41697,7 @@ sub_0202D0D8: ; 0x0202D0D8 arm_func_start sub_0202D0EC sub_0202D0EC: ; 0x0202D0EC stmdb sp!, {r3, r4, r5, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r5, r0 add r0, r5, #4 bl sub_02032558 @@ -41711,7 +41711,7 @@ sub_0202D0EC: ; 0x0202D0EC arm_func_start sub_0202D114 sub_0202D114: ; 0x0202D114 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x1ac] cmp r0, #3 moveq r0, #1 @@ -41724,7 +41724,7 @@ sub_0202D114: ; 0x0202D114 sub_0202D134: ; 0x0202D134 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, #1 mov r2, #0 @@ -41742,7 +41742,7 @@ sub_0202D134: ; 0x0202D134 sub_0202D16C: ; 0x0202D16C stmdb sp!, {r3, r4, r5, lr} mov r5, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 cmp r5, #0 ldr r0, [r4, #0xfc] @@ -41776,8 +41776,8 @@ _0202D1BC: ldmia sp!, {r3, r4, r5, pc} arm_func_end sub_0202D16C - arm_func_start sub_0202D1F0 -sub_0202D1F0: ; 0x0202D1F0 + arm_func_start CreateOptionsMenu +CreateOptionsMenu: ; 0x0202D1F0 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x12c mov r5, r1 @@ -41872,7 +41872,7 @@ _0202D300: addne sb, sp, #0x1c ldmneia r6, {r0, r1, r2, r3} stmneia sb, {r0, r1, r2, r3} - ldrne r0, _0202D528 ; =sub_0202D618 + ldrne r0, _0202D528 ; =UpdateOptionsMenu mov r8, fp strne r0, [sp, #0x1c] bne _0202D364 @@ -41966,7 +41966,7 @@ _0202D468: ldrneb r0, [sp, #0x23] subne r0, r1, r0 strneb r0, [sp, #0x21] - ldr r0, _0202D528 ; =sub_0202D618 + ldr r0, _0202D528 ; =UpdateOptionsMenu cmp r4, #0 str r0, [r7] str r5, [r7, #0xfc] @@ -41990,7 +41990,7 @@ _0202D4C4: add r0, sp, #0x1c mov r1, #3 strb r2, [r7, #0x1a5] - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #0xc mov r6, r0 bl sub_02028284 @@ -42007,15 +42007,15 @@ _0202D4C4: add sp, sp, #0x12c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0202D528: .word sub_0202D618 +_0202D528: .word UpdateOptionsMenu _0202D52C: .word _0209AED0 - arm_func_end sub_0202D1F0 + arm_func_end CreateOptionsMenu arm_func_start sub_0202D530 sub_0202D530: ; 0x0202D530 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #0x198] bl MemFree @@ -42029,7 +42029,7 @@ sub_0202D530: ; 0x0202D530 arm_func_start sub_0202D55C sub_0202D55C: ; 0x0202D55C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x1a0] cmp r0, #6 cmpne r0, #7 @@ -42041,7 +42041,7 @@ sub_0202D55C: ; 0x0202D55C arm_func_start sub_0202D57C sub_0202D57C: ; 0x0202D57C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r0, [r0, #0x1a4] cmp r0, #0 moveq r0, #1 @@ -42053,7 +42053,7 @@ sub_0202D57C: ; 0x0202D57C arm_func_start sub_0202D59C sub_0202D59C: ; 0x0202D59C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02032558 ldmia sp!, {r3, pc} @@ -42063,7 +42063,7 @@ sub_0202D59C: ; 0x0202D59C sub_0202D5B0: ; 0x0202D5B0 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 - bl GetDialogBoxField0xC + bl GetWindowContents ldr r4, [r0, #0x198] b _0202D5D0 _0202D5C4: @@ -42081,7 +42081,7 @@ _0202D5D0: arm_func_start sub_0202D5E4 sub_0202D5E4: ; 0x0202D5E4 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1a4] cmp r1, #0 beq _0202D610 @@ -42096,8 +42096,8 @@ _0202D610: ldmia sp!, {r3, pc} arm_func_end sub_0202D5E4 - arm_func_start sub_0202D618 -sub_0202D618: ; 0x0202D618 + arm_func_start UpdateOptionsMenu +UpdateOptionsMenu: ; 0x0202D618 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x30 mov r7, r0 @@ -42242,7 +42242,7 @@ _0202D7E0: add r0, r4, #4 ble _0202D86C mov r1, #3 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [sp, #8] tst r0, #8 ldr r0, [r6, #0x108] @@ -42260,7 +42260,7 @@ _0202D864: b _0202D900 _0202D86C: mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0202D900 _0202D878: tst r0, #0x80 @@ -42272,7 +42272,7 @@ _0202D878: add r0, r4, #4 bge _0202D8DC mov r1, #3 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [sp, #8] tst r0, #8 ldr r0, [r6, #0x108] @@ -42292,7 +42292,7 @@ _0202D8D4: b _0202D900 _0202D8DC: mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0202D900 _0202D8E8: ldr r0, [sp, #8] @@ -42300,7 +42300,7 @@ _0202D8E8: beq _0202D900 add r0, r4, #4 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound _0202D900: cmp r5, #0 beq _0202D910 @@ -42338,7 +42338,7 @@ _0202D96C: beq _0202D960 add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound mov r1, #1 mov r0, #0 strb r1, [r4, #0x1a4] @@ -42353,7 +42353,7 @@ _0202D9AC: beq _0202D9DC add r0, r4, #4 mov r1, #1 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #1 strb r0, [r4, #0x1a4] strb r0, [r4, #0x1a5] @@ -42400,7 +42400,7 @@ _0202DA30: _0202DA5C: add sp, sp, #0x30 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end sub_0202D618 + arm_func_end UpdateOptionsMenu arm_func_start sub_0202DA64 sub_0202DA64: ; 0x0202DA64 @@ -42537,8 +42537,8 @@ _0202DC48: .word _0209AEFC _0202DC4C: .word _0209AF04 arm_func_end sub_0202DA64 - arm_func_start sub_0202DC50 -sub_0202DC50: ; 0x0202DC50 + arm_func_start CreateDebugMenu +CreateDebugMenu: ; 0x0202DC50 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x30 mov r7, r3 @@ -42586,7 +42586,7 @@ _0202DCB8: str r1, [sp, #8] ldmneia r8, {r0, r1, r2, r3} stmneia fp, {r0, r1, r2, r3} - ldrne r0, _0202DEE8 ; =sub_0202DF98 + ldrne r0, _0202DEE8 ; =UpdateDebugMenu mov sb, r4 orr r5, r5, #4 ldr r6, [sp, #0x5c] @@ -42667,7 +42667,7 @@ _0202DDF8: ldrneb r0, [sp, #0x17] subne r0, r1, r0 strneb r0, [sp, #0x15] - ldr r0, _0202DEE8 ; =sub_0202DF98 + ldr r0, _0202DEE8 ; =UpdateDebugMenu cmp sl, #0 str r0, [r7] str r5, [r7, #0xfc] @@ -42703,7 +42703,7 @@ _0202DE54: str r0, [r7, #0x3b0] add r0, sp, #0x10 mov r1, #3 - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #0x20 mov r6, r0 bl sub_02028284 @@ -42720,7 +42720,7 @@ _0202DE54: add sp, sp, #0x30 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0202DEE8: .word sub_0202DF98 +_0202DEE8: .word UpdateDebugMenu _0202DEEC: .word _0209AF0C #ifdef EUROPE _0202DEF0: .word 0x00003C67 @@ -42729,13 +42729,13 @@ _0202DEF4: .word 0x00003C68 _0202DEF0: .word 0x00003C65 _0202DEF4: .word 0x00003C66 #endif - arm_func_end sub_0202DC50 + arm_func_end CreateDebugMenu arm_func_start sub_0202DEF8 sub_0202DEF8: ; 0x0202DEF8 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #0x198] bl MemFree @@ -42749,7 +42749,7 @@ sub_0202DEF8: ; 0x0202DEF8 arm_func_start sub_0202DF24 sub_0202DF24: ; 0x0202DF24 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x1a0] cmp r0, #6 cmpne r0, #7 @@ -42761,7 +42761,7 @@ sub_0202DF24: ; 0x0202DF24 arm_func_start sub_0202DF44 sub_0202DF44: ; 0x0202DF44 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r0, [r0, #0x1a4] cmp r0, #0 moveq r0, #1 @@ -42773,7 +42773,7 @@ sub_0202DF44: ; 0x0202DF44 arm_func_start sub_0202DF64 sub_0202DF64: ; 0x0202DF64 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1a4] cmp r1, #0 beq _0202DF90 @@ -42788,8 +42788,8 @@ _0202DF90: ldmia sp!, {r3, pc} arm_func_end sub_0202DF64 - arm_func_start sub_0202DF98 -sub_0202DF98: ; 0x0202DF98 + arm_func_start UpdateDebugMenu +UpdateDebugMenu: ; 0x0202DF98 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x30 mov r7, r0 @@ -42901,7 +42901,7 @@ _0202E0EC: add r0, r4, #4 bne _0202E154 mov r1, #3 - bl sub_02032960 + bl PlayMenuOptionSound ldrb r0, [r6, #0x100] mov r5, #1 cmp r0, #0 @@ -42911,7 +42911,7 @@ _0202E0EC: b _0202E15C _0202E154: mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound _0202E15C: cmp r5, #0 beq _0202E16C @@ -42940,7 +42940,7 @@ _0202E1A4: beq _0202E194 add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound mov r1, #1 mov r0, #0 strb r1, [r4, #0x1a4] @@ -42955,7 +42955,7 @@ _0202E1E4: beq _0202E214 add r0, r4, #4 mov r1, #1 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #1 strb r0, [r4, #0x1a4] strb r0, [r4, #0x1a5] @@ -43002,7 +43002,7 @@ _0202E268: _0202E294: add sp, sp, #0x30 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end sub_0202DF98 + arm_func_end UpdateDebugMenu arm_func_start sub_0202E29C sub_0202E29C: ; 0x0202E29C @@ -43088,8 +43088,8 @@ _0202E3B0: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} arm_func_end sub_0202E29C - arm_func_start sub_0202E3CC -sub_0202E3CC: ; 0x0202E3CC + arm_func_start CreateScrollBox1 +CreateScrollBox1: ; 0x0202E3CC stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x10 mov r8, r0 @@ -43107,8 +43107,8 @@ sub_0202E3CC: ; 0x0202E3CC stmeqia ip, {r0, r1, r2, r3} ldmneia r8, {r0, r1, r2, r3} stmneia ip, {r0, r1, r2, r3} - ldrne r0, _0202E510 ; =sub_0202E708 - ldr r1, _0202E510 ; =sub_0202E708 + ldrne r0, _0202E510 ; =UpdateScrollBox + ldr r1, _0202E510 ; =UpdateScrollBox strne r0, [sp] ldr r0, _0202E514 ; =0x0D0C8012 str r4, [sp, #0xc] @@ -43174,18 +43174,18 @@ _0202E4E0: add r0, sp, #0 mov r1, #3 strb r3, [r2, #0x468] - bl sub_02027648 + bl NewWindowScreenCheck add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _0202E508: .word 0x00001D6C _0202E50C: .word _0209AF1C -_0202E510: .word sub_0202E708 +_0202E510: .word UpdateScrollBox _0202E514: .word 0x0D0C8012 - arm_func_end sub_0202E3CC + arm_func_end CreateScrollBox1 - arm_func_start sub_0202E518 -sub_0202E518: ; 0x0202E518 + arm_func_start CreateScrollBox2 +CreateScrollBox2: ; 0x0202E518 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x10 mov r6, r0 @@ -43209,8 +43209,8 @@ sub_0202E518: ; 0x0202E518 addne ip, sp, #0 ldmneia r6, {r0, r1, r2, r3} stmneia ip, {r0, r1, r2, r3} - ldrne r0, _0202E6A8 ; =sub_0202E708 - ldr r1, _0202E6A8 ; =sub_0202E708 + ldrne r0, _0202E6A8 ; =UpdateScrollBox + ldr r1, _0202E6A8 ; =UpdateScrollBox strne r0, [sp] ldr r0, _0202E6AC ; =0x0D0C8012 str r4, [sp, #0xc] @@ -43291,20 +43291,20 @@ _0202E670: add r0, sp, #0 mov r1, #3 strb r3, [r2, #0x468] - bl sub_02027648 + bl NewWindowScreenCheck add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0202E6A0: .word 0x00001D6C _0202E6A4: .word _0209AF1C -_0202E6A8: .word sub_0202E708 +_0202E6A8: .word UpdateScrollBox _0202E6AC: .word 0x0D0C8012 - arm_func_end sub_0202E518 + arm_func_end CreateScrollBox2 arm_func_start sub_0202E6B0 sub_0202E6B0: ; 0x0202E6B0 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #0x1000 mov r1, #7 str r1, [r0, #0x464] @@ -43315,7 +43315,7 @@ sub_0202E6B0: ; 0x0202E6B0 sub_0202E6C8: ; 0x0202E6C8 stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 @@ -43325,7 +43325,7 @@ sub_0202E6C8: ; 0x0202E6C8 arm_func_start sub_0202E6E4 sub_0202E6E4: ; 0x0202E6E4 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #0x1000 ldr r0, [r0, #0x464] cmp r0, #8 @@ -43335,8 +43335,8 @@ sub_0202E6E4: ; 0x0202E6E4 ldmia sp!, {r3, pc} arm_func_end sub_0202E6E4 - arm_func_start sub_0202E708 -sub_0202E708: ; 0x0202E708 + arm_func_start UpdateScrollBox +UpdateScrollBox: ; 0x0202E708 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x6c mov r4, r0 @@ -43553,7 +43553,7 @@ _0202E9C0: beq _0202EA48 add r0, r5, #4 mov r1, #4 - bl sub_02032960 + bl PlayMenuOptionSound subs r8, r8, #1 addmi r0, r5, #0x1000 ldrmi r0, [r0, #0x4bc] @@ -43564,7 +43564,7 @@ _0202EA48: beq _0202EA70 add r0, r5, #4 mov r1, #4 - bl sub_02032960 + bl PlayMenuOptionSound add r0, r5, #0x1000 ldr r0, [r0, #0x4bc] add r8, r8, #1 @@ -43611,7 +43611,7 @@ _0202EAC0: _0202EAFC: add r0, r5, #4 mov r1, #3 - bl sub_02032960 + bl PlayMenuOptionSound mov r7, #1 b _0202EB54 _0202EB10: @@ -43631,7 +43631,7 @@ _0202EB10: _0202EB44: add r0, r5, #4 mov r1, #3 - bl sub_02032960 + bl PlayMenuOptionSound mov r7, #1 _0202EB54: ldr r0, [sp, #0x14] @@ -43781,7 +43781,7 @@ _0202ED44: beq _0202EDBC add r0, r5, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [r5, #0x430] add r2, r6, #0x18 add r0, r0, #1 @@ -43803,7 +43803,7 @@ _0202ED44: _0202EDBC: add r0, r5, #4 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound _0202EDC8: cmp r7, #0 bne _0202EE28 @@ -43812,7 +43812,7 @@ _0202EDC8: beq _0202EE28 add r0, r5, #4 mov r1, #1 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [r5, #0x430] cmp r0, #0 ble _0202EE0C @@ -43859,7 +43859,7 @@ _0202EE74: _0202EE7C: .word 0x0000040C _0202EE80: .word 0x000001AF _0202EE84: .word 0x00000408 - arm_func_end sub_0202E708 + arm_func_end UpdateScrollBox arm_func_start sub_0202EE88 sub_0202EE88: ; 0x0202EE88 @@ -44017,8 +44017,8 @@ _0202F0A8: .word 0x0000C406 _0202F0AC: .word 0x0000C506 arm_func_end sub_0202EE88 - arm_func_start CreateDBox -CreateDBox: ; 0x0202F0B0 + arm_func_start CreateDialogueBox +CreateDialogueBox: ; 0x0202F0B0 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x10 mov r6, r0 @@ -44033,8 +44033,8 @@ CreateDBox: ; 0x0202F0B0 stmeqia r5, {r0, r1, r2, r3} ldmneia r6, {r0, r1, r2, r3} stmneia r5, {r0, r1, r2, r3} - ldrne r0, _0202F144 ; =sub_0202F488 - ldr r1, _0202F144 ; =sub_0202F488 + ldrne r0, _0202F144 ; =UpdateDialogueBox + ldr r1, _0202F144 ; =UpdateDialogueBox strne r0, [sp] str r4, [sp, #0xc] str r1, [r4] @@ -44042,7 +44042,7 @@ CreateDBox: ; 0x0202F0B0 add r0, sp, #0 mov r1, #3 strb r2, [r4, #0xa] - bl sub_02027648 + bl NewWindowScreenCheck mov r5, r0 mov r1, r5 add r0, r4, #0xc @@ -44057,45 +44057,45 @@ CreateDBox: ; 0x0202F0B0 .align 2, 0 _0202F13C: .word 0x00000528 _0202F140: .word _0209AF2C -_0202F144: .word sub_0202F488 - arm_func_end CreateDBox +_0202F144: .word UpdateDialogueBox + arm_func_end CreateDialogueBox - arm_func_start FreeDBox -FreeDBox: ; 0x0202F148 + arm_func_start FreeDialogueBox +FreeDialogueBox: ; 0x0202F148 stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r0, r4 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 ldmia sp!, {r4, pc} - arm_func_end FreeDBox + arm_func_end FreeDialogueBox arm_func_start sub_0202F16C sub_0202F16C: ; 0x0202F16C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #0xc bl sub_020261D4 ldmia sp!, {r3, pc} arm_func_end sub_0202F16C - arm_func_start IsDBoxActive -IsDBoxActive: ; 0x0202F180 + arm_func_start IsDialogueBoxActive +IsDialogueBoxActive: ; 0x0202F180 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r0, [r0, #8] ldmia sp!, {r3, pc} - arm_func_end IsDBoxActive + arm_func_end IsDialogueBoxActive arm_func_start sub_0202F190 sub_0202F190: ; 0x0202F190 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r5 mov r2, r4 add r0, r0, #0xc @@ -44103,13 +44103,13 @@ sub_0202F190: ; 0x0202F190 ldmia sp!, {r3, r4, r5, pc} arm_func_end sub_0202F190 - arm_func_start ShowMessageInDBox -ShowMessageInDBox: ; 0x0202F1B4 + arm_func_start ShowMessageInDialogueBox +ShowMessageInDialogueBox: ; 0x0202F1B4 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r1 mov r6, r2 mov r5, r3 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #4] cmp r0, #2 @@ -44141,15 +44141,15 @@ _0202F200: add r2, r4, #0x128 bl sub_02026194 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ShowMessageInDBox + arm_func_end ShowMessageInDialogueBox - arm_func_start ShowStringInDBox -ShowStringInDBox: ; 0x0202F23C + arm_func_start ShowStringInDialogueBox +ShowStringInDialogueBox: ; 0x0202F23C stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r1 mov r6, r2 mov r5, r3 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #4] cmp r0, #2 @@ -44181,12 +44181,12 @@ _0202F288: add r2, r4, #0x128 bl sub_02026194 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ShowStringInDBox + arm_func_end ShowStringInDialogueBox arm_func_start sub_0202F2C4 sub_0202F2C4: ; 0x0202F2C4 stmdb sp!, {r4, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #4] cmp r0, #4 @@ -44222,7 +44222,7 @@ _0202F31C: arm_func_start sub_0202F334 sub_0202F334: ; 0x0202F334 stmdb sp!, {r4, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #4] cmp r0, #4 @@ -44255,10 +44255,10 @@ _0202F38C: ldmia sp!, {r4, pc} arm_func_end sub_0202F334 - arm_func_start ShowDBox -ShowDBox: ; 0x0202F3A4 + arm_func_start ShowDialogueBox +ShowDialogueBox: ; 0x0202F3A4 stmdb sp!, {r4, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #4] cmp r0, #4 @@ -44281,12 +44281,12 @@ _0202F3E0: str r0, [r4, #4] strb r0, [r4, #8] ldmia sp!, {r4, pc} - arm_func_end ShowDBox + arm_func_end ShowDialogueBox arm_func_start sub_0202F3F8 sub_0202F3F8: ; 0x0202F3F8 stmdb sp!, {r4, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #4] cmp r0, #4 @@ -44316,7 +44316,7 @@ sub_0202F44C: ; 0x0202F44C stmdb sp!, {r3, r4, r5, lr} mov r5, r1 mov r4, r2 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r0 mov r0, r5 mov r2, r4 @@ -44329,13 +44329,13 @@ sub_0202F44C: ; 0x0202F44C sub_0202F474: ; 0x0202F474 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents strb r4, [r0, #0xa] ldmia sp!, {r4, pc} arm_func_end sub_0202F474 - arm_func_start sub_0202F488 -sub_0202F488: ; 0x0202F488 + arm_func_start UpdateDialogueBox +UpdateDialogueBox: ; 0x0202F488 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r4, [r5, #0xc] @@ -44415,7 +44415,7 @@ _0202F57C: sub r0, r0, #6 str r0, [r5, #0xb8] ldmia sp!, {r3, r4, r5, pc} - arm_func_end sub_0202F488 + arm_func_end UpdateDialogueBox arm_func_start CreatePortraitBox CreatePortraitBox: ; 0x0202F5AC @@ -44432,7 +44432,7 @@ CreatePortraitBox: ; 0x0202F5AC add ip, sp, #0 ldmia r1, {r0, r1, r2, r3} stmia ip, {r0, r1, r2, r3} - ldr r0, _0202F64C ; =sub_0202F70C + ldr r0, _0202F64C ; =UpdatePortraitBox cmp r6, #0 str r0, [sp] mvnne r0, #3 @@ -44443,7 +44443,7 @@ CreatePortraitBox: ; 0x0202F5AC add r0, sp, #0 strb r6, [r5, #0x2a] mov r1, #3 - bl sub_02027648 + bl NewWindowScreenCheck strb r0, [r5] mov r1, #0 add r0, r5, #8 @@ -44460,14 +44460,14 @@ CreatePortraitBox: ; 0x0202F5AC ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0202F648: .word _0209AF3C -_0202F64C: .word sub_0202F70C +_0202F64C: .word UpdatePortraitBox arm_func_end CreatePortraitBox arm_func_start FreePortraitBox FreePortraitBox: ; 0x0202F650 stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 @@ -44477,7 +44477,7 @@ FreePortraitBox: ; 0x0202F650 arm_func_start sub_0202F66C sub_0202F66C: ; 0x0202F66C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #4] sub r0, r0, #1 cmp r0, #1 @@ -44491,7 +44491,7 @@ sub_0202F66C: ; 0x0202F66C ShowPortraitBox: ; 0x0202F690 stmdb sp!, {r3, r4, r5, lr} mov r5, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #4] cmp r0, #2 @@ -44514,7 +44514,7 @@ _0202F6D0: arm_func_start HidePortraitBox HidePortraitBox: ; 0x0202F6DC stmdb sp!, {r4, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, #0 strb r0, [r4, #0x28] @@ -44527,8 +44527,8 @@ HidePortraitBox: ; 0x0202F6DC ldmia sp!, {r4, pc} arm_func_end HidePortraitBox - arm_func_start sub_0202F70C -sub_0202F70C: ; 0x0202F70C + arm_func_start UpdatePortraitBox +UpdatePortraitBox: ; 0x0202F70C stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r4, [r5, #0xc] @@ -44650,35 +44650,35 @@ _0202F894: sub r0, r0, #6 str r0, [r5, #0xb8] ldmia sp!, {r3, r4, r5, pc} - arm_func_end sub_0202F70C + arm_func_end UpdatePortraitBox - arm_func_start sub_0202F8C4 -sub_0202F8C4: ; 0x0202F8C4 + arm_func_start CreateTextBox1 +CreateTextBox1: ; 0x0202F8C4 stmdb sp!, {r4, lr} mov r4, r1 - bl sub_0202F9DC + bl CreateTextBoxInternal str r4, [r0, #4] ldrsb r0, [r0] ldmia sp!, {r4, pc} - arm_func_end sub_0202F8C4 + arm_func_end CreateTextBox1 - arm_func_start sub_0202F8DC -sub_0202F8DC: ; 0x0202F8DC + arm_func_start CreateTextBox2 +CreateTextBox2: ; 0x0202F8DC stmdb sp!, {r3, r4, r5, lr} mov r4, r2 mov r5, r1 - bl sub_0202F9DC + bl CreateTextBoxInternal str r4, [r0, #0x14] str r5, [r0, #8] ldrsb r0, [r0] ldmia sp!, {r3, r4, r5, pc} - arm_func_end sub_0202F8DC + arm_func_end CreateTextBox2 arm_func_start sub_0202F8FC sub_0202F8FC: ; 0x0202F8FC stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 @@ -44689,7 +44689,7 @@ sub_0202F8FC: ; 0x0202F8FC sub_0202F918: ; 0x0202F918 stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r0, r4 bl sub_0202836C mov r0, r4 @@ -44697,7 +44697,7 @@ sub_0202F918: ; 0x0202F918 mov r0, r4 bl sub_0202F954 mov r0, r4 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 @@ -44707,7 +44707,7 @@ sub_0202F918: ; 0x0202F918 arm_func_start sub_0202F954 sub_0202F954: ; 0x0202F954 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r1, [r0, #0x10] cmp r1, #6 addls pc, pc, r1, lsl #2 @@ -44741,7 +44741,7 @@ _0202F9AC: arm_func_start sub_0202F9B8 sub_0202F9B8: ; 0x0202F9B8 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r1, [r0, #0x10] cmp r1, #3 moveq r1, #2 @@ -44751,8 +44751,8 @@ sub_0202F9B8: ; 0x0202F9B8 ldmia sp!, {r3, pc} arm_func_end sub_0202F9B8 - arm_func_start sub_0202F9DC -sub_0202F9DC: ; 0x0202F9DC + arm_func_start CreateTextBoxInternal +CreateTextBoxInternal: ; 0x0202F9DC stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x10 mov r5, r0 @@ -44766,30 +44766,30 @@ sub_0202F9DC: ; 0x0202F9DC ldmeqia r0, {r0, r1, r2, r3} ldmneia r5, {r0, r1, r2, r3} stmia ip, {r0, r1, r2, r3} - ldr r1, _0202FA58 ; =sub_0202FA5C + ldr r1, _0202FA58 ; =UpdateTextBox add r0, sp, #0 str r1, [sp] str r4, [sp, #0xc] mov r1, #3 - bl sub_02027648 + bl NewWindowScreenCheck strb r0, [r4] mov r0, #0 str r0, [r4, #4] str r0, [r4, #8] str r0, [r4, #0x14] str r0, [r4, #0x10] - ldr r1, _0202FA58 ; =sub_0202FA5C + ldr r1, _0202FA58 ; =UpdateTextBox mov r0, r4 str r1, [r4, #0xc] add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0202FA54: .word _0209AF4C -_0202FA58: .word sub_0202FA5C - arm_func_end sub_0202F9DC +_0202FA58: .word UpdateTextBox + arm_func_end CreateTextBoxInternal - arm_func_start sub_0202FA5C -sub_0202FA5C: ; 0x0202FA5C + arm_func_start UpdateTextBox +UpdateTextBox: ; 0x0202FA5C stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r4, [r5, #0xc] @@ -44880,12 +44880,12 @@ _0202FB88: mov r0, #7 str r0, [r4, #0x10] ldmia sp!, {r3, r4, r5, pc} - arm_func_end sub_0202FA5C + arm_func_end UpdateTextBox arm_func_start sub_0202FB9C sub_0202FB9C: ; 0x0202FB9C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x10] cmp r0, #7 movne r0, #1 @@ -44894,8 +44894,8 @@ sub_0202FB9C: ; 0x0202FB9C ldmia sp!, {r3, pc} arm_func_end sub_0202FB9C - arm_func_start sub_0202FBBC -sub_0202FBBC: ; 0x0202FBBC + arm_func_start CreateDynamicTextBox +CreateDynamicTextBox: ; 0x0202FBBC stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0x64 mov r7, r0 @@ -44923,7 +44923,7 @@ sub_0202FBBC: ; 0x0202FBBC addne lr, sp, #4 ldmneia r7, {r0, r1, r2, r3} stmneia lr, {r0, r1, r2, r3} - ldrne r0, _0202FD34 ; =sub_0202FD8C + ldrne r0, _0202FD34 ; =UpdateDynamicTextBox strne r0, [sp, #4] bne _0202FC48 ldr r0, _0202FD38 ; =_0209AF5C @@ -44970,7 +44970,7 @@ _0202FC48: cmp r0, #0 movlt r0, #0 strlt r0, [r4, #0x1b0] - ldr r0, _0202FD34 ; =sub_0202FD8C + ldr r0, _0202FD34 ; =UpdateDynamicTextBox cmp r5, #0 stmia r4, {r0, r6} beq _0202FD10 @@ -44988,20 +44988,20 @@ _0202FD10: add r0, sp, #4 mov r1, #3 str r2, [r4, #0xa0] - bl sub_02027648 + bl NewWindowScreenCheck add sp, sp, #0x64 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _0202FD2C: .word _0209AF6C _0202FD30: .word 0x0000C402 -_0202FD34: .word sub_0202FD8C +_0202FD34: .word UpdateDynamicTextBox _0202FD38: .word _0209AF5C - arm_func_end sub_0202FBBC + arm_func_end CreateDynamicTextBox arm_func_start sub_0202FD3C sub_0202FD3C: ; 0x0202FD3C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #3 str r1, [r0, #0xa0] ldmia sp!, {r3, pc} @@ -45011,7 +45011,7 @@ sub_0202FD3C: ; 0x0202FD3C sub_0202FD50: ; 0x0202FD50 stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 @@ -45021,7 +45021,7 @@ sub_0202FD50: ; 0x0202FD50 arm_func_start sub_0202FD6C sub_0202FD6C: ; 0x0202FD6C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0xa0] cmp r0, #2 cmpne r0, #4 @@ -45030,8 +45030,8 @@ sub_0202FD6C: ; 0x0202FD6C ldmia sp!, {r3, pc} arm_func_end sub_0202FD6C - arm_func_start sub_0202FD8C -sub_0202FD8C: ; 0x0202FD8C + arm_func_start UpdateDynamicTextBox +UpdateDynamicTextBox: ; 0x0202FD8C stmdb sp!, {r4, r5, r6, lr} mov r5, r0 ldr r4, [r5, #0xc] @@ -45076,10 +45076,10 @@ _0202FE0C: movne r0, #4 strne r0, [r4, #0xa0] ldmia sp!, {r4, r5, r6, pc} - arm_func_end sub_0202FD8C + arm_func_end UpdateDynamicTextBox - arm_func_start sub_0202FE2C -sub_0202FE2C: ; 0x0202FE2C + arm_func_start CreateControlsChart +CreateControlsChart: ; 0x0202FE2C stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x10 mov r7, r0 @@ -45098,10 +45098,10 @@ sub_0202FE2C: ; 0x0202FE2C stmeqia lr, {r0, r1, r2, r3} ldmneia r7, {r0, r1, r2, r3} stmneia lr, {r0, r1, r2, r3} - ldrne r0, _0202FED0 ; =sub_0202FF10 + ldrne r0, _0202FED0 ; =UpdateControlsChart str ip, [sp, #0xc] strne r0, [sp] - ldr r0, _0202FED0 ; =sub_0202FF10 + ldr r0, _0202FED0 ; =UpdateControlsChart cmp r4, #0 stmia ip, {r0, r5} beq _0202FEB0 @@ -45119,19 +45119,19 @@ _0202FEB0: add r0, sp, #0 mov r1, #3 str r2, [ip, #0xa0] - bl sub_02027648 + bl NewWindowScreenCheck add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0202FECC: .word _0209AF78 -_0202FED0: .word sub_0202FF10 - arm_func_end sub_0202FE2C +_0202FED0: .word UpdateControlsChart + arm_func_end CreateControlsChart arm_func_start sub_0202FED4 sub_0202FED4: ; 0x0202FED4 stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 @@ -45141,7 +45141,7 @@ sub_0202FED4: ; 0x0202FED4 arm_func_start sub_0202FEF0 sub_0202FEF0: ; 0x0202FEF0 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0xa0] cmp r0, #2 cmpne r0, #4 @@ -45150,8 +45150,8 @@ sub_0202FEF0: ; 0x0202FEF0 ldmia sp!, {r3, pc} arm_func_end sub_0202FEF0 - arm_func_start sub_0202FF10 -sub_0202FF10: ; 0x0202FF10 + arm_func_start UpdateControlsChart +UpdateControlsChart: ; 0x0202FF10 stmdb sp!, {r4, r5, r6, lr} mov r5, r0 ldr r4, [r5, #0xc] @@ -45196,10 +45196,10 @@ _0202FF90: movne r0, #4 strne r0, [r4, #0xa0] ldmia sp!, {r4, r5, r6, pc} - arm_func_end sub_0202FF10 + arm_func_end UpdateControlsChart - arm_func_start sub_0202FFB0 -sub_0202FFB0: ; 0x0202FFB0 + arm_func_start CreateAlertBox +CreateAlertBox: ; 0x0202FFB0 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x10 mov r5, r0 @@ -45216,12 +45216,12 @@ sub_0202FFB0: ; 0x0202FFB0 stmeqia ip, {r0, r1, r2, r3} ldmneia r5, {r0, r1, r2, r3} stmneia ip, {r0, r1, r2, r3} - ldrne r0, _02030040 ; =sub_02030274 + ldrne r0, _02030040 ; =UpdateAlertBox str r4, [sp, #0xc] strne r0, [sp] add r0, sp, #0 mov r1, #3 - bl sub_02027648 + bl NewWindowScreenCheck strb r0, [r4] ldrsb r1, [r4] add r0, r4, #8 @@ -45237,21 +45237,21 @@ sub_0202FFB0: ; 0x0202FFB0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0203003C: .word _0209AF94 -_02030040: .word sub_02030274 - arm_func_end sub_0202FFB0 +_02030040: .word UpdateAlertBox + arm_func_end CreateAlertBox arm_func_start sub_02030044 sub_02030044: ; 0x02030044 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldrsb r0, [r4] bl sub_0202836C add r0, r4, #8 bl sub_0202613C mov r0, r5 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r5 bl sub_02028194 @@ -45313,7 +45313,7 @@ sub_0203010C: ; 0x0203010C mov r7, r1 mov r6, r2 mov r5, r3 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #4] cmp r0, #2 @@ -45373,7 +45373,7 @@ _02030144: arm_func_start sub_020301F4 sub_020301F4: ; 0x020301F4 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #4] cmp r0, #3 moveq r0, #1 @@ -45385,7 +45385,7 @@ sub_020301F4: ; 0x020301F4 arm_func_start sub_02030214 sub_02030214: ; 0x02030214 stmdb sp!, {r4, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #4] cmp r0, #5 @@ -45414,8 +45414,8 @@ _02030260: ldmia sp!, {r4, pc} arm_func_end sub_02030214 - arm_func_start sub_02030274 -sub_02030274: ; 0x02030274 + arm_func_start UpdateAlertBox +UpdateAlertBox: ; 0x02030274 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r5, r0 ldr r4, [r5, #0xc] @@ -45448,7 +45448,7 @@ _020302C8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _020302E0: ldrsb r0, [r5, #0x10] - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #0x600 ldrsh r1, [r0, #0x46] ldrsh r0, [r0, #0x44] @@ -45459,7 +45459,7 @@ _020302E0: ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} ldrsb r4, [r5, #0x10] mov r0, r4 - bl GetDialogBoxField0xC + bl GetWindowContents mov r6, r0 add r3, r6, #0x600 ldr r1, [r6, #0x20] @@ -45538,7 +45538,7 @@ _020303C4: _02030438: ldrsb r5, [r5, #0x10] mov r0, r5 - bl GetDialogBoxField0xC + bl GetWindowContents mov r7, r0 add r3, r7, #0x600 ldr r1, [r7, #0x20] @@ -45637,33 +45637,33 @@ _02030588: mvn r0, #5 str r0, [r5, #0xb8] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - arm_func_end sub_02030274 + arm_func_end UpdateAlertBox - arm_func_start sub_020305B4 -sub_020305B4: ; 0x020305B4 + arm_func_start CreateAdvancedTextBox1 +CreateAdvancedTextBox1: ; 0x020305B4 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 mov r4, r3 ldr ip, [sp, #0x14] ldr r3, [sp, #0x10] str ip, [sp] - bl sub_0203061C + bl CreateAdvancedTextBoxInternal add r1, r0, #0x100 str r4, [r0, #0x1a4] ldrsb r0, [r1, #0xa0] add sp, sp, #4 ldmia sp!, {r3, r4, pc} - arm_func_end sub_020305B4 + arm_func_end CreateAdvancedTextBox1 - arm_func_start sub_020305E4 -sub_020305E4: ; 0x020305E4 + arm_func_start CreateAdvancedTextBox2 +CreateAdvancedTextBox2: ; 0x020305E4 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 mov r4, r3 ldr ip, [sp, #0x18] ldr r3, [sp, #0x14] str ip, [sp] - bl sub_0203061C + bl CreateAdvancedTextBoxInternal ldr r2, [sp, #0x10] str r4, [r0, #0x1a8] add r1, r0, #0x100 @@ -45671,10 +45671,10 @@ sub_020305E4: ; 0x020305E4 ldrsb r0, [r1, #0xa0] add sp, sp, #4 ldmia sp!, {r3, r4, pc} - arm_func_end sub_020305E4 + arm_func_end CreateAdvancedTextBox2 - arm_func_start sub_0203061C -sub_0203061C: ; 0x0203061C + arm_func_start CreateAdvancedTextBoxInternal +CreateAdvancedTextBoxInternal: ; 0x0203061C stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x28 mov r8, r0 @@ -45696,7 +45696,7 @@ sub_0203061C: ; 0x0203061C addne ip, sp, #0x18 ldmneia r8, {r0, r1, r2, r3} stmneia ip, {r0, r1, r2, r3} - ldrne r0, _02030774 ; =sub_02030AE8 + ldrne r0, _02030774 ; =UpdateAdvancedTextBox strne r0, [sp, #0x18] bne _02030690 ldr r0, _02030778 ; =_0209AFA4 @@ -45716,7 +45716,7 @@ _02030690: ldrneb r0, [sp, #0x1f] subne r0, r1, r0 strneb r0, [sp, #0x1d] - ldr r0, _02030774 ; =sub_02030AE8 + ldr r0, _02030774 ; =UpdateAdvancedTextBox cmp r6, #0 str r0, [r4] str r7, [r4, #0x104] @@ -45741,7 +45741,7 @@ _020306F0: add r0, sp, #0x18 mov r1, #3 strb r2, [r4, #0x1c3] - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #8 strb r0, [r4, #0x1a0] bl sub_02028284 @@ -45765,15 +45765,15 @@ _020306F0: add sp, sp, #0x28 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02030774: .word sub_02030AE8 +_02030774: .word UpdateAdvancedTextBox _02030778: .word _0209AFA4 - arm_func_end sub_0203061C + arm_func_end CreateAdvancedTextBoxInternal arm_func_start sub_0203077C sub_0203077C: ; 0x0203077C stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents strb r4, [r0, #0x1c3] ldr r1, [r0, #0x104] tst r4, #0xff @@ -45787,7 +45787,7 @@ sub_0203077C: ; 0x0203077C sub_020307A4: ; 0x020307A4 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents strb r4, [r0, #0x1c4] ldmia sp!, {r4, pc} arm_func_end sub_020307A4 @@ -45795,7 +45795,7 @@ sub_020307A4: ; 0x020307A4 arm_func_start sub_020307B8 sub_020307B8: ; 0x020307B8 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #1 str r1, [r0, #0x1bc] mov r1, #0 @@ -45813,10 +45813,10 @@ sub_020307B8: ; 0x020307B8 sub_020307EC: ; 0x020307EC stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, r5 - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x1bc] cmp r0, #7 moveq r0, #1 @@ -45837,7 +45837,7 @@ _02030828: arm_func_start sub_0203083C sub_0203083C: ; 0x0203083C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #1 strb r1, [r0, #0x1c2] ldmia sp!, {r3, pc} @@ -45853,7 +45853,7 @@ sub_02030850: ; 0x02030850 mov r0, r5 bl sub_0202812C mov r0, r5 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, r5 bl sub_02028194 @@ -45865,7 +45865,7 @@ sub_02030850: ; 0x02030850 arm_func_start sub_0203088C sub_0203088C: ; 0x0203088C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #5 str r1, [r0, #0x1bc] ldmia sp!, {r3, pc} @@ -45875,7 +45875,7 @@ sub_0203088C: ; 0x0203088C sub_020308A0: ; 0x020308A0 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, r5 bl sub_02028194 @@ -45887,7 +45887,7 @@ sub_020308A0: ; 0x020308A0 arm_func_start sub_020308C4 sub_020308C4: ; 0x020308C4 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x1bc] cmp r0, #6 cmpne r0, #7 @@ -45899,7 +45899,7 @@ sub_020308C4: ; 0x020308C4 arm_func_start sub_020308E4 sub_020308E4: ; 0x020308E4 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1c0] cmp r1, #0 ldrneb r0, [r0, #0x1c1] @@ -45912,7 +45912,7 @@ sub_020308E4: ; 0x020308E4 arm_func_start sub_02030908 sub_02030908: ; 0x02030908 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1c0] cmp r1, #0 beq _02030938 @@ -45931,7 +45931,7 @@ _02030938: arm_func_start sub_02030940 sub_02030940: ; 0x02030940 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1c0] cmp r1, #0 beq _02030970 @@ -45954,7 +45954,7 @@ sub_02030978: ; 0x02030978 mov r6, r1 mov r5, r2 mov r4, r3 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r0 strh r5, [r1, #0xfc] strh r4, [r1, #0xfe] @@ -45975,7 +45975,7 @@ sub_020309B8: ; 0x020309B8 mov r7, r1 mov r6, r2 mov r5, r3 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r0 strh r6, [r1, #0xfc] ldr r4, [sp, #0x28] @@ -45998,7 +45998,7 @@ sub_020309B8: ; 0x020309B8 arm_func_start sub_02030A18 sub_02030A18: ; 0x02030A18 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02032568 ldmia sp!, {r3, pc} @@ -46008,7 +46008,7 @@ sub_02030A18: ; 0x02030A18 sub_02030A2C: ; 0x02030A2C stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents strh r4, [r0, #0x20] ldmia sp!, {r4, pc} arm_func_end sub_02030A2C @@ -46016,7 +46016,7 @@ sub_02030A2C: ; 0x02030A2C arm_func_start sub_02030A40 sub_02030A40: ; 0x02030A40 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x1b0] ldmia sp!, {r3, pc} arm_func_end sub_02030A40 @@ -46025,7 +46025,7 @@ sub_02030A40: ; 0x02030A40 sub_02030A50: ; 0x02030A50 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents str r4, [r0, #0xc0] ldmia sp!, {r4, pc} arm_func_end sub_02030A50 @@ -46033,7 +46033,7 @@ sub_02030A50: ; 0x02030A50 arm_func_start sub_02030A64 sub_02030A64: ; 0x02030A64 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0xc0] ldmia sp!, {r3, pc} arm_func_end sub_02030A64 @@ -46042,7 +46042,7 @@ sub_02030A64: ; 0x02030A64 sub_02030A74: ; 0x02030A74 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r4 add r0, r0, #4 bl sub_02031C74 @@ -46053,7 +46053,7 @@ sub_02030A74: ; 0x02030A74 sub_02030A90: ; 0x02030A90 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r4 add r0, r0, #4 bl sub_02031C84 @@ -46064,7 +46064,7 @@ sub_02030A90: ; 0x02030A90 sub_02030AAC: ; 0x02030AAC stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents strb r4, [r0, #0xf8] ldmia sp!, {r4, pc} arm_func_end sub_02030AAC @@ -46073,7 +46073,7 @@ sub_02030AAC: ; 0x02030AAC sub_02030AC0: ; 0x02030AC0 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents str r4, [r0, #0x1b4] ldmia sp!, {r4, pc} arm_func_end sub_02030AC0 @@ -46082,13 +46082,13 @@ sub_02030AC0: ; 0x02030AC0 sub_02030AD4: ; 0x02030AD4 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents str r4, [r0, #0x1b8] ldmia sp!, {r4, pc} arm_func_end sub_02030AD4 - arm_func_start sub_02030AE8 -sub_02030AE8: ; 0x02030AE8 + arm_func_start UpdateAdvancedTextBox +UpdateAdvancedTextBox: ; 0x02030AE8 stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #0x44 mov r7, r0 @@ -46248,7 +46248,7 @@ _02030D04: bne _02030D38 add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _02030D38: mov r1, #1 mov r0, #0 @@ -46273,7 +46273,7 @@ _02030D74: beq _02030D94 add r0, r4, #4 mov r1, #1 - bl sub_02032960 + bl PlayMenuOptionSound _02030D94: mov r0, #1 strb r0, [r4, #0x1c0] @@ -46348,7 +46348,7 @@ _02030E88: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 _02030E90: .word 0x00000408 - arm_func_end sub_02030AE8 + arm_func_end UpdateAdvancedTextBox arm_func_start sub_02030E94 sub_02030E94: ; 0x02030E94 @@ -46383,7 +46383,7 @@ _02030ED8: sub_02030EF0: ; 0x02030EF0 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, #1 mov r2, #0 @@ -46401,15 +46401,15 @@ sub_02030EF0: ; 0x02030EF0 sub_02030F28: ; 0x02030F28 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r4 add r0, r0, #4 - bl sub_02032960 + bl PlayMenuOptionSound ldmia sp!, {r4, pc} arm_func_end sub_02030F28 - arm_func_start sub_02030F44 -sub_02030F44: ; 0x02030F44 + arm_func_start CreateTeamSelectionMenu +CreateTeamSelectionMenu: ; 0x02030F44 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x28 sub sp, sp, #0x400 @@ -46428,7 +46428,7 @@ sub_02030F44: ; 0x02030F44 stmeqia r4, {r0, r1, r2, r3} ldmneia r6, {r0, r1, r2, r3} stmneia r4, {r0, r1, r2, r3} - ldrne r0, _02031118 ; =sub_0203123C + ldrne r0, _02031118 ; =UpdateTeamSelectionMenu orr sl, sl, #0x8000 strne r0, [sp, #0x18] ldrb r0, [sp, #0x1e] @@ -46489,7 +46489,7 @@ _02031040: ldrneb r0, [sp, #0x1f] subne r0, r1, r0 strneb r0, [sp, #0x1d] - ldr r0, _02031118 ; =sub_0203123C + ldr r0, _02031118 ; =UpdateTeamSelectionMenu cmp sb, #0 str r0, [r5] str sl, [r5, #0xfc] @@ -46517,7 +46517,7 @@ _0203109C: add r0, sp, #0x18 mov r1, #3 strb r2, [r5, #0x1b0] - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #8 mov r6, r0 bl sub_02028284 @@ -46536,13 +46536,13 @@ _0203109C: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _02031114: .word _0209AFB4 -_02031118: .word sub_0203123C - arm_func_end sub_02030F44 +_02031118: .word UpdateTeamSelectionMenu + arm_func_end CreateTeamSelectionMenu arm_func_start sub_0203111C sub_0203111C: ; 0x0203111C stmdb sp!, {r4, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, #1 str r0, [r4, #0x19c] @@ -46562,7 +46562,7 @@ sub_0203111C: ; 0x0203111C arm_func_start sub_0203115C sub_0203115C: ; 0x0203115C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r1, [r0, #0x19c] cmp r1, #3 moveq r1, #2 @@ -46575,7 +46575,7 @@ sub_0203115C: ; 0x0203115C sub_0203117C: ; 0x0203117C stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r4 add r0, r0, #4 bl sub_0203271C @@ -46586,7 +46586,7 @@ sub_0203117C: ; 0x0203117C sub_02031198: ; 0x02031198 stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 @@ -46596,7 +46596,7 @@ sub_02031198: ; 0x02031198 arm_func_start sub_020311B4 sub_020311B4: ; 0x020311B4 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x19c] cmp r0, #6 cmpne r0, #7 @@ -46608,7 +46608,7 @@ sub_020311B4: ; 0x020311B4 arm_func_start sub_020311D4 sub_020311D4: ; 0x020311D4 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02032578 ldmia sp!, {r3, pc} @@ -46617,7 +46617,7 @@ sub_020311D4: ; 0x020311D4 arm_func_start sub_020311E8 sub_020311E8: ; 0x020311E8 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1a0] cmp r1, #0 beq _02031218 @@ -46637,15 +46637,15 @@ _02031218: sub_02031220: ; 0x02031220 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r4 add r0, r0, #4 bl sub_02032684 ldmia sp!, {r4, pc} arm_func_end sub_02031220 - arm_func_start sub_0203123C -sub_0203123C: ; 0x0203123C + arm_func_start UpdateTeamSelectionMenu +UpdateTeamSelectionMenu: ; 0x0203123C stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x30 mov r7, r0 @@ -46789,7 +46789,7 @@ _02031400: bne _02031450 add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _02031450: mov r1, #1 mov r0, #0 @@ -46805,14 +46805,14 @@ _02031450: _0203147C: add r0, r4, #4 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _020315C4 _0203148C: tst r1, #2 beq _020314C8 add r0, r4, #4 mov r1, #1 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #1 strb r0, [r4, #0x1a0] strb r0, [r4, #0x1a1] @@ -46831,7 +46831,7 @@ _020314C8: beq _02031518 add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound mov r2, #1 mov r0, #0 strb r2, [r4, #0x1a0] @@ -46852,7 +46852,7 @@ _02031518: beq _02031568 add r0, r4, #4 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound mov r2, #1 mov r0, #0 strb r2, [r4, #0x1a0] @@ -46872,7 +46872,7 @@ _02031568: add r0, r4, #4 beq _02031590 mov r1, #5 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [r4, #0x18c] blx r0 b _020315C4 @@ -47004,7 +47004,7 @@ _02031750: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02031758: .word 0x00000408 - arm_func_end sub_0203123C + arm_func_end UpdateTeamSelectionMenu arm_func_start sub_0203175C sub_0203175C: ; 0x0203175C @@ -47095,7 +47095,7 @@ _02031868: sub_02031888: ; 0x02031888 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents str r4, [r0, #0x18c] ldmia sp!, {r4, pc} arm_func_end sub_02031888 @@ -47104,7 +47104,7 @@ sub_02031888: ; 0x02031888 sub_0203189C: ; 0x0203189C stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents str r4, [r0, #0x190] ldmia sp!, {r4, pc} arm_func_end sub_0203189C @@ -47112,7 +47112,7 @@ sub_0203189C: ; 0x0203189C arm_func_start sub_020318B0 sub_020318B0: ; 0x020318B0 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x19c] cmp r0, #3 moveq r0, #1 @@ -47125,7 +47125,7 @@ sub_020318B0: ; 0x020318B0 sub_020318D0: ; 0x020318D0 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, #1 mov r2, #0 @@ -47239,7 +47239,7 @@ sub_02031A3C: ; 0x02031A3C moveq r0, #0 ldmeqia sp!, {r3, pc} mov r0, r1 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #1 ldmia sp!, {r3, pc} arm_func_end sub_02031A3C @@ -47527,7 +47527,7 @@ _02031E0C: beq _02031E2C mov r0, r8 mov r1, #4 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #1 b _02031E78 _02031E2C: @@ -47536,7 +47536,7 @@ _02031E2C: beq _02031E44 mov r0, r8 mov r1, #3 - bl sub_02032960 + bl PlayMenuOptionSound _02031E44: ldr r0, [r8, #0xd8] cmp r0, #0 @@ -47671,7 +47671,7 @@ _02031FFC: beq _0203201C mov r0, r8 mov r1, #4 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #1 b _02032068 _0203201C: @@ -47680,7 +47680,7 @@ _0203201C: beq _02032034 mov r0, r8 mov r1, #3 - bl sub_02032960 + bl PlayMenuOptionSound _02032034: ldr r0, [r8, #0xd8] cmp r0, #0 @@ -48453,18 +48453,18 @@ _02032958: bx lr arm_func_end sub_0203293C - arm_func_start sub_02032960 -sub_02032960: ; 0x02032960 + arm_func_start PlayMenuOptionSound +PlayMenuOptionSound: ; 0x02032960 stmdb sp!, {r3, lr} ldr r0, [r0, #0x10] tst r0, #0x10 moveq r0, #0 ldmeqia sp!, {r3, pc} mov r0, r1 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end sub_02032960 + arm_func_end PlayMenuOptionSound arm_func_start sub_02032984 sub_02032984: ; 0x02032984 @@ -49287,7 +49287,7 @@ sub_020333D8: ; 0x020333D8 moveq r0, #0 ldmeqia sp!, {r3, pc} mov r0, r1 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #1 ldmia sp!, {r3, pc} arm_func_end sub_020333D8 @@ -49637,7 +49637,7 @@ _0203385C: bl sub_02032864 mov r0, sb mov r1, #4 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [r8] mov r4, #1 orr r0, r0, #0x400000 @@ -49660,7 +49660,7 @@ _020338D4: bl sub_0203282C mov r0, sb mov r1, #4 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [r8] mov r4, #1 orr r0, r0, #0x800000 @@ -49680,7 +49680,7 @@ _0203392C: bl sub_0203280C mov r0, sb mov r1, #4 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [r8] mov r4, #1 orr r0, r0, #0x100000 @@ -49700,7 +49700,7 @@ _02033978: bl sub_020327E4 mov r0, sb mov r1, #4 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [r8] mov r4, #1 orr r0, r0, #0x200000 @@ -49740,14 +49740,14 @@ _020339EC: bl sub_020327E4 mov r0, sb mov r1, #4 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [r8] orr r0, r0, #0x4000 str r0, [r8] b _02033A60 _02033A58: mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _02033A60: mov r4, #1 _02033A64: @@ -49774,14 +49774,14 @@ _02033A64: bl sub_0203280C mov r0, sb mov r1, #4 - bl sub_02032960 + bl PlayMenuOptionSound ldr r0, [r8] orr r0, r0, #0x8000 str r0, [r8] b _02033ADC _02033AD4: mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _02033ADC: mov r4, #1 _02033AE0: @@ -49830,7 +49830,7 @@ _02033B2C: orr r2, r1, #0x10000 mov r1, #2 str r2, [r8] - bl sub_02032960 + bl PlayMenuOptionSound _02033B94: mov r4, #1 _02033B98: @@ -51395,7 +51395,7 @@ sub_02035098: ; 0x02035098 mvnne r1, #1 cmpne r0, r1 beq _020350C4 - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _020350D0 ; =_020AFDBC str r0, [r1, #0x10] _020350C4: @@ -51429,7 +51429,7 @@ sub_020350D4: ; 0x020350D4 ldr r1, [r1, #8] strb r0, [r1, #2] mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _02035150 ; =_020AFDBC mvn r2, #1 ldr r3, [r1, #8] @@ -51453,12 +51453,12 @@ sub_02035154: ; 0x02035154 mvn r1, #1 cmp r0, r1 beq _0203517C - bl FreeNormalMenu + bl FreeSimpleMenu _0203517C: ldr r0, _020351D8 ; =_020AFDBC ldr r0, [r0, #8] ldrsb r0, [r0, #1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _020351D8 ; =_020AFDBC ldr r0, [r0, #8] ldrsb r0, [r0, #2] @@ -51514,7 +51514,7 @@ _02035234: ldrh r1, [r3, #0x14] ldrh r2, [r3, #0x16] add r3, r3, #0x18 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02035598 ; =_020AFDBC mov r1, #1 ldr r0, [r0, #8] @@ -51525,7 +51525,7 @@ _0203525C: ldrh r1, [r3, #0x14] add r2, r3, #0x68 add r3, r3, #0x18 - bl ShowStringInDBox + bl ShowStringInDialogueBox ldr r0, _02035598 ; =_020AFDBC mov r1, #1 ldr r0, [r0, #8] @@ -51560,7 +51560,7 @@ _020352C8: b _020352EC _020352E0: ldrsb r0, [r2, #1] - bl IsDBoxActive + bl IsDialogueBoxActive mov r4, r0 _020352EC: ldr r0, _02035598 ; =_020AFDBC @@ -51595,7 +51595,7 @@ _02035350: ldrsb r0, [r0] cmp r0, r1 beq _0203536C - bl FreeNormalMenu + bl FreeSimpleMenu _0203536C: ldr r0, _02035598 ; =_020AFDBC ldr r2, [r0, #0xc] @@ -51607,7 +51607,7 @@ _0203536C: bne _020353A0 ldr r3, [r2, #0x470] add r2, sp, #4 - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02035598 ; =_020AFDBC b _020353B0 _020353A0: @@ -51621,7 +51621,7 @@ _020353B0: ldr r0, _02035598 ; =_020AFDBC ldr r0, [r0, #8] ldrsb r0, [r0, #1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02035598 ; =_020AFDBC ldr r1, [r0, #0xc] ldr r1, [r1, #0x47c] @@ -51645,7 +51645,7 @@ _02035408: ldrsb r0, [r0] cmp r0, r1 beq _02035468 - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _02035598 ; =_020AFDBC mov r4, #1 str r0, [r1, #0x10] @@ -51653,13 +51653,13 @@ _02035408: strb r4, [r0, #9] ldr r0, [r1, #8] ldrsb r0, [r0] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _02035468 ldr r0, _02035598 ; =_020AFDBC ldr r0, [r0, #8] ldrsb r0, [r0] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _02035598 ; =_020AFDBC mvn r1, #1 ldr r0, [r0, #8] @@ -51902,7 +51902,7 @@ _02035790: ldrsb r0, [r0, #1] cmp r0, r1 beq _020357AC - bl FreeDBox + bl FreeDialogueBox _020357AC: ldr r0, _020357EC ; =_020AFDD0 mvn r1, #1 @@ -51948,13 +51948,13 @@ _0203582C: mvn r1, #1 cmp r0, r1 beq _0203586C - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02035CC0 ldr r0, _02035CCC ; =_020AFDD0 ldr r0, [r0, #4] ldrsb r0, [r0, #1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02035CCC ; =_020AFDD0 mvn r1, #1 ldr r0, [r0, #4] @@ -51999,7 +51999,7 @@ _020358A8: ldr r3, _02035CD4 ; =_0209B134 orr r1, r1, #0x1800 add r2, r2, #0xc - bl sub_0202D1F0 + bl CreateOptionsMenu ldr r1, _02035CCC ; =_020AFDD0 ldr r1, [r1, #4] strb r0, [r1] @@ -52072,7 +52072,7 @@ _020359FC: cmp r0, r1 bne _02035A34 mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r3, _02035CCC ; =_020AFDD0 ldr r1, _02035CD8 ; =0x00000408 ldr r4, [r3, #4] @@ -52081,7 +52081,7 @@ _020359FC: ldr r0, [r3, #4] mov r3, #0 ldrsb r0, [r0, #1] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _02035A34: ldr r1, _02035CCC ; =_020AFDD0 mvn r0, #1 @@ -52153,13 +52153,13 @@ _02035B24: ldrsb r0, [r0, #1] cmp r0, r1 beq _02035B68 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02035CC0 ldr r0, _02035CCC ; =_020AFDD0 ldr r0, [r0, #4] ldrsb r0, [r0, #1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02035CCC ; =_020AFDD0 mvn r1, #1 ldr r0, [r0, #4] @@ -52345,7 +52345,7 @@ _02035DD8: ldrsb r0, [r0, #1] cmp r0, r1 beq _02035DF4 - bl FreeDBox + bl FreeDialogueBox _02035DF4: ldr r0, _02035E34 ; =_020AFDD8 mvn r1, #1 @@ -52390,13 +52390,13 @@ _02035E70: mvn r1, #1 cmp r0, r1 beq _02035EB0 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02036300 ldr r0, _0203630C ; =_020AFDD8 ldr r0, [r0, #4] ldrsb r0, [r0, #1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0203630C ; =_020AFDD8 mvn r1, #1 ldr r0, [r0, #4] @@ -52441,7 +52441,7 @@ _02035EEC: ldr r3, _02036314 ; =_0209B1F0 orr r1, r1, #0x1800 add r2, r2, #0xc - bl sub_0202D1F0 + bl CreateOptionsMenu ldr r1, _0203630C ; =_020AFDD8 ldr r1, [r1, #4] strb r0, [r1] @@ -52533,7 +52533,7 @@ _0203608C: cmp r0, r1 bne _020360C4 mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r3, _0203630C ; =_020AFDD8 ldr r1, _02036318 ; =0x00000408 ldr r4, [r3, #4] @@ -52542,7 +52542,7 @@ _0203608C: ldr r0, [r3, #4] mov r3, #0 ldrsb r0, [r0, #1] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _020360C4: ldr r1, _0203630C ; =_020AFDD8 mvn r0, #1 @@ -52614,13 +52614,13 @@ _020361B4: ldrsb r0, [r0, #1] cmp r0, r1 beq _020361F8 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02036300 ldr r0, _0203630C ; =_020AFDD8 ldr r0, [r0, #4] ldrsb r0, [r0, #1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0203630C ; =_020AFDD8 mvn r1, #1 ldr r0, [r0, #4] @@ -52775,7 +52775,7 @@ _0203638C: orr r1, r1, #0x33 orr r1, r1, #0x9800 add r2, r2, #0xc - bl sub_0202DC50 + bl CreateDebugMenu ldr r1, _0203642C ; =_020AFDE0 mov r3, #0 ldr r2, [r1, #4] @@ -52953,7 +52953,7 @@ _020365D4: orr r1, r1, #0x33 orr r1, r1, #0x9800 add r2, r2, #0xc - bl sub_0202DC50 + bl CreateDebugMenu ldr r1, _02036674 ; =_020AFDE8 mov r3, #0 ldr r2, [r1, #4] @@ -53457,7 +53457,7 @@ _02036BA0: ; jump table _02036BB0: ldr r0, _02036CB4 ; =_0209B2FC ldr r1, _02036CB8 ; =sub_02037F58 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02036CB0 ; =_020AFDF0 ldr r2, [r1] strb r0, [r2] @@ -53476,7 +53476,7 @@ _02036BB0: _02036BF8: ldr r0, _02036CBC ; =_0209B31C ldr r1, _02036CC0 ; =sub_02037CA8 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02036CB0 ; =_020AFDF0 ldr r1, [r1] strb r0, [r1, #2] @@ -53484,7 +53484,7 @@ _02036BF8: _02036C14: ldr r0, _02036CBC ; =_0209B31C ldr r1, _02036CC4 ; =sub_02037C78 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02036CB0 ; =_020AFDF0 ldr r1, [r1] strb r0, [r1, #2] @@ -53492,7 +53492,7 @@ _02036C14: _02036C30: ldr r0, _02036CC8 ; =_0209B2EC ldr r1, _02036CB8 ; =sub_02037F58 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02036CB0 ; =_020AFDF0 ldr r2, [r1] strb r0, [r2] @@ -53507,14 +53507,14 @@ _02036C30: beq _02036C84 ldr r0, _02036CBC ; =_0209B31C ldr r1, _02036CC4 ; =sub_02037C78 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02036CB0 ; =_020AFDF0 ldr r1, [r1] strb r0, [r1, #2] _02036C84: ldr r0, _02036CCC ; =_0209B2DC ldr r1, _02036CD0 ; =sub_02037CD8 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02036CB0 ; =_020AFDF0 mov r2, #0 ldr r3, [r1] @@ -53658,7 +53658,7 @@ _02036E30: beq _02036EE0 mov r0, #3 strb r1, [r2, #0x1c] - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02037444 ; =_020AFDF0 mov r1, #8 ldr r0, [r0] @@ -53779,7 +53779,7 @@ _02037044: beq _02037068 mov r0, #3 strb r2, [r1, #0x18] - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02037444 ; =_020AFDF0 mov r1, #8 ldr r0, [r0] @@ -53920,11 +53920,11 @@ _02037240: sub r1, r0, #1 mov r0, #3 strb r1, [r2, #0x1c] - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02037374 _02037268: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02037374 _02037274: ldr r0, _02037444 ; =_020AFDF0 @@ -53941,11 +53941,11 @@ _02037274: add r1, r1, #1 mov r0, #3 strb r1, [r4, #0x1c] - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02037374 _020372B4: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02037374 _020372C0: ldr r0, _02037444 ; =_020AFDF0 @@ -53961,11 +53961,11 @@ _020372C0: sub r1, r0, r1 mov r0, #3 strb r1, [r2, #0x1c] - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02037374 _020372FC: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02037374 _02037308: ldr r0, _02037444 ; =_020AFDF0 @@ -53991,11 +53991,11 @@ _02037308: ldrb r1, [r2, #0x1c] add r1, r1, r5 strb r1, [r2, #0x1c] - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02037374 _0203736C: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper _02037374: ldrh r0, [sp, #0x10] cmp r0, #8 @@ -54022,7 +54022,7 @@ _020373B0: b _0203743C _020373C4: mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02037444 ; =_020AFDF0 mov r1, #5 ldr r0, [r0] @@ -54044,7 +54044,7 @@ _020373E0: ldrb r1, [r2, #0x16] and r1, r1, #1 strb r1, [r2, #0x16] - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02037444 ; =_020AFDF0 ldr r0, [r0] ldrsb r0, [r0, #1] @@ -54242,7 +54242,7 @@ _020376A4: blt _02037698 ldr r0, _020376E4 ; =_0209B30C ldr r1, _020376E8 ; =sub_02037F58 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _020376E0 ; =_020AFDF0 mov r2, #0 ldr r3, [r1] @@ -54580,7 +54580,7 @@ _02037B24: bne _02037B64 ldr r0, _02037C30 ; =_0209B2FC ldr r1, _02037C34 ; =sub_02037F58 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02037C28 ; =_020AFDF0 ldr r1, [r1] strb r0, [r1] @@ -54596,7 +54596,7 @@ _02037B64: ldr r2, [r2] mov r3, #0 strb r3, [r2, #0x15] - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02037C28 ; =_020AFDF0 ldr r2, [r1] strb r0, [r2] @@ -54609,7 +54609,7 @@ _02037B64: beq _02037BD0 ldr r0, _02037C3C ; =_0209B31C ldr r1, _02037C40 ; =sub_02037C78 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02037C28 ; =_020AFDF0 ldr r1, [r1] strb r0, [r1, #2] @@ -54627,7 +54627,7 @@ _02037BD0: _02037BF8: ldr r0, _02037C44 ; =_0209B2DC ldr r1, _02037C48 ; =sub_02037CD8 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02037C28 ; =_020AFDF0 mov r2, #0 ldr r3, [r1] @@ -55293,11 +55293,11 @@ _02038500: cmp ip, #0 bne _02038514 mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _020388F8 _02038514: mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02038900 ; =_020AFDF0 mov r2, #0 ldr r1, [r0] @@ -55312,11 +55312,11 @@ _02038544: cmp ip, #1 bne _02038558 mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _020388F8 _02038558: mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02038900 ; =_020AFDF0 mov r2, #1 ldr r1, [r0] @@ -55334,7 +55334,7 @@ _02038588: movne r2, #0 mov r0, #4 strb r2, [r1, #0x15] - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #0 bl sub_020383FC ldr r0, _02038900 ; =_020AFDF0 @@ -55369,7 +55369,7 @@ _020385F0: cmp r4, #0x12 bge _02038680 mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r1, #0x20 ldr r0, _02038900 ; =_020AFDF0 b _0203864C @@ -55418,7 +55418,7 @@ _02038680: cmp r1, r0 beq _020386E8 mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #3 ldmia sp!, {r3, r4, r5, pc} _020386E8: @@ -55438,7 +55438,7 @@ _020386FC: beq _0203872C _0203871C: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #2 ldmia sp!, {r3, r4, r5, pc} _0203872C: @@ -55453,11 +55453,11 @@ _0203872C: cmp r0, #0x3c ble _02038760 mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _020388F8 _02038760: mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper cmp r4, #0 beq _02038794 bl sub_02038A54 @@ -55489,7 +55489,7 @@ _020387B4: cmp r0, #0xff bne _02038810 mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _020388F8 _020387E4: ldr r0, [r1, #0xc] @@ -55502,7 +55502,7 @@ _020387E4: bls _02038810 _02038804: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _020388F8 _02038810: ldr r0, _02038900 ; =_020AFDF0 @@ -55563,7 +55563,7 @@ _020388A4: movge r0, #5 strgeb r0, [r2, #0x18] mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl sub_02038ADC ldr r0, _02038900 ; =_020AFDF0 ldr r0, [r0] @@ -55589,7 +55589,7 @@ sub_02038904: ; 0x02038904 cmp r2, #0 bne _0203893C mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #1 ldmia sp!, {r3, pc} _0203893C: @@ -55601,7 +55601,7 @@ _0203893C: ldr r2, [r0, #0xf8] mov r0, #1 strb r3, [r2, r1] - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02038A50 ; =_020AFDF0 ldr r0, [r0] ldrsb r0, [r0] @@ -55661,7 +55661,7 @@ _02038A10: strb r2, [r1, r0] _02038A2C: mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02038A50 ; =_020AFDF0 ldr r0, [r0] ldrsb r0, [r0] @@ -56187,7 +56187,7 @@ _0203913C: mov r2, #1 ldr r1, _02039210 ; =sub_0203939C str r2, [sp, #4] - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02039208 ; =_020AFE40 ldr r3, _02039214 ; =_0209B4E4 ldr r1, [r1] @@ -56196,7 +56196,7 @@ _0203913C: mov r0, #0 mov r1, #0x31 str r0, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02039208 ; =_020AFE40 mov r2, #0 ldr r3, [r1] @@ -56206,7 +56206,7 @@ _0203913C: b _020391FC _020391C0: mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r3, _02039208 ; =_020AFE40 mov r1, #0x218 ldr r4, [r3] @@ -56215,7 +56215,7 @@ _020391C0: ldr r0, [r3] mov r3, #0 ldrsb r0, [r0, #2] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02039208 ; =_020AFE40 mov r1, #1 ldr r0, [r0] @@ -56263,7 +56263,7 @@ _02039270: ldrsb r0, [r0, #1] cmp r0, r1 beq _020392DC - bl FreeNormalMenu + bl FreeSimpleMenu b _020392DC _02039290: ldrsb r0, [r0] @@ -56278,7 +56278,7 @@ _020392A4: ldrsb r0, [r0, #2] cmp r0, r1 beq _020392DC - bl FreeDBox + bl FreeDialogueBox b _020392DC _020392C4: bl MemFree @@ -56322,7 +56322,7 @@ sub_0203931C: ; 0x0203931C cmp r0, #1 bne _0203934C ldrsb r0, [r1, #2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02039390 mov r0, #1 @@ -56332,17 +56332,17 @@ _0203934C: cmp r0, #0 bne _0203937C ldrsb r0, [r1, #1] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _02039390 ldr r0, _02039398 ; =_020AFE40 ldr r0, [r0] ldrsb r0, [r0, #1] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldmia sp!, {r3, pc} _0203937C: ldrsb r0, [r1, #2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 moveq r0, #1 ldmeqia sp!, {r3, pc} @@ -56439,7 +56439,7 @@ sub_02039460: ; 0x02039460 ldr r3, _02039520 ; =sub_02039C14 mov r0, ip str r2, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 b _02039500 _020394C8: ldr r0, _02039524 ; =_0209C5D0 @@ -56455,7 +56455,7 @@ _020394C8: ldr r3, _02039520 ; =sub_02039C14 mov r0, ip str r2, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 _02039500: strb r0, [r4, #0x14] mov r0, r4 @@ -56488,7 +56488,7 @@ _0203954C: ; jump table b _0203955C ; case 3 _0203955C: mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldrsb r0, [r5, #0x14] bl sub_0202836C ldrsb r0, [r5, #0x14] @@ -56505,7 +56505,7 @@ _02039584: ldrsb r0, [r5, #0x14] bl sub_020308A0 mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper mvn r0, #0 ldmia sp!, {r3, r4, r5, pc} _020395AC: @@ -56660,7 +56660,7 @@ _02039788: beq _020397A0 mov r0, #3 strb r5, [r4, #0x28] - bl sub_02017CCC + bl PlaySeVolumeWrapper _020397A0: ldrb r1, [r4, #0x28] mov r0, #0xc @@ -56695,7 +56695,7 @@ _0203980C: cmp r3, r0 bne _0203982C mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #0 b _020398B0 _0203982C: @@ -56704,7 +56704,7 @@ _0203982C: mov r0, #3 ldr r1, [r1, r2, lsl #2] add r5, r3, r1 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, [r4, #0xc] cmp r5, r0 strgt r0, [r4] @@ -56717,7 +56717,7 @@ _0203985C: cmp r3, r0 bne _0203987C mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #0 b _020398B0 _0203987C: @@ -56726,7 +56726,7 @@ _0203987C: mov r0, #3 ldr r1, [r1, r2, lsl #2] sub r5, r3, r1 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, [r4, #8] cmp r5, r0 strlt r0, [r4] @@ -56772,7 +56772,7 @@ _020398EC: beq _0203993C mov r0, #3 strb r2, [r4, #0x28] - bl sub_02017CCC + bl PlaySeVolumeWrapper _0203993C: mov r0, #0 _02039940: @@ -57532,7 +57532,7 @@ _0203A390: mov r4, #6 add r2, r2, #0x400 str r4, [sp, #4] - bl sub_02030F44 + bl CreateTeamSelectionMenu ldr r1, _0203A4D4 ; =_020AFE5C ldr r1, [r1, #0x10] strb r0, [r1, #0x468] @@ -57549,7 +57549,7 @@ _0203A3E0: mov r4, #6 add r2, r2, #0x400 str r4, [sp, #4] - bl sub_02030F44 + bl CreateTeamSelectionMenu ldr r1, _0203A4D4 ; =_020AFE5C ldr r1, [r1, #0x10] strb r0, [r1, #0x468] @@ -57576,7 +57576,7 @@ _0203A420: mov r4, #8 add r2, r2, #0x400 str r4, [sp, #4] - bl sub_02030F44 + bl CreateTeamSelectionMenu ldr r2, _0203A4D4 ; =_020AFE5C ldr r1, _0203A510 ; =_0203B884 ldr r3, [r2, #0x10] @@ -57587,7 +57587,7 @@ _0203A420: bl sub_02031888 ldr r0, _0203A514 ; =_0209C638 ldr r1, _0203A518 ; =sub_0203C784 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0203A4D4 ; =_020AFE5C mov r2, #1 ldr r3, [r1, #0x10] @@ -57791,7 +57791,7 @@ _0203A6F0: bne _0203A748 ldr r0, _0203A754 ; =_0209C638 ldr r1, _0203A758 ; =sub_0203C784 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0203A750 ; =_020AFE5C ldr r1, [r1, #0x10] strb r0, [r1, #0x469] @@ -59147,20 +59147,20 @@ sub_0203B91C: ; 0x0203B91C mov r1, #0x13 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0203BA18 ; =_020AFE5C ldr r1, [r1, #0x10] strb r0, [r1, #0x506] ldmia sp!, {r3, pc} _0203B968: - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0203BA18 ; =_020AFE5C ldr r0, [r0, #0x10] add r0, r0, #0x500 ldrsb r0, [r0, #6] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #5 addls pc, pc, r0, lsl #2 b _0203B9E8 @@ -59195,7 +59195,7 @@ _0203B9E8: ldr r0, [r0, #0x10] add r0, r0, #0x500 ldrsb r0, [r0, #6] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0203BA18 ; =_020AFE5C mvn r1, #1 ldr r0, [r0, #0x10] @@ -59459,27 +59459,27 @@ sub_0203BCEC: ; 0x0203BCEC mov r1, #0x13 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0203BE0C ; =_020AFE5C ldr r1, [r1, #0x10] strb r0, [r1, #0x507] b _0203BE04 _0203BD3C: - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _0203BE04 ldr r0, _0203BE0C ; =_020AFE5C ldr r0, [r0, #0x10] add r0, r0, #0x500 ldrsb r0, [r0, #7] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _0203BE0C ; =_020AFE5C mov r0, r0, lsl #0x10 ldr r1, [r1, #0x10] mov r4, r0, asr #0x10 add r0, r1, #0x500 ldrsb r0, [r0, #7] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0203BE0C ; =_020AFE5C mvn r2, #1 ldr r1, [r0, #0x10] @@ -59565,14 +59565,14 @@ sub_0203BE18: ; 0x0203BE18 str r2, [r0, #0x508] b _0203BEC4 _0203BE94: - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _0203BEC4 ldr r0, _0203BECC ; =_020AFE5C ldr r0, [r0, #0x10] add r0, r0, #0x500 ldrsb r0, [r0, #7] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0203BECC ; =_020AFE5C mvn r1, #1 ldr r0, [r0, #0x10] @@ -59690,7 +59690,7 @@ _0203C02C: .word _022AADF8 sub_0203C030: ; 0x0203C030 stmdb sp!, {r3, lr} ldr r0, _0203C078 ; =_0209C648 - bl CreateDBox + bl CreateDialogueBox ldr r3, _0203C07C ; =_020AFE5C ldr r1, _0203C080 ; =0x00000418 ldr ip, [r3, #0x10] @@ -59700,7 +59700,7 @@ sub_0203C030: ; 0x0203C030 mov r3, #0 add r0, r0, #0x500 ldrsb r0, [r0, #5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0203C07C ; =_020AFE5C mov r1, #5 ldr r0, [r0, #0x10] @@ -59720,7 +59720,7 @@ sub_0203C088: ; 0x0203C088 ldr r0, [r0, #0x10] add r0, r0, #0x500 ldrsb r0, [r0, #5] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0203C0D0 ; =_020AFE5C @@ -59747,7 +59747,7 @@ sub_0203C0D4: ; 0x0203C0D4 ldrsb r0, [r0, #5] cmp r0, r1 ldmeqia sp!, {r3, pc} - bl FreeDBox + bl FreeDialogueBox ldr r0, _0203C120 ; =_020AFE5C mvn r1, #1 ldr r0, [r0, #0x10] @@ -59800,7 +59800,7 @@ sub_0203C124: ; 0x0203C124 add r2, r2, #0x1d8 ldr r3, _0203C1F4 ; =sub_0203BCCC add r2, r2, #0x400 - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _0203C1E8 ; =_020AFE5C mov r2, #8 ldr r3, [r1, #0x10] @@ -59845,7 +59845,7 @@ _0203C22C: ldmia sp!, {r3, pc} _0203C244: mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _0203C324 ; =_020AFE5C ldr r0, [r0, #0x10] add r0, r0, #0x500 @@ -59891,7 +59891,7 @@ _0203C2BC: ldmia sp!, {r3, pc} _0203C2F4: mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _0203C324 ; =_020AFE5C ldr r0, [r0, #0x10] add r0, r0, #0x500 @@ -60752,7 +60752,7 @@ _0203CD2C: bne _0203CD5C ldr r0, _0203CE08 ; =_0209C7E4 ldr r1, _0203CE0C ; =sub_0203CE1C - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0203CE04 ; =_020AFE70 ldr r1, [r1] strb r0, [r1, #1] @@ -60765,7 +60765,7 @@ _0203CD5C: bne _0203CD8C ldr r0, _0203CE10 ; =_0209C7D4 ldr r1, _0203CE14 ; =sub_0203CFCC - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0203CE04 ; =_020AFE70 ldr r1, [r1] strb r0, [r1, #2] @@ -61867,7 +61867,7 @@ _0203DD68: ldr r3, _0203E4F4 ; =_0209C86C mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0203E4B0 ; =_020AFE74 mov r2, #0x11 ldr r3, [r1] @@ -61878,20 +61878,20 @@ _0203DD68: _0203DDAC: add r0, r4, #0x100 ldrsb r0, [r0, #0xa0] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _0203EF9C ldr r0, _0203E4B0 ; =_020AFE74 ldr r0, [r0] add r0, r0, #0x100 ldrsb r0, [r0, #0xa0] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _0203E4B0 ; =_020AFE74 mov r4, r0 ldr r0, [r1] add r0, r0, #0x100 ldrsb r0, [r0, #0xa0] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0203E4B0 ; =_020AFE74 mvn r1, #1 ldr r0, [r0] @@ -63199,7 +63199,7 @@ _0203F08C: ldrsb r0, [r0, #5] cmp r0, r1 beq _0203F0B8 - bl FreeDBox + bl FreeDialogueBox ldr r0, _0203F0EC ; =_020AFE74 mvn r1, #1 ldr r0, [r0] @@ -63362,7 +63362,7 @@ _0203F2C0: ldr r3, _0203F35C ; =sub_0203F0F0 add r2, sp, #8 str r4, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _0203F360 ; =sub_0203F928 mov r4, r0 bl sub_02030AD4 @@ -63376,7 +63376,7 @@ _0203F2FC: ldr r3, _0203F35C ; =sub_0203F0F0 add r2, sp, #8 str r4, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 mov r4, r0 _0203F324: ldr r0, _0203F340 ; =_020AFE78 @@ -63605,7 +63605,7 @@ _0203F60C: tst r0, #0x40 beq _0203F748 mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _0203F748 _0203F660: ldrsb r0, [r2] @@ -63615,7 +63615,7 @@ _0203F660: tst r4, #0x40000 bne _0203F680 mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper _0203F680: ldr r0, _0203F8D4 ; =_020AFE78 ldr r1, [r0] @@ -63651,7 +63651,7 @@ _0203F6A8: tst r0, #0x80 beq _0203F748 mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _0203F748 _0203F708: ldrsb r0, [r3] @@ -63661,7 +63661,7 @@ _0203F708: tst r4, #0x80000 bne _0203F728 mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper _0203F728: ldr r0, _0203F8D4 ; =_020AFE78 ldr r2, [r0] @@ -63756,7 +63756,7 @@ _0203F83C: ldr r1, _0203F8E8 ; =0x00001013 stmia sp, {r2, r4} str r2, [sp, #8] - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0203F8D4 ; =_020AFE78 mov r2, #4 ldr r3, [r1] @@ -64285,7 +64285,7 @@ _0203FF44: ldr r1, _02040164 ; =0x00401803 ldr r3, _02040168 ; =sub_020401A8 add r2, r2, #4 - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02040154 ; =_020AFE7C ldr r1, [r1, #8] strb r0, [r1] @@ -64298,7 +64298,7 @@ _0203FF7C: ldr r1, _02040170 ; =0x00400800 ldr r3, _02040168 ; =sub_020401A8 add r2, r2, #4 - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02040154 ; =_020AFE7C ldr r1, [r1, #8] strb r0, [r1] @@ -64317,7 +64317,7 @@ _0203FFAC: ldr r1, _02040164 ; =0x00401803 ldr r3, _02040168 ; =sub_020401A8 add r2, r2, #4 - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02040154 ; =_020AFE7C ldr r1, [r1, #8] strb r0, [r1] @@ -64336,7 +64336,7 @@ _0203FFF4: ldr r1, _02040178 ; =0x00401A03 ldr r3, _02040168 ; =sub_020401A8 add r2, r2, #4 - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02040154 ; =_020AFE7C ldr r1, [r1, #8] strb r0, [r1] @@ -64355,7 +64355,7 @@ _0204003C: ldr r1, _02040180 ; =0x00400A00 ldr r3, _02040168 ; =sub_020401A8 add r2, r2, #4 - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02040154 ; =_020AFE7C ldr r1, [r1, #8] strb r0, [r1] @@ -64373,7 +64373,7 @@ _02040084: ldr r1, _02040184 ; =0x00409823 ldr r3, _02040168 ; =sub_020401A8 add r2, r2, #4 - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02040154 ; =_020AFE7C ldr r1, [r1, #8] strb r0, [r1] @@ -64388,7 +64388,7 @@ _020400C8: ldr r1, _02040188 ; =0x00401823 ldr r3, _02040168 ; =sub_020401A8 add r2, r2, #4 - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02040154 ; =_020AFE7C ldr r1, [r1, #8] strb r0, [r1] @@ -64948,7 +64948,7 @@ _0204087C: cmp r0, r1 bne _020408B8 mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #1 b _02040F88 _020408B8: @@ -65027,18 +65027,18 @@ _02040980: cmp r1, r0, asr #16 beq _020409D8 mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r1, _02040F94 ; =_020AFE7C mov r0, #3 strh r4, [r1, #2] b _02040F88 _020409D8: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02040A44 _020409E4: mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02040F94 ; =_020AFE7C ldr r1, [r0, #8] ldrsh r2, [r0, #2] @@ -65082,18 +65082,18 @@ _02040A44: cmp r1, r0, asr #16 beq _02040A9C mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r1, _02040F94 ; =_020AFE7C mov r0, #4 strh r4, [r1, #2] b _02040F88 _02040A9C: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02040B10 _02040AA8: mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02040F94 ; =_020AFE7C ldrsh r1, [r0, #2] cmp r1, #0 @@ -65213,7 +65213,7 @@ _02040C38: cmp r1, r0 beq _02040C90 mov r0, #4 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02040F94 ; =_020AFE7C mov r1, #0 strh r1, [r0, #2] @@ -65231,7 +65231,7 @@ _02040C90: tst r0, #2 beq _02040CAC mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #1 b _02040F88 _02040CAC: @@ -65383,7 +65383,7 @@ _02040E88: b _02040EC0 _02040EB8: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper _02040EC0: bl sub_02041178 b _02040F84 @@ -65391,7 +65391,7 @@ _02040EC8: cmp r4, #0 beq _02040EEC mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02040F94 ; =_020AFE7C ldr r0, [r0, #8] ldrsb r0, [r0] @@ -65402,14 +65402,14 @@ _02040EEC: tst r0, #0x400 mov r0, #0 beq _02040F14 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02040F94 ; =_020AFE7C ldr r0, [r0, #8] ldrsb r0, [r0] bl sub_02030EF0 b _02040F18 _02040F14: - bl sub_02017CCC + bl PlaySeVolumeWrapper _02040F18: ldr r0, _02040F94 ; =_020AFE7C mov r1, #2 @@ -65435,7 +65435,7 @@ _02040F18: b _02040F88 _02040F70: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper cmp r4, #0 beq _02040F84 bl sub_02041178 @@ -66289,7 +66289,7 @@ _02041950: ldr r1, _020419FC ; =0x00001013 mov r2, #0 str r4, [sp, #0xc] - bl sub_0202E518 + bl CreateScrollBox2 ldr r1, _020419F4 ; =_020AFE8C b _020419D4 _020419A0: @@ -66304,7 +66304,7 @@ _020419A0: ldrh r3, [r1, #0xac] ldr r1, _020419FC ; =0x00001013 mov r2, #0 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _020419F4 ; =_020AFE8C _020419D4: ldr r1, [r1] @@ -66471,7 +66471,7 @@ _02041BC0: streq r0, [r2, #0x6f0] beq _020420B0 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _020420BC ; =_020AFE90 ldr r2, _020420C0 ; =_0209C9B0 ldrsb r3, [r0] @@ -66600,7 +66600,7 @@ _02041DD4: ; jump table b _02041DE8 ; case 4 _02041DE8: mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper _02041DF0: ldr r0, _020420BC ; =_020AFE90 ldr r0, [r0, #4] @@ -66618,7 +66618,7 @@ _02041E14: b _020420B0 _02041E24: mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _020420BC ; =_020AFE90 mov r1, #3 ldr r0, [r0, #4] @@ -66631,7 +66631,7 @@ _02041E40: cmp r0, #0x18 bne _02041E60 mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02041E98 _02041E60: cmp r0, #0x1b @@ -66642,7 +66642,7 @@ _02041E60: bhi _02041E84 _02041E78: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02041E98 _02041E84: ldrb r1, [r2, r1] @@ -66718,7 +66718,7 @@ _02041F30: mov ip, ip, lsr #0x10 str ip, [sp, #4] str r2, [sp, #8] - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _020420BC ; =_020AFE90 mov r2, #6 ldr r3, [r1, #4] @@ -66969,7 +66969,7 @@ sub_02042258: ; 0x02042258 ldr r1, _020423C8 ; =0x00443C33 ldr r3, _020423CC ; =sub_02042760 add r2, r2, #8 - bl sub_0202C3A8 + bl CreateCollectionMenu ldr r2, _020423B4 ; =_020AFEA8 ldr r1, _020423D0 ; =sub_0204262C ldr r3, [r2, #4] @@ -67059,7 +67059,7 @@ sub_020423D8: ; 0x020423D8 ble _0204241C bl sub_02042AF8 mov r0, #6 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r5, #1 b _020425D8 _0204241C: @@ -67092,11 +67092,11 @@ _02042478: cmp r5, #0 beq _0204248C mov r0, #6 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _020425D8 _0204248C: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _020425D8 _02042498: tst r0, #0x400 @@ -67128,7 +67128,7 @@ _020424CC: mov r1, #0 mov r0, #6 str r1, [r2, r4, lsl #2] - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r5, #1 b _020425D8 _02042514: @@ -67141,7 +67141,7 @@ _02042514: cmp r1, r0 bge _02042550 mov r0, #6 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02042618 ; =_020AFEA8 mov r5, #1 ldr r0, [r0, #8] @@ -67149,12 +67149,12 @@ _02042514: b _020425D8 _02042550: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r5, #0 b _020425D8 _02042560: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r5, #0 b _020425D8 _02042570: @@ -67174,17 +67174,17 @@ _02042570: beq _020425B8 mov r1, #0 str r1, [r2, r4, lsl #2] - bl sub_02017CCC + bl PlaySeVolumeWrapper b _020425D8 _020425B8: - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02042618 ; =_020AFEA8 ldr r0, [r0, #8] str r5, [r0, r4, lsl #2] b _020425D8 _020425CC: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r5, #0 _020425D8: bl sub_02042B20 @@ -67875,7 +67875,7 @@ _02042E6C: ldr r3, _02042FA4 ; =_020432B4 add r2, r2, #0x400 str r4, [sp, #8] - bl sub_0202C3A8 + bl CreateCollectionMenu ldr r2, _02042F88 ; =_020AFEB4 ldr r1, _02042FA8 ; =sub_020430F4 ldr r3, [r2, #4] @@ -67918,7 +67918,7 @@ _02042F28: _02042F3C: ldr r0, _02042FB0 ; =_0209CA48 ldr r1, _02042FB4 ; =sub_02044210 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02042F88 ; =_020AFEB4 ldr r1, [r1, #4] strb r0, [r1, #0x7d5] @@ -67992,7 +67992,7 @@ _0204303C: cmp r4, #0 beq _020430A0 mov r0, #6 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _020430F0 ; =_020AFEB4 mvn r1, #1 ldr r3, [r0, #8] @@ -68017,7 +68017,7 @@ _0204307C: b _020430A8 _020430A0: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper _020430A8: bl sub_020434FC cmp r0, #0 @@ -68496,26 +68496,26 @@ sub_020435CC: ; 0x020435CC mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02043760 ; =_020AFEB4 ldr r1, [r1, #4] strb r0, [r1, #0x7d8] b _02043758 _0204361C: - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _02043758 ldr r0, _02043760 ; =_020AFEB4 ldr r0, [r0, #4] add r0, r0, #0x700 ldrsb r0, [r0, #0xd8] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _02043760 ; =_020AFEB4 mov r4, r0 ldr r0, [r1, #4] add r0, r0, #0x700 ldrsb r0, [r0, #0xd8] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _02043760 ; =_020AFEB4 mvn r2, #1 ldr r1, [r0, #4] @@ -68598,7 +68598,7 @@ _02043768: .word _0209CAB4 sub_0204376C: ; 0x0204376C stmdb sp!, {r3, lr} ldr r0, _020437B4 ; =_0209CA88 - bl CreateDBox + bl CreateDialogueBox ldr r3, _020437B8 ; =_020AFEB4 ldr r1, _020437BC ; =0x00000418 ldr ip, [r3, #4] @@ -68608,7 +68608,7 @@ sub_0204376C: ; 0x0204376C mov r3, #0 add r0, r0, #0x700 ldrsb r0, [r0, #0xd7] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _020437B8 ; =_020AFEB4 mov r1, #2 ldr r0, [r0, #4] @@ -68628,7 +68628,7 @@ sub_020437C4: ; 0x020437C4 ldr r0, [r0, #4] add r0, r0, #0x700 ldrsb r0, [r0, #0xd7] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 ldmneia sp!, {r3, pc} mov r0, #9 @@ -68668,7 +68668,7 @@ sub_02043844: ; 0x02043844 ldrsb r0, [r0, #0xd7] cmp r0, r1 ldmeqia sp!, {r3, pc} - bl FreeDBox + bl FreeDialogueBox ldr r0, _02043940 ; =_020AFEB4 mvn r2, #1 ldr r1, [r0, #4] @@ -69432,7 +69432,7 @@ sub_0204426C: ; 0x0204426C ldr r1, _020442C8 ; =sub_02044338 ldr r0, [r0] add r0, r2, r0, lsl #4 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _020442C0 ; =_020AFEC8 ldr r1, [r1] strb r0, [r1, #5] @@ -69561,7 +69561,7 @@ sub_0204440C: ; 0x0204440C ldr r2, [r2] mov r3, #1 strb r3, [r2, #4] - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02044468 ; =_020AFECC ldr r1, [r1] strb r0, [r1, #0xa] @@ -69671,7 +69671,7 @@ sub_02044568: ; 0x02044568 ldr r1, _020445C4 ; =sub_02044604 ldr r0, [r0] add r0, r2, r0, lsl #4 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _020445BC ; =_020AFED0 ldr r1, [r1] strb r0, [r1, #5] @@ -69772,7 +69772,7 @@ sub_02044688: ; 0x02044688 ldr r0, _020447EC ; =_0209CB78 ldr r1, _020447F0 ; =sub_02044964 mov r2, r4 - bl sub_0202F8DC + bl CreateTextBox2 strb r0, [r4, #0x72c] cmp r5, #3 mov r0, #0x10 @@ -69794,7 +69794,7 @@ sub_02044688: ; 0x02044688 ldr r3, _020447FC ; =sub_02044990 add r2, sp, #0xc mov r1, #0x800 - bl sub_020305E4 + bl CreateAdvancedTextBox2 strb r0, [r4, #0x72d] b _020447A8 _02044760: @@ -69814,7 +69814,7 @@ _02044760: ldr r3, _020447FC ; =sub_02044990 add r2, sp, #0xc mov r1, #0x800 - bl sub_020305E4 + bl CreateAdvancedTextBox2 strb r0, [r4, #0x72d] _020447A8: mov r0, r6 @@ -70381,7 +70381,7 @@ _02044EE8: mov r0, #0x68 smlabb r0, r1, r0, r2 ldrsh r0, [r0, #8] - bl CheckTeamMemberIdx + bl sub_02056228 cmp r0, #0 ldrsh r1, [r8, #0x12] ldrsh r0, [r8, #0x16] @@ -70846,7 +70846,7 @@ _02045558: mov r1, #8 ldrsb r0, [r3, #0x14] add r3, r3, #0x1c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02045A14 _02045584: mov r0, #2 @@ -70855,7 +70855,7 @@ _02045584: ldr r0, _02045A1C ; =_020AFED4 ldr r0, [r0] ldrsb r0, [r0, #0x14] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02045A1C ; =_020AFED4 mov r3, #2 ldr r1, [r0] @@ -70865,7 +70865,7 @@ _02045584: mov r1, #8 ldrsb r0, [r3, #0x14] add r3, r3, #0x1c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02045A14 _020455CC: ldr r1, _02045A28 ; =0x000002CE @@ -70959,7 +70959,7 @@ _02045688: ldr r0, _02045A1C ; =_020AFED4 ldr r0, [r0] ldrsb r0, [r0, #0x14] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02045A1C ; =_020AFED4 mov r4, #0x11 ldr r3, [r0] @@ -70969,7 +70969,7 @@ _02045688: add r2, r4, #0x2c0 ldrsb r0, [r3, #0x14] add r3, r3, #0x1c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02045A14 _02045764: mov r4, #3 @@ -70980,7 +70980,7 @@ _02045764: ldr r3, _02045A40 ; =_0209CC48 add r2, sp, #0x64 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02045A1C ; =_020AFED4 ldr r1, [r1] strb r0, [r1, #0x16] @@ -71028,7 +71028,7 @@ _02045798: mov r4, r4, lsl #0x10 mov r4, r4, lsr #0x10 stmib sp, {r4, ip} - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _02045A1C ; =_020AFED4 ldr r1, [r1] strb r0, [r1, #0x17] @@ -71075,7 +71075,7 @@ _020458C0: ldr r0, _02045A1C ; =_020AFED4 ldr r0, [r0] ldrsb r0, [r0, #0x14] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02045A1C ; =_020AFED4 mov r3, #7 ldr r1, [r0] @@ -71085,7 +71085,7 @@ _020458C0: mov r1, #8 ldrsb r0, [r3, #0x14] add r3, r3, #0x1c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02045A14 _02045914: mov r4, #3 @@ -71096,7 +71096,7 @@ _02045914: ldr r3, _02045A40 ; =_0209CC48 add r2, sp, #0xfc str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02045A1C ; =_020AFED4 ldr r1, [r1] strb r0, [r1, #0x16] @@ -71113,14 +71113,14 @@ _02045958: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02045A1C ; =_020AFED4 ldr r1, [r1] strb r0, [r1, #0x16] b _02045A14 _02045984: ldrsb r0, [r4, #0x14] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02045A1C ; =_020AFED4 mvn r1, #1 ldr r0, [r0] @@ -71156,7 +71156,7 @@ _020459E0: mov r2, #0x2d0 ldrsb r0, [r3, #0x14] add r3, r3, #0x1c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _02045A14: add sp, sp, #0x194 ldmia sp!, {r4, r5, pc} @@ -71220,7 +71220,7 @@ _02045ACC: mov r1, #8 ldrsb r0, [r3, #0x14] add r3, r3, #0x1c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02045F88 _02045AF8: mov r0, #2 @@ -71229,7 +71229,7 @@ _02045AF8: ldr r0, _02045F90 ; =_020AFED4 ldr r0, [r0] ldrsb r0, [r0, #0x14] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02045F90 ; =_020AFED4 mov r3, #2 ldr r1, [r0] @@ -71239,7 +71239,7 @@ _02045AF8: mov r1, #8 ldrsb r0, [r3, #0x14] add r3, r3, #0x1c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02045F88 _02045B40: ldr r1, _02045F9C ; =0x000002CE @@ -71333,7 +71333,7 @@ _02045BFC: ldr r0, _02045F90 ; =_020AFED4 ldr r0, [r0] ldrsb r0, [r0, #0x14] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02045F90 ; =_020AFED4 mov r4, #0x11 ldr r3, [r0] @@ -71343,7 +71343,7 @@ _02045BFC: add r2, r4, #0x2c0 ldrsb r0, [r3, #0x14] add r3, r3, #0x1c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02045F88 _02045CD8: mov r4, #3 @@ -71354,7 +71354,7 @@ _02045CD8: ldr r3, _02045FB4 ; =_0209CC48 add r2, sp, #0xac str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02045F90 ; =_020AFED4 ldr r1, [r1] strb r0, [r1, #0x16] @@ -71402,7 +71402,7 @@ _02045D0C: mov r4, r4, lsl #0x10 mov r4, r4, lsr #0x10 stmib sp, {r4, ip} - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _02045F90 ; =_020AFED4 ldr r1, [r1] strb r0, [r1, #0x17] @@ -71449,7 +71449,7 @@ _02045E34: ldr r0, _02045F90 ; =_020AFED4 ldr r0, [r0] ldrsb r0, [r0, #0x14] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02045F90 ; =_020AFED4 mov r3, #7 ldr r1, [r0] @@ -71459,7 +71459,7 @@ _02045E34: mov r1, #8 ldrsb r0, [r3, #0x14] add r3, r3, #0x1c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02045F88 _02045E88: mov r4, #3 @@ -71470,7 +71470,7 @@ _02045E88: ldr r3, _02045FB4 ; =_0209CC48 add r2, sp, #0x14 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02045F90 ; =_020AFED4 ldr r1, [r1] strb r0, [r1, #0x16] @@ -71487,14 +71487,14 @@ _02045ECC: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02045F90 ; =_020AFED4 ldr r1, [r1] strb r0, [r1, #0x16] b _02045F88 _02045EF8: ldrsb r0, [r4, #0x14] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02045F90 ; =_020AFED4 mvn r1, #1 ldr r0, [r0] @@ -71530,7 +71530,7 @@ _02045F54: mov r2, #0x2d0 ldrsb r0, [r3, #0x14] add r3, r3, #0x1c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _02045F88: add sp, sp, #0x194 ldmia sp!, {r4, r5, pc} @@ -71626,7 +71626,7 @@ _02046074: ; jump table b _020464CC ; case 18 _020460C0: ldrsb r0, [r2, #0x16] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 ldrne r1, _020465D8 ; =_020AFED4 ldrne r1, [r1] @@ -71650,7 +71650,7 @@ _02046104: b _0204653C _02046114: ldrsb r0, [r2, #0x16] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 ldrne r1, _020465D8 ; =_020AFED4 ldrne r1, [r1] @@ -71674,7 +71674,7 @@ _02046158: b _0204653C _02046168: ldrsb r0, [r2, #0x16] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 ldrne r1, _020465D8 ; =_020AFED4 ldrne r1, [r1] @@ -71739,7 +71739,7 @@ _02046234: tst r0, #8 beq _020462F4 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r1, _020465D8 ; =_020AFED4 mov r0, r4 ldr r1, [r1] @@ -71831,7 +71831,7 @@ _02046394: b _0204653C _020463B4: ldrsb r0, [r2, #0x16] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #6 addls pc, pc, r0, lsl #2 b _0204653C @@ -71910,13 +71910,13 @@ _020464C4: b _02046540 _020464CC: ldrsb r0, [r2, #0x14] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0204653C ldr r0, _020465D8 ; =_020AFED4 ldr r0, [r0] ldrsb r0, [r0, #0x14] - bl ShowDBox + bl ShowDialogueBox ldr r0, _020465D8 ; =_020AFED4 mov r2, #0x14 ldr r1, [r0] @@ -71927,13 +71927,13 @@ _020464CC: b _0204653C _0204650C: ldrsb r0, [r2, #0x14] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0204653C ldr r0, _020465D8 ; =_020AFED4 ldr r0, [r0] ldrsb r0, [r0, #0x14] - bl ShowDBox + bl ShowDialogueBox ldr r0, _020465D8 ; =_020AFED4 ldr r0, [r0] ldr r0, [r0, #8] @@ -71969,7 +71969,7 @@ _02046590: ldrsb r0, [r0, #0x14] cmp r0, r1 beq _020465CC - bl FreeDBox + bl FreeDialogueBox ldr r0, _020465D8 ; =_020AFED4 mvn r1, #1 ldr r0, [r0] @@ -72000,7 +72000,7 @@ sub_020465DC: ; 0x020465DC ldr r0, _02046620 ; =_020AFED4 ldr r0, [r0] ldrsb r0, [r0, #0x16] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _02046620 ; =_020AFED4 mvn r1, #1 ldr r0, [r0] @@ -72020,7 +72020,7 @@ sub_02046624: ; 0x02046624 cmp r1, r0 ldmneia sp!, {r3, pc} mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _02046658 ; =_020AFED4 ldr r1, [r1] strb r0, [r1, #0x14] @@ -72083,7 +72083,7 @@ _020466D0: ldr r3, _0204673C ; =sub_02046798 add r2, sp, #8 str ip, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _0204672C ; =_020AFED8 ldr r1, [r1] strb r0, [r1] @@ -72107,11 +72107,11 @@ sub_02046740: ; 0x02046740 cmp r1, r0 blt _02046768 mov r0, #0x14 - bl sub_02017B58 + bl PlayBgmByIdVeneer ldmia sp!, {r3, pc} _02046768: mov r0, #0x13 - bl sub_02017B58 + bl PlayBgmByIdVeneer ldmia sp!, {r3, pc} .align 2, 0 _02046774: .word _020AFED8 @@ -72205,7 +72205,7 @@ sub_0204682C: ; 0x0204682C ldr r1, [r2] mov r0, #0 strh r3, [r1, #8] - bl CreateDBox + bl CreateDialogueBox ldr r1, _02046890 ; =_020AFEDC mov r2, #0 ldr r3, [r1] @@ -72227,7 +72227,7 @@ sub_02046898: ; 0x02046898 cmp r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _020468D0 ; =_020AFEDC ldr r0, [r0] bl MemFree @@ -72258,7 +72258,7 @@ _02046900: ldrh r2, [r2, #8] ldr r1, _020469B8 ; =0x00000618 mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _020469B4 ; =_020AFEDC mov r1, #1 ldr r0, [r0] @@ -72266,7 +72266,7 @@ _02046900: b _020469AC _02046928: ldrsb r0, [r2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _020469AC ldr r0, _020469B4 ; =_020AFEDC @@ -72280,7 +72280,7 @@ _02046928: b _020469AC _0204695C: ldrsb r0, [r2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 ldreq r0, _020469B4 ; =_020AFEDC moveq r1, #3 @@ -72866,7 +72866,7 @@ sub_0204707C: ; 0x0204707C bl MemZero mov r0, r6 mov r1, r5 - bl sub_0202F8C4 + bl CreateTextBox1 strb r0, [r4] mov r0, #3 str r0, [r4, #8] @@ -72992,7 +72992,7 @@ _0204721C: .word _020AFEE4 sub_02047220: ; 0x02047220 stmdb sp!, {r3, lr} mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _02047240 ; =_020AFEE4 ldr r1, [r1] strb r0, [r1] @@ -73017,14 +73017,14 @@ sub_02047244: ; 0x02047244 ldr r0, _020472A0 ; =_020AFEE4 ldr r0, [r0] ldrsb r0, [r0] - bl ShowDBox + bl ShowDialogueBox ldr r0, _020472A0 ; =_020AFEE4 mov r3, r4 ldr r2, [r0] ldrsb r0, [r2] ldrh r1, [r2, #0x68] ldrh r2, [r2, #0x14] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, #1 ldmia sp!, {r4, pc} .align 2, 0 @@ -73041,7 +73041,7 @@ sub_020472A4: ; 0x020472A4 cmp r0, #1 bne _020472D4 mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _020472EC ; =_020AFEE4 ldr r1, [r1] strb r0, [r1] @@ -73073,14 +73073,14 @@ sub_020472F0: ; 0x020472F0 ldr r0, _02047354 ; =_020AFEE4 ldr r0, [r0] ldrsb r0, [r0] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02047354 ; =_020AFEE4 mov r2, r5 ldr r1, [r0] mov r3, r4 ldrsb r0, [r1] ldrh r1, [r1, #0x68] - bl ShowStringInDBox + bl ShowStringInDialogueBox mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 @@ -73097,7 +73097,7 @@ sub_02047358: ; 0x02047358 cmp r0, #1 bne _02047388 mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _020473A0 ; =_020AFEE4 ldr r1, [r1] strb r0, [r1] @@ -73129,7 +73129,7 @@ sub_020473A4: ; 0x020473A4 ldr r0, _020473F8 ; =_020AFEE4 ldr r0, [r0] ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _020473F8 ; =_020AFEE4 mvn r1, #1 ldr r0, [r0] @@ -73150,7 +73150,7 @@ sub_020473FC: ; 0x020473FC cmp r0, r1 moveq r0, #1 ldmeqia sp!, {r4, pc} - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r0, #4 bne _02047440 @@ -73459,7 +73459,7 @@ sub_02047760: ; 0x02047760 mov r0, lr add r2, r2, #0x1c00 str ip, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 add r1, r4, #0x100 strb r0, [r4, #0x120] ldrsb r0, [r1, #0x20] @@ -73497,7 +73497,7 @@ _02047850: mov r0, ip add r2, r2, #0x1c00 str r1, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 strb r0, [r4, #0x120] add r0, r4, #0x1f00 mov r1, #8 @@ -73822,7 +73822,7 @@ _02047CB8: beq _02047D0C _02047CF0: mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #3 str r0, [r5, #0x11c] mov r0, #1 @@ -73856,7 +73856,7 @@ _02047D34: b _02047D74 _02047D6C: mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper _02047D74: mov r6, #1 b _02047DC4 @@ -73878,7 +73878,7 @@ _02047D8C: strgth r3, [r1, #0x74] bgt _02047DC0 mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper _02047DC0: mov r6, #1 _02047DC4: @@ -73948,7 +73948,7 @@ _02047EAC: mov r1, #3 mov r0, #1 str r1, [r5, #0x11c] - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02047EE4 _02047EC0: mov r0, #4 @@ -75878,7 +75878,7 @@ sub_02049684: ; 0x02049684 ldr r1, [r2] mov r0, #0 str r3, [r1, #8] - bl CreateDBox + bl CreateDialogueBox ldr r1, _020496EC ; =_020AFF4C mov r3, #0 ldr r2, [r1] @@ -75901,7 +75901,7 @@ sub_020496F4: ; 0x020496F4 cmp r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0204972C ; =_020AFF4C ldr r0, [r0] bl MemFree @@ -75940,7 +75940,7 @@ _02049770: ldrh r2, [r1, r2] ldr r1, _02049A20 ; =0x00000408 mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02049A18 ; =_020AFF4C mov r1, #1 ldr r0, [r0] @@ -75948,7 +75948,7 @@ _02049770: b _02049A10 _020497A4: ldrsb r0, [r3] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 ldreq r0, _02049A18 ; =_020AFF4C moveq r1, #2 @@ -76037,7 +76037,7 @@ _020498C8: ldr r1, _02049A30 ; =0x0000040C mov r2, #0x238 mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02049A18 ; =_020AFF4C mov r1, #8 ldr r0, [r0] @@ -76053,7 +76053,7 @@ _02049908: ldrh r2, [r1, r2] ldr r1, _02049A38 ; =0x0000061C mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02049A18 ; =_020AFF4C mov r1, #5 ldr r0, [r0] @@ -76064,7 +76064,7 @@ _02049944: ldr r1, _02049A38 ; =0x0000061C ldr r2, _02049A3C ; =0x00000239 mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02049A18 ; =_020AFF4C mov r1, #5 ldr r0, [r0] @@ -76072,7 +76072,7 @@ _02049944: b _02049A10 _0204996C: ldrsb r0, [r3] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02049A10 ldr r0, _02049A18 ; =_020AFF4C @@ -76086,7 +76086,7 @@ _0204996C: b _02049A10 _020499A0: ldrsb r0, [r3] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02049A10 ldr r0, _02049A18 ; =_020AFF4C @@ -76112,7 +76112,7 @@ _020499F4: ldmia sp!, {r3, pc} _020499FC: ldrsb r0, [r3] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02049A10 bl CardBackupError @@ -76164,7 +76164,7 @@ sub_02049A74: ; 0x02049A74 ldr r1, [r1] str r0, [r1, #0xc] mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _02049ACC ; =_020AFF54 mov r3, #0 ldr r2, [r1] @@ -76186,7 +76186,7 @@ sub_02049AD0: ; 0x02049AD0 cmp r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02049B08 ; =_020AFF54 ldr r0, [r0] bl MemFree @@ -76222,7 +76222,7 @@ _02049B4C: ldr r1, _02049D38 ; =0x00000408 ldr r2, _02049D3C ; =0x0000024F mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02049D34 ; =_020AFF54 mov r1, #1 ldr r0, [r0] @@ -76230,7 +76230,7 @@ _02049B4C: b _02049D2C _02049B74: ldrsb r0, [r2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 ldreq r0, _02049D34 ; =_020AFF54 moveq r1, #2 @@ -76272,7 +76272,7 @@ _02049BEC: ldrsb r0, [r1] ldr r1, _02049D40 ; =0x0000040C mov r2, #0x238 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02049D34 ; =_020AFF54 mov r1, #8 ldr r0, [r0] @@ -76284,7 +76284,7 @@ _02049C2C: ldr r1, _02049D44 ; =0x0000061C bne _02049C58 mov r2, #0x250 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02049D34 ; =_020AFF54 mov r1, #5 ldr r0, [r0] @@ -76292,7 +76292,7 @@ _02049C2C: b _02049D2C _02049C58: ldr r2, _02049D48 ; =0x0000023A - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02049D34 ; =_020AFF54 mov r1, #5 ldr r0, [r0] @@ -76300,7 +76300,7 @@ _02049C58: b _02049D2C _02049C74: ldrsb r0, [r2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02049D2C ldr r0, _02049D34 ; =_020AFF54 @@ -76314,7 +76314,7 @@ _02049C74: b _02049D2C _02049CA8: ldrsb r0, [r2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02049D2C ldr r0, _02049D34 ; =_020AFF54 @@ -76345,7 +76345,7 @@ _02049D10: ldmia sp!, {r3, pc} _02049D18: ldrsb r0, [r2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02049D2C bl CardBackupError @@ -76398,7 +76398,7 @@ sub_02049D84: ; 0x02049D84 ldr r1, [r2, #4] mov r0, #0 str r3, [r1, #8] - bl CreateDBox + bl CreateDialogueBox ldr r1, _02049DEC ; =_020AFF5C mov r3, #0 ldr r2, [r1, #4] @@ -76421,7 +76421,7 @@ sub_02049DF4: ; 0x02049DF4 cmp r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02049E2C ; =_020AFF5C ldr r0, [r0, #4] bl MemFree @@ -76459,7 +76459,7 @@ _02049E6C: ldrh r2, [r1, r2] ldr r1, _0204A00C ; =0x00000408 mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0204A004 ; =_020AFF5C mov r1, #1 ldr r0, [r0, #4] @@ -76467,7 +76467,7 @@ _02049E6C: b _02049FFC _02049EA0: ldrsb r0, [r3] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 ldreq r0, _0204A004 ; =_020AFF5C moveq r1, #2 @@ -76517,7 +76517,7 @@ _02049F2C: mov r3, r3, lsl #1 ldrh r2, [r2, r3] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0204A004 ; =_020AFF5C mov r1, #5 ldr r0, [r0, #4] @@ -76525,7 +76525,7 @@ _02049F2C: b _02049FFC _02049F6C: ldrsb r0, [r3] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02049FFC ldr r0, _0204A004 ; =_020AFF5C @@ -76539,7 +76539,7 @@ _02049F6C: b _02049FFC _02049FA0: ldrsb r0, [r3] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02049FFC ldr r0, _0204A004 ; =_020AFF5C @@ -76593,7 +76593,7 @@ sub_0204A02C: ; 0x0204A02C ldr r1, _0204A078 ; =_020AFF64 str r0, [r1] mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r3, _0204A078 ; =_020AFF64 ldr r1, _0204A07C ; =0x00000408 ldr ip, [r3] @@ -76602,7 +76602,7 @@ sub_0204A02C: ; 0x0204A02C ldr r0, [r3] mov r3, #0 ldrsb r0, [r0] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 @@ -76618,7 +76618,7 @@ sub_0204A080: ; 0x0204A080 cmp r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0204A0B8 ; =_020AFF64 ldr r0, [r0] bl MemFree @@ -76636,7 +76636,7 @@ sub_0204A0BC: ; 0x0204A0BC ldr r0, _0204A0E4 ; =_020AFF64 ldr r0, [r0] ldrsb r0, [r0] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0204A0DC bl CardBackupError @@ -76666,7 +76666,7 @@ sub_0204A0FC: ; 0x0204A0FC ldr r1, _0204A148 ; =_020AFF68 str r0, [r1] mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r3, _0204A148 ; =_020AFF68 ldr r1, _0204A14C ; =0x00000408 ldr ip, [r3] @@ -76675,7 +76675,7 @@ sub_0204A0FC: ; 0x0204A0FC ldr r0, [r3] mov r3, #0 ldrsb r0, [r0] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 @@ -76692,7 +76692,7 @@ sub_0204A154: ; 0x0204A154 cmp r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0204A18C ; =_020AFF68 ldr r0, [r0] bl MemFree @@ -92172,8 +92172,8 @@ _020561D8: _02056224: .word TEAM_MEMBER_TABLE_PTR arm_func_end RemoveActiveMembersFromRescueTeam - arm_func_start CheckTeamMemberIdx -CheckTeamMemberIdx: ; 0x02056228 + arm_func_start sub_02056228 +sub_02056228: ; 0x02056228 ldr r1, _0205625C ; =0x000055AA cmp r0, r1 moveq r0, #1 @@ -92190,10 +92190,10 @@ CheckTeamMemberIdx: ; 0x02056228 .align 2, 0 _0205625C: .word 0x000055AA _02056260: .word 0x00005AA5 - arm_func_end CheckTeamMemberIdx + arm_func_end sub_02056228 - arm_func_start sub_02056264 -sub_02056264: ; 0x02056264 + arm_func_start CheckTeamMemberIdx +CheckTeamMemberIdx: ; 0x02056264 ldr r1, _0205628C ; =0x000055AA cmp r0, r1 moveq r0, #1 @@ -92207,7 +92207,7 @@ sub_02056264: ; 0x02056264 .align 2, 0 _0205628C: .word 0x000055AA _02056290: .word 0x00005AA5 - arm_func_end sub_02056264 + arm_func_end CheckTeamMemberIdx arm_func_start IsMonsterIdInNormalRange IsMonsterIdInNormalRange: ; 0x02056294 @@ -94136,7 +94136,7 @@ _02057B50: tst r0, #0xff beq _02057C14 ldrsh r0, [r8, #8] - bl sub_02056264 + bl CheckTeamMemberIdx cmp r0, #0 bne _02057C14 ldrsh r0, [r8, #0xc] @@ -94394,7 +94394,7 @@ _02057EB4: tst r0, #0xff beq _02057EDC ldrsh r0, [r8, #8] - bl sub_02056264 + bl CheckTeamMemberIdx cmp r0, #0 strneb r5, [r8] _02057EDC: @@ -94462,7 +94462,7 @@ _02057F90: and r1, r2, #0xff orr r1, r1, #1 strb r1, [r7] - bl sub_02056264 + bl CheckTeamMemberIdx cmp r0, #0 mov r0, sb mov r1, #0 @@ -94994,7 +94994,7 @@ sub_02058674: ; 0x02058674 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl CheckTeamMemberIdx + bl sub_02056228 cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} mov r0, r5 @@ -112696,7 +112696,7 @@ _02066EF4: bne _02066F44 bl sub_02046BB4 mov r0, #6 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, [r6, #8] add r0, r6, r0, lsl #1 ldrsh r0, [r0, #0xc] @@ -112736,7 +112736,7 @@ _02066F84: cmp r0, #0xe bne _02066FB4 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _020674A0 ; =_020B0B2C mov r1, #4 ldr r0, [r0, #0x14] @@ -112963,7 +112963,7 @@ _020672B8: cmp r4, #7 bne _020672D4 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper _020672D4: ldr r0, _020674A0 ; =_020B0B2C mov r1, #0 @@ -113711,7 +113711,7 @@ sub_02067C8C: ; 0x02067C8C ldr r6, [r0, #0x14] bl sub_02046BB4 mov r0, #6 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, [r6, #8] add r0, r6, r0, lsl #1 ldrsh r0, [r0, #0xc] @@ -115292,7 +115292,7 @@ sub_020691B8: ; 0x020691B8 str r3, [sp, #8] ldr r3, [lr, #0xe44] add r2, r2, #0xc00 - bl sub_0202C3A8 + bl CreateCollectionMenu ldr r3, _020692A8 ; =_020B0B2C mov r1, #0 ldr ip, [r3, #0x14] @@ -115593,7 +115593,7 @@ sub_02069598: ; 0x02069598 cmp r0, #0 beq _02069600 mov r0, #6 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #0 strb r0, [r4, r6] bl sub_020674E8 @@ -115613,7 +115613,7 @@ _02069600: bhs _0206963C _0206961C: mov r0, #6 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldrsb r0, [r5, #0x7d] mov r1, #1 bl sub_0202D07C @@ -115622,13 +115622,13 @@ _0206961C: b _02069644 _0206963C: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper _02069644: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} _0206964C: mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper _02069654: mov r0, #0 ldmia sp!, {r4, r5, r6, pc} @@ -117777,7 +117777,7 @@ _0206B328: mov r0, #0x7c mla r6, r5, r0, fp mov r0, r6 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldrsh r1, [r4, #0x18] mov r0, r6 bl SetSpriteIdForAnimationControl @@ -120252,7 +120252,7 @@ _0206D444: mov r1, r7, lsl #0x10 mov r0, sl mov r1, r1, asr #0x10 - bl sub_0206D558 + bl ReadWaviEntry cmp r0, #0 beq _0206D4C4 str r5, [r0, #0x24] @@ -120330,8 +120330,8 @@ _0206D550: .word 0x04000208 _0206D554: .word _022B7990 arm_func_end sub_0206D4E4 - arm_func_start sub_0206D558 -sub_0206D558: ; 0x0206D558 + arm_func_start ReadWaviEntry +ReadWaviEntry: ; 0x0206D558 ldr r2, [r0, #0x10] cmp r2, #0 moveq r0, #0 @@ -120346,7 +120346,7 @@ sub_0206D558: ; 0x0206D558 moveq r0, #0 addne r0, r2, r0 bx lr - arm_func_end sub_0206D558 + arm_func_end ReadWaviEntry arm_func_start sub_0206D590 sub_0206D590: ; 0x0206D590 @@ -120580,7 +120580,7 @@ sub_0206D808: ; 0x0206D808 _0206D854: mov r0, r7 mov r1, #1 - bl sub_0206E4E8 + bl FindSmdlSongChunk movs r5, r0 bne _0206D880 mov r1, r7 @@ -121523,8 +121523,8 @@ _0206E4E0: .word _022B7330 _0206E4E4: .word 0x04000208 arm_func_end sub_0206E3C4 - arm_func_start sub_0206E4E8 -sub_0206E4E8: ; 0x0206E4E8 + arm_func_start FindSmdlSongChunk +FindSmdlSongChunk: ; 0x0206E4E8 stmdb sp!, {r3, r4, r5, r6, r7, lr} ldr r6, _0206E54C ; =0x736F6E67 ldr r7, _0206E550 ; =0x656F6420 @@ -121555,7 +121555,7 @@ _0206E548: .align 2, 0 _0206E54C: .word 0x736F6E67 _0206E550: .word 0x656F6420 - arm_func_end sub_0206E4E8 + arm_func_end FindSmdlSongChunk arm_func_start sub_0206E554 sub_0206E554: ; 0x0206E554 @@ -124810,7 +124810,7 @@ _02071030: ldrsb r0, [r5, #0xd0] cmp r0, #1 bne _020710D0 - bl sub_0207AEE4 + bl GetTimer0Control ldr r2, [r8, #0xec8] ldr r1, [r8, #0xecc] sub sl, r0, r2 @@ -124873,7 +124873,7 @@ _02071118: ldrsb r0, [r5, #0xd0] cmp r0, #1 bne _02071030 - bl sub_0207AEE4 + bl GetTimer0Control str r0, [r8, #0xecc] b _02071030 _02071148: @@ -124944,8 +124944,8 @@ _02071200: _02071220: .word _022B7330 arm_func_end sub_02071160 - arm_func_start ParseDseEvents -ParseDseEvents: ; 0x02071224 + arm_func_start ParseDseEvent +ParseDseEvent: ; 0x02071224 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 mov r6, r1 @@ -125070,7 +125070,7 @@ _020713C4: _020713DC: .word SMD_EVENTS_FUN_TABLE _020713E0: .word _020B0B7C _020713E4: .word 0x02040811 - arm_func_end ParseDseEvents + arm_func_end ParseDseEvent arm_func_start UpdateSequencerTracks UpdateSequencerTracks: ; 0x020713E8 @@ -125250,7 +125250,7 @@ _02071648: bne _02071674 mov r0, sl mov r1, r8 - bl ParseDseEvents + bl ParseDseEvent ldrsb r0, [r8, #2] cmp r0, #1 ldreqb r0, [sl, #0xd] @@ -128635,7 +128635,7 @@ _02073F40: str r2, [sp, #4] str r1, [sp, #8] ldrsh r1, [r5, #0x12] - bl sub_0206D558 + bl ReadWaviEntry movs fp, r0 beq _02073F40 ldrb r3, [sl, #5] @@ -135397,7 +135397,7 @@ sub_02079340: ; 0x02079340 ldr r4, _02079404 ; =_022B966C cmp r0, #0 bne _02079370 - bl sub_0207B848 + bl GetProcessorMode cmp r0, #0x12 bne _0207937C _02079370: @@ -137679,14 +137679,14 @@ _0207AEDC: .word 0x0000FFFF _0207AEE0: .word _022B99A0 arm_func_end sub_0207AE44 - arm_func_start sub_0207AEE4 -sub_0207AEE4: ; 0x0207AEE4 + arm_func_start GetTimer0Control +GetTimer0Control: ; 0x0207AEE4 ldr r0, _0207AEF0 ; =0x04000100 ldrh r0, [r0] bx lr .align 2, 0 _0207AEF0: .word 0x04000100 - arm_func_end sub_0207AEE4 + arm_func_end GetTimer0Control arm_func_start sub_0207AEF4 sub_0207AEF4: ; 0x0207AEF4 @@ -138436,12 +138436,12 @@ GetIrqFlag: ; 0x0207B83C bx lr arm_func_end GetIrqFlag - arm_func_start sub_0207B848 -sub_0207B848: ; 0x0207B848 + arm_func_start GetProcessorMode +GetProcessorMode: ; 0x0207B848 mrs r0, cpsr and r0, r0, #0x1f bx lr - arm_func_end sub_0207B848 + arm_func_end GetProcessorMode arm_func_start sub_0207B854 sub_0207B854: ; 0x0207B854 @@ -138699,7 +138699,7 @@ sub_0207BB50: ; 0x0207BB50 mov r5, r0 ldrh r6, [r1] ldr r4, _0207BC14 ; =0x027FFC00 - bl sub_0207AEE4 + bl GetTimer0Control orr r0, r0, r6, lsl #16 str r0, [r5] ldr r1, _0207BC18 ; =_022B99A8 @@ -168407,23 +168407,23 @@ _0209AE7C: .byte 0x6B, 0x6D, 0x61, 0x72, 0x6B, 0x2E, 0x77, 0x31, 0x36, 0x00, 0x00, 0x00 .global _0209AE90 _0209AE90: - .word sub_0202ABFC + .word UpdateParentMenu .byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AEA0 _0209AEA0: - .word sub_0202B5C8 + .word UpdateSimpleMenu .byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AEB0 _0209AEB0: - .word sub_0202BD64 + .word UpdateAdvancedMenu .byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AEC0 _0209AEC0: - .word sub_0202C808 + .word UpdateCollectionMenu .byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AED0 _0209AED0: - .word sub_0202D618 + .word UpdateOptionsMenu .byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AEE0 _0209AEE0: @@ -168443,32 +168443,32 @@ _0209AF04: .byte 0x5B, 0x4D, 0x3A, 0x42, 0x31, 0x35, 0x5D, 0x00 .global _0209AF0C _0209AF0C: - .word sub_0202DF98 + .word UpdateDebugMenu .byte 0x1E, 0x0F, 0x00, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AF1C _0209AF1C: - .word sub_0202E708 + .word UpdateScrollBox .byte 0x02, 0x02, 0x1C, 0x14 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AF2C _0209AF2C: - .word sub_0202F488 + .word UpdateDialogueBox .byte 0x02, 0x11, 0x1C, 0x05 .byte 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AF3C _0209AF3C: - .word sub_0202F70C + .word UpdatePortraitBox .byte 0x01, 0x0A, 0x05, 0x05 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AF4C _0209AF4C: - .word sub_0202FA5C + .word UpdateTextBox .byte 0x01, 0x10, 0x1E, 0x06 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AF5C _0209AF5C: - .word sub_0202FD8C + .word UpdateDynamicTextBox .byte 0x1E, 0x0F, 0x00, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AF6C @@ -168477,20 +168477,20 @@ _0209AF6C: .byte 0x00, 0x00, 0x00, 0x00 .global _0209AF78 _0209AF78: - .word sub_0202FF10 + .word UpdateControlsChart .byte 0x02, 0x02, 0x1C, 0x14, 0x01, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AF94 _0209AF94: - .word sub_02030274 + .word UpdateAlertBox .byte 0x02, 0x11, 0x1C, 0x05, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AFA4 _0209AFA4: - .word sub_02030AE8 + .word UpdateAdvancedTextBox .byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AFB4 _0209AFB4: - .word sub_0203123C + .word UpdateTeamSelectionMenu .byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global _0209AFC4 _0209AFC4: @@ -183052,7 +183052,7 @@ RENDER_3D_FUNCTIONS_64: .word Render3d64RectangleMulticolor .word Render3d64Quadrilateral .word Render3d64Tiling - .word Render3d64Border + .word Render3d64WindowFrame .word Render3d64Texture0x7 .global _020AFCE4 _020AFCE4: diff --git a/asm/overlay_00.s b/asm/overlay_00.s index 6c241bba..711087ec 100644 --- a/asm/overlay_00.s +++ b/asm/overlay_00.s @@ -2090,7 +2090,7 @@ _022BE184: bl sub_02028E2C bl sub_02017A68 mov r0, #2 - bl sub_02017B58 + bl PlayBgmByIdVeneer bl sub_020519D0 bl sub_0201DC90 bl ov00_022BE4D8 @@ -20502,7 +20502,7 @@ _022CD908: mov r5, #0 b _022CD93C _022CD924: - bl sub_0207B848 + bl GetProcessorMode cmp r0, #0x12 addeq sp, sp, #0xc mvneq r0, #0x1b @@ -22168,7 +22168,7 @@ ov00_022CEF10: ; 0x022CEF10 and r0, r0, #3 cmp r0, #1 bne _022CEF60 - bl sub_0207B848 + bl GetProcessorMode cmp r0, #0x12 beq _022CEF60 mov r0, #0xa diff --git a/asm/overlay_01.s b/asm/overlay_01.s index f2b7cf5c..cf9fde25 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -3685,7 +3685,7 @@ ov01_0232C148: ; 0x0232C148 ldr r0, _0232C1CC ; =ov01_0233C800 mov r4, r1 mov r6, r2 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r1, _0232C1D0 ; =ov01_0233C780 ldr r0, _0232C1CC ; =ov01_0233C800 ldrsh r1, [r1] @@ -3873,7 +3873,7 @@ ov01_0232C3AC: ; 0x0232C3AC ldr r0, _0232C448 ; =ov01_0233C8FC mov r4, r1 mov r6, r3 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r1, _0232C44C ; =ov01_0233C87C ldr r0, _0232C448 ; =ov01_0233C8FC ldrsh r1, [r1] @@ -7600,7 +7600,7 @@ _0232F618: bne _0232F664 ldr r0, _0232F734 ; =ov01_0233AFEC ldr r1, _0232F738 ; =ov01_0232F830 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0232F730 ; =ov01_0233C158 ldr r1, [r1] strb r0, [r1, #8] @@ -8071,7 +8071,7 @@ ov01_0232FC28: ; 0x0232FC28 ldr r3, _0232FCF8 ; =0x00003FC9 mov r1, r0 mov r2, r0 - bl sub_0202FE2C + bl CreateControlsChart ldr r1, _0232FCF4 ; =ov01_0233C15C ldr r1, [r1] strb r0, [r1, #8] @@ -8440,7 +8440,7 @@ ov01_023300C4: ; 0x023300C4 ldr r3, _02330194 ; =0x00000122 mov r1, r0 mov r2, r0 - bl sub_0202FE2C + bl CreateControlsChart ldr r1, _02330190 ; =ov01_0233C160 ldr r1, [r1] strb r0, [r1, #8] @@ -8589,7 +8589,7 @@ ov01_02330224: ; 0x02330224 strh r1, [r2, #0x8e] ldr r0, [r0] add r0, r0, #0x94 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r0, _02330584 ; =ov01_0233C164 ldr r2, [r0] ldrh r1, [r2, #0x96] @@ -8628,7 +8628,7 @@ ov01_02330224: ; 0x02330224 strh r2, [r1, #0xcc] ldr r0, [r0] add r0, r0, #0x110 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r1, _02330584 ; =ov01_0233C164 ldr r0, [r1] add r0, r0, #0x100 @@ -8672,7 +8672,7 @@ ov01_02330224: ; 0x02330224 strh r2, [r0, #0x48] ldr r0, [r1] add r0, r0, #0x18c - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r1, _02330584 ; =ov01_0233C164 ldr r0, [r1] add r0, r0, #0x100 @@ -8715,7 +8715,7 @@ ov01_02330224: ; 0x02330224 strh r2, [r0, #0xc4] ldr r0, [r1] add r0, r0, #0x208 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r0, _02330584 ; =ov01_0233C164 ldr r0, [r0] ldrsh r1, [r0, #0x92] @@ -9095,7 +9095,7 @@ ov01_023309F4: ; 0x023309F4 ldr r3, _02330AC4 ; =0x000004EE mov r1, r0 mov r2, r0 - bl sub_0202FE2C + bl CreateControlsChart ldr r1, _02330AC0 ; =ov01_0233C164 ldr r1, [r1] strb r0, [r1, #8] @@ -9477,7 +9477,7 @@ _02330F18: moveq r0, #0 beq _02330FDC ldr r0, _02330FF8 ; =ov01_0233C978 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r1, _02330FE4 ; =ov01_0233C174 ldr r0, _02330FF8 ; =ov01_0233C978 ldrsh r1, [r1, #2] @@ -10064,7 +10064,7 @@ _02331748: ldrsb r0, [r0, #4] cmp r0, r1 beq _02331764 - bl FreeDBox + bl FreeDialogueBox _02331764: ldr r0, _02331780 ; =ov01_0233C178 ldr r0, [r0] @@ -10123,7 +10123,7 @@ _02331810: bne _023324F4 bl ov01_0232F910 ldr r0, _0233250C ; =OVERLAY1_D_BOX_LAYOUT_3 - bl CreateDBox + bl CreateDialogueBox ldr r1, _02332508 ; =ov01_0233C178 mov r3, #2 ldr r5, [r1] @@ -10317,7 +10317,7 @@ _02331AB4: ldrsb r0, [r3, #4] ldrh r2, [r2, #0x7e] mov r3, r4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _02331AF0: ldr r0, _02332508 ; =ov01_0233C178 ldr r0, [r0] @@ -10494,7 +10494,7 @@ _02331D4C: ldrsb r0, [r0, #4] ldrh r2, [r2, #0x32] mov r3, r4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _02331D8C: ldr r0, _02332508 ; =ov01_0233C178 ldr r0, [r0] @@ -10567,7 +10567,7 @@ _02331E44: ldr r0, [r3] mov r3, #0 ldrsb r0, [r0, #4] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02332508 ; =ov01_0233C178 mvn r3, #0 ldr r2, [r0] @@ -10667,7 +10667,7 @@ _02331F78: mov r2, r2, lsl #0x10 ldr r1, _02332518 ; =0x00000404 mov r2, r2, lsr #0x10 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02332508 ; =ov01_0233C178 mvn r3, #0 ldr r2, [r0] @@ -10694,7 +10694,7 @@ _02332040: mov r2, r2, lsl #0x10 ldr r1, _02332518 ; =0x00000404 mov r2, r2, lsr #0x10 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _02332088: ldr r0, _02332508 ; =ov01_0233C178 ldr r0, [r0] @@ -10743,7 +10743,7 @@ _02332128: sub r1, r5, #3 cmp r0, r1 beq _02332148 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _023324F4 _02332148: @@ -10830,14 +10830,14 @@ _02332268: ldrnesb r0, [r0, #4] cmpne r0, r1 beq _023322B4 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r5, #0 bne _023322B4 ldr r0, _02332508 ; =ov01_0233C178 ldr r0, [r0] ldrsb r0, [r0, #4] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02332508 ; =ov01_0233C178 mvn r1, #1 ldr r0, [r0] @@ -11258,13 +11258,13 @@ _0233281C: str r0, [r1, #4] ldr r0, _023329D0 ; =OVERLAY1_D_BOX_LAYOUT_5 ldr r1, _023329D4 ; =ov01_02332EF4 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r2, _023329C8 ; =ov01_0233C184 mov r1, #0 ldr r2, [r2] strb r0, [r2, #0x60c] ldr r0, _023329D8 ; =OVERLAY1_D_BOX_LAYOUT_6 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _023329C8 ; =ov01_0233C184 ldr r2, [r1] strb r0, [r2, #0x60d] @@ -12535,7 +12535,7 @@ ov01_02333994: ; 0x02333994 mov r1, #0x13 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _023339EC ; =ov01_0233C190 mov r3, #0 ldr r2, [r1, #4] @@ -12559,7 +12559,7 @@ ov01_023339F8: ; 0x023339F8 cmp r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _02333A30 ; =ov01_0233C190 ldr r0, [r0, #4] bl MemFree @@ -12596,13 +12596,13 @@ _02333A64: b _02333BBC _02333A84: ldrsb r0, [r2] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _02333BBC ldr r0, _02333BC8 ; =ov01_0233C190 ldr r0, [r0, #4] ldrsb r0, [r0] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _02333BC8 ; =ov01_0233C190 mov r2, #2 str r0, [r1] @@ -13357,7 +13357,7 @@ _023344E4: blt _02333ED8 _023344EC: ldr r0, _02334610 ; =ov01_0233B8E8 - bl CreateDBox + bl CreateDialogueBox ldr r2, _02334604 ; =ov01_0233C1A0 mov r1, #0xff ldr r3, [r2, #4] @@ -13371,10 +13371,10 @@ _023344EC: mov r3, #0 ldrsb r0, [r2, #1] add r2, r2, #0xac - bl ShowStringInDBox + bl ShowStringInDialogueBox ldr r0, _02334618 ; =ov01_0233B8C8 ldr r1, _0233461C ; =ov01_02334F2C - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02334604 ; =ov01_0233C1A0 mov r4, #0 ldr r2, [r1, #4] @@ -13464,7 +13464,7 @@ ov01_0233462C: ; 0x0233462C ldr r0, _023346B8 ; =ov01_0233C1A0 ldr r0, [r0, #4] ldrsb r0, [r0, #1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _023346B8 ; =ov01_0233C1A0 ldr r0, [r0, #4] add r0, r0, #0x1ac @@ -13514,7 +13514,7 @@ _023346EC: tst r0, #0xc0 beq _02334764 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl ov01_02334E20 ldr r0, _02334B90 ; =ov01_0233C1A0 ldr r0, [r0, #4] @@ -13567,7 +13567,7 @@ _023347B0: cmpeq r0, r1 bne _02334804 mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _023349B4 _02334804: bl ov01_02334B94 @@ -13648,7 +13648,7 @@ _023348F8: b _023349B4 _0233491C: mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl ov01_02334D04 cmp r0, #0 blt _023349B4 @@ -13672,7 +13672,7 @@ _02334954: cmpne r0, #0 bne _023349A8 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl ov01_02334E20 ldr r0, _02334B90 ; =ov01_0233C1A0 ldr r0, [r0, #4] @@ -13685,7 +13685,7 @@ _02334954: b _023349B4 _023349A8: mov r0, #4 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl ov01_02335208 _023349B4: mov r0, #0 @@ -13710,7 +13710,7 @@ _023349BC: tst r0, #0x10 beq _02334A18 mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #1 bl ov01_02335154 b _02334AD8 @@ -13718,7 +13718,7 @@ _02334A18: tst r0, #0x20 beq _02334AD8 mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper mvn r0, #0 bl ov01_02335154 b _02334AD8 @@ -13731,12 +13731,12 @@ _02334A34: b _02334AD0 _02334A4C: mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl ov01_02334D04 b _02334AD8 _02334A5C: mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02334B90 ; =ov01_0233C1A0 ldr r0, [r0, #4] ldrsb r0, [r0] @@ -13793,7 +13793,7 @@ _02334B0C: ldr r0, _02334B90 ; =ov01_0233C1A0 ldr r0, [r0, #4] ldrsb r0, [r0, #1] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r0, #0 bne _02334B58 @@ -13917,7 +13917,7 @@ ov01_02334C34: ; 0x02334C34 cmp r0, #0 bne _02334C5C mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, [r7, #0xc] ldmia sp!, {r3, r4, r5, r6, r7, pc} _02334C5C: @@ -13977,7 +13977,7 @@ _02334CD8: str r1, [r7, #0xc] ldr r1, [r7, #4] str r5, [r1, r4, lsl #2] - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #1 bl ov01_02335154 ldr r0, [r7, #0xc] @@ -15317,7 +15317,7 @@ _02335D2C: str r4, [r3, #0xdc] str r2, [r1] str r2, [r1, #4] - bl CreateDBox + bl CreateDialogueBox ldr r2, _02335F58 ; =ov01_0233C1A8 mov r1, #0x104 ldr r2, [r2] @@ -15330,7 +15330,7 @@ _02335D2C: add r2, sp, #8 ldrsb r0, [r0] mov r3, r4 - bl ShowStringInDBox + bl ShowStringInDialogueBox ldr r0, _02335F58 ; =ov01_0233C1A8 ldr r0, [r0] ldr r0, [r0, #0xd8] @@ -15350,7 +15350,7 @@ _02335DC4: ldr r3, _02335F7C ; =ov01_02336664 mov r1, #0x400000 str r2, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02335F58 ; =ov01_0233C1A8 ldr r1, [r1] strb r0, [r1, #1] @@ -15362,7 +15362,7 @@ _02335DF0: ldr r3, _02335F84 ; =ov01_02336730 mov r1, #0x400000 str r2, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02335F58 ; =ov01_0233C1A8 ldr r1, [r1] strb r0, [r1, #1] @@ -15374,7 +15374,7 @@ _02335E1C: ldr r3, _02335F88 ; =ov01_02336540 mov r1, #0x400000 str r2, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02335F58 ; =ov01_0233C1A8 ldr r1, [r1] strb r0, [r1, #1] @@ -15385,12 +15385,12 @@ _02335E44: ldr r3, _02335F90 ; =ov01_02336890 mov r1, #0x400000 str r2, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02335F58 ; =ov01_0233C1A8 ldr r1, [r1] strb r0, [r1, #2] ldr r0, _02335F94 ; =ov01_0233BB78 - bl CreateDBox + bl CreateDialogueBox ldr r1, _02335F58 ; =ov01_0233C1A8 ldr r2, [r1] strb r0, [r2, #3] @@ -15443,7 +15443,7 @@ _02335F0C: add r2, sp, #8 ldrsb r0, [r0, #3] mov r3, #0 - bl ShowStringInDBox + bl ShowStringInDialogueBox ldr r1, _02335F58 ; =ov01_0233C1A8 mov r4, #0 ldr r0, [r1] @@ -15487,7 +15487,7 @@ ov01_02335FA8: ; 0x02335FA8 cmp r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02336010 ; =ov01_0233C1A8 ldr r0, [r0] ldrsb r0, [r0, #1] @@ -15499,7 +15499,7 @@ ov01_02335FA8: ; 0x02335FA8 ldr r0, _02336010 ; =ov01_0233C1A8 ldr r0, [r0] ldrsb r0, [r0, #3] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02336010 ; =ov01_0233C1A8 ldr r0, [r0] bl MemFree @@ -15605,7 +15605,7 @@ _02336150: tst r0, #8 beq _02336178 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02336534 ; =ov01_0233C1A8 mov r1, #0xb ldr r0, [r0] @@ -15634,7 +15634,7 @@ _0233618C: cmp r0, #0 bne _023361D4 mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r2, #0 b _023362DC _023361D4: @@ -15642,12 +15642,12 @@ _023361D4: mov r0, #3 ldr r1, [r1] strb r4, [r1, #0x15] - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r2, #1 b _023362DC _023361F0: mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02336534 ; =ov01_0233C1A8 ldr r2, [r0] ldrsb r1, [r2, #0x14] @@ -15682,7 +15682,7 @@ _02336238: cmp r0, #0 bne _02336284 mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r2, #0 b _023362DC _02336284: @@ -15690,12 +15690,12 @@ _02336284: mov r0, #3 ldr r1, [r1] strb r4, [r1, #0x15] - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r2, #1 b _023362DC _023362A0: mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02336534 ; =ov01_0233C1A8 ldr r2, [r0] ldrsb r1, [r2, #0x14] @@ -15819,12 +15819,12 @@ _02336458: cmp sl, r0 blt _02336400 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02336528 _02336474: mov r0, #1 str r0, [r1, #0xdc] - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _0233653C ; =ov01_0233CA70 mvn r1, #0 str r1, [r0] @@ -15832,7 +15832,7 @@ _02336474: b _02336528 _02336494: ldrsb r0, [r2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r0, #0 bne _023364FC @@ -15846,7 +15846,7 @@ _02336494: ldr r0, _02336534 ; =ov01_0233C1A8 ldr r0, [r0] ldrsb r0, [r0, #3] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r0, #0 bne _023364FC @@ -16200,7 +16200,7 @@ _023369B8: tst r0, #8 beq _023369E0 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02336B4C ; =ov01_0233C1A8 mov r2, #0xb ldr r1, [r0] @@ -16229,7 +16229,7 @@ _023369F4: cmp r0, #0 bne _02336A3C mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #0 b _02336B44 _02336A3C: @@ -16237,12 +16237,12 @@ _02336A3C: mov r0, #3 ldr r1, [r1] strb r4, [r1, #0x15] - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #1 b _02336B44 _02336A58: mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02336B4C ; =ov01_0233C1A8 ldr r2, [r0] ldrsb r1, [r2, #0x14] @@ -16277,7 +16277,7 @@ _02336AA0: cmp r0, #0 bne _02336AEC mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #0 b _02336B44 _02336AEC: @@ -16285,12 +16285,12 @@ _02336AEC: mov r0, #3 ldr r1, [r1] strb r4, [r1, #0x15] - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #1 b _02336B44 _02336B08: mov r0, #3 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02336B4C ; =ov01_0233C1A8 ldr r2, [r0] ldrsb r1, [r2, #0x14] @@ -16562,11 +16562,11 @@ _02336E98: mov r0, #7 ldr r1, [r1] strb r7, [r1, #0x15] - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02336FFC _02336EC0: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _02336FFC _02336ECC: sub r0, r4, #0xc @@ -16679,7 +16679,7 @@ ov01_02337014: ; 0x02337014 cmp r0, #0xa bge _02337090 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _023370A4 ; =ov01_0233C1A8 ldr r2, _023370A8 ; =ov01_0233BCA4 ldr ip, [r0] @@ -16758,7 +16758,7 @@ _02337120: streq r0, [r3, #4] ldmeqia sp!, {r3, pc} mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02337170 ; =ov01_0233C1A8 mov r1, #0 ldr r0, [r0] @@ -16766,7 +16766,7 @@ _02337120: ldmia sp!, {r3, pc} _0233714C: mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02337170 ; =ov01_0233C1A8 mov r1, #0xa ldr r2, [r0] diff --git a/asm/overlay_03.s b/asm/overlay_03.s index 9ac87fd6..2d7758b3 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -9105,7 +9105,7 @@ _023448A0: ldr r3, _02344950 ; =ov03_02344970 add r2, sp, #8 str ip, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 strb r0, [r4, #5] mov r0, #3 str r0, [r4] @@ -10317,7 +10317,7 @@ _0234598C: tst r0, #8 beq _02346640 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, r4 bl sub_02043254 ldr r1, _02345A5C ; =ov03_02346BDC @@ -10473,7 +10473,7 @@ _02345B80: ldr r3, _02346654 ; =0x000008E4 mov r2, #0 str r4, [sp, #8] - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _02345A5C ; =ov03_02346BDC ldr r1, [r1] strb r0, [r1, #0x14] @@ -10824,7 +10824,7 @@ _02346098: ldr r1, [r1] str r0, [r1, #0x10] mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl sub_0203A51C ldr r0, _02345A5C ; =ov03_02346BDC mov r1, #0x3600 diff --git a/asm/overlay_04.s b/asm/overlay_04.s index 37cc1192..2d7d2fe8 100644 --- a/asm/overlay_04.s +++ b/asm/overlay_04.s @@ -1226,7 +1226,7 @@ _0233DA6C: tst r0, #8 beq _0233EEB4 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, r5 bl sub_02043254 ldr r1, _0233E28C ; =ov01_0233C1DC @@ -1412,7 +1412,7 @@ _0233DCCC: ldr r3, _0233E2B8 ; =0x000008E4 mov r2, #0 str r5, [sp, #8] - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0233E25C ; =ov04_0233F644 ldr r1, [r1] strb r0, [r1, #8] diff --git a/asm/overlay_07.s b/asm/overlay_07.s index 302d9aa4..b40af0ee 100644 --- a/asm/overlay_07.s +++ b/asm/overlay_07.s @@ -598,7 +598,7 @@ _0233D1A8: ldr r3, _0233D8FC ; =ov07_0233D9DC str r2, [sp, #8] add r2, r6, #0x1d0 - bl sub_0202C3A8 + bl CreateCollectionMenu strb r0, [r6, #4] b _0233D238 _0233D234: @@ -1241,7 +1241,7 @@ ov07_0233DAA8: ; 0x0233DAA8 tst r6, #0x400 beq _0233DB44 mov r0, #6 - bl sub_02017CCC + bl PlaySeVolumeWrapper add r2, r4, r5, lsl #2 ldrb r0, [r2, #0xe] cmp r0, #0 @@ -5192,7 +5192,7 @@ _02340F6C: ldr r1, _023414D4 ; =0x00441C33 ldr r3, _023414D8 ; =ov07_02341B20 add r2, r4, #0x2e4 - bl sub_0202D1F0 + bl CreateOptionsMenu strb r0, [r4, #0x2b8] mov r0, #0x27 str r0, [r4] @@ -5751,7 +5751,7 @@ ov07_02341738: ; 0x02341738 beq _0234177C ldr r0, _0234179C ; =ov07_02341B00 ldr r1, _023417A0 ; =ov07_02341800 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02341798 ; =ov07_02341B78 ldr r1, [r1] strb r0, [r1, #0x469] @@ -5759,7 +5759,7 @@ ov07_02341738: ; 0x02341738 _0234177C: ldr r0, _023417A4 ; =ov07_02341AF0 ldr r1, _023417A0 ; =ov07_02341800 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02341798 ; =ov07_02341B78 ldr r1, [r1] strb r0, [r1, #0x469] diff --git a/asm/overlay_09.s b/asm/overlay_09.s index f6c1db6b..1a05f314 100644 --- a/asm/overlay_09.s +++ b/asm/overlay_09.s @@ -223,13 +223,13 @@ _0233CD70: ldrsb r0, [r0, #3] cmp r0, r1 beq _0233CDB4 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0233D918 ldr r0, _0233D928 ; =ov09_0233F7E0 ldr r0, [r0] ldrsb r0, [r0, #3] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0233D928 ; =ov09_0233F7E0 mvn r1, #1 ldr r0, [r0] @@ -256,7 +256,7 @@ _0233CDB4: mov ip, #6 add r3, r5, #8 str ip, [sp] - bl ov09_0233E030 + bl CreateJukeboxTrackMenu ldr r1, _0233D928 ; =ov09_0233F7E0 ldr r2, [r1] strb r0, [r2] @@ -266,7 +266,7 @@ _0233CDB4: mvneq r0, #0 streq r0, [r1, #0x14] ldr r0, _0233D93C ; =ov09_0233F59C - bl CreateDBox + bl CreateDialogueBox ldr r3, _0233D928 ; =ov09_0233F7E0 ldr r1, _0233D940 ; =0x00000404 ldr ip, [r3] @@ -275,7 +275,7 @@ _0233CDB4: ldr r0, [r3] mov r3, #0 ldrsb r0, [r0, #1] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0233D928 ; =ov09_0233F7E0 mov r3, #0 ldr r2, [r0] @@ -295,7 +295,7 @@ _0233CE78: ldrsb r0, [r3, #1] add r2, r1, #0xed mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0233D928 ; =ov09_0233F7E0 mov r1, #0 ldr r0, [r0] @@ -308,7 +308,7 @@ _0233CEB8: ldrsb r0, [r3, #1] add r2, r1, #0xee mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0233D928 ; =ov09_0233F7E0 mov r1, #1 ldr r0, [r0] @@ -379,7 +379,7 @@ _0233CFA8: add r3, r3, #8 mov r1, #0x13 str ip, [sp] - bl ov09_0233F210 + bl CreateInputLockBox ldr r1, _0233D928 ; =ov09_0233F7E0 mov r2, #6 ldr r3, [r1] @@ -423,7 +423,7 @@ _0233D050: ldrsb r0, [r2, #1] add r2, r1, #0xed mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0233D928 ; =ov09_0233F7E0 mov r1, #0 ldr r0, [r0] @@ -436,7 +436,7 @@ _0233D098: ldrsb r0, [r2, #1] add r2, r1, #0xee mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0233D928 ; =ov09_0233F7E0 mov r1, #1 ldr r0, [r0] @@ -465,13 +465,13 @@ _0233D104: ldrsb r0, [r0, #1] cmp r0, r1 beq _0233D148 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0233D918 ldr r0, _0233D928 ; =ov09_0233F7E0 ldr r0, [r0] ldrsb r0, [r0, #1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0233D928 ; =ov09_0233F7E0 mvn r1, #1 ldr r0, [r0] @@ -493,12 +493,12 @@ _0233D148: add r2, sp, #0xe50 add r3, r3, #8 str ip, [sp, #4] - bl ov09_0233E918 + bl CreatePlaybackControlsMenu ldr r1, _0233D928 ; =ov09_0233F7E0 ldr r1, [r1] strb r0, [r1, #2] mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0233D928 ; =ov09_0233F7E0 ldr r2, [r1] strb r0, [r2, #3] @@ -527,7 +527,7 @@ _0233D148: add r2, r1, #0xf6 ldrsb r0, [r0, #3] add r3, sp, #0xe00 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox add r1, sp, #0xe00 str r1, [sp] ldr r2, _0233D958 ; =0x000004FA @@ -696,7 +696,7 @@ _0233D454: ldr r1, _0233D940 ; =0x00000404 ldrsb r0, [r0, #3] add r2, r1, #0xf7 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0233D928 ; =ov09_0233F7E0 mvn r3, #0 ldr r2, [r0] @@ -737,7 +737,7 @@ _0233D494: add r3, sp, #0x9b0 ldrsb r0, [r0, #3] add r2, r1, #0xf6 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox add r1, sp, #0x9b0 str r1, [sp] ldr r2, _0233D958 ; =0x000004FA @@ -775,7 +775,7 @@ _0233D56C: add r3, r3, #8 mov r1, #0x13 str ip, [sp] - bl ov09_0233F210 + bl CreateInputLockBox ldr r1, _0233D928 ; =ov09_0233F7E0 mov r2, #0xa ldr r3, [r1] @@ -830,7 +830,7 @@ _0233D64C: ldr r1, _0233D940 ; =0x00000404 ldrsb r0, [r0, #3] add r2, r1, #0xf7 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0233D928 ; =ov09_0233F7E0 mvn r3, #0 ldr r2, [r0] @@ -873,7 +873,7 @@ _0233D68C: ldrsb r0, [r0, #3] add r3, r3, #0xc8 add r2, r1, #0xf6 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox add r1, sp, #0x400 add r1, r1, #0xc8 str r1, [sp] @@ -946,13 +946,13 @@ _0233D808: ldrsb r0, [r0, #1] cmp r0, r1 beq _0233D84C - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0233D918 ldr r0, _0233D928 ; =ov09_0233F7E0 ldr r0, [r0] ldrsb r0, [r0, #1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0233D928 ; =ov09_0233F7E0 mvn r1, #1 ldr r0, [r0] @@ -982,13 +982,13 @@ _0233D890: ldrsb r0, [r0, #3] cmp r0, r1 beq _0233D8D4 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0233D918 ldr r0, _0233D928 ; =ov09_0233F7E0 ldr r0, [r0] ldrsb r0, [r0, #3] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0233D928 ; =ov09_0233F7E0 mvn r1, #1 ldr r0, [r0] @@ -1007,7 +1007,7 @@ _0233D8F4: cmp r0, #0 bne _0233D918 mov r0, #2 - bl sub_02017B58 + bl PlayBgmByIdVeneer mov r0, #0x14 bl ov01_023310B8 mov r0, #4 @@ -1099,7 +1099,7 @@ ov09_0233D9F8: ; 0x0233D9F8 ldrh r0, [r0, #2] cmp r0, #0 ldmeqia sp!, {r4, pc} - bl sub_02017B58 + bl PlayBgmByIdVeneer mov r1, #1 mov r0, #0 strb r1, [r4, #0x14] @@ -1315,7 +1315,7 @@ _0233DCF0: beq _0233DD1C mov r0, r7 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound ldrb r0, [r8, #0x15] cmp r0, #0 moveq r0, #1 @@ -1338,7 +1338,7 @@ _0233DD1C: bne _0233DD60 mov r0, r7 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound _0233DD60: mov r0, #0x78 str r0, [r8, #0x28] @@ -1352,7 +1352,7 @@ _0233DD70: tst r0, #4 beq _0233DDA0 mov r0, r7 - bl sub_02032960 + bl PlayMenuOptionSound ldrb r0, [r8, #0x16] cmp r0, #0 moveq r0, #1 @@ -1371,7 +1371,7 @@ _0233DDA0: mov r0, r7 beq _0233DDF0 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound cmp r6, #0 movne r0, #1 strneb r0, [r6] @@ -1381,7 +1381,7 @@ _0233DDA0: b _0233DDF8 _0233DDF0: mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound _0233DDF8: mov r0, #4 str r0, [r8, #0x2c] @@ -1393,7 +1393,7 @@ _0233DE0C: beq _0233DE48 mov r0, r7 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound mov r1, #4 mov r0, r8 str r1, [r8, #0x2c] @@ -1415,11 +1415,11 @@ _0233DE48: mov r0, r7 bne _0233DE78 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0233DEDC _0233DE78: mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, r8 bl ov09_0233DAD0 mov r0, #1 @@ -1436,11 +1436,11 @@ _0233DE94: mov r0, r7 bne _0233DEC4 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0233DEDC _0233DEC4: mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, r8 bl ov09_0233DA70 mov r0, #1 @@ -1488,7 +1488,7 @@ ov09_0233DEEC: ; 0x0233DEEC mov r1, r4 mov r0, r7 mov r4, #1 - bl sub_02032960 + bl PlayMenuOptionSound ldrb r0, [r8, #0x15] cmp r0, #0 moveq r0, r4 @@ -1520,11 +1520,11 @@ _0233DF84: mov r0, r7 beq _0233DFF0 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0233E00C _0233DFF0: mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound ldrb r0, [r8, #0x16] cmp r0, #0 moveq r0, r4 @@ -1544,8 +1544,8 @@ _0233E028: ldmia sp!, {r4, r5, r6, r7, r8, pc} arm_func_end ov09_0233DEEC - arm_func_start ov09_0233E030 -ov09_0233E030: ; 0x0233E030 + arm_func_start CreateJukeboxTrackMenu +CreateJukeboxTrackMenu: ; 0x0233E030 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x34 mov sl, r3 @@ -1610,7 +1610,7 @@ _0233E0B8: addne ip, sp, #0x14 ldmneia sb, {r0, r1, r2, r3} stmneia ip, {r0, r1, r2, r3} - ldrne r0, _0233E2CC ; =ov09_0233E3DC + ldrne r0, _0233E2CC ; =UpdateJukeboxTrackMenu orr sl, sl, #0x8000 strne r0, [sp, #0x14] bne _0233E144 @@ -1686,7 +1686,7 @@ _0233E208: ldrneb r0, [sp, #0x1b] subne r0, r1, r0 strneb r0, [sp, #0x19] - ldr r0, _0233E2CC ; =ov09_0233E3DC + ldr r0, _0233E2CC ; =UpdateJukeboxTrackMenu cmp r8, #0 str r0, [r7] str sl, [r7, #0x100] @@ -1710,7 +1710,7 @@ _0233E264: add r0, sp, #0x14 mov r1, #3 strb r2, [sp, #0x1c] - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #0x24 mov r5, r0 bl sub_02028284 @@ -1728,14 +1728,14 @@ _0233E264: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0233E2C8: .word 0x0000C402 -_0233E2CC: .word ov09_0233E3DC +_0233E2CC: .word UpdateJukeboxTrackMenu _0233E2D0: .word ov09_0233F794 - arm_func_end ov09_0233E030 + arm_func_end CreateJukeboxTrackMenu arm_func_start ov09_0233E2D4 ov09_0233E2D4: ; 0x0233E2D4 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #1 str r1, [r0, #0x1a0] mov r1, #0 @@ -1753,7 +1753,7 @@ ov09_0233E2D4: ; 0x0233E2D4 ov09_0233E308: ; 0x0233E308 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, #1 mov r2, #0 @@ -1774,7 +1774,7 @@ ov09_0233E308: ; 0x0233E308 ov09_0233E34C: ; 0x0233E34C stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, #0 mov r1, r0 @@ -1791,7 +1791,7 @@ ov09_0233E34C: ; 0x0233E34C arm_func_start ov09_0233E384 ov09_0233E384: ; 0x0233E384 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x1a0] cmp r0, #7 cmpne r0, #8 @@ -1803,7 +1803,7 @@ ov09_0233E384: ; 0x0233E384 arm_func_start ov09_0233E3A4 ov09_0233E3A4: ; 0x0233E3A4 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1a4] cmp r1, #0 beq _0233E3D4 @@ -1819,8 +1819,8 @@ _0233E3D4: ldmia sp!, {r3, pc} arm_func_end ov09_0233E3A4 - arm_func_start ov09_0233E3DC -ov09_0233E3DC: ; 0x0233E3DC + arm_func_start UpdateJukeboxTrackMenu +UpdateJukeboxTrackMenu: ; 0x0233E3DC stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x34 mov r6, r0 @@ -1957,7 +1957,7 @@ _0233E598: bl ov09_0233DB84 add r0, r4, #8 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0233E750 _0233E5D8: add r0, r4, #8 @@ -1969,7 +1969,7 @@ _0233E5D8: bne _0233E600 add r0, r4, #8 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _0233E600: mov r1, #1 mov r0, #0 @@ -1985,7 +1985,7 @@ _0233E600: _0233E62C: add r0, r4, #8 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0233E750 _0233E63C: tst r0, #2 @@ -1997,12 +1997,12 @@ _0233E63C: bl ov09_0233DB84 add r0, r4, #8 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0233E750 _0233E668: add r0, r4, #8 mov r1, #1 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #1 strb r0, [r4, #0x1a4] strb r0, [r4, #0x1a5] @@ -2108,7 +2108,7 @@ _0233E7E8: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0233E7F0: .word 0x00000408 - arm_func_end ov09_0233E3DC + arm_func_end UpdateJukeboxTrackMenu arm_func_start ov09_0233E7F4 ov09_0233E7F4: ; 0x0233E7F4 @@ -2192,8 +2192,8 @@ _0233E8EC: _0233E914: .word 0x0000C402 arm_func_end ov09_0233E7F4 - arm_func_start ov09_0233E918 -ov09_0233E918: ; 0x0233E918 + arm_func_start CreatePlaybackControlsMenu +CreatePlaybackControlsMenu: ; 0x0233E918 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x3c mov sl, r1 @@ -2275,7 +2275,7 @@ _0233E9C4: stmeqia r4, {r0, r1, r2, r3} ldmneia r0, {r0, r1, r2, r3} stmneia r4, {r0, r1, r2, r3} - ldrne r0, _0233EC1C ; =ov09_0233ED84 + ldrne r0, _0233EC1C ; =UpdatePlaybackControlsMenu str r7, [sp, #0x28] strne r0, [sp, #0x1c] ldrb r0, [sp, #0x22] @@ -2357,7 +2357,7 @@ _0233EB48: ldrneb r0, [sp, #0x23] subne r0, r1, r0 strneb r0, [sp, #0x21] - ldr r0, _0233EC1C ; =ov09_0233ED84 + ldr r0, _0233EC1C ; =UpdatePlaybackControlsMenu cmp sb, #0 str r0, [r7] str sl, [r7, #0x100] @@ -2386,7 +2386,7 @@ _0233EBA4: add r0, sp, #0x1c mov r1, #3 strb r2, [sp, #0x24] - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #0x2c mov r5, r0 bl sub_02028284 @@ -2403,13 +2403,13 @@ _0233EBA4: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0233EC18: .word ov09_0233F7A4 -_0233EC1C: .word ov09_0233ED84 - arm_func_end ov09_0233E918 +_0233EC1C: .word UpdatePlaybackControlsMenu + arm_func_end CreatePlaybackControlsMenu arm_func_start ov09_0233EC20 ov09_0233EC20: ; 0x0233EC20 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #1 str r1, [r0, #0x1a4] mov r1, #0 @@ -2428,7 +2428,7 @@ ov09_0233EC20: ; 0x0233EC20 ov09_0233EC58: ; 0x0233EC58 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, #0 mov r1, r0 @@ -2448,7 +2448,7 @@ ov09_0233EC58: ; 0x0233EC58 ov09_0233EC98: ; 0x0233EC98 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #0x1a4] cmp r0, #3 @@ -2476,7 +2476,7 @@ ov09_0233EC98: ; 0x0233EC98 arm_func_start ov09_0233ECFC ov09_0233ECFC: ; 0x0233ECFC stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x1a4] cmp r0, #7 cmpne r0, #8 @@ -2488,7 +2488,7 @@ ov09_0233ECFC: ; 0x0233ECFC arm_func_start ov09_0233ED1C ov09_0233ED1C: ; 0x0233ED1C stmdb sp!, {r4, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1a8] cmp r1, #0 beq _0233ED7C @@ -2517,8 +2517,8 @@ _0233ED7C: ldmia sp!, {r4, pc} arm_func_end ov09_0233ED1C - arm_func_start ov09_0233ED84 -ov09_0233ED84: ; 0x0233ED84 + arm_func_start UpdatePlaybackControlsMenu +UpdatePlaybackControlsMenu: ; 0x0233ED84 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x34 mov r6, r0 @@ -2643,7 +2643,7 @@ _0233EF18: bl ov09_0233DB84 add r0, r4, #8 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0233F078 _0233EF58: add r0, r4, #8 @@ -2655,7 +2655,7 @@ _0233EF58: bne _0233EF80 add r0, r4, #8 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound _0233EF80: mov r1, #1 mov r0, #0 @@ -2671,7 +2671,7 @@ _0233EF80: _0233EFAC: add r0, r4, #8 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0233F078 _0233EFBC: tst r2, #2 @@ -2683,12 +2683,12 @@ _0233EFBC: bl ov09_0233DB84 add r0, r4, #8 mov r1, #2 - bl sub_02032960 + bl PlayMenuOptionSound b _0233F078 _0233EFE8: add r0, r4, #8 mov r1, #1 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #1 strb r0, [r4, #0x1a8] strb r0, [r4, #0x1a9] @@ -2780,7 +2780,7 @@ _0233F12C: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0233F134: .word 0x00000408 - arm_func_end ov09_0233ED84 + arm_func_end UpdatePlaybackControlsMenu arm_func_start ov09_0233F138 ov09_0233F138: ; 0x0233F138 @@ -2843,8 +2843,8 @@ _0233F1DC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} arm_func_end ov09_0233F138 - arm_func_start ov09_0233F210 -ov09_0233F210: ; 0x0233F210 + arm_func_start CreateInputLockBox +CreateInputLockBox: ; 0x0233F210 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x28 mov r7, r0 @@ -2878,7 +2878,7 @@ ov09_0233F210: ; 0x0233F210 addne lr, sp, #0x18 ldmneia r7, {r0, r1, r2, r3} stmneia lr, {r0, r1, r2, r3} - ldrne r0, _0233F3BC ; =ov09_0233F3FC + ldrne r0, _0233F3BC ; =UpdateInputLockBox str r4, [sp, #0x24] strne r0, [sp, #0x18] ldrb r0, [sp, #0x1e] @@ -2918,7 +2918,7 @@ ov09_0233F210: ; 0x0233F210 cmp r0, #0 movlt r0, #0 strlt r0, [r4, #0x2ac] - ldr r0, _0233F3BC ; =ov09_0233F3FC + ldr r0, _0233F3BC ; =UpdateInputLockBox cmp r5, #0 str r0, [r4] str r6, [r4, #0x100] @@ -2937,7 +2937,7 @@ _0233F368: add r0, sp, #0x18 mov r1, #3 str r2, [r4, #0x19c] - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #8 mov r7, r0 bl sub_02028284 @@ -2955,14 +2955,14 @@ _0233F368: .align 2, 0 _0233F3B4: .word 0x0000C402 _0233F3B8: .word ov09_0233F7B4 -_0233F3BC: .word ov09_0233F3FC - arm_func_end ov09_0233F210 +_0233F3BC: .word UpdateInputLockBox + arm_func_end CreateInputLockBox arm_func_start ov09_0233F3C0 ov09_0233F3C0: ; 0x0233F3C0 stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 @@ -2972,7 +2972,7 @@ ov09_0233F3C0: ; 0x0233F3C0 arm_func_start ov09_0233F3DC ov09_0233F3DC: ; 0x0233F3DC stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x19c] cmp r0, #4 movne r0, #1 @@ -2981,8 +2981,8 @@ ov09_0233F3DC: ; 0x0233F3DC ldmia sp!, {r3, pc} arm_func_end ov09_0233F3DC - arm_func_start ov09_0233F3FC -ov09_0233F3FC: ; 0x0233F3FC + arm_func_start UpdateInputLockBox +UpdateInputLockBox: ; 0x0233F3FC stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x2c mov r5, r0 @@ -3156,17 +3156,17 @@ ov09_0233F780: .byte 0x2E, 0x62, 0x67, 0x70, 0x00, 0x00, 0x00, 0x00 .global ov09_0233F794 ov09_0233F794: - .word ov09_0233E3DC + .word UpdateJukeboxTrackMenu .byte 0x1E, 0x0F, 0x00, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov09_0233F7A4 ov09_0233F7A4: - .word ov09_0233ED84 + .word UpdatePlaybackControlsMenu .byte 0x1E, 0x0F, 0x00, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov09_0233F7B4 ov09_0233F7B4: - .word ov09_0233F3FC + .word UpdateInputLockBox .byte 0x0A, 0x08, 0x0C, 0x02 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/asm/overlay_10.s b/asm/overlay_10.s index e46d50a8..1d4f9765 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -3,8 +3,8 @@ .text - arm_func_start ov10_022BCA80 -ov10_022BCA80: ; 0x022BCA80 + arm_func_start CreateInventoryMenu +CreateInventoryMenu: ; 0x022BCA80 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x2c sub sp, sp, #0x400 @@ -25,7 +25,7 @@ ov10_022BCA80: ; 0x022BCA80 stmeqia r5, {r0, r1, r2, r3} ldmneia r6, {r0, r1, r2, r3} stmneia r5, {r0, r1, r2, r3} - ldrne r0, _022BCC5C ; =ov10_022BCE74 + ldrne r0, _022BCC5C ; =UpdateInventoryMenu orreq sl, sl, #0x300000 strne r0, [sp, #0x1c] ldrb r0, [sp, #0x22] @@ -86,7 +86,7 @@ _022BCB84: ldrneb r0, [sp, #0x23] subne r0, r1, r0 strneb r0, [sp, #0x21] - ldr r1, _022BCC5C ; =ov10_022BCE74 + ldr r1, _022BCC5C ; =UpdateInventoryMenu mov r0, #0 str r1, [r4] strb r0, [r4, #0x1a3] @@ -112,7 +112,7 @@ _022BCBE8: add r0, sp, #0x1c mov r1, #3 strb r2, [r4, #0x1a2] - bl sub_02027648 + bl NewWindowScreenCheck add r1, sp, #0xc mov r6, r0 bl sub_02028284 @@ -133,14 +133,14 @@ _022BCBE8: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022BCC58: .word ov10_022C4394 -_022BCC5C: .word ov10_022BCE74 - arm_func_end ov10_022BCA80 +_022BCC5C: .word UpdateInventoryMenu + arm_func_end CreateInventoryMenu arm_func_start ov10_022BCC60 ov10_022BCC60: ; 0x022BCC60 stmdb sp!, {r4, lr} mov r4, r1 - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, r4 add r0, r0, #4 bl sub_020331AC @@ -150,7 +150,7 @@ ov10_022BCC60: ; 0x022BCC60 arm_func_start ov10_022BCC7C ov10_022BCC7C: ; 0x022BCC7C stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #1 str r1, [r0, #0x19c] mov r1, #0 @@ -167,7 +167,7 @@ ov10_022BCC7C: ; 0x022BCC7C arm_func_start ov10_022BCCB0 ov10_022BCCB0: ; 0x022BCCB0 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r1, [r0, #0x19c] cmp r1, #3 moveq r1, #2 @@ -178,7 +178,7 @@ ov10_022BCCB0: ; 0x022BCCB0 arm_func_start ov10_022BCCCC ov10_022BCCCC: ; 0x022BCCCC stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #0 str r1, [r0, #0x19c] ldmia sp!, {r3, pc} @@ -187,7 +187,7 @@ ov10_022BCCCC: ; 0x022BCCCC arm_func_start ov10_022BCCE0 ov10_022BCCE0: ; 0x022BCCE0 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #6 str r1, [r0, #0x19c] ldmia sp!, {r3, pc} @@ -197,7 +197,7 @@ ov10_022BCCE0: ; 0x022BCCE0 ov10_022BCCF4: ; 0x022BCCF4 stmdb sp!, {r4, lr} mov r4, r0 - bl GetDialogBoxField0xC + bl GetWindowContents bl MemFree mov r0, r4 bl sub_02028194 @@ -208,7 +208,7 @@ ov10_022BCCF4: ; 0x022BCCF4 ov10_022BCD10: ; 0x022BCD10 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldr r0, [r4, #0x19c] cmp r0, #6 @@ -233,7 +233,7 @@ ov10_022BCD10: ; 0x022BCD10 arm_func_start ov10_022BCD68 ov10_022BCD68: ; 0x022BCD68 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x19c] cmp r0, #7 cmpne r0, #8 @@ -245,7 +245,7 @@ ov10_022BCD68: ; 0x022BCD68 arm_func_start ov10_022BCD88 ov10_022BCD88: ; 0x022BCD88 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r0, [r0, #0x1a0] cmp r0, #0 moveq r0, #1 @@ -257,7 +257,7 @@ ov10_022BCD88: ; 0x022BCD88 arm_func_start ov10_022BCDA8 ov10_022BCDA8: ; 0x022BCDA8 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02033064 ldmia sp!, {r3, pc} @@ -266,7 +266,7 @@ ov10_022BCDA8: ; 0x022BCDA8 arm_func_start ov10_022BCDBC ov10_022BCDBC: ; 0x022BCDBC stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r1, [r0, #0x1a0] cmp r1, #0 beq _022BCDEC @@ -286,7 +286,7 @@ _022BCDEC: ov10_022BCDF4: ; 0x022BCDF4 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 mov r0, #1 mov r1, #0 @@ -310,7 +310,7 @@ _022BCE38: arm_func_start ov10_022BCE44 ov10_022BCE44: ; 0x022BCE44 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02033414 ldmia sp!, {r3, pc} @@ -319,7 +319,7 @@ ov10_022BCE44: ; 0x022BCE44 arm_func_start ov10_022BCE58 ov10_022BCE58: ; 0x022BCE58 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldrb r2, [r0, #0x1a3] mov r1, #0 strb r1, [r0, #0x1a3] @@ -327,8 +327,8 @@ ov10_022BCE58: ; 0x022BCE58 ldmia sp!, {r3, pc} arm_func_end ov10_022BCE58 - arm_func_start ov10_022BCE74 -ov10_022BCE74: ; 0x022BCE74 + arm_func_start UpdateInventoryMenu +UpdateInventoryMenu: ; 0x022BCE74 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x30 mov r8, r0 @@ -339,7 +339,7 @@ ov10_022BCE74: ; 0x022BCE74 moveq r1, #0 ldrsb r0, [r8, #0x10] and r5, r1, #0xff - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02033414 cmp r0, #0 @@ -407,7 +407,7 @@ _022BCF6C: b _022BD200 _022BCF8C: ldrsb r0, [r8, #0x10] - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02033414 mov r7, r0 @@ -527,7 +527,7 @@ _022BD138: cmp r5, #0 beq _022BD200 ldrsb r0, [r8, #0x10] - bl GetDialogBoxField0xC + bl GetWindowContents add r0, r0, #4 bl sub_02033414 cmp r7, r0 @@ -589,7 +589,7 @@ _022BD220: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _022BD228: .word 0x00000408 - arm_func_end ov10_022BCE74 + arm_func_end UpdateInventoryMenu arm_func_start ov10_022BD22C ov10_022BD22C: ; 0x022BD22C @@ -686,7 +686,7 @@ _022BD354: arm_func_start ov10_022BD374 ov10_022BD374: ; 0x022BD374 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x19c] cmp r0, #3 moveq r0, #1 @@ -800,7 +800,7 @@ ov10_022BD474: ; 0x022BD474 add r2, sp, #0x10 orr r1, r5, r1 str r4, [sp, #0xc] - bl ov10_022BCA80 + bl CreateInventoryMenu b _022BD54C _022BD508: cmp r4, #0 @@ -819,7 +819,7 @@ _022BD508: add r2, sp, #0x10 orr r1, r6, r1 str r4, [sp, #0xc] - bl ov10_022BCA80 + bl CreateInventoryMenu _022BD54C: add sp, sp, #0xa8 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -1807,7 +1807,7 @@ _022BE200: ; jump table b _022BE418 ; case 6 _022BE21C: add r0, r7, #0x68 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldrsh r1, [r7, #0x64] add r0, r7, #0x68 bl SetSpriteIdForAnimationControl @@ -1833,7 +1833,7 @@ _022BE21C: b _022BE440 _022BE280: add r0, r7, #0x68 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldrsh r1, [r7, #0x64] add r0, r7, #0x68 bl SetSpriteIdForAnimationControl @@ -1866,7 +1866,7 @@ _022BE280: b _022BE440 _022BE300: add r0, r7, #0x68 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldrsh r1, [r7, #0x64] add r0, r7, #0x68 bl SetSpriteIdForAnimationControl @@ -1894,7 +1894,7 @@ _022BE300: b _022BE440 _022BE36C: add r0, r7, #0x68 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldrsh r1, [r7, #0x64] add r0, r7, #0x68 bl SetSpriteIdForAnimationControl @@ -4813,7 +4813,7 @@ _022C08D4: ldr r0, [r4] add r0, r0, #0x88 mla r0, r6, sb, r0 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C add r0, r6, #1 ldr r1, [r4] mov r0, r0, lsl #0x10 @@ -4918,7 +4918,7 @@ ov10_022C09E8: ; 0x022C09E8 strh r0, [r2, #4] ldr r0, [r1] add r0, r0, #8 - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C ldr r0, _022C0CC0 ; =ov10_022DC1D0 ldr r0, [r0] ldrsh r1, [r0, #4] @@ -5004,21 +5004,21 @@ _022C0B5C: add r0, sb, #7 add r8, r8, #1 strb r0, [sp, #0x45] - ldr r1, _022C0CD0 ; =ov10_022C1864 + ldr r1, _022C0CD0 ; =ProcessTeamStatsNameGender mov r0, r4 strb r8, [sp, #0x44] - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, [fp] add sb, sb, #9 add r1, r1, r7 strb r0, [r1, #0x27c] ldmia r5, {r0, r1, r2, r3} stmia r4, {r0, r1, r2, r3} - ldr r1, _022C0CD4 ; =ov10_022C1748 + ldr r1, _022C0CD4 ; =ProcessTeamStatsLvHp mov r0, r4 strb r8, [sp, #0x44] strb sb, [sp, #0x45] - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, [fp] add r1, r1, r7 add r7, r7, #1 @@ -5089,8 +5089,8 @@ _022C0CC0: .word ov10_022DC1D0 _022C0CC4: .word WAN_TABLE _022C0CC8: .word ov10_022DBFEC _022C0CCC: .word ov10_022DBFDC -_022C0CD0: .word ov10_022C1864 -_022C0CD4: .word ov10_022C1748 +_022C0CD0: .word ProcessTeamStatsNameGender +_022C0CD4: .word ProcessTeamStatsLvHp _022C0CD8: .word ov10_022DC1CC _022C0CDC: .word ov10_022DBFFC arm_func_end ov10_022C09E8 @@ -5158,7 +5158,7 @@ _022C0DA8: add r0, r0, r8 add r0, r0, #0x200 ldrsb r0, [r0, #0x80] - bl ov10_022C1748 + bl ProcessTeamStatsLvHp _022C0DCC: tst sb, #2 beq _022C0DE8 @@ -5166,7 +5166,7 @@ _022C0DCC: add r0, r0, r8 add r0, r0, #0x200 ldrsb r0, [r0, #0x7c] - bl ov10_022C1864 + bl ProcessTeamStatsNameGender _022C0DE8: tst sb, #4 beq _022C0EA8 @@ -5694,7 +5694,7 @@ ov10_022C14D0: ; 0x022C14D0 stmia ip, {r0, r1, r2, r3} mov r0, ip mov r1, #0 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _022C1594 ; =ov10_022DC1D0 ldr r2, [r1] strb r0, [r2, #0x284] @@ -5859,8 +5859,8 @@ _022C171C: _022C1744: .word ov10_022DC1D0 arm_func_end ov10_022C16D8 - arm_func_start ov10_022C1748 -ov10_022C1748: ; 0x022C1748 + arm_func_start ProcessTeamStatsLvHp +ProcessTeamStatsLvHp: ; 0x022C1748 #ifdef EUROPE #define OV10_022C1748_STACK_OFFSET 0x40 #else @@ -5946,7 +5946,7 @@ _022C182C: .align 2, 0 _022C1834: .word ov10_022DC1D0 _022C1838: .word ov10_022DC02C - arm_func_end ov10_022C1748 + arm_func_end ProcessTeamStatsLvHp arm_func_start SprintfStatic__022C183C SprintfStatic__022C183C: ; 0x022C183C @@ -5962,8 +5962,8 @@ SprintfStatic__022C183C: ; 0x022C183C bx lr arm_func_end SprintfStatic__022C183C - arm_func_start ov10_022C1864 -ov10_022C1864: ; 0x022C1864 + arm_func_start ProcessTeamStatsNameGender +ProcessTeamStatsNameGender: ; 0x022C1864 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x258 ldr r1, _022C1984 ; =ov10_022DC1D0 @@ -6046,7 +6046,7 @@ _022C197C: _022C1984: .word ov10_022DC1D0 _022C1988: .word ov10_022DBFB0 _022C198C: .word ov10_022DC058 - arm_func_end ov10_022C1864 + arm_func_end ProcessTeamStatsNameGender arm_func_start ov10_022C1990 ov10_022C1990: ; 0x022C1990 @@ -7062,8 +7062,8 @@ ov10_022C26A0: ; 0x022C26A0 ldmia sp!, {r4, pc} arm_func_end ov10_022C26A0 - arm_func_start ov10_022C26BC -ov10_022C26BC: ; 0x022C26BC + arm_func_start InitTilesetBuffer +InitTilesetBuffer: ; 0x022C26BC stmdb sp!, {r3, r4, lr} sub sp, sp, #0xc mov r4, r0 @@ -7090,7 +7090,7 @@ ov10_022C26BC: ; 0x022C26BC ldmia sp!, {r3, r4, pc} .align 2, 0 _022C271C: .word 0x00001C20 - arm_func_end ov10_022C26BC + arm_func_end InitTilesetBuffer arm_func_start ov10_022C2720 ov10_022C2720: ; 0x022C2720 @@ -8490,7 +8490,7 @@ _022C3A64: ldr r0, [sp, #0x18] mov r1, r1, asr #0x10 mov r2, #0x10 - bl ov10_022C26BC + bl InitTilesetBuffer mov r1, r5, lsl #0x10 ldr r0, [sp, #0x38] mov r1, r1, asr #0x10 @@ -9120,7 +9120,7 @@ ov10_022C434C: ; 0x022C434C .global ov10_022C4394 ov10_022C4394: - .word ov10_022BCE74 + .word UpdateInventoryMenu .byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov10_022C43A4 ov10_022C43A4: @@ -9658,8 +9658,8 @@ POISON_DAMAGE_COOLDOWN: .global LEECH_SEED_DAMAGE_COOLDOWN LEECH_SEED_DAMAGE_COOLDOWN: .byte 0x02, 0x00, 0x00, 0x00 - .global ov10_022C46B0 -ov10_022C46B0: + .global THROWN_ITEM_HIT_CHANCE +THROWN_ITEM_HIT_CHANCE: .byte 0x5A, 0x00, 0x00, 0x00 .global GEO_PEBBLE_DAMAGE GEO_PEBBLE_DAMAGE: diff --git a/asm/overlay_11.s b/asm/overlay_11.s index 8fd4cf44..dab2b3ad 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -6737,7 +6737,7 @@ _022E20A4: mov r0, r0, lsr #0x10 cmp r0, r1 beq _022E20C8 - bl sub_02017B58 + bl PlayBgmByIdVeneer b _022E2464 _022E20C8: bl sub_02017B70 @@ -6822,7 +6822,7 @@ _022E21A8: mov r2, r3, lsl #0x10 mov r1, r1, lsr #0x10 mov r2, r2, lsr #0x10 - bl sub_02017BE0 + bl PlayBgmByIdVolumeVeneer b _022E2464 _022E21F8: bl sub_02017BEC @@ -14202,7 +14202,7 @@ _022E851C: ldr r2, _022E8664 ; =0x0000025F ldrsb r0, [r3, #4] add r3, r3, #0x18 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _022E865C ; =ov11_02324CAC ldr r1, [r0] ldrsb r0, [r1, #5] @@ -14268,7 +14268,7 @@ _022E861C: mov r2, #0x260 ldrsb r0, [r3, #4] add r3, r3, #0x18 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _022E865C ; =ov11_02324CAC ldr r1, [r0] ldrsb r0, [r1, #5] @@ -14294,7 +14294,7 @@ ov11_022E866C: ; 0x022E866C cmp r1, r0 ldmneia sp!, {r3, pc} mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _022E86A0 ; =ov11_02324CAC ldr r1, [r1] strb r0, [r1, #4] @@ -14333,7 +14333,7 @@ ov11_022E86E4: ; 0x022E86E4 ldrsb r0, [r0, #4] cmp r0, r1 beq _022E8714 - bl FreeDBox + bl FreeDialogueBox ldr r0, _022E8744 ; =ov11_02324CAC mvn r1, #1 ldr r0, [r0] @@ -14365,7 +14365,7 @@ ov11_022E8748: ; 0x022E8748 cmp r0, r1 moveq r0, #0 ldmeqia sp!, {r3, pc} - bl IsDBoxActive + bl IsDialogueBoxActive ldmia sp!, {r3, pc} .align 2, 0 _022E8770: .word ov11_02324CAC @@ -27434,7 +27434,7 @@ _022F32B4: ldr r1, [r5] mla r0, r6, r4, r0 add r1, r1, #0x1a0 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer add r6, r6, #1 cmp r6, #0x40 blt _022F32B4 @@ -27461,7 +27461,7 @@ _022F3318: ldr r1, [r5] mla r0, r6, r4, r0 add r1, r1, #0x1a0 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer add r6, r6, #1 cmp r6, #0x40 blt _022F3318 @@ -27563,7 +27563,7 @@ _022F349C: ldr r1, [r5] add r0, r0, sb add r1, r1, #0x1a0 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer cmp r8, #4 movlt r1, r7 movge r1, r6 @@ -28386,7 +28386,7 @@ _022F4018: ldr r1, [r6] add r0, r0, sl add r1, r1, #0x1a0 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, [r6, #4] ldr r1, [r8, #0xc] add r0, r0, sl @@ -29166,7 +29166,7 @@ _022F4A38: mov r1, #0xff add r0, r4, #0xc strb r1, [r4, #0xa4] - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C mov r0, #0 strb r0, [r4, #0x8a] strh r0, [r4, #0x8c] @@ -29211,7 +29211,7 @@ ov11_022F4AB8: ; 0x022F4AB8 strh r1, [r6, #0xb2] add r0, r6, #0xc strh r1, [r6, #0xb4] - bl sub_0201C0B0 + bl InitAnimationControlWithSet__0201C14C mov r1, #0 strh r1, [r6, #0x8c] strh r1, [r6, #0x8e] @@ -31821,13 +31821,13 @@ ov11_022F6EFC: ; 0x022F6EFC _022F6F04: .word ov11_022F4BE4 arm_func_end ov11_022F6EFC - arm_func_start ov11_022F6F08 -ov11_022F6F08: ; 0x022F6F08 + arm_func_start InitAnimDataFromOtherAnimDataVeneer +InitAnimDataFromOtherAnimDataVeneer: ; 0x022F6F08 ldr ip, _022F6F10 ; =InitAnimDataFromOtherAnimData bx ip .align 2, 0 _022F6F10: .word InitAnimDataFromOtherAnimData - arm_func_end ov11_022F6F08 + arm_func_end InitAnimDataFromOtherAnimDataVeneer arm_func_start AnimRelatedFunction__022F6F14 AnimRelatedFunction__022F6F14: ; 0x022F6F14 @@ -36098,7 +36098,7 @@ _022FA8D8: _022FA8F0: bl KeyWaitInit mov r0, #4 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl sub_020676AC bl ov11_02300D5C add r0, r4, #0x12c @@ -41420,8 +41420,8 @@ ov11_022FEE90: ; 0x022FEE90 bx lr arm_func_end ov11_022FEE90 - arm_func_start ov11_022FEE94 -ov11_022FEE94: ; 0x022FEE94 + arm_func_start CreateTeamInfoBox +CreateTeamInfoBox: ; 0x022FEE94 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x10 mov r0, #0x378 @@ -41435,12 +41435,12 @@ ov11_022FEE94: ; 0x022FEE94 ldrne r0, _022FEF1C ; =ov11_0232245C ldmia r0, {r0, r1, r2, r3} stmia r5, {r0, r1, r2, r3} - ldr r2, _022FEF20 ; =ov11_022FEFA4 + ldr r2, _022FEF20 ; =UpdateTeamInfoBox str r4, [sp, #0xc] add r0, sp, #0 mov r1, #1 str r2, [r4] - bl sub_02027648 + bl NewWindowScreenCheck mov r2, #1 mov r5, r0 mov r1, #0 @@ -41458,13 +41458,13 @@ ov11_022FEE94: ; 0x022FEE94 .align 2, 0 _022FEF18: .word ov11_0232246C _022FEF1C: .word ov11_0232245C -_022FEF20: .word ov11_022FEFA4 - arm_func_end ov11_022FEE94 +_022FEF20: .word UpdateTeamInfoBox + arm_func_end CreateTeamInfoBox arm_func_start ov11_022FEF24 ov11_022FEF24: ; 0x022FEF24 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents mov r1, #4 str r1, [r0, #0x370] ldrsb r0, [r0, #4] @@ -41479,7 +41479,7 @@ ov11_022FEF24: ; 0x022FEF24 ov11_022FEF4C: ; 0x022FEF4C stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - bl GetDialogBoxField0xC + bl GetWindowContents mov r4, r0 ldrsb r0, [r4, #4] mvn r1, #1 @@ -41497,7 +41497,7 @@ _022FEF70: arm_func_start ov11_022FEF84 ov11_022FEF84: ; 0x022FEF84 stmdb sp!, {r3, lr} - bl GetDialogBoxField0xC + bl GetWindowContents ldr r0, [r0, #0x370] cmp r0, #5 movne r0, #1 @@ -41506,8 +41506,8 @@ ov11_022FEF84: ; 0x022FEF84 ldmia sp!, {r3, pc} arm_func_end ov11_022FEF84 - arm_func_start ov11_022FEFA4 -ov11_022FEFA4: ; 0x022FEFA4 + arm_func_start UpdateTeamInfoBox +UpdateTeamInfoBox: ; 0x022FEFA4 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0x54 sub sp, sp, #0x400 @@ -41676,7 +41676,7 @@ _022FF1C4: .word 0x0000021F _022FF1C8: .word 0x0000C402 _022FF1CC: .word 0x00000221 _022FF1D0: .word 0x00000226 - arm_func_end ov11_022FEFA4 + arm_func_end UpdateTeamInfoBox arm_func_start ov11_022FF1D4 ov11_022FF1D4: ; 0x022FF1D4 @@ -42660,7 +42660,7 @@ _022FFEA8: ldrsb r0, [r0, #1] cmp r0, r1 beq _022FFEC4 - bl FreeDBox + bl FreeDialogueBox _022FFEC4: ldr r0, _022FFEFC ; =ov11_02324D1C mvn r1, #1 @@ -42783,7 +42783,7 @@ _02300040: mvn r1, #1 cmp r0, r1 beq _02300078 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02300570 _02300078: @@ -42803,7 +42803,7 @@ _0230009C: ldrsb r0, [r0, #1] cmp r0, r1 beq _023000C8 - bl FreeDBox + bl FreeDialogueBox ldr r0, _0230057C ; =ov11_02324D1C mvn r1, #1 ldr r0, [r0, #4] @@ -42987,7 +42987,7 @@ _02300340: cmp r0, r1 bne _02300398 mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0230057C ; =ov11_02324D1C ldr r2, [r1, #4] strb r0, [r2, #1] @@ -43004,7 +43004,7 @@ _02300340: ldrsb r0, [r0, #1] ldr r2, _02300594 ; =0x0000022F add r3, sp, #8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _02300398: ldr r1, _0230057C ; =ov11_02324D1C mvn r0, #1 @@ -43080,7 +43080,7 @@ _02300494: ldrsb r0, [r0, #1] cmp r0, r1 beq _023004B8 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02300570 _023004B8: @@ -43100,7 +43100,7 @@ _023004DC: ldrsb r0, [r0, #1] cmp r0, r1 beq _02300508 - bl FreeDBox + bl FreeDialogueBox ldr r0, _0230057C ; =ov11_02324D1C mvn r1, #1 ldr r0, [r0, #4] @@ -43320,7 +43320,7 @@ ov11_023007AC: ; 0x023007AC str r0, [r1] str r2, [r0, #4] ldr r0, _023007EC ; =ov11_023225CC - bl CreateDBox + bl CreateDialogueBox ldr r1, _023007E8 ; =ov11_02324D24 ldr r1, [r1] strb r0, [r1] @@ -43339,7 +43339,7 @@ ov11_023007F0: ; 0x023007F0 cmp r0, #0 beq _02300824 ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02300848 ; =ov11_02324D24 ldr r0, [r0] bl MemFree @@ -43404,7 +43404,7 @@ _023008D0: ldr r3, [r2, #4] ldrh r2, [r3, #4] add r3, r3, #8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02300904 _023008EC: ldr r2, _02300A20 ; =ov11_02324D24 @@ -43412,7 +43412,7 @@ _023008EC: ldr r3, [r2, #4] add r2, r3, #0x58 add r3, r3, #8 - bl ShowStringInDBox + bl ShowStringInDialogueBox _02300904: ldr r0, _02300A20 ; =ov11_02324D24 ldmia r0, {r1, r2} @@ -43453,7 +43453,7 @@ _02300964: b _02300A18 _02300990: ldrsb r0, [r3] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02300A18 ldr r0, _02300A20 ; =ov11_02324D24 @@ -43601,7 +43601,7 @@ ov11_02300B50: ; 0x02300B50 ldr r1, [r1] ldr r0, _02300B98 ; =ov11_023225EC strb r2, [r1, #8] - bl CreateDBox + bl CreateDialogueBox ldr r1, _02300B94 ; =ov11_02324D2C ldr r1, [r1] strb r0, [r1] @@ -43620,7 +43620,7 @@ ov11_02300B9C: ; 0x02300B9C cmp r0, #0 beq _02300BD0 ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02300BF4 ; =ov11_02324D2C ldr r0, [r0] bl MemFree @@ -43674,7 +43674,7 @@ _02300C58: ldr r3, [r2, #4] ldrh r2, [r3, #4] add r3, r3, #8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02300C8C _02300C74: ldr r2, _02300D58 ; =ov11_02324D2C @@ -43682,7 +43682,7 @@ _02300C74: ldr r3, [r2, #4] add r2, r3, #0x58 add r3, r3, #8 - bl ShowStringInDBox + bl ShowStringInDialogueBox _02300C8C: ldr r0, _02300D58 ; =ov11_02324D2C ldr r2, [r0, #4] @@ -43704,7 +43704,7 @@ _02300CC8: ldr r0, _02300D58 ; =ov11_02324D2C ldr r0, [r0] ldrsb r0, [r0] - bl IsDBoxActive + bl IsDialogueBoxActive ldr r1, _02300D58 ; =ov11_02324D2C cmp r0, #0 ldr r2, [r1] @@ -43838,11 +43838,11 @@ _02300E5C: strb r0, [r3] ldr r0, _02300EF0 ; =ov11_0232261C mov r3, #0x10000 - bl sub_0202FBBC + bl CreateDynamicTextBox ldr r1, _02300ED8 ; =ov11_02324D34 ldr r1, [r1] strb r0, [r1, #1] - bl ov11_022FEE94 + bl CreateTeamInfoBox ldr r1, _02300ED8 ; =ov11_02324D34 mov r3, #0 ldr r2, [r1] @@ -44348,7 +44348,7 @@ _0230152C: cmp r1, r0 bne _02301554 mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _02301A10 ; =ov11_02324D48 ldr r1, [r1] strb r0, [r1, #0x254] @@ -44378,7 +44378,7 @@ _0230157C: add r0, r3, #0x200 ldrsb r0, [r0, #0x54] add r3, r3, #0x188 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldmia sp!, {r3, pc} _023015BC: bl ov11_02302618 @@ -44401,7 +44401,7 @@ _023015F0: ldr r1, _02301A1C ; =0x00300011 ldr r3, _02301A20 ; =ov11_0232271C str r2, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02301A10 ; =ov11_02324D48 ldr r1, [r1] strb r0, [r1, #0x255] @@ -44421,7 +44421,7 @@ _02301618: add r0, r3, #0x200 ldrsb r0, [r0, #0x54] add r3, r3, #0x188 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldmia sp!, {r3, pc} _02301658: ldr r0, _02301A18 ; =ov11_023226FC @@ -44429,7 +44429,7 @@ _02301658: ldr r1, _02301A1C ; =0x00300011 ldr r3, _02301A20 ; =ov11_0232271C str r2, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02301A10 ; =ov11_02324D48 ldr r1, [r1] strb r0, [r1, #0x255] @@ -44514,7 +44514,7 @@ _02301780: ldrsb r0, [r0, #0x54] add r3, r2, #0x188 mov r2, #0x3a4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldmia sp!, {r3, pc} _023017B4: mov r1, #1 @@ -44643,12 +44643,12 @@ _02301938: add r0, r3, #0x200 ldrsb r0, [r0, #0x54] add r3, r3, #0x188 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldmia sp!, {r3, pc} _023019A0: add r0, r2, #0x200 ldrsb r0, [r0, #0x54] - bl FreeDBox + bl FreeDialogueBox ldr r1, _02301A10 ; =ov11_02324D48 mvn r3, #1 ldr r2, [r1] @@ -44728,7 +44728,7 @@ _02301AA8: cmp r1, r0 bne _02301AD0 mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _02301F8C ; =ov11_02324D48 ldr r1, [r1] strb r0, [r1, #0x254] @@ -44758,7 +44758,7 @@ _02301AF8: add r0, r3, #0x200 ldrsb r0, [r0, #0x54] add r3, r3, #0x188 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldmia sp!, {r3, pc} _02301B38: bl ov11_02302618 @@ -44781,7 +44781,7 @@ _02301B6C: ldr r1, _02301F98 ; =0x00300011 ldr r3, _02301F9C ; =ov11_0232271C str r2, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02301F8C ; =ov11_02324D48 ldr r1, [r1] strb r0, [r1, #0x255] @@ -44801,7 +44801,7 @@ _02301B94: add r0, r3, #0x200 ldrsb r0, [r0, #0x54] add r3, r3, #0x188 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldmia sp!, {r3, pc} _02301BD4: ldr r0, _02301F94 ; =ov11_023226FC @@ -44809,7 +44809,7 @@ _02301BD4: ldr r1, _02301F98 ; =0x00300011 ldr r3, _02301F9C ; =ov11_0232271C str r2, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02301F8C ; =ov11_02324D48 ldr r1, [r1] strb r0, [r1, #0x255] @@ -44894,7 +44894,7 @@ _02301CFC: add r3, r2, #0x188 ldrsb r0, [r0, #0x54] mov r2, #0x3a4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldmia sp!, {r3, pc} _02301D30: mov r1, #1 @@ -45023,12 +45023,12 @@ _02301EB4: add r0, r3, #0x200 ldrsb r0, [r0, #0x54] add r3, r3, #0x188 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldmia sp!, {r3, pc} _02301F1C: add r0, r2, #0x200 ldrsb r0, [r0, #0x54] - bl FreeDBox + bl FreeDialogueBox ldr r1, _02301F8C ; =ov11_02324D48 mvn r3, #1 ldr r2, [r1] @@ -45078,14 +45078,14 @@ ov11_02301FAC: ; 0x02301FAC ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x54] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _02302000 ; =ov11_02324D48 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x54] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02302000 ; =ov11_02324D48 ldr r0, [r0] ldr r0, [r0, #4] @@ -45164,7 +45164,7 @@ _02302078: ; jump table _023020E0: add r0, r0, #0x200 ldrsb r0, [r0, #0x54] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02302554 mov r0, #3 @@ -45173,12 +45173,12 @@ _023020E0: ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x54] - bl ShowDBox + bl ShowDialogueBox b _02302554 _02302114: add r0, r0, #0x200 ldrsb r0, [r0, #0x55] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _02302170 cmp r0, #4 @@ -45280,7 +45280,7 @@ _0230221C: _0230228C: add r0, r0, #0x200 ldrsb r0, [r0, #0x55] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _023022C4 cmp r0, #4 @@ -45305,14 +45305,14 @@ _023022D4: _023022E0: add r0, r0, #0x200 ldrsb r0, [r0, #0x54] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02302554 ldr r0, _023025E4 ; =ov11_02324D48 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x54] - bl ShowDBox + bl ShowDialogueBox ldr r0, _023025E4 ; =ov11_02324D48 mov r2, #0x1a ldr r1, [r0] @@ -45505,7 +45505,7 @@ _023025A4: ldrsb r0, [r0, #0x54] cmp r0, r1 beq _023025DC - bl FreeDBox + bl FreeDialogueBox b _023025DC _023025CC: ldr r0, [r0, #0x20] @@ -45551,7 +45551,7 @@ ov11_02302618: ; 0x02302618 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x55] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _02302664 ; =ov11_02324D48 mvn r1, #1 ldr r0, [r0] @@ -45627,13 +45627,13 @@ _02302744: ldmia sp!, {r3, pc} _0230274C: ldrsb r0, [r2, #0xfc] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0230283C ldr r0, _02302844 ; =ov11_02324D4C ldr r0, [r0] ldrsb r0, [r0, #0xfc] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02302844 ; =ov11_02324D4C mov r2, #0xd ldr r1, [r0] @@ -45662,13 +45662,13 @@ _0230278C: b _0230283C _023027D0: ldrsb r0, [r2, #0xfc] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0230283C ldr r0, _02302844 ; =ov11_02324D4C ldr r0, [r0] ldrsb r0, [r0, #0xfc] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02302844 ; =ov11_02324D4C mvn r1, #1 ldr r0, [r0] @@ -45679,7 +45679,7 @@ _023027D0: ldr r0, _02302844 ; =ov11_02324D4C ldr r0, [r0] ldrsb r0, [r0, #0xfc] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02302844 ; =ov11_02324D4C mvn r1, #1 ldr r0, [r0] @@ -46151,7 +46151,7 @@ _02302E0C: cmp r1, r0 bne _023031DC mov r0, #0 - bl CreateDBox + bl CreateDialogueBox mov r1, sb ldr r3, [r1, #4] mov r2, #1 @@ -46164,7 +46164,7 @@ _02302E4C: ldr r2, _023031E8 ; =0x000002C5 mov r1, #0x10 mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, sb ldr r0, [r0, #4] mov r1, #2 @@ -46172,13 +46172,13 @@ _02302E4C: b _023031DC _02302E74: ldrsb r0, [r3, #9] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _023031DC mov r0, sb ldr r0, [r0, #4] ldrsb r0, [r0, #9] - bl ShowDBox + bl ShowDialogueBox mov r0, sb ldr r0, [r0, #4] mov r1, #3 @@ -46229,19 +46229,19 @@ _02302EC0: b _023031DC _02302F4C: ldrsb r0, [r3, #0xa] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _023031DC mov r0, sb ldr r0, [r0, #4] ldrsb r0, [r0, #0xa] - bl GetNormalMenuResult + bl GetSimpleMenuResult mov r1, sb ldr r2, [r1, #4] str r0, [r2, #4] ldr r0, [r1, #4] ldrsb r0, [r0, #0xa] - bl FreeNormalMenu + bl FreeSimpleMenu mov r0, sb ldr r1, [r0, #4] ldr r0, [r1, #4] @@ -46253,7 +46253,7 @@ _02302F4C: b _02302FE8 _02302FA8: ldrsb r0, [r1, #9] - bl FreeDBox + bl FreeDialogueBox mov r0, sb ldr r0, [r0, #4] mov r1, #0xb @@ -46261,7 +46261,7 @@ _02302FA8: b _023031DC _02302FC4: ldrsb r0, [r1, #9] - bl FreeDBox + bl FreeDialogueBox mov r0, sb ldr r0, [r0, #4] mov r1, #1 @@ -46278,7 +46278,7 @@ _02302FF4: ldr r2, _023031F8 ; =0x000002C9 add r3, r3, #0x13c mov r1, #0x10 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, sb ldr r0, [r0, #4] mov r1, #6 @@ -46286,13 +46286,13 @@ _02302FF4: b _023031DC _0230301C: ldrsb r0, [r3, #9] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _023031DC mov r0, sb ldr r0, [r0, #4] ldrsb r0, [r0, #9] - bl ShowDBox + bl ShowDialogueBox mov r0, sb ldr r0, [r0, #4] mov r1, #7 @@ -46305,7 +46305,7 @@ _02303050: ldr r3, _02303204 ; =ov11_02322798 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper mov r1, sb ldr r3, [r1, #4] mov r2, #8 @@ -46315,19 +46315,19 @@ _02303050: b _023031DC _02303088: ldrsb r0, [r3, #0xa] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _023031DC mov r0, sb ldr r0, [r0, #4] ldrsb r0, [r0, #0xa] - bl GetNormalMenuResult + bl GetSimpleMenuResult mov r1, sb ldr r2, [r1, #4] str r0, [r2, #4] ldr r0, [r1, #4] ldrsb r0, [r0, #0xa] - bl FreeNormalMenu + bl FreeSimpleMenu mov r0, sb ldr r1, [r0, #4] ldr r0, [r1, #4] @@ -46348,7 +46348,7 @@ _023030F4: mov r1, #0x218 add r2, r1, #0xb2 add r3, r3, #0x13c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, sb ldr r0, [r0, #4] mov r1, #0xa @@ -46356,7 +46356,7 @@ _023030F4: b _023031DC _0230311C: ldrsb r0, [r3, #9] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 moveq r0, sb ldreq r0, [r0, #4] @@ -46403,7 +46403,7 @@ _023031C0: mov r0, sb ldr r0, [r0, #4] ldrsb r0, [r0, #9] - bl FreeDBox + bl FreeDialogueBox mov r0, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _023031DC: @@ -46609,14 +46609,14 @@ _023034A0: _023034A8: add r0, r2, #0xc00 ldrsb r0, [r0, #0x7d] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _023035B4 ldr r0, _023035BC ; =ov11_02324D54 ldr r0, [r0] add r0, r0, #0xc00 ldrsb r0, [r0, #0x7d] - bl ShowDBox + bl ShowDialogueBox ldr r0, _023035BC ; =ov11_02324D54 mov r2, #0xd ldr r1, [r0] @@ -46647,14 +46647,14 @@ _023034F4: _02303538: add r0, r2, #0xc00 ldrsb r0, [r0, #0x7d] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _023035B4 ldr r0, _023035BC ; =ov11_02324D54 ldr r0, [r0] add r0, r0, #0xc00 ldrsb r0, [r0, #0x7d] - bl ShowDBox + bl ShowDialogueBox ldr r0, _023035BC ; =ov11_02324D54 mvn r1, #1 ldr r0, [r0] @@ -46667,7 +46667,7 @@ _02303538: ldr r0, [r0] add r0, r0, #0xc00 ldrsb r0, [r0, #0x7d] - bl FreeDBox + bl FreeDialogueBox ldr r0, _023035BC ; =ov11_02324D54 mvn r1, #1 ldr r0, [r0] @@ -47057,7 +47057,7 @@ _02303A20: ldr r2, [r3, #0x40] sub r2, r2, #2 str r2, [r3, #0x10] - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02303AF8 ; =ov11_02324D58 mov r2, #1 ldr r3, [r1, #4] @@ -47180,7 +47180,7 @@ _02303BFC: ldr r3, _02303D74 ; =ov11_023228F0 add r2, r1, #0xf8 mov r1, #0x33 - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02303D68 ; =ov11_02324D58 ldr r2, [r1, #4] strb r0, [r2, #2] @@ -47198,7 +47198,7 @@ _02303C5C: add r2, r1, #0xf8 ldr r3, _02303D78 ; =ov11_02322910 mov r1, #0x33 - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02303D68 ; =ov11_02324D58 ldr r1, [r1, #4] strb r0, [r1, #2] @@ -47254,7 +47254,7 @@ _02303D24: ldmia sp!, {r3, pc} _02303D4C: ldrsb r0, [r3, #2] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _02303D68 ; =ov11_02324D58 mov r1, #4 ldr r0, [r0, #4] @@ -47293,7 +47293,7 @@ _02303DA0: ; jump table b _0230422C ; case 6 _02303DBC: ldrsb r0, [r2, #2] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #5 addls pc, pc, r0, lsl #2 b _0230428C @@ -47478,7 +47478,7 @@ _0230404C: b _0230428C _0230406C: ldrsb r0, [r2, #2] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #4 addls pc, pc, r0, lsl #2 b _0230428C @@ -47617,7 +47617,7 @@ _02304250: b _0230428C _02304268: ldrsb r0, [r2, #2] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _02304298 ; =ov11_02324D58 mvn r3, #1 ldr r2, [r0, #4] @@ -48625,7 +48625,7 @@ _02304EA8: mov r1, #8 ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0230543C _02304EDC: mov r0, #3 @@ -48634,7 +48634,7 @@ _02304EDC: ldr r0, _02305444 ; =ov11_02324D84 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02305444 ; =ov11_02324D84 mov r3, #3 ldr r1, [r0] @@ -48644,7 +48644,7 @@ _02304EDC: mov r1, #8 ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0230543C _02304F24: add r0, r4, #0x1b0 @@ -48726,7 +48726,7 @@ _02304FE4: ldr r0, _02305444 ; =ov11_02324D84 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02305444 ; =ov11_02324D84 mov r4, #0x15 ldr r3, [r0] @@ -48736,7 +48736,7 @@ _02304FE4: add r2, r4, #0x2bc ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0230543C _0230508C: mov r4, #3 @@ -48746,7 +48746,7 @@ _0230508C: ldr r3, _0230545C ; =ov11_02322BC8 add r2, sp, #0x68 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02305444 ; =ov11_02324D84 ldr r1, [r1] strb r0, [r1, #0x4a] @@ -48782,7 +48782,7 @@ _023050BC: mov r4, r4, lsl #0x10 mov r4, r4, lsr #0x10 stmib sp, {r4, ip} - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _02305444 ; =ov11_02324D84 ldr r1, [r1] strb r0, [r1, #0x4b] @@ -48833,7 +48833,7 @@ _02305138: ldr r3, [r0] ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02305444 ; =ov11_02324D84 ldr r0, [r0] ldr r0, [r0, #0x44] @@ -48881,7 +48881,7 @@ _0230527C: ldr r0, _02305444 ; =ov11_02324D84 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02305444 ; =ov11_02324D84 mov r3, #5 ldr r1, [r0] @@ -48891,7 +48891,7 @@ _0230527C: mov r1, #8 ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0230543C _023052D0: mov r4, #3 @@ -48901,7 +48901,7 @@ _023052D0: ldr r3, _0230545C ; =ov11_02322BC8 add r2, sp, #0x100 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02305444 ; =ov11_02324D84 ldr r1, [r1] strb r0, [r1, #0x4a] @@ -48924,7 +48924,7 @@ _02305310: ldr r3, [r0] ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0230543C _02305348: ldr r0, _02305478 ; =ov11_02322BB8 @@ -48933,14 +48933,14 @@ _02305348: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02305444 ; =ov11_02324D84 ldr r1, [r1] strb r0, [r1, #0x4a] b _0230543C _02305374: ldrsb r0, [r4, #0x48] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02305444 ; =ov11_02324D84 mvn r2, #1 ldr r1, [r0] @@ -48990,7 +48990,7 @@ _02305408: mov r1, #0x18 ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _0230543C: add sp, sp, #0x198 ldmia sp!, {r3, r4, r5, pc} @@ -49086,7 +49086,7 @@ _02305560: mov r1, #8 ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02305AF4 _02305594: mov r0, #3 @@ -49095,7 +49095,7 @@ _02305594: ldr r0, _02305AFC ; =ov11_02324D84 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02305AFC ; =ov11_02324D84 mov r3, #3 ldr r1, [r0] @@ -49105,7 +49105,7 @@ _02305594: mov r1, #8 ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02305AF4 _023055DC: add r0, r4, #0x1b0 @@ -49187,7 +49187,7 @@ _0230569C: ldr r0, _02305AFC ; =ov11_02324D84 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02305AFC ; =ov11_02324D84 mov r4, #0x15 ldr r3, [r0] @@ -49197,7 +49197,7 @@ _0230569C: add r2, r4, #0x2bc ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02305AF4 _02305744: mov r4, #3 @@ -49207,7 +49207,7 @@ _02305744: ldr r3, _02305B14 ; =ov11_02322BC8 add r2, sp, #0xb0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02305AFC ; =ov11_02324D84 ldr r1, [r1] strb r0, [r1, #0x4a] @@ -49243,7 +49243,7 @@ _02305774: mov r4, r4, lsl #0x10 mov r4, r4, lsr #0x10 stmib sp, {r4, ip} - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _02305AFC ; =ov11_02324D84 ldr r1, [r1] strb r0, [r1, #0x4b] @@ -49294,7 +49294,7 @@ _023057F0: ldr r3, [r0] ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02305AFC ; =ov11_02324D84 ldr r0, [r0] ldr r0, [r0, #0x44] @@ -49342,7 +49342,7 @@ _02305934: ldr r0, _02305AFC ; =ov11_02324D84 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02305AFC ; =ov11_02324D84 mov r3, #5 ldr r1, [r0] @@ -49352,7 +49352,7 @@ _02305934: mov r1, #8 ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02305AF4 _02305988: mov r4, #3 @@ -49362,7 +49362,7 @@ _02305988: ldr r3, _02305B14 ; =ov11_02322BC8 add r2, sp, #0x18 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02305AFC ; =ov11_02324D84 ldr r1, [r1] strb r0, [r1, #0x4a] @@ -49385,7 +49385,7 @@ _023059C8: ldr r3, [r0] ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02305AF4 _02305A00: ldr r0, _02305B30 ; =ov11_02322BB8 @@ -49394,14 +49394,14 @@ _02305A00: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02305AFC ; =ov11_02324D84 ldr r1, [r1] strb r0, [r1, #0x4a] b _02305AF4 _02305A2C: ldrsb r0, [r4, #0x48] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02305AFC ; =ov11_02324D84 mvn r2, #1 ldr r1, [r0] @@ -49451,7 +49451,7 @@ _02305AC0: mov r1, #0x18 ldrsb r0, [r3, #0x48] add r3, r3, #0x15c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _02305AF4: add sp, sp, #0x198 ldmia sp!, {r3, r4, r5, pc} @@ -49553,7 +49553,7 @@ _02305BE0: ; jump table b _02306050 ; case 22 _02305C3C: ldrsb r0, [r3, #0x4a] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _02305C70 cmp r0, #2 @@ -49573,7 +49573,7 @@ _02305C70: b _023060C0 _02305C80: ldrsb r0, [r3, #0x4a] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _02305CB4 cmp r0, #2 @@ -49593,7 +49593,7 @@ _02305CB4: b _023060C0 _02305CC4: ldrsb r0, [r3, #0x4a] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _02305CF8 cmp r0, #2 @@ -49634,7 +49634,7 @@ _02305D08: ldr r1, [r1] str r0, [r1, #0x44] mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _02306148 ; =ov11_02324D84 ldr r0, [r0] ldrsb r0, [r0, #0x49] @@ -49667,7 +49667,7 @@ _02305D9C: cmp r0, #0 bne _02305DE4 mov r0, #5 - bl sub_02017CCC + bl PlaySeVolumeWrapper _02305DE4: bl SortItemsInBag bl GetNbItemsInBag @@ -49755,7 +49755,7 @@ _02305F00: b _023060C0 _02305F24: ldrsb r0, [r3, #0x4a] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #6 addls pc, pc, r0, lsl #2 b _023060C0 @@ -49839,13 +49839,13 @@ _02306044: b _023060C4 _02306050: ldrsb r0, [r3, #0x48] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _023060C0 ldr r0, _02306148 ; =ov11_02324D84 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02306148 ; =ov11_02324D84 mov r2, #0x18 ldr r1, [r0] @@ -49856,13 +49856,13 @@ _02306050: b _023060C0 _02306090: ldrsb r0, [r3, #0x48] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _023060C0 ldr r0, _02306148 ; =ov11_02324D84 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02306148 ; =ov11_02324D84 ldr r0, [r0] ldr r0, [r0, #0x3c] @@ -49898,7 +49898,7 @@ _02306120: str r1, [r3, #0x50] ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl FreeDBox + bl FreeDialogueBox b _02306140 _02306138: mov r0, #4 @@ -49923,7 +49923,7 @@ ov11_0230614C: ; 0x0230614C ldr r0, _02306190 ; =ov11_02324D84 ldr r0, [r0] ldrsb r0, [r0, #0x4a] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _02306190 ; =ov11_02324D84 mvn r1, #1 ldr r0, [r0] @@ -49943,7 +49943,7 @@ ov11_02306194: ; 0x02306194 cmp r1, r0 ldmneia sp!, {r3, pc} mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _023061C8 ; =ov11_02324D84 ldr r1, [r1] strb r0, [r1, #0x48] @@ -50096,7 +50096,7 @@ _02306388: mov r2, #0x2e0 ldrsb r0, [r3, #0x21] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02306760 _023063BC: mov r0, #3 @@ -50105,7 +50105,7 @@ _023063BC: ldr r0, _02306768 ; =ov11_02324D88 ldr r0, [r0] ldrsb r0, [r0, #0x21] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02306768 ; =ov11_02324D88 mov r3, #3 ldr r1, [r0] @@ -50115,7 +50115,7 @@ _023063BC: mov r1, #8 ldrsb r0, [r3, #0x21] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02306760 _02306404: ldr r0, _0230676C ; =ov11_02322C10 @@ -50124,7 +50124,7 @@ _02306404: ldr r3, _02306774 ; =ov11_02322C38 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02306768 ; =ov11_02324D88 ldr r1, [r1] strb r0, [r1, #0x22] @@ -50134,14 +50134,14 @@ _02306430: ldr r0, _02306768 ; =ov11_02324D88 ldr r0, [r0] ldrsb r0, [r0, #0x21] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02306768 ; =ov11_02324D88 ldr r2, _02306778 ; =0x000002EA ldr r3, [r0] mov r1, #8 ldrsb r0, [r3, #0x21] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02306768 ; =ov11_02324D88 mov r1, #5 ldr r0, [r0] @@ -50157,7 +50157,7 @@ _02306474: ldr r1, _0230677C ; =0x00300031 ldr r3, _02306780 ; =ov11_02322C20 add r2, r2, #0x8c - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02306768 ; =ov11_02324D88 mov r2, #6 ldr r3, [r1] @@ -50167,18 +50167,18 @@ _02306474: b _02306760 _023064B8: ldrsb r0, [r2, #0x22] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _02306760 ldr r0, _02306768 ; =ov11_02324D88 ldr r0, [r0] ldrsb r0, [r0, #0x22] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _02306768 ; =ov11_02324D88 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #0x22] - bl FreeNormalMenu + bl FreeSimpleMenu cmp r4, #2 beq _023064FC cmp r4, #3 @@ -50220,7 +50220,7 @@ _02306538: ldr r3, [r0] ldrsb r0, [r3, #0x21] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02306768 ; =ov11_02324D88 ldr r0, [r0] ldrsh r0, [r0, #0xc] @@ -50266,7 +50266,7 @@ _02306610: mov r1, #0x13 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02306768 ; =ov11_02324D88 ldr r1, [r1] strb r0, [r1, #0x22] @@ -50322,7 +50322,7 @@ _023066C0: b _02306760 _023066F4: ldrsb r0, [r2, #0x21] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02306768 ; =ov11_02324D88 mvn r3, #1 ldr r2, [r0] @@ -50349,7 +50349,7 @@ _0230672C: mov r1, #0x18 ldrsb r0, [r3, #0x21] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _02306760: add sp, sp, #0x7c ldmia sp!, {r3, r4, pc} @@ -50433,7 +50433,7 @@ _02306858: mov r2, #0x2e0 ldrsb r0, [r3, #0x21] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02306C30 _0230688C: mov r0, #3 @@ -50442,7 +50442,7 @@ _0230688C: ldr r0, _02306C38 ; =ov11_02324D88 ldr r0, [r0] ldrsb r0, [r0, #0x21] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02306C38 ; =ov11_02324D88 mov r3, #3 ldr r1, [r0] @@ -50452,7 +50452,7 @@ _0230688C: mov r1, #8 ldrsb r0, [r3, #0x21] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _02306C30 _023068D4: ldr r0, _02306C3C ; =ov11_02322C10 @@ -50461,7 +50461,7 @@ _023068D4: ldr r3, _02306C44 ; =ov11_02322C38 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02306C38 ; =ov11_02324D88 ldr r1, [r1] strb r0, [r1, #0x22] @@ -50471,14 +50471,14 @@ _02306900: ldr r0, _02306C38 ; =ov11_02324D88 ldr r0, [r0] ldrsb r0, [r0, #0x21] - bl ShowDBox + bl ShowDialogueBox ldr r0, _02306C38 ; =ov11_02324D88 ldr r2, _02306C48 ; =0x000002EA ldr r3, [r0] mov r1, #8 ldrsb r0, [r3, #0x21] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02306C38 ; =ov11_02324D88 mov r1, #5 ldr r0, [r0] @@ -50494,7 +50494,7 @@ _02306944: ldr r1, _02306C4C ; =0x00300031 ldr r3, _02306C50 ; =ov11_02322C20 add r2, r2, #0x8c - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02306C38 ; =ov11_02324D88 mov r2, #6 ldr r3, [r1] @@ -50504,18 +50504,18 @@ _02306944: b _02306C30 _02306988: ldrsb r0, [r2, #0x22] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _02306C30 ldr r0, _02306C38 ; =ov11_02324D88 ldr r0, [r0] ldrsb r0, [r0, #0x22] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _02306C38 ; =ov11_02324D88 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #0x22] - bl FreeNormalMenu + bl FreeSimpleMenu cmp r4, #2 beq _023069CC cmp r4, #3 @@ -50557,7 +50557,7 @@ _02306A08: ldr r3, [r0] ldrsb r0, [r3, #0x21] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _02306C38 ; =ov11_02324D88 ldr r0, [r0] ldrsh r0, [r0, #0xc] @@ -50603,7 +50603,7 @@ _02306AE0: mov r1, #0x13 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _02306C38 ; =ov11_02324D88 ldr r1, [r1] strb r0, [r1, #0x22] @@ -50659,7 +50659,7 @@ _02306B90: b _02306C30 _02306BC4: ldrsb r0, [r2, #0x21] - bl FreeDBox + bl FreeDialogueBox ldr r0, _02306C38 ; =ov11_02324D88 mvn r3, #1 ldr r2, [r0] @@ -50686,7 +50686,7 @@ _02306BFC: mov r1, #0x18 ldrsb r0, [r3, #0x21] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _02306C30: add sp, sp, #0x7c ldmia sp!, {r3, r4, pc} @@ -50773,7 +50773,7 @@ _02306CE4: ; jump table b _02307070 ; case 22 _02306D40: ldrsb r0, [r2, #0x22] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 ldrne r1, _023071C0 ; =ov11_02324D88 ldrne r1, [r1] @@ -50803,7 +50803,7 @@ _02306DA0: ldr r0, _023071C0 ; =ov11_02324D88 ldr r0, [r0] ldrsb r0, [r0, #0x21] - bl FreeDBox + bl FreeDialogueBox ldr r0, _023071C0 ; =ov11_02324D88 mvn r3, #1 ldr r1, [r0] @@ -50840,7 +50840,7 @@ _02306DE8: ldr r1, [r1] str r0, [r1, #4] mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl sub_0203A5F0 bl sub_0203A51C ldr r0, _023071C0 ; =ov11_02324D88 @@ -50893,7 +50893,7 @@ _02306ED0: b _02307120 _02306EFC: ldrsb r0, [r2, #0x22] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #7 addls pc, pc, r0, lsl #2 b _02307120 @@ -50998,13 +50998,13 @@ _02307068: b _02307124 _02307070: ldrsb r0, [r2, #0x21] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02307120 ldr r0, _023071C0 ; =ov11_02324D88 ldr r0, [r0] ldrsb r0, [r0, #0x21] - bl ShowDBox + bl ShowDialogueBox ldr r0, _023071C0 ; =ov11_02324D88 mov r2, #0x18 ldr r1, [r0] @@ -51015,13 +51015,13 @@ _02307070: b _02307120 _023070B0: ldrsb r0, [r2, #0x21] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02307120 ldr r0, _023071C0 ; =ov11_02324D88 ldr r0, [r0] ldrsb r0, [r0, #0x21] - bl ShowDBox + bl ShowDialogueBox ldr r0, _023071C0 ; =ov11_02324D88 ldr r0, [r0] ldr r0, [r0, #0x14] @@ -51077,7 +51077,7 @@ _0230717C: ldrsb r0, [r0, #0x21] cmp r0, r1 beq _023071B8 - bl FreeDBox + bl FreeDialogueBox ldr r0, _023071C0 ; =ov11_02324D88 mvn r1, #1 ldr r0, [r0] @@ -51106,7 +51106,7 @@ ov11_023071C4: ; 0x023071C4 ldr r0, _02307208 ; =ov11_02324D88 ldr r0, [r0] ldrsb r0, [r0, #0x22] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _02307208 ; =ov11_02324D88 mvn r1, #1 ldr r0, [r0] @@ -51126,7 +51126,7 @@ ov11_0230720C: ; 0x0230720C cmp r1, r0 ldmneia sp!, {r3, pc} mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _02307240 ; =ov11_02324D88 ldr r1, [r1] strb r0, [r1, #0x21] @@ -51274,7 +51274,7 @@ _023073FC: ldr r2, [r2] strb r0, [r2, #4] ldr r0, _023082BC ; =ov11_02322C88 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _023082B4 ; =ov11_02324D8C mvn r3, #0 ldr r4, [r1] @@ -51326,7 +51326,7 @@ _023074EC: cmp r0, #0 bne _023074FC mov r0, #5 - bl sub_02017CCC + bl PlaySeVolumeWrapper _023074FC: bl SortItemsInBag ldr r0, _023082B4 ; =ov11_02324D8C @@ -51561,7 +51561,7 @@ _02307840: tst r0, #8 beq _02308CF0 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _023082B4 ; =ov11_02324D8C ldr r0, [r0] ldrsb r0, [r0, #4] @@ -51800,7 +51800,7 @@ _02307BCC: mov r1, #0x18 ldrsb r0, [r3, #8] add r3, r3, #0xb4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0xd ldr r0, [r0] @@ -51864,7 +51864,7 @@ _02307C78: mov r1, #0x18 ldrsb r0, [r3, #8] add r3, r3, #0xb4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0x14 ldr r0, [r0] @@ -51872,13 +51872,13 @@ _02307C78: b _02308CF0 _02307CD0: ldrsb r0, [r4, #8] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02308CF0 ldr r0, _023082B4 ; =ov11_02324D8C ldr r0, [r0] ldrsb r0, [r0, #8] - bl ShowDBox + bl ShowDialogueBox bl ov11_02308F14 ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0x15 @@ -51946,7 +51946,7 @@ _02307D90: mov r1, #0x18 ldrsb r0, [r3, #8] add r3, r3, #0xb4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _023082B4 ; =ov11_02324D8C ldr r1, [r0] ldr r0, [r1, #0x244] @@ -52028,7 +52028,7 @@ _02307ECC: mov r1, #0x18 ldrsb r0, [r3, #8] add r3, r3, #0xb4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0x17 ldr r3, [r0] @@ -52040,13 +52040,13 @@ _02307ECC: b _02308CF0 _02307F20: ldrsb r0, [r4, #8] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02308CF0 ldr r0, _023082B4 ; =ov11_02324D8C ldr r0, [r0] ldrsb r0, [r0, #8] - bl ShowDBox + bl ShowDialogueBox bl ov11_02308F14 ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0x10 @@ -52233,7 +52233,7 @@ _023081D0: ldr r3, _02308318 ; =ov11_02322CF0 add r2, r1, #0x1c mov r1, #0x33 - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _023082B4 ; =ov11_02324D8C mov r2, #0x20 ldr r3, [r1] @@ -52243,18 +52243,18 @@ _023081D0: b _02308CF0 _02308214: ldrsb r0, [r4, #0xc] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _02308CF0 ldr r0, _023082B4 ; =ov11_02324D8C ldr r0, [r0] ldrsb r0, [r0, #0xc] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _023082B4 ; =ov11_02324D8C mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #0xc] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _023082B4 ; =ov11_02324D8C mvn r1, #1 ldr r0, [r0] @@ -52387,7 +52387,7 @@ _0230841C: mov r1, #0x18 ldrsb r0, [r3, #8] add r3, r3, #0xb4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0x24 ldr r0, [r0] @@ -52395,7 +52395,7 @@ _0230841C: b _02308CF0 _02308450: ldrsb r0, [r4, #8] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 ldreq r0, _023082B4 ; =ov11_02324D8C moveq r1, #0x25 @@ -52491,7 +52491,7 @@ _02308594: strb r2, [r1, #7] ldr r0, [r0] ldrsb r0, [r0, #8] - bl ShowDBox + bl ShowDialogueBox bl ov11_02308F14 b _02308CF0 _023085C8: @@ -52574,7 +52574,7 @@ _023086B0: mov r1, #0x18 ldrsb r0, [r3, #8] add r3, r3, #0xb4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _023082B4 ; =ov11_02324D8C ldr r0, [r0] add r0, r0, #0x238 @@ -52613,7 +52613,7 @@ _02308748: mov r1, #0x18 ldrsb r0, [r3, #8] add r3, r3, #0xb4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0x29 ldr r0, [r0] @@ -52627,7 +52627,7 @@ _023087A0: add r2, r1, #0xf10 ldrsb r0, [r0, #8] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0x1e ldr r0, [r0] @@ -52635,13 +52635,13 @@ _023087A0: b _02308CF0 _023087D4: ldrsb r0, [r4, #8] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02308CF0 ldr r0, _023082B4 ; =ov11_02324D8C ldr r0, [r0] ldrsb r0, [r0, #8] - bl ShowDBox + bl ShowDialogueBox bl ov11_02308F14 ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0x21 @@ -52650,13 +52650,13 @@ _023087D4: b _02308CF0 _0230880C: ldrsb r0, [r4, #8] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02308CF0 ldr r0, _023082B4 ; =ov11_02324D8C ldr r0, [r0] ldrsb r0, [r0, #8] - bl ShowDBox + bl ShowDialogueBox bl ov11_02308F14 ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0 @@ -52755,7 +52755,7 @@ _02308940: mov r1, #0x18 ldrsb r0, [r3, #8] add r3, r3, #0xb4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #6 ldr r0, [r0] @@ -52763,13 +52763,13 @@ _02308940: b _02308CF0 _023089C0: ldrsb r0, [r4, #8] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02308CF0 ldr r0, _023082B4 ; =ov11_02324D8C ldr r0, [r0] ldrsb r0, [r0, #8] - bl ShowDBox + bl ShowDialogueBox bl ov11_02304AC4 cmp r0, #0 ldreq r0, _023082B4 ; =ov11_02324D8C @@ -52870,7 +52870,7 @@ _02308AB4: mov r4, r4, lsl #0x10 mov r4, r4, lsr #0x10 stmib sp, {r4, r6} - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _023082B4 ; =ov11_02324D8C mov r2, #0xb ldr r3, [r1] @@ -52932,7 +52932,7 @@ _02308C1C: mov r2, #0x2b4 ldrsb r0, [r0, #8] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0xd ldr r0, [r0] @@ -52940,13 +52940,13 @@ _02308C1C: b _02308CF0 _02308C4C: ldrsb r0, [r4, #8] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _02308CF0 ldr r0, _023082B4 ; =ov11_02324D8C ldr r0, [r0] ldrsb r0, [r0, #8] - bl ShowDBox + bl ShowDialogueBox bl ov11_02308F14 ldr r0, _023082B4 ; =ov11_02324D8C mov r1, #0x10 @@ -53144,7 +53144,7 @@ ov11_02308EDC: ; 0x02308EDC cmp r1, r0 ldmneia sp!, {r3, pc} mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _02308F10 ; =ov11_02324D8C ldr r1, [r1] strb r0, [r1, #8] @@ -53162,7 +53162,7 @@ ov11_02308F14: ; 0x02308F14 ldrsb r0, [r0, #8] cmp r0, r1 ldmeqia sp!, {r3, pc} - bl FreeDBox + bl FreeDialogueBox ldr r0, _02308F48 ; =ov11_02324D8C mvn r1, #1 ldr r0, [r0] @@ -54353,7 +54353,7 @@ _02309F60: beq _02309FAC bl GetActiveTeamMember ldrsh r0, [r0, #8] - bl sub_02056264 + bl CheckTeamMemberIdx cmp r0, #0 streq fp, [r8] streqh r6, [r8, #4] @@ -54550,7 +54550,7 @@ _0230A1F4: ldr r3, _0230A2CC ; =ov11_0230A2D0 add r2, sp, #8 str r4, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _0230A2B0 ; =ov11_02324D94 mov r2, #4 ldr r3, [r1] @@ -55980,7 +55980,7 @@ _0230B5A8: str r6, [sp, #4] add r2, r2, #0x4400 str r5, [sp, #8] - bl sub_0202C3A8 + bl CreateCollectionMenu mov r2, r8 ldr r1, [r2, #4] cmp r4, #3 @@ -56111,7 +56111,7 @@ ov11_0230B78C: ; 0x0230B78C cmp r0, #0 beq _0230B7E8 mov r0, r1 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r1, #0 strb r1, [r5, #4] add r0, r4, #0x1400 @@ -56125,7 +56125,7 @@ _0230B7E8: cmp r0, r1 bge _0230B834 mov r0, #6 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #1 strb r0, [r5, #4] bl ov11_0230B874 @@ -56140,7 +56140,7 @@ _0230B7E8: b _0230B83C _0230B834: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper _0230B83C: ldr r0, _0230B870 ; =ov11_02324DA4 ldr r1, [r0, #4] @@ -56447,7 +56447,7 @@ _0230BC00: add r2, r2, #0x22c add r2, r2, #0x4400 stmib sp, {ip, lr} - bl sub_0202C3A8 + bl CreateCollectionMenu ldr r2, _0230BCD8 ; =ov11_02324DA4 ldr r1, [r2, #4] add r1, r1, #0x1000 @@ -59989,7 +59989,7 @@ ov11_0230E7EC: ; 0x0230E7EC ldr r3, _0230E8C4 ; =0x00003FCA mov r1, r0 mov r2, r0 - bl sub_0202FE2C + bl CreateControlsChart ldr r1, _0230E8C0 ; =ov11_02324DDC ldr r1, [r1, #4] strb r0, [r1, #8] @@ -60553,7 +60553,7 @@ _0230EF9C: add r1, r1, #0x1f8 add r0, r6, r4 add r1, r1, #0x400 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer add r0, r6, r4 mov r1, #8 bl ov11_022F4974 @@ -61347,7 +61347,7 @@ _0230FA20: beq _0230FB24 add r0, r4, #0xf400 add r1, r1, #0x6c0 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer add r0, r4, #0xf400 mov r1, #0xe bl ov11_022F4974 @@ -61371,7 +61371,7 @@ _0230FABC: add sb, r0, #0xf000 add r0, sb, r8 add r1, r1, #0x6c0 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer add r0, sb, r8 rsb r1, r5, #0x20 bl ov11_022F4974 @@ -61509,7 +61509,7 @@ _0230FC7C: add r0, r4, #0xf400 add r1, r1, #0x1f8 add r1, r1, #0x400 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer add r0, r4, #0xf400 mov r1, #0xc bl ov11_022F4974 @@ -61929,7 +61929,7 @@ _023102B0: ldr r0, _02310340 ; =ov11_02323340 mov r1, #0x13 mov r2, #0 - bl sub_0202FBBC + bl CreateDynamicTextBox ldr r1, _0231031C ; =WORLD_MAP_MODE ldr r1, [r1, #8] add r1, r1, #0xf000 @@ -65329,7 +65329,7 @@ _02312E14: ldmia r7, {r0, r1} add r0, r0, r5 add r1, r1, #0x324 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, [r7] mov r1, sb mov r2, r8 @@ -65377,7 +65377,7 @@ _02312EC8: ldmia r7, {r0, r1} add r0, r0, r5 add r1, r1, #0x324 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, [r7] mov r1, sb mov r2, r8 @@ -65414,7 +65414,7 @@ _02312F58: ldmia r5, {r0, r1} mla r0, r6, r4, r0 add r1, r1, #0x324 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer add r6, r6, #1 cmp r6, #0x50 blt _02312F58 @@ -65948,7 +65948,7 @@ _023136D0: ldmia r6, {r0, r1} add r0, r0, sb add r1, r1, #0x324 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, [r6] ldr r1, [r8, #0xc] add r0, r0, sb @@ -79958,11 +79958,11 @@ ov11_02322418: .byte 0x25, 0x33, 0x64, 0x20, 0x20, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x25, 0x33, 0x64, 0x00 .global ov11_0232245C ov11_0232245C: - .word ov11_022FEFA4 + .word UpdateTeamInfoBox .byte 0x02, 0x11, 0x1C, 0x05, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov11_0232246C ov11_0232246C: - .word ov11_022FEFA4 + .word UpdateTeamInfoBox .byte 0x12, 0x13, 0x0C, 0x02, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov11_0232247C ov11_0232247C: diff --git a/asm/overlay_13.s b/asm/overlay_13.s index d94c418b..bba076b2 100644 --- a/asm/overlay_13.s +++ b/asm/overlay_13.s @@ -433,7 +433,7 @@ _0238A6F4: b _0238BD74 _0238A73C: ldr r0, _0238B4FC ; =QUIZ_D_BOX_LAYOUT_4 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mov r3, #2 ldr r4, [r1] @@ -452,7 +452,7 @@ _0238A73C: add r2, r1, #0x6c0 ldrsb r0, [r0, #2] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, #2 bl WaitForNextStep b _0238BD74 @@ -465,13 +465,13 @@ _0238A79C: ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] - bl FreeDBox + bl FreeDialogueBox ldr r1, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, _0238B500 ; =QUIZ_D_BOX_LAYOUT_1 ldr r1, [r1] mvn r2, #1 strb r2, [r1, #2] - bl CreateDBox + bl CreateDialogueBox ldr r1, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mov r3, #0 ldr r2, [r1] @@ -525,7 +525,7 @@ _0238A830: beq _0238BD74 ldr r0, _0238B504 ; =QUIZ_D_BOX_LAYOUT_3 ldr r1, _0238B508 ; =ov13_0238BE6C - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r1] strb r0, [r1, #6] @@ -601,14 +601,14 @@ _0238A9A4: ldr r0, [r0] strh r3, [r1, r2] ldrsb r0, [r0, #2] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mov r1, #4 ldr r2, [r0] mov r3, #0 ldrsb r0, [r2, #2] ldrh r2, [r2, #0x60] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -617,7 +617,7 @@ _0238A9A4: b _0238BD74 _0238AA00: ldrsb r0, [r0, #2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238BD74 ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 @@ -635,7 +635,7 @@ _0238AA28: mov r4, #0xa mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, [r1] strb r0, [r2, #3] @@ -646,13 +646,13 @@ _0238AA28: b _0238BD74 _0238AA6C: ldrsb r0, [r0, #3] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _0238BD74 ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #3] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r3, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, [r3] ldr r1, [r2, #0x24] @@ -774,7 +774,7 @@ _0238AC2C: ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #3] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mvn r1, #1 ldr r2, [r0] @@ -809,7 +809,7 @@ _0238ACB4: b _0238BD74 _0238ACC0: ldrsb r0, [r0, #2] - bl ShowDBox + bl ShowDialogueBox bl GetPersonality ldr r1, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 add r0, r0, r0, lsl #1 @@ -820,7 +820,7 @@ _0238ACC0: ldrh r2, [r1, r2] mov r1, #8 mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, #0x25 bl WaitForNextStep b _0238BD74 @@ -860,7 +860,7 @@ _0238AD00: ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r4, [r0] bl GetPersonality @@ -874,13 +874,13 @@ _0238AD00: mov r3, r3, lsl #1 ldrh r2, [r2, r3] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, #0x26 bl WaitForNextStep b _0238BD74 _0238ADD4: ldrsb r0, [r0, #2] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #5] @@ -909,7 +909,7 @@ _0238AE20: ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mvn r3, #1 ldr r2, [r0] @@ -964,7 +964,7 @@ _0238AEA8: b _0238BD74 _0238AEF4: ldrsb r0, [r0, #2] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] @@ -1035,18 +1035,18 @@ _0238AFBC: b _0238BD74 _0238AFF8: ldrsb r0, [r0, #4] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, _0238B538 ; =0x000005CC ldr r0, [r0] mov r1, #8 ldrsb r0, [r0, #2] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, #0x24 bl WaitForNextStep b _0238BD74 @@ -1056,20 +1056,20 @@ _0238B038: ldrb r0, [r0, r1] bl SetBothScreensWindowsColor ldr r0, _0238B540 ; =QUIZ_D_BOX_LAYOUT_2 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, [r1] strb r0, [r2, #4] ldr r0, [r1] ldrsb r0, [r0, #4] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, _0238B544 ; =0x000006AD ldr r0, [r0] mov r1, #8 ldrsb r0, [r0, #4] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mov r2, #0x11 ldr r1, [r0] @@ -1089,14 +1089,14 @@ _0238B0A8: b _0238BD74 _0238B0C4: ldrsb r0, [r0, #4] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, _0238B548 ; =0x000006AE ldr r0, [r0] mov r1, #8 ldrsb r0, [r0, #4] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -1105,14 +1105,14 @@ _0238B0C4: b _0238BD74 _0238B100: ldrsb r0, [r0, #4] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, _0238B54C ; =0x000006AF ldr r0, [r0] mov r1, #8 ldrsb r0, [r0, #4] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -1121,14 +1121,14 @@ _0238B100: b _0238BD74 _0238B13C: ldrsb r0, [r0, #4] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mov r1, #8 ldr r0, [r0] mov r2, #0x6b0 ldrsb r0, [r0, #4] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -1137,14 +1137,14 @@ _0238B13C: b _0238BD74 _0238B178: ldrsb r0, [r0, #4] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, _0238B550 ; =0x000006B1 ldr r0, [r0] mov r1, #0x18 ldrsb r0, [r0, #4] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -1153,7 +1153,7 @@ _0238B178: b _0238BD74 _0238B1B4: ldrsb r0, [r0, #4] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mov r1, #8 ldr r4, [r0] @@ -1165,7 +1165,7 @@ _0238B1B4: add r2, r2, #0x600 mov r2, r2, lsl #0x10 mov r2, r2, lsr #0x10 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -1177,7 +1177,7 @@ _0238B204: ldr r2, _0238B554 ; =0x000006C9 mov r1, #0x218 mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -1312,7 +1312,7 @@ _0238B3D4: b _0238BD74 _0238B410: ldrsb r0, [r0, #2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238BD74 ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 @@ -1323,13 +1323,13 @@ _0238B410: b _0238BD74 _0238B438: ldrsb r0, [r0, #4] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238BD74 ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #4] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #4] @@ -1344,13 +1344,13 @@ _0238B438: b _0238BD74 _0238B488: ldrsb r0, [r0, #4] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238BD74 ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #4] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -1359,13 +1359,13 @@ _0238B488: b _0238BD74 _0238B4C0: ldrsb r0, [r0, #4] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238BD74 ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #4] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -1404,13 +1404,13 @@ _0238B558: streq r1, [r0, #0x20] beq _0238BD74 ldrsb r0, [r0, #4] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238BD74 ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #4] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -1473,14 +1473,14 @@ _0238B63C: b _0238BD74 _0238B670: ldrsb r0, [r0, #2] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, _0238BD7C ; =0x000006C2 ldr r0, [r0] mov r1, #8 ldrsb r0, [r0, #2] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -1489,14 +1489,14 @@ _0238B670: b _0238BD74 _0238B6AC: ldrsb r0, [r0, #2] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, _0238BD80 ; =0x000006C3 ldr r0, [r0] mov r1, #4 ldrsb r0, [r0, #2] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r1, [r0] ldr r0, [r1, #0x20] @@ -1514,14 +1514,14 @@ _0238B6E8: ldrsh r0, [r0, #0x74] str r0, [sp, #0x128] ldrsb r0, [r1, #2] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mov r1, #4 ldr r0, [r0] add r3, sp, #0x128 ldrsb r0, [r0, #2] add r2, r1, #0x6c0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mov r1, #0x3b ldr r0, [r0] @@ -1529,20 +1529,20 @@ _0238B6E8: b _0238BD74 _0238B744: ldrsb r0, [r0, #2] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, _0238BD84 ; =0x000006C5 ldr r0, [r0] mov r1, #8 ldrsb r0, [r0, #2] mov r3, #0 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, #0x37 bl WaitForNextStep b _0238BD74 _0238B774: ldrsb r0, [r0, #2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238BD74 ldr r0, _0238B51C ; =QUIZ_D_BOX_LAYOUT_5 @@ -1551,7 +1551,7 @@ _0238B774: ldr r3, _0238BD8C ; =QUIZ_MENU_1 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, [r1] strb r0, [r2, #3] @@ -1562,7 +1562,7 @@ _0238B774: b _0238BD74 _0238B7C0: ldrsb r0, [r0, #3] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238B7DC cmp r0, #2 @@ -1572,7 +1572,7 @@ _0238B7DC: ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] @@ -1580,7 +1580,7 @@ _0238B7DC: ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #3] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mvn r2, #1 ldr r1, [r0] @@ -1600,7 +1600,7 @@ _0238B848: ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #3] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mvn r3, #1 ldr r2, [r0] @@ -1835,7 +1835,7 @@ _0238BB98: strh r2, [r0, #0x24] ldr r0, [r1] ldrsb r0, [r0, #2] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] @@ -1896,7 +1896,7 @@ _0238BCA8: b _0238BD74 _0238BCC8: ldrsb r0, [r0, #2] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238BD74 ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 @@ -1932,7 +1932,7 @@ _0238BD1C: ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r0, [r0] ldrsb r0, [r0, #2] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238B4F8 ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mvn r3, #1 ldr r2, [r0] diff --git a/asm/overlay_14.s b/asm/overlay_14.s index 6d447952..f60abe6a 100644 --- a/asm/overlay_14.s +++ b/asm/overlay_14.s @@ -172,7 +172,7 @@ _0238A2BC: ldr r1, [r0] add r0, r1, #0x2a8 add r1, r1, #0x1e4 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, _0238A508 ; =SENTRY_DUTY_PTR mov r1, #0x800 ldr r0, [r0] @@ -191,7 +191,7 @@ _0238A3E8: add r0, r1, #0x36c add r0, r0, r8 add r1, r1, #0x1e4 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, [r4] mov r1, r7 add r0, r0, #0x36c @@ -203,7 +203,7 @@ _0238A3E8: add r0, r0, #0xc00 add r0, r0, r8 add r1, r1, #0x1e4 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, [r4] mov r1, r5 add r0, r0, #0x3ac @@ -215,7 +215,7 @@ _0238A3E8: add r0, r0, #0x1800 add r0, r0, r8 add r1, r1, #0x1e4 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, [r4] mov r1, r5 arm_func_end SentrySetupState @@ -240,7 +240,7 @@ _0238A494: add r0, r0, #0x2800 add r0, r0, r4 add r1, r1, #0x1e4 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, [r7] mov r1, r8 add r0, r0, #0x2c @@ -259,7 +259,7 @@ _0238A494: beq _0238A4FC mov r1, #6 str r1, [r2, #0x108] - bl sub_02017B58 + bl PlayBgmByIdVeneer _0238A4FC: mov r0, #1 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} @@ -400,14 +400,14 @@ ov14_0238A6B0: ; 0x0238A6B0 cmp r0, r1 moveq r2, #1 beq _0238A710 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r2, #0 bne _0238A710 ldr r0, _0238AB9C ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238AB9C ; =SENTRY_DUTY_PTR mvn r1, #1 ldr r0, [r0] @@ -680,14 +680,14 @@ _0238AAC4: cmp r0, r1 moveq r2, #1 beq _0238AB20 - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238AB20 ldr r0, _0238AB9C ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #0xa] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AB9C ; =SENTRY_DUTY_PTR mvn r1, #1 ldr r0, [r0] @@ -708,14 +708,14 @@ _0238AB2C: cmp r0, r1 moveq r2, #1 beq _0238AB88 - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238AB88 ldr r0, _0238AB9C ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #0xb] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AB9C ; =SENTRY_DUTY_PTR mvn r1, #1 ldr r0, [r0] @@ -798,7 +798,7 @@ ov14_0238AC40: ; 0x0238AC40 str r0, [ip, #0x114] ldr r0, [r1] ldrsb r0, [r0, #1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238ACE4 ; =SENTRY_DUTY_PTR ldr r1, _0238ACE8 ; =0x00000408 ldr r3, [r0] @@ -807,11 +807,11 @@ ov14_0238AC40: ; 0x0238AC40 mov r2, r2, lsl #0x10 mov r2, r2, lsr #0x10 add r3, r3, #0xa4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238ACE4 ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #1] - bl ShowDBox + bl ShowDialogueBox ldr r1, _0238ACE4 ; =SENTRY_DUTY_PTR ldr r0, [r1] add r0, r0, #0x3000 @@ -1725,7 +1725,7 @@ _0238B96C: cmp r1, r0 bne _0238B9B8 ldr r0, _0238C148 ; =ov14_0238D9B8 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0238C12C ; =SENTRY_DUTY_PTR ldr r1, [r1] strb r0, [r1, #1] @@ -1733,7 +1733,7 @@ _0238B9B8: ldr r0, _0238C12C ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #1] - bl ShowDBox + bl ShowDialogueBox ldr r2, _0238C12C ; =SENTRY_DUTY_PTR ldr r0, [r2] ldr r1, [r0, #0x108] @@ -2010,7 +2010,7 @@ _0238BD6C: mov r2, r2, lsl #0x10 mov r2, r2, lsr #0x10 add r3, r3, #0xa4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _0238BDA4: ldr r0, _0238C12C ; =SENTRY_DUTY_PTR ldr r1, [r0] @@ -2059,7 +2059,7 @@ _0238BE30: bne _0238BE6C ldr r0, _0238C1A4 ; =ov14_0238D9F8 ldr r1, _0238C1A8 ; =ov14_0238ACEC - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0238C12C ; =SENTRY_DUTY_PTR ldr r1, [r1] strb r0, [r1, #3] @@ -2075,7 +2075,7 @@ _0238BE6C: bne _0238BEA8 ldr r0, _0238C1AC ; =ov14_0238D988 ldr r1, _0238C1B0 ; =ov14_0238AD04 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0238C12C ; =SENTRY_DUTY_PTR ldr r1, [r1] strb r0, [r1, #4] @@ -2091,7 +2091,7 @@ _0238BEA8: bne _0238BEE4 ldr r0, _0238C1B4 ; =ov14_0238D998 ldr r1, _0238C1B0 ; =ov14_0238AD04 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0238C12C ; =SENTRY_DUTY_PTR ldr r1, [r1] strb r0, [r1, #5] @@ -2179,7 +2179,7 @@ _0238BFE4: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C12C ; =SENTRY_DUTY_PTR ldr r1, [r1] strb r0, [r1, #0xa] @@ -2199,7 +2199,7 @@ _0238C030: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C12C ; =SENTRY_DUTY_PTR ldr r1, [r1] strb r0, [r1, #0xb] @@ -2214,7 +2214,7 @@ _0238C090: tst r0, #2 beq _0238C0B0 ldrsb r0, [r2, #1] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r0, #0 bne _0238C0B4 @@ -2331,13 +2331,13 @@ SentryState1: ; 0x0238C20C ldr r0, _0238C260 ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #0xb] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0238C260 ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #0xb] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #8 beq _0238C248 cmp r0, #9 @@ -2374,13 +2374,13 @@ SentryState3: ; 0x0238C288 ldr r0, _0238C3AC ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #0xa] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0238C3AC ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #0xa] - bl GetNormalMenuResult + bl GetSimpleMenuResult add r0, r0, #1 cmp r0, #8 addls pc, pc, r0, lsl #2 @@ -2774,7 +2774,7 @@ _0238C72C: add r0, r1, #0x6c add r0, r0, #0x3400 add r1, r1, #0x1e4 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, _0238CA54 ; =SENTRY_DUTY_PTR ldr r1, _0238CA7C ; =0x00001003 ldr r0, [r0] @@ -2791,7 +2791,7 @@ _0238C72C: add r0, r1, #0x1b4 add r0, r0, #0x2800 add r1, r1, #0x120 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, _0238CA54 ; =SENTRY_DUTY_PTR ldr r1, _0238CA80 ; =0x48140000 ldr r0, [r0] @@ -2844,7 +2844,7 @@ _0238C88C: add r0, r0, #0x2c00 add r0, r0, r8 add r1, r1, #0x120 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer ldr r0, [r4] ldr r1, _0238CA80 ; =0x48140000 add r0, r0, #0x188 @@ -2864,7 +2864,7 @@ _0238C88C: add r0, r0, #0x3000 add r0, r0, r8 add r1, r1, #0x120 - bl ov11_022F6F08 + bl InitAnimDataFromOtherAnimDataVeneer cmp sb, #3 addls pc, pc, sb, lsl #2 b _0238C984 diff --git a/asm/overlay_15.s b/asm/overlay_15.s index 259fb0bd..089c9ea6 100644 --- a/asm/overlay_15.s +++ b/asm/overlay_15.s @@ -14,7 +14,7 @@ ov15_0238A140: ; 0x0238A140 add r0, r0, #0x88 bl InitPreprocessorArgs mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r2, _0238A228 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 mov r1, #3 ldr r3, [r2] @@ -94,7 +94,7 @@ _0238A250: ; jump table b _0238A4B4 ; case 12 _0238A284: ldrsb r0, [r1, #0x80] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A4D4 ldr r0, _0238A4DC ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 @@ -104,12 +104,12 @@ _0238A284: b _0238A4D4 _0238A2A8: ldrsb r0, [r1, #0x83] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _0238A4DC ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #0x80] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A4D4 cmp r4, #4 @@ -194,12 +194,12 @@ _0238A3A0: _0238A3E4: #ifdef EUROPE mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper #endif ldr r0, _0238A4DC ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r0, [r0] ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox mov r0, #5 bl ov15_0238A4E8 b _0238A4D4 @@ -244,7 +244,7 @@ _0238A444: _0238A488: #ifdef EUROPE mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper #else ldr r0, _0238A4E4 ; =ov15_0238B0CC bl DebugPrint0 @@ -252,7 +252,7 @@ _0238A488: ldr r0, _0238A4DC ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r0, [r0] ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox mov r0, #5 bl ov15_0238A4E8 b _0238A4D4 @@ -261,7 +261,7 @@ _0238A4AC: ldmia sp!, {r4, pc} _0238A4B4: ldrsb r0, [r1, #0x80] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A4D4 ldr r0, _0238A4DC ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 @@ -314,7 +314,7 @@ _0238A548: ldrsb r0, [r3, #0x80] add r2, r2, #0x374 add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238A56C: ldrsb r1, [r3, #0x68] @@ -355,7 +355,7 @@ _0238A5CC: ldr r2, _0238AD1C ; =0x00000376 ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238A608: bl GetMoneyStored @@ -367,18 +367,18 @@ _0238A608: ldr r3, [r3] ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238A634: ldr r0, _0238AD24 ; =BANK_D_BOX_LAYOUT_2 ldr r1, _0238AD28 ; =ov15_0238ADC4 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r2, [r1] strb r0, [r2, #0x82] ldr r0, [r1] ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238AD2C ; =ov15_0238B0E0 bl DebugPrint0 mov r1, #4 @@ -387,7 +387,7 @@ _0238A634: ldr r1, _0238AD34 ; =0x00300013 mov r2, #0 ldr r3, _0238AD38 ; =BANK_MAIN_MENU - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r1, [r1] strb r0, [r1, #0x83] @@ -398,7 +398,7 @@ _0238A68C: ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r0, [r0] ldrsb r0, [r0, #0x83] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 mvn r2, #1 ldr r1, [r0] @@ -422,7 +422,7 @@ _0238A68C: ldr r3, [r0] ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238A708: ldr r0, _0238AD3C ; =ov15_0238B0E8 @@ -432,7 +432,7 @@ _0238A708: ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r0, [r0] ldrsb r0, [r0, #0x83] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 mvn r2, #1 ldr r1, [r0] @@ -457,7 +457,7 @@ _0238A708: ldr r3, [r0] ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238A790: ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 @@ -465,7 +465,7 @@ _0238A790: ldr r3, [r0] ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238A7AC: ldr r0, _0238AD4C ; =ov15_0238B0F4 @@ -495,7 +495,7 @@ _0238A7AC: ldr r3, [r0] ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238A820: ldr r0, _0238AD3C ; =ov15_0238B0E8 @@ -503,7 +503,7 @@ _0238A820: ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r0, [r0] ldrsb r0, [r0, #0x83] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r0, [r0] ldrsb r0, [r0, #0x82] @@ -527,7 +527,7 @@ _0238A820: mov r2, #0x37c ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 mov r1, #1 ldr r0, [r0] @@ -547,7 +547,7 @@ _0238A8AC: add r2, ip, #0x37c ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238A8E8: ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 @@ -559,11 +559,11 @@ _0238A8E8: add r1, ip, #0x3000 ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238A914: ldrsb r0, [r3, #0x80] - bl ShowDBox + bl ShowDialogueBox bl GetMoneyStored ldr r2, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r1, _0238AD54 ; =0x0098967F @@ -601,7 +601,7 @@ _0238A95C: bl DebugPrint0 ldr r0, _0238AD24 ; =BANK_D_BOX_LAYOUT_2 ldr r1, _0238AD28 ; =ov15_0238ADC4 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 mov r2, #0 ldr r3, [r1] @@ -611,7 +611,7 @@ _0238A95C: ldr r0, _0238AD64 ; =BANK_D_BOX_LAYOUT_3 ldr r3, _0238AD68 ; =ov15_0238AE6C str r2, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 #ifdef EUROPE ldr r2, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 mov r1, #0 @@ -638,7 +638,7 @@ _0238A95C: b _0238AD08 _0238AA08: ldrsb r0, [r3, #0x80] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r0, [r0] ldrsb r0, [r0, #0x82] @@ -667,7 +667,7 @@ _0238AA08: ldr r3, [r0] ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238AA88: ldr r0, _0238AD3C ; =ov15_0238B0E8 @@ -675,7 +675,7 @@ _0238AA88: ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r0, [r0] ldrsb r0, [r0, #0x83] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r0, [r0] ldrsb r0, [r0, #0x82] @@ -692,7 +692,7 @@ _0238AA88: strb r2, [r1, #0x83] ldr r0, [r0] ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox bl GetMoneyCarried ldr r1, _0238AD6C ; =0x0001869F cmp r0, r1 @@ -706,7 +706,7 @@ _0238AA88: mov r2, #0x380 ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238AB20: bl GetMoneyStored @@ -721,7 +721,7 @@ _0238AB20: add r2, ip, #0x380 ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238AB58: ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 @@ -737,7 +737,7 @@ _0238AB58: ldr r3, [r3] ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238AB94: bl GetMoneyCarried @@ -777,7 +777,7 @@ _0238ABD4: bl DebugPrint0 ldr r0, _0238AD24 ; =BANK_D_BOX_LAYOUT_2 ldr r1, _0238AD28 ; =ov15_0238ADC4 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 mov r2, #0 ldr r3, [r1] @@ -787,7 +787,7 @@ _0238ABD4: ldr r0, _0238AD64 ; =BANK_D_BOX_LAYOUT_3 ldr r3, _0238AD68 ; =ov15_0238AE6C str r2, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 #ifdef EUROPE ldr r2, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 mov r1, #0 @@ -814,7 +814,7 @@ _0238ABD4: b _0238AD08 _0238AC80: ldrsb r0, [r3, #0x80] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238AD10 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r0, [r0] ldrsb r0, [r0, #0x82] @@ -843,7 +843,7 @@ _0238AC80: ldr r3, [r0] ldrsb r0, [r3, #0x80] add r3, r3, #0x88 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AD08 _0238AD00: ldrsb r0, [r3, #0x82] @@ -1061,7 +1061,7 @@ _0238AF94: b _0238B048 _0238AFB0: ldrsb r0, [r1, #0x80] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238B048 ldr r0, _0238B050 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 @@ -1087,7 +1087,7 @@ _0238AFF4: ldr r0, _0238B050 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 ldr r0, [r0] ldrsb r0, [r0, #0x80] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238B050 ; =OVERLAY15_UNKNOWN_POINTER__NA_238B180 mov r3, #3 ldr r2, [r0] diff --git a/asm/overlay_16.s b/asm/overlay_16.s index 0a6b42bd..37836b6d 100644 --- a/asm/overlay_16.s +++ b/asm/overlay_16.s @@ -83,7 +83,7 @@ _0238A240: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A274: bl ov16_0238CBD0 @@ -100,7 +100,7 @@ _0238A298: ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r3, #6 ldr r1, [r0] @@ -110,14 +110,14 @@ _0238A298: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A2D8: bl ov16_0238CB98 ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r3, #1 ldr r1, [r0] @@ -127,7 +127,7 @@ _0238A2D8: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A318: ldr r0, _0238B0D8 ; =EVO_D_BOX_LAYOUT_6 @@ -136,7 +136,7 @@ _0238A318: ldr r3, _0238B0E0 ; =EVO_MAIN_MENU mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -151,7 +151,7 @@ _0238A344: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A370: mov r1, #5 @@ -176,7 +176,7 @@ _0238A394: ldrsb r0, [r1, #0xc1] add r3, r1, #0xe8 mov r1, #0x18 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r1, #0 ldr r0, [r0] @@ -192,7 +192,7 @@ _0238A3DC: ldr r3, [r0] ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A408: ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 @@ -200,7 +200,7 @@ _0238A408: ldr r3, [r0] ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A424: mov r2, #5 @@ -215,7 +215,7 @@ _0238A440: ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r3, #0x27 ldr r1, [r0] @@ -229,7 +229,7 @@ ov16_0238A468: ; 0x0238A468 mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A480: bl ov16_0238CB98 @@ -255,7 +255,7 @@ _0238A480: str r1, [r2, #0xec] ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r1, #8 mov r4, #0x13 @@ -265,7 +265,7 @@ _0238A480: ldr r3, [r0] ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A50C: ldr r2, [r0, #0x40] @@ -289,7 +289,7 @@ _0238A50C: ldr r1, _0238B0F0 ; =0x00300013 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -308,7 +308,7 @@ _0238A574: str r1, [r2, #0xec] ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r3, #0x11 ldr r1, [r0] @@ -318,7 +318,7 @@ _0238A574: mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A5D8: mov r2, #0x1c @@ -331,7 +331,7 @@ _0238A5D8: ldr r3, _0238B0EC ; =EVO_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -343,7 +343,7 @@ _0238A614: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -383,7 +383,7 @@ _0238A668: str r1, [r2, #0xec] ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r4, #0x1b ldr r2, [r0] @@ -393,7 +393,7 @@ _0238A668: add r2, r4, #0x420 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A6F4: mov r2, #0x1c @@ -406,7 +406,7 @@ _0238A6F4: ldr r3, _0238B0EC ; =EVO_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -562,7 +562,7 @@ _0238A928: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A95C: ldr r2, [r0, #0x40] @@ -586,7 +586,7 @@ _0238A95C: ldr r1, _0238B0F0 ; =0x00300013 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -602,7 +602,7 @@ _0238A9C4: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238A9F4: ldrsb r0, [r0, #0xc1] @@ -644,7 +644,7 @@ _0238AA58: mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238AA94: mov r1, #0x1f @@ -662,7 +662,7 @@ _0238AA94: mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238AAD8: bl ov16_0238CB98 @@ -894,11 +894,11 @@ _0238AE1C: mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238AE3C: ldrsb r0, [r0, #0xc1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mvn r1, #1 ldr r0, [r0] @@ -922,7 +922,7 @@ _0238AE74: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238AEA0: mov r2, #0xb @@ -937,7 +937,7 @@ _0238AEA0: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C4 _0238AED8: bl ov11_02310BDC @@ -952,7 +952,7 @@ _0238AED8: mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r1, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mvn r0, #1 ldr r1, [r1] @@ -990,7 +990,7 @@ _0238AED8: b _0238B0C4 _0238AF98: ldrsb r0, [r0, #0xc1] - bl FreeDBox + bl FreeDialogueBox ldr r1, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mvn r3, #1 ldr r2, [r1] @@ -1027,7 +1027,7 @@ _0238AFF8: mov ip, #2 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -1185,7 +1185,7 @@ _0238B240: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B274: bl ov16_0238CBD0 @@ -1202,7 +1202,7 @@ _0238B298: ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r3, #6 ldr r1, [r0] @@ -1212,14 +1212,14 @@ _0238B298: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B2D8: bl ov16_0238CB98 ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r3, #1 ldr r1, [r0] @@ -1229,7 +1229,7 @@ _0238B2D8: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B318: ldr r0, _0238C0D8 ; =EVO_D_BOX_LAYOUT_6 @@ -1238,7 +1238,7 @@ _0238B318: ldr r3, _0238C0E0 ; =EVO_MAIN_MENU mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -1253,7 +1253,7 @@ _0238B344: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B370: mov r1, #5 @@ -1278,7 +1278,7 @@ _0238B394: ldrsb r0, [r1, #0xc1] add r3, r1, #0xe8 mov r1, #0x18 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r1, #0 ldr r0, [r0] @@ -1294,7 +1294,7 @@ _0238B3DC: ldr r3, [r0] ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B408: ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 @@ -1302,7 +1302,7 @@ _0238B408: ldr r3, [r0] ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B424: mov r2, #5 @@ -1317,7 +1317,7 @@ _0238B440: ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r3, #0x27 ldr r1, [r0] @@ -1327,7 +1327,7 @@ _0238B440: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B480: bl ov16_0238CB98 @@ -1353,7 +1353,7 @@ _0238B480: str r1, [r2, #0xec] ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r1, #8 mov r4, #0x13 @@ -1363,7 +1363,7 @@ _0238B480: ldr r3, [r0] ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B50C: ldr r2, [r0, #0x40] @@ -1387,7 +1387,7 @@ _0238B50C: ldr r1, _0238C0F0 ; =0x00300013 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -1406,7 +1406,7 @@ _0238B574: str r1, [r2, #0xec] ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r3, #0x11 ldr r1, [r0] @@ -1416,7 +1416,7 @@ _0238B574: mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B5D8: mov r2, #0x1c @@ -1429,7 +1429,7 @@ _0238B5D8: ldr r3, _0238C0EC ; =EVO_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -1441,7 +1441,7 @@ _0238B614: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -1481,7 +1481,7 @@ _0238B668: str r1, [r2, #0xec] ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r4, #0x1b ldr r2, [r0] @@ -1491,7 +1491,7 @@ _0238B668: add r2, r4, #0x420 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B6F4: mov r2, #0x1c @@ -1504,7 +1504,7 @@ _0238B6F4: ldr r3, _0238C0EC ; =EVO_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -1660,7 +1660,7 @@ _0238B928: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B95C: ldr r2, [r0, #0x40] @@ -1684,7 +1684,7 @@ _0238B95C: ldr r1, _0238C0F0 ; =0x00300013 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -1700,7 +1700,7 @@ _0238B9C4: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238B9F4: ldrsb r0, [r0, #0xc1] @@ -1742,7 +1742,7 @@ _0238BA58: mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238BA94: mov r1, #0x1f @@ -1760,7 +1760,7 @@ _0238BA94: mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238BAD8: bl ov16_0238CB98 @@ -1988,11 +1988,11 @@ _0238BE1C: mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238BE3C: ldrsb r0, [r0, #0xc1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mvn r1, #1 ldr r0, [r0] @@ -2016,7 +2016,7 @@ _0238BE74: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238BEA0: mov r2, #0xb @@ -2031,7 +2031,7 @@ _0238BEA0: mov r1, #0x18 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C0C4 _0238BED8: bl ov11_02310BDC @@ -2046,7 +2046,7 @@ _0238BED8: mov r1, #8 ldrsb r0, [r3, #0xc1] add r3, r3, #0xe8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r1, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mvn r0, #1 ldr r1, [r1] @@ -2084,7 +2084,7 @@ _0238BED8: b _0238C0C4 _0238BF98: ldrsb r0, [r0, #0xc1] - bl FreeDBox + bl FreeDialogueBox ldr r1, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mvn r3, #1 ldr r2, [r1] @@ -2121,7 +2121,7 @@ _0238BFF8: mov ip, #2 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C0CC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc3] @@ -2332,7 +2332,7 @@ _0238C260: ; jump table b _0238C87C ; case 41 _0238C308: ldrsb r0, [r3, #0xc3] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 ldrne r1, _0238CADC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldrne r1, [r1] @@ -2499,7 +2499,7 @@ _0238C554: b _0238C9B0 _0238C56C: ldrsb r0, [r3, #0xc3] - bl GetNormalMenuResult + bl GetSimpleMenuResult mov r4, r0 bl sub_0203C9E4 cmp r4, #1 @@ -2578,13 +2578,13 @@ _0238C66C: b _0238C9B0 _0238C690: ldrsb r0, [r3, #0xc3] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _0238C9B0 ldr r0, _0238CADC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc3] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _0238CADC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r4, r0 ldr r0, [r1] @@ -2711,13 +2711,13 @@ _0238C874: b _0238C9B4 _0238C87C: ldrsb r0, [r3, #0xc1] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238C9B0 ldr r0, _0238CADC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238CADC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mov r2, #0x2b ldr r1, [r0] @@ -2779,13 +2779,13 @@ _0238C96C: ldr r0, _0238CADC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238C9B0 ldr r0, _0238CADC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238CADC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldr r0, [r0, #0x74] @@ -2812,7 +2812,7 @@ _0238C9EC: str r1, [r3, #0xd8] ldr r0, [r0] ldrsb r0, [r0, #0xc1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238CADC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mvn r1, #1 ldr r0, [r0] @@ -2894,7 +2894,7 @@ ov16_0238CAE8: ; 0x0238CAE8 ldr r0, _0238CB2C ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r0, [r0] ldrsb r0, [r0, #0xc3] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238CB2C ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 mvn r1, #1 ldr r0, [r0] @@ -2945,7 +2945,7 @@ ov16_0238CB98: ; 0x0238CB98 cmp r1, r0 ldmneia sp!, {r3, pc} mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0238CBCC ; =OVERLAY16_UNKNOWN_POINTER__NA_238CE40 ldr r1, [r1] strb r0, [r1, #0xc1] diff --git a/asm/overlay_17.s b/asm/overlay_17.s index f21d147b..633636e1 100644 --- a/asm/overlay_17.s +++ b/asm/overlay_17.s @@ -168,14 +168,14 @@ ov17_0238A364: ; 0x0238A364 cmp r0, r1 moveq r2, #1 beq _0238A3C4 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r2, #0 bne _0238A3C4 ldr r0, _0238A718 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238A718 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 mvn r1, #1 ldr r0, [r0] @@ -224,7 +224,7 @@ _0238A438: cmp r0, r1 moveq r2, #1 beq _0238A494 - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 arm_func_end ov17_0238A364 @@ -235,7 +235,7 @@ ov17_0238A468: ; 0x0238A468 ldr r0, _0238A718 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0, #2] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238A718 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 mvn r1, #1 ldr r0, [r0] @@ -256,14 +256,14 @@ _0238A4A0: cmp r0, r1 moveq r2, #1 beq _0238A4FC - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238A4FC ldr r0, _0238A718 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0, #3] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238A718 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 mvn r1, #1 ldr r0, [r0] @@ -300,14 +300,14 @@ _0238A540: cmp r0, r1 moveq r2, #1 beq _0238A59C - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238A59C ldr r0, _0238A718 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0, #4] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238A718 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 mvn r1, #1 ldr r0, [r0] @@ -397,14 +397,14 @@ _0238A6A8: cmp r0, r1 moveq r2, #1 beq _0238A704 - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238A704 ldr r0, _0238A718 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0, #8] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238A718 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 mvn r1, #1 ldr r0, [r0] @@ -523,7 +523,7 @@ _0238A840: ldr r4, _0238AFA4 ; =0x00003008 bne _0238A898 ldr r0, _0238AFA8 ; =ASSEMBLY_D_BOX_LAYOUT_4 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0238AF9C ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 mov r2, #0 ldr r3, [r1] @@ -534,7 +534,7 @@ _0238A898: ldr r0, _0238AF9C ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238AF9C ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r1, [r0] ldr r0, [r1, #0x70] @@ -646,7 +646,7 @@ _0238A9F8: ldrsb r0, [r3] ldrh r2, [r3, #0x7c] add r3, r3, #0xc - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _0238AA30: ldr r0, _0238AF9C ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r1, [r0] @@ -698,7 +698,7 @@ _0238AABC: ldr r1, _0238AFE8 ; =0x00300013 ldr r3, _0238AFEC ; =ASSEMBLY_MAIN_MENU_2 str r2, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238AF9C ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r1, [r1] strb r0, [r1, #2] @@ -721,7 +721,7 @@ _0238AB04: ldr r1, _0238AFF4 ; =0x00300033 ldr r3, _0238AFF8 ; =ASSEMBLY_MENU_CONFIRM add r2, r2, #0x1b4 - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238AF9C ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r1, [r1] strb r0, [r1, #3] @@ -880,7 +880,7 @@ _0238AD54: ldr r1, _0238B01C ; =0x00000213 mov r3, r7 add r2, r2, #0x11c - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238AF9C ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r1, [r1] strb r0, [r1, #4] @@ -962,7 +962,7 @@ _0238AE6C: ldr r3, _0238B024 ; =ASSEMBLY_MAIN_MENU_1 mov r1, #0x13 str r2, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238AF9C ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r1, [r1] strb r0, [r1, #8] @@ -977,7 +977,7 @@ _0238AEC8: tst r0, #1 beq _0238AEE8 ldrsb r0, [r4] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r0, #0 bne _0238AEEC @@ -1158,13 +1158,13 @@ ov17_0238B10C: ; 0x0238B10C ldr r0, _0238B190 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0, #2] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0238B190 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0, #2] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #2 beq _0238B150 cmp r0, #3 @@ -1328,7 +1328,7 @@ ov17_0238B2B4: ; 0x0238B2B4 tst r0, #8 ldmeqia sp!, {r3, pc} mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl sub_0203AAB0 ldr r1, _0238B368 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r1, [r1] @@ -1385,13 +1385,13 @@ ov17_0238B390: ; 0x0238B390 ldr r0, _0238B4CC ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0, #4] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} ldr r0, _0238B4CC ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0, #4] - bl GetNormalMenuResult + bl GetSimpleMenuResult sub r0, r0, #5 cmp r0, #7 addls pc, pc, r0, lsl #2 @@ -1686,13 +1686,13 @@ ov17_0238B738: ; 0x0238B738 ldr r0, _0238B7A4 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0, #3] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0238B7A4 ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0, #3] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #0 beq _0238B780 cmp r0, #1 @@ -1924,13 +1924,13 @@ ov17_0238B9FC: ; 0x0238B9FC mov r4, #0 ldr r0, [r0] ldrsb r0, [r0, #8] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} ldr r0, _0238BA7C ; =OVERLAY17_UNKNOWN_POINTER__NA_238BE00 ldr r0, [r0] ldrsb r0, [r0, #8] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #3 beq _0238BA3C cmp r0, #4 diff --git a/asm/overlay_18.s b/asm/overlay_18.s index 9af188f2..325138bd 100644 --- a/asm/overlay_18.s +++ b/asm/overlay_18.s @@ -222,7 +222,7 @@ ov18_0238A42C: ; 0x0238A42C cmp r0, r1 moveq r2, #1 beq _0238A48C - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r2, #0 bne _0238A48C @@ -233,7 +233,7 @@ ov18_0238A468: ; 0x0238A468 ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mvn r1, #1 ldr r0, [r0] @@ -310,14 +310,14 @@ _0238A568: cmp r0, r1 moveq r2, #1 beq _0238A5C4 - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238A5C4 ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #3] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mvn r1, #1 ldr r0, [r0] @@ -338,14 +338,14 @@ _0238A5D0: cmp r0, r1 moveq r2, #1 beq _0238A62C - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238A62C ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #4] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mvn r1, #1 ldr r0, [r0] @@ -366,14 +366,14 @@ _0238A638: cmp r0, r1 moveq r2, #1 beq _0238A694 - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238A694 ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #5] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mvn r1, #1 ldr r0, [r0] @@ -394,14 +394,14 @@ _0238A6A0: cmp r0, r1 moveq r2, #1 beq _0238A6FC - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238A6FC ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #6] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mvn r1, #1 ldr r0, [r0] @@ -507,14 +507,14 @@ _0238A840: cmp r0, r1 moveq r2, #1 beq _0238A89C - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238A89C ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #0xa] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mvn r1, #1 ldr r0, [r0] @@ -563,14 +563,14 @@ _0238A910: cmp r0, r1 moveq r2, #1 beq _0238A96C - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238A96C ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #0xc] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mvn r1, #1 ldr r0, [r0] @@ -620,14 +620,14 @@ _0238A9E4: cmp r0, r1 moveq r2, #1 beq _0238AA40 - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 movne r2, #0 bne _0238AA40 ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #0xe] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mvn r1, #1 ldr r0, [r0] @@ -648,14 +648,14 @@ _0238AA4C: cmp r0, r1 moveq r2, #1 beq _0238AAA8 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r2, #0 bne _0238AAA8 ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #0xf] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238AABC ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mvn r1, #1 ldr r0, [r0] @@ -1158,7 +1158,7 @@ _0238B0FC: cmp r1, r0 bne _0238B150 ldr r0, _0238BD4C ; =OVERLAY18_D_BOX_LAYOUT_11 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mvn r2, #0 ldr r3, [r1] @@ -1169,7 +1169,7 @@ _0238B150: ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mov r1, #0x1fc ldr r3, [r0] @@ -1406,7 +1406,7 @@ _0238B468: ldrsb r0, [r3], #0x14 mov r2, r2, lsl #0x10 mov r2, r2, lsr #0x10 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _0238B4A4: ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r1, [r0] @@ -1455,7 +1455,7 @@ _0238B530: bne _0238B56C ldr r0, _0238BDB0 ; =OVERLAY18_D_BOX_LAYOUT_1 ldr r1, _0238BDB4 ; =ov18_0238AF3C - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r1, [r1] strb r0, [r1, #2] @@ -1475,7 +1475,7 @@ _0238B56C: ldr r3, _0238BDC0 ; =MOVES_MAIN_MENU mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r1, [r1] strb r0, [r1, #3] @@ -1495,7 +1495,7 @@ _0238B5B8: ldr r3, _0238BDC8 ; =MOVES_SUBMENU_3 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r1, [r1] strb r0, [r1, #4] @@ -1518,7 +1518,7 @@ _0238B604: ldr r1, _0238BDD0 ; =0x00300033 ldr r3, _0238BDD4 ; =MOVES_MENU_CONFIRM add r2, r2, #0x90 - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r1, [r1] strb r0, [r1, #6] @@ -1538,7 +1538,7 @@ _0238B65C: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r1, [r1] strb r0, [r1, #5] @@ -1736,7 +1736,7 @@ _0238B93C: ldr r1, _0238BDF0 ; =0x80000213 mov r3, r4 add r2, r2, #0x128 - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r1, [r1] strb r0, [r1, #0xa] @@ -1819,7 +1819,7 @@ _0238BA70: ldr r3, _0238BE10 ; =MOVES_SUBMENU_1 add r2, r1, #0x258 mov r1, #0x33 - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r1, [r1] strb r0, [r1, #0xc] @@ -1879,7 +1879,7 @@ _0238BB10: ldr r3, _0238BE18 ; =MOVES_SUBMENU_2 add r1, r4, #0x230 add r2, r2, #0x2f0 - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r1, [r1] strb r0, [r1, #0xe] @@ -1894,7 +1894,7 @@ _0238BBAC: cmp r1, r0 bne _0238BBF0 ldr r0, _0238BE1C ; =OVERLAY18_D_BOX_LAYOUT_10 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mvn r2, #0 ldr r3, [r1] @@ -1905,7 +1905,7 @@ _0238BBF0: ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #0xf] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r3, [r0] ldr r0, [r3, #0x78] @@ -1938,7 +1938,7 @@ _0238BC50: ldr r0, [r0] add r3, sp, #0x14c ldrsb r0, [r0, #0xf] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _0238BC74: ldr r0, _0238BD40 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 mov r1, #2 @@ -1950,7 +1950,7 @@ _0238BC88: tst r0, #1 beq _0238BCA8 ldrsb r0, [r4] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r0, #0 bne _0238BCD4 @@ -1961,7 +1961,7 @@ _0238BCA8: tst r0, #0x10000 beq _0238BCD0 ldrsb r0, [r1, #0xf] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r0, #0 bne _0238BCD4 @@ -2114,13 +2114,13 @@ ov18_0238BE90: ; 0x0238BE90 ldr r0, _0238BF08 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #3] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0238BF08 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #3] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #6 addls pc, pc, r0, lsl #2 b _0238BEFC @@ -2213,13 +2213,13 @@ ov18_0238BFA8: ; 0x0238BFA8 ldr r0, _0238C038 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #4] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0238C038 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #4] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #8 bgt _0238BFFC cmp r0, #2 @@ -2389,7 +2389,7 @@ ov18_0238C164: ; 0x0238C164 tst r0, #8 ldmeqia sp!, {r3, pc} mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl sub_0203AAB0 ldr r1, _0238C218 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r1, [r1] @@ -2471,13 +2471,13 @@ ov18_0238C27C: ; 0x0238C27C ldr r0, _0238C33C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #5] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} ldr r0, _0238C33C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #5] - bl GetNormalMenuResult + bl GetSimpleMenuResult sub r0, r0, #5 cmp r0, #0xb addls pc, pc, r0, lsl #2 @@ -2701,7 +2701,7 @@ ov18_0238C528: ; 0x0238C528 mov r4, #0 ldr r0, [r0] ldrsb r0, [r0, #0xa] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} bl sub_02041094 @@ -2709,7 +2709,7 @@ ov18_0238C528: ; 0x0238C528 mov r5, r0 ldr r0, [r1] ldrsb r0, [r0, #0xa] - bl GetNormalMenuResult + bl GetSimpleMenuResult sub r1, r0, #4 cmp r1, #0xe addls pc, pc, r1, lsl #2 @@ -2744,7 +2744,7 @@ _0238C5C8: cmp r0, #0x1f4 bge _0238C5EC mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #0x13 bl ov18_0238BE28 ldmia sp!, {r3, r4, r5, pc} @@ -2769,7 +2769,7 @@ _0238C620: b _0238C6E4 _0238C62C: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _0238C6E4 _0238C638: mov r0, r5 @@ -2785,11 +2785,11 @@ _0238C638: b _0238C6E4 _0238C664: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _0238C6E4 _0238C670: mov r0, r4 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, r5 bl sub_020416BC bl sub_020410A4 @@ -2797,7 +2797,7 @@ _0238C670: b _0238C6E4 _0238C68C: mov r0, r4 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, r5 bl sub_020416DC bl sub_020410A4 @@ -2811,7 +2811,7 @@ _0238C6A8: b _0238C6E4 _0238C6BC: mov r0, r4 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #0x1d bl ov18_0238BE28 b _0238C6E4 @@ -2819,7 +2819,7 @@ _0238C6D0: cmp r0, #6 beq _0238C6E0 mov r0, #1 - bl sub_02017CCC + bl PlaySeVolumeWrapper _0238C6E0: mov r4, #1 _0238C6E4: @@ -2933,7 +2933,7 @@ ov18_0238C808: ; 0x0238C808 ldr r0, _0238C884 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #6] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 @@ -2941,7 +2941,7 @@ ov18_0238C808: ; 0x0238C808 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #0 beq _0238C850 cmp r0, #1 @@ -3000,7 +3000,7 @@ ov18_0238C8D0: ; 0x0238C8D0 ldr r0, _0238C94C ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #6] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 @@ -3008,7 +3008,7 @@ ov18_0238C8D0: ; 0x0238C8D0 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #0 beq _0238C918 cmp r0, #1 @@ -3284,13 +3284,13 @@ ov18_0238CC00: ; 0x0238CC00 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #0xc] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} ldr r0, _0238CD84 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #0xc] - bl GetNormalMenuResult + bl GetSimpleMenuResult sub r0, r0, #4 cmp r0, #9 addls pc, pc, r0, lsl #2 @@ -3511,14 +3511,14 @@ ov18_0238CED8: ; 0x0238CED8 ldr r0, _0238CF94 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #0xe] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r3, pc} bl sub_0203FD38 ldr r0, _0238CF94 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #0xe] - bl GetNormalMenuResult + bl GetSimpleMenuResult sub r0, r0, #4 cmp r0, #6 addls pc, pc, r0, lsl #2 @@ -3654,7 +3654,7 @@ ov18_0238D098: ; 0x0238D098 ldr r0, _0238D128 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #6] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 @@ -3662,7 +3662,7 @@ ov18_0238D098: ; 0x0238D098 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #0 beq _0238D0E0 cmp r0, #1 @@ -3726,7 +3726,7 @@ ov18_0238D174: ; 0x0238D174 ldr r0, _0238D204 ; =OVERLAY18_UNKNOWN_POINTER__NA_238D620 ldr r0, [r0] ldrsb r0, [r0, #6] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 ldmneia sp!, {r4, pc} bl sub_02041094 @@ -3734,7 +3734,7 @@ ov18_0238D174: ; 0x0238D174 mov r4, r0 ldr r0, [r1] ldrsb r0, [r0, #6] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #0 beq _0238D1BC cmp r0, #1 diff --git a/asm/overlay_19.s b/asm/overlay_19.s index eea29249..58edea30 100644 --- a/asm/overlay_19.s +++ b/asm/overlay_19.s @@ -556,7 +556,7 @@ _0238A878: cmp r4, #0 bne _0238A888 mov r0, #5 - bl sub_02017CCC + bl PlaySeVolumeWrapper _0238A888: bl SortItemsInBag mov r0, #0 @@ -700,7 +700,7 @@ _0238AA08: ldr r1, _0238B468 ; =0x00001013 ldr r3, _0238B46C ; =0x000008E4 str r4, [sp, #8] - bl sub_0202E3CC + bl CreateScrollBox1 strb r0, [r8, #0x21] mov r0, #0xc str r0, [r8, #4] @@ -744,7 +744,7 @@ _0238AB00: tst r0, #8 beq _0238C598 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl sub_0203AAB0 str r0, [r8, #0xd4] bl sub_0203A5F0 diff --git a/asm/overlay_20.s b/asm/overlay_20.s index 6677f384..3c645c46 100644 --- a/asm/overlay_20.s +++ b/asm/overlay_20.s @@ -1637,7 +1637,7 @@ _0238B6E0: ldr r0, _0238B7E8 ; =RECYCLE_D_BOX_LAYOUT_2 ldr r1, _0238B7EC ; =ov20_0238B8CC mov r2, r4 - bl sub_0202F8DC + bl CreateTextBox2 ldr r1, _0238B7E4 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D124 ldr r1, [r1] strb r0, [r1, #0x14] @@ -1651,7 +1651,7 @@ _0238B70C: ldr r0, _0238B7F0 ; =RECYCLE_D_BOX_LAYOUT_1 ldr r1, _0238B7F4 ; =ov20_0238BA40 mov r2, r4 - bl sub_0202F8DC + bl CreateTextBox2 ldr r1, _0238B7E4 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D124 ldr r1, [r1] strb r0, [r1, #0x15] @@ -1665,7 +1665,7 @@ _0238B740: ldr r0, _0238B7F8 ; =RECYCLE_D_BOX_LAYOUT_3 ldr r1, _0238B7FC ; =ov20_0238BAB4 mov r2, r4 - bl sub_0202F8DC + bl CreateTextBox2 ldr r1, _0238B7E4 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D124 ldr r1, [r1] strb r0, [r1, #0x16] @@ -2199,13 +2199,13 @@ _0238BE24: b _0238C1C0 _0238BE74: ldrsb r0, [r4, #4] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _0238BEDC ldr r0, _0238C1D0 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D128 ldr r0, [r0] ldrsb r0, [r0, #4] - bl GetNormalMenuResult + bl GetSimpleMenuResult mvn r1, #0 cmp r0, r1 bne _0238BEC0 @@ -2269,7 +2269,7 @@ _0238BF68: tst r0, #0x100 beq _0238C1C0 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _0238C1D0 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D128 ldr r0, [r0] bl ov20_0238C288 @@ -2285,7 +2285,7 @@ _0238BFA8: mov r1, #0x13 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C1D0 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D128 strb r0, [r4, #5] ldr r0, [r1] @@ -2294,13 +2294,13 @@ _0238BFA8: b _0238C1C0 _0238BFDC: ldrsb r0, [r4, #5] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _0238C1C0 ldr r0, _0238C1D0 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D128 ldr r0, [r0] ldrsb r0, [r0, #5] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r2, _0238C1D0 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D128 mvn r1, #0 ldr r3, [r2] @@ -2366,7 +2366,7 @@ _0238C07C: ldr r0, _0238C1E4 ; =RECYCLE_D_BOX_LAYOUT_4 ldr r1, _0238C1E8 ; =0x00001013 ldr r3, _0238C1EC ; =0x000008E4 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238C1D0 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D128 mov r2, #6 ldr r3, [r1] @@ -2503,7 +2503,7 @@ ov20_0238C288: ; 0x0238C288 mvn r1, #1 cmp r0, r1 ldmeqia sp!, {r4, pc} - bl FreeNormalMenu + bl FreeSimpleMenu mvn r0, #1 strb r0, [r4, #4] mov r0, #0 @@ -2519,7 +2519,7 @@ ov20_0238C2B8: ; 0x0238C2B8 mvn r1, #1 cmp r0, r1 ldmeqia sp!, {r4, pc} - bl FreeNormalMenu + bl FreeSimpleMenu mvn r0, #1 strb r0, [r4, #5] ldmia sp!, {r4, pc} @@ -2722,7 +2722,7 @@ _0238C560: ldr r3, _0238C9D8 ; =ov20_0238CC14 str r2, [sp, #8] add r2, r4, #0x20 - bl sub_0202C3A8 + bl CreateCollectionMenu strb r0, [r4, #4] ldrsb r0, [r4, #4] mov r1, #1 @@ -2741,7 +2741,7 @@ _0238C5CC: ldr r0, _0238C9E4 ; =RECYCLE_D_BOX_LAYOUT_8 ldr r1, _0238C9E8 ; =ov20_0238CE9C mov r2, r4 - bl sub_0202F8DC + bl CreateTextBox2 strb r0, [r4, #7] _0238C5F0: ldrsb r1, [r4, #8] @@ -2751,7 +2751,7 @@ _0238C5F0: ldr r0, _0238C9EC ; =RECYCLE_D_BOX_LAYOUT_7 ldr r1, _0238C9F0 ; =ov20_0238CF20 mov r2, r4 - bl sub_0202F8DC + bl CreateTextBox2 strb r0, [r4, #8] _0238C614: ldr r0, _0238C9C8 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D12C @@ -2872,7 +2872,7 @@ _0238C7B0: mov r1, #0x13 mov r2, #0 str r5, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C9C8 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D12C strb r0, [r4, #5] ldr r0, [r1] @@ -2881,13 +2881,13 @@ _0238C7B0: b _0238C9BC _0238C7E4: ldrsb r0, [r4, #5] - bl IsNormalMenuActive + bl IsSimpleMenuActive cmp r0, #0 bne _0238C9BC ldr r0, _0238C9C8 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D12C ldr r0, [r0] ldrsb r0, [r0, #5] - bl GetNormalMenuResult + bl GetSimpleMenuResult ldr r1, _0238C9C8 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D12C ldr r2, [r1] str r0, [r2, #0x1b4] @@ -2959,7 +2959,7 @@ _0238C860: ldr r1, _0238CA04 ; =0x00001013 ldr r3, _0238CA08 ; =0x000008E4 str r4, [sp, #8] - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238C9C8 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D12C mov r2, #7 ldr r3, [r1] @@ -3201,7 +3201,7 @@ ov20_0238CBEC: ; 0x0238CBEC mvn r1, #1 cmp r0, r1 ldmeqia sp!, {r4, pc} - bl FreeNormalMenu + bl FreeSimpleMenu mvn r0, #1 strb r0, [r4, #5] ldmia sp!, {r4, pc} @@ -3334,17 +3334,17 @@ _0238CD98: ldrsb r0, [r0, #7] bl sub_0202F9B8 mov r0, #6 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _0238CDFC _0238CDD0: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper b _0238CDFC _0238CDDC: tst r0, #0x100 beq _0238CDFC mov r0, r4 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _0238CE38 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D12C mov r1, #1 ldr r0, [r0] diff --git a/asm/overlay_21.s b/asm/overlay_21.s index 8a90ad35..2324cc9f 100644 --- a/asm/overlay_21.s +++ b/asm/overlay_21.s @@ -91,7 +91,7 @@ _0238A274: mov r2, #0x96 mov r0, #0 str r2, [r1, #0x54] - bl CreateDBox + bl CreateDialogueBox mov r3, r4 ldr r4, [r3] ldr r1, _0238B094 ; =0x00003008 @@ -100,7 +100,7 @@ _0238A274: ldr r2, _0238B098 ; =0x000003B2 ldrsb r0, [r3, #0x80] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, #0 mov r1, #3 mov r2, #1 @@ -135,7 +135,7 @@ _0238A32C: bl DebugPrint0 ldr r0, _0238B0A4 ; =SWAP_SHOP_D_BOX_LAYOUT_1 ldr r1, _0238B0A8 ; =ov21_0238C9A4 - bl sub_0202F8C4 + bl CreateTextBox1 mov r2, r4 ldr r2, [r2] ldr r1, _0238B0AC ; =0x00300013 @@ -145,7 +145,7 @@ _0238A32C: ldr r0, _0238B0B4 ; =SWAP_SHOP_D_BOX_LAYOUT_5 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r1, [r1] strb r0, [r1, #0x83] @@ -175,7 +175,7 @@ _0238A378: ldrsb r0, [r3, #0x80] ldr r2, _0238B0BC ; =0x000003B3 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A3E0: bl ov21_0238C920 @@ -203,7 +203,7 @@ _0238A3E0: ldrsb r0, [r3, #0x80] mov r2, #0x3d0 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A44C: ldr r0, _0238B0C0 ; =SWAP_SHOP_D_BOX_LAYOUT_7 @@ -212,7 +212,7 @@ _0238A44C: ldr r3, _0238B0C4 ; =SWAP_SHOP_SUBMENU_2 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper arm_func_end ov21_0238A140 arm_func_start ov21_0238A468 @@ -249,7 +249,7 @@ _0238A478: ldrsb r0, [r3, #0x80] ldr r2, _0238B0D0 ; =0x000003C5 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A4EC: ldr r0, _0238B0C8 ; =ov21_0238CC18 @@ -263,7 +263,7 @@ _0238A4EC: ldrsb r0, [r3, #0x80] add r2, r4, #0x3c4 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A520: ldr r0, _0238B0C8 ; =ov21_0238CC18 @@ -293,7 +293,7 @@ _0238A520: ldrsb r0, [r3, #0x80] ldr r2, _0238B0D4 ; =0x000003C7 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A594: ldr r0, _0238B0D8 ; =ov21_0238CC3C @@ -320,7 +320,7 @@ _0238A594: ldrsb r0, [r3, #0x80] mov r2, #0x3c8 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A5FC: bl ov21_0238C920 @@ -348,7 +348,7 @@ _0238A5FC: ldrsb r0, [r3, #0x80] ldr r2, _0238B0DC ; =0x000003B7 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A668: ldr r0, _0238B0E0 ; =ov21_0238CC5C @@ -378,7 +378,7 @@ _0238A668: ldrsb r0, [r3, #0x80] ldr r2, _0238B0E4 ; =0x000003B6 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A6DC: ldr r0, _0238B0E8 ; =ov21_0238CC7C @@ -408,7 +408,7 @@ _0238A6DC: ldrsb r0, [r3, #0x80] mov r2, #0x3b4 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A750: ldr r0, _0238B0EC ; =ov21_0238CC9C @@ -441,7 +441,7 @@ _0238A750: ldrsb r0, [r3, #0x80] ldr r2, _0238B0F0 ; =0x000003B5 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A7D0: ldr r0, _0238B0F4 ; =ov21_0238CCC0 @@ -471,7 +471,7 @@ _0238A7D0: ldrsb r0, [r3, #0x80] mov r2, #0x3c4 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A844: ldr r0, _0238B0F8 ; =ov21_0238CCE4 @@ -509,7 +509,7 @@ _0238A854: ldrsb r0, [r3, #0x80] mov r2, #0x3b8 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A8D4: ldr r0, _0238B100 ; =ov21_0238CD24 @@ -541,7 +541,7 @@ _0238A8D4: ldrsb r0, [r3, #0x80] ldr r2, _0238B104 ; =0x000003C2 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238A950: ldr r0, _0238B108 ; =ov21_0238CD44 @@ -549,7 +549,7 @@ _0238A950: mov r0, r4 ldr r0, [r0] ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox mov r0, r4 ldr r0, [r0] ldrsb r0, [r0, #0x80] @@ -573,7 +573,7 @@ _0238A9A8: mov r0, r4 ldr r0, [r0] ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox mov r0, r4 ldr r0, [r0] ldrsb r0, [r0, #0x80] @@ -593,7 +593,7 @@ _0238A9E8: ldr r3, _0238B120 ; =SWAP_SHOP_MAIN_MENU_1 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r1, [r1] strb r0, [r1, #0x83] @@ -639,7 +639,7 @@ _0238AA1C: stmib sp, {r2, r3} ldr r3, _0238B138 ; =0x0000033E mov r2, #0 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r1, [r1] strb r0, [r1, #0x85] @@ -695,7 +695,7 @@ _0238AAC0: ldr r1, _0238B094 ; =0x00003008 ldr r2, _0238B140 ; =0x000003BD add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238AB90: ldrsh r0, [r3, #0xe] @@ -708,7 +708,7 @@ _0238AB90: ldr r3, [r0] ldrsb r0, [r3, #0x80] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238ABC0: ldr r0, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 @@ -716,7 +716,7 @@ _0238ABC0: ldr r3, [r0] ldrsb r0, [r3, #0x80] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238ABDC: ldr r0, _0238B148 ; =ov21_0238CE34 @@ -727,7 +727,7 @@ _0238ABDC: ldr r0, _0238B0A4 ; =SWAP_SHOP_D_BOX_LAYOUT_1 ldr r1, _0238B0A8 ; =ov21_0238C9A4 str r3, [r2, #0x54] - bl sub_0202F8C4 + bl CreateTextBox1 mov r2, r4 ldr r2, [r2] ldr r1, _0238B0AC ; =0x00300013 @@ -737,7 +737,7 @@ _0238ABDC: ldr r0, _0238B0C0 ; =SWAP_SHOP_D_BOX_LAYOUT_7 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r1, [r1] strb r0, [r1, #0x83] @@ -804,7 +804,7 @@ _0238AD04: ldrsb r0, [r2, #0x80] add r3, r2, #0x30 mov r2, #0x3c4 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, r4 ldr r1, [r0] mov r2, #0 @@ -835,7 +835,7 @@ _0238AD64: mov r1, #0x18 ldrsb r0, [r3, #0x80] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, r4 ldr r0, [r0] ldrsb r0, [r0, #0x81] @@ -850,7 +850,7 @@ _0238ADB0: ldrsb r0, [r3, #0x80] mov r1, #0x18 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, r4 ldr r0, [r0] ldrsb r0, [r0, #0x81] @@ -883,13 +883,13 @@ _0238AE08: ldrsb r0, [r3, #0x80] ldr r2, _0238B104 ; =0x000003C2 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238AE54 _0238AE44: ldrsb r0, [r3, #0x80] mov r2, #0x3c0 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _0238AE54: ldr r0, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 mov r2, #0 @@ -915,7 +915,7 @@ _0238AE94: ldrsb r0, [r3, #0x80] ldr r2, _0238B160 ; =0x000003BA add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, r4 ldr r1, [r0] mov r2, #0 @@ -950,7 +950,7 @@ _0238AEF4: mov r1, #8 ldrsb r0, [r3, #0x80] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r0, [r0] ldrsb r0, [r0, #0x81] @@ -1140,7 +1140,7 @@ _0238B188: ldr r2, _0238B7C0 ; =0x000003BE ldrsb r0, [r3, #0x80] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238B204: mov r1, #0x25 @@ -1150,11 +1150,11 @@ _0238B204: ldrsb r0, [r3, #0x80] ldr r2, _0238B7C4 ; =0x000003CA add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238B228: ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox mov r0, r4 ldr r0, [r0] ldrsb r0, [r0, #0x80] @@ -1174,7 +1174,7 @@ _0238B260: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r1, [r1] strb r0, [r1, #0x83] @@ -1256,12 +1256,12 @@ _0238B344: ldrsb r0, [r3, #0x80] ldr r2, _0238B7D0 ; =0x000003CB add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox bl ov11_0230C910 b _0238B7B8 _0238B3B8: ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox mov r0, r4 ldr r0, [r0] ldrsb r0, [r0, #0x80] @@ -1287,7 +1287,7 @@ _0238B408: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r1, [r1] strb r0, [r1, #0x83] @@ -1330,7 +1330,7 @@ _0238B434: add r4, r4, #0x30 mov r2, #0 str r4, [sp, #8] - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r1, [r1] strb r0, [r1, #0x85] @@ -1361,7 +1361,7 @@ _0238B4CC: ldrsb r0, [r3, #0x80] ldr r2, _0238B7D8 ; =0x000003B9 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238B538: bl ov21_0238C920 @@ -1389,7 +1389,7 @@ _0238B538: ldrsb r0, [r3, #0x80] mov r2, #0x3cc add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238B5A4: ldr r0, _0238B0C0 ; =SWAP_SHOP_D_BOX_LAYOUT_7 @@ -1398,7 +1398,7 @@ _0238B5A4: ldr r3, _0238B14C ; =SWAP_SHOP_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r1, [r1] strb r0, [r1, #0x83] @@ -1430,11 +1430,11 @@ _0238B5D0: ldrsb r0, [r3, #0x80] ldr r2, _0238B7DC ; =0x000003C9 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238B640: ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox mov r0, r4 ldr r0, [r0] ldrsb r0, [r0, #0x80] @@ -1479,7 +1479,7 @@ _0238B68C: ldrsb r0, [r3, #0x80] ldr r2, _0238B7D8 ; =0x000003B9 add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B7B8 _0238B6F8: ldr r0, _0238B118 ; =SWAP_SHOP_D_BOX_LAYOUT_6 @@ -1488,7 +1488,7 @@ _0238B6F8: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r1, [r1] strb r0, [r1, #0x83] @@ -1531,7 +1531,7 @@ _0238B724: add r4, r4, #0x30 mov r2, #0 str r4, [sp, #8] - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238B08C ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r1, [r1] strb r0, [r1, #0x85] @@ -1749,7 +1749,7 @@ _0238B98C: ; jump table b _0238C5E4 ; case 67 _0238BA9C: ldrsb r0, [r3, #0x80] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238C7E4 mov r0, #0x1b @@ -1757,7 +1757,7 @@ _0238BA9C: ldr r0, _0238C8D0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r0, [r0] ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox b _0238C7E4 _0238BAC8: bl ov11_0230D220 @@ -1822,7 +1822,7 @@ _0238BB44: b _0238C7E4 _0238BBA8: ldrsb r0, [r3, #0x83] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238BD24 cmp r0, #6 @@ -1947,7 +1947,7 @@ _0238BD40: b _0238C7E4 _0238BD7C: ldrsb r0, [r3, #0x83] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238BDB8 cmp r0, #4 @@ -1981,20 +1981,20 @@ _0238BDB8: ldr r2, _0238C8E0 ; =0x000003B9 ldrsb r0, [r3, #0x80] add r3, r3, #0x30 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C7E4 _0238BE08: mov r0, #3 b _0238C7E8 _0238BE10: ldrsb r0, [r3, #0x80] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238C7E4 ldr r0, _0238C8D0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r0, [r0] ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C8D0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 mov r2, #0x44 ldr r1, [r0] @@ -2009,7 +2009,7 @@ _0238BE10: b _0238C7E4 _0238BE60: ldrsb r0, [r3, #0x83] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 ldrne r1, _0238C8D0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldrne r1, [r1] @@ -2103,7 +2103,7 @@ _0238BF80: tst r0, #8 beq _0238C7E4 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl sub_0203AAB0 ldr r1, _0238C8D0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r1, [r1] @@ -2139,7 +2139,7 @@ _0238C014: b _0238C7E4 _0238C034: ldrsb r0, [r3, #0x83] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #0xb addls pc, pc, r0, lsl #2 b _0238C7E4 @@ -2328,7 +2328,7 @@ _0238C284: b _0238C7E4 _0238C2E8: ldrsb r0, [r3, #0x83] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C324 cmp r0, #6 @@ -2368,7 +2368,7 @@ _0238C340: b _0238C7E4 _0238C37C: ldrsb r0, [r3, #0x83] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C3B0 cmp r0, #4 @@ -2388,7 +2388,7 @@ _0238C3B0: b _0238C7E4 _0238C3C0: ldrsb r0, [r3, #0x83] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #0xc bgt _0238C3F0 bge _0238C3FC @@ -2442,7 +2442,7 @@ _0238C464: cmp r0, r1 bge _0238C4A0 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _0238C8D0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r0, [r0] add r0, r0, #0x18 @@ -2453,7 +2453,7 @@ _0238C464: _0238C4A0: bne _0238C7E4 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, _0238C8D0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r2, [r0] add r3, r2, #0x42 @@ -2498,7 +2498,7 @@ _0238C4EC: b _0238C7E4 _0238C550: ldrsb r0, [r3, #0x83] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C58C cmp r0, #6 @@ -2670,13 +2670,13 @@ _0238C7A8: b _0238C7E4 _0238C7B4: ldrsb r0, [r3, #0x80] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238C7E4 ldr r0, _0238C8D0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r0, [r0] ldrsb r0, [r0, #0x80] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C8D0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r0, [r0] ldr r0, [r0, #4] @@ -2707,7 +2707,7 @@ _0238C830: str r1, [r3, #0x2c] ldr r0, [r0] ldrsb r0, [r0, #0x80] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238C8D0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r0, [r0] ldrsb r0, [r0, #0x81] @@ -2802,7 +2802,7 @@ _0238C960: ldr r0, _0238C9A0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 ldr r0, [r0] ldrsb r0, [r0, #0x83] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238C9A0 ; =OVERLAY21_UNKNOWN_POINTER__NA_238CF40 mvn r1, #1 ldr r0, [r0] diff --git a/asm/overlay_22.s b/asm/overlay_22.s index 3d686061..4dce5a39 100644 --- a/asm/overlay_22.s +++ b/asm/overlay_22.s @@ -41,7 +41,7 @@ ov22_0238A150: ; 0x0238A150 str r3, [sp, #8] ldr r2, [r2, #4] ldr r3, _0238A224 ; =ov22_0238A640 - bl sub_0202C3A8 + bl CreateCollectionMenu ldr r2, _0238A210 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC60 mov r1, #0x76 ldr r3, [r2, #4] @@ -445,7 +445,7 @@ ov22_0238A67C: ; 0x0238A67C mov r1, r4 mov r0, #6 strb r1, [r2, r5] - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r4, #1 b _0238A730 _0238A6D0: @@ -469,12 +469,12 @@ _0238A6F8: mov r1, #1 mov r0, #6 strb r1, [r2, #0x390] - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r4, #1 b _0238A730 _0238A728: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper _0238A730: bl ov22_0238A4CC cmp r0, #0 @@ -546,7 +546,7 @@ ov22_0238A79C: ; 0x0238A79C str r3, [sp, #8] ldr r2, [r2, #4] ldr r3, _0238A870 ; =ov22_0238AC8C - bl sub_0202C3A8 + bl CreateCollectionMenu ldr r2, _0238A85C ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC68 mov r1, #0x76 ldr r3, [r2, #4] @@ -946,7 +946,7 @@ ov22_0238ACC8: ; 0x0238ACC8 mov r1, r4 mov r0, #6 strb r1, [r2, r5] - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r4, #1 b _0238AD7C _0238AD1C: @@ -970,12 +970,12 @@ _0238AD44: mov r1, #1 mov r0, #6 strb r1, [r2, #0x230] - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r4, #1 b _0238AD7C _0238AD74: mov r0, #2 - bl sub_02017CCC + bl PlaySeVolumeWrapper _0238AD7C: bl ov22_0238AB18 cmp r0, #0 @@ -1095,7 +1095,7 @@ _0238AEC4: mul r5, r4, r2 ldr r2, _0238BD6C ; =OVERLAY22_UNKNOWN_STRING_IDS ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238AF18: ldr r0, _0238BD70 ; =ov22_0238E9D8 @@ -1118,7 +1118,7 @@ _0238AF18: mul r5, r4, r2 ldr r2, _0238BD78 ; =ov22_0238E8F2 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238AF70: ldr r0, _0238BD7C ; =ov22_0238E9E4 @@ -1129,7 +1129,7 @@ _0238AF70: ldr r3, _0238BD88 ; =SHOP_MAIN_MENU_3 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -1157,7 +1157,7 @@ _0238AFB0: mul r5, r4, r2 ldr r2, _0238BD94 ; =ov22_0238E91E ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B000: ldr r0, _0238BD98 ; =ov22_0238EA04 @@ -1178,7 +1178,7 @@ _0238B000: mul r5, r4, r2 ldr r2, _0238BD9C ; =ov22_0238E8F4 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B050: ldr r0, _0238BDA0 ; =ov22_0238EA10 @@ -1199,7 +1199,7 @@ _0238B050: mul r5, r4, r2 ldr r2, _0238BDA4 ; =ov22_0238E90A ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B0A0: ldr r0, _0238BDA8 ; =ov22_0238EA1C @@ -1220,7 +1220,7 @@ _0238B0A0: mul r5, r4, r2 ldr r2, _0238BDAC ; =ov22_0238E90C ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B0F0: ldr r0, _0238BDB0 ; =ov22_0238EA28 @@ -1240,7 +1240,7 @@ _0238B0F0: mul r5, r4, r2 ldr r2, _0238BDB4 ; =ov22_0238E90E ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B13C: ldr r0, _0238BDB8 ; =ov22_0238EA34 @@ -1260,7 +1260,7 @@ _0238B13C: mul r5, r4, r2 ldr r2, _0238BDBC ; =ov22_0238E91C ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B188: ldr r0, _0238BDC0 ; =ov22_0238EA40 @@ -1280,7 +1280,7 @@ _0238B188: mul r5, r4, r2 ldr r2, _0238BDC4 ; =ov22_0238E910 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B1D4: ldr r0, _0238BDC8 ; =ov22_0238EA4C @@ -1300,7 +1300,7 @@ _0238B1D4: mul r5, r4, r2 ldr r2, _0238BDCC ; =ov22_0238E912 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B220: ldr r0, _0238BDD0 ; =ov22_0238EA58 @@ -1320,7 +1320,7 @@ _0238B220: mul r5, r4, r2 ldr r2, _0238BDD4 ; =ov22_0238E914 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B26C: ldr r0, _0238BDD8 ; =ov22_0238EA64 @@ -1341,7 +1341,7 @@ _0238B26C: mul r5, r4, r2 ldr r2, _0238BDDC ; =ov22_0238E916 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B2BC: ldr r0, _0238BDE0 ; =ov22_0238EA70 @@ -1362,7 +1362,7 @@ _0238B2BC: mul r5, r4, r2 ldr r2, _0238BDE4 ; =ov22_0238E918 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B30C: ldr r0, _0238BDE8 ; =ov22_0238EA7C @@ -1389,7 +1389,7 @@ _0238B30C: mul r5, r4, r2 ldr r2, _0238BDEC ; =ov22_0238E91A ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B374: ldr r0, _0238BDF0 ; =ov22_0238EA88 @@ -1410,7 +1410,7 @@ _0238B374: mul r5, r4, r2 ldr r2, _0238BDBC ; =ov22_0238E91C ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B3C4: ldrb r0, [r2, #8] @@ -1443,7 +1443,7 @@ _0238B3E0: mul r5, r4, r2 ldr r2, _0238BDF8 ; =ov22_0238E8F6 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B43C: ldr r0, _0238BDFC ; =ov22_0238EAA8 @@ -1467,7 +1467,7 @@ _0238B43C: ldrh r2, [r2, r1] ldr r1, _0238BD90 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B498: ldr r0, _0238BE04 ; =ov22_0238EAB8 @@ -1475,7 +1475,7 @@ _0238B498: ldr r0, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -1511,7 +1511,7 @@ _0238B510: str r2, [r1, #0x9c] ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -1552,7 +1552,7 @@ _0238B594: ldrne r0, _0238BE14 ; =SHOP_D_BOX_LAYOUT_7 str r4, [sp] ldreq r0, _0238BE18 ; =SHOP_D_BOX_LAYOUT_10 - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -1590,7 +1590,7 @@ _0238B5DC: mul r5, r4, r2 ldr r2, _0238BE24 ; =ov22_0238E8FA ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 mov r3, #0x2f ldr r2, [r0] @@ -1649,7 +1649,7 @@ _0238B680: stmib sp, {r2, r3} ldr r3, _0238BE3C ; =0x0000033E mov r2, #0 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4d] @@ -1693,7 +1693,7 @@ _0238B7A0: ldrh r2, [r2, r1] ldr r1, _0238BD90 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B7D8: ldr r0, _0238BE48 ; =ov22_0238EB30 @@ -1717,7 +1717,7 @@ _0238B7D8: mul r5, r4, r2 ldr r2, _0238BE4C ; =ov22_0238E900 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B834: ldr r0, _0238BE50 ; =ov22_0238EB40 @@ -1741,7 +1741,7 @@ _0238B834: ldrh r2, [r2, r1] ldr r1, _0238BD90 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238B890: ldr r0, _0238BE58 ; =ov22_0238EB50 @@ -1749,7 +1749,7 @@ _0238B890: ldr r0, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -1777,7 +1777,7 @@ _0238B8F0: str r2, [r1, #0x9c] ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -1804,7 +1804,7 @@ _0238B958: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -1842,7 +1842,7 @@ _0238B98C: mul r5, r4, r2 ldr r2, _0238BE6C ; =ov22_0238E904 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238BA14: ldr r0, _0238BE70 ; =ov22_0238EB90 @@ -1853,7 +1853,7 @@ _0238BA14: ldr r3, _0238BE78 ; =SHOP_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -1867,7 +1867,7 @@ _0238BA48: ldr r3, _0238BE78 ; =SHOP_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -1927,7 +1927,7 @@ _0238BA7C: stmib sp, {r2, r3} ldr r3, _0238BE3C ; =0x0000033E mov r2, r5 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4d] @@ -1966,7 +1966,7 @@ _0238BBA0: ldrh r2, [r2, r1] ldr r1, _0238BD90 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238BBD8: ldr r0, _0238BE90 ; =ov22_0238EBD8 @@ -1993,7 +1993,7 @@ _0238BBD8: mul r5, r4, r2 ldr r2, _0238BE94 ; =ov22_0238E906 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238BC40: ldr r0, _0238BE98 ; =ov22_0238EBE4 @@ -2070,7 +2070,7 @@ _0238BD04: ldrh r2, [r2, r1] ldr r1, _0238BD68 ; =0x00003008 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C .align 2, 0 _0238BD60: .word OVERLAY22_UNKNOWN_POINTER__NA_238EC70 @@ -2223,7 +2223,7 @@ _0238BF48: ldrh r2, [r2, r1] ldr r1, _0238BD68 ; =0x00003008 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238BFB4: ldr r0, _0238C174 ; =ov22_0238EC00 @@ -2234,7 +2234,7 @@ _0238BFB4: ldr r3, _0238BE78 ; =SHOP_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -2258,7 +2258,7 @@ _0238BFE8: ldrh r2, [r2, r1] ldr r1, _0238BD90 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238C038: ldr r0, _0238C174 ; =ov22_0238EC00 @@ -2269,7 +2269,7 @@ _0238C038: ldr r3, _0238BE78 ; =SHOP_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -2283,7 +2283,7 @@ _0238C06C: ldr r3, _0238BE78 ; =SHOP_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -2294,7 +2294,7 @@ _0238C0A0: ldr r0, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox bl ov22_0238D528 cmp r0, #0 ldreq r0, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 @@ -2315,7 +2315,7 @@ _0238C0A0: ldrh r2, [r2, r1] ldr r1, _0238BD90 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C16C _0238C110: ldr r0, _0238C180 ; =ov22_0238EC38 @@ -2323,7 +2323,7 @@ _0238C110: ldr r0, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238BD60 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 mov r2, #1 ldr r1, [r0] @@ -2339,7 +2339,7 @@ _0238C110: mul r5, r4, r2 ldr r2, _0238BE8C ; =ov22_0238E908 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox bl sub_02042AF8 _0238C16C: add sp, sp, #0xac @@ -2431,7 +2431,7 @@ _0238C268: mul r5, r4, r2 ldr r2, _0238D110 ; =OVERLAY22_UNKNOWN_STRING_IDS ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C2BC: ldr r0, _0238D114 ; =ov22_0238E9D8 @@ -2454,7 +2454,7 @@ _0238C2BC: mul r5, r4, r2 ldr r2, _0238D11C ; =ov22_0238E8F2 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C314: ldr r0, _0238D120 ; =ov22_0238E9E4 @@ -2465,7 +2465,7 @@ _0238C314: ldr r3, _0238D12C ; =SHOP_MAIN_MENU_3 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -2493,7 +2493,7 @@ _0238C354: mul r5, r4, r2 ldr r2, _0238D138 ; =ov22_0238E91E ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C3A4: ldr r0, _0238D13C ; =ov22_0238EA04 @@ -2514,7 +2514,7 @@ _0238C3A4: mul r5, r4, r2 ldr r2, _0238D140 ; =ov22_0238E8F4 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C3F4: ldr r0, _0238D144 ; =ov22_0238EA10 @@ -2535,7 +2535,7 @@ _0238C3F4: mul r5, r4, r2 ldr r2, _0238D148 ; =ov22_0238E90A ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C444: ldr r0, _0238D14C ; =ov22_0238EA1C @@ -2556,7 +2556,7 @@ _0238C444: mul r5, r4, r2 ldr r2, _0238D150 ; =ov22_0238E90C ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C494: ldr r0, _0238D154 ; =ov22_0238EA28 @@ -2576,7 +2576,7 @@ _0238C494: mul r5, r4, r2 ldr r2, _0238D158 ; =ov22_0238E90E ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C4E0: ldr r0, _0238D15C ; =ov22_0238EA34 @@ -2596,7 +2596,7 @@ _0238C4E0: mul r5, r4, r2 ldr r2, _0238D160 ; =ov22_0238E91C ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C52C: ldr r0, _0238D164 ; =ov22_0238EA40 @@ -2616,7 +2616,7 @@ _0238C52C: mul r5, r4, r2 ldr r2, _0238D168 ; =ov22_0238E910 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C578: ldr r0, _0238D16C ; =ov22_0238EA4C @@ -2636,7 +2636,7 @@ _0238C578: mul r5, r4, r2 ldr r2, _0238D170 ; =ov22_0238E912 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C5C4: ldr r0, _0238D174 ; =ov22_0238EA58 @@ -2656,7 +2656,7 @@ _0238C5C4: mul r5, r4, r2 ldr r2, _0238D178 ; =ov22_0238E914 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C610: ldr r0, _0238D17C ; =ov22_0238EA64 @@ -2677,7 +2677,7 @@ _0238C610: mul r5, r4, r2 ldr r2, _0238D180 ; =ov22_0238E916 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C660: ldr r0, _0238D184 ; =ov22_0238EA70 @@ -2698,7 +2698,7 @@ _0238C660: mul r5, r4, r2 ldr r2, _0238D188 ; =ov22_0238E918 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C6B0: ldr r0, _0238D18C ; =ov22_0238EA7C @@ -2725,7 +2725,7 @@ _0238C6B0: mul r5, r4, r2 ldr r2, _0238D190 ; =ov22_0238E91A ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C718: ldr r0, _0238D194 ; =ov22_0238EA88 @@ -2746,7 +2746,7 @@ _0238C718: mul r5, r4, r2 ldr r2, _0238D160 ; =ov22_0238E91C ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C768: ldrb r0, [r2, #8] @@ -2779,7 +2779,7 @@ _0238C784: mul r5, r4, r2 ldr r2, _0238D19C ; =ov22_0238E8F6 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C7E0: ldr r0, _0238D1A0 ; =ov22_0238EAA8 @@ -2803,7 +2803,7 @@ _0238C7E0: ldrh r2, [r2, r1] ldr r1, _0238D134 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238C83C: ldr r0, _0238D1A8 ; =ov22_0238EAB8 @@ -2811,7 +2811,7 @@ _0238C83C: ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -2847,7 +2847,7 @@ _0238C8B4: str r2, [r1, #0x9c] ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -2888,7 +2888,7 @@ _0238C938: ldrne r0, _0238D1B8 ; =SHOP_D_BOX_LAYOUT_7 str r4, [sp] ldreq r0, _0238D1BC ; =SHOP_D_BOX_LAYOUT_10 - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -2926,7 +2926,7 @@ _0238C980: mul r5, r4, r2 ldr r2, _0238D1C8 ; =ov22_0238E8FA ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 mov r3, #0x2f ldr r2, [r0] @@ -2985,7 +2985,7 @@ _0238CA24: stmib sp, {r2, r3} ldr r3, _0238D1E0 ; =0x0000033E mov r2, #0 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4d] @@ -3029,7 +3029,7 @@ _0238CB44: ldrh r2, [r2, r1] ldr r1, _0238D134 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238CB7C: ldr r0, _0238D1EC ; =ov22_0238EB30 @@ -3053,7 +3053,7 @@ _0238CB7C: mul r5, r4, r2 ldr r2, _0238D1F0 ; =ov22_0238E900 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238CBD8: ldr r0, _0238D1F4 ; =ov22_0238EB40 @@ -3077,7 +3077,7 @@ _0238CBD8: ldrh r2, [r2, r1] ldr r1, _0238D134 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238CC34: ldr r0, _0238D1FC ; =ov22_0238EB50 @@ -3085,7 +3085,7 @@ _0238CC34: ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -3113,7 +3113,7 @@ _0238CC94: str r2, [r1, #0x9c] ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] @@ -3140,7 +3140,7 @@ _0238CCFC: mov r1, #0x13 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -3178,7 +3178,7 @@ _0238CD30: mul r5, r4, r2 ldr r2, _0238D210 ; =ov22_0238E904 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238CDB8: ldr r0, _0238D214 ; =ov22_0238EB90 @@ -3189,7 +3189,7 @@ _0238CDB8: ldr r3, _0238D21C ; =SHOP_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -3203,7 +3203,7 @@ _0238CDEC: ldr r3, _0238D21C ; =SHOP_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -3263,7 +3263,7 @@ _0238CE20: stmib sp, {r2, r3} ldr r3, _0238D1E0 ; =0x0000033E mov r2, r5 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4d] @@ -3302,7 +3302,7 @@ _0238CF44: ldrh r2, [r2, r1] ldr r1, _0238D134 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238CF7C: ldr r0, _0238D234 ; =ov22_0238EBD8 @@ -3329,7 +3329,7 @@ _0238CF7C: mul r5, r4, r2 ldr r2, _0238D238 ; =ov22_0238E906 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238CFE4: ldr r0, _0238D23C ; =ov22_0238EBE4 @@ -3406,7 +3406,7 @@ _0238D0A8: ldrh r2, [r2, r1] ldr r1, _0238D10C ; =0x00003008 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 .align 2, 0 _0238D104: .word OVERLAY22_UNKNOWN_POINTER__NA_238EC70 @@ -3559,7 +3559,7 @@ _0238D2EC: ldrh r2, [r2, r1] ldr r1, _0238D10C ; =0x00003008 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238D358: ldr r0, _0238D518 ; =ov22_0238EC00 @@ -3570,7 +3570,7 @@ _0238D358: ldr r3, _0238D21C ; =SHOP_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -3594,7 +3594,7 @@ _0238D38C: ldrh r2, [r2, r1] ldr r1, _0238D134 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238D3DC: ldr r0, _0238D518 ; =ov22_0238EC00 @@ -3605,7 +3605,7 @@ _0238D3DC: ldr r3, _0238D21C ; =SHOP_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -3619,7 +3619,7 @@ _0238D410: ldr r3, _0238D21C ; =SHOP_MENU_CONFIRM mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r1, [r1] strb r0, [r1, #0x4c] @@ -3630,7 +3630,7 @@ _0238D444: ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox bl ov22_0238D528 cmp r0, #0 ldreq r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 @@ -3651,7 +3651,7 @@ _0238D444: ldrh r2, [r2, r1] ldr r1, _0238D134 ; =0x00003018 add r3, r4, #0x50 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238D510 _0238D4B4: ldr r0, _0238D524 ; =ov22_0238EC38 @@ -3659,7 +3659,7 @@ _0238D4B4: ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238D104 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 mov r2, #1 ldr r1, [r0] @@ -3675,7 +3675,7 @@ _0238D4B4: mul r5, r4, r2 ldr r2, _0238D230 ; =ov22_0238E908 ldrh r2, [r2, r5] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox bl sub_02042AF8 _0238D510: add sp, sp, #0xac @@ -3789,7 +3789,7 @@ ov22_0238D640: ; 0x0238D640 add r0, r0, #0x50 bl InitPreprocessorArgs mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r2, _0238D7A4 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 mov r1, #3 ldr r3, [r2] @@ -3978,7 +3978,7 @@ _0238D848: ; jump table b _0238E638 ; case 48 _0238D90C: ldrsb r0, [r2, #0x48] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238E734 mov r0, #0x2c @@ -3986,11 +3986,11 @@ _0238D90C: ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox b _0238E734 _0238D938: ldrsb r0, [r2, #0x4c] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 ldrne r1, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldrne r1, [r1] @@ -4412,7 +4412,7 @@ _0238DF04: tst r0, #8 beq _0238E734 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl sub_02042ADC ldr r2, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 mov r1, #6 @@ -4443,7 +4443,7 @@ _0238DF04: b _0238E734 _0238DFA0: ldrsb r0, [r2, #0x4c] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238E058 cmp r0, #2 @@ -4503,7 +4503,7 @@ _0238E058: b _0238E734 _0238E07C: ldrsb r0, [r2, #0x4c] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238E148 cmp r0, #3 @@ -4566,13 +4566,13 @@ _0238E148: b _0238E734 _0238E164: ldrsb r0, [r2, #0x48] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238E734 ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x4c] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238E1E0 cmp r0, #5 @@ -4606,13 +4606,13 @@ _0238E1E0: b _0238E734 _0238E1F0: ldrsb r0, [r2, #0x48] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238E734 ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x4c] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238E270 cmp r0, #5 @@ -4645,7 +4645,7 @@ _0238E270: b _0238E734 _0238E280: ldrsb r0, [r2, #0x4c] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238E38C cmp r0, #5 @@ -4723,7 +4723,7 @@ _0238E38C: b _0238E734 _0238E39C: ldrsb r0, [r2, #0x4c] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238E3F8 cmp r0, #5 @@ -4752,14 +4752,14 @@ _0238E3F8: ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox bl ov22_0238E7E4 mov r0, #0x11 bl ov22_0238ADD8 b _0238E734 _0238E418: ldrsb r0, [r2, #0x4c] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238E544 cmp r0, #5 @@ -4842,7 +4842,7 @@ _0238E544: ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox bl ov22_0238E7E4 mov r0, #0x1d bl ov22_0238ADD8 @@ -4885,13 +4885,13 @@ _0238E5DC: b _0238E738 _0238E5E8: ldrsb r0, [r2, #0x48] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238E734 ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 mov r2, #0x10 ldr r1, [r0] @@ -4964,13 +4964,13 @@ _0238E6F8: b _0238E734 _0238E704: ldrsb r0, [r2, #0x48] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238E734 ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldr r0, [r0, #0x14] @@ -4986,7 +4986,7 @@ _0238E738: b _0238E7DC _0238E750: ldrsb r0, [r2, #0x48] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238E7DC ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 @@ -5018,7 +5018,7 @@ _0238E7A8: ldr r0, _0238E794 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 ldr r0, [r0] ldrsb r0, [r0, #0x48] - bl FreeDBox + bl FreeDialogueBox bl ov11_022E6E68 mov r0, #4 ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -5036,7 +5036,7 @@ ov22_0238E7E4: ; 0x0238E7E4 ldrsb r0, [r0, #0x4c] cmp r0, r1 ldmeqia sp!, {r3, pc} - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238E818 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC70 mvn r1, #1 ldr r0, [r0] diff --git a/asm/overlay_23.s b/asm/overlay_23.s index c06ffc6c..9a824b0c 100644 --- a/asm/overlay_23.s +++ b/asm/overlay_23.s @@ -64,7 +64,7 @@ _0238A218: mov r1, #1 mov r0, #0 strb r1, [r2, #0x88] - bl CreateDBox + bl CreateDialogueBox ldr r2, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 mov r4, #0x73 ldr r3, [r2] @@ -152,7 +152,7 @@ _0238A34C: add r2, sp, #0xc add r1, r4, #0x210 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -164,7 +164,7 @@ _0238A38C: ldr r3, _0238B0F8 ; =STORAGE_MAIN_MENU_4 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -439,7 +439,7 @@ _0238A7A4: ldr r0, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -463,7 +463,7 @@ _0238A800: ldr r0, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -519,7 +519,7 @@ _0238A8B8: add r2, sp, #0xa4 add r1, r4, #0x210 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -535,7 +535,7 @@ _0238A8FC: add r2, sp, #0x13c add r1, r4, #0x210 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -597,7 +597,7 @@ _0238A938: stmib sp, {r2, r3} ldr r3, _0238B178 ; =0x00000315 mov r2, #0 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x9a] @@ -697,7 +697,7 @@ _0238AB64: ldr r3, _0238B190 ; =STORAGE_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -711,7 +711,7 @@ _0238AB98: ldr r3, _0238B190 ; =STORAGE_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -811,7 +811,7 @@ _0238AD0C: str r2, [r1, #0xc] ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -836,7 +836,7 @@ _0238AD74: ldr r0, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -862,7 +862,7 @@ _0238ADCC: mov r1, #0x13 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -878,7 +878,7 @@ _0238AE00: add r2, sp, #0x224 add r1, ip, #0x210 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -927,7 +927,7 @@ _0238AE3C: stmib sp, {r2, r3} ldr r3, _0238B178 ; =0x00000315 mov r2, #0 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x9a] @@ -985,7 +985,7 @@ _0238AF94: ldr r3, _0238B190 ; =STORAGE_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -1042,7 +1042,7 @@ _0238B06C: ldr r3, _0238B190 ; =STORAGE_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -1216,7 +1216,7 @@ _0238B308: mov r1, #1 mov r0, #0 strb r1, [r2, #0x88] - bl CreateDBox + bl CreateDialogueBox ldr r2, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 mov r4, #0x73 ldr r3, [r2] @@ -1304,7 +1304,7 @@ _0238B43C: add r2, sp, #0x274 add r1, r4, #0x210 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -1316,7 +1316,7 @@ _0238B47C: ldr r3, _0238C1E8 ; =STORAGE_MAIN_MENU_4 mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -1591,7 +1591,7 @@ _0238B894: ldr r0, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -1615,7 +1615,7 @@ _0238B8F0: ldr r0, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -1671,7 +1671,7 @@ _0238B9A8: add r2, sp, #0x1dc add r1, r4, #0x210 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -1687,7 +1687,7 @@ _0238B9EC: add r2, sp, #0x144 add r1, r4, #0x210 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -1749,7 +1749,7 @@ _0238BA28: stmib sp, {r2, r3} ldr r3, _0238C268 ; =0x00000315 mov r2, #0 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x9a] @@ -1849,7 +1849,7 @@ _0238BC54: ldr r3, _0238C280 ; =STORAGE_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -1863,7 +1863,7 @@ _0238BC88: ldr r3, _0238C280 ; =STORAGE_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -1963,7 +1963,7 @@ _0238BDFC: str r2, [r1, #0xc] ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -1988,7 +1988,7 @@ _0238BE64: ldr r0, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] @@ -2014,7 +2014,7 @@ _0238BEBC: mov r1, #0x13 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -2030,7 +2030,7 @@ _0238BEF0: add r2, sp, #0x5c add r1, ip, #0x210 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -2079,7 +2079,7 @@ _0238BF2C: stmib sp, {r2, r3} ldr r3, _0238C268 ; =0x00000315 mov r2, #0 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x9a] @@ -2137,7 +2137,7 @@ _0238C084: ldr r3, _0238C280 ; =STORAGE_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -2194,7 +2194,7 @@ _0238C15C: ldr r3, _0238C280 ; =STORAGE_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C1CC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r1, [r1] strb r0, [r1, #0x99] @@ -2486,7 +2486,7 @@ _0238C574: b _0238CFD0 _0238C598: ldrsb r0, [r1, #0x95] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238CFD0 mov r0, #0x23 @@ -2494,7 +2494,7 @@ _0238C598: ldr r0, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl ShowDBox + bl ShowDialogueBox b _0238CFD0 _0238C5C4: bl sub_020426B4 @@ -2556,7 +2556,7 @@ _0238C66C: tst r0, #8 beq _0238CFD0 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl sub_02042ADC ldr r1, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r2, [r1] @@ -2585,7 +2585,7 @@ _0238C66C: b _0238CFD0 _0238C704: ldrsb r0, [r1, #0x99] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C80C cmp r0, #2 @@ -2681,7 +2681,7 @@ _0238C828: b _0238CFD0 _0238C864: ldrsb r0, [r1, #0x99] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C89C cmp r0, #4 @@ -2714,7 +2714,7 @@ _0238C89C: b _0238CFD0 _0238C8DC: ldrsb r0, [r1, #0x99] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C934 cmp r0, #4 @@ -2815,7 +2815,7 @@ _0238CA2C: tst r0, #8 beq _0238CFD0 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, r4 bl sub_0204323C ldr r2, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 @@ -2853,7 +2853,7 @@ _0238CA2C: b _0238CFD0 _0238CAE8: ldrsb r0, [r1, #0x99] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238CBCC cmp r0, #3 @@ -2938,7 +2938,7 @@ _0238CBE8: b _0238CFD0 _0238CC24: ldrsb r0, [r1, #0x99] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238CC7C cmp r0, #4 @@ -2979,13 +2979,13 @@ _0238CC7C: b _0238CFD0 _0238CCBC: ldrsb r0, [r1, #0x95] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238CFD0 ldr r0, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x99] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238CD30 cmp r0, #4 @@ -3031,13 +3031,13 @@ _0238CD70: b _0238CFD4 _0238CD7C: ldrsb r0, [r1, #0x95] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238CFD0 ldr r0, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 mov r2, #0x2e ldr r1, [r0] @@ -3052,7 +3052,7 @@ _0238CD7C: b _0238CFD0 _0238CDCC: ldrsb r0, [r1, #0x99] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 ldrne r1, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldrne r1, [r1] @@ -3188,13 +3188,13 @@ _0238CF94: b _0238CFD0 _0238CFA0: ldrsb r0, [r1, #0x95] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238CFD0 ldr r0, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldr r0, [r0, #0xc] @@ -3228,7 +3228,7 @@ _0238D01C: ldr r0, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x95] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238D090 ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x96] @@ -3272,7 +3272,7 @@ ov23_0238D098: ; 0x0238D098 ldr r0, _0238D0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 ldr r0, [r0] ldrsb r0, [r0, #0x99] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238D0DC ; =OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 mvn r1, #1 ldr r0, [r0] @@ -3307,7 +3307,7 @@ ov23_0238D0E0: ; 0x0238D0E0 mov r1, r5 mov r2, r4 add r3, r3, #0x9c - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0238D144: .word OVERLAY23_UNKNOWN_POINTER__NA_238D8A0 diff --git a/asm/overlay_24.s b/asm/overlay_24.s index 6548f1d3..9f409981 100644 --- a/asm/overlay_24.s +++ b/asm/overlay_24.s @@ -55,7 +55,7 @@ _0238A15C: ; jump table _0238A1F8: add r0, r2, #0x200 ldrsb r0, [r0, #0x8c] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A604 mov r0, #0x1a @@ -64,7 +64,7 @@ _0238A1F8: ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] - bl ShowDBox + bl ShowDialogueBox b _0238A604 _0238A22C: bl ov11_02306C9C @@ -87,7 +87,7 @@ _0238A250: _0238A26C: add r0, r2, #0x200 ldrsb r0, [r0, #0x8f] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238A2A4 cmp r0, #4 @@ -117,14 +117,14 @@ _0238A2C0: ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A604 ldr r0, _0238A60C ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238A60C ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mov r2, #0x27 ldr r1, [r0] @@ -142,7 +142,7 @@ _0238A2C0: _0238A334: add r0, r2, #0x200 ldrsb r0, [r0, #0x8f] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 ldrne r1, _0238A60C ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 ldrne r1, [r1] @@ -282,14 +282,14 @@ _0238A4FC: _0238A518: add r0, r2, #0x200 ldrsb r0, [r0, #0x8c] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A604 ldr r0, _0238A60C ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238A60C ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mvn r2, #1 ldr r1, [r0] @@ -332,14 +332,14 @@ _0238A5B8: ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A604 ldr r0, _0238A60C ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8c] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238A60C ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 ldr r0, [r0] ldr r0, [r0, #8] @@ -415,7 +415,7 @@ _0238A658: ; jump table _0238A6F4: mov r0, #0 strb r0, [r1, #0x1f0] - bl CreateDBox + bl CreateDialogueBox ldr r2, _0238B384 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mov r1, #3 ldr r3, [r2] @@ -460,12 +460,12 @@ _0238A6F4: bne _0238A7B8 ldr r2, _0238B390 ; =0x0000038A add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238A7C4 _0238A7B8: ldr r2, _0238B394 ; =0x0000038B add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _0238A7C4: ldr r0, _0238B384 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mov r3, #4 @@ -481,7 +481,7 @@ _0238A7E4: ldr r1, _0238B398 ; =0x00003008 ldr r2, _0238B39C ; =0x0000038F add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238A800: ldr r0, _0238B3A0 ; =DAYCARE_D_BOX_LAYOUT_4 @@ -490,7 +490,7 @@ _0238A800: ldr r3, _0238B3A8 ; =DAYCARE_MAIN_MENU mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B384 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 ldr r1, [r1] strb r0, [r1, #0x28f] @@ -519,7 +519,7 @@ _0238A82C: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238A890: bl ov24_0238C47C @@ -548,7 +548,7 @@ _0238A890: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238A900: bl ov24_0238C47C @@ -574,7 +574,7 @@ _0238A900: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238A964: bl ov24_0238C47C @@ -606,7 +606,7 @@ _0238A964: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238A9E0: bl ov24_0238C47C @@ -638,7 +638,7 @@ _0238A9E0: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238AA5C: bl ov24_0238C47C @@ -670,7 +670,7 @@ _0238AA5C: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238AAD8: ldr r0, _0238B3B0 ; =0x0000220F @@ -701,7 +701,7 @@ _0238AAD8: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238AB50: bl ov24_0238C47C @@ -738,7 +738,7 @@ _0238AB50: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238ABE0: mov r2, #0x12 @@ -781,7 +781,7 @@ _0238AC2C: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238AC80: mov r2, #0x1b @@ -806,7 +806,7 @@ _0238AC80: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238ACE0: ldr r0, _0238B3B0 ; =0x0000220F @@ -851,7 +851,7 @@ _0238ACE0: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238AD90: mov r0, #0 @@ -859,7 +859,7 @@ _0238AD90: mov r2, r0 mov r1, #0x11 str r0, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B384 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 ldr r1, [r1] strb r0, [r1, #0x28f] @@ -952,7 +952,7 @@ _0238AECC: ldrsb r0, [r0, #0x8c] ldr r2, _0238B3D4 ; =0x000003A2 add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238AF00: bl Rand16Bit @@ -1001,7 +1001,7 @@ _0238AF00: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238AFC0: ldr r0, _0238B384 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 @@ -1026,7 +1026,7 @@ _0238AFC0: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B384 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mov r3, #0x25 ldr r2, [r0] @@ -1181,7 +1181,7 @@ _0238B170: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238B278: mov r0, #0xa @@ -1206,12 +1206,12 @@ _0238B284: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B37C _0238B2D4: add r0, r1, #0x200 ldrsb r0, [r0, #0x8c] - bl FreeDBox + bl FreeDialogueBox ldr r1, _0238B384 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mvn r3, #1 ldr r2, [r1] @@ -1249,7 +1249,7 @@ _0238B338: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B384 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mov r1, #4 ldr r0, [r0] @@ -1350,7 +1350,7 @@ _0238B434: ; jump table _0238B4D0: mov r0, #0 strb r0, [r1, #0x1f0] - bl CreateDBox + bl CreateDialogueBox ldr r2, _0238C164 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mov r1, #3 ldr r3, [r2] @@ -1395,12 +1395,12 @@ _0238B4D0: bne _0238B594 ldr r2, _0238C16C ; =0x0000038A add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B5A0 _0238B594: ldr r2, _0238C170 ; =0x0000038B add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _0238B5A0: ldr r0, _0238C164 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mov r3, #4 @@ -1416,7 +1416,7 @@ _0238B5C0: ldr r1, _0238C174 ; =0x00003008 ldr r2, _0238C178 ; =0x0000038F add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238B5DC: ldr r0, _0238C17C ; =DAYCARE_D_BOX_LAYOUT_4 @@ -1425,7 +1425,7 @@ _0238B5DC: ldr r3, _0238C184 ; =DAYCARE_MAIN_MENU mov r2, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C164 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 ldr r1, [r1] strb r0, [r1, #0x28f] @@ -1454,7 +1454,7 @@ _0238B608: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238B66C: bl ov24_0238C47C @@ -1483,7 +1483,7 @@ _0238B66C: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238B6DC: bl ov24_0238C47C @@ -1509,7 +1509,7 @@ _0238B6DC: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238B740: bl ov24_0238C47C @@ -1541,7 +1541,7 @@ _0238B740: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238B7BC: bl ov24_0238C47C @@ -1573,7 +1573,7 @@ _0238B7BC: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238B838: bl ov24_0238C47C @@ -1605,7 +1605,7 @@ _0238B838: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238B8B4: ldr r0, _0238C18C ; =0x0000220F @@ -1636,7 +1636,7 @@ _0238B8B4: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238B92C: bl ov24_0238C47C @@ -1673,7 +1673,7 @@ _0238B92C: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238B9BC: mov r2, #0x12 @@ -1716,7 +1716,7 @@ _0238BA08: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238BA5C: mov r2, #0x1b @@ -1741,7 +1741,7 @@ _0238BA5C: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238BABC: ldr r0, _0238C18C ; =0x0000220F @@ -1786,7 +1786,7 @@ _0238BABC: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238BB6C: mov r0, #0 @@ -1794,7 +1794,7 @@ _0238BB6C: mov r2, r0 mov r1, #0x11 str r0, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238C164 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 ldr r1, [r1] strb r0, [r1, #0x28f] @@ -1883,7 +1883,7 @@ _0238BCA8: ldrsb r0, [r0, #0x8c] ldr r2, _0238C1B0 ; =0x000003A2 add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238BCDC: bl Rand16Bit @@ -1932,7 +1932,7 @@ _0238BCDC: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238BD9C: ldr r0, _0238C164 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 @@ -1957,7 +1957,7 @@ _0238BD9C: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238C164 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mov r3, #0x25 ldr r2, [r0] @@ -2112,7 +2112,7 @@ _0238BF4C: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238C054: mov r0, #0xa @@ -2137,12 +2137,12 @@ _0238C060: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238C158 _0238C0B0: add r0, r1, #0x200 ldrsb r0, [r0, #0x8c] - bl FreeDBox + bl FreeDialogueBox ldr r1, _0238C164 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mvn r3, #1 ldr r2, [r1] @@ -2180,7 +2180,7 @@ _0238C114: add r0, r3, #0x200 ldrsb r0, [r0, #0x8c] add r3, r3, #0x1f8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238C164 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mov r1, #4 ldr r0, [r0] @@ -2388,7 +2388,7 @@ _0238C408: ldrsb r0, [r0, #0x8c] cmp r0, r1 beq _0238C43C - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238C478 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mvn r1, #1 ldr r0, [r0] @@ -2430,7 +2430,7 @@ ov24_0238C47C: ; 0x0238C47C ldr r0, [r0] add r0, r0, #0x200 ldrsb r0, [r0, #0x8f] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238C4C8 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 mvn r1, #1 ldr r0, [r0] @@ -2451,7 +2451,7 @@ ov24_0238C4CC: ; 0x0238C4CC cmp r0, r1 ldmneia sp!, {r3, pc} mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0238C504 ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600 ldr r1, [r1] strb r0, [r1, #0x28c] diff --git a/asm/overlay_25.s b/asm/overlay_25.s index 511560db..51bedea1 100644 --- a/asm/overlay_25.s +++ b/asm/overlay_25.s @@ -48,7 +48,7 @@ _0238A15C: ; jump table _0238A1DC: add r0, r2, #0x100 ldrsb r0, [r0, #0x38] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A674 mov r0, #0x1a @@ -57,7 +57,7 @@ _0238A1DC: ldr r0, [r0] add r0, r0, #0x100 ldrsb r0, [r0, #0x38] - bl ShowDBox + bl ShowDialogueBox b _0238A674 _0238A210: bl ov11_0230BA64 @@ -111,7 +111,7 @@ _0238A260: _0238A2C4: add r0, r2, #0x100 ldrsb r0, [r0, #0x3a] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238A334 cmp r0, #6 @@ -167,7 +167,7 @@ _0238A350: _0238A394: add r0, r2, #0x100 ldrsb r0, [r0, #0x3a] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238A3EC cmp r0, #4 @@ -200,14 +200,14 @@ _0238A3FC: _0238A404: add r0, r2, #0x100 ldrsb r0, [r0, #0x38] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A674 ldr r0, _0238A67C ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r0, [r0] add r0, r0, #0x100 ldrsb r0, [r0, #0x38] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238A67C ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 mov r2, #0x20 ldr r1, [r0] @@ -229,7 +229,7 @@ _0238A464: arm_func_start ov25_0238A468 ov25_0238A468: ; 0x0238A468 ldrsb r0, [r0, #0x3a] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 ldrne r1, _0238A67C ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldrne r1, [r1] @@ -333,7 +333,7 @@ _0238A5C0: ldrsb r0, [r0, #0x38] ldr r2, _0238A68C ; =0x000003E2 add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238A67C ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 mov r1, #0x1b ldr r0, [r0] @@ -351,7 +351,7 @@ _0238A5F8: ldrsb r0, [r0, #0x38] rsb r2, r2, #0x3e4 add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238A67C ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 mov r1, #0x1b ldr r0, [r0] @@ -360,14 +360,14 @@ _0238A5F8: _0238A63C: add r0, r2, #0x100 ldrsb r0, [r0, #0x38] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A674 ldr r0, _0238A67C ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r0, [r0] add r0, r0, #0x100 ldrsb r0, [r0, #0x38] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238A67C ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r0, [r0] ldr r0, [r0, #4] @@ -431,7 +431,7 @@ _0238A734: mov r2, #0x96 mov r0, #0 str r2, [r1, #0x4c] - bl CreateDBox + bl CreateDialogueBox ldr r3, _0238B0D0 ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r1, _0238B0D4 ; =0x00003008 ldr ip, [r3] @@ -441,7 +441,7 @@ _0238A734: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, #0 mov r1, #3 mov r2, #1 @@ -475,7 +475,7 @@ _0238A734: _0238A7E4: ldr r0, _0238B0DC ; =APPRAISAL_D_BOX_LAYOUT_1 ldr r1, _0238B0E0 ; =ov25_0238B414 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r2, _0238B0D0 ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r1, _0238B0E4 ; =0x00300013 ldr r2, [r2] @@ -485,7 +485,7 @@ _0238A7E4: ldr r0, _0238B0EC ; =APPRAISAL_D_BOX_LAYOUT_5 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0D0 ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r1, [r1] strb r0, [r1, #0x13a] @@ -515,7 +515,7 @@ _0238A828: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C8 _0238A890: bl ov25_0238B380 @@ -545,7 +545,7 @@ _0238A890: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C8 _0238A904: bl ov25_0238B380 @@ -572,7 +572,7 @@ _0238A904: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C8 _0238A96C: bl ov25_0238B380 @@ -602,7 +602,7 @@ _0238A96C: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C8 _0238A9E0: bl ov25_0238B380 @@ -632,7 +632,7 @@ _0238A9E0: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C8 _0238AA54: bl ov25_0238B380 @@ -662,7 +662,7 @@ _0238AA54: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C8 _0238AAC8: bl ov25_0238B380 @@ -692,7 +692,7 @@ _0238AAC8: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C8 _0238AB3C: bl ov25_0238B380 @@ -725,7 +725,7 @@ _0238AB3C: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C8 _0238ABBC: bl ov25_0238B380 @@ -780,7 +780,7 @@ _0238AC1C: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C8 _0238AC90: mov r0, #0xd @@ -810,12 +810,12 @@ _0238AC90: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C8 _0238AD04: add r0, r1, #0x100 ldrsb r0, [r0, #0x38] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0D0 ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r0, [r0] add r0, r0, #0x100 @@ -833,7 +833,7 @@ _0238AD04: _0238AD48: add r0, r1, #0x100 ldrsb r0, [r0, #0x38] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B0D0 ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r0, [r0] add r0, r0, #0x100 @@ -857,7 +857,7 @@ _0238AD8C: mov r1, #0x13 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0D0 ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r1, [r1] strb r0, [r1, #0x13a] @@ -907,7 +907,7 @@ ov25_0238ADFC: ; 0x0238ADFC add ip, ip, #0x28 mov r2, #0 str ip, [sp, #8] - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238B0D0 ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r1, [r1] strb r0, [r1, #0x13b] @@ -946,12 +946,12 @@ _0238AE64: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238B0C8 _0238AEF0: ldr r0, _0238B0DC ; =APPRAISAL_D_BOX_LAYOUT_1 ldr r1, _0238B0E0 ; =ov25_0238B414 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0238B0D0 ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r3, _0238B120 ; =APPRAISAL_MENU_CONFIRM ldr r1, [r1] @@ -961,7 +961,7 @@ _0238AEF0: mov r1, #0x80000013 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B0D0 ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r1, [r1] strb r0, [r1, #0x13a] @@ -1072,7 +1072,7 @@ _0238B00C: add r0, r3, #0x100 ldrsb r0, [r0, #0x38] add r3, r3, #0x28 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _0238B0C8: add sp, sp, #0x68 ldmia sp!, {r3, pc} @@ -1249,7 +1249,7 @@ _0238B318: ldr r0, [r0] add r0, r0, #0x100 ldrsb r0, [r0, #0x38] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238B37C ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 ldr r0, [r0] add r0, r0, #0x100 @@ -1291,7 +1291,7 @@ ov25_0238B380: ; 0x0238B380 ldr r0, [r0] add r0, r0, #0x100 ldrsb r0, [r0, #0x3a] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238B410 ; =OVERLAY25_UNKNOWN_POINTER__NA_238B5E0 mvn r1, #1 ldr r0, [r0] diff --git a/asm/overlay_26.s b/asm/overlay_26.s index b7a342a8..bf068645 100644 --- a/asm/overlay_26.s +++ b/asm/overlay_26.s @@ -342,7 +342,7 @@ _0238A5E0: mvn r1, #1 cmp r0, r1 beq _0238A5FC - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A8EC _0238A5FC: @@ -474,7 +474,7 @@ _0238A7B0: cmp r1, r0 bne _0238A7DC mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0238A8F8 ; =OVERLAY26_UNKNOWN_POINTER__NA_238AF60 ldr r1, [r1] strb r0, [r1, #4] @@ -485,7 +485,7 @@ _0238A7DC: mov r2, r4 ldrsb r0, [r3, #4] add r3, r3, #8 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox mov r0, #1 _0238A7FC: cmp r0, #0 @@ -503,7 +503,7 @@ _0238A824: mvn r1, #1 cmp r0, r1 beq _0238A840 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238A8EC _0238A840: @@ -577,7 +577,7 @@ ov26_0238A90C: ; 0x0238A90C ldrsb r0, [r0, #4] cmp r0, r1 beq _0238A93C - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238A96C ; =OVERLAY26_UNKNOWN_POINTER__NA_238AF60 mvn r1, #1 ldr r0, [r0] diff --git a/asm/overlay_27.s b/asm/overlay_27.s index 96a303f5..0bcd70e9 100644 --- a/asm/overlay_27.s +++ b/asm/overlay_27.s @@ -368,7 +368,7 @@ _0238A63C: mvn r1, #1 cmp r0, r1 beq _0238A660 - bl FreeDBox + bl FreeDialogueBox ldr r0, _0238A8DC ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE80 mvn r1, #1 ldr r0, [r0] @@ -476,7 +476,7 @@ _0238A78C: ldrsb r0, [r2, #8] ldrh r1, [r2, #0x34] add r2, r2, #0x38 - bl ShowStringInDBox + bl ShowStringInDialogueBox mov r4, #1 _0238A7D4: cmp r4, #0 @@ -523,7 +523,7 @@ _0238A830: ldrsb r0, [r1, #8] ldrh r1, [r1, #0x36] add r2, r2, #0x400 - bl ShowStringInDBox + bl ShowStringInDialogueBox mov r4, #1 _0238A880: cmp r4, #0 @@ -587,7 +587,7 @@ ov27_0238A928: ; 0x0238A928 ldrsb r0, [r0, #8] cmp r0, r1 beq _0238A954 - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} @@ -608,7 +608,7 @@ ov27_0238A960: ; 0x0238A960 cmp r1, r0 ldmneia sp!, {r3, pc} mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r1, _0238A994 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE80 ldr r1, [r1] strb r0, [r1, #8] @@ -680,7 +680,7 @@ _0238AA78: mov r1, #1 mov r0, #0 strb r1, [r2, #0x80] - bl CreateDBox + bl CreateDialogueBox ldr r2, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 mov r1, #0x73 ldr r3, [r2] @@ -701,7 +701,7 @@ _0238AA78: mov r1, #8 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238AAE0: ldr r0, _0238B928 ; =ov27_0238CA8C @@ -731,7 +731,7 @@ _0238AAE0: add r2, sp, #0xc mov r0, #0 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x91] @@ -754,7 +754,7 @@ _0238AB60: ldr r3, [r0] ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238ABAC: ldr r0, _0238B938 ; =ov27_0238CAB8 @@ -775,7 +775,7 @@ _0238ABAC: add r2, r1, #0x4c0 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238ABFC: ldr r0, _0238B93C ; =ov27_0238CAD0 @@ -796,7 +796,7 @@ _0238ABFC: add r2, r1, #0xa5 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238AC4C: ldr r0, _0238B944 ; =ov27_0238CAE4 @@ -817,7 +817,7 @@ _0238AC4C: mov r1, #0x18 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238AC9C: ldr r0, _0238B948 ; =ov27_0238CAFC @@ -838,7 +838,7 @@ _0238AC9C: mov r1, #0x18 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238ACEC: ldr r0, _0238B950 ; =ov27_0238CB14 @@ -859,7 +859,7 @@ _0238ACEC: mov r1, #0x18 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238AD3C: ldr r0, _0238B958 ; =ov27_0238CB30 @@ -880,7 +880,7 @@ _0238AD3C: add r2, r1, #0xab ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238AD8C: ldr r0, _0238B95C ; =ov27_0238CB4C @@ -910,7 +910,7 @@ _0238AD8C: ldr r3, [r0] ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox arm_func_end ov27_0238A998 arm_func_start ov27_0238ADFC @@ -935,7 +935,7 @@ _0238AE00: mov r1, #0x18 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238AE50: ldr r0, _0238B96C ; =ov27_0238CB7C @@ -960,7 +960,7 @@ _0238AE5C: add r2, r1, #0xac ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238AEAC: ldr r0, _0238B974 ; =ov27_0238CBA4 @@ -980,7 +980,7 @@ _0238AEAC: add r2, r1, #0xb5 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238AEF8: ldr r0, _0238B978 ; =ov27_0238CBBC @@ -988,7 +988,7 @@ _0238AEF8: ldr r0, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] @@ -1009,7 +1009,7 @@ _0238AF48: ldr r0, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] @@ -1051,7 +1051,7 @@ _0238AF94: add r2, sp, #0xa4 add r1, r4, #0x210 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x91] @@ -1067,7 +1067,7 @@ _0238B014: add r2, sp, #0x13c add r1, r4, #0x210 str r4, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x91] @@ -1129,7 +1129,7 @@ _0238B050: stmib sp, {r2, r3} ldr r3, _0238B9AC ; =0x00000315 mov r2, #0 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x92] @@ -1164,7 +1164,7 @@ _0238B134: ldr r3, [r0] ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238B1B0: ldr r0, _0238B9B8 ; =ov27_0238CC78 @@ -1196,7 +1196,7 @@ _0238B1B0: ldr r3, [r0] ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238B22C: ldr r0, _0238B9BC ; =ov27_0238CC94 @@ -1207,7 +1207,7 @@ _0238B22C: ldr r3, _0238B9C8 ; =DISCARD_ITEMS_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x91] @@ -1221,7 +1221,7 @@ _0238B260: ldr r3, _0238B9C8 ; =DISCARD_ITEMS_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x91] @@ -1272,7 +1272,7 @@ _0238B2E8: ldr r3, [r0] ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238B34C: ldr r0, _0238B9D4 ; =ov27_0238CCDC @@ -1304,7 +1304,7 @@ _0238B37C: add r2, r1, #0xb4 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238B3C4: ldr r0, _0238B9D8 ; =ov27_0238CCF8 @@ -1326,7 +1326,7 @@ _0238B3C4: ldr r3, [r0] ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238B418: ldr r0, _0238B9E0 ; =ov27_0238CD10 @@ -1347,7 +1347,7 @@ _0238B418: add r1, ip, #0x400 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238B468: ldr r0, _0238B9E8 ; =ov27_0238CD28 @@ -1358,7 +1358,7 @@ _0238B468: str r2, [r1, #4] ldr r0, [r0] ldrsb r0, [r0, #0x8d] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] @@ -1379,7 +1379,7 @@ _0238B4C0: ldr r0, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] @@ -1401,7 +1401,7 @@ _0238B508: mov r1, #0x13 mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x91] @@ -1417,7 +1417,7 @@ _0238B53C: add r2, sp, #0x224 add r1, ip, #0x210 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x91] @@ -1466,7 +1466,7 @@ _0238B578: stmib sp, {r2, r3} ldr r3, _0238B9AC ; =0x00000315 mov r2, #0 - bl sub_0202E3CC + bl CreateScrollBox1 ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x92] @@ -1495,7 +1495,7 @@ _0238B628: ldr r3, [r0] ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 mov r3, #0x23 ldr r2, [r0] @@ -1513,7 +1513,7 @@ _0238B6A8: ldr r3, _0238B9C8 ; =DISCARD_ITEMS_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x91] @@ -1548,7 +1548,7 @@ _0238B6DC: ldr r3, [r0] ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238B758: ldr r0, _0238BA10 ; =ov27_0238CDE0 @@ -1559,7 +1559,7 @@ _0238B758: ldr r3, _0238B9C8 ; =DISCARD_ITEMS_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x91] @@ -1600,7 +1600,7 @@ _0238B78C: ldr r3, [r0] ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238B820: ldr r0, _0238BA18 ; =ov27_0238CE10 @@ -1629,7 +1629,7 @@ _0238B820: add r2, r1, #0xbd ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox b _0238BA74 _0238B890: ldr r0, _0238BA1C ; =ov27_0238CE2C @@ -1646,7 +1646,7 @@ _0238B890: mov r1, #8 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r0, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 mov r3, #0x23 ldr r2, [r0] @@ -1664,7 +1664,7 @@ _0238B8EC: ldr r3, _0238B9C8 ; =DISCARD_ITEMS_MENU_CONFIRM mov r2, #0 str ip, [sp] - bl CreateNormalMenu + bl CreateSimpleMenuWrapper ldr r1, _0238B920 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r1, [r1] strb r0, [r1, #0x91] @@ -1755,7 +1755,7 @@ _0238BA2C: add r2, r1, #0xc4 ldrsb r0, [r3, #0x8d] add r3, r3, #0x94 - bl ShowMessageInDBox + bl ShowMessageInDialogueBox _0238BA74: add sp, sp, #0x30c ldmia sp!, {r3, r4, pc} @@ -1922,7 +1922,7 @@ _0238BC8C: b _0238C860 _0238BCB0: ldrsb r0, [r1, #0x8d] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238C860 mov r0, #0x22 @@ -1930,7 +1930,7 @@ _0238BCB0: ldr r0, _0238C8F8 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] - bl ShowDBox + bl ShowDialogueBox b _0238C860 _0238BCDC: bl sub_020426B4 @@ -1992,7 +1992,7 @@ _0238BD84: tst r0, #8 beq _0238C860 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper bl sub_02042ADC ldr r1, _0238C8F8 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r2, [r1] @@ -2024,7 +2024,7 @@ _0238BD84: b _0238C860 _0238BE28: ldrsb r0, [r1, #0x91] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238BF48 cmp r0, #2 @@ -2126,7 +2126,7 @@ _0238BF64: b _0238C860 _0238BFA0: ldrsb r0, [r1, #0x91] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C038 cmp r0, #4 @@ -2185,7 +2185,7 @@ _0238C038: b _0238C860 _0238C078: ldrsb r0, [r1, #0x91] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C13C cmp r0, #4 @@ -2316,7 +2316,7 @@ _0238C234: tst r0, #8 beq _0238C860 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, r4 bl sub_0204323C ldr r2, _0238C8F8 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 @@ -2354,7 +2354,7 @@ _0238C234: b _0238C860 _0238C2F0: ldrsb r0, [r1, #0x91] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C394 cmp r0, #3 @@ -2422,7 +2422,7 @@ _0238C3B0: b _0238C860 _0238C3EC: ldrsb r0, [r1, #0x91] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C454 cmp r0, #4 @@ -2467,13 +2467,13 @@ _0238C454: b _0238C860 _0238C494: ldrsb r0, [r1, #0x8d] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238C860 ldr r0, _0238C8F8 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x91] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C55C cmp r0, #4 @@ -2538,7 +2538,7 @@ _0238C55C: b _0238C860 _0238C59C: ldrsb r0, [r1, #0x91] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 beq _0238C604 cmp r0, #4 @@ -2587,13 +2587,13 @@ _0238C644: b _0238C864 _0238C650: ldrsb r0, [r1, #0x8d] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238C860 ldr r0, _0238C8F8 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C8F8 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 mov r2, #0x30 ldr r1, [r0] @@ -2604,7 +2604,7 @@ _0238C650: b _0238C860 _0238C690: ldrsb r0, [r1, #0x91] - bl GetNormalMenuResult + bl GetSimpleMenuResult cmp r0, #1 ldrne r1, _0238C8F8 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldrne r1, [r1] @@ -2725,13 +2725,13 @@ _0238C824: b _0238C860 _0238C830: ldrsb r0, [r1, #0x8d] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0238C860 ldr r0, _0238C8F8 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] - bl ShowDBox + bl ShowDialogueBox ldr r0, _0238C8F8 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldr r0, [r0, #4] @@ -2761,7 +2761,7 @@ _0238C89C: ldr r0, _0238C8F8 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x8d] - bl FreeDBox + bl FreeDialogueBox b _0238C8EC _0238C8C0: ldr r0, [r1, #0x1b4] @@ -2800,7 +2800,7 @@ ov27_0238C900: ; 0x0238C900 ldr r0, _0238C944 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 ldr r0, [r0] ldrsb r0, [r0, #0x91] - bl FreeNormalMenu + bl FreeSimpleMenu ldr r0, _0238C944 ; =OVERLAY27_UNKNOWN_POINTER__NA_238CE84 mvn r1, #1 ldr r0, [r0] diff --git a/asm/overlay_28.s b/asm/overlay_28.s index 922470d1..ca6302d6 100644 --- a/asm/overlay_28.s +++ b/asm/overlay_28.s @@ -827,7 +827,7 @@ _0238AC74: _0238AC9C: add r0, sp, #0 mov r1, #3 - bl NewDialogBox + bl NewWindow ldr r1, _0238ACF8 ; =ov28_0238AD80 ldr r2, [r1] add r2, r2, r7 diff --git a/asm/overlay_29_022E0378.s b/asm/overlay_29_022E0378.s index 16e8660a..78a1f909 100644 --- a/asm/overlay_29_022E0378.s +++ b/asm/overlay_29_022E0378.s @@ -1522,7 +1522,7 @@ _022E1658: add r0, r0, #0x12000 ldr r0, [r0, #0xb28] add r0, r0, #0x2c - bl sub_0201C0CC + bl InitAnimationControlWithSet__0201C168 ldr r0, [r4] add r0, r0, r6, lsl #2 add r0, r0, #0x12000 @@ -1560,7 +1560,7 @@ _022E16E8: add r0, r0, #0x12000 ldr r0, [r0, #0xb38] add r0, r0, #0x2c - bl sub_0201C0CC + bl InitAnimationControlWithSet__0201C168 ldr r0, [r4] add r0, r0, r7, lsl #2 add r0, r0, #0x12000 diff --git a/asm/overlay_29_022E37DC.s b/asm/overlay_29_022E37DC.s index 830dc92b..d60de6ed 100644 --- a/asm/overlay_29_022E37DC.s +++ b/asm/overlay_29_022E37DC.s @@ -6903,7 +6903,7 @@ ov29_022E8E94: ; 0x022E8E94 stmia ip, {r0, r1, r2, r3} ldr r1, _022E8F24 ; =ov29_022E8E60 mov r0, ip - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _022E8F1C ; =ov29_02353558 ldr r2, [r1] strb r0, [r2] diff --git a/asm/overlay_29_022EAB50.s b/asm/overlay_29_022EAB50.s index ac60f1f5..03fa1380 100644 --- a/asm/overlay_29_022EAB50.s +++ b/asm/overlay_29_022EAB50.s @@ -466,7 +466,7 @@ _022EB09C: and r0, r2, r0 mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 - bl sub_02017B58 + bl PlayBgmByIdVeneer b _022EB0EC _022EB0D4: and r0, r2, r0 diff --git a/asm/overlay_29_022F05B4.s b/asm/overlay_29_022F05B4.s index f2318425..4984fa0f 100644 --- a/asm/overlay_29_022F05B4.s +++ b/asm/overlay_29_022F05B4.s @@ -403,7 +403,7 @@ ov29_022F0AA4: ; 0x022F0AA4 ldmneia sp!, {r3, pc} ldr r0, _022F0AD8 ; =ov29_023526A8 ldr r1, _022F0ADC ; =ov29_022F0B10 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _022F0AD4 ; =ov29_023535A4 strb r0, [r1] ldmia sp!, {r3, pc} @@ -1403,7 +1403,7 @@ _022F18B4: bl GetTileSafe str r0, [sp, #0x78] mov r0, #7 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldr r0, [sp, #0x38] cmp r0, #0 beq _022F198C @@ -1786,7 +1786,7 @@ _022F1E3C: beq _022F1E90 bl sub_0204AF78 mov r0, #4 - bl sub_02017CCC + bl PlaySeVolumeWrapper mov r0, #0 mov r1, #1 bl OpenMessageLog @@ -2337,7 +2337,7 @@ _022F25D8: bne _022F2748 ldrb r1, [fp, #0x4c] mov r0, r6 - bl CanMonsterMoveInDirection + bl ov29_0230105C cmp r0, #0 moveq r0, #0 beq _022F2748 @@ -2428,7 +2428,7 @@ _022F2748: _022F27C8: mov r0, r6 mov r1, r7 - bl ov29_02300E78 + bl CanMonsterMoveInDirection cmp r0, #0 orreq r0, r8, #2 andeq r8, r0, #0xff @@ -2481,7 +2481,7 @@ _022F2864: strh r2, [r1, #0xd8] ldrh r2, [sp, #0xb4] strh r2, [r1, #0xda] - bl sub_02017CCC + bl PlaySeVolumeWrapper _022F289C: ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0] @@ -2599,7 +2599,7 @@ _022F2A00: cmp r0, #0 bne _022F2A70 mov r0, #4 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldrb r0, [sp, #0xb7] ldrb r1, [sp, #0xb8] mov r2, #1 @@ -2612,7 +2612,7 @@ _022F2A00: b _022F2A9C _022F2A70: mov r0, #4 - bl sub_02017CCC + bl PlaySeVolumeWrapper ldrb r0, [sp, #0xb7] ldrb r1, [sp, #0xb8] mov r2, #0 @@ -3633,7 +3633,7 @@ _022F38F4: bne _022F390C mov r0, r6 mov r1, sb - bl ov29_02300E78 + bl CanMonsterMoveInDirection _022F390C: cmp r0, #0 andne r0, sb, #7 @@ -3707,7 +3707,7 @@ _022F39D8: tst r0, #0xff beq _022F3A40 ldrsh r0, [r7, #8] - bl CheckTeamMemberIdxVeneer + bl ov29_022F9C34 cmp r0, #0 ldrsh r0, [sb, #0xc] ldreqsh r8, [r7, #8] @@ -4019,7 +4019,7 @@ _022F3E28: _022F3E5C: mov r0, #1 strb r5, [sb, #0x4c] - bl sub_02017CCC + bl PlaySeVolumeWrapper _022F3E68: ldr r1, _022F3E90 ; =ov29_0237C9A4 mov r0, #0 diff --git a/asm/overlay_29_022F52B0.s b/asm/overlay_29_022F52B0.s index d99575ef..c741da22 100644 --- a/asm/overlay_29_022F52B0.s +++ b/asm/overlay_29_022F52B0.s @@ -856,7 +856,7 @@ _022F5E1C: bl GetActiveTeamMember mov r4, r0 ldrsh r0, [r4, #8] - bl ov29_022F9C40 + bl CheckTeamMemberIdxVeneer cmp r0, #0 addne r5, r5, #3 addne r6, r5, #3 diff --git a/asm/overlay_29_022F62CC.s b/asm/overlay_29_022F62CC.s index 00e23be2..d2d3f133 100644 --- a/asm/overlay_29_022F62CC.s +++ b/asm/overlay_29_022F62CC.s @@ -193,7 +193,7 @@ _022F6548: beq _022F65B4 mov r0, sl add r1, sp, #0x14 - bl CannotStandOnTile + bl ov29_022FF764 cmp r0, #0 bne _022F65B4 add r3, sp, #0x14 @@ -878,13 +878,13 @@ _022F6EF0: .word DUNGEON_PTR arm_func_start ov29_022F6EF4 ov29_022F6EF4: ; 0x022F6EF4 ldr r1, _022F6F08 ; =0x0000FFFF - ldr r0, _022F6F0C ; =ov29_023535AC + ldr r0, _022F6F0C ; =LOADED_ATTACK_SPRITE_FILE_INDEX strh r1, [r0, #2] strh r1, [r0] bx lr .align 2, 0 _022F6F08: .word 0x0000FFFF -_022F6F0C: .word ov29_023535AC +_022F6F0C: .word LOADED_ATTACK_SPRITE_FILE_INDEX arm_func_end ov29_022F6EF4 arm_func_start FreeLoadedAttackSpriteAndMore @@ -919,7 +919,7 @@ _022F6F64: .word ov29_0237C9B0 arm_func_start SetAndLoadCurrentAttackAnimation SetAndLoadCurrentAttackAnimation: ; 0x022F6F68 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _022F6FFC ; =ov29_023535AC + ldr r2, _022F6FFC ; =LOADED_ATTACK_SPRITE_FILE_INDEX mov r5, r0 ldrh r0, [r2, #2] mov r4, r1 @@ -945,7 +945,7 @@ _022F6FA8: mov r2, r4 bl LoadWanTableEntryFromPackUseProvidedMemory ldr r1, _022F7000 ; =ov29_0237C9AC - ldr r2, _022F6FFC ; =ov29_023535AC + ldr r2, _022F6FFC ; =LOADED_ATTACK_SPRITE_FILE_INDEX ldr r1, [r1] add r1, r1, #0x1a000 strh r0, [r1] @@ -958,7 +958,7 @@ _022F6FE8: ldrsh r0, [r0] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022F6FFC: .word ov29_023535AC +_022F6FFC: .word LOADED_ATTACK_SPRITE_FILE_INDEX _022F7000: .word ov29_0237C9AC _022F7004: .word WAN_TABLE arm_func_end SetAndLoadCurrentAttackAnimation diff --git a/asm/overlay_29_022F7388.s b/asm/overlay_29_022F7388.s index f8d3574d..6ca9ba8f 100644 --- a/asm/overlay_29_022F7388.s +++ b/asm/overlay_29_022F7388.s @@ -806,12 +806,12 @@ _022F7E4C: tst r0, #0xff beq _022F7E94 ldrsh r0, [sb, #8] - bl sub_02056264 + bl CheckTeamMemberIdx cmp r0, #0 strneb r5, [sb] bne _022F7E94 ldrsh r0, [sb, #8] - bl CheckTeamMemberIdx + bl sub_02056228 cmp r0, #0 strneb r4, [sb] _022F7E94: @@ -867,8 +867,8 @@ _022F7F28: arm_func_end ov29_022F7F08 #ifdef EUROPE - arm_func_start ov29_022F88E8_EU -ov29_022F88E8_EU: ; 0x022F88E8 + arm_func_start EuFaintCheck +EuFaintCheck: ; 0x022F88E8 stmdb sp!, {r4, lr} mov r4, r0 cmp r1, #0 @@ -881,7 +881,7 @@ _022F8900: bl UpdateMapSurveyorFlag cmp r0, #0 beq _022F892C - bl ov29_0233AE00_EU + bl GetMinimapDataE447 cmp r0, #0 beq _022F892C mov r0, #1 @@ -891,7 +891,7 @@ _022F892C: bl ov29_022E8104 bl ov29_022E81F8 ldmia sp!, {r4, pc} - arm_func_end ov29_022F88E8_EU + arm_func_end EuFaintCheck #endif arm_func_start HandleFaint @@ -1017,7 +1017,7 @@ _022F8008: streqb r0, [r7, #0x165] #ifdef EUROPE mov r0, r5 - bl ov29_022F88E8_EU + bl EuFaintCheck #else bl ov29_022E8104 bl ov29_022E81F8 @@ -1148,7 +1148,7 @@ _022F80F4: ldrsb r2, [r2, #0x9b] sub r2, r2, #1 strb r2, [r3, #0x79b] - bl ov29_022F88E8_EU + bl EuFaintCheck #else ldr r1, _022F85D0 ; =DUNGEON_PTR mov r0, #1 @@ -1206,7 +1206,7 @@ _022F825C: strb r1, [r3, #0xa] ldr r2, [r2] strb r1, [r2, #0x758] - bl ov29_022F88E8_EU + bl EuFaintCheck #else mov r0, #1 strb r0, [r2, #8] @@ -1490,7 +1490,7 @@ _022F8594: #ifdef EUROPE mov r0, r5 mov r1, #0 - bl ov29_022F88E8_EU + bl EuFaintCheck #else bl ov29_022E8104 bl ov29_022E81F8 @@ -3131,21 +3131,21 @@ _022F9C00: ldmia sp!, {r3, r4, pc} arm_func_end ov29_022F9B8C - arm_func_start CheckTeamMemberIdxVeneer -CheckTeamMemberIdxVeneer: ; 0x022F9C34 - ldr ip, _022F9C3C ; =CheckTeamMemberIdx + arm_func_start ov29_022F9C34 +ov29_022F9C34: ; 0x022F9C34 + ldr ip, _022F9C3C ; =sub_02056228 bx ip .align 2, 0 -_022F9C3C: .word CheckTeamMemberIdx - arm_func_end CheckTeamMemberIdxVeneer +_022F9C3C: .word sub_02056228 + arm_func_end ov29_022F9C34 - arm_func_start ov29_022F9C40 -ov29_022F9C40: ; 0x022F9C40 - ldr ip, _022F9C48 ; =sub_02056264 + arm_func_start CheckTeamMemberIdxVeneer +CheckTeamMemberIdxVeneer: ; 0x022F9C40 + ldr ip, _022F9C48 ; =CheckTeamMemberIdx bx ip .align 2, 0 -_022F9C48: .word sub_02056264 - arm_func_end ov29_022F9C40 +_022F9C48: .word CheckTeamMemberIdx + arm_func_end CheckTeamMemberIdxVeneer arm_func_start ov29_022F9C4C ov29_022F9C4C: ; 0x022F9C4C @@ -3154,7 +3154,7 @@ ov29_022F9C4C: ; 0x022F9C4C ldrsh r0, [r0, #0xc] bl GetActiveTeamMember ldrsh r0, [r0, #8] - bl sub_02056264 + bl CheckTeamMemberIdx ldmia sp!, {r3, pc} arm_func_end ov29_022F9C4C @@ -3948,7 +3948,7 @@ _022FA6C4: movne sb, #1 bne _022FA70C ldrsh r0, [r4, #8] - bl sub_02056264 + bl CheckTeamMemberIdx cmp r0, #0 movne sb, #1 bne _022FA70C @@ -5537,7 +5537,7 @@ _022FBB38: add r1, r2, r1, lsl #1 ldrsh r1, [r1, sl] strh r1, [r8, #0xa8] - bl sub_0201C0CC + bl InitAnimationControlWithSet__0201C168 ldrsh r1, [r8, #0xa8] add r0, r8, #0x2c bl SetSpriteIdForAnimationControl diff --git a/asm/overlay_29_022FE4BC.s b/asm/overlay_29_022FE4BC.s index e9adef7e..965224c3 100644 --- a/asm/overlay_29_022FE4BC.s +++ b/asm/overlay_29_022FE4BC.s @@ -256,7 +256,7 @@ _022FF244: mov sl, r2, asr #0x10 bne _022FF29C mov r0, r6 - bl ov29_02300E78 + bl CanMonsterMoveInDirection cmp r0, #0 moveq r8, #1 _022FF29C: @@ -597,7 +597,7 @@ _022FF704: bne _022FF794 mov r0, r6 add r1, r6, #4 - bl ov29_022FFC9C + bl CannotStandOnTile cmp r0, #0 beq _022FF784 ldr r0, [r5, #0x110] @@ -885,7 +885,7 @@ _022FE818: mov r8, r2, asr #0x10 bne _022FE870 mov r0, sb - bl ov29_02300E78 + bl CanMonsterMoveInDirection cmp r0, #0 moveq r5, #1 _022FE870: @@ -1226,7 +1226,7 @@ _022FECD8: bne _022FED68 mov r0, sb add r1, sb, #4 - bl ov29_022FFC9C + bl CannotStandOnTile cmp r0, #0 beq _022FED58 ldr r0, [r6, #0x110] diff --git a/asm/overlay_29_022FEDBC.s b/asm/overlay_29_022FEDBC.s index 29199f7c..fd8f2a17 100644 --- a/asm/overlay_29_022FEDBC.s +++ b/asm/overlay_29_022FEDBC.s @@ -410,7 +410,7 @@ _022FF320: beq _022FF3AC ldrb r1, [r4, #0x4c] mov r0, r5 - bl ov29_02300E78 + bl CanMonsterMoveInDirection cmp r0, #0 beq _022FF368 ldrsh r1, [r4, #2] @@ -727,8 +727,8 @@ _022FF75C: ldmia sp!, {r4, pc} arm_func_end IsInvalidSpawnTile - arm_func_start CannotStandOnTile -CannotStandOnTile: ; 0x022FF764 + arm_func_start ov29_022FF764 +ov29_022FF764: ; 0x022FF764 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r1 mov r6, r0 @@ -813,7 +813,7 @@ _022FF888: _022FF890: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end CannotStandOnTile + arm_func_end ov29_022FF764 arm_func_start ItemIsActive__022FF898 ItemIsActive__022FF898: ; 0x022FF898 @@ -1114,8 +1114,8 @@ _022FFC94: ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ov29_022FFB90 - arm_func_start ov29_022FFC9C -ov29_022FFC9C: ; 0x022FFC9C + arm_func_start CannotStandOnTile +CannotStandOnTile: ; 0x022FFC9C stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, r1 mov r6, r0 @@ -1211,7 +1211,7 @@ _022FFDE4: _022FFDEC: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} - arm_func_end ov29_022FFC9C + arm_func_end CannotStandOnTile arm_func_start CalcSpeedStage CalcSpeedStage: ; 0x022FFDF4 diff --git a/asm/overlay_29_02300108.s b/asm/overlay_29_02300108.s index 02f566fd..a9ab311c 100644 --- a/asm/overlay_29_02300108.s +++ b/asm/overlay_29_02300108.s @@ -1032,8 +1032,8 @@ _02300DF4: ldmia sp!, {r3, pc} arm_func_end ov29_02300DCC - arm_func_start ov29_02300E78 -ov29_02300E78: ; 0x02300E78 + arm_func_start CanMonsterMoveInDirection +CanMonsterMoveInDirection: ; 0x02300E78 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 ldr r2, [r6, #0xb4] @@ -1081,7 +1081,7 @@ ov29_02300E78: ; 0x02300E78 _02300F24: .word DIRECTIONS_XY _02300F28: .word ov29_0235171E _02300F2C: .word ov29_02352798 - arm_func_end ov29_02300E78 + arm_func_end CanMonsterMoveInDirection arm_func_start GetDirectionalMobilityType GetDirectionalMobilityType: ; 0x02300F30 @@ -1169,8 +1169,8 @@ _02301054: .word ov29_0235171E _02301058: .word ov29_02352790 arm_func_end ov29_02300FCC - arm_func_start CanMonsterMoveInDirection -CanMonsterMoveInDirection: ; 0x0230105C + arm_func_start ov29_0230105C +ov29_0230105C: ; 0x0230105C stmdb sp!, {r4, r5, r6, lr} mov r6, r0 ldr r2, [r6, #0xb4] @@ -1219,7 +1219,7 @@ CanMonsterMoveInDirection: ; 0x0230105C _0230110C: .word DIRECTIONS_XY _02301110: .word ov29_0235171E _02301114: .word ov29_02352788 - arm_func_end CanMonsterMoveInDirection + arm_func_end ov29_0230105C arm_func_start IsMonsterCornered IsMonsterCornered: ; 0x02301118 diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index 6a8b2ca8..b7987bc6 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -1232,7 +1232,7 @@ _0231DC60: bge _0231DCAC bl GetActiveTeamMember ldrsh r0, [r0, #8] - bl CheckTeamMemberIdxVeneer + bl ov29_022F9C34 cmp r0, #0 movne r6, #0 _0231DCAC: diff --git a/asm/overlay_29_0231EDFC.s b/asm/overlay_29_0231EDFC.s index 3a015f38..9b068454 100644 --- a/asm/overlay_29_0231EDFC.s +++ b/asm/overlay_29_0231EDFC.s @@ -117,7 +117,7 @@ _0231EF64: add r1, sp, #0x34 add r2, r3, r2 strh r2, [sp, #0x36] - bl CannotStandOnTile + bl ov29_022FF764 cmp r0, #0 bne _0231EFB8 ldrsh r0, [sp, #0x34] @@ -158,7 +158,7 @@ _0231EFF8: add r1, sp, #0x30 add r2, r3, r2 strh r2, [sp, #0x32] - bl CannotStandOnTile + bl ov29_022FF764 cmp r0, #0 bne _0231F074 ldrsh r0, [sp, #0x30] @@ -225,7 +225,7 @@ _0231F0F4: strh r0, [sp, #0x2e] mov r0, r4 mov r1, r6 - bl CannotStandOnTile + bl ov29_022FF764 cmp r0, #0 bne _0231F150 ldrsh r0, [sp, #0x2c] @@ -409,7 +409,7 @@ _0231F3A4: mov r1, sb strh r3, [sp, #0x28] strh r2, [sp, #0x2a] - bl CannotStandOnTile + bl ov29_022FF764 cmp r0, #0 bne _0231F408 ldrsh r0, [sp, #0x28] diff --git a/asm/overlay_29_02320788.s b/asm/overlay_29_02320788.s index 7250c9bb..fff5cd0f 100644 --- a/asm/overlay_29_02320788.s +++ b/asm/overlay_29_02320788.s @@ -686,7 +686,7 @@ EnsureCanStandCurrentTile: ; 0x02321104 stmdb sp!, {r4, lr} mov r4, r0 add r1, r4, #4 - bl ov29_022FFC9C + bl CannotStandOnTile cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -720,7 +720,7 @@ ov29_02321164: ; 0x02321164 mov r5, r0 mov r0, r4 add r1, r4, #4 - bl ov29_022FFC9C + bl CannotStandOnTile cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} mov r0, r5 diff --git a/asm/overlay_29_023350FC.s b/asm/overlay_29_023350FC.s index 74591d73..2a4bb871 100644 --- a/asm/overlay_29_023350FC.s +++ b/asm/overlay_29_023350FC.s @@ -1921,7 +1921,7 @@ ov29_02336460: ; 0x02336460 mov r2, #0 add r0, r0, #0x2a8 add r0, r0, #0x10000 - bl ov10_022C26BC + bl InitTilesetBuffer ldr r1, _02336598 ; =DUNGEON_PTR ldr r0, _023365A8 ; =0x00012162 ldr r2, [r1] diff --git a/asm/overlay_29_02337CCC.s b/asm/overlay_29_02337CCC.s index 85d3af8f..97deb7ee 100644 --- a/asm/overlay_29_02337CCC.s +++ b/asm/overlay_29_02337CCC.s @@ -2927,14 +2927,14 @@ SetMinimapDataE447: ; 0x0233A218 arm_func_end SetMinimapDataE447 #ifdef EUROPE - arm_func_start ov29_0233AE00_EU -ov29_0233AE00_EU: ; 0x0233AE00 + arm_func_start GetMinimapDataE447 +GetMinimapDataE447: ; 0x0233AE00 stmdb sp!, {r3, lr} bl GetMinimapData add r0, r0, #0xe000 ldrb r0, [r0, #0x447] ldmia sp!, {r3, pc} - arm_func_end ov29_0233AE00_EU + arm_func_end GetMinimapDataE447 #endif arm_func_start SetMinimapDataE448 diff --git a/asm/overlay_29_023456BC.s b/asm/overlay_29_023456BC.s index 1d10315e..6741c964 100644 --- a/asm/overlay_29_023456BC.s +++ b/asm/overlay_29_023456BC.s @@ -2514,7 +2514,7 @@ _0234791C: add r2, sp, #0x48 mov r0, sl str r1, [r2, r6, lsl #3] - bl ov29_02348020 + bl DoesProjectileHitTarget add r1, sp, #0x48 add r1, r1, r6, lsl #3 strb r0, [r1, #4] diff --git a/asm/overlay_29_02347BC8.s b/asm/overlay_29_02347BC8.s index 61cca648..e0dcbe63 100644 --- a/asm/overlay_29_02347BC8.s +++ b/asm/overlay_29_02347BC8.s @@ -221,7 +221,7 @@ _02347EE8: bne _02347F10 mov r0, sl mov r1, r5 - bl ov29_02348020 + bl DoesProjectileHitTarget mov r6, r0 _02347F10: ldr r1, [sp, #8] @@ -301,8 +301,8 @@ _02348018: .word 0x00000BE4 _0234801C: .word 0x00000BE3 arm_func_end ov29_02347BC8 - arm_func_start ov29_02348020 -ov29_02348020: ; 0x02348020 + arm_func_start DoesProjectileHitTarget +DoesProjectileHitTarget: ; 0x02348020 stmdb sp!, {r4, r5, r6, lr} mov r4, r1 ldr r1, [r4, #0xb4] @@ -317,7 +317,7 @@ ov29_02348020: ; 0x02348020 ldmeqia sp!, {r4, r5, r6, pc} mov r0, #0x64 bl DungeonRandInt - ldr r1, _023480F8 ; =ov10_022C46B0 + ldr r1, _023480F8 ; =THROWN_ITEM_HIT_CHANCE ldrsh r1, [r1] cmp r0, r1 movlt r1, #1 @@ -361,8 +361,8 @@ _023480F0: mov r0, r6 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023480F8: .word ov10_022C46B0 - arm_func_end ov29_02348020 +_023480F8: .word THROWN_ITEM_HIT_CHANCE + arm_func_end DoesProjectileHitTarget arm_func_start ov29_023480FC ov29_023480FC: ; 0x023480FC diff --git a/asm/overlay_29_023498A0.s b/asm/overlay_29_023498A0.s index d429fa1f..fd86d1b2 100644 --- a/asm/overlay_29_023498A0.s +++ b/asm/overlay_29_023498A0.s @@ -2443,7 +2443,7 @@ _0234B8A0: tst r0, #0xff bne _0234B900 mov r0, #0 - bl sub_0202FFB0 + bl CreateAlertBox ldr r1, _0234BA14 ; =ov29_023537CC mov r2, #0 ldr r3, [r1, #4] @@ -4978,7 +4978,7 @@ _0234D948: ldr r0, _0234D9BC ; =ov29_02382800 ldr r0, [r0] ldrsb r0, [r0, #0x10] - bl FreeDBox + bl FreeDialogueBox ldr r0, _0234D9BC ; =ov29_02382800 ldr r0, [r0] bl MemFree @@ -5034,7 +5034,7 @@ _0234D9E0: cmp r0, #0 bne _0234DA90 ldrsb r0, [r1, #0x10] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 bne _0234DB44 ldr r0, [r6] @@ -5110,7 +5110,7 @@ _0234DAF8: b _0234DB44 _0234DB2C: ldrsb r0, [r1, #0x10] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 moveq r0, #1 movne r0, #0 @@ -5206,7 +5206,7 @@ ov29_0234DC3C: ; 0x0234DC3C cmp r0, ip bne _0234DC8C mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r2, _0234DD88 ; =ov29_02382800 mov r1, #0 ldr r3, [r2] @@ -5281,7 +5281,7 @@ _0234DD64: add r1, r0, #0x400 ldrsb r0, [r0, #0x10] ldrh r1, [r1, #0x64] - bl ShowStringInDBox + bl ShowStringInDialogueBox ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0234DD88: .word ov29_02382800 diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index ced79a67..23cdd187 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -40,7 +40,7 @@ _0234ECA4: ldrsh r0, [r4, #0xc] bl GetActiveTeamMember ldrsh r0, [r0, #8] - bl sub_02056264 + bl CheckTeamMemberIdx cmp r0, #0 movne r0, #0 ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} @@ -58,7 +58,7 @@ _0234ECE4: add sl, sb, r5, lsl #5 bl GetActiveTeamMember ldrsh r0, [r0, #8] - bl CheckTeamMemberIdxVeneer + bl ov29_022F9C34 strb r0, [sl, #4] str r7, [sl, #0x1c] str r6, [sb, r5, lsl #5] @@ -101,7 +101,7 @@ _0234ED84: cmp r0, #0 beq _0234EDA4 ldrsh r0, [r6, #8] - bl sub_02056264 + bl CheckTeamMemberIdx cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} @@ -568,7 +568,7 @@ _0234F374: ldr r3, _0234F3F0 ; =ov29_0234F430 add r2, sp, #0xc str ip, [sp, #8] - bl sub_020305E4 + bl CreateAdvancedTextBox2 strb r0, [r4, #2] b _0234F3D4 _0234F398: @@ -1250,7 +1250,7 @@ ov29_0234FC50: ; 0x0234FC50 str r0, [r2] strh r4, [r0, #2] ldr r0, _0234FCA4 ; =ov29_023534B4 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _0234FC9C ; =ov29_02353848 ldr r1, [r1] strb r0, [r1] @@ -4259,8 +4259,8 @@ ov29_023535A4: .global ov29_023535A8 ov29_023535A8: .byte 0x00, 0x00, 0x00, 0x00 - .global ov29_023535AC -ov29_023535AC: + .global LOADED_ATTACK_SPRITE_FILE_INDEX +LOADED_ATTACK_SPRITE_FILE_INDEX: .byte 0xFF, 0xFF, 0xFF, 0xFF .global EXCL_ITEM_EFFECTS_WEATHER_ATK_SPEED_BOOST EXCL_ITEM_EFFECTS_WEATHER_ATK_SPEED_BOOST: diff --git a/asm/overlay_31.s b/asm/overlay_31.s index 266de3e5..7160b916 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -290,13 +290,13 @@ _02382BEC: ldr r2, [r2] strb r0, [r2] ldr r0, _02382DA0 ; =DUNGEON_D_BOX_LAYOUT_4 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r2, _02382D8C ; =OVERLAY31_UNKNOWN_POINTER__NA_238A260 ldr r1, _02382DA4 ; =DungeonMenuSwitch ldr r2, [r2] strb r0, [r2, #2] ldr r0, _02382DA8 ; =DUNGEON_D_BOX_LAYOUT_2 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02382D8C ; =OVERLAY31_UNKNOWN_POINTER__NA_238A260 ldr r2, [r1] strb r0, [r2, #1] @@ -599,7 +599,7 @@ _02382FF4: ldr r3, _02383234 ; =ov31_02382F68 add r2, sp, #0xa0 str r4, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r2, _02383218 ; =ov31_0238A2A0 mov r1, r4 ldr r3, [r2, #4] @@ -694,7 +694,7 @@ _02383170: ldr r3, _02383244 ; =ov31_02383248 add r2, sp, #8 str ip, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02383218 ; =ov31_0238A2A0 mov r2, #4 ldr r3, [r1, #4] @@ -1097,7 +1097,7 @@ ov31_0238367C: ; 0x0238367C mov ip, r4, lsl #0x10 mov r4, ip, lsr #0x10 stmib sp, {r4, lr} - bl sub_0202E3CC + bl CreateScrollBox1 mov r5, r0 mov r4, #0x16 _023836F0: @@ -1524,7 +1524,7 @@ _02383C44: beq _02383CEC ldr r0, _023848B0 ; =DUNGEON_D_BOX_LAYOUT_10 ldr r1, _023848B4 ; =ov31_02383854 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02384898 ; =OVERLAY31_UNKNOWN_POINTER__NA_238A26C ldr r1, [r1] add r1, r1, #0x1000 @@ -1533,7 +1533,7 @@ _02383C44: _02383CEC: ldr r0, _023848B8 ; =DUNGEON_D_BOX_LAYOUT_11 mov r1, #0 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r2, _02384898 ; =OVERLAY31_UNKNOWN_POINTER__NA_238A26C mvn r3, #0 ldr r1, [r2] @@ -1562,7 +1562,7 @@ _02383D1C: ldr r3, _023848AC ; =ov31_02383478 add r2, r2, #0x9c str r4, [sp, #0xc] - bl ov10_022BCA80 + bl CreateInventoryMenu ldr r1, _02384898 ; =OVERLAY31_UNKNOWN_POINTER__NA_238A26C ldr r1, [r1] add r1, r1, #0x1000 @@ -1951,7 +1951,7 @@ _023842F4: cmp r0, #0 bne _02384314 mov r0, #5 - bl sub_02017CCC + bl PlaySeVolumeWrapper _02384314: bl ov29_02346E5C bl SortItemsInBag @@ -3167,7 +3167,7 @@ HandleMovesMenu: ; 0x02385404 cmp r0, #1 bne _0238547C ldr r0, _02385F74 ; =DUNGEON_D_BOX_LAYOUT_14 - bl CreateDBox + bl CreateDialogueBox mov r1, #0 str r0, [sp, #0x14] bl sub_0202F474 @@ -3177,11 +3177,11 @@ HandleMovesMenu: ; 0x02385404 ldr r0, [sp, #0x14] ldr r1, _02385F7C ; =0x00000404 mov r3, #0 - bl ShowStringInDBox + bl ShowStringInDialogueBox b _023854AC _0238547C: ldr r0, _02385F80 ; =DUNGEON_D_BOX_LAYOUT_16 - bl CreateDBox + bl CreateDialogueBox mov r1, #0 str r0, [sp, #0x14] bl sub_0202F474 @@ -3191,7 +3191,7 @@ _0238547C: ldr r0, [sp, #0x14] ldr r1, _02385F7C ; =0x00000404 mov r3, #0 - bl ShowStringInDBox + bl ShowStringInDialogueBox _023854AC: ldr r0, [sp] ldr r6, [r0] @@ -3911,7 +3911,7 @@ _02385D34: cmp r1, r0 bne _02385D78 mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper _02385D78: add r0, sp, #0x1c bl ov29_0234E988 @@ -3945,7 +3945,7 @@ _02385DD4: b _02385DEC _02385DE4: mov r0, #0 - bl sub_02017CCC + bl PlaySeVolumeWrapper _02385DEC: cmp r5, #0x14 bne _02385E4C @@ -4025,7 +4025,7 @@ _02385EFC: ldr r0, [sp, #0x14] bl sub_0202F334 ldr r0, [sp, #0x14] - bl FreeDBox + bl FreeDialogueBox mov r0, #8 mov r1, #0x1e bl ov29_022EA370 @@ -5027,7 +5027,7 @@ _02386C90: bl ov29_022EA62C ldr r0, _02386F10 ; =DUNGEON_D_BOX_LAYOUT_18 ldr r1, _02386F14 ; =ov31_02386B28 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02386F0C ; =OVERLAY31_UNKNOWN_POINTER__NA_238A27C ldr r1, [r1] strb r0, [r1, #0x160] @@ -5135,7 +5135,7 @@ _02386D70: str r2, [sp, #4] mov r2, #0 str r2, [sp, #8] - bl sub_0202E3CC + bl CreateScrollBox1 mov r6, r0 mov r4, #0x16 _02386E3C: @@ -5468,7 +5468,7 @@ _02387278: bge _023872FC bl GetActiveTeamMember ldrsh r0, [r0, #8] - bl CheckTeamMemberIdxVeneer + bl ov29_022F9C34 cmp r0, #0 movne r6, #0 _023872FC: @@ -5962,7 +5962,7 @@ _02387958: ldrsh r0, [r6, #0xc] bl GetActiveTeamMember ldrsh r0, [r0, #8] - bl CheckTeamMemberIdxVeneer + bl ov29_022F9C34 cmp r0, #0 ldrsh r1, [r6, #0x12] ldrsh r0, [r6, #0x16] @@ -6124,7 +6124,7 @@ _02387B80: ldr r2, [r2] strb r0, [r2, #0x695] ldr r0, _023880C0 ; =DUNGEON_D_BOX_LAYOUT_24 - bl sub_0202F8C4 + bl CreateTextBox1 ldr r1, _02388084 ; =OVERLAY31_UNKNOWN_POINTER__NA_238A280 ldr r3, _023880C4 ; =0x00000A36 ldr r2, [r1] @@ -6149,7 +6149,7 @@ _02387B80: add r2, sp, #0x180 mov r1, #0x800 str r5, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02388084 ; =OVERLAY31_UNKNOWN_POINTER__NA_238A280 ldr r1, [r1] strb r0, [r1, #0x697] @@ -6170,7 +6170,7 @@ _02387CA8: add r2, sp, #0x180 mov r1, #0x800 str r5, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02388084 ; =OVERLAY31_UNKNOWN_POINTER__NA_238A280 ldr r1, [r1] strb r0, [r1, #0x697] @@ -6572,7 +6572,7 @@ _0238826C: ldrsh r0, [r6, #0xc] bl GetActiveTeamMember ldrsh r0, [r0, #8] - bl CheckTeamMemberIdxVeneer + bl ov29_022F9C34 str r0, [sp, #4] b _023882E8 _023882A0: @@ -6589,7 +6589,7 @@ _023882A0: ldrsh r5, [r6, #0xe] ldrsh r8, [r6, #0x10] ldrsh r0, [r6, #8] - bl CheckTeamMemberIdx + bl sub_02056228 str r0, [sp, #4] mov r1, r6 add r0, sp, #0xc @@ -6826,7 +6826,7 @@ _023885DC: bne _02388638 add r0, sl, #0x5c0 mov r1, #0 - bl sub_02032960 + bl PlayMenuOptionSound mov r0, #2 str r0, [r4, #0x400] ldr r0, [sl, #0x6b8] @@ -6835,7 +6835,7 @@ _023885DC: _02388638: mov r1, r5 add r0, sl, #0x5c0 - bl sub_02032960 + bl PlayMenuOptionSound _02388644: ldrsb r0, [sl] bl sub_0202AB40 @@ -7311,7 +7311,7 @@ _02388C34: ldr r3, _02388D50 ; =ov31_02388D54 add r2, sp, #8 str ip, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _02388D30 ; =OVERLAY31_UNKNOWN_POINTER__NA_238A288 ldr r2, [r1] strb r0, [r2] @@ -7569,7 +7569,7 @@ _0238900C: tst r0, #0xff beq _02389058 ldrsh r0, [fp, #8] - bl ov29_022F9C40 + bl CheckTeamMemberIdxVeneer cmp r0, #0 bne _02389058 ldrsh r1, [fp, #0xc] @@ -7821,7 +7821,7 @@ _02389344: ldr r3, _02389418 ; =ov31_023891A8 add r2, sp, #8 str ip, [sp, #4] - bl sub_020305B4 + bl CreateAdvancedTextBox1 ldr r1, _023893FC ; =OVERLAY31_UNKNOWN_POINTER__NA_238A28C mov r2, #4 ldr r3, [r1] @@ -8262,7 +8262,7 @@ ov31_0238994C: ; 0x0238994C mov r2, r4 strb ip, [sp, #4] strb r3, [sp, #5] - bl sub_0202F8DC + bl CreateTextBox2 strb r0, [r4] mov r0, #0xb strb r0, [r4, #1] @@ -8534,7 +8534,7 @@ ov31_02389CC0: ; 0x02389CC0 ldr r1, _02389D78 ; =0x00001013 ldr r3, _02389D7C ; =0x00000A3B str r2, [sp, #8] - bl sub_0202E3CC + bl CreateScrollBox1 mov r7, r0 mov r6, #0x3e _02389D1C: diff --git a/asm/overlay_34.s b/asm/overlay_34.s index 10fea2c7..e26fc909 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -830,7 +830,7 @@ ov34_022DCBF4: ; 0x022DCBF4 ldr r1, [r1] strb r0, [r1] mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r3, _022DCC84 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD084 ldr r1, _022DCC8C ; =0x00000408 ldr ip, [r3] @@ -839,7 +839,7 @@ ov34_022DCBF4: ; 0x022DCBF4 ldr r0, [r3] mov r3, #0 ldrsb r0, [r0, #1] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r1, _022DCC84 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD084 mov r3, #0 ldr r2, [r1] @@ -867,7 +867,7 @@ ov34_022DCC94: ; 0x022DCC94 ldr r0, _022DCCDC ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD084 ldr r0, [r0] ldrsb r0, [r0, #1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _022DCCDC ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD084 ldr r0, [r0] bl MemFree @@ -919,7 +919,7 @@ _022DCD54: ldr r0, _022DCDC8 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD084 ldr r0, [r0] ldrsb r0, [r0, #1] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 ldreq r0, _022DCDC8 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD084 moveq r1, #2 @@ -983,7 +983,7 @@ ov34_022DCDF4: ; 0x022DCDF4 ldr r1, [r1] strb r0, [r1] mov r0, #0 - bl CreateDBox + bl CreateDialogueBox ldr r3, _022DCE7C ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD08C ldr r1, _022DCE84 ; =0x00000408 ldr ip, [r3] @@ -992,7 +992,7 @@ ov34_022DCDF4: ; 0x022DCDF4 ldr r0, [r3] mov r3, #0 ldrsb r0, [r0, #1] - bl ShowMessageInDBox + bl ShowMessageInDialogueBox ldr r1, _022DCE7C ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD08C mov r3, #0 ldr r2, [r1] @@ -1024,7 +1024,7 @@ ov34_022DCE8C: ; 0x022DCE8C ldr r0, _022DCED4 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD08C ldr r0, [r0] ldrsb r0, [r0, #1] - bl FreeDBox + bl FreeDialogueBox ldr r0, _022DCED4 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD08C ldr r0, [r0] bl MemFree @@ -1076,7 +1076,7 @@ _022DCF4C: ldr r0, _022DCFF0 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD08C ldr r0, [r0] ldrsb r0, [r0, #1] - bl IsDBoxActive + bl IsDialogueBoxActive cmp r0, #0 ldreq r0, _022DCFF0 ; =OVERLAY34_UNKNOWN_POINTER__NA_22DD08C moveq r1, #2 diff --git a/sub/asm/include/main.inc b/sub/asm/include/main.inc index 562fb179..28d2b7ad 100644 --- a/sub/asm/include/main.inc +++ b/sub/asm/include/main.inc @@ -4,7 +4,11 @@ .public _0380B408 .public _0380B434 .public _0380B460 +.public __divsi3 +.public __udivsi3 +.public ClearIeFlag .public EnableIrqFlag +.public GetCurrentPlaybackTime .public SDK_SUBPRIV_ARENA_LO .public SetIrqFlag .public sub_037F84E0 @@ -33,7 +37,6 @@ .public sub_037FB454 .public sub_037FB7BC .public sub_037FB8F0 -.public sub_037FB928 .public sub_037FBBFC .public sub_037FC054 .public sub_037FC15C @@ -50,7 +53,6 @@ .public sub_037FC90C .public sub_037FCC74 .public sub_037FCD84 -.public sub_037FD21C .public sub_037FD390 .public sub_037FD3A0 .public sub_037FD4DC @@ -86,8 +88,6 @@ .public sub_03803B7C .public sub_0380521C .public sub_03806B80 -.public sub_03806BC8 -.public sub_03806DD4 .public sub_03807334 .public sub_03807380 .public sub_038073D4 diff --git a/sub/asm/main.s b/sub/asm/main.s index 17a23d0a..3e2fc2f5 100644 --- a/sub/asm/main.s +++ b/sub/asm/main.s @@ -961,7 +961,7 @@ _027E0CCC: mov r4, r0 and r0, r1, r2 strh r0, [r8, #0x86] - bl sub_037FD21C + bl GetCurrentPlaybackTime orr r2, r0, #1 add r0, r8, r5, lsl #3 add r3, r8, #0x128 @@ -1364,7 +1364,7 @@ _027E12EC: cmp r0, #0 cmpeq r1, #0 beq _027E19CC - bl sub_037FD21C + bl GetCurrentPlaybackTime orr r0, r0, #1 str r0, [r8, #0x738] orr r0, r1, #0 @@ -1430,7 +1430,7 @@ _027E13E0: blt _027E13C4 strh r5, [r7, #0xbe] _027E13F0: - bl sub_037FD21C + bl GetCurrentPlaybackTime orr r0, r0, #1 str r0, [sp, #8] ldr r0, _027E1718 ; =0x00008001 @@ -4377,7 +4377,7 @@ _027E3B68: blo _027E3B68 sub r0, r7, #0x40 mov r1, #0x42 - bl sub_03806DD4 + bl __udivsi3 add r2, sp, #0x4e stmia sp, {r2, r5} add r1, sp, #0x1e @@ -4737,7 +4737,7 @@ _027E4074: moveq r0, #1 beq _027E409C ldr r0, _027E445C ; =0x00002710 - bl sub_03806BC8 + bl __divsi3 add r0, r0, #1 _027E409C: mov r0, r0, lsl #0x10 @@ -4931,7 +4931,7 @@ _027E42F8: mov r4, r0 cmpeq r2, #0 beq _027E4388 - bl sub_037FD21C + bl GetCurrentPlaybackTime orr r0, r0, #1 str r0, [r7, #0x738] orr r0, r1, #0 @@ -5712,7 +5712,7 @@ _027E4DC8: rsb r0, r1, #0x10000 strh r0, [r8, #0xbe] strh r1, [r8, #0xc0] - bl sub_037FD21C + bl GetCurrentPlaybackTime orr r1, r1, #0 orr r2, r0, #1 mov r3, #0 @@ -6449,7 +6449,7 @@ _027E584C: str r0, [r4, #0x7b8] str r0, [r4, #0x7bc] _027E5858: - bl sub_037FD21C + bl GetCurrentPlaybackTime orr r1, r1, #0 orr r2, r0, #1 mov r3, #0 @@ -6934,7 +6934,7 @@ sub_027E5E74: ; 0x027E5E74 cmp r0, #0 cmpeq r1, #0 beq _027E5F68 - bl sub_037FD21C + bl GetCurrentPlaybackTime ldr r3, [r4, #0x73c] ldr ip, [r4, #0x738] cmp r3, #0 @@ -10054,7 +10054,7 @@ sub_027E89E0: ; 0x027E89E0 ldr r2, [r4, #0x14] str r2, [r0, #0x304] ldr r0, [r4, #0x30] - bl sub_03806DD4 + bl __udivsi3 mov r1, r0 ldr r0, [r4, #0x2c] bl sub_027E8DDC @@ -11575,7 +11575,7 @@ sub_027E9E30: ; 0x027E9E30 ldrh r0, [r4, #0x6e] mov r1, #0x64 mul r0, r6, r0 - bl sub_03806DD4 + bl __udivsi3 cmp r0, #0x10000 movhi r0, #5 bhi _027E9E84 @@ -12494,7 +12494,7 @@ sub_027EA9BC: ; 0x027EA9BC mla r2, r5, r0, r2 mov r6, r3, lsr #6 orr r6, r6, r2, lsl #26 - bl sub_037FD21C + bl GetCurrentPlaybackTime adds r0, r6, r0 adc r2, r1, #0 mov r1, r0 @@ -13020,7 +13020,7 @@ sub_027EB06C: ; 0x027EB06C stmdb sp!, {r4, lr} mov r4, r0 mov r0, #0x1000000 - bl sub_037FB928 + bl ClearIeFlag ldr r1, _027EB0AC ; =0x0380FFF4 ldr r1, [r1] add r1, r1, #0x300 @@ -13056,7 +13056,7 @@ sub_027EB0B0: ; 0x027EB0B0 strh r1, [r5, #0xc] strh r0, [r5, #0xe] mov r0, #0x1000000 - bl sub_037FB928 + bl ClearIeFlag ldrh r2, [r4, #0xb0] mov r1, #0 strh r2, [r5, #0x10] @@ -13669,7 +13669,7 @@ _027EB8DC: .word sub_037F92DC sub_027EB8E0: ; 0x027EB8E0 stmdb sp!, {r3, lr} mov r0, #0x1000000 - bl sub_037FB928 + bl ClearIeFlag mov r0, #0x1000000 mov r1, #0 bl sub_037FB7BC @@ -13834,7 +13834,7 @@ sub_027EBAE8: ; 0x027EBAE8 mov r0, #0x1000000 add r4, r2, #0x1ac mov r6, r1 - bl sub_037FB928 + bl ClearIeFlag ldrh r1, [r4, #8] mov r5, r0 cmp r1, #0 @@ -13864,7 +13864,7 @@ sub_027EBB44: ; 0x027EBB44 ldr r2, [r0, #0x31c] mov r0, #0x1000000 mla r6, r5, r1, r2 - bl sub_037FB928 + bl ClearIeFlag ldr r1, _027EBBD0 ; =0x0380FFF4 mov r4, r0 ldr r0, [r1] @@ -13906,7 +13906,7 @@ sub_027EBBD4: ; 0x027EBBD4 ldr r2, [r0, #0x31c] mov r0, #0x1000000 mla r6, r5, r1, r2 - bl sub_037FB928 + bl ClearIeFlag ldr r1, _027EBC40 ; =0x0380FFF4 mov r4, r0 ldr r0, [r1] @@ -13936,7 +13936,7 @@ sub_027EBC44: ; 0x027EBC44 mov r6, r0 mov r0, #0x1000000 mov r5, r1 - bl sub_037FB928 + bl ClearIeFlag ldr r3, _027EBD28 ; =0x0380FFF4 mov r4, r0 cmp r5, #0x40 @@ -14147,7 +14147,7 @@ sub_027EBEB0: ; 0x027EBEB0 mov r0, #0x1000000 add r1, r1, #0x12c add r4, r1, #0x400 - bl sub_037FB928 + bl ClearIeFlag mov r6, r0 mov r5, #1 mov r1, #2 @@ -14369,7 +14369,7 @@ sub_027EC10C: ; 0x027EC10C ldr r1, _027EC1C4 ; =0x0480425C mov r0, #0x1000000 add r6, r2, r1 - bl sub_037FB928 + bl ClearIeFlag mov r4, r0 cmp r5, #0 bne _027EC17C @@ -14419,7 +14419,7 @@ sub_027EC1C8: ; 0x027EC1C8 add r1, r1, #0x300 ldrh r1, [r1, #0xd8] add r6, r1, r2 - bl sub_037FB928 + bl ClearIeFlag mov r4, r0 cmp r5, #0 bne _027EC224 @@ -16191,7 +16191,7 @@ _027ED9B8: mov r2, #0 cmpne r0, #0 beq _027ED9F8 - bl sub_03806DD4 + bl __udivsi3 add r2, r0, #1 cmp r2, #0x64 movhi r2, #0x64 @@ -18688,7 +18688,7 @@ _027EF8B0: strh r0, [r2, #2] _027EF8E0: mov r0, #0x1000000 - bl sub_037FB928 + bl ClearIeFlag mov r2, #2 ldr r1, _027EF958 ; =0x00003FFF strh r2, [fp, r8] @@ -18970,7 +18970,7 @@ _027EFCA8: add r0, r3, r0 mov r1, #0xa add r0, r0, #0x32 - bl sub_03806DD4 + bl __udivsi3 mov r4, r0 bl EnableIrqFlag ldr r1, _027EFE04 ; =0x00003FFF @@ -18992,7 +18992,7 @@ _027EFD40: add r0, sb, r0 mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 - bl sub_03806DD4 + bl __udivsi3 ldrh r3, [sl, #0x18] add r1, r0, #3 cmp r1, r3 @@ -19134,7 +19134,7 @@ sub_027EFEF4: ; 0x027EFEF4 add r4, r2, #0x344 beq _027F00FC mov r0, #0x1000000 - bl sub_037FB928 + bl ClearIeFlag ldrh r1, [r6] str r0, [sp] cmp r1, #0 @@ -19997,7 +19997,7 @@ sub_027F0B00: ; 0x027F0B00 ldr r1, [r1] add r1, r1, #0x2c add r4, r1, #0x400 - bl sub_037FB928 + bl ClearIeFlag ldr r1, _027F0B6C ; =0x0380FFF4 mov r5, r0 ldr r0, [r1] @@ -20032,7 +20032,7 @@ sub_027F0B74: ; 0x027F0B74 ldr r1, [r1] add r1, r1, #0x2c add r4, r1, #0x400 - bl sub_037FB928 + bl ClearIeFlag ldr r1, _027F0BC4 ; =0x048080B4 mov r2, #2 strh r2, [r1] @@ -20059,7 +20059,7 @@ sub_027F0BC8: ; 0x027F0BC8 ldr r1, [r1] add r1, r1, #0x2c add r4, r1, #0x400 - bl sub_037FB928 + bl ClearIeFlag ldr r1, _027F0C68 ; =0x0380FFF4 mov r5, r0 ldr r0, [r1] @@ -20145,7 +20145,7 @@ sub_027F0CD4: ; 0x027F0CD4 add r5, r0, #0x400 mov r0, #0x1000000 add r6, r5, r4 - bl sub_037FB928 + bl ClearIeFlag ldr r1, _027F0D58 ; =_027F7870 mov r2, r7, lsl #1 ldrh r2, [r1, r2] @@ -24422,7 +24422,7 @@ _027F47D0: sub r0, r0, #0x18 strh r0, [r4, #0x20] ldrh r0, [r4, #0x20] - bl sub_03806DD4 + bl __udivsi3 mov r1, r6 strh r0, [r1, #2] b _027F4AC8 @@ -26067,24 +26067,24 @@ _027F5D7C: mov r0, r7 mov r1, #0x190 addls r6, r6, #0xc - bl sub_03806DD4 + bl __udivsi3 mov r4, r0 mov r0, r7 mov r1, #0x64 - bl sub_03806DD4 + bl __udivsi3 mov r1, #0xd mul r1, r6, r1 mov r6, r0 add r0, r1, #8 mov r1, #5 - bl sub_03806DD4 + bl __udivsi3 add r1, r7, r7, lsr #2 sub r1, r1, r6 add r1, r4, r1 add r0, r1, r0 add r0, r5, r0 mov r1, #7 - bl sub_03806DD4 + bl __udivsi3 ldr r0, _027F5F04 ; =0x027FFDE8 ldr r2, [r0] mov r3, r2, lsl #5 diff --git a/sub/asm/wram.s b/sub/asm/wram.s index 785d867b..4aa8a2f0 100644 --- a/sub/asm/wram.s +++ b/sub/asm/wram.s @@ -3,8 +3,8 @@ .text - arm_func_start sub_037F8000 -sub_037F8000: ; 0x037F8000 + arm_func_start NitroSpMain +NitroSpMain: ; 0x037F8000 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x210 bl sub_037FC9EC @@ -312,7 +312,7 @@ _037F845C: .word 0xFFFFFF2A _037F8460: .word 0xFFFFFF60 _037F8464: .word sub_037F84BC _037F8468: .word 0x04000004 - arm_func_end sub_037F8000 + arm_func_end NitroSpMain arm_func_start sub_037F846C sub_037F846C: ; 0x037F846C @@ -388,7 +388,7 @@ _037F8508: bl sub_037F8704 _037F852C: mov r0, r4 - bl sub_037FB928 + bl ClearIeFlag ldrh r1, [r8, #0x10] strh r1, [r8, #0x12] mov r1, r1, lsl #1 @@ -428,7 +428,7 @@ sub_037F8598: ; 0x037F8598 ldr r0, _037F864C ; =0x01000010 mov r6, r1 add r5, r4, #0xbc - bl sub_037FB928 + bl ClearIeFlag add r2, r5, r6, lsl #3 ldrh r1, [r2, #2] mov ip, r6, lsl #3 @@ -479,7 +479,7 @@ sub_037F8650: ; 0x037F8650 mov r5, r0 ldr r0, _037F86C0 ; =0x01000010 ldr r4, [r1] - bl sub_037FB928 + bl ClearIeFlag mov lr, r5, lsl #1 ldrh r5, [r4, lr] ldr r2, _037F86C4 ; =0x0000FFFF @@ -554,7 +554,7 @@ sub_037F873C: ; 0x037F873C mov r5, r0 mov r0, #0x1000000 mov r4, r1 - bl sub_037FB928 + bl ClearIeFlag ldrh r1, [r5, #8] cmp r1, #0 mvneq r1, #0 @@ -597,7 +597,7 @@ sub_037F87AC: ; 0x037F87AC movne r0, #2 bne _037F8860 mov r0, #0x1000000 - bl sub_037FB928 + bl ClearIeFlag ldrh r1, [r5, #8] sub r1, r1, #1 strh r1, [r5, #8] @@ -738,7 +738,7 @@ sub_037F8988: ; 0x037F8988 movne r0, #1 bne _037F89E8 mov r0, #0x1000000 - bl sub_037FB928 + bl ClearIeFlag mov r5, r0 mov r0, r4 mov r1, r6 @@ -775,7 +775,7 @@ sub_037F89F4: ; 0x037F89F4 movne r0, #2 bne _037F8A74 mov r0, #0x1000000 - bl sub_037FB928 + bl ClearIeFlag ldrh r1, [r5, #8] cmp r1, #0 mvneq r1, #0 @@ -2803,7 +2803,7 @@ _037FA65C: .word 0x0380FFF4 sub_037FA660: ; 0x037FA660 stmdb sp!, {r4, lr} mov r0, #0x1000000 - bl sub_037FB928 + bl ClearIeFlag ldr r2, _037FA6C0 ; =0x04808210 mov r1, #0x1000 ldrh r3, [r2] @@ -3847,8 +3847,8 @@ _037FB474: _037FB484: .word 0x04808180 arm_func_end sub_037FB454 - arm_func_start sub_037FB488 -sub_037FB488: ; 0x037FB488 + arm_func_start HardwareInterrupt +HardwareInterrupt: ; 0x037FB488 stmdb sp!, {lr} mov ip, #0x4000000 add ip, ip, #0x210 @@ -3879,15 +3879,15 @@ _037FB4D4: str r2, [ip, #4] ldr r1, _037FB4EC ; =_038074F4 ldr r0, [r1, r0, lsl #2] - ldr lr, _037FB4F0 ; =sub_037FB4F4 + ldr lr, _037FB4F0 ; =ReturnFromInterrupt bx r0 .align 2, 0 _037FB4EC: .word _038074F4 -_037FB4F0: .word sub_037FB4F4 - arm_func_end sub_037FB488 +_037FB4F0: .word ReturnFromInterrupt + arm_func_end HardwareInterrupt - arm_func_start sub_037FB4F4 -sub_037FB4F4: ; 0x037FB4F4 + arm_func_start ReturnFromInterrupt +ReturnFromInterrupt: ; 0x037FB4F4 ldr ip, _037FB630 ; =_03807608 mov r3, #0 ldr ip, [ip] @@ -3985,15 +3985,15 @@ _037FB5DC: .align 2, 0 _037FB630: .word _03807608 _037FB634: .word _038076A4 - arm_func_end sub_037FB4F4 + arm_func_end ReturnFromInterrupt arm_func_start sub_037FB638 sub_037FB638: ; 0x037FB638 bx lr arm_func_end sub_037FB638 - arm_func_start sub_037FB63C -sub_037FB63C: ; 0x037FB63C + arm_func_start AudioInterrupt +AudioInterrupt: ; 0x037FB63C stmdb sp!, {r3, r4, r5, lr} mov r1, #0xc mul r5, r0, r1 @@ -4022,7 +4022,7 @@ _037FB684: cmp r0, #0 bne _037FB6AC mov r0, r4 - bl sub_037FB928 + bl ClearIeFlag _037FB6AC: ldmia sp!, {r3, r4, r5, lr} bx lr @@ -4032,78 +4032,78 @@ _037FB6B8: .word _038074E0 _037FB6BC: .word _03807618 _037FB6C0: .word 0x0380FFF8 _037FB6C4: .word _03807614 - arm_func_end sub_037FB63C + arm_func_end AudioInterrupt arm_func_start sub_037FB6C8 sub_037FB6C8: ; 0x037FB6C8 - ldr ip, _037FB6D4 ; =sub_037FB63C + ldr ip, _037FB6D4 ; =AudioInterrupt mov r0, #0 bx ip .align 2, 0 -_037FB6D4: .word sub_037FB63C +_037FB6D4: .word AudioInterrupt arm_func_end sub_037FB6C8 arm_func_start sub_037FB6D8 sub_037FB6D8: ; 0x037FB6D8 - ldr ip, _037FB6E4 ; =sub_037FB63C + ldr ip, _037FB6E4 ; =AudioInterrupt mov r0, #1 bx ip .align 2, 0 -_037FB6E4: .word sub_037FB63C +_037FB6E4: .word AudioInterrupt arm_func_end sub_037FB6D8 arm_func_start sub_037FB6E8 sub_037FB6E8: ; 0x037FB6E8 - ldr ip, _037FB6F4 ; =sub_037FB63C + ldr ip, _037FB6F4 ; =AudioInterrupt mov r0, #2 bx ip .align 2, 0 -_037FB6F4: .word sub_037FB63C +_037FB6F4: .word AudioInterrupt arm_func_end sub_037FB6E8 arm_func_start sub_037FB6F8 sub_037FB6F8: ; 0x037FB6F8 - ldr ip, _037FB704 ; =sub_037FB63C + ldr ip, _037FB704 ; =AudioInterrupt mov r0, #3 bx ip .align 2, 0 -_037FB704: .word sub_037FB63C +_037FB704: .word AudioInterrupt arm_func_end sub_037FB6F8 arm_func_start sub_037FB708 sub_037FB708: ; 0x037FB708 - ldr ip, _037FB714 ; =sub_037FB63C + ldr ip, _037FB714 ; =AudioInterrupt mov r0, #4 bx ip .align 2, 0 -_037FB714: .word sub_037FB63C +_037FB714: .word AudioInterrupt arm_func_end sub_037FB708 arm_func_start sub_037FB718 sub_037FB718: ; 0x037FB718 - ldr ip, _037FB724 ; =sub_037FB63C + ldr ip, _037FB724 ; =AudioInterrupt mov r0, #5 bx ip .align 2, 0 -_037FB724: .word sub_037FB63C +_037FB724: .word AudioInterrupt arm_func_end sub_037FB718 arm_func_start sub_037FB728 sub_037FB728: ; 0x037FB728 - ldr ip, _037FB734 ; =sub_037FB63C + ldr ip, _037FB734 ; =AudioInterrupt mov r0, #6 bx ip .align 2, 0 -_037FB734: .word sub_037FB63C +_037FB734: .word AudioInterrupt arm_func_end sub_037FB728 arm_func_start sub_037FB738 sub_037FB738: ; 0x037FB738 - ldr ip, _037FB744 ; =sub_037FB63C + ldr ip, _037FB744 ; =AudioInterrupt mov r0, #7 bx ip .align 2, 0 -_037FB744: .word sub_037FB63C +_037FB744: .word AudioInterrupt arm_func_end sub_037FB738 arm_func_start sub_037FB748 @@ -4223,7 +4223,7 @@ _037FB8A0: .word _03807644 sub_037FB8A4: ; 0x037FB8A4 stmdb sp!, {r4, lr} mov r4, r0 - bl sub_037FB8D8 + bl ClearImeFlag ldr r1, _037FB8D4 ; =0x04000210 ldr r3, [r1] sub r2, r1, #8 @@ -4237,8 +4237,8 @@ sub_037FB8A4: ; 0x037FB8A4 _037FB8D4: .word 0x04000210 arm_func_end sub_037FB8A4 - arm_func_start sub_037FB8D8 -sub_037FB8D8: ; 0x037FB8D8 + arm_func_start ClearImeFlag +ClearImeFlag: ; 0x037FB8D8 ldr r2, _037FB8EC ; =0x04000208 mov r1, #0 ldrh r0, [r2] @@ -4246,13 +4246,13 @@ sub_037FB8D8: ; 0x037FB8D8 bx lr .align 2, 0 _037FB8EC: .word 0x04000208 - arm_func_end sub_037FB8D8 + arm_func_end ClearImeFlag arm_func_start sub_037FB8F0 sub_037FB8F0: ; 0x037FB8F0 stmdb sp!, {r4, lr} mov r4, r0 - bl sub_037FB8D8 + bl ClearImeFlag ldr ip, _037FB924 ; =0x04000210 ldr r3, [ip] sub r2, ip, #8 @@ -4267,11 +4267,11 @@ sub_037FB8F0: ; 0x037FB8F0 _037FB924: .word 0x04000210 arm_func_end sub_037FB8F0 - arm_func_start sub_037FB928 -sub_037FB928: ; 0x037FB928 + arm_func_start ClearIeFlag +ClearIeFlag: ; 0x037FB928 stmdb sp!, {r4, lr} mov r4, r0 - bl sub_037FB8D8 + bl ClearImeFlag ldr ip, _037FB960 ; =0x04000210 mvn r1, r4 ldr r3, [ip] @@ -4285,13 +4285,13 @@ sub_037FB928: ; 0x037FB928 bx lr .align 2, 0 _037FB960: .word 0x04000210 - arm_func_end sub_037FB928 + arm_func_end ClearIeFlag arm_func_start sub_037FB964 sub_037FB964: ; 0x037FB964 stmdb sp!, {r4, lr} mov r4, r0 - bl sub_037FB8D8 + bl ClearImeFlag ldr r1, _037FB994 ; =0x04000214 ldr r3, [r1] sub r2, r1, #0xc @@ -4856,7 +4856,7 @@ sub_037FBF64: ; 0x037FBF64 str r1, [r0, #0x2c] str r1, [r0, #0x28] cmp r2, #0 - ldrle r0, _037FC038 ; =sub_037F8000 + ldrle r0, _037FC038 ; =NitroSpMain ldrgt r1, _037FC03C ; =0x00000400 ldrgt r0, _037FC040 ; =0x0380FF80 subgt r0, r0, r1 @@ -4890,7 +4890,7 @@ _037FC028: .word _03807680 _037FC02C: .word _038076A8 _037FC030: .word 0x00000400 _037FC034: .word _03807758 -_037FC038: .word sub_037F8000 +_037FC038: .word NitroSpMain _037FC03C: .word 0x00000400 _037FC040: .word 0x0380FF80 _037FC044: .word 0xD73BFDF7 @@ -5456,7 +5456,7 @@ _037FC714: ble _037FC6F4 ldr r0, [r6, #0x18] add r0, r0, r2 - bl sub_03806BC8 + bl __divsi3 ldr r2, [r6, #0x10] add r0, r6, #8 str r5, [r2, r1, lsl #2] @@ -5504,7 +5504,7 @@ _037FC7A0: ldr r0, [r6, #0x18] ldr r1, [r6, #0x14] add r0, r0, #1 - bl sub_03806BC8 + bl __divsi3 str r1, [r6, #0x18] ldr r1, [r6, #0x1c] mov r0, r6 @@ -6337,8 +6337,8 @@ _037FD214: .word sub_037FB858 _037FD218: .word sub_037FD1B4 arm_func_end sub_037FD1B4 - arm_func_start sub_037FD21C -sub_037FD21C: ; 0x037FD21C + arm_func_start GetCurrentPlaybackTime +GetCurrentPlaybackTime: ; 0x037FD21C stmdb sp!, {lr} sub sp, sp, #0xc bl EnableIrqFlag @@ -6382,13 +6382,13 @@ _037FD288: _037FD2B4: .word 0x04000100 _037FD2B8: .word _03807828 _037FD2BC: .word 0x0000FFFF - arm_func_end sub_037FD21C + arm_func_end GetCurrentPlaybackTime arm_func_start sub_037FD2C0 sub_037FD2C0: ; 0x037FD2C0 stmdb sp!, {r3, r4, r5, lr} mov r4, r0 - bl sub_037FD21C + bl GetCurrentPlaybackTime ldr r3, _037FD33C ; =0x04000106 mov r2, #0 strh r2, [r3] @@ -6440,7 +6440,7 @@ sub_037FD34C: ; 0x037FD34C str r2, [r1, #4] mov r0, #0x10 str r2, [r1, #8] - bl sub_037FB928 + bl ClearIeFlag _037FD384: ldmia sp!, {r3, lr} bx lr @@ -6476,7 +6476,7 @@ sub_037FD3B0: ; 0x037FD3B0 mov r6, r2 cmpeq r3, #0 beq _037FD424 - bl sub_037FD21C + bl GetCurrentPlaybackTime ldr r6, [r8, #0x28] ldr r7, [r8, #0x24] cmp r6, r1 @@ -6572,7 +6572,7 @@ _037FD504: ldr r1, [sp, #0x18] mov r7, r0 str r1, [r6, #4] - bl sub_037FD21C + bl GetCurrentPlaybackTime adds r3, r5, r0 adc r2, r4, r1 mov r0, r6 @@ -6676,12 +6676,12 @@ sub_037FD658: ; 0x037FD658 mov r2, #0 mov r0, #0x10 strh r2, [r1] - bl sub_037FB928 + bl ClearIeFlag ldr r1, _037FD744 ; =0x0380FFF8 ldr r0, [r1] orr r0, r0, #0x10 str r0, [r1] - bl sub_037FD21C + bl GetCurrentPlaybackTime ldr r2, _037FD748 ; =_03807838 ldr r4, [r2, #4] cmp r4, #0 @@ -6752,7 +6752,7 @@ sub_037FD74C: ; 0x037FD74C str r2, [r1, #0xc] mov r0, #4 str r2, [r1, #0x10] - bl sub_037FB928 + bl ClearIeFlag ldr r0, _037FD794 ; =_03807844 mov r1, #0 str r1, [r0, #8] @@ -7047,7 +7047,7 @@ _037FDAF4: .word _03807844 sub_037FDAF8: ; 0x037FDAF8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r0, #4 - bl sub_037FB928 + bl ClearIeFlag ldr r2, _037FDC98 ; =0x04000004 ldr r1, _037FDC9C ; =0x0380FFF8 ldrh r0, [r2] @@ -7114,7 +7114,7 @@ _037FDBD4: cmpeq r0, sb bne _037FDC90 mov r0, #4 - bl sub_037FB928 + bl ClearIeFlag ldrh r1, [r7] mov r0, #4 bic r1, r1, #0x20 @@ -7997,7 +7997,7 @@ _037FE5E8: bne _037FE640 ldr r0, _037FE650 ; =_038078E4 bl sub_037FD3A0 - bl sub_037FD21C + bl GetCurrentPlaybackTime ldr r2, _037FE654 ; =sub_037FE65C ldr r3, _037FE658 ; =0x0000082E str r2, [sp, #4] @@ -8766,7 +8766,7 @@ _037FEF60: .word _03807E48 sub_037FEF64: ; 0x037FEF64 stmdb sp!, {lr} sub sp, sp, #0xc - bl sub_037FD21C + bl GetCurrentPlaybackTime ldr r3, _037FEFA8 ; =sub_037FEFEC adds ip, r0, #0x10000 str r3, [sp, #4] @@ -8852,7 +8852,7 @@ sub_037FF008: ; 0x037FF008 bl sub_037FE7CC mov r0, #0x7f bl sub_037FE7BC - bl sub_037FD21C + bl GetCurrentPlaybackTime ldr r2, _037FF0F4 ; =sub_037FEFEC adds r4, r0, #0x10000 str r2, [sp, #4] @@ -9948,7 +9948,7 @@ sub_037FFE64: ; 0x037FFE64 blt _037FFEAC rsb r1, r0, #0x7e mov r0, #0x1e00 - bl sub_03806BC8 + bl __divsi3 mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 _037FFEAC: @@ -11723,7 +11723,7 @@ _038015AC: beq _038017D0 mov r1, sb ldrsh r0, [r4] - bl sub_03806BC8 + bl __divsi3 strh r0, [r4] b _038017D0 _038015C8: @@ -12375,7 +12375,7 @@ _03801DDC: bl sub_037FD4DC b _03801E4C _03801E24: - bl sub_037FD21C + bl GetCurrentPlaybackTime ldr r2, _03801E64 ; =sub_03801EA8 adds r0, r5, r0 stmib sp, {r2, sb} @@ -15319,11 +15319,11 @@ _03804200: b _03804284 _03804230: mul r0, sb, r8 - bl sub_03806DD4 + bl __udivsi3 ldr r2, [sl, #0xc] mov r1, r8 add r0, r2, r0 - bl sub_03806DD4 + bl __udivsi3 mov r0, r1, lsl #0x10 mov r0, r0, lsr #0x10 cmp r0, #0xc8 @@ -16321,7 +16321,7 @@ sub_03804F1C: ; 0x03804F1C bl EnableIrqFlag mov r4, r0 mvn r0, #0xfe000000 - bl sub_037FB928 + bl ClearIeFlag mov r5, r0 mov r0, r8 bl sub_03804CCC @@ -16483,7 +16483,7 @@ _03805164: ldr r0, [r1] add r6, r5, r4 ldrh r1, [r6, #0xa] - bl sub_03806DD4 + bl __udivsi3 mov r1, #0 mov r3, r1, lsr r0 ldr ip, [r6, #4] @@ -17641,7 +17641,7 @@ _03806038: beq _03806060 b _03806064 _03806060: - ldr r0, _03806094 ; =sub_037FB4F4 + ldr r0, _03806094 ; =ReturnFromInterrupt _03806064: beq _0380606C b _03806070 @@ -17661,7 +17661,7 @@ _03806088: .word _0380B24C _0380608C: .word _03807210 _03806090: .word _038074F4 arm_func_end sub_03805FD0 -_03806094: .word sub_037FB4F4 +_03806094: .word ReturnFromInterrupt arm_func_start sub_03806098 sub_03806098: ; 0x03806098 @@ -18408,7 +18408,7 @@ _038069F0: orrs r6, r5, r6 bne _03806A24 mov r1, r2 - bl sub_03806BC8 + bl __divsi3 ands r4, r4, #1 movne r0, r1 mov r1, r0, asr #0x1f @@ -18537,7 +18537,7 @@ _03806BA4: orrs r5, r1, r3 bne _03806A44 mov r1, r2 - bl sub_03806DDC + bl __udivsi3_no_zero_check cmp r4, #0 movne r0, r1 mov r1, #0 @@ -18545,8 +18545,8 @@ _03806BA4: bx lr arm_func_end sub_03806B80 - arm_func_start sub_03806BC8 -sub_03806BC8: ; 0x03806BC8 + arm_func_start __divsi3 +__divsi3: ; 0x03806BC8 eor ip, r0, r1 and ip, ip, #0x80000000 cmp r0, #0 @@ -18679,16 +18679,16 @@ _03806DC0: ands r3, ip, #1 rsbne r1, r1, #0 bx lr - arm_func_end sub_03806BC8 + arm_func_end __divsi3 - arm_func_start sub_03806DD4 -sub_03806DD4: ; 0x03806DD4 + arm_func_start __udivsi3 +__udivsi3: ; 0x03806DD4 cmp r1, #0 bxeq lr - arm_func_end sub_03806DD4 + arm_func_end __udivsi3 - arm_func_start sub_03806DDC -sub_03806DDC: ; 0x03806DDC + arm_func_start __udivsi3_no_zero_check +__udivsi3_no_zero_check: ; 0x03806DDC cmp r0, r1 movlo r1, r0 movlo r0, #0 @@ -18808,7 +18808,7 @@ sub_03806DDC: ; 0x03806DDC adcs r0, r0, r0 mov r1, r3 bx lr - arm_func_end sub_03806DDC + arm_func_end __udivsi3_no_zero_check _03806FB8: .byte 0x00, 0x06, 0x0C, 0x13, 0x19, 0x1F, 0x25, 0x2B, 0x31, 0x36, 0x3C, 0x41, 0x47, 0x4C, 0x51, 0x55 diff --git a/sub/lib/asm/crt0.s b/sub/lib/asm/crt0.s index 77c237ae..9a4cda39 100644 --- a/sub/lib/asm/crt0.s +++ b/sub/lib/asm/crt0.s @@ -67,9 +67,9 @@ _023800C4: blo _023800B4 bl sub_0238018C ldr r1, _02380108 ; =0x0380FFFC - ldr r0, _0238010C ; =sub_037FB488 + ldr r0, _0238010C ; =HardwareInterrupt str r0, [r1] - ldr r1, _02380110 ; =sub_037F8000 + ldr r1, _02380110 ; =NitroSpMain ldr lr, _02380114 ; =0xFFFF0000 bx r1 .align 2, 0 @@ -83,8 +83,8 @@ _023800FC: .word 0x027FFA80 _02380100: .word 0x023FE904 _02380104: .word _start_ModuleParams _02380108: .word 0x0380FFFC -_0238010C: .word sub_037FB488 -_02380110: .word sub_037F8000 +_0238010C: .word HardwareInterrupt +_02380110: .word NitroSpMain _02380114: .word 0xFFFF0000 arm_func_end _start diff --git a/sub/lib/asm/include/crt0.inc b/sub/lib/asm/include/crt0.inc index 3e68a9a4..b6070e7f 100644 --- a/sub/lib/asm/include/crt0.inc +++ b/sub/lib/asm/include/crt0.inc @@ -1,8 +1,8 @@ #pragma once +.public HardwareInterrupt +.public NitroSpMain .public SDK_AUTOLOAD_LIST .public SDK_AUTOLOAD_LIST_END .public SDK_AUTOLOAD_START .public SDK_STATIC_BSS_END .public SDK_STATIC_BSS_START -.public sub_037F8000 -.public sub_037FB488 diff --git a/tools/sync_pmdsky_debug/pmdsky_debug_reader.py b/tools/sync_pmdsky_debug/pmdsky_debug_reader.py index 0f9607d2..c72bdfb1 100644 --- a/tools/sync_pmdsky_debug/pmdsky_debug_reader.py +++ b/tools/sync_pmdsky_debug/pmdsky_debug_reader.py @@ -7,6 +7,11 @@ from symbol_details import SymbolDetails SYMBOLS_FOLDER = 'symbols' pmdsky_debug_path = None +LANGUAGE_KEYS = { + 'NA': 'us', + 'EU': 'eu', +} + def get_pmdsky_debug_location() -> str: global pmdsky_debug_path if not pmdsky_debug_path: @@ -23,53 +28,71 @@ def get_pmdsky_debug_location() -> str: exit(1) return pmdsky_debug_path -# In the returned dictionary, outer key = region, inner key = symbol address, value = symbol details. -def read_pmdsky_debug_symbols() -> Dict[str, Dict[int, SymbolDetails]]: - pmdsky_debug_symbols: Dict[str, Dict[int, SymbolDetails]] = {} +""" +Dictionary format: +{ + : { + : { + : { + Symbol details + } + } + } +} +""" +def read_pmdsky_debug_symbols() -> Dict[str, Dict[str, Dict[int, SymbolDetails]]]: + pmdsky_debug_symbols: Dict[str, Dict[str, Dict[int, SymbolDetails]]] = {} + for language in LANGUAGE_KEYS: + pmdsky_debug_symbols[LANGUAGE_KEYS[language]] = {} pmdsky_debug_path = get_pmdsky_debug_location() - def read_yaml_symbols(file_path: str, symbols: Dict[int, SymbolDetails] = None, address_suffix = '') -> Dict[int, SymbolDetails]: - if symbols is None: - symbols = {} + def read_yaml_symbols(file_path: str, symbols_key: str, address_suffix = '') -> Dict[int, SymbolDetails]: full_file_path = os.path.join(pmdsky_debug_path, SYMBOLS_FOLDER, file_path) with open(full_file_path, 'r') as symbols_file: symbols_yaml = yaml.safe_load(symbols_file) def read_symbols_from_array(array_key: str, is_data: bool): for symbol in symbols_yaml[list(symbols_yaml.keys())[0]][array_key]: - target_region = f'NA{address_suffix}' - if target_region not in symbol['address']: - continue - addresses = symbol['address'][target_region] - symbol_name = symbol['name'] - if isinstance(addresses, list): - if len(addresses) > 1: - for address in addresses: - symbols[address] = SymbolDetails(f'{symbol_name}__{address:08X}', full_file_path, is_data) + for language in symbol['address'].keys(): + if not language.endswith(address_suffix): + continue + base_language = language.replace(address_suffix, '') + if base_language not in LANGUAGE_KEYS: + continue + + language_symbols = pmdsky_debug_symbols[LANGUAGE_KEYS[base_language]] + if symbols_key not in language_symbols: + language_symbols[symbols_key] = {} + symbols = language_symbols[symbols_key] + + addresses = symbol['address'][language] + symbol_name = symbol['name'] + if isinstance(addresses, list): + if len(addresses) > 1: + for address in addresses: + symbols[address] = SymbolDetails(f'{symbol_name}__{address:08X}', full_file_path, is_data) + else: + symbols[addresses[0]] = SymbolDetails(symbol_name, full_file_path, is_data) else: - symbols[addresses[0]] = SymbolDetails(symbol_name, full_file_path, is_data) - else: - symbols[addresses] = SymbolDetails(symbol_name, full_file_path, is_data) + symbols[addresses] = SymbolDetails(symbol_name, full_file_path, is_data) read_symbols_from_array('functions', False) read_symbols_from_array('data', True) - return symbols - itcm_file = os.path.join('arm9', 'itcm.yml') - pmdsky_debug_symbols['main'] = read_yaml_symbols('arm9.yml') - pmdsky_debug_symbols['main'] = read_yaml_symbols(itcm_file, pmdsky_debug_symbols['main']) - pmdsky_debug_symbols['ITCM'] = read_yaml_symbols(itcm_file, address_suffix='-ITCM') - pmdsky_debug_symbols['arm7'] = read_yaml_symbols('arm7.yml') + read_yaml_symbols('arm9.yml', 'main') + read_yaml_symbols(itcm_file, 'main') + read_yaml_symbols(itcm_file, 'ITCM', address_suffix='-ITCM') + read_yaml_symbols('arm7.yml', 'arm7') for i in range(0, 36): overlay_name = f'overlay{i:02d}' - pmdsky_debug_symbols[str(i)] = read_yaml_symbols(f'{overlay_name}.yml') + read_yaml_symbols(f'{overlay_name}.yml', str(i)) overlay_folder = os.path.join(pmdsky_debug_path, SYMBOLS_FOLDER, overlay_name) if os.path.exists(overlay_folder): for file in os.listdir(overlay_folder): if file.endswith('.yml'): - read_yaml_symbols(os.path.join(overlay_name, file), pmdsky_debug_symbols[str(i)]) + read_yaml_symbols(os.path.join(overlay_name, file), str(i)) return pmdsky_debug_symbols diff --git a/tools/sync_pmdsky_debug/sync_from_pmdsky_debug.py b/tools/sync_pmdsky_debug/sync_from_pmdsky_debug.py index da813462..975723c3 100644 --- a/tools/sync_pmdsky_debug/sync_from_pmdsky_debug.py +++ b/tools/sync_pmdsky_debug/sync_from_pmdsky_debug.py @@ -26,73 +26,93 @@ def add_files_with_extensions(folder: str, extensions: List[str]) -> List[str]: asm_files = add_files_with_extensions('asm', ['.s', '.inc']) asm_arm7_files = add_files_with_extensions(os.path.join('sub', 'asm'), ['.s', '.inc']) +asm_arm7_files.extend(add_files_with_extensions(os.path.join('sub', 'lib'), ['.s', '.inc'])) src_files = add_files_with_extensions(HEADER_FOLDER, ['.h']) src_files.extend(add_files_with_extensions('src', ['.c'])) -for section_name, pmdsky_debug_section in pmdsky_debug_symbols.items(): - if section_name in xmap_symbols: - xmap_section = xmap_symbols[section_name] - else: - xmap_section = {} +replaced_symbols = set() +for language, pmdsky_debug_language_symbols in pmdsky_debug_symbols.items(): + xmap_language_symbols = xmap_symbols[language] + for section_name, pmdsky_debug_section in pmdsky_debug_language_symbols.items(): + if section_name in xmap_language_symbols: + xmap_section = xmap_language_symbols[section_name] + else: + xmap_section = {} - for address, symbol in pmdsky_debug_section.items(): - if section_name == 'arm7' and address > 0x2380000: - # TODO Figure out exact boundary of WRAM. - address += 0x1477E18 - if address in xmap_section and xmap_section[address].name != symbol.name and xmap_section[address].name not in MIXED_CASE_SYMBOLS: - old_symbol = xmap_section[address] - print(f'Replacing {old_symbol.name} with {symbol.name}') - if symbol.is_data: - asm_search_string_bases = [ - f'\n{old_symbol.name}:\n', - f'.word {old_symbol.name}\n', - f'; ={old_symbol.name}\n', - f'.global {old_symbol.name}\n', - f'.public {old_symbol.name}\n', - ] - else: - asm_search_string_bases = [ - f'arm_func_start {old_symbol.name}\n', - f'arm_func_end {old_symbol.name}\n', - f'\n{old_symbol.name}: ', - f'thumb_func_start {old_symbol.name}\n', - f'thumb_func_end {old_symbol.name}\n', - f'.word {old_symbol.name}\n', - f'b {old_symbol.name} ; case', - f'bl {old_symbol.name}\n', - f'blx {old_symbol.name}\n', - f'beq {old_symbol.name}\n', - f'bne {old_symbol.name}\n', - f'; ={old_symbol.name}\n', - f'.public {old_symbol.name}\n', - ] - asm_search_strings = [(base, base.replace(old_symbol.name, symbol.name)) for base in asm_search_string_bases] - candidate_asm_files = asm_files - if section_name == 'arm7': - candidate_asm_files = asm_arm7_files - for file_path in candidate_asm_files: - with open(file_path, 'r') as asm_file: - asm_contents = asm_file.read() - for search_string in asm_search_strings: - asm_contents = asm_contents.replace(search_string[0], search_string[1]) - with open(file_path, 'w') as asm_file: - asm_file.write(asm_contents) + for address, symbol in pmdsky_debug_section.items(): + if section_name == 'arm7' and address > 0x2380000: + # TODO Figure out exact boundary of WRAM. + address += 0x1477E18 + if address in xmap_section and xmap_section[address].name != symbol.name and xmap_section[address].name not in MIXED_CASE_SYMBOLS and xmap_section[address].name not in replaced_symbols: + old_symbol = xmap_section[address] - src_search_string_data_regex = re.compile(fr'([ &*(]){old_symbol.name}([,); [])') - src_search_string_data_regex_replace = fr'\1{symbol.name}\2' + if '__' in old_symbol.name: + # When a symbol is duplicated in multiple places and has the address appended to the symbol name, + # don't flag the EU name/address combination as a different symbol. + base_symbol = old_symbol.name.split('__')[0] + if symbol.name.startswith(f'{base_symbol}__'): + continue - src_search_string_bases = [ - f' {old_symbol.name}(', - f'({old_symbol.name}(', - ] - src_search_function_strings = [(base, base.replace(old_symbol.name, symbol.name)) for base in src_search_string_bases] - for file_path in src_files: - with open(file_path, 'r') as src_file: - src_contents = src_file.read() + print(f'Replacing {old_symbol.name} with {symbol.name}') + replaced_symbols.add(old_symbol.name) if symbol.is_data: - src_contents = src_search_string_data_regex.sub(src_search_string_data_regex_replace, src_contents) + asm_search_string_bases = [ + f'\n{old_symbol.name}:\n', + f'.word {old_symbol.name}\n', + f'; ={old_symbol.name}\n', + f'.global {old_symbol.name}\n', + f'.public {old_symbol.name}\n', + ] else: - for search_string in src_search_function_strings: - src_contents = src_contents.replace(search_string[0], search_string[1]) - with open(file_path, 'w') as src_file: - src_file.write(src_contents) + asm_search_string_bases = [ + f'arm_func_start {old_symbol.name}\n', + f'arm_func_end {old_symbol.name}\n', + f'\n{old_symbol.name}: ', + f'thumb_func_start {old_symbol.name}\n', + f'thumb_func_end {old_symbol.name}\n', + f'.word {old_symbol.name}\n', + f'b {old_symbol.name} ; case', + f'bl {old_symbol.name}\n', + f'blx {old_symbol.name}\n', + f'beq {old_symbol.name}\n', + f'bne {old_symbol.name}\n', + f'; ={old_symbol.name}\n', + f'.public {old_symbol.name}\n', + ] + asm_search_strings = [(base, base.replace(old_symbol.name, symbol.name)) for base in asm_search_string_bases] + candidate_asm_files = asm_files + if section_name == 'arm7': + candidate_asm_files = asm_arm7_files + for file_path in candidate_asm_files: + with open(file_path, 'r') as asm_file: + asm_contents = asm_file.read() + for search_string in asm_search_strings: + asm_contents = asm_contents.replace(search_string[0], search_string[1]) + if file_path.endswith('.inc') and 'macros' not in file_path: + asm_contents_split = asm_contents.split('\n') + sorted_imports = sorted(asm_contents_split[1:], key=str.casefold) + if len(sorted_imports) and sorted_imports[0] == '': + sorted_imports = sorted_imports[1:] + asm_contents = '#pragma once\n' + '\n'.join(sorted_imports) + '\n' + + with open(file_path, 'w') as asm_file: + asm_file.write(asm_contents) + + src_search_string_data_regex = re.compile(fr'([ &*(]){old_symbol.name}([,); [])') + src_search_string_data_regex_replace = fr'\1{symbol.name}\2' + + src_search_string_bases = [ + f' {old_symbol.name}(', + f'({old_symbol.name}(', + ] + src_search_function_strings = [(base, base.replace(old_symbol.name, symbol.name)) for base in src_search_string_bases] + for file_path in src_files: + with open(file_path, 'r') as src_file: + src_contents = src_file.read() + if symbol.is_data: + src_contents = src_search_string_data_regex.sub(src_search_string_data_regex_replace, src_contents) + else: + for search_string in src_search_function_strings: + src_contents = src_contents.replace(search_string[0], search_string[1]) + with open(file_path, 'w') as src_file: + src_file.write(src_contents) diff --git a/tools/sync_pmdsky_debug/xmap_reader.py b/tools/sync_pmdsky_debug/xmap_reader.py index 6e3dafa7..bf2dfd88 100644 --- a/tools/sync_pmdsky_debug/xmap_reader.py +++ b/tools/sync_pmdsky_debug/xmap_reader.py @@ -4,13 +4,30 @@ from typing import Dict from symbol_details import SymbolDetails HEADER_FOLDER = 'include' -XMAP_PATH = os.path.join('build', 'pmdsky.us', 'main.nef.xMAP') XMAP_PATH_ARM7 = os.path.join('sub', 'build', 'arm7.nef.xMAP') MAIN_LSF_PATH = 'main.lsf' -REMOTE_XMAP_URL = 'https://raw.githubusercontent.com/pret/pmd-sky/xmap/pmdskyus.xMAP' -# In the returned dictionary, outer key = region, inner key = symbol address, value = symbol details. -def read_xmap_symbols() -> Dict[str, Dict[int, SymbolDetails]]: +""" +Dictionary format: +{ + : { + : { + : { + Symbol details + } + } + } +} +""" +def read_xmap_symbols() -> Dict[str, Dict[str, Dict[int, SymbolDetails]]]: + xmap_symbols: Dict[str, Dict[str, Dict[int, SymbolDetails]]] = {} + for language in ['us', 'eu']: + xmap_symbols[language] = read_xmap_symbols_for_language(language) + return xmap_symbols + +def read_xmap_symbols_for_language(language: str) -> Dict[str, Dict[int, SymbolDetails]]: + xmap_path = os.path.join('build', f'pmdsky.{language}', 'main.nef.xMAP') + remote_xmap_url = f'https://raw.githubusercontent.com/pret/pmd-sky/xmap/pmdsky{language}.xMAP' xmap_symbols: Dict[str, Dict[int, SymbolDetails]] = {} overlay_names: Dict[str, int] = {} OVERLAY_START = 'Overlay ' @@ -21,17 +38,17 @@ def read_xmap_symbols() -> Dict[str, Dict[int, SymbolDetails]]: SECTION_START = '# .' - if os.path.exists(XMAP_PATH): + if os.path.exists(xmap_path): print('Using local xMAP file.') - with open(XMAP_PATH, 'r') as xmap_file: + with open(xmap_path, 'r') as xmap_file: xmap_lines = xmap_file.readlines() else: print('No local xMAP file found. Using remote xMAP file from upstream repo.') - remote_xmap_response = requests.get(REMOTE_XMAP_URL) + remote_xmap_response = requests.get(remote_xmap_url) if remote_xmap_response.status_code == 200: xmap_lines = remote_xmap_response.text.split('\n') else: - raise Exception(f'Received error {remote_xmap_response.status_code} from {REMOTE_XMAP_URL}') + raise Exception(f'Received error {remote_xmap_response.status_code} from {remote_xmap_url}') def read_xmap_file(xmap_lines): current_section = None