diff --git a/asm/include/main_02054C24.inc b/asm/include/main_02054C24.inc index 3e17ba5d..70b5c62a 100644 --- a/asm/include/main_02054C24.inc +++ b/asm/include/main_02054C24.inc @@ -213,6 +213,7 @@ .public DEF_SCARF_STAT_BOOST .public DeleteWanTableEntryVeneer .public DEMO_TEAMS +.public DrawTextInWindow .public DRIVER_WORK .public DUNGEON_SWAP_ID_TABLE .public DungeonGoesUp @@ -488,7 +489,6 @@ .public sub_0202568C .public sub_02025888 .public sub_02025AD8 -.public sub_02026214 .public sub_02026268 .public sub_02026358 .public sub_020264F8 diff --git a/asm/include/overlay_00.inc b/asm/include/overlay_00.inc index 42d4e1ff..16d75b25 100644 --- a/asm/include/overlay_00.inc +++ b/asm/include/overlay_00.inc @@ -23,6 +23,7 @@ .public EnableIrqFlag .public FileInit .public GetDebugFlag +.public GetFadeStatus .public GetLanguage .public GetProcessorMode .public LoadOverlay @@ -101,7 +102,6 @@ .public sub_0200BB74 .public sub_0200BC54 .public sub_0200BD14 -.public sub_0200BD2C .public sub_02017A68 .public sub_02017A80 .public sub_02017ACC diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index 9557fd59..0deaf54c 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -29,6 +29,7 @@ .public CreateTextBox .public DebugPrint0 .public DeleteWanTableEntryVeneer +.public DrawTextInWindow .public EnableIrqFlag .public FemaleToMaleForm .public GetAdvancedMenuCurrentOption @@ -273,7 +274,6 @@ .public sub_02025480 .public sub_02025888 .public sub_02025D50 -.public sub_02026214 .public sub_02026268 .public sub_0202676C .public sub_0202737C diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc index 49853f60..da8fb3a1 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03.inc @@ -10,6 +10,7 @@ .public CreateAdvancedTextBox .public CreateScrollBoxSingle .public DebugPrint0 +.public DrawTextInWindow .public GetAdvancedMenuCurrentOption .public GetAdvancedMenuResult .public GetHeldButtons @@ -127,7 +128,6 @@ .public sub_02010154 .public sub_02025404 .public sub_0202561C -.public sub_02026214 .public sub_0202836C .public sub_02029F88 .public sub_02029FBC diff --git a/asm/include/overlay_05.inc b/asm/include/overlay_05.inc index df657e9f..4bcc5148 100644 --- a/asm/include/overlay_05.inc +++ b/asm/include/overlay_05.inc @@ -1,6 +1,7 @@ #pragma once .public CloseAdvancedMenu .public CreateAdvancedMenu +.public DrawTextInWindow .public GetAdvancedMenuCurrentOption .public GetAdvancedMenuResult .public GetAdventureLogDungeonFloor @@ -73,7 +74,6 @@ .public sub_02003BC8 .public sub_02003BFC .public sub_02006C8C -.public sub_02026214 .public sub_02027AF0 .public sub_0202836C .public sub_02029F88 diff --git a/asm/include/overlay_07.inc b/asm/include/overlay_07.inc index e4497349..ab4dde09 100644 --- a/asm/include/overlay_07.inc +++ b/asm/include/overlay_07.inc @@ -6,6 +6,7 @@ .public CreateCollectionMenu .public CreateOptionsMenu .public CreateTextBox +.public DrawTextInWindow .public GetKeyboardStatus .public GetKeyboardStringResult .public GetLanguageType @@ -113,7 +114,6 @@ .public sub_02003BC8 .public sub_02003BFC .public sub_0202065C -.public sub_02026214 .public sub_020264F8 .public sub_02027AF0 .public sub_02027B1C diff --git a/asm/include/overlay_09.inc b/asm/include/overlay_09.inc index d9769c35..c5aacf40 100644 --- a/asm/include/overlay_09.inc +++ b/asm/include/overlay_09.inc @@ -3,6 +3,7 @@ .public CloseDialogueBox .public CreateDialogueBox .public DeleteWindow +.public DrawTextInWindow .public GetPressedButtons .public GetStringFromFileVeneer .public GetWindowContents @@ -38,7 +39,6 @@ .public sub_02017B18 .public sub_02017B70 .public sub_02017B7C -.public sub_02026214 .public sub_020263C8 .public sub_020265A8 .public sub_02027AF0 diff --git a/asm/include/overlay_10.inc b/asm/include/overlay_10.inc index a630e9da..b5af6787 100644 --- a/asm/include/overlay_10.inc +++ b/asm/include/overlay_10.inc @@ -7,6 +7,7 @@ .public BAG_ITEMS_PTR_MIRROR .public CalcMenuHeightDiv8__020329E4 .public CleanStickyItemsInBag +.public ClearWindow .public ClosePortraitBox .public CloseTextBox .public CloseTextBox2 @@ -157,6 +158,7 @@ .public DoMoveWillOWisp .public DoMoveWrap .public DoMoveYawn +.public DrawTextInWindow .public ExplorersOfSkyMain .public GendersEqual .public GetBgRegionArea @@ -209,7 +211,6 @@ .public ov29_022EA428 .public ov29_0234C584 .public ov29_0234C5EC -.public ov29_0234C668 .public PreprocessString .public ProcessWte .public Rand16Bit @@ -226,6 +227,7 @@ .public SetPortraitOffset .public SetSpriteIdForAnimationControl .public ShowPortraitInPortraitBox +.public StartFadeDungeonWrapper .public strcmp .public strcpy .public sub_02001808 @@ -258,12 +260,10 @@ .public sub_0201F2A0 .public sub_0201F598 .public sub_02025010_EU -.public sub_02026214 .public sub_020263C8 .public sub_020265A8 .public sub_02027AF0 .public sub_02027B1C -.public sub_02027B58 .public sub_0202810C .public sub_0202812C .public sub_0202830C diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index b871d38d..3eb25278 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -61,6 +61,8 @@ .public DecompressAtNormalVeneer .public DeleteWanTableEntryVeneer .public DeleteWindow +.public DrawTeamStats +.public DrawTextInWindow .public DungeonMoveToGroundMove .public DungeonRequestsDoneWrapper .public DungeonSwapIdxToId @@ -78,6 +80,7 @@ .public FileOpen .public FileRead .public FileSeek +.public FreeTeamStats .public GenerateDailyMissions .public GenerateKecleonItems1 .public GenerateKecleonItems2 @@ -96,6 +99,7 @@ .public GetDungeonModeSpecial .public GetExclusiveItemType .public GetExecuteSpecialEpisodeType +.public GetFadeStatus .public GetFirstEmptyMemberIdx .public GetFirstUnequippedItemOfType .public GetGameMode @@ -220,11 +224,8 @@ .public ov10_022C0814 .public ov10_022C096C .public ov10_022C0998 -.public ov10_022C09E8 -.public ov10_022C0CE0 .public ov10_022C11D8 .public ov10_022C1398 -.public ov10_022C13B4 .public ov10_022C1D40 .public ov10_022C1D78 .public ov10_022C2300 @@ -440,7 +441,6 @@ .public sub_0200BC60 .public sub_0200BCB0 .public sub_0200BD14 -.public sub_0200BD2C .public sub_0200BD50 .public sub_0200CF6C .public sub_0200D310 @@ -517,7 +517,6 @@ .public sub_0201F36C .public sub_0201F464 .public sub_020236FC -.public sub_02026214 .public sub_02026268 .public sub_020262E0 .public sub_020265A8 @@ -809,6 +808,7 @@ .public TRIG_TABLE .public UnloadFile .public UnloadOverlay +.public UpdateTeamStats .public vsprintf .public WAN_TABLE .public ZInit8 diff --git a/asm/include/overlay_13.inc b/asm/include/overlay_13.inc index 686500fe..66460500 100644 --- a/asm/include/overlay_13.inc +++ b/asm/include/overlay_13.inc @@ -10,6 +10,7 @@ .public CreatePortraitBox .public CreateSimpleMenuFromStringIds .public CreateTextBox +.public DrawTextInWindow .public FemaleToMaleForm .public GetAdvancedMenuCurrentOption .public GetAdvancedMenuResult @@ -59,7 +60,6 @@ .public sub_02017C74 .public sub_02017CB4 .public sub_0201F2E4 -.public sub_02026214 .public sub_02027AF0 .public sub_02027B1C .public sub_0202836C diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc index 62ee6943..a9101ce1 100644 --- a/asm/include/overlay_14.inc +++ b/asm/include/overlay_14.inc @@ -2,6 +2,7 @@ .public _s32_div_f .public AnimRelatedFunction__022F6F14 .public AnimRelatedFunction__022F7064 +.public ClearWindow .public CloseAdvancedMenu .public CloseDialogueBox .public ClosePortraitBox @@ -13,6 +14,7 @@ .public CreateSimpleMenuFromStringIds .public CreateTextBox .public DebugPrint0 +.public DrawTextInWindow .public FemaleToMaleForm .public GetHero .public GetHeroMemberIdx @@ -62,9 +64,7 @@ .public sub_02017B70 .public sub_02017B7C .public sub_02017C80 -.public sub_02026214 .public sub_02027AF0 -.public sub_02027B58 .public sub_0202BC60 .public sub_0202F334 .public sub_0202F954 diff --git a/asm/include/overlay_15.inc b/asm/include/overlay_15.inc index 22c24d7f..667b09bf 100644 --- a/asm/include/overlay_15.inc +++ b/asm/include/overlay_15.inc @@ -12,6 +12,7 @@ .public CreateSimpleMenuFromStringIds .public CreateTextBox .public DebugPrint0 +.public DrawTextInWindow .public GetMoneyCarried .public GetMoneyStored .public GetSimpleMenuResult @@ -33,7 +34,6 @@ .public ShowPortraitInPortraitBox .public ShowStringIdInDialogueBox .public sub_02017C80 -.public sub_02026214 .public sub_02026268 .public sub_02027AF0 .public sub_02027B1C diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc index 50f94ce3..9b235c5b 100644 --- a/asm/include/overlay_18.inc +++ b/asm/include/overlay_18.inc @@ -12,6 +12,7 @@ .public CreatePortraitBox .public CreateSimpleMenuFromStringIds .public CreateTextBox +.public DrawTextInWindow .public GetAdvancedMenuCurrentOption .public GetAdvancedMenuResult .public GetEncodedHalfword @@ -49,7 +50,6 @@ .public StrncpySimpleNoPadSafe .public sub_02017C74 .public sub_02017C80 -.public sub_02026214 .public sub_02026268 .public sub_02027AF0 .public sub_02027B1C diff --git a/asm/include/overlay_20.inc b/asm/include/overlay_20.inc index d100af81..a6b19dff 100644 --- a/asm/include/overlay_20.inc +++ b/asm/include/overlay_20.inc @@ -14,6 +14,7 @@ .public CreateSimpleMenu .public CreateSimpleMenuFromStringIds .public CreateTextBoxWithArg +.public DrawTextInWindow .public GetItemAtIdx .public GetSimpleMenuField0x1A4 .public GetSimpleMenuResult @@ -76,7 +77,6 @@ .public sub_02017C10 .public sub_02017C50 .public sub_02025D50 -.public sub_02026214 .public sub_02027AF0 .public sub_02027B1C .public sub_0202A03C diff --git a/asm/include/overlay_21.inc b/asm/include/overlay_21.inc index db4f64cf..952cc639 100644 --- a/asm/include/overlay_21.inc +++ b/asm/include/overlay_21.inc @@ -13,6 +13,7 @@ .public CreateSimpleMenuFromStringIds .public CreateTextBox .public DebugPrint0 +.public DrawTextInWindow .public GetMoneyCarried .public GetPressedButtons .public GetSimpleMenuResult @@ -70,7 +71,6 @@ .public sub_02013150 .public sub_02017C74 .public sub_02017C80 -.public sub_02026214 .public sub_02026268 .public sub_02027AF0 .public sub_02027B1C diff --git a/asm/include/overlay_25.inc b/asm/include/overlay_25.inc index 7a6eb1b2..66ad4a5f 100644 --- a/asm/include/overlay_25.inc +++ b/asm/include/overlay_25.inc @@ -12,6 +12,7 @@ .public CreateScrollBoxSingle .public CreateSimpleMenuFromStringIds .public CreateTextBox +.public DrawTextInWindow .public GetMoneyCarried .public GetNbItemsInBag .public GetPressedButtons @@ -47,7 +48,6 @@ .public sub_0200D670 .public sub_02017C74 .public sub_02017C80 -.public sub_02026214 .public sub_02026268 .public sub_02027AF0 .public sub_02027B1C diff --git a/asm/include/overlay_28.inc b/asm/include/overlay_28.inc index fde0cb60..eec985ad 100644 --- a/asm/include/overlay_28.inc +++ b/asm/include/overlay_28.inc @@ -1,4 +1,5 @@ #pragma once +.public DrawTextInWindow .public GetStringFromFileVeneer .public MemAlloc .public MemFree @@ -9,7 +10,6 @@ .public sub_02025B80 .public sub_02025B90 .public sub_02025C14 -.public sub_02026214 .public sub_02027170 .public sub_02027228 .public sub_0202810C diff --git a/asm/include/overlay_29_022DC240.inc b/asm/include/overlay_29_022DC240.inc index 355cc82d..cba8bf4b 100644 --- a/asm/include/overlay_29_022DC240.inc +++ b/asm/include/overlay_29_022DC240.inc @@ -3,6 +3,7 @@ .public _020AFC70 .public _s32_div_f .public AllocAndLoadFileInPack +.public AllocTopScreenStatus .public ChangeGiratinaFormIfSkyDungeon .public ClearHiddenStairs .public CloseFixedBin @@ -11,8 +12,10 @@ .public DeleteAllMonsterSpriteFiles .public DetermineAllTilesWalkableNeighbors .public DIRECTIONS_XY +.public DisplayFloorCard .public DisplayMessage .public DisplayMessage2 +.public DrawTeamStats .public DUNGEON_PTR .public DungeonGoesUp .public DungeonRandInt @@ -22,6 +25,9 @@ .public FadeToBlack .public FIXED_ROOM_REVISIT_OVERRIDES .public FreeLoadedAttackSpriteAndMore +.public FreeMapAndTeam +.public FreeTeamStats +.public FreeTopScreenStatus .public GenerateDungeonRngSeed .public GenerateFloor .public GetApparentWeather @@ -67,14 +73,10 @@ .public ov10_022C0814 .public ov10_022C096C .public ov10_022C0998 -.public ov10_022C09E8 -.public ov10_022C0CE0 .public ov10_022C0F6C .public ov10_022C11D8 -.public ov10_022C13B4 .public ov10_022C14D0 .public ov10_022C159C -.public ov10_022C16D8 .public ov10_022C22A0 .public ov29_022E0434 .public ov29_022E081C @@ -96,8 +98,6 @@ .public ov29_022E6E40 .public ov29_022E6F94 .public ov29_022E7CFC -.public ov29_022E7EC4 -.public ov29_022E7F44 .public ov29_022E7F7C .public ov29_022E8104 .public ov29_022E8708 @@ -194,7 +194,6 @@ .public ov29_02346DA4 .public ov29_02346E48 .public ov29_023480FC -.public ov29_023482D4 .public ov29_023484A0 .public ov29_02348850 .public ov29_02348894 @@ -221,7 +220,6 @@ .public ov29_0234C584 .public ov29_0234C5EC .public ov29_0234C654 -.public ov29_0234C668 .public ov29_0234C738 .public ov29_0234CA84 .public ov29_0234CB34 @@ -277,6 +275,7 @@ .public SpawnInitialMonsters .public SpawnShopkeepers .public SpawnTeam +.public StartFadeDungeonWrapper .public sub_01FF8130 .public sub_01FF81CC .public sub_01FF8C60 @@ -340,4 +339,5 @@ .public UpdateMinimap .public UpdateShouldBoostHiddenStairsSpawnChance .public UpdateShouldBoostKecleonShopSpawnChance +.public UpdateTeamStats .public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_022E0378.inc b/asm/include/overlay_29_022E0378.inc index 0ad12e79..d2a7afd9 100644 --- a/asm/include/overlay_29_022E0378.inc +++ b/asm/include/overlay_29_022E0378.inc @@ -55,7 +55,6 @@ .public ov29_0234B034 .public ov29_0234B0B4 .public ov29_0234B1A4 -.public ov29_0234C668 .public ov29_0234C738 .public ov29_023510E0 .public ov29_02353540 @@ -73,6 +72,7 @@ .public SECONDARY_TERRAIN_TYPES .public SetMinimapDataE447 .public SetMoneyCarried +.public StartFadeDungeonWrapper .public sub_020063F4 .public sub_02006564 .public sub_02006BFC diff --git a/asm/include/overlay_29_022E37DC.inc b/asm/include/overlay_29_022E37DC.inc index 37c5a0da..94a1b717 100644 --- a/asm/include/overlay_29_022E37DC.inc +++ b/asm/include/overlay_29_022E37DC.inc @@ -11,6 +11,7 @@ .public CreateTextBox .public DIRECTIONS_XY .public DisplayAnimatedNumbers +.public DrawTextInWindow .public DUNGEON_PTR .public DungeonFloorToGroupFloor .public DungeonGetSpriteIndex @@ -103,7 +104,6 @@ .public ov29_02349378 .public ov29_0234B1A4 .public ov29_0234B4E0 -.public ov29_0234C668 .public ov29_0234C70C .public ov29_0234F25C .public ov29_0234F278 @@ -127,7 +127,6 @@ .public ov29_02351604 .public ov29_0235352C .public ov29_0235354C -.public ov29_02353554 .public ov29_02353558 .public ov29_0237C850 .public ov29_0237C888 @@ -141,6 +140,7 @@ .public SetMinimapDataE448 .public SetMonsterId .public ShouldDisplayEntityWrapper +.public StartFadeDungeonWrapper .public STATUS_ICON_ARRAY_BIDE .public STATUS_ICON_ARRAY_BLINDED .public STATUS_ICON_ARRAY_BURN @@ -163,7 +163,6 @@ .public sub_0201C000 .public sub_0201CF90 .public sub_0201D034 -.public sub_02026214 .public sub_02027AF0 .public sub_02048384 .public sub_020483B8 @@ -172,5 +171,6 @@ .public sub_0204AEA0 .public sub_0204AF58 .public SubstitutePlaceholderStringTags +.public TOP_SCREEN_STATUS_PTR .public UnloadFile .public UpdateMinimap diff --git a/asm/include/overlay_29_022E9618.inc b/asm/include/overlay_29_022E9618.inc index 355b589b..115c1b6a 100644 --- a/asm/include/overlay_29_022E9618.inc +++ b/asm/include/overlay_29_022E9618.inc @@ -13,6 +13,7 @@ .public EntityIsValid__022E95F4 .public GetLeader .public GetTile +.public HandleTopScreenFades .public InitWeirdMinimapMatrix .public MemAlloc .public MemFree @@ -23,7 +24,6 @@ .public ov29_022DE638 .public ov29_022E1854 .public ov29_022E335C -.public ov29_022E886C .public ov29_022E8C10 .public ov29_022ED800 .public ov29_02300818 diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc index 906be010..fa0be144 100644 --- a/asm/include/overlay_29_022F05B4.inc +++ b/asm/include/overlay_29_022F05B4.inc @@ -17,6 +17,7 @@ .public CloseTextBox .public CreateTextBox .public DIRECTIONS_XY +.public DrawTextInWindow .public DrawTileGrid .public DUNGEON_PTR .public DungeonRandInt @@ -184,7 +185,6 @@ .public sub_02017C80 .public sub_0201B9F8 .public sub_0201CF90 -.public sub_02026214 .public sub_02026268 .public sub_02027AF0 .public sub_02027B1C diff --git a/asm/include/overlay_29_02328030.inc b/asm/include/overlay_29_02328030.inc index 09241e67..65de6357 100644 --- a/asm/include/overlay_29_02328030.inc +++ b/asm/include/overlay_29_02328030.inc @@ -68,7 +68,6 @@ .public ov29_02337E2C .public ov29_0234B034 .public ov29_0234B084 -.public ov29_0234C668 .public ov29_0234C738 .public ov29_02352B18 .public ov29_0237CA6B @@ -84,6 +83,7 @@ .public SOLARBEAM_DAMAGE_MULTIPLIER .public SONICBOOM_FIXED_DAMAGE .public SPATK_STAT_IDX +.public StartFadeDungeonWrapper .public StringFromId .public SubstitutePlaceholderStringTags .public THUNDERBOLT_PARALYZE_CHANCE diff --git a/asm/include/overlay_29_02337CCC.inc b/asm/include/overlay_29_02337CCC.inc index 2b872d8a..fb0958c0 100644 --- a/asm/include/overlay_29_02337CCC.inc +++ b/asm/include/overlay_29_02337CCC.inc @@ -124,7 +124,6 @@ .public ov29_02348BE8 .public ov29_0234B09C .public ov29_0234B1A4 -.public ov29_0234C668 .public ov29_0234C738 .public ov29_023502F0 .public ov29_023502F4 @@ -163,6 +162,7 @@ .public SpawnEnemyTrapAtPos .public SpawnItem .public SpawnMonster +.public StartFadeDungeonWrapper .public sub_020018D0 .public sub_0200A174 .public sub_0200B330 diff --git a/asm/include/overlay_29_02347BC8.inc b/asm/include/overlay_29_02347BC8.inc index 2f294bc4..d1c432ea 100644 --- a/asm/include/overlay_29_02347BC8.inc +++ b/asm/include/overlay_29_02347BC8.inc @@ -16,6 +16,7 @@ .public GenerateMissionEggMonster .public GetAcceptedMission .public GetBgRegionArea +.public GetCurrentHiddenStairsType .public GetForcedLossReason .public GetLeader .public GetMaxPp @@ -47,7 +48,6 @@ .public ov29_023009CC .public ov29_02304A84 .public ov29_02307BDC -.public ov29_023386B0 .public ov29_02344B44 .public ov29_02344B70 .public ov29_02344B9C @@ -63,11 +63,11 @@ .public ov29_0234B06C .public ov29_0234B0B4 .public ov29_0234B4CC -.public ov29_0234C668 .public ov29_0234C738 .public ov29_023537C4 .public ov29_0237C694 .public SpawnDroppedItem +.public StartFadeDungeonWrapper .public strcpy .public sub_020018D0 .public sub_02011220 diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc index 12cc651e..c3e787d5 100644 --- a/asm/include/overlay_29_023498A0.inc +++ b/asm/include/overlay_29_023498A0.inc @@ -14,6 +14,7 @@ .public CreateParentMenuFromStringIds .public CreatePortraitBox .public DebugPrint0 +.public DUNGEON_FADES_PTR .public DUNGEON_PTR .public DungeonAlloc .public DungeonFree @@ -172,7 +173,6 @@ .public ov29_023537C8 .public ov29_023537CC .public ov29_023537D8 -.public ov29_023537E0 .public ov29_023537E4 .public ov29_023537E8 .public ov29_0237C694 diff --git a/asm/include/overlay_29_0234EC38.inc b/asm/include/overlay_29_0234EC38.inc index 7272a5c4..a6481d46 100644 --- a/asm/include/overlay_29_0234EC38.inc +++ b/asm/include/overlay_29_0234EC38.inc @@ -10,6 +10,7 @@ .public CreateParentMenuFromStringIds .public CreateTextBox .public DisplayMessage +.public DrawTextInWindow .public DungeonGoesUp .public DungeonRequestsDoneWrapper .public EntityIsValid__0234EC14 @@ -97,7 +98,6 @@ .public StrncpySimple .public StrncpySimpleNoPadSafe .public sub_0200B3D4 -.public sub_02026214 .public sub_020282F4 .public sub_0202AB80 .public sub_0202ABB0 diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index 27de401d..2f06292c 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -34,6 +34,7 @@ .public DebugPrint0 .public DisableDungeonSubMenuOption .public DisplayMessage +.public DrawTextInWindow .public DrawTileGrid .public DUNGEON_PTR .public FormatMoveString @@ -185,7 +186,6 @@ .public sub_02017C74 .public sub_02017C80 .public sub_02025888 -.public sub_02026214 .public sub_020265A8 .public sub_02027AF0 .public sub_02027B1C diff --git a/asm/include/overlay_34.inc b/asm/include/overlay_34.inc index 177a21c5..ed986016 100644 --- a/asm/include/overlay_34.inc +++ b/asm/include/overlay_34.inc @@ -5,6 +5,7 @@ .public CreateDialogueBox .public CreateParentMenuFromStringIds .public GetDebugFlag +.public GetFadeStatus .public IsDialogueBoxActive .public IsParentMenuActive .public MemAlloc @@ -31,7 +32,6 @@ .public sub_0200BB74 .public sub_0200BC54 .public sub_0200BD14 -.public sub_0200BD2C .public sub_02017A68 .public sub_02017A80 .public sub_02017B70 diff --git a/asm/main_02000C6C.s b/asm/main_02000C6C.s index ddbe76d6..3a1ad526 100644 --- a/asm/main_02000C6C.s +++ b/asm/main_02000C6C.s @@ -13657,8 +13657,8 @@ _0200B958: bx lr arm_func_end sub_0200B928 - arm_func_start sub_0200B990 -sub_0200B990: ; 0x0200B990 + arm_func_start UpdateFadeStatus +UpdateFadeStatus: ; 0x0200B990 ldr r3, _0200BA00 ; =_02094AE8 mov ip, r1, lsl #1 ldrsh r3, [r3, ip] @@ -13691,10 +13691,10 @@ _0200B9D4: .align 2, 0 _0200BA00: .word _02094AE8 _0200BA04: .word _02094AF0 - arm_func_end sub_0200B990 + arm_func_end UpdateFadeStatus - arm_func_start sub_0200BA08 -sub_0200BA08: ; 0x0200BA08 + arm_func_start HandleFades +HandleFades: ; 0x0200BA08 stmdb sp!, {r4, lr} mov r4, r0 ldr r0, [r4, #4] @@ -13793,7 +13793,7 @@ _0200BB50: _0200BB58: mov r0, #0 ldmia sp!, {r4, pc} - arm_func_end sub_0200BA08 + arm_func_end HandleFades arm_func_start sub_0200BB60 sub_0200BB60: ; 0x0200BB60 @@ -13807,12 +13807,12 @@ _0200BB70: .word sub_0200B928 arm_func_start sub_0200BB74 sub_0200BB74: ; 0x0200BB74 - ldr ip, _0200BB84 ; =sub_0200B990 + ldr ip, _0200BB84 ; =UpdateFadeStatus mov r3, #1 str r3, [r0] bx ip .align 2, 0 -_0200BB84: .word sub_0200B990 +_0200BB84: .word UpdateFadeStatus arm_func_end sub_0200BB74 arm_func_start sub_0200BB88 @@ -13878,10 +13878,10 @@ _0200BC40: arm_func_start sub_0200BC54 sub_0200BC54: ; 0x0200BC54 - ldr ip, _0200BC5C ; =sub_0200BA08 + ldr ip, _0200BC5C ; =HandleFades bx ip .align 2, 0 -_0200BC5C: .word sub_0200BA08 +_0200BC5C: .word HandleFades arm_func_end sub_0200BC54 arm_func_start sub_0200BC60 @@ -13902,7 +13902,7 @@ _0200BC70: cmpne r1, #0xb bne _0200BCA4 mov r1, #2 - bl sub_0200B990 + bl UpdateFadeStatus ldmia sp!, {r4, pc} _0200BCA4: mov r1, r2 @@ -13924,7 +13924,7 @@ _0200BCC0: cmp r1, #1 bne _0200BCE4 mov r1, #1 - bl sub_0200B990 + bl UpdateFadeStatus ldmia sp!, {r4, pc} _0200BCE4: cmp r1, #3 @@ -13938,7 +13938,7 @@ _0200BCE4: ldmia sp!, {r4, pc} _0200BD08: mov r1, #2 - bl sub_0200B990 + bl UpdateFadeStatus ldmia sp!, {r4, pc} arm_func_end sub_0200BCB0 @@ -13952,8 +13952,8 @@ sub_0200BD14: ; 0x0200BD14 bx lr arm_func_end sub_0200BD14 - arm_func_start sub_0200BD2C -sub_0200BD2C: ; 0x0200BD2C + arm_func_start GetFadeStatus +GetFadeStatus: ; 0x0200BD2C ldrsh r1, [r0, #0x10] mvn r0, #0xff cmp r1, r0 @@ -13963,7 +13963,7 @@ sub_0200BD2C: ; 0x0200BD2C moveq r0, #2 movne r0, #0 bx lr - arm_func_end sub_0200BD2C + arm_func_end GetFadeStatus arm_func_start sub_0200BD50 sub_0200BD50: ; 0x0200BD50 @@ -13976,7 +13976,7 @@ sub_0200BD50: ; 0x0200BD50 cmpeq r0, #0 beq _0200C000 mov r0, r4 - bl sub_0200BA08 + bl HandleFades cmp r0, #0 beq _0200BF90 ldr r0, [r4] diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index a5a4a358..51246e0d 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -118,7 +118,7 @@ sub_0200C5DC: ; 0x0200C5DC mov r0, r6 mov r1, #4 mov r2, #0x10 - bl sub_02026214 + bl DrawTextInWindow add r1, r5, #0x1e add r0, r5, #0x3c str r1, [sp, #0x40] @@ -157,7 +157,7 @@ _0200C6BC: mov r0, r6 mov r1, r1, asr #1 mov r2, #0x1a - bl sub_02026214 + bl DrawTextInWindow ldrsh r0, [r5, #0x5a] add r1, sp, #0x54 add r3, sp, #4 @@ -171,7 +171,7 @@ _0200C6BC: mov r0, r6 mov r2, #0x24 add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow ldr r1, [r5, #0x64] ldr r0, _0200CA24 ; =0x000009CF str r1, [sp, #0x28] @@ -189,7 +189,7 @@ _0200C6BC: mov r1, #4 mov r2, #0x34 add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow ldrsh r1, [r5, #0x68] mov r0, #0x9d0 str r1, [sp, #0x28] @@ -205,7 +205,7 @@ _0200C6BC: mov r1, #4 mov r2, #0x3e add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow ldrb r2, [r5, #0x6a] str r2, [sp, #0x28] ldrb r0, [r5, #0x6c] @@ -240,7 +240,7 @@ _0200C810: mov r0, r6 mov r1, #4 mov r2, #0x48 - bl sub_02026214 + bl DrawTextInWindow ldrb r2, [r5, #0xab] cmp r2, #0 beq _0200C864 @@ -272,7 +272,7 @@ _0200C888: mov r0, r6 mov r1, #4 mov r2, #0x48 - bl sub_02026214 + bl DrawTextInWindow ldrb r2, [r5, #0x6b] str r2, [sp, #0x28] ldrb r0, [r5, #0x6d] @@ -307,7 +307,7 @@ _0200C90C: mov r0, r6 mov r1, #4 mov r2, #0x52 - bl sub_02026214 + bl DrawTextInWindow ldrb r2, [r5, #0xac] cmp r2, #0 beq _0200C960 @@ -339,7 +339,7 @@ _0200C984: mov r0, r6 mov r1, #4 mov r2, #0x52 - bl sub_02026214 + bl DrawTextInWindow ldrb r0, [r5, #0x5e] tst r0, #1 movne r0, #1 @@ -370,7 +370,7 @@ _0200C9F8: mov r0, r6 mov r1, #4 mov r2, #0x62 - bl sub_02026214 + bl DrawTextInWindow add sp, sp, #0x54 add sp, sp, #0x400 ldmia sp!, {r3, r4, r5, r6, pc} @@ -33171,8 +33171,8 @@ sub_02026204: ; 0x02026204 _02026210: .word AnalyzeText arm_func_end sub_02026204 - arm_func_start sub_02026214 -sub_02026214: ; 0x02026214 + arm_func_start DrawTextInWindow +DrawTextInWindow: ; 0x02026214 stmdb sp!, {r3, r4, lr} sub sp, sp, #0x124 mov r4, r0 @@ -33195,7 +33195,7 @@ sub_02026214: ; 0x02026214 ldmia sp!, {r3, r4, pc} .align 2, 0 _02026264: .word 0x0000C402 - arm_func_end sub_02026214 + arm_func_end DrawTextInWindow arm_func_start sub_02026268 sub_02026268: ; 0x02026268 @@ -35197,8 +35197,8 @@ _02027B50: .word _022A88F0 _02027B54: .word _022A88F8 arm_func_end sub_02027B1C - arm_func_start sub_02027B58 -sub_02027B58: ; 0x02027B58 + arm_func_start ClearWindow +ClearWindow: ; 0x02027B58 mov r1, #0xe0 mul r2, r0, r1 ldr r0, _02027B7C ; =_022A88F0 @@ -35212,7 +35212,7 @@ sub_02027B58: ; 0x02027B58 _02027B7C: .word _022A88F0 _02027B80: .word _022A88F8 _02027B84: .word memset - arm_func_end sub_02027B58 + arm_func_end ClearWindow arm_func_start sub_02027B88 sub_02027B88: ; 0x02027B88 @@ -42503,7 +42503,7 @@ _0202DB80: ldrne r3, _0202DC44 ; =_0209AEF4 ldr r1, [r4, #0x1b0] mov r2, r8 - bl sub_02026214 + bl DrawTextInWindow add r0, r5, #0x3e8 cmp r0, fp ldreq r3, _0202DC48 ; =_0209AEFC @@ -42511,7 +42511,7 @@ _0202DB80: ldrne r3, _0202DC4C ; =_0209AF04 ldr r1, [r4, #0x1b4] mov r2, r8 - bl sub_02026214 + bl DrawTextInWindow _0202DC04: add r7, r7, #1 add r5, r5, #1 @@ -45059,7 +45059,7 @@ _0202FDD0: ldr r1, [r6, #0x1b0] ldr r2, [r6, #0x1ac] add r3, r6, #0xac - bl sub_02026214 + bl DrawTextInWindow ldrsb r0, [r5, #0x10] bl sub_02027AF0 mov r0, #2 @@ -49373,7 +49373,7 @@ sub_020334A8: ; 0x020334A8 mov r0, r4 mov r1, #8 mov r2, #0 - bl sub_02026214 + bl DrawTextInWindow _020334FC: mov r0, #0x17 str r0, [sp] @@ -49413,7 +49413,7 @@ _020334FC: mov r2, #0 sub r1, r1, ip add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow _02033598: add sp, sp, #0x154 ldmia sp!, {r4, r5, pc} @@ -49462,7 +49462,7 @@ _02033610: mov r0, r4 mov r1, #8 mov r2, #0 - bl sub_02026214 + bl DrawTextInWindow mov r0, #0x17 str r0, [sp] ldr r2, [r5, #0xc] @@ -49504,7 +49504,7 @@ _02033610: sub r1, r1, r2 mov r0, r4 mov r2, #0 - bl sub_02026214 + bl DrawTextInWindow _020336E8: add sp, sp, #0x154 ldmia sp!, {r4, r5, pc} @@ -49881,7 +49881,7 @@ sub_02033BC0: ; 0x02033BC0 ldreq r3, _02033ED8 ; =_0209AFE4 add r2, r5, #3 mov r1, #4 - bl sub_02026214 + bl DrawTextInWindow add r6, r6, #0x12 _02033C44: ldr r0, [r8, #0x10] @@ -49893,7 +49893,7 @@ _02033C44: ldreq r3, _02033EE0 ; =_0209AFF4 mov r1, r6 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow add r6, r6, #0x14 _02033C70: ldr r0, [r8, #0x10] @@ -49921,7 +49921,7 @@ _02033CB8: ldreq r3, _02033EE8 ; =_0209B004 mov r1, r6 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _02033CD4: mov r0, r8 bl sub_0203293C @@ -49936,7 +49936,7 @@ _02033CEC: ldreq r3, _02033EF0 ; =_0209B014 add r1, r6, #0xe add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _02033D08: mov r0, r8 bl sub_02032918 @@ -49951,7 +49951,7 @@ _02033D20: ldreq r3, _02033EF8 ; =_0209B024 add r1, r6, #0x1f add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _02033D3C: mov r0, r8 bl sub_0203293C @@ -49966,7 +49966,7 @@ _02033D54: ldreq r3, _02033F00 ; =_0209B034 add r1, r6, #0x2d add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _02033D70: add r6, r6, #0x3e _02033D74: @@ -49980,7 +49980,7 @@ _02033D74: mov r0, r7 mov r1, r6 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow b _02033DE0 _02033DA4: tst r1, #0x20000000 @@ -49998,7 +49998,7 @@ _02033DCC: mov r0, r7 mov r1, r6 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _02033DE0: tst r4, #0x80000 beq _02033E00 @@ -50006,7 +50006,7 @@ _02033DE0: mov r0, r7 add r1, r6, #0xe add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow b _02033E40 _02033E00: ldr r0, [r8, #0x10] @@ -50025,7 +50025,7 @@ _02033E2C: mov r0, r7 add r1, r6, #0xe add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _02033E40: ldr r2, [r8, #0xc] ldr r1, [r8, #8] @@ -50041,7 +50041,7 @@ _02033E40: mov r0, r7 mov r1, r6 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _02033E7C: ldr r0, [r8, #0x10] tst r0, #4 @@ -50054,7 +50054,7 @@ _02033E7C: ldreq r3, _02033F24 ; =_0209B074 sub r1, r6, #0x12 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow b _02033ECC _02033EB0: tst r4, #0x10000 @@ -50063,7 +50063,7 @@ _02033EB0: ldreq r3, _02033F2C ; =_0209B084 sub r1, r6, #0x12 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _02033ECC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} @@ -50415,7 +50415,7 @@ sub_02034360: ; 0x02034360 ldreq r3, _0203466C ; =_0209AFE4 add r2, r5, #3 mov r1, #4 - bl sub_02026214 + bl DrawTextInWindow _020343E0: ldr r0, [r8, #0x10] tst r0, #0x4000 @@ -50426,7 +50426,7 @@ _020343E0: ldreq r3, _02034674 ; =_0209AFF4 add r2, r5, #3 mov r1, #0x16 - bl sub_02026214 + bl DrawTextInWindow _02034408: ldr r0, [r8, #0x10] add r6, r6, #0x26 @@ -50454,7 +50454,7 @@ _02034454: ldreq r3, _0203467C ; =_0209B004 mov r1, r6 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _02034470: mov r0, r8 bl sub_020333B4 @@ -50469,7 +50469,7 @@ _02034488: ldreq r3, _02034684 ; =_0209B014 add r1, r6, #0xe add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _020344A4: mov r0, r8 bl sub_02033390 @@ -50484,7 +50484,7 @@ _020344BC: ldreq r3, _0203468C ; =_0209B024 add r1, r6, #0x1f add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _020344D8: mov r0, r8 bl sub_020333B4 @@ -50499,7 +50499,7 @@ _020344F0: ldreq r3, _02034694 ; =_0209B034 add r1, r6, #0x2d add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _0203450C: add r6, r6, #0x3e _02034510: @@ -50513,7 +50513,7 @@ _02034510: mov r0, r7 mov r1, r6 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow b _0203457C _02034540: tst r1, #0x20000000 @@ -50531,7 +50531,7 @@ _02034568: mov r0, r7 mov r1, r6 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _0203457C: tst r4, #0x80000 beq _0203459C @@ -50539,7 +50539,7 @@ _0203457C: mov r0, r7 add r1, r6, #0xe add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow b _020345DC _0203459C: ldr r0, [r8, #0x10] @@ -50558,7 +50558,7 @@ _020345C8: mov r0, r7 add r1, r6, #0xe add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _020345DC: ldr r2, [r8, #0xc] ldr r1, [r8, #8] @@ -50574,7 +50574,7 @@ _020345DC: mov r0, r7 mov r1, r6 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _02034618: ldr r0, [r8, #0x10] tst r0, #4 @@ -50585,7 +50585,7 @@ _02034618: mov r0, r7 sub r1, r6, #0x12 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow b _02034660 _02034644: tst r4, #0x10000 @@ -50594,7 +50594,7 @@ _02034644: ldreq r3, _020346BC ; =_0209B084 sub r1, r6, #0x12 add r2, r5, #3 - bl sub_02026214 + bl DrawTextInWindow _02034660: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} @@ -54852,7 +54852,7 @@ _02037EA8: ldrb r5, [r2, #4] ldrb r2, [r2, #5] add r1, r1, r5 - bl sub_02026214 + bl DrawTextInWindow _02037EF4: add r4, r4, #1 _02037EF8: @@ -54928,7 +54928,7 @@ sub_02037F58: ; 0x02037F58 add r0, r0, r0, lsr #31 mov r1, r0, asr #1 mov r0, sb - bl sub_02026214 + bl DrawTextInWindow _02037FF8: ldr r0, _020383E0 ; =_020AFDF0 ldr r0, [r0] @@ -55163,7 +55163,7 @@ _02038328: mov r0, sb add r3, sp, #0x12 add r1, r5, r1 - bl sub_02026214 + bl DrawTextInWindow ldr r2, [fp] mov r1, #0x17 ldr r5, [r2, #0xc] @@ -56387,7 +56387,7 @@ _020393E0: mov r0, r4 mov r1, #4 mov r2, #3 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0x254 @@ -60824,7 +60824,7 @@ sub_0203CE1C: ; 0x0203CE1C ldrsh r2, [r1, #6] mov r1, #0x44 smlabb r4, r2, r1, r3 - bl sub_02027B58 + bl ClearWindow ldrsh r0, [r4, #4] bl GetDexNumber str r0, [sp, #0xa8] @@ -60839,7 +60839,7 @@ sub_0203CE1C: ; 0x0203CE1C mov r1, #0x20 mov r2, #0 add r3, sp, #0xd4 - bl sub_02026214 + bl DrawTextInWindow ldr r0, _0203CF8C ; =_020AFE70 ldr r0, [r0] ldrsh r0, [r0, #6] @@ -60891,7 +60891,7 @@ _0203CEE4: mov r1, #0x4c mov r2, #0 add r3, sp, #0xd4 - bl sub_02026214 + bl DrawTextInWindow ldrsh r1, [r4, #4] add r0, sp, #0xd4 orr r1, r1, #0x10000 @@ -60900,7 +60900,7 @@ _0203CEE4: mov r1, #0xd0 mov r2, #0 add r3, sp, #0xd4 - bl sub_02026214 + bl DrawTextInWindow mov r0, r5 bl sub_02027AF0 _0203CF84: @@ -60952,7 +60952,7 @@ sub_0203CFCC: ; 0x0203CFCC mov r1, #0x44 mov r0, r6 smlabb r4, r2, r1, r3 - bl sub_02027B58 + bl ClearWindow ldrsh r0, [sp, #4] mov r1, #0 bl GetType @@ -61001,7 +61001,7 @@ _0203D098: mov r0, r6 mov r1, #4 mov r2, r5 - bl sub_02026214 + bl DrawTextInWindow add r0, r5, #0xc mov r0, r0, lsl #0x10 mov r5, r0, asr #0x10 @@ -61022,7 +61022,7 @@ _0203D098: mov r1, #4 mov r2, r5 add r3, sp, #0xcc - bl sub_02026214 + bl DrawTextInWindow add r0, r5, #0xc mov r0, r0, lsl #0x10 mov r5, r0, asr #0x10 @@ -61039,7 +61039,7 @@ _0203D098: mov r1, #4 mov r2, r5 add r3, sp, #0xcc - bl sub_02026214 + bl DrawTextInWindow ldrb r2, [sp, #0x38] ldrb r1, [sp, #0x3d] ldr r0, _0203D418 ; =0x0000097B @@ -61060,7 +61060,7 @@ _0203D098: mov r0, r6 mov r2, r5 mov r1, #4 - bl sub_02026214 + bl DrawTextInWindow ldrb r2, [sp, #0x3a] ldrb r1, [sp, #0x3f] ldr r0, _0203D41C ; =0x0000097F @@ -61081,7 +61081,7 @@ _0203D098: mov r0, r6 mov r2, r5 mov r1, #4 - bl sub_02026214 + bl DrawTextInWindow add r0, r5, #0xc mov r0, r0, lsl #0x10 mov r5, r0, asr #0x10 @@ -61098,7 +61098,7 @@ _0203D098: mov r1, #4 mov r2, r5 add r3, sp, #0xcc - bl sub_02026214 + bl DrawTextInWindow ldrb r2, [sp, #0x39] ldrb r1, [sp, #0x3e] ldr r0, _0203D424 ; =0x0000097D @@ -61119,7 +61119,7 @@ _0203D098: mov r0, r6 mov r2, r5 mov r1, #4 - bl sub_02026214 + bl DrawTextInWindow ldrb r2, [sp, #0x3b] ldrb r1, [sp, #0x40] ldr r0, _0203D428 ; =0x00000981 @@ -61140,7 +61140,7 @@ _0203D098: mov r0, r6 mov r2, r5 mov r1, #4 - bl sub_02026214 + bl DrawTextInWindow ldrsh r0, [sp, #0x42] mov r1, #0xa str r0, [sp, #0xa0] @@ -61170,7 +61170,7 @@ _0203D338: mov r1, #4 mov r2, r5 add r3, sp, #0xcc - bl sub_02026214 + bl DrawTextInWindow ldrsh r0, [r4, #4] ldrsh r1, [sp, #0x42] bl GetNextIqSkill @@ -61198,7 +61198,7 @@ _0203D3D0: add r3, sp, #0xcc mov r0, r6 mov r1, #4 - bl sub_02026214 + bl DrawTextInWindow mov r0, r6 bl sub_02027AF0 _0203D3F4: @@ -64475,7 +64475,7 @@ _020401E0: moveq r1, fp mov r0, sl add r2, r8, #2 - bl sub_02026214 + bl DrawTextInWindow cmp sb, #0 ble _02040238 add r0, r7, sb, lsl #3 @@ -69968,20 +69968,20 @@ sub_02044964: ; 0x02044964 mov r3, r0 mov r0, r4 mov r2, r1 - bl sub_02026214 + bl DrawTextInWindow ldmia sp!, {r4, pc} arm_func_end sub_02044964 arm_func_start sub_02044990 sub_02044990: ; 0x02044990 - ldr ip, _020449A8 ; =sub_02026214 + ldr ip, _020449A8 ; =DrawTextInWindow add r1, r1, #0x2e add r3, r1, #0x800 mov r1, #2 mov r2, #0x10 bx ip .align 2, 0 -_020449A8: .word sub_02026214 +_020449A8: .word DrawTextInWindow arm_func_end sub_02044990 arm_func_start sub_020449AC @@ -83666,31 +83666,31 @@ _0204F9B4: .word 0x000042BA arm_func_start sub_0204F9B8 sub_0204F9B8: ; 0x0204F9B8 - ldr ip, _0204F9C4 ; =sub_02050E08 + ldr ip, _0204F9C4 ; =ResetPlayTimer ldr r0, _0204F9C8 ; =_022AB694 bx ip .align 2, 0 -_0204F9C4: .word sub_02050E08 +_0204F9C4: .word ResetPlayTimer _0204F9C8: .word _022AB694 arm_func_end sub_0204F9B8 arm_func_start sub_0204F9CC sub_0204F9CC: ; 0x0204F9CC - ldr ip, _0204F9D8 ; =sub_02050E18 + ldr ip, _0204F9D8 ; =PlayTimerTick ldr r0, _0204F9DC ; =_022AB694 bx ip .align 2, 0 -_0204F9D8: .word sub_02050E18 +_0204F9D8: .word PlayTimerTick _0204F9DC: .word _022AB694 arm_func_end sub_0204F9CC arm_func_start sub_0204F9E0 sub_0204F9E0: ; 0x0204F9E0 - ldr ip, _0204F9EC ; =sub_02050E54 + ldr ip, _0204F9EC ; =GetPlayTimeSeconds ldr r0, _0204F9F0 ; =_022AB694 bx ip .align 2, 0 -_0204F9EC: .word sub_02050E54 +_0204F9EC: .word GetPlayTimeSeconds _0204F9F0: .word _022AB694 arm_func_end sub_0204F9E0 @@ -85352,16 +85352,16 @@ _02050E00: .word _022AB924 _02050E04: .word _022AB918 arm_func_end sub_02050D84 - arm_func_start sub_02050E08 -sub_02050E08: ; 0x02050E08 + arm_func_start ResetPlayTimer +ResetPlayTimer: ; 0x02050E08 mov r1, #0 strb r1, [r0, #4] str r1, [r0] bx lr - arm_func_end sub_02050E08 + arm_func_end ResetPlayTimer - arm_func_start sub_02050E18 -sub_02050E18: ; 0x02050E18 + arm_func_start PlayTimerTick +PlayTimerTick: ; 0x02050E18 ldrb r1, [r0, #4] add r2, r1, #1 and r1, r2, #0xff @@ -85378,13 +85378,13 @@ sub_02050E18: ; 0x02050E18 bx lr .align 2, 0 _02050E50: .word 0x022550FF - arm_func_end sub_02050E18 + arm_func_end PlayTimerTick - arm_func_start sub_02050E54 -sub_02050E54: ; 0x02050E54 + arm_func_start GetPlayTimeSeconds +GetPlayTimeSeconds: ; 0x02050E54 ldr r0, [r0] bx lr - arm_func_end sub_02050E54 + arm_func_end GetPlayTimeSeconds arm_func_start sub_02050E5C sub_02050E5C: ; 0x02050E5C diff --git a/asm/main_02054C24.s b/asm/main_02054C24.s index fc012af4..f54df4cf 100644 --- a/asm/main_02054C24.s +++ b/asm/main_02054C24.s @@ -6873,7 +6873,7 @@ _0205A4F0: mov r0, r4 mov r1, #4 mov r2, r7 - bl sub_02026214 + bl DrawTextInWindow mov r3, r5 str r3, [sp] ldr r2, _0205ADA4 ; =0x00000952 @@ -6885,7 +6885,7 @@ _0205A4F0: mov r1, #4 mov r2, #0x1c add r3, sp, #0xbc - bl sub_02026214 + bl DrawTextInWindow ldr r2, [r6, #0x2c] cmp r2, #0x64 bge _0205A5B8 @@ -6907,7 +6907,7 @@ _0205A4F0: mov r0, r4 mov r1, #4 mov r2, #0x28 - bl sub_02026214 + bl DrawTextInWindow _0205A5B8: ldr r0, [r6, #0x24] ldr r2, _0205ADAC ; =0x00000954 @@ -6924,7 +6924,7 @@ _0205A5B8: mov r0, r4 mov r1, #4 mov r2, #0x36 - bl sub_02026214 + bl DrawTextInWindow mov r3, r5 str r3, [sp] ldr r2, _0205ADB0 ; =0x00000955 @@ -6936,7 +6936,7 @@ _0205A5B8: mov r1, #4 mov r2, #0x42 add r3, sp, #0xbc - bl sub_02026214 + bl DrawTextInWindow ldrb r1, [r6, #0x34] ldr r2, _0205ADB4 ; =0x00000957 add r5, sp, #0x6c @@ -6955,7 +6955,7 @@ _0205A5B8: mov r0, r4 mov r1, #4 mov r2, #0x42 - bl sub_02026214 + bl DrawTextInWindow ldrb r2, [r6, #0x3b] ldrb r1, [r6, #0x36] add r0, sp, #0xbc @@ -6972,7 +6972,7 @@ _0205A5B8: mov r0, r4 mov r1, #4 mov r2, #0x42 - bl sub_02026214 + bl DrawTextInWindow b _0205A6E4 _0205A6BC: ldr r2, _0205ADBC ; =0x0000095B @@ -6984,7 +6984,7 @@ _0205A6BC: mov r0, r4 mov r1, #4 mov r2, #0x42 - bl sub_02026214 + bl DrawTextInWindow _0205A6E4: ldr r2, _0205ADC0 ; =0x00000956 add r5, sp, #0x6c @@ -6997,7 +6997,7 @@ _0205A6E4: mov r0, r4 mov r1, #4 mov r2, #0x4e - bl sub_02026214 + bl DrawTextInWindow ldrb r1, [r6, #0x35] ldr r2, _0205ADC4 ; =0x00000959 add r5, sp, #0x6c @@ -7016,7 +7016,7 @@ _0205A6E4: mov r0, r4 mov r1, #4 mov r2, #0x4e - bl sub_02026214 + bl DrawTextInWindow ldrb r2, [r6, #0x3c] ldrb r1, [r6, #0x37] add r0, sp, #0xbc @@ -7033,7 +7033,7 @@ _0205A6E4: mov r0, r4 mov r1, #4 mov r2, #0x4e - bl sub_02026214 + bl DrawTextInWindow b _0205A7D0 _0205A7A8: ldr r2, _0205ADCC ; =0x0000095D @@ -7045,7 +7045,7 @@ _0205A7A8: mov r0, r4 mov r1, #4 mov r2, #0x4e - bl sub_02026214 + bl DrawTextInWindow _0205A7D0: ldrb r0, [r6, #0x1c] tst r0, #1 @@ -7080,7 +7080,7 @@ _0205A83C: mov r0, r4 mov r1, #4 mov r2, #0x5a - bl sub_02026214 + bl DrawTextInWindow ldrsh r0, [r6, #0x3e] mov r1, #0xa str r0, [sp, #0x90] @@ -7104,7 +7104,7 @@ _0205A83C: mov r0, r4 mov r1, #4 mov r2, #0x68 - bl sub_02026214 + bl DrawTextInWindow ldrb r0, [r6, #0x38] cmp r0, #0 bne _0205AD98 @@ -7123,7 +7123,7 @@ _0205A83C: mov r0, r4 mov r1, #4 mov r2, #0x74 - bl sub_02026214 + bl DrawTextInWindow b _0205AD98 _0205A900: ldr r3, _0205ADE4 ; =0x00000972 @@ -7226,7 +7226,7 @@ _0205AA04: mov r1, #0xc mov r2, r7 add r3, sp, #0xbc - bl sub_02026214 + bl DrawTextInWindow cmp sl, #1 ldrgeb r1, [sb, #0x58] addge r0, r5, sl, lsl #2 @@ -7319,7 +7319,7 @@ _0205AB98: mov r1, #0xc mov r2, r7 add r3, sp, #0xbc - bl sub_02026214 + bl DrawTextInWindow _0205ABD8: add sl, sl, #1 add r8, r8, #1 @@ -7371,7 +7371,7 @@ _0205AC5C: mov r0, r4 mov r1, #4 mov r2, #0x10 - bl sub_02026214 + bl DrawTextInWindow ldr r3, _0205AE14 ; =0x00000967 mov r0, r4 mov r1, #4 @@ -7390,7 +7390,7 @@ _0205AC5C: mov r1, #4 mov r2, #0x2b add r3, sp, #0xbc - bl sub_02026214 + bl DrawTextInWindow bl sub_02025888 mov r5, r0 ldrsh r0, [r6] @@ -7412,7 +7412,7 @@ _0205AC5C: mov r1, #4 mov r2, #0x3a add r3, sp, #0xbc - bl sub_02026214 + bl DrawTextInWindow ldrsh r0, [r6] bl GetBodySize mov r1, r0 @@ -7430,7 +7430,7 @@ _0205AC5C: mov r0, r4 mov r1, #4 mov r2, #0x58 - bl sub_02026214 + bl DrawTextInWindow ldrb r2, [r6, #0x44] mov r0, r4 mov r1, #4 @@ -14906,7 +14906,7 @@ _02060FA8: mov r2, r5 mov r3, r7 mov r1, #4 - bl sub_02026214 + bl DrawTextInWindow add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 @@ -14990,7 +14990,7 @@ _020610B8: mov r3, r5 mov r1, #4 mov r2, #0 - bl sub_02026214 + bl DrawTextInWindow b _02061124 _020610E8: mov r3, r7 @@ -15001,7 +15001,7 @@ _020610E8: mov r0, r8 mov r3, r5 mov r1, #4 - bl sub_02026214 + bl DrawTextInWindow b _02061124 _02061110: ldr r3, _02061BE0 ; =0x00003C1E @@ -15184,7 +15184,7 @@ _02061370: mov r3, r5 mov r1, #4 mov r2, #0x11 - bl sub_02026214 + bl DrawTextInWindow ldr r1, [sb, #0x58] mov r0, r5 add r1, r1, #0x24 @@ -15197,7 +15197,7 @@ _02061370: mov r1, #4 mov r2, #0x1e mov r3, r5 - bl sub_02026214 + bl DrawTextInWindow _020613D4: ldrb r1, [sb, #0x46] cmp r1, #0xf @@ -15260,7 +15260,7 @@ _02061494: mov r2, r6 mov r3, r4 mov r1, #0x42 - bl sub_02026214 + bl DrawTextInWindow b _02061518 _020614BC: ldr r0, [sb, #0x5c] @@ -15286,7 +15286,7 @@ _020614EC: mov r0, r8 mov r1, #0x42 mov r3, r4 - bl sub_02026214 + bl DrawTextInWindow _02061518: ldrb r2, [sb, #0x48] ldr r1, _02061C08 ; =MISSION_MENU_STRING_IDS_1 @@ -15304,12 +15304,12 @@ _02061518: movhi r1, #0x40 mov r0, r8 add r1, r1, #0x6c - bl sub_02026214 + bl DrawTextInWindow ldr r3, _02061C0C ; =_020A46A8 mov r0, r8 mov r1, #0x6c mov r2, #1 - bl sub_02026214 + bl DrawTextInWindow ldr r3, _02061C10 ; =0x00003C22 mov r0, r8 mov r1, #4 @@ -15328,7 +15328,7 @@ _02061518: mov r3, r4 mov r1, #0x42 mov r2, #0x3a - bl sub_02026214 + bl DrawTextInWindow add r7, r7, #0x47 ldr r3, _02061C14 ; =0x00003C23 mov r0, r8 @@ -15343,7 +15343,7 @@ _02061518: mov r1, #0x42 mov r2, r7 mov r3, r4 - bl sub_02026214 + bl DrawTextInWindow ldrb r0, [sb, #0x46] cmp r0, #0 beq _020616C8 @@ -15399,7 +15399,7 @@ _020616B4: mov r2, r7 mov r3, r4 mov r1, #0x42 - bl sub_02026214 + bl DrawTextInWindow _020616C8: ldr r1, [sb, #0x5c] cmp r1, #0 @@ -15455,7 +15455,7 @@ _02061764: ldr r3, [r1, sl, lsl #2] mov r2, r7 mov r1, #0x42 - bl sub_02026214 + bl DrawTextInWindow add r0, sp, #0xfc bl InitPreprocessorArgs str r6, [sp, #0x120] @@ -15470,7 +15470,7 @@ _02061764: mov r1, #0x56 mov r2, r7 mov r3, r4 - bl sub_02026214 + bl DrawTextInWindow _020617D4: ldr r1, [sb, #0x64] cmp r1, #0 @@ -15525,7 +15525,7 @@ _02061850: mov r0, r8 mov r1, #0x42 mov r3, r4 - bl sub_02026214 + bl DrawTextInWindow b _02061BA4 _020618A0: ldr r1, [sb, #0x20] @@ -15546,7 +15546,7 @@ _020618A0: mov r0, r8 mov r1, #0x42 mov r3, r4 - bl sub_02026214 + bl DrawTextInWindow b _02061BA4 _020618F0: ldrsh r1, [sb, #0x2c] @@ -15567,7 +15567,7 @@ _020618F0: mov r0, r8 mov r1, #0x42 mov r3, r4 - bl sub_02026214 + bl DrawTextInWindow b _02061BA4 _02061940: ldrsh r1, [sb, #0x2c] @@ -15588,7 +15588,7 @@ _02061940: mov r0, r8 mov r1, #0x42 mov r3, r4 - bl sub_02026214 + bl DrawTextInWindow b _02061BA4 _02061990: ldrsh r1, [sb, #0x2c] @@ -15609,7 +15609,7 @@ _02061990: mov r0, r8 mov r1, #0x42 mov r3, r4 - bl sub_02026214 + bl DrawTextInWindow b _02061BA4 _020619E0: ldr r0, _02061C44 ; =MISSION_MENU_STRING_IDS_2 @@ -15621,7 +15621,7 @@ _020619E0: mov r2, r6 mov r3, r5 mov r1, #0x42 - bl sub_02026214 + bl DrawTextInWindow b _02061BA4 _02061A0C: ldrsh r1, [sb, #0x3c] @@ -15642,7 +15642,7 @@ _02061A0C: mov r0, r8 mov r1, #0x42 mov r3, r4 - bl sub_02026214 + bl DrawTextInWindow b _02061BA4 _02061A5C: ldr r0, _02061C44 ; =MISSION_MENU_STRING_IDS_2 @@ -15654,7 +15654,7 @@ _02061A5C: mov r2, r6 mov r3, r5 mov r1, #0x42 - bl sub_02026214 + bl DrawTextInWindow b _02061BA4 _02061A88: ldr r1, _02061C48 ; =0x000038DF @@ -15664,7 +15664,7 @@ _02061A88: mov r2, r6 mov r3, r5 mov r1, #0x42 - bl sub_02026214 + bl DrawTextInWindow b _02061BA4 _02061AAC: cmp r1, #0 @@ -15704,7 +15704,7 @@ _02061AAC: mov r1, #0x42 add r2, r7, #0xd mov r3, r4 - bl sub_02026214 + bl DrawTextInWindow b _02061BA4 _02061B48: cmp r0, #6 @@ -15729,7 +15729,7 @@ _02061B48: mov r1, #0x42 add r2, r7, #0xd mov r3, r4 - bl sub_02026214 + bl DrawTextInWindow _02061BA4: ldrb r1, [sb, #0x45] ldr r2, [sb, #0x5c] @@ -15799,7 +15799,7 @@ sub_02061C60: ; 0x02061C60 mov r0, r5 mov r1, #0x6c mov r2, #1 - bl sub_02026214 + bl DrawTextInWindow ldr r3, _02061CC4 ; =0x00003C4E mov r0, r5 mov r1, #4 @@ -25289,7 +25289,7 @@ sub_020696E8: ; 0x020696E8 mov r1, #0 mov r2, #3 add r3, sp, #4 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0x154 @@ -25314,7 +25314,7 @@ sub_02069750: ; 0x02069750 mov r0, r4 mov r1, #0 mov r2, #3 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0x100 diff --git a/asm/overlay_00.s b/asm/overlay_00.s index f4afa77d..051aeb25 100644 --- a/asm/overlay_00.s +++ b/asm/overlay_00.s @@ -2575,7 +2575,7 @@ ov00_022BE774: ; 0x022BE774 cmp r0, #0 beq _022BE830 ldr r0, _022BE860 ; =ov00_0231E2FC - bl sub_0200BD2C + bl GetFadeStatus cmp r0, #0 bne _022BE7B8 ldr r1, _022BE85C ; =ov00_0231E2A8 @@ -2595,7 +2595,7 @@ _022BE7C8: ldrsh r0, [r0, #0x14] bl ov00_022BE868 ldr r0, _022BE864 ; =ov00_0231E2B8 - bl sub_0200BD2C + bl GetFadeStatus cmp r0, #0 bne _022BE800 ldr r1, _022BE85C ; =ov00_0231E2A8 diff --git a/asm/overlay_01.s b/asm/overlay_01.s index 6de0c6b4..2d96d3eb 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -7778,7 +7778,7 @@ ov01_0232F830: ; 0x0232F830 mov r1, #0x1e mov r2, #0x14 add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow mov r0, #0x16 bl GetPerformanceFlagWithChecks cmp r0, #0 @@ -7794,7 +7794,7 @@ ov01_0232F830: ; 0x0232F830 mov r0, r5 mov r1, #0x5a mov r2, #0 - bl sub_02026214 + bl DrawTextInWindow _0232F8F0: mov r0, r5 bl sub_02027AF0 @@ -11257,7 +11257,7 @@ _0233281C: ldr r1, [r1] str r0, [r1, #4] ldr r0, _023329D0 ; =MAIN_MENU_WINDOW_PARAMS_5 - ldr r1, _023329D4 ; =ov01_02332EF4 + ldr r1, _023329D4 ; =ProcessContinueScreenContents bl CreateTextBox ldr r2, _023329C8 ; =ov01_0233C184 mov r1, #0 @@ -11375,7 +11375,7 @@ _023329C4: .word ov01_0233B70C _023329C8: .word ov01_0233C184 _023329CC: .word ov01_0233B798 _023329D0: .word MAIN_MENU_WINDOW_PARAMS_5 -_023329D4: .word ov01_02332EF4 +_023329D4: .word ProcessContinueScreenContents _023329D8: .word MAIN_MENU_WINDOW_PARAMS_6 _023329DC: .word 0x00000203 _023329E0: .word 0x00000201 @@ -11752,8 +11752,8 @@ _02332EEC: .word MAIN_MENU_WINDOW_PARAMS_7 _02332EF0: .word MAIN_MENU_ITEMS_CONFIRM arm_func_end ov01_02332ACC - arm_func_start ov01_02332EF4 -ov01_02332EF4: ; 0x02332EF4 + arm_func_start ProcessContinueScreenContents +ProcessContinueScreenContents: ; 0x02332EF4 stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x94 sub sp, sp, #0x800 @@ -11766,7 +11766,7 @@ ov01_02332EF4: ; 0x02332EF4 mov r0, r4 mov r1, #8 mov r2, #0 - bl sub_02026214 + bl DrawTextInWindow ldr r3, _02333624 ; =0x0000020F mov r0, r4 mov r1, #8 @@ -11854,7 +11854,7 @@ _02333000: mov r1, #0x90 add r3, r2, #0xc mov r2, #0xf - bl sub_02026214 + bl DrawTextInWindow bl GetHero movs r5, r0 add r0, sp, #0x400 @@ -11892,7 +11892,7 @@ _023330BC: mov r1, #0x50 add r3, r2, #0x10c mov r2, #0xf - bl sub_02026214 + bl DrawTextInWindow b _02333158 _02333110: bl GetSpecialEpisodeType @@ -11992,7 +11992,7 @@ _02333260: mov r1, #0x50 add r3, r2, #0x20c mov r2, #0x1c - bl sub_02026214 + bl DrawTextInWindow bl sub_0204F9E0 str r0, [sp, #0x3c8] add r1, sp, #0x3a4 @@ -12010,7 +12010,7 @@ _02333260: mov r1, #0x50 add r3, r2, #0x30c mov r2, #0x36 - bl sub_02026214 + bl DrawTextInWindow bl GetNbAdventures cmp r0, #0 beq _02333334 @@ -12038,7 +12038,7 @@ _02333260: add r2, r2, #0xc add r3, r2, #0x400 mov r2, #0x43 - bl sub_02026214 + bl DrawTextInWindow _02333334: ldr r0, _02333628 ; =ov01_0233C184 mov r1, #0 @@ -12178,7 +12178,7 @@ _02333534: add r3, r2, #0x10c mov r2, r1 add r3, r3, #0x400 - bl sub_02026214 + bl DrawTextInWindow ldr sb, _02333628 ; =ov01_0233C184 mov r8, #3 ldr r0, [sb] @@ -12259,7 +12259,7 @@ _02333668: .word 0x00002710 _0233366C: .word 0x05F5E100 _02333670: .word 0x00000217 _02333674: .word ov01_0233B764 - arm_func_end ov01_02332EF4 + arm_func_end ProcessContinueScreenContents arm_func_start ov01_02333678 ov01_02333678: ; 0x02333678 @@ -15908,7 +15908,7 @@ _02336564: ldrsh r1, [r2, #0x16] ldrsh r2, [r2, #0x18] mov r3, r6 - bl sub_02026214 + bl DrawTextInWindow add r0, r7, #1 mov r0, r0, lsl #0x10 mov r7, r0, asr #0x10 @@ -15924,7 +15924,7 @@ _02336564: ldrsh r1, [r2, #0x2e] ldrsh r2, [r2, #0x30] add r1, r1, #0xc - bl sub_02026214 + bl DrawTextInWindow ldr r0, _0233665C ; =ov01_0233C1A8 add r3, sp, #0 ldr r2, [r0] @@ -15932,7 +15932,7 @@ _02336564: ldrsh r1, [r2, #0x4e] ldrsh r2, [r2, #0x50] add r1, r1, #0xc - bl sub_02026214 + bl DrawTextInWindow ldr r0, _0233665C ; =ov01_0233C1A8 ldr r1, _02336658 ; =ov01_0233BC74 ldr r0, [r0] @@ -15986,7 +15986,7 @@ _02336684: ldrsh r1, [r2, #0x16] ldrsh r2, [r2, #0x18] mov r3, r6 - bl sub_02026214 + bl DrawTextInWindow add r0, r7, #1 mov r0, r0, lsl #0x10 mov r7, r0, asr #0x10 @@ -16043,7 +16043,7 @@ _02336750: ldrsh r1, [r2, #0x16] ldrsh r2, [r2, #0x18] mov r3, r7 - bl sub_02026214 + bl DrawTextInWindow add r0, r8, #1 mov r0, r0, lsl #0x10 mov r8, r0, asr #0x10 @@ -16076,7 +16076,7 @@ _02336750: ldrsh r1, [r2, #0x16] ldrsh r2, [r2, #0x18] sub r1, r1, #0xc - bl sub_02026214 + bl DrawTextInWindow ldr r5, _02336880 ; =ov01_0233BB9E ldr sb, _02336888 ; =ov01_0233C1A8 mov r7, #0 @@ -16097,7 +16097,7 @@ _02336824: mov r3, r6 sub r1, r1, #0x30 smlabb r1, r7, r8, r1 - bl sub_02026214 + bl DrawTextInWindow add r0, r7, #1 mov r0, r0, lsl #0x10 mov r7, r0, asr #0x10 @@ -16136,7 +16136,7 @@ _023368B4: ldrsh r1, [r2, #0x16] ldrsh r2, [r2, #0x18] mov r3, r6 - bl sub_02026214 + bl DrawTextInWindow add r0, r7, #1 mov r0, r0, lsl #0x10 mov r7, r0, asr #0x10 diff --git a/asm/overlay_03.s b/asm/overlay_03.s index 88bbc726..45049174 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -9192,7 +9192,7 @@ ov03_02344970: ; 0x02344970 mov r0, r4 mov r1, #4 mov r2, #0x10 - bl sub_02026214 + bl DrawTextInWindow ldmia sp!, {r3, r4, r5, pc} arm_func_end ov03_02344970 diff --git a/asm/overlay_05.s b/asm/overlay_05.s index 1bb56c48..b8b9f6e4 100644 --- a/asm/overlay_05.s +++ b/asm/overlay_05.s @@ -3549,7 +3549,7 @@ _0233FAE0: mov r0, r6 mov r1, #4 mov r2, #2 - bl sub_02026214 + bl DrawTextInWindow mov r0, r6 bl sub_02027AF0 add sp, sp, #0x194 diff --git a/asm/overlay_07.s b/asm/overlay_07.s index d11aa54b..ecff1e04 100644 --- a/asm/overlay_07.s +++ b/asm/overlay_07.s @@ -1334,7 +1334,7 @@ ov07_0233DB50: ; 0x0233DB50 mov r1, #4 mov r2, #2 mov r3, r5 - bl sub_02026214 + bl DrawTextInWindow mov r0, r6 bl MemFree mov r0, r5 diff --git a/asm/overlay_09.s b/asm/overlay_09.s index aa927030..9e464016 100644 --- a/asm/overlay_09.s +++ b/asm/overlay_09.s @@ -3011,7 +3011,7 @@ _0233F444: ldr r1, [r6, #0x2ac] ldr r2, [r6, #0x2a8] add r3, r6, #0x1a8 - bl sub_02026214 + bl DrawTextInWindow ldrsb r0, [r5, #0x10] bl sub_02027AF0 ldr r1, [r6, #4] diff --git a/asm/overlay_10.s b/asm/overlay_10.s index 824f668a..7d010603 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -4893,8 +4893,8 @@ _022C09BC: _022C09E4: .word ov10_022DC1D0 arm_func_end ov10_022C0998 - arm_func_start ov10_022C09E8 -ov10_022C09E8: ; 0x022C09E8 + arm_func_start DrawTeamStats +DrawTeamStats: ; 0x022C09E8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x50 ldr r3, _022C0CC0 ; =ov10_022DC1D0 @@ -5093,10 +5093,10 @@ _022C0CD0: .word ProcessTeamStatsNameGender _022C0CD4: .word ProcessTeamStatsLvHp _022C0CD8: .word ov10_022DC1CC _022C0CDC: .word ov10_022DBFFC - arm_func_end ov10_022C09E8 + arm_func_end DrawTeamStats - arm_func_start ov10_022C0CE0 -ov10_022C0CE0: ; 0x022C0CE0 + arm_func_start UpdateTeamStats +UpdateTeamStats: ; 0x022C0CE0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x20 ldr r0, _022C0F5C ; =ov10_022DC1D0 @@ -5130,14 +5130,14 @@ ov10_022C0CE0: ; 0x022C0CE0 mov r0, #4 mov r1, #0x1000 mov r2, #1 - bl ov29_0234C668 + bl StartFadeDungeonWrapper b _022C0D80 _022C0D6C: bl ov29_0234C584 mov r0, #1 mov r2, r0 mov r1, #0x1000 - bl ov29_0234C668 + bl StartFadeDungeonWrapper _022C0D80: ldr fp, _022C0F5C ; =ov10_022DC1D0 mov r8, #0 @@ -5276,7 +5276,7 @@ _022C0F5C: .word ov10_022DC1D0 _022C0F60: .word 0x0000FFFF _022C0F64: .word ov10_022DBFB0 _022C0F68: .word ov10_022DC1CC - arm_func_end ov10_022C0CE0 + arm_func_end UpdateTeamStats arm_func_start ov10_022C0F6C ov10_022C0F6C: ; 0x022C0F6C @@ -5579,8 +5579,8 @@ _022C13AC: .word ov10_022DC1D0 _022C13B0: .word ov10_022C231C arm_func_end ov10_022C1398 - arm_func_start ov10_022C13B4 -ov10_022C13B4: ; 0x022C13B4 + arm_func_start FreeTeamStats +FreeTeamStats: ; 0x022C13B4 stmdb sp!, {r4, r5, r6, lr} ldr r0, _022C14C8 ; =ov10_022DC1D0 ldr r0, [r0] @@ -5658,7 +5658,7 @@ _022C14A4: .align 2, 0 _022C14C8: .word ov10_022DC1D0 _022C14CC: .word WAN_TABLE - arm_func_end ov10_022C13B4 + arm_func_end FreeTeamStats arm_func_start ov10_022C14D0 ov10_022C14D0: ; 0x022C14D0 @@ -5770,7 +5770,7 @@ _022C15F4: mov r1, #0 mov r2, sb add r3, sp, OV10_022C159C_STACK_OFFSET - bl sub_02026214 + bl DrawTextInWindow #ifdef EUROPE mov r1, r8 add r0, sp, #0x54 @@ -5788,7 +5788,7 @@ _022C15F4: mov r1, #0x44 mov r2, sb add r3, sp, OV10_022C159C_STACK_OFFSET - bl sub_02026214 + bl DrawTextInWindow mov r0, fp bl InitPreprocessorArgs ldr r2, _022C16D4 ; =ov10_022DC014 @@ -5803,7 +5803,7 @@ _022C15F4: mov r1, #0x80 mov r2, sb add r3, sp, OV10_022C159C_STACK_OFFSET - bl sub_02026214 + bl DrawTextInWindow add sb, sb, #0xc _022C169C: add r5, r5, #1 @@ -5825,8 +5825,8 @@ _022C16D0: .word ov10_022DC00C _022C16D4: .word ov10_022DC014 arm_func_end ov10_022C159C - arm_func_start ov10_022C16D8 -ov10_022C16D8: ; 0x022C16D8 + arm_func_start FreeMapAndTeam +FreeMapAndTeam: ; 0x022C16D8 stmdb sp!, {r3, lr} ldr r0, _022C1744 ; =ov10_022DC1D0 ldr r0, [r0] @@ -5857,7 +5857,7 @@ _022C171C: ldmia sp!, {r3, pc} .align 2, 0 _022C1744: .word ov10_022DC1D0 - arm_func_end ov10_022C16D8 + arm_func_end FreeMapAndTeam arm_func_start ProcessTeamStatsLvHp ProcessTeamStatsLvHp: ; 0x022C1748 @@ -5897,12 +5897,12 @@ _022C1794: cmp r0, #0 mov r0, r4 bne _022C17C8 - bl sub_02027B58 + bl ClearWindow mov r0, r4 bl sub_02027AF0 b _022C182C _022C17C8: - bl sub_02027B58 + bl ClearWindow add r0, sp, #0x104 + OV10_022C1748_STACK_OFFSET bl InitPreprocessorArgs #ifdef EUROPE @@ -5937,7 +5937,7 @@ _022C17C8: mov r0, r4 mov r2, r1 add r3, sp, #0x154 + OV10_022C1748_STACK_OFFSET - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 _022C182C: @@ -5992,7 +5992,7 @@ _022C18A4: cmp r0, #0 bne _022C18D8 mov r0, r5 - bl sub_02027B58 + bl ClearWindow mov r0, r5 bl sub_02027AF0 b _022C197C @@ -6003,7 +6003,7 @@ _022C18D8: strb r2, [sp, #4] ldrb r1, [r1, #1] strb r1, [sp, #5] - bl sub_02027B58 + bl ClearWindow add r0, sp, #8 bl InitPreprocessorArgs ldrsh r0, [r4, #0x42] @@ -6036,7 +6036,7 @@ _022C1930: add r3, sp, #0x58 mov r0, r5 mov r2, r1 - bl sub_02026214 + bl DrawTextInWindow mov r0, r5 bl sub_02027AF0 _022C197C: diff --git a/asm/overlay_11.s b/asm/overlay_11.s index 935152f9..c8e2b552 100644 --- a/asm/overlay_11.s +++ b/asm/overlay_11.s @@ -120,8 +120,8 @@ ov11_022DC3A0: ; 0x022DC3A0 mov r1, #1 ldr r0, [r0] mov r2, #0 - bl ov10_022C09E8 - bl ov10_022C0CE0 + bl DrawTeamStats + bl UpdateTeamStats ldr r0, _022DC3F8 ; =ov11_02324C60 mov r2, #1 ldr r1, [r0] @@ -142,7 +142,7 @@ ov11_022DC3FC: ; 0x022DC3FC ldrneb r0, [r0, #0x185] cmpne r0, #0 ldmeqia sp!, {r3, pc} - bl ov10_022C13B4 + bl FreeTeamStats ldr r0, _022DC430 ; =ov11_02324C60 mov r1, #0 ldr r0, [r0] @@ -165,7 +165,7 @@ ov11_022DC434: ; 0x022DC434 ldmeqia sp!, {r3, pc} mov r0, #0 strb r0, [r1, #0x19a] - bl ov10_022C0CE0 + bl UpdateTeamStats ldmia sp!, {r3, pc} .align 2, 0 _022DC468: .word ov11_02324C60 @@ -8657,7 +8657,7 @@ _022E3C28: streqh r0, [sb, #0xe] b _022E3C5C _022E3C40: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 moveq r0, #2 movne r5, #0 @@ -16225,8 +16225,8 @@ _022E9F70: .word ov11_02388FC0 _022E9F74: .word ov11_02389128 arm_func_end ov11_022E9F48 - arm_func_start ov11_022E9F78 -ov11_022E9F78: ; 0x022E9F78 + arm_func_start IsScreenFadeInProgress +IsScreenFadeInProgress: ; 0x022E9F78 stmdb sp!, {r3, lr} ldr r0, _022E9F9C ; =ov11_023890A0 bl sub_0200BD14 @@ -16239,7 +16239,7 @@ ov11_022E9F78: ; 0x022E9F78 .align 2, 0 _022E9F9C: .word ov11_023890A0 _022E9FA0: .word ov11_02389018 - arm_func_end ov11_022E9F78 + arm_func_end IsScreenFadeInProgress arm_func_start ov11_022E9FA4 ov11_022E9FA4: ; 0x022E9FA4 @@ -16261,11 +16261,11 @@ ov11_022E9FC8: ; 0x022E9FC8 cmp r0, #0 bne _022E9FE0 ldr r0, _022E9FEC ; =ov11_02389128 - bl sub_0200BD2C + bl GetFadeStatus ldmia sp!, {r3, pc} _022E9FE0: ldr r0, _022E9FF0 ; =ov11_02389018 - bl sub_0200BD2C + bl GetFadeStatus ldmia sp!, {r3, pc} .align 2, 0 _022E9FEC: .word ov11_02389128 @@ -16367,7 +16367,7 @@ ov11_022EA0BC: ; 0x022EA0BC ldrsh r0, [r0, #0x14] bl ov11_022EA80C ldr r0, _022EA7FC ; =ov11_02389128 - bl sub_0200BD2C + bl GetFadeStatus cmp r0, #0 bne _022EA12C ldr r1, _022EA7F4 ; =ov11_02388FC0 @@ -16384,7 +16384,7 @@ _022EA12C: movne r4, #0 bne _022EA1B4 ldr r0, _022EA7FC ; =ov11_02389128 - bl sub_0200BD2C + bl GetFadeStatus cmp r0, #2 bne _022EA1B4 ldr r0, _022EA7F4 ; =ov11_02388FC0 @@ -16417,7 +16417,7 @@ _022EA1B4: ldrsh r0, [r0, #0x14] bl ov11_022EA8A0 ldr r0, _022EA800 ; =ov11_02389018 - bl sub_0200BD2C + bl GetFadeStatus cmp r0, #0 bne _022EA1EC ldr r1, _022EA7F4 ; =ov11_02388FC0 @@ -16434,7 +16434,7 @@ _022EA1EC: movne r4, #0 bne _022EA264 ldr r0, _022EA800 ; =ov11_02389018 - bl sub_0200BD2C + bl GetFadeStatus cmp r0, #2 bne _022EA264 mov r0, #0 @@ -16510,7 +16510,7 @@ _022EA300: ldrsh r0, [r0, #0x14] bl ov11_022EA80C ldr r0, _022EA7FC ; =ov11_02389128 - bl sub_0200BD2C + bl GetFadeStatus cmp r0, #0 bne _022EA354 ldr r1, _022EA7F4 ; =ov11_02388FC0 @@ -41564,7 +41564,7 @@ _022FEFFC: mov r2, #4 #endif add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow mov r0, #0x16 bl GetPerformanceFlagWithChecks cmp r0, #0 @@ -41580,7 +41580,7 @@ _022FEFFC: add r3, sp, #0x54 mov r1, #0x28 mov r2, #0x16 - bl sub_02026214 + bl DrawTextInWindow _022FF0AC: add r1, sp, #4 str r1, [sp] @@ -41597,7 +41597,7 @@ _022FF0AC: #else mov r2, #0x16 #endif - bl sub_02026214 + bl DrawTextInWindow ldrsb r0, [r6, #4] mvn r1, #1 cmp r0, r1 @@ -41636,14 +41636,14 @@ _022FF118: mov r1, #0x9a mov r2, #4 #endif - bl sub_02026214 + bl DrawTextInWindow b _022FF168 _022FF15C: mov r1, #0x10 #ifndef EUROPE mov r2, #2 #endif - bl sub_02026214 + bl DrawTextInWindow _022FF168: mov r0, #3 str r0, [r4, #0x370] @@ -47652,7 +47652,7 @@ ov11_023042A8: ; 0x023042A8 mov r1, #1 ldr r3, [r2, r3, lsl #2] mov r2, #3 - bl sub_02026214 + bl DrawTextInWindow ldr r0, _02304390 ; =ov11_02324D58 ldr r3, [r0, #4] ldr r0, [r3, #0x10] @@ -47695,7 +47695,7 @@ _02304334: mov r0, r4 mov r1, #0x3c mov r2, #3 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #4 @@ -51400,7 +51400,7 @@ _023075F0: add r3, sp, #0x20 mov r0, r5 mov r2, r1 - bl sub_02026214 + bl DrawTextInWindow mov r0, r5 bl sub_02027AF0 _0230760C: @@ -55526,7 +55526,7 @@ GetExclusiveItemRequirements: ; 0x0230AF38 mov r1, #0x18 mov r2, sb add r3, sp, #0xa - bl sub_02026214 + bl DrawTextInWindow mov r0, r8 bl ov11_0230C068 cmp r0, #3 @@ -55542,21 +55542,21 @@ _0230AFB4: mov r0, r7 mov r1, #0x6c mov r2, sb - bl sub_02026214 + bl DrawTextInWindow b _0230AFF8 _0230AFCC: ldr r3, _0230B1E4 ; =ov11_02322FB0 mov r0, r7 mov r1, #0x6c mov r2, sb - bl sub_02026214 + bl DrawTextInWindow b _0230AFF8 _0230AFE4: ldr r3, _0230B1E8 ; =ov11_02322FC0 mov r0, r7 mov r1, #0x6c mov r2, sb - bl sub_02026214 + bl DrawTextInWindow _0230AFF8: ldr r0, [r6] cmp r0, #0 @@ -58716,7 +58716,7 @@ _0230D7F8: ; jump table b _0230D8A0 ; case 4 b _0230D890 ; case 5 _0230D810: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 bne _0230D8A0 bl ov11_022EA014 @@ -58742,7 +58742,7 @@ _0230D810: str r1, [r0] b _0230D8A0 _0230D874: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldreq r0, _0230D8A8 ; =ov11_02324DC0 moveq r1, #2 @@ -58886,7 +58886,7 @@ _0230D9F4: ; jump table b _0230DAB4 ; case 6 b _0230DAA8 ; case 7 _0230DA14: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 bne _0230DACC bl ov11_022EA014 @@ -58918,7 +58918,7 @@ _0230DA78: bl ov11_022E9CB0 b _0230DACC _0230DA8C: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldreq r0, _0230DAD4 ; =ov11_02324DC4 moveq r1, #2 @@ -58926,7 +58926,7 @@ _0230DA8C: streq r1, [r0] b _0230DACC _0230DAA8: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 bne _0230DACC _0230DAB4: @@ -59127,7 +59127,7 @@ _0230DCF4: ; jump table b _0230DE4C ; case 6 b _0230DE68 ; case 7 _0230DD14: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _0230DE80 ; =ov11_02324DC8 mov r1, #1 @@ -59138,7 +59138,7 @@ _0230DD14: ldr r0, [r0, #4] str r1, [r0, #4] _0230DD3C: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _0230DE80 ; =ov11_02324DC8 movne r1, #1 @@ -59178,7 +59178,7 @@ _0230DD94: str r1, [r0, #4] b _0230DE78 _0230DDD4: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _0230DE80 ; =ov11_02324DC8 movne r1, #1 @@ -59210,7 +59210,7 @@ _0230DE00: strb r1, [r0, #0xc] b _0230DE78 _0230DE4C: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 bne _0230DE78 ldr r0, _0230DE80 ; =ov11_02324DC8 @@ -59492,7 +59492,7 @@ _0230E194: ; jump table b _0230E2E4 ; case 6 b _0230E328 ; case 7 _0230E1B4: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _0230E340 ; =ov11_02324DD4 mov r1, #1 @@ -59503,7 +59503,7 @@ _0230E1B4: ldr r0, [r0, #4] str r1, [r0, #4] _0230E1DC: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _0230E340 ; =ov11_02324DD4 movne r1, #1 @@ -59541,7 +59541,7 @@ _0230E234: str r1, [r0, #4] b _0230E338 _0230E26C: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _0230E340 ; =ov11_02324DD4 movne r1, #1 @@ -59573,7 +59573,7 @@ _0230E298: strb r1, [r0, #9] b _0230E338 _0230E2E4: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 bne _0230E338 ldr r0, _0230E340 ; =ov11_02324DD4 @@ -59838,8 +59838,8 @@ ov11_0230E614: ; 0x0230E614 bx lr arm_func_end ov11_0230E614 - arm_func_start ov11_0230E618 -ov11_0230E618: ; 0x0230E618 + arm_func_start HandleControlsTopScreenGround +HandleControlsTopScreenGround: ; 0x0230E618 stmdb sp!, {r3, lr} ldr r0, _0230E7E8 ; =ov11_02324DDC ldr r0, [r0, #4] @@ -59858,7 +59858,7 @@ _0230E634: ; jump table b _0230E788 ; case 7 b _0230E7D0 ; case 8 _0230E658: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _0230E7E8 ; =ov11_02324DDC mov r1, #1 @@ -59869,7 +59869,7 @@ _0230E658: ldr r0, [r0, #4] str r1, [r0, #4] _0230E680: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _0230E7E8 ; =ov11_02324DDC movne r1, #1 @@ -59907,7 +59907,7 @@ _0230E6D8: str r1, [r0, #4] b _0230E7E0 _0230E710: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _0230E7E8 ; =ov11_02324DDC movne r1, #1 @@ -59939,7 +59939,7 @@ _0230E73C: strb r1, [r0, #9] b _0230E7E0 _0230E788: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 bne _0230E7E0 ldr r0, _0230E7E8 ; =ov11_02324DDC @@ -59968,7 +59968,7 @@ _0230E7E0: ldmia sp!, {r3, pc} .align 2, 0 _0230E7E8: .word ov11_02324DDC - arm_func_end ov11_0230E618 + arm_func_end HandleControlsTopScreenGround arm_func_start ov11_0230E7EC ov11_0230E7EC: ; 0x0230E7EC @@ -60886,7 +60886,7 @@ _0230F39C: ; jump table b _0230FD84 ; case 8 b _0230FDA0 ; case 9 _0230F3C4: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02310050 ; =WORLD_MAP_MODE mov r1, #1 @@ -60897,7 +60897,7 @@ _0230F3C4: ldr r0, [r0, #8] str r1, [r0, #8] _0230F3EC: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02310050 ; =WORLD_MAP_MODE movne r1, #1 @@ -61056,7 +61056,7 @@ _0230F604: strb r1, [r0, #0xc] b _0230FDB0 _0230F640: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02310050 ; =WORLD_MAP_MODE movne r1, #1 @@ -61559,7 +61559,7 @@ _0230FD5C: streq r0, [r2, #8] b _0230FDB0 _0230FD84: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 bne _0230FDB0 ldr r0, _02310050 ; =WORLD_MAP_MODE @@ -62359,7 +62359,7 @@ _0231086C: ; jump table b _02310A1C ; case 7 b _02310A38 ; case 8 _02310890: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02310A50 ; =ov11_02324DF0 mov r1, #1 @@ -62370,7 +62370,7 @@ _02310890: ldr r0, [r0] str r1, [r0, #4] _023108B8: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02310A50 ; =ov11_02324DF0 movne r1, #1 @@ -62433,7 +62433,7 @@ _02310958: strb r1, [r0, #0x6ec] b _02310A48 _023109A4: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02310A50 ; =ov11_02324DF0 movne r1, #1 @@ -62465,7 +62465,7 @@ _023109D0: strb r1, [r0, #0x6ec] b _02310A48 _02310A1C: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 bne _02310A48 ldr r0, _02310A50 ; =ov11_02324DF0 @@ -64178,7 +64178,7 @@ _02311F60: ; jump table b _023120A8 ; case 6 b _023120E4 ; case 7 _02311F80: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _023120FC ; =ov11_02324E10 mov r1, #1 @@ -64189,7 +64189,7 @@ _02311F80: ldr r0, [r0, #4] str r1, [r0, #4] _02311FA8: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _023120FC ; =ov11_02324E10 movne r1, #1 @@ -64227,7 +64227,7 @@ _02312000: str r1, [r0, #4] b _023120F4 _02312038: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _023120FC ; =ov11_02324E10 movne r1, #1 @@ -64257,7 +64257,7 @@ _02312064: strb r1, [r0, #9] b _023120F4 _023120A8: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 bne _023120F4 ldr r0, _023120FC ; =ov11_02324E10 @@ -66256,8 +66256,8 @@ ov11_02313AD8: ; 0x02313AD8 bx lr arm_func_end ov11_02313AD8 - arm_func_start ov11_02313ADC -ov11_02313ADC: ; 0x02313ADC + arm_func_start HandleTeamStatsGround +HandleTeamStatsGround: ; 0x02313ADC stmdb sp!, {r3, lr} ldr r0, _02313CAC ; =ov11_02324E30 ldr r0, [r0] @@ -66275,7 +66275,7 @@ _02313AF8: ; jump table b _02313C58 ; case 6 b _02313C94 ; case 7 _02313B18: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02313CAC ; =ov11_02324E30 mov r1, #1 @@ -66286,7 +66286,7 @@ _02313B18: ldr r0, [r0] str r1, [r0, #4] _02313B40: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02313CAC ; =ov11_02324E30 movne r1, #1 @@ -66324,7 +66324,7 @@ _02313B98: str r1, [r0, #4] b _02313CA4 _02313BD0: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02313CAC ; =ov11_02324E30 movne r1, #1 @@ -66361,7 +66361,7 @@ _02313C40: strb r1, [r0, #9] b _02313CA4 _02313C58: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 bne _02313CA4 ldr r0, _02313CAC ; =ov11_02324E30 @@ -66387,7 +66387,7 @@ _02313CA4: ldmia sp!, {r3, pc} .align 2, 0 _02313CAC: .word ov11_02324E30 - arm_func_end ov11_02313ADC + arm_func_end HandleTeamStatsGround arm_func_start ov11_02313CB0 ov11_02313CB0: ; 0x02313CB0 @@ -69364,7 +69364,7 @@ _023165E4: ; jump table b _02316738 ; case 7 b _02316770 ; case 8 _02316608: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02316788 ; =ov11_02324E78 mov r1, #1 @@ -69375,7 +69375,7 @@ _02316608: ldr r0, [r0] str r1, [r0] _02316630: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02316788 ; =ov11_02324E78 movne r1, #1 @@ -69413,7 +69413,7 @@ _02316688: str r1, [r0] b _02316780 _023166C0: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 ldrne r0, _02316788 ; =ov11_02324E78 movne r1, #1 @@ -69445,7 +69445,7 @@ _023166EC: strb r1, [r0, #5] b _02316780 _02316738: - bl ov11_022E9F78 + bl IsScreenFadeInProgress cmp r0, #0 bne _02316780 ldr r0, _02316788 ; =ov11_02324E78 @@ -69610,7 +69610,7 @@ _0231691C: moveq r3, r5 movne r3, r4 mov r0, sl - bl sub_02026214 + bl DrawTextInWindow mov r0, r6 mov r1, #0x400 mov r2, sb @@ -69619,7 +69619,7 @@ _0231691C: mov r1, #0x12 mov r2, r7 mov r3, r6 - bl sub_02026214 + bl DrawTextInWindow mov r0, r6 mov r1, #0x400 mov r2, sb @@ -69628,7 +69628,7 @@ _0231691C: mov r1, #0x40 add r2, r7, #0xa mov r3, r6 - bl sub_02026214 + bl DrawTextInWindow ldrb r1, [sb, #1] cmp r1, #0xe bne _023169CC @@ -69646,7 +69646,7 @@ _023169CC: mov r0, sl mov r1, #0xcc add r2, r7, #0xa - bl sub_02026214 + bl DrawTextInWindow _023169EC: add r7, r7, #0x14 _023169F0: @@ -80753,7 +80753,7 @@ ov11_023232D8: .word ov11_0230E4FC .word ov11_0230E5F4 .word ov11_0230E614 - .word ov11_0230E618 + .word HandleControlsTopScreenGround .word ov11_0230E7EC .word ov11_0230E8D0 .word ov11_0230E920 @@ -81185,7 +81185,7 @@ ov11_02323D2C: .word ov11_023139CC .word ov11_02313AB8 .word ov11_02313AD8 - .word ov11_02313ADC + .word HandleTeamStatsGround .word ov11_02313CB0 .word ov11_02313D18 .word ov11_02313D90 diff --git a/asm/overlay_13.s b/asm/overlay_13.s index d4e4885b..e6efcca4 100644 --- a/asm/overlay_13.s +++ b/asm/overlay_13.s @@ -2053,7 +2053,7 @@ ov13_0238BE6C: ; 0x0238BE6C mov r1, #4 mov r2, #0 add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow ldr r0, _0238BFFC ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r2, _0238C008 ; =0x000006CB ldr lr, [r0] @@ -2074,7 +2074,7 @@ ov13_0238BE6C: ; 0x0238BE6C mov r1, #4 mov r2, #0xc add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow mov r1, #0x400 ldr r0, _0238BFFC ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 mov ip, r5 @@ -2096,7 +2096,7 @@ ov13_0238BE6C: ; 0x0238BE6C mov r1, #4 mov r2, #0x18 add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow ldr r0, _0238BFFC ; =OVERLAY13_UNKNOWN_POINTER__NA_238CEA0 ldr r3, _0238C004 ; =0x0000C402 ldr r2, [r0] @@ -2118,7 +2118,7 @@ ov13_0238BE6C: ; 0x0238BE6C mov r0, r4 mov r1, #4 mov r2, #0x24 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0x54 diff --git a/asm/overlay_14.s b/asm/overlay_14.s index 7290b7dd..72de1f81 100644 --- a/asm/overlay_14.s +++ b/asm/overlay_14.s @@ -837,7 +837,7 @@ ov14_0238ACEC: ; 0x0238ACEC mvn r1, #1 cmp r0, r1 ldmeqia sp!, {r3, pc} - bl sub_02027B58 + bl ClearWindow ldmia sp!, {r3, pc} arm_func_end ov14_0238ACEC @@ -849,7 +849,7 @@ ov14_0238AD04: ; 0x0238AD04 mvn r1, #1 cmp r4, r1 beq _0238ADF0 - bl sub_02027B58 + bl ClearWindow ldr r0, _0238ADF8 ; =SENTRY_DUTY_PTR ldr r1, [r0] ldrsb r0, [r1, #4] @@ -863,7 +863,7 @@ ov14_0238AD04: ; 0x0238AD04 add r3, sp, #0 mov r0, r4 sub r2, r1, #3 - bl sub_02026214 + bl DrawTextInWindow ldr r1, _0238ADF8 ; =SENTRY_DUTY_PTR add r0, sp, #0 ldr r1, [r1] @@ -874,7 +874,7 @@ ov14_0238AD04: ; 0x0238AD04 mov r0, r4 sub r2, r1, #0x7b add r3, sp, #0 - bl sub_02026214 + bl DrawTextInWindow _0238AD84: ldr r0, _0238ADF8 ; =SENTRY_DUTY_PTR ldr r1, [r0] @@ -889,7 +889,7 @@ _0238AD84: add r3, sp, #0 mov r0, r4 sub r2, r1, #3 - bl sub_02026214 + bl DrawTextInWindow ldr r1, _0238ADF8 ; =SENTRY_DUTY_PTR add r0, sp, #0 ldr r1, [r1] @@ -900,7 +900,7 @@ _0238AD84: mov r0, r4 sub r2, r1, #0x7b add r3, sp, #0 - bl sub_02026214 + bl DrawTextInWindow _0238ADE8: mov r0, r4 bl sub_02027AF0 @@ -2924,7 +2924,7 @@ _0238C9C0: ldrsb r0, [r0, #3] cmp r0, r1 beq _0238CA10 - bl sub_02027B58 + bl ClearWindow _0238CA10: ldr r1, _0238CA54 ; =SENTRY_DUTY_PTR ldr r0, _0238CA90 ; =0x00002C04 @@ -3450,7 +3450,7 @@ _0238D160: ldr r0, _0238D2FC ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #4] - bl sub_02027B58 + bl ClearWindow ldr r0, _0238D2FC ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #4] @@ -3458,7 +3458,7 @@ _0238D160: ldr r0, _0238D2FC ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #5] - bl sub_02027B58 + bl ClearWindow ldr r0, _0238D2FC ; =SENTRY_DUTY_PTR ldr r0, [r0] ldrsb r0, [r0, #5] @@ -3585,7 +3585,7 @@ SentryState10: ; 0x0238D320 ldrsb r0, [r0, #3] cmp r0, r1 beq _0238D368 - bl sub_02027B58 + bl ClearWindow _0238D368: ldr r0, _0238D394 ; =0x00002C08 bl sub_02017C80 @@ -3872,7 +3872,7 @@ SentryState1D: ; 0x0238D69C mvn r1, #1 cmp r0, r1 beq _0238D6CC - bl sub_02027B58 + bl ClearWindow _0238D6CC: ldr r0, _0238D6FC ; =SENTRY_DUTY_PTR ldr r0, [r0] diff --git a/asm/overlay_15.s b/asm/overlay_15.s index cd0e1516..29988c57 100644 --- a/asm/overlay_15.s +++ b/asm/overlay_15.s @@ -929,7 +929,7 @@ ov15_0238ADFC: ; 0x0238ADFC mov r0, r4 mov r1, #8 mov r2, #6 - bl sub_02026214 + bl DrawTextInWindow bl GetMoneyStored add r1, sp, #0x400 str r0, [sp, #0x428] @@ -944,7 +944,7 @@ ov15_0238ADFC: ; 0x0238ADFC mov r1, #0x74 mov r2, #6 add r3, sp, #4 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0x54 diff --git a/asm/overlay_18.s b/asm/overlay_18.s index 96065f12..ae6a4001 100644 --- a/asm/overlay_18.s +++ b/asm/overlay_18.s @@ -1043,7 +1043,7 @@ ov18_0238AF3C: ; 0x0238AF3C mov r0, r4 mov r1, #0x16 mov r2, #0x10 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0x54 diff --git a/asm/overlay_20.s b/asm/overlay_20.s index 6da967bb..faa54c50 100644 --- a/asm/overlay_20.s +++ b/asm/overlay_20.s @@ -1802,7 +1802,7 @@ ov20_0238B8CC: ; 0x0238B8CC mov r0, sl mov r1, #8 mov r2, r8 - bl sub_02026214 + bl DrawTextInWindow mov r0, #0x17 str r0, [sp] mov r0, sl @@ -1867,7 +1867,7 @@ _0238B9F8: mov r1, #8 mov r2, r8 add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow add r8, r8, #0xc add sb, sb, #1 _0238BA14: @@ -1914,7 +1914,7 @@ ov20_0238BA40: ; 0x0238BA40 mov r0, r5 mov r1, #8 mov r2, #2 - bl sub_02026214 + bl DrawTextInWindow mov r0, r5 bl sub_02027AF0 add sp, sp, #0x154 @@ -1947,7 +1947,7 @@ ov20_0238BAB4: ; 0x0238BAB4 mov r0, r4 mov r1, #8 mov r2, #0 - bl sub_02026214 + bl DrawTextInWindow mov r0, #0x17 str r0, [sp] mov r0, r4 @@ -1966,7 +1966,7 @@ ov20_0238BAB4: ; 0x0238BAB4 mov r1, #8 mov r2, #0x18 add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0x154 @@ -3433,7 +3433,7 @@ ov20_0238CE9C: ; 0x0238CE9C mov r0, r5 mov r2, r1 add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow mov r0, r5 bl sub_02027AF0 add sp, sp, #0x154 @@ -3466,7 +3466,7 @@ ov20_0238CF20: ; 0x0238CF20 mov r0, r4 mov r2, r1 add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0x154 diff --git a/asm/overlay_21.s b/asm/overlay_21.s index 728f1390..4fec8041 100644 --- a/asm/overlay_21.s +++ b/asm/overlay_21.s @@ -2838,7 +2838,7 @@ ov21_0238C9A4: ; 0x0238C9A4 mov r1, #0x16 mov r2, #0x10 add r3, sp, #4 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0x54 diff --git a/asm/overlay_25.s b/asm/overlay_25.s index 16473449..f4490c4f 100644 --- a/asm/overlay_25.s +++ b/asm/overlay_25.s @@ -1345,7 +1345,7 @@ ov25_0238B414: ; 0x0238B414 mov r0, r4 mov r2, r1 add r3, sp, #4 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0x54 diff --git a/asm/overlay_28.s b/asm/overlay_28.s index ca6302d6..081e8b9d 100644 --- a/asm/overlay_28.s +++ b/asm/overlay_28.s @@ -845,7 +845,7 @@ _0238AC9C: mov r2, r8 mov r3, r4 add r1, r6, r1, ror #29 - bl sub_02026214 + bl DrawTextInWindow add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 diff --git a/asm/overlay_29_022DC240.s b/asm/overlay_29_022DC240.s index 9b9c454d..8994ad5a 100644 --- a/asm/overlay_29_022DC240.s +++ b/asm/overlay_29_022DC240.s @@ -344,17 +344,17 @@ ov29_022DC694: ; 0x022DC694 mov r0, r5 mov r1, #0 mov r2, #1 - bl ov10_022C09E8 + bl DrawTeamStats add sp, sp, #0x14 ldmia sp!, {r4, r5, pc} arm_func_end ov29_022DC694 arm_func_start ov29_022DC6D0 ov29_022DC6D0: ; 0x022DC6D0 - ldr ip, _022DC6D8 ; =ov10_022C0CE0 + ldr ip, _022DC6D8 ; =UpdateTeamStats bx ip .align 2, 0 -_022DC6D8: .word ov10_022C0CE0 +_022DC6D8: .word UpdateTeamStats arm_func_end ov29_022DC6D0 arm_func_start ov29_022DC6DC @@ -388,7 +388,7 @@ ov29_022DC6E8: ; 0x022DC6E8 arm_func_start ov29_022DC728 ov29_022DC728: ; 0x022DC728 stmdb sp!, {r3, lr} - bl ov10_022C13B4 + bl FreeTeamStats bl ov10_022C096C ldmia sp!, {r3, pc} arm_func_end ov29_022DC728 @@ -426,7 +426,7 @@ ov29_022DC778: ; 0x022DC778 arm_func_start ov29_022DC77C ov29_022DC77C: ; 0x022DC77C stmdb sp!, {r3, lr} - bl ov10_022C16D8 + bl FreeMapAndTeam bl ov10_022C096C ldmia sp!, {r3, pc} arm_func_end ov29_022DC77C @@ -3119,7 +3119,7 @@ ov29_022DEADC: ; 0x022DEADC mov r0, #1 mov r1, #0x4000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 ldmia sp!, {r3, pc} @@ -3131,7 +3131,7 @@ ov29_022DEB40: ; 0x022DEB40 mov r0, #2 mov r1, #0x4000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 mov r0, #1 @@ -3519,7 +3519,7 @@ _022DF0AC: bl sub_02017B00 mov r1, r5 bl ov29_022EAF48 - bl ov29_022E7EC4 + bl AllocTopScreenStatus bl ov29_022E6F94 bl ov29_022E1640 bl ov29_023362EC @@ -3890,7 +3890,7 @@ _022DF5E4: cmp r0, #0 bne _022DF660 mov r0, #0x3c - bl ov29_023482D4 + bl DisplayFloorCard _022DF660: bl ov29_022E12F8 cmp r5, #0 @@ -4013,17 +4013,17 @@ _022DF7EC: mov r2, #0 beq _022DF824 mov r0, #4 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r8, #0 b _022DF82C _022DF824: mov r0, #1 - bl ov29_0234C668 + bl StartFadeDungeonWrapper _022DF82C: mov r0, #1 mov r2, r0 mov r1, #0x1000 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 bl ov29_022E0E44 @@ -4337,7 +4337,7 @@ _022DFC60: mov r0, #1 mov r1, #0x4000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 mov r0, #0 @@ -4347,7 +4347,7 @@ _022DFC60: mov r0, #2 mov r1, #0x4000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 mov r0, #1 @@ -4765,7 +4765,7 @@ _022E02EC: strneb r0, [sl, #0x1a8] _022E030C: bl ov10_022BDC0C - bl ov29_022E7F44 + bl FreeTopScreenStatus bl ov29_0234AFD0 bl ov29_0234BB20 bl ov29_02338D30 diff --git a/asm/overlay_29_022E0378.s b/asm/overlay_29_022E0378.s index 5615df30..811d479a 100644 --- a/asm/overlay_29_022E0378.s +++ b/asm/overlay_29_022E0378.s @@ -480,11 +480,11 @@ FadeToBlack: ; 0x022E0968 mov r0, #2 mov r1, #0x1000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #2 mov r1, #0x1000 mov r2, #1 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 bl ov29_022E0E44 diff --git a/asm/overlay_29_022E37DC.s b/asm/overlay_29_022E37DC.s index 1bb69514..432f3839 100644 --- a/asm/overlay_29_022E37DC.s +++ b/asm/overlay_29_022E37DC.s @@ -5597,17 +5597,17 @@ _022E7EA4: _022E7EC0: .word DUNGEON_PTR arm_func_end GetMonsterLevelToSpawn - arm_func_start ov29_022E7EC4 -ov29_022E7EC4: ; 0x022E7EC4 + arm_func_start AllocTopScreenStatus +AllocTopScreenStatus: ; 0x022E7EC4 stmdb sp!, {r3, lr} mov r0, #0x230 mov r1, #0 bl MemAlloc - ldr r2, _022E7F40 ; =ov29_02353554 + ldr r2, _022E7F40 ; =TOP_SCREEN_STATUS_PTR mov r1, #0x230 str r0, [r2] bl MemZero - ldr r0, _022E7F40 ; =ov29_02353554 + ldr r0, _022E7F40 ; =TOP_SCREEN_STATUS_PTR mov r2, #0 ldr r1, [r0] strb r2, [r1] @@ -5622,7 +5622,7 @@ ov29_022E7EC4: ; 0x022E7EC4 ldr r0, [r0] strb r2, [r0, #0x228] bl ov29_022E8708 - ldr r0, _022E7F40 ; =ov29_02353554 + ldr r0, _022E7F40 ; =TOP_SCREEN_STATUS_PTR mov r3, #2 ldr r2, [r0] mov r1, #0 @@ -5631,43 +5631,43 @@ ov29_022E7EC4: ; 0x022E7EC4 strb r1, [r0, #0x229] ldmia sp!, {r3, pc} .align 2, 0 -_022E7F40: .word ov29_02353554 - arm_func_end ov29_022E7EC4 +_022E7F40: .word TOP_SCREEN_STATUS_PTR + arm_func_end AllocTopScreenStatus - arm_func_start ov29_022E7F44 -ov29_022E7F44: ; 0x022E7F44 + arm_func_start FreeTopScreenStatus +FreeTopScreenStatus: ; 0x022E7F44 stmdb sp!, {r3, lr} - ldr r0, _022E7F78 ; =ov29_02353554 + ldr r0, _022E7F78 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} - bl ov29_022E8C4C - ldr r0, _022E7F78 ; =ov29_02353554 + bl FreeTopScreen + ldr r0, _022E7F78 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] bl MemFree - ldr r0, _022E7F78 ; =ov29_02353554 + ldr r0, _022E7F78 ; =TOP_SCREEN_STATUS_PTR mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_022E7F78: .word ov29_02353554 - arm_func_end ov29_022E7F44 +_022E7F78: .word TOP_SCREEN_STATUS_PTR + arm_func_end FreeTopScreenStatus arm_func_start ov29_022E7F7C ov29_022E7F7C: ; 0x022E7F7C - ldr r0, _022E7F90 ; =ov29_02353554 + ldr r0, _022E7F90 ; =TOP_SCREEN_STATUS_PTR mov r1, #0 ldr r0, [r0] strb r1, [r0] bx lr .align 2, 0 -_022E7F90: .word ov29_02353554 +_022E7F90: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E7F7C arm_func_start ov29_022E7F94 ov29_022E7F94: ; 0x022E7F94 stmdb sp!, {r3, lr} - ldr r0, _022E8014 ; =ov29_02353554 + ldr r0, _022E8014 ; =TOP_SCREEN_STATUS_PTR mov r3, #0 ldr r2, [r0] mov r1, #1 @@ -5681,7 +5681,7 @@ ov29_022E7F94: ; 0x022E7F94 bl UpdateMinimap mov r0, #0 bl SetMinimapDataE447 - ldr r1, _022E8014 ; =ov29_02353554 + ldr r1, _022E8014 ; =TOP_SCREEN_STATUS_PTR mov r0, #1 ldr r1, [r1] strb r0, [r1] @@ -5689,7 +5689,7 @@ ov29_022E7F94: ; 0x022E7F94 bl ov29_022E8104 bl ov29_022F42D8 cmp r0, #2 - ldr r0, _022E8014 ; =ov29_02353554 + ldr r0, _022E8014 ; =TOP_SCREEN_STATUS_PTR moveq r1, #1 ldr r0, [r0] movne r1, #0 @@ -5699,20 +5699,20 @@ ov29_022E7F94: ; 0x022E7F94 mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_022E8014: .word ov29_02353554 +_022E8014: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E7F94 arm_func_start ov29_022E8018 ov29_022E8018: ; 0x022E8018 stmdb sp!, {r3, lr} - ldr r0, _022E8050 ; =ov29_02353554 + ldr r0, _022E8050 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] ldrb r0, [r0, #0x228] cmp r0, #0 beq _022E8048 bl ov29_022DC76C bl ov29_022DC778 - ldr r0, _022E8050 ; =ov29_02353554 + ldr r0, _022E8050 ; =TOP_SCREEN_STATUS_PTR mov r1, #0 ldr r0, [r0] strb r1, [r0, #0x228] @@ -5720,7 +5720,7 @@ _022E8048: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_022E8050: .word ov29_02353554 +_022E8050: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8018 arm_func_start ov29_022E8054 @@ -5733,12 +5733,12 @@ ov29_022E8054: ; 0x022E8054 strb r1, [r0, #0x10] bl sub_0204AEA0 cmp r0, #3 - ldrne r0, _022E80CC ; =ov29_02353554 + ldrne r0, _022E80CC ; =TOP_SCREEN_STATUS_PTR movne r1, #0 ldrne r0, [r0] strneb r1, [r0] ldmneia sp!, {r3, pc} - ldr r0, _022E80CC ; =ov29_02353554 + ldr r0, _022E80CC ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] ldrb r0, [r0] cmp r0, #0 @@ -5750,20 +5750,20 @@ ov29_022E8054: ; 0x022E8054 mov r0, #1 mov r1, #0 bl ov29_02339D7C - ldr r0, _022E80CC ; =ov29_02353554 + ldr r0, _022E80CC ; =TOP_SCREEN_STATUS_PTR mov r1, #1 ldr r0, [r0] strb r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_022E80CC: .word ov29_02353554 +_022E80CC: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8054 arm_func_start ov29_022E80D0 ov29_022E80D0: ; 0x022E80D0 stmdb sp!, {r3, lr} bl ov29_022DC77C - ldr r1, _022E8100 ; =ov29_02353554 + ldr r1, _022E8100 ; =TOP_SCREEN_STATUS_PTR mov r0, #0 ldr r1, [r1] strb r0, [r1] @@ -5774,13 +5774,13 @@ ov29_022E80D0: ; 0x022E80D0 mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_022E8100: .word ov29_02353554 +_022E8100: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E80D0 arm_func_start ov29_022E8104 ov29_022E8104: ; 0x022E8104 stmdb sp!, {r3, lr} - ldr r0, _022E812C ; =ov29_02353554 + ldr r0, _022E812C ; =TOP_SCREEN_STATUS_PTR mov r2, #0 ldr r1, [r0] strb r2, [r1, #0x228] @@ -5790,26 +5790,26 @@ ov29_022E8104: ; 0x022E8104 bl ov29_022E8CE8 ldmia sp!, {r3, pc} .align 2, 0 -_022E812C: .word ov29_02353554 +_022E812C: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8104 - arm_func_start ov29_022E8130 -ov29_022E8130: ; 0x022E8130 + arm_func_start InitializeTeamStats +InitializeTeamStats: ; 0x022E8130 stmdb sp!, {r3, lr} - ldr r0, _022E818C ; =ov29_02353554 + ldr r0, _022E818C ; =TOP_SCREEN_STATUS_PTR mov r2, #0 ldr r1, [r0] strb r2, [r1, #0x228] ldr r0, [r0] strb r2, [r0, #0x229] bl ov29_022E8104 - ldr r0, _022E818C ; =ov29_02353554 + ldr r0, _022E818C ; =TOP_SCREEN_STATUS_PTR mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x24] bl ov29_022F42D8 cmp r0, #2 - ldr r0, _022E818C ; =ov29_02353554 + ldr r0, _022E818C ; =TOP_SCREEN_STATUS_PTR moveq r1, #1 ldr r0, [r0] movne r1, #0 @@ -5819,19 +5819,19 @@ ov29_022E8130: ; 0x022E8130 mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_022E818C: .word ov29_02353554 - arm_func_end ov29_022E8130 +_022E818C: .word TOP_SCREEN_STATUS_PTR + arm_func_end InitializeTeamStats - arm_func_start ov29_022E8190 -ov29_022E8190: ; 0x022E8190 + arm_func_start UpdateTeamStatsWrapper +UpdateTeamStatsWrapper: ; 0x022E8190 stmdb sp!, {r3, lr} - ldr r0, _022E81C4 ; =ov29_02353554 + ldr r0, _022E81C4 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] ldrb r0, [r0, #0x228] cmp r0, #0 beq _022E81BC bl ov29_022DC6D0 - ldr r0, _022E81C4 ; =ov29_02353554 + ldr r0, _022E81C4 ; =TOP_SCREEN_STATUS_PTR mov r1, #0 ldr r0, [r0] strb r1, [r0, #0x228] @@ -5839,8 +5839,8 @@ _022E81BC: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_022E81C4: .word ov29_02353554 - arm_func_end ov29_022E8190 +_022E81C4: .word TOP_SCREEN_STATUS_PTR + arm_func_end UpdateTeamStatsWrapper arm_func_start ov29_022E81C8 ov29_022E81C8: ; 0x022E81C8 @@ -5854,13 +5854,13 @@ ov29_022E81C8: ; 0x022E81C8 ldmia sp!, {r4, pc} arm_func_end ov29_022E81C8 - arm_func_start ov29_022E81E8 -ov29_022E81E8: ; 0x022E81E8 + arm_func_start FreeTeamStatsWrapper +FreeTeamStatsWrapper: ; 0x022E81E8 stmdb sp!, {r3, lr} bl ov29_022DC728 mov r0, #1 ldmia sp!, {r3, pc} - arm_func_end ov29_022E81E8 + arm_func_end FreeTeamStatsWrapper arm_func_start ov29_022E81F8 ov29_022E81F8: ; 0x022E81F8 @@ -5874,7 +5874,7 @@ _022E8210: bl sub_0204AEA0 cmp r0, #1 bne _022E8238 - ldr r0, _022E8240 ; =ov29_02353554 + ldr r0, _022E8240 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] ldrsh r0, [r0, #8] cmp r0, #1 @@ -5885,7 +5885,7 @@ _022E8238: bl ov29_022E8CE8 ldmia sp!, {r3, pc} .align 2, 0 -_022E8240: .word ov29_02353554 +_022E8240: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E81F8 arm_func_start ov29_022E8244 @@ -5893,7 +5893,7 @@ ov29_022E8244: ; 0x022E8244 stmdb sp!, {r3, lr} bl sub_0204AEA0 cmp r0, #4 - ldreq r0, _022E826C ; =ov29_02353554 + ldreq r0, _022E826C ; =TOP_SCREEN_STATUS_PTR ldreq r0, [r0] ldreqsh r0, [r0, #8] cmpeq r0, #4 @@ -5901,14 +5901,14 @@ ov29_022E8244: ; 0x022E8244 bl ov29_022E9008 ldmia sp!, {r3, pc} .align 2, 0 -_022E826C: .word ov29_02353554 +_022E826C: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8244 arm_func_start ov29_022E8270 ov29_022E8270: ; 0x022E8270 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x1c - ldr r3, _022E83FC ; =ov29_02353554 + ldr r3, _022E83FC ; =TOP_SCREEN_STATUS_PTR mov sl, r0 ldr r3, [r3] mov sb, r1 @@ -6014,7 +6014,7 @@ _022E83F4: add sp, sp, #0x1c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022E83FC: .word ov29_02353554 +_022E83FC: .word TOP_SCREEN_STATUS_PTR _022E8400: .word DUNGEON_PTR _022E8404: .word 0x00000229 _022E8408: .word ov29_0237C850 @@ -6024,7 +6024,7 @@ _022E8408: .word ov29_0237C850 ov29_022E840C: ; 0x022E840C stmdb sp!, {lr} sub sp, sp, #0x14 - ldr r0, _022E8478 ; =ov29_02353554 + ldr r0, _022E8478 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] ldrb r0, [r0, #0x29] cmp r0, #0 @@ -6032,7 +6032,7 @@ ov29_022E840C: ; 0x022E840C bne _022E8470 add r0, sp, #0 bl ov10_022C22A0 - ldr r0, _022E8478 ; =ov29_02353554 + ldr r0, _022E8478 ; =TOP_SCREEN_STATUS_PTR add r1, sp, #0 ldr r0, [r0] mov r2, #0 @@ -6044,7 +6044,7 @@ ov29_022E840C: ; 0x022E840C beq _022E8460 bl sub_02048384 _022E8460: - ldr r1, _022E8478 ; =ov29_02353554 + ldr r1, _022E8478 ; =TOP_SCREEN_STATUS_PTR mov r0, #1 ldr r1, [r1] strb r0, [r1, #0x29] @@ -6052,7 +6052,7 @@ _022E8470: add sp, sp, #0x14 ldmia sp!, {pc} .align 2, 0 -_022E8478: .word ov29_02353554 +_022E8478: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E840C arm_func_start ov29_022E847C @@ -6064,19 +6064,19 @@ ov29_022E847C: ; 0x022E847C mov r1, #0 strb r1, [r0, #0x10] bl sub_020483B8 - ldr r0, _022E84AC ; =ov29_02353554 + ldr r0, _022E84AC ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] add r0, r0, #0x80 bl ov10_022C21D8 ldmia sp!, {r3, pc} .align 2, 0 -_022E84AC: .word ov29_02353554 +_022E84AC: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E847C arm_func_start ov29_022E84B0 ov29_022E84B0: ; 0x022E84B0 stmdb sp!, {r3, lr} - ldr r0, _022E84FC ; =ov29_02353554 + ldr r0, _022E84FC ; =TOP_SCREEN_STATUS_PTR ldr r1, [r0] ldrb r0, [r1, #0x29] cmp r0, #0 @@ -6089,14 +6089,14 @@ ov29_022E84B0: ; 0x022E84B0 beq _022E84E4 bl sub_020483D8 _022E84E4: - ldr r0, _022E84FC ; =ov29_02353554 + ldr r0, _022E84FC ; =TOP_SCREEN_STATUS_PTR mov r2, #0 ldr r1, [r0] mov r0, #1 strb r2, [r1, #0x29] ldmia sp!, {r3, pc} .align 2, 0 -_022E84FC: .word ov29_02353554 +_022E84FC: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E84B0 arm_func_start ov29_022E8500 @@ -6105,14 +6105,14 @@ ov29_022E8500: ; 0x022E8500 sub sp, sp, #0x14 add r0, sp, #0 bl ov10_022C22A0 - ldr r0, _022E8548 ; =ov29_02353554 + ldr r0, _022E8548 ; =TOP_SCREEN_STATUS_PTR add r1, sp, #0 ldr r0, [r0] mov r2, #0 add r0, r0, #0x80 mov r3, #1 bl ov10_022C1E80 - ldr r0, _022E8548 ; =ov29_02353554 + ldr r0, _022E8548 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] add r0, r0, #0x80 bl ov10_022C21D8 @@ -6120,7 +6120,7 @@ ov29_022E8500: ; 0x022E8500 add sp, sp, #0x14 ldmia sp!, {pc} .align 2, 0 -_022E8548: .word ov29_02353554 +_022E8548: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8500 arm_func_start ov29_022E854C @@ -6132,7 +6132,7 @@ ov29_022E854C: ; 0x022E854C ldmeqia sp!, {r4, pc} add r0, r4, #0x10 bl ov29_022E8F78 - ldr r0, _022E8584 ; =ov29_02353554 + ldr r0, _022E8584 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] add r0, r0, #0x80 bl ov10_022C21D8 @@ -6140,20 +6140,20 @@ ov29_022E854C: ; 0x022E854C strb r0, [r4, #0x10] ldmia sp!, {r4, pc} .align 2, 0 -_022E8584: .word ov29_02353554 +_022E8584: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E854C arm_func_start ov29_022E8588 ov29_022E8588: ; 0x022E8588 stmdb sp!, {r3, lr} - ldr r0, _022E85A4 ; =ov29_02353554 + ldr r0, _022E85A4 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] add r0, r0, #0x80 bl ov10_022C2278 bl ov29_022E8F28 ldmia sp!, {r3, pc} .align 2, 0 -_022E85A4: .word ov29_02353554 +_022E85A4: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8588 arm_func_start ov29_022E85A8 @@ -6162,14 +6162,14 @@ ov29_022E85A8: ; 0x022E85A8 sub sp, sp, #0x14 add r0, sp, #0 bl ov10_022C22A0 - ldr r0, _022E85F0 ; =ov29_02353554 + ldr r0, _022E85F0 ; =TOP_SCREEN_STATUS_PTR add r1, sp, #0 ldr r0, [r0] mov r2, #0 add r0, r0, #0x80 mov r3, #1 bl ov10_022C1E80 - ldr r0, _022E85F0 ; =ov29_02353554 + ldr r0, _022E85F0 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] add r0, r0, #0x80 bl ov10_022C21D8 @@ -6177,7 +6177,7 @@ ov29_022E85A8: ; 0x022E85A8 add sp, sp, #0x14 ldmia sp!, {pc} .align 2, 0 -_022E85F0: .word ov29_02353554 +_022E85F0: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E85A8 arm_func_start ov29_022E85F4 @@ -6189,7 +6189,7 @@ ov29_022E85F4: ; 0x022E85F4 ldmeqia sp!, {r4, pc} add r0, r4, #0x10 bl ov29_022E9014 - ldr r0, _022E862C ; =ov29_02353554 + ldr r0, _022E862C ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] add r0, r0, #0x80 bl ov10_022C21D8 @@ -6197,20 +6197,20 @@ ov29_022E85F4: ; 0x022E85F4 strb r0, [r4, #0x10] ldmia sp!, {r4, pc} .align 2, 0 -_022E862C: .word ov29_02353554 +_022E862C: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E85F4 arm_func_start ov29_022E8630 ov29_022E8630: ; 0x022E8630 stmdb sp!, {r3, lr} - ldr r0, _022E864C ; =ov29_02353554 + ldr r0, _022E864C ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] add r0, r0, #0x80 bl ov10_022C2278 bl ov29_022E8FF8 ldmia sp!, {r3, pc} .align 2, 0 -_022E864C: .word ov29_02353554 +_022E864C: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8630 arm_func_start ov29_022E8650 @@ -6219,14 +6219,14 @@ ov29_022E8650: ; 0x022E8650 sub sp, sp, #0x14 add r0, sp, #0 bl ov10_022C22A0 - ldr r0, _022E8698 ; =ov29_02353554 + ldr r0, _022E8698 ; =TOP_SCREEN_STATUS_PTR add r1, sp, #0 ldr r0, [r0] mov r2, #0 add r0, r0, #0x80 mov r3, #1 bl ov10_022C1E80 - ldr r0, _022E8698 ; =ov29_02353554 + ldr r0, _022E8698 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] add r0, r0, #0x80 bl ov10_022C21D8 @@ -6234,7 +6234,7 @@ ov29_022E8650: ; 0x022E8650 add sp, sp, #0x14 ldmia sp!, {pc} .align 2, 0 -_022E8698: .word ov29_02353554 +_022E8698: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8650 arm_func_start ov29_022E869C @@ -6251,18 +6251,18 @@ ov29_022E86A4: ; 0x022E86A4 arm_func_start ov29_022E86A8 ov29_022E86A8: ; 0x022E86A8 stmdb sp!, {r3, lr} - ldr r0, _022E86C4 ; =ov29_02353554 + ldr r0, _022E86C4 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] add r0, r0, #0x80 bl ov10_022C2278 mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_022E86C4: .word ov29_02353554 +_022E86C4: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E86A8 - arm_func_start ov29_022E86C8 -ov29_022E86C8: ; 0x022E86C8 + arm_func_start AssignTopScreenHandlers +AssignTopScreenHandlers: ; 0x022E86C8 str r1, [r0] ldr r1, [sp] stmib r0, {r2, r3} @@ -6270,12 +6270,12 @@ ov29_022E86C8: ; 0x022E86C8 mov r1, #1 strb r1, [r0, #0x10] bx lr - arm_func_end ov29_022E86C8 + arm_func_end AssignTopScreenHandlers arm_func_start ov29_022E86E4 ov29_022E86E4: ; 0x022E86E4 stmdb sp!, {r3, lr} - ldr r0, _022E8704 ; =ov29_02353554 + ldr r0, _022E8704 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] ldr r0, [r0, #0x18] cmp r0, #0 @@ -6283,7 +6283,7 @@ ov29_022E86E4: ; 0x022E86E4 blx r0 ldmia sp!, {r3, pc} .align 2, 0 -_022E8704: .word ov29_02353554 +_022E8704: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E86E4 arm_func_start ov29_022E8708 @@ -6330,7 +6330,7 @@ _022E8774: .word ov29_022E8CA8 arm_func_start ov29_022E8778 ov29_022E8778: ; 0x022E8778 stmdb sp!, {r3, lr} - ldr r0, _022E87B0 ; =ov29_02353554 + ldr r0, _022E87B0 ; =TOP_SCREEN_STATUS_PTR mov r3, #3 ldr r2, [r0] sub r1, r3, #4 @@ -6338,18 +6338,18 @@ ov29_022E8778: ; 0x022E8778 ldr r0, [r0] strh r1, [r0, #0x10] bl ov29_022E8104 - ldr r0, _022E87B0 ; =ov29_02353554 + ldr r0, _022E87B0 ; =TOP_SCREEN_STATUS_PTR ldr r1, [r0] ldrsh r0, [r1, #0x10] strh r0, [r1, #8] ldmia sp!, {r3, pc} .align 2, 0 -_022E87B0: .word ov29_02353554 +_022E87B0: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8778 arm_func_start ov29_022E87B4 ov29_022E87B4: ; 0x022E87B4 - ldr r1, _022E87D8 ; =ov29_02353554 + ldr r1, _022E87D8 ; =TOP_SCREEN_STATUS_PTR ldr r2, [r1] ldrsh r1, [r2, #8] cmp r1, r0 @@ -6359,7 +6359,7 @@ ov29_022E87B4: ; 0x022E87B4 movne r0, #0 bx lr .align 2, 0 -_022E87D8: .word ov29_02353554 +_022E87D8: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E87B4 arm_func_start ov29_022E87DC @@ -6377,17 +6377,17 @@ _022E87F8: .word ov29_023515E8 arm_func_start ov29_022E87FC ov29_022E87FC: ; 0x022E87FC - ldr r1, _022E880C ; =ov29_02353554 + ldr r1, _022E880C ; =TOP_SCREEN_STATUS_PTR ldr r1, [r1] strb r0, [r1, #0x2b] bx lr .align 2, 0 -_022E880C: .word ov29_02353554 +_022E880C: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E87FC arm_func_start ov29_022E8810 ov29_022E8810: ; 0x022E8810 - ldr r0, _022E8830 ; =ov29_02353554 + ldr r0, _022E8830 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] ldr r0, [r0, #4] cmp r0, #1 @@ -6396,22 +6396,22 @@ ov29_022E8810: ; 0x022E8810 and r0, r0, #0xff bx lr .align 2, 0 -_022E8830: .word ov29_02353554 +_022E8830: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8810 arm_func_start ov29_022E8834 ov29_022E8834: ; 0x022E8834 - ldr r1, _022E8844 ; =ov29_02353554 + ldr r1, _022E8844 ; =TOP_SCREEN_STATUS_PTR ldr r1, [r1] strb r0, [r1, #0x2c] bx lr .align 2, 0 -_022E8844: .word ov29_02353554 +_022E8844: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8834 arm_func_start ov29_022E8848 ov29_022E8848: ; 0x022E8848 - ldr r0, _022E8868 ; =ov29_02353554 + ldr r0, _022E8868 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] ldr r0, [r0, #4] cmp r0, #3 @@ -6420,13 +6420,13 @@ ov29_022E8848: ; 0x022E8848 and r0, r0, #0xff bx lr .align 2, 0 -_022E8868: .word ov29_02353554 +_022E8868: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8848 - arm_func_start ov29_022E886C -ov29_022E886C: ; 0x022E886C + arm_func_start HandleTopScreenFades +HandleTopScreenFades: ; 0x022E886C stmdb sp!, {r3, r4, r5, lr} - ldr r0, _022E8BA0 ; =ov29_02353554 + ldr r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR ldr r5, [r0] cmp r5, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -6456,13 +6456,13 @@ _022E88C0: bl ov29_0234C70C cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _022E8BA0 ; =ov29_02353554 + ldr r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR mov r1, #5 ldr r0, [r0] str r1, [r0, #4] _022E88EC: - bl ov29_022E8C4C - ldr r0, _022E8BA0 ; =ov29_02353554 + bl FreeTopScreen + ldr r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR ldr r4, [r0] ldrsh r0, [r4, #0x10] cmp r0, #5 @@ -6482,16 +6482,16 @@ _022E8920: add r0, r4, #0x14 mov r2, #0 str ip, [sp] - bl ov29_022E86C8 + bl AssignTopScreenHandlers b _022E89DC _022E8940: - ldr ip, _022E8BB0 ; =ov29_022E81E8 - ldr r1, _022E8BB4 ; =ov29_022E8130 - ldr r2, _022E8BB8 ; =ov29_022E8190 + ldr ip, _022E8BB0 ; =FreeTeamStatsWrapper + ldr r1, _022E8BB4 ; =InitializeTeamStats + ldr r2, _022E8BB8 ; =UpdateTeamStatsWrapper ldr r3, _022E8BBC ; =ov29_022E81C8 add r0, r4, #0x14 str ip, [sp] - bl ov29_022E86C8 + bl AssignTopScreenHandlers b _022E89DC _022E8960: ldr ip, _022E8BC0 ; =ov29_022E8588 @@ -6500,7 +6500,7 @@ _022E8960: add r0, r4, #0x14 mov r2, #0 str ip, [sp] - bl ov29_022E86C8 + bl AssignTopScreenHandlers b _022E89DC _022E8980: ldr ip, _022E8BCC ; =ov29_022E80D0 @@ -6509,7 +6509,7 @@ _022E8980: ldr r3, _022E8BD8 ; =ov29_022E8054 add r0, r4, #0x14 str ip, [sp] - bl ov29_022E86C8 + bl AssignTopScreenHandlers b _022E89DC _022E89A0: ldr ip, _022E8BDC ; =ov29_022E8630 @@ -6518,7 +6518,7 @@ _022E89A0: add r0, r4, #0x14 mov r2, #0 str ip, [sp] - bl ov29_022E86C8 + bl AssignTopScreenHandlers b _022E89DC _022E89C0: ldr ip, _022E8BE8 ; =ov29_022E86A8 @@ -6527,9 +6527,9 @@ _022E89C0: ldr r3, _022E8BF4 ; =ov29_022E86A4 add r0, r4, #0x14 str ip, [sp] - bl ov29_022E86C8 + bl AssignTopScreenHandlers _022E89DC: - ldr r0, _022E8BA0 ; =ov29_02353554 + ldr r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR ldrsh r1, [r4, #0x10] ldr r0, [r0] strh r1, [r0, #8] @@ -6548,7 +6548,7 @@ _022E89DC: blx r0 _022E8A20: mov r1, #0 - ldr r0, _022E8BA0 ; =ov29_02353554 + ldr r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR str r1, [r5, #0xc] ldr r2, [r0] ldrb r1, [r2, #0x2c] @@ -6565,8 +6565,8 @@ _022E8A20: mov r0, #1 mov r2, r0 mov r1, #0x4000 - bl ov29_0234C668 - ldr r0, _022E8BA0 ; =ov29_02353554 + bl StartFadeDungeonWrapper + ldr r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR mov r1, #4 ldr r0, [r0] str r1, [r0, #4] @@ -6584,15 +6584,15 @@ _022E8A80: mov r0, #1 mov r2, r0 mov r1, #0x4000 - bl ov29_0234C668 - ldr r0, _022E8BA0 ; =ov29_02353554 + bl StartFadeDungeonWrapper + ldr r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR mov r1, #4 ldr r0, [r0] str r1, [r0, #4] ldmia sp!, {r3, r4, r5, pc} _022E8AC8: bl ov29_022E86E4 - ldr r0, _022E8BA0 ; =ov29_02353554 + ldr r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] ldrb r0, [r0, #2] cmp r0, #0 @@ -6600,7 +6600,7 @@ _022E8AC8: mov r0, #1 bl ov29_0234C70C cmp r0, #0 - ldreq r0, _022E8BA0 ; =ov29_02353554 + ldreq r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR moveq r1, #5 ldreq r0, [r0] streq r1, [r0, #4] @@ -6610,7 +6610,7 @@ _022E8B00: ldr r0, [r5, #0xc] cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _022E8BA0 ; =ov29_02353554 + ldr r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR ldr r2, [r0] ldrb r1, [r2, #1] strb r1, [r2, #2] @@ -6623,8 +6623,8 @@ _022E8B00: mov r0, #2 mov r1, #0x4000 mov r2, #1 - bl ov29_0234C668 - ldr r0, _022E8BA0 ; =ov29_02353554 + bl StartFadeDungeonWrapper + ldr r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR mov r1, #6 ldr r0, [r0] str r1, [r0, #4] @@ -6638,8 +6638,8 @@ _022E8B5C: cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} _022E8B78: - bl ov29_022E8C4C - ldr r0, _022E8BA0 ; =ov29_02353554 + bl FreeTopScreen + ldr r0, _022E8BA0 ; =TOP_SCREEN_STATUS_PTR ldr r1, [r0] ldrb r0, [r1, #0x2b] cmp r0, #0 @@ -6649,13 +6649,13 @@ _022E8B78: streq r0, [r1, #4] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022E8BA0: .word ov29_02353554 +_022E8BA0: .word TOP_SCREEN_STATUS_PTR _022E8BA4: .word ov29_022E84B0 _022E8BA8: .word ov29_022E840C _022E8BAC: .word ov29_022E847C -_022E8BB0: .word ov29_022E81E8 -_022E8BB4: .word ov29_022E8130 -_022E8BB8: .word ov29_022E8190 +_022E8BB0: .word FreeTeamStatsWrapper +_022E8BB4: .word InitializeTeamStats +_022E8BB8: .word UpdateTeamStatsWrapper _022E8BBC: .word ov29_022E81C8 _022E8BC0: .word ov29_022E8588 _022E8BC4: .word ov29_022E8500 @@ -6672,22 +6672,22 @@ _022E8BEC: .word ov29_022E8650 _022E8BF0: .word ov29_022E869C _022E8BF4: .word ov29_022E86A4 _022E8BF8: .word ov29_0235352C - arm_func_end ov29_022E886C + arm_func_end HandleTopScreenFades arm_func_start ov29_022E8BFC ov29_022E8BFC: ; 0x022E8BFC - ldr r1, _022E8C0C ; =ov29_02353554 + ldr r1, _022E8C0C ; =TOP_SCREEN_STATUS_PTR ldr r1, [r1] strb r0, [r1, #1] bx lr .align 2, 0 -_022E8C0C: .word ov29_02353554 +_022E8C0C: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8BFC arm_func_start ov29_022E8C10 ov29_022E8C10: ; 0x022E8C10 stmdb sp!, {r3, lr} - ldr r0, _022E8C48 ; =ov29_02353554 + ldr r0, _022E8C48 ; =TOP_SCREEN_STATUS_PTR ldr r2, [r0] cmp r2, #0 ldmeqia sp!, {r3, pc} @@ -6701,13 +6701,13 @@ ov29_022E8C10: ; 0x022E8C10 blx r1 ldmia sp!, {r3, pc} .align 2, 0 -_022E8C48: .word ov29_02353554 +_022E8C48: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8C10 - arm_func_start ov29_022E8C4C -ov29_022E8C4C: ; 0x022E8C4C + arm_func_start FreeTopScreen +FreeTopScreen: ; 0x022E8C4C stmdb sp!, {r3, r4, r5, lr} - ldr r0, _022E8CA4 ; =ov29_02353554 + ldr r0, _022E8CA4 ; =TOP_SCREEN_STATUS_PTR ldr r4, [r0] ldr r0, [r4, #0x20] cmp r0, #0 @@ -6723,7 +6723,7 @@ ov29_022E8C4C: ; 0x022E8C4C mov r3, r1 add r0, r4, #0x14 str r1, [sp] - bl ov29_022E86C8 + bl AssignTopScreenHandlers b _022E8C9C _022E8C98: mov r5, #1 @@ -6731,12 +6731,12 @@ _022E8C9C: mov r0, r5 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022E8CA4: .word ov29_02353554 - arm_func_end ov29_022E8C4C +_022E8CA4: .word TOP_SCREEN_STATUS_PTR + arm_func_end FreeTopScreen arm_func_start ov29_022E8CA8 ov29_022E8CA8: ; 0x022E8CA8 - ldr r1, _022E8CE4 ; =ov29_02353554 + ldr r1, _022E8CE4 ; =TOP_SCREEN_STATUS_PTR ldr r3, [r1] ldrsh r2, [r3, #8] cmp r2, r0 @@ -6752,7 +6752,7 @@ ov29_022E8CA8: ; 0x022E8CA8 strb r2, [r0, #0x28] bx lr .align 2, 0 -_022E8CE4: .word ov29_02353554 +_022E8CE4: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8CA8 arm_func_start ov29_022E8CE8 @@ -6782,7 +6782,7 @@ _022E8D30: add r0, r1, r8, lsl #2 add r0, r0, #0x12000 ldr r6, [r0, #0xb28] - ldr r0, _022E8E5C ; =ov29_02353554 + ldr r0, _022E8E5C ; =TOP_SCREEN_STATUS_PTR ldr r7, [r6, #0xb4] ldr r0, [r0] add r5, r0, #0xb8 @@ -6831,7 +6831,7 @@ _022E8DE4: mov r0, #0x5c smulbb r4, sb, r0 mov r3, #0 - ldr r1, _022E8E5C ; =ov29_02353554 + ldr r1, _022E8E5C ; =TOP_SCREEN_STATUS_PTR b _022E8E24 _022E8E0C: ldr r2, [r1] @@ -6843,11 +6843,11 @@ _022E8E0C: _022E8E24: cmp sb, #4 blt _022E8E0C - ldr r0, _022E8E5C ; =ov29_02353554 + ldr r0, _022E8E5C ; =TOP_SCREEN_STATUS_PTR ldr r0, [r0] add r0, r0, #0xb8 bl ov29_022DC684 - ldr r0, _022E8E5C ; =ov29_02353554 + ldr r0, _022E8E5C ; =TOP_SCREEN_STATUS_PTR mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x228] @@ -6856,7 +6856,7 @@ _022E8E24: .align 2, 0 _022E8E54: .word 0x000003E7 _022E8E58: .word DUNGEON_PTR -_022E8E5C: .word ov29_02353554 +_022E8E5C: .word TOP_SCREEN_STATUS_PTR arm_func_end ov29_022E8CE8 arm_func_start ov29_022E8E60 @@ -6869,7 +6869,7 @@ ov29_022E8E60: ; 0x022E8E60 mov r3, r0 mov r0, r4 mov r2, r1 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 ldmia sp!, {r4, pc} @@ -6966,7 +6966,7 @@ ov29_022E8F78: ; 0x022E8F78 mov r3, r0 mov r0, r4 mov r2, r1 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 ldmia sp!, {r4, pc} diff --git a/asm/overlay_29_022E9618.s b/asm/overlay_29_022E9618.s index cb78766c..8cceedfc 100644 --- a/asm/overlay_29_022E9618.s +++ b/asm/overlay_29_022E9618.s @@ -770,7 +770,7 @@ ov29_022EA008: ; 0x022EA008 cmp r0, #0 beq _022EA27C bl ov29_0234B854 - bl ov29_022E886C + bl HandleTopScreenFades ldr r0, _022EA290 ; =DUNGEON_PTR ldr r0, [r0] cmp r0, #0 diff --git a/asm/overlay_29_022F05B4.s b/asm/overlay_29_022F05B4.s index ee15095a..e76b8e70 100644 --- a/asm/overlay_29_022F05B4.s +++ b/asm/overlay_29_022F05B4.s @@ -456,7 +456,7 @@ ov29_022F0B10: ; 0x022F0B10 mov r1, #0xa mov r2, #0x14 add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0xd4 diff --git a/asm/overlay_29_02328030.s b/asm/overlay_29_02328030.s index 8fed6895..d053ac23 100644 --- a/asm/overlay_29_02328030.s +++ b/asm/overlay_29_02328030.s @@ -1446,13 +1446,13 @@ DoMoveSeismicToss: ; 0x02329258 mov r0, #5 mov r1, #0x2000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 mov r0, #4 mov r1, #0x400 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #1 bl ov29_022ECAFC mov r0, #0 diff --git a/asm/overlay_29_02337CCC.s b/asm/overlay_29_02337CCC.s index 7ff5cf7f..f7841991 100644 --- a/asm/overlay_29_02337CCC.s +++ b/asm/overlay_29_02337CCC.s @@ -822,8 +822,8 @@ _023386A8: ldmia sp!, {r3, pc} arm_func_end IsSecretFloor - arm_func_start ov29_023386B0 -ov29_023386B0: ; 0x023386B0 + arm_func_start GetCurrentHiddenStairsType +GetCurrentHiddenStairsType: ; 0x023386B0 stmdb sp!, {r3, lr} bl IsSecretBazaar cmp r0, #0 @@ -834,7 +834,7 @@ ov29_023386B0: ; 0x023386B0 movne r0, #2 moveq r0, #0 ldmia sp!, {r3, pc} - arm_func_end ov29_023386B0 + arm_func_end GetCurrentHiddenStairsType arm_func_start HiddenStairsPresent HiddenStairsPresent: ; 0x023386D8 @@ -14790,13 +14790,13 @@ _02344690: mov r0, #4 mov r1, #0x4000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 mov r0, #4 mov r1, #0x4000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 mov r0, r4 diff --git a/asm/overlay_29_02347BC8.s b/asm/overlay_29_02347BC8.s index 984ab088..97471f32 100644 --- a/asm/overlay_29_02347BC8.s +++ b/asm/overlay_29_02347BC8.s @@ -500,27 +500,27 @@ ExclusiveItemEffectIsActive__023482B0: ; 0x023482B0 ldmia sp!, {r3, pc} arm_func_end ExclusiveItemEffectIsActive__023482B0 - arm_func_start ov29_023482D4 -ov29_023482D4: ; 0x023482D4 + arm_func_start DisplayFloorCard +DisplayFloorCard: ; 0x023482D4 stmdb sp!, {r3, r4, r5, lr} ldr r1, _02348308 ; =DUNGEON_PTR mov r5, r0 ldr r4, [r1] - bl ov29_023386B0 + bl GetCurrentHiddenStairsType mov r3, r0 ldrb ip, [r4, #0x749] ldrsh r1, [r4, #0x1e] ldrb r0, [r4, #0x748] mov r2, r5 add r1, ip, r1 - bl ov29_0234830C + bl HandleFloorCard ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02348308: .word DUNGEON_PTR - arm_func_end ov29_023482D4 + arm_func_end DisplayFloorCard - arm_func_start ov29_0234830C -ov29_0234830C: ; 0x0234830C + arm_func_start HandleFloorCard +HandleFloorCard: ; 0x0234830C stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0xc mov r7, r0 @@ -547,7 +547,7 @@ ov29_0234830C: ; 0x0234830C mov r0, #1 mov r1, #0x1000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl sub_02051EB8 mov sb, r0 @@ -602,7 +602,7 @@ _0234842C: mov r0, #2 mov r1, #0x1000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 mov r0, #1 @@ -630,7 +630,7 @@ _02348490: .align 2, 0 _02348498: .word ov29_023537C4 _0234849C: .word ov29_0237C694 - arm_func_end ov29_0234830C + arm_func_end HandleFloorCard arm_func_start ov29_023484A0 ov29_023484A0: ; 0x023484A0 diff --git a/asm/overlay_29_023498A0.s b/asm/overlay_29_023498A0.s index 6abe28bc..7828ada6 100644 --- a/asm/overlay_29_023498A0.s +++ b/asm/overlay_29_023498A0.s @@ -2853,7 +2853,7 @@ _0234BDA0: mov r0, #1 mov r1, #0x4000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 add r0, r4, #0xc4 @@ -2898,7 +2898,7 @@ _0234BE80: mov r0, #2 mov r1, #0x4000 mov r2, #0 - bl ov29_0234C668 + bl StartFadeDungeonWrapper mov r0, #0 bl ov29_0234C738 _0234BEB8: @@ -3143,7 +3143,7 @@ _0234C1F4: bl ov29_022E0A64 bl ov29_022DDE24 bl ov29_022E9F9C - bl ov29_0234C9E4 + bl HandleFadesDungeonBothScreens bl sub_02034A80 bl ov29_022EA008 ldr r0, _0234C2EC ; =DUNGEON_PTR @@ -3296,8 +3296,8 @@ _0234C3F8: ldmia sp!, {r4, pc} arm_func_end ov29_0234C3A0 - arm_func_start ov29_0234C408 -ov29_0234C408: ; 0x0234C408 + arm_func_start StartFadeDungeon +StartFadeDungeon: ; 0x0234C408 stmdb sp!, {r3, lr} str r2, [r0, #0x8c] str r1, [r0, #0x94] @@ -3364,7 +3364,7 @@ _0234C4CC: _0234C4F0: bl ov29_0234C3A0 ldmia sp!, {r3, pc} - arm_func_end ov29_0234C408 + arm_func_end StartFadeDungeon arm_func_start ov29_0234C4F8 ov29_0234C4F8: ; 0x0234C4F8 @@ -3372,49 +3372,49 @@ ov29_0234C4F8: ; 0x0234C4F8 mov r0, #0x144 mov r1, #0 bl MemAlloc - ldr r2, _0234C540 ; =ov29_023537E0 + ldr r2, _0234C540 ; =DUNGEON_FADES_PTR mov r1, #0x144 str r0, [r2] bl MemZero - ldr r0, _0234C540 ; =ov29_023537E0 + ldr r0, _0234C540 ; =DUNGEON_FADES_PTR mov r1, #0 ldr r0, [r0] bl ov29_0234C2F4 - ldr r0, _0234C540 ; =ov29_023537E0 + ldr r0, _0234C540 ; =DUNGEON_FADES_PTR mov r1, #1 ldr r0, [r0] add r0, r0, #0x9c bl ov29_0234C2F4 ldmia sp!, {r3, pc} .align 2, 0 -_0234C540: .word ov29_023537E0 +_0234C540: .word DUNGEON_FADES_PTR arm_func_end ov29_0234C4F8 arm_func_start ov29_0234C544 ov29_0234C544: ; 0x0234C544 stmdb sp!, {r3, lr} - ldr r0, _0234C580 ; =ov29_023537E0 + ldr r0, _0234C580 ; =DUNGEON_FADES_PTR ldr r0, [r0] bl ov29_0234C354 - ldr r0, _0234C580 ; =ov29_023537E0 + ldr r0, _0234C580 ; =DUNGEON_FADES_PTR ldr r0, [r0] add r0, r0, #0x9c bl ov29_0234C354 - ldr r0, _0234C580 ; =ov29_023537E0 + ldr r0, _0234C580 ; =DUNGEON_FADES_PTR ldr r0, [r0] bl MemFree - ldr r0, _0234C580 ; =ov29_023537E0 + ldr r0, _0234C580 ; =DUNGEON_FADES_PTR mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0234C580: .word ov29_023537E0 +_0234C580: .word DUNGEON_FADES_PTR arm_func_end ov29_0234C544 arm_func_start ov29_0234C584 ov29_0234C584: ; 0x0234C584 stmdb sp!, {r3, lr} - ldr r1, _0234C5E8 ; =ov29_023537E0 + ldr r1, _0234C5E8 ; =DUNGEON_FADES_PTR mov r2, #0x10000 ldr r3, [r1] mov r1, #0x9c @@ -3440,13 +3440,13 @@ _0234C5CC: bl ov29_0234C3A0 ldmia sp!, {r3, pc} .align 2, 0 -_0234C5E8: .word ov29_023537E0 +_0234C5E8: .word DUNGEON_FADES_PTR arm_func_end ov29_0234C584 arm_func_start ov29_0234C5EC ov29_0234C5EC: ; 0x0234C5EC stmdb sp!, {r3, lr} - ldr r2, _0234C650 ; =ov29_023537E0 + ldr r2, _0234C650 ; =DUNGEON_FADES_PTR mov r1, #0x9c ldr r3, [r2] mov r2, #0x10000 @@ -3472,23 +3472,23 @@ _0234C630: bl ov29_0234C3A0 ldmia sp!, {r3, pc} .align 2, 0 -_0234C650: .word ov29_023537E0 +_0234C650: .word DUNGEON_FADES_PTR arm_func_end ov29_0234C5EC arm_func_start ov29_0234C654 ov29_0234C654: ; 0x0234C654 - ldr r1, _0234C664 ; =ov29_023537E0 + ldr r1, _0234C664 ; =DUNGEON_FADES_PTR ldr r1, [r1] strh r0, [r1, #0x72] bx lr .align 2, 0 -_0234C664: .word ov29_023537E0 +_0234C664: .word DUNGEON_FADES_PTR arm_func_end ov29_0234C654 - arm_func_start ov29_0234C668 -ov29_0234C668: ; 0x0234C668 + arm_func_start StartFadeDungeonWrapper +StartFadeDungeonWrapper: ; 0x0234C668 stmdb sp!, {r3, lr} - ldr r3, _0234C708 ; =ov29_023537E0 + ldr r3, _0234C708 ; =DUNGEON_FADES_PTR mov ip, #0 ldr lr, [r3] add lr, lr, r2, lsl #2 @@ -3533,15 +3533,15 @@ _0234C6E4: ldmia sp!, {r3, pc} _0234C6FC: mov r2, r3 - bl ov29_0234C408 + bl StartFadeDungeon ldmia sp!, {r3, pc} .align 2, 0 -_0234C708: .word ov29_023537E0 - arm_func_end ov29_0234C668 +_0234C708: .word DUNGEON_FADES_PTR + arm_func_end StartFadeDungeonWrapper arm_func_start ov29_0234C70C ov29_0234C70C: ; 0x0234C70C - ldr r2, _0234C734 ; =ov29_023537E0 + ldr r2, _0234C734 ; =DUNGEON_FADES_PTR mov r1, #0x9c ldr r2, [r2] mla r1, r0, r1, r2 @@ -3552,7 +3552,7 @@ ov29_0234C70C: ; 0x0234C70C movne r0, #1 bx lr .align 2, 0 -_0234C734: .word ov29_023537E0 +_0234C734: .word DUNGEON_FADES_PTR arm_func_end ov29_0234C70C arm_func_start ov29_0234C738 @@ -3561,7 +3561,7 @@ ov29_0234C738: ; 0x0234C738 mov r5, r0 mov r0, #0x9c mul r4, r5, r0 - ldr r6, _0234C7D0 ; =ov29_023537E0 + ldr r6, _0234C7D0 ; =DUNGEON_FADES_PTR mov r7, #5 _0234C750: ldr r1, [r6] @@ -3602,13 +3602,13 @@ _0234C7C0: _0234C7CC: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0234C7D0: .word ov29_023537E0 +_0234C7D0: .word DUNGEON_FADES_PTR arm_func_end ov29_0234C738 - arm_func_start ov29_0234C7D4 -ov29_0234C7D4: ; 0x0234C7D4 + arm_func_start HandleFadesDungeon +HandleFadesDungeon: ; 0x0234C7D4 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _0234C9E0 ; =ov29_023537E0 + ldr r1, _0234C9E0 ; =DUNGEON_FADES_PTR mov r5, r0 ldr r4, [r1] add r0, r4, r5, lsl #2 @@ -3644,13 +3644,13 @@ _0234C830: ldr r1, [r0, #0x94] bne _0234C864 mov r2, #2 - bl ov29_0234C408 + bl StartFadeDungeon b _0234C86C _0234C864: mov r2, #4 - bl ov29_0234C408 + bl StartFadeDungeon _0234C86C: - ldr r0, _0234C9E0 ; =ov29_023537E0 + ldr r0, _0234C9E0 ; =DUNGEON_FADES_PTR ldr r0, [r0] add r1, r0, #0x140 ldrb r0, [r1, r5] @@ -3671,7 +3671,7 @@ _0234C888: bl ov29_0234C354 ldmia sp!, {r3, r4, r5, pc} _0234C8B8: - ldr r1, _0234C9E0 ; =ov29_023537E0 + ldr r1, _0234C9E0 ; =DUNGEON_FADES_PTR mov r0, #0x9c ldr r1, [r1] mla r4, r5, r0, r1 @@ -3754,18 +3754,18 @@ _0234C9BC: strpl r0, [r4, #0x8c] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234C9E0: .word ov29_023537E0 - arm_func_end ov29_0234C7D4 +_0234C9E0: .word DUNGEON_FADES_PTR + arm_func_end HandleFadesDungeon - arm_func_start ov29_0234C9E4 -ov29_0234C9E4: ; 0x0234C9E4 + arm_func_start HandleFadesDungeonBothScreens +HandleFadesDungeonBothScreens: ; 0x0234C9E4 stmdb sp!, {r3, lr} mov r0, #0 - bl ov29_0234C7D4 + bl HandleFadesDungeon mov r0, #1 - bl ov29_0234C7D4 + bl HandleFadesDungeon ldmia sp!, {r3, pc} - arm_func_end ov29_0234C9E4 + arm_func_end HandleFadesDungeonBothScreens arm_func_start ov29_0234C9FC ov29_0234C9FC: ; 0x0234C9FC diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index ede25225..90411d33 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -646,7 +646,7 @@ _0234F460: mov r0, r5 mov r1, #0xa mov r2, #0x13 - bl sub_02026214 + bl DrawTextInWindow ldrb r0, [r4, #1] bl DungeonGoesUp cmp r0, #0 @@ -666,7 +666,7 @@ _0234F460: mov r0, r5 mov r1, #0x15 mov r2, #0x13 - bl sub_02026214 + bl DrawTextInWindow mov r2, #0 add r0, sp, #0x58 mov r3, r2 @@ -677,7 +677,7 @@ _0234F460: mov r0, r5 mov r1, #0x3c mov r2, #0x13 - bl sub_02026214 + bl DrawTextInWindow b _0234F75C _0234F508: ldrb r0, [r4, #1] @@ -706,7 +706,7 @@ _0234F508: mov r0, r5 mov r1, #0xa mov r2, #0x13 - bl sub_02026214 + bl DrawTextInWindow b _0234F75C _0234F578: ldr r0, _0234F770 ; =0x000008DE @@ -715,7 +715,7 @@ _0234F578: mov r0, r5 mov r1, #0xa mov r2, #0x13 - bl sub_02026214 + bl DrawTextInWindow b _0234F75C _0234F598: mov sb, #0 @@ -747,11 +747,11 @@ _0234F5AC: mov r2, r7 bne _0234F610 ldr r3, _0234F774 ; =ov29_02353404 - bl sub_02026214 + bl DrawTextInWindow b _0234F618 _0234F610: ldr r3, _0234F764 ; =ov29_023533F0 - bl sub_02026214 + bl DrawTextInWindow _0234F618: ldrb r1, [sl, #1] cmp r1, #3 @@ -783,7 +783,7 @@ _0234F618: mov r1, #0x15 mov r2, r7 add r3, sp, #0x58 - bl sub_02026214 + bl DrawTextInWindow _0234F694: mov r2, sl add r0, sp, #0x58 @@ -793,7 +793,7 @@ _0234F694: mov r1, #0x3c mov r2, r7 add r3, sp, #0x58 - bl sub_02026214 + bl DrawTextInWindow add r7, r7, #0xe _0234F6BC: add r8, r8, #1 @@ -809,7 +809,7 @@ _0234F6BC: mov r0, r5 mov r1, #0xa mov r2, #0x13 - bl sub_02026214 + bl DrawTextInWindow b _0234F75C _0234F6F8: ldr r0, _0234F770 ; =0x000008DE @@ -818,7 +818,7 @@ _0234F6F8: mov r0, r5 mov r1, #0xa mov r2, #0x13 - bl sub_02026214 + bl DrawTextInWindow b _0234F75C _0234F718: add r0, sp, #6 @@ -831,14 +831,14 @@ _0234F718: mov r0, r5 mov r1, #0xa mov r2, #0x13 - bl sub_02026214 + bl DrawTextInWindow b _0234F75C _0234F748: ldr r3, _0234F778 ; =ov29_0235340C mov r0, r5 mov r1, #0xa mov r2, #0x13 - bl sub_02026214 + bl DrawTextInWindow _0234F75C: add sp, sp, #0xbc ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -1228,7 +1228,7 @@ ov29_0234FC1C: ; 0x0234FC1C mov r0, r4 mov r1, #4 mov r2, #0 - bl sub_02026214 + bl DrawTextInWindow ldmia sp!, {r4, pc} .align 2, 0 _0234FC4C: .word ov29_02353848 @@ -4220,8 +4220,8 @@ ov29_02353544: .global ov29_0235354C ov29_0235354C: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_02353554 -ov29_02353554: + .global TOP_SCREEN_STATUS_PTR +TOP_SCREEN_STATUS_PTR: .byte 0x00, 0x00, 0x00, 0x00 .global ov29_02353558 ov29_02353558: @@ -4430,8 +4430,8 @@ ov29_023537CC: ov29_023537D8: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov29_023537E0 -ov29_023537E0: + .global DUNGEON_FADES_PTR +DUNGEON_FADES_PTR: .byte 0x00, 0x00, 0x00, 0x00 .global ov29_023537E4 ov29_023537E4: diff --git a/asm/overlay_31.s b/asm/overlay_31.s index a7faec07..1bf4590d 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -25,8 +25,8 @@ _0238285C: .word DUNGEON_WINDOW_PARAMS_3 _02382860: .word OVERLAY31_UNKNOWN_POINTER__NA_238A260 arm_func_end EntryOverlay31 - arm_func_start ov31_02382864 -ov31_02382864: ; 0x02382864 + arm_func_start DrawDungeonMenuStatusWindow +DrawDungeonMenuStatusWindow: ; 0x02382864 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x254 mov sl, r0 @@ -63,7 +63,7 @@ ov31_02382864: ; 0x02382864 mov r1, #0x73 mov r2, #0 add r3, sp, #0x104 - bl sub_02026214 + bl DrawTextInWindow bl GetMoneyCarried str r0, [sp, #0x228] ldr r0, _02382AA4 ; =0x000008B5 @@ -79,7 +79,7 @@ ov31_02382864: ; 0x02382864 mov r1, #0x73 mov r2, #0xc add r3, sp, #0x104 - bl sub_02026214 + bl DrawTextInWindow mov r0, #0 bl GetApparentWeather str r0, [sp, #0x204] @@ -96,7 +96,7 @@ ov31_02382864: ; 0x02382864 mov r0, sl mov r1, #0x73 mov r2, #0x18 - bl sub_02026214 + bl DrawTextInWindow bl sub_0204F9E0 str r0, [sp, #0x228] ldr r0, _02382AAC ; =0x000008B7 @@ -112,7 +112,7 @@ ov31_02382864: ; 0x02382864 mov r1, #0x73 mov r2, #0x24 add r3, sp, #0x104 - bl sub_02026214 + bl DrawTextInWindow mov r7, #0 mov r8, r7 add r6, sp, #4 @@ -161,7 +161,7 @@ _02382A08: mov r1, #4 mov r2, r7 add r3, sp, #0x104 - bl sub_02026214 + bl DrawTextInWindow add r7, r7, #0xc cmp r7, #0x30 bge _02382A90 @@ -184,7 +184,7 @@ _02382AB0: .word 0x0000C402 _02382AB4: .word 0x000003E7 _02382AB8: .word DUNGEON_PTR _02382ABC: .word 0x000008B8 - arm_func_end ov31_02382864 + arm_func_end DrawDungeonMenuStatusWindow arm_func_start DungeonMenuSwitch DungeonMenuSwitch: ; 0x02382AC0 @@ -218,7 +218,7 @@ DungeonMenuSwitch: ; 0x02382AC0 add r0, r0, r0, lsr #31 mov r1, r0, asr #1 mov r0, r4 - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 add sp, sp, #0x54 @@ -286,7 +286,7 @@ _02382BEC: add r2, sp, #4 bl CreateParentMenuFromStringIds ldr r2, _02382D8C ; =OVERLAY31_UNKNOWN_POINTER__NA_238A260 - ldr r1, _02382D9C ; =ov31_02382864 + ldr r1, _02382D9C ; =DrawDungeonMenuStatusWindow ldr r2, [r2] strb r0, [r2] ldr r0, _02382DA0 ; =DUNGEON_WINDOW_PARAMS_4 @@ -387,7 +387,7 @@ _02382D8C: .word OVERLAY31_UNKNOWN_POINTER__NA_238A260 _02382D90: .word DUNGEON_WINDOW_PARAMS_1 _02382D94: .word 0x00000233 _02382D98: .word DUNGEON_MAIN_MENU_ITEMS -_02382D9C: .word ov31_02382864 +_02382D9C: .word DrawDungeonMenuStatusWindow _02382DA0: .word DUNGEON_WINDOW_PARAMS_4 _02382DA4: .word DungeonMenuSwitch _02382DA8: .word DUNGEON_WINDOW_PARAMS_2 @@ -547,7 +547,7 @@ ov31_02382F68: ; 0x02382F68 mov r1, #0x10 mov r2, #0x12 str r3, [ip] - bl sub_02026214 + bl DrawTextInWindow mov r0, r4 bl sub_02027AF0 ldmia sp!, {r4, pc} @@ -750,7 +750,7 @@ ov31_02383248: ; 0x02383248 mov r0, r4 mov r1, #4 mov r2, #0x14 - bl sub_02026214 + bl DrawTextInWindow ldmia sp!, {r4, pc} .align 2, 0 _02383284: .word ov31_0238A2A0 @@ -1222,7 +1222,7 @@ ov31_02383854: ; 0x02383854 mov r3, r0 mov r0, r4 mov r2, r1 - bl sub_02026214 + bl DrawTextInWindow ldmia sp!, {r4, pc} .align 2, 0 _0238387C: .word 0x000008E6 @@ -1691,7 +1691,7 @@ _02383F34: mov r0, r8 mov r2, r1 add r3, sp, #0x4c - bl sub_02026214 + bl DrawTextInWindow mov r0, r8 bl sub_02027AF0 ldr r0, [sp, #0x28] @@ -1747,7 +1747,7 @@ _02383FF0: mov r0, r8 mov r2, r1 add r3, sp, #0x4c - bl sub_02026214 + bl DrawTextInWindow mov r0, r8 bl sub_02027AF0 ldr r0, [r4] @@ -4939,7 +4939,7 @@ ov31_02386B28: ; 0x02386B28 add r0, r0, #0x100 ldrsb r0, [r0, #0x60] mov r2, #2 - bl sub_02026214 + bl DrawTextInWindow ldr r1, [r4, #0x10] cmp r1, #0 moveq r0, #0 @@ -4975,7 +4975,7 @@ _02386B98: add r0, r0, #0x100 ldrsb r0, [r0, #0x60] add r3, sp, #0x54 - bl sub_02026214 + bl DrawTextInWindow _02386C00: add sp, sp, #0xa4 ldmia sp!, {r3, r4, pc} @@ -5812,7 +5812,7 @@ ov31_0238778C: ; 0x0238778C mov r3, r0 mov r0, r4 mov r2, r1 - bl sub_02026214 + bl DrawTextInWindow ldmia sp!, {r4, pc} .align 2, 0 _023877C0: .word OVERLAY31_UNKNOWN_POINTER__NA_238A280 @@ -5821,7 +5821,7 @@ _023877C0: .word OVERLAY31_UNKNOWN_POINTER__NA_238A280 arm_func_start ov31_023877C4 ov31_023877C4: ; 0x023877C4 ldr r2, _023877E4 ; =OVERLAY31_UNKNOWN_POINTER__NA_238A280 - ldr ip, _023877E8 ; =sub_02026214 + ldr ip, _023877E8 ; =DrawTextInWindow ldr r3, [r2] mov r1, #2 add r3, r3, #0x12 @@ -5830,7 +5830,7 @@ ov31_023877C4: ; 0x023877C4 bx ip .align 2, 0 _023877E4: .word OVERLAY31_UNKNOWN_POINTER__NA_238A280 -_023877E8: .word sub_02026214 +_023877E8: .word DrawTextInWindow arm_func_end ov31_023877C4 arm_func_start ov31_023877EC @@ -7405,7 +7405,7 @@ _02388D90: mov r1, r8 mov r2, sb mov r3, r6 - bl sub_02026214 + bl DrawTextInWindow add sb, sb, #0xd cmp sb, #0x7c blt _02388E18 @@ -7428,7 +7428,7 @@ _02388E30: mov r0, sl mov r1, r8 mov r2, sb - bl sub_02026214 + bl DrawTextInWindow _02388E4C: add sp, sp, #0xd4 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} @@ -7706,7 +7706,7 @@ ov31_023891A8: ; 0x023891A8 mov r0, r5 mov r1, #4 mov r2, #0x10 - bl sub_02026214 + bl DrawTextInWindow ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _023891F8: .word DUNGEON_SUBMENU_ITEMS_6 @@ -8324,7 +8324,7 @@ ov31_02389A04: ; 0x02389A04 mov r0, r5 mov r1, #4 mov r2, #2 - bl sub_02026214 + bl DrawTextInWindow mov r0, r5 bl sub_02027AF0 add sp, sp, #0x94 diff --git a/asm/overlay_34.s b/asm/overlay_34.s index 6bcd4585..b0616ca1 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -697,7 +697,7 @@ ov34_022DCA70: ; 0x022DCA70 cmp r0, #0 beq _022DCB2C ldr r0, _022DCB5C ; =ov34_022DD104 - bl sub_0200BD2C + bl GetFadeStatus cmp r0, #0 bne _022DCAB4 ldr r1, _022DCB58 ; =ov34_022DD0B0 @@ -717,7 +717,7 @@ _022DCAC4: ldrsh r0, [r0, #0x14] bl ov34_022DCB64 ldr r0, _022DCB60 ; =ov34_022DD0C0 - bl sub_0200BD2C + bl GetFadeStatus cmp r0, #0 bne _022DCAFC ldr r1, _022DCB58 ; =ov34_022DD0B0