From 22f67f201a5f2e3eb3456b8d8997e109db38071a Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 19 Sep 2023 22:10:56 -0400 Subject: [PATCH 1/2] Defined more overlay 29 pointers . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . --- asm/include/itcm.inc | 1 + asm/include/overlay_29_022E0378.inc | 37 +- asm/include/overlay_29_022E9618.inc | 30 +- asm/include/overlay_29_022EAB50.inc | 71 +- asm/include/overlay_29_022EC62C.inc | 19 +- asm/include/overlay_29_022ECDE4.inc | 41 +- asm/include/overlay_29_022EE36C.inc | 70 +- asm/include/overlay_29_022EF7C4.inc | 15 +- asm/include/overlay_29_022F05B4.inc | 98 ++- asm/include/overlay_29_022F52B0.inc | 64 +- asm/include/overlay_29_022F62CC.inc | 32 +- asm/include/overlay_29_022F7388.inc | 121 +-- asm/include/overlay_29_022FC9C0.inc | 68 +- asm/include/overlay_29_022FEDBC.inc | 34 +- asm/include/overlay_29_02300108.inc | 1 + asm/include/overlay_29_02302A5C.inc | 52 +- asm/include/overlay_29_02305C28.inc | 72 +- asm/include/overlay_29_02307F1C.inc | 5 +- asm/include/overlay_29_02308FE0.inc | 196 +++-- asm/include/overlay_29_0230E914.inc | 14 +- asm/include/overlay_29_0230F02C.inc | 80 +- asm/include/overlay_29_023118D8.inc | 1 + asm/include/overlay_29_02318D58.inc | 3 +- asm/include/overlay_29_02318E70.inc | 29 +- asm/include/overlay_29_02319FB0.inc | 36 +- asm/include/overlay_29_0231B1B8.inc | 129 ++-- asm/include/overlay_29_0231CBEC.inc | 23 + asm/include/overlay_29_0231EDFC.inc | 22 +- asm/include/overlay_29_0231F594.inc | 24 +- asm/include/overlay_29_0231FC20.inc | 17 +- asm/include/overlay_29_023201A0.inc | 1 + asm/include/overlay_29_0232145C.inc | 1 + asm/include/overlay_29_0232A3FC.inc | 132 ++-- asm/include/overlay_29_0232C524.inc | 138 ++-- asm/include/overlay_29_0232E274.inc | 26 +- asm/include/overlay_29_0232E864.inc | 704 +++++++++--------- asm/include/overlay_29_02333FD0.inc | 14 +- asm/include/overlay_29_023350FC.inc | 1 + asm/include/overlay_29_02337CCC.inc | 110 ++- asm/include/overlay_29_02344B1C.inc | 28 +- asm/include/overlay_29_023456BC.inc | 2 + asm/include/overlay_29_02347BC8.inc | 28 +- asm/include/overlay_29_023498A0.inc | 1 + asm/include/overlay_29_0234DDF4.inc | 25 +- asm/itcm.s | 20 +- asm/main_0200C4CC.s | 37 +- asm/overlay_10.s | 785 +++++++++++++++++--- asm/overlay_29_022E0378.s | 248 +++---- asm/overlay_29_022E9618.s | 300 ++++---- asm/overlay_29_022EAB50.s | 254 +++---- asm/overlay_29_022EC62C.s | 80 +- asm/overlay_29_022ECDE4.s | 134 ++-- asm/overlay_29_022EE36C.s | 116 +-- asm/overlay_29_022EF7C4.s | 38 +- asm/overlay_29_022F05B4.s | 396 +++++----- asm/overlay_29_022F52B0.s | 56 +- asm/overlay_29_022F62CC.s | 156 ++-- asm/overlay_29_022F7388.s | 418 +++++------ asm/overlay_29_022FC9C0.s | 192 ++--- asm/overlay_29_022FEDBC.s | 30 +- asm/overlay_29_02300108.s | 24 +- asm/overlay_29_02302A5C.s | 126 ++-- asm/overlay_29_02305C28.s | 40 +- asm/overlay_29_02307F1C.s | 12 +- asm/overlay_29_02308FE0.s | 552 +++++++------- asm/overlay_29_0230E914.s | 58 +- asm/overlay_29_0230F02C.s | 162 ++--- asm/overlay_29_023118D8.s | 16 +- asm/overlay_29_02318D58.s | 4 +- asm/overlay_29_02318E70.s | 108 +-- asm/overlay_29_02319FB0.s | 64 +- asm/overlay_29_0231B1B8.s | 190 ++--- asm/overlay_29_0231CBEC.s | 138 ++-- asm/overlay_29_0231EDFC.s | 22 +- asm/overlay_29_0231F594.s | 20 +- asm/overlay_29_0231FC20.s | 22 +- asm/overlay_29_023201A0.s | 4 +- asm/overlay_29_0232145C.s | 16 +- asm/overlay_29_0232A3FC.s | 200 ++--- asm/overlay_29_0232C524.s | 138 ++-- asm/overlay_29_0232E274.s | 42 +- asm/overlay_29_0232E864.s | 104 +-- asm/overlay_29_02333FD0.s | 36 +- asm/overlay_29_023350FC.s | 4 +- asm/overlay_29_02337CCC.s | 1052 +++++++++++++-------------- asm/overlay_29_02344B1C.s | 72 +- asm/overlay_29_023456BC.s | 40 +- asm/overlay_29_02347BC8.s | 214 +++--- asm/overlay_29_023498A0.s | 10 +- asm/overlay_29_0234DDF4.s | 34 +- asm/overlay_29_0234EC38.s | 823 +++++++++++++++++---- 91 files changed, 5964 insertions(+), 4259 deletions(-) diff --git a/asm/include/itcm.inc b/asm/include/itcm.inc index 220723d1..3d1ccda1 100644 --- a/asm/include/itcm.inc +++ b/asm/include/itcm.inc @@ -170,3 +170,4 @@ .public TRIG_TABLE .public TryAddTargetToAiTargetList .public UpdateAiTargetPos +.public DIRECTIONS_XY diff --git a/asm/include/overlay_29_022E0378.inc b/asm/include/overlay_29_022E0378.inc index 5624062a..3b3ccaa6 100644 --- a/asm/include/overlay_29_022E0378.inc +++ b/asm/include/overlay_29_022E0378.inc @@ -1,5 +1,9 @@ #pragma once +.public _020AFC28 +.public _020AFC4C +.public _020AFC70 .public AllocAndLoadFileInPack +.public AnimationDelayOrSomething .public CalcSpeedStageWrapper .public DisplayMessage2 .public DungeonGoesUp @@ -17,23 +21,20 @@ .public GetTileSafe .public HandleFaint .public HandleSir0Translation +.public IsCurrentTilesetBackground .public IsExperienceLocked .public IsFloorOver .public IsJirachiChallengeFloor .public IsMoneyAllowed +.public LoadTextureUi .public LoadWteFromFileDirectory .public Memcpy32 .public Memset32 -.public RemoveAllItems -.public SetMinimapDataE447 -.public SetMoneyCarried -.public UnloadFile -.public UnloadWte +.public ov10_022C4D54 .public ov29_022DD7D8 .public ov29_022DE15C .public ov29_022DE854 .public ov29_022E34B0 -.public AnimationDelayOrSomething .public ov29_022E3A40 .public ov29_022E68BC .public ov29_022E8270 @@ -42,14 +43,11 @@ .public ov29_022E9FD0 .public ov29_022EA370 .public ov29_022ED9D0 -.public SubInitMonster .public ov29_02303F18 .public ov29_023046E8 -.public LoadTextureUi .public ov29_02335760 .public ov29_02335774 .public ov29_02335804 -.public IsCurrentTilesetBackground .public ov29_0233A248 .public ov29_023457C8 .public ov29_0234B034 @@ -57,6 +55,23 @@ .public ov29_0234B1A4 .public ov29_0234C668 .public ov29_0234C738 +.public ov29_023510E0 +.public ov29_02353538 +.public ov29_02353540 +.public ov29_02353544 +.public ov29_0237C694 +.public ov29_0237C696 +.public ov29_0237C698 +.public ov29_0237C6A4 +.public ov29_0237C6B8 +.public ov29_0237C6D4 +.public ov29_0237C754 +.public ov29_0237C79C +.public ov29_0237CFC0 +.public RemoveAllItems +.public SECONDARY_TERRAIN_TYPES +.public SetMinimapDataE447 +.public SetMoneyCarried .public sub_020063F4 .public sub_02006564 .public sub_02006BFC @@ -73,4 +88,6 @@ .public sub_0201E380 .public sub_0201F598 .public sub_0204AE80 -.public SECONDARY_TERRAIN_TYPES +.public SubInitMonster +.public UnloadFile +.public UnloadWte diff --git a/asm/include/overlay_29_022E9618.inc b/asm/include/overlay_29_022E9618.inc index f6bbab69..b836d370 100644 --- a/asm/include/overlay_29_022E9618.inc +++ b/asm/include/overlay_29_022E9618.inc @@ -1,9 +1,12 @@ #pragma once -.public abs .public __divsi3 +.public _020AFC4C +.public abs +.public DisplayUi .public EntityIsValid__022E95F4 .public GetLeader .public GetTile +.public InitWeirdMinimapMatrix .public MemAlloc .public MemFree .public ov29_022DD8B4 @@ -12,7 +15,6 @@ .public ov29_022DE134 .public ov29_022DE638 .public ov29_022E1854 -.public UpdateCamera .public ov29_022E335C .public ov29_022E886C .public ov29_022E8C10 @@ -20,18 +22,36 @@ .public ov29_02300818 .public ov29_0230175C .public ov29_0230473C -.public DisplayUi .public ov29_02335F40 .public ov29_02338AC4 .public ov29_02339A24 -.public UpdateMinimap .public ov29_02339FF4 .public ov29_0233A248 -.public InitWeirdMinimapMatrix .public ov29_0234B1A4 .public ov29_0234B4F4 .public ov29_0234B854 +.public ov29_02351628 +.public ov29_02351658 +.public DIRECTIONS_XY +.public ov29_0235171E +.public ov29_0235179C +.public ov29_023517A0 +.public ov29_023517A2 +.public ov29_023517DC +.public ov29_02351844 +.public ov29_023518AC +.public ov29_02353538 +.public ov29_02353540 +.public ov29_02353560 +.public ov29_02353570 +.public ov29_02353584 +.public ov29_0237C694 +.public ov29_0237C850 +.public ov29_0237C888 .public sub_0201BAC8 .public sub_0204AEA0 .public sub_0204AEC0 .public sub_02051E20 +.public UpdateCamera +.public UpdateMinimap + diff --git a/asm/include/overlay_29_022EAB50.inc b/asm/include/overlay_29_022EAB50.inc index 0e5c2114..c783cde7 100644 --- a/asm/include/overlay_29_022EAB50.inc +++ b/asm/include/overlay_29_022EAB50.inc @@ -1,11 +1,12 @@ #pragma once +.public __divsi3 .public AbilityIsActiveVeneer .public abs .public AdvanceFrame .public CalcSpeedStageWrapper +.public ChangeLeader .public DecrementWindCounter .public DisplayActions -.public __divsi3 .public DungeonRandInt .public DungeonRandRange .public EnemyEvolution @@ -16,45 +17,55 @@ .public GetFloorType .public GetItemAtIdx .public GetItemCategoryVeneer +.public GetItemInfo .public GetLeader +.public GetLeaderMonster .public GetTile .public IqSkillIsEnabled +.public IsCurrentFixedRoomBossFight .public IsFloorOver .public IsHM .public ItemZInit .public LogMessageByIdWithPopupCheckUserTarget +.public MoveMonsterToPos +.public ov10_022C51FC +.public ov10_022C555C +.public ov10_022C6C70 +.public ov29_022E555C +.public ov29_022E81F8 +.public ov29_022EF9C8 +.public ov29_0230FC24 +.public ov29_02321260 +.public ov29_02347040 +.public ov29_02348FD8 +.public ov29_023516E8 +.public ov29_02352010 +.public ov29_02352030 +.public ov29_02352032 +.public ov29_02352070 +.public ov29_02352074 +.public ov29_02352284 +.public ov29_023522B6 +.public ov29_02353538 +.public ov29_02353570 +.public ov29_0237C918 +.public ov29_0237C91C +.public ov29_0237C91E +.public ov29_0237C920 +.public ov29_0237C922 +.public ov29_0237C96C +.public RemoveEmptyItemsInBagWrapper .public RemoveEquivItemNoHole +.public RemoveGroundItem .public RemoveItem .public RoundUpDiv256 .public RunMonsterAi .public SetItemAcquired +.public SetLeaderAction +.public ShouldDisplayEntityWrapper +.public SpawnItem .public strcmp .public StringFromMessageId -.public SubstitutePlaceholderStringTags -.public TickStatusAndHealthRegen -.public TryActivateArtificialWeatherAbilities -.public TryForcedLoss -.public TrySpawnMonsterAndActivatePlusMinus -.public IsCurrentFixedRoomBossFight -.public GetItemInfo -.public UpdateEntityPixelPos -.public ShouldDisplayEntityWrapper -.public ov29_022E555C -.public ov29_022E81F8 -.public GetLeaderMonster -.public ov29_022EF9C8 -.public SetLeaderAction -.public ChangeLeader -.public MoveMonsterToPos -.public TryRestoreRoostTyping -.public ov29_0230FC24 -.public ov29_02321260 -.public TryActivateWeather -.public SpawnItem -.public RemoveGroundItem -.public RemoveEmptyItemsInBagWrapper -.public ov29_02347040 -.public ov29_02348FD8 .public sub_01FFBDF4 .public sub_0200D208 .public sub_02017ACC @@ -67,3 +78,11 @@ .public sub_02017C68 .public sub_02017C74 .public sub_02017D80 +.public SubstitutePlaceholderStringTags +.public TickStatusAndHealthRegen +.public TryActivateArtificialWeatherAbilities +.public TryActivateWeather +.public TryForcedLoss +.public TryRestoreRoostTyping +.public TrySpawnMonsterAndActivatePlusMinus +.public UpdateEntityPixelPos diff --git a/asm/include/overlay_29_022EC62C.inc b/asm/include/overlay_29_022EC62C.inc index 2f6eb3f4..4ab0286c 100644 --- a/asm/include/overlay_29_022EC62C.inc +++ b/asm/include/overlay_29_022EC62C.inc @@ -1,22 +1,29 @@ #pragma once +.public __divsi3 .public AbilityIsActiveVeneer .public AdvanceFrame +.public ChangeDungeonMusic .public DisplayActions -.public __divsi3 .public EntityIsValid__022EC608 .public EntityIsValid__022ECDC0 .public ExecuteMonsterAction .public GetForcedLossReason .public GetLeader +.public GetMonsterName .public HandleFaint .public LogMessageByIdWithPopupCheckUser -.public RunMonsterAi -.public TryForcedLoss -.public TrySpawnMonsterAndTickSpawnCounter +.public ov10_022C6320 .public ov29_022E5DBC -.public ChangeDungeonMusic .public ov29_022EAEF0 .public ov29_022EF9C8 .public ov29_022F2FE4 +.public ov29_023522B6 +.public ov29_02352380 +.public ov29_02352390 +.public ov29_02353538 +.public ov29_02353598 +.public ov29_0237C974 +.public RunMonsterAi +.public TryForcedLoss .public TryPointCameraToMonster -.public GetMonsterName +.public TrySpawnMonsterAndTickSpawnCounter diff --git a/asm/include/overlay_29_022ECDE4.inc b/asm/include/overlay_29_022ECDE4.inc index 4193ba3d..5bc5ed6e 100644 --- a/asm/include/overlay_29_022ECDE4.inc +++ b/asm/include/overlay_29_022ECDE4.inc @@ -1,44 +1,55 @@ #pragma once +.public _020AFC4C +.public _020AFC70 .public AbilityIsActiveVeneer .public AdvanceFrame +.public ApplyTrapEffect +.public AreLateGameTrapsEnabled +.public DrawMinimapTile .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public EnemyEvolution .public EntityIsValid__022ECDC0 .public EntityIsValid__022EE348 +.public GetMonsterName .public GetStringFromFileVeneer .public GetTile .public GetTileSafe +.public GetTrapInfo .public HasHeldItem +.public InitRender3dElement64 .public IqSkillIsEnabled +.public IsFullFloorFixedRoom .public LoadWteFromFileDirectory .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public LogMessageByIdWithPopupCheckUserUnknown -.public MemZero .public memset -.public ProcessWte -.public strcpy -.public StringFromMessageId -.public SubstitutePlaceholderStringTags -.public GetTrapInfo -.public SpawnTrap +.public MemZero +.public ov10_022C445C .public ov29_022E2CA0 .public ov29_022E56A0 .public ov29_022E58B0 .public ov29_022E7A30 -.public ApplyTrapEffect .public ov29_022F89CC .public ov29_022F9840 -.public GetMonsterName -.public UpdateShopkeeperModeAfterTrap -.public IsFullFloorFixedRoom -.public UpdateTrapsVisibility -.public DrawMinimapTile -.public AreLateGameTrapsEnabled .public ov29_0234B034 +.public ov29_02352690 +.public ov29_02352698 +.public ov29_023526A0 +.public ov29_02353538 +.public ov29_0235359C +.public ov29_0237C864 +.public ov29_0237C974 +.public ov29_0237C99C +.public ProcessWte +.public SpawnTrap +.public strcpy +.public StringFromMessageId .public sub_0201B9F8 .public sub_0201E080 -.public InitRender3dElement64 .public sub_0201F2A0 .public sub_02024FC8 +.public SubstitutePlaceholderStringTags +.public UpdateShopkeeperModeAfterTrap +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_022EE36C.inc b/asm/include/overlay_29_022EE36C.inc index 76858d58..334e1b51 100644 --- a/asm/include/overlay_29_022EE36C.inc +++ b/asm/include/overlay_29_022EE36C.inc @@ -1,17 +1,29 @@ #pragma once .public AbilityIsActiveVeneer +.public AnimationDelayOrSomething +.public ApplyDamageAndEffectsWrapper +.public AreLateGameTrapsEnabled +.public BAG_ITEMS_PTR_MIRROR .public CalcStatusDuration +.public DIRECTIONS_XY +.public DrawMinimapTile .public DungeonRandInt .public EntityIsValid__022EE348 .public FemaleToMaleForm +.public GenerateStandardItem .public GetFloorType .public GetItemCategoryVeneer +.public GetItemInfo .public GetKecleonIdToSpawnByFloor .public GetMonsterIdToSpawn .public GetTile +.public GetTrapInfo +.public GetVisibilityRange .public HandleFaint .public HasDropeyeStatus +.public HasTypeAffectedByGravity .public IsExperienceLocked +.public IsFullFloorFixedRoom .public IsNotMoney .public ItemIsActive__022EE318 .public LogMessageByIdWithPopup @@ -22,20 +34,15 @@ .public LowerSpeed .public MewSpawnCheck .public MultiplyByFixedPoint -.public RemoveHeldItemNoHole -.public SpawnMonster -.public SubstitutePlaceholderStringTags -.public TryBlowAway -.public TryInflictConfusedStatus -.public TryInflictPoisonedStatus -.public TryInflictSleepStatus -.public TrySealMove -.public TryWarp -.public GetTrapInfo -.public GetItemInfo -.public ShouldDisplayEntityWrapper -.public GetVisibilityRange -.public AnimationDelayOrSomething +.public ov10_022C4418 +.public ov10_022C4434 +.public ov10_022C44E4 +.public ov10_022C45C8 +.public ov10_022C45CC +.public ov10_022C4720 +.public ov10_022C4770 +.public ov10_022C4B18 +.public ov10_022C6C7A .public ov29_022E56A0 .public ov29_022E56D4 .public ov29_022E58B0 @@ -46,24 +53,33 @@ .public ov29_022FA574 .public ov29_022FB920 .public ov29_022FBD80 -.public HasTypeAffectedByGravity .public ov29_023049A8 .public ov29_02304A48 -.public ApplyDamageAndEffectsWrapper -.public TryInflictGrudgeStatus -.public TryResetStatChanges -.public TryExplosion -.public IsFullFloorFixedRoom -.public UpdateTrapsVisibility -.public DrawMinimapTile -.public UpdateMinimap -.public AreLateGameTrapsEnabled .public ov29_02344B44 -.public GenerateStandardItem -.public RemoveGroundItem .public ov29_02346344 -.public RemoveEmptyItemsInBagWrapper .public ov29_0234B084 +.public ov29_0235171E +.public ov29_02351844 +.public ov29_02352AE8 +.public ov29_02352AEC +.public ov29_02353538 +.public RemoveEmptyItemsInBagWrapper +.public RemoveGroundItem +.public RemoveHeldItemNoHole +.public ShouldDisplayEntityWrapper +.public SpawnMonster .public sub_02001888 .public sub_0200FA68 .public sub_0200FAEC +.public SubstitutePlaceholderStringTags +.public TryBlowAway +.public TryExplosion +.public TryInflictConfusedStatus +.public TryInflictGrudgeStatus +.public TryInflictPoisonedStatus +.public TryInflictSleepStatus +.public TryResetStatChanges +.public TrySealMove +.public TryWarp +.public UpdateMinimap +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_022EF7C4.inc b/asm/include/overlay_29_022EF7C4.inc index c68732a3..b8626e80 100644 --- a/asm/include/overlay_29_022EF7C4.inc +++ b/asm/include/overlay_29_022EF7C4.inc @@ -1,19 +1,22 @@ #pragma once +.public BoostIQ +.public ChangeDungeonMusic .public EntityIsValid__022EF7A0 .public EntityIsValid__022F0590 .public IsFloorOver -.public ov29_022DE5F0 -.public UpdateEntityPixelPos -.public ov29_022EA370 -.public ChangeDungeonMusic .public MoveMonsterToPos -.public BoostIQ +.public ov29_022DE5F0 +.public ov29_022EA370 .public ov29_022FA360 -.public TeamMemberHasItemActive .public ov29_023444D4 .public ov29_02348F20 .public ov29_0234B1A4 .public ov29_0234BA54 .public ov29_0234D630 .public ov29_0234D8A0 +.public ov29_02353538 +.public ov29_023535A4 +.public ov29_0237C9A0 .public sub_0201D198 +.public TeamMemberHasItemActive +.public UpdateEntityPixelPos diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc index b28ec6d3..d0e86fbc 100644 --- a/asm/include/overlay_29_022F05B4.inc +++ b/asm/include/overlay_29_022F05B4.inc @@ -1,12 +1,22 @@ #pragma once +.public __divsi3 +.public BAG_ITEMS_PTR_MIRROR +.public _020AFC4C .public abs +.public AddHeldItemToBag .public AddItemToBag .public AddItemToBagNoHeld .public AddMoneyCarried .public AdvanceFrame +.public AnimationDelayOrSomething +.public CanMonsterMoveInDirection +.public CanSeeTarget .public CeilFixedPoint +.public CheckTeamItemsFlags .public CheckTeamMemberIdxVeneer -.public __divsi3 +.public CheckTouchscreenArea +.public DIRECTIONS_XY +.public DrawTileGrid .public DungeonRandInt .public EntityIsValid__022F0590 .public ExecuteMoveEffect @@ -18,15 +28,23 @@ .public GetHero .public GetItemCategoryVeneer .public GetItemIndex +.public GetItemInfo +.public GetItemToUse .public GetLeader +.public GetLeaderMonster .public GetMonsterGenderVeneer .public GetPressedButtons .public GetSleepAnimationId +.public GetTeamMemberIndex .public GetTile .public GetTileAtEntity .public GetTileSafe +.public GetTrapInfo .public HasHeldItem +.public HiddenStairsTrigger +.public HideTileGrid .public InitMove +.public InitPortraitDungeon .public InitPreprocessorArgs .public IqSkillIsEnabled .public IsBlinded @@ -34,19 +52,15 @@ .public IsFloorOver .public IsGoldenChamber .public ItemZInit +.public LogItemBlockedByEmbargo .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUser .public MemAlloc .public MemFree .public MemZero +.public MonsterHasEmbargoStatus +.public OpenMenu .public OpenMessageLog -.public PreprocessString -.public RemoveEquivItemNoHole -.public SetMonsterActionFields -.public ShouldMonsterRunAway -.public ShouldMonsterRunAwayVariation -.public SubstitutePlaceholderStringTags -.public UpdateAiTargetPos .public ov29_022DE608 .public ov29_022E0B44 .public ov29_022E0C2C @@ -55,34 +69,22 @@ .public ov29_022E0C64 .public ov29_022E0C80 .public ov29_022E0C9C -.public CheckTouchscreenArea .public ov29_022E0DD8 .public ov29_022E0DF0 -.public GetTrapInfo -.public GetItemInfo -.public CanSeeTarget .public ov29_022E28D4 -.public GetTeamMemberIndex .public ov29_022E2CA0 -.public PointCameraToMonster -.public AnimationDelayOrSomething .public ov29_022E3DD8 .public ov29_022E3E24 .public ov29_022E8104 .public ov29_022E81F8 -.public GetLeaderMonster .public ov29_022EA370 .public ov29_022EA3B4 .public ov29_022EA428 .public ov29_022EACCC .public ov29_022EB398 -.public SetLeaderActionFields -.public GetItemToUse .public ov29_022EB568 .public ov29_022EB594 .public ov29_022EB944 -.public SetActionUseMovePlayer -.public TryTriggerTrap .public ov29_022F04F0 .public ov29_022F0518 .public ov29_022F59C4 @@ -90,7 +92,6 @@ .public ov29_022F670C .public ov29_022F87C0 .public ov29_022F89AC -.public TryPointCameraToMonster .public ov29_022F9C4C .public ov29_022F9EA0 .public ov29_022FA2F0 @@ -105,40 +106,24 @@ .public ov29_023009CC .public ov29_02300E78 .public ov29_02300FCC -.public CanMonsterMoveInDirection .public ov29_02301158 .public ov29_0230175C .public ov29_023049A8 .public ov29_023055B0 -.public TryTriggerMonsterHouse -.public MonsterHasEmbargoStatus -.public LogItemBlockedByEmbargo .public ov29_02321164 .public ov29_02322DDC .public ov29_0232461C -.public UpdateTrapsVisibility -.public DrawTileGrid -.public HideTileGrid -.public PositionHasMonster .public ov29_02337D68 -.public HiddenStairsTrigger .public ov29_02338F58 .public ov29_02339190 .public ov29_023391C0 .public ov29_02339CD4 -.public UpdateMinimap .public ov29_02339D7C .public ov29_0233A0E8 .public ov29_0233A248 .public ov29_02344B44 -.public TryLeaderItemPickUp -.public SpawnItem -.public RemoveGroundItem -.public CheckTeamItemsFlags .public ov29_02346E5C -.public AddHeldItemToBag .public ov29_02346FB8 -.public RemoveEmptyItemsInBagWrapper .public ov29_02348D3C .public ov29_02348ECC .public ov29_023491B8 @@ -150,9 +135,7 @@ .public ov29_0234B1A4 .public ov29_0234B4CC .public ov29_0234BA54 -.public InitPortraitDungeon .public ov29_0234BB38 -.public YesNoMenu .public ov29_0234D650 .public ov29_0234D65C .public ov29_0234D668 @@ -161,10 +144,36 @@ .public ov29_0234D860 .public ov29_0234D878 .public ov29_0234D88C -.public OpenMenu .public ov29_0234E8F8 .public ov29_0234FC50 .public ov29_0234FCA8 +.public ov29_0235171E +.public ov29_023526A8 +.public ov29_023526B8 +.public ov29_023526C8 +.public ov29_023526D8 +.public ov29_023526F0 +.public ov29_023526F2 +.public ov29_023526F4 +.public ov29_02353538 +.public ov29_0235355C +.public ov29_023535A4 +.public ov29_0237C694 +.public ov29_0237C6A4 +.public ov29_0237C9A4 +.public ov29_0237CFBB +.public PointCameraToMonster +.public PositionHasMonster +.public PreprocessString +.public RemoveEmptyItemsInBagWrapper +.public RemoveEquivItemNoHole +.public RemoveGroundItem +.public SetActionUseMovePlayer +.public SetLeaderActionFields +.public SetMonsterActionFields +.public ShouldMonsterRunAway +.public ShouldMonsterRunAwayVariation +.public SpawnItem .public sub_02001AB0 .public sub_02006B70 .public sub_0200FB54 @@ -186,3 +195,12 @@ .public sub_0204AF20 .public sub_0204AF78 .public sub_02056754 +.public SubstitutePlaceholderStringTags +.public TryLeaderItemPickUp +.public TryPointCameraToMonster +.public TryTriggerMonsterHouse +.public TryTriggerTrap +.public UpdateAiTargetPos +.public UpdateMinimap +.public UpdateTrapsVisibility +.public YesNoMenu diff --git a/asm/include/overlay_29_022F52B0.inc b/asm/include/overlay_29_022F52B0.inc index 0f7f9ad7..ca30a4f5 100644 --- a/asm/include/overlay_29_022F52B0.inc +++ b/asm/include/overlay_29_022F52B0.inc @@ -1,10 +1,13 @@ #pragma once +.public __divsi3 .public AbilityIsActiveVeneer .public ApplyItemEffect +.public AreMovesEnabled +.public CanMonsterUseItem .public DecrementStackItem +.public DIRECTIONS_XY .public DisplayMessage .public DisplayMessage2 -.public __divsi3 .public DungeonRandInt .public EnemyEvolution .public EntityIsValid__022F528C @@ -13,29 +16,27 @@ .public GetActiveTeamMember .public GetDirectionTowardsPosition .public GetItemCategoryVeneer +.public GetItemToUse .public GetLeader +.public GetMissionDestination .public GetNumberOfAttacks +.public GetPersonalityIndex .public GetStringFromFileVeneer .public GetTalkLine .public HandleFaint .public HasHeldItem .public HasLowHealth .public InitMove +.public InitPortraitDungeon .public IqSkillIsEnabled .public IsFloorOver -.public IsMonsterIdInNormalRangeVeneer -.public ItemZInit -.public LogMessageByIdWithPopupCheckUser -.public RemoveEquivItemNoHole -.public ShouldMonsterRunAwayVariation -.public strcpy -.public strncpy -.public SubstitutePlaceholderStringTags -.public TryActivateTruant -.public UpdateMapSurveyorFlag -.public UpdateMovePp .public IsMarowakTrainingMaze -.public ShouldDisplayEntityWrapper +.public IsMonsterIdInNormalRangeVeneer +.public IsSecretBazaarNpcBehavior +.public ItemZInit +.public LogItemBlockedByEmbargo +.public LogMessageByIdWithPopupCheckUser +.public MonsterHasEmbargoStatus .public ov29_022E56A0 .public ov29_022E5728 .public ov29_022E690C @@ -44,9 +45,6 @@ .public ov29_022E9A9C .public ov29_022EA370 .public ov29_022EB378 -.public GetItemToUse -.public RemoveUsedItem -.public IsSecretBazaarNpcBehavior .public ov29_022F3B8C .public ov29_022F6748 .public ov29_022F87C0 @@ -60,40 +58,48 @@ .public ov29_02304A48 .public ov29_02304AFC .public ov29_02307BDC -.public TryTriggerMonsterHouse .public ov29_0230F9A4 -.public MonsterHasEmbargoStatus -.public LogItemBlockedByEmbargo -.public ShouldUsePp .public ov29_0231AE3C -.public CanMonsterUseItem .public ov29_0232145C .public ov29_02322374 .public ov29_02338430 .public ov29_0233A248 .public ov29_02343D30 -.public AreMovesEnabled .public ov29_02344544 .public ov29_02344B44 .public ov29_02344B70 -.public SpawnItem -.public RemoveGroundItem .public ov29_02346FB8 .public ov29_02347000 -.public RemoveEmptyItemsInBagWrapper .public ov29_02347518 .public ov29_02347BC8 .public ov29_02348C64 -.public GetMissionDestination .public ov29_0234A2D4 .public ov29_0234A5E4 .public ov29_0234B034 .public ov29_0234B0B4 -.public InitPortraitDungeon .public ov29_0234CFA0 -.public GetPersonalityIndex .public ov29_0234D304 -.public YesNoMenu +.public ov29_0235171E +.public ov29_02352750 +.public ov29_02352758 +.public ov29_02353538 +.public ov29_0237CA80 +.public RemoveEmptyItemsInBagWrapper +.public RemoveEquivItemNoHole +.public RemoveGroundItem +.public RemoveUsedItem +.public ShouldDisplayEntityWrapper +.public ShouldMonsterRunAwayVariation +.public ShouldUsePp +.public SpawnItem +.public strcpy +.public strncpy .public sub_02020880 .public sub_02024FB8 .public sub_02025888 +.public SubstitutePlaceholderStringTags +.public TryActivateTruant +.public TryTriggerMonsterHouse +.public UpdateMapSurveyorFlag +.public UpdateMovePp +.public YesNoMenu diff --git a/asm/include/overlay_29_022F62CC.inc b/asm/include/overlay_29_022F62CC.inc index 85728a7e..399511ae 100644 --- a/asm/include/overlay_29_022F62CC.inc +++ b/asm/include/overlay_29_022F62CC.inc @@ -1,7 +1,10 @@ #pragma once .public abs .public AddMoneyCarried +.public AnimationDelayOrSomething +.public BAG_ITEMS_PTR_MIRROR .public CalcSpeedStageWrapper +.public CannotStandOnTile .public DeleteWanTableEntryVeneer .public DisplayMessage2 .public EntityIsValid__022F62A8 @@ -10,40 +13,47 @@ .public GetDirectionTowardsPosition .public GetExplorerMazeMonster .public GetGold +.public GetItemInfo .public GetKecleonIdToSpawnByFloor .public GetLeader .public GetMonsterIdFromSpawnEntry .public GetSpriteFileSize .public GetTile .public GetTileAtEntity +.public InitPortraitDungeon .public IsCastform .public IsCherrim .public IsFloorOver .public IsShaymin +.public IsShoppableItem .public LoadMissionMonsterSprites .public LoadMonsterSprite +.public LoadWanTableEntryFromPackUseProvidedMemory .public LogMessageByIdWithPopupCheckUser .public MemAlloc .public MemFree .public MemZero -.public TeamLeaderIqSkillIsEnabled -.public TryWarp -.public GetItemInfo -.public AnimationDelayOrSomething +.public ov10_022C473C +.public ov10_022C4800 .public ov29_022EACCC .public ov29_022F6210 -.public CannotStandOnTile .public ov29_023009CC .public ov29_02304A00 .public ov29_02304A48 .public ov29_0231B490 .public ov29_0231B4AC -.public SpawnItem -.public RemoveGroundItem .public ov29_0234B09C -.public InitPortraitDungeon -.public YesNoMenu +.public ov29_02352760 +.public ov29_02353538 +.public ov29_023535A8 +.public ov29_023535AC +.public ov29_0237C9AC +.public ov29_0237C9B0 +.public RemoveGroundItem +.public SpawnItem .public sub_020018A4 -.public IsShoppableItem -.public LoadWanTableEntryFromPackUseProvidedMemory .public sub_0208FC8C +.public TeamLeaderIqSkillIsEnabled +.public TryWarp +.public WAN_TABLE +.public YesNoMenu diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc index 4044bc5f..2c91df71 100644 --- a/asm/include/overlay_29_022F7388.inc +++ b/asm/include/overlay_29_022F7388.inc @@ -1,23 +1,34 @@ #pragma once +.public __divsi3 +.public _020A1870 .public AbilityIsActiveVeneer .public AdvanceFrame .public AiMovement +.public AnimationDelayOrSomething .public ApplyItemEffect +.public BAG_ITEMS_PTR_MIRROR .public CanAttackInDirection .public CanMonsterSpawn +.public CanMonsterUseItem +.public CanSeeTarget .public CeilFixedPoint .public CheckTeamMemberIdx .public Conversion2IsActive .public DeleteWanTableEntryVeneer +.public DIRECTIONS_XY +.public DiscoverMinimap .public DisplayMessage .public DisplayMessage2 -.public __divsi3 +.public DrawMinimapTile .public DungeonRandInt .public DungeonRngSetPrimary .public DungeonRngSetSecondary .public EnableIqSkill +.public EndBurnClassStatus .public EndCringeClassStatus .public EndFrozenClassStatus +.public EndReflectClassStatus +.public EndSleepClassStatus .public EntityIsValid__022F7364 .public EntityIsValid__022FC99C .public ExclusiveItemEffectFlagTest @@ -28,16 +39,17 @@ .public GetApparentWeather .public GetBodySize .public GetChebyshevDistance +.public GetDefensiveStatAtLevel .public GetDirectionTowardsPosition .public GetExp .public GetExplorerMazeMonster .public GetFileLengthInPackWithPackNb .public GetFloorType .public GetForcedLossReason -.public InitMoveCheckId .public GetLeader .public GetLearnableIqSkills .public GetLvlUpEntry +.public GetMaxHpAtLevel .public GetMaxPp .public GetMaxPpWrapper .public GetMobilityType @@ -45,11 +57,15 @@ .public GetMonsterGender .public GetMonsterIdFromSpawnEntry .public GetMonsterLevelFromSpawnEntry +.public GetMonsterMoves +.public GetMonsterName .public GetMoveBasePp .public GetMoveType .public GetMoveTypeForMonster .public GetNbItemsInBag .public GetNumberOfAttacks +.public GetOffensiveStatAtLevel +.public GetOutlawSpawnData .public GetScenarioBalance .public GetScenarioBalanceVeneer .public GetSleepAnimationId @@ -57,28 +73,40 @@ .public GetSpriteFileSize .public GetSpriteIndex__020526EC .public GetStairsRoom +.public GetStairsSpawnPosition .public GetTile .public GetTileAtEntity .public GetTileSafe .public GetTurnLimit .public GetType +.public GetTypeMatchupBothTypes .public GroundToDungeonMoveset .public HasHeldItem +.public HasMaxGinsengBoost99 +.public InitMoveCheckId .public InitTeamMember +.public IQ_SKILLS .public IqSkillIsEnabled +.public IsCurrentFixedRoomBossFight .public IsCurrentMissionType .public IsDestinationFloorWithFixedRoom .public IsDestinationFloorWithMonster +.public IsFullFloorFixedRoom +.public IsInvalidSpawnTile .public IsLevelResetDungeon .public IsMonsterIdInNormalRange +.public IsMonsterSleeping .public IsOneHitKoMove .public IsOutlawOrChallengeRequestFloor .public IsRecruitingAllowed +.public IsSecretBazaarNpcBehavior .public IsSecretFloor .public IsShaymin .public ItemZInit .public JoinedAtRangeCheck .public JoinedAtRangeCheck2 +.public LoadWanTableEntryFromPack +.public LoadWanTableEntryFromPackUseProvidedMemory .public LoadWazaP2 .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUser @@ -88,38 +116,19 @@ .public MemFree .public MonsterIsType .public OpenMessageLog -.public RandInt -.public RemoveEquivItem -.public ReplaceWanFromBinFile -.public RestoreAllMovePP -.public SetActionPassTurnOrWalk -.public SetForcedLossReason -.public SetMissionTargetEnemyDefeated -.public SetMonsterLevelAndId -.public ShouldMonsterRunAway -.public StoryRestrictionsEnabled -.public SubFixedPoint -.public SubstitutePlaceholderStringTags -.public TryIncreaseHp -.public TryInflictBurnStatus -.public TryInflictPausedStatus -.public UnloadCurrentWazaP -.public UpdateStatusIconFlags +.public ov10_022C48DC +.public ov10_022C4C6C +.public ov10_022C4C6E +.public ov10_022C4C70 +.public ov10_022C5938 .public ov29_022DDA54 .public ov29_022DDB68 -.public IsCurrentFixedRoomBossFight .public ov29_022E0A04 .public ov29_022E1C0C .public ov29_022E2470 -.public ShouldDisplayEntityWrapper -.public CanSeeTarget .public ov29_022E2978 .public ov29_022E2A78 -.public PointCameraToMonster -.public UpdateCamera -.public AnimationDelayOrSomething .public ov29_022E4160 -.public ShowPpRestoreEffect .public ov29_022E576C .public ov29_022E6260 .public ov29_022E647C @@ -135,47 +144,26 @@ .public ov29_022EF7C4 .public ov29_022EF938 .public ov29_022EFAE8 -.public IsSecretBazaarNpcBehavior .public ov29_022FCD04 .public ov29_022FE048 -.public GetMaxHpAtLevel -.public GetOffensiveStatAtLevel -.public GetDefensiveStatAtLevel -.public GetOutlawSpawnData -.public IsInvalidSpawnTile .public ov29_022FFB90 -.public GetMonsterName .public ov29_0230040C -.public IsMonsterSleeping .public ov29_02300818 .public ov29_02300CB0 .public ov29_0230175C .public ov29_023018AC .public ov29_023021F0 -.public GetMonsterMoves .public ov29_02304830 .public ov29_023049A8 .public ov29_02304A48 .public ov29_02304BAC -.public EndSleepClassStatus -.public EndBurnClassStatus -.public EndReflectClassStatus .public ov29_02307CE0 .public ov29_02307DD0 -.public GetTypeMatchupBothTypes .public ov29_0230F654 .public ov29_0230F9A4 .public ov29_023159D4 -.public CanMonsterUseItem -.public ShouldTryEatItem -.public HasMaxGinsengBoost99 -.public IsFullFloorFixedRoom -.public GetStairsSpawnPosition -.public DiscoverMinimap .public ov29_02337EC0 .public ov29_02338F24 -.public DrawMinimapTile -.public UpdateMinimap .public ov29_02344B44 .public ov29_02348100 .public ov29_02349688 @@ -186,16 +174,34 @@ .public ov29_0234B09C .public ov29_0234B0B4 .public ov29_0234B1A4 -.public YesNoMenu .public ov29_0234EF24 +.public ov29_0235171E +.public ov29_02351E28 +.public ov29_02352768 +.public ov29_02353538 +.public ov29_0235355C +.public ov29_0237C9B0 +.public PointCameraToMonster +.public RandInt +.public RemoveEquivItem +.public ReplaceWanFromBinFile +.public RestoreAllMovePP +.public SECONDARY_TERRAIN_TYPES +.public SetActionPassTurnOrWalk +.public SetForcedLossReason +.public SetMissionTargetEnemyDefeated +.public SetMonsterLevelAndId +.public SetSpriteIdForAnimationControl +.public ShouldDisplayEntityWrapper +.public ShouldMonsterRunAway +.public ShouldTryEatItem +.public ShowPpRestoreEffect +.public StoryRestrictionsEnabled .public sub_0200F9B4 .public sub_0200FB54 .public sub_0201405C .public sub_02017C50 .public sub_0201C0CC -.public SetSpriteIdForAnimationControl -.public LoadWanTableEntryFromPack -.public LoadWanTableEntryFromPackUseProvidedMemory .public sub_0204AEF0 .public sub_02050964 .public sub_02050FF8 @@ -208,4 +214,15 @@ .public sub_02058674 .public sub_02058EB0 .public sub_0205A450 -.public SECONDARY_TERRAIN_TYPES +.public SubFixedPoint +.public SubstitutePlaceholderStringTags +.public TEAM_MEMBER_TABLE_PTR +.public TryIncreaseHp +.public TryInflictBurnStatus +.public TryInflictPausedStatus +.public UnloadCurrentWazaP +.public UpdateCamera +.public UpdateMinimap +.public UpdateStatusIconFlags +.public WAN_TABLE +.public YesNoMenu diff --git a/asm/include/overlay_29_022FC9C0.inc b/asm/include/overlay_29_022FC9C0.inc index 6733ff05..4f233dd5 100644 --- a/asm/include/overlay_29_022FC9C0.inc +++ b/asm/include/overlay_29_022FC9C0.inc @@ -1,16 +1,25 @@ #pragma once +.public OUTLAW_LEVEL_TABLE .public AbilityIsActiveVeneer +.public AddHeldItemToBag .public AdvanceFrame +.public AnimationDelayOrSomething .public CalcSpeedStageWrapper +.public CreateEnemyEntity +.public DIRECTIONS_XY .public DisplayActions +.public DungeonGetSpriteIndex .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public DungeonRngSetPrimary .public DungeonRngSetSecondary .public EnemyEvolution +.public EnsureCanStandCurrentTile .public EntityIsValid__022FC99C .public EntityIsValid__022FED98 .public ExclusiveItemEffectFlagTest +.public FindClosestUnoccupiedTileWithin2 +.public FindFarthestUnoccupiedTileWithin2 .public FreeOtherWrappedMonsters .public GetAbility .public GetActiveTeamMember @@ -21,41 +30,49 @@ .public GetBaseOffensiveStat .public GetChanceAsleep .public GetCurrentBagCapacity +.public GetItemIdToSpawn .public GetItemToRetrieve .public GetLeader .public GetLvlUpEntry +.public GetMissionDestination .public GetMissionRank +.public GetMonsterApparentId .public GetMonsterIdToSpawn .public GetMonsterLevelToSpawn -.public DungeonGetSpriteIndex .public GetTile .public GetType .public HasHeldItem .public InflictSleepStatusSingle +.public InitEnemyStatsAndMoves .public InitStandardItem .public IqSkillIsEnabled .public IsBagFull +.public IsCurrentFixedRoomBossFight .public IsCurrentMissionType .public IsDestinationFloorWithFixedRoom .public IsDestinationFloorWithFleeingOutlaw .public IsDestinationFloorWithHiddenOutlaw .public IsDestinationFloorWithMonster .public IsFloorOver +.public IsInvalidSpawnTile .public IsOutlawMonsterHouseFloor +.public IsSecretBazaarNpcBehavior .public ItemZInit .public LogMessageByIdWithPopupCheckUser .public MemZero .public MewSpawnCheck +.public MoveMonsterToPos .public MultiplyByFixedPoint -.public SetTargetMonsterNotFoundFlag -.public ShuffleHiddenPower -.public SubstitutePlaceholderStringTags -.public UpdateStatusIconFlags +.public ov10_022C4520 +.public ov10_022C45A4 +.public ov10_022C4858 +.public ov10_022C489C +.public ov10_022C4C6C +.public ov10_022C4F3C +.public ov10_022C4F3D .public ov29_022DDA54 .public ov29_022DDB68 .public ov29_022DEA10 -.public IsCurrentFixedRoomBossFight -.public UpdateEntityPixelPos .public ov29_022E1AAC .public ov29_022E1AD4 .public ov29_022E1C0C @@ -64,24 +81,16 @@ .public ov29_022E1EC4 .public ov29_022E1F34 .public ov29_022E2018 -.public CreateEnemyEntity .public ov29_022E2DFC -.public AnimationDelayOrSomething .public ov29_022E3A58 .public ov29_022E5D68 .public ov29_022E6644 -.public GetItemIdToSpawn .public ov29_022E81F8 .public ov29_022E9628 -.public FindClosestUnoccupiedTileWithin2 -.public FindFarthestUnoccupiedTileWithin2 .public ov29_022EB944 .public ov29_022EC85C -.public TrySpawnTrapperTrap -.public TryTriggerTrap .public ov29_022EF9BC .public ov29_022EFAE8 -.public IsSecretBazaarNpcBehavior .public ov29_022F3890 .public ov29_022F4350 .public ov29_022F4370 @@ -94,13 +103,9 @@ .public ov29_022F4DAC .public ov29_022F505C .public ov29_022F52B0 -.public UseSingleUseItemWrapper -.public UseThrowableItem .public ov29_022F59C4 .public ov29_022F5F18 .public ov29_022F6058 -.public MoveMonsterToPos -.public GetMonsterApparentId .public ov29_022F9840 .public ov29_022F996C .public ov29_022F9EA0 @@ -111,12 +116,9 @@ .public ov29_022FBD08 .public ov29_022FBF08 .public ov29_022FBF30 -.public InitEnemyStatsAndMoves .public ov29_022FC468 .public ov29_022FEDBC .public ov29_022FEFC8 -.public TryActivateFlashFireOnAllMonsters -.public IsInvalidSpawnTile .public ov29_022FFC9C .public ov29_02300DCC .public ov29_02300E78 @@ -133,18 +135,34 @@ .public ov29_02318D58 .public ov29_0231A8A0 .public ov29_0231A9F8 -.public EnsureCanStandCurrentTile .public ov29_0232461C .public ov29_02337CCC .public ov29_02338708 .public ov29_02338850 .public ov29_02338898 .public ov29_02346888 -.public AddHeldItemToBag -.public GetMissionDestination .public ov29_0234B024 .public ov29_0234BA54 +.public ov29_0235171E +.public ov29_02351E28 +.public ov29_0235276C +.public ov29_02353538 +.public ov29_0235355C +.public ov29_0237C690 +.public ov29_0237C9C0 +.public ov29_0237CA68 +.public ov29_0237CA6C +.public SetTargetMonsterNotFoundFlag +.public ShuffleHiddenPower .public sub_02050FF8 .public sub_02054FEC .public sub_02055020 .public sub_02058EB0 +.public SubstitutePlaceholderStringTags +.public TryActivateFlashFireOnAllMonsters +.public TrySpawnTrapperTrap +.public TryTriggerTrap +.public UpdateEntityPixelPos +.public UpdateStatusIconFlags +.public UseSingleUseItemWrapper +.public UseThrowableItem diff --git a/asm/include/overlay_29_022FEDBC.inc b/asm/include/overlay_29_022FEDBC.inc index 29491b71..80c6115e 100644 --- a/asm/include/overlay_29_022FEDBC.inc +++ b/asm/include/overlay_29_022FEDBC.inc @@ -1,5 +1,6 @@ #pragma once .public AbilityIsActive +.public ActivateFlashFire .public CanMonsterUseMove .public ChooseAiMove .public DungeonRandInt @@ -10,28 +11,31 @@ .public GetMobilityType .public GetSpeedStatus .public GetTile -.public IsFloating .public HasHeldItem .public IqSkillIsEnabled .public IsBlinded +.public IsChargingTwoTurnMove +.public IsCurrentTilesetBackground +.public IsFloating +.public IsMonsterSleeping .public LogMessageByIdWithPopupCheckUser .public MonsterIsType +.public ov29_022E56A0 +.public ov29_022E655C +.public ov29_022FAA04 +.public ov29_02300DCC +.public ov29_02300E78 +.public ov29_0230F654 +.public ov29_02318D58 +.public ov29_02322374 +.public ov29_02344B44 +.public ov29_02353538 +.public ov29_023535B0 +.public ov29_023535B8 +.public ov29_0237C9B8 .public SetActionPassTurnOrWalk +.public SetActionUseMovePlayer .public SetMonsterActionFields .public SubstitutePlaceholderStringTags .public TickStatusTurnCounter -.public ov29_022E56A0 -.public ov29_022E655C -.public SetActionUseMovePlayer -.public ov29_022FAA04 -.public IsMonsterSleeping -.public ov29_02300DCC -.public ov29_02300E78 .public UpdateStateFlags -.public ov29_0230F654 -.public ActivateFlashFire -.public ov29_02318D58 -.public ov29_02322374 -.public IsChargingTwoTurnMove -.public IsCurrentTilesetBackground -.public ov29_02344B44 diff --git a/asm/include/overlay_29_02300108.inc b/asm/include/overlay_29_02300108.inc index 0c3878ca..849bc17c 100644 --- a/asm/include/overlay_29_02300108.inc +++ b/asm/include/overlay_29_02300108.inc @@ -70,3 +70,4 @@ .public sub_020585B4 .public sub_02058C9C .public SECONDARY_TERRAIN_TYPES +.public DIRECTIONS_XY diff --git a/asm/include/overlay_29_02302A5C.inc b/asm/include/overlay_29_02302A5C.inc index 765721c7..6844c331 100644 --- a/asm/include/overlay_29_02302A5C.inc +++ b/asm/include/overlay_29_02302A5C.inc @@ -1,30 +1,32 @@ #pragma once +.public _020AFC4C +.public DIRECTIONS_XY .public DisplayMessage .public DisplayMessage2 +.public DungeonGetSpriteIndex .public DungeonRandInt .public EntityIsValid__02302A38 .public EntityIsValid__023047B8 .public FormatMoveString +.public GetEncodedHalfword .public GetLeader +.public GetLoadedAttackSpriteId .public GetLvlUpEntry +.public GetMonsterName .public GetMovesetLevelUpPtr +.public GetPersonalityIndex .public GetSleepAnimationId -.public DungeonGetSpriteIndex .public GetStringFromFileVeneer .public GetTalkLine .public GetTile +.public InitPortraitDungeon .public IsExperienceLocked +.public IsInvalidSpawnTile .public IsOnMonsterSpawnList .public IsSpecialEpisodeDungeon .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUserTarget .public NeedsItemToSpawn -.public Rand16Bit -.public SpawnMonster -.public strcat -.public strcpy -.public StringFromMessageId -.public SubstitutePlaceholderStringTags .public ov29_022DD7D8 .public ov29_022DDB98 .public ov29_022E273C @@ -39,13 +41,7 @@ .public ov29_022EAC9C .public ov29_022EBCE8 .public ov29_022ECB38 -.public GetLoadedAttackSpriteId -.public SetMonsterTypeAndAbility -.public TryPointCameraToMonster .public ov29_022FB6E4 -.public SubInitMonster -.public IsInvalidSpawnTile -.public GetMonsterName .public ov29_0230040C .public ov29_023009CC .public ov29_023021F0 @@ -59,18 +55,33 @@ .public ov29_0234B084 .public ov29_0234B09C .public ov29_0234B4E0 -.public InitPortraitDungeon .public ov29_0234CFA0 -.public GetPersonalityIndex .public ov29_0234D234 .public ov29_0234D304 .public ov29_0234D484 .public ov29_0234FAEC +.public ov29_0235171E +.public ov29_023527F0 +.public ov29_0235280C +.public ov29_02352810 +.public ov29_02353538 +.public ov29_023535C8 +.public ov29_0237C850 +.public ov29_0237C888 +.public ov29_0237C9C4 +.public ov29_0237C9C5 +.public ov29_0237C9C8 +.public ov29_0237C9C9 +.public Rand16Bit +.public SetAndPlayAnimationForAnimationControl +.public SetMonsterTypeAndAbility +.public SetSpriteIdForAnimationControl +.public SpawnMonster +.public strcat +.public strcpy +.public StringFromMessageId .public sub_020149C0 .public sub_0201B9F8 -.public SetSpriteIdForAnimationControl -.public SetAndPlayAnimationForAnimationControl -.public SwitchAnimationControlToNextFrame .public sub_0201CF5C .public sub_0201D034 .public sub_0201D110 @@ -78,9 +89,12 @@ .public sub_0201D1B0 .public sub_02025888 .public sub_0204F610 -.public GetEncodedHalfword .public sub_02053904 .public sub_02054FB8 .public sub_02054FEC .public sub_02055020 .public sub_02058C9C +.public SubInitMonster +.public SubstitutePlaceholderStringTags +.public SwitchAnimationControlToNextFrame +.public TryPointCameraToMonster diff --git a/asm/include/overlay_29_02305C28.inc b/asm/include/overlay_29_02305C28.inc index 53f1ff30..f2290c6f 100644 --- a/asm/include/overlay_29_02305C28.inc +++ b/asm/include/overlay_29_02305C28.inc @@ -1,64 +1,68 @@ #pragma once .public abs .public AdvanceFrame +.public ApplyDamageAndEffectsWrapper .public CalcSpeedStageWrapper .public CalcStatusDuration +.public DungeonGetSpriteIndex +.public EndNegativeStatusCondition +.public EnsureCanStandCurrentTile .public EntityIsValid__02305C04 .public EntityIsValid__02307EF8 .public FreeOtherWrappedMonsters +.public GetMonsterApparentId .public GetSleepAnimationId -.public DungeonGetSpriteIndex .public GetType +.public IsProtectedFromNegativeStatus .public ItemIsActive__02307F1C .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget +.public MonsterHasNegativeStatus +.public ov10_022C45A0 +.public ov10_022C45A8 +.public ov10_022C4868 +.public ov29_022E543C +.public ov29_022E65F4 +.public ov29_022E6798 +.public ov29_022F62CC +.public ov29_022FA1D8 +.public ov29_022FB984 +.public ov29_02304830 +.public ov29_02304A48 +.public ov29_02311C28 +.public ov29_02321134 +.public ov29_02353538 +.public SafeguardIsActive +.public SubInitMonster .public SubstitutePlaceholderStringTags .public TryIncreaseHp .public TryInflictBadlyPoisonedStatus +.public TryInflictBlinkerStatus .public TryInflictBurnStatus .public TryInflictConfusedStatus .public TryInflictConstrictionStatus .public TryInflictCoweringStatus .public TryInflictCringeStatus +.public TryInflictCrossEyedStatus +.public TryInflictDecoyStatus +.public TryInflictDropeyeStatus +.public TryInflictEmbargoStatus +.public TryInflictEncoreStatus +.public TryInflictExposedStatus +.public TryInflictGastroAcidStatus +.public TryInflictHealBlockStatus .public TryInflictInfatuatedStatus .public TryInflictLeechSeedStatus +.public TryInflictMiracleEyeStatus +.public TryInflictMuzzledStatus .public TryInflictParalysisStatus .public TryInflictPausedStatus +.public TryInflictPerishSongStatus .public TryInflictPoisonedStatus .public TryInflictShadowHoldStatus .public TryInflictSleepStatus -.public UpdateStatusIconFlags -.public ov29_022E543C -.public ov29_022E65F4 -.public ov29_022E6798 -.public ov29_022F62CC -.public GetMonsterApparentId -.public ov29_022FA1D8 -.public ov29_022FB984 -.public SubInitMonster -.public MonsterHasNegativeStatus -.public SafeguardIsActive -.public IsProtectedFromNegativeStatus -.public ov29_02304830 -.public ov29_02304A48 -.public EndNegativeStatusCondition -.public ApplyDamageAndEffectsWrapper -.public ov29_02311C28 -.public TryInflictWhifferStatus -.public TryInflictDecoyStatus .public TryInflictTauntStatus -.public TryInflictPerishSongStatus -.public TryInflictEncoreStatus -.public TryInflictMuzzledStatus -.public TryInflictExposedStatus -.public TryInflictBlinkerStatus -.public TryInflictCrossEyedStatus -.public TryInflictDropeyeStatus -.public TryInflictGastroAcidStatus -.public TryInflictHealBlockStatus -.public TryInflictEmbargoStatus -.public TryInflictMiracleEyeStatus -.public EnsureCanStandCurrentTile -.public ov29_02321134 -.public UpdateTrapsVisibility +.public TryInflictWhifferStatus .public UpdateMinimap +.public UpdateStatusIconFlags +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_02307F1C.inc b/asm/include/overlay_29_02307F1C.inc index 068a8c44..7f036be9 100644 --- a/asm/include/overlay_29_02307F1C.inc +++ b/asm/include/overlay_29_02307F1C.inc @@ -1,6 +1,7 @@ #pragma once .public AbilityIsActiveVeneer .public AdvanceFrame +.public AnimationDelayOrSomething .public DungeonRandInt .public DungeonRandRange .public EntityIsValid__02307EF8 @@ -10,5 +11,7 @@ .public HasHeldItem .public MewSpawnCheck .public MultiplyByFixedPoint +.public ov10_022C4560 +.public ov10_022C4660 +.public ov29_02353538 .public SpawnMonster -.public AnimationDelayOrSomething diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc index 8d307221..ccff7fd8 100644 --- a/asm/include/overlay_29_02308FE0.inc +++ b/asm/include/overlay_29_02308FE0.inc @@ -1,30 +1,52 @@ #pragma once +.public __divsi3 +.public _020A18CC +.public _020A18D4 +.public _020A18D8 +.public _020A18E8 +.public _020A18EC +.public _020A18F0 +.public _020A18F4 +.public _020A18F8 .public AbilityIsActiveVeneer .public abs +.public ActivateMotorDrive .public AddExpSpecial .public AddFixedPoint64 .public AdvanceFrame +.public ApplyDamageAndEffects +.public AURA_BOW_STAT_BOOST .public AuraBowIsActive +.public BAG_ITEMS_PTR_MIRROR .public CanEnemyEvolve +.public CanSeeTarget .public CeilFixedPoint +.public ChangeDungeonMusic .public ClampedLn .public DebugPrint0 +.public DebugRecruitingEnabled +.public DEF_SCARF_STAT_BOOST .public DivideFixedPoint64 -.public __divsi3 .public DungeonRandInt .public DungeonRandOutcome__022EAB20 +.public EndCurseClassStatus +.public EndInvisibleClassStatus +.public EnsureCanStandCurrentTile .public EntityIsValid__02308FBC .public EntityIsValid__0230E8F0 .public ExclusiveItemDefenseBoost .public ExclusiveItemEffectFlagTest +.public ExclusiveItemEffectIsActiveWithLogging .public ExclusiveItemOffenseBoost .public FixedPoint32To64 .public FixedPoint64CmpLt .public FixedPoint64IsZero .public FixedPoint64ToInt .public FixedRoomIsSubstituteRoom +.public FlashFireShouldActivate .public FreeOtherWrappedMonsters .public GendersEqualNotGenderless +.public GenerateStandardItem .public GetActiveTeamMember .public GetApparentWeather .public GetDirectionTowardsPosition @@ -46,7 +68,6 @@ .public GetTileAtEntity .public GravityIsActive .public HandleFaint -.public IsFloating .public HasHeldItem .public HasPlayedOldGame .public InitTeamMember @@ -56,6 +77,8 @@ .public IsCurrentMissionType .public IsCurrentMissionTypeExact .public IsExperienceLocked +.public IsFloating +.public IsFullFloorFixedRoom .public IsLegendaryChallengeFloor .public IsMonsterIdInNormalRangeVeneer .public IsMonsterOnTeam @@ -63,58 +86,80 @@ .public IsRecoilMove .public IsRecruitingAllowed .public IsRegularAttackOrProjectile +.public IsSecretBazaarNpcBehavior .public IsSpecialStoryAlly .public ItemZInit .public JoinedAtRangeCheck2Veneer .public LevitateIsActive .public LogMessageByIdWithPopup +.public LogMessageByIdWithPopupCheckParticipants .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public MemZero .public MewSpawnCheck +.public MonsterHasNegativeStatus .public MonsterIsType .public MoveIsNotPhysical +.public MoveMonsterToPos .public MultiplyByFixedPoint .public MultiplyFixedPoint64 -.public PreprocessString -.public ResetDamageData -.public RestorePpAllMovesSetFlags -.public RoundUpDiv256 -.public SetItemAcquired -.public SetMonsterFlag2 -.public SetPokemonBattled -.public SetPokemonJoined -.public SpawnMonster -.public StringFromMessageId -.public StrncpySimpleNoPad -.public SubstitutePlaceholderStringTags -.public TryIncreaseHp -.public UpdateAiTargetPos -.public UpdateStatusIconFlags +.public MUNCH_BELT_STAT_BOOST +.public MusicTableIdxToMusicId +.public NearbyAllyIqSkillIsEnabled +.public OtherMonsterAbilityIsActive .public ov10_022BDC68 .public ov10_022BDE50 .public ov10_022BF964 -.public UpdateEntityPixelPos +.public ov10_022C4410 +.public ov10_022C441C +.public ov10_022C4430 +.public ov10_022C443C +.public ov10_022C447C +.public ov10_022C44DC +.public ov10_022C44FC +.public ov10_022C4510 +.public ov10_022C455C +.public ov10_022C4594 +.public ov10_022C4598 +.public ov10_022C45B4 +.public ov10_022C45C4 +.public ov10_022C45E0 +.public ov10_022C45FC +.public ov10_022C4640 +.public ov10_022C46A4 +.public ov10_022C46F0 +.public ov10_022C46FC +.public ov10_022C4700 +.public ov10_022C4704 +.public ov10_022C4708 +.public ov10_022C470C +.public ov10_022C4710 +.public ov10_022C4744 +.public ov10_022C474C +.public ov10_022C4758 +.public ov10_022C47C0 +.public ov10_022C47F8 +.public ov10_022C4810 +.public ov10_022C4818 +.public ov10_022C481C +.public ov10_022C4820 +.public ov10_022C4824 +.public ov10_022C482C +.public ov10_022C4834 +.public ov10_022C4844 +.public ov10_022C4D14 +.public ov10_022C4D98 +.public ov10_022C4DEC +.public ov10_022C5064 +.public ov10_022C56B0 +.public ov10_022C593C .public ov29_022E1B28 .public ov29_022E2470 -.public ShouldDisplayEntityWrapper -.public CanSeeTarget -.public PointCameraToMonster -.public PlayEffectAnimationEntity -.public PlayEffectAnimation0x171Full -.public PlayEffectAnimation0x171 .public ov29_022E5478 .public ov29_022E550C .public ov29_022E576C .public ov29_022E57A0 -.public PlayEffectAnimation0x1A9__022E6130 -.public PlayEffectAnimation0x1A9__022E617C -.public PlayEffectAnimation0x1A9__022E61C8 -.public PlayEffectAnimation0x1A9__022E6214 .public ov29_022E62F0 -.public PlayEffectAnimation0x18E -.public PlayEffectAnimation0x1A9__022E64C4 -.public PlayEffectAnimation0x1A9__022E6510 .public ov29_022E66D8 .public ov29_022E68BC .public ov29_022E8104 @@ -123,13 +168,9 @@ .public ov29_022EA370 .public ov29_022EA718 .public ov29_022EACAC -.public MusicTableIdxToMusicId -.public ChangeDungeonMusic .public ov29_022EAF20 .public ov29_022EAF34 .public ov29_022ECD84 -.public DebugRecruitingEnabled -.public IsSecretBazaarNpcBehavior .public ov29_022EFB20 .public ov29_022EFB84 .public ov29_022F0518 @@ -137,7 +178,6 @@ .public ov29_022F05E4 .public ov29_022F0604 .public ov29_022F0780 -.public MoveMonsterToPos .public ov29_022F9058 .public ov29_022F9AF4 .public ov29_022FB98C @@ -145,44 +185,24 @@ .public ov29_022FBD24 .public ov29_022FBDE0 .public ov29_022FD318 -.public SubInitMonster .public ov29_0230040C -.public MonsterHasNegativeStatus -.public OtherMonsterAbilityIsActive -.public UpdateStateFlags .public ov29_02303E0C .public ov29_02304830 .public ov29_023049A8 .public ov29_02304A48 .public ov29_02305F60 -.public EndCurseClassStatus -.public EndInvisibleClassStatus .public ov29_02307BDC .public ov29_02307C48 -.public ApplyDamageAndEffects -.public TrySpawnEnemyItemDrop -.public FlashFireShouldActivate -.public ExclusiveItemEffectIsActiveWithLogging .public ov29_023159D4 -.public RestoreRandomMovePP -.public ActivateMotorDrive -.public TryAftermathExplosion -.public EnsureCanStandCurrentTile -.public IsFullFloorFixedRoom -.public UpdateTrapsVisibility .public ov29_02337EC0 -.public NearbyAllyIqSkillIsEnabled .public ov29_0233847C .public ov29_02344B9C -.public GenerateStandardItem -.public SpawnDroppedItemWrapper .public ov29_0234969C .public ov29_0234B034 .public ov29_0234B084 .public ov29_0234B09C .public ov29_0234B0B4 .public ov29_0234B1A4 -.public LogMessageByIdWithPopupCheckParticipants .public ov29_0234BA54 .public ov29_0234BB50 .public ov29_0234D630 @@ -192,6 +212,59 @@ .public ov29_0234D8A0 .public ov29_0234EE10 .public ov29_0234F008 +.public ov29_02352838 +.public ov29_0235283C +.public ov29_02352844 +.public ov29_0235284C +.public ov29_0235285C +.public ov29_02352864 +.public ov29_0235286C +.public ov29_0235287C +.public ov29_02352884 +.public ov29_02352894 +.public ov29_023528A4 +.public ov29_02352984 +.public ov29_02352990 +.public ov29_0235299C +.public ov29_02353218 +.public ov29_0235321C +.public ov29_02353220 +.public ov29_02353224 +.public ov29_02353228 +.public ov29_0235322C +.public ov29_02353230 +.public ov29_02353234 +.public ov29_02353330 +.public ov29_02353538 +.public ov29_023535D4 +.public ov29_0237CA6C +.public PlayEffectAnimation0x171 +.public PlayEffectAnimation0x171Full +.public PlayEffectAnimation0x18E +.public PlayEffectAnimation0x1A9__022E6130 +.public PlayEffectAnimation0x1A9__022E617C +.public PlayEffectAnimation0x1A9__022E61C8 +.public PlayEffectAnimation0x1A9__022E6214 +.public PlayEffectAnimation0x1A9__022E64C4 +.public PlayEffectAnimation0x1A9__022E6510 +.public PlayEffectAnimationEntity +.public PointCameraToMonster +.public POWER_BAND_STAT_BOOST +.public PreprocessString +.public ResetDamageData +.public RestorePpAllMovesSetFlags +.public RestoreRandomMovePP +.public RoundUpDiv256 +.public SetItemAcquired +.public SetMonsterFlag2 +.public SetPokemonBattled +.public SetPokemonJoined +.public ShouldDisplayEntityWrapper +.public SpawnDroppedItemWrapper +.public SpawnMonster +.public SPECIAL_BAND_STAT_BOOST +.public StringFromMessageId +.public StrncpySimpleNoPad .public sub_0200FB54 .public sub_02025314 .public sub_02025888 @@ -205,3 +278,14 @@ .public sub_020584FC .public sub_020585B4 .public sub_02058EB0 +.public SubInitMonster +.public SubstitutePlaceholderStringTags +.public TryAftermathExplosion +.public TryIncreaseHp +.public TrySpawnEnemyItemDrop +.public UpdateAiTargetPos +.public UpdateEntityPixelPos +.public UpdateStateFlags +.public UpdateStatusIconFlags +.public UpdateTrapsVisibility +.public ZINC_BAND_STAT_BOOST diff --git a/asm/include/overlay_29_0230E914.inc b/asm/include/overlay_29_0230E914.inc index 29f0a4cc..4648668e 100644 --- a/asm/include/overlay_29_0230E914.inc +++ b/asm/include/overlay_29_0230E914.inc @@ -1,19 +1,25 @@ #pragma once +.public BAG_ITEMS_PTR_MIRROR .public abs +.public CanSeeTarget .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public EntityIsValid__0230F008 .public GetDirectionTowardsPosition .public GetItemCategoryVeneer +.public GetItemInfo .public GetTile .public IqSkillIsEnabled .public IsTargetInRange -.public SetMonsterActionFields -.public TestItemAiFlag -.public GetItemInfo -.public CanSeeTarget .public ov29_02300B40 .public ov29_0230175C .public ov29_02302368 .public ov29_0230F02C .public ov29_0231E05C +.public ov29_02353538 +.public ov29_023536FC +.public ov29_0237C9D0 +.public ov29_0237C9D8 +.public ov29_0237C9F8 +.public SetMonsterActionFields +.public TestItemAiFlag diff --git a/asm/include/overlay_29_0230F02C.inc b/asm/include/overlay_29_0230F02C.inc index a6ffbe8d..928c18b8 100644 --- a/asm/include/overlay_29_0230F02C.inc +++ b/asm/include/overlay_29_0230F02C.inc @@ -2,44 +2,72 @@ .public AbilityIsActiveVeneer .public abs .public AddMoneyCarried +.public ApplyDamageAndEffectsWrapper +.public BAG_ITEMS_PTR_MIRROR .public BinToDecFixedPoint .public BoostSpeedOneStage +.public CanSeeTarget .public CeilFixedPoint +.public DIRECTIONS_XY .public DisplayActions .public DungeonRandInt .public DungeonRandOutcome__022EAB20 +.public EndBurnClassStatus +.public EndMagnetRiseStatus +.public EndNegativeStatusCondition +.public EndNegativeStatusConditionWrapper +.public EnsureCanStandCurrentTile .public EntityIsValid__0230F008 .public EntityIsValid__02311010 .public ExclusiveItemEffectFlagTest .public ExclusiveItemEffectIsActive__02311064 +.public ExclusiveItemEffectIsActiveWithLogging +.public GenerateStandardItem .public GetApparentWeather .public GetCurrentBagCapacity .public GetItemCategoryVeneer +.public GetItemInfo .public GetTile .public GetTileAtEntity .public GravityIsActive -.public IsFloating .public HasHeldItem .public InitMove .public IqSkillIsEnabled .public IsAuraBow .public IsExperienceLocked +.public IsFloating .public IsFloorOver .public ItemIsActive__02311034 .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUser +.public MonsterHasNegativeStatus .public MonsterIsType .public MultiplyFixedPoint64 -.public ShouldMonsterRunAwayVariation -.public SubFixedPoint -.public SubstitutePlaceholderStringTags -.public TickStatusTurnCounter -.public TreasureBoxDropsEnabled -.public TryIncreaseHp -.public TryWarp -.public TryWeatherFormChange -.public GetItemInfo -.public CanSeeTarget +.public ov10_022C4414 +.public ov10_022C4454 +.public ov10_022C446C +.public ov10_022C44BC +.public ov10_022C44D4 +.public ov10_022C44D8 +.public ov10_022C4588 +.public ov10_022C4590 +.public ov10_022C45D0 +.public ov10_022C45E8 +.public ov10_022C45F0 +.public ov10_022C4610 +.public ov10_022C464C +.public ov10_022C4650 +.public ov10_022C4664 +.public ov10_022C466C +.public ov10_022C46A0 +.public ov10_022C46A8 +.public ov10_022C46AC +.public ov10_022C46EC +.public ov10_022C4A5C +.public ov10_022C4BBC +.public ov10_022C4BE4 +.public ov10_022C4C9C +.public ov10_022C4FC4 .public ov29_022E42E8 .public ov29_022E53F0 .public ov29_022E543C @@ -49,33 +77,19 @@ .public ov29_022F2FE4 .public ov29_022F42F8 .public ov29_022F52BC -.public UseThrowableItem .public ov29_022F9EA0 .public ov29_022FB718 -.public MonsterHasNegativeStatus .public ov29_02300818 .public ov29_02300CB0 .public ov29_02300DCC .public ov29_0230175C -.public EndNegativeStatusCondition -.public EndNegativeStatusConditionWrapper -.public EndBurnClassStatus -.public EndMagnetRiseStatus .public ov29_02307BDC -.public ApplyDamageAndEffectsWrapper -.public ExclusiveItemEffectIsActiveWithLogging -.public TryActivateBadDreams .public ov29_0231E05C -.public EnsureCanStandCurrentTile .public ov29_02322374 .public ov29_02337E2C .public ov29_02344B44 .public ov29_02344B9C -.public GenerateStandardItem .public ov29_02345004 -.public RemoveGroundItem -.public SpawnDroppedItemWrapper -.public TryGenerateUnownStoneDrop .public ov29_023460DC .public ov29_02347040 .public ov29_02347184 @@ -86,6 +100,22 @@ .public ov29_0234908C .public ov29_0234B084 .public ov29_0234B294 +.public ov29_023529A8 +.public ov29_02353538 +.public ov29_023536FC +.public RemoveGroundItem +.public ShouldMonsterRunAwayVariation +.public SpawnDroppedItemWrapper .public sub_0200D8AC .public sub_0201116C .public sub_02050FF8 +.public SubFixedPoint +.public SubstitutePlaceholderStringTags +.public TickStatusTurnCounter +.public TreasureBoxDropsEnabled +.public TryActivateBadDreams +.public TryGenerateUnownStoneDrop +.public TryIncreaseHp +.public TryWarp +.public TryWeatherFormChange +.public UseThrowableItem diff --git a/asm/include/overlay_29_023118D8.inc b/asm/include/overlay_29_023118D8.inc index 9a6cbf40..79714b17 100644 --- a/asm/include/overlay_29_023118D8.inc +++ b/asm/include/overlay_29_023118D8.inc @@ -70,3 +70,4 @@ .public sub_02025888 .public sub_020258E4 .public SECONDARY_TERRAIN_TYPES +.public DIRECTIONS_XY diff --git a/asm/include/overlay_29_02318D58.inc b/asm/include/overlay_29_02318D58.inc index e4d4a4b7..d4c221d1 100644 --- a/asm/include/overlay_29_02318D58.inc +++ b/asm/include/overlay_29_02318D58.inc @@ -3,6 +3,7 @@ .public EntityIsValid__02318D34 .public EntityIsValid__02318E4C .public LogMessageByIdWithPopupCheckUserTarget +.public ov10_022C4750 +.public ov29_022E3F20 .public SubstitutePlaceholderStringTags .public UpdateStatusIconFlags -.public ov29_022E3F20 diff --git a/asm/include/overlay_29_02318E70.inc b/asm/include/overlay_29_02318E70.inc index d77bb0e2..105276bf 100644 --- a/asm/include/overlay_29_02318E70.inc +++ b/asm/include/overlay_29_02318E70.inc @@ -3,6 +3,8 @@ .public abs .public CalcStatusDuration .public CanAttackInDirection +.public CanSeeTarget +.public DIRECTIONS_XY .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public EntityIsValid__02318E4C @@ -19,11 +21,19 @@ .public IsBlinded .public IsTargetInRange .public LogMessageByIdWithPopupCheckUserTarget -.public StatusCheckerCheck -.public SubstitutePlaceholderStringTags -.public TryAddTargetToAiTargetList -.public UpdateStatusIconFlags -.public CanSeeTarget +.public ov10_022C4648 +.public ov10_022C472C +.public ov10_022C4730 +.public ov10_022C4734 +.public ov10_022C4738 +.public ov10_022C4740 +.public ov10_022C4794 +.public ov10_022C47B8 +.public ov10_022C47CC +.public ov10_022C47F4 +.public ov10_022C4840 +.public ov10_022C4854 +.public ov10_022C485C .public ov29_022E3F74 .public ov29_022E3F78 .public ov29_022E3F7C @@ -38,3 +48,12 @@ .public ov29_022E41AC .public ov29_022E543C .public ov29_0231A364 +.public ov29_02353538 +.public ov29_0237CA18 +.public ov29_0237CA20 +.public ov29_0237CA28 +.public ov29_0237CA48 +.public StatusCheckerCheck +.public SubstitutePlaceholderStringTags +.public TryAddTargetToAiTargetList +.public UpdateStatusIconFlags diff --git a/asm/include/overlay_29_02319FB0.inc b/asm/include/overlay_29_02319FB0.inc index fc5451bb..0777093a 100644 --- a/asm/include/overlay_29_02319FB0.inc +++ b/asm/include/overlay_29_02319FB0.inc @@ -1,10 +1,13 @@ #pragma once +.public __divsi3 .public AbilityIsActiveVeneer .public abs .public AiConsiderMove +.public AreMovesEnabled +.public AreOrbsAllowed .public BoostSpeedOneStage .public CanAttackInDirection -.public __divsi3 +.public DIRECTIONS_XY .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public EnemyEvolution @@ -14,6 +17,7 @@ .public GetApparentWeather .public GetDirectionTowardsPosition .public GetItemMoveId16 +.public GetItemToUse .public GetMoveAccuracyOrAiChance .public GetMoveTargetAndRange .public GetMoveTypeForMonster @@ -25,25 +29,22 @@ .public IqSkillIsEnabled .public IsBlinded .public IsFloorOver +.public IsMonsterSleeping .public IsMoveRangeString19 +.public LogMessageByIdWithPopupCheckParticipants .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget +.public MonsterHasNegativeStatus .public MonsterIsType -.public SetActionUseMoveAi -.public SubstitutePlaceholderStringTags -.public TryActivateTruant -.public UpdateAiTargetPos -.public UpdateMovePp +.public ov10_022C459C +.public ov10_022C48DC +.public ov10_022C5130 .public ov29_022E3ED0 .public ov29_022E4110 .public ov29_022EB4E8 -.public GetItemToUse -.public RemoveUsedItem .public ov29_022FA574 .public ov29_022FB9E0 .public ov29_022FBAB4 -.public MonsterHasNegativeStatus -.public IsMonsterSleeping .public ov29_023007DC .public ov29_0230175C .public ov29_0230B7D4 @@ -53,7 +54,16 @@ .public ov29_02322374 .public ov29_0232E80C .public ov29_02333FD0 -.public AreOrbsAllowed -.public AreMovesEnabled .public ov29_02344B44 -.public LogMessageByIdWithPopupCheckParticipants +.public ov29_0235171E +.public ov29_02353538 +.public ov29_0237CA18 +.public ov29_0237CA20 +.public ov29_0237CA28 +.public ov29_0237CA48 +.public RemoveUsedItem +.public SetActionUseMoveAi +.public SubstitutePlaceholderStringTags +.public TryActivateTruant +.public UpdateAiTargetPos +.public UpdateMovePp diff --git a/asm/include/overlay_29_0231B1B8.inc b/asm/include/overlay_29_0231B1B8.inc index 8c569f76..fb286d28 100644 --- a/asm/include/overlay_29_0231B1B8.inc +++ b/asm/include/overlay_29_0231B1B8.inc @@ -1,10 +1,36 @@ #pragma once .public AbilityIsActiveVeneer +.public AddHeldItemToBag +.public AnimationDelayOrSomething +.public ApplyBlastSeedEffect +.public ApplyCalciumEffect +.public ApplyCheriBerryEffect +.public ApplyDamageAndEffectsWrapper +.public ApplyDoughSeedEffect +.public ApplyGinsengEffect +.public ApplyGonePebbleEffect +.public ApplyGracideaEffect +.public ApplyGravelyrockEffect +.public ApplyGrimyFoodEffect .public ApplyGummiBoostsDungeonMode +.public ApplyHungerSeedEffect +.public ApplyIronEffect +.public ApplyKeyEffect +.public ApplyMixElixirEffect +.public ApplyPechaBerryEffect +.public ApplyProteinEffect +.public ApplyRawstBerryEffect +.public ApplyViaSeedEffect +.public ApplyVileSeedEffect +.public ApplyViolentSeedEffect +.public ApplyZincEffect +.public BoostIQ .public BoostSpeedOneStage .public CalcDamageFixedNoCategory -.public DealDamageProjectile .public CalcStatusDuration +.public DealDamageProjectile +.public DungeonGetSpriteIndex +.public EndNegativeStatusConditionWrapper .public EnemyEvolution .public EntityIsValid__0231B194 .public EntityIsValid__0231CBC8 @@ -13,25 +39,45 @@ .public GetActiveTeamMember .public GetItemCategoryVeneer .public GetSleepAnimationId -.public DungeonGetSpriteIndex +.public GUMMI_STAT_BOOST .public InitMove .public IqSkillIsEnabled .public IsBagFull +.public IsMonsterSleeping .public IsShaymin .public IsSkyExclusiveDungeon +.public LevelUpItemEffect .public LogMessageByIdWithPopupCheckUserTarget -.public RestoreAllMovePP -.public SubstitutePlaceholderStringTags -.public TryIncreaseHp -.public TryInflictConfusedStatus -.public TryInflictPetrifiedStatus -.public TryInflictSleepStatus -.public TryInflictSleeplessStatus -.public TryWarp -.public ApplyViolentSeedEffect +.public ov10_022C4420 +.public ov10_022C4438 +.public ov10_022C4478 +.public ov10_022C44D0 +.public ov10_022C44EC +.public ov10_022C44F4 +.public ov10_022C44F8 +.public ov10_022C4530 +.public ov10_022C4558 +.public ov10_022C4574 +.public ov10_022C457C +.public ov10_022C45EC +.public ov10_022C45F4 +.public ov10_022C4624 +.public ov10_022C46B4 +.public ov10_022C46B8 +.public ov10_022C46BC +.public ov10_022C46C4 +.public ov10_022C46C8 +.public ov10_022C46CC +.public ov10_022C46D8 +.public ov10_022C46DC +.public ov10_022C46E0 +.public ov10_022C46E4 +.public ov10_022C46E8 +.public ov10_022C4720 +.public ov10_022C4864 +.public ov10_022C4EB8 .public ov29_022E28D4 .public ov29_022E3590 -.public AnimationDelayOrSomething .public ov29_022E5A00 .public ov29_022E5AE4 .public ov29_022E60E4 @@ -41,52 +87,37 @@ .public ov29_022EACCC .public ov29_022F04F0 .public ov29_022F0518 -.public SwapMonsterWanFileIndex -.public SetMonsterTypeAndAbility .public ov29_022F9EA0 -.public BoostIQ .public ov29_022FB9BC -.public IsMonsterSleeping .public ov29_02300B40 -.public LevelUpItemEffect -.public TryDecreaseLevel .public ov29_02304830 .public ov29_02304BAC -.public EndNegativeStatusConditionWrapper .public ov29_02307BDC -.public ApplyDamageAndEffectsWrapper -.public UpdateShopkeeperModeAfterAttack .public ov29_0230F9A4 -.public TryInflictInvisibleStatus -.public TryIncreaseBelly -.public TryInflictBlinkerStatus -.public TryInflictCrossEyedStatus -.public TryInflictEyedropStatus -.public TryInflictSlipStatus -.public TryInflictDropeyeStatus -.public ApplyProteinEffect -.public ApplyCalciumEffect -.public ApplyIronEffect -.public ApplyZincEffect -.public ApplyCheriBerryEffect -.public ApplyPechaBerryEffect -.public ApplyRawstBerryEffect -.public ApplyHungerSeedEffect -.public ApplyVileSeedEffect -.public ApplyGinsengEffect -.public ApplyBlastSeedEffect -.public ApplyGrimyFoodEffect -.public ApplyMixElixirEffect -.public ApplyDoughSeedEffect -.public ApplyViaSeedEffect -.public ApplyGravelyrockEffect -.public ApplyGonePebbleEffect -.public ApplyGracideaEffect -.public ApplyKeyEffect .public ov29_02344B44 -.public SpawnDroppedItemWrapper -.public AddHeldItemToBag .public ov29_0234B084 .public ov29_0234BA54 +.public ov29_02353538 +.public RestoreAllMovePP +.public SetMonsterTypeAndAbility +.public SpawnDroppedItemWrapper .public sub_020017EC .public sub_0201CF80 +.public SubstitutePlaceholderStringTags +.public SwapMonsterWanFileIndex +.public TryDecreaseLevel +.public TryIncreaseBelly +.public TryIncreaseHp +.public TryInflictBlinkerStatus +.public TryInflictConfusedStatus +.public TryInflictCrossEyedStatus +.public TryInflictDropeyeStatus +.public TryInflictEyedropStatus +.public TryInflictInvisibleStatus +.public TryInflictPetrifiedStatus +.public TryInflictSleeplessStatus +.public TryInflictSleepStatus +.public TryInflictSlipStatus +.public TryWarp +.public UpdateShopkeeperModeAfterAttack +.public WONDER_GUMMI_STAT_BOOST diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index ce6b7ca0..c2cc8223 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -118,3 +118,26 @@ .public ov31_023877EC .public sub_02050FF8 .public sub_02053D1C +.public DIRECTIONS_XY +.public WONDER_GUMMI_IQ_GAIN +.public _020A1894 +.public IQ_GUMMI_GAIN_TABLE +.public _020A2538 +.public ov10_022C44CC +.public ov10_022C44E8 +.public ov10_022C45D4 +.public ov10_022C45D8 +.public ov10_022C45DC +.public ov10_022C45E4 +.public ov10_022C4680 +.public ov10_022C46C0 +.public ov10_022C47E0 +.public ov10_022C47F0 +.public ov10_022C4B74 +.public ov29_023529AC +.public ov29_023529B0 +.public ov29_02352AE8 +.public ov29_02352AEC +.public ov29_023532D0 +.public ov29_02353324 +.public ov29_02353538 diff --git a/asm/include/overlay_29_0231EDFC.inc b/asm/include/overlay_29_0231EDFC.inc index 298897be..a78c3320 100644 --- a/asm/include/overlay_29_0231EDFC.inc +++ b/asm/include/overlay_29_0231EDFC.inc @@ -1,8 +1,11 @@ #pragma once +.public __divsi3 .public AbilityIsActiveVeneer .public AdvanceFrame .public CalcDamageFixedNoCategory -.public __divsi3 +.public CannotStandOnTile +.public CanSeeTarget +.public DIRECTIONS_XY .public DungeonRandInt .public DungeonRandRange .public EntityIsValid__0231F570 @@ -11,20 +14,21 @@ .public HasDropeyeStatus .public InitMove .public LogMessageByIdWithPopupCheckUserTarget -.public SubstitutePlaceholderStringTags -.public TryWarp -.public UpdateEntityPixelPos -.public ShouldDisplayEntityWrapper -.public CanSeeTarget +.public MoveMonsterToPos +.public ov10_022C4458 .public ov29_022E9298 .public ov29_022EA370 .public ov29_022EACCC -.public MoveMonsterToPos -.public CannotStandOnTile .public ov29_0230175C .public ov29_023049A8 .public ov29_02304A48 .public ov29_0232033C .public ov29_02321238 -.public TwoTurnMoveForcedMiss +.public ov29_0235171E +.public ov29_02353538 +.public ShouldDisplayEntityWrapper .public sub_020018D0 +.public SubstitutePlaceholderStringTags +.public TryWarp +.public TwoTurnMoveForcedMiss +.public UpdateEntityPixelPos diff --git a/asm/include/overlay_29_0231F594.inc b/asm/include/overlay_29_0231F594.inc index 100265dd..e75ac35d 100644 --- a/asm/include/overlay_29_0231F594.inc +++ b/asm/include/overlay_29_0231F594.inc @@ -1,28 +1,30 @@ #pragma once +.public __divsi3 .public abs .public AdvanceFrame -.public __divsi3 +.public AreOrbsAllowedVeneer +.public AreTrawlOrbsAllowed +.public DetermineTileWalkableNeighbors +.public DrawMinimapTile .public EntityIsValid__0231FBFC +.public GetItemInfo .public GetTile .public GetTileSafe +.public IsWaterTileset .public LogMessageByIdWithPopupCheckUser .public MemAlloc .public MemFree -.public GetItemInfo .public ov29_022E1A84 .public ov29_022E1A90 .public ov29_022E56A0 .public ov29_022F62CC .public ov29_02304B64 .public ov29_02336694 -.public DetermineTileWalkableNeighbors -.public UpdateTrapsVisibility -.public IsWaterTileset -.public DrawMinimapTile -.public UpdateMinimap -.public AreTrawlOrbsAllowed -.public AreOrbsAllowedVeneer -.public SpawnItem -.public RemoveGroundItem .public ov29_023457C8 +.public ov29_02351844 +.public ov29_02353538 +.public RemoveGroundItem +.public SpawnItem .public sub_020018D0 +.public UpdateMinimap +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_0231FC20.inc b/asm/include/overlay_29_0231FC20.inc index 7c331507..0f95ea48 100644 --- a/asm/include/overlay_29_0231FC20.inc +++ b/asm/include/overlay_29_0231FC20.inc @@ -1,25 +1,28 @@ #pragma once .public AbilityIsActiveVeneer .public AdvanceFrame +.public AreTileJumpsAllowed .public CalcDamageFixedNoCategory +.public DIRECTIONS_XY +.public EnsureCanStandCurrentTile .public EntityIsValid__0232017C .public GetTile .public InitMove .public IsFloorOver .public LogMessageByIdWithPopupCheckUserTarget -.public SubstitutePlaceholderStringTags -.public UpdateEntityPixelPos -.public ov29_022E1A90 -.public ShouldDisplayEntityWrapper -.public ov29_022E56A0 .public MoveMonsterToPos +.public ov10_022C4570 +.public ov29_022E1A90 +.public ov29_022E56A0 .public ov29_022F9C74 .public ov29_022FFB90 .public ov29_023049A8 .public ov29_02307BDC .public ov29_0232033C -.public EnsureCanStandCurrentTile .public ov29_02321238 .public ov29_0232124C +.public ov29_02353538 +.public ShouldDisplayEntityWrapper +.public SubstitutePlaceholderStringTags .public TwoTurnMoveForcedMiss -.public AreTileJumpsAllowed +.public UpdateEntityPixelPos diff --git a/asm/include/overlay_29_023201A0.inc b/asm/include/overlay_29_023201A0.inc index fc17e369..9fc9a801 100644 --- a/asm/include/overlay_29_023201A0.inc +++ b/asm/include/overlay_29_023201A0.inc @@ -30,3 +30,4 @@ .public UpdateMinimap .public RemoveGroundItem .public sub_020018D0 +.public DIRECTIONS_XY diff --git a/asm/include/overlay_29_0232145C.inc b/asm/include/overlay_29_0232145C.inc index a2b75cfb..a4b79979 100644 --- a/asm/include/overlay_29_0232145C.inc +++ b/asm/include/overlay_29_0232145C.inc @@ -137,3 +137,4 @@ .public sub_0201D1B0 .public sub_0201D1D4 .public WanTableSpriteHasAnimationGroup +.public DIRECTIONS_XY diff --git a/asm/include/overlay_29_0232A3FC.inc b/asm/include/overlay_29_0232A3FC.inc index 9461c13c..66cadf9d 100644 --- a/asm/include/overlay_29_0232A3FC.inc +++ b/asm/include/overlay_29_0232A3FC.inc @@ -1,6 +1,11 @@ #pragma once +.public __divsi3 .public AbilityIsActiveVeneer +.public AddHeldItemToBag .public AdvanceFrame +.public AnimationDelayOrSomething +.public ApplyDamageAndEffectsWrapper +.public BAG_ITEMS_PTR_MIRROR .public BoostDefensiveStat .public BoostOffensiveStat .public BoostSpeedOneStage @@ -9,29 +14,88 @@ .public CeilFixedPoint .public DealDamage .public DefenderAbilityIsActiveMoveEffects__02329F14 -.public __divsi3 +.public DIRECTIONS_XY .public DungeonRandInt +.public DungeonRandOutcome__022EAB20 .public DungeonRandOutcomeUserAction .public DungeonRandOutcomeUserTargetInteraction -.public DungeonRandOutcome__022EAB20 +.public EndFrozenStatus .public EntityIsValidMoveEffects__0232A3D8 .public EntityIsValidMoveEffects__0232C500 +.public GetDamageSourceWrapper .public GetMoveCategory .public GetMoveType .public GetTileSafe .public InitMove .public InitStandardItem .public IsBagFull +.public IsChargingTwoTurnMove .public IsExperienceLocked .public IsFloorOver +.public IsFullFloorFixedRoom +.public IsMonsterSleeping .public ItemZInit .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat .public LowerHitChanceStat .public LowerOffensiveStat .public LowerSpeed +.public MoveMonsterToPos +.public ov10_022C448C +.public ov10_022C44A4 +.public ov10_022C44B4 +.public ov10_022C44C4 +.public ov10_022C44E0 +.public ov10_022C450C +.public ov10_022C4540 +.public ov10_022C4548 +.public ov10_022C454C +.public ov10_022C4554 +.public ov10_022C4608 +.public ov10_022C46D4 +.public ov10_022C471C +.public ov10_022C4720 +.public ov10_022C4748 +.public ov10_022C48BC +.public ov10_022C4924 +.public ov10_022C49C4 +.public ov10_022C49D4 +.public ov10_022C4C3C +.public ov10_022C4C3E +.public ov10_022C5DDC +.public ov10_022C5DE0 +.public ov10_022C6321 +.public ov10_022C6322 +.public ov29_022E1A84 +.public ov29_022E1A90 +.public ov29_022E2CA0 +.public ov29_022ED868 +.public ov29_022F8FF8 +.public ov29_022F9EA0 +.public ov29_022FFB90 +.public ov29_0230175C +.public ov29_023049A8 +.public ov29_02318BBC +.public ov29_02318D58 +.public ov29_02321164 +.public ov29_02321260 +.public ov29_02324D60 +.public ov29_02332F18 +.public ov29_0234B084 +.public ov29_0235171E +.public ov29_02352AE8 +.public ov29_02352AEC +.public ov29_02352B1C +.public ov29_02353538 +.public ov29_0237CA84 +.public ov29_0237CA88 .public RemoveEquivItem +.public RevealTrapsNearby +.public SpawnDroppedItem .public StringFromMessageId +.public sub_02025888 +.public sub_02050FF8 +.public sub_02054EC8 .public SubstitutePlaceholderStringTags .public TryBlowAway .public TryIncreaseHp @@ -39,61 +103,31 @@ .public TryInflictConfusedStatus .public TryInflictConstrictionStatus .public TryInflictCringeStatus +.public TryInflictCurseStatus +.public TryInflictDecoyStatus .public TryInflictDestinyBondStatus .public TryInflictFrozenStatus .public TryInflictInfatuatedStatus .public TryInflictIngrainStatus .public TryInflictLeechSeedStatus +.public TryInflictLightScreenStatus +.public TryInflictMagicCoatStatus +.public TryInflictMirrorCoatStatus .public TryInflictNappingStatus .public TryInflictParalysisStatus .public TryInflictPausedStatus -.public TryInflictPoisonedStatus -.public TryInflictSleepStatus -.public TryInflictWrappedStatus -.public TryWarp -.public UpdateEntityPixelPos -.public ov29_022E1A84 -.public ov29_022E1A90 -.public ov29_022E2CA0 -.public AnimationDelayOrSomething -.public ov29_022ED868 -.public TrySpawnTrap -.public RevealTrapsNearby -.public MoveMonsterToPos -.public ov29_022F8FF8 -.public ov29_022F9EA0 -.public ov29_022FFB90 -.public IsMonsterSleeping -.public ov29_0230175C -.public ov29_023049A8 -.public EndFrozenStatus -.public ApplyDamageAndEffectsWrapper -.public TryInflictSetDamageStatus -.public TryInflictDecoyStatus -.public TryInflictCurseStatus -.public TryInflictSnatchStatus .public TryInflictPerishSongStatus -.public TryTransform -.public ov29_02318BBC -.public ov29_02318D58 -.public TryInflictMagicCoatStatus -.public TryInflictLightScreenStatus -.public TryInflictReflectStatus +.public TryInflictPoisonedStatus .public TryInflictProtectStatus -.public TryInflictMirrorCoatStatus -.public ov29_02321164 -.public ov29_02321260 -.public IsChargingTwoTurnMove -.public TwoTurnMoveForcedMiss -.public ov29_02324D60 -.public GetDamageSourceWrapper -.public ov29_02332F18 -.public IsFullFloorFixedRoom -.public UpdateTrapsVisibility +.public TryInflictReflectStatus +.public TryInflictSetDamageStatus +.public TryInflictSleepStatus +.public TryInflictSnatchStatus +.public TryInflictWrappedStatus .public TrySmashWall -.public SpawnDroppedItem -.public AddHeldItemToBag -.public ov29_0234B084 -.public sub_02025888 -.public sub_02050FF8 -.public sub_02054EC8 +.public TrySpawnTrap +.public TryTransform +.public TryWarp +.public TwoTurnMoveForcedMiss +.public UpdateEntityPixelPos +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_0232C524.inc b/asm/include/overlay_29_0232C524.inc index c18d2ef9..61b919ef 100644 --- a/asm/include/overlay_29_0232C524.inc +++ b/asm/include/overlay_29_0232C524.inc @@ -1,20 +1,33 @@ #pragma once +.public __divsi3 .public AbilityIsActiveVeneer +.public BAG_ITEMS_PTR_MIRROR .public BoostDefensiveStat .public BoostOffensiveStat .public BoostOrLowerSpeed .public CalcDamageFixedWrapper .public CalcRecoilDamageFixed .public CalcStatusDuration +.public CountMovesOutOfPp .public DealDamage -.public __divsi3 +.public DealDamageWithTypeAndPowerBoost +.public DetermineTileWalkableNeighbors +.public DIRECTIONS_XY .public DungeonRandInt .public DungeonRandOutcomeUserTargetInteraction +.public EndFrozenStatus +.public EndNegativeStatusConditionWrapper +.public EndProtectStatus +.public EndReflectClassStatus .public EntityIsValidMoveEffects__0232C500 .public EntityIsValidMoveEffects__0232E250 .public FixedRoomIsSubstituteRoom +.public GenerateStandardItem .public GetApparentWeather .public GetBodySize +.public GetDamageSourceWrapper +.public GetEntityNaturalGiftInfo +.public GetItemIdToSpawn .public GetMaxPp .public GetMonsterIdToSpawn .public GetMoveCategory @@ -23,102 +36,113 @@ .public GetSize .public GetTileAtEntity .public GetTileSafe +.public GetTrapInfo +.public GetVisibilityRange .public HandleFaint .public HasDropeyeStatus +.public IsChargingTwoTurnMove +.public IsCurrentFixedRoomBossFight +.public IsFullFloorFixedRoom .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat .public LowerHitChanceStat .public LowerSpeed .public MewSpawnCheck -.public StringFromMessageId -.public SubstitutePlaceholderStringTags -.public TryIncreaseHp -.public TryInflictBurnStatus -.public TryInflictCoweringStatus -.public TryInflictCringeStatus -.public TryInflictFrozenStatus -.public TryInflictParalysisStatus -.public TryInflictPetrifiedStatus -.public TryInflictSleepStatus -.public TryInflictSleeplessStatus -.public TryPounce -.public TrySwitchPlace -.public TryWarp -.public IsCurrentFixedRoomBossFight +.public MistIsActive +.public ov10_022C44B8 +.public ov10_022C44F0 +.public ov10_022C4518 +.public ov10_022C452C +.public ov10_022C453C +.public ov10_022C456C +.public ov10_022C45BC +.public ov10_022C4654 +.public ov10_022C4678 +.public ov10_022C4684 +.public ov10_022C46F4 +.public ov10_022C4720 +.public ov10_022C47DC +.public ov10_022C4944 +.public ov10_022C4964 +.public ov10_022C49B4 .public ov29_022E09E8 -.public GetTrapInfo .public ov29_022E1AAC .public ov29_022E1AD4 .public ov29_022E1EF8 -.public GetVisibilityRange .public ov29_022E3430 .public ov29_022E6770 .public ov29_022E6784 -.public GetItemIdToSpawn .public ov29_022E8104 .public ov29_022E81F8 .public ov29_022ED868 -.public PrepareTrapperTrap -.public TrySpawnTrap .public ov29_022EDE7C -.public CountMovesOutOfPp -.public TryEatItem .public ov29_022FBDE0 .public ov29_022FBDF0 .public ov29_022FD7A0 .public ov29_0230175C .public ov29_02304B64 -.public EndNegativeStatusConditionWrapper -.public TransferNegativeStatusCondition -.public EndReflectClassStatus -.public EndFrozenStatus -.public EndProtectStatus .public ov29_0230D874 .public ov29_0230D8E8 .public ov29_0230D95C .public ov29_0230D9D0 .public ov29_0230DA44 .public ov29_0230DAB8 -.public RevealItems -.public RevealStairs -.public RevealEnemies -.public TryInflictInvisibleStatus -.public TryDecreaseBelly -.public TryInflictMuzzledStatus -.public TryInflictMobileStatus -.public TryActivateIdentifyCondition -.public TryInflictLongTossStatus -.public TryInflictPierceStatus -.public TryInflictGastroAcidStatus -.public TryInflictAquaRingStatus -.public TryInflictLuckyChantStatus -.public TryInflictHealBlockStatus -.public TryInflictEmbargoStatus -.public TryInflictMagnetRiseStatus .public ov29_02318BBC .public ov29_02318D58 .public ov29_02318D98 -.public MistIsActive -.public GetEntityNaturalGiftInfo .public ov29_0231EA40 .public ov29_0231EDFC -.public TryDrought .public ov29_0231F6E4 -.public IsChargingTwoTurnMove -.public GetDamageSourceWrapper -.public DealDamageWithTypeAndPowerBoost .public ov29_02332F18 -.public TryActivateWeather -.public IsFullFloorFixedRoom .public ov29_02336694 -.public DetermineTileWalkableNeighbors -.public UpdateTrapsVisibility .public ov29_023383BC -.public UpdateMinimap -.public GenerateStandardItem -.public SpawnDroppedItemWrapper .public ov29_0234B084 .public ov29_0234B0B4 .public ov29_0234BA54 +.public ov29_0235171E +.public ov29_02352AE8 +.public ov29_02352AEC +.public ov29_02352B38 +.public ov29_02352B3C +.public ov29_02353538 +.public PrepareTrapperTrap +.public RevealEnemies +.public RevealItems +.public RevealStairs +.public SpawnDroppedItemWrapper +.public StringFromMessageId .public sub_02024FB8 +.public SubstitutePlaceholderStringTags +.public TransferNegativeStatusCondition +.public TryActivateIdentifyCondition +.public TryActivateWeather +.public TryDecreaseBelly +.public TryDrought +.public TryEatItem +.public TryIncreaseHp +.public TryInflictAquaRingStatus +.public TryInflictBurnStatus +.public TryInflictCoweringStatus +.public TryInflictCringeStatus +.public TryInflictEmbargoStatus +.public TryInflictFrozenStatus +.public TryInflictGastroAcidStatus +.public TryInflictHealBlockStatus +.public TryInflictInvisibleStatus +.public TryInflictLongTossStatus +.public TryInflictLuckyChantStatus +.public TryInflictMagnetRiseStatus +.public TryInflictMobileStatus +.public TryInflictMuzzledStatus +.public TryInflictParalysisStatus +.public TryInflictPetrifiedStatus +.public TryInflictPierceStatus +.public TryInflictSleeplessStatus +.public TryInflictSleepStatus +.public TryPounce +.public TrySpawnTrap +.public TrySwitchPlace +.public TryWarp +.public UpdateMinimap +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_0232E274.inc b/asm/include/overlay_29_0232E274.inc index 024dc2cb..7012cf38 100644 --- a/asm/include/overlay_29_0232E274.inc +++ b/asm/include/overlay_29_0232E274.inc @@ -6,25 +6,31 @@ .public CalcRecoilDamageFixed .public DealDamage .public DefenderAbilityIsActiveMoveEffects__0232DE20 +.public DoMoveCleanse +.public DoMoveEscape .public DungeonRandOutcomeUserTargetInteraction -.public EntityIsValidMoveEffects__0232E250 +.public EndFrozenStatus +.public EndNegativeStatusConditionWrapper +.public EndSleepClassStatus .public EntityIsValid__0232E840 +.public EntityIsValidMoveEffects__0232E250 .public LogMessageByIdWithPopupCheckUserTarget .public LowerOffensiveStat +.public ov10_022C449C +.public ov10_022C4684 +.public ov10_022C46F4 +.public ov29_02318D98 +.public ov29_0234AFFC +.public ov29_02352AE8 +.public ov29_02352AEC +.public ov29_02353718 .public ResetHitChanceStat .public RestoreAllMovePP +.public sub_02054EC8 .public SubstitutePlaceholderStringTags .public TryIncreaseHp .public TryInflictBurnStatus .public TryInflictCringeStatus -.public EndNegativeStatusConditionWrapper -.public EndSleepClassStatus -.public EndFrozenStatus +.public TryInflictMiracleEyeStatus .public TryInflictTerrifiedStatus .public TryRestoreHp -.public TryInflictMiracleEyeStatus -.public ov29_02318D98 -.public DoMoveCleanse -.public DoMoveEscape -.public ov29_0234AFFC -.public sub_02054EC8 diff --git a/asm/include/overlay_29_0232E864.inc b/asm/include/overlay_29_0232E864.inc index dc1c7eb7..cd75ae84 100644 --- a/asm/include/overlay_29_0232E864.inc +++ b/asm/include/overlay_29_0232E864.inc @@ -1,19 +1,342 @@ #pragma once .public AbilityIsActiveVeneer .public abs +.public AnimationDelayOrSomething +.public ApplyDamageAndEffects +.public ApplyDamageAndEffectsWrapper +.public AreEntitiesAdjacent .public CalcDamage .public CanAttackInDirection .public CanBeSnatched +.public CanSeeTarget .public CeilFixedPoint .public Conversion2IsActive +.public CreateMainMenus +.public DIRECTIONS_XY +.public DoMoveAbsorb +.public DoMoveAcupressure +.public DoMoveAmnesia +.public DoMoveAquaRing +.public DoMoveAssist +.public DoMoveAttract +.public DoMoveAuroraBeam +.public DoMoveBeatUp +.public DoMoveBellyDrum +.public DoMoveBide +.public DoMoveBideUnleash +.public DoMoveBlastBurn +.public DoMoveBlazeKick +.public DoMoveBlock +.public DoMoveBlowback +.public DoMoveBoostAttack1 +.public DoMoveBoostDefense1 +.public DoMoveBoostDefense2 +.public DoMoveBoostSpeed1 +.public DoMoveBounce +.public DoMoveBrickBreak +.public DoMoveBrine +.public DoMoveBubble +.public DoMoveBulkUp +.public DoMoveCalmMind +.public DoMoveCamouflage +.public DoMoveCaptivate +.public DoMoveCharge +.public DoMoveChargeBeam +.public DoMoveCharm +.public DoMoveCleanse +.public DoMoveCloseCombat +.public DoMoveConfuse +.public DoMoveConversion +.public DoMoveConversion2 +.public DoMoveCopycat +.public DoMoveCosmicPower +.public DoMoveCounter +.public DoMoveCrunch +.public DoMoveCrushClaw +.public DoMoveCurse +.public DoMoveDamage__02325DC0 +.public DoMoveDamage__0232A500 +.public DoMoveDamage__0232B8B0 +.public DoMoveDamageBoostAllStats +.public DoMoveDamageBurn10 +.public DoMoveDamageBurn10FlameWheel +.public DoMoveDamageConfuse10 +.public DoMoveDamageConfuse30 +.public DoMoveDamageConstrict10 +.public DoMoveDamageCringe10 +.public DoMoveDamageCringe20 +.public DoMoveDamageCringe30 +.public DoMoveDamageDrain +.public DoMoveDamageEatItem +.public DoMoveDamageFreeze15 +.public DoMoveDamageHpDependent +.public DoMoveDamageLowerAccuracy40 +.public DoMoveDamageLowerDefensiveStatVariable +.public DoMoveDamageLowerSpecialDefense50 +.public DoMoveDamageLowerSpeed100 +.public DoMoveDamageLowerSpeed20 +.public DoMoveDamageMultihitFatigue +.public DoMoveDamageMultihitUntilMiss +.public DoMoveDamageParalyze10 +.public DoMoveDamageParalyze20 +.public DoMoveDamagePoison18 +.public DoMoveDamagePoison40 +.public DoMoveDamageStealItem +.public DoMoveDamageWeightDependent .public DoMoveDamageWithRecoil +.public DoMoveDecoy +.public DoMoveDefendOrder +.public DoMoveDefenseCurl +.public DoMoveDefog +.public DoMoveDestinyBond +.public DoMoveDig +.public DoMoveDive +.public DoMoveDoubleEdge +.public DoMoveDoubleTeam +.public DoMoveDracoMeteor +.public DoMoveDragonDance +.public DoMoveDragonRage +.public DoMoveDreamEater +.public DoMoveDrought +.public DoMoveDynamicPunch +.public DoMoveEarthquake +.public DoMoveEcho +.public DoMoveEmbargo +.public DoMoveEncore +.public DoMoveEndeavor +.public DoMoveEndure +.public DoMoveEruption +.public DoMoveEscape +.public DoMoveExplosion +.public DoMoveExpose +.public DoMoveFacade +.public DoMoveFakeOut +.public DoMoveFakeTears +.public DoMoveFamish +.public DoMoveFeatherDance +.public DoMoveFeint +.public DoMoveFillIn +.public DoMoveFireFang +.public DoMoveFissure +.public DoMoveFlareBlitz +.public DoMoveFlatter +.public DoMoveFly +.public DoMoveFocusEnergy +.public DoMoveFocusPunch +.public DoMoveFrustration +.public DoMoveGastroAcid +.public DoMoveGravity +.public DoMoveGrowl +.public DoMoveGrowth +.public DoMoveGrudge +.public DoMoveGuardSwap +.public DoMoveGust +.public DoMoveGyroBall +.public DoMoveHail +.public DoMoveHammerArm +.public DoMoveHaze +.public DoMoveHeadbutt +.public DoMoveHeadSmash +.public DoMoveHealBlock +.public DoMoveHealingWish +.public DoMoveHealOrder +.public DoMoveHealStatus +.public DoMoveHeartSwap +.public DoMoveHelpingHand +.public DoMoveHiddenPower +.public DoMoveHiJumpKick +.public DoMoveHornDrill +.public DoMoveHpGauge +.public DoMoveHurl +.public DoMoveIceFang +.public DoMoveIngrain +.public DoMoveInvisify +.public DoMoveIronTail +.public DoMoveItemize +.public DoMoveJumpKick +.public DoMoveKnockOff +.public DoMoveLastResort +.public DoMoveLeafStorm +.public DoMoveLeechSeed +.public DoMoveLightScreen +.public DoMoveLongToss +.public DoMoveLowerAccuracy1 +.public DoMoveLowerDefense1 +.public DoMoveLowerSpeed1 +.public DoMoveLuckyChant +.public DoMoveLunarDance +.public DoMoveMagicCoat +.public DoMoveMagnetRise +.public DoMoveMagnitude +.public DoMoveMemento +.public DoMoveMetalBurst +.public DoMoveMetalClaw +.public DoMoveMetalSound +.public DoMoveMeteorMash +.public DoMoveMetronome +.public DoMoveMinimize +.public DoMoveMiracleEye +.public DoMoveMirrorCoat +.public DoMoveMirrorMove +.public DoMoveMist +.public DoMoveMistBall +.public DoMoveMobile +.public DoMoveMoonlight +.public DoMoveMorningSun +.public DoMoveMudSlap +.public DoMoveNastyPlot +.public DoMoveNaturalGift +.public DoMoveNaturePower +.public DoMoveNightmare +.public DoMoveNightShade +.public DoMoveNoMove +.public DoMoveOctazooka +.public DoMoveOhko +.public DoMoveOneRoom +.public DoMoveOneShot +.public DoMoveOverheat +.public DoMovePainSplit +.public DoMoveParalyze__02326E80 +.public DoMoveParalyze__02328230 +.public DoMoveParalyze__0232B434 +.public DoMovePause +.public DoMovePayDay +.public DoMovePerishSong +.public DoMovePetrify +.public DoMovePierce +.public DoMovePoison +.public DoMovePoisonFang +.public DoMovePoisonTail +.public DoMovePounce +.public DoMovePowerEars +.public DoMovePowerSwap +.public DoMovePowerTrick +.public DoMovePresent +.public DoMoveProtect +.public DoMovePsychoBoost +.public DoMovePsychoShift +.public DoMovePsychUp +.public DoMovePsywave +.public DoMoveRage +.public DoMoveRainDance +.public DoMoveRapidSpin +.public DoMoveRazorWind +.public DoMoveRebound +.public DoMoveRecoverHp +.public DoMoveRecoverHpTeam +.public DoMoveRecycle +.public DoMoveReflect +.public DoMoveRest +.public DoMoveReturn +.public DoMoveReversal +.public DoMoveReviver +.public DoMoveRockPolish +.public DoMoveRockSmash +.public DoMoveRolePlay +.public DoMoveRoost +.public DoMoveSacredFire +.public DoMoveSafeguard +.public DoMoveSandstorm +.public DoMoveScan +.public DoMoveScreech +.public DoMoveSearchlight +.public DoMoveSecretPower +.public DoMoveSeeStairs +.public DoMoveSeeTrap +.public DoMoveSeismicToss +.public DoMoveSelfdestruct +.public DoMoveSetDamage +.public DoMoveShadowBall +.public DoMoveShadowForce +.public DoMoveShadowHold +.public DoMoveShocker +.public DoMoveSiesta +.public DoMoveSketch +.public DoMoveSkillSwap +.public DoMoveSkullBash +.public DoMoveSkyAttack +.public DoMoveSleep +.public DoMoveSleepTalk +.public DoMoveSlowDown +.public DoMoveSmellingSalt +.public DoMoveSmokescreen +.public DoMoveSnatch +.public DoMoveSnore +.public DoMoveSolarBeam +.public DoMoveSonicBoom +.public DoMoveSpikes +.public DoMoveSpite +.public DoMoveSpitUp +.public DoMoveSplash +.public DoMoveSport +.public DoMoveStayAway +.public DoMoveStealthRock +.public DoMoveSteelWing +.public DoMoveStockpile +.public DoMoveStringShot +.public DoMoveStruggle +.public DoMoveSunnyDay +.public DoMoveSuperFang +.public DoMoveSuperpower +.public DoMoveSureShot +.public DoMoveSurf +.public DoMoveSwagger +.public DoMoveSwallow +.public DoMoveSwapItems +.public DoMoveSweetScent +.public DoMoveSwitchPositions +.public DoMoveSwordsDance +.public DoMoveSynthesis +.public DoMoveTag0x1A6 +.public DoMoveTag0x1A7 +.public DoMoveTag0x1AB +.public DoMoveTailGlow +.public DoMoveTakeaway +.public DoMoveTaunt +.public DoMoveThunderbolt +.public DoMoveThunderFang +.public DoMoveThundershock +.public DoMoveThunderWave +.public DoMoveTickle +.public DoMoveTorment +.public DoMoveToxic +.public DoMoveToxicSpikes +.public DoMoveTransfer +.public DoMoveTransform +.public DoMoveTrapBuster +.public DoMoveTrapper +.public DoMoveTrawl +.public DoMoveTriAttack +.public DoMoveTrickRoom +.public DoMoveTripleKick +.public DoMoveTrumpCard +.public DoMoveTwineedle +.public DoMoveTwister +.public DoMoveTwoEdge +.public DoMoveUproar +.public DoMoveVacuumCut +.public DoMoveVitalThrow +.public DoMoveWakeUpSlap +.public DoMoveWarp +.public DoMoveWaterfall +.public DoMoveWaterSpout +.public DoMoveWeatherBall +.public DoMoveWhirlpool +.public DoMoveWildCall +.public DoMoveWillOWisp +.public DoMoveWish +.public DoMoveWorrySeed +.public DoMoveWrap +.public DoMoveYawn +.public DoMoveZapCannon .public DungeonRandInt -.public DungeonRandOutcomeUserAction .public DungeonRandOutcome__022EAB20 +.public DungeonRandOutcomeUserAction .public EntityIsValid__0232E840 .public EntityIsValid__02333FAC .public ExclusiveItemEffectFlagTest .public GetApparentWeather +.public GetDamageSourceWrapper .public GetDirectionTowardsPosition .public GetEntityMoveTargetAndRange .public GetMoveCategory @@ -24,29 +347,37 @@ .public GetTileAtEntity .public HasHeldItem .public HasLowHealth +.public HasSuperEffectiveMoveAgainstUser .public IqSkillIsEnabled +.public IsChargingTwoTurnMove +.public IsCurrentFixedRoomBossFight .public IsFloorOver .public IsHealingWishOrLunarDance +.public IsHyperBeamVariant .public IsReflectedByMagicCoat .public IsSoundMove .public LightningRodStormDrainCheck .public LogMessageByIdQuietCheckUserTarget +.public LogMessageByIdWithPopupCheckParticipants .public LogMessageByIdWithPopupCheckUserTarget .public LowerOffensiveStat +.public MirrorMoveIsActive +.public MistIsActive +.public MonsterHasNegativeStatus .public MonsterIsType .public MoveHitCheck -.public SubFixedPoint -.public SubstitutePlaceholderStringTags -.public TryWarp -.public DoMoveNightShade .public ov01_0233103C -.public CreateMainMenus .public ov01_023315F4 .public ov10_022BFD6C -.public IsCurrentFixedRoomBossFight -.public ShouldDisplayEntityWrapper -.public CanSeeTarget -.public AnimationDelayOrSomething +.public ov10_022C4468 +.public ov10_022C4480 +.public ov10_022C4504 +.public ov10_022C4508 +.public ov10_022C45F8 +.public ov10_022C460C +.public ov10_022C4614 +.public ov10_022C483C +.public ov10_022C6322 .public ov29_022E3FCC .public ov29_022E4110 .public ov29_022E56A0 @@ -57,14 +388,9 @@ .public ov29_022EA370 .public ov29_022EA718 .public ov29_022EDC30 -.public TryActivateTraceAndColorChange -.public TryActivateConversion2 .public ov29_022F9840 -.public HasSuperEffectiveMoveAgainstUser .public ov29_022FB1A8 -.public AreEntitiesAdjacent .public ov29_0230040C -.public MonsterHasNegativeStatus .public ov29_023007DC .public ov29_02300D50 .public ov29_02300DC0 @@ -74,346 +400,38 @@ .public ov29_02304A48 .public ov29_02304C3C .public ov29_02307BDC -.public ApplyDamageAndEffects .public ov29_0230D088 -.public ApplyDamageAndEffectsWrapper -.public UpdateShopkeeperModeAfterAttack .public ov29_0230F654 .public ov29_02314DC4 -.public MirrorMoveIsActive -.public MistIsActive .public ov29_0231AD38 -.public TryActivateFrisk .public ov29_023201D0 -.public TryActivateNondamagingDefenderAbility -.public TryActivateNondamagingDefenderExclusiveItem .public ov29_0232393C -.public IsHyperBeamVariant -.public IsChargingTwoTurnMove .public ov29_0232461C -.public TwoTurnMoveForcedMiss .public ov29_02324D60 -.public GetDamageSourceWrapper -.public PlayMoveAnimation .public ov29_023258EC -.public DoMoveDamage__02325DC0 -.public DoMoveIronTail -.public DoMoveDamageMultihitUntilMiss -.public DoMoveYawn -.public DoMoveSleep -.public DoMoveNightmare -.public DoMoveMorningSun -.public DoMoveVitalThrow -.public DoMoveDig -.public DoMoveSweetScent -.public DoMoveCharm -.public DoMoveRainDance -.public DoMoveHail -.public DoMoveHealStatus -.public DoMoveBubble -.public DoMoveEncore -.public DoMoveRage -.public DoMoveSuperFang -.public DoMovePainSplit -.public DoMoveTorment -.public DoMoveStringShot -.public DoMoveSwagger -.public DoMoveSnore -.public DoMoveScreech -.public DoMoveDamageCringe30 -.public DoMoveWeatherBall -.public DoMoveWhirlpool -.public DoMoveFakeTears -.public DoMoveSpite -.public DoMoveFocusEnergy -.public DoMoveSmokescreen -.public DoMoveMirrorMove -.public DoMoveOverheat -.public DoMoveAuroraBeam -.public DoMoveMemento -.public DoMoveOctazooka -.public DoMoveFlatter -.public DoMoveWillOWisp -.public DoMoveReturn -.public DoMoveGrudge -.public DoMoveCounter -.public DoMoveDamageBurn10FlameWheel -.public DoMoveDamageBurn10 -.public DoMoveExpose -.public DoMoveDoubleTeam -.public DoMoveGust -.public DoMoveBoostDefense1 -.public DoMoveParalyze__02326E80 -.public DoMoveBoostAttack1 -.public DoMoveRazorWind -.public DoMoveBide -.public DoMoveBideUnleash -.public DoMoveCrunch -.public DoMoveDamageCringe20 -.public DoMoveDamageParalyze20 -.public DoMoveEndeavor -.public DoMoveFacade -.public DoMoveDamageLowerSpeed20 -.public DoMoveBrickBreak -.public DoMoveDamageLowerSpeed100 -.public DoMoveFocusPunch -.public DoMoveDamageDrain -.public DoMoveReversal -.public DoMoveSmellingSalt -.public DoMoveMetalSound -.public DoMoveTickle -.public DoMoveShadowHold -.public DoMoveHaze -.public DoMoveDamageMultihitFatigue -.public DoMoveDamageWeightDependent -.public DoMoveDamageBoostAllStats -.public DoMoveSynthesis -.public DoMoveBoostSpeed1 -.public DoMoveRapidSpin -.public DoMoveSureShot -.public DoMoveCosmicPower -.public DoMoveSkyAttack -.public DoMoveDamageFreeze15 -.public DoMoveMeteorMash -.public DoMoveEndure -.public DoMoveLowerSpeed1 -.public DoMoveDamageConfuse10 -.public DoMovePsywave -.public DoMoveDamageLowerDefensiveStatVariable -.public DoMovePsychoBoost -.public DoMoveUproar -.public DoMoveWaterSpout -.public DoMovePsychUp -.public DoMoveRecoverHp -.public DoMoveEarthquake -.public DoMoveNaturePower -.public DoMoveDamageParalyze10 -.public DoMoveSelfdestruct -.public DoMoveParalyze__02328230 -.public DoMoveShadowBall -.public DoMoveCharge -.public DoMoveThunderbolt -.public DoMoveMist -.public DoMoveFissure -.public DoMoveDamageCringe10 -.public DoMoveSafeguard -.public DoMoveAbsorb -.public DoMoveSkillSwap -.public DoMoveSketch -.public DoMoveHeadbutt -.public DoMoveDoubleEdge -.public DoMoveSandstorm -.public DoMoveLowerAccuracy1 -.public DoMoveDamagePoison40 -.public DoMoveGrowth -.public DoMoveSacredFire -.public DoMoveOhko -.public DoMoveSolarBeam -.public DoMoveSonicBoom -.public DoMoveFly -.public DoMoveExplosion -.public DoMoveDive -.public DoMoveWaterfall -.public DoMoveDamageLowerAccuracy40 -.public DoMoveStockpile -.public DoMoveTwister -.public DoMoveTwineedle -.public DoMoveRecoverHpTeam -.public DoMoveMinimize -.public DoMoveSeismicToss -.public DoMoveConfuse -.public DoMoveTaunt -.public DoMoveMoonlight -.public DoMoveHornDrill -.public DoMoveSwordsDance -.public DoMoveConversion -.public DoMoveConversion2 -.public DoMoveHelpingHand -.public DoMoveBoostDefense2 -.public DoMoveWarp -.public DoMoveThundershock -.public DoMoveThunderWave -.public DoMoveZapCannon -.public DoMoveBlock -.public DoMovePoison -.public DoMoveToxic -.public DoMovePoisonFang -.public DoMoveDamagePoison18 -.public DoMoveJumpKick -.public DoMoveBounce -.public DoMoveHiJumpKick -.public DoMoveTriAttack -.public DoMoveSwapItems -.public DoMoveTripleKick -.public DoMoveSport -.public DoMoveMudSlap -.public DoMoveDamageStealItem -.public DoMoveAmnesia -.public DoMoveGrowl -.public DoMoveSurf -.public DoMoveRolePlay -.public DoMoveSunnyDay -.public DoMoveLowerDefense1 -.public DoMoveWish -.public DoMoveFakeOut -.public DoMoveSleepTalk -.public DoMovePayDay -.public DoMoveAssist -.public DoMoveRest -.public DoMoveIngrain -.public DoMoveSwallow -.public DoMoveCurse -.public DoMoveDamage__0232A500 -.public DoMoveSuperpower -.public DoMoveSteelWing -.public DoMoveSpitUp -.public DoMoveDynamicPunch -.public DoMoveKnockOff -.public DoMoveSplash -.public DoMoveSetDamage -.public DoMoveBellyDrum -.public DoMoveLightScreen -.public DoMoveSecretPower -.public DoMoveDamageConfuse30 -.public DoMoveBulkUp -.public DoMovePause -.public DoMoveFeatherDance -.public DoMoveBeatUp -.public DoMoveBlastBurn -.public DoMoveCrushClaw -.public DoMoveBlazeKick -.public DoMovePresent -.public DoMoveEruption -.public DoMoveParalyze__0232B434 -.public DoMoveTransform -.public DoMovePoisonTail -.public DoMoveBlowback -.public DoMoveCamouflage -.public DoMoveTailGlow -.public DoMoveDamageConstrict10 -.public DoMovePerishSong -.public DoMoveWrap -.public DoMoveSpikes -.public DoMoveMagnitude -.public DoMoveMagicCoat -.public DoMoveProtect -.public DoMoveDefenseCurl -.public DoMoveDecoy -.public DoMoveMistBall -.public DoMoveDestinyBond -.public DoMoveDamage__0232B8B0 -.public DoMoveMirrorCoat -.public DoMoveCalmMind -.public DoMoveHiddenPower -.public DoMoveMetalClaw -.public DoMoveAttract -.public DoMoveCopycat -.public DoMoveFrustration -.public DoMoveLeechSeed -.public DoMoveMetronome -.public DoMoveDreamEater -.public DoMoveSnatch -.public DoMoveRecycle -.public DoMoveReflect -.public DoMoveDragonRage -.public DoMoveDragonDance -.public DoMoveSkullBash -.public DoMoveDamageLowerSpecialDefense50 -.public DoMoveStruggle -.public DoMoveRockSmash -.public DoMoveSeeTrap -.public DoMoveTakeaway -.public DoMoveRebound -.public DoMoveSwitchPositions -.public DoMoveStayAway -.public DoMoveCleanse -.public DoMoveSiesta -.public DoMoveTwoEdge -.public DoMoveNoMove -.public DoMoveScan -.public DoMovePowerEars -.public DoMoveTransfer -.public DoMoveSlowDown -.public DoMoveSearchlight -.public DoMovePetrify -.public DoMovePounce -.public DoMoveTrawl -.public DoMoveEscape -.public DoMoveDrought -.public DoMoveTrapBuster -.public DoMoveWildCall -.public DoMoveInvisify -.public DoMoveOneShot -.public DoMoveHpGauge -.public DoMoveVacuumCut -.public DoMoveReviver -.public DoMoveShocker -.public DoMoveEcho -.public DoMoveFamish -.public DoMoveOneRoom -.public DoMoveFillIn -.public DoMoveTrapper -.public DoMoveItemize -.public DoMoveHurl -.public DoMoveMobile -.public DoMoveSeeStairs -.public DoMoveLongToss -.public DoMovePierce -.public DoMoveHammerArm -.public DoMoveAquaRing -.public DoMoveGastroAcid -.public DoMoveHealingWish -.public DoMoveCloseCombat -.public DoMoveLuckyChant -.public DoMoveGuardSwap -.public DoMoveHealOrder -.public DoMoveHealBlock -.public DoMoveThunderFang -.public DoMoveDefog -.public DoMoveTrumpCard -.public DoMoveIceFang -.public DoMovePsychoShift -.public DoMoveEmbargo -.public DoMoveBrine -.public DoMoveNaturalGift -.public DoMoveGyroBall -.public DoMoveShadowForce -.public DoMoveGravity -.public DoMoveStealthRock -.public DoMoveChargeBeam -.public DoMoveDamageEatItem -.public DoMoveAcupressure -.public DoMoveMagnetRise -.public DoMoveToxicSpikes -.public DoMoveLastResort -.public DoMoveTrickRoom -.public DoMoveWorrySeed -.public DoMoveDamageHpDependent -.public DoMoveHeartSwap -.public DoMoveRoost -.public DoMovePowerSwap -.public DoMovePowerTrick -.public DoMoveFeint -.public DoMoveFlareBlitz -.public DoMoveDefendOrder -.public DoMoveFireFang -.public DoMoveLunarDance -.public DoMoveMiracleEye -.public DoMoveWakeUpSlap -.public DoMoveMetalBurst -.public DoMoveHeadSmash -.public DoMoveCaptivate -.public DoMoveLeafStorm -.public DoMoveDracoMeteor -.public DoMoveRockPolish -.public DoMoveNastyPlot -.public DoMoveTag0x1AB .public ov29_0232E744 -.public DoMoveTag0x1A6 -.public DoMoveTag0x1A7 .public ov29_02337E2C .public ov29_023381C0 .public ov29_02344B44 .public ov29_0234B034 -.public LogMessageByIdWithPopupCheckParticipants +.public ov29_02352AE8 +.public ov29_02352AEC +.public ov29_02353538 +.public ov29_02353718 +.public ov29_0237CA68 +.public ov29_0237CA69 +.public ov29_0237CA74 +.public ov29_0237CA80 +.public PlayMoveAnimation +.public ShouldDisplayEntityWrapper .public sub_02050FF8 +.public SubFixedPoint +.public SubstitutePlaceholderStringTags +.public TryActivateConversion2 +.public TryActivateFrisk +.public TryActivateNondamagingDefenderAbility +.public TryActivateNondamagingDefenderExclusiveItem +.public TryActivateTraceAndColorChange +.public TryWarp +.public TwoTurnMoveForcedMiss +.public UpdateShopkeeperModeAfterAttack diff --git a/asm/include/overlay_29_02333FD0.inc b/asm/include/overlay_29_02333FD0.inc index c0451fb3..9237d463 100644 --- a/asm/include/overlay_29_02333FD0.inc +++ b/asm/include/overlay_29_02333FD0.inc @@ -2,22 +2,24 @@ .public AbilityIsActiveVeneer .public abs .public AdvanceFrame +.public AnimationDelayOrSomething .public DungeonRandInt .public EntityIsValid__023350D8 .public GendersEqualNotGenderless .public GetLeader +.public GetWeatherColorTable .public GravityIsActive .public HasHeldItem +.public IsMonsterSleeping .public IsSecretFloor .public IsThawingMove .public LogMessageByIdWithPopupCheckUser .public MonsterIsType -.public TryActivateArtificialWeatherAbilities -.public TryWeatherFormChange .public ov29_022DE608 -.public GetWeatherColorTable -.public AnimationDelayOrSomething .public ov29_022E5FE8 -.public IsMonsterSleeping -.public TryActivateWeather .public ov29_02338A4C +.public ov29_02353538 +.public ov29_02353562 +.public TryActivateArtificialWeatherAbilities +.public TryActivateWeather +.public TryWeatherFormChange diff --git a/asm/include/overlay_29_023350FC.inc b/asm/include/overlay_29_023350FC.inc index 2966e2c7..358aa59a 100644 --- a/asm/include/overlay_29_023350FC.inc +++ b/asm/include/overlay_29_023350FC.inc @@ -60,3 +60,4 @@ .public sub_02051D8C .public sub_02051E60 .public SECONDARY_TERRAIN_TYPES +.public DIRECTIONS_XY diff --git a/asm/include/overlay_29_02337CCC.inc b/asm/include/overlay_29_02337CCC.inc index 12d4f5d0..baaf706c 100644 --- a/asm/include/overlay_29_02337CCC.inc +++ b/asm/include/overlay_29_02337CCC.inc @@ -1,7 +1,12 @@ #pragma once +.public __divsi3 +.public _020AFC4C +.public _020AFC70 .public abs .public AllocAndLoadFileInPack -.public __divsi3 +.public DetermineAllTilesWalkableNeighbors +.public DetermineTileWalkableNeighbors +.public DIRECTIONS_XY .public DungeonRand16Bit .public DungeonRandInt .public DungeonRandRange @@ -9,6 +14,8 @@ .public DungeonRngSetSecondary .public EntityIsValid__02337CA8 .public EntityIsValid__02344AF8 +.public GenerateCleanItem +.public GenerateStandardItem .public GetActiveTeamMember .public GetDungeonMode .public GetExclusiveItem @@ -29,15 +36,21 @@ .public GetSpecialTargetItem .public GetTile .public GetTileSafe +.public GetTrapInfo .public GetVictoriesOnOneFloor .public HandleSir0Translation +.public InitOtherMonsterData +.public InitRender3dElement64 .public InitStandardItem .public IqSkillIsEnabled .public IsBagFull .public IsCurrentMissionType .public IsCurrentMissionTypeExact +.public IsCurrentTilesetBackground +.public IsDestinationFloor .public IsDestinationFloorWithMonster .public IsExperienceLocked +.public IsFullFloorFixedRoom .public IsGoldenChamber .public IsItemInBag .public IsOutlawMonsterHouseFloor @@ -46,27 +59,33 @@ .public LoadScriptVariableValue .public LoadWteFromFileDirectory .public LogMessageByIdWithPopupCheckUser +.public MarkShopkeeperSpawn .public MemAlloc +.public Memcpy32 .public MemFree .public MemZero -.public Memcpy32 .public MultiplyByFixedPoint -.public PointsToZero -.public ProcessWte -.public RandInt -.public SetMonsterLevelAndId -.public SetVictoriesOnOneFloor -.public SpawnMonster -.public SubstitutePlaceholderStringTags -.public UnloadFile -.public ZInit8 .public ov10_022BFD20 +.public ov10_022C440C +.public ov10_022C44AC +.public ov10_022C4660 +.public ov10_022C484C +.public ov10_022C4850 +.public ov10_022C4B34 +.public ov10_022C52EC +.public ov10_022C5938 +.public ov10_022C631C +.public ov10_022C6326 +.public ov10_022C6327 +.public ov10_022C6C74 +.public ov10_022C6C75 +.public ov10_022C6C76 +.public ov10_022C6C77 +.public ov10_022C6C78 +.public ov10_022C6C79 .public ov29_022DE288 -.public GetTrapInfo .public ov29_022E2418 -.public ShouldMinimapDisplayEntity .public ov29_022E3580 -.public PlayEffectAnimationPos .public ov29_022E6694 .public ov29_022E66C4 .public ov29_022E7BB8 @@ -74,7 +93,6 @@ .public ov29_022E7F7C .public ov29_022EA370 .public ov29_022EA408 -.public SpawnEnemyTrapAtPos .public ov29_022EDEDC .public ov29_022EFAE8 .public ov29_022EFB20 @@ -91,30 +109,61 @@ .public ov29_022F07D8 .public ov29_022F0848 .public ov29_022FAFD4 -.public InitOtherMonsterData -.public MarkShopkeeperSpawn .public ov29_02304BAC .public ov29_02306D54 -.public TeamMemberHasExclusiveItemEffectActive -.public IsFullFloorFixedRoom -.public IsCurrentTilesetBackground .public ov29_023365E8 .public ov29_02336694 -.public DetermineAllTilesWalkableNeighbors -.public DetermineTileWalkableNeighbors -.public UpdateTrapsVisibility .public ov29_02344B9C -.public GenerateStandardItem -.public GenerateCleanItem .public ov29_02344E88 .public ov29_02345004 -.public SpawnItem .public ov29_02348BE8 -.public IsDestinationFloor .public ov29_0234B09C .public ov29_0234B1A4 .public ov29_0234C668 .public ov29_0234C738 +.public ov29_0234FDFC +.public ov29_023502EC +.public ov29_023502F0 +.public ov29_023502F4 +.public ov29_02352B5C +.public ov29_02352F1C +.public ov29_02352F40 +.public ov29_02352F7C +.public ov29_02352FCC +.public ov29_02352FD0 +.public ov29_02352FF4 +.public ov29_02353010 +.public ov29_02353030 +.public ov29_02353050 +.public ov29_02353110 +.public ov29_023534F0 +.public ov29_0235352C +.public ov29_02353538 +.public ov29_0235372C +.public ov29_02353730 +.public ov29_0235376C +.public ov29_0235377C +.public ov29_02353784 +.public ov29_0235378C +.public ov29_02353794 +.public ov29_02353798 +.public ov29_0237CACC +.public ov29_0237CD40 +.public ov29_0237CFB8 +.public ov29_0237CFBC +.public ov29_0237CFC0 +.public ov29_0237CFFC +.public PlayEffectAnimationPos +.public PointsToZero +.public ProcessWte +.public RandInt +.public SECONDARY_TERRAIN_TYPES +.public SetMonsterLevelAndId +.public SetVictoriesOnOneFloor +.public ShouldMinimapDisplayEntity +.public SpawnEnemyTrapAtPos +.public SpawnItem +.public SpawnMonster .public sub_020018D0 .public sub_0200A174 .public sub_0200B330 @@ -123,10 +172,13 @@ .public sub_0200F940 .public sub_0201B9F8 .public sub_0201E13C -.public InitRender3dElement64 .public sub_0201F2A0 .public sub_0204AEA0 .public sub_0204AEC0 .public sub_0204AF30 .public sub_02056880 -.public SECONDARY_TERRAIN_TYPES +.public SubstitutePlaceholderStringTags +.public TeamMemberHasExclusiveItemEffectActive +.public UnloadFile +.public UpdateTrapsVisibility +.public ZInit8 diff --git a/asm/include/overlay_29_02344B1C.inc b/asm/include/overlay_29_02344B1C.inc index 85a292d4..c42436f3 100644 --- a/asm/include/overlay_29_02344B1C.inc +++ b/asm/include/overlay_29_02344B1C.inc @@ -1,45 +1,51 @@ #pragma once +.public __divsi3 .public AddItemToBagNoHeld .public AddMoneyCarried .public AdvanceFrame -.public __divsi3 .public DungeonRand16Bit .public DungeonRandInt .public DungeonRandRange .public DungeonRngSetPrimary .public DungeonRngSetSecondary .public EntityIsValid__02345698 +.public GenerateItem .public GetActualBuyPrice .public GetActualSellPrice .public GetCurrentBagCapacity .public GetItemAtIdx .public GetItemCategoryVeneer +.public GetItemIdToSpawn +.public GetItemInfo .public GetItemToRetrieve .public GetLeader .public GetTile .public GetTileSafe .public IqSkillIsEnabled .public IsDestinationFloorWithItem +.public IsShoppableItem .public LogMessageByIdWithPopupCheckUser .public MemAlloc .public MemFree -.public RemoveEmptyItemsInBag -.public RemoveEquivItemNoHole -.public ShouldMonsterRunAwayVariation -.public SubstitutePlaceholderStringTags -.public GetItemInfo -.public SpawnItemEntity -.public GetItemIdToSpawn .public ov29_022EACCC .public ov29_022FB920 -.public RemoveGroundItem .public ov29_02347040 -.public GenerateItem .public ov29_02348D3C .public ov29_02348DD8 .public ov29_02348ECC .public ov29_0234B084 .public ov29_0234CCB4 -.public IsShoppableItem +.public ov29_023531A0 +.public ov29_023531A4 +.public ov29_023531BC +.public ov29_023531CC +.public ov29_02353538 +.public ov29_023537B0 +.public RemoveEmptyItemsInBag +.public RemoveEquivItemNoHole +.public RemoveGroundItem +.public ShouldMonsterRunAwayVariation +.public SpawnItemEntity .public sub_0200D8AC .public sub_02024FE8 +.public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_023456BC.inc b/asm/include/overlay_29_023456BC.inc index 0eda3b1f..d719dfc3 100644 --- a/asm/include/overlay_29_023456BC.inc +++ b/asm/include/overlay_29_023456BC.inc @@ -93,3 +93,5 @@ .public sub_02053D1C .public sub_02057CE8 .public SECONDARY_TERRAIN_TYPES +.public DIRECTIONS_XY +.public BAG_ITEMS_PTR_MIRROR diff --git a/asm/include/overlay_29_02347BC8.inc b/asm/include/overlay_29_02347BC8.inc index 8392f068..4ef8c697 100644 --- a/asm/include/overlay_29_02347BC8.inc +++ b/asm/include/overlay_29_02347BC8.inc @@ -1,15 +1,18 @@ #pragma once +.public __divsi3 +.public _020A1878 .public abs .public AdvanceFrame .public ApplyItemEffect +.public CanSeeTarget .public CheckAcceptedMissionByTypeAndDungeon .public DisplayMessage .public DisplayMessage2 -.public __divsi3 .public DungeonRandInt .public EntityIsValid__0234987C .public ExclusiveItemEffectFlagTest .public ExclusiveItemEffectIsActive__02347B80 +.public GenerateMissionEggMonster .public GetAcceptedMission .public GetBgRegionArea .public GetForcedLossReason @@ -19,8 +22,10 @@ .public GetSpriteFileSize .public GetTile .public InitMove +.public InitPortraitDungeon .public IsItemInBag .public IsItemWithFlagsInBag +.public IsWaterTileset .public ItemIsActive__02347B50 .public LoadMonsterSprite .public LogMessageByIdWithPopupCheckUser @@ -28,31 +33,25 @@ .public MemAlloc .public MemFree .public MemZero -.public strcpy -.public SubstitutePlaceholderStringTags +.public ov10_022C46B0 +.public ov10_022C48E4 .public ov29_022E09E8 .public ov29_022E0DD8 .public ov29_022E0DE4 .public ov29_022E0DFC .public ov29_022E0E44 .public ov29_022E1A84 -.public CanSeeTarget .public ov29_022E2CA0 .public ov29_022E9488 .public ov29_022FB9BC .public ov29_023009CC .public ov29_02304A84 .public ov29_02307BDC -.public TwoTurnMoveForcedMiss -.public TrySpawnGoldenChamber -.public IsWaterTileset .public ov29_023386B0 .public ov29_02344B44 .public ov29_02344B70 .public ov29_02344B9C .public ov29_023457C8 -.public SpawnDroppedItem -.public GenerateMissionEggMonster .public ov29_02349A70 .public ov29_02349AD4 .public ov29_0234A244 @@ -64,10 +63,13 @@ .public ov29_0234B06C .public ov29_0234B0B4 .public ov29_0234B4CC -.public InitPortraitDungeon .public ov29_0234C668 .public ov29_0234C738 -.public YesNoMenu +.public ov29_02353538 +.public ov29_023537C4 +.public ov29_0237C694 +.public SpawnDroppedItem +.public strcpy .public sub_020018D0 .public sub_02011220 .public sub_02015328 @@ -79,3 +81,7 @@ .public sub_02024FB8 .public sub_02051DFC .public sub_02051EB8 +.public SubstitutePlaceholderStringTags +.public TrySpawnGoldenChamber +.public TwoTurnMoveForcedMiss +.public YesNoMenu diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc index 0078110d..2ab93495 100644 --- a/asm/include/overlay_29_023498A0.inc +++ b/asm/include/overlay_29_023498A0.inc @@ -235,3 +235,4 @@ .public sub_02051E60 .public sub_0205BAB0 .public sub_020778D0 +.public BAG_ITEMS_PTR_MIRROR diff --git a/asm/include/overlay_29_0234DDF4.inc b/asm/include/overlay_29_0234DDF4.inc index 8214ec04..a40e0bd3 100644 --- a/asm/include/overlay_29_0234DDF4.inc +++ b/asm/include/overlay_29_0234DDF4.inc @@ -1,25 +1,25 @@ #pragma once .public AdvanceFrame .public DisplayMessage +.public DrawTileGrid .public EntityIsValid__0234DDD0 .public EntityIsValid__0234EC14 .public GetActiveTeamMember .public GetItemMoveId16 +.public GetItemToUse .public GetLeader +.public GetLeaderAction +.public GetLeaderMonster .public GetTile +.public HideTileGrid .public InitMove .public LoadOverlay -.public OverlayIsLoaded -.public StrncpySimple -.public UnloadOverlay +.public OthersMenu .public ov29_022E0B44 .public ov29_022E2A78 -.public GetLeaderMonster .public ov29_022EA370 .public ov29_022EA428 .public ov29_022EB398 -.public GetItemToUse -.public GetLeaderAction .public ov29_022F0B9C .public ov29_022F0C1C .public ov29_022F0C3C @@ -27,19 +27,18 @@ .public ov29_022F44F0 .public ov29_022F5A0C .public ov29_022F5DC0 -.public TryPointCameraToMonster .public ov29_022FB920 .public ov29_02302388 .public ov29_0231DA80 .public ov29_0231DBF0 .public ov29_0231DD60 -.public DrawTileGrid -.public HideTileGrid .public ov29_0234B034 .public ov29_0234B1A4 .public ov29_0234EC38 .public ov29_0234ED30 -.public OthersMenu +.public ov29_0235352C +.public ov29_02353538 +.public ov29_02382804 .public ov30_02382820 .public ov30_02382E08 .public ov30_02382E18 @@ -51,10 +50,11 @@ .public ov31_023860A4 .public ov31_0238619C .public ov31_02386C6C -.public TeamMenu .public ov31_02387660 .public ov31_02387688 +.public OverlayIsLoaded .public RestMenu +.public StrncpySimple .public sub_0200B330 .public sub_0200B3D4 .public sub_02025888 @@ -62,3 +62,6 @@ .public sub_0202AABC .public sub_0202AAE8 .public sub_0204AF20 +.public TeamMenu +.public TryPointCameraToMonster +.public UnloadOverlay diff --git a/asm/itcm.s b/asm/itcm.s index 78911dd1..b26d9fc4 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -2836,7 +2836,7 @@ _01FFA68C: strh r1, [sp, #0x52] strh r0, [sp, #0x54] add sl, sp, #0x51 - ldr r6, _01FFB2B8 ; =0x0235171C + ldr r6, _01FFB2B8 ; =DIRECTIONS_XY b _01FFA74C _01FFA6F0: mov r1, r7, lsl #2 @@ -2874,7 +2874,7 @@ _01FFA754: mov r1, #6 strb r1, [sb, #0x7c] mov r3, r0, lsl #2 - ldr r0, _01FFB2B8 ; =0x0235171C + ldr r0, _01FFB2B8 ; =DIRECTIONS_XY ldrsh r5, [r4, #4] ldrsh r2, [r0, r3] ldr r1, _01FFB2BC ; =0x0235171E @@ -3501,7 +3501,7 @@ _01FFB040: strb r0, [sb, #0x151] b _01FFB2A4 _01FFB080: - ldr r0, _01FFB2B8 ; =0x0235171C + ldr r0, _01FFB2B8 ; =DIRECTIONS_XY mov r2, r7, lsl #2 ldrsh r1, [r4, #4] ldrsh r0, [r0, r2] @@ -3654,7 +3654,7 @@ _01FFB2A4: _01FFB2AC: .word 0x000003E7 _01FFB2B0: .word 0x000F423F _01FFB2B4: .word 0x02353538 -_01FFB2B8: .word 0x0235171C +_01FFB2B8: .word DIRECTIONS_XY _01FFB2BC: .word 0x0235171E _01FFB2C0: .word 0xFFF0BDC1 _01FFB2C4: .word 0x0235177C @@ -3725,7 +3725,7 @@ _01FFB38C: beq _01FFB3E0 mov r0, #3 strb r0, [sb, #0x7c] - ldr r0, _01FFB624 ; =0x0235171C + ldr r0, _01FFB624 ; =DIRECTIONS_XY mov r3, r8, lsl #2 ldrsh r2, [r0, r3] ldrsh r4, [sl, #4] @@ -3761,7 +3761,7 @@ _01FFB3F0: mov r1, #6 strb r1, [sb, #0x7c] mov r3, r0, lsl #2 - ldr r0, _01FFB624 ; =0x0235171C + ldr r0, _01FFB624 ; =DIRECTIONS_XY ldrsh r4, [sl, #4] ldrsh r2, [r0, r3] ldr r1, _01FFB628 ; =0x0235171E @@ -3784,7 +3784,7 @@ _01FFB460: mov r1, #6 strb r1, [sb, #0x7c] mov r3, r0, lsl #2 - ldr r0, _01FFB624 ; =0x0235171C + ldr r0, _01FFB624 ; =DIRECTIONS_XY ldrsh r4, [sl, #4] ldrsh r2, [r0, r3] ldr r1, _01FFB628 ; =0x0235171E @@ -3838,7 +3838,7 @@ _01FFB520: mov r8, r0 mov r5, #0 add fp, sp, #0 - ldr r4, _01FFB624 ; =0x0235171C + ldr r4, _01FFB624 ; =DIRECTIONS_XY b _01FFB5C8 _01FFB554: and r8, r8, #7 @@ -3883,7 +3883,7 @@ _01FFB5D8: mov r1, #6 strb r1, [sb, #0x7c] mov r3, r0, lsl #2 - ldr r0, _01FFB624 ; =0x0235171C + ldr r0, _01FFB624 ; =DIRECTIONS_XY ldrsh r4, [sl, #4] ldrsh r2, [r0, r3] ldr r1, _01FFB628 ; =0x0235171E @@ -3898,7 +3898,7 @@ _01FFB5D8: .align 2, 0 _01FFB61C: .word 0x02353538 _01FFB620: .word 0x0235177C -_01FFB624: .word 0x0235171C +_01FFB624: .word DIRECTIONS_XY _01FFB628: .word 0x0235171E arm_func_end CalculateAiTargetPos diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index f03d6d99..7b2c0bb8 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -169914,6 +169914,8 @@ GUMMI_STAT_BOOST: .global WONDER_GUMMI_IQ_GAIN WONDER_GUMMI_IQ_GAIN: .byte 0x0F, 0x00, 0x00, 0x00 + .global _020A1894 +_020A1894: .byte 0x32, 0x00, 0x00, 0x00 .global AURA_BOW_STAT_BOOST AURA_BOW_STAT_BOOST: @@ -169951,11 +169953,19 @@ EVOLUTION_HP_BONUS: .byte 0x0A, 0x00, 0x00, 0x00 .global _020A18C8 _020A18C8: - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00 + .global _020A18CC +_020A18CC: + .byte 0x00, 0x32, 0x00, 0x00 .global EVOLUTION_PHYSICAL_STAT_BONUSES EVOLUTION_PHYSICAL_STAT_BONUSES: .byte 0x05, 0x00, 0x05, 0x00 - .byte 0x00, 0xC9, 0xFE, 0xFF, 0x00, 0x08, 0x00, 0x00 + .global _020A18D4 +_020A18D4: + .byte 0x00, 0xC9, 0xFE, 0xFF + .global _020A18D8 +_020A18D8: + .byte 0x00, 0x08, 0x00, 0x00 .global EGG_STAT_BONUSES EGG_STAT_BONUSES: .byte 0x05, 0x00, 0x05, 0x00 @@ -169964,8 +169974,22 @@ _020A18E0: .byte 0x05, 0x00, 0x05, 0x00 .global EVOLUTION_SPECIAL_STAT_BONUSES EVOLUTION_SPECIAL_STAT_BONUSES: - .byte 0x05, 0x00, 0x05, 0x00, 0x54, 0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF - .byte 0x99, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00 + .byte 0x05, 0x00, 0x05, 0x00 + .global _020A18E8 +_020A18E8: + .byte 0x54, 0x01, 0x00, 0x00 + .global _020A18EC +_020A18EC: + .byte 0x00, 0x32, 0x00, 0x00 + .global _020A18F0 +_020A18F0: + .byte 0x80, 0xFF, 0xFF, 0xFF + .global _020A18F4 +_020A18F4: + .byte 0x99, 0x00, 0x00, 0x00 + .global _020A18F8 +_020A18F8: + .byte 0x00, 0x0A, 0x00, 0x00 .global _020A18FC _020A18FC: .byte 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0x00, 0x00, 0x00 @@ -170223,7 +170247,10 @@ IQ_GUMMI_GAIN_TABLE: .byte 0x03, 0x00, 0x01, 0x00, 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x05, 0x00, 0x03, 0x00 .byte 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 .byte 0x01, 0x00, 0x04, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 - .byte 0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x05, 0x00 + .global _020A2538 +_020A2538: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x0F, 0x00 .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 diff --git a/asm/overlay_10.s b/asm/overlay_10.s index 6869ff10..e990016a 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -9112,87 +9112,557 @@ ov10_022C43F8: .byte 0x5B, 0x4D, 0x53, 0x3A, 0x31, 0x5D, 0x25, 0x73, 0x00, 0x00, 0x00, 0x00 .global ov10_022C4404 ov10_022C4404: - .byte 0x20, 0x20, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xC9, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00 + .byte 0x20, 0x20, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00 + .global ov10_022C440C +ov10_022C440C: + .byte 0x1C, 0x00, 0x00, 0x00 + .global ov10_022C4410 +ov10_022C4410: + .byte 0xC8, 0x00, 0x00, 0x00 + .global ov10_022C4414 +ov10_022C4414: + .byte 0x05, 0x00, 0x00, 0x00 + .global ov10_022C4418 +ov10_022C4418: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C441C +ov10_022C441C: + .byte 0xC8, 0x00, 0x00, 0x00 + .global ov10_022C4420 +ov10_022C4420: + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x1E, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00 + .global ov10_022C4430 +ov10_022C4430: + .byte 0x0F, 0x00, 0x00, 0x00 + .global ov10_022C4434 +ov10_022C4434: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C4438 +ov10_022C4438: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C443C +ov10_022C443C: + .byte 0xC9, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00 .byte 0x14, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 - .byte 0x28, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x6A, 0xFF, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xE7, 0x03, 0x00, 0x00 - .byte 0x64, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 - .byte 0x19, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 + .global ov10_022C4454 +ov10_022C4454: + .byte 0x02, 0x00, 0x00, 0x00 + .global ov10_022C4458 +ov10_022C4458: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C445C +ov10_022C445C: + .byte 0x1E, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .byte 0x18, 0x00, 0x00, 0x00 + .global ov10_022C4468 +ov10_022C4468: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C446C +ov10_022C446C: + .byte 0x05, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 + .byte 0x21, 0x00, 0x00, 0x00 + .global ov10_022C4478 +ov10_022C4478: + .byte 0x64, 0x00, 0x00, 0x00 + .global ov10_022C447C +ov10_022C447C: + .byte 0x96, 0x00, 0x00, 0x00 + .global ov10_022C4480 +ov10_022C4480: + .byte 0x14, 0x00, 0x00, 0x00 + .byte 0x28, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + .global ov10_022C448C +ov10_022C448C: + .byte 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 + .byte 0x1E, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 + .global ov10_022C449C +ov10_022C449C: + .byte 0x19, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 + .global ov10_022C44A4 +ov10_022C44A4: + .byte 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C44AC +ov10_022C44AC: + .byte 0x07, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C44B4 +ov10_022C44B4: + .byte 0x05, 0x00, 0x00, 0x00 + .global ov10_022C44B8 +ov10_022C44B8: + .byte 0x28, 0x00, 0x00, 0x00 + .global ov10_022C44BC +ov10_022C44BC: + .byte 0x03, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C44C4 +ov10_022C44C4: + .byte 0x14, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 + .global ov10_022C44CC +ov10_022C44CC: + .byte 0x19, 0x00, 0x00, 0x00 + .global ov10_022C44D0 +ov10_022C44D0: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C44D4 +ov10_022C44D4: + .byte 0x06, 0x00, 0x00, 0x00 + .global ov10_022C44D8 +ov10_022C44D8: + .byte 0x02, 0x00, 0x00, 0x00 + .global ov10_022C44DC +ov10_022C44DC: + .byte 0x24, 0x00, 0x00, 0x00 + .global ov10_022C44E0 +ov10_022C44E0: + .byte 0x32, 0x00, 0x00, 0x00 + .global ov10_022C44E4 +ov10_022C44E4: + .byte 0x05, 0x00, 0x00, 0x00 + .global ov10_022C44E8 +ov10_022C44E8: + .byte 0x23, 0x00, 0x00, 0x00 + .global ov10_022C44EC +ov10_022C44EC: + .byte 0x3C, 0x00, 0x00, 0x00 + .global ov10_022C44F0 +ov10_022C44F0: + .byte 0x28, 0x00, 0x00, 0x00 + .global ov10_022C44F4 +ov10_022C44F4: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov10_022C44F8 +ov10_022C44F8: + .byte 0x03, 0x00, 0x00, 0x00 + .global ov10_022C44FC +ov10_022C44FC: + .byte 0x32, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00 + .global ov10_022C4504 +ov10_022C4504: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4508 +ov10_022C4508: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C450C +ov10_022C450C: + .byte 0x32, 0x00, 0x00, 0x00 + .global ov10_022C4510 +ov10_022C4510: + .byte 0x0A, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4518 +ov10_022C4518: + .byte 0x0F, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00 + .global ov10_022C4520 +ov10_022C4520: + .byte 0x19, 0x00, 0x00, 0x00 + .byte 0x0C, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 + .global ov10_022C452C +ov10_022C452C: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4530 +ov10_022C4530: + .byte 0x0F, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 + .global ov10_022C453C +ov10_022C453C: + .byte 0x19, 0x00, 0x00, 0x00 + .global ov10_022C4540 +ov10_022C4540: + .byte 0x0A, 0x00, 0x00, 0x00 + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4548 +ov10_022C4548: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C454C +ov10_022C454C: + .byte 0x1E, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .global ov10_022C4554 +ov10_022C4554: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4558 +ov10_022C4558: + .byte 0x01, 0x00, 0x00, 0x00 + .global ov10_022C455C +ov10_022C455C: + .byte 0x04, 0x00, 0x00, 0x00 + .global ov10_022C4560 +ov10_022C4560: + .byte 0x08, 0x00, 0x00, 0x00 + .byte 0x0C, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + .global ov10_022C456C +ov10_022C456C: + .byte 0x12, 0x00, 0x00, 0x00 + .global ov10_022C4570 +ov10_022C4570: + .byte 0x05, 0x00, 0x00, 0x00 + .global ov10_022C4574 +ov10_022C4574: + .byte 0x02, 0x00, 0x00, 0x00, 0x6A, 0xFF, 0x00, 0x00 + .global ov10_022C457C +ov10_022C457C: + .byte 0x03, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00 + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C4588 +ov10_022C4588: + .byte 0x0A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .global ov10_022C4590 +ov10_022C4590: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4594 +ov10_022C4594: + .byte 0x32, 0x00, 0x00, 0x00 + .global ov10_022C4598 +ov10_022C4598: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C459C +ov10_022C459C: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C45A0 +ov10_022C45A0: + .byte 0xE7, 0x03, 0x00, 0x00 + .global ov10_022C45A4 +ov10_022C45A4: + .byte 0x64, 0x00, 0x00, 0x00 + .global ov10_022C45A8 +ov10_022C45A8: + .byte 0x08, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 + .global ov10_022C45B4 +ov10_022C45B4: + .byte 0x1E, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 + .global ov10_022C45BC +ov10_022C45BC: + .byte 0x0A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .global ov10_022C45C4 +ov10_022C45C4: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C45C8 +ov10_022C45C8: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C45CC +ov10_022C45CC: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C45D0 +ov10_022C45D0: + .byte 0x06, 0x00, 0x00, 0x00 + .global ov10_022C45D4 +ov10_022C45D4: + .byte 0x19, 0x00, 0x00, 0x00 + .global ov10_022C45D8 +ov10_022C45D8: + .byte 0x19, 0x00, 0x00, 0x00 + .global ov10_022C45DC +ov10_022C45DC: + .byte 0x23, 0x00, 0x00, 0x00 + .global ov10_022C45E0 +ov10_022C45E0: + .byte 0x28, 0x00, 0x00, 0x00 + .global ov10_022C45E4 +ov10_022C45E4: + .byte 0x10, 0x00, 0x00, 0x00 + .global ov10_022C45E8 +ov10_022C45E8: + .byte 0x05, 0x00, 0x00, 0x00 + .global ov10_022C45EC +ov10_022C45EC: + .byte 0x64, 0x00, 0x00, 0x00 + .global ov10_022C45F0 +ov10_022C45F0: + .byte 0x02, 0x00, 0x00, 0x00 + .global ov10_022C45F4 +ov10_022C45F4: + .byte 0x02, 0x00, 0x00, 0x00 + .global ov10_022C45F8 +ov10_022C45F8: + .byte 0x02, 0x00, 0x00, 0x00 + .global ov10_022C45FC +ov10_022C45FC: + .byte 0x05, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4608 +ov10_022C4608: + .byte 0x32, 0x00, 0x00, 0x00 + .global ov10_022C460C +ov10_022C460C: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4610 +ov10_022C4610: + .byte 0x32, 0x00, 0x00, 0x00 + .global ov10_022C4614 +ov10_022C4614: .byte 0x14, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 + .global ov10_022C4624 +ov10_022C4624: .byte 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x9C, 0xFF, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0xB8, 0x0B, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0xFA, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00 - .byte 0x9C, 0xFF, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00 + .byte 0x0F, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 + .global ov10_022C4640 +ov10_022C4640: + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C4648 +ov10_022C4648: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C464C +ov10_022C464C: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4650 +ov10_022C4650: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4654 +ov10_022C4654: + .byte 0xB8, 0x0B, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 + .global ov10_022C4660 +ov10_022C4660: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C4664 +ov10_022C4664: + .byte 0x14, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 + .global ov10_022C466C +ov10_022C466C: + .byte 0xFA, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00 + .byte 0x9C, 0xFF, 0x00, 0x00 + .global ov10_022C4678 +ov10_022C4678: + .byte 0x19, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .global ov10_022C4680 +ov10_022C4680: + .byte 0x3C, 0x00, 0x00, 0x00 + .global ov10_022C4684 +ov10_022C4684: .byte 0x19, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x24, 0xFF, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - .byte 0xE7, 0x03, 0x00, 0x00, 0x9C, 0xFF, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00 - .byte 0xC8, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00 - .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x03, 0x00, 0x07, 0x00 - .byte 0x04, 0x00, 0x08, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x0A, 0x00, 0x0C, 0x00, 0x0A, 0x00, 0x0C, 0x00 - .byte 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0E, 0x00, 0x50, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0C, 0x00 - .byte 0xCC, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0xB3, 0x01, 0x00, 0x00, 0x06, 0x00, 0x0C, 0x00 - .byte 0x03, 0x00, 0x05, 0x00, 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0A, 0x00 + .byte 0x14, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 + .global ov10_022C46A0 +ov10_022C46A0: + .byte 0x32, 0x00, 0x00, 0x00 + .global ov10_022C46A4 +ov10_022C46A4: + .byte 0x04, 0x00, 0x00, 0x00 + .global ov10_022C46A8 +ov10_022C46A8: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C46AC +ov10_022C46AC: + .byte 0x02, 0x00, 0x00, 0x00 + .global ov10_022C46B0 +ov10_022C46B0: + .byte 0x5A, 0x00, 0x00, 0x00 + .global ov10_022C46B4 +ov10_022C46B4: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C46B8 +ov10_022C46B8: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C46BC +ov10_022C46BC: + .byte 0x64, 0x00, 0x00, 0x00 + .global ov10_022C46C0 +ov10_022C46C0: + .byte 0x0C, 0x00, 0x00, 0x00 + .global ov10_022C46C4 +ov10_022C46C4: + .byte 0x03, 0x00, 0x00, 0x00 + .global ov10_022C46C8 +ov10_022C46C8: + .byte 0x03, 0x00, 0x00, 0x00 + .global ov10_022C46CC +ov10_022C46CC: + .byte 0x03, 0x00, 0x00, 0x00, 0x24, 0xFF, 0x00, 0x00 + .global ov10_022C46D4 +ov10_022C46D4: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C46D8 +ov10_022C46D8: + .byte 0x0F, 0x00, 0x00, 0x00 + .global ov10_022C46DC +ov10_022C46DC: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C46E0 +ov10_022C46E0: + .byte 0x07, 0x00, 0x00, 0x00 + .global ov10_022C46E4 +ov10_022C46E4: + .byte 0x06, 0x00, 0x00, 0x00 + .global ov10_022C46E8 +ov10_022C46E8: + .byte 0x04, 0x00, 0x00, 0x00 + .global ov10_022C46EC +ov10_022C46EC: + .byte 0x03, 0x00, 0x00, 0x00 + .global ov10_022C46F0 +ov10_022C46F0: + .byte 0x0F, 0x00, 0x00, 0x00 + .global ov10_022C46F4 +ov10_022C46F4: + .byte 0xE7, 0x03, 0x00, 0x00, 0x9C, 0xFF, 0x00, 0x00 + .global ov10_022C46FC +ov10_022C46FC: + .byte 0xC8, 0x00, 0x00, 0x00 + .global ov10_022C4700 +ov10_022C4700: + .byte 0xC8, 0x00, 0x00, 0x00 + .global ov10_022C4704 +ov10_022C4704: + .byte 0xC8, 0x00, 0x00, 0x00 + .global ov10_022C4708 +ov10_022C4708: + .byte 0xC8, 0x00, 0x00, 0x00 + .global ov10_022C470C +ov10_022C470C: + .byte 0xC8, 0x00, 0x00, 0x00 + .global ov10_022C4710 +ov10_022C4710: + .byte 0x80, 0x01, 0x00, 0x00 + .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00 + .global ov10_022C471C +ov10_022C471C: + .byte 0x03, 0x00, 0x06, 0x00 + .global ov10_022C4720 +ov10_022C4720: + .byte 0x03, 0x00, 0x07, 0x00 + .byte 0x04, 0x00, 0x08, 0x00, 0x7F, 0x00, 0x7F, 0x00 + .global ov10_022C472C +ov10_022C472C: + .byte 0x0A, 0x00, 0x0C, 0x00 + .global ov10_022C4730 +ov10_022C4730: + .byte 0x0A, 0x00, 0x0C, 0x00 + .global ov10_022C4734 +ov10_022C4734: + .byte 0x0F, 0x00, 0x14, 0x00 + .global ov10_022C4738 +ov10_022C4738: + .byte 0x0A, 0x00, 0x0E, 0x00 + .global ov10_022C473C +ov10_022C473C: + .byte 0x50, 0x00, 0x00, 0x00 + .global ov10_022C4740 +ov10_022C4740: + .byte 0x0A, 0x00, 0x0C, 0x00 + .global ov10_022C4744 +ov10_022C4744: + .byte 0xCC, 0x00, 0x00, 0x00 + .global ov10_022C4748 +ov10_022C4748: + .byte 0x01, 0x00, 0x04, 0x00 + .global ov10_022C474C +ov10_022C474C: + .byte 0xB3, 0x01, 0x00, 0x00 + .global ov10_022C4750 +ov10_022C4750: + .byte 0x06, 0x00, 0x0C, 0x00 + .byte 0x03, 0x00, 0x05, 0x00 + .global ov10_022C4758 +ov10_022C4758: + .byte 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0A, 0x00 .global ov10_022C4760 ov10_022C4760: .byte 0x49, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x10, 0x00, 0x08, 0x00, 0x10, 0x00, 0x04, 0x00, 0x0A, 0x00, 0x20, 0x00, 0x00, 0x00 + .byte 0x08, 0x00, 0x10, 0x00, 0x08, 0x00, 0x10, 0x00, 0x04, 0x00, 0x0A, 0x00 + .global ov10_022C4770 +ov10_022C4770: + .byte 0x20, 0x00, 0x00, 0x00 .byte 0x04, 0x00, 0x0A, 0x00, 0x04, 0x00, 0x0A, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x04, 0x00, 0x0A, 0x00 .byte 0x03, 0x00, 0x09, 0x00, 0x03, 0x00, 0x05, 0x00, 0x0A, 0x00, 0x0C, 0x00, 0x0A, 0x00, 0x0C, 0x00 + .global ov10_022C4794 +ov10_022C4794: .byte 0x0A, 0x00, 0x0C, 0x00, 0x0A, 0x00, 0x0C, 0x00, 0x0A, 0x00, 0x14, 0x00, 0x7F, 0x00, 0x7F, 0x00 .byte 0x02, 0x00, 0x04, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x0A, 0x00, 0x0C, 0x00 - .byte 0x14, 0x00, 0x32, 0x00, 0x01, 0x00, 0x03, 0x00, 0x0A, 0x00, 0x0C, 0x00, 0x33, 0x01, 0x00, 0x00 - .byte 0x01, 0x00, 0x04, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0C, 0x00, 0x03, 0x00, 0x03, 0x00 - .byte 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x00, 0x02, 0x00, 0x00, 0x0A, 0x00, 0x05, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x04, 0x00, 0x80, 0x01, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x78, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x06, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0xB5, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x32, 0x00 + .global ov10_022C47B8 +ov10_022C47B8: + .byte 0x01, 0x00, 0x03, 0x00, 0x0A, 0x00, 0x0C, 0x00 + .global ov10_022C47C0 +ov10_022C47C0: + .byte 0x33, 0x01, 0x00, 0x00 + .byte 0x01, 0x00, 0x04, 0x00, 0x14, 0x00, 0x1E, 0x00 + .global ov10_022C47CC +ov10_022C47CC: + .byte 0x0A, 0x00, 0x0C, 0x00, 0x03, 0x00, 0x03, 0x00 + .byte 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00 + .global ov10_022C47DC +ov10_022C47DC: + .byte 0x00, 0x02, 0x00, 0x00 + .global ov10_022C47E0 +ov10_022C47E0: + .byte 0x0A, 0x00, 0x05, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + .global ov10_022C47F0 +ov10_022C47F0: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C47F4 +ov10_022C47F4: + .byte 0x01, 0x00, 0x04, 0x00 + .global ov10_022C47F8 +ov10_022C47F8: + .byte 0x80, 0x01, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00 + .global ov10_022C4800 +ov10_022C4800: + .byte 0x78, 0x00, 0x00, 0x00 + .byte 0x04, 0x00, 0x06, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00 + .global ov10_022C4810 +ov10_022C4810: + .byte 0xB5, 0x00, 0x00, 0x00 .global ov10_022C4814 ov10_022C4814: - .byte 0x44, 0x00, 0x00, 0x00, 0x66, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00 - .byte 0x80, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x00, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00 - .byte 0x80, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x33, 0x01, 0x00, 0x00, 0x33, 0x01, 0x00, 0x00 - .byte 0x0A, 0x00, 0x0A, 0x00, 0x59, 0x01, 0x00, 0x00, 0x0F, 0x00, 0x14, 0x00, 0x02, 0x00, 0x02, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x08, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x03, 0x00, 0x05, 0x00 + .byte 0x44, 0x00, 0x00, 0x00 + .global ov10_022C4818 +ov10_022C4818: + .byte 0x66, 0x01, 0x00, 0x00 + .global ov10_022C481C +ov10_022C481C: + .byte 0x00, 0x01, 0x00, 0x00 + .global ov10_022C4820 +ov10_022C4820: + .byte 0x40, 0x00, 0x00, 0x00 + .global ov10_022C4824 +ov10_022C4824: + .byte 0x80, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 + .global ov10_022C482C +ov10_022C482C: + .byte 0x00, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 + .global ov10_022C4834 +ov10_022C4834: + .byte 0x32, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00 + .global ov10_022C483C +ov10_022C483C: + .byte 0x3C, 0x00, 0x00, 0x00 + .global ov10_022C4840 +ov10_022C4840: + .byte 0x01, 0x00, 0x03, 0x00 + .global ov10_022C4844 +ov10_022C4844: + .byte 0x80, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 + .global ov10_022C484C +ov10_022C484C: + .byte 0x33, 0x01, 0x00, 0x00 + .global ov10_022C4850 +ov10_022C4850: + .byte 0x33, 0x01, 0x00, 0x00 + .global ov10_022C4854 +ov10_022C4854: + .byte 0x0A, 0x00, 0x0A, 0x00 + .global ov10_022C4858 +ov10_022C4858: + .byte 0x59, 0x01, 0x00, 0x00 + .global ov10_022C485C +ov10_022C485C: + .byte 0x0F, 0x00, 0x14, 0x00, 0x02, 0x00, 0x02, 0x00 + .global ov10_022C4864 +ov10_022C4864: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4868 +ov10_022C4868: + .byte 0x04, 0x00, 0x08, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x03, 0x00, 0x05, 0x00 .byte 0x7F, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x28, 0x00, 0x32, 0x00, 0x7F, 0x00, 0x7F, 0x00 .byte 0x01, 0x00, 0x01, 0x00, 0x08, 0x00, 0x0A, 0x00, 0x06, 0x00, 0x08, 0x00, 0x06, 0x00, 0x0C, 0x00 - .byte 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00 + .byte 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x05, 0x00 + .global ov10_022C489C +ov10_022C489C: + .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00 .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x0F, 0x00, 0x1E, 0x00 + .global ov10_022C48BC +ov10_022C48BC: + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 .global ov10_022C48C4 ov10_022C48C4: .byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -9201,7 +9671,12 @@ ov10_022C48CC: .byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov10_022C48D4 ov10_022C48D4: - .byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0D, 0x01, 0x03, 0x06, 0x01, 0x06 + .byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov10_022C48DC +ov10_022C48DC: + .byte 0x01, 0x02, 0x0D, 0x01, 0x03, 0x06, 0x01, 0x06 + .global ov10_022C48E4 +ov10_022C48E4: .byte 0x20, 0x00, 0x20, 0x00, 0x47, 0x00, 0x47, 0x00, 0x00, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00 .global ov10_022C48F4 ov10_022C48F4: @@ -9214,19 +9689,31 @@ ov10_022C490C: .global ov10_022C4918 ov10_022C4918: .byte 0x47, 0x00, 0x4D, 0x00, 0x7A, 0x05, 0x88, 0x00, 0x88, 0x00, 0x00, 0x00 + .global ov10_022C4924 +ov10_022C4924: .byte 0x05, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x19, 0x00, 0x1E, 0x00, 0x23, 0x00, 0x28, 0x00, 0x00, 0x00 .global ov10_022C4934 ov10_022C4934: .byte 0x4D, 0x00, 0x47, 0x00, 0x7B, 0x05, 0x49, 0x00, 0x88, 0x00, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov10_022C4944 +ov10_022C4944: .byte 0x00, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 + .global ov10_022C4964 +ov10_022C4964: .byte 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00 .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 .byte 0x00, 0x02, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 + .global ov10_022C49B4 +ov10_022C49B4: .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 + .global ov10_022C49C4 +ov10_022C49C4: .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 + .global ov10_022C49D4 +ov10_022C49D4: .byte 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00 .global ov10_022C49E4 ov10_022C49E4: @@ -9251,7 +9738,10 @@ ov10_022C4A34: .global ov10_022C4A48 ov10_022C4A48: .byte 0x49, 0x00, 0x45, 0x00, 0x49, 0x00, 0x45, 0x00, 0x78, 0x00, 0x79, 0x00 - .byte 0x7A, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x7A, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov10_022C4A5C +ov10_022C4A5C: + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 .global ov10_022C4A70 ov10_022C4A70: @@ -9284,12 +9774,19 @@ ov10_022C4AE8: ov10_022C4B00: .byte 0x49, 0x00, 0x49, 0x00 .byte 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x47, 0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov10_022C4B18 +ov10_022C4B18: + .byte 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00 + .global ov10_022C4B34 +ov10_022C4B34: .byte 0x20, 0x00, 0x20, 0x00, 0x47, 0x00, 0x47, 0x00, 0x81, 0x00, 0x81, 0x00, 0x73, 0x00, 0x73, 0x00 .byte 0x5D, 0x00, 0xBA, 0x00, 0x90, 0x00, 0x90, 0x00, 0x37, 0x00, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + .global ov10_022C4B74 +ov10_022C4B74: .byte 0x4A, 0x00, 0x4B, 0x00, 0x4C, 0x00, 0x4F, 0x00, 0x53, 0x00, 0x54, 0x00, 0x56, 0x00, 0x5B, 0x00 .byte 0x57, 0x00, 0x5C, 0x00, 0x5E, 0x00, 0x5F, 0x00, 0x6F, 0x00, 0x68, 0x00, 0x6B, 0x00, 0x75, 0x00 .byte 0x71, 0x00, 0x00, 0x00 @@ -9297,21 +9794,44 @@ ov10_022C4B00: ov10_022C4B98: .byte 0x77, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00, 0x7C, 0x00 .byte 0x7D, 0x00, 0x7E, 0x00, 0x7F, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83, 0x00, 0x84, 0x00 - .byte 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0C, 0x00, 0x1E, 0x00 + .byte 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x00, 0x00 + .global ov10_022C4BBC +ov10_022C4BBC: + .byte 0x00, 0x00, 0x06, 0x00, 0x0C, 0x00, 0x1E, 0x00 .byte 0x32, 0x00, 0x46, 0x00, 0x5A, 0x00, 0x6E, 0x00, 0x82, 0x00, 0x96, 0x00, 0xAA, 0x00, 0xBE, 0x00 .byte 0xD2, 0x00, 0xE6, 0x00, 0xFA, 0x00, 0x0E, 0x01, 0x22, 0x01, 0x36, 0x01, 0xE7, 0x03, 0xE7, 0x03 + .global ov10_022C4BE4 +ov10_022C4BE4: .byte 0x00, 0x00, 0x06, 0x00, 0x0C, 0x00, 0x1E, 0x00, 0x32, 0x00, 0x46, 0x00, 0x5A, 0x00, 0x6E, 0x00 .byte 0x82, 0x00, 0x96, 0x00, 0xAA, 0x00, 0xBE, 0x00, 0xD2, 0x00, 0xE6, 0x00, 0xFA, 0x00, 0x0E, 0x01 .byte 0x22, 0x01, 0x36, 0x01, 0xE7, 0x03, 0xE7, 0x03, 0x32, 0x00, 0x05, 0x00, 0x64, 0x00, 0x0A, 0x00 .byte 0xC8, 0x00, 0x0F, 0x00, 0x2C, 0x01, 0x14, 0x00, 0x90, 0x01, 0x19, 0x00, 0xF4, 0x01, 0x1E, 0x00 .byte 0x58, 0x02, 0x23, 0x00, 0xBC, 0x02, 0x28, 0x00, 0x20, 0x03, 0x2D, 0x00, 0xE8, 0x03, 0x2D, 0x00 - .byte 0x10, 0x27, 0x0F, 0x27, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x0F, 0x27, 0x32, 0x00, 0x2D, 0x00 + .byte 0x10, 0x27, 0x0F, 0x27, 0xFF, 0xFF, 0x01, 0x00 + .global ov10_022C4C3C +ov10_022C4C3C: + .byte 0x00, 0x00 + .global ov10_022C4C3E +ov10_022C4C3E: + .byte 0x0F, 0x27, 0x32, 0x00, 0x2D, 0x00 .byte 0x64, 0x00, 0x28, 0x00, 0xC8, 0x00, 0x23, 0x00, 0x2C, 0x01, 0x1E, 0x00, 0x90, 0x01, 0x19, 0x00 .byte 0xF4, 0x01, 0x14, 0x00, 0x58, 0x02, 0x0F, 0x00, 0xBC, 0x02, 0x0A, 0x00, 0xE8, 0x03, 0x05, 0x00 - .byte 0x10, 0x27, 0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x7B, 0x01, 0xD3, 0x03, 0x02, 0x00 + .byte 0x10, 0x27, 0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00 + .global ov10_022C4C6C +ov10_022C4C6C: + .byte 0x01, 0x00 + .global ov10_022C4C6E +ov10_022C4C6E: + .byte 0x7B, 0x01 + .global ov10_022C4C70 +ov10_022C4C70: + .byte 0xD3, 0x03, 0x02, 0x00 .byte 0x7D, 0x01, 0xD5, 0x03, 0x01, 0x00, 0x7B, 0x01, 0xD3, 0x03, 0x01, 0x00, 0x7B, 0x01, 0xD3, 0x03 .byte 0x03, 0x00, 0x7E, 0x01, 0xD6, 0x03, 0x06, 0x00, 0x7C, 0x01, 0xD4, 0x03, 0x01, 0x00, 0x7B, 0x01 - .byte 0xD3, 0x03, 0x06, 0x00, 0x7C, 0x01, 0xD4, 0x03, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00 + .byte 0xD3, 0x03, 0x06, 0x00, 0x7C, 0x01, 0xD4, 0x03 + .global ov10_022C4C9C +ov10_022C4C9C: + .byte 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00 .byte 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00 .byte 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00 .byte 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00 @@ -9319,20 +9839,30 @@ ov10_022C4B98: .byte 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00 .byte 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, 0x00, 0x5D, 0x00, 0x5E, 0x00 .byte 0x5F, 0x00, 0x60, 0x00, 0x61, 0x00, 0x6A, 0x00, 0x6B, 0x00, 0x68, 0x00, 0x75, 0x00, 0x00, 0x00 + .global ov10_022C4D14 +ov10_022C4D14: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 + .global ov10_022C4D54 +ov10_022C4D54: .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0D, 0x00, 0x0F, 0x00, 0x0F, 0x00 .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 .byte 0x0D, 0x00, 0x0D, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 - .byte 0x0D, 0x00, 0x0F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x8A, 0x00, 0x00, 0x00 + .byte 0x0D, 0x00, 0x0F, 0x00 + .global ov10_022C4D98 +ov10_022C4D98: + .byte 0x80, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x8A, 0x00, 0x00, 0x00 .byte 0x8F, 0x00, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0xA1, 0x00, 0x00, 0x00 .byte 0xAB, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .byte 0x33, 0x01, 0x00, 0x00, 0x4C, 0x01, 0x00, 0x00, 0x66, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00 .byte 0x99, 0x01, 0x00, 0x00, 0xA6, 0x01, 0x00, 0x00, 0xB3, 0x01, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00 - .byte 0xCC, 0x01, 0x00, 0x00, 0xD9, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .byte 0xCC, 0x01, 0x00, 0x00, 0xD9, 0x01, 0x00, 0x00 + .global ov10_022C4DEC +ov10_022C4DEC: + .byte 0x07, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 .byte 0x19, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00 .byte 0x4C, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00 .byte 0x00, 0x01, 0x00, 0x00, 0x4C, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00, 0xE6, 0x01, 0x00, 0x00 @@ -9345,7 +9875,10 @@ ov10_022C4B98: .byte 0x74, 0x80, 0x32, 0x02, 0xCF, 0x00, 0x00, 0x00, 0xC0, 0x5D, 0x32, 0x02, 0xF0, 0x00, 0x00, 0x00 .byte 0xC0, 0x5D, 0x32, 0x02, 0x0E, 0x01, 0x00, 0x00, 0xF4, 0x7A, 0x32, 0x02, 0x59, 0x01, 0x00, 0x00 .byte 0xF4, 0x7A, 0x32, 0x02, 0xE6, 0x01, 0x00, 0x00, 0xC0, 0x5D, 0x32, 0x02, 0xF5, 0x01, 0x00, 0x00 - .byte 0x00, 0x90, 0x32, 0x02, 0x45, 0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00 + .byte 0x00, 0x90, 0x32, 0x02 + .global ov10_022C4EB8 +ov10_022C4EB8: + .byte 0x45, 0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00 .byte 0x4B, 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00 .byte 0x53, 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00 .byte 0x5B, 0x00, 0x5D, 0x00, 0x5E, 0x00, 0x5F, 0x00, 0x60, 0x00, 0x61, 0x00, 0x63, 0x00, 0x64, 0x00 @@ -9353,7 +9886,13 @@ ov10_022C4B98: .byte 0x6D, 0x00, 0x6E, 0x00, 0x6F, 0x00, 0x70, 0x00, 0x73, 0x00, 0x74, 0x00, 0x75, 0x00, 0x76, 0x00 .byte 0x77, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00 .byte 0x7F, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83, 0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00 - .byte 0x87, 0x00, 0x88, 0x00, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 + .byte 0x87, 0x00, 0x88, 0x00, 0x89, 0x00, 0x00, 0x00 + .global ov10_022C4F3C +ov10_022C4F3C: + .byte 0x00 + .global ov10_022C4F3D +ov10_022C4F3D: + .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -9362,6 +9901,8 @@ ov10_022C4B98: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov10_022C4FC4 +ov10_022C4FC4: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -9372,6 +9913,8 @@ ov10_022C4B98: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 + .global ov10_022C5064 +ov10_022C5064: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -9384,7 +9927,10 @@ ov10_022C4B98: .byte 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00 .byte 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00 .byte 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00 - .byte 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0xF5, 0x00, 0xF5, 0x00, 0x00, 0x00, 0x45, 0x00, 0x04, 0x00 + .byte 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0xF5, 0x00, 0xF5, 0x00, 0x00, 0x00 + .global ov10_022C5130 +ov10_022C5130: + .byte 0x45, 0x00, 0x04, 0x00 .byte 0x01, 0x00, 0x46, 0x00, 0x08, 0x00, 0x01, 0x00, 0x47, 0x00, 0x0B, 0x00, 0x03, 0x00, 0x48, 0x00 .byte 0x0E, 0x00, 0x02, 0x00, 0x49, 0x00, 0x09, 0x00, 0x01, 0x00, 0x4A, 0x00, 0x10, 0x00, 0x02, 0x00 .byte 0x4B, 0x00, 0x11, 0x00, 0x01, 0x00, 0x4C, 0x00, 0x10, 0x00, 0x02, 0x00, 0x4D, 0x00, 0x07, 0x00 @@ -9397,7 +9943,10 @@ ov10_022C4B98: .byte 0x05, 0x00, 0x60, 0x00, 0x07, 0x00, 0x05, 0x00, 0x61, 0x00, 0x0C, 0x00, 0x05, 0x00, 0x68, 0x00 .byte 0x0E, 0x00, 0x02, 0x00, 0x69, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x6A, 0x00, 0x06, 0x00, 0x02, 0x00 .byte 0x6B, 0x00, 0x08, 0x00, 0x02, 0x00, 0x75, 0x00, 0x08, 0x00, 0x05, 0x00, 0x76, 0x00, 0x11, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x3B, 0x00, 0x1D, 0x00, 0x3A, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov10_022C51FC +ov10_022C51FC: + .byte 0x24, 0x00, 0x3B, 0x00, 0x1D, 0x00, 0x3A, 0x00 .byte 0x2E, 0x00, 0x1A, 0x00, 0x37, 0x00, 0x15, 0x00, 0x2F, 0x00, 0x16, 0x00, 0x36, 0x00, 0x2A, 0x00 .byte 0x22, 0x00, 0x24, 0x00, 0x23, 0x00, 0x1E, 0x00, 0x35, 0x00, 0x3A, 0x00, 0x17, 0x00, 0x28, 0x00 .byte 0x3E, 0x00, 0x3F, 0x00, 0x1E, 0x00, 0x1F, 0x00, 0x27, 0x00, 0x38, 0x00, 0x2A, 0x00, 0x3B, 0x00 @@ -9412,7 +9961,10 @@ ov10_022C4B98: .byte 0x29, 0x00, 0x2E, 0x00, 0x16, 0x00, 0x1F, 0x00, 0x2C, 0x00, 0x8B, 0x00, 0x8C, 0x00, 0x38, 0x00 .byte 0x29, 0x00, 0x2E, 0x00, 0x16, 0x00, 0x1F, 0x00, 0x23, 0x00, 0x24, 0x00, 0x1D, 0x00, 0x5E, 0x00 .byte 0x3E, 0x00, 0x3F, 0x00, 0x28, 0x00, 0x2A, 0x00, 0x1A, 0x00, 0x18, 0x00, 0x16, 0x00, 0x91, 0x00 - .byte 0x1E, 0x00, 0x1F, 0x00, 0x8F, 0x00, 0x90, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00 + .byte 0x1E, 0x00, 0x1F, 0x00, 0x8F, 0x00, 0x90, 0x00 + .global ov10_022C52EC +ov10_022C52EC: + .byte 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00 .byte 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00 .byte 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00 .byte 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x64, 0x00 @@ -9451,7 +10003,10 @@ ov10_022C4B98: .byte 0x99, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x59, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .byte 0xCC, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00 .byte 0x66, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0xE7, 0x03, 0x15, 0x00, 0x16, 0x00, 0x17, 0x00 + .byte 0x33, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00 + .global ov10_022C555C +ov10_022C555C: + .byte 0xE7, 0x03, 0x15, 0x00, 0x16, 0x00, 0x17, 0x00 .byte 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, 0x00 .byte 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, 0x00 .byte 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, 0x00, 0x2C, 0x00, 0x3D, 0x00, 0x2E, 0x00, 0x2F, 0x00 @@ -9472,7 +10027,10 @@ ov10_022C4B98: .byte 0x12, 0x00, 0x12, 0x00, 0x12, 0x00, 0x7B, 0x00, 0x11, 0x00, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00 .byte 0x12, 0x00, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x8A, 0x00 .byte 0x12, 0x00, 0x0B, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x10, 0x00, 0xA5, 0x00, 0xA5, 0x00 - .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x12, 0x00, 0x46, 0x00, 0x13, 0x00, 0x02, 0x00, 0x02, 0x00 + .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x12, 0x00, 0x46, 0x00, 0x13, 0x00 + .global ov10_022C56B0 +ov10_022C56B0: + .byte 0x02, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 @@ -9513,7 +10071,13 @@ ov10_022C4B98: .byte 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00 .byte 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x02, 0x00 - .byte 0x02, 0x00, 0x01, 0x00, 0x0A, 0x00, 0x64, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00 + .byte 0x02, 0x00, 0x01, 0x00 + .global ov10_022C5938 +ov10_022C5938: + .byte 0x0A, 0x00, 0x64, 0x00 + .global ov10_022C593C +ov10_022C593C: + .byte 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00 .byte 0x03, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0x0B, 0x0B, 0x00, 0x00, 0x06, 0x00, 0x1B, 0x00 .byte 0x00, 0x00, 0x14, 0x14, 0x08, 0x08, 0x00, 0x00, 0x0C, 0x00, 0x64, 0x00, 0x00, 0x00, 0x1E, 0x1E .byte 0x14, 0x14, 0x00, 0x00, 0x1E, 0x00, 0xD6, 0x01, 0x00, 0x00, 0x2B, 0x24, 0x23, 0x26, 0x00, 0x00 @@ -9587,7 +10151,13 @@ ov10_022C4B98: .byte 0x00, 0x00, 0x41, 0x3C, 0x32, 0x32, 0xFF, 0x00, 0x32, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x41, 0x3C .byte 0x32, 0x32, 0xFF, 0x00, 0x37, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x41, 0x3C, 0x32, 0x32, 0xFF, 0x00 .byte 0x1E, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x78, 0x78, 0x78, 0x78, 0xFF, 0x00, 0x37, 0x00, 0xC8, 0x00 - .byte 0x00, 0x00, 0x41, 0x3C, 0x32, 0x32, 0xFF, 0x00, 0x01, 0x00, 0x00, 0x00, 0xE4, 0x5D, 0x32, 0x02 + .byte 0x00, 0x00, 0x41, 0x3C, 0x32, 0x32, 0xFF, 0x00 + .global ov10_022C5DDC +ov10_022C5DDC: + .byte 0x01, 0x00, 0x00, 0x00 + .global ov10_022C5DE0 +ov10_022C5DE0: + .byte 0xE4, 0x5D, 0x32, 0x02 .byte 0x03, 0x00, 0x00, 0x00, 0xC4, 0x5E, 0x32, 0x02, 0x05, 0x00, 0x00, 0x00, 0x3C, 0x5F, 0x32, 0x02 .byte 0x0B, 0x00, 0x00, 0x00, 0xA8, 0x60, 0x32, 0x02, 0x11, 0x00, 0x00, 0x00, 0x0C, 0x62, 0x32, 0x02 .byte 0x14, 0x00, 0x00, 0x00, 0x64, 0x62, 0x32, 0x02, 0x15, 0x00, 0x00, 0x00, 0x1C, 0x63, 0x32, 0x02 @@ -9671,8 +10241,26 @@ ov10_022C4B98: .byte 0x10, 0x02, 0x00, 0x00, 0xD0, 0xE3, 0x32, 0x02, 0x11, 0x02, 0x00, 0x00, 0xE4, 0xD9, 0x32, 0x02 .byte 0x13, 0x02, 0x00, 0x00, 0x00, 0xE4, 0x32, 0x02, 0x15, 0x02, 0x00, 0x00, 0xA0, 0xE4, 0x32, 0x02 .byte 0x16, 0x02, 0x00, 0x00, 0x60, 0xE5, 0x32, 0x02, 0x1B, 0x02, 0x00, 0x00, 0xC0, 0x5D, 0x32, 0x02 - .byte 0x1D, 0x02, 0x00, 0x00, 0x08, 0x7C, 0x32, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x00 - .byte 0x09, 0x00, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0D, 0x00, 0x07, 0x00, 0x00, 0x00 + .byte 0x1D, 0x02, 0x00, 0x00, 0x08, 0x7C, 0x32, 0x02 + .global ov10_022C631C +ov10_022C631C: + .byte 0x01, 0x00, 0x00, 0x00 + .global ov10_022C6320 +ov10_022C6320: + .byte 0x00 + .global ov10_022C6321 +ov10_022C6321: + .byte 0x09 + .global ov10_022C6322 +ov10_022C6322: + .byte 0x01, 0x00 + .byte 0x09, 0x00 + .global ov10_022C6326 +ov10_022C6326: + .byte 0x04 + .global ov10_022C6327 +ov10_022C6327: + .byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0D, 0x00, 0x07, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0D, 0x00, 0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x07, 0x0D, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0D, 0x00 .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x0D, 0x00, 0x00, 0x00 @@ -9820,8 +10408,31 @@ ov10_022C4B98: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x0D, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x02, 0x04, 0x00, 0x0E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x00 .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x07, 0x0D, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x07, 0x0D, 0x00, 0x07, 0x00, 0x00, 0x00 + .global ov10_022C6C70 +ov10_022C6C70: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov10_022C6C74 +ov10_022C6C74: + .byte 0x00 + .global ov10_022C6C75 +ov10_022C6C75: + .byte 0x01 + .global ov10_022C6C76 +ov10_022C6C76: + .byte 0x01 + .global ov10_022C6C77 +ov10_022C6C77: + .byte 0x01 + .global ov10_022C6C78 +ov10_022C6C78: + .byte 0x01 + .global ov10_022C6C79 +ov10_022C6C79: + .byte 0x01 + .global ov10_022C6C7A +ov10_022C6C7A: + .byte 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 .byte 0x00, 0x01, 0x01, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 .byte 0x80, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x81, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x82, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 diff --git a/asm/overlay_29_022E0378.s b/asm/overlay_29_022E0378.s index 117eb76f..f969a3a6 100644 --- a/asm/overlay_29_022E0378.s +++ b/asm/overlay_29_022E0378.s @@ -5,7 +5,7 @@ arm_func_start ov29_022E0378 ov29_022E0378: ; 0x022E0378 - ldr r1, _022E03A8 ; =0x0237CFC0 + ldr r1, _022E03A8 ; =ov29_0237CFC0 ldrb r1, [r1] cmp r1, #0 movne r0, #1 @@ -18,14 +18,14 @@ ov29_022E0378: ; 0x022E0378 and r0, r0, #0xff bx lr .align 2, 0 -_022E03A8: .word 0x0237CFC0 +_022E03A8: .word ov29_0237CFC0 _022E03AC: .word SECONDARY_TERRAIN_TYPES arm_func_end ov29_022E0378 arm_func_start GetFloorType GetFloorType: ; 0x022E03B0 stmdb sp!, {r3, lr} - ldr r0, _022E0430 ; =0x02353538 + ldr r0, _022E0430 ; =ov29_02353538 ldr r2, [r0] add r0, r2, #0x700 ldrsb r0, [r0, #0x98] @@ -61,14 +61,14 @@ _022E041C: and r0, r0, #0xff ldmia sp!, {r3, pc} .align 2, 0 -_022E0430: .word 0x02353538 +_022E0430: .word ov29_02353538 arm_func_end GetFloorType arm_func_start ov29_022E0434 ov29_022E0434: ; 0x022E0434 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r7, #0 - ldr r4, _022E0618 ; =0x02353538 + ldr r4, _022E0618 ; =ov29_02353538 mov r5, r7 mov r6, #1 mov fp, r7 @@ -105,7 +105,7 @@ _022E04B4: blt _022E044C mov r8, #0 _022E04C4: - ldr r0, _022E0618 ; =0x02353538 + ldr r0, _022E0618 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r8, lsl #2 add r0, r0, #0x12000 @@ -122,7 +122,7 @@ _022E04C4: rsb r0, r3, #0x3e8 ldrsh r2, [r4, #0x12] ldrsh r1, [r4, #0x16] - ldr r3, _022E0618 ; =0x02353538 + ldr r3, _022E0618 ; =ov29_02353538 add r1, r2, r1 cmp r1, r0 movgt r1, r0 @@ -197,7 +197,7 @@ _022E05FC: blt _022E05B8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022E0618: .word 0x02353538 +_022E0618: .word ov29_02353538 _022E061C: .word 0x00000246 arm_func_end ov29_022E0434 @@ -224,7 +224,7 @@ _022E0648: beq _022E07F8 cmp r5, #0 bne _022E0698 - ldr r1, _022E0800 ; =0x02353538 + ldr r1, _022E0800 ; =ov29_02353538 mov r0, #0 ldr r1, [r1] add r1, r1, #0x248 @@ -235,7 +235,7 @@ _022E0648: mov r2, #1 bl DisplayMessage2 _022E0698: - ldr r0, _022E0800 ; =0x02353538 + ldr r0, _022E0800 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75f] cmp r0, #0 @@ -259,7 +259,7 @@ _022E06C8: beq _022E07F8 cmp r5, #0 bne _022E0718 - ldr r1, _022E0800 ; =0x02353538 + ldr r1, _022E0800 ; =ov29_02353538 mov r0, #0 ldr r1, [r1] add r1, r1, #0x248 @@ -287,7 +287,7 @@ _022E0738: bl EntityIsValid__022E0354 cmp r0, #0 beq _022E07F8 - ldr r0, _022E0800 ; =0x02353538 + ldr r0, _022E0800 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x75f] cmp r0, #0 @@ -335,7 +335,7 @@ _022E07F8: mov r0, r6 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022E0800: .word 0x02353538 +_022E0800: .word ov29_02353538 _022E0804: .word 0x0000025E _022E0808: .word 0x00000B71 _022E080C: .word 0x00000261 @@ -347,7 +347,7 @@ _022E0818: .word 0x00000265 arm_func_start ov29_022E081C ov29_022E081C: ; 0x022E081C stmdb sp!, {r3, lr} - ldr r0, _022E0860 ; =0x02353538 + ldr r0, _022E0860 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl GetMaxItemsAllowed @@ -355,7 +355,7 @@ ov29_022E081C: ; 0x022E081C bne _022E083C bl RemoveAllItems _022E083C: - ldr r0, _022E0860 ; =0x02353538 + ldr r0, _022E0860 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl IsMoneyAllowed @@ -365,7 +365,7 @@ _022E083C: bl SetMoneyCarried ldmia sp!, {r3, pc} .align 2, 0 -_022E0860: .word 0x02353538 +_022E0860: .word ov29_02353538 arm_func_end ov29_022E081C arm_func_start IsBossFight @@ -382,20 +382,20 @@ _022E0878: arm_func_start IsCurrentFixedRoomBossFight IsCurrentFixedRoomBossFight: ; 0x022E0880 - ldr r0, _022E0898 ; =0x02353538 + ldr r0, _022E0898 ; =ov29_02353538 ldr ip, _022E089C ; =IsBossFight ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] bx ip .align 2, 0 -_022E0898: .word 0x02353538 +_022E0898: .word ov29_02353538 _022E089C: .word IsBossFight arm_func_end IsCurrentFixedRoomBossFight arm_func_start IsMarowakTrainingMaze IsMarowakTrainingMaze: ; 0x022E08A0 - ldr r0, _022E08C8 ; =0x02353538 + ldr r0, _022E08C8 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] cmp r0, #0xb4 @@ -407,12 +407,12 @@ _022E08C0: mov r0, #0 bx lr .align 2, 0 -_022E08C8: .word 0x02353538 +_022E08C8: .word ov29_02353538 arm_func_end IsMarowakTrainingMaze arm_func_start FixedRoomIsSubstituteRoom FixedRoomIsSubstituteRoom: ; 0x022E08CC - ldr r0, _022E08F0 ; =0x02353538 + ldr r0, _022E08F0 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] @@ -422,12 +422,12 @@ FixedRoomIsSubstituteRoom: ; 0x022E08CC and r0, r0, #0xff bx lr .align 2, 0 -_022E08F0: .word 0x02353538 +_022E08F0: .word ov29_02353538 arm_func_end FixedRoomIsSubstituteRoom arm_func_start ov29_022E08F4 ov29_022E08F4: ; 0x022E08F4 - ldr r0, _022E0924 ; =0x02353538 + ldr r0, _022E0924 ; =ov29_02353538 ldr r0, [r0] cmp r0, #0 moveq r0, #0 @@ -440,12 +440,12 @@ ov29_022E08F4: ; 0x022E08F4 and r0, r0, #0xff bx lr .align 2, 0 -_022E0924: .word 0x02353538 +_022E0924: .word ov29_02353538 arm_func_end ov29_022E08F4 arm_func_start StoryRestrictionsEnabled StoryRestrictionsEnabled: ; 0x022E0928 - ldr r0, _022E0958 ; =0x02353538 + ldr r0, _022E0958 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x75c] cmp r0, #0 @@ -460,7 +460,7 @@ _022E0950: mov r0, #0 bx lr .align 2, 0 -_022E0958: .word 0x02353538 +_022E0958: .word ov29_02353538 arm_func_end StoryRestrictionsEnabled arm_func_start GetScenarioBalanceVeneer @@ -499,35 +499,35 @@ FadeToBlack: ; 0x022E0968 mov r0, #1 bl ov29_022E34B0 mov r1, #1 - ldr r0, _022E09E4 ; =0x02353538 + ldr r0, _022E09E4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1a000 strb r1, [r0, #0x24d] ldmia sp!, {r3, pc} .align 2, 0 -_022E09E4: .word 0x02353538 +_022E09E4: .word ov29_02353538 arm_func_end FadeToBlack arm_func_start ov29_022E09E8 ov29_022E09E8: ; 0x022E09E8 - ldr r2, _022E0A00 ; =0x02353538 + ldr r2, _022E0A00 ; =ov29_02353538 ldr r3, [r2] str r0, [r3, #0x18] ldr r0, [r2] strb r1, [r0, #8] bx lr .align 2, 0 -_022E0A00: .word 0x02353538 +_022E0A00: .word ov29_02353538 arm_func_end ov29_022E09E8 arm_func_start ov29_022E0A04 ov29_022E0A04: ; 0x022E0A04 - ldr r0, _022E0A14 ; =0x02353538 + ldr r0, _022E0A14 ; =ov29_02353538 ldr r0, [r0] ldr r0, [r0, #0x18] bx lr .align 2, 0 -_022E0A14: .word 0x02353538 +_022E0A14: .word ov29_02353538 arm_func_end ov29_022E0A04 arm_func_start ov29_022E0A18 @@ -541,7 +541,7 @@ ov29_022E0A18: ; 0x022E0A18 bl ov29_022E8BFC mov r0, #0 bl SetMinimapDataE447 - ldr r0, _022E0A60 ; =0x02353538 + ldr r0, _022E0A60 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] add r0, r0, #0x1a000 @@ -551,22 +551,22 @@ ov29_022E0A18: ; 0x022E0A18 bl ov29_022E9FD0 ldmia sp!, {r3, pc} .align 2, 0 -_022E0A60: .word 0x02353538 +_022E0A60: .word ov29_02353538 arm_func_end ov29_022E0A18 arm_func_start ov29_022E0A64 ov29_022E0A64: ; 0x022E0A64 stmdb sp!, {r3, lr} - ldr r1, _022E0B34 ; =0x0237C694 + ldr r1, _022E0B34 ; =ov29_0237C694 mov r0, #0 bl GetHeldButtons - ldr r1, _022E0B38 ; =0x0237C696 + ldr r1, _022E0B38 ; =ov29_0237C696 mov r0, #0 bl GetPressedButtons - ldr r1, _022E0B3C ; =0x0237C698 + ldr r1, _022E0B3C ; =ov29_0237C698 mov r0, #0 bl sub_020063F4 - ldr r0, _022E0B40 ; =0x0237C694 + ldr r0, _022E0B40 ; =ov29_0237C694 mov r1, #0 strh r1, [r0, #8] ldrh r1, [r0] @@ -585,11 +585,11 @@ _022E0AB8: orrlt r1, r1, #2 strlth r1, [r0, #8] _022E0AD0: - ldr r0, _022E0B40 ; =0x0237C694 + ldr r0, _022E0B40 ; =ov29_0237C694 mov r1, #0 strh r1, [r0, #0xa] _022E0ADC: - ldr r0, _022E0B40 ; =0x0237C694 + ldr r0, _022E0B40 ; =ov29_0237C694 ldrh r1, [r0] tst r1, #0x100 ldrsh r1, [r0, #0xc] @@ -606,31 +606,31 @@ _022E0B00: orrlt r1, r1, #0x100 strlth r1, [r0, #8] _022E0B18: - ldr r0, _022E0B40 ; =0x0237C694 + ldr r0, _022E0B40 ; =ov29_0237C694 mov r1, #0 strh r1, [r0, #0xc] _022E0B24: - ldr r0, _022E0B40 ; =0x0237C694 + ldr r0, _022E0B40 ; =ov29_0237C694 ldrh r1, [r0, #8] strh r1, [r0, #6] ldmia sp!, {r3, pc} .align 2, 0 -_022E0B34: .word 0x0237C694 -_022E0B38: .word 0x0237C696 -_022E0B3C: .word 0x0237C698 -_022E0B40: .word 0x0237C694 +_022E0B34: .word ov29_0237C694 +_022E0B38: .word ov29_0237C696 +_022E0B3C: .word ov29_0237C698 +_022E0B40: .word ov29_0237C694 arm_func_end ov29_022E0A64 arm_func_start ov29_022E0B44 ov29_022E0B44: ; 0x022E0B44 ldr r1, _022E0B58 ; =0x000003E7 - ldr r0, _022E0B5C ; =0x0237C694 + ldr r0, _022E0B5C ; =ov29_0237C694 strh r1, [r0, #0xa] strh r1, [r0, #0xc] bx lr .align 2, 0 _022E0B58: .word 0x000003E7 -_022E0B5C: .word 0x0237C694 +_022E0B5C: .word ov29_0237C694 arm_func_end ov29_022E0B44 arm_func_start ov29_022E0B60 @@ -639,9 +639,9 @@ ov29_022E0B60: ; 0x022E0B60 bl sub_0204AE80 cmp r0, #0 beq _022E0C18 - ldr r0, _022E0C24 ; =0x0237C6A4 + ldr r0, _022E0C24 ; =ov29_0237C6A4 bl GetReleasedStylus - ldr r0, _022E0C28 ; =0x0237C6A4 + ldr r0, _022E0C28 ; =ov29_0237C6A4 ldrb r1, [r0, #0x2c] cmp r1, #0 beq _022E0B98 @@ -650,7 +650,7 @@ ov29_022E0B60: ; 0x022E0B60 moveq r1, #0 streqb r1, [r0, #0x2c] _022E0B98: - ldr r0, _022E0C28 ; =0x0237C6A4 + ldr r0, _022E0C28 ; =ov29_0237C6A4 mov r2, #0 ldrh r3, [r0] strh r2, [r0, #0x24] @@ -686,83 +686,83 @@ _022E0C0C: str r2, [r0, #0x28] ldmia sp!, {r3, pc} _022E0C18: - ldr r0, _022E0C24 ; =0x0237C6A4 + ldr r0, _022E0C24 ; =ov29_0237C6A4 bl sub_02006BFC ldmia sp!, {r3, pc} .align 2, 0 -_022E0C24: .word 0x0237C6A4 -_022E0C28: .word 0x0237C6A4 +_022E0C24: .word ov29_0237C6A4 +_022E0C28: .word ov29_0237C6A4 arm_func_end ov29_022E0B60 arm_func_start ov29_022E0C2C ov29_022E0C2C: ; 0x022E0C2C - ldr r1, _022E0C38 ; =0x0237C6A4 + ldr r1, _022E0C38 ; =ov29_0237C6A4 strb r0, [r1, #0x2c] bx lr .align 2, 0 -_022E0C38: .word 0x0237C6A4 +_022E0C38: .word ov29_0237C6A4 arm_func_end ov29_022E0C2C arm_func_start ov29_022E0C3C ov29_022E0C3C: ; 0x022E0C3C - ldr r0, _022E0C48 ; =0x0237C6A4 + ldr r0, _022E0C48 ; =ov29_0237C6A4 ldrb r0, [r0, #0x2c] bx lr .align 2, 0 -_022E0C48: .word 0x0237C6A4 +_022E0C48: .word ov29_0237C6A4 arm_func_end ov29_022E0C3C arm_func_start ov29_022E0C4C ov29_022E0C4C: ; 0x022E0C4C stmdb sp!, {r3, lr} bl sub_02006564 - ldr r0, _022E0C60 ; =0x0237C6A4 + ldr r0, _022E0C60 ; =ov29_0237C6A4 bl sub_02006BFC ldmia sp!, {r3, pc} .align 2, 0 -_022E0C60: .word 0x0237C6A4 +_022E0C60: .word ov29_0237C6A4 arm_func_end ov29_022E0C4C arm_func_start ov29_022E0C64 ov29_022E0C64: ; 0x022E0C64 - ldr r1, _022E0C7C ; =0x0237C6A4 + ldr r1, _022E0C7C ; =ov29_0237C6A4 ldr r2, [r1, #4] ldr r1, [r1, #8] str r2, [r0] str r1, [r0, #4] bx lr .align 2, 0 -_022E0C7C: .word 0x0237C6A4 +_022E0C7C: .word ov29_0237C6A4 arm_func_end ov29_022E0C64 arm_func_start ov29_022E0C80 ov29_022E0C80: ; 0x022E0C80 - ldr r1, _022E0C98 ; =0x0237C6A4 + ldr r1, _022E0C98 ; =ov29_0237C6A4 ldr r2, [r1, #0xc] ldr r1, [r1, #0x10] str r2, [r0] str r1, [r0, #4] bx lr .align 2, 0 -_022E0C98: .word 0x0237C6A4 +_022E0C98: .word ov29_0237C6A4 arm_func_end ov29_022E0C80 arm_func_start ov29_022E0C9C ov29_022E0C9C: ; 0x022E0C9C - ldr r1, _022E0CB4 ; =0x0237C6A4 + ldr r1, _022E0CB4 ; =ov29_0237C6A4 ldr r2, [r1, #0x14] ldr r1, [r1, #0x18] str r2, [r0] str r1, [r0, #4] bx lr .align 2, 0 -_022E0CB4: .word 0x0237C6A4 +_022E0CB4: .word ov29_0237C6A4 arm_func_end ov29_022E0C9C arm_func_start CheckTouchscreenArea CheckTouchscreenArea: ; 0x022E0CB8 stmdb sp!, {r3, lr} - ldr lr, _022E0CF8 ; =0x0237C6B8 + ldr lr, _022E0CF8 ; =ov29_0237C6B8 ldr ip, [lr] cmp r0, ip bgt _022E0CE8 @@ -780,7 +780,7 @@ _022E0CF0: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_022E0CF8: .word 0x0237C6B8 +_022E0CF8: .word ov29_0237C6B8 arm_func_end CheckTouchscreenArea arm_func_start ov29_022E0CFC @@ -961,10 +961,10 @@ _022E0F28: .word sub_02008F3C arm_func_start ov29_022E0F2C ov29_022E0F2C: ; 0x022E0F2C - ldr r3, _022E0F64 ; =0x020AFC4C + ldr r3, _022E0F64 ; =_020AFC4C mov r2, #0x70 ldr ip, [r3] - ldr r3, _022E0F68 ; =0x020AFC28 + ldr r3, _022E0F68 ; =_020AFC28 mla r2, r1, r2, ip ldrh r1, [r2, #0xc] ldr ip, [r2, #0x64] @@ -976,15 +976,15 @@ ov29_022E0F2C: ; 0x022E0F2C smlabb r0, r0, r1, ip bx lr .align 2, 0 -_022E0F64: .word 0x020AFC4C -_022E0F68: .word 0x020AFC28 +_022E0F64: .word _020AFC4C +_022E0F68: .word _020AFC28 arm_func_end ov29_022E0F2C arm_func_start ov29_022E0F6C ov29_022E0F6C: ; 0x022E0F6C stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0x74 - ldr r3, _022E11D0 ; =0x023510E0 + ldr r3, _022E11D0 ; =ov29_023510E0 add r2, sp, #0x28 mov r1, #0x16 _022E0F80: @@ -1009,7 +1009,7 @@ _022E0F80: mov r2, #1 mov r3, #0x20 bl sub_0201F598 - ldr r0, _022E11D8 ; =0x020AFC4C + ldr r0, _022E11D8 ; =_020AFC4C add r1, sp, #0x54 ldr r0, [r0] mov r2, #0 @@ -1072,7 +1072,7 @@ _022E1038: add r0, sp, #0x64 mov r3, #0x10 bl sub_0201F598 - ldr r0, _022E11D8 ; =0x020AFC4C + ldr r0, _022E11D8 ; =_020AFC4C add r1, sp, #0x64 ldr r0, [r0] mov r2, #0xc @@ -1099,13 +1099,13 @@ _022E1038: bl Memcpy32 add r0, sp, #8 bl UnloadFile - ldr r2, _022E11E8 ; =0x02353544 + ldr r2, _022E11E8 ; =ov29_02353544 mov r0, #4 mov r1, #0x3e4 mov r3, #0 bl AllocAndLoadFileInPack - ldr r1, _022E11EC ; =0x02353540 - ldr r0, _022E11F0 ; =0x02353540 + ldr r1, _022E11EC ; =ov29_02353540 + ldr r0, _022E11F0 ; =ov29_02353540 ldr r1, [r1, #4] bl HandleSir0Translation add r0, sp, #0x20 @@ -1115,7 +1115,7 @@ _022E1038: bl LoadWteFromFileDirectory mov r6, #0 mov r5, r6 - ldr r4, _022E11F4 ; =0x020AFC70 + ldr r4, _022E11F4 ; =_020AFC70 b _022E11A8 _022E1180: ldr r0, [r4] @@ -1140,16 +1140,16 @@ _022E11A8: add sp, sp, #0x74 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_022E11D0: .word 0x023510E0 +_022E11D0: .word ov29_023510E0 _022E11D4: .word 0x000003E5 -_022E11D8: .word 0x020AFC4C +_022E11D8: .word _020AFC4C _022E11DC: .word 0x000003E3 _022E11E0: .word 0x000003E7 _022E11E4: .word 0x000003E6 -_022E11E8: .word 0x02353544 -_022E11EC: .word 0x02353540 -_022E11F0: .word 0x02353540 -_022E11F4: .word 0x020AFC70 +_022E11E8: .word ov29_02353544 +_022E11EC: .word ov29_02353540 +_022E11F0: .word ov29_02353540 +_022E11F4: .word _020AFC70 arm_func_end ov29_022E0F6C arm_func_start ov29_022E11F8 @@ -1166,7 +1166,7 @@ ov29_022E11F8: ; 0x022E11F8 bl HandleSir0Translation ldr lr, [sp] mov r4, #0 - ldr ip, _022E12F0 ; =0x0237C6D4 + ldr ip, _022E12F0 ; =ov29_0237C6D4 b _022E1254 _022E1230: ldr r0, [lr, #8] @@ -1221,7 +1221,7 @@ _022E1298: ldmia sp!, {r3, r4, pc} .align 2, 0 _022E12EC: .word 0x00000409 -_022E12F0: .word 0x0237C6D4 +_022E12F0: .word ov29_0237C6D4 _022E12F4: .word 0x00005E20 arm_func_end ov29_022E11F8 @@ -1247,7 +1247,7 @@ ov29_022E1304: ; 0x022E1304 add r0, sp, #0x10 bl HandleSir0Translation ldr sb, [sp, #0x10] - ldr r4, _022E14F0 ; =0x020AFC4C + ldr r4, _022E14F0 ; =_020AFC4C mov r8, #0 mov r7, #0xd0 mov r6, #0xff @@ -1282,8 +1282,8 @@ _022E134C: bl UnloadFile bl ov29_022E11F8 mov r5, #0 - ldr r2, _022E14F4 ; =0x022C4D54 - ldr fp, _022E14F8 ; =0x02353538 + ldr r2, _022E14F4 ; =ov10_022C4D54 + ldr fp, _022E14F8 ; =ov29_02353538 ldr r8, _022E14FC ; =0x00011EC8 mov r6, #0x280 mov r3, r5 @@ -1309,7 +1309,7 @@ _022E13E4: orr r0, r6, #0xf000 mov r0, r0, lsl #0x10 mov r3, r0, lsr #0x10 - ldr r1, _022E14F8 ; =0x02353538 + ldr r1, _022E14F8 ; =ov29_02353538 ldr r0, _022E1500 ; =0x00012A92 mov r4, #0 _022E142C: @@ -1320,7 +1320,7 @@ _022E142C: cmp r4, #9 blt _022E142C ldr r3, _022E1504 ; =0x0000F2F0 - ldr r1, _022E14F8 ; =0x02353538 + ldr r1, _022E14F8 ; =ov29_02353538 ldr r0, _022E1508 ; =0x0001212C mov r6, #0x2f0 mov r4, #0 @@ -1331,8 +1331,8 @@ _022E1458: strh r3, [r2, r0] cmp r4, #9 blt _022E1458 - ldr r2, _022E14F4 ; =0x022C4D54 - ldr ip, _022E14F8 ; =0x02353538 + ldr r2, _022E14F4 ; =ov10_022C4D54 + ldr ip, _022E14F8 ; =ov29_02353538 ldr sb, _022E1508 ; =0x0001212C add r6, r6, #1 mov r7, #1 @@ -1367,9 +1367,9 @@ _022E14B4: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022E14EC: .word 0x000003FE -_022E14F0: .word 0x020AFC4C -_022E14F4: .word 0x022C4D54 -_022E14F8: .word 0x02353538 +_022E14F0: .word _020AFC4C +_022E14F4: .word ov10_022C4D54 +_022E14F8: .word ov29_02353538 _022E14FC: .word 0x00011EC8 _022E1500: .word 0x00012A92 _022E1504: .word 0x0000F2F0 @@ -1378,7 +1378,7 @@ _022E1508: .word 0x0001212C arm_func_start ov29_022E150C ov29_022E150C: ; 0x022E150C - ldr r0, _022E154C ; =0x02353538 + ldr r0, _022E154C ; =ov29_02353538 mov r3, #0 _022E1514: ldr r1, [r0] @@ -1396,7 +1396,7 @@ _022E1514: blt _022E1514 bx lr .align 2, 0 -_022E154C: .word 0x02353538 +_022E154C: .word ov29_02353538 arm_func_end ov29_022E150C arm_func_start ov29_022E1550 @@ -1405,12 +1405,12 @@ ov29_022E1550: ; 0x022E1550 bl GetFloorType cmp r0, #0 bne _022E1590 - ldr r0, _022E15C4 ; =0x02353538 + ldr r0, _022E15C4 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl DungeonGoesUp cmp r0, #0 - ldr r0, _022E15C4 ; =0x02353538 + ldr r0, _022E15C4 ; =ov29_02353538 movne r1, #0x1c ldr r0, [r0] moveq r1, #0x1b @@ -1419,41 +1419,41 @@ ov29_022E1550: ; 0x022E1550 ldmia sp!, {r3, pc} _022E1590: cmp r0, #1 - ldrne r0, _022E15C4 ; =0x02353538 + ldrne r0, _022E15C4 ; =ov29_02353538 movne r1, #0x1d ldrne r0, [r0] addne r0, r0, #0x4000 strneh r1, [r0, #0xd8] ldmneia sp!, {r3, pc} - ldr r0, _022E15C4 ; =0x02353538 + ldr r0, _022E15C4 ; =ov29_02353538 mov r1, #6 ldr r0, [r0] add r0, r0, #0x4000 strh r1, [r0, #0xd8] ldmia sp!, {r3, pc} .align 2, 0 -_022E15C4: .word 0x02353538 +_022E15C4: .word ov29_02353538 arm_func_end ov29_022E1550 arm_func_start ov29_022E15C8 ov29_022E15C8: ; 0x022E15C8 stmdb sp!, {r3, lr} - ldr r0, _022E15FC ; =0x02353540 + ldr r0, _022E15FC ; =ov29_02353540 ldr r0, [r0, #4] cmp r0, #0 beq _022E15E4 - ldr r0, _022E1600 ; =0x02353544 + ldr r0, _022E1600 ; =ov29_02353544 bl UnloadFile _022E15E4: bl ov29_02335760 bl ov29_02335804 - ldr r0, _022E15FC ; =0x02353540 + ldr r0, _022E15FC ; =ov29_02353540 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_022E15FC: .word 0x02353540 -_022E1600: .word 0x02353544 +_022E15FC: .word ov29_02353540 +_022E1600: .word ov29_02353544 arm_func_end ov29_022E15C8 arm_func_start ov29_022E1604 @@ -1500,7 +1500,7 @@ _022E163C: .word GetTileSafe ov29_022E1640: ; 0x022E1640 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r6, #0 - ldr r4, _022E1848 ; =0x02353538 + ldr r4, _022E1848 ; =ov29_02353538 mov r5, r6 mov r8, r6 mov r7, #0xb8 @@ -1531,7 +1531,7 @@ _022E1658: strh r8, [r0, #0xa8] cmp r6, #4 blt _022E1658 - ldr r0, _022E184C ; =0x0237C754 + ldr r0, _022E184C ; =ov29_0237C754 mov r7, #0 _022E16C8: strb r7, [r0, r8] @@ -1539,7 +1539,7 @@ _022E16C8: cmp r8, #0x48 blt _022E16C8 mov r5, #0 - ldr r4, _022E1848 ; =0x02353538 + ldr r4, _022E1848 ; =ov29_02353538 mov r6, r5 mov r8, #0xb8 _022E16E8: @@ -1569,14 +1569,14 @@ _022E16E8: strh r6, [r0, #0xa8] cmp r7, #0x10 blt _022E16E8 - ldr r0, _022E1850 ; =0x0237C79C + ldr r0, _022E1850 ; =ov29_0237C79C mov r3, #0 _022E1758: strb r3, [r0, r6] add r6, r6, #1 cmp r6, #0xae blt _022E1758 - ldr r2, _022E1848 ; =0x02353538 + ldr r2, _022E1848 ; =ov29_02353538 mov r0, #0 _022E1770: ldr r1, [r2] @@ -1586,7 +1586,7 @@ _022E1770: str r0, [r1, #0xb78] cmp r3, #0x14 blt _022E1770 - ldr r4, _022E1848 ; =0x02353538 + ldr r4, _022E1848 ; =ov29_02353538 mov r1, #0 mov r3, #0xb8 _022E1798: @@ -1605,7 +1605,7 @@ _022E1798: str r1, [r2] cmp r0, #0x40 blt _022E1798 - ldr r4, _022E1848 ; =0x02353538 + ldr r4, _022E1848 ; =ov29_02353538 mov r0, #0 mov r3, #0xb8 _022E17E0: @@ -1624,7 +1624,7 @@ _022E17E0: str r0, [r2] cmp r1, #0x40 blt _022E17E0 - ldr r2, _022E1848 ; =0x02353538 + ldr r2, _022E1848 ; =ov29_02353538 ldr r4, [r2] add r1, r4, #0x2c add r3, r1, #0x19800 @@ -1636,16 +1636,16 @@ _022E17E0: str r0, [r1] ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022E1848: .word 0x02353538 -_022E184C: .word 0x0237C754 -_022E1850: .word 0x0237C79C +_022E1848: .word ov29_02353538 +_022E184C: .word ov29_0237C754 +_022E1850: .word ov29_0237C79C arm_func_end ov29_022E1640 arm_func_start ov29_022E1854 ov29_022E1854: ; 0x022E1854 stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0xc - ldr r4, _022E1A18 ; =0x02353538 + ldr r4, _022E1A18 ; =ov29_02353538 ldr r0, [r4] add r0, r0, #0x1a000 ldrb r1, [r0, #0x23e] @@ -1722,7 +1722,7 @@ _022E196C: add r6, r6, #1 cmp r6, #4 blt _022E1908 - ldr r4, _022E1A18 ; =0x02353538 + ldr r4, _022E1A18 ; =ov29_02353538 mov r5, #0 _022E1980: ldr r0, [r4] @@ -1743,7 +1743,7 @@ _022E19A8: mov r7, sb mov r6, #1 mov r5, #0xff - ldr r4, _022E1A18 ; =0x02353538 + ldr r4, _022E1A18 ; =ov29_02353538 b _022E19F0 _022E19CC: add r0, r1, sb, lsl #2 @@ -1768,5 +1768,5 @@ _022E1A10: add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022E1A18: .word 0x02353538 +_022E1A18: .word ov29_02353538 arm_func_end ov29_022E1854 diff --git a/asm/overlay_29_022E9618.s b/asm/overlay_29_022E9618.s index 26a8e91f..5b9e879a 100644 --- a/asm/overlay_29_022E9618.s +++ b/asm/overlay_29_022E9618.s @@ -260,7 +260,7 @@ _022E9920: ldrb r2, [r0, #7] cmp r2, #0xff beq _022E99CC - ldr r2, _022E99EC ; =0x02353538 + ldr r2, _022E99EC ; =ov29_02353538 ldr r2, [r2] add r2, r2, #0xcc00 ldrsh r3, [r2, #0xe4] @@ -292,43 +292,43 @@ _022E99D8: add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022E99EC: .word 0x02353538 +_022E99EC: .word ov29_02353538 arm_func_end FindNearbyUnoccupiedTile arm_func_start FindClosestUnoccupiedTileWithin2 FindClosestUnoccupiedTileWithin2: ; 0x022E99F0 stmdb sp!, {r3, lr} str r2, [sp] - ldr r2, _022E9A08 ; =0x02351844 + ldr r2, _022E9A08 ; =ov29_02351844 mov r3, #0x19 bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 -_022E9A08: .word 0x02351844 +_022E9A08: .word ov29_02351844 arm_func_end FindClosestUnoccupiedTileWithin2 arm_func_start FindFarthestUnoccupiedTileWithin2 FindFarthestUnoccupiedTileWithin2: ; 0x022E9A0C stmdb sp!, {r3, lr} str r2, [sp] - ldr r2, _022E9A24 ; =0x023517DC + ldr r2, _022E9A24 ; =ov29_023517DC mov r3, #0x19 bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 -_022E9A24: .word 0x023517DC +_022E9A24: .word ov29_023517DC arm_func_end FindFarthestUnoccupiedTileWithin2 arm_func_start FindUnoccupiedTileWithin3 FindUnoccupiedTileWithin3: ; 0x022E9A28 stmdb sp!, {r3, lr} str r2, [sp] - ldr r2, _022E9A40 ; =0x023518AC + ldr r2, _022E9A40 ; =ov29_023518AC mov r3, #0x31 bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 -_022E9A40: .word 0x023518AC +_022E9A40: .word ov29_023518AC arm_func_end FindUnoccupiedTileWithin3 arm_func_start TickStatusTurnCounter @@ -375,11 +375,11 @@ ov29_022E9A9C: ; 0x022E9A9C bl ov29_02300818 cmp r0, #0 beq _022E9B00 - ldr r0, _022E9CA0 ; =0x0235171C + ldr r0, _022E9CA0 ; =DIRECTIONS_XY mov r2, r4, lsl #2 ldrsh r1, [r0, r2] ldrsh r3, [sb, #4] - ldr r0, _022E9CA4 ; =0x0235171E + ldr r0, _022E9CA4 ; =ov29_0235171E add r1, r1, r1, lsl #1 add r1, r3, r1 strh r1, [sl] @@ -396,17 +396,17 @@ _022E9B00: ldreqsh r1, [r8, #0x5c] cmpeq r1, r0 bne _022E9C8C - ldr r0, _022E9CA8 ; =0x02353538 + ldr r0, _022E9CA8 ; =ov29_02353538 ldrb r6, [r8, #0x4c] ldr r1, [r0] - ldr r4, _022E9CAC ; =0x0235179C + ldr r4, _022E9CAC ; =ov29_0235179C add r0, r1, #0x3000 ldrb r0, [r0, #0xe38] - ldr r3, _022E9CB0 ; =0x023517A0 + ldr r3, _022E9CB0 ; =ov29_023517A0 mov r5, r6, lsl #3 cmp r0, #0 ldrsh r0, [r3, r5] - ldr r2, _022E9CB4 ; =0x023517A2 + ldr r2, _022E9CB4 ; =ov29_023517A2 ldr r4, [r4, r6, lsl #3] str r0, [sp, #0x14] ldrsh r0, [r2, r5] @@ -482,11 +482,11 @@ _022E9C44: cmp r3, #0x63 bne _022E9BBC ldrb r1, [r8, #0x4c] - ldr r0, _022E9CA0 ; =0x0235171C + ldr r0, _022E9CA0 ; =DIRECTIONS_XY ldrsh r2, [sb, #4] mov r1, r1, lsl #2 ldrsh r1, [r0, r1] - ldr r0, _022E9CA4 ; =0x0235171E + ldr r0, _022E9CA4 ; =ov29_0235171E add r1, r2, r1, lsl #1 strh r1, [sl] ldrb r1, [r8, #0x4c] @@ -504,18 +504,18 @@ _022E9C98: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022E9CA0: .word 0x0235171C -_022E9CA4: .word 0x0235171E -_022E9CA8: .word 0x02353538 -_022E9CAC: .word 0x0235179C -_022E9CB0: .word 0x023517A0 -_022E9CB4: .word 0x023517A2 +_022E9CA0: .word DIRECTIONS_XY +_022E9CA4: .word ov29_0235171E +_022E9CA8: .word ov29_02353538 +_022E9CAC: .word ov29_0235179C +_022E9CB0: .word ov29_023517A0 +_022E9CB4: .word ov29_023517A2 arm_func_end ov29_022E9A9C arm_func_start ov29_022E9CB8 ov29_022E9CB8: ; 0x022E9CB8 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} - ldr r1, _022E9F04 ; =0x0237C850 + ldr r1, _022E9F04 ; =ov29_0237C850 ldr r0, _022E9F08 ; =0xFFFF000F ldrh r2, [r1, #0x1a] mov lr, #0 @@ -575,12 +575,12 @@ ov29_022E9CB8: ; 0x022E9CB8 _022E9DA0: mov r0, #0x48 mul r5, lr, r0 - ldr r3, _022E9F0C ; =0x0237C888 + ldr r3, _022E9F0C ; =ov29_0237C888 mov r8, #0x400 - ldr r2, _022E9F10 ; =0x02351628 + ldr r2, _022E9F10 ; =ov29_02351628 mov r1, #0x18 mla r6, lr, r1, r2 - ldr r0, _022E9F14 ; =0x02351658 + ldr r0, _022E9F14 ; =ov29_02351658 add r4, r3, r5 add r5, r0, r5 mov ip, #0 @@ -664,29 +664,29 @@ _022E9DD4: blt _022E9DA0 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_022E9F04: .word 0x0237C850 +_022E9F04: .word ov29_0237C850 _022E9F08: .word 0xFFFF000F -_022E9F0C: .word 0x0237C888 -_022E9F10: .word 0x02351628 -_022E9F14: .word 0x02351658 +_022E9F0C: .word ov29_0237C888 +_022E9F10: .word ov29_02351628 +_022E9F14: .word ov29_02351658 arm_func_end ov29_022E9CB8 arm_func_start ov29_022E9F18 ov29_022E9F18: ; 0x022E9F18 stmdb sp!, {r3, lr} ldr r0, _022E9F70 ; =0x000003E7 - ldr r1, _022E9F74 ; =0x0237C850 + ldr r1, _022E9F74 ; =ov29_0237C850 mov r2, #0 str r0, [r1, #4] - ldr r0, _022E9F78 ; =0x02353560 + ldr r0, _022E9F78 ; =ov29_02353560 str r2, [r1, #0x10] strb r2, [r0, #2] strh r2, [r1, #0x1c] bl ov29_022E9CB8 - ldr r2, _022E9F7C ; =0x02353538 + ldr r2, _022E9F7C ; =ov29_02353538 mov r3, #1 ldr r0, [r2] - ldr r1, _022E9F74 ; =0x0237C850 + ldr r1, _022E9F74 ; =ov29_0237C850 add r0, r0, #0x1a000 strb r3, [r0, #0x24c] ldr r0, [r2] @@ -697,26 +697,26 @@ ov29_022E9F18: ; 0x022E9F18 ldmia sp!, {r3, pc} .align 2, 0 _022E9F70: .word 0x000003E7 -_022E9F74: .word 0x0237C850 -_022E9F78: .word 0x02353560 -_022E9F7C: .word 0x02353538 +_022E9F74: .word ov29_0237C850 +_022E9F78: .word ov29_02353560 +_022E9F7C: .word ov29_02353538 arm_func_end ov29_022E9F18 arm_func_start ov29_022E9F80 ov29_022E9F80: ; 0x022E9F80 - ldr r2, _022E9F98 ; =0x02353560 + ldr r2, _022E9F98 ; =ov29_02353560 mov r3, #0 strb r0, [r2] str r1, [r2, #8] str r3, [r2, #0xc] bx lr .align 2, 0 -_022E9F98: .word 0x02353560 +_022E9F98: .word ov29_02353560 arm_func_end ov29_022E9F80 arm_func_start ov29_022E9F9C ov29_022E9F9C: ; 0x022E9F9C - ldr r0, _022E9FBC ; =0x02353560 + ldr r0, _022E9FBC ; =ov29_02353560 ldrb r1, [r0, #1] cmp r1, #0 ldrneb r2, [r0, #5] @@ -725,31 +725,31 @@ ov29_022E9F9C: ; 0x022E9F9C strneb r1, [r0, #1] bx lr .align 2, 0 -_022E9FBC: .word 0x02353560 +_022E9FBC: .word ov29_02353560 arm_func_end ov29_022E9F9C arm_func_start ov29_022E9FC0 ov29_022E9FC0: ; 0x022E9FC0 - ldr r0, _022E9FCC ; =0x02353560 + ldr r0, _022E9FCC ; =ov29_02353560 ldrb r0, [r0, #3] bx lr .align 2, 0 -_022E9FCC: .word 0x02353560 +_022E9FCC: .word ov29_02353560 arm_func_end ov29_022E9FC0 arm_func_start ov29_022E9FD0 ov29_022E9FD0: ; 0x022E9FD0 - ldr r1, _022E9FDC ; =0x02353560 + ldr r1, _022E9FDC ; =ov29_02353560 strb r0, [r1, #3] bx lr .align 2, 0 -_022E9FDC: .word 0x02353560 +_022E9FDC: .word ov29_02353560 arm_func_end ov29_022E9FD0 arm_func_start AdvanceFrame AdvanceFrame: ; 0x022E9FE0 stmdb sp!, {r3, lr} - ldr r1, _022EA004 ; =0x02353560 + ldr r1, _022EA004 ; =ov29_02353560 ldrb r1, [r1, #3] cmp r1, #0 beq _022E9FFC @@ -759,29 +759,29 @@ _022E9FFC: bl ov29_022EA324 ldmia sp!, {r3, pc} .align 2, 0 -_022EA004: .word 0x02353560 +_022EA004: .word ov29_02353560 arm_func_end AdvanceFrame arm_func_start ov29_022EA008 ov29_022EA008: ; 0x022EA008 stmdb sp!, {r3, lr} - ldr r0, _022EA290 ; =0x02353538 + ldr r0, _022EA290 ; =ov29_02353538 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} - ldr r0, _022EA294 ; =0x02353560 + ldr r0, _022EA294 ; =ov29_02353560 ldrb r0, [r0, #3] cmp r0, #0 beq _022EA27C bl ov29_0234B854 bl ov29_022E886C - ldr r0, _022EA290 ; =0x02353538 + ldr r0, _022EA290 ; =ov29_02353538 ldr r0, [r0] cmp r0, #0 beq _022EA0F8 mov r0, #1 bl UpdateCamera - ldr r1, _022EA290 ; =0x02353538 + ldr r1, _022EA290 ; =ov29_02353538 ldr r0, _022EA298 ; =0x0001A224 ldr ip, [r1] add r1, r0, #2 @@ -795,7 +795,7 @@ ov29_022EA008: ; 0x022EA008 mov r2, #1 mov r3, #0 bl sub_02051E20 - ldr r1, _022EA290 ; =0x02353538 + ldr r1, _022EA290 ; =ov29_02353538 ldr r0, [r1] add ip, r0, #0x1a000 ldrb r0, [ip, #0x251] @@ -829,13 +829,13 @@ _022EA0F8: bl ov29_0230473C bl ov29_022E1854 bl ov29_022E335C - ldr r0, _022EA290 ; =0x02353538 + ldr r0, _022EA290 ; =ov29_02353538 ldr r1, [r0] ldrsh r0, [r1, #0x1c] cmp r0, #0x64 addlt r0, r0, #1 strlth r0, [r1, #0x1c] - ldr r0, _022EA29C ; =0x0237C850 + ldr r0, _022EA29C ; =ov29_0237C850 ldr r0, [r0, #4] cmp r0, #0 cmpne r0, #3 @@ -854,11 +854,11 @@ _022EA154: bl ov29_022EA64C bl ov29_022EA80C bl DisplayUi - ldr r1, _022EA294 ; =0x02353560 + ldr r1, _022EA294 ; =ov29_02353560 ldrb r0, [r1] cmp r0, #0 beq _022EA1D0 - ldr r0, _022EA290 ; =0x02353538 + ldr r0, _022EA290 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1a000 ldrb r2, [r0, #0x24a] @@ -867,10 +867,10 @@ _022EA154: bl ov29_022DE11C cmp r0, #0 beq _022EA1D0 - ldr r0, _022EA290 ; =0x02353538 + ldr r0, _022EA290 ; =ov29_02353538 mov r2, #0 ldr r0, [r0] - ldr r1, _022EA294 ; =0x02353560 + ldr r1, _022EA294 ; =ov29_02353560 add r0, r0, #0x1a000 strb r2, [r0, #0x24a] ldr r0, [r1, #8] @@ -884,7 +884,7 @@ _022EA1B8: movle r1, #1 strleb r1, [r0, #0x24a] _022EA1D0: - ldr r0, _022EA290 ; =0x02353538 + ldr r0, _022EA290 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1a000 ldrb r0, [r0, #0x24a] @@ -893,8 +893,8 @@ _022EA1D0: bl ov29_0234B4F4 cmp r0, #3 beq _022EA214 - ldr r1, _022EA290 ; =0x02353538 - ldr r0, _022EA294 ; =0x02353560 + ldr r1, _022EA290 ; =ov29_02353538 + ldr r0, _022EA294 ; =ov29_02353560 ldr r1, [r1] ldrb r3, [r0, #2] add r2, r1, #0x1e0 @@ -902,7 +902,7 @@ _022EA1D0: mov r1, #0x20 bl ov29_022DE134 _022EA214: - ldr r1, _022EA290 ; =0x02353538 + ldr r1, _022EA290 ; =ov29_02353538 ldr r0, _022EA2A0 ; =0x0001A21C ldr r2, [r1] add r1, r0, #2 @@ -911,7 +911,7 @@ _022EA214: bl GetTile cmp r0, #0 beq _022EA260 - ldr r2, _022EA290 ; =0x02353538 + ldr r2, _022EA290 ; =ov29_02353538 ldrb r1, [r0, #7] ldr r2, [r2] cmp r2, #0 @@ -924,85 +924,85 @@ _022EA214: _022EA260: bl ov29_02338AC4 bl ov29_022E8C10 - ldr r0, _022EA290 ; =0x02353538 + ldr r0, _022EA290 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x224 add r0, r0, #0x1a000 bl ov29_022DD8B4 _022EA27C: - ldr r0, _022EA29C ; =0x0237C850 + ldr r0, _022EA29C ; =ov29_0237C850 ldr r1, [r0] add r1, r1, #1 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_022EA290: .word 0x02353538 -_022EA294: .word 0x02353560 +_022EA290: .word ov29_02353538 +_022EA294: .word ov29_02353560 _022EA298: .word 0x0001A224 -_022EA29C: .word 0x0237C850 +_022EA29C: .word ov29_0237C850 _022EA2A0: .word 0x0001A21C arm_func_end ov29_022EA008 arm_func_start ov29_022EA2A4 ov29_022EA2A4: ; 0x022EA2A4 stmdb sp!, {r3, lr} - ldr r0, _022EA318 ; =0x02353538 + ldr r0, _022EA318 ; =ov29_02353538 ldr r0, [r0] cmp r0, #0 bne _022EA2C0 bl ov29_022DDEF8 ldmia sp!, {r3, pc} _022EA2C0: - ldr r0, _022EA31C ; =0x02353560 + ldr r0, _022EA31C ; =ov29_02353560 ldrb r0, [r0, #6] cmp r0, #0 - ldrne r0, _022EA320 ; =0x0237C850 + ldrne r0, _022EA320 ; =ov29_0237C850 ldrne r1, [r0, #0x10] addne r1, r1, #1 strne r1, [r0, #0x10] bl ov29_022DDEF8 - ldr r0, _022EA318 ; =0x02353538 + ldr r0, _022EA318 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] add r0, r0, #0x1a000 strb r1, [r0, #0x248] bl InitWeirdMinimapMatrix - ldr r0, _022EA31C ; =0x02353560 + ldr r0, _022EA31C ; =ov29_02353560 ldrb r0, [r0, #6] cmp r0, #0 - ldrne r0, _022EA320 ; =0x0237C850 + ldrne r0, _022EA320 ; =ov29_0237C850 ldrne r1, [r0, #0x10] subne r1, r1, #1 strne r1, [r0, #0x10] ldmia sp!, {r3, pc} .align 2, 0 -_022EA318: .word 0x02353538 -_022EA31C: .word 0x02353560 -_022EA320: .word 0x0237C850 +_022EA318: .word ov29_02353538 +_022EA31C: .word ov29_02353560 +_022EA320: .word ov29_0237C850 arm_func_end ov29_022EA2A4 arm_func_start ov29_022EA324 ov29_022EA324: ; 0x022EA324 stmdb sp!, {r3, lr} - ldr r0, _022EA368 ; =0x02353560 + ldr r0, _022EA368 ; =ov29_02353560 ldrb r0, [r0, #6] cmp r0, #0 - ldrne r0, _022EA36C ; =0x0237C850 + ldrne r0, _022EA36C ; =ov29_0237C850 ldrne r1, [r0, #0x10] addne r1, r1, #1 strne r1, [r0, #0x10] bl ov29_022DDEF8 - ldr r0, _022EA368 ; =0x02353560 + ldr r0, _022EA368 ; =ov29_02353560 ldrb r0, [r0, #6] cmp r0, #0 - ldrne r0, _022EA36C ; =0x0237C850 + ldrne r0, _022EA36C ; =ov29_0237C850 ldrne r1, [r0, #0x10] subne r1, r1, #1 strne r1, [r0, #0x10] ldmia sp!, {r3, pc} .align 2, 0 -_022EA368: .word 0x02353560 -_022EA36C: .word 0x0237C850 +_022EA368: .word ov29_02353560 +_022EA36C: .word ov29_0237C850 arm_func_end ov29_022EA324 arm_func_start ov29_022EA370 @@ -1010,7 +1010,7 @@ ov29_022EA370: ; 0x022EA370 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 - ldr r4, _022EA3B0 ; =0x02353560 + ldr r4, _022EA3B0 ; =ov29_02353560 b _022EA3A4 _022EA384: ldrb r0, [r4, #3] @@ -1028,14 +1028,14 @@ _022EA3A4: bne _022EA384 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022EA3B0: .word 0x02353560 +_022EA3B0: .word ov29_02353560 arm_func_end ov29_022EA370 arm_func_start ov29_022EA3B4 ov29_022EA3B4: ; 0x022EA3B4 stmdb sp!, {r4, r5, r6, lr} - ldr r4, _022EA3F0 ; =0x0237C694 - ldr r5, _022EA3F4 ; =0x02353560 + ldr r4, _022EA3F0 ; =ov29_0237C694 + ldr r5, _022EA3F4 ; =ov29_02353560 mov r6, r0 _022EA3C4: ldrb r0, [r5, #3] @@ -1052,8 +1052,8 @@ _022EA3E0: bne _022EA3C4 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022EA3F0: .word 0x0237C694 -_022EA3F4: .word 0x02353560 +_022EA3F0: .word ov29_0237C694 +_022EA3F4: .word ov29_02353560 arm_func_end ov29_022EA3B4 arm_func_start ov29_022EA3F8 @@ -1067,26 +1067,26 @@ _022EA404: .word ov29_022DE638 arm_func_start ov29_022EA408 ov29_022EA408: ; 0x022EA408 - ldr r0, _022EA414 ; =0x0237C850 + ldr r0, _022EA414 ; =ov29_0237C850 ldr r0, [r0, #4] bx lr .align 2, 0 -_022EA414: .word 0x0237C850 +_022EA414: .word ov29_0237C850 arm_func_end ov29_022EA408 arm_func_start ov29_022EA418 ov29_022EA418: ; 0x022EA418 - ldr r1, _022EA424 ; =0x02353560 + ldr r1, _022EA424 ; =ov29_02353560 strb r0, [r1, #4] bx lr .align 2, 0 -_022EA424: .word 0x02353560 +_022EA424: .word ov29_02353560 arm_func_end ov29_022EA418 arm_func_start ov29_022EA428 ov29_022EA428: ; 0x022EA428 stmdb sp!, {r4, lr} - ldr r1, _022EA620 ; =0x0237C850 + ldr r1, _022EA620 ; =ov29_0237C850 mov r4, r0 ldr r0, [r1, #4] cmp r4, r0 @@ -1116,7 +1116,7 @@ _022EA48C: cmp r4, r0 b _022EA614 _022EA498: - ldr r0, _022EA628 ; =0x02353560 + ldr r0, _022EA628 ; =ov29_02353560 ldrb r0, [r0, #3] cmp r0, #0 beq _022EA614 @@ -1124,7 +1124,7 @@ _022EA498: bl ov29_0234B1A4 b _022EA614 _022EA4B4: - ldr r0, _022EA628 ; =0x02353560 + ldr r0, _022EA628 ; =ov29_02353560 ldrb r1, [r0, #3] cmp r1, #0 beq _022EA614 @@ -1136,7 +1136,7 @@ _022EA4B4: bl ov29_02339FF4 b _022EA614 _022EA4E0: - ldr r0, _022EA628 ; =0x02353560 + ldr r0, _022EA628 ; =ov29_02353560 ldrb r1, [r0, #3] cmp r1, #0 beq _022EA614 @@ -1147,7 +1147,7 @@ _022EA4E0: bl ov29_02339FF4 b _022EA614 _022EA508: - ldr r0, _022EA628 ; =0x02353560 + ldr r0, _022EA628 ; =ov29_02353560 ldrb r0, [r0, #3] cmp r0, #0 beq _022EA614 @@ -1155,7 +1155,7 @@ _022EA508: bl ov29_0234B1A4 b _022EA614 _022EA524: - ldr r0, _022EA628 ; =0x02353560 + ldr r0, _022EA628 ; =ov29_02353560 ldrb r0, [r0, #3] cmp r0, #0 beq _022EA614 @@ -1163,7 +1163,7 @@ _022EA524: bl ov29_0234B1A4 b _022EA614 _022EA540: - ldr r0, _022EA628 ; =0x02353560 + ldr r0, _022EA628 ; =ov29_02353560 ldrb r0, [r0, #3] cmp r0, #0 beq _022EA614 @@ -1176,7 +1176,7 @@ _022EA540: bl ov29_0233A248 b _022EA614 _022EA570: - ldr r0, _022EA628 ; =0x02353560 + ldr r0, _022EA628 ; =ov29_02353560 ldrb r0, [r0, #3] cmp r0, #0 beq _022EA614 @@ -1186,7 +1186,7 @@ _022EA570: bl ov29_0233A248 b _022EA614 _022EA594: - ldr r0, _022EA628 ; =0x02353560 + ldr r0, _022EA628 ; =ov29_02353560 ldrb r1, [r0, #3] cmp r1, #0 beq _022EA5BC @@ -1200,7 +1200,7 @@ _022EA5BC: mov r4, #0 b _022EA614 _022EA5C4: - ldr r0, _022EA628 ; =0x02353560 + ldr r0, _022EA628 ; =ov29_02353560 ldrb r0, [r0, #3] cmp r0, #0 beq _022EA614 @@ -1208,7 +1208,7 @@ _022EA5C4: bl ov29_0234B1A4 b _022EA614 _022EA5E0: - ldr r0, _022EA628 ; =0x02353560 + ldr r0, _022EA628 ; =ov29_02353560 ldrb r0, [r0, #3] cmp r0, #0 beq _022EA614 @@ -1216,32 +1216,32 @@ _022EA5E0: bl ov29_0234B1A4 b _022EA614 _022EA5FC: - ldr r0, _022EA628 ; =0x02353560 + ldr r0, _022EA628 ; =ov29_02353560 ldrb r0, [r0, #3] cmp r0, #0 beq _022EA614 mov r0, #0 bl ov29_0234B1A4 _022EA614: - ldr r0, _022EA620 ; =0x0237C850 + ldr r0, _022EA620 ; =ov29_0237C850 str r4, [r0, #4] ldmia sp!, {r4, pc} .align 2, 0 -_022EA620: .word 0x0237C850 +_022EA620: .word ov29_0237C850 _022EA624: .word 0x000003E7 -_022EA628: .word 0x02353560 +_022EA628: .word ov29_02353560 arm_func_end ov29_022EA428 arm_func_start ov29_022EA62C ov29_022EA62C: ; 0x022EA62C - ldr r1, _022EA644 ; =0x0237C850 + ldr r1, _022EA644 ; =ov29_0237C850 mov r2, #0xa ldr ip, _022EA648 ; =ov29_0234B1A4 mov r0, #0 str r2, [r1, #4] bx ip .align 2, 0 -_022EA644: .word 0x0237C850 +_022EA644: .word ov29_0237C850 _022EA648: .word ov29_0234B1A4 arm_func_end ov29_022EA62C @@ -1249,19 +1249,19 @@ _022EA648: .word ov29_0234B1A4 ov29_022EA64C: ; 0x022EA64C stmdb sp!, {r4, lr} sub sp, sp, #8 - ldr r0, _022EA708 ; =0x0237C850 + ldr r0, _022EA708 ; =ov29_0237C850 mov r2, #0 ldr r1, [r0, #8] adds r1, r1, #1 str r1, [r0, #8] movmi r1, #0 strmi r1, [r0, #8] - ldr r0, _022EA708 ; =0x0237C850 + ldr r0, _022EA708 ; =ov29_0237C850 ldr r1, [r0, #8] cmp r1, #0xc movge r1, #0 strge r1, [r0, #8] - ldr r0, _022EA708 ; =0x0237C850 + ldr r0, _022EA708 ; =ov29_0237C850 mov r1, #0xb ldr r3, [r0, #8] mov r0, r3, asr #1 @@ -1270,8 +1270,8 @@ ov29_022EA64C: ; 0x022EA64C add ip, r0, r0, lsl #1 str r2, [sp] str r1, [sp, #4] - ldr r0, _022EA70C ; =0x02353540 - ldr r1, _022EA710 ; =0x020AFC4C + ldr r0, _022EA70C ; =ov29_02353540 + ldr r1, _022EA710 ; =_020AFC4C ldr r2, [r0] ldr r0, [r1] add r1, r2, ip, lsl #8 @@ -1283,8 +1283,8 @@ ov29_022EA64C: ; 0x022EA64C str r0, [sp] mov r1, #0xb str r1, [sp, #4] - ldr r0, _022EA70C ; =0x02353540 - ldr r1, _022EA710 ; =0x020AFC4C + ldr r0, _022EA70C ; =ov29_02353540 + ldr r1, _022EA710 ; =_020AFC4C ldr ip, [r0] add r3, r4, #0x100 ldr r0, [r1] @@ -1295,9 +1295,9 @@ ov29_022EA64C: ; 0x022EA64C add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_022EA708: .word 0x0237C850 -_022EA70C: .word 0x02353540 -_022EA710: .word 0x020AFC4C +_022EA708: .word ov29_0237C850 +_022EA70C: .word ov29_02353540 +_022EA710: .word _020AFC4C _022EA714: .word 0x000001EA arm_func_end ov29_022EA64C @@ -1309,7 +1309,7 @@ ov29_022EA718: ; 0x022EA718 mov r8, r2 mov r7, r3 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _022EA7FC ; =0x02353538 + ldr r0, _022EA7FC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1a000 ldrb r0, [r0, #0x23e] @@ -1317,8 +1317,8 @@ ov29_022EA718: ; 0x022EA718 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} mov r6, #0 mov fp, #0x29 - ldr r5, _022EA800 ; =0x0237C850 - ldr r4, _022EA804 ; =0x02353560 + ldr r5, _022EA800 ; =ov29_0237C850 + ldr r4, _022EA804 ; =ov29_02353560 b _022EA78C _022EA75C: ldrsh r0, [r5, #0x1c] @@ -1339,7 +1339,7 @@ _022EA78C: cmp r6, #0x14 blt _022EA75C _022EA794: - ldr r1, _022EA800 ; =0x0237C850 + ldr r1, _022EA800 ; =ov29_0237C850 mov r0, #0x3c str sl, [r1, #0x20] strb r8, [r1, #0x24] @@ -1367,9 +1367,9 @@ _022EA7F4: strh r7, [r1, #0x1e] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022EA7FC: .word 0x02353538 -_022EA800: .word 0x0237C850 -_022EA804: .word 0x02353560 +_022EA7FC: .word ov29_02353538 +_022EA800: .word ov29_0237C850 +_022EA804: .word ov29_02353560 _022EA808: .word 0xFFFFFC19 arm_func_end ov29_022EA718 @@ -1377,7 +1377,7 @@ _022EA808: .word 0xFFFFFC19 ov29_022EA80C: ; 0x022EA80C stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc - ldr r0, _022EA95C ; =0x0237C850 + ldr r0, _022EA95C ; =ov29_0237C850 ldrsh r1, [r0, #0x1c] cmp r1, #0 beq _022EA954 @@ -1392,11 +1392,11 @@ ov29_022EA80C: ; 0x022EA80C and r0, r0, #0xff _022EA848: cmp r0, #0 - ldreq r0, _022EA95C ; =0x0237C850 + ldreq r0, _022EA95C ; =ov29_0237C850 moveq r1, #0 streqh r1, [r0, #0x1c] beq _022EA954 - ldr r3, _022EA95C ; =0x0237C850 + ldr r3, _022EA95C ; =ov29_0237C850 ldr r5, [r3, #0x28] ldr r1, [r3, #0x2c] ldrh r0, [r5, #0x26] @@ -1405,7 +1405,7 @@ _022EA848: strneh r0, [r3, #0x1c] bne _022EA954 ldrsh r2, [r3, #0x1c] - ldr r1, _022EA960 ; =0x02353538 + ldr r1, _022EA960 ; =ov29_02353538 ldr r0, _022EA964 ; =0x0001A224 sub r2, r2, #1 strh r2, [r3, #0x1c] @@ -1442,7 +1442,7 @@ _022EA848: mov r1, #0x1f bl __divsi3 _022EA910: - ldr ip, _022EA95C ; =0x0237C850 + ldr ip, _022EA95C ; =ov29_0237C850 mov r1, r4, lsl #0x10 ldrh r4, [ip, #0x1e] mov r2, r5, lsl #0x10 @@ -1463,25 +1463,25 @@ _022EA954: add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 -_022EA95C: .word 0x0237C850 -_022EA960: .word 0x02353538 +_022EA95C: .word ov29_0237C850 +_022EA960: .word ov29_02353538 _022EA964: .word 0x0001A224 arm_func_end ov29_022EA80C arm_func_start SetDungeonRngPreseed23Bit SetDungeonRngPreseed23Bit: ; 0x022EA968 orr r1, r0, #1 - ldr r0, _022EA97C ; =0x02353570 + ldr r0, _022EA97C ; =ov29_02353570 bic r1, r1, #0xff000000 str r1, [r0, #8] bx lr .align 2, 0 -_022EA97C: .word 0x02353570 +_022EA97C: .word ov29_02353570 arm_func_end SetDungeonRngPreseed23Bit arm_func_start GenerateDungeonRngSeed GenerateDungeonRngSeed: ; 0x022EA980 - ldr r2, _022EA9C4 ; =0x02353570 + ldr r2, _022EA9C4 ; =ov29_02353570 mov r1, #0x10000 ldr r3, [r2, #8] ldr r0, _022EA9C8 ; =0x5D588B65 @@ -1499,36 +1499,36 @@ GenerateDungeonRngSeed: ; 0x022EA980 orr r0, r0, #1 bx lr .align 2, 0 -_022EA9C4: .word 0x02353570 +_022EA9C4: .word ov29_02353570 _022EA9C8: .word 0x5D588B65 arm_func_end GenerateDungeonRngSeed arm_func_start GetDungeonRngPreseed GetDungeonRngPreseed: ; 0x022EA9CC - ldr r0, _022EA9D8 ; =0x02353570 + ldr r0, _022EA9D8 ; =ov29_02353570 ldr r0, [r0, #8] bx lr .align 2, 0 -_022EA9D8: .word 0x02353570 +_022EA9D8: .word ov29_02353570 arm_func_end GetDungeonRngPreseed arm_func_start SetDungeonRngPreseed SetDungeonRngPreseed: ; 0x022EA9DC - ldr r1, _022EA9E8 ; =0x02353570 + ldr r1, _022EA9E8 ; =ov29_02353570 str r0, [r1, #8] bx lr .align 2, 0 -_022EA9E8: .word 0x02353570 +_022EA9E8: .word ov29_02353570 arm_func_end SetDungeonRngPreseed arm_func_start InitDungeonRng InitDungeonRng: ; 0x022EA9EC - ldr r1, _022EAA18 ; =0x02353570 + ldr r1, _022EAA18 ; =ov29_02353570 orr r2, r0, #1 str r2, [r1, #0xc] mov r2, #0 str r2, [r1, #4] - ldr r1, _022EAA1C ; =0x02353584 + ldr r1, _022EAA1C ; =ov29_02353584 _022EAA04: str r0, [r1, r2, lsl #2] add r2, r2, #1 @@ -1536,20 +1536,20 @@ _022EAA04: blt _022EAA04 bx lr .align 2, 0 -_022EAA18: .word 0x02353570 -_022EAA1C: .word 0x02353584 +_022EAA18: .word ov29_02353570 +_022EAA1C: .word ov29_02353584 arm_func_end InitDungeonRng arm_func_start DungeonRand16Bit DungeonRand16Bit: ; 0x022EAA20 stmdb sp!, {r3, lr} - ldr r1, _022EAA88 ; =0x02353570 + ldr r1, _022EAA88 ; =ov29_02353570 ldrb r0, [r1] cmp r0, #0 ldr r0, _022EAA8C ; =0x5D588B65 beq _022EAA5C ldr lr, [r1, #0x10] - ldr r3, _022EAA90 ; =0x02353584 + ldr r3, _022EAA90 ; =ov29_02353584 ldr r1, _022EAA94 ; =0x00269EC3 ldr r2, [r3, lr, lsl #2] umull ip, r0, r2, r0 @@ -1571,9 +1571,9 @@ _022EAA80: mov r0, r0, lsr #0x10 ldmia sp!, {r3, pc} .align 2, 0 -_022EAA88: .word 0x02353570 +_022EAA88: .word ov29_02353570 _022EAA8C: .word 0x5D588B65 -_022EAA90: .word 0x02353584 +_022EAA90: .word ov29_02353584 _022EAA94: .word 0x00269EC3 arm_func_end DungeonRand16Bit diff --git a/asm/overlay_29_022EAB50.s b/asm/overlay_29_022EAB50.s index 8074d215..db4f6de3 100644 --- a/asm/overlay_29_022EAB50.s +++ b/asm/overlay_29_022EAB50.s @@ -57,34 +57,34 @@ _022EAC24: arm_func_start DungeonRngUnsetSecondary DungeonRngUnsetSecondary: ; 0x022EAC34 - ldr r0, _022EAC48 ; =0x02353570 + ldr r0, _022EAC48 ; =ov29_02353570 mov r1, #0 strb r1, [r0] str r1, [r0, #0x10] bx lr .align 2, 0 -_022EAC48: .word 0x02353570 +_022EAC48: .word ov29_02353570 arm_func_end DungeonRngUnsetSecondary arm_func_start DungeonRngSetSecondary DungeonRngSetSecondary: ; 0x022EAC4C - ldr r1, _022EAC60 ; =0x02353570 + ldr r1, _022EAC60 ; =ov29_02353570 mov r2, #1 strb r2, [r1] str r0, [r1, #0x10] bx lr .align 2, 0 -_022EAC60: .word 0x02353570 +_022EAC60: .word ov29_02353570 arm_func_end DungeonRngSetSecondary arm_func_start DungeonRngSetPrimary DungeonRngSetPrimary: ; 0x022EAC64 - ldr r0, _022EAC74 ; =0x02353570 + ldr r0, _022EAC74 ; =ov29_02353570 mov r1, #0 strb r1, [r0] bx lr .align 2, 0 -_022EAC74: .word 0x02353570 +_022EAC74: .word ov29_02353570 arm_func_end DungeonRngSetPrimary arm_func_start ov29_022EAC78 @@ -164,7 +164,7 @@ MusicTableIdxToMusicId: ; 0x022EAD00 stmdb sp!, {r4, lr} mov r1, #0xaa bl __divsi3 - ldr r0, _022EAD5C ; =0x022C555C + ldr r0, _022EAD5C ; =ov10_022C555C mov r1, r1, lsl #1 ldrh r4, [r0, r1] tst r4, #0x8000 @@ -178,16 +178,16 @@ MusicTableIdxToMusicId: ; 0x022EAD00 ldr r1, _022EAD60 ; =0x00007FFF mov r0, r0, lsl #0x10 and r1, r4, r1 - ldr r3, _022EAD64 ; =0x022C51FC + ldr r3, _022EAD64 ; =ov10_022C51FC mov r1, r1, lsl #0x10 mov r2, r0, asr #0xf add r0, r3, r1, lsr #13 ldrh r0, [r2, r0] ldmia sp!, {r4, pc} .align 2, 0 -_022EAD5C: .word 0x022C555C +_022EAD5C: .word ov10_022C555C _022EAD60: .word 0x00007FFF -_022EAD64: .word 0x022C51FC +_022EAD64: .word ov10_022C51FC arm_func_end MusicTableIdxToMusicId arm_func_start ov29_022EAD68 @@ -212,10 +212,10 @@ _022EADA4: cmp r6, #0x1f4 blt _022EAD88 _022EADAC: - ldr r0, _022EAE0C ; =0x02353538 + ldr r0, _022EAE0C ; =ov29_02353538 mov r1, #0xc ldr r0, [r0] - ldr r2, _022EAE10 ; =0x022C6C70 + ldr r2, _022EAE10 ; =ov10_022C6C70 add r0, r0, #0x4000 ldrb r3, [r0, #0xda] smulbb r1, r3, r1 @@ -238,13 +238,13 @@ _022EAE00: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _022EAE08: .word 0x00001410 -_022EAE0C: .word 0x02353538 -_022EAE10: .word 0x022C6C70 +_022EAE0C: .word ov29_02353538 +_022EAE10: .word ov10_022C6C70 arm_func_end ov29_022EAD68 arm_func_start ChangeDungeonMusic ChangeDungeonMusic: ; 0x022EAE14 - ldr r3, _022EAE38 ; =0x02353538 + ldr r3, _022EAE38 ; =ov29_02353538 ldr r1, _022EAE3C ; =0x0002CB06 ldr ip, [r3] sub r2, r1, #6 @@ -254,14 +254,14 @@ ChangeDungeonMusic: ; 0x022EAE14 strh r1, [r0, r2] bx lr .align 2, 0 -_022EAE38: .word 0x02353538 +_022EAE38: .word ov29_02353538 _022EAE3C: .word 0x0002CB06 arm_func_end ChangeDungeonMusic arm_func_start ov29_022EAE40 ov29_022EAE40: ; 0x022EAE40 stmdb sp!, {r4, lr} - ldr lr, _022EAEA0 ; =0x02353538 + ldr lr, _022EAEA0 ; =ov29_02353538 ldr r2, _022EAEA4 ; =0x0002CB02 ldr r4, [lr] ldr r1, _022EAEA8 ; =0x000003E7 @@ -285,7 +285,7 @@ ov29_022EAE40: ; 0x022EAE40 strh r1, [r0, #0x96] ldmia sp!, {r4, pc} .align 2, 0 -_022EAEA0: .word 0x02353538 +_022EAEA0: .word ov29_02353538 _022EAEA4: .word 0x0002CB02 _022EAEA8: .word 0x000003E7 arm_func_end ov29_022EAE40 @@ -295,7 +295,7 @@ ov29_022EAEAC: ; 0x022EAEAC stmdb sp!, {r3, lr} bl sub_02017ACC ldr r0, _022EAEE4 ; =0x0002CB02 - ldr r2, _022EAEE8 ; =0x02353538 + ldr r2, _022EAEE8 ; =ov29_02353538 ldr ip, _022EAEEC ; =0x000003E7 ldr r3, [r2] add r1, r0, #2 @@ -308,7 +308,7 @@ ov29_022EAEAC: ; 0x022EAEAC ldmia sp!, {r3, pc} .align 2, 0 _022EAEE4: .word 0x0002CB02 -_022EAEE8: .word 0x02353538 +_022EAEE8: .word ov29_02353538 _022EAEEC: .word 0x000003E7 arm_func_end ov29_022EAEAC @@ -322,7 +322,7 @@ _022EAEF8: .word sub_02017D80 arm_func_start ov29_022EAEFC ov29_022EAEFC: ; 0x022EAEFC - ldr r0, _022EAF1C ; =0x02353538 + ldr r0, _022EAF1C ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x792] cmp r0, #0 @@ -331,33 +331,33 @@ ov29_022EAEFC: ; 0x022EAEFC and r0, r0, #0xff bx lr .align 2, 0 -_022EAF1C: .word 0x02353538 +_022EAF1C: .word ov29_02353538 arm_func_end ov29_022EAEFC arm_func_start ov29_022EAF20 ov29_022EAF20: ; 0x022EAF20 - ldr r0, _022EAF30 ; =0x02353538 + ldr r0, _022EAF30 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x792] bx lr .align 2, 0 -_022EAF30: .word 0x02353538 +_022EAF30: .word ov29_02353538 arm_func_end ov29_022EAF20 arm_func_start ov29_022EAF34 ov29_022EAF34: ; 0x022EAF34 - ldr r1, _022EAF44 ; =0x02353538 + ldr r1, _022EAF44 ; =ov29_02353538 ldr r1, [r1] strb r0, [r1, #0x792] bx lr .align 2, 0 -_022EAF44: .word 0x02353538 +_022EAF44: .word ov29_02353538 arm_func_end ov29_022EAF34 arm_func_start ov29_022EAF48 ov29_022EAF48: ; 0x022EAF48 stmdb sp!, {r4, lr} - ldr ip, _022EAFA8 ; =0x02353538 + ldr ip, _022EAFA8 ; =ov29_02353538 mov r4, #0 ldr r3, [ip] ldr lr, _022EAFAC ; =0x000003E7 @@ -383,14 +383,14 @@ _022EAFA0: bl ov29_022EAE40 ldmia sp!, {r4, pc} .align 2, 0 -_022EAFA8: .word 0x02353538 +_022EAFA8: .word ov29_02353538 _022EAFAC: .word 0x000003E7 arm_func_end ov29_022EAF48 arm_func_start ov29_022EAFB0 ov29_022EAFB0: ; 0x022EAFB0 stmdb sp!, {r4, lr} - ldr r0, _022EB168 ; =0x02353538 + ldr r0, _022EB168 ; =ov29_02353538 ldr r3, [r0] cmp r3, #0 ldmeqia sp!, {r4, pc} @@ -404,7 +404,7 @@ ov29_022EAFB0: ; 0x022EAFB0 ldrb r1, [r3, #0x792] cmp r1, #0 beq _022EB004 - ldr r0, _022EB170 ; =0x023516E8 + ldr r0, _022EB170 ; =ov29_023516E8 ldr r0, [r0, r1, lsl #2] mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 @@ -511,9 +511,9 @@ _022EB124: str r0, [r4] ldmia sp!, {r4, pc} .align 2, 0 -_022EB168: .word 0x02353538 +_022EB168: .word ov29_02353538 _022EB16C: .word 0x000003E7 -_022EB170: .word 0x023516E8 +_022EB170: .word ov29_023516E8 _022EB174: .word 0x00007FFF arm_func_end ov29_022EAFB0 @@ -616,7 +616,7 @@ _022EB2C4: .word 0x00000B76 ov29_022EB2C8: ; 0x022EB2C8 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r0 - ldr r0, _022EB360 ; =0x0237C91C + ldr r0, _022EB360 ; =ov29_0237C91C mov r2, r5, lsl #3 ldrh r6, [r0, r2] mov r4, r1 @@ -633,18 +633,18 @@ _022EB2F8: mov r7, r0, lsr #0x10 mov r0, r7 bl StringFromMessageId - ldr r1, _022EB368 ; =0x02352070 + ldr r1, _022EB368 ; =ov29_02352070 bl strcmp cmp r0, #0 moveq r0, #1 movne r0, #0 tst r0, #0xff beq _022EB34C - ldr r0, _022EB36C ; =0x0237C91E + ldr r0, _022EB36C ; =ov29_0237C91E mov r1, r5, lsl #3 ldrsh r0, [r0, r1] bl sub_0200D208 - ldr r1, _022EB370 ; =0x02352032 + ldr r1, _022EB370 ; =ov29_02352032 mov r0, r0, lsl #2 ldrh r0, [r1, r0] ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -655,11 +655,11 @@ _022EB34C: movne r0, r7 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022EB360: .word 0x0237C91C +_022EB360: .word ov29_0237C91C _022EB364: .word 0x000009C9 -_022EB368: .word 0x02352070 -_022EB36C: .word 0x0237C91E -_022EB370: .word 0x02352032 +_022EB368: .word ov29_02352070 +_022EB36C: .word ov29_0237C91E +_022EB370: .word ov29_02352032 _022EB374: .word 0x000009CA arm_func_end ov29_022EB2C8 @@ -668,12 +668,12 @@ ov29_022EB378: ; 0x022EB378 stmdb sp!, {r3, lr} ldrsh r0, [r0, #4] bl sub_0200D208 - ldr r1, _022EB394 ; =0x02352030 + ldr r1, _022EB394 ; =ov29_02352030 mov r0, r0, lsl #2 ldrh r0, [r1, r0] ldmia sp!, {r3, pc} .align 2, 0 -_022EB394: .word 0x02352030 +_022EB394: .word ov29_02352030 arm_func_end ov29_022EB378 arm_func_start ov29_022EB398 @@ -772,7 +772,7 @@ _022EB498: blo _022EB4DC cmp r2, #0x94 bhs _022EB4DC - ldr r0, _022EB4E4 ; =0x02353538 + ldr r0, _022EB4E4 ; =ov29_02353538 sub r1, r2, #0x90 ldr r0, [r0] add r0, r0, r1, lsl #2 @@ -785,7 +785,7 @@ _022EB4DC: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_022EB4E4: .word 0x02353538 +_022EB4E4: .word ov29_02353538 arm_func_end GetItemToUseByIndex arm_func_start ov29_022EB4E8 @@ -834,7 +834,7 @@ ov29_022EB568: ; 0x022EB568 ldr r2, [r0, #0xb4] mov r0, #6 mla r2, r1, r0, r2 - ldr r0, _022EB590 ; =0x02353538 + ldr r0, _022EB590 ; =ov29_02353538 ldrb r1, [r2, #0x4e] ldr r0, [r0] add r0, r0, r1, lsl #2 @@ -842,7 +842,7 @@ ov29_022EB568: ; 0x022EB568 ldr r0, [r0, #0xb28] bx lr .align 2, 0 -_022EB590: .word 0x02353538 +_022EB590: .word ov29_02353538 arm_func_end ov29_022EB568 arm_func_start ov29_022EB594 @@ -881,13 +881,13 @@ GetItemAction: ; 0x022EB5D8 moveq r0, #0x35 ldmeqia sp!, {r3, pc} bl GetItemCategoryVeneer - ldr r1, _022EB608 ; =0x02352010 + ldr r1, _022EB608 ; =ov29_02352010 mov r0, r0, lsl #1 ldrh r0, [r1, r0] ldmia sp!, {r3, pc} .align 2, 0 _022EB604: .word 0x0000016B -_022EB608: .word 0x02352010 +_022EB608: .word ov29_02352010 arm_func_end GetItemAction arm_func_start RemoveUsedItem @@ -970,7 +970,7 @@ _022EB71C: ldrb r1, [r4, #1] cmp r1, #0 beq _022EB7C8 - ldr r0, _022EB800 ; =0x02353538 + ldr r0, _022EB800 ; =ov29_02353538 sub r1, r1, #1 ldr r0, [r0] add r0, r0, r1, lsl #2 @@ -1029,29 +1029,29 @@ _022EB7F8: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022EB800: .word 0x02353538 +_022EB800: .word ov29_02353538 arm_func_end ov29_022EB668 arm_func_start ov29_022EB804 ov29_022EB804: ; 0x022EB804 cmp r0, #0 - ldrge r1, _022EB818 ; =0x0237C920 + ldrge r1, _022EB818 ; =ov29_0237C920 movlt r0, #0 ldrgeb r0, [r1, r0, lsl #3] bx lr .align 2, 0 -_022EB818: .word 0x0237C920 +_022EB818: .word ov29_0237C920 arm_func_end ov29_022EB804 arm_func_start AddDungeonSubMenuOption AddDungeonSubMenuOption: ; 0x022EB81C stmdb sp!, {r4, r5, r6, lr} - ldr r2, _022EB89C ; =0x0237C918 + ldr r2, _022EB89C ; =ov29_0237C918 ldr r2, [r2] cmp r2, #0xa ldmgeia sp!, {r4, r5, r6, pc} mov r5, #0 - ldr r4, _022EB8A0 ; =0x0237C91C + ldr r4, _022EB8A0 ; =ov29_0237C91C b _022EB850 _022EB83C: mov r3, r5, lsl #3 @@ -1062,37 +1062,37 @@ _022EB83C: _022EB850: cmp r5, r2 blt _022EB83C - ldr ip, _022EB89C ; =0x0237C918 - ldr r4, _022EB8A0 ; =0x0237C91C + ldr ip, _022EB89C ; =ov29_0237C918 + ldr r4, _022EB8A0 ; =ov29_0237C91C mov r6, r2, lsl #3 ldr lr, [ip] add r3, r0, #0x87 add lr, lr, #1 - ldr r5, _022EB8A4 ; =0x0237C91E + ldr r5, _022EB8A4 ; =ov29_0237C91E strh r0, [r4, r6] - ldr r4, _022EB8A8 ; =0x0237C920 + ldr r4, _022EB8A8 ; =ov29_0237C920 strh r1, [r5, r6] mov r1, #1 - ldr r0, _022EB8AC ; =0x0237C922 + ldr r0, _022EB8AC ; =ov29_0237C922 strb r1, [r4, r2, lsl #3] add r1, r3, #0x900 strh r1, [r0, r6] str lr, [ip] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022EB89C: .word 0x0237C918 -_022EB8A0: .word 0x0237C91C -_022EB8A4: .word 0x0237C91E -_022EB8A8: .word 0x0237C920 -_022EB8AC: .word 0x0237C922 +_022EB89C: .word ov29_0237C918 +_022EB8A0: .word ov29_0237C91C +_022EB8A4: .word ov29_0237C91E +_022EB8A8: .word ov29_0237C920 +_022EB8AC: .word ov29_0237C922 arm_func_end AddDungeonSubMenuOption arm_func_start ov29_022EB8B0 ov29_022EB8B0: ; 0x022EB8B0 - ldr r1, _022EB8EC ; =0x0237C918 + ldr r1, _022EB8EC ; =ov29_0237C918 mov r3, #0 ldr ip, [r1] - ldr r2, _022EB8F0 ; =0x0237C91C + ldr r2, _022EB8F0 ; =ov29_0237C91C b _022EB8DC _022EB8C4: mov r1, r3, lsl #3 @@ -1107,23 +1107,23 @@ _022EB8DC: mvn r0, #0 bx lr .align 2, 0 -_022EB8EC: .word 0x0237C918 -_022EB8F0: .word 0x0237C91C +_022EB8EC: .word ov29_0237C918 +_022EB8F0: .word ov29_0237C91C arm_func_end ov29_022EB8B0 arm_func_start DisableDungeonSubMenuOption DisableDungeonSubMenuOption: ; 0x022EB8F4 stmdb sp!, {r3, lr} - ldr r1, _022EB938 ; =0x0237C918 + ldr r1, _022EB938 ; =ov29_0237C918 mov ip, #0 ldr lr, [r1] - ldr r2, _022EB93C ; =0x0237C91C + ldr r2, _022EB93C ; =ov29_0237C91C b _022EB92C _022EB90C: mov r3, ip, lsl #3 ldrh r1, [r2, r3] cmp r0, r1 - ldreq r0, _022EB940 ; =0x0237C920 + ldreq r0, _022EB940 ; =ov29_0237C920 moveq r1, #0 streqb r1, [r0, r3] ldmeqia sp!, {r3, pc} @@ -1133,9 +1133,9 @@ _022EB92C: blt _022EB90C ldmia sp!, {r3, pc} .align 2, 0 -_022EB938: .word 0x0237C918 -_022EB93C: .word 0x0237C91C -_022EB940: .word 0x0237C920 +_022EB938: .word ov29_0237C918 +_022EB93C: .word ov29_0237C91C +_022EB940: .word ov29_0237C920 arm_func_end DisableDungeonSubMenuOption arm_func_start ov29_022EB944 @@ -1170,15 +1170,15 @@ _022EB964: ov29_022EB9A0: ; 0x022EB9A0 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 - ldr r0, _022EBA64 ; =0x0237C918 + ldr r0, _022EBA64 ; =ov29_0237C918 mov r3, #0 ldr ip, [r0] b _022EBA54 _022EB9B8: add lr, r3, #1 mov r2, r3, lsl #3 - ldr r1, _022EBA68 ; =0x0237C91C - ldr r0, _022EBA6C ; =0x02352074 + ldr r1, _022EBA68 ; =ov29_0237C91C + ldr r0, _022EBA6C ; =ov29_02352074 b _022EBA48 _022EB9CC: mov r4, lr, lsl #3 @@ -1226,28 +1226,28 @@ _022EBA54: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022EBA64: .word 0x0237C918 -_022EBA68: .word 0x0237C91C -_022EBA6C: .word 0x02352074 +_022EBA64: .word ov29_0237C918 +_022EBA68: .word ov29_0237C91C +_022EBA6C: .word ov29_02352074 arm_func_end ov29_022EB9A0 arm_func_start ov29_022EBA70 ov29_022EBA70: ; 0x022EBA70 - ldr r0, _022EBA80 ; =0x0237C918 + ldr r0, _022EBA80 ; =ov29_0237C918 mov r1, #0 str r1, [r0] bx lr .align 2, 0 -_022EBA80: .word 0x0237C918 +_022EBA80: .word ov29_0237C918 arm_func_end ov29_022EBA70 arm_func_start ov29_022EBA84 ov29_022EBA84: ; 0x022EBA84 - ldr r0, _022EBA90 ; =0x0237C918 + ldr r0, _022EBA90 ; =ov29_0237C918 ldr r0, [r0] bx lr .align 2, 0 -_022EBA90: .word 0x0237C918 +_022EBA90: .word ov29_0237C918 arm_func_end ov29_022EBA84 arm_func_start ov29_022EBA94 @@ -1266,12 +1266,12 @@ ov29_022EBAB0: ; 0x022EBAB0 ldrb ip, [sp] cmp ip, #0 cmpeq r3, #0 - ldrne r0, _022EBB48 ; =0x0237C96C + ldrne r0, _022EBB48 ; =ov29_0237C96C movne r2, #0x80 strneb r2, [r0] bne _022EBB30 cmp r2, #0 - ldreq r2, _022EBB48 ; =0x0237C96C + ldreq r2, _022EBB48 ; =ov29_0237C96C addeq r0, r0, #1 streqb r0, [r2] beq _022EBB30 @@ -1299,35 +1299,35 @@ _022EBB18: _022EBB20: mov r2, #0 _022EBB24: - ldr r0, _022EBB48 ; =0x0237C96C + ldr r0, _022EBB48 ; =ov29_0237C96C add r2, r2, #0x90 strb r2, [r0] _022EBB30: ldrsh r2, [r1] - ldr r0, _022EBB48 ; =0x0237C96C + ldr r0, _022EBB48 ; =ov29_0237C96C strh r2, [r0, #2] ldrsh r1, [r1, #2] strh r1, [r0, #4] bx lr .align 2, 0 -_022EBB48: .word 0x0237C96C +_022EBB48: .word ov29_0237C96C arm_func_end ov29_022EBAB0 arm_func_start ov29_022EBB4C ov29_022EBB4C: ; 0x022EBB4C - ldr r0, _022EBB64 ; =0x0237C96C + ldr r0, _022EBB64 ; =ov29_0237C96C mov r1, #0 strb r1, [r0] strh r1, [r0, #2] strh r1, [r0, #4] bx lr .align 2, 0 -_022EBB64: .word 0x0237C96C +_022EBB64: .word ov29_0237C96C arm_func_end ov29_022EBB4C arm_func_start ov29_022EBB68 ov29_022EBB68: ; 0x022EBB68 - ldr r1, _022EBB88 ; =0x0237C96C + ldr r1, _022EBB88 ; =ov29_0237C96C ldrh r2, [r1] strh r2, [r0] ldrh r2, [r1, #2] @@ -1336,24 +1336,24 @@ ov29_022EBB68: ; 0x022EBB68 strh r1, [r0, #4] bx lr .align 2, 0 -_022EBB88: .word 0x0237C96C +_022EBB88: .word ov29_0237C96C arm_func_end ov29_022EBB68 arm_func_start ov29_022EBB8C ov29_022EBB8C: ; 0x022EBB8C - ldr r0, _022EBB94 ; =0x0237C96C + ldr r0, _022EBB94 ; =ov29_0237C96C bx lr .align 2, 0 -_022EBB94: .word 0x0237C96C +_022EBB94: .word ov29_0237C96C arm_func_end ov29_022EBB8C arm_func_start ov29_022EBB98 ov29_022EBB98: ; 0x022EBB98 - ldr r0, _022EBBA4 ; =0x0237C96C + ldr r0, _022EBBA4 ; =ov29_0237C96C ldrb r0, [r0] bx lr .align 2, 0 -_022EBBA4: .word 0x0237C96C +_022EBBA4: .word ov29_0237C96C arm_func_end ov29_022EBB98 arm_func_start ov29_022EBBA8 @@ -1361,7 +1361,7 @@ ov29_022EBBA8: ; 0x022EBBA8 stmdb sp!, {r4, lr} mov r4, r0 bl SetMonsterActionFields - ldr r0, _022EBBE4 ; =0x0237C96C + ldr r0, _022EBBE4 ; =ov29_0237C96C mov r1, #0 ldrh r2, [r0] strh r2, [r4, #4] @@ -1374,7 +1374,7 @@ ov29_022EBBA8: ; 0x022EBBA8 strh r1, [r4, #0xe] ldmia sp!, {r4, pc} .align 2, 0 -_022EBBE4: .word 0x0237C96C +_022EBBE4: .word ov29_0237C96C arm_func_end ov29_022EBBA8 arm_func_start ov29_022EBBE8 @@ -1383,7 +1383,7 @@ ov29_022EBBE8: ; 0x022EBBE8 mov r1, #0xc mov r4, r0 bl SetMonsterActionFields - ldr r0, _022EBC28 ; =0x0237C96C + ldr r0, _022EBC28 ; =ov29_0237C96C mov r1, #0 ldrh r2, [r0] strh r2, [r4, #4] @@ -1396,7 +1396,7 @@ ov29_022EBBE8: ; 0x022EBBE8 strh r1, [r4, #0xe] ldmia sp!, {r4, pc} .align 2, 0 -_022EBC28: .word 0x0237C96C +_022EBC28: .word ov29_0237C96C arm_func_end ov29_022EBBE8 arm_func_start ov29_022EBC2C @@ -1512,7 +1512,7 @@ _022EBD60: mov r5, #0 b _022EBECC _022EBD80: - ldr r0, _022EC2FC ; =0x02353538 + ldr r0, _022EC2FC ; =ov29_02353538 ldr r0, [r0] add r0, r0, r5, lsl #2 add r0, r0, #0x12000 @@ -1528,7 +1528,7 @@ _022EBD80: bl IsFloorOver cmp r0, #0 bne _022EBED4 - ldr r1, _022EC2FC ; =0x02353538 + ldr r1, _022EC2FC ; =ov29_02353538 mov r0, r4 ldr r1, [r1] str r4, [r1, #0xc4] @@ -1538,8 +1538,8 @@ _022EBD80: mov r0, r4 strb r1, [r6, #0x14e] bl CalcSpeedStageWrapper - ldr r1, _022EC2FC ; =0x02353538 - ldr r3, _022EC300 ; =0x02352284 + ldr r1, _022EC2FC ; =ov29_02353538 + ldr r3, _022EC300 ; =ov29_02352284 ldr r2, [r1] mov r1, #0x32 add r2, r2, #0x700 @@ -1622,7 +1622,7 @@ _022EBEE4: add fp, sp, #0 mov r6, #0 _022EBF18: - ldr r0, _022EC2FC ; =0x02353538 + ldr r0, _022EC2FC ; =ov29_02353538 ldr r0, [r0] add r0, r0, sl, lsl #2 add r0, r0, #0x12000 @@ -1696,7 +1696,7 @@ _022EC00C: cmp r0, #0 bne _022EC094 mov r4, #0 - ldr r5, _022EC2FC ; =0x02353538 + ldr r5, _022EC2FC ; =ov29_02353538 mov r6, r4 _022EC038: ldr r0, [r5] @@ -1730,9 +1730,9 @@ _022EC094: mov sb, #0 mov r5, sb mov r7, sb - ldr r6, _022EC300 ; =0x02352284 + ldr r6, _022EC300 ; =ov29_02352284 mov fp, #0x32 - ldr r4, _022EC2FC ; =0x02353538 + ldr r4, _022EC2FC ; =ov29_02353538 b _022EC1C0 _022EC0BC: ldr r0, [r4] @@ -1809,7 +1809,7 @@ _022EC1C8: cmp r0, #0 bne _022EC23C mov r4, #0 - ldr r5, _022EC2FC ; =0x02353538 + ldr r5, _022EC2FC ; =ov29_02353538 mov r6, r4 _022EC1E0: ldr r0, [r5] @@ -1840,8 +1840,8 @@ _022EC23C: bl IsFloorOver cmp r0, #0 bne _022EC2F4 - ldr r4, _022EC2FC ; =0x02353538 - ldr r1, _022EC304 ; =0x023522B6 + ldr r4, _022EC2FC ; =ov29_02353538 + ldr r1, _022EC304 ; =ov29_023522B6 ldr r0, [r4] add r0, r0, #0x700 ldrsh r0, [r0, #0x80] @@ -1876,7 +1876,7 @@ _022EC2AC: mov r0, #0 bl TryForcedLoss _022EC2C4: - ldr r1, _022EC2FC ; =0x02353538 + ldr r1, _022EC2FC ; =ov29_02353538 ldr r0, [r1] add r0, r0, #0x700 ldrsh r2, [r0, #0x80] @@ -1892,9 +1892,9 @@ _022EC2F4: add sp, sp, #0x40 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022EC2FC: .word 0x02353538 -_022EC300: .word 0x02352284 -_022EC304: .word 0x023522B6 +_022EC2FC: .word ov29_02353538 +_022EC300: .word ov29_02352284 +_022EC304: .word ov29_023522B6 arm_func_end RunFractionalTurn arm_func_start RunLeaderTurn @@ -1909,8 +1909,8 @@ RunLeaderTurn: ; 0x022EC308 bl TryActivateArtificialWeatherAbilities mov r0, r4 bl CalcSpeedStageWrapper - ldr r1, _022EC600 ; =0x02353538 - ldr r3, _022EC604 ; =0x02352284 + ldr r1, _022EC600 ; =ov29_02353538 + ldr r3, _022EC604 ; =ov29_02352284 ldr r2, [r1] mov r1, #0x32 add r2, r2, #0x700 @@ -1939,7 +1939,7 @@ _022EC380: bl DisplayActions cmp r0, #0 bne _022EC3C8 - ldr r0, _022EC600 ; =0x02353538 + ldr r0, _022EC600 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x78b] cmp r0, #0 @@ -1966,7 +1966,7 @@ _022EC3E8: cmp r0, #0 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _022EC600 ; =0x02353538 + ldr r0, _022EC600 ; =ov29_02353538 mov r1, #0 ldr r2, [r0] cmp sl, #0 @@ -1985,12 +1985,12 @@ _022EC434: bl ov29_022E81F8 mov r0, sb bl EnemyEvolution - ldr r0, _022EC600 ; =0x02353538 + ldr r0, _022EC600 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x11] bl SetLeaderAction - ldr r0, _022EC600 ; =0x02353538 + ldr r0, _022EC600 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] strb r1, [r0, #0x11] @@ -2019,7 +2019,7 @@ _022EC434: cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r4, _022EC600 ; =0x02353538 + ldr r4, _022EC600 ; =ov29_02353538 ldr r1, [r4] ldrb r0, [r1, #0x10] cmp r0, #0 @@ -2076,13 +2076,13 @@ _022EC59C: cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r0, _022EC600 ; =0x02353538 + ldr r0, _022EC600 ; =ov29_02353538 ldr r1, [r0] ldr r0, [r1, #0xc8] cmp r0, #0 beq _022EC5DC bl ChangeLeader - ldr r0, _022EC600 ; =0x02353538 + ldr r0, _022EC600 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] mov sl, #1 @@ -2099,6 +2099,6 @@ _022EC5DC: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022EC600: .word 0x02353538 -_022EC604: .word 0x02352284 +_022EC600: .word ov29_02353538 +_022EC604: .word ov29_02352284 arm_func_end RunLeaderTurn diff --git a/asm/overlay_29_022EC62C.s b/asm/overlay_29_022EC62C.s index bc520fda..cb9baee1 100644 --- a/asm/overlay_29_022EC62C.s +++ b/asm/overlay_29_022EC62C.s @@ -10,7 +10,7 @@ ov29_022EC62C: ; 0x022EC62C bl GetLeader cmp r6, r0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - ldr r7, _022EC6D8 ; =0x02353538 + ldr r7, _022EC6D8 ; =ov29_02353538 ldr r1, [r7] ldrb r0, [r1, #0x10] cmp r0, #0 @@ -52,14 +52,14 @@ _022EC6CC: blt _022EC668 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022EC6D8: .word 0x02353538 +_022EC6D8: .word ov29_02353538 arm_func_end ov29_022EC62C arm_func_start TrySpawnMonsterAndActivatePlusMinus TrySpawnMonsterAndActivatePlusMinus: ; 0x022EC6DC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r0, _022EC7E0 ; =0x02353538 - ldr r1, _022EC7E4 ; =0x023522B6 + ldr r0, _022EC7E0 ; =ov29_02353538 + ldr r1, _022EC7E4 ; =ov29_023522B6 ldr r0, [r0] add r0, r0, #0x700 ldrsh r0, [r0, #0x80] @@ -68,7 +68,7 @@ TrySpawnMonsterAndActivatePlusMinus: ; 0x022EC6DC cmp r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} bl TrySpawnMonsterAndTickSpawnCounter - ldr r4, _022EC7E0 ; =0x02353538 + ldr r4, _022EC7E0 ; =ov29_02353538 mov r8, #0 ldr r0, [r4] mov fp, #1 @@ -125,14 +125,14 @@ _022EC7C8: bl TryForcedLoss ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022EC7E0: .word 0x02353538 -_022EC7E4: .word 0x023522B6 +_022EC7E0: .word ov29_02353538 +_022EC7E4: .word ov29_023522B6 arm_func_end TrySpawnMonsterAndActivatePlusMinus arm_func_start IsFloorOver IsFloorOver: ; 0x022EC7E8 stmdb sp!, {r3, lr} - ldr r0, _022EC858 ; =0x02353538 + ldr r0, _022EC858 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #8] cmp r0, #0 @@ -140,12 +140,12 @@ IsFloorOver: ; 0x022EC7E8 ldmneia sp!, {r3, pc} bl GetLeader cmp r0, #0 - ldreq r1, _022EC858 ; =0x02353538 + ldreq r1, _022EC858 ; =ov29_02353538 moveq r0, #1 ldreq r1, [r1] streqb r0, [r1, #0x758] ldmeqia sp!, {r3, pc} - ldr r0, _022EC858 ; =0x02353538 + ldr r0, _022EC858 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #6] cmp r0, #1 @@ -160,7 +160,7 @@ IsFloorOver: ; 0x022EC7E8 movne r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_022EC858: .word 0x02353538 +_022EC858: .word ov29_02353538 arm_func_end IsFloorOver arm_func_start ov29_022EC85C @@ -182,13 +182,13 @@ ov29_022EC878: ; 0x022EC878 strb r2, [r0, #2] strb r2, [r0, #3] strb r2, [r0, #4] - ldr r1, _022EC8A4 ; =0x02353598 + ldr r1, _022EC8A4 ; =ov29_02353598 strb r2, [r0, #5] mov r0, #1 strb r0, [r1] bx lr .align 2, 0 -_022EC8A4: .word 0x02353598 +_022EC8A4: .word ov29_02353598 arm_func_end ov29_022EC878 arm_func_start ov29_022EC8A8 @@ -203,7 +203,7 @@ ov29_022EC8A8: ; 0x022EC8A8 mov r3, r1, lsl #1 and r0, r3, #0xff mov r2, r0, lsr #1 - ldr r1, _022EC998 ; =0x02352390 + ldr r1, _022EC998 ; =ov29_02352390 mov r0, #0xc0 strb r3, [r6, #4] add r2, r2, #1 @@ -214,7 +214,7 @@ ov29_022EC8A8: ; 0x022EC8A8 _022EC8F0: strb r4, [r6, #3] mov r8, #0x63 - ldr r7, _022EC99C ; =0x02353538 + ldr r7, _022EC99C ; =ov29_02353538 b _022EC93C _022EC900: ldrb r1, [r6, #3] @@ -249,18 +249,18 @@ _022EC96C: ldrb r0, [r6, #2] cmp r0, #0 bne _022EC8F0 - ldr r0, _022EC99C ; =0x02353538 + ldr r0, _022EC99C ; =ov29_02353538 mov r2, #0 ldr r0, [r0] - ldr r1, _022EC9A0 ; =0x02353598 + ldr r1, _022EC9A0 ; =ov29_02353598 add r0, r0, #0x1a000 str r2, [r0, #0x230] strb r2, [r1] ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022EC998: .word 0x02352390 -_022EC99C: .word 0x02353538 -_022EC9A0: .word 0x02353598 +_022EC998: .word ov29_02352390 +_022EC99C: .word ov29_02353538 +_022EC9A0: .word ov29_02353598 arm_func_end ov29_022EC8A8 arm_func_start ov29_022EC9A4 @@ -269,7 +269,7 @@ ov29_022EC9A4: ; 0x022EC9A4 sub sp, sp, #8 mov r3, #0xc smulbb r3, r1, r3 - ldr r1, _022ECAD8 ; =0x022C6320 + ldr r1, _022ECAD8 ; =ov10_022C6320 mov r6, r0 ldrb r4, [r1, r3] mov r5, r2 @@ -334,7 +334,7 @@ _022ECA78: _022ECA8C: add r0, sp, #0 bl ov29_022EC878 - ldr r0, _022ECAF8 ; =0x02352380 + ldr r0, _022ECAF8 ; =ov29_02352380 ldr r0, [r0, r5, lsl #2] mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 @@ -353,7 +353,7 @@ _022ECAD0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022ECAD8: .word 0x022C6320 +_022ECAD8: .word ov10_022C6320 _022ECADC: .word 0x00000BFD _022ECAE0: .word 0x00000BFE _022ECAE4: .word 0x00000BFF @@ -361,7 +361,7 @@ _022ECAE8: .word 0x00000C01 _022ECAEC: .word 0x00000C02 _022ECAF0: .word 0x00000C03 _022ECAF4: .word 0x00000C04 -_022ECAF8: .word 0x02352380 +_022ECAF8: .word ov29_02352380 arm_func_end ov29_022EC9A4 arm_func_start ov29_022ECAFC @@ -385,11 +385,11 @@ ov29_022ECAFC: ; 0x022ECAFC arm_func_start ov29_022ECB38 ov29_022ECB38: ; 0x022ECB38 - ldr r0, _022ECB44 ; =0x02353598 + ldr r0, _022ECB44 ; =ov29_02353598 ldrb r0, [r0] bx lr .align 2, 0 -_022ECB44: .word 0x02353598 +_022ECB44: .word ov29_02353598 arm_func_end ov29_022ECB38 arm_func_start DecrementWindCounter @@ -407,21 +407,21 @@ DecrementWindCounter: ; 0x022ECB48 _022ECB70: cmp r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _022ECD7C ; =0x02353538 + ldr r0, _022ECD7C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsh r1, [r0, #0x84] cmp r1, #0 subgt r1, r1, #1 strgth r1, [r0, #0x84] - ldr r0, _022ECD7C ; =0x02353538 + ldr r0, _022ECD7C ; =ov29_02353538 ldr r1, [r0] add r0, r1, #0x700 ldrsh r0, [r0, #0x84] cmp r0, #1 movlt r0, #3 strltb r0, [r1, #0x79a] - ldr r0, _022ECD7C ; =0x02353538 + ldr r0, _022ECD7C ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x79a] cmp r0, #0 @@ -440,14 +440,14 @@ _022ECB70: bl IsFloorOver cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r1, _022ECD7C ; =0x02353538 + ldr r1, _022ECD7C ; =ov29_02353538 mov r0, r4 ldr r2, [r1] add r1, r2, #0x4000 ldrsh r1, [r1, #0xd4] ldrb r2, [r2, #0x79a] bl ov29_022EC9A4 - ldr r0, _022ECD7C ; =0x02353538 + ldr r0, _022ECD7C ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x79a] @@ -469,14 +469,14 @@ _022ECC2C: bl IsFloorOver cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r1, _022ECD7C ; =0x02353538 + ldr r1, _022ECD7C ; =ov29_02353538 mov r0, r4 ldr r2, [r1] add r1, r2, #0x4000 ldrsh r1, [r1, #0xd4] ldrb r2, [r2, #0x79a] bl ov29_022EC9A4 - ldr r0, _022ECD7C ; =0x02353538 + ldr r0, _022ECD7C ; =ov29_02353538 mov r1, #2 ldr r0, [r0] strb r1, [r0, #0x79a] @@ -498,14 +498,14 @@ _022ECC9C: bl IsFloorOver cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r1, _022ECD7C ; =0x02353538 + ldr r1, _022ECD7C ; =ov29_02353538 mov r0, r4 ldr r2, [r1] add r1, r2, #0x4000 ldrsh r1, [r1, #0xd4] ldrb r2, [r2, #0x79a] bl ov29_022EC9A4 - ldr r0, _022ECD7C ; =0x02353538 + ldr r0, _022ECD7C ; =ov29_02353538 mov r1, #3 ldr r0, [r0] strb r1, [r0, #0x79a] @@ -523,14 +523,14 @@ _022ECD0C: bl IsFloorOver cmp r0, #0 ldmneia sp!, {r4, pc} - ldr r1, _022ECD7C ; =0x02353538 + ldr r1, _022ECD7C ; =ov29_02353538 mov r0, r4 ldr r2, [r1] add r1, r2, #0x4000 ldrsh r1, [r1, #0xd4] ldrb r2, [r2, #0x79a] bl ov29_022EC9A4 - ldr r0, _022ECD7C ; =0x02353538 + ldr r0, _022ECD7C ; =ov29_02353538 ldr r1, _022ECD80 ; =0x0000025D ldr r3, [r0] mov ip, #4 @@ -540,7 +540,7 @@ _022ECD0C: bl HandleFaint ldmia sp!, {r4, pc} .align 2, 0 -_022ECD7C: .word 0x02353538 +_022ECD7C: .word ov29_02353538 _022ECD80: .word 0x0000025D arm_func_end DecrementWindCounter @@ -557,9 +557,9 @@ ov29_022ECD84: ; 0x022ECD84 ldr r1, [r4, #0xb4] cmp r1, #0 ldmeqia sp!, {r4, pc} - ldr r0, _022ECDBC ; =0x0237C974 + ldr r0, _022ECDBC ; =ov29_0237C974 bl GetMonsterName ldmia sp!, {r4, pc} .align 2, 0 -_022ECDBC: .word 0x0237C974 +_022ECDBC: .word ov29_0237C974 arm_func_end ov29_022ECD84 diff --git a/asm/overlay_29_022ECDE4.s b/asm/overlay_29_022ECDE4.s index 09005571..8f2751b4 100644 --- a/asm/overlay_29_022ECDE4.s +++ b/asm/overlay_29_022ECDE4.s @@ -6,7 +6,7 @@ arm_func_start ov29_022ECDE4 ov29_022ECDE4: ; 0x022ECDE4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr r4, _022ECF34 ; =0x02353538 + ldr r4, _022ECF34 ; =ov29_02353538 mov r6, r1 ldr r1, [r4] mov sb, r0 @@ -31,7 +31,7 @@ _022ECE28: bl GetMonsterName b _022ECE6C _022ECE44: - ldr r1, _022ECF38 ; =0x0237C974 + ldr r1, _022ECF38 ; =ov29_0237C974 ldrb r0, [r1] cmp r0, #0 beq _022ECE60 @@ -60,7 +60,7 @@ _022ECE94: strh sb, [r4, #0x5a] ldrh r1, [r6, #0x62] ldr r0, _022ECF40 ; =0x000003E7 - ldr r3, _022ECF34 ; =0x02353538 + ldr r3, _022ECF34 ; =ov29_02353538 strh r1, [r4, #0x5e] ldrh r1, [r6, #0x64] strh r1, [r4, #0x60] @@ -77,7 +77,7 @@ _022ECE94: movgt r1, r0 strh r1, [r4, #0x68] ldrb r1, [r6, #0x1a] - ldr r0, _022ECF38 ; =0x0237C974 + ldr r0, _022ECF38 ; =ov29_0237C974 mov r2, #0x28 strb r1, [r4, #0x6a] ldrb r5, [r6, #0x1b] @@ -95,15 +95,15 @@ _022ECE94: bl memset ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022ECF34: .word 0x02353538 -_022ECF38: .word 0x0237C974 +_022ECF34: .word ov29_02353538 +_022ECF38: .word ov29_0237C974 _022ECF3C: .word 0x00000A41 _022ECF40: .word 0x000003E7 arm_func_end ov29_022ECDE4 arm_func_start ov29_022ECF44 ov29_022ECF44: ; 0x022ECF44 - ldr r1, _022ECF6C ; =0x02353538 + ldr r1, _022ECF6C ; =ov29_02353538 ldr r0, _022ECF70 ; =0x0002CA66 ldr r2, [r1] ldr r1, _022ECF74 ; =0x00000279 @@ -114,14 +114,14 @@ ov29_022ECF44: ; 0x022ECF44 and r0, r0, #0xff bx lr .align 2, 0 -_022ECF6C: .word 0x02353538 +_022ECF6C: .word ov29_02353538 _022ECF70: .word 0x0002CA66 _022ECF74: .word 0x00000279 arm_func_end ov29_022ECF44 arm_func_start ov29_022ECF78 ov29_022ECF78: ; 0x022ECF78 - ldr r1, _022ECFAC ; =0x02353538 + ldr r1, _022ECFAC ; =ov29_02353538 ldr r0, _022ECFB0 ; =0x0002CA66 ldr r2, [r1] ldr r1, _022ECFB4 ; =0x0000027A @@ -135,7 +135,7 @@ ov29_022ECF78: ; 0x022ECF78 movne r0, #0 bx lr .align 2, 0 -_022ECFAC: .word 0x02353538 +_022ECFAC: .word ov29_02353538 _022ECFB0: .word 0x0002CA66 _022ECFB4: .word 0x0000027A arm_func_end ov29_022ECF78 @@ -143,7 +143,7 @@ _022ECFB4: .word 0x0000027A arm_func_start ov29_022ECFB8 ov29_022ECFB8: ; 0x022ECFB8 stmdb sp!, {r4, lr} - ldr r1, _022ED004 ; =0x02353538 + ldr r1, _022ED004 ; =ov29_02353538 mov r4, r0 ldr r1, [r1] cmp r1, #0 @@ -164,34 +164,34 @@ _022ECFF8: bl MemZero ldmia sp!, {r4, pc} .align 2, 0 -_022ED004: .word 0x02353538 +_022ED004: .word ov29_02353538 arm_func_end ov29_022ECFB8 arm_func_start SetForcedLossReason SetForcedLossReason: ; 0x022ED008 - ldr r1, _022ED018 ; =0x02353538 + ldr r1, _022ED018 ; =ov29_02353538 ldr r1, [r1] str r0, [r1, #0x14] bx lr .align 2, 0 -_022ED018: .word 0x02353538 +_022ED018: .word ov29_02353538 arm_func_end SetForcedLossReason arm_func_start GetForcedLossReason GetForcedLossReason: ; 0x022ED01C - ldr r0, _022ED02C ; =0x02353538 + ldr r0, _022ED02C ; =ov29_02353538 ldr r0, [r0] ldr r0, [r0, #0x14] bx lr .align 2, 0 -_022ED02C: .word 0x02353538 +_022ED02C: .word ov29_02353538 arm_func_end GetForcedLossReason arm_func_start ov29_022ED030 ov29_022ED030: ; 0x022ED030 stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr r1, _022ED0A0 ; =0x02352690 + ldr r1, _022ED0A0 ; =ov29_02352690 ldr r2, _022ED0A4 ; =0x00000401 ldr r3, [r1, #4] ldr ip, [r1] @@ -209,38 +209,38 @@ ov29_022ED030: ; 0x022ED030 ldr r1, [sp, #4] ldr r0, [sp] ldrh r2, [r1, #0xc] - ldr r1, _022ED0A8 ; =0x0237C99C + ldr r1, _022ED0A8 ; =ov29_0237C99C strh r2, [r1] bl sub_0201E080 - ldr r0, _022ED0AC ; =0x0235359C + ldr r0, _022ED0AC ; =ov29_0235359C mov r1, #1 strb r1, [r0] add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_022ED0A0: .word 0x02352690 +_022ED0A0: .word ov29_02352690 _022ED0A4: .word 0x00000401 -_022ED0A8: .word 0x0237C99C -_022ED0AC: .word 0x0235359C +_022ED0A8: .word ov29_0237C99C +_022ED0AC: .word ov29_0235359C arm_func_end ov29_022ED030 arm_func_start ov29_022ED0B0 ov29_022ED0B0: ; 0x022ED0B0 - ldr r0, _022ED0C0 ; =0x0235359C + ldr r0, _022ED0C0 ; =ov29_0235359C mov r1, #0 strb r1, [r0] bx lr .align 2, 0 -_022ED0C0: .word 0x0235359C +_022ED0C0: .word ov29_0235359C arm_func_end ov29_022ED0B0 arm_func_start ov29_022ED0C4 ov29_022ED0C4: ; 0x022ED0C4 - ldr r0, _022ED0D0 ; =0x0235359C + ldr r0, _022ED0D0 ; =ov29_0235359C ldrb r0, [r0, #4] bx lr .align 2, 0 -_022ED0D0: .word 0x0235359C +_022ED0D0: .word ov29_0235359C arm_func_end ov29_022ED0C4 arm_func_start ov29_022ED0D4 @@ -248,18 +248,18 @@ ov29_022ED0D4: ; 0x022ED0D4 cmp r0, #0 movlt r0, #0 cmp r0, #0xff - ldr r1, _022ED0F0 ; =0x0235359C + ldr r1, _022ED0F0 ; =ov29_0235359C movgt r0, #0xff strb r0, [r1, #4] bx lr .align 2, 0 -_022ED0F0: .word 0x0235359C +_022ED0F0: .word ov29_0235359C arm_func_end ov29_022ED0D4 arm_func_start ov29_022ED0F4 ov29_022ED0F4: ; 0x022ED0F4 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r1, _022ED180 ; =0x0235359C + ldr r1, _022ED180 ; =ov29_0235359C mov r4, r0 ldrb r7, [r1, #4] cmp r7, #0x80 @@ -298,14 +298,14 @@ _022ED174: bne _022ED150 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022ED180: .word 0x0235359C +_022ED180: .word ov29_0235359C arm_func_end ov29_022ED0F4 arm_func_start ov29_022ED184 ov29_022ED184: ; 0x022ED184 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #0x88 - ldr r3, _022ED7F0 ; =0x0235359C + ldr r3, _022ED7F0 ; =ov29_0235359C ldrb r3, [r3] cmp r3, #0 beq _022ED7E8 @@ -330,8 +330,8 @@ _022ED1D0: _022ED1E0: add r0, sp, #0x48 bl InitRender3dElement64 - ldr r1, _022ED7F4 ; =0x0237C99C - ldr r0, _022ED7F8 ; =0x020AFC70 + ldr r1, _022ED7F4 ; =ov29_0237C99C + ldr r0, _022ED7F8 ; =_020AFC70 ldrh r2, [r1] mov r3, #5 mov r1, #0x400 @@ -340,7 +340,7 @@ _022ED1E0: ldr r0, [r0] str r1, [sp, #0x68] ldr r1, [r0, #0xe0] - ldr r0, _022ED7F0 ; =0x0235359C + ldr r0, _022ED7F0 ; =ov29_0235359C add r1, r1, #0x3a00 str r1, [sp, #0x6c] ldrb r6, [r0, #4] @@ -429,7 +429,7 @@ _022ED1E0: bl sub_0201F2A0 b _022ED7E8 _022ED370: - ldr r6, _022ED7FC ; =0x02352698 + ldr r6, _022ED7FC ; =ov29_02352698 add r5, sp, #0 mov r4, #4 _022ED37C: @@ -458,7 +458,7 @@ _022ED37C: ldrsh r2, [sp, #6] mov r1, #5 mov r0, #0x400 - ldr ip, _022ED7F8 ; =0x020AFC70 + ldr ip, _022ED7F8 ; =_020AFC70 mov r3, r3, lsl #0x10 sub r6, r6, r4 sub lr, lr, r4 @@ -466,7 +466,7 @@ _022ED37C: sub r5, r2, r5 mov r3, r6, lsl #0x10 mov r6, r5, lsl #0x10 - ldr r7, _022ED7F4 ; =0x0237C99C + ldr r7, _022ED7F4 ; =ov29_0237C99C strb r1, [sp, #0x44] ldrh r1, [r7] ldr r5, [ip] @@ -476,7 +476,7 @@ _022ED37C: add r5, r0, #0x3a00 str r5, [sp, #0x2c] strh r1, [sp, #0x1c] - ldr r0, _022ED7F0 ; =0x0235359C + ldr r0, _022ED7F0 ; =ov29_0235359C mov r1, #0 ldrb ip, [r0, #4] mov r7, #4 @@ -727,10 +727,10 @@ _022ED7E8: add sp, sp, #0x88 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022ED7F0: .word 0x0235359C -_022ED7F4: .word 0x0237C99C -_022ED7F8: .word 0x020AFC70 -_022ED7FC: .word 0x02352698 +_022ED7F0: .word ov29_0235359C +_022ED7F4: .word ov29_0237C99C +_022ED7F8: .word _020AFC70 +_022ED7FC: .word ov29_02352698 arm_func_end ov29_022ED184 arm_func_start ov29_022ED800 @@ -773,14 +773,14 @@ BindTrapToTile: ; 0x022ED858 arm_func_start ov29_022ED868 ov29_022ED868: ; 0x022ED868 - ldr r0, _022ED880 ; =0x02353538 + ldr r0, _022ED880 ; =ov29_02353538 ldr ip, _022ED884 ; =AreLateGameTrapsEnabled ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] bx ip .align 2, 0 -_022ED880: .word 0x02353538 +_022ED880: .word ov29_02353538 _022ED884: .word AreLateGameTrapsEnabled arm_func_end ov29_022ED868 @@ -788,7 +788,7 @@ _022ED884: .word AreLateGameTrapsEnabled ov29_022ED888: ; 0x022ED888 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 - ldr r0, _022ED96C ; =0x023526A0 + ldr r0, _022ED96C ; =ov29_023526A0 mov sl, #0 ldrh r1, [r0] ldrh r0, [r0, #2] @@ -849,7 +849,7 @@ _022ED94C: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022ED96C: .word 0x023526A0 +_022ED96C: .word ov29_023526A0 arm_func_end ov29_022ED888 arm_func_start SpawnEnemyTrapAtPos @@ -885,7 +885,7 @@ _022ED9C8: ov29_022ED9D0: ; 0x022ED9D0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 - ldr r0, _022EDBB8 ; =0x02353538 + ldr r0, _022EDBB8 ; =ov29_02353538 ldr r1, _022EDBBC ; =0x0001A21E ldr r0, [r0] ldrsh r2, [r0, r1] @@ -902,7 +902,7 @@ _022ED9F8: mov r0, r1 add fp, r0, #8 ldr r0, _022EDBC4 ; =0x0000013E - ldr r6, _022EDBC8 ; =0x0237C864 + ldr r6, _022EDBC8 ; =ov29_0237C864 sub r0, r0, #0x1f str r0, [sp, #4] mov r0, r1 @@ -934,7 +934,7 @@ _022EDA74: ldr r0, [sp] cmp r0, #0 beq _022EDB78 - ldr r0, _022EDBB8 ; =0x02353538 + ldr r0, _022EDBB8 ; =ov29_02353538 ldr r3, [r0] mov r0, #0x18 mul r2, r7, r0 @@ -989,13 +989,13 @@ _022EDA74: orr r0, r3, #0x3e orr r0, r0, #0x100 strh r0, [r6, #4] - ldr r0, _022EDBD0 ; =0x020AFC4C + ldr r0, _022EDBD0 ; =_020AFC4C ldr r0, [r0] bl sub_0201B9F8 _022EDB78: add r7, r7, #1 _022EDB7C: - ldr r0, _022EDBB8 ; =0x02353538 + ldr r0, _022EDBB8 ; =ov29_02353538 ldr r1, _022EDBC0 ; =0x0001A21C ldr r0, [r0] ldrsh r1, [r0, r1] @@ -1012,19 +1012,19 @@ _022EDB9C: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022EDBB8: .word 0x02353538 +_022EDBB8: .word ov29_02353538 _022EDBBC: .word 0x0001A21E _022EDBC0: .word 0x0001A21C _022EDBC4: .word 0x0000013E -_022EDBC8: .word 0x0237C864 +_022EDBC8: .word ov29_0237C864 _022EDBCC: .word 0xFFFF000F -_022EDBD0: .word 0x020AFC4C +_022EDBD0: .word _020AFC4C arm_func_end ov29_022ED9D0 arm_func_start PrepareTrapperTrap PrepareTrapperTrap: ; 0x022EDBD4 stmdb sp!, {r3, r4, r5, lr} - ldr lr, _022EDC28 ; =0x02353538 + ldr lr, _022EDC28 ; =ov29_02353538 ldrsh r5, [r0] ldr r3, _022EDC2C ; =0x00012AAA ldr r4, [lr] @@ -1045,7 +1045,7 @@ PrepareTrapperTrap: ; 0x022EDBD4 strb r3, [r0, #0xaa8] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022EDC28: .word 0x02353538 +_022EDC28: .word ov29_02353538 _022EDC2C: .word 0x00012AAA arm_func_end PrepareTrapperTrap @@ -1171,7 +1171,7 @@ _022EDDA0: arm_func_start TrySpawnTrapperTrap TrySpawnTrapperTrap: ; 0x022EDDD4 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _022EDE6C ; =0x02353538 + ldr r1, _022EDE6C ; =ov29_02353538 mov r5, r0 ldr r0, [r1] add r0, r0, #0x12000 @@ -1192,7 +1192,7 @@ TrySpawnTrapperTrap: ; 0x022EDDD4 movs r4, r0 ldr r1, _022EDE70 ; =0x00012AAA beq _022EDE48 - ldr r0, _022EDE6C ; =0x02353538 + ldr r0, _022EDE6C ; =ov29_02353538 ldr r2, _022EDE74 ; =0x00000E57 ldr r3, [r0] mov r0, r5 @@ -1200,7 +1200,7 @@ TrySpawnTrapperTrap: ; 0x022EDDD4 bl LogMessageByIdWithPopupCheckUserUnknown b _022EDE60 _022EDE48: - ldr r0, _022EDE6C ; =0x02353538 + ldr r0, _022EDE6C ; =ov29_02353538 ldr r2, _022EDE78 ; =0x00000E58 ldr r3, [r0] mov r0, r5 @@ -1211,7 +1211,7 @@ _022EDE60: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022EDE6C: .word 0x02353538 +_022EDE6C: .word ov29_02353538 _022EDE70: .word 0x00012AAA _022EDE74: .word 0x00000E57 _022EDE78: .word 0x00000E58 @@ -1262,7 +1262,7 @@ ov29_022EDEDC: ; 0x022EDEDC ldr r0, [r1] cmp r0, #2 bne _022EDF48 - ldr r0, _022EDF58 ; =0x02353538 + ldr r0, _022EDF58 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x13] cmp r0, #0 @@ -1286,7 +1286,7 @@ _022EDF50: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022EDF58: .word 0x02353538 +_022EDF58: .word ov29_02353538 arm_func_end ov29_022EDEDC arm_func_start ov29_022EDF5C @@ -1395,7 +1395,7 @@ _022EE0C8: ldr r0, [sp, #0xc] cmp r0, #1 beq _022EE0EC - ldr r0, _022EE308 ; =0x02353538 + ldr r0, _022EE308 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1a000 ldrb r0, [r0, #0x244] @@ -1435,7 +1435,7 @@ _022EE148: bl IqSkillIsEnabled cmp r0, #0 beq _022EE1D8 - ldr r0, _022EE310 ; =0x022C445C + ldr r0, _022EE310 ; =ov10_022C445C ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -1486,7 +1486,7 @@ _022EE1D8: mov r0, #0 ldrb r1, [r6] bl ov29_022EDF5C - ldr r0, _022EE308 ; =0x02353538 + ldr r0, _022EE308 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1a000 ldrb r0, [r0, #0x23e] @@ -1551,9 +1551,9 @@ _022EE2F4: _022EE2FC: .word 0x00000E59 _022EE300: .word 0x00000E5B _022EE304: .word 0x00000E5A -_022EE308: .word 0x02353538 +_022EE308: .word ov29_02353538 _022EE30C: .word 0x00000E5C -_022EE310: .word 0x022C445C +_022EE310: .word ov10_022C445C _022EE314: .word 0x00000E5D arm_func_end TryTriggerTrap diff --git a/asm/overlay_29_022EE36C.s b/asm/overlay_29_022EE36C.s index 221b5640..91a694f6 100644 --- a/asm/overlay_29_022EE36C.s +++ b/asm/overlay_29_022EE36C.s @@ -16,7 +16,7 @@ ApplyMudTrapEffect: ; 0x022EE36C mov ip, #1 mov r3, #3 bge _022EE3B8 - ldr r0, _022EE42C ; =0x02352AEC + ldr r0, _022EE42C ; =ov29_02352AEC str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -27,7 +27,7 @@ ApplyMudTrapEffect: ; 0x022EE36C _022EE3B8: cmp r0, #0x32 bge _022EE3E0 - ldr r0, _022EE430 ; =0x02352AE8 + ldr r0, _022EE430 ; =ov29_02352AE8 str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -38,7 +38,7 @@ _022EE3B8: _022EE3E0: cmp r0, #0x4b bge _022EE408 - ldr r0, _022EE42C ; =0x02352AEC + ldr r0, _022EE42C ; =ov29_02352AEC str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -47,7 +47,7 @@ _022EE3E0: bl LowerDefensiveStat b _022EE424 _022EE408: - ldr r0, _022EE430 ; =0x02352AE8 + ldr r0, _022EE430 ; =ov29_02352AE8 str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -58,8 +58,8 @@ _022EE424: add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022EE42C: .word 0x02352AEC -_022EE430: .word 0x02352AE8 +_022EE42C: .word ov29_02352AEC +_022EE430: .word ov29_02352AE8 arm_func_end ApplyMudTrapEffect arm_func_start ApplyStickyTrapEffect @@ -85,7 +85,7 @@ _022EE470: mov r5, #0 cmp r0, #0 beq _022EE508 - ldr fp, _022EE618 ; =0x020AF6B8 + ldr fp, _022EE618 ; =BAG_ITEMS_PTR_MIRROR mov r6, r5 _022EE48C: mov r0, #6 @@ -171,7 +171,7 @@ _022EE574: bl sub_0200FAEC b _022EE5E8 _022EE5C4: - ldr r1, _022EE620 ; =0x02353538 + ldr r1, _022EE620 ; =ov29_02353538 sub r0, r0, #1 ldr r2, [r1] add r1, r0, r0, lsl #3 @@ -195,9 +195,9 @@ _022EE610: add sp, sp, #0xcc ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022EE618: .word 0x020AF6B8 +_022EE618: .word BAG_ITEMS_PTR_MIRROR _022EE61C: .word 0x00000E5F -_022EE620: .word 0x02353538 +_022EE620: .word ov29_02353538 _022EE624: .word 0x00000309 _022EE628: .word 0x00000E5E arm_func_end ApplyStickyTrapEffect @@ -217,7 +217,7 @@ ApplyGrimyTrapEffect: ; 0x022EE62C str r0, [sp, #4] cmp r1, #0 beq _022EE6C0 - ldr r0, _022EE808 ; =0x020AF6B8 + ldr r0, _022EE808 ; =BAG_ITEMS_PTR_MIRROR mov r1, r5 ldr r6, [r0] mov lr, r5 @@ -253,7 +253,7 @@ _022EE6C0: addne r0, sp, #8 addne r1, r2, #0x62 strne r1, [r0, r4, lsl #2] - ldr r0, _022EE80C ; =0x022C4434 + ldr r0, _022EE80C ; =ov10_022C4434 strne r4, [sp, #4] ldrsh r0, [r0] addne r4, r4, #1 @@ -293,7 +293,7 @@ _022EE6FC: bl sub_0200FA68 b _022EE7AC _022EE77C: - ldr r0, _022EE810 ; =0x02353538 + ldr r0, _022EE810 ; =ov29_02353538 ldrb r2, [r8, #1] ldr r3, [r0] ldrh r1, [r8] @@ -334,9 +334,9 @@ _022EE800: add sp, sp, #0xd8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022EE808: .word 0x020AF6B8 -_022EE80C: .word 0x022C4434 -_022EE810: .word 0x02353538 +_022EE808: .word BAG_ITEMS_PTR_MIRROR +_022EE80C: .word ov10_022C4434 +_022EE810: .word ov29_02353538 _022EE814: .word 0x00000E63 _022EE818: .word 0x00000E61 _022EE81C: .word 0x00000E62 @@ -351,7 +351,7 @@ ApplyPitfallTrapEffect: ; 0x022EE820 mov r5, r3 mov r4, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} - ldr r0, _022EE980 ; =0x02353538 + ldr r0, _022EE980 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] @@ -393,13 +393,13 @@ _022EE8AC: mov r1, #0x4b strb r2, [r5, #0x174] bl ov29_022EA370 - ldr r1, _022EE988 ; =0x022C44E4 + ldr r1, _022EE988 ; =ov10_022C44E4 mov r0, r7 ldrsh r1, [r1] mov r2, #0x11 mov r3, #0x254 bl ApplyDamageAndEffectsWrapper - ldr r0, _022EE980 ; =0x02353538 + ldr r0, _022EE980 ; =ov29_02353538 mov r1, #2 ldr r0, [r0] mov r4, #0 @@ -440,9 +440,9 @@ _022EE968: bl ov29_022EF478 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022EE980: .word 0x02353538 +_022EE980: .word ov29_02353538 _022EE984: .word 0x00000E64 -_022EE988: .word 0x022C44E4 +_022EE988: .word ov10_022C44E4 _022EE98C: .word 0x00000E66 _022EE990: .word 0x00000E65 arm_func_end ApplyPitfallTrapEffect @@ -454,7 +454,7 @@ ApplySummonTrapEffect: ; 0x022EE994 mov r0, #3 mov r5, r1 bl DungeonRandInt - ldr r1, _022EEA20 ; =0x02353538 + ldr r1, _022EEA20 ; =ov29_02353538 mov r4, r0 ldr r0, [r1] add r0, r0, #0x4000 @@ -487,7 +487,7 @@ _022EEA10: bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022EEA20: .word 0x02353538 +_022EEA20: .word ov29_02353538 _022EEA24: .word 0x00000E68 _022EEA28: .word 0x0000030F _022EEA2C: .word 0x00000E67 @@ -568,7 +568,7 @@ ApplyPokemonTrapEffect: ; 0x022EEB18 mov r4, r1 mov r7, #0 bl GetVisibilityRange - ldr r1, _022EED1C ; =0x02353538 + ldr r1, _022EED1C ; =ov29_02353538 mov r5, r0 ldr r0, [r1] add r0, r0, #0x4000 @@ -595,7 +595,7 @@ _022EEB60: add r5, r0, r5 b _022EECE8 _022EEB94: - ldr r0, _022EED1C ; =0x02353538 + ldr r0, _022EED1C ; =ov29_02353538 mov r1, #0x1c ldr r0, [r0] add r0, r0, #0x2e8 @@ -635,7 +635,7 @@ _022EEBE4: mov r8, #0 b _022EEC68 _022EEC28: - ldr r0, _022EED1C ; =0x02353538 + ldr r0, _022EED1C ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x790] cmp r0, #0 @@ -707,7 +707,7 @@ _022EED14: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022EED1C: .word 0x02353538 +_022EED1C: .word ov29_02353538 _022EED20: .word 0x00000E6B _022EED24: .word 0x00000E6C _022EED28: .word 0x00000E6D @@ -761,19 +761,19 @@ _022EEDC4: mov r0, r5 bl ov29_022E56A0 ldrb r1, [r4, #0x4c] - ldr r0, _022EEE44 ; =0x0235171C + ldr r0, _022EEE44 ; =DIRECTIONS_XY ldrsh r3, [r5, #4] mov r1, r1, lsl #0x1d mov r4, r1, lsr #0x1b ldrsh r2, [r0, r4] - ldr r1, _022EEE48 ; =0x0235171E + ldr r1, _022EEE48 ; =ov29_0235171E mov r0, r6 add r2, r3, r2 strh r2, [sp, #0xc] ldrsh r2, [r1, r4] ldrsh r3, [r5, #6] mov r4, #1 - ldr r1, _022EEE4C ; =0x02351844 + ldr r1, _022EEE4C ; =ov29_02351844 add r2, r3, r2 strh r2, [sp, #0xe] str r4, [sp] @@ -788,9 +788,9 @@ _022EEE38: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _022EEE40: .word 0x0000130F -_022EEE44: .word 0x0235171C -_022EEE48: .word 0x0235171E -_022EEE4C: .word 0x02351844 +_022EEE44: .word DIRECTIONS_XY +_022EEE48: .word ov29_0235171E +_022EEE4C: .word ov29_02351844 arm_func_end ApplyTripTrapEffect arm_func_start ApplyStealthRockTrapEffect @@ -808,7 +808,7 @@ ApplyStealthRockTrapEffect: ; 0x022EEE50 ldrsh r1, [r5, #0x16] ldr r0, _022EEEDC ; =0x000003E7 add r2, r2, r1 - ldr r1, _022EEEE0 ; =0x022C4770 + ldr r1, _022EEEE0 ; =ov10_022C4770 cmp r2, r0 movgt r2, r0 ldr r1, [r1] @@ -833,7 +833,7 @@ _022EEEBC: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _022EEEDC: .word 0x000003E7 -_022EEEE0: .word 0x022C4770 +_022EEEE0: .word ov10_022C4770 _022EEEE4: .word 0x0000026D _022EEEE8: .word 0x00000E6E arm_func_end ApplyStealthRockTrapEffect @@ -844,7 +844,7 @@ ApplyToxicSpikesTrapEffect: ; 0x022EEEEC movs r4, r1 mov r5, r0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r1, _022EEF3C ; =0x022C45CC + ldr r1, _022EEF3C ; =ov10_022C45CC mov r0, r4 ldrsh r1, [r1] mov r2, #0x15 @@ -861,7 +861,7 @@ ApplyToxicSpikesTrapEffect: ; 0x022EEEEC bl TryInflictPoisonedStatus ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022EEF3C: .word 0x022C45CC +_022EEF3C: .word ov10_022C45CC arm_func_end ApplyToxicSpikesTrapEffect arm_func_start ApplyRandomTrapEffect @@ -875,7 +875,7 @@ ApplyRandomTrapEffect: ; 0x022EEF40 ldr r8, [sp, #0x88] beq _022EF064 bl ov29_022E7A8C - ldr r1, _022EF06C ; =0x022C4B18 + ldr r1, _022EF06C ; =ov10_022C4B18 mov r4, r0 ldrb r0, [r1, r4] cmp r0, #0 @@ -901,7 +901,7 @@ _022EEFB0: str sb, [sp, #0x14] add r7, r5, #1 _022EEFC4: - ldr r0, _022EF070 ; =0x02353538 + ldr r0, _022EF070 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r5, lsl #2 add r0, r0, #0x12000 @@ -948,8 +948,8 @@ _022EF064: add sp, sp, #0x64 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022EF06C: .word 0x022C4B18 -_022EF070: .word 0x02353538 +_022EF06C: .word ov10_022C4B18 +_022EF070: .word ov29_02353538 arm_func_end ApplyRandomTrapEffect arm_func_start ApplyGrudgeTrapEffect @@ -971,7 +971,7 @@ ApplyGrudgeTrapEffect: ; 0x022EF074 bl ov29_022E56D4 _022EF0B0: mov r7, #0 - ldr r4, _022EF14C ; =0x02353538 + ldr r4, _022EF14C ; =ov29_02353538 mov r8, r7 mov r5, #1 mov r6, r7 @@ -1012,7 +1012,7 @@ _022EF11C: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _022EF148: .word 0x0000030F -_022EF14C: .word 0x02353538 +_022EF14C: .word ov29_02353538 _022EF150: .word 0x00000E6F arm_func_end ApplyGrudgeTrapEffect @@ -1122,7 +1122,7 @@ _022EF2A4: _022EF2C4: cmp r5, #0 beq _022EF454 - ldr r1, _022EF460 ; =0x022C4720 + ldr r1, _022EF460 ; =ov10_022C4720 mov r0, r5 mov r2, #1 bl CalcStatusDuration @@ -1182,7 +1182,7 @@ _022EF388: _022EF398: cmp r5, #0 beq _022EF454 - ldr r0, _022EF468 ; =0x022C45C8 + ldr r0, _022EF468 ; =ov10_022C45C8 ldr r3, _022EF46C ; =0x00000252 ldrsh r1, [r0] mov r0, r5 @@ -1204,7 +1204,7 @@ _022EF3D0: _022EF3E4: cmp r5, #0 beq _022EF454 - ldr r0, _022EF470 ; =0x022C4418 + ldr r0, _022EF470 ; =ov10_022C4418 ldr r3, _022EF474 ; =0x00000245 ldrsh r1, [r0] mov r0, r5 @@ -1240,11 +1240,11 @@ _022EF454: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022EF460: .word 0x022C4720 +_022EF460: .word ov10_022C4720 _022EF464: .word 0x00000251 -_022EF468: .word 0x022C45C8 +_022EF468: .word ov10_022C45C8 _022EF46C: .word 0x00000252 -_022EF470: .word 0x022C4418 +_022EF470: .word ov10_022C4418 _022EF474: .word 0x00000245 arm_func_end ApplyTrapEffect @@ -1316,7 +1316,7 @@ _022EF538: bl MewSpawnCheck cmp r0, #0 beq _022EF5B4 - ldr r1, _022EF5D4 ; =0x0235171C + ldr r1, _022EF5D4 ; =DIRECTIONS_XY mov r0, #0 mov r2, r8, lsl #2 ldrsh r3, [r1, r2] @@ -1350,7 +1350,7 @@ _022EF5BC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022EF5D0: .word 0x0000017B -_022EF5D4: .word 0x0235171C +_022EF5D4: .word DIRECTIONS_XY arm_func_end ov29_022EF4B4 arm_func_start RevealTrapsNearby @@ -1394,7 +1394,7 @@ _022EF648: ble _022EF614 b _022EF6C4 _022EF65C: - ldr r0, _022EF6F4 ; =0x02353538 + ldr r0, _022EF6F4 ; =ov29_02353538 mov r1, #0x1c ldr r0, [r0] add r0, r0, #0x2e8 @@ -1439,7 +1439,7 @@ _022EF6E4: bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022EF6F4: .word 0x02353538 +_022EF6F4: .word ov29_02353538 _022EF6F8: .word 0x00000E02 _022EF6FC: .word 0x00000E03 arm_func_end RevealTrapsNearby @@ -1469,10 +1469,10 @@ ov29_022EF738: ; 0x022EF738 bl IsFullFloorFixedRoom cmp r0, #0 beq _022EF780 - ldr r0, _022EF798 ; =0x02353538 + ldr r0, _022EF798 ; =ov29_02353538 mov r1, #0xc ldr r0, [r0] - ldr r2, _022EF79C ; =0x022C6C7A + ldr r2, _022EF79C ; =ov10_022C6C7A add r0, r0, #0x4000 ldrb r3, [r0, #0xda] smulbb r1, r3, r1 @@ -1484,13 +1484,13 @@ ov29_022EF738: ; 0x022EF738 streqb r1, [r0, #0xca] ldmia sp!, {r3, pc} _022EF780: - ldr r0, _022EF798 ; =0x02353538 + ldr r0, _022EF798 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] add r0, r0, #0x4000 strb r1, [r0, #0xca] ldmia sp!, {r3, pc} .align 2, 0 -_022EF798: .word 0x02353538 -_022EF79C: .word 0x022C6C7A +_022EF798: .word ov29_02353538 +_022EF79C: .word ov10_022C6C7A arm_func_end ov29_022EF738 diff --git a/asm/overlay_29_022EF7C4.s b/asm/overlay_29_022EF7C4.s index 87a305a8..644eec57 100644 --- a/asm/overlay_29_022EF7C4.s +++ b/asm/overlay_29_022EF7C4.s @@ -10,7 +10,7 @@ ov29_022EF7C4: ; 0x022EF7C4 mov r7, r2 cmp r1, #5 ldmlsia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - ldr r4, _022EF89C ; =0x02353538 + ldr r4, _022EF89C ; =ov29_02353538 ldr r0, [r4] add r0, r0, #0x4000 ldrb r0, [r0, #0xca] @@ -49,14 +49,14 @@ _022EF854: beq _022EF874 mov r0, #0x64 bl ov29_0234BA54 - ldr r0, _022EF89C ; =0x02353538 + ldr r0, _022EF89C ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #6] _022EF874: cmp r7, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - ldr r0, _022EF89C ; =0x02353538 + ldr r0, _022EF89C ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #6] cmp r0, #0 @@ -65,7 +65,7 @@ _022EF874: bl ChangeDungeonMusic ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022EF89C: .word 0x02353538 +_022EF89C: .word ov29_02353538 _022EF8A0: .word 0x000003E7 arm_func_end ov29_022EF7C4 @@ -73,7 +73,7 @@ _022EF8A0: .word 0x000003E7 ov29_022EF8A4: ; 0x022EF8A4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r8, #1 - ldr r5, _022EF934 ; =0x02353538 + ldr r5, _022EF934 ; =ov29_02353538 mov r7, r8 mov r6, #0 mvn r4, #0 @@ -110,13 +110,13 @@ _022EF918: bl ov29_023444D4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022EF934: .word 0x02353538 +_022EF934: .word ov29_02353538 arm_func_end ov29_022EF8A4 arm_func_start ov29_022EF938 ov29_022EF938: ; 0x022EF938 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r5, _022EF9B4 ; =0x02353538 + ldr r5, _022EF9B4 ; =ov29_02353538 mov r4, #0 mov r6, #4 _022EF948: @@ -150,7 +150,7 @@ _022EF99C: blt _022EF948 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022EF9B4: .word 0x02353538 +_022EF9B4: .word ov29_02353538 arm_func_end ov29_022EF938 arm_func_start ov29_022EF9B8 @@ -171,13 +171,13 @@ ov29_022EF9C8: ; 0x022EF9C8 stmdb sp!, {r3, lr} bl IsFloorOver cmp r0, #0 - ldreq r0, _022EF9E8 ; =0x02353538 + ldreq r0, _022EF9E8 ; =ov29_02353538 ldreq r0, [r0] ldreqb r0, [r0, #6] cmpeq r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_022EF9E8: .word 0x02353538 +_022EF9E8: .word ov29_02353538 arm_func_end ov29_022EF9C8 arm_func_start ShouldRunMonsterAi @@ -230,7 +230,7 @@ DebugRecruitingEnabled: ; 0x022EFA6C TryActivateIqBooster: ; 0x022EFA74 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x10 - ldr r1, _022EFAE0 ; =0x02353538 + ldr r1, _022EFAE0 ; =ov29_02353538 ldr r0, _022EFAE4 ; =0x000286D0 ldr r1, [r1] ldrsh r6, [r1, r0] @@ -259,7 +259,7 @@ _022EFAD8: add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022EFAE0: .word 0x02353538 +_022EFAE0: .word ov29_02353538 _022EFAE4: .word 0x000286D0 arm_func_end TryActivateIqBooster @@ -299,21 +299,21 @@ ov29_022EFB20: ; 0x022EFB20 bl ov29_022EA370 _022EFB48: bl ov29_0234D630 - ldr r1, _022EFB7C ; =0x023535A4 + ldr r1, _022EFB7C ; =ov29_023535A4 mvn r2, #1 mov r0, #1 strb r2, [r1] bl ov29_022DE5F0 - ldr r1, _022EFB80 ; =0x0237C9A0 + ldr r1, _022EFB80 ; =ov29_0237C9A0 strh r0, [r1, #2] mov r0, #0 bl ov29_022DE5F0 - ldr r1, _022EFB80 ; =0x0237C9A0 + ldr r1, _022EFB80 ; =ov29_0237C9A0 strh r0, [r1] ldmia sp!, {r3, pc} .align 2, 0 -_022EFB7C: .word 0x023535A4 -_022EFB80: .word 0x0237C9A0 +_022EFB7C: .word ov29_023535A4 +_022EFB80: .word ov29_0237C9A0 arm_func_end ov29_022EFB20 arm_func_start ov29_022EFB84 @@ -997,7 +997,7 @@ _022F0530: .word sub_0201D198 arm_func_start ov29_022F0534 ov29_022F0534: ; 0x022F0534 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r4, _022F058C ; =0x02353538 + ldr r4, _022F058C ; =ov29_02353538 mov r7, r0 mov r5, #0 _022F0544: @@ -1022,5 +1022,5 @@ _022F057C: blt _022F0544 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022F058C: .word 0x02353538 +_022F058C: .word ov29_02353538 arm_func_end ov29_022F0534 diff --git a/asm/overlay_29_022F05B4.s b/asm/overlay_29_022F05B4.s index 5a06a079..8679e04a 100644 --- a/asm/overlay_29_022F05B4.s +++ b/asm/overlay_29_022F05B4.s @@ -87,7 +87,7 @@ ov29_022F067C: ; 0x022F067C cmp r1, #0 bne _022F06F4 mov r5, #0 - ldr r8, _022F077C ; =0x02353538 + ldr r8, _022F077C ; =ov29_02353538 mov r4, r5 add sb, sp, #0x10 _022F06A4: @@ -148,7 +148,7 @@ _022F0700: add sp, sp, #0x24 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_022F077C: .word 0x02353538 +_022F077C: .word ov29_02353538 arm_func_end ov29_022F067C arm_func_start ov29_022F0780 @@ -185,7 +185,7 @@ _022F07D4: .word 0x00001308 arm_func_start ov29_022F07D8 ov29_022F07D8: ; 0x022F07D8 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r5, _022F0844 ; =0x02353538 + ldr r5, _022F0844 ; =ov29_02353538 mov r4, r0 mov r6, #0 _022F07E8: @@ -214,7 +214,7 @@ _022F082C: blt _022F07E8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022F0844: .word 0x02353538 +_022F0844: .word ov29_02353538 arm_func_end ov29_022F07D8 arm_func_start ov29_022F0848 @@ -240,7 +240,7 @@ ov29_022F085C: ; 0x022F085C mov r0, #0x100 str r1, [sp] bl sub_02001AB0 - ldr r1, _022F0980 ; =0x02353538 + ldr r1, _022F0980 ; =ov29_02353538 mov r0, #0x400 ldr r2, [r1] mov r1, #0 @@ -308,7 +308,7 @@ _022F0964: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F0980: .word 0x02353538 +_022F0980: .word ov29_02353538 arm_func_end ov29_022F085C arm_func_start ov29_022F0984 @@ -396,38 +396,38 @@ _022F0AA0: .word ov29_022F0AA4 arm_func_start ov29_022F0AA4 ov29_022F0AA4: ; 0x022F0AA4 stmdb sp!, {r3, lr} - ldr r1, _022F0AD4 ; =0x023535A4 + ldr r1, _022F0AD4 ; =ov29_023535A4 mvn r0, #1 ldrsb r1, [r1] cmp r1, r0 ldmneia sp!, {r3, pc} - ldr r0, _022F0AD8 ; =0x023526A8 + ldr r0, _022F0AD8 ; =ov29_023526A8 ldr r1, _022F0ADC ; =ov29_022F0B10 bl sub_0202F8C4 - ldr r1, _022F0AD4 ; =0x023535A4 + ldr r1, _022F0AD4 ; =ov29_023535A4 strb r0, [r1] ldmia sp!, {r3, pc} .align 2, 0 -_022F0AD4: .word 0x023535A4 -_022F0AD8: .word 0x023526A8 +_022F0AD4: .word ov29_023535A4 +_022F0AD8: .word ov29_023526A8 _022F0ADC: .word ov29_022F0B10 arm_func_end ov29_022F0AA4 arm_func_start ov29_022F0AE0 ov29_022F0AE0: ; 0x022F0AE0 stmdb sp!, {r3, lr} - ldr r0, _022F0B0C ; =0x023535A4 + ldr r0, _022F0B0C ; =ov29_023535A4 mvn r1, #1 ldrsb r0, [r0] cmp r0, r1 ldmeqia sp!, {r3, pc} bl sub_0202F8FC - ldr r0, _022F0B0C ; =0x023535A4 + ldr r0, _022F0B0C ; =ov29_023535A4 mvn r1, #1 strb r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_022F0B0C: .word 0x023535A4 +_022F0B0C: .word ov29_023535A4 arm_func_end ov29_022F0AE0 arm_func_start ov29_022F0B10 @@ -442,7 +442,7 @@ ov29_022F0B10: ; 0x022F0B10 str r0, [sp, #0x28] add r1, sp, #4 str r1, [sp] - ldr r2, _022F0B84 ; =0x023526B8 + ldr r2, _022F0B84 ; =ov29_023526B8 add r0, sp, #0x54 mov r1, #0x80 mov r3, #0x400 @@ -462,7 +462,7 @@ ov29_022F0B10: ; 0x022F0B10 add sp, sp, #0xd4 ldmia sp!, {r3, r4, pc} .align 2, 0 -_022F0B84: .word 0x023526B8 +_022F0B84: .word ov29_023526B8 _022F0B88: .word 0x00000225 arm_func_end ov29_022F0B10 @@ -579,8 +579,8 @@ ov29_022F0C98: ; 0x022F0C98 mov r0, #4 mov r1, r8 bl ov29_022E0DD8 - ldr r1, _022F0EC8 ; =0x02353538 - ldr r2, _022F0ECC ; =0x0237CFBB + ldr r1, _022F0EC8 ; =ov29_02353538 + ldr r2, _022F0ECC ; =ov29_0237CFBB ldr r1, [r1] mov r0, #1 strb r0, [r2] @@ -613,9 +613,9 @@ _022F0D44: mov r0, #4 mov r1, #0x2f bl ov29_022EA370 - ldr r4, _022F0ED0 ; =0x0237C6A4 - ldr r5, _022F0ECC ; =0x0237CFBB - ldr r6, _022F0ED4 ; =0x0237C694 + ldr r4, _022F0ED0 ; =ov29_0237C6A4 + ldr r5, _022F0ECC ; =ov29_0237CFBB + ldr r6, _022F0ED4 ; =ov29_0237C694 mov fp, #0x2f _022F0D78: mov r0, fp @@ -691,14 +691,14 @@ _022F0E64: bl ov29_02339190 mov r0, #0 bl ov29_02338F58 - ldr r1, _022F0EC8 ; =0x02353538 + ldr r1, _022F0EC8 ; =ov29_02353538 mov r0, r7 ldr r1, [r1] mov r2, #0 add r1, r1, #0x1a000 strb r2, [r1, #0x249] bl sub_0204AEB0 - ldr r0, _022F0ECC ; =0x0237CFBB + ldr r0, _022F0ECC ; =ov29_0237CFBB mov r1, #1 strb r1, [r0] bl UpdateMinimap @@ -712,10 +712,10 @@ _022F0E64: bl ov29_022E0B44 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F0EC8: .word 0x02353538 -_022F0ECC: .word 0x0237CFBB -_022F0ED0: .word 0x0237C6A4 -_022F0ED4: .word 0x0237C694 +_022F0EC8: .word ov29_02353538 +_022F0ECC: .word ov29_0237CFBB +_022F0ED0: .word ov29_0237C6A4 +_022F0ED4: .word ov29_0237C694 _022F0ED8: .word 0x00003F03 arm_func_end ov29_022F0C98 @@ -723,7 +723,7 @@ _022F0ED8: .word 0x00003F03 SetLeaderAction: ; 0x022F0EDC stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xdc - ldr r1, _022F1DDC ; =0x02353538 + ldr r1, _022F1DDC ; =ov29_02353538 add r0, sp, #0xb6 ldr r2, [r1] mov r1, #5 @@ -734,7 +734,7 @@ SetLeaderAction: ; 0x022F0EDC mov r2, #0 str r2, [sp, #0x64] bl MemZero - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 mov r1, #0 ldr r0, [r0] strh r1, [r0, #0x1c] @@ -753,12 +753,12 @@ SetLeaderAction: ; 0x022F0EDC bl ov29_022EA370 b _022F2B34 _022F0F58: - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 mov r1, #0 ldr r0, [r0] strb r1, [r0, #0x78e] bl ov29_02339CD4 - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #5] cmp r0, #0 @@ -769,7 +769,7 @@ _022F0F58: cmp r0, #0 beq _022F0FAC bl ov29_0234A980 - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #8] cmp r0, #0 @@ -801,14 +801,14 @@ _022F1000: mov r1, r0 mov r2, r0 bl ov29_022FA2F0 - ldr r1, _022F1DE0 ; =0x0235171C + ldr r1, _022F1DE0 ; =DIRECTIONS_XY ldrsh r0, [r1, #0x12] str r0, [sp, #8] ldrsh r0, [r1, #0x10] str r0, [sp, #4] _022F1024: bl GetLeader - ldr r1, _022F1DDC ; =0x02353538 + ldr r1, _022F1DDC ; =ov29_02353538 mov r6, r0 ldr r0, [r1] ldr sb, [r6, #0xb4] @@ -824,10 +824,10 @@ _022F1024: bne _022F2B34 bl ov29_022F2FE4 _022F1064: - ldr r1, _022F1DE4 ; =0x0237C9A4 + ldr r1, _022F1DE4 ; =ov29_0237C9A4 mov r2, #0 strb r2, [r1, #2] - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 strb r2, [r1, #1] ldr r0, [r0] ldr r0, [r0, #0x614] @@ -846,7 +846,7 @@ _022F10AC: mov r0, #0 str r0, [sp, #0x6c] bl SetLeaderActionFields - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 mov r1, #0 strb r1, [r0] strb r1, [r0, #3] @@ -876,10 +876,10 @@ _022F110C: ldrb r0, [sp, #0xb6] cmp r0, #0 bne _022F2970 - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 ldrsh r0, [r0, #4] add r1, r0, #1 - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 strh r1, [r0, #4] ldrb r0, [r5, #0x35] cmp r0, #0 @@ -899,7 +899,7 @@ _022F110C: _022F117C: mov r0, r6 bl ov29_022F2B74 - ldr r0, _022F1DEC ; =0x0237C6A4 + ldr r0, _022F1DEC ; =ov29_0237C6A4 mov r8, #0 ldrh r1, [r0] tst r1, #0x40 @@ -936,7 +936,7 @@ _022F1200: _022F1208: mov r0, r8 bl ov29_022E0C2C - ldr r0, _022F1DEC ; =0x0237C6A4 + ldr r0, _022F1DEC ; =ov29_0237C6A4 ldrh r0, [r0] tst r0, #0x100 movne r0, #1 @@ -960,7 +960,7 @@ _022F1228: moveq r0, #0 streq r0, [sp, #0x50] _022F1268: - ldr r0, _022F1DEC ; =0x0237C6A4 + ldr r0, _022F1DEC ; =ov29_0237C6A4 mov r1, #0 ldrh r0, [r0] tst r0, #0x80 @@ -1020,7 +1020,7 @@ _022F12E0: _022F1344: cmp r8, #0 bne _022F1364 - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0] tst r0, #1 beq _022F13B0 @@ -1041,7 +1041,7 @@ _022F1364: beq _022F13B0 mov r0, #1 bl SetLeaderActionFields - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x78e] @@ -1056,7 +1056,7 @@ _022F13B0: mov fp, r0 mov r8, r0 str r0, [sp, #0x60] - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 ldrb r0, [r0, #2] cmp r0, #0 bne _022F1440 @@ -1070,7 +1070,7 @@ _022F13B0: strge r0, [sp, #0x60] b _022F1440 _022F1408: - ldr r0, _022F1DEC ; =0x0237C6A4 + ldr r0, _022F1DEC ; =ov29_0237C6A4 mov r1, r8 ldrh r0, [r0] tst r0, #0x80 @@ -1124,11 +1124,11 @@ _022F1470: strh r1, [sp, #0xa2] strh r1, [sp, #0x92] mov r0, r0, lsl #0x1d - ldr r1, _022F1DE0 ; =0x0235171C + ldr r1, _022F1DE0 ; =DIRECTIONS_XY mov ip, r0, lsr #0x1b ldrsh r1, [r1, ip] ldrsh r2, [sp, #0xa2] - ldr ip, _022F1DE0 ; =0x0235171C + ldr ip, _022F1DE0 ; =DIRECTIONS_XY add r0, ip, r0, lsr #27 add r1, r2, r1 strh r1, [sp, #0xa2] @@ -1274,12 +1274,12 @@ _022F16F4: cmp r0, #0 moveq r1, #0 beq _022F17E0 - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 ldrb r0, [r0, #2] cmp r0, #0 movne r1, #0 bne _022F17E0 - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0] and r0, r0, #0xf0 mov r0, r0, lsl #0x10 @@ -1311,7 +1311,7 @@ _022F16F4: cmp r0, #0x20 moveq r0, #6 streq r0, [sp, #0x20] - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 ldrb r0, [r0, #1] cmp r0, #0 beq _022F17B8 @@ -1331,7 +1331,7 @@ _022F17B8: streqb r8, [sb, #0x4c] movne r1, #1 _022F17E0: - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 ldrb r0, [r0, #2] cmp r0, #0 bne _022F1884 @@ -1340,7 +1340,7 @@ _022F17E0: ldr r0, [sp, #0x64] cmp r0, #0 bne _022F18B4 - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0] tst r0, #2 beq _022F1868 @@ -1360,7 +1360,7 @@ _022F1838: _022F1844: mov r0, #1 str r0, [sp, #0x48] - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r1, [r0] mov r0, #1 str r0, [sp, #0x2c] @@ -1370,7 +1370,7 @@ _022F1844: _022F1868: mov r0, #1 str r0, [sp, #0x48] - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r1, [r0] mov r0, #0 strb r0, [r1, #0x78c] @@ -1384,7 +1384,7 @@ _022F1884: strne r0, [sp, #0x48] bne _022F18B4 _022F18A0: - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0, #2] tst r0, #1 movne r0, #1 @@ -1478,7 +1478,7 @@ _022F19DC: ldr r0, [sp, #0x2c] cmp r0, #0 bne _022F1A64 - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0] tst r0, #2 beq _022F1A64 @@ -1496,7 +1496,7 @@ _022F19DC: beq _022F1CE0 mov r0, #1 bl SetLeaderActionFields - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x78e] @@ -1512,13 +1512,13 @@ _022F1A64: bl LogMessageByIdWithPopupCheckUser mov r0, #1 bl SetLeaderActionFields - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x78e] b _022F2970 _022F1AA0: - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0] tst r0, #0x200 cmpeq fp, #0 @@ -1683,7 +1683,7 @@ _022F1CC0: cmp r0, #0 bne _022F2970 _022F1CE0: - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0, #2] tst r0, #0x400 beq _022F1D10 @@ -1726,7 +1726,7 @@ _022F1D10: strb r0, [sp, #0xba] b _022F2970 _022F1D84: - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0, #6] tst r0, #2 beq _022F1DB0 @@ -1750,18 +1750,18 @@ _022F1DB0: strb r0, [sp, #0xb9] b _022F2970 .align 2, 0 -_022F1DDC: .word 0x02353538 -_022F1DE0: .word 0x0235171C -_022F1DE4: .word 0x0237C9A4 +_022F1DDC: .word ov29_02353538 +_022F1DE0: .word DIRECTIONS_XY +_022F1DE4: .word ov29_0237C9A4 _022F1DE8: .word 0x00000BA3 -_022F1DEC: .word 0x0237C6A4 -_022F1DF0: .word 0x0237C694 +_022F1DEC: .word ov29_0237C6A4 +_022F1DF0: .word ov29_0237C694 _022F1DF4: .word 0x00000B9A _022F1DF8: .word 0x00000B9B _022F1DFC: .word 0x00000B9C _022F1E00: .word 0x00000708 _022F1E04: - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0] tst r0, #0x800 bne _022F1E3C @@ -1772,15 +1772,15 @@ _022F1E04: cmp r0, #0 beq _022F1E3C bl HideTileGrid - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 mov r1, #0 strb r1, [r0, #2] _022F1E3C: - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0] tst r0, #0x200 beq _022F1E90 - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0, #2] tst r0, #2 beq _022F1E90 @@ -1801,25 +1801,25 @@ _022F1E88: _022F1E90: mov r0, #0 str r0, [sp, #0x44] - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0] tst r0, #0x100 beq _022F1ECC - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 ldrb r0, [r0, #1] cmp r0, #0 - ldreq r0, _022F1DE4 ; =0x0237C9A4 + ldreq r0, _022F1DE4 ; =ov29_0237C9A4 moveq r1, #0 streqh r1, [r0, #4] mov r1, #1 - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 b _022F1ED4 _022F1ECC: - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 mov r1, #0 _022F1ED4: strb r1, [r0, #1] - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 mov r8, #0 ldrh r0, [r0, #2] tst r0, #0x800 @@ -1831,14 +1831,14 @@ _022F1EF4: _022F1EF8: cmp sl, #0 beq _022F1F68 - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 ldrb r0, [r0, #2] cmp r0, #0 bne _022F1F68 mov r0, r6 add r1, sp, #0xbc bl GetEntityTouchscreenArea - ldr r0, _022F1DEC ; =0x0237C6A4 + ldr r0, _022F1DEC ; =ov29_0237C6A4 ldrh r0, [r0] tst r0, #0x100 beq _022F1F68 @@ -1883,10 +1883,10 @@ _022F1FA0: b _022F204C _022F1FC0: and r8, r8, #7 - ldr r1, _022F1DE0 ; =0x0235171C + ldr r1, _022F1DE0 ; =DIRECTIONS_XY mov r2, r8, lsl #2 ldrsh r3, [r1, r2] - ldr r2, _022F1DE0 ; =0x0235171C + ldr r2, _022F1DE0 ; =DIRECTIONS_XY ldrsh r0, [r6, #4] add r2, r2, r8, lsl #2 ldrsh r1, [r6, #6] @@ -1942,7 +1942,7 @@ _022F2090: cmp fp, #1 blt _022F1FA0 _022F2098: - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 mov r1, #1 strb r1, [r0, #2] ldrb r0, [sb, #0x4c] @@ -1954,11 +1954,11 @@ _022F20B8: ldr r0, [sp, #0x38] cmp r0, #0 bne _022F20E4 - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0] tst r0, #0x200 beq _022F20EC - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0, #2] tst r0, #0x100 beq _022F20EC @@ -2006,13 +2006,13 @@ _022F2150: cmp r0, #0 bne _022F2970 _022F2180: - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1a000 ldrb r0, [r0, #0x23e] cmp r0, #0 bne _022F21B4 - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0, #2] tst r0, #4 beq _022F21B4 @@ -2025,7 +2025,7 @@ _022F21B4: mov r0, #0 str r0, [sp, #0x3c] str r0, [sp, #0x40] - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r0, [r0] add r1, r0, #0x100 ldrsh r3, [r1, #0xd8] @@ -2044,7 +2044,7 @@ _022F21B4: mov r7, r0 b _022F23C4 _022F2210: - ldr r1, _022F1DE4 ; =0x0237C9A4 + ldr r1, _022F1DE4 ; =ov29_0237C9A4 ldrb r1, [r1, #2] cmp r1, #0 bne _022F2324 @@ -2121,19 +2121,19 @@ _022F2324: ldrb r0, [r0, #0x78c] cmp r0, #0 beq _022F234C - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 ldrb r0, [r0, #1] cmp r0, #0 - ldreq r0, _022F1DF0 ; =0x0237C694 + ldreq r0, _022F1DF0 ; =ov29_0237C694 ldreqh r1, [r0, #2] moveq r2, r1 beq _022F2368 _022F234C: - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r1, [r0] ldrb r0, [r5, #0x35] cmp r0, #0 - ldrne r0, _022F1DF0 ; =0x0237C694 + ldrne r0, _022F1DF0 ; =ov29_0237C694 ldrneh r2, [r0, #2] moveq r2, r1 _022F2368: @@ -2188,20 +2188,20 @@ _022F23C4: cmp r0, #0 beq _022F243C bl HideTileGrid - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 mov r1, #0 strb r1, [r0, #2] _022F243C: - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 cmp sl, #0 ldr r0, [r0] add r0, r0, #0x100 strh r4, [r0, #0xdc] - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x100 strh r4, [r0, #0xde] - ldrne r0, _022F1DE4 ; =0x0237C9A4 + ldrne r0, _022F1DE4 ; =ov29_0237C9A4 ldrneb r0, [r0, #2] cmpne r0, #0 beq _022F248C @@ -2215,7 +2215,7 @@ _022F243C: _022F248C: cmp r7, #0 blt _022F2944 - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 ldrb r0, [r0, #1] cmp r0, #0 beq _022F24AC @@ -2230,7 +2230,7 @@ _022F24AC: str r0, [sp, #0x28] and r0, r7, #7 strb r0, [sb, #0x4c] - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 ldrb r0, [r0, #2] cmp r0, #0 beq _022F251C @@ -2241,11 +2241,11 @@ _022F24AC: mov r2, r7 mov r0, r6 bl ov29_023049A8 - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x100 strh r4, [r0, #0xd8] - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x100 strh r4, [r0, #0xda] @@ -2257,13 +2257,13 @@ _022F251C: add r1, sp, #0x90 bl GetPressedButtons ldr fp, [r6, #0xb4] - ldr r1, _022F1DE0 ; =0x0235171C + ldr r1, _022F1DE0 ; =DIRECTIONS_XY ldrb r3, [fp, #0x4c] ldrsh r2, [r6, #4] ldrsh r0, [r6, #6] mov sl, r3, lsl #2 ldrsh r1, [r1, sl] - ldr sl, _022F1DE0 ; =0x0235171C + ldr sl, _022F1DE0 ; =DIRECTIONS_XY add r3, sl, r3, lsl #2 add r1, r2, r1 ldrsh r3, [r3, #2] @@ -2359,7 +2359,7 @@ _022F26B8: add r0, fp, #0x4a mov r1, #2 bl SetMonsterActionFields - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 mov r1, #2 ldrh r0, [r0] tst r0, #2 @@ -2388,7 +2388,7 @@ _022F26B8: ldr r1, [sp, #0x14] ldrsh r1, [r1, #6] strh r1, [r2, #0x80] - ldr r1, _022F1DDC ; =0x02353538 + ldr r1, _022F1DDC ; =ov29_02353538 ldr r2, [r1] mov r1, r0 strb r1, [r2, #0x10] @@ -2455,7 +2455,7 @@ _022F2804: _022F282C: mov r0, #1 bl SetLeaderActionFields - ldr r1, _022F1DDC ; =0x02353538 + ldr r1, _022F1DDC ; =ov29_02353538 mov r3, #1 ldr r0, [r1] sub r2, r3, #2 @@ -2473,7 +2473,7 @@ _022F2864: ldr r0, [sp, #0x40] cmp r0, #0 beq _022F289C - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldrh r2, [sp, #0xb2] ldr r1, [r0] mov r0, #7 @@ -2483,7 +2483,7 @@ _022F2864: strh r2, [r1, #0xda] bl sub_02017CCC _022F289C: - ldr r0, _022F1DF0 ; =0x0237C694 + ldr r0, _022F1DF0 ; =ov29_0237C694 ldrh r0, [r0] tst r0, #2 ldreq r0, [sp, #0x3c] @@ -2502,7 +2502,7 @@ _022F289C: ldr r0, [r6, #0xb4] ldrb r0, [r0, #0xd0] cmp r0, #2 - ldrne r0, _022F1DDC ; =0x02353538 + ldrne r0, _022F1DDC ; =ov29_02353538 movne r1, #1 ldrne r0, [r0] strneb r1, [r0, #0x78b] @@ -2519,21 +2519,21 @@ _022F2910: mov r0, #0x23 bl ov29_022EA3B4 _022F2920: - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x100 strh r4, [r0, #0xd8] - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x100 strh r4, [r0, #0xda] b _022F2964 _022F2944: - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x100 strh r4, [r0, #0xd8] - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x100 strh r4, [r0, #0xda] @@ -2563,7 +2563,7 @@ _022F29B0: ldrb r0, [sp, #0xb6] cmp r0, #0 bne _022F2A00 - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 mov r1, #0 ldr r0, [r0] strb r1, [r0, #0x78c] @@ -2624,7 +2624,7 @@ _022F2A70: bl sub_02006B70 _022F2A9C: bl ov29_022E0B44 - ldr r0, _022F1DE4 ; =0x0237C9A4 + ldr r0, _022F1DE4 ; =ov29_0237C9A4 mov r1, #0 strb r1, [r0, #2] strb r1, [r5, #0x35] @@ -2637,7 +2637,7 @@ _022F2A9C: beq _022F2B18 cmp r0, #0x2b bne _022F2AEC - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 mov r2, #1 ldr r1, [r0] strb r2, [r1, #8] @@ -2647,7 +2647,7 @@ _022F2AEC: ldrh r0, [sb, #0x4a] cmp r0, #0x2e bne _022F2B34 - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 mov r3, #1 ldr r2, [r0] mov r1, #0 @@ -2658,7 +2658,7 @@ _022F2AEC: _022F2B18: mov r0, #0xf bl AdvanceFrame - ldr r0, _022F1DDC ; =0x02353538 + ldr r0, _022F1DDC ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #8] cmp r0, #0 @@ -2691,8 +2691,8 @@ _022F2B6C: ov29_022F2B74: ; 0x022F2B74 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x18 - ldr r1, _022F2FBC ; =0x02353538 - ldr r8, _022F2FC0 ; =0x0237C9A4 + ldr r1, _022F2FBC ; =ov29_02353538 + ldr r8, _022F2FC0 ; =ov29_0237C9A4 ldr r1, [r1] ldrb r2, [r8, #1] add r1, r1, #0x21c @@ -2708,7 +2708,7 @@ ov29_022F2B74: ; 0x022F2B74 str r0, [sp, #8] add r7, r6, #0x200 _022F2BBC: - ldr r0, _022F2FC8 ; =0x023526D8 + ldr r0, _022F2FC8 ; =ov29_023526D8 mov r1, #6 ldrh r2, [sp, #0x10] mla r0, r4, r1, r0 @@ -2784,7 +2784,7 @@ _022F2BBC: strh r2, [sp, #0x14] ldrsh ip, [r8, #4] and r3, r1, r0 - ldr r0, _022F2FD0 ; =0x020AFC4C + ldr r0, _022F2FD0 ; =_020AFC4C add ip, ip, ip, lsr #31 strh r3, [sp, #0x16] mov r3, ip, asr #1 @@ -2821,7 +2821,7 @@ _022F2D58: cmp r3, #8 bge _022F2F7C ldrb r0, [r8, #3] - ldr r2, _022F2FC0 ; =0x0237C9A4 + ldr r2, _022F2FC0 ; =ov29_0237C9A4 cmp r0, #0 ldrneb r0, [r8] ldrsh r2, [r2, #4] @@ -2829,10 +2829,10 @@ _022F2D58: mov r0, #0xc mul r1, r3, r0 add r2, r2, r2, lsr #31 - ldr r0, _022F2FD4 ; =0x023526F0 + ldr r0, _022F2FD4 ; =ov29_023526F0 mov r2, r2, asr #1 and r2, r2, #7 - ldr r3, _022F2FD8 ; =0x023526F2 + ldr r3, _022F2FD8 ; =ov29_023526F2 add r7, r2, #0xa ldrsh r4, [r0, r1] ldrsh r2, [r3, r1] @@ -2845,7 +2845,7 @@ _022F2D58: add r8, r3, #0x62 mov r6, #0 ble _022F2F7C - ldr r3, _022F2FDC ; =0x023526F4 + ldr r3, _022F2FDC ; =ov29_023526F4 mov r4, #0x400 ldr r2, _022F2FE0 ; =0x000003FF ldr r3, [r3, r1] @@ -2938,7 +2938,7 @@ _022F2E0C: ldr r2, [sp, #4] orr r0, r1, r0, lsr #16 strh r0, [sp, #0x16] - ldr r0, _022F2FD0 ; =0x020AFC4C + ldr r0, _022F2FD0 ; =_020AFC4C add r1, sp, #0x10 ldr r0, [r0] strh r3, [sp, #0x14] @@ -2952,7 +2952,7 @@ _022F2F74: cmp r6, sl blt _022F2E0C _022F2F7C: - ldr r0, _022F2FC0 ; =0x0237C9A4 + ldr r0, _022F2FC0 ; =ov29_0237C9A4 ldrb r1, [r0, #2] cmp r1, #0 ldrneb r2, [r5, #0x36] @@ -2970,23 +2970,23 @@ _022F2FB4: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F2FBC: .word 0x02353538 -_022F2FC0: .word 0x0237C9A4 +_022F2FBC: .word ov29_02353538 +_022F2FC0: .word ov29_0237C9A4 _022F2FC4: .word 0x0000013F -_022F2FC8: .word 0x023526D8 +_022F2FC8: .word ov29_023526D8 _022F2FCC: .word 0xFFFF000F -_022F2FD0: .word 0x020AFC4C -_022F2FD4: .word 0x023526F0 -_022F2FD8: .word 0x023526F2 -_022F2FDC: .word 0x023526F4 +_022F2FD0: .word _020AFC4C +_022F2FD4: .word ov29_023526F0 +_022F2FD8: .word ov29_023526F2 +_022F2FDC: .word ov29_023526F4 _022F2FE0: .word 0x000003FF arm_func_end ov29_022F2B74 arm_func_start ov29_022F2FE4 ov29_022F2FE4: ; 0x022F2FE4 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r1, _022F3084 ; =0x02353538 - ldr r2, _022F3088 ; =0x0237C694 + ldr r1, _022F3084 ; =ov29_02353538 + ldr r2, _022F3088 ; =ov29_0237C694 ldr r6, [r1] mov r4, #0 ldrb r5, [r6, #0x78c] @@ -3003,11 +3003,11 @@ ov29_022F2FE4: ; 0x022F2FE4 add r0, r0, #0x100 strh r3, [r0, #0xd8] ldr r0, [r1] - ldr r7, _022F3088 ; =0x0237C694 + ldr r7, _022F3088 ; =ov29_0237C694 add r0, r0, #0x100 strh r3, [r0, #0xda] ldrh r0, [r2] - ldr r6, _022F3084 ; =0x02353538 + ldr r6, _022F3084 ; =ov29_02353538 tst r0, #0x100 movne r4, #1 b _022F3070 @@ -3027,15 +3027,15 @@ _022F3070: bne _022F3050 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022F3084: .word 0x02353538 -_022F3088: .word 0x0237C694 +_022F3084: .word ov29_02353538 +_022F3088: .word ov29_0237C694 arm_func_end ov29_022F2FE4 arm_func_start ShouldLeaderKeepRunning ShouldLeaderKeepRunning: ; 0x022F308C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x68 - ldr r0, _022F35D4 ; =0x02353538 + ldr r0, _022F35D4 ; =ov29_02353538 ldr r5, [r0] bl GetLeader mov r4, r0 @@ -3047,9 +3047,9 @@ ShouldLeaderKeepRunning: ; 0x022F308C ldrb r7, [r2, #0x4c] bl GetTile ldrb r1, [r5, #0x78b] - ldr r3, _022F35D8 ; =0x0235171C + ldr r3, _022F35D8 ; =DIRECTIONS_XY mov r5, r7, lsl #2 - ldr r2, _022F35DC ; =0x0235171E + ldr r2, _022F35DC ; =ov29_0235171E ldrsh r6, [r3, r5] mov r8, r0 cmp r1, #0 @@ -3093,7 +3093,7 @@ _022F3160: bne _022F35CC _022F3170: mvn r6, #0 - ldr r5, _022F35D8 ; =0x0235171C + ldr r5, _022F35D8 ; =DIRECTIONS_XY b _022F31C4 _022F317C: add r0, r7, r6 @@ -3123,11 +3123,11 @@ _022F31C4: mov r0, r0, lsl #0x1d add r2, r7, #3 mov r2, r2, lsl #0x1d - ldr r6, _022F35D8 ; =0x0235171C + ldr r6, _022F35D8 ; =DIRECTIONS_XY mov r5, r1, lsr #0x1b mov fp, r0, lsr #0x1b ldrsh r1, [r6, r5] - ldr r8, _022F35DC ; =0x0235171E + ldr r8, _022F35DC ; =ov29_0235171E mov r3, r2, lsr #0x1b add r1, sl, r1 ldrsh r2, [r6, r3] @@ -3201,7 +3201,7 @@ _022F32DC: bne _022F3368 ldrb r0, [r1, #0x20] cmp r0, #0 - ldreq r0, _022F35D4 ; =0x02353538 + ldreq r0, _022F35D4 ; =ov29_02353538 ldreq r0, [r0] addeq r0, r0, #0x1a000 ldreqb r0, [r0, #0x244] @@ -3220,7 +3220,7 @@ _022F3324: bne _022F3368 ldrb r0, [r1, #0x20] cmp r0, #0 - ldreq r0, _022F35D4 ; =0x02353538 + ldreq r0, _022F35D4 ; =ov29_02353538 ldreq r0, [r0] addeq r0, r0, #0x1a000 ldreqb r0, [r0, #0x244] @@ -3392,9 +3392,9 @@ _022F35CC: add sp, sp, #0x68 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F35D4: .word 0x02353538 -_022F35D8: .word 0x0235171C -_022F35DC: .word 0x0235171E +_022F35D4: .word ov29_02353538 +_022F35D8: .word DIRECTIONS_XY +_022F35DC: .word ov29_0235171E arm_func_end ShouldLeaderKeepRunning arm_func_start ov29_022F35E0 @@ -3452,7 +3452,7 @@ CheckLeaderTile: ; 0x022F3634 _022F3698: ldrh r0, [r5] tst r0, #0x200 - ldrne r0, _022F37CC ; =0x02353538 + ldrne r0, _022F37CC ; =ov29_02353538 movne r1, #1 ldrne r0, [r0] strneb r1, [r0, #5] @@ -3525,7 +3525,7 @@ _022F37A0: mov r0, r4 bl ShouldMonsterRunAway cmp r0, #0 - ldreq r0, _022F37CC ; =0x02353538 + ldreq r0, _022F37CC ; =ov29_02353538 moveq r1, #4 ldreq r0, [r0] streq r1, [r0, #0x614] @@ -3535,7 +3535,7 @@ _022F37C0: bl HiddenStairsTrigger ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022F37CC: .word 0x02353538 +_022F37CC: .word ov29_02353538 arm_func_end CheckLeaderTile arm_func_start ov29_022F37D0 @@ -3645,7 +3645,7 @@ _022F3928: arm_func_start ChangeLeader ChangeLeader: ; 0x022F3934 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r0, _022F3AE4 ; =0x02353538 + ldr r0, _022F3AE4 ; =ov29_02353538 ldr r0, [r0] ldr r6, [r0, #0xc8] bl GetLeader @@ -3673,7 +3673,7 @@ _022F398C: bl LogMessageByIdWithPopup ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _022F399C: - ldr r0, _022F3AE4 ; =0x02353538 + ldr r0, _022F3AE4 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x790] cmp r0, #0 @@ -3723,7 +3723,7 @@ _022F3A40: mov r5, r0, asr #0x10 cmp r5, #4 blt _022F39D8 - ldr r0, _022F3AF4 ; =0x0235355C + ldr r0, _022F3AF4 ; =ov29_0235355C mov r1, #0 str r1, [r0] add r3, sl, #0x4a @@ -3761,11 +3761,11 @@ _022F3A6C: bl ov29_022F9EA0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F3AE4: .word 0x02353538 +_022F3AE4: .word ov29_02353538 _022F3AE8: .word 0x00000BA4 _022F3AEC: .word 0x00000BA5 _022F3AF0: .word 0x00000BA6 -_022F3AF4: .word 0x0235355C +_022F3AF4: .word ov29_0235355C _022F3AF8: .word 0x00000BA7 arm_func_end ChangeLeader @@ -3868,7 +3868,7 @@ _022F3C40: beq _022F3E88 _022F3C4C: bl ov29_022F2FE4 - ldr r1, _022F3E90 ; =0x0237C9A4 + ldr r1, _022F3E90 ; =ov29_0237C9A4 mov r2, #0 strb r2, [r1, #1] mov r0, #1 @@ -3879,7 +3879,7 @@ _022F3C4C: ldr r0, _022F3E94 ; =0x00000BA8 bl ov29_0234FC50 bl ov29_022E0B44 - ldr r6, _022F3E90 ; =0x0237C9A4 + ldr r6, _022F3E90 ; =ov29_0237C9A4 mvn r8, #0 _022F3C84: mov r0, #0x62 @@ -3893,7 +3893,7 @@ _022F3C84: add r0, r0, #1 strh r0, [r6, #4] _022F3CAC: - ldr r0, _022F3E98 ; =0x0237C6A4 + ldr r0, _022F3E98 ; =ov29_0237C6A4 mov r1, #0 ldrh r0, [r0] tst r0, #0x40 @@ -3920,7 +3920,7 @@ _022F3CC8: strne r0, [sp, #4] b _022F3DE0 _022F3D10: - ldr r0, _022F3E9C ; =0x0237C694 + ldr r0, _022F3E9C ; =ov29_0237C694 ldrh r0, [r0] tst r0, #0x100 and r0, r0, #0xf0 @@ -3932,7 +3932,7 @@ _022F3D10: mov r1, #0 strb r1, [r6, #1] strh r1, [r6, #4] - ldr r1, _022F3E9C ; =0x0237C694 + ldr r1, _022F3E9C ; =ov29_0237C694 ldrh r1, [r1, #2] and r0, r0, r1 _022F3D4C: @@ -3967,7 +3967,7 @@ _022F3DB0: tst r7, #1 beq _022F3DE0 _022F3DC0: - ldr r0, _022F3E9C ; =0x0237C694 + ldr r0, _022F3E9C ; =ov29_0237C694 ldrh r0, [r0, #2] tst r0, #2 movne r4, #1 @@ -4015,7 +4015,7 @@ _022F3E5C: strb r5, [sb, #0x4c] bl sub_02017CCC _022F3E68: - ldr r1, _022F3E90 ; =0x0237C9A4 + ldr r1, _022F3E90 ; =ov29_0237C9A4 mov r0, #0 strb r0, [r1, #1] strh r0, [r1, #4] @@ -4027,10 +4027,10 @@ _022F3E88: add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F3E90: .word 0x0237C9A4 +_022F3E90: .word ov29_0237C9A4 _022F3E94: .word 0x00000BA8 -_022F3E98: .word 0x0237C6A4 -_022F3E9C: .word 0x0237C694 +_022F3E98: .word ov29_0237C6A4 +_022F3E9C: .word ov29_0237C694 arm_func_end ov29_022F3B98 arm_func_start ov29_022F3EA0 @@ -4054,7 +4054,7 @@ _022F3ECC: _022F3EDC: bl ov29_022E0C9C _022F3EE0: - ldr r1, _022F40AC ; =0x02353538 + ldr r1, _022F40AC ; =ov29_02353538 ldr r0, _022F40B0 ; =0x0001A224 ldr r7, [r1] ldr r2, [sp] @@ -4181,7 +4181,7 @@ _022F40A4: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022F40AC: .word 0x02353538 +_022F40AC: .word ov29_02353538 _022F40B0: .word 0x0001A224 _022F40B4: .word 0x0001A226 arm_func_end ov29_022F3EA0 @@ -4223,7 +4223,7 @@ ov29_022F40B8: ; 0x022F40B8 mov r7, r0 cmp r6, r7 movgt r1, #1 - ldr r0, _022F4264 ; =0x023526C8 + ldr r0, _022F4264 ; =ov29_023526C8 movle r1, #0 add r0, r0, r1, lsl #3 ldrb r0, [r5, r0] @@ -4249,7 +4249,7 @@ _022F4190: _022F4198: add r0, sp, #0 ldr r8, [r0, r4, lsl #2] - ldr r0, _022F4268 ; =0x0235171C + ldr r0, _022F4268 ; =DIRECTIONS_XY mov r1, r8, lsl #2 ldrsh r1, [r0, r1] ldrsh r2, [sl, #4] @@ -4257,7 +4257,7 @@ _022F4198: add r1, r2, r1 sub r0, r1, r0 bl abs - ldr r1, _022F4268 ; =0x0235171C + ldr r1, _022F4268 ; =DIRECTIONS_XY ldrsh r3, [sl, #6] add r1, r1, r8, lsl #2 ldrsh r2, [r1, #2] @@ -4304,8 +4304,8 @@ _022F425C: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F4264: .word 0x023526C8 -_022F4268: .word 0x0235171C +_022F4264: .word ov29_023526C8 +_022F4268: .word DIRECTIONS_XY arm_func_end ov29_022F40B8 arm_func_start ov29_022F426C @@ -4316,7 +4316,7 @@ ov29_022F426C: ; 0x022F426C ldrsh r0, [r5] ldrsh r1, [r5, #2] bl GetTileSafe - ldr r1, _022F42D4 ; =0x02353538 + ldr r1, _022F42D4 ; =ov29_02353538 mov r4, r0 ldr r0, [r1] add r0, r0, #0x1a000 @@ -4337,7 +4337,7 @@ ov29_022F426C: ; 0x022F426C and r0, r0, #0xff ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022F42D4: .word 0x02353538 +_022F42D4: .word ov29_02353538 arm_func_end ov29_022F426C arm_func_start ov29_022F42D8 @@ -4368,7 +4368,7 @@ _022F4318: ldrneb r0, [r0, #7] cmpne r0, #0 bxeq lr - ldr r0, _022F434C ; =0x02353538 + ldr r0, _022F434C ; =ov29_02353538 mov r3, #0 ldr r2, [r0] sub r1, r3, #1 @@ -4377,7 +4377,7 @@ _022F4318: str r1, [r0, #0x614] bx lr .align 2, 0 -_022F434C: .word 0x02353538 +_022F434C: .word ov29_02353538 arm_func_end ov29_022F42F8 arm_func_start ov29_022F4350 @@ -4407,7 +4407,7 @@ ov29_022F4370: ; 0x022F4370 mov ip, sb mov fp, sb mov r2, lr - ldr r1, _022F44D4 ; =0x020AF6B8 + ldr r1, _022F44D4 ; =BAG_ITEMS_PTR_MIRROR mov r0, #6 b _022F441C _022F43AC: @@ -4492,7 +4492,7 @@ _022F4494: bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F44D4: .word 0x020AF6B8 +_022F44D4: .word BAG_ITEMS_PTR_MIRROR _022F44D8: .word 0x00000BA9 _022F44DC: .word 0x00003F07 _022F44E0: .word 0x00000BAA @@ -4510,7 +4510,7 @@ ov29_022F44F0: ; 0x022F44F0 mov sb, r1 mov r6, r8 mov fp, r7 - ldr r5, _022F45BC ; =0x020AF6B8 + ldr r5, _022F45BC ; =BAG_ITEMS_PTR_MIRROR mov r4, #6 b _022F45B0 _022F4518: @@ -4559,7 +4559,7 @@ _022F45B0: blt _022F4518 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F45BC: .word 0x020AF6B8 +_022F45BC: .word BAG_ITEMS_PTR_MIRROR _022F45C0: .word 0x00000BA9 _022F45C4: .word 0x00003F07 _022F45C8: .word 0x00000BAD @@ -4754,7 +4754,7 @@ _022F4878: mov r1, r4 bl ov29_02321164 ldrb r0, [sb, #7] - ldr r1, _022F48D4 ; =0x02353538 + ldr r1, _022F48D4 ; =ov29_02353538 cmp r0, #0 ldreqh r0, [sb] orreq r0, r0, #0x4000 @@ -4773,7 +4773,7 @@ _022F48C4: .word 0x00001317 _022F48C8: .word 0x00000BB2 _022F48CC: .word 0x00000BAE _022F48D0: .word 0x00000BB3 -_022F48D4: .word 0x02353538 +_022F48D4: .word ov29_02353538 arm_func_end ov29_022F45CC arm_func_start ov29_022F48D8 @@ -4829,7 +4829,7 @@ _022F4928: mov r0, r6 bl ov29_02321164 ldrb r0, [r5, #7] - ldr r1, _022F49DC ; =0x02353538 + ldr r1, _022F49DC ; =ov29_02353538 cmp r0, #0 ldreqh r0, [r5] orreq r0, r0, #0x4000 @@ -4846,7 +4846,7 @@ _022F49C8: _022F49D0: .word 0x00000BAE _022F49D4: .word 0x00001317 _022F49D8: .word 0x00000BB5 -_022F49DC: .word 0x02353538 +_022F49DC: .word ov29_02353538 arm_func_end ov29_022F48D8 arm_func_start ov29_022F49E0 @@ -4948,7 +4948,7 @@ _022F4B24: movlt r0, #0 strltb r0, [r6, #1] blt _022F4B70 - ldr r2, _022F4BD0 ; =0x02353538 + ldr r2, _022F4BD0 ; =ov29_02353538 add r1, r0, r0, lsl #3 ldr r0, [r2] add r0, r0, #0x3f4 @@ -4966,7 +4966,7 @@ _022F4B70: mov r1, r4 bl ov29_02321164 ldrb r0, [r5, #7] - ldr r1, _022F4BD0 ; =0x02353538 + ldr r1, _022F4BD0 ; =ov29_02353538 cmp r0, #0 ldreqh r0, [r5] orreq r0, r0, #0x4000 @@ -4982,7 +4982,7 @@ _022F4BC0: .align 2, 0 _022F4BC8: .word 0x00001565 _022F4BCC: .word 0x00000BAE -_022F4BD0: .word 0x02353538 +_022F4BD0: .word ov29_02353538 _022F4BD4: .word 0x00001317 _022F4BD8: .word 0x00000BB6 arm_func_end ov29_022F49E0 @@ -5104,7 +5104,7 @@ _022F4D48: mov r0, r5 bl LogMessageByIdWithPopupCheckUser mov r0, r5 - ldr r1, _022F4DA8 ; =0x02353538 + ldr r1, _022F4DA8 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc4] @@ -5116,7 +5116,7 @@ _022F4D98: .word 0x00000BAE _022F4D9C: .word 0x00000BB8 _022F4DA0: .word 0x00001317 _022F4DA4: .word 0x00000BB9 -_022F4DA8: .word 0x02353538 +_022F4DA8: .word ov29_02353538 arm_func_end ov29_022F4BF8 arm_func_start ov29_022F4DAC @@ -5254,7 +5254,7 @@ _022F4F94: bl ov29_02346FB8 cmp r0, #0 blt _022F4FD0 - ldr r1, _022F5050 ; =0x02353538 + ldr r1, _022F5050 ; =ov29_02353538 add r0, r0, r0, lsl #3 ldr r2, [r1] ldrh r1, [sp] @@ -5282,7 +5282,7 @@ _022F4FDC: ldr r1, _022F5058 ; =0x00000BBD mov r0, r8 bl LogMessageByIdWithPopupCheckUser - ldr r1, _022F5050 ; =0x02353538 + ldr r1, _022F5050 ; =ov29_02353538 mov r0, r8 ldr r1, [r1] add r1, r1, #0x4000 @@ -5301,7 +5301,7 @@ _022F5040: .word 0x00000BAE _022F5044: .word 0x00000BB1 _022F5048: .word 0x00000BBB _022F504C: .word 0x00000BBC -_022F5050: .word 0x02353538 +_022F5050: .word ov29_02353538 _022F5054: .word 0x00001317 _022F5058: .word 0x00000BBD arm_func_end ov29_022F4DAC @@ -5437,7 +5437,7 @@ _022F522C: ldr r1, _022F5284 ; =0x00000BBD mov r0, r7 bl LogMessageByIdWithPopupCheckUser - ldr r1, _022F5288 ; =0x02353538 + ldr r1, _022F5288 ; =ov29_02353538 mov r0, r7 ldr r1, [r1] add r1, r1, #0x4000 @@ -5456,5 +5456,5 @@ _022F5278: .word 0x00000BBB _022F527C: .word 0x00000BBC _022F5280: .word 0x00001317 _022F5284: .word 0x00000BBD -_022F5288: .word 0x02353538 +_022F5288: .word ov29_02353538 arm_func_end ov29_022F505C diff --git a/asm/overlay_29_022F52B0.s b/asm/overlay_29_022F52B0.s index 5d2acae9..0e36b76b 100644 --- a/asm/overlay_29_022F52B0.s +++ b/asm/overlay_29_022F52B0.s @@ -23,7 +23,7 @@ _022F52C8: .word UseSingleUseItem arm_func_start UseSingleUseItemWrapper UseSingleUseItemWrapper: ; 0x022F52CC ldr r2, [r0, #0xb4] - ldr r1, _022F52F0 ; =0x02353538 + ldr r1, _022F52F0 ; =ov29_02353538 ldrb r2, [r2, #0x54] ldr r1, [r1] ldr ip, _022F52F4 ; =UseSingleUseItem @@ -32,7 +32,7 @@ UseSingleUseItemWrapper: ; 0x022F52CC ldr r1, [r1, #0xb28] bx ip .align 2, 0 -_022F52F0: .word 0x02353538 +_022F52F0: .word ov29_02353538 _022F52F4: .word UseSingleUseItem arm_func_end UseSingleUseItemWrapper @@ -118,7 +118,7 @@ _022F5334: cmp r0, #0 beq _022F5498 mov r7, #0 - ldr r4, _022F54B8 ; =0x02353538 + ldr r4, _022F54B8 ; =ov29_02353538 add r6, sp, #8 mov r5, r7 _022F5440: @@ -146,7 +146,7 @@ _022F5484: cmp r7, #4 blt _022F5440 _022F5498: - ldr r1, _022F54B8 ; =0x02353538 + ldr r1, _022F54B8 ; =ov29_02353538 mov r0, sb ldr r1, [r1] add r1, r1, #0x4000 @@ -156,7 +156,7 @@ _022F54B0: add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_022F54B8: .word 0x02353538 +_022F54B8: .word ov29_02353538 arm_func_end UseSingleUseItem arm_func_start UseThrowableItem @@ -488,7 +488,7 @@ _022F5944: ldrb r1, [r8, #0x4c] mov r0, sb bl ov29_02304A48 - ldr r1, _022F5990 ; =0x02353538 + ldr r1, _022F5990 ; =ov29_02353538 mov r0, sb ldr r1, [r1] add r1, r1, #0x4000 @@ -502,7 +502,7 @@ _022F5980: .word 0x00000BAE _022F5984: .word 0x00000BBE _022F5988: .word 0x00000103 _022F598C: .word 0x00000BBF -_022F5990: .word 0x02353538 +_022F5990: .word ov29_02353538 arm_func_end UseThrowableItem arm_func_start ItemIsActive__022F5994 @@ -549,7 +549,7 @@ ov29_022F5A0C: ; 0x022F5A0C stmdb sp!, {r4, lr} mov r4, r0 bl GetLeader - ldr r1, _022F5A3C ; =0x02353538 + ldr r1, _022F5A3C ; =ov29_02353538 ldrb r3, [r4, #4] ldr r1, [r1] mov r2, #0 @@ -559,7 +559,7 @@ ov29_022F5A0C: ; 0x022F5A0C bl ov29_022F5A40 ldmia sp!, {r4, pc} .align 2, 0 -_022F5A3C: .word 0x02353538 +_022F5A3C: .word ov29_02353538 arm_func_end ov29_022F5A0C arm_func_start ov29_022F5A40 @@ -681,7 +681,7 @@ _022F5BE4: ldrb r0, [sb, #0xbc] cmp r0, #7 bne _022F5C3C - ldr r0, _022F5DA4 ; =0x02353538 + ldr r0, _022F5DA4 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x790] cmp r0, #0 @@ -759,14 +759,14 @@ _022F5CE8: ldr r0, [sp, #4] cmp r0, #0 bne _022F5D3C - ldr r1, _022F5DB8 ; =0x02352750 + ldr r1, _022F5DB8 ; =ov29_02352750 mov r0, r5 bl sub_02020880 cmp r0, #0 beq _022F5D3C subs r6, r6, #1 bne _022F5D34 - ldr r1, _022F5DBC ; =0x02352758 + ldr r1, _022F5DBC ; =ov29_02352758 mov r0, r5 bl strcpy _022F5D34: @@ -804,13 +804,13 @@ _022F5D94: .align 2, 0 _022F5D9C: .word 0x00000BC1 _022F5DA0: .word 0x00000BC2 -_022F5DA4: .word 0x02353538 +_022F5DA4: .word ov29_02353538 _022F5DA8: .word 0x00000BC3 _022F5DAC: .word 0x000003E7 _022F5DB0: .word 0x0000025E _022F5DB4: .word 0x000004D3 -_022F5DB8: .word 0x02352750 -_022F5DBC: .word 0x02352758 +_022F5DB8: .word ov29_02352750 +_022F5DBC: .word ov29_02352758 arm_func_end ov29_022F5A40 arm_func_start ov29_022F5DC0 @@ -818,7 +818,7 @@ ov29_022F5DC0: ; 0x022F5DC0 stmdb sp!, {r4, lr} mov r4, r0 bl GetLeader - ldr r1, _022F5DF0 ; =0x02353538 + ldr r1, _022F5DF0 ; =ov29_02353538 ldrb r3, [r4, #4] ldr r1, [r1] mov r2, #0 @@ -828,7 +828,7 @@ ov29_022F5DC0: ; 0x022F5DC0 bl ov29_022F5DF4 ldmia sp!, {r4, pc} .align 2, 0 -_022F5DF0: .word 0x02353538 +_022F5DF0: .word ov29_02353538 arm_func_end ov29_022F5DC0 arm_func_start ov29_022F5DF4 @@ -921,7 +921,7 @@ ov29_022F5F18: ; 0x022F5F18 bl EntityIsValid__022F528C cmp r0, #0 beq _022F5F88 - ldr r0, _022F6050 ; =0x02353538 + ldr r0, _022F6050 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] @@ -1001,7 +1001,7 @@ _022F6048: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_022F6050: .word 0x02353538 +_022F6050: .word ov29_02353538 _022F6054: .word 0x00000DFD arm_func_end ov29_022F5F18 @@ -1011,7 +1011,7 @@ ov29_022F6058: ; 0x022F6058 sub sp, sp, #0x14 mov sl, r0 ldr r7, [sl, #0xb4] - ldr r2, _022F61F8 ; =0x0237CA80 + ldr r2, _022F61F8 ; =ov29_0237CA80 mov r3, #0 add r0, sp, #0xc str r3, [r2] @@ -1085,7 +1085,7 @@ _022F6168: cmp r0, #0 beq _022F61F0 cmp sb, #0x160 - ldreq r0, _022F61F8 ; =0x0237CA80 + ldreq r0, _022F61F8 ; =ov29_0237CA80 ldreq r0, [r0] cmpeq r0, #0 bne _022F6198 @@ -1098,11 +1098,11 @@ _022F6198: cmpne sb, #0x160 beq _022F61E8 ldrb r1, [r7, #0x4c] - ldr r0, _022F6208 ; =0x0235171C + ldr r0, _022F6208 ; =DIRECTIONS_XY ldrsh r3, [sl, #4] mov r1, r1, lsl #2 ldrsh r2, [r0, r1] - ldr r1, _022F620C ; =0x0235171E + ldr r1, _022F620C ; =ov29_0235171E add r0, sp, #8 add r2, r3, r2 strh r2, [sp, #8] @@ -1120,12 +1120,12 @@ _022F61F0: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F61F8: .word 0x0237CA80 +_022F61F8: .word ov29_0237CA80 _022F61FC: .word 0x00000BCC _022F6200: .word 0x00000BCD _022F6204: .word 0x00000BCE -_022F6208: .word 0x0235171C -_022F620C: .word 0x0235171E +_022F6208: .word DIRECTIONS_XY +_022F620C: .word ov29_0235171E arm_func_end ov29_022F6058 arm_func_start ov29_022F6210 @@ -1137,7 +1137,7 @@ ov29_022F6210: ; 0x022F6210 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} mov r4, #0 - ldr r7, _022F62A4 ; =0x02353538 + ldr r7, _022F62A4 ; =ov29_02353538 b _022F6294 _022F6234: ldr r0, [r7] @@ -1171,5 +1171,5 @@ _022F6294: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022F62A4: .word 0x02353538 +_022F62A4: .word ov29_02353538 arm_func_end ov29_022F6210 diff --git a/asm/overlay_29_022F62CC.s b/asm/overlay_29_022F62CC.s index 3aa741a2..a2248956 100644 --- a/asm/overlay_29_022F62CC.s +++ b/asm/overlay_29_022F62CC.s @@ -12,14 +12,14 @@ ov29_022F62CC: ; 0x022F62CC cmp r0, #0 bne _022F66F4 bl GetLeader - ldr r1, _022F66FC ; =0x02353538 + ldr r1, _022F66FC ; =ov29_02353538 mov r4, r0 ldr r1, [r1] ldr r6, [r4, #0xb4] ldrb fp, [r1, #0x7c8] bl GetTileAtEntity ldrh r0, [r0] - ldr r7, _022F66FC ; =0x02353538 + ldr r7, _022F66FC ; =ov29_02353538 tst r0, #0x20 movne r0, #1 moveq r0, #0 @@ -44,7 +44,7 @@ ov29_022F62CC: ; 0x022F62CC mov r0, #0 bl AnimationDelayOrSomething _022F6364: - ldr r0, _022F66FC ; =0x02353538 + ldr r0, _022F66FC ; =ov29_02353538 mov r2, #0 ldr r1, [r0] strb r2, [r1, #0x7c8] @@ -122,7 +122,7 @@ _022F6464: mov r0, #1 str r0, [sp] mov r8, r7 - ldr sb, _022F66FC ; =0x02353538 + ldr sb, _022F66FC ; =ov29_02353538 b _022F6618 _022F648C: ldr r0, [sb] @@ -159,7 +159,7 @@ _022F648C: cmp r0, #1 ble _022F65CC _022F6510: - ldr r0, _022F6704 ; =0x02352760 + ldr r0, _022F6704 ; =ov29_02352760 mvn r8, #0 ldrh r1, [r0] ldrh r0, [r0, #2] @@ -242,7 +242,7 @@ _022F6620: beq _022F6654 cmp r7, #0 bne _022F6654 - ldr r0, _022F66FC ; =0x02353538 + ldr r0, _022F66FC ; =ov29_02353538 ldr r0, [r0] ldr r1, [r0, #0x7c4] ldr r0, [r0, #0x7bc] @@ -256,7 +256,7 @@ _022F6654: beq _022F6688 cmp r6, #0 bne _022F6688 - ldr r0, _022F66FC ; =0x02353538 + ldr r0, _022F66FC ; =ov29_02353538 ldr r0, [r0] ldr r1, [r0, #0x7c4] ldr r0, [r0, #0x7bc] @@ -298,15 +298,15 @@ _022F66F4: add sp, sp, #0x28 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F66FC: .word 0x02353538 +_022F66FC: .word ov29_02353538 _022F6700: .word 0x00000E53 -_022F6704: .word 0x02352760 +_022F6704: .word ov29_02352760 _022F6708: .word 0x00000E52 arm_func_end ov29_022F62CC arm_func_start ov29_022F670C ov29_022F670C: ; 0x022F670C - ldr r0, _022F6744 ; =0x02353538 + ldr r0, _022F6744 ; =ov29_02353538 ldr r2, [r0] ldr r1, [r2, #0x7c4] ldr r0, [r2, #0x7bc] @@ -321,7 +321,7 @@ ov29_022F670C: ; 0x022F670C and r0, r0, #0xff bx lr .align 2, 0 -_022F6744: .word 0x02353538 +_022F6744: .word ov29_02353538 arm_func_end ov29_022F670C arm_func_start ov29_022F6748 @@ -370,7 +370,7 @@ _022F67CC: .word 0x00000E51 ov29_022F67D0: ; 0x022F67D0 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x24 - ldr r1, _022F69EC ; =0x02353538 + ldr r1, _022F69EC ; =ov29_02353538 mov r4, r0 ldr r0, [r1] mov r5, #0 @@ -386,16 +386,16 @@ ov29_022F67D0: ; 0x022F67D0 add r0, sp, #0x14 mov r2, #0 bl InitPortraitDungeon - ldr r0, _022F69EC ; =0x02353538 + ldr r0, _022F69EC ; =ov29_02353538 cmp r4, #0 ldr r0, [r0] ldr r4, [r0, #0x7c0] beq _022F69E4 - ldr r0, _022F69F0 ; =0x023535A8 + ldr r0, _022F69F0 ; =ov29_023535A8 cmp r5, #0 str r4, [r0] beq _022F6870 - ldr r0, _022F69F4 ; =0x022C4800 + ldr r0, _022F69F4 ; =ov10_022C4800 mov r1, r4, lsl #8 ldr r3, [r0] mov r2, #0x64 @@ -424,8 +424,8 @@ _022F6870: bl ov29_022EACCC mov r0, r4 bl AddMoneyCarried - ldr r1, _022F6A04 ; =0x02352760 - ldr r0, _022F69EC ; =0x02353538 + ldr r1, _022F6A04 ; =ov29_02352760 + ldr r0, _022F69EC ; =ov29_02353538 ldrh r3, [r1, #4] ldr r0, [r0] ldrh r2, [r1, #6] @@ -443,7 +443,7 @@ _022F68D8: add r6, sp, #0xc add r5, sp, #8 mov fp, #1 - ldr r4, _022F69EC ; =0x02353538 + ldr r4, _022F69EC ; =ov29_02353538 b _022F6990 _022F68FC: mov r0, sb @@ -496,7 +496,7 @@ _022F69A8: ldr r1, [r1, #0xd1c] cmp sb, r1 ble _022F68D8 - ldr r1, _022F69EC ; =0x02353538 + ldr r1, _022F69EC ; =ov29_02353538 add r0, sp, #0x14 ldr r4, [r1] ldr r1, _022F6A08 ; =0x00000E4A @@ -511,13 +511,13 @@ _022F69E4: add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F69EC: .word 0x02353538 -_022F69F0: .word 0x023535A8 -_022F69F4: .word 0x022C4800 +_022F69EC: .word ov29_02353538 +_022F69F0: .word ov29_023535A8 +_022F69F4: .word ov10_022C4800 _022F69F8: .word 0x00000E4F _022F69FC: .word 0x00000E4D _022F6A00: .word 0x00001308 -_022F6A04: .word 0x02352760 +_022F6A04: .word ov29_02352760 _022F6A08: .word 0x00000E4A arm_func_end ov29_022F67D0 @@ -536,14 +536,14 @@ ov29_022F6A0C: ; 0x022F6A0C add r0, sp, #4 mov r2, #0 bl InitPortraitDungeon - ldr r0, _022F6C8C ; =0x02353538 + ldr r0, _022F6C8C ; =ov29_02353538 cmp r4, #0 ldr r0, [r0] ldr r1, [r0, #0x7c4] ldr r0, [r0, #0x7bc] sub r6, r1, r0 beq _022F6A80 - ldr r0, _022F6C90 ; =0x022C473C + ldr r0, _022F6C90 ; =ov10_022C473C mov r3, r6, lsl #8 ldr r0, [r0] mov r2, #0x64 @@ -629,7 +629,7 @@ _022F6B78: cmp r6, #0x38 blt _022F6B24 mov r6, #0 - ldr sb, _022F6CA4 ; =0x020AF6B8 + ldr sb, _022F6CA4 ; =BAG_ITEMS_PTR_MIRROR mov r4, r6 mov r5, #1 mov r8, #6 @@ -655,7 +655,7 @@ _022F6BE4: cmp r6, #0x32 blt _022F6BA4 mov r7, #0 - ldr r8, _022F6C8C ; =0x02353538 + ldr r8, _022F6C8C ; =ov29_02353538 mov r4, r7 mov r5, #1 _022F6C00: @@ -684,7 +684,7 @@ _022F6C54: add r7, r7, #1 cmp r7, #0x14 blt _022F6C00 - ldr r1, _022F6C8C ; =0x02353538 + ldr r1, _022F6C8C ; =ov29_02353538 add r0, sp, #4 ldr r4, [r1] ldr r1, _022F6CA8 ; =0x00000E49 @@ -697,20 +697,20 @@ _022F6C84: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022F6C8C: .word 0x02353538 -_022F6C90: .word 0x022C473C +_022F6C8C: .word ov29_02353538 +_022F6C90: .word ov10_022C473C _022F6C94: .word 0x00000E4E _022F6C98: .word 0x00000E4C _022F6C9C: .word 0x00000E4B _022F6CA0: .word 0x00001308 -_022F6CA4: .word 0x020AF6B8 +_022F6CA4: .word BAG_ITEMS_PTR_MIRROR _022F6CA8: .word 0x00000E49 arm_func_end ov29_022F6A0C arm_func_start ov29_022F6CAC ov29_022F6CAC: ; 0x022F6CAC stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} - ldr r0, _022F6E0C ; =0x02353538 + ldr r0, _022F6E0C ; =ov29_02353538 mov r2, #1 ldr r1, [r0] strb r2, [r1, #0x790] @@ -745,7 +745,7 @@ _022F6D14: cmp r6, #0x38 blt _022F6CDC mov r7, #0 - ldr r1, _022F6E14 ; =0x020AF6B8 + ldr r1, _022F6E14 ; =BAG_ITEMS_PTR_MIRROR mov r3, r7 mov r4, #1 mov r0, #6 @@ -765,7 +765,7 @@ _022F6D40: cmp r7, #0x32 blt _022F6D40 mov r8, #0 - ldr sb, _022F6E0C ; =0x02353538 + ldr sb, _022F6E0C ; =ov29_02353538 mov r6, r8 mov r4, r8 mov r5, #1 @@ -794,7 +794,7 @@ _022F6DDC: add r8, r8, #1 cmp r8, #0x14 blt _022F6D8C - ldr r0, _022F6E0C ; =0x02353538 + ldr r0, _022F6E0C ; =ov29_02353538 mov r2, #0 ldr r1, [r0] str r2, [r1, #0x7c4] @@ -804,9 +804,9 @@ _022F6DDC: str r2, [r0, #0x7c0] ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_022F6E0C: .word 0x02353538 +_022F6E0C: .word ov29_02353538 _022F6E10: .word 0x00000E54 -_022F6E14: .word 0x020AF6B8 +_022F6E14: .word BAG_ITEMS_PTR_MIRROR arm_func_end ov29_022F6CAC arm_func_start ResetDamageData @@ -829,18 +829,18 @@ ov29_022F6E40: ; 0x022F6E40 ldr r0, _022F6ED8 ; =0x0001A002 mov r1, #0 bl MemAlloc - ldr r2, _022F6EDC ; =0x0237C9AC + ldr r2, _022F6EDC ; =ov29_0237C9AC ldr r1, _022F6ED8 ; =0x0001A002 str r0, [r2] bl MemZero - ldr r0, _022F6EDC ; =0x0237C9AC + ldr r0, _022F6EDC ; =ov29_0237C9AC mov r1, #0 ldr r0, [r0] add r0, r0, #0x1a000 strh r1, [r0] bl ov29_0231B490 mov r2, #0 - ldr r0, _022F6EE0 ; =0x0237C9B0 + ldr r0, _022F6EE0 ; =ov29_0237C9B0 mov r1, r2 _022F6E84: str r1, [r0, r2, lsl #2] @@ -859,7 +859,7 @@ _022F6E84: ldr r0, _022F6EEC ; =0x00000211 bl GetSpriteFileSize _022F6EC0: - ldr r0, _022F6EF0 ; =0x02353538 + ldr r0, _022F6EF0 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] add r0, r0, #0x3000 @@ -867,35 +867,35 @@ _022F6EC0: ldmia sp!, {r4, pc} .align 2, 0 _022F6ED8: .word 0x0001A002 -_022F6EDC: .word 0x0237C9AC -_022F6EE0: .word 0x0237C9B0 +_022F6EDC: .word ov29_0237C9AC +_022F6EE0: .word ov29_0237C9B0 _022F6EE4: .word 0x00000216 _022F6EE8: .word 0x00000217 _022F6EEC: .word 0x00000211 -_022F6EF0: .word 0x02353538 +_022F6EF0: .word ov29_02353538 arm_func_end ov29_022F6E40 arm_func_start ov29_022F6EF4 ov29_022F6EF4: ; 0x022F6EF4 ldr r1, _022F6F08 ; =0x0000FFFF - ldr r0, _022F6F0C ; =0x023535AC + ldr r0, _022F6F0C ; =ov29_023535AC strh r1, [r0, #2] strh r1, [r0] bx lr .align 2, 0 _022F6F08: .word 0x0000FFFF -_022F6F0C: .word 0x023535AC +_022F6F0C: .word ov29_023535AC arm_func_end ov29_022F6EF4 arm_func_start FreeLoadedAttackSpriteAndMore FreeLoadedAttackSpriteAndMore: ; 0x022F6F10 stmdb sp!, {r4, r5, r6, lr} bl ClearLoadedAttackSprite - ldr r0, _022F6F60 ; =0x0237C9AC + ldr r0, _022F6F60 ; =ov29_0237C9AC ldr r0, [r0] bl MemFree mov r6, #0 - ldr r5, _022F6F64 ; =0x0237C9B0 + ldr r5, _022F6F64 ; =ov29_0237C9B0 mov r4, r6 _022F6F30: ldr r0, [r5, r6, lsl #2] @@ -907,19 +907,19 @@ _022F6F44: add r6, r6, #1 cmp r6, #2 blt _022F6F30 - ldr r0, _022F6F60 ; =0x0237C9AC + ldr r0, _022F6F60 ; =ov29_0237C9AC mov r1, #0 str r1, [r0] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022F6F60: .word 0x0237C9AC -_022F6F64: .word 0x0237C9B0 +_022F6F60: .word ov29_0237C9AC +_022F6F64: .word ov29_0237C9B0 arm_func_end FreeLoadedAttackSpriteAndMore arm_func_start SetAndLoadCurrentAttackAnimation SetAndLoadCurrentAttackAnimation: ; 0x022F6F68 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _022F6FFC ; =0x023535AC + ldr r2, _022F6FFC ; =ov29_023535AC mov r5, r0 ldrh r0, [r2, #2] mov r4, r1 @@ -927,7 +927,7 @@ SetAndLoadCurrentAttackAnimation: ; 0x022F6F68 ldreqh r0, [r2] cmpeq r0, r4 beq _022F6FE8 - ldr r0, _022F7000 ; =0x0237C9AC + ldr r0, _022F7000 ; =ov29_0237C9AC ldr r0, [r0] add r0, r0, #0x1a000 ldrsh r0, [r0] @@ -936,65 +936,65 @@ SetAndLoadCurrentAttackAnimation: ; 0x022F6F68 bl ClearLoadedAttackSprite _022F6FA8: mov r1, #1 - ldr r0, _022F7004 ; =0x020AFC68 + ldr r0, _022F7004 ; =WAN_TABLE str r1, [sp] - ldr r1, _022F7000 ; =0x0237C9AC + ldr r1, _022F7000 ; =ov29_0237C9AC ldr r0, [r0] ldr r3, [r1] mov r1, r5 mov r2, r4 bl LoadWanTableEntryFromPackUseProvidedMemory - ldr r1, _022F7000 ; =0x0237C9AC - ldr r2, _022F6FFC ; =0x023535AC + ldr r1, _022F7000 ; =ov29_0237C9AC + ldr r2, _022F6FFC ; =ov29_023535AC ldr r1, [r1] add r1, r1, #0x1a000 strh r0, [r1] strh r5, [r2, #2] strh r4, [r2] _022F6FE8: - ldr r0, _022F7000 ; =0x0237C9AC + ldr r0, _022F7000 ; =ov29_0237C9AC ldr r0, [r0] add r0, r0, #0x1a000 ldrsh r0, [r0] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022F6FFC: .word 0x023535AC -_022F7000: .word 0x0237C9AC -_022F7004: .word 0x020AFC68 +_022F6FFC: .word ov29_023535AC +_022F7000: .word ov29_0237C9AC +_022F7004: .word WAN_TABLE arm_func_end SetAndLoadCurrentAttackAnimation arm_func_start ClearLoadedAttackSprite ClearLoadedAttackSprite: ; 0x022F7008 stmdb sp!, {r3, lr} - ldr r0, _022F7048 ; =0x0237C9AC + ldr r0, _022F7048 ; =ov29_0237C9AC ldr r0, [r0] add r0, r0, #0x1a000 ldrsh r1, [r0] cmp r1, #0 ldmeqia sp!, {r3, pc} - ldr r0, _022F704C ; =0x020AFC68 + ldr r0, _022F704C ; =WAN_TABLE ldr r0, [r0] bl DeleteWanTableEntryVeneer - ldr r0, _022F7048 ; =0x0237C9AC + ldr r0, _022F7048 ; =ov29_0237C9AC mov r1, #0 ldr r0, [r0] add r0, r0, #0x1a000 strh r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_022F7048: .word 0x0237C9AC -_022F704C: .word 0x020AFC68 +_022F7048: .word ov29_0237C9AC +_022F704C: .word WAN_TABLE arm_func_end ClearLoadedAttackSprite arm_func_start GetLoadedAttackSpriteId GetLoadedAttackSpriteId: ; 0x022F7050 - ldr r0, _022F7064 ; =0x0237C9AC + ldr r0, _022F7064 ; =ov29_0237C9AC ldr r0, [r0] add r0, r0, #0x1a000 ldrsh r0, [r0] bx lr .align 2, 0 -_022F7064: .word 0x0237C9AC +_022F7064: .word ov29_0237C9AC arm_func_end GetLoadedAttackSpriteId arm_func_start DungeonGetTotalSpriteFileSize @@ -1046,7 +1046,7 @@ _022F7100: .word 0x000001CD arm_func_start ov29_022F7104 ov29_022F7104: ; 0x022F7104 - ldr r1, _022F712C ; =0x02353538 + ldr r1, _022F712C ; =ov29_02353538 mov r3, #0x400 ldr r0, [r1] mov r2, #0xa @@ -1057,13 +1057,13 @@ ov29_022F7104: ; 0x022F7104 str r2, [r0, #0xe30] bx lr .align 2, 0 -_022F712C: .word 0x02353538 +_022F712C: .word ov29_02353538 arm_func_end ov29_022F7104 arm_func_start ov29_022F7130 ov29_022F7130: ; 0x022F7130 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r0, _022F72F8 ; =0x02353538 + ldr r0, _022F72F8 ; =ov29_02353538 mov r2, #0 ldr r0, [r0] mov r3, r2 @@ -1076,7 +1076,7 @@ _022F7150: strh r3, [r4, r1] cmp r2, r0 blt _022F7150 - ldr r1, _022F72F8 ; =0x02353538 + ldr r1, _022F72F8 ; =ov29_02353538 ldr r0, _022F7300 ; =0x00000229 ldr r2, [r1] mov r1, #1 @@ -1085,7 +1085,7 @@ _022F7150: bl LoadMonsterSprite mov r6, #0 mov r5, #1 - ldr r4, _022F72F8 ; =0x02353538 + ldr r4, _022F72F8 ; =ov29_02353538 b _022F71AC _022F7190: add r0, r1, #0x174 @@ -1102,7 +1102,7 @@ _022F71AC: cmp r6, r0 blt _022F7190 bl LoadMissionMonsterSprites - ldr r0, _022F72F8 ; =0x02353538 + ldr r0, _022F72F8 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsh r1, [r0, #0xa8] @@ -1156,7 +1156,7 @@ _022F7278: mov sb, r0, asr #0x10 cmp sb, #4 blt _022F7204 - ldr r0, _022F72F8 ; =0x02353538 + ldr r0, _022F72F8 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] @@ -1186,7 +1186,7 @@ _022F72E0: blt _022F72B4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F72F8: .word 0x02353538 +_022F72F8: .word ov29_02353538 _022F72FC: .word 0x00000483 _022F7300: .word 0x00000229 _022F7304: .word 0x00000217 @@ -1196,7 +1196,7 @@ _022F7304: .word 0x00000217 ov29_022F7308: ; 0x022F7308 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r6, #0 - ldr r4, _022F7360 ; =0x02353538 + ldr r4, _022F7360 ; =ov29_02353538 mov r5, r6 _022F7318: ldr r0, [r4] @@ -1219,5 +1219,5 @@ _022F7350: blt _022F7318 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022F7360: .word 0x02353538 +_022F7360: .word ov29_02353538 arm_func_end ov29_022F7308 diff --git a/asm/overlay_29_022F7388.s b/asm/overlay_29_022F7388.s index 25deabc6..03bf4489 100644 --- a/asm/overlay_29_022F7388.s +++ b/asm/overlay_29_022F7388.s @@ -5,14 +5,14 @@ arm_func_start DungeonGetSpriteIndex DungeonGetSpriteIndex: ; 0x022F7388 - ldr r2, _022F73A0 ; =0x02353538 + ldr r2, _022F73A0 ; =ov29_02353538 ldr r1, _022F73A4 ; =0x00019914 ldr r2, [r2] add r0, r2, r0, lsl #1 ldrsh r0, [r0, r1] bx lr .align 2, 0 -_022F73A0: .word 0x02353538 +_022F73A0: .word ov29_02353538 _022F73A4: .word 0x00019914 arm_func_end DungeonGetSpriteIndex @@ -26,7 +26,7 @@ _022F73B0: .word JoinedAtRangeCheck2 arm_func_start FloorNumberIsEven FloorNumberIsEven: ; 0x022F73B4 - ldr r0, _022F73E8 ; =0x02353538 + ldr r0, _022F73E8 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x748] cmp r0, #0x5b @@ -40,7 +40,7 @@ FloorNumberIsEven: ; 0x022F73B4 movne r0, #0 bx lr .align 2, 0 -_022F73E8: .word 0x02353538 +_022F73E8: .word ov29_02353538 arm_func_end FloorNumberIsEven arm_func_start GetKecleonIdToSpawnByFloor @@ -59,7 +59,7 @@ _022F7408: .word 0x0000017F arm_func_start StoreSpriteFileIndexBothGenders StoreSpriteFileIndexBothGenders: ; 0x022F740C stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r2, _022F74D0 ; =0x02353538 + ldr r2, _022F74D0 ; =ov29_02353538 mov r7, r0 ldr r2, [r2] mov r6, r1 @@ -109,14 +109,14 @@ _022F7490: streqh r1, [r5, r0] ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022F74D0: .word 0x02353538 +_022F74D0: .word ov29_02353538 arm_func_end StoreSpriteFileIndexBothGenders arm_func_start LoadMonsterSpriteInner LoadMonsterSpriteInner: ; 0x022F74D4 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 - ldr r1, _022F75C4 ; =0x02353538 + ldr r1, _022F75C4 ; =ov29_02353538 mov r6, r0 ldr r2, [r1] ldr r1, _022F75C8 ; =0x00019914 @@ -138,11 +138,11 @@ LoadMonsterSpriteInner: ; 0x022F74D4 bl GetSpriteFileSize mov r1, #0 bl MemAlloc - ldr r2, _022F75CC ; =0x0237C9B0 + ldr r2, _022F75CC ; =ov29_0237C9B0 mov r1, #1 str r0, [r2, r5, lsl #2] str r1, [sp] - ldr r0, _022F75D0 ; =0x020AFC68 + ldr r0, _022F75D0 ; =WAN_TABLE ldr r3, [r2, r5, lsl #2] ldr r0, [r0] mov r2, r4 @@ -154,7 +154,7 @@ LoadMonsterSpriteInner: ; 0x022F74D4 b _022F7598 _022F756C: mov r1, #1 - ldr r0, _022F75D0 ; =0x020AFC68 + ldr r0, _022F75D0 ; =WAN_TABLE str r1, [sp] mov r1, #0 ldr r0, [r0] @@ -168,7 +168,7 @@ _022F7598: mov r1, r4 mov r0, #0 bl GetFileLengthInPackWithPackNb - ldr r1, _022F75C4 ; =0x02353538 + ldr r1, _022F75C4 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x2c000 ldr r2, [r1, #0xb0c] @@ -178,17 +178,17 @@ _022F75BC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_022F75C4: .word 0x02353538 +_022F75C4: .word ov29_02353538 _022F75C8: .word 0x00019914 -_022F75CC: .word 0x0237C9B0 -_022F75D0: .word 0x020AFC68 +_022F75CC: .word ov29_0237C9B0 +_022F75D0: .word WAN_TABLE arm_func_end LoadMonsterSpriteInner arm_func_start SwapMonsterWanFileIndex SwapMonsterWanFileIndex: ; 0x022F75D4 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 - ldr r2, _022F764C ; =0x02353538 + ldr r2, _022F764C ; =ov29_02353538 mov r5, r1 ldr r1, [r2] mov r6, r0 @@ -199,7 +199,7 @@ SwapMonsterWanFileIndex: ; 0x022F75D4 mov r1, #1 str r1, [sp] mov r1, r6, lsl #1 - ldr r2, _022F7650 ; =0x020AFC68 + ldr r2, _022F7650 ; =WAN_TABLE mov r3, r0 ldrsh r1, [r4, r1] ldr r0, [r2] @@ -217,8 +217,8 @@ SwapMonsterWanFileIndex: ; 0x022F75D4 add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_022F764C: .word 0x02353538 -_022F7650: .word 0x020AFC68 +_022F764C: .word ov29_02353538 +_022F7650: .word WAN_TABLE arm_func_end SwapMonsterWanFileIndex arm_func_start LoadMonsterSprite @@ -235,7 +235,7 @@ LoadMonsterSprite: ; 0x022F7654 mov r0, r0, lsr #0x10 cmp r0, #3 bhi _022F769C - ldr r0, _022F774C ; =0x02353538 + ldr r0, _022F774C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x3e00 ldrsh r0, [r0, #0x3a] @@ -290,7 +290,7 @@ _022F7734: ldmia sp!, {r4, pc} .align 2, 0 _022F7748: .word 0xFFFFFE5E -_022F774C: .word 0x02353538 +_022F774C: .word ov29_02353538 _022F7750: .word 0x0000017B _022F7754: .word 0xFFFFFC2D _022F7758: .word 0x0000017D @@ -302,7 +302,7 @@ _022F7764: .word 0xFFFFFBDC arm_func_start DeleteMonsterSpriteFile DeleteMonsterSpriteFile: ; 0x022F7768 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _022F77F4 ; =0x02353538 + ldr r1, _022F77F4 ; =ov29_02353538 mov r5, r0 ldr r1, [r1] ldr r0, _022F77F8 ; =0x00019914 @@ -310,10 +310,10 @@ DeleteMonsterSpriteFile: ; 0x022F7768 ldrsh r1, [r1, r0] cmp r1, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _022F77FC ; =0x020AFC68 + ldr r0, _022F77FC ; =WAN_TABLE ldr r0, [r0] bl DeleteWanTableEntryVeneer - ldr r0, _022F77F4 ; =0x02353538 + ldr r0, _022F77F4 ; =ov29_02353538 ldr r1, _022F77F8 ; =0x00019914 ldr r2, [r0] mov r3, #0 @@ -326,21 +326,21 @@ DeleteMonsterSpriteFile: ; 0x022F7768 mov r0, r5 bl IsShaymin cmp r0, #0 - ldr r0, _022F7800 ; =0x0237C9B0 + ldr r0, _022F7800 ; =ov29_0237C9B0 movne r4, #0 ldr r0, [r0, r4, lsl #2] cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} bl MemFree - ldr r0, _022F7800 ; =0x0237C9B0 + ldr r0, _022F7800 ; =ov29_0237C9B0 mov r1, #0 str r1, [r0, r4, lsl #2] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022F77F4: .word 0x02353538 +_022F77F4: .word ov29_02353538 _022F77F8: .word 0x00019914 -_022F77FC: .word 0x020AFC68 -_022F7800: .word 0x0237C9B0 +_022F77FC: .word WAN_TABLE +_022F7800: .word ov29_0237C9B0 arm_func_end DeleteMonsterSpriteFile arm_func_start DeleteAllMonsterSpriteFiles @@ -566,13 +566,13 @@ _022F7AE8: mov r1, sl mov r3, r4 bl sub_02053250 - ldr r0, _022F7BE8 ; =0x020B0A48 + ldr r0, _022F7BE8 ; =TEAM_MEMBER_TABLE_PTR mov r1, r4, lsl #1 ldr r0, [r0] mvn r3, #0 add r0, r0, #0x9000 ldr r2, [r0, #0x870] - ldr r0, _022F7BEC ; =0x020A1C7C + ldr r0, _022F7BEC ; =IQ_SKILLS strh r3, [r2, r1] ldrb r2, [r5] ldr r1, [r0, #0x20] @@ -622,8 +622,8 @@ _022F7BD8: .word 0x00000C0E _022F7BDC: .word 0x00000C0F _022F7BE0: .word 0x00000C0C _022F7BE4: .word 0x000055AA -_022F7BE8: .word 0x020B0A48 -_022F7BEC: .word 0x020A1C7C +_022F7BE8: .word TEAM_MEMBER_TABLE_PTR +_022F7BEC: .word IQ_SKILLS _022F7BF0: .word 0x00000C12 arm_func_end ov29_022F7910 @@ -640,12 +640,12 @@ ov29_022F7BF4: ; 0x022F7BF4 cmpne r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} - ldr r0, _022F7E18 ; =0x02353538 + ldr r0, _022F7E18 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl IsRecruitingAllowed cmp r0, #0 - ldrne r0, _022F7E18 ; =0x02353538 + ldrne r0, _022F7E18 ; =ov29_02353538 ldrne r0, [r0] ldrneb r0, [r0, #0x759] cmpne r0, #0 @@ -708,13 +708,13 @@ _022F7CE4: mov r1, r6 mov r3, r4 bl sub_02053250 - ldr r0, _022F7E28 ; =0x020B0A48 + ldr r0, _022F7E28 ; =TEAM_MEMBER_TABLE_PTR mov r1, r4, lsl #1 ldr r0, [r0] mvn r3, #0 add r0, r0, #0x9000 ldr r2, [r0, #0x870] - ldr r0, _022F7E2C ; =0x020A1C7C + ldr r0, _022F7E2C ; =IQ_SKILLS strh r3, [r2, r1] ldrb r2, [r5] ldr r1, [r0, #0x20] @@ -778,12 +778,12 @@ _022F7E10: mov r0, #1 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022F7E18: .word 0x02353538 +_022F7E18: .word ov29_02353538 _022F7E1C: .word 0x00000C0B _022F7E20: .word 0x00000C0A _022F7E24: .word 0x000055AA -_022F7E28: .word 0x020B0A48 -_022F7E2C: .word 0x020A1C7C +_022F7E28: .word TEAM_MEMBER_TABLE_PTR +_022F7E2C: .word IQ_SKILLS _022F7E30: .word 0x00000C11 arm_func_end ov29_022F7BF4 @@ -827,7 +827,7 @@ _022F7E94: ov29_022F7EAC: ; 0x022F7EAC stmdb sp!, {r3, r4, r5, lr} bl GetLeader - ldr r1, _022F7F04 ; =0x02353538 + ldr r1, _022F7F04 ; =ov29_02353538 mov r2, #0 ldr r5, [r1] movs r4, r0 @@ -848,7 +848,7 @@ ov29_022F7EAC: ; 0x022F7EAC bl DiscoverMinimap ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022F7F04: .word 0x02353538 +_022F7F04: .word ov29_02353538 arm_func_end ov29_022F7EAC arm_func_start ov29_022F7F08 @@ -890,7 +890,7 @@ _022F7F64: ldrsh r1, [sl, #6] bl DrawMinimapTile mov r5, #0 - ldr fp, _022F85D0 ; =0x02353538 + ldr fp, _022F85D0 ; =ov29_02353538 mov r4, r5 _022F7F8C: ldr r0, [fp] @@ -913,7 +913,7 @@ _022F7FC4: blt _022F7F8C ldrb r0, [r7, #0xd8] cmp r0, #2 - ldreq r0, _022F85D0 ; =0x02353538 + ldreq r0, _022F85D0 ; =ov29_02353538 moveq r1, #0 ldreq r0, [r0] addeq r0, r0, #0x3000 @@ -930,7 +930,7 @@ _022F8008: bl ov29_023159D4 mov r1, #0 strb r1, [sl, #0x22] - ldr r0, _022F85D4 ; =0x0235355C + ldr r0, _022F85D4 ; =ov29_0235355C strb r1, [sl, #0x20] str r1, [r0] ldrb r0, [r7, #7] @@ -946,14 +946,14 @@ _022F8008: mov r0, #1 bl SetForcedLossReason mov r2, #0 - ldr r0, _022F85D0 ; =0x02353538 + ldr r0, _022F85D0 ; =ov29_02353538 strh r2, [r7, #0x10] ldr r0, [r0] mov r1, sl add r0, r0, #0x248 add r0, r0, #0x400 bl ov29_022E2A78 - ldr r0, _022F85D0 ; =0x02353538 + ldr r0, _022F85D0 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75f] cmp r0, #0 @@ -968,7 +968,7 @@ _022F8098: beq _022F83B4 mov r0, #0 bl ov29_0234B1A4 - ldr r0, _022F85D0 ; =0x02353538 + ldr r0, _022F85D0 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75f] cmp r0, #0 @@ -987,7 +987,7 @@ _022F8098: mov r1, r0 bl OpenMessageLog _022F80F4: - ldr r1, _022F85D0 ; =0x02353538 + ldr r1, _022F85D0 ; =ov29_02353538 ldr r2, [r1] ldrb r0, [r2, #0xa] cmp r0, #0 @@ -999,7 +999,7 @@ _022F80F4: bl GetForcedLossReason cmp r0, #4 beq _022F8234 - ldr r0, _022F85D0 ; =0x02353538 + ldr r0, _022F85D0 ; =ov29_02353538 ldr r2, [r0] ldrb r0, [r2, #0x790] cmp r0, #0 @@ -1039,7 +1039,7 @@ _022F80F4: mov r0, r4 mov r2, #1 bl DisplayMessage - ldr r1, _022F85D0 ; =0x02353538 + ldr r1, _022F85D0 ; =ov29_02353538 mov r0, #1 ldr r2, [r1] strb r0, [r2, #8] @@ -1096,7 +1096,7 @@ _022F8284: ldr r0, _022F85E4 ; =0x00000266 cmp sb, r0 bne _022F82B4 - ldr r1, _022F85D0 ; =0x02353538 + ldr r1, _022F85D0 ; =ov29_02353538 mov r0, sb ldr r2, [r1] mov r1, r8 @@ -1117,7 +1117,7 @@ _022F82C8: bne _022F83B4 mov r5, #0 mov r4, r5 - ldr r6, _022F85D0 ; =0x02353538 + ldr r6, _022F85D0 ; =ov29_02353538 b _022F8328 _022F82E4: ldr r0, [r6] @@ -1154,13 +1154,13 @@ _022F8330: bl IsMonsterIdInNormalRange cmp r0, #0 beq _022F83A8 - ldr r0, _022F85D0 ; =0x02353538 + ldr r0, _022F85D0 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl IsLevelResetDungeon cmp r0, #0 bne _022F83A8 - ldr r0, _022F85D0 ; =0x02353538 + ldr r0, _022F85D0 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsb r0, [r0, #0x98] @@ -1199,7 +1199,7 @@ _022F83F4: bne _022F8428 mov r0, #2 bl SetForcedLossReason - ldr r0, _022F85D0 ; =0x02353538 + ldr r0, _022F85D0 ; =ov29_02353538 mov r1, sl ldr r0, [r0] mov r2, #0 @@ -1215,7 +1215,7 @@ _022F8428: beq _022F8460 mov r0, #3 bl SetForcedLossReason - ldr r0, _022F85D0 ; =0x02353538 + ldr r0, _022F85D0 ; =ov29_02353538 mov r1, sl ldr r0, [r0] mov r2, #0 @@ -1256,13 +1256,13 @@ _022F84AC: bl IsMonsterIdInNormalRange cmp r0, #0 beq _022F856C - ldr r0, _022F85D0 ; =0x02353538 + ldr r0, _022F85D0 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl IsLevelResetDungeon cmp r0, #0 bne _022F8528 - ldr r0, _022F85D0 ; =0x02353538 + ldr r0, _022F85D0 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsb r0, [r0, #0x98] @@ -1278,7 +1278,7 @@ _022F8528: ldrb r0, [r7, #7] mov r5, #0 cmp r0, #0 - ldr r0, _022F85D0 ; =0x02353538 + ldr r0, _022F85D0 ; =ov29_02353538 movne r5, #1 ldr r0, [r0] ldrb r0, [r0, #0x75c] @@ -1307,8 +1307,8 @@ _022F856C: _022F8594: ldr r0, [r7, #0xb0] bl ov29_022DDB68 - ldr r0, _022F85D0 ; =0x02353538 - ldr r1, _022F85D4 ; =0x0235355C + ldr r0, _022F85D0 ; =ov29_02353538 + ldr r1, _022F85D4 ; =ov29_0235355C mov r2, #0 ldr r0, [r0] str r2, [r1] @@ -1322,8 +1322,8 @@ _022F85C8: add sp, sp, #0xbc ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F85D0: .word 0x02353538 -_022F85D4: .word 0x0235355C +_022F85D0: .word ov29_02353538 +_022F85D4: .word ov29_0235355C _022F85D8: .word 0x0000025B _022F85DC: .word 0x00000C13 _022F85E0: .word 0x00000C14 @@ -1401,7 +1401,7 @@ _022F86C8: mov r0, r0, asr #0x10 mov r1, r1, asr #0x10 bl ov29_02338F24 - ldr r0, _022F87BC ; =0x02353538 + ldr r0, _022F87BC ; =ov29_02353538 mov r1, #0 ldr r0, [r0] strb r1, [r0, #5] @@ -1458,7 +1458,7 @@ _022F87A8: bl ov29_02304BAC ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022F87BC: .word 0x02353538 +_022F87BC: .word ov29_02353538 arm_func_end MoveMonsterToPos arm_func_start ov29_022F87C0 @@ -1471,8 +1471,8 @@ ov29_022F87C0: ; 0x022F87C0 cmp r0, #0 beq _022F8820 ldrb r2, [r5, #0x4c] - ldr r1, _022F8828 ; =0x0235171C - ldr r0, _022F882C ; =0x0235171E + ldr r1, _022F8828 ; =DIRECTIONS_XY + ldr r0, _022F882C ; =ov29_0235171E mov ip, r2, lsl #2 ldrsh lr, [r4, #4] ldrsh r3, [r1, ip] @@ -1491,8 +1491,8 @@ _022F8820: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022F8828: .word 0x0235171C -_022F882C: .word 0x0235171E +_022F8828: .word DIRECTIONS_XY +_022F882C: .word ov29_0235171E arm_func_end ov29_022F87C0 arm_func_start ov29_022F8830 @@ -1500,10 +1500,10 @@ ov29_022F8830: ; 0x022F8830 stmdb sp!, {r3, r4, r5, lr} mov r4, r0 ldr r5, [r4, #0xb4] - ldr r0, _022F88B8 ; =0x0235171C + ldr r0, _022F88B8 ; =DIRECTIONS_XY ldrb r2, [r5, #0x4c] ldrsh r3, [r4, #4] - ldr r1, _022F88BC ; =0x0235171E + ldr r1, _022F88BC ; =ov29_0235171E mov r2, r2, lsl #2 ldrsh r0, [r0, r2] add r0, r3, r0 @@ -1533,8 +1533,8 @@ _022F88B0: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022F88B8: .word 0x0235171C -_022F88BC: .word 0x0235171E +_022F88B8: .word DIRECTIONS_XY +_022F88BC: .word ov29_0235171E arm_func_end ov29_022F8830 arm_func_start ov29_022F88C0 @@ -1542,10 +1542,10 @@ ov29_022F88C0: ; 0x022F88C0 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldr r4, [r5, #0xb4] - ldr r0, _022F89A4 ; =0x0235171C + ldr r0, _022F89A4 ; =DIRECTIONS_XY ldrb r2, [r4, #0x4c] ldrsh r3, [r5, #4] - ldr r1, _022F89A8 ; =0x0235171E + ldr r1, _022F89A8 ; =ov29_0235171E mov r2, r2, lsl #2 ldrsh r0, [r0, r2] add r0, r3, r0 @@ -1566,11 +1566,11 @@ ov29_022F88C0: ; 0x022F88C0 movne r0, #0 ldmneia sp!, {r3, r4, r5, pc} ldrb r1, [r4, #0x4c] - ldr r0, _022F89A4 ; =0x0235171C + ldr r0, _022F89A4 ; =DIRECTIONS_XY ldrsh r2, [r5, #4] mov r1, r1, lsl #2 ldrsh r0, [r0, r1] - ldr r1, _022F89A8 ; =0x0235171E + ldr r1, _022F89A8 ; =ov29_0235171E add r0, r2, r0, lsl #1 strh r0, [sp] ldrb r2, [r4, #0x4c] @@ -1598,8 +1598,8 @@ _022F899C: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022F89A4: .word 0x0235171C -_022F89A8: .word 0x0235171E +_022F89A4: .word DIRECTIONS_XY +_022F89A8: .word ov29_0235171E arm_func_end ov29_022F88C0 arm_func_start ov29_022F89AC @@ -1680,7 +1680,7 @@ _022F8A28: strb r2, [r7, #0x54] ldrh r2, [r5, #0x62] add r4, r7, #0x48 - ldr r3, _022F8FF4 ; =0x02353538 + ldr r3, _022F8FF4 ; =ov29_02353538 strh r2, [r7, #0x1c] ldrh r2, [r5, #0x64] strh r2, [r7, #0x1e] @@ -1719,7 +1719,7 @@ _022F8B24: cmp r1, r0, asr #2 movle r0, #6 strleb r0, [r7, #0x58] - ldr r0, _022F8FF4 ; =0x02353538 + ldr r0, _022F8FF4 ; =ov29_02353538 addle r4, r4, #1 ldr r0, [r0] ldrb r0, [r0, #0x78d] @@ -2040,17 +2040,17 @@ _022F8FD8: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _022F8FF0: .word 0x000003E7 -_022F8FF4: .word 0x02353538 +_022F8FF4: .word ov29_02353538 arm_func_end ov29_022F89CC arm_func_start ov29_022F8FF8 ov29_022F8FF8: ; 0x022F8FF8 stmdb sp!, {r4, lr} ldr r2, [r1, #0xb4] - ldr ip, _022F9050 ; =0x0235171C + ldr ip, _022F9050 ; =DIRECTIONS_XY ldrb lr, [r2, #0x4c] ldrsh r4, [r1, #4] - ldr r3, _022F9054 ; =0x0235171E + ldr r3, _022F9054 ; =ov29_0235171E mov lr, lr, lsl #2 ldrsh ip, [ip, lr] add r4, r4, ip @@ -2068,8 +2068,8 @@ ov29_022F8FF8: ; 0x022F8FF8 and r0, r0, #0xff ldmia sp!, {r4, pc} .align 2, 0 -_022F9050: .word 0x0235171C -_022F9054: .word 0x0235171E +_022F9050: .word DIRECTIONS_XY +_022F9054: .word ov29_0235171E arm_func_end ov29_022F8FF8 arm_func_start ov29_022F9058 @@ -2140,13 +2140,13 @@ _022F90F8: UpdateAiTargetPos: ; 0x022F9144 stmdb sp!, {r3, lr} ldr lr, [r0, #0xb4] - ldr r2, _022F918C ; =0x0235171C + ldr r2, _022F918C ; =DIRECTIONS_XY ldrb r3, [lr, #0x4c] ldrsh ip, [r0, #4] add r1, lr, #0x100 mov r3, r3, lsl #2 ldrsh r3, [r2, r3] - ldr r2, _022F9190 ; =0x0235171E + ldr r2, _022F9190 ; =ov29_0235171E add r3, ip, r3 strh r3, [r1, #0x7e] ldrb r3, [lr, #0x4c] @@ -2157,8 +2157,8 @@ UpdateAiTargetPos: ; 0x022F9144 strh r0, [r1, #0x80] ldmia sp!, {r3, pc} .align 2, 0 -_022F918C: .word 0x0235171C -_022F9190: .word 0x0235171E +_022F918C: .word DIRECTIONS_XY +_022F9190: .word ov29_0235171E arm_func_end UpdateAiTargetPos arm_func_start SetMonsterTypeAndAbility @@ -2174,7 +2174,7 @@ SetMonsterTypeAndAbility: ; 0x022F9194 bl GetApparentWeather mov r1, #6 mul r2, r0, r1 - ldr r1, _022F9234 ; =0x022C4C6C + ldr r1, _022F9234 ; =ov10_022C4C6C mov r0, #0 ldrb r1, [r1, r2] strb r1, [r4, #0x5e] @@ -2202,14 +2202,14 @@ _022F9200: strb r0, [r1, #0x60] cmp r5, #2 blt _022F9200 - ldr r0, _022F9238 ; =0x02353538 + ldr r0, _022F9238 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0xe] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022F9234: .word 0x022C4C6C -_022F9238: .word 0x02353538 +_022F9234: .word ov10_022C4C6C +_022F9238: .word ov29_02353538 arm_func_end SetMonsterTypeAndAbility arm_func_start TryActivateSlowStart @@ -2218,7 +2218,7 @@ TryActivateSlowStart: ; 0x022F923C mov sb, #0 mov r7, #1 ldr r5, _022F92D0 ; =0x00000C17 - ldr r4, _022F92D4 ; =0x02353538 + ldr r4, _022F92D4 ; =ov29_02353538 mov r6, sb mov fp, r7 mov r8, #0x5e @@ -2255,7 +2255,7 @@ _022F92C0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022F92D0: .word 0x00000C17 -_022F92D4: .word 0x02353538 +_022F92D4: .word ov29_02353538 arm_func_end TryActivateSlowStart arm_func_start TryActivateArtificialWeatherAbilities @@ -2264,7 +2264,7 @@ TryActivateArtificialWeatherAbilities: ; 0x022F92D8 bl IsSecretFloor cmp r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} - ldr r4, _022F9404 ; =0x02353538 + ldr r4, _022F9404 ; =ov29_02353538 ldr r1, [r4] ldrb r0, [r1, #0xe] cmp r0, #0 @@ -2340,7 +2340,7 @@ _022F93F4: blt _022F9324 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022F9404: .word 0x02353538 +_022F9404: .word ov29_02353538 arm_func_end TryActivateArtificialWeatherAbilities arm_func_start GetMonsterApparentId @@ -2363,7 +2363,7 @@ GetMonsterApparentId: ; 0x022F9408 bl GetApparentWeather mov r1, #6 mul r1, r0, r1 - ldr r0, _022F94E4 ; =0x022C4C6E + ldr r0, _022F94E4 ; =ov10_022C4C6E ldrsh r0, [r0, r1] ldmia sp!, {r4, pc} _022F945C: @@ -2383,7 +2383,7 @@ _022F945C: bl GetApparentWeather mov r1, #6 mul r1, r0, r1 - ldr r0, _022F94EC ; =0x022C4C70 + ldr r0, _022F94EC ; =ov10_022C4C70 ldrsh r0, [r0, r1] ldmia sp!, {r4, pc} _022F94A8: @@ -2405,9 +2405,9 @@ _022F94D8: ldmia sp!, {r4, pc} .align 2, 0 _022F94E0: .word 0x0000017B -_022F94E4: .word 0x022C4C6E +_022F94E4: .word ov10_022C4C6E _022F94E8: .word 0x000003D3 -_022F94EC: .word 0x022C4C70 +_022F94EC: .word ov10_022C4C70 arm_func_end GetMonsterApparentId arm_func_start TryActivateTraceAndColorChange @@ -2461,7 +2461,7 @@ _022F95A0: blt _022F95FC add r1, sp, #0 ldrb r3, [r1, r0] - ldr r1, _022F96BC ; =0x02353538 + ldr r1, _022F96BC ; =ov29_02353538 add r2, r6, r4 strb r3, [r2, #0x60] mov r0, #0 @@ -2502,7 +2502,7 @@ _022F95FC: bne _022F9658 mov r0, sb bl GetApparentWeather - ldr r1, _022F96C4 ; =0x022C48DC + ldr r1, _022F96C4 ; =ov10_022C48DC ldrb r4, [r1, r0] _022F9658: cmp r4, #0 @@ -2531,9 +2531,9 @@ _022F9658: bl ov29_022E647C ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022F96BC: .word 0x02353538 +_022F96BC: .word ov29_02353538 _022F96C0: .word 0x00000C18 -_022F96C4: .word 0x022C48DC +_022F96C4: .word ov10_022C48DC _022F96C8: .word 0x00000C19 arm_func_end TryActivateTraceAndColorChange @@ -2695,7 +2695,7 @@ TryPointCameraToMonster: ; 0x022F98B4 ldr r0, [r6] cmp r0, #1 ldmneia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _022F9968 ; =0x02353538 + ldr r0, _022F9968 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1a000 ldr r0, [r0, #0x22c] @@ -2706,7 +2706,7 @@ TryPointCameraToMonster: ; 0x022F98B4 mov r0, #1 bl AnimationDelayOrSomething mov r7, #0x34 - ldr r5, _022F9968 ; =0x02353538 + ldr r5, _022F9968 ; =ov29_02353538 b _022F9918 _022F9910: mov r0, r7 @@ -2728,14 +2728,14 @@ _022F9928: add r0, r6, #4 bl DiscoverMinimap _022F9950: - ldr r0, _022F9968 ; =0x02353538 + ldr r0, _022F9968 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] strh r1, [r0, #0x1c] bl ov29_022E81F8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022F9968: .word 0x02353538 +_022F9968: .word ov29_02353538 arm_func_end TryPointCameraToMonster arm_func_start ov29_022F996C @@ -2747,7 +2747,7 @@ ov29_022F996C: ; 0x022F996C ov29_022F9970: ; 0x022F9970 stmdb sp!, {r4, r5, r6, lr} mov r4, #0 - ldr r6, _022F99E8 ; =0x02353538 + ldr r6, _022F99E8 ; =ov29_02353538 b _022F99DC _022F9980: ldr r0, [r6] @@ -2762,7 +2762,7 @@ _022F9980: ldrb r0, [r0, #0xd8] cmp r0, #3 bne _022F99D8 - ldr r1, _022F99E8 ; =0x02353538 + ldr r1, _022F99E8 ; =ov29_02353538 ldr r0, [r1] add r0, r0, #0x19000 str r5, [r0, #0x904] @@ -2779,7 +2779,7 @@ _022F99DC: blt _022F9980 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022F99E8: .word 0x02353538 +_022F99E8: .word ov29_02353538 arm_func_end ov29_022F9970 arm_func_start ov29_022F99EC @@ -2787,7 +2787,7 @@ ov29_022F99EC: ; 0x022F99EC stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x40 mov r4, #0 - ldr r6, _022F9A70 ; =0x02353538 + ldr r6, _022F9A70 ; =ov29_02353538 mov r5, r4 add r7, sp, #0 _022F9A04: @@ -2821,7 +2821,7 @@ _022F9A68: add sp, sp, #0x40 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022F9A70: .word 0x02353538 +_022F9A70: .word ov29_02353538 arm_func_end ov29_022F99EC arm_func_start RestorePpAllMovesSetFlags @@ -3007,7 +3007,7 @@ ov29_022F9C74: ; 0x022F9C74 and r0, r0, #3 cmp r0, #2 bne _022F9D50 - ldr r0, _022F9E88 ; =0x02353538 + ldr r0, _022F9E88 ; =ov29_02353538 ldr r1, _022F9E8C ; =SECONDARY_TERRAIN_TYPES ldr r0, [r0] add r0, r0, #0x4000 @@ -3062,7 +3062,7 @@ _022F9D50: mov r0, r1 strh r4, [r3] strh r0, [r3, #2] - ldr r1, _022F9E94 ; =0x02352768 + ldr r1, _022F9E94 ; =ov29_02352768 ldr r0, [r3] ldrh r2, [r1] strh r4, [sp, #8] @@ -3132,10 +3132,10 @@ _022F9E80: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_022F9E88: .word 0x02353538 +_022F9E88: .word ov29_02353538 _022F9E8C: .word SECONDARY_TERRAIN_TYPES _022F9E90: .word 0x00000115 -_022F9E94: .word 0x02352768 +_022F9E94: .word ov29_02352768 _022F9E98: .word 0x00000C1A _022F9E9C: .word 0x00000C1B arm_func_end ov29_022F9C74 @@ -3208,7 +3208,7 @@ _022F9F60: strh r2, [r0, #0x46] strh r1, [r0, #0x48] _022F9F9C: - ldr r0, _022FA028 ; =0x02353538 + ldr r0, _022FA028 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x78d] cmp r0, #0 @@ -3247,7 +3247,7 @@ _022FA000: add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 -_022FA028: .word 0x02353538 +_022FA028: .word ov29_02353538 arm_func_end ov29_022F9EA0 arm_func_start ov29_022FA02C @@ -3401,13 +3401,13 @@ _022FA210: add r0, r4, #0x4a bl SetActionPassTurnOrWalk ldrb r2, [r4, #0x16a] - ldr r1, _022FA2E8 ; =0x0235171C + ldr r1, _022FA2E8 ; =DIRECTIONS_XY add r0, r4, #0x100 strb r2, [r4, #0x4c] mov r2, r2, lsl #2 ldrsh r3, [r1, r2] ldrsh ip, [r6, #4] - ldr r2, _022FA2EC ; =0x0235171E + ldr r2, _022FA2EC ; =ov29_0235171E mov r1, #0xff add r3, ip, r3 strh r3, [r0, #0x7e] @@ -3452,14 +3452,14 @@ _022FA2B8: bl ov29_02304A48 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022FA2E8: .word 0x0235171C -_022FA2EC: .word 0x0235171E +_022FA2E8: .word DIRECTIONS_XY +_022FA2EC: .word ov29_0235171E arm_func_end ov29_022FA1D8 arm_func_start ov29_022FA2F0 ov29_022FA2F0: ; 0x022FA2F0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr sb, _022FA35C ; =0x02353538 + ldr sb, _022FA35C ; =ov29_02353538 mov r8, r0 mov r7, r1 mov r6, r2 @@ -3488,7 +3488,7 @@ _022FA34C: blt _022FA308 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022FA35C: .word 0x02353538 +_022FA35C: .word ov29_02353538 arm_func_end ov29_022FA2F0 arm_func_start ov29_022FA360 @@ -3531,7 +3531,7 @@ ov29_022FA3A0: ; 0x022FA3A0 arm_func_start ov29_022FA3D4 ov29_022FA3D4: ; 0x022FA3D4 stmdb sp!, {r4, r5, r6, lr} - ldr r1, _022FA414 ; =0x02353538 + ldr r1, _022FA414 ; =ov29_02353538 mov r4, r0 ldr r0, [r1] mov r6, #0 @@ -3548,7 +3548,7 @@ _022FA3F0: blt _022FA3F0 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022FA414: .word 0x02353538 +_022FA414: .word ov29_02353538 arm_func_end ov29_022FA3D4 arm_func_start ov29_022FA418 @@ -3573,14 +3573,14 @@ ShouldMonsterHeadToStairs: ; 0x022FA430 ldrb r0, [r0, #7] cmp r5, r0 bne _022FA514 - ldr r1, _022FA51C ; =0x02353538 + ldr r1, _022FA51C ; =ov29_02353538 add r0, sl, #4 ldr r1, [r1] add r1, r1, #0xe4 add r1, r1, #0xcc00 bl GetChebyshevDistance ldr r7, _022FA520 ; =0x00002710 - ldr r4, _022FA51C ; =0x02353538 + ldr r4, _022FA51C ; =ov29_02353538 mov r6, r0 mov r8, #0 _022FA480: @@ -3627,14 +3627,14 @@ _022FA514: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_022FA51C: .word 0x02353538 +_022FA51C: .word ov29_02353538 _022FA520: .word 0x00002710 arm_func_end ShouldMonsterHeadToStairs arm_func_start ov29_022FA524 ov29_022FA524: ; 0x022FA524 stmdb sp!, {r4, r5, r6, lr} - ldr r4, _022FA570 ; =0x02353538 + ldr r4, _022FA570 ; =ov29_02353538 mov r5, #0 _022FA530: ldr r0, [r4] @@ -3655,7 +3655,7 @@ _022FA560: blt _022FA530 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022FA570: .word 0x02353538 +_022FA570: .word ov29_02353538 arm_func_end ov29_022FA524 arm_func_start ov29_022FA574 @@ -3707,7 +3707,7 @@ MewSpawnCheck: ; 0x022FA5F0 ldmeqia sp!, {r3, r4, r5, pc} cmp r5, #0x97 bne _022FA63C - ldr r0, _022FA644 ; =0x02353538 + ldr r0, _022FA644 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x3000 ldrb r0, [r0, #0xe39] @@ -3721,7 +3721,7 @@ _022FA63C: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022FA644: .word 0x02353538 +_022FA644: .word ov29_02353538 arm_func_end MewSpawnCheck arm_func_start ov29_022FA648 @@ -3732,7 +3732,7 @@ ov29_022FA648: ; 0x022FA648 mov fp, r6 mov r5, r7 _022FA65C: - ldr r0, _022FA74C ; =0x02353538 + ldr r0, _022FA74C ; =ov29_02353538 ldr r0, [r0] add r0, r0, r7, lsl #2 add r0, r0, #0x12000 @@ -3798,14 +3798,14 @@ _022FA730: bl ov29_022EA370 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FA74C: .word 0x02353538 +_022FA74C: .word ov29_02353538 arm_func_end ov29_022FA648 arm_func_start ov29_022FA750 ov29_022FA750: ; 0x022FA750 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} mov r6, #0 - ldr r4, _022FA7D8 ; =0x02353538 + ldr r4, _022FA7D8 ; =ov29_02353538 mov r5, r6 _022FA760: ldr r0, [r4] @@ -3842,7 +3842,7 @@ _022FA7C8: blt _022FA760 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_022FA7D8: .word 0x02353538 +_022FA7D8: .word ov29_02353538 arm_func_end ov29_022FA750 arm_func_start TryEndStatusWithAbility @@ -4028,7 +4028,7 @@ _022FAA0C: ov29_022FAA58: ; 0x022FAA58 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x14 - ldr r1, _022FAC90 ; =0x02353538 + ldr r1, _022FAC90 ; =ov29_02353538 mov sl, r0 ldr r0, [r1] mov r6, #0 @@ -4182,7 +4182,7 @@ _022FAC74: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FAC90: .word 0x02353538 +_022FAC90: .word ov29_02353538 _022FAC94: .word 0x00000C23 arm_func_end ov29_022FAA58 @@ -4203,7 +4203,7 @@ ExclusiveItemEffectIsActive__022FAC98: ; 0x022FAC98 ov29_022FACBC: ; 0x022FACBC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #4 - ldr r1, _022FAD44 ; =0x02353538 + ldr r1, _022FAD44 ; =ov29_02353538 mov sb, r0 ldr r0, [r1] mov r8, #0 @@ -4238,14 +4238,14 @@ _022FAD28: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_022FAD44: .word 0x02353538 +_022FAD44: .word ov29_02353538 _022FAD48: .word 0x000003E7 arm_func_end ov29_022FACBC arm_func_start ov29_022FAD4C ov29_022FAD4C: ; 0x022FAD4C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr r1, _022FAF00 ; =0x02353538 + ldr r1, _022FAF00 ; =ov29_02353538 mov r8, #0 ldr r1, [r1] sub r3, r8, #1 @@ -4367,14 +4367,14 @@ _022FAEEC: bl GetFloorType ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022FAF00: .word 0x02353538 +_022FAF00: .word ov29_02353538 _022FAF04: .word 0x00000C21 arm_func_end ov29_022FAD4C arm_func_start ov29_022FAF08 ov29_022FAF08: ; 0x022FAF08 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr r1, _022FAFC8 ; =0x02353538 + ldr r1, _022FAFC8 ; =ov29_02353538 mov r6, r0 ldr r0, [r1] mov r5, #0 @@ -4408,7 +4408,7 @@ _022FAF74: _022FAF7C: cmp r5, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - ldr r1, _022FAFC8 ; =0x02353538 + ldr r1, _022FAFC8 ; =ov29_02353538 ldr r0, _022FAFCC ; =0x00012AF8 ldr r1, [r1] ldrsh r1, [r1, r0] @@ -4426,7 +4426,7 @@ _022FAF7C: bl ov29_022EA370 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022FAFC8: .word 0x02353538 +_022FAFC8: .word ov29_02353538 _022FAFCC: .word 0x00012AF8 _022FAFD0: .word 0x00000C22 arm_func_end ov29_022FAF08 @@ -4447,7 +4447,7 @@ ov29_022FAFD4: ; 0x022FAFD4 arm_func_start GetTeamMemberWithIqSkill GetTeamMemberWithIqSkill: ; 0x022FAFF8 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r1, _022FB060 ; =0x02353538 + ldr r1, _022FB060 ; =ov29_02353538 mov r4, #0 ldr r1, [r1] mov r5, r0 @@ -4477,7 +4477,7 @@ _022FB058: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022FB060: .word 0x02353538 +_022FB060: .word ov29_02353538 arm_func_end GetTeamMemberWithIqSkill arm_func_start TeamMemberHasEnabledIqSkill @@ -4760,7 +4760,7 @@ _022FB418: blt _022FB410 mov r8, #0 add r4, sp, #0xe - ldr fp, _022FB514 ; =0x020AF6B8 + ldr fp, _022FB514 ; =BAG_ITEMS_PTR_MIRROR b _022FB4FC _022FB430: ldrb r1, [r4, r8] @@ -4825,7 +4825,7 @@ _022FB508: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022FB510: .word 0x00000C24 -_022FB514: .word 0x020AF6B8 +_022FB514: .word BAG_ITEMS_PTR_MIRROR _022FB518: .word 0x00000C25 arm_func_end TryEatItem @@ -4849,7 +4849,7 @@ ov29_022FB538: ; 0x022FB538 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} ldr r5, [r6, #0xb4] mov r4, #0 - ldr r7, _022FB5E8 ; =0x02353538 + ldr r7, _022FB5E8 ; =ov29_02353538 strb r4, [r5, #0x10c] ldr r0, [r7] add r0, r0, #0x3000 @@ -4890,7 +4890,7 @@ _022FB5DC: blt _022FB574 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022FB5E8: .word 0x02353538 +_022FB5E8: .word ov29_02353538 arm_func_end ov29_022FB538 arm_func_start CheckSpawnThreshold @@ -4943,7 +4943,7 @@ AreEntitiesAdjacent: ; 0x022FB678 mov r7, r0 mov r6, r1 mov r5, #0 - ldr r4, _022FB6E0 ; =0x0235171C + ldr r4, _022FB6E0 ; =DIRECTIONS_XY b _022FB6D0 _022FB690: mov r1, r5, lsl #2 @@ -4968,7 +4968,7 @@ _022FB6D0: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022FB6E0: .word 0x0235171C +_022FB6E0: .word DIRECTIONS_XY arm_func_end AreEntitiesAdjacent arm_func_start ov29_022FB6E4 @@ -5006,7 +5006,7 @@ ov29_022FB718: ; 0x022FB718 ldr r4, [sl, #0xb4] bl IqSkillIsEnabled cmp r0, #0 - ldrne r0, _022FB834 ; =0x020A1870 + ldrne r0, _022FB834 ; =_020A1870 mov r8, #0 ldrnesh r1, [r4, #0x16] ldrnesh r0, [r0] @@ -5065,7 +5065,7 @@ _022FB7FC: strh r1, [sb, #0x10] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FB834: .word 0x020A1870 +_022FB834: .word _020A1870 _022FB838: .word 0x000003E7 arm_func_end ov29_022FB718 @@ -5138,7 +5138,7 @@ _022FB91C: .word 0x000003E7 arm_func_start ov29_022FB920 ov29_022FB920: ; 0x022FB920 stmdb sp!, {r3, r4, r5, lr} - ldr r4, _022FB980 ; =0x02353538 + ldr r4, _022FB980 ; =ov29_02353538 mov r5, #0 _022FB92C: ldr r0, [r4] @@ -5154,16 +5154,16 @@ _022FB92C: mov r0, #0x41 bl TeamMemberHasEnabledIqSkill cmp r0, #0 - ldrne r0, _022FB980 ; =0x02353538 + ldrne r0, _022FB980 ; =ov29_02353538 movne r1, #1 - ldreq r0, _022FB980 ; =0x02353538 + ldreq r0, _022FB980 ; =ov29_02353538 moveq r1, #0 ldr r0, [r0] add r0, r0, #0x1a000 strb r1, [r0, #0x241] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022FB980: .word 0x02353538 +_022FB980: .word ov29_02353538 arm_func_end ov29_022FB920 arm_func_start ov29_022FB984 @@ -5315,7 +5315,7 @@ IsExperienceLocked: ; 0x022FBAF0 ov29_022FBB1C: ; 0x022FBB1C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #4 - ldr r4, _022FBBE4 ; =0x02353538 + ldr r4, _022FBBE4 ; =ov29_02353538 ldr sl, _022FBBE8 ; =0x00019914 mov r7, #0 add r6, sp, #0 @@ -5366,7 +5366,7 @@ _022FBBD0: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_022FBBE4: .word 0x02353538 +_022FBBE4: .word ov29_02353538 _022FBBE8: .word 0x00019914 arm_func_end ov29_022FBB1C @@ -5375,7 +5375,7 @@ ov29_022FBBEC: ; 0x022FBBEC stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r0 mov r4, #0 - ldr r6, _022FBC48 ; =0x02353538 + ldr r6, _022FBC48 ; =ov29_02353538 b _022FBC38 _022FBC00: ldr r0, [r6] @@ -5399,14 +5399,14 @@ _022FBC38: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022FBC48: .word 0x02353538 +_022FBC48: .word ov29_02353538 arm_func_end ov29_022FBBEC arm_func_start ov29_022FBC4C ov29_022FBC4C: ; 0x022FBC4C stmdb sp!, {r3, r4, r5, lr} mov r5, #0 - ldr r4, _022FBC90 ; =0x02353538 + ldr r4, _022FBC90 ; =ov29_02353538 b _022FBC80 _022FBC5C: ldr r0, [r4] @@ -5424,14 +5424,14 @@ _022FBC80: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022FBC90: .word 0x02353538 +_022FBC90: .word ov29_02353538 arm_func_end ov29_022FBC4C arm_func_start ov29_022FBC94 ov29_022FBC94: ; 0x022FBC94 stmdb sp!, {r4, r5, r6, lr} bl GetBodySize - ldr r6, _022FBD04 ; =0x02353538 + ldr r6, _022FBD04 ; =ov29_02353538 mov r4, r0 mov r5, #0 _022FBCA8: @@ -5460,19 +5460,19 @@ _022FBCE4: and r0, r0, #0xff ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022FBD04: .word 0x02353538 +_022FBD04: .word ov29_02353538 arm_func_end ov29_022FBC94 arm_func_start ov29_022FBD08 ov29_022FBD08: ; 0x022FBD08 - ldr r0, _022FBD20 ; =0x02353538 + ldr r0, _022FBD20 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] add r0, r0, #0x3000 str r1, [r0, #0xe1c] bx lr .align 2, 0 -_022FBD20: .word 0x02353538 +_022FBD20: .word ov29_02353538 arm_func_end ov29_022FBD08 arm_func_start ov29_022FBD24 @@ -5483,7 +5483,7 @@ ov29_022FBD24: ; 0x022FBD24 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _022FBD7C ; =0x02353538 + ldr r0, _022FBD7C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1cc add r3, r0, #0x3c00 @@ -5500,7 +5500,7 @@ ov29_022FBD24: ; 0x022FBD24 str r1, [r3, #0x50] ldmia sp!, {r4, pc} .align 2, 0 -_022FBD7C: .word 0x02353538 +_022FBD7C: .word ov29_02353538 arm_func_end ov29_022FBD24 arm_func_start ov29_022FBD80 @@ -5510,7 +5510,7 @@ ov29_022FBD80: ; 0x022FBD80 bl IsMonster__022F9720 cmp r0, #0 beq _022FBDD4 - ldr r0, _022FBDDC ; =0x02353538 + ldr r0, _022FBDDC ; =ov29_02353538 ldr r1, [r4, #0xb4] ldr r0, [r0] ldr r2, [r1, #0xb0] @@ -5532,7 +5532,7 @@ _022FBDD4: mov r0, #0 ldmia sp!, {r4, pc} .align 2, 0 -_022FBDDC: .word 0x02353538 +_022FBDDC: .word ov29_02353538 arm_func_end ov29_022FBD80 arm_func_start ov29_022FBDE0 @@ -5560,11 +5560,11 @@ ov29_022FBE04: ; 0x022FBE04 ldrb r0, [r0, #6] cmp r0, #0 bne _022FBE4C - ldr r0, _022FBE54 ; =0x02353538 + ldr r0, _022FBE54 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl GetTurnLimit - ldr r1, _022FBE54 ; =0x02353538 + ldr r1, _022FBE54 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x700 ldrsh r1, [r1, #0x84] @@ -5578,7 +5578,7 @@ _022FBE4C: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_022FBE54: .word 0x02353538 +_022FBE54: .word ov29_02353538 arm_func_end ov29_022FBE04 arm_func_start InitOtherMonsterData @@ -5590,7 +5590,7 @@ InitOtherMonsterData: ; 0x022FBE58 strb r6, [ip, #0x100] ldrsh r5, [ip, #0x12] ldrsh r3, [ip, #0x16] - ldr r7, _022FBF04 ; =0x022C5938 + ldr r7, _022FBF04 ; =ov10_022C5938 mov r0, #0xc add r5, r5, r3 smlabb r3, r1, r0, r7 @@ -5627,13 +5627,13 @@ InitOtherMonsterData: ; 0x022FBE58 bl ov29_022FB83C ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022FBF04: .word 0x022C5938 +_022FBF04: .word ov10_022C5938 arm_func_end InitOtherMonsterData arm_func_start ov29_022FBF08 ov29_022FBF08: ; 0x022FBF08 stmdb sp!, {r3, lr} - ldr r0, _022FBF2C ; =0x02353538 + ldr r0, _022FBF2C ; =ov29_02353538 ldr r0, [r0] ldr r0, [r0, #0x7cc] sub r0, r0, #1 @@ -5642,13 +5642,13 @@ ov29_022FBF08: ; 0x022FBF08 bl LoadWazaP2 ldmia sp!, {r3, pc} .align 2, 0 -_022FBF2C: .word 0x02353538 +_022FBF2C: .word ov29_02353538 arm_func_end ov29_022FBF08 arm_func_start ov29_022FBF30 ov29_022FBF30: ; 0x022FBF30 stmdb sp!, {r3, lr} - ldr r0, _022FBF54 ; =0x02353538 + ldr r0, _022FBF54 ; =ov29_02353538 ldr r0, [r0] ldr r0, [r0, #0x7cc] sub r0, r0, #1 @@ -5657,14 +5657,14 @@ ov29_022FBF30: ; 0x022FBF30 bl UnloadCurrentWazaP ldmia sp!, {r3, pc} .align 2, 0 -_022FBF54: .word 0x02353538 +_022FBF54: .word ov29_02353538 arm_func_end ov29_022FBF30 arm_func_start InitEnemySpawnStats InitEnemySpawnStats: ; 0x022FBF58 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x218 - ldr r1, _022FC230 ; =0x02353538 + ldr r1, _022FC230 ; =ov29_02353538 mov r0, #0 ldr r1, [r1] add r1, r1, #0xf4 @@ -5755,7 +5755,7 @@ _022FC088: _022FC0A8: cmp r4, #0x40 bge _022FC0E0 - ldr r0, _022FC230 ; =0x02353538 + ldr r0, _022FC230 ; =ov29_02353538 ldr r2, [r0] add r0, r2, #0x700 ldrsh r1, [r0, #0xa8] @@ -5769,7 +5769,7 @@ _022FC0A8: add r4, r4, #1 _022FC0E0: mov r2, #0 - ldr r1, _022FC230 ; =0x02353538 + ldr r1, _022FC230 ; =ov29_02353538 mov sl, r2 _022FC0EC: ldr r0, [r1] @@ -5800,7 +5800,7 @@ _022FC128: mov r0, fp mov r1, #0x258 bl __divsi3 - ldr r0, _022FC230 ; =0x02353538 + ldr r0, _022FC230 ; =ov29_02353538 mov r1, r1, lsl #0x10 ldr r0, [r0] mov sb, r1, asr #0x10 @@ -5824,7 +5824,7 @@ _022FC194: blt _022FC1F0 cmp r5, #0x100 ble _022FC1C8 - ldr r0, _022FC230 ; =0x02353538 + ldr r0, _022FC230 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r6 add r1, r0, #0x3000 @@ -5832,7 +5832,7 @@ _022FC194: strb r0, [r1, #0xb74] b _022FC1E4 _022FC1C8: - ldr r0, _022FC230 ; =0x02353538 + ldr r0, _022FC230 ; =ov29_02353538 rsb r1, r5, #0x100 ldr r0, [r0] add r5, r5, #2 @@ -5845,7 +5845,7 @@ _022FC1E8: cmp sl, r4 blt _022FC118 _022FC1F0: - ldr r1, _022FC230 ; =0x02353538 + ldr r1, _022FC230 ; =ov29_02353538 mov r4, #0 mov r2, #1 _022FC1FC: @@ -5863,7 +5863,7 @@ _022FC1FC: add sp, sp, #0x218 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FC230: .word 0x02353538 +_022FC230: .word ov29_02353538 arm_func_end InitEnemySpawnStats arm_func_start InitEnemyStatsAndMoves @@ -5879,7 +5879,7 @@ InitEnemyStatsAndMoves: ; 0x022FC234 ldr r6, [sp, #0x34] bl __divsi3 mov r0, r1, lsl #0x10 - ldr r2, _022FC464 ; =0x02353538 + ldr r2, _022FC464 ; =ov29_02353538 mov r4, r0, asr #0x10 ldr r1, [r2] mov fp, #0 @@ -6023,7 +6023,7 @@ _022FC45C: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FC464: .word 0x02353538 +_022FC464: .word ov29_02353538 arm_func_end InitEnemyStatsAndMoves arm_func_start ov29_022FC468 @@ -6061,7 +6061,7 @@ _022FC4C4: cmp r2, #2 blt _022FC4C4 ldrsh r1, [r4, #8] - ldr r0, _022FC508 ; =0x020A1C7C + ldr r0, _022FC508 ; =IQ_SKILLS ldr r0, [r0, #0x20] strh r1, [r5] cmp r1, r0 @@ -6070,7 +6070,7 @@ _022FC4C4: strb r0, [sb, #0x20] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022FC508: .word 0x020A1C7C +_022FC508: .word IQ_SKILLS arm_func_end ov29_022FC468 arm_func_start SpawnTeam @@ -6080,7 +6080,7 @@ SpawnTeam: ; 0x022FC50C mov sl, r0 mov r0, #0 bl DungeonRngSetSecondary - ldr r0, _022FC98C ; =0x02353538 + ldr r0, _022FC98C ; =ov29_02353538 ldr r0, [r0] add r1, r0, #0xcc00 ldrsh r0, [r1, #0xe0] @@ -6158,7 +6158,7 @@ _022FC628: mov r7, r0, asr #0x10 cmp r7, #4 blt _022FC5FC - ldr r0, _022FC98C ; =0x02353538 + ldr r0, _022FC98C ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75c] cmp r0, #0 @@ -6236,7 +6236,7 @@ _022FC6F0: _022FC74C: mov r4, #0 _022FC750: - ldr r0, _022FC998 ; =0x02351E28 + ldr r0, _022FC998 ; =ov29_02351E28 mov r1, r4, lsl #2 ldrh r1, [r0, r1] add r0, r0, r4, lsl #2 @@ -6246,7 +6246,7 @@ _022FC750: strh r0, [sp, #0x20] cmp r8, #0x63 beq _022FC808 - ldr r0, _022FC98C ; =0x02353538 + ldr r0, _022FC98C ; =ov29_02353538 ldrsh r7, [sp, #0x20] ldr r0, [r0] add r0, r0, #0xcc00 @@ -6263,7 +6263,7 @@ _022FC750: bl IsInvalidSpawnTile cmp r0, #0 bne _022FC800 - ldr r0, _022FC98C ; =0x02353538 + ldr r0, _022FC98C ; =ov29_02353538 mov r1, #0 ldr r2, [r0] mov r0, #1 @@ -6286,7 +6286,7 @@ _022FC800: _022FC808: cmp r6, #0 bne _022FC8BC - ldr r8, _022FC998 ; =0x02351E28 + ldr r8, _022FC998 ; =ov29_02351E28 mov r7, #0 _022FC818: mov r0, r7, lsl #2 @@ -6298,7 +6298,7 @@ _022FC818: strh r0, [sp, #0x16] cmp r6, #0x63 beq _022FC8BC - ldr r0, _022FC98C ; =0x02353538 + ldr r0, _022FC98C ; =ov29_02353538 ldrsh r4, [sp, #0x16] ldr r0, [r0] add r0, r0, #0xcc00 @@ -6312,7 +6312,7 @@ _022FC818: bl IsInvalidSpawnTile cmp r0, #0 bne _022FC8B4 - ldr r0, _022FC98C ; =0x02353538 + ldr r0, _022FC98C ; =ov29_02353538 mov r1, #0 ldr r2, [r0] mov r0, #1 @@ -6348,7 +6348,7 @@ _022FC8E0: mov r2, r0, asr #0x10 cmp r2, #5 blt _022FC8E0 - ldr r4, _022FC98C ; =0x02353538 + ldr r4, _022FC98C ; =ov29_02353538 mov r6, #0 mov r7, #1 add r5, sp, #0x18 @@ -6388,8 +6388,8 @@ _022FC964: add sp, sp, #0x44 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FC98C: .word 0x02353538 +_022FC98C: .word ov29_02353538 _022FC990: .word 0x0000017B _022FC994: .word 0x000003D3 -_022FC998: .word 0x02351E28 +_022FC998: .word ov29_02351E28 arm_func_end SpawnTeam diff --git a/asm/overlay_29_022FC9C0.s b/asm/overlay_29_022FC9C0.s index 9fcee0c5..f7768bf3 100644 --- a/asm/overlay_29_022FC9C0.s +++ b/asm/overlay_29_022FC9C0.s @@ -53,14 +53,14 @@ _022FCA58: _022FCA60: cmp sl, #4 blt _022FCA58 - ldr r0, _022FCCF4 ; =0x0235355C + ldr r0, _022FCCF4 ; =ov29_0235355C mov r1, #0 str r1, [r0] bl GetLeader mov r4, r0 bl EntityIsValid__022FC99C cmp r0, #0 - ldreq r0, _022FCCF8 ; =0x02353538 + ldreq r0, _022FCCF8 ; =ov29_02353538 ldrnesh sb, [r4, #4] ldreq r0, [r0] ldrnesh r8, [r4, #6] @@ -94,7 +94,7 @@ _022FCAB4: cmp r1, r0 bne _022FCCD0 ldr r0, _022FCCFC ; =0x00005AA5 - ldr fp, _022FCD00 ; =0x02351E28 + ldr fp, _022FCD00 ; =ov29_02351E28 mov r5, #0 strh r0, [r6, #8] _022FCB14: @@ -140,7 +140,7 @@ _022FCBA4: _022FCBAC: cmp r7, #0 bne _022FCC48 - ldr fp, _022FCD00 ; =0x02351E28 + ldr fp, _022FCD00 ; =ov29_02351E28 mov r5, #0 _022FCBBC: mov r0, r5, lsl #2 @@ -228,17 +228,17 @@ _022FCCD0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022FCCF0: .word 0x000055AA -_022FCCF4: .word 0x0235355C -_022FCCF8: .word 0x02353538 +_022FCCF4: .word ov29_0235355C +_022FCCF8: .word ov29_02353538 _022FCCFC: .word 0x00005AA5 -_022FCD00: .word 0x02351E28 +_022FCD00: .word ov29_02351E28 arm_func_end ov29_022FC9C0 arm_func_start ov29_022FCD04 ov29_022FCD04: ; 0x022FCD04 stmdb sp!, {r4, r5, r6, lr} mov r5, #0 - ldr r4, _022FCD70 ; =0x02353538 + ldr r4, _022FCD70 ; =ov29_02353538 b _022FCD64 _022FCD14: ldr r0, [r4] @@ -255,7 +255,7 @@ _022FCD14: mov r0, r6 bl ov29_022E2DFC ldrh r1, [r6, #4] - ldr r0, _022FCD74 ; =0x0237C690 + ldr r0, _022FCD74 ; =ov29_0237C690 strh r1, [r0] ldrh r1, [r6, #6] strh r1, [r0, #2] @@ -267,8 +267,8 @@ _022FCD64: blt _022FCD14 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_022FCD70: .word 0x02353538 -_022FCD74: .word 0x0237C690 +_022FCD70: .word ov29_02353538 +_022FCD74: .word ov29_0237C690 arm_func_end ov29_022FCD04 arm_func_start SpawnInitialMonsters @@ -310,7 +310,7 @@ _022FCDDC: strb r0, [sp, #0x2a] b _022FCE34 _022FCE00: - ldr r0, _022FD080 ; =0x02353538 + ldr r0, _022FD080 ; =ov29_02353538 ldr r2, [r0] add r0, r2, #0x700 ldrsh r0, [r0, #0xa8] @@ -324,7 +324,7 @@ _022FCE00: strh r0, [sp, #0x28] strb r1, [sp, #0x2a] _022FCE34: - ldr r0, _022FD080 ; =0x02353538 + ldr r0, _022FD080 ; =ov29_02353538 mov r2, #0 ldr r1, [r0] mov r0, #0x38 @@ -427,7 +427,7 @@ _022FCF48: cmp r0, #0 beq _022FCFEC _022FCFB4: - ldr r1, _022FD080 ; =0x02353538 + ldr r1, _022FD080 ; =ov29_02353538 add r0, sp, #0 ldr r1, [r1] mov r2, #0 @@ -442,7 +442,7 @@ _022FCFB4: strneh r0, [sp, #0x30] b _022FD020 _022FCFEC: - ldr r1, _022FD080 ; =0x02353538 + ldr r1, _022FD080 ; =ov29_02353538 add r0, sp, #0 ldr r1, [r1] mov r2, #0 @@ -483,7 +483,7 @@ _022FD070: add sp, sp, #0x34 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FD080: .word 0x02353538 +_022FD080: .word ov29_02353538 arm_func_end SpawnInitialMonsters arm_func_start SpawnMonster @@ -506,7 +506,7 @@ SpawnMonster: ; 0x022FD084 movs r4, r0 mov r0, #0 beq _022FD2F8 - ldr r3, _022FD300 ; =0x0237C690 + ldr r3, _022FD300 ; =ov29_0237C690 mov r1, r4 mov r2, r7 bl InitMonster @@ -515,7 +515,7 @@ SpawnMonster: ; 0x022FD084 strb r0, [r5, #6] mov r1, #0 strb r1, [r5, #8] - ldr r0, _022FD304 ; =0x02353538 + ldr r0, _022FD304 ; =ov29_02353538 ldr r1, _022FD308 ; =0x0002CB08 ldr r2, [r0] mov r0, r4 @@ -589,7 +589,7 @@ _022FD1F0: bl ov29_022EFAE8 cmp r0, #0 beq _022FD224 - ldr r0, _022FD30C ; =0x022C45A4 + ldr r0, _022FD30C ; =ov10_022C45A4 ldrsh r2, [r5, #0x12] ldrsh r1, [r0] ldr r0, _022FD310 ; =0x000003E7 @@ -599,24 +599,24 @@ _022FD1F0: cmp r1, r0 strgth r0, [r5, #0x12] _022FD224: - ldr r0, _022FD304 ; =0x02353538 + ldr r0, _022FD304 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] cmp r0, #0x67 bne _022FD278 - ldr r1, _022FD314 ; =0x022C489C + ldr r1, _022FD314 ; =ov10_022C489C add r0, r5, #0x1a ldrb r1, [r1] bl sub_02054FEC - ldr r1, _022FD314 ; =0x022C489C + ldr r1, _022FD314 ; =ov10_022C489C add r0, r5, #0x1b ldrb r1, [r1, #1] bl sub_02054FEC - ldr r1, _022FD314 ; =0x022C489C + ldr r1, _022FD314 ; =ov10_022C489C add r0, r5, #0x1c ldrb r1, [r1, #2] bl sub_02055020 - ldr r1, _022FD314 ; =0x022C489C + ldr r1, _022FD314 ; =ov10_022C489C add r0, r5, #0x1d ldrb r1, [r1, #3] bl sub_02055020 @@ -658,12 +658,12 @@ _022FD2F8: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022FD300: .word 0x0237C690 -_022FD304: .word 0x02353538 +_022FD300: .word ov29_0237C690 +_022FD304: .word ov29_02353538 _022FD308: .word 0x0002CB08 -_022FD30C: .word 0x022C45A4 +_022FD30C: .word ov10_022C45A4 _022FD310: .word 0x000003E7 -_022FD314: .word 0x022C489C +_022FD314: .word ov10_022C489C arm_func_end SpawnMonster arm_func_start ov29_022FD318 @@ -735,7 +735,7 @@ InitTeamMember: ; 0x022FD3B4 bne _022FD420 ldrb r0, [sp, #0x3c] cmp r0, #0 - ldrne r0, _022FD780 ; =0x02353538 + ldrne r0, _022FD780 ; =ov29_02353538 ldrne r0, [r0] addne r0, r0, #0x3e00 ldrnesh r7, [r0, #0x3a] @@ -755,11 +755,11 @@ _022FD420: beq _022FD774 mov r0, r7 bl ov29_022E1D2C - ldr r1, _022FD784 ; =0x0237C9C0 + ldr r1, _022FD784 ; =ov29_0237C9C0 strh r7, [sp, #4] ldrb r3, [r1] - ldr r2, _022FD788 ; =0x0235171C - ldr r1, _022FD78C ; =0x0235171E + ldr r2, _022FD788 ; =DIRECTIONS_XY + ldr r1, _022FD78C ; =ov29_0235171E mov r3, r3, lsl #2 ldrsh r2, [r2, r3] ldrsh r1, [r1, r3] @@ -777,7 +777,7 @@ _022FD420: strb r3, [sp, #0x12] cmp r6, #0 addne r3, sp, #0 - ldreq r3, _022FD790 ; =0x0237C690 + ldreq r3, _022FD790 ; =ov29_0237C690 add r2, sp, #4 mov r1, r7 mov r0, #1 @@ -790,11 +790,11 @@ _022FD420: strb r2, [r8, #9] ldrb r1, [sp, #0x40] strb r6, [r8, #7] - ldr r0, _022FD794 ; =0x0235355C + ldr r0, _022FD794 ; =ov29_0235355C strb r1, [r8, #0x102] str r2, [r0] cmp r6, #0 - ldrne r0, _022FD790 ; =0x0237C690 + ldrne r0, _022FD790 ; =ov29_0237C690 mov r3, #0 strneh sl, [r0] strneh sb, [r0, #2] @@ -909,7 +909,7 @@ _022FD570: cmpne r0, #0x47 bne _022FD760 ldr r2, [r7, #0xb4] - ldr r0, _022FD798 ; =0x022C4520 + ldr r0, _022FD798 ; =ov10_022C4520 ldrb r1, [r2, #6] ldrsh r5, [r0] cmp r1, #0 @@ -921,7 +921,7 @@ _022FD570: _022FD6D8: cmp r0, #0 beq _022FD6FC - ldr r1, _022FD79C ; =0x022C4858 + ldr r1, _022FD79C ; =ov10_022C4858 mov r0, r5, lsl #8 ldr r1, [r1] bl MultiplyByFixedPoint @@ -965,14 +965,14 @@ _022FD774: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _022FD77C: .word 0x000001A2 -_022FD780: .word 0x02353538 -_022FD784: .word 0x0237C9C0 -_022FD788: .word 0x0235171C -_022FD78C: .word 0x0235171E -_022FD790: .word 0x0237C690 -_022FD794: .word 0x0235355C -_022FD798: .word 0x022C4520 -_022FD79C: .word 0x022C4858 +_022FD780: .word ov29_02353538 +_022FD784: .word ov29_0237C9C0 +_022FD788: .word DIRECTIONS_XY +_022FD78C: .word ov29_0235171E +_022FD790: .word ov29_0237C690 +_022FD794: .word ov29_0235355C +_022FD798: .word ov10_022C4520 +_022FD79C: .word ov10_022C4858 arm_func_end InitTeamMember arm_func_start ov29_022FD7A0 @@ -1129,7 +1129,7 @@ _022FD9D0: .word 0x000003E7 InitMonster: ; 0x022FD9D4 stmdb sp!, {r3, r4, r5, r6, r7, r8, lr} sub sp, sp, #0xc - ldr r4, _022FDDB0 ; =0x02353538 + ldr r4, _022FDDB0 ; =ov29_02353538 mov r7, r1 ldr r4, [r4] mov r1, #1 @@ -1167,7 +1167,7 @@ InitMonster: ; 0x022FD9D4 addne r0, r0, #0x258 cmpne r1, r0 bne _022FDAAC - ldr r0, _022FDDB0 ; =0x02353538 + ldr r0, _022FDDB0 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x790] cmp r0, #0 @@ -1188,13 +1188,13 @@ _022FDAB4: ldrsh r0, [r4, #2] bl GetBaseForm cmp r0, #0x97 - ldreq r0, _022FDDB0 ; =0x02353538 + ldreq r0, _022FDDB0 ; =ov29_02353538 moveq r1, #1 ldreq r0, [r0] addeq r0, r0, #0x3000 streqb r1, [r0, #0xe39] _022FDAD4: - ldr r1, _022FDDB0 ; =0x02353538 + ldr r1, _022FDDB0 ; =ov29_02353538 mov r2, #0 ldr r0, [r1] add r0, r0, #0x3000 @@ -1339,8 +1339,8 @@ _022FDB18: cmpne r1, r0 moveq r0, #0 streqb r0, [r4, #0x160] - ldr r1, _022FDDBC ; =0x0235276C - ldr r0, _022FDDB0 ; =0x02353538 + ldr r1, _022FDDBC ; =ov29_0235276C + ldr r0, _022FDDB0 ; =ov29_02353538 ldrh r3, [r1] ldr r0, [r0] add r2, sp, #8 @@ -1379,10 +1379,10 @@ _022FDB18: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_022FDDB0: .word 0x02353538 +_022FDDB0: .word ov29_02353538 _022FDDB4: .word 0x0000017F _022FDDB8: .word 0x0000028A -_022FDDBC: .word 0x0235276C +_022FDDBC: .word ov29_0235276C arm_func_end InitMonster arm_func_start SubInitMonster @@ -1472,7 +1472,7 @@ _022FDEA0: bl GetApparentWeather mov r1, #6 mul r2, r0, r1 - ldr r1, _022FDF9C ; =0x022C4C6C + ldr r1, _022FDF9C ; =ov10_022C4C6C mov r0, #0 ldrb r1, [r1, r2] strb r1, [sl, #0x5e] @@ -1493,7 +1493,7 @@ _022FDF48: mov r2, #0 strb r2, [sl, #0xaa] strb r2, [sl, #0xab] - ldr r0, _022FDFA0 ; =0x02353538 + ldr r0, _022FDFA0 ; =ov29_02353538 strb r2, [sl, #0xa9] ldr r0, [r0] mov r1, #1 @@ -1512,8 +1512,8 @@ _022FDF48: bl ov29_02307DC0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FDF9C: .word 0x022C4C6C -_022FDFA0: .word 0x02353538 +_022FDF9C: .word ov10_022C4C6C +_022FDFA0: .word ov29_02353538 arm_func_end SubInitMonster arm_func_start ov29_022FDFA4 @@ -1524,7 +1524,7 @@ ov29_022FDFA4: ; 0x022FDFA4 mov r5, #1 mov r6, r7 _022FDFB8: - ldr r0, _022FE044 ; =0x02353538 + ldr r0, _022FE044 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r7, lsl #2 add r0, r0, #0x12000 @@ -1562,7 +1562,7 @@ _022FE034: blt _022FDFB8 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022FE044: .word 0x02353538 +_022FE044: .word ov29_02353538 arm_func_end ov29_022FDFA4 arm_func_start ov29_022FE048 @@ -1660,7 +1660,7 @@ _022FE194: .word 0x00005AA5 arm_func_start MarkShopkeeperSpawn MarkShopkeeperSpawn: ; 0x022FE198 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr ip, _022FE248 ; =0x02353538 + ldr ip, _022FE248 ; =ov29_02353538 mov r6, #0 ldr r4, [ip] mov lr, #6 @@ -1707,14 +1707,14 @@ _022FE1E8: str r0, [ip, #0x30] ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022FE248: .word 0x02353538 +_022FE248: .word ov29_02353538 arm_func_end MarkShopkeeperSpawn arm_func_start SpawnShopkeepers SpawnShopkeepers: ; 0x022FE24C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x10 - ldr r0, _022FE2E0 ; =0x02353538 + ldr r0, _022FE2E0 ; =ov29_02353538 ldr r0, [r0] add r6, r0, #0x5e0 bl ov29_022FBF08 @@ -1753,18 +1753,18 @@ _022FE2C8: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022FE2E0: .word 0x02353538 +_022FE2E0: .word ov29_02353538 arm_func_end SpawnShopkeepers arm_func_start ov29_022FE2E4 ov29_022FE2E4: ; 0x022FE2E4 - ldr r0, _022FE2F8 ; =0x02353538 + ldr r0, _022FE2F8 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] str r1, [r0, #0x610] bx lr .align 2, 0 -_022FE2F8: .word 0x02353538 +_022FE2F8: .word ov29_02353538 arm_func_end ov29_022FE2E4 arm_func_start GetMaxHpAtLevel @@ -1861,7 +1861,7 @@ _022FE404: arm_func_start GetOutlawSpawnData GetOutlawSpawnData: ; 0x022FE420 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _022FE4A0 ; =0x02353538 + ldr r1, _022FE4A0 ; =ov29_02353538 mov r4, r0 ldr r0, [r1] add r0, r0, #0x348 @@ -1870,7 +1870,7 @@ GetOutlawSpawnData: ; 0x022FE420 mov r5, r0 bl GetMissionDestination ldrsh r2, [r0, #0xe] - ldr r0, _022FE4A4 ; =0x020A1998 + ldr r0, _022FE4A4 ; =OUTLAW_LEVEL_TABLE mov r1, r5, lsl #1 ldrsh r1, [r0, r1] strh r2, [r4] @@ -1893,18 +1893,18 @@ GetOutlawSpawnData: ; 0x022FE420 streqb r0, [r4, #2] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022FE4A0: .word 0x02353538 -_022FE4A4: .word 0x020A1998 +_022FE4A0: .word ov29_02353538 +_022FE4A4: .word OUTLAW_LEVEL_TABLE arm_func_end GetOutlawSpawnData arm_func_start ov29_022FE4A8 ov29_022FE4A8: ; 0x022FE4A8 - ldr r0, _022FE4B8 ; =0x0237C9C0 + ldr r0, _022FE4B8 ; =ov29_0237C9C0 mov r1, #0 strb r1, [r0] bx lr .align 2, 0 -_022FE4B8: .word 0x0237C9C0 +_022FE4B8: .word ov29_0237C9C0 arm_func_end ov29_022FE4A8 arm_func_start ExecuteMonsterAction @@ -1919,10 +1919,10 @@ ExecuteMonsterAction: ; 0x022FE4BC ldr r6, [sb, #0xb4] mov r1, #0 strb r1, [r6, #0x109] - ldr r0, _022FED70 ; =0x02353538 + ldr r0, _022FED70 ; =ov29_02353538 strb r1, [r6, #0xfc] ldr r1, [r0] - ldr r0, _022FED74 ; =0x022C4F3C + ldr r0, _022FED74 ; =ov10_022C4F3C str sb, [r1, #0xc4] ldrh r2, [r6, #0x4a] ldrb r0, [r0, r2, lsl #1] @@ -1931,13 +1931,13 @@ ExecuteMonsterAction: ; 0x022FE4BC ldrb r0, [r6, #7] cmp r0, #0 beq _022FE528 - ldr r1, _022FED78 ; =0x022C4F3D + ldr r1, _022FED78 ; =ov10_022C4F3D mov r0, sb ldrb r1, [r1, r2, lsl #1] bl ov29_022F3890 b _022FE538 _022FE528: - ldr r1, _022FED78 ; =0x022C4F3D + ldr r1, _022FED78 ; =ov10_022C4F3D mov r0, sb ldrb r1, [r1, r2, lsl #1] bl ov29_023085DC @@ -1991,7 +1991,7 @@ _022FE578: cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} - ldr r0, _022FED7C ; =0x0237C9C0 + ldr r0, _022FED7C ; =ov29_0237C9C0 ldrb r0, [r0, #1] cmp r0, #0 movne r0, #1 @@ -2016,7 +2016,7 @@ _022FE638: strb r0, [r6, #0x23c] ldrh r0, [r6, #0x4a] mov r4, #0 - ldr r1, _022FED80 ; =0x0237CA6C + ldr r1, _022FED80 ; =ov29_0237CA6C cmp r0, #1 cmpne r0, #0 cmpne r0, #4 @@ -2024,7 +2024,7 @@ _022FE638: movne r0, #1 strneb r0, [r6, #0x152] strb r4, [r6, #0x154] - ldr r0, _022FED84 ; =0x0237CA68 + ldr r0, _022FED84 ; =ov29_0237CA68 strb r4, [r1] strb r4, [r0] mov r1, #1 @@ -2118,7 +2118,7 @@ _022FE7B8: ldrb r0, [r6, #7] cmp r0, #0 beq _022FEBB4 - ldr r0, _022FED70 ; =0x02353538 + ldr r0, _022FED70 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x100 ldrsh r0, [r0, #0xd8] @@ -2127,7 +2127,7 @@ _022FE7B8: mov r0, #0x56 bl AdvanceFrame _022FE7F4: - ldr r1, _022FED70 ; =0x02353538 + ldr r1, _022FED70 ; =ov29_02353538 mvn r2, #0 ldr r0, [r1] add r0, r0, #0x100 @@ -2139,9 +2139,9 @@ _022FE7F4: _022FE818: ldrb r1, [r6, #0x4c] ldrh r3, [r6] - ldr r2, _022FED88 ; =0x0235171C + ldr r2, _022FED88 ; =DIRECTIONS_XY mov r8, r1, lsl #2 - ldr r0, _022FED8C ; =0x0235171E + ldr r0, _022FED8C ; =ov29_0235171E ldrsh ip, [sb, #4] ldrsh r7, [r2, r8] ldrsh r5, [sb, #6] @@ -2169,7 +2169,7 @@ _022FE870: ldrb r0, [r6, #7] cmp r0, #0 beq _022FEBB4 - ldr r0, _022FED70 ; =0x02353538 + ldr r0, _022FED70 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x100 ldrsh r0, [r0, #0xd8] @@ -2178,7 +2178,7 @@ _022FE870: mov r0, #0x56 bl AdvanceFrame _022FE8B4: - ldr r1, _022FED70 ; =0x02353538 + ldr r1, _022FED70 ; =ov29_02353538 mvn r2, #0 ldr r0, [r1] add r0, r0, #0x100 @@ -2230,7 +2230,7 @@ _022FE95C: ldrb r0, [r6, #0xd0] cmp r0, #2 bne _022FEBB4 - ldr r1, _022FED70 ; =0x02353538 + ldr r1, _022FED70 ; =ov29_02353538 sub r2, r4, #2 ldr r0, [r1] add r0, r0, #0x100 @@ -2245,10 +2245,10 @@ _022FE99C: b _022FEBB4 _022FE9A8: bl ov29_022E5D68 - ldr r0, _022FED70 ; =0x02353538 + ldr r0, _022FED70 ; =ov29_02353538 mov r2, #1 ldr r0, [r0] - ldr r1, _022FED7C ; =0x0237C9C0 + ldr r1, _022FED7C ; =ov29_0237C9C0 strb r2, [r0, #6] ldrb r2, [r6, #0x4c] add r0, sb, #4 @@ -2312,7 +2312,7 @@ _022FEA78: bl ov29_022F44F0 b _022FEBB4 _022FEA84: - ldr r0, _022FED70 ; =0x02353538 + ldr r0, _022FED70 ; =ov29_02353538 ldrb r1, [r6, #0x4e] ldr r2, [r0] add r0, r2, r1, lsl #2 @@ -2527,14 +2527,14 @@ _022FED68: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_022FED70: .word 0x02353538 -_022FED74: .word 0x022C4F3C -_022FED78: .word 0x022C4F3D -_022FED7C: .word 0x0237C9C0 -_022FED80: .word 0x0237CA6C -_022FED84: .word 0x0237CA68 -_022FED88: .word 0x0235171C -_022FED8C: .word 0x0235171E +_022FED70: .word ov29_02353538 +_022FED74: .word ov10_022C4F3C +_022FED78: .word ov10_022C4F3D +_022FED7C: .word ov29_0237C9C0 +_022FED80: .word ov29_0237CA6C +_022FED84: .word ov29_0237CA68 +_022FED88: .word DIRECTIONS_XY +_022FED8C: .word ov29_0235171E _022FED90: .word 0x00000DF1 _022FED94: .word 0x00000DF2 arm_func_end ExecuteMonsterAction diff --git a/asm/overlay_29_022FEDBC.s b/asm/overlay_29_022FEDBC.s index 945151b5..3b44afd0 100644 --- a/asm/overlay_29_022FEDBC.s +++ b/asm/overlay_29_022FEDBC.s @@ -9,7 +9,7 @@ ov29_022FEDBC: ; 0x022FEDBC sub sp, sp, #0x10 mov r4, #0 _022FEDC8: - ldr r0, _022FEFB8 ; =0x02353538 + ldr r0, _022FEFB8 ; =ov29_02353538 mov r6, #0 ldr r0, [r0] add r0, r0, r4, lsl #2 @@ -145,7 +145,7 @@ _022FEFA4: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FEFB8: .word 0x02353538 +_022FEFB8: .word ov29_02353538 _022FEFBC: .word 0x0000020D _022FEFC0: .word 0x00000DF3 _022FEFC4: .word 0x00001204 @@ -157,7 +157,7 @@ ov29_022FEFC8: ; 0x022FEFC8 sub sp, sp, #0x10 mov r5, #0 _022FEFD4: - ldr r0, _022FF160 ; =0x02353538 + ldr r0, _022FF160 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r5, lsl #2 add r0, r0, #0x12000 @@ -264,7 +264,7 @@ _022FF14C: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FF160: .word 0x02353538 +_022FF160: .word ov29_02353538 _022FF164: .word 0x00000DF4 arm_func_end ov29_022FEFC8 @@ -272,7 +272,7 @@ _022FF164: .word 0x00000DF4 TryActivateFlashFireOnAllMonsters: ; 0x022FF168 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r4, #0 - ldr r5, _022FF1C4 ; =0x02353538 + ldr r5, _022FF1C4 ; =ov29_02353538 mov r6, r4 _022FF178: ldr r0, [r5] @@ -296,7 +296,7 @@ _022FF1B4: blt _022FF178 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022FF1C4: .word 0x02353538 +_022FF1C4: .word ov29_02353538 arm_func_end TryActivateFlashFireOnAllMonsters arm_func_start HasStatusThatPreventsActing @@ -640,16 +640,16 @@ GetMobilityTypeCheckSlip: ; 0x022FF62C moveq r1, #1 movne r1, #0 tst r1, #0xff - ldrne r0, _022FF670 ; =0x0237C9B8 + ldrne r0, _022FF670 ; =ov29_0237C9B8 ldrneb r0, [r0, #5] ldmneia sp!, {r4, pc} _022FF660: cmp r0, #4 - ldrhs r1, _022FF670 ; =0x0237C9B8 + ldrhs r1, _022FF670 ; =ov29_0237C9B8 ldrhsb r0, [r1, r0] ldmia sp!, {r4, pc} .align 2, 0 -_022FF670: .word 0x0237C9B8 +_022FF670: .word ov29_0237C9B8 arm_func_end GetMobilityTypeCheckSlip arm_func_start GetMobilityTypeCheckSlipAndFloating @@ -1254,7 +1254,7 @@ _022FFE78: mov r1, #0x3a bl IqSkillIsEnabled cmp r0, #0 - ldr r1, _022FFF18 ; =0x023535B8 + ldr r1, _022FFF18 ; =ov29_023535B8 addne r4, r4, #1 ldrb r0, [r1, r5] cmp r0, #0 @@ -1279,7 +1279,7 @@ _022FFEB0: bne _022FFEFC ldrb r0, [r6, #6] cmp r0, #0 - ldrne r0, _022FFF24 ; =0x02353538 + ldrne r0, _022FFF24 ; =ov29_02353538 ldrne r0, [r0] ldrneb r0, [r0, #0x790] cmpne r0, #0 @@ -1293,10 +1293,10 @@ _022FFEFC: str r4, [r6, #0x110] ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_022FFF18: .word 0x023535B8 +_022FFF18: .word ov29_023535B8 _022FFF1C: .word 0x000001A5 _022FFF20: .word 0x0000017F -_022FFF24: .word 0x02353538 +_022FFF24: .word ov29_02353538 arm_func_end CalcSpeedStage arm_func_start ExclusiveItemEffectIsActive__022FFF28 @@ -1356,7 +1356,7 @@ _022FFFB8: movne r5, #1 movne r6, r5 _022FFFD8: - ldr r4, _023000DC ; =0x023535B0 + ldr r4, _023000DC ; =ov29_023535B0 ldrb r0, [r4, r8] cmp r0, #0 beq _02300000 @@ -1427,6 +1427,6 @@ _023000D4: add sp, sp, #8 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_023000DC: .word 0x023535B0 +_023000DC: .word ov29_023535B0 _023000E0: .word 0x00000C31 arm_func_end GetNumberOfAttacks diff --git a/asm/overlay_29_02300108.s b/asm/overlay_29_02300108.s index 8e8e16ab..d46a2b6d 100644 --- a/asm/overlay_29_02300108.s +++ b/asm/overlay_29_02300108.s @@ -1040,7 +1040,7 @@ ov29_02300E78: ; 0x02300E78 mov r5, r1 ldrsh r1, [r2, #2] bl GetMobilityTypeCheckSlipAndFloating - ldr r2, _02300F24 ; =0x0235171C + ldr r2, _02300F24 ; =DIRECTIONS_XY mov ip, r5, lsl #2 ldr r1, _02300F28 ; =0x0235171E ldrsh r3, [r2, ip] @@ -1078,7 +1078,7 @@ ov29_02300E78: ; 0x02300E78 and r0, r0, #0xff ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02300F24: .word 0x0235171C +_02300F24: .word DIRECTIONS_XY _02300F28: .word 0x0235171E _02300F2C: .word 0x02352798 arm_func_end ov29_02300E78 @@ -1133,7 +1133,7 @@ ov29_02300FCC: ; 0x02300FCC stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - ldr r1, _02301050 ; =0x0235171C + ldr r1, _02301050 ; =DIRECTIONS_XY mov ip, r4, lsl #2 ldr r0, _02301054 ; =0x0235171E ldrsh r3, [r1, ip] @@ -1164,7 +1164,7 @@ ov29_02300FCC: ; 0x02300FCC and r0, r0, #0xff ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02301050: .word 0x0235171C +_02301050: .word DIRECTIONS_XY _02301054: .word 0x0235171E _02301058: .word 0x02352790 arm_func_end ov29_02300FCC @@ -1177,7 +1177,7 @@ CanMonsterMoveInDirection: ; 0x0230105C mov r5, r1 ldrsh r1, [r2, #2] bl GetMobilityTypeCheckSlipAndFloating - ldr r2, _0230110C ; =0x0235171C + ldr r2, _0230110C ; =DIRECTIONS_XY mov ip, r5, lsl #2 ldr r1, _02301110 ; =0x0235171E ldrsh r3, [r2, ip] @@ -1216,7 +1216,7 @@ CanMonsterMoveInDirection: ; 0x0230105C movne r0, #1 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0230110C: .word 0x0235171C +_0230110C: .word DIRECTIONS_XY _02301110: .word 0x0235171E _02301114: .word 0x02352788 arm_func_end CanMonsterMoveInDirection @@ -1251,7 +1251,7 @@ ov29_02301158: ; 0x02301158 mov r5, r1 ldrsh r1, [r2, #2] bl GetMobilityTypeCheckSlipAndFloating - ldr r2, _02301228 ; =0x0235171C + ldr r2, _02301228 ; =DIRECTIONS_XY mov ip, r5, lsl #2 ldr r1, _0230122C ; =0x0235171E ldrsh r3, [r2, ip] @@ -1299,7 +1299,7 @@ _023011E0: and r0, r0, #0xff ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02301228: .word 0x0235171C +_02301228: .word DIRECTIONS_XY _0230122C: .word 0x0235171E _02301230: .word 0x02352780 arm_func_end ov29_02301158 @@ -1313,7 +1313,7 @@ CanAttackInDirection: ; 0x02301234 ldrsh r1, [r2, #2] bl GetMobilityTypeCheckSlipAndFloating mov r4, r0 - ldr r1, _023012EC ; =0x0235171C + ldr r1, _023012EC ; =DIRECTIONS_XY mov ip, r5, lsl #2 cmp r4, #1 ldr r0, _023012F0 ; =0x0235171E @@ -1353,7 +1353,7 @@ CanAttackInDirection: ; 0x02301234 movne r0, #1 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023012EC: .word 0x0235171C +_023012EC: .word DIRECTIONS_XY _023012F0: .word 0x0235171E _023012F4: .word 0x02352778 arm_func_end CanAttackInDirection @@ -1369,7 +1369,7 @@ CanAiMonsterMoveInDirection: ; 0x023012F8 bl GetMobilityTypeCheckSlipAndFloating mov r1, #0 strb r1, [r6] - ldr r2, _02301484 ; =0x0235171C + ldr r2, _02301484 ; =DIRECTIONS_XY mov r4, r7, lsl #2 ldr r1, _02301488 ; =0x0235171E ldrsh r3, [r2, r4] @@ -1464,7 +1464,7 @@ _0230142C: movne r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02301484: .word 0x0235171C +_02301484: .word DIRECTIONS_XY _02301488: .word 0x0235171E _0230148C: .word 0x02353538 _02301490: .word SECONDARY_TERRAIN_TYPES diff --git a/asm/overlay_29_02302A5C.s b/asm/overlay_29_02302A5C.s index 5b6ef1e1..500e46d3 100644 --- a/asm/overlay_29_02302A5C.s +++ b/asm/overlay_29_02302A5C.s @@ -132,7 +132,7 @@ ov29_02302C04: ; 0x02302C04 ldrb r1, [r1, #0xa] add r0, sp, #0 bl sub_02058C9C - ldr r0, _02302CC0 ; =0x02353538 + ldr r0, _02302CC0 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl sub_0204F610 @@ -170,7 +170,7 @@ _02302CB8: add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02302CC0: .word 0x02353538 +_02302CC0: .word ov29_02353538 _02302CC4: .word 0x00000F2A arm_func_end ov29_02302C04 @@ -207,7 +207,7 @@ ov29_02302CC8: ; 0x02302CC8 moveq r6, #1 b _02302D58 _02302D40: - ldr r0, _02302F64 ; =0x02353538 + ldr r0, _02302F64 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl IsSpecialEpisodeDungeon @@ -268,11 +268,11 @@ _02302E18: ldr r0, [r8, #0x28] cmp r0, #0 ble _02302E5C - ldr r0, _02302F70 ; =0x023527F0 + ldr r0, _02302F70 ; =ov29_023527F0 ldrb r2, [r0, r4] cmp r2, #0 beq _02302E44 - ldr r1, _02302F74 ; =0x023535C8 + ldr r1, _02302F74 ; =ov29_023535C8 mov r0, r5 ldr r1, [r1, r2, lsl #2] bl strcat @@ -287,11 +287,11 @@ _02302E5C: ldr r0, [r8, #0x2c] cmp r0, #0 ble _02302EA0 - ldr r0, _02302F70 ; =0x023527F0 + ldr r0, _02302F70 ; =ov29_023527F0 ldrb r2, [r0, r4] cmp r2, #0 beq _02302E88 - ldr r1, _02302F74 ; =0x023535C8 + ldr r1, _02302F74 ; =ov29_023535C8 mov r0, r5 ldr r1, [r1, r2, lsl #2] bl strcat @@ -306,11 +306,11 @@ _02302EA0: ldr r0, [r8, #0x30] cmp r0, #0 ble _02302EE4 - ldr r0, _02302F70 ; =0x023527F0 + ldr r0, _02302F70 ; =ov29_023527F0 ldrb r2, [r0, r4] cmp r2, #0 beq _02302ECC - ldr r1, _02302F74 ; =0x023535C8 + ldr r1, _02302F74 ; =ov29_023535C8 mov r0, r5 ldr r1, [r1, r2, lsl #2] bl strcat @@ -325,11 +325,11 @@ _02302EE4: ldr r0, [r8, #0x34] cmp r0, #0 ble _02302F24 - ldr r0, _02302F70 ; =0x023527F0 + ldr r0, _02302F70 ; =ov29_023527F0 ldrb r2, [r0, r4] cmp r2, #0 beq _02302F10 - ldr r1, _02302F74 ; =0x023535C8 + ldr r1, _02302F74 ; =ov29_023535C8 mov r0, r5 ldr r1, [r1, r2, lsl #2] bl strcat @@ -358,11 +358,11 @@ _02302F4C: add sp, sp, #0x58 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02302F64: .word 0x02353538 +_02302F64: .word ov29_02353538 _02302F68: .word 0x00000F27 _02302F6C: .word 0x00000F18 -_02302F70: .word 0x023527F0 -_02302F74: .word 0x023535C8 +_02302F70: .word ov29_023527F0 +_02302F74: .word ov29_023535C8 _02302F78: .word 0x00000F19 _02302F7C: .word 0x00000F1A _02302F80: .word 0x00000F1B @@ -444,7 +444,7 @@ LevelUp: ; 0x0230303C movne r0, r6 bne _02303268 ldrb r0, [r7, #0xa] - ldr r4, _02303270 ; =0x0237C9C4 + ldr r4, _02303270 ; =ov29_0237C9C4 add r5, r0, #1 b _0230325C _0230309C: @@ -524,7 +524,7 @@ _02303160: movgt r2, r0 strh r2, [r7, #0x10] _023031B8: - ldr r0, _02303278 ; =0x0237C9C8 + ldr r0, _02303278 ; =ov29_0237C9C8 ldrb r2, [r7, #0x1a] mov r1, r0 strb r2, [r1] @@ -537,24 +537,24 @@ _023031B8: ldrb r1, [sp, #0x12] bl sub_02054FEC ldrb r1, [sp, #0x13] - ldr r0, _0230327C ; =0x0237C9C9 + ldr r0, _0230327C ; =ov29_0237C9C9 bl sub_02054FEC ldrb r1, [sp, #0x14] mov r0, r4 bl sub_02055020 ldrb r1, [sp, #0x15] - ldr r0, _02303280 ; =0x0237C9C5 + ldr r0, _02303280 ; =ov29_0237C9C5 bl sub_02055020 mov r0, sl bl ov29_023021F0 mov r0, sl bl ov29_02318D58 - ldr r0, _02303278 ; =0x0237C9C8 + ldr r0, _02303278 ; =ov29_0237C9C8 mov r1, sl ldrb r2, [r0] ldr r0, [sp, #4] strb r2, [r7, #0x1a] - ldr r2, _02303278 ; =0x0237C9C8 + ldr r2, _02303278 ; =ov29_0237C9C8 ldr r3, [sp, #8] ldrb ip, [r2, #1] mov r2, sb @@ -574,11 +574,11 @@ _02303268: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02303270: .word 0x0237C9C4 +_02303270: .word ov29_0237C9C4 _02303274: .word 0x000003E7 -_02303278: .word 0x0237C9C8 -_0230327C: .word 0x0237C9C9 -_02303280: .word 0x0237C9C5 +_02303278: .word ov29_0237C9C8 +_0230327C: .word ov29_0237C9C9 +_02303280: .word ov29_0237C9C5 arm_func_end LevelUp arm_func_start ov29_02303284 @@ -620,7 +620,7 @@ _023032F8: _02303304: sub r4, sb, #1 ldrb sb, [r7, #0xa] - ldr fp, _023034C4 ; =0x0237C9C4 + ldr fp, _023034C4 ; =ov29_0237C9C4 b _02303450 _02303314: cmp sb, #0x64 @@ -664,7 +664,7 @@ _0230333C: movgt r2, r0 strh r2, [r7, #0x10] _023033B0: - ldr r0, _023034CC ; =0x0237C9C8 + ldr r0, _023034CC ; =ov29_0237C9C8 ldrb r2, [r7, #0x1a] mov r1, r0 strb r2, [r1] @@ -678,7 +678,7 @@ _023033B0: rsb r1, r1, #0 bl sub_02054FEC ldrb r1, [sp, #0xf] - ldr r0, _023034D0 ; =0x0237C9C9 + ldr r0, _023034D0 ; =ov29_0237C9C9 rsb r1, r1, #0 bl sub_02054FEC ldrb r1, [sp, #0x10] @@ -686,17 +686,17 @@ _023033B0: rsb r1, r1, #0 bl sub_02055020 ldrb r1, [sp, #0x11] - ldr r0, _023034D4 ; =0x0237C9C5 + ldr r0, _023034D4 ; =ov29_0237C9C5 rsb r1, r1, #0 bl sub_02055020 mov r0, sl bl ov29_023021F0 mov r0, sl bl ov29_02318D58 - ldr r0, _023034CC ; =0x0237C9C8 + ldr r0, _023034CC ; =ov29_0237C9C8 ldrb r0, [r0] strb r0, [r7, #0x1a] - ldr r0, _023034CC ; =0x0237C9C8 + ldr r0, _023034CC ; =ov29_0237C9C8 ldrb r0, [r0, #1] strb r0, [r7, #0x1b] ldrb r0, [fp] @@ -738,11 +738,11 @@ _023034BC: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023034C4: .word 0x0237C9C4 +_023034C4: .word ov29_0237C9C4 _023034C8: .word 0x000003E7 -_023034CC: .word 0x0237C9C8 -_023034D0: .word 0x0237C9C9 -_023034D4: .word 0x0237C9C5 +_023034CC: .word ov29_0237C9C8 +_023034D0: .word ov29_0237C9C9 +_023034D4: .word ov29_0237C9C5 _023034D8: .word 0x00000F22 _023034DC: .word 0x00000F21 arm_func_end ov29_02303284 @@ -1358,7 +1358,7 @@ EvolveMonster: ; 0x02303C7C cmpne r5, r0 bne _02303DF4 mov r5, #0 - ldr r4, _02303E04 ; =0x0235171C + ldr r4, _02303E04 ; =DIRECTIONS_XY mov r8, #0x140 b _02303D84 _02303D48: @@ -1389,13 +1389,13 @@ _02303D8C: strh r0, [sp, #4] ldrb r1, [r6, #0xa] mov r2, #0 - ldr r0, _02303E04 ; =0x0235171C + ldr r0, _02303E04 ; =DIRECTIONS_XY mov r5, r5, lsl #2 strh r1, [sp, #0xc] strb r2, [sp, #6] ldrsh r3, [r0, r5] ldrsh r4, [r7, #4] - ldr r1, _02303E08 ; =0x0235171E + ldr r1, _02303E08 ; =ov29_0235171E add r0, sp, #4 add r3, r4, r3 strh r3, [sp, #0xe] @@ -1413,8 +1413,8 @@ _02303DF4: .align 2, 0 _02303DFC: .word 0x00000F29 _02303E00: .word 0x0000013F -_02303E04: .word 0x0235171C -_02303E08: .word 0x0235171E +_02303E04: .word DIRECTIONS_XY +_02303E08: .word ov29_0235171E arm_func_end EvolveMonster arm_func_start ov29_02303E0C @@ -1457,7 +1457,7 @@ ov29_02303E5C: ; 0x02303E5C ldmgeia sp!, {r3, r4, r5, pc} cmp r1, #6 ldmeqia sp!, {r3, r4, r5, pc} - ldr r5, _02303F0C ; =0x0237C888 + ldr r5, _02303F0C ; =ov29_0237C888 mov lr, #0x48 smlabb r5, r2, lr, r5 mov r2, #0xc @@ -1477,7 +1477,7 @@ ov29_02303E5C: ; 0x02303E5C ldrh r3, [r1, #6] ldrsh r4, [r1, #0xa] ldr r0, _02303F10 ; =0xFFFF000F - ldr r2, _02303F14 ; =0x020AFC4C + ldr r2, _02303F14 ; =_020AFC4C and r0, r3, r0 strh r0, [r1, #6] add r0, ip, r4 @@ -1490,16 +1490,16 @@ ov29_02303E5C: ; 0x02303E5C bl sub_0201B9F8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02303F0C: .word 0x0237C888 +_02303F0C: .word ov29_0237C888 _02303F10: .word 0xFFFF000F -_02303F14: .word 0x020AFC4C +_02303F14: .word _020AFC4C arm_func_end ov29_02303E5C arm_func_start ov29_02303F18 ov29_02303F18: ; 0x02303F18 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x38 - ldr r1, _023046C8 ; =0x02353538 + ldr r1, _023046C8 ; =ov29_02353538 mov r7, r0 ldr r0, [r1] ldr r5, [r7, #0xb4] @@ -1545,7 +1545,7 @@ ov29_02303F18: ; 0x02303F18 cmp r1, #3 movlo r3, #0 _02303FD4: - ldr r2, _023046CC ; =0x02352810 + ldr r2, _023046CC ; =ov29_02352810 mov r1, #0xd mla r1, r3, r1, r2 ldrb r1, [r6, r1] @@ -1709,7 +1709,7 @@ _0230422C: ldr r0, _023046D4 ; =0x0001A224 str r1, [r7, #0x14] ldr r2, [r7, #0x10] - ldr r1, _023046C8 ; =0x02353538 + ldr r1, _023046C8 ; =ov29_02353538 str r2, [r7, #0x18] ldr r8, [r1] add r1, r0, #2 @@ -1732,7 +1732,7 @@ _0230422C: bl ov29_022ECB38 cmp r0, #0 beq _023042B0 - ldr r0, _023046D8 ; =0x0237C850 + ldr r0, _023046D8 ; =ov29_0237C850 ldr r0, [r0] tst r0, #1 mvnne r0, #1 @@ -1753,7 +1753,7 @@ _023042D8: ldrb r0, [r5, #0x173] cmp r0, #0 beq _023042FC - ldr r0, _023046D8 ; =0x0237C850 + ldr r0, _023046D8 ; =ov29_0237C850 ldr r0, [r0] tst r0, #4 movne r0, #1 @@ -1766,7 +1766,7 @@ _023042FC: movne r0, #0 and r4, r0, #0xff _02304310: - ldr r3, _023046DC ; =0x0235280C + ldr r3, _023046DC ; =ov29_0235280C add r0, sp, #0x28 ldrh r6, [r3] add r2, r7, #0x2c @@ -1785,7 +1785,7 @@ _02304310: mov r3, r3, asr #8 strh r3, [sp, #0x1a] bl sub_0201D034 - ldr r1, _023046C8 ; =0x02353538 + ldr r1, _023046C8 ; =ov29_02353538 ldr r0, [r5, #0xb0] ldr r2, [r1] add r1, sp, #0x18 @@ -1816,7 +1816,7 @@ _02304310: cmp r4, #0 beq _0230464C ldr r0, [r7, #0xb4] - ldr r1, _023046C8 ; =0x02353538 + ldr r1, _023046C8 ; =ov29_02353538 ldr r3, _023046E0 ; =0x0000F3FF ldrb r6, [r0, #0x220] mov r0, #0 @@ -1861,7 +1861,7 @@ _02304458: bl ov29_02338988 cmp r0, #0 beq _02304498 - ldr r0, _023046D8 ; =0x0237C850 + ldr r0, _023046D8 ; =ov29_0237C850 ldr r0, [r0] tst r0, #1 beq _023044B8 @@ -1912,7 +1912,7 @@ _02304510: cmpne r0, #4 cmpne r1, #2 bne _02304558 - ldr r0, _023046D8 ; =0x0237C850 + ldr r0, _023046D8 ; =ov29_0237C850 ldr r0, [r0] and r0, r0, #2 add r0, r8, r0 @@ -1928,7 +1928,7 @@ _02304558: _02304570: cmp r0, #1 bne _02304590 - ldr r0, _023046D8 ; =0x0237C850 + ldr r0, _023046D8 ; =ov29_0237C850 ldr r0, [r0] tst r0, #1 beq _02304590 @@ -1940,7 +1940,7 @@ _02304590: ldr r0, _023046D4 ; =0x0001A224 strh r2, [r1, #0x82] ldrsh r8, [r7, #0x52] - ldr r3, _023046C8 ; =0x02353538 + ldr r3, _023046C8 ; =ov29_02353538 add r2, r0, #2 strh r8, [r1, #0x84] ldrsh sb, [r1, #0x82] @@ -1965,7 +1965,7 @@ _02304590: bl ov29_022ECB38 cmp r0, #0 beq _02304628 - ldr r0, _023046D8 ; =0x0237C850 + ldr r0, _023046D8 ; =ov29_0237C850 ldr r0, [r0] tst r0, #1 mvnne r0, #1 @@ -1988,7 +1988,7 @@ _0230464C: cmp r0, #1 cmpne r0, #6 beq _023046C0 - ldr r0, _023046C8 ; =0x02353538 + ldr r0, _023046C8 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x78b] cmp r0, #0 @@ -2019,12 +2019,12 @@ _023046C0: add sp, sp, #0x38 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_023046C8: .word 0x02353538 -_023046CC: .word 0x02352810 +_023046C8: .word ov29_02353538 +_023046CC: .word ov29_02352810 _023046D0: .word 0x00000229 _023046D4: .word 0x0001A224 -_023046D8: .word 0x0237C850 -_023046DC: .word 0x0235280C +_023046D8: .word ov29_0237C850 +_023046DC: .word ov29_0235280C _023046E0: .word 0x0000F3FF _023046E4: .word 0xFFFFFE5D arm_func_end ov29_02303F18 @@ -2059,7 +2059,7 @@ _02304728: ov29_0230473C: ; 0x0230473C stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, #0 - ldr r6, _023047B4 ; =0x02353538 + ldr r6, _023047B4 ; =ov29_02353538 mov r7, r5 _0230474C: ldr r0, [r6] @@ -2090,5 +2090,5 @@ _023047A4: blt _0230474C ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_023047B4: .word 0x02353538 +_023047B4: .word ov29_02353538 arm_func_end ov29_0230473C diff --git a/asm/overlay_29_02305C28.s b/asm/overlay_29_02305C28.s index 02f3e65e..a63d19c5 100644 --- a/asm/overlay_29_02305C28.s +++ b/asm/overlay_29_02305C28.s @@ -319,7 +319,7 @@ _02306070: bl LogMessageByIdWithPopupCheckUserTarget cmp r6, #0 beq _02306164 - ldr r0, _02306194 ; =0x022C45A8 + ldr r0, _02306194 ; =ov10_022C45A8 ldr r3, _02306198 ; =0x0000024E ldrsh r1, [r0] mov r0, r8 @@ -335,7 +335,7 @@ _023060A8: ldrb r0, [sp, #0x20] cmp r0, #0 beq _023060E8 - ldr r0, _0230619C ; =0x022C45A0 + ldr r0, _0230619C ; =ov10_022C45A0 mov r6, r4 ldrsh r2, [r0] mov r0, sb @@ -359,7 +359,7 @@ _023060E8: _02306118: cmp r7, #0 beq _02306154 - ldr r1, _023061A0 ; =0x022C4868 + ldr r1, _023061A0 ; =ov10_022C4868 mov r3, r4 mov r0, r8 mov r2, #1 @@ -391,10 +391,10 @@ _02306164: .align 2, 0 _0230618C: .word 0x00000C8D _02306190: .word 0x00000C8E -_02306194: .word 0x022C45A8 +_02306194: .word ov10_022C45A8 _02306198: .word 0x0000024E -_0230619C: .word 0x022C45A0 -_023061A0: .word 0x022C4868 +_0230619C: .word ov10_022C45A0 +_023061A0: .word ov10_022C4868 _023061A4: .word 0x00000C91 arm_func_end EndSleepClassStatus @@ -810,7 +810,7 @@ TryRemoveSnatchedMonsterFromDungeonStruct: ; 0x023066D8 ldrb r0, [r0, #0xd8] cmp r0, #3 ldmneia sp!, {r4, pc} - ldr r1, _02306724 ; =0x02353538 + ldr r1, _02306724 ; =ov29_02353538 mov r2, #0 ldr r0, [r1] add r0, r0, #0x19000 @@ -820,7 +820,7 @@ TryRemoveSnatchedMonsterFromDungeonStruct: ; 0x023066D8 str r2, [r0, #0x90c] ldmia sp!, {r4, pc} .align 2, 0 -_02306724: .word 0x02353538 +_02306724: .word ov29_02353538 arm_func_end TryRemoveSnatchedMonsterFromDungeonStruct arm_func_start EndCurseClassStatus @@ -880,7 +880,7 @@ _023067D4: mov r1, r0 mov r0, r7 bl ov29_02304830 - ldr r1, _023068B0 ; =0x02353538 + ldr r1, _023068B0 ; =ov29_02353538 mov r0, #0 ldr r1, [r1] cmp r6, #2 @@ -907,7 +907,7 @@ _02306830: mov r0, r7 bl LogMessageByIdWithPopupCheckUser _02306854: - ldr r0, _023068B0 ; =0x02353538 + ldr r0, _023068B0 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0xe] @@ -934,7 +934,7 @@ _02306894: .align 2, 0 _023068A8: .word 0x00000C95 _023068AC: .word 0x00000C96 -_023068B0: .word 0x02353538 +_023068B0: .word ov29_02353538 _023068B4: .word 0x00000CA5 _023068B8: .word 0x00000CBF _023068BC: .word 0x00000CC2 @@ -1306,7 +1306,7 @@ _02306D50: .word 0x00000CC5 ov29_02306D54: ; 0x02306D54 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r8, #0 - ldr r4, _02306DC8 ; =0x02353538 + ldr r4, _02306DC8 ; =ov29_02353538 mov sb, r0 mov r5, r8 mov r6, #1 @@ -1337,7 +1337,7 @@ _02306DB0: blt _02306D70 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02306DC8: .word 0x02353538 +_02306DC8: .word ov29_02353538 arm_func_end ov29_02306D54 arm_func_start ov29_02306DCC @@ -1900,7 +1900,7 @@ _02307574: subs r1, r1, #1 strb r0, [r2], #1 bne _02307574 - ldr r1, _023076BC ; =0x02353538 + ldr r1, _023076BC ; =ov29_02353538 mov r0, r8 ldr r1, [r1] mov r2, #1 @@ -1988,7 +1988,7 @@ _023076B4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_023076BC: .word 0x02353538 +_023076BC: .word ov29_02353538 arm_func_end ov29_0230737C arm_func_start ov29_023076C0 @@ -2047,7 +2047,7 @@ _0230776C: stmia r3, {r0, r1, r2} mov r0, #0xff strb r0, [r7, #0xe8] - ldr r2, _023077F8 ; =0x02353538 + ldr r2, _023077F8 ; =ov29_02353538 mov r0, #0 _02307794: ldr r1, [r2] @@ -2077,7 +2077,7 @@ _023077CC: mov r0, r5 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_023077F8: .word 0x02353538 +_023077F8: .word ov29_02353538 arm_func_end ov29_023076C0 arm_func_start ov29_023077FC @@ -2522,7 +2522,7 @@ ov29_02307DD0: ; 0x02307DD0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r4, #0 _02307DD8: - ldr r0, _02307EF4 ; =0x02353538 + ldr r0, _02307EF4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r4, lsl #2 add r0, r0, #0x12000 @@ -2541,7 +2541,7 @@ _02307DD8: mov r7, r8 mov r5, r8 ldrb sl, [r6, #0x25] - ldr fp, _02307EF4 ; =0x02353538 + ldr fp, _02307EF4 ; =ov29_02353538 b _02307EBC _02307E2C: ldr r0, [fp] @@ -2601,5 +2601,5 @@ _02307EE4: blt _02307DD8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02307EF4: .word 0x02353538 +_02307EF4: .word ov29_02353538 arm_func_end ov29_02307DD0 diff --git a/asm/overlay_29_02307F1C.s b/asm/overlay_29_02307F1C.s index 0bf42a45..0a64e448 100644 --- a/asm/overlay_29_02307F1C.s +++ b/asm/overlay_29_02307F1C.s @@ -37,7 +37,7 @@ TryTriggerMonsterHouse: ; 0x02307F4C ldrh r0, [r0] tst r0, #0x40 beq _02308268 - ldr r0, _02308270 ; =0x02353538 + ldr r0, _02308270 ; =ov29_02353538 ldr r2, [r0] ldrb r1, [r2, #0x793] cmp r1, #0 @@ -151,8 +151,8 @@ _0230811C: cmp sb, sl blt _023080B4 _02308124: - ldr r0, _02308274 ; =0x022C4560 - ldr r1, _02308278 ; =0x022C4660 + ldr r0, _02308274 ; =ov10_022C4560 + ldr r1, _02308278 ; =ov10_022C4660 ldrsh r0, [r0] ldrsh r1, [r1] bl DungeonRandRange @@ -246,7 +246,7 @@ _02308268: add sp, sp, #0x1a0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02308270: .word 0x02353538 -_02308274: .word 0x022C4560 -_02308278: .word 0x022C4660 +_02308270: .word ov29_02353538 +_02308274: .word ov10_022C4560 +_02308278: .word ov10_022C4660 arm_func_end TryTriggerMonsterHouse diff --git a/asm/overlay_29_02308FE0.s b/asm/overlay_29_02308FE0.s index 6f6eaf93..e7428395 100644 --- a/asm/overlay_29_02308FE0.s +++ b/asm/overlay_29_02308FE0.s @@ -52,7 +52,7 @@ _0230905C: cmpeq r0, #3 ldreqb r0, [r6, #0xf] cmpeq r0, #0 - ldreq r0, _02309F98 ; =0x022C4598 + ldreq r0, _02309F98 ; =ov10_022C4598 ldreqsh r0, [r0] streq r0, [r6] ldr r0, [r8] @@ -274,7 +274,7 @@ _02309398: mov r0, #0 b _0230A918 _023093D8: - ldr sl, _02309FAC ; =0x023528A4 + ldr sl, _02309FAC ; =ov29_023528A4 b _0230944C _023093E0: ldrb r0, [r6, #0xc] @@ -354,7 +354,7 @@ _023094D8: bl ExclusiveItemEffectIsActive__0230A9B8 cmp r0, #0 beq _02309520 - ldr r0, _02309FB0 ; =0x022C45C4 + ldr r0, _02309FB0 ; =ov10_022C45C4 ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -478,7 +478,7 @@ _02309650: mov sl, r0, asr #0x10 mvn r1, #0 cmp sl, r1 - ldr r0, _02309FC8 ; =0x023535D4 + ldr r0, _02309FC8 ; =ov29_023535D4 strh r1, [r0] beq _02309718 b _023096D4 @@ -501,7 +501,7 @@ _023096D4: mov r3, #3 str r2, [sp, #0xc] bl PlayEffectAnimationEntity - ldr r1, _02309FC8 ; =0x023535D4 + ldr r1, _02309FC8 ; =ov29_023535D4 strh r0, [r1] _02309718: ldrb r0, [r4, #0x15c] @@ -521,7 +521,7 @@ _02309740: ldr r1, [r6, #4] ldr r2, [r4, #0xb8] cmp r1, #0x1b - ldrlt r0, _02309FD8 ; =0x02353330 + ldrlt r0, _02309FD8 ; =ov29_02353330 movge sl, #0 movlt r1, r1, lsl #1 ldrlth sl, [r0, r1] @@ -701,7 +701,7 @@ _023099DC: bl ExclusiveItemEffectIsActive__0230A9B8 cmp r0, #0 beq _02309A28 - ldr r0, _02309FE8 ; =0x022C4834 + ldr r0, _02309FE8 ; =ov10_022C4834 ldr r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -752,7 +752,7 @@ _02309A78: ldr r0, _02309FA4 ; =0x0000270F cmp r1, r0 beq _02309AC4 - ldr r1, _02309FEC ; =0x022C45FC + ldr r1, _02309FEC ; =ov10_022C45FC mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -769,7 +769,7 @@ _02309AC4: ldr r0, _02309FA4 ; =0x0000270F cmp r1, r0 beq _02309B04 - ldr r1, _02309FEC ; =0x022C45FC + ldr r1, _02309FEC ; =ov10_022C45FC mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -872,14 +872,14 @@ _02309C50: ldrb r0, [r4, #0xbc] cmp r0, #7 bne _02309C7C - ldr r0, _02309FF4 ; =0x02353220 + ldr r0, _02309FF4 ; =ov29_02353220 mov r1, sb, lsl #1 ldrh r1, [r0, r1] mov r0, r8 bl LogMessageByIdWithPopup b _02309DC8 _02309C7C: - ldr r0, _02309FF8 ; =0x0235321C + ldr r0, _02309FF8 ; =ov29_0235321C mov r1, sb, lsl #1 ldrh r2, [r0, r1] mov r0, r8 @@ -897,13 +897,13 @@ _02309C98: bl JoinedAtRangeCheck2Veneer cmp r0, #0 beq _02309CEC - ldr r0, _02309FFC ; =0x02353538 + ldr r0, _02309FFC ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75c] cmp r0, #0 bne _02309CEC _02309CD4: - ldr r0, _0230A000 ; =0x02353228 + ldr r0, _0230A000 ; =ov29_02353228 mov r1, sb, lsl #1 ldrh r1, [r0, r1] mov r0, r8 @@ -918,14 +918,14 @@ _02309CEC: bl IsSpecialStoryAlly cmp r0, #0 beq _02309D24 - ldr r0, _0230A004 ; =0x02353234 + ldr r0, _0230A004 ; =ov29_02353234 mov r1, sb, lsl #1 ldrh r1, [r0, r1] mov r0, r8 bl LogMessageByIdWithPopup b _02309DC8 _02309D24: - ldr r0, _0230A008 ; =0x0235322C + ldr r0, _0230A008 ; =ov29_0235322C mov r1, sb, lsl #1 ldrh r1, [r0, r1] mov r0, r8 @@ -935,7 +935,7 @@ _02309D3C: ldrb r0, [r4, #0xbc] cmp r0, #7 bne _02309D60 - ldr r0, _02309FF4 ; =0x02353220 + ldr r0, _02309FF4 ; =ov29_02353220 mov r1, sb, lsl #1 ldrh r1, [r0, r1] mov r0, r8 @@ -946,26 +946,26 @@ _02309D60: bl IsMonsterIdInNormalRangeVeneer cmp r0, #0 beq _02309DB4 - ldr r0, _02309FFC ; =0x02353538 + ldr r0, _02309FFC ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75d] cmp r0, #0 beq _02309D9C - ldr r0, _0230A00C ; =0x02353224 + ldr r0, _0230A00C ; =ov29_02353224 mov r1, sb, lsl #1 ldrh r1, [r0, r1] mov r0, r8 bl LogMessageByIdWithPopup b _02309DC8 _02309D9C: - ldr r0, _0230A010 ; =0x02353230 + ldr r0, _0230A010 ; =ov29_02353230 mov r1, sb, lsl #1 ldrh r1, [r0, r1] mov r0, r8 bl LogMessageByIdWithPopup b _02309DC8 _02309DB4: - ldr r0, _0230A014 ; =0x02353218 + ldr r0, _0230A014 ; =ov29_02353218 mov r1, sb, lsl #1 ldrh r1, [r0, r1] mov r0, r8 @@ -1018,7 +1018,7 @@ _02309DE4: strh r1, [r0, #0x48] ldrb r0, [r4, #7] cmp r0, #0 - ldrne r0, _02309FFC ; =0x02353538 + ldrne r0, _02309FFC ; =ov29_02353538 ldrne r1, [r0] strneb r2, [r1, #0x799] ldrne r0, [r0] @@ -1089,41 +1089,41 @@ _02309F44: bne _0230A224 mov sl, #0 mov sb, sl - ldr r6, _02309FFC ; =0x02353538 + ldr r6, _02309FFC ; =ov29_02353538 b _0230A090 .align 2, 0 -_02309F98: .word 0x022C4598 +_02309F98: .word ov10_022C4598 _02309F9C: .word 0x00000C46 _02309FA0: .word 0x0000024D _02309FA4: .word 0x0000270F _02309FA8: .word 0x00000C41 -_02309FAC: .word 0x023528A4 -_02309FB0: .word 0x022C45C4 +_02309FAC: .word ov29_023528A4 +_02309FB0: .word ov10_022C45C4 _02309FB4: .word 0x00000C42 _02309FB8: .word 0x00000C43 _02309FBC: .word 0x00000C44 _02309FC0: .word 0x00000C45 _02309FC4: .word 0x00000C47 -_02309FC8: .word 0x023535D4 +_02309FC8: .word ov29_023535D4 _02309FCC: .word 0x000002B6 _02309FD0: .word 0x00000C48 _02309FD4: .word 0x000003E7 -_02309FD8: .word 0x02353330 +_02309FD8: .word ov29_02353330 _02309FDC: .word 0x0000025F _02309FE0: .word 0x00000C49 _02309FE4: .word 0x00000C4A -_02309FE8: .word 0x022C4834 -_02309FEC: .word 0x022C45FC +_02309FE8: .word ov10_022C4834 +_02309FEC: .word ov10_022C45FC _02309FF0: .word 0x00000C4B -_02309FF4: .word 0x02353220 -_02309FF8: .word 0x0235321C -_02309FFC: .word 0x02353538 -_0230A000: .word 0x02353228 -_0230A004: .word 0x02353234 -_0230A008: .word 0x0235322C -_0230A00C: .word 0x02353224 -_0230A010: .word 0x02353230 -_0230A014: .word 0x02353218 +_02309FF4: .word ov29_02353220 +_02309FF8: .word ov29_0235321C +_02309FFC: .word ov29_02353538 +_0230A000: .word ov29_02353228 +_0230A004: .word ov29_02353234 +_0230A008: .word ov29_0235322C +_0230A00C: .word ov29_02353224 +_0230A010: .word ov29_02353230 +_0230A014: .word ov29_02353218 _0230A018: .word 0x00000153 _0230A01C: .word 0x00000C4C _0230A020: .word 0x00000159 @@ -1206,7 +1206,7 @@ _0230A098: strh r1, [r0, #0x48] ldrb r0, [r4, #7] cmp r0, #0 - ldrne r0, _02309FFC ; =0x02353538 + ldrne r0, _02309FFC ; =ov29_02353538 ldrne r1, [r0] strneb r2, [r1, #0x799] ldrne r0, [r0] @@ -1297,7 +1297,7 @@ _0230A29C: ldreqb r0, [r4, #6] cmpeq r0, #0 bne _0230A330 - ldr r0, _0230A924 ; =0x020AF6B8 + ldr r0, _0230A924 ; =BAG_ITEMS_PTR_MIRROR mov sl, #0 ldr ip, [r0] mov lr, sl @@ -1362,7 +1362,7 @@ _0230A330: strh r1, [r0, #0x48] ldrb r0, [r4, #7] cmp r0, #0 - ldrne r0, _02309FFC ; =0x02353538 + ldrne r0, _02309FFC ; =ov29_02353538 ldrne r1, [r0] strneb r2, [r1, #0x799] ldrne r0, [r0] @@ -1412,7 +1412,7 @@ _0230A3F4: mov r0, #0 b _0230A918 _0230A45C: - ldr r0, _02309FFC ; =0x02353538 + ldr r0, _02309FFC ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #8] cmp r0, #0 @@ -1500,7 +1500,7 @@ _0230A4A0: bl ov29_0234BA54 mov r0, #0 bl ov29_022F0534 - ldr r0, _02309FFC ; =0x02353538 + ldr r0, _02309FFC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd6] @@ -1566,7 +1566,7 @@ _0230A69C: ldrb r0, [r4, #0x100] mov r6, #0 cmp r0, #0 - ldrne r0, _02309FFC ; =0x02353538 + ldrne r0, _02309FFC ; =ov29_02353538 ldrne r1, _02309FD4 ; =0x000003E7 ldrne r0, [r0] addne r0, r0, #0x700 @@ -1589,7 +1589,7 @@ _0230A69C: add r0, r4, #0x100 ldrsh r2, [r0, #0x68] mov r0, #0xc - ldr r1, _0230A938 ; =0x022C593C + ldr r1, _0230A938 ; =ov10_022C593C smulbb r0, r2, r0 ldrsh sb, [r1, r0] b _0230A740 @@ -1624,7 +1624,7 @@ _0230A740: mov r1, r8 mov r2, sb bl AddExpSpecial - ldr r6, _02309FFC ; =0x02353538 + ldr r6, _02309FFC ; =ov29_02353538 mov r4, #0 _0230A78C: ldr r0, [r6] @@ -1647,13 +1647,13 @@ _0230A7C0: mov r6, #1 b _0230A7FC _0230A7D4: - ldr r0, _02309FFC ; =0x02353538 + ldr r0, _02309FFC ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl CanEnemyEvolve cmp r0, #0 movne r1, #1 - ldrne r0, _02309FFC ; =0x02353538 + ldrne r0, _02309FFC ; =ov29_02353538 strneb r1, [sl, #0x153] ldrne r0, [r0] strneb r1, [r0, #0xf] @@ -1699,7 +1699,7 @@ _0230A824: bl HandleFaint b _0230A8F4 _0230A898: - ldr r0, _0230A93C ; =0x0237CA6C + ldr r0, _0230A93C ; =ov29_0237CA6C mov r1, #1 strb r1, [r0] b _0230A8F4 @@ -1725,7 +1725,7 @@ _0230A8CC: mov r2, r8 bl HandleFaint _0230A8F4: - ldr r0, _0230A93C ; =0x0237CA6C + ldr r0, _0230A93C ; =ov29_0237CA6C ldrb r0, [r0] cmp r0, #0 bne _0230A914 @@ -1740,13 +1740,13 @@ _0230A918: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0230A920: .word 0x00000C4D -_0230A924: .word 0x020AF6B8 +_0230A924: .word BAG_ITEMS_PTR_MIRROR _0230A928: .word 0x00000C6A _0230A92C: .word 0x00000C6B _0230A930: .word 0x00000C6C _0230A934: .word 0x00000C6D -_0230A938: .word 0x022C593C -_0230A93C: .word 0x0237CA6C +_0230A938: .word ov10_022C593C +_0230A93C: .word ov29_0237CA6C arm_func_end ApplyDamage arm_func_start DefenderAbilityIsActive__0230A940 @@ -1829,7 +1829,7 @@ AftermathCheck: ; 0x0230AA0C bl DefenderAbilityIsActive__0230A940 cmp r0, #0 beq _0230AA78 - ldr r0, _0230AA84 ; =0x022C4594 + ldr r0, _0230AA84 ; =ov10_022C4594 ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -1852,14 +1852,14 @@ _0230AA7C: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0230AA84: .word 0x022C4594 +_0230AA84: .word ov10_022C4594 _0230AA88: .word 0x0000026F arm_func_end AftermathCheck arm_func_start GetTypeMatchupBothTypes GetTypeMatchupBothTypes: ; 0x0230AA8C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r3, _0230AB4C ; =0x02352838 + ldr r3, _0230AB4C ; =ov29_02352838 mov sl, r0 ldrh r4, [r3] ldrh r3, [r3, #2] @@ -1868,7 +1868,7 @@ GetTypeMatchupBothTypes: ; 0x0230AA8C strh r4, [sp] strh r3, [sp, #2] bl ScrappyShouldActivate - ldr fp, _0230AB50 ; =0x02353538 + ldr fp, _0230AB50 ; =ov29_02353538 mov r7, r0 mov r6, #0 mov r5, #1 @@ -1904,15 +1904,15 @@ _0230AB18: cmp r6, #2 blt _0230AAC8 ldrsh r2, [sp] - ldr r0, _0230AB54 ; =0x022C4D14 + ldr r0, _0230AB54 ; =ov10_022C4D14 ldrsh r1, [sp, #2] add r0, r0, r2, lsl #4 ldr r0, [r0, r1, lsl #2] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0230AB4C: .word 0x02352838 -_0230AB50: .word 0x02353538 -_0230AB54: .word 0x022C4D14 +_0230AB4C: .word ov29_02352838 +_0230AB50: .word ov29_02353538 +_0230AB54: .word ov10_022C4D14 arm_func_end GetTypeMatchupBothTypes arm_func_start ScrappyShouldActivate @@ -1945,7 +1945,7 @@ _0230ABB4: mov r0, fp _0230ABB8: cmp r0, #0 - ldrne r1, _0230ABEC ; =0x02353538 + ldrne r1, _0230ABEC ; =ov29_02353538 movne r0, #1 ldrne r1, [r1] strneb r0, [r1, #0x1cc] @@ -1959,7 +1959,7 @@ _0230ABDC: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0230ABEC: .word 0x02353538 +_0230ABEC: .word ov29_02353538 arm_func_end ScrappyShouldActivate arm_func_start IsTypeIneffectiveAgainstGhost @@ -2040,7 +2040,7 @@ _0230ACCC: movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} _0230ACE0: - ldr r1, _0230AD00 ; =0x022C56B0 + ldr r1, _0230AD00 ; =ov10_022C56B0 mov r0, #0x24 mla r0, r5, r0, r1 add r1, r4, r6 @@ -2049,14 +2049,14 @@ _0230ACE0: ldrsh r0, [r1, r0] ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0230AD00: .word 0x022C56B0 +_0230AD00: .word ov10_022C56B0 arm_func_end GetTypeMatchup arm_func_start CalcTypeBasedDamageEffects CalcTypeBasedDamageEffects: ; 0x0230AD04 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x64 - ldr r5, _0230B774 ; =0x02352838 + ldr r5, _0230B774 ; =ov29_02352838 mov sl, r1 ldr r4, [r5, #0x1c] ldr r5, [r5, #0x20] @@ -2100,30 +2100,30 @@ CalcTypeBasedDamageEffects: ; 0x0230AD04 mov r2, r8 str r3, [r7, #8] bl ScrappyShouldActivate - ldr r3, _0230B778 ; =0x022C4820 + ldr r3, _0230B778 ; =ov10_022C4820 str r0, [sp, #0x28] ldr r0, [r3] - ldr r2, _0230B77C ; =0x022C4824 + ldr r2, _0230B77C ; =ov10_022C4824 str r0, [sp, #0x24] ldr r0, [r2] - ldr r1, _0230B780 ; =0x022C482C + ldr r1, _0230B780 ; =ov10_022C482C str r0, [sp, #0x20] ldr r0, [r1] - ldr r1, _0230B784 ; =0x022C4758 + ldr r1, _0230B784 ; =ov10_022C4758 str r0, [sp, #0x1c] - ldr r0, _0230B788 ; =0x022C474C + ldr r0, _0230B788 ; =ov10_022C474C mov r4, #0 ldr r0, [r0] str r0, [sp, #0x18] ldr r0, [r1] - ldr r1, _0230B78C ; =0x022C481C + ldr r1, _0230B78C ; =ov10_022C481C str r0, [sp, #0x14] - ldr r0, _0230B790 ; =0x022C4810 + ldr r0, _0230B790 ; =ov10_022C4810 ldr r0, [r0] str r0, [sp, #0x10] ldr r0, [r1] str r0, [sp, #0xc] - ldr r0, _0230B794 ; =0x022C4818 + ldr r0, _0230B794 ; =ov10_022C4818 ldr r0, [r0] str r0, [sp, #8] b _0230AF8C @@ -2186,7 +2186,7 @@ _0230AEC0: bl GhostImmunityIsActive cmp r0, #0 beq _0230AF1C - ldr r0, _0230B798 ; =0x02353538 + ldr r0, _0230B798 ; =ov29_02353538 mov r5, #0 ldr r1, [r0] mov r0, #1 @@ -2228,10 +2228,10 @@ _0230AF8C: cmp r4, #2 blt _0230AE28 _0230AF94: - ldr r0, _0230B798 ; =0x02353538 + ldr r0, _0230B798 ; =ov29_02353538 ldr r4, [sp, #0x34] ldr r2, [r0] - ldr r1, _0230B79C ; =0x022C4D14 + ldr r1, _0230B79C ; =ov10_022C4D14 strb r4, [r2, #0x18c] ldr r3, [sp, #0x38] ldr r2, [r0] @@ -2245,7 +2245,7 @@ _0230AF94: ldr r0, [sp, #0x30] mov r4, #0 cmp r0, #0 - ldrne r0, _0230B774 ; =0x02352838 + ldrne r0, _0230B774 ; =ov29_02352838 ldrne r1, [r0, #0x3c] ldrne r0, [r0, #0x40] strne r1, [fp] @@ -2259,7 +2259,7 @@ _0230AFEC: ldr r0, [r7, #8] cmp r0, #1 bne _0230B02C - ldr r1, _0230B7A0 ; =0x022C47C0 + ldr r1, _0230B7A0 ; =ov10_022C47C0 add r0, sp, #0x3c ldr r1, [r1] bl FixedPoint32To64 @@ -2286,7 +2286,7 @@ _0230B064: ldr r0, [r7, #8] cmp r0, #3 bne _0230B080 - ldr r2, _0230B7A4 ; =0x02352864 + ldr r2, _0230B7A4 ; =ov29_02352864 mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2296,7 +2296,7 @@ _0230B080: bl ExclusiveItemEffectIsActive__0230A9B8 cmp r0, #0 beq _0230B0A4 - ldr r2, _0230B7A8 ; =0x0235283C + ldr r2, _0230B7A8 ; =ov29_0235283C mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2309,12 +2309,12 @@ _0230B0A4: bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B104 - ldr r0, _0230B7AC ; =0x022C455C + ldr r0, _0230B7AC ; =ov10_022C455C ldrsh r1, [r0] ldr r0, [sp, #4] cmp r0, r1 bgt _0230B104 - ldr r2, _0230B7B0 ; =0x02352844 + ldr r2, _0230B7B0 ; =ov29_02352844 mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2336,8 +2336,8 @@ _0230B104: bl DefenderAbilityIsActive__0230A940 cmp r0, #0 beq _0230B14C - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7A8 ; =0x0235283C + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7A8 ; =ov29_0235283C ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2352,7 +2352,7 @@ _0230B14C: bl FlashFireShouldActivate cmp r0, #0 beq _0230B198 - ldr r1, _0230B798 ; =0x02353538 + ldr r1, _0230B798 ; =ov29_02353538 mov r0, fp ldr r2, [r1] mov r3, #1 @@ -2374,8 +2374,8 @@ _0230B198: bl DefenderAbilityIsActive__0230A940 cmp r0, #0 beq _0230B1DC - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7A8 ; =0x0235283C + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7A8 ; =ov29_0235283C ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2400,7 +2400,7 @@ _0230B208: cmp r0, #0 beq _0230B248 _0230B218: - ldr r1, _0230B798 ; =0x02353538 + ldr r1, _0230B798 ; =ov29_02353538 mov r0, fp ldr r2, [r1] mov r3, #1 @@ -2440,8 +2440,8 @@ _0230B248: mov r5, r0 cmp r7, #0 beq _0230B2D4 - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7BC ; =0x0235284C + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7BC ; =ov29_0235284C ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2485,8 +2485,8 @@ _0230B2F4: mov r5, r0 cmp r7, #0 beq _0230B380 - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7BC ; =0x0235284C + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7BC ; =ov29_0235284C ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2530,8 +2530,8 @@ _0230B3A0: mov r5, r0 cmp r7, #0 beq _0230B42C - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7BC ; =0x0235284C + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7BC ; =ov29_0235284C ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2575,8 +2575,8 @@ _0230B44C: mov r5, r0 cmp r7, #0 beq _0230B4D8 - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7BC ; =0x0235284C + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7BC ; =ov29_0235284C ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2600,8 +2600,8 @@ _0230B4F8: bl DefenderAbilityIsActive__0230A940 cmp r0, #0 beq _0230B534 - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7B0 ; =0x02352844 + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7B0 ; =ov29_02352844 ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2612,7 +2612,7 @@ _0230B534: ldrb r0, [r6, #0xbf] cmp r0, #1 bne _0230B560 - ldr r1, _0230B7CC ; =0x022C4744 + ldr r1, _0230B7CC ; =ov10_022C4744 add r0, sp, #0x3c ldr r1, [r1] bl FixedPoint32To64 @@ -2630,7 +2630,7 @@ _0230B560: bl MonsterIsType cmp r0, #0 beq _0230B5CC - ldr r1, _0230B798 ; =0x02353538 + ldr r1, _0230B798 ; =ov29_02353538 mov r0, sl ldr r2, [r1] mov r3, #1 @@ -2639,13 +2639,13 @@ _0230B560: bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B5BC - ldr r2, _0230B7BC ; =0x0235284C + ldr r2, _0230B7BC ; =ov29_0235284C mov r0, fp mov r1, fp bl MultiplyFixedPoint64 b _0230B5CC _0230B5BC: - ldr r2, _0230B7B0 ; =0x02352844 + ldr r2, _0230B7B0 ; =ov29_02352844 mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2657,8 +2657,8 @@ _0230B5CC: bne _0230B634 cmp r8, #2 bne _0230B60C - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7B0 ; =0x02352844 + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7B0 ; =ov29_02352844 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2669,8 +2669,8 @@ _0230B5CC: _0230B60C: cmp r8, #3 bne _0230B634 - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7A8 ; =0x0235283C + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7A8 ; =ov29_0235283C ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2682,8 +2682,8 @@ _0230B634: bne _0230B690 cmp r8, #2 bne _0230B668 - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7A8 ; =0x0235283C + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7A8 ; =ov29_0235283C ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2694,8 +2694,8 @@ _0230B634: _0230B668: cmp r8, #3 bne _0230B690 - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7B0 ; =0x02352844 + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7B0 ; =ov29_02352844 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2707,16 +2707,16 @@ _0230B690: bne _0230B6C0 cmp r8, #1 beq _0230B6C0 - ldr r2, _0230B7D0 ; =0x0235285C + ldr r2, _0230B7D0 ; =ov29_0235285C mov r0, fp mov r1, fp bl MultiplyFixedPoint64 - ldr r0, _0230B798 ; =0x02353538 + ldr r0, _0230B798 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x1c2] _0230B6C0: - ldr r0, _0230B798 ; =0x02353538 + ldr r0, _0230B798 ; =ov29_02353538 ldr r7, [r0] add r0, r7, #0xc000 ldrb r0, [r0, #0xd5b] @@ -2727,14 +2727,14 @@ _0230B6C0: _0230B6E0: cmp r8, #5 bne _0230B700 - ldr r2, _0230B7A8 ; =0x0235283C + ldr r2, _0230B7A8 ; =ov29_0235283C mov r3, #1 mov r0, fp mov r1, fp strb r3, [r7, #0x1d0] bl MultiplyFixedPoint64 _0230B700: - ldr r0, _0230B798 ; =0x02353538 + ldr r0, _0230B798 ; =ov29_02353538 ldr r5, [r0] add r0, r5, #0xc000 ldrb r0, [r0, #0xd5c] @@ -2742,7 +2742,7 @@ _0230B700: beq _0230B738 cmp r8, #2 bne _0230B738 - ldr r2, _0230B7A8 ; =0x0235283C + ldr r2, _0230B7A8 ; =ov29_0235283C mov r3, #1 mov r0, fp mov r1, fp @@ -2753,8 +2753,8 @@ _0230B738: ldreqb r0, [r6, #0xd2] cmpeq r0, #0xb bne _0230B768 - ldr r0, _0230B798 ; =0x02353538 - ldr r2, _0230B7BC ; =0x0235284C + ldr r0, _0230B798 ; =ov29_02353538 + ldr r2, _0230B7BC ; =ov29_0235284C ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2767,30 +2767,30 @@ _0230B76C: add sp, sp, #0x64 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0230B774: .word 0x02352838 -_0230B778: .word 0x022C4820 -_0230B77C: .word 0x022C4824 -_0230B780: .word 0x022C482C -_0230B784: .word 0x022C4758 -_0230B788: .word 0x022C474C -_0230B78C: .word 0x022C481C -_0230B790: .word 0x022C4810 -_0230B794: .word 0x022C4818 -_0230B798: .word 0x02353538 -_0230B79C: .word 0x022C4D14 -_0230B7A0: .word 0x022C47C0 -_0230B7A4: .word 0x02352864 -_0230B7A8: .word 0x0235283C -_0230B7AC: .word 0x022C455C -_0230B7B0: .word 0x02352844 +_0230B774: .word ov29_02352838 +_0230B778: .word ov10_022C4820 +_0230B77C: .word ov10_022C4824 +_0230B780: .word ov10_022C482C +_0230B784: .word ov10_022C4758 +_0230B788: .word ov10_022C474C +_0230B78C: .word ov10_022C481C +_0230B790: .word ov10_022C4810 +_0230B794: .word ov10_022C4818 +_0230B798: .word ov29_02353538 +_0230B79C: .word ov10_022C4D14 +_0230B7A0: .word ov10_022C47C0 +_0230B7A4: .word ov29_02352864 +_0230B7A8: .word ov29_0235283C +_0230B7AC: .word ov10_022C455C +_0230B7B0: .word ov29_02352844 _0230B7B4: .word 0x00000C3E _0230B7B8: .word 0x000003E7 -_0230B7BC: .word 0x0235284C +_0230B7BC: .word ov29_0235284C _0230B7C0: .word 0x00000C4F _0230B7C4: .word 0x00000C51 _0230B7C8: .word 0x00000C52 -_0230B7CC: .word 0x022C4744 -_0230B7D0: .word 0x0235285C +_0230B7CC: .word ov10_022C4744 +_0230B7D0: .word ov29_0235285C arm_func_end CalcTypeBasedDamageEffects arm_func_start ov29_0230B7D4 @@ -2872,7 +2872,7 @@ _0230B8E0: mov r1, sb mov r2, r8 bl ScrappyShouldActivate - ldr r1, _0230BBA0 ; =0x02352884 + ldr r1, _0230BBA0 ; =ov29_02352884 str r0, [sp] add ip, sp, #4 ldmia r1, {r0, r1, r2, r3} @@ -2895,7 +2895,7 @@ _0230B90C: ldreqb r0, [r6, #0xfe] cmpeq r0, #0 bne _0230B960 - ldr r1, _0230BBA4 ; =0x02353538 + ldr r1, _0230BBA4 ; =ov29_02353538 mov r0, #0 ldr r2, [r1] mov r1, #1 @@ -3030,7 +3030,7 @@ _0230BAF4: moveq r0, #2 beq _0230BB98 _0230BB3C: - ldr r0, _0230BBA4 ; =0x02353538 + ldr r0, _0230BBA4 ; =ov29_02353538 ldr r1, [r0] add r0, r1, #0xc000 ldrb r0, [r0, #0xd5b] @@ -3059,8 +3059,8 @@ _0230BB98: add sp, sp, #0x24 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0230BBA0: .word 0x02352884 -_0230BBA4: .word 0x02353538 +_0230BBA0: .word ov29_02352884 +_0230BBA4: .word ov29_02353538 _0230BBA8: .word 0x000003E7 arm_func_end ov29_0230B7D4 @@ -3068,7 +3068,7 @@ _0230BBA8: .word 0x000003E7 CalcDamage: ; 0x0230BBAC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xc0 - ldr r4, _0230C450 ; =0x02353538 + ldr r4, _0230C450 ; =ov29_02353538 mov sl, r0 ldr r4, [r4] ldr r6, [sl, #0xb4] @@ -3089,7 +3089,7 @@ CalcDamage: ; 0x0230BBAC ldrb r0, [r6, #0x221] cmp r0, #0 beq _0230BC1C - ldr r1, _0230C454 ; =0x022C4710 + ldr r1, _0230C454 ; =ov10_022C4710 ldr r0, [sp, #0x1c] ldr r1, [r1] bl MultiplyByFixedPoint @@ -3513,7 +3513,7 @@ _0230C23C: movlt r0, #0 strlt r0, [sp, #0x44] ldr r0, [sp, #0x44] - ldr r2, _0230C470 ; =0x022C4D98 + ldr r2, _0230C470 ; =ov10_022C4D98 cmp r0, #0x14 movgt r0, #0x14 strgt r0, [sp, #0x44] @@ -3541,7 +3541,7 @@ _0230C23C: strb r4, [r5, #0xb] add r0, r7, #0x1c ldrb r2, [r0, r1] - ldr r1, _0230C474 ; =0x022C4DEC + ldr r1, _0230C474 ; =ov10_022C4DEC strh r2, [r5, #0xe] ldr r2, [sp, #0x18] ldr r1, [r1, r4, lsl #2] @@ -3580,7 +3580,7 @@ _0230C338: bl ItemIsActive__0230A9DC cmp r0, #0 beq _0230C378 - ldr r0, _0230C478 ; =0x020A18AC + ldr r0, _0230C478 ; =POWER_BAND_STAT_BOOST ldr r1, [sp, #0x90] ldrsh r2, [r0] add r0, r1, r2 @@ -3594,7 +3594,7 @@ _0230C378: bl ItemIsActive__0230A9DC cmp r0, #0 beq _0230C3AC - ldr r0, _0230C47C ; =0x020A187C + ldr r0, _0230C47C ; =MUNCH_BELT_STAT_BOOST ldr r1, [sp, #0x90] ldrsh r2, [r0] add r0, r1, r2 @@ -3607,7 +3607,7 @@ _0230C3AC: bl AuraBowIsActive cmp r0, #0 beq _0230C3DC - ldr r0, _0230C480 ; =0x020A1898 + ldr r0, _0230C480 ; =AURA_BOW_STAT_BOOST ldr r1, [sp, #0x90] ldrsh r2, [r0] add r0, r1, r2 @@ -3624,7 +3624,7 @@ _0230C3DC: bl ItemIsActive__0230A9DC cmp r0, #0 beq _0230C41C - ldr r0, _0230C484 ; =0x020A18A8 + ldr r0, _0230C484 ; =DEF_SCARF_STAT_BOOST ldr r1, [sp, #0x94] ldrsh r2, [r0] add r0, r1, r2 @@ -3637,7 +3637,7 @@ _0230C41C: bl AuraBowIsActive cmp r0, #0 beq _0230C5E0 - ldr r0, _0230C480 ; =0x020A1898 + ldr r0, _0230C480 ; =AURA_BOW_STAT_BOOST ldr r1, [sp, #0x94] ldrsh r2, [r0] add r0, r1, r2 @@ -3647,40 +3647,40 @@ _0230C41C: strb r0, [r5, #0x36] b _0230C5E0 .align 2, 0 -_0230C450: .word 0x02353538 -_0230C454: .word 0x022C4710 +_0230C450: .word ov29_02353538 +_0230C454: .word ov10_022C4710 _0230C458: .word 0x000001D3 _0230C45C: .word 0x00000163 _0230C460: .word 0x000001A3 _0230C464: .word 0x000001A5 _0230C468: .word 0x00000211 _0230C46C: .word 0x000001BD -_0230C470: .word 0x022C4D98 -_0230C474: .word 0x022C4DEC -_0230C478: .word 0x020A18AC -_0230C47C: .word 0x020A187C -_0230C480: .word 0x020A1898 -_0230C484: .word 0x020A18A8 -_0230C488: .word 0x020A18B4 -_0230C48C: .word 0x020A186C +_0230C470: .word ov10_022C4D98 +_0230C474: .word ov10_022C4DEC +_0230C478: .word POWER_BAND_STAT_BOOST +_0230C47C: .word MUNCH_BELT_STAT_BOOST +_0230C480: .word AURA_BOW_STAT_BOOST +_0230C484: .word DEF_SCARF_STAT_BOOST +_0230C488: .word ZINC_BAND_STAT_BOOST +_0230C48C: .word SPECIAL_BAND_STAT_BOOST _0230C490: .word 0x00000C53 _0230C494: .word 0x00000C54 _0230C498: .word 0x00000C55 _0230C49C: .word 0x000003E7 -_0230C4A0: .word 0x020A18D8 -_0230C4A4: .word 0x02352984 -_0230C4A8: .word 0x02352990 -_0230C4AC: .word 0x0235299C -_0230C4B0: .word 0x020A18F4 -_0230C4B4: .word 0x020A18F0 -_0230C4B8: .word 0x020A18CC -_0230C4BC: .word 0x020A18F8 -_0230C4C0: .word 0x020A18EC -_0230C4C4: .word 0x020A18D4 -_0230C4C8: .word 0x020A18E8 -_0230C4CC: .word 0x0235286C -_0230C4D0: .word 0x02352838 -_0230C4D4: .word 0x0235287C +_0230C4A0: .word _020A18D8 +_0230C4A4: .word ov29_02352984 +_0230C4A8: .word ov29_02352990 +_0230C4AC: .word ov29_0235299C +_0230C4B0: .word _020A18F4 +_0230C4B4: .word _020A18F0 +_0230C4B8: .word _020A18CC +_0230C4BC: .word _020A18F8 +_0230C4C0: .word _020A18EC +_0230C4C4: .word _020A18D4 +_0230C4C8: .word _020A18E8 +_0230C4CC: .word ov29_0235286C +_0230C4D0: .word ov29_02352838 +_0230C4D4: .word ov29_0235287C _0230C4D8: ldr r0, [sp, #0xf8] cmp r0, #0 @@ -3690,7 +3690,7 @@ _0230C4D8: bl ItemIsActive__0230A9DC cmp r0, #0 beq _0230C518 - ldr r0, _0230C488 ; =0x020A18B4 + ldr r0, _0230C488 ; =ZINC_BAND_STAT_BOOST ldr r1, [sp, #0x94] ldrsh r2, [r0] add r0, r1, r2 @@ -3703,7 +3703,7 @@ _0230C518: bl AuraBowIsActive cmp r0, #0 beq _0230C548 - ldr r0, _0230C480 ; =0x020A1898 + ldr r0, _0230C480 ; =AURA_BOW_STAT_BOOST ldr r1, [sp, #0x94] ldrsh r2, [r0] add r0, r1, r2 @@ -3717,7 +3717,7 @@ _0230C548: bl ItemIsActive__0230A9DC cmp r0, #0 beq _0230C57C - ldr r0, _0230C48C ; =0x020A186C + ldr r0, _0230C48C ; =SPECIAL_BAND_STAT_BOOST ldr r1, [sp, #0x90] ldrsh r2, [r0] add r0, r1, r2 @@ -3731,7 +3731,7 @@ _0230C57C: bl ItemIsActive__0230A9DC cmp r0, #0 beq _0230C5B0 - ldr r0, _0230C47C ; =0x020A187C + ldr r0, _0230C47C ; =MUNCH_BELT_STAT_BOOST ldr r1, [sp, #0x90] ldrsh r2, [r0] add r0, r1, r2 @@ -3744,7 +3744,7 @@ _0230C5B0: bl AuraBowIsActive cmp r0, #0 beq _0230C5E0 - ldr r0, _0230C480 ; =0x020A1898 + ldr r0, _0230C480 ; =AURA_BOW_STAT_BOOST ldr r1, [sp, #0x90] ldrsh r2, [r0] add r0, r1, r2 @@ -3873,7 +3873,7 @@ _0230C76C: ldr r0, [sp, #0x30] cmp r0, #1 bne _0230C7D4 - ldr r0, _0230C450 ; =0x02353538 + ldr r0, _0230C450 ; =ov29_02353538 ldr r1, [r0] ldr r0, [sp, #0x14] add r0, r1, r0 @@ -3893,7 +3893,7 @@ _0230C7D4: ldr r0, [sp, #0x30] cmp r0, #1 bne _0230C820 - ldr r0, _0230C450 ; =0x02353538 + ldr r0, _0230C450 ; =ov29_02353538 ldr r1, [r0] ldr r0, [sp, #0x14] add r0, r1, r0 @@ -4004,7 +4004,7 @@ _0230C940: add r0, sp, #0x88 sub r1, r2, r1 bl IntToFixedPoint64 - ldr r1, _0230C4A0 ; =0x020A18D8 + ldr r1, _0230C4A0 ; =_020A18D8 add r0, sp, #0x80 ldr r1, [r1] bl FixedPoint32To64 @@ -4037,19 +4037,19 @@ _0230C940: add r0, sp, #0xa8 bl FixedPoint64ToInt mov r1, r0 - ldr r0, _0230C4A4 ; =0x02352984 + ldr r0, _0230C4A4 ; =ov29_02352984 bl DebugPrint0 add r0, sp, #0xa0 bl FixedPoint64ToInt mov r1, r0 - ldr r0, _0230C4A8 ; =0x02352990 + ldr r0, _0230C4A8 ; =ov29_02352990 bl DebugPrint0 add r0, sp, #0x98 bl FixedPoint64ToInt mov r1, r0 - ldr r0, _0230C4AC ; =0x0235299C + ldr r0, _0230C4AC ; =ov29_0235299C bl DebugPrint0 - ldr r1, _0230C4B0 ; =0x020A18F4 + ldr r1, _0230C4B0 ; =_020A18F4 add r0, sp, #0x70 ldr r1, [r1] bl FixedPoint32To64 @@ -4057,7 +4057,7 @@ _0230C940: add r1, sp, #0xa0 mov r2, r0 bl MultiplyFixedPoint64 - ldr r1, _0230C4B4 ; =0x020A18F0 + ldr r1, _0230C4B4 ; =_020A18F0 add r0, sp, #0x68 ldr r1, [r1] bl FixedPoint32To64 @@ -4065,7 +4065,7 @@ _0230C940: add r1, sp, #0x98 mov r2, r0 bl MultiplyFixedPoint64 - ldr r1, _0230C4B8 ; =0x020A18CC + ldr r1, _0230C4B8 ; =_020A18CC add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4073,7 +4073,7 @@ _0230C940: add r1, sp, #0xa8 add r2, sp, #0x78 bl AddFixedPoint64 - ldr r1, _0230C4BC ; =0x020A18F8 + ldr r1, _0230C4BC ; =_020A18F8 add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4086,7 +4086,7 @@ _0230C940: mov r1, r0 add r0, sp, #0x60 bl ClampedLn - ldr r1, _0230C4C0 ; =0x020A18EC + ldr r1, _0230C4C0 ; =_020A18EC add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4102,7 +4102,7 @@ _0230C940: add r2, sp, #0x60 mov r1, r0 bl AddFixedPoint64 - ldr r1, _0230C4C4 ; =0x020A18D4 + ldr r1, _0230C4C4 ; =_020A18D4 add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4116,7 +4116,7 @@ _0230C940: ldrb r0, [r6, #6] cmp r0, #0 beq _0230CB78 - ldr r1, _0230C4C8 ; =0x020A18E8 + ldr r1, _0230C4C8 ; =_020A18E8 add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4125,20 +4125,20 @@ _0230C940: mov r1, r0 bl DivideFixedPoint64 _0230CB78: - ldr r0, _0230C4CC ; =0x0235286C + ldr r0, _0230C4CC ; =ov29_0235286C add r1, sp, #0xb0 bl FixedPoint64CmpLt cmp r0, #0 - ldrne r0, _0230C4D0 ; =0x02352838 + ldrne r0, _0230C4D0 ; =ov29_02352838 ldrne r1, [r0, #0x38] ldrne r0, [r0, #0x34] strne r1, [sp, #0xb4] strne r0, [sp, #0xb0] - ldr r1, _0230C4D4 ; =0x0235287C + ldr r1, _0230C4D4 ; =ov29_0235287C add r0, sp, #0xb0 bl FixedPoint64CmpLt cmp r0, #0 - ldrne r0, _0230C4D0 ; =0x02352838 + ldrne r0, _0230C4D0 ; =ov29_02352838 ldrne r1, [r0, #0x48] ldrne r0, [r0, #0x44] strne r1, [sp, #0xb4] @@ -4218,7 +4218,7 @@ _0230CCD0: mov r0, sb bl PlayEffectAnimation0x171 add r0, sp, #0xb8 - ldr r2, _0230D064 ; =0x0235283C + ldr r2, _0230D064 ; =ov29_0235283C mov r1, r0 bl MultiplyFixedPoint64 mov r0, #1 @@ -4239,7 +4239,7 @@ _0230CD1C: mov r0, sb bl PlayEffectAnimation0x171Full add r0, sp, #0xb8 - ldr r2, _0230D064 ; =0x0235283C + ldr r2, _0230D064 ; =ov29_0235283C mov r1, r0 bl MultiplyFixedPoint64 mov r0, #1 @@ -4291,7 +4291,7 @@ _0230CD3C: cmp r0, #0 beq _0230CE04 _0230CDF0: - ldr r0, _0230D068 ; =0x022C46F0 + ldr r0, _0230D068 ; =ov10_022C46F0 mov r1, #1 ldrsh r0, [r0] strb r1, [r5, #0x38] @@ -4301,7 +4301,7 @@ _0230CE04: mov r1, #0x58 bl AbilityIsActiveVeneer cmp r0, #0 - ldrne r0, _0230D06C ; =0x022C4510 + ldrne r0, _0230D06C ; =ov10_022C4510 movne r1, #1 ldrnesh r0, [r0] strneb r1, [r5, #0x49] @@ -4310,7 +4310,7 @@ _0230CE04: mov r0, sb bl ItemIsActive__0230A9DC cmp r0, #0 - ldrne r0, _0230D068 ; =0x022C46F0 + ldrne r0, _0230D068 ; =ov10_022C46F0 movne r1, #1 ldrnesh r0, [r0] strneb r1, [r5, #0x39] @@ -4321,7 +4321,7 @@ _0230CE04: mov r1, #1 bl IqSkillIsEnabled cmp r0, #0 - ldrne r0, _0230D070 ; =0x022C45E0 + ldrne r0, _0230D070 ; =ov10_022C45E0 movne r1, #1 ldrnesh r4, [r0] strneb r1, [r5, #0x3d] @@ -4347,14 +4347,14 @@ _0230CE74: cmp r0, #0 add r0, sp, #0xb8 beq _0230CEE0 - ldr r2, _0230D074 ; =0x0235284C + ldr r2, _0230D074 ; =ov29_0235284C mov r1, r0 bl MultiplyFixedPoint64 mov r0, #1 strb r0, [r5, #0x4a] b _0230CEEC _0230CEE0: - ldr r2, _0230D078 ; =0x02352844 + ldr r2, _0230D078 ; =ov29_02352844 mov r1, r0 bl MultiplyFixedPoint64 _0230CEEC: @@ -4420,7 +4420,7 @@ _0230CFBC: bl IqSkillIsEnabled cmp r0, #0 beq _0230CFFC - ldr r0, _0230D080 ; =0x022C47F8 + ldr r0, _0230D080 ; =ov10_022C47F8 ldr r2, [r8] ldr r1, [r0] mov r0, r2, lsl #8 @@ -4440,7 +4440,7 @@ ov29_0230D000: ; 0x0230D000 bl ExclusiveItemEffectIsActive__0230A9B8 cmp r0, #0 beq _0230D038 - ldr r0, _0230D084 ; =0x022C4844 + ldr r0, _0230D084 ; =ov10_022C4844 ldr r2, [r8] ldr r1, [r0] mov r0, r2, lsl #8 @@ -4461,15 +4461,15 @@ _0230D054: .align 2, 0 _0230D05C: .word 0x00000C58 _0230D060: .word 0x00000C57 -_0230D064: .word 0x0235283C -_0230D068: .word 0x022C46F0 -_0230D06C: .word 0x022C4510 -_0230D070: .word 0x022C45E0 -_0230D074: .word 0x0235284C -_0230D078: .word 0x02352844 +_0230D064: .word ov29_0235283C +_0230D068: .word ov10_022C46F0 +_0230D06C: .word ov10_022C4510 +_0230D070: .word ov10_022C45E0 +_0230D074: .word ov29_0235284C +_0230D078: .word ov29_02352844 _0230D07C: .word 0x00000195 -_0230D080: .word 0x022C47F8 -_0230D084: .word 0x022C4844 +_0230D080: .word ov10_022C47F8 +_0230D084: .word ov10_022C4844 arm_func_end ov29_0230D000 arm_func_start ov29_0230D088 @@ -4644,7 +4644,7 @@ _0230D298: cmp r0, #0 beq _0230D2F8 ldr r2, [sp, #0x10] - ldr r0, _0230D39C ; =0x022C4D14 + ldr r0, _0230D39C ; =ov10_022C4D14 ldr r1, [sp, #0x14] add r0, r0, r2, lsl #4 ldr r0, [r0, r1, lsl #2] @@ -4661,7 +4661,7 @@ _0230D2F8: bl IqSkillIsEnabled cmp r0, #0 beq _0230D334 - ldr r1, _0230D3A4 ; =0x022C47F8 + ldr r1, _0230D3A4 ; =ov10_022C47F8 mov r0, r8 ldr r1, [r1] bl MultiplyByFixedPoint @@ -4694,9 +4694,9 @@ _0230D334: add sp, sp, #0x2c ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_0230D39C: .word 0x022C4D14 +_0230D39C: .word ov10_022C4D14 _0230D3A0: .word 0x00000256 -_0230D3A4: .word 0x022C47F8 +_0230D3A4: .word ov10_022C47F8 arm_func_end CalcDamageFixed arm_func_start CalcDamageFixedNoCategory @@ -4821,7 +4821,7 @@ _0230D518: arm_func_start ResetDamageCalcDiagnostics ResetDamageCalcDiagnostics: ; 0x0230D528 stmdb sp!, {r3, r4, r5, lr} - ldr r0, _0230D614 ; =0x02353538 + ldr r0, _0230D614 ; =ov29_02353538 mov r1, #0x54 ldr r4, [r0] add r5, r4, #0x184 @@ -4880,22 +4880,22 @@ ResetDamageCalcDiagnostics: ; 0x0230D528 strb r1, [r5, #0x33] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0230D614: .word 0x02353538 +_0230D614: .word ov29_02353538 arm_func_end ResetDamageCalcDiagnostics arm_func_start ov29_0230D618 ov29_0230D618: ; 0x0230D618 - ldr r1, _0230D624 ; =0x02352894 + ldr r1, _0230D624 ; =ov29_02352894 ldr r0, [r1, r0, lsl #2] bx lr .align 2, 0 -_0230D624: .word 0x02352894 +_0230D624: .word ov29_02352894 arm_func_end ov29_0230D618 arm_func_start ov29_0230D628 ov29_0230D628: ; 0x0230D628 stmdb sp!, {r3, lr} - ldr r1, _0230D650 ; =0x02353538 + ldr r1, _0230D650 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 ldr r1, [r1, #0x22c] @@ -4905,7 +4905,7 @@ ov29_0230D628: ; 0x0230D628 bl PointCameraToMonster ldmia sp!, {r3, pc} .align 2, 0 -_0230D650: .word 0x02353538 +_0230D650: .word ov29_02353538 arm_func_end ov29_0230D628 arm_func_start ov29_0230D654 @@ -4974,7 +4974,7 @@ ov29_0230D70C: ; 0x0230D70C stmdb sp!, {r3, lr} mov r0, #0x64 bl DungeonRandInt - ldr r1, _0230D734 ; =0x022C45B4 + ldr r1, _0230D734 ; =ov10_022C45B4 arm_func_end ov29_0230D70C arm_func_start ov29_0230D71C @@ -4986,7 +4986,7 @@ ov29_0230D71C: ; 0x0230D71C and r0, r0, #0xff ldmia sp!, {r3, pc} .align 2, 0 -_0230D734: .word 0x022C45B4 +_0230D734: .word ov10_022C45B4 arm_func_end ov29_0230D71C arm_func_start ov29_0230D738 @@ -4996,7 +4996,7 @@ ov29_0230D738: ; 0x0230D738 bne _0230D760 mov r0, #0x64 bl DungeonRandInt - ldr r1, _0230D768 ; =0x022C45B4 + ldr r1, _0230D768 ; =ov10_022C45B4 ldrsh r1, [r1] cmp r0, r1 movlt r0, #1 @@ -5005,7 +5005,7 @@ _0230D760: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_0230D768: .word 0x022C45B4 +_0230D768: .word ov10_022C45B4 arm_func_end ov29_0230D738 arm_func_start ov29_0230D76C @@ -5044,7 +5044,7 @@ _0230D7A0: ov29_0230D7D4: ; 0x0230D7D4 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x10 - ldr r2, _0230D870 ; =0x023535D4 + ldr r2, _0230D870 ; =ov29_023535D4 mvn r1, #0 ldrsh r3, [r2] mov r4, r0 @@ -5052,7 +5052,7 @@ ov29_0230D7D4: ; 0x0230D7D4 beq _0230D808 ldrsh r0, [r2] bl ov10_022BDE50 - ldr r0, _0230D870 ; =0x023535D4 + ldr r0, _0230D870 ; =ov29_023535D4 mvn r1, #0 strh r1, [r0] _0230D808: @@ -5086,7 +5086,7 @@ _0230D868: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0230D870: .word 0x023535D4 +_0230D870: .word ov29_023535D4 arm_func_end ov29_0230D7D4 arm_func_start ov29_0230D874 @@ -5293,7 +5293,7 @@ ov29_0230DAB8: ; 0x0230DAB8 arm_func_start SpecificRecruitCheck SpecificRecruitCheck: ; 0x0230DB14 stmdb sp!, {r4, lr} - ldr r1, _0230DBC8 ; =0x02353538 + ldr r1, _0230DBC8 ; =ov29_02353538 mov r4, r0 ldr r1, [r1] ldrb r1, [r1, #0x759] @@ -5305,7 +5305,7 @@ SpecificRecruitCheck: ; 0x0230DB14 moveq r0, #0 ldmeqia sp!, {r4, pc} cmp r4, #0x97 - ldreq r0, _0230DBC8 ; =0x02353538 + ldreq r0, _0230DBC8 ; =ov29_02353538 ldreq r0, [r0] addeq r0, r0, #0x700 ldreqsb r0, [r0, #0x98] @@ -5338,14 +5338,14 @@ SpecificRecruitCheck: ; 0x0230DB14 and r0, r0, #0xff ldmia sp!, {r4, pc} .align 2, 0 -_0230DBC8: .word 0x02353538 +_0230DBC8: .word ov29_02353538 _0230DBCC: .word 0x000001A3 arm_func_end SpecificRecruitCheck arm_func_start RecruitCheck RecruitCheck: ; 0x0230DBD0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr r2, _0230E024 ; =0x02353538 + ldr r2, _0230E024 ; =ov29_02353538 mov r8, r0 ldr r0, [r2] mov r7, r1 @@ -5370,7 +5370,7 @@ _0230DC28: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _0230DC30: - ldr r0, _0230E024 ; =0x02353538 + ldr r0, _0230E024 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x75d] cmp r0, #0 @@ -5501,7 +5501,7 @@ _0230DDFC: mov r1, #0x35 bl ItemIsActive__0230E578 cmp r0, #0 - ldrne r0, _0230E038 ; =0x022C44FC + ldrne r0, _0230E038 ; =ov10_022C44FC ldrnesh r0, [r0] addne r6, r6, r0 bne _0230DFD4 @@ -5509,7 +5509,7 @@ _0230DDFC: mov r1, #0x39 bl ItemIsActive__0230E578 cmp r0, #0 - ldrne r0, _0230E03C ; =0x022C443C + ldrne r0, _0230E03C ; =ov10_022C443C ldrnesh r0, [r0] addne r6, r6, r0 bne _0230DFD4 @@ -5517,7 +5517,7 @@ _0230DDFC: mov r1, #0x3a bl ItemIsActive__0230E578 cmp r0, #0 - ldrne r0, _0230E040 ; =0x022C447C + ldrne r0, _0230E040 ; =ov10_022C447C ldrnesh r0, [r0] addne r6, r6, r0 bne _0230DFD4 @@ -5530,7 +5530,7 @@ _0230DDFC: mov r1, #6 bl MonsterIsType cmp r0, #0 - ldrne r0, _0230E044 ; =0x022C441C + ldrne r0, _0230E044 ; =ov10_022C441C ldrnesh r0, [r0] addne r6, r6, r0 b _0230DFD4 @@ -5544,7 +5544,7 @@ _0230DEA0: mov r1, #2 bl MonsterIsType cmp r0, #0 - ldrne r0, _0230E048 ; =0x022C4410 + ldrne r0, _0230E048 ; =ov10_022C4410 ldrnesh r0, [r0] addne r6, r6, r0 b _0230DFD4 @@ -5558,7 +5558,7 @@ _0230DED4: mov r1, #9 bl MonsterIsType cmp r0, #0 - ldrne r0, _0230E04C ; =0x022C470C + ldrne r0, _0230E04C ; =ov10_022C470C ldrnesh r0, [r0] addne r6, r6, r0 b _0230DFD4 @@ -5572,7 +5572,7 @@ _0230DF08: mov r1, #3 bl MonsterIsType cmp r0, #0 - ldrne r0, _0230E050 ; =0x022C4708 + ldrne r0, _0230E050 ; =ov10_022C4708 ldrnesh r0, [r0] addne r6, r6, r0 b _0230DFD4 @@ -5586,7 +5586,7 @@ _0230DF3C: mov r1, #0xd bl MonsterIsType cmp r0, #0 - ldrne r0, _0230E054 ; =0x022C4704 + ldrne r0, _0230E054 ; =ov10_022C4704 ldrnesh r0, [r0] addne r6, r6, r0 b _0230DFD4 @@ -5600,7 +5600,7 @@ _0230DF70: mov r1, #4 bl MonsterIsType cmp r0, #0 - ldrne r0, _0230E058 ; =0x022C4700 + ldrne r0, _0230E058 ; =ov10_022C4700 ldrnesh r0, [r0] addne r6, r6, r0 b _0230DFD4 @@ -5614,7 +5614,7 @@ _0230DFA4: mov r1, #0xa bl MonsterIsType cmp r0, #0 - ldrne r0, _0230E05C ; =0x022C46FC + ldrne r0, _0230E05C ; =ov10_022C46FC ldrnesh r0, [r0] addne r6, r6, r0 _0230DFD4: @@ -5622,12 +5622,12 @@ _0230DFD4: mov r1, #0x1e bl IqSkillIsEnabled cmp r0, #0 - ldrne r0, _0230E038 ; =0x022C44FC + ldrne r0, _0230E038 ; =ov10_022C44FC ldrb r1, [r5, #0xa] ldrnesh r0, [r0] mov r1, r1, lsl #1 addne r6, r6, r0 - ldr r0, _0230E060 ; =0x022C5064 + ldr r0, _0230E060 ; =ov10_022C5064 ldrsh r0, [r0, r1] add r0, r6, r0 cmp r4, r0 @@ -5639,22 +5639,22 @@ _0230DFD4: movge r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0230E024: .word 0x02353538 +_0230E024: .word ov29_02353538 _0230E028: .word 0x000001E6 _0230E02C: .word 0x0000010F _0230E030: .word 0xFFFFFDEA _0230E034: .word 0xFFFFFC19 -_0230E038: .word 0x022C44FC -_0230E03C: .word 0x022C443C -_0230E040: .word 0x022C447C -_0230E044: .word 0x022C441C -_0230E048: .word 0x022C4410 -_0230E04C: .word 0x022C470C -_0230E050: .word 0x022C4708 -_0230E054: .word 0x022C4704 -_0230E058: .word 0x022C4700 -_0230E05C: .word 0x022C46FC -_0230E060: .word 0x022C5064 +_0230E038: .word ov10_022C44FC +_0230E03C: .word ov10_022C443C +_0230E040: .word ov10_022C447C +_0230E044: .word ov10_022C441C +_0230E048: .word ov10_022C4410 +_0230E04C: .word ov10_022C470C +_0230E050: .word ov10_022C4708 +_0230E054: .word ov10_022C4704 +_0230E058: .word ov10_022C4700 +_0230E05C: .word ov10_022C46FC +_0230E060: .word ov10_022C5064 arm_func_end RecruitCheck arm_func_start TryRecruit @@ -5722,7 +5722,7 @@ _0230E114: strb r1, [sp, #0xac] strb r0, [sp, #0xad] ldrsh r2, [r8, #0xc] - ldr r1, _0230E560 ; =0x02353538 + ldr r1, _0230E560 ; =ov29_02353538 sub r3, r0, #1 strb r2, [sp, #0xae] strh r4, [sp, #0xb2] @@ -5999,7 +5999,7 @@ _0230E550: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0230E55C: .word 0x00000C77 -_0230E560: .word 0x02353538 +_0230E560: .word ov29_02353538 _0230E564: .word 0x00000C7B _0230E568: .word 0x00000C7E _0230E56C: .word 0x00000C7F @@ -6110,7 +6110,7 @@ ov29_0230E658: ; 0x0230E658 TrySpawnMonsterAndTickSpawnCounter: ; 0x0230E6BC stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x10 - ldr r0, _0230E8D8 ; =0x02353538 + ldr r0, _0230E8D8 ; =ov29_02353538 mov r6, #0 ldr r7, [r0] add r0, r7, #0x700 @@ -6123,14 +6123,14 @@ TrySpawnMonsterAndTickSpawnCounter: ; 0x0230E6BC ldrb r1, [r7, #0x790] cmp r1, #0 bne _0230E710 - ldr r1, _0230E8DC ; =0x022C44DC + ldr r1, _0230E8DC ; =ov10_022C44DC ldrsh r2, [r0, #0x82] ldrsh r0, [r1] cmp r2, r0 bge _0230E724 b _0230E8D0 _0230E710: - ldr r1, _0230E8E0 ; =0x022C4640 + ldr r1, _0230E8E0 ; =ov10_022C4640 ldrsh r2, [r0, #0x82] ldrsh r0, [r1] cmp r2, r0 @@ -6182,19 +6182,19 @@ _0230E7B8: ldrb r0, [r7, #0x790] cmp r0, #0 bne _0230E80C - ldr r0, _0230E8D8 ; =0x02353538 + ldr r0, _0230E8D8 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xc9] cmp r0, #0xff bne _0230E7FC - ldr r0, _0230E8E4 ; =0x022C4430 + ldr r0, _0230E8E4 ; =ov10_022C4430 ldrsh r0, [r0] cmp r5, r0 blt _0230E80C b _0230E8D0 _0230E7FC: - ldr r0, _0230E8E8 ; =0x022C46A4 + ldr r0, _0230E8E8 ; =ov10_022C46A4 ldrsh r0, [r0] cmp r5, r0 bge _0230E8D0 @@ -6237,7 +6237,7 @@ _0230E844: strh r4, [sp, #8] strb r1, [sp, #2] bl DungeonRandInt - ldr r1, _0230E8D8 ; =0x02353538 + ldr r1, _0230E8D8 ; =ov29_02353538 mov r4, r0 ldr r0, [r1] ldrb r0, [r0, #0x748] @@ -6255,10 +6255,10 @@ _0230E8D0: add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_0230E8D8: .word 0x02353538 -_0230E8DC: .word 0x022C44DC -_0230E8E0: .word 0x022C4640 -_0230E8E4: .word 0x022C4430 -_0230E8E8: .word 0x022C46A4 +_0230E8D8: .word ov29_02353538 +_0230E8DC: .word ov10_022C44DC +_0230E8E0: .word ov10_022C4640 +_0230E8E4: .word ov10_022C4430 +_0230E8E8: .word ov10_022C46A4 _0230E8EC: .word 0x00000C5D arm_func_end TrySpawnMonsterAndTickSpawnCounter diff --git a/asm/overlay_29_0230E914.s b/asm/overlay_29_0230E914.s index 5c91d281..6fe84290 100644 --- a/asm/overlay_29_0230E914.s +++ b/asm/overlay_29_0230E914.s @@ -33,8 +33,8 @@ ov29_0230E914: ; 0x0230E914 mov r3, #1 bl ov29_0230EDB0 mov r4, #0 - ldr r6, _0230EDA0 ; =0x0237C9D8 - ldr r5, _0230EDA4 ; =0x023536FC + ldr r6, _0230EDA0 ; =ov29_0237C9D8 + ldr r5, _0230EDA4 ; =ov29_023536FC b _0230E9DC _0230E990: ldr r0, [r6, r4, lsl #2] @@ -47,7 +47,7 @@ _0230E990: mov r0, #0x81 strb r0, [r7, #0x4e] ldrsh r1, [sl, #4] - ldr r0, _0230EDA8 ; =0x0237C9F8 + ldr r0, _0230EDA8 ; =ov29_0237C9F8 strh r1, [r7, #0x50] ldrsh r1, [sl, #6] strh r1, [r7, #0x52] @@ -62,7 +62,7 @@ _0230E9DC: cmp r4, r0 blt _0230E990 _0230E9E8: - ldr r0, _0230EDA4 ; =0x023536FC + ldr r0, _0230EDA4 ; =ov29_023536FC ldr r0, [r0] cmp r4, r0 bne _0230ED98 @@ -78,7 +78,7 @@ _0230EA08: add r1, r7, #0x62 mov r3, #1 bl ov29_0230F02C - ldr r0, _0230EDA4 ; =0x023536FC + ldr r0, _0230EDA4 ; =ov29_023536FC ldr r1, [r0] cmp r1, #0 beq _0230EA9C @@ -164,7 +164,7 @@ _0230EB58: ldrb r0, [r7, #7] cmp r0, #0 beq _0230ED98 - ldr r0, _0230EDAC ; =0x020AF6B8 + ldr r0, _0230EDAC ; =BAG_ITEMS_PTR_MIRROR sub r1, r5, #1 ldr r0, [r0] sub r2, r5, #2 @@ -231,7 +231,7 @@ _0230EC4C: cmp r0, #0 beq _0230ED8C mov r4, #1 - ldr fp, _0230EDA4 ; =0x023536FC + ldr fp, _0230EDA4 ; =ov29_023536FC b _0230ED84 _0230EC68: ldrsh r0, [r8, #4] @@ -251,7 +251,7 @@ _0230EC68: ldr r0, [fp] cmp r0, #0 beq _0230ED80 - ldr r0, _0230EDA4 ; =0x023536FC + ldr r0, _0230EDA4 ; =ov29_023536FC ldr r0, [r0] bl DungeonRandInt mov r4, r0 @@ -284,7 +284,7 @@ _0230ED14: mov sb, #0 b _0230ED74 _0230ED28: - ldr r0, _0230EDA0 ; =0x0237C9D8 + ldr r0, _0230EDA0 ; =ov29_0237C9D8 ldr r0, [r0, sb, lsl #2] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -294,7 +294,7 @@ _0230ED28: bl SetMonsterActionFields strb r6, [r7, #0x4e] ldrsh r1, [sl, #4] - ldr r0, _0230EDA8 ; =0x0237C9F8 + ldr r0, _0230EDA8 ; =ov29_0237C9F8 strh r1, [r7, #0x50] ldrsh r1, [sl, #6] strh r1, [r7, #0x52] @@ -322,21 +322,21 @@ _0230ED98: add sp, sp, #0x50 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0230EDA0: .word 0x0237C9D8 -_0230EDA4: .word 0x023536FC -_0230EDA8: .word 0x0237C9F8 -_0230EDAC: .word 0x020AF6B8 +_0230EDA0: .word ov29_0237C9D8 +_0230EDA4: .word ov29_023536FC +_0230EDA8: .word ov29_0237C9F8 +_0230EDAC: .word BAG_ITEMS_PTR_MIRROR arm_func_end ov29_0230E914 arm_func_start ov29_0230EDB0 ov29_0230EDB0: ; 0x0230EDB0 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x14 - ldr r4, _0230EFF4 ; =0x023536FC + ldr r4, _0230EFF4 ; =ov29_023536FC mov r5, #0 mov sl, r0 str r3, [sp, #8] - ldr r0, _0230EFF8 ; =0x0237C9D0 + ldr r0, _0230EFF8 ; =ov29_0237C9D0 str r1, [sp] str r2, [sp, #4] str r5, [r4] @@ -349,7 +349,7 @@ _0230EDDC: mvn r0, #0 str r0, [sp, #0x10] _0230EDF4: - ldr r0, _0230EFFC ; =0x02353538 + ldr r0, _0230EFFC ; =ov29_02353538 ldr r0, [r0] add r0, r0, fp, lsl #2 add r0, r0, #0x12000 @@ -448,7 +448,7 @@ _0230EF44: _0230EF54: cmp r5, #0 blt _0230EFE0 - ldr r0, _0230EFF8 ; =0x0237C9D0 + ldr r0, _0230EFF8 ; =ov29_0237C9D0 ldrb r0, [r0, r5] cmp r0, #0 bne _0230EFE0 @@ -459,14 +459,14 @@ _0230EF54: bl IsTargetInRange cmp r0, #0 beq _0230EFE0 - ldr r0, _0230EFF8 ; =0x0237C9D0 + ldr r0, _0230EFF8 ; =ov29_0237C9D0 mov r1, #1 strb r1, [r0, r5] ldr r0, [sp, #8] cmp r0, #0 - ldr r0, _0230EFF4 ; =0x023536FC + ldr r0, _0230EFF4 ; =ov29_023536FC ldr r1, [r0] - ldr r0, _0230F000 ; =0x0237C9F8 + ldr r0, _0230F000 ; =ov29_0237C9F8 str r5, [r0, r1, lsl #2] movne r0, #0x64 bne _0230EFC4 @@ -475,11 +475,11 @@ _0230EF54: mov r0, r4 bl ov29_0231E05C _0230EFC4: - ldr r1, _0230EFF4 ; =0x023536FC + ldr r1, _0230EFF4 ; =ov29_023536FC ldr r2, [r1] - ldr r1, _0230F004 ; =0x0237C9D8 + ldr r1, _0230F004 ; =ov29_0237C9D8 str r0, [r1, r2, lsl #2] - ldr r0, _0230EFF4 ; =0x023536FC + ldr r0, _0230EFF4 ; =ov29_023536FC add r1, r2, #1 str r1, [r0] _0230EFE0: @@ -489,9 +489,9 @@ _0230EFE0: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0230EFF4: .word 0x023536FC -_0230EFF8: .word 0x0237C9D0 -_0230EFFC: .word 0x02353538 -_0230F000: .word 0x0237C9F8 -_0230F004: .word 0x0237C9D8 +_0230EFF4: .word ov29_023536FC +_0230EFF8: .word ov29_0237C9D0 +_0230EFFC: .word ov29_02353538 +_0230F000: .word ov29_0237C9F8 +_0230F004: .word ov29_0237C9D8 arm_func_end ov29_0230EDB0 diff --git a/asm/overlay_29_0230F02C.s b/asm/overlay_29_0230F02C.s index 1d6e384d..2f1cc3fd 100644 --- a/asm/overlay_29_0230F02C.s +++ b/asm/overlay_29_0230F02C.s @@ -6,7 +6,7 @@ arm_func_start ov29_0230F02C ov29_0230F02C: ; 0x0230F02C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r4, _0230F138 ; =0x023536FC + ldr r4, _0230F138 ; =ov29_023536FC mov r6, #0 mov sl, r0 mov fp, r1 @@ -14,7 +14,7 @@ ov29_0230F02C: ; 0x0230F02C mov r8, r3 str r6, [r4] _0230F04C: - ldr r0, _0230F13C ; =0x02353538 + ldr r0, _0230F13C ; =ov29_02353538 ldr r0, [r0] add r0, r0, r6, lsl #2 add r0, r0, #0x12000 @@ -76,8 +76,8 @@ _0230F128: blt _0230F04C ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0230F138: .word 0x023536FC -_0230F13C: .word 0x02353538 +_0230F138: .word ov29_023536FC +_0230F13C: .word ov29_02353538 arm_func_end ov29_0230F02C arm_func_start ov29_0230F140 @@ -216,7 +216,7 @@ _0230F2B0: bl LogMessageByIdWithPopup b _0230F624 _0230F300: - ldr r0, _0230F63C ; =0x02353538 + ldr r0, _0230F63C ; =ov29_02353538 ldr r0, [r0] ldrb sb, [r0, #0x75b] cmp sb, #0 @@ -224,7 +224,7 @@ _0230F300: ldrb r0, [r6, #6] cmp r0, #0 bne _0230F36C - ldr r0, _0230F640 ; =0x020AF6B8 + ldr r0, _0230F640 ; =BAG_ITEMS_PTR_MIRROR mov r5, #0 ldr r0, [r0] add r2, sp, #0 @@ -442,8 +442,8 @@ _0230F62C: .word 0x00000C5E _0230F630: .word 0x00001305 _0230F634: .word 0x00001308 _0230F638: .word 0x00000C5F -_0230F63C: .word 0x02353538 -_0230F640: .word 0x020AF6B8 +_0230F63C: .word ov29_02353538 +_0230F640: .word BAG_ITEMS_PTR_MIRROR _0230F644: .word 0x00001304 _0230F648: .word 0x00000C61 _0230F64C: .word 0x00000C62 @@ -558,7 +558,7 @@ ExclusiveItemDefenseBoost: ; 0x0230F788 TeamMemberHasItemActive: ; 0x0230F798 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r6, #0 - ldr r4, _0230F80C ; =0x02353538 + ldr r4, _0230F80C ; =ov29_02353538 mov sb, r0 mov r8, r1 mov r5, r6 @@ -588,7 +588,7 @@ _0230F7F0: mov r0, r6 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0230F80C: .word 0x02353538 +_0230F80C: .word ov29_02353538 arm_func_end TeamMemberHasItemActive arm_func_start ItemIsActive__0230F810 @@ -612,7 +612,7 @@ TeamMemberHasExclusiveItemEffectActive: ; 0x0230F840 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r4, r0 mov r6, #0 - ldr r5, _0230F8A8 ; =0x02353538 + ldr r5, _0230F8A8 ; =ov29_02353538 b _0230F898 _0230F854: ldr r0, [r5] @@ -639,7 +639,7 @@ _0230F898: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0230F8A8: .word 0x02353538 +_0230F8A8: .word ov29_02353538 arm_func_end TeamMemberHasExclusiveItemEffectActive arm_func_start ExclusiveItemEffectIsActive__0230F8AC @@ -667,7 +667,7 @@ ov29_0230F8D0: ; 0x0230F8D0 ldr r0, [r8, #0xb4] mov r5, #0 ldrb r6, [r0, #0x4c] - ldr r4, _0230F97C ; =0x0235171C + ldr r4, _0230F97C ; =DIRECTIONS_XY b _0230F96C _0230F900: mov r1, r6, lsl #2 @@ -704,7 +704,7 @@ _0230F96C: mov r0, #0xff ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0230F97C: .word 0x0235171C +_0230F97C: .word DIRECTIONS_XY arm_func_end ov29_0230F8D0 arm_func_start IsMonster__0230F980 @@ -741,7 +741,7 @@ ov29_0230F9A4: ; 0x0230F9A4 TrySpawnEnemyItemDrop: ; 0x0230F9D8 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 - ldr r2, _0230FB28 ; =0x02353538 + ldr r2, _0230FB28 ; =ov29_02353538 mov r6, r0 ldr r0, [r2] mov r5, r1 @@ -810,7 +810,7 @@ _0230FAC4: bl ExclusiveItemEffectIsActive__0230F8AC cmp r0, #0 beq _0230FB20 - ldr r0, _0230FB2C ; =0x022C4650 + ldr r0, _0230FB2C ; =ov10_022C4650 ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -828,14 +828,14 @@ _0230FB20: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0230FB28: .word 0x02353538 -_0230FB2C: .word 0x022C4650 +_0230FB28: .word ov29_02353538 +_0230FB2C: .word ov10_022C4650 arm_func_end TrySpawnEnemyItemDrop arm_func_start ov29_0230FB30 ov29_0230FB30: ; 0x0230FB30 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _0230FB88 ; =0x023529A8 + ldr r1, _0230FB88 ; =ov29_023529A8 mov r5, r0 ldrh r2, [r1] add r0, sp, #0 @@ -857,7 +857,7 @@ ov29_0230FB30: ; 0x0230FB30 bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0230FB88: .word 0x023529A8 +_0230FB88: .word ov29_023529A8 _0230FB8C: .word 0x00000F62 arm_func_end ov29_0230FB30 @@ -890,7 +890,7 @@ _0230FBB8: mov r0, #0x64 bl DungeonRandInt ldrb r2, [r4, #0x107] - ldr r1, _0230FC20 ; =0x022C4BE4 + ldr r1, _0230FC20 ; =ov10_022C4BE4 mov r2, r2, lsl #1 ldrsh r1, [r1, r2] cmp r0, r1 @@ -901,7 +901,7 @@ _0230FBB8: strb r0, [r4, #0x107] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0230FC20: .word 0x022C4BE4 +_0230FC20: .word ov10_022C4BE4 arm_func_end TickNoSlipCap arm_func_start ov29_0230FC24 @@ -939,7 +939,7 @@ ov29_0230FC24: ; 0x0230FC24 mov r0, #0x64 bl DungeonRandInt ldrb r2, [r4, #0x17c] - ldr r1, _02310A6C ; =0x022C4BBC + ldr r1, _02310A6C ; =ov10_022C4BBC mov r2, r2, lsl #1 ldrsh r1, [r1, r2] cmp r0, r1 @@ -1020,7 +1020,7 @@ _0230FD0C: ldr r3, _02310A70 ; =0x0000199A cmp r7, #0x13 mov r6, #0 - ldr r2, _02310A74 ; =0x022C4FC4 + ldr r2, _02310A74 ; =ov10_022C4FC4 movgt r7, #0x13 add r0, sp, #0x2c add r1, sp, #0x24 @@ -1030,7 +1030,7 @@ _0230FD0C: bl MultiplyFixedPoint64 ldrb r2, [r4, #0x15d] cmp r2, #1 - ldrhi r0, _02310A78 ; =0x022C4A5C + ldrhi r0, _02310A78 ; =ov10_022C4A5C ldrhi r1, [sp, #0x30] ldrhi r0, [r0, r2, lsl #2] addhi r0, r1, r0, lsl #16 @@ -1174,13 +1174,13 @@ _0230FFE8: bl IsFloorOver cmp r0, #0 bne _02310FF4 - ldr r0, _02310A84 ; =0x02353538 + ldr r0, _02310A84 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x799] cmp r0, #0xa addlo r0, r0, #1 strlob r0, [r1, #0x799] - ldr r0, _02310A84 ; =0x02353538 + ldr r0, _02310A84 ; =ov29_02353538 mov r1, r5 ldr r0, [r0] ldrb r0, [r0, #0x799] @@ -1213,7 +1213,7 @@ _0230FFE8: movne r6, #0 b _023100E8 _023100D8: - ldr r0, _02310A84 ; =0x02353538 + ldr r0, _02310A84 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] strb r1, [r0, #0x799] @@ -1222,7 +1222,7 @@ _023100E8: beq _0231013C cmp r7, #0 beq _02310124 - ldr r0, _02310A84 ; =0x02353538 + ldr r0, _02310A84 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #8] cmp r0, #0 @@ -1248,7 +1248,7 @@ _0231013C: bl IsFloorOver cmp r0, #0 bne _02310FF4 - ldr r0, _02310A84 ; =0x02353538 + ldr r0, _02310A84 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xc000 ldrb r0, [r0, #0xd5a] @@ -1282,7 +1282,7 @@ _0231013C: bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 bne _02310360 - ldr r0, _02310A9C ; =0x022C46EC + ldr r0, _02310A9C ; =ov10_022C46EC ldr r3, _02310AA0 ; =0x0000025F ldrsh r1, [r0] mov r0, r5 @@ -1322,7 +1322,7 @@ _023101FC: bl ExclusiveItemEffectIsActiveWithLogging cmp r0, #0 bne _02310360 - ldr r0, _02310A9C ; =0x022C46EC + ldr r0, _02310A9C ; =ov10_022C46EC ldr r3, _02310AA0 ; =0x0000025F ldrsh r1, [r0] mov r0, r5 @@ -1350,7 +1350,7 @@ _02310298: mov r0, #2 mov r1, #0x5a bl ov29_0234B084 - ldr r0, _02310A9C ; =0x022C46EC + ldr r0, _02310A9C ; =ov10_022C46EC mov r2, #0x19 ldrsh r1, [r0] mov r0, r5 @@ -1375,7 +1375,7 @@ _02310304: mov r0, #2 mov r1, #0x55 bl ov29_0234B084 - ldr r0, _02310A9C ; =0x022C46EC + ldr r0, _02310A9C ; =ov10_022C46EC ldr r3, _02310AA0 ; =0x0000025F ldrsh r1, [r0] mov r0, r5 @@ -1398,7 +1398,7 @@ _0231037C: bl AbilityIsActiveVeneer cmp r0, #0 beq _023103F8 - ldr r0, _02310AA4 ; =0x022C46A0 + ldr r0, _02310AA4 ; =ov10_022C46A0 ldrsh r0, [r0] cmp r6, r0 bge _023103F8 @@ -1460,7 +1460,7 @@ _02310474: cmp r0, #0 beq _023104C0 ldrb r1, [r4, #0x11f] - ldr r0, _02310AA8 ; =0x022C466C + ldr r0, _02310AA8 ; =ov10_022C466C add r2, r1, #1 ldrsh r0, [r0] and r1, r2, #0xff @@ -1508,13 +1508,13 @@ _023104F8: bl IsFloorOver cmp r0, #0 bne _02310FF4 - ldr r1, _02310AAC ; =0x022C4610 + ldr r1, _02310AAC ; =ov10_022C4610 mov r0, r5 ldrsh r2, [r1] mov r1, r5 strb r2, [r4, #0xc1] bl ov29_02307BDC - ldr r0, _02310AB0 ; =0x022C44D4 + ldr r0, _02310AB0 ; =ov10_022C44D4 mov r2, #1 ldrsh r1, [r0] mov r0, r5 @@ -1584,7 +1584,7 @@ _02310614: bl ExclusiveItemEffectIsActive__02311064 cmp r0, #0 beq _0231067C - ldr r0, _02310AB8 ; =0x022C4664 + ldr r0, _02310AB8 ; =ov10_022C4664 mov r3, #0 ldrsh r2, [r0] mov r0, r5 @@ -1609,7 +1609,7 @@ _023106A4: cmp r0, #0 beq _02310754 mov sl, #0 - ldr r6, _02310A84 ; =0x02353538 + ldr r6, _02310A84 ; =ov29_02353538 mov sb, sl mov r7, #1 _023106C8: @@ -1641,7 +1641,7 @@ _02310718: blt _023106C8 cmp sl, #0 beq _02310754 - ldr r0, _02310ABC ; =0x022C464C + ldr r0, _02310ABC ; =ov10_022C464C mov r6, #1 ldrsh r2, [r0] mov r0, r5 @@ -1671,7 +1671,7 @@ _02310754: ldreqb r0, [r4, #0xbf] cmpeq r0, #2 bne _02310FF4 - ldr r1, _02310AC0 ; =0x022C46A8 + ldr r1, _02310AC0 ; =ov10_022C46A8 mov r0, r5 ldrsh r2, [r1] mov r1, r5 @@ -1682,7 +1682,7 @@ _02310754: bl AbilityIsActiveVeneer cmp r0, #0 beq _023107F8 - ldr r0, _02310AC4 ; =0x022C44D8 + ldr r0, _02310AC4 ; =ov10_022C44D8 mov r6, #1 ldrsh r2, [r0] mov r0, r5 @@ -1692,7 +1692,7 @@ _02310754: bl TryIncreaseHp b _02310810 _023107F8: - ldr r0, _02310AC4 ; =0x022C44D8 + ldr r0, _02310AC4 ; =ov10_022C44D8 mov r2, #3 ldrsh r1, [r0] mov r0, r5 @@ -1721,7 +1721,7 @@ _02310830: cmp r6, #0x1d addlo r0, r6, #1 strlob r0, [r4, #0xc2] - ldr r0, _02310AC8 ; =0x022C4414 + ldr r0, _02310AC8 ; =ov10_022C4414 cmp r6, #0x1d ldrsh r0, [r0] movge r6, #0x1d @@ -1747,7 +1747,7 @@ _02310830: bl AbilityIsActiveVeneer cmp r0, #0 beq _023108F4 - ldr r0, _02310ACC ; =0x022C4C9C + ldr r0, _02310ACC ; =ov10_022C4C9C mov r1, r6, lsl #1 ldrsh r2, [r0, r1] mov r6, #1 @@ -1758,7 +1758,7 @@ _02310830: bl TryIncreaseHp b _02310910 _023108F4: - ldr r0, _02310ACC ; =0x022C4C9C + ldr r0, _02310ACC ; =ov10_022C4C9C mov r1, r6, lsl #1 ldrsh r1, [r0, r1] mov r2, #3 @@ -1793,7 +1793,7 @@ _0231092C: bl IsFloorOver cmp r0, #0 bne _02310FF4 - ldr r1, _02310AD0 ; =0x022C4454 + ldr r1, _02310AD0 ; =ov10_022C4454 mov r0, r5 ldrsh r2, [r1] mov r1, r5 @@ -1802,7 +1802,7 @@ _0231092C: ldr r1, [r4, #0xc8] mov r0, r5 bl ov29_022E42E8 - ldr r1, _02310AD4 ; =0x022C446C + ldr r1, _02310AD4 ; =ov10_022C446C mov r0, r5 ldrsh r1, [r1] mov r2, #2 @@ -1836,13 +1836,13 @@ _023109D4: bl IsFloorOver cmp r0, #0 bne _02310FF4 - ldr r1, _02310AD8 ; =0x022C45F0 + ldr r1, _02310AD8 ; =ov10_022C45F0 mov r0, r5 ldrsh r2, [r1] mov r1, r5 strb r2, [r4, #0xcd] bl ov29_02307BDC - ldr r0, _02310ADC ; =0x022C45D0 + ldr r0, _02310ADC ; =ov10_022C45D0 ldr r3, _02310AE0 ; =0x0000024A ldrsh r1, [r0] mov r0, r5 @@ -1858,41 +1858,41 @@ _02310A4C: beq _02310B6C b _02310FF4 .align 2, 0 -_02310A6C: .word 0x022C4BBC +_02310A6C: .word ov10_022C4BBC _02310A70: .word 0x0000199A -_02310A74: .word 0x022C4FC4 -_02310A78: .word 0x022C4A5C +_02310A74: .word ov10_022C4FC4 +_02310A78: .word ov10_022C4A5C _02310A7C: .word 0x00000DE6 _02310A80: .word 0x00000DE7 -_02310A84: .word 0x02353538 +_02310A84: .word ov29_02353538 _02310A88: .word 0x00000DE8 _02310A8C: .word 0x00000DE9 _02310A90: .word 0x00000DEA _02310A94: .word 0x00001303 _02310A98: .word 0x00000DBD -_02310A9C: .word 0x022C46EC +_02310A9C: .word ov10_022C46EC _02310AA0: .word 0x0000025F -_02310AA4: .word 0x022C46A0 -_02310AA8: .word 0x022C466C -_02310AAC: .word 0x022C4610 -_02310AB0: .word 0x022C44D4 +_02310AA4: .word ov10_022C46A0 +_02310AA8: .word ov10_022C466C +_02310AAC: .word ov10_022C4610 +_02310AB0: .word ov10_022C44D4 _02310AB4: .word 0x000003E7 -_02310AB8: .word 0x022C4664 -_02310ABC: .word 0x022C464C -_02310AC0: .word 0x022C46A8 -_02310AC4: .word 0x022C44D8 -_02310AC8: .word 0x022C4414 -_02310ACC: .word 0x022C4C9C -_02310AD0: .word 0x022C4454 -_02310AD4: .word 0x022C446C -_02310AD8: .word 0x022C45F0 -_02310ADC: .word 0x022C45D0 +_02310AB8: .word ov10_022C4664 +_02310ABC: .word ov10_022C464C +_02310AC0: .word ov10_022C46A8 +_02310AC4: .word ov10_022C44D8 +_02310AC8: .word ov10_022C4414 +_02310ACC: .word ov10_022C4C9C +_02310AD0: .word ov10_022C4454 +_02310AD4: .word ov10_022C446C +_02310AD8: .word ov10_022C45F0 +_02310ADC: .word ov10_022C45D0 _02310AE0: .word 0x0000024A -_02310AE4: .word 0x022C45E8 -_02310AE8: .word 0x022C4590 -_02310AEC: .word 0x022C44BC -_02310AF0: .word 0x022C46AC -_02310AF4: .word 0x022C4588 +_02310AE4: .word ov10_022C45E8 +_02310AE8: .word ov10_022C4590 +_02310AEC: .word ov10_022C44BC +_02310AF0: .word ov10_022C46AC +_02310AF4: .word ov10_022C4588 _02310AF8: cmp r0, #5 bne _02310B6C @@ -1912,8 +1912,8 @@ _02310AF8: bl IsFloorOver cmp r0, #0 bne _02310FF4 - ldr r1, _02310AE4 ; =0x022C45E8 - ldr r0, _02310AE8 ; =0x022C4590 + ldr r1, _02310AE4 ; =ov10_022C45E8 + ldr r0, _02310AE8 ; =ov10_022C4590 ldrsh r3, [r1] ldrsh r2, [r0] mov r0, r5 @@ -1942,7 +1942,7 @@ _02310B6C: movgt r1, r0 mov r0, r1, asr #1 add r0, r1, r0, lsr #30 - ldr r1, _02310AEC ; =0x022C44BC + ldr r1, _02310AEC ; =ov10_022C44BC movs r6, r0, asr #2 ldrsh r1, [r1] mov r0, #0 @@ -1991,15 +1991,15 @@ _02310C28: ldrb r0, [r4, #0xea] cmp r0, #0 bne _02310DC4 - ldr r0, _02310A84 ; =0x02353538 + ldr r0, _02310A84 ; =ov29_02353538 ldrb r2, [r4, #0xe8] ldr r0, [r0] - ldr r1, _02310AF0 ; =0x022C46AC + ldr r1, _02310AF0 ; =ov10_022C46AC add r0, r0, r2, lsl #2 add r0, r0, #0x12000 ldr r7, [r0, #0xb78] ldrsh r1, [r1] - ldr r0, _02310AF4 ; =0x022C4588 + ldr r0, _02310AF4 ; =ov10_022C4588 cmp r7, #0 ldrsh r6, [r0] strb r1, [r4, #0xea] diff --git a/asm/overlay_29_023118D8.s b/asm/overlay_29_023118D8.s index eceb41a4..4be0bad7 100644 --- a/asm/overlay_29_023118D8.s +++ b/asm/overlay_29_023118D8.s @@ -904,7 +904,7 @@ _02312504: cmp r5, #0 bne _023125E8 mov r5, #0 - ldr fp, _02312610 ; =0x0235171C + ldr fp, _02312610 ; =DIRECTIONS_XY mov r4, r5 _02312534: mov r1, r4, lsl #2 @@ -966,7 +966,7 @@ _02312600: .word 0x00000DB9 _02312604: .word 0x022C4874 _02312608: .word 0x00000D1C _0231260C: .word 0x00000D1D -_02312610: .word 0x0235171C +_02312610: .word DIRECTIONS_XY _02312614: .word 0x00000DC5 arm_func_end TryInflictBurnStatus @@ -1134,7 +1134,7 @@ _02312840: cmp r4, #0 bne _02312914 mov r5, #0 - ldr fp, _02312934 ; =0x0235171C + ldr fp, _02312934 ; =DIRECTIONS_XY mov r4, r5 _02312868: mov r1, r4, lsl #2 @@ -1192,7 +1192,7 @@ _02312924: .word 0x00000DAD _02312928: .word 0x00000DAE _0231292C: .word 0x022C4878 _02312930: .word 0x00000D1E -_02312934: .word 0x0235171C +_02312934: .word DIRECTIONS_XY _02312938: .word 0x00000DC5 arm_func_end TryInflictPoisonedStatus @@ -1327,7 +1327,7 @@ _02312AFC: cmp r4, #0 bne _02312BD0 mov r5, #0 - ldr fp, _02312BF0 ; =0x0235171C + ldr fp, _02312BF0 ; =DIRECTIONS_XY mov r4, r5 _02312B24: mov r1, r4, lsl #2 @@ -1385,7 +1385,7 @@ _02312BE0: .word 0x00000DAD _02312BE4: .word 0x00000DAE _02312BE8: .word 0x022C4880 _02312BEC: .word 0x00000D1F -_02312BF0: .word 0x0235171C +_02312BF0: .word DIRECTIONS_XY _02312BF4: .word 0x00000DC5 arm_func_end TryInflictBadlyPoisonedStatus @@ -3321,7 +3321,7 @@ _023146F0: cmp r4, #0 bne _023147C4 mov r5, #0 - ldr fp, _023147E4 ; =0x0235171C + ldr fp, _023147E4 ; =DIRECTIONS_XY mov r4, r5 _02314718: mov r1, r4, lsl #2 @@ -3380,7 +3380,7 @@ _023147D0: _023147D8: .word 0x00000DA1 _023147DC: .word 0x022C4894 _023147E0: .word 0x00000D01 -_023147E4: .word 0x0235171C +_023147E4: .word DIRECTIONS_XY _023147E8: .word 0x00000DC5 arm_func_end TryInflictParalysisStatus diff --git a/asm/overlay_29_02318D58.s b/asm/overlay_29_02318D58.s index c7466b1a..102b868e 100644 --- a/asm/overlay_29_02318D58.s +++ b/asm/overlay_29_02318D58.s @@ -54,7 +54,7 @@ _02318DEC: cmpne r0, #0xa cmpne r0, #0xf beq _02318E20 - ldr r1, _02318E44 ; =0x022C4750 + ldr r1, _02318E44 ; =ov10_022C4750 mov r0, r6 mov r2, #0 bl CalcStatusDuration @@ -71,6 +71,6 @@ _02318E20: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02318E40: .word 0x00000CF3 -_02318E44: .word 0x022C4750 +_02318E44: .word ov10_022C4750 _02318E48: .word 0x00000CF2 arm_func_end ov29_02318D98 diff --git a/asm/overlay_29_02318E70.s b/asm/overlay_29_02318E70.s index 39085ebb..f71ca998 100644 --- a/asm/overlay_29_02318E70.s +++ b/asm/overlay_29_02318E70.s @@ -20,7 +20,7 @@ TryInflictSafeguardStatus: ; 0x02318E70 ldrb r0, [r4, #0xd5] cmp r0, #2 beq _02318EE8 - ldr r1, _02318F04 ; =0x022C4734 + ldr r1, _02318F04 ; =ov10_022C4734 mov r3, #2 mov r0, r5 mov r2, #0 @@ -45,7 +45,7 @@ _02318EF8: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02318F04: .word 0x022C4734 +_02318F04: .word ov10_022C4734 _02318F08: .word 0x00000CEE _02318F0C: .word 0x00000CEF arm_func_end TryInflictSafeguardStatus @@ -67,7 +67,7 @@ TryInflictMistStatus: ; 0x02318F10 ldrb r0, [r4, #0xd5] cmp r0, #0xe beq _02318F88 - ldr r1, _02318FA4 ; =0x022C4738 + ldr r1, _02318FA4 ; =ov10_022C4738 mov r3, #0xe mov r0, r5 mov r2, #0 @@ -92,7 +92,7 @@ _02318F98: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02318FA4: .word 0x022C4738 +_02318FA4: .word ov10_022C4738 _02318FA8: .word 0x00000CF1 arm_func_end TryInflictMistStatus @@ -113,7 +113,7 @@ TryInflictWishStatus: ; 0x02318FAC ldrb r0, [r4, #0xd5] cmp r0, #6 beq _02319024 - ldr r1, _02319040 ; =0x022C4794 + ldr r1, _02319040 ; =ov10_022C4794 mov r3, #6 mov r0, r5 mov r2, #0 @@ -138,7 +138,7 @@ _02319034: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02319040: .word 0x022C4794 +_02319040: .word ov10_022C4794 _02319044: .word 0x00000CDE _02319048: .word 0x00000CDF arm_func_end TryInflictWishStatus @@ -160,7 +160,7 @@ TryInflictMagicCoatStatus: ; 0x0231904C ldrb r0, [r4, #0xd5] cmp r0, #5 beq _023190C4 - ldr r1, _023190E0 ; =0x022C4740 + ldr r1, _023190E0 ; =ov10_022C4740 mov r3, #5 mov r0, r5 mov r2, #0 @@ -185,7 +185,7 @@ _023190D4: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023190E0: .word 0x022C4740 +_023190E0: .word ov10_022C4740 _023190E4: .word 0x00000CE7 _023190E8: .word 0x00000CE8 arm_func_end TryInflictMagicCoatStatus @@ -207,7 +207,7 @@ TryInflictLightScreenStatus: ; 0x023190EC ldrb r0, [r4, #0xd5] cmp r0, #3 beq _02319164 - ldr r1, _02319180 ; =0x022C4730 + ldr r1, _02319180 ; =ov10_022C4730 mov r3, #3 mov r0, r5 mov r2, #0 @@ -232,7 +232,7 @@ _02319174: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02319180: .word 0x022C4730 +_02319180: .word ov10_022C4730 _02319184: .word 0x00000CF4 _02319188: .word 0x00000CF5 arm_func_end TryInflictLightScreenStatus @@ -254,7 +254,7 @@ TryInflictReflectStatus: ; 0x0231918C ldrb r0, [r4, #0xd5] cmp r0, #1 beq _02319204 - ldr r1, _02319220 ; =0x022C472C + ldr r1, _02319220 ; =ov10_022C472C mov r3, #1 mov r0, r5 mov r2, #0 @@ -279,7 +279,7 @@ _02319214: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02319220: .word 0x022C472C +_02319220: .word ov10_022C472C _02319224: .word 0x00000CF6 _02319228: .word 0x00000CF7 arm_func_end TryInflictReflectStatus @@ -299,7 +299,7 @@ TryInflictProtectStatus: ; 0x0231922C ldrb r0, [r4, #0xd5] cmp r0, #7 beq _023192A4 - ldr r1, _023192D0 ; =0x022C47B8 + ldr r1, _023192D0 ; =ov10_022C47B8 mov r3, #7 mov r0, r5 mov r2, #0 @@ -330,7 +330,7 @@ _023192C4: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023192D0: .word 0x022C47B8 +_023192D0: .word ov10_022C47B8 _023192D4: .word 0x00000D47 _023192D8: .word 0x00000D48 arm_func_end TryInflictProtectStatus @@ -352,7 +352,7 @@ TryInflictMirrorCoatStatus: ; 0x023192DC ldrb r0, [r4, #0xd5] cmp r0, #8 beq _02319354 - ldr r1, _02319370 ; =0x022C47CC + ldr r1, _02319370 ; =ov10_022C47CC mov r3, #8 mov r0, r5 mov r2, #0 @@ -377,7 +377,7 @@ _02319364: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02319370: .word 0x022C47CC +_02319370: .word ov10_022C47CC _02319374: .word 0x00000D4F arm_func_end TryInflictMirrorCoatStatus @@ -398,7 +398,7 @@ TryInflictEndureStatus: ; 0x02319378 ldrb r0, [r4, #0xd5] cmp r0, #9 beq _023193F0 - ldr r1, _0231940C ; =0x022C47F4 + ldr r1, _0231940C ; =ov10_022C47F4 mov r3, #9 mov r0, r5 mov r2, #0 @@ -423,7 +423,7 @@ _02319400: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0231940C: .word 0x022C47F4 +_0231940C: .word ov10_022C47F4 _02319410: .word 0x00000D58 _02319414: .word 0x00000D59 arm_func_end TryInflictEndureStatus @@ -445,7 +445,7 @@ TryInflictMirrorMoveStatus: ; 0x02319418 ldrb r0, [r4, #0xd5] cmp r0, #0xb beq _02319490 - ldr r1, _023194AC ; =0x022C4840 + ldr r1, _023194AC ; =ov10_022C4840 mov r3, #0xb mov r0, r5 mov r2, #0 @@ -470,7 +470,7 @@ _023194A0: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023194AC: .word 0x022C4840 +_023194AC: .word ov10_022C4840 _023194B0: .word 0x00000D5A _023194B4: .word 0x00000D5B arm_func_end TryInflictMirrorMoveStatus @@ -503,7 +503,7 @@ _02319500: ldrb r0, [r4, #0xd5] cmp r0, #0xc beq _02319558 - ldr r1, _02319578 ; =0x022C4854 + ldr r1, _02319578 ; =ov10_022C4854 mov r3, #0xc mov r0, r5 mov r2, #0 @@ -529,7 +529,7 @@ _02319568: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02319574: .word 0x00000DC4 -_02319578: .word 0x022C4854 +_02319578: .word ov10_022C4854 _0231957C: .word 0x00000D5C _02319580: .word 0x00000D5D arm_func_end TryInflictConversion2Status @@ -551,7 +551,7 @@ TryInflictVitalThrowStatus: ; 0x02319584 ldrb r0, [r4, #0xd5] cmp r0, #0xd beq _023195FC - ldr r1, _02319618 ; =0x022C485C + ldr r1, _02319618 ; =ov10_022C485C mov r3, #0xd mov r0, r5 mov r2, #0 @@ -576,7 +576,7 @@ _0231960C: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02319618: .word 0x022C485C +_02319618: .word ov10_022C485C _0231961C: .word 0x00000D5E _02319620: .word 0x00000D5F arm_func_end TryInflictVitalThrowStatus @@ -681,7 +681,7 @@ MirrorMoveIsActive: ; 0x02319748 bl ExclusiveItemEffectIsActive__023197A8 cmp r0, #0 beq _0231979C - ldr r0, _023197A4 ; =0x022C4648 + ldr r0, _023197A4 ; =ov10_022C4648 ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -691,7 +691,7 @@ _0231979C: mov r0, #0 ldmia sp!, {r4, pc} .align 2, 0 -_023197A4: .word 0x022C4648 +_023197A4: .word ov10_022C4648 arm_func_end MirrorMoveIsActive arm_func_start ExclusiveItemEffectIsActive__023197A8 @@ -756,7 +756,7 @@ _02319854: arm_func_start ov29_0231985C ov29_0231985C: ; 0x0231985C mov r2, #0 - ldr r0, _0231987C ; =0x0237CA18 + ldr r0, _0231987C ; =ov29_0237CA18 mov r1, r2 _02319868: strb r1, [r0, r2] @@ -765,7 +765,7 @@ _02319868: blt _02319868 bx lr .align 2, 0 -_0231987C: .word 0x0237CA18 +_0231987C: .word ov29_0237CA18 arm_func_end ov29_0231985C arm_func_start AiConsiderMove @@ -838,13 +838,13 @@ _02319958: cmp r0, #0 beq _023199C0 ldrb r6, [r6, #0x4c] - ldr r4, _02319F70 ; =0x0237CA18 + ldr r4, _02319F70 ; =ov29_0237CA18 ldrb r0, [r4, r6] cmp r0, #0 bne _02319E88 - ldr r1, _02319F74 ; =0x0237CA20 + ldr r1, _02319F74 ; =ov29_0237CA20 mov r3, #1 - ldr r0, _02319F78 ; =0x0237CA28 + ldr r0, _02319F78 ; =ov29_0237CA28 mov r2, #0x63 strb r3, [r4, r6] strb r6, [r1] @@ -854,7 +854,7 @@ _02319958: add r5, r5, #1 b _02319E88 _023199C0: - ldr fp, _02319F7C ; =0x0235171C + ldr fp, _02319F7C ; =DIRECTIONS_XY mov r8, #0 _023199C8: mov r1, r8, lsl #2 @@ -897,7 +897,7 @@ _02319A44: _02319A54: cmp r7, #0x30 bne _02319AC8 - ldr r7, _02319F80 ; =0x02353538 + ldr r7, _02319F80 ; =ov29_02353538 mov r6, #0 _02319A64: ldr r0, [r7] @@ -931,11 +931,11 @@ _02319AC8: bne _02319BB0 mov r8, #0 _02319AD4: - ldr r0, _02319F7C ; =0x0235171C + ldr r0, _02319F7C ; =DIRECTIONS_XY mov r2, r8, lsl #2 add r0, r0, r8, lsl #2 ldrsh r6, [r0, #2] - ldr r0, _02319F7C ; =0x0235171C + ldr r0, _02319F7C ; =DIRECTIONS_XY ldrsh r1, [sl, #6] ldrsh r7, [r0, r2] ldrsh r0, [sl, #4] @@ -1006,7 +1006,7 @@ _02319BB0: mvn r0, #0 str r0, [sp, #0x28] _02319BF0: - ldr r0, _02319F80 ; =0x02353538 + ldr r0, _02319F80 ; =ov29_02353538 ldr r1, [r0] ldr r0, [sp, #0x20] add r0, r1, r0, lsl #2 @@ -1022,7 +1022,7 @@ _02319BF0: add r0, sl, #4 add r1, r1, #4 bl GetDirectionTowardsPosition - ldr r1, _02319F70 ; =0x0237CA18 + ldr r1, _02319F70 ; =ov29_0237CA18 str r0, [sp, #0x1c] ldrb r0, [r1, r0] cmp r0, #0 @@ -1118,12 +1118,12 @@ _02319D50: bl IsTargetInRange cmp r0, #0 beq _02319DE8 - ldr r1, _02319F70 ; =0x0237CA18 + ldr r1, _02319F70 ; =ov29_0237CA18 ldr r0, [sp, #0x1c] mov r2, #1 strb r2, [r1, r0] mov r1, r0 - ldr r0, _02319F74 ; =0x0237CA20 + ldr r0, _02319F74 ; =ov29_0237CA20 strb r1, [r0, r5] mov r0, sl mov r1, sb @@ -1133,10 +1133,10 @@ _02319D50: ldr r2, [sp, #0x18] mov r0, sl bl ov29_0231A364 - ldr r1, _02319F84 ; =0x0237CA28 + ldr r1, _02319F84 ; =ov29_0237CA28 str r0, [r1, r5, lsl #2] ldr r1, [sp, #0x18] - ldr r0, _02319F88 ; =0x0237CA48 + ldr r0, _02319F88 ; =ov29_0237CA48 str r1, [r0, r5, lsl #2] add r5, r5, #1 _02319DE8: @@ -1149,7 +1149,7 @@ _02319DE8: _02319E00: cmp r7, #0x60 bne _02319E60 - ldr r7, _02319F80 ; =0x02353538 + ldr r7, _02319F80 ; =ov29_02353538 mov r6, #0 _02319E10: ldr r0, [r7] @@ -1193,7 +1193,7 @@ _02319E88: mov r0, #0 str r0, [sp, #0x14] mov r4, r0 - ldr r3, _02319F84 ; =0x0237CA28 + ldr r3, _02319F84 ; =ov29_0237CA28 b _02319EC4 _02319EB0: ldr r2, [r3, r4, lsl #2] @@ -1206,7 +1206,7 @@ _02319EC4: blt _02319EB0 mov r6, #0 mov r2, r6 - ldr r4, _02319F84 ; =0x0237CA28 + ldr r4, _02319F84 ; =ov29_0237CA28 b _02319EF0 _02319EDC: ldr r3, [r4, r6, lsl #2] @@ -1218,7 +1218,7 @@ _02319EF0: cmp r6, r5 blt _02319EDC mov r3, #0 - ldr r2, _02319F84 ; =0x0237CA28 + ldr r2, _02319F84 ; =ov29_0237CA28 b _02319F10 _02319F04: ldr r1, [r2, r3, lsl #2] @@ -1229,7 +1229,7 @@ _02319F10: blt _02319F04 bl DungeonRandInt mov r3, #0 - ldr r2, _02319F84 ; =0x0237CA28 + ldr r2, _02319F84 ; =ov29_0237CA28 b _02319F38 _02319F28: ldr r1, [r2, r3, lsl #2] @@ -1240,7 +1240,7 @@ _02319F38: cmp r3, r5 blt _02319F28 _02319F40: - ldr r1, _02319F74 ; =0x0237CA20 + ldr r1, _02319F74 ; =ov29_0237CA20 ldr r0, [sp, #8] mov r2, #1 strb r2, [r0] @@ -1255,11 +1255,11 @@ _02319F64: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02319F6C: .word 0x00000273 -_02319F70: .word 0x0237CA18 -_02319F74: .word 0x0237CA20 -_02319F78: .word 0x0237CA28 -_02319F7C: .word 0x0235171C -_02319F80: .word 0x02353538 -_02319F84: .word 0x0237CA28 -_02319F88: .word 0x0237CA48 +_02319F70: .word ov29_0237CA18 +_02319F74: .word ov29_0237CA20 +_02319F78: .word ov29_0237CA28 +_02319F7C: .word DIRECTIONS_XY +_02319F80: .word ov29_02353538 +_02319F84: .word ov29_0237CA28 +_02319F88: .word ov29_0237CA48 arm_func_end AiConsiderMove diff --git a/asm/overlay_29_02319FB0.s b/asm/overlay_29_02319FB0.s index 59a00ff8..0ac4b77a 100644 --- a/asm/overlay_29_02319FB0.s +++ b/asm/overlay_29_02319FB0.s @@ -30,7 +30,7 @@ TryAddTargetToAiTargetList: ; 0x02319FB0 bl GetDirectionTowardsPosition mov r5, r0 _0231A010: - ldr r4, _0231A094 ; =0x0237CA18 + ldr r4, _0231A094 ; =ov29_0237CA18 ldrb r0, [r4, r5] cmp r0, #0 movne r0, sb @@ -44,7 +44,7 @@ _0231A010: bl IsAiTargetEligible cmp r0, #0 beq _0231A08C - ldr r2, _0231A098 ; =0x0237CA20 + ldr r2, _0231A098 ; =ov29_0237CA20 mov r3, #1 ldr r1, [sp, #0x20] mov r0, r7 @@ -56,8 +56,8 @@ _0231A010: mov r1, r8 mov r2, r6 bl ov29_0231A364 - ldr r2, _0231A09C ; =0x0237CA28 - ldr r1, _0231A0A0 ; =0x0237CA48 + ldr r2, _0231A09C ; =ov29_0237CA28 + ldr r1, _0231A0A0 ; =ov29_0237CA48 str r0, [r2, sb, lsl #2] str r6, [r1, sb, lsl #2] add sb, sb, #1 @@ -65,10 +65,10 @@ _0231A08C: mov r0, sb ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0231A094: .word 0x0237CA18 -_0231A098: .word 0x0237CA20 -_0231A09C: .word 0x0237CA28 -_0231A0A0: .word 0x0237CA48 +_0231A094: .word ov29_0237CA18 +_0231A098: .word ov29_0237CA20 +_0231A09C: .word ov29_0237CA28 +_0231A0A0: .word ov29_0237CA48 arm_func_end TryAddTargetToAiTargetList arm_func_start IsAiTargetEligible @@ -303,7 +303,7 @@ _0231A3A4: ldrsh r0, [r5, #2] mov r1, #0x258 bl __divsi3 - ldr r0, _0231A45C ; =0x02353538 + ldr r0, _0231A45C ; =ov29_02353538 ldr r0, [r0] add r0, r0, r1 add r0, r0, #0x3000 @@ -335,7 +335,7 @@ _0231A454: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0231A45C: .word 0x02353538 +_0231A45C: .word ov29_02353538 arm_func_end ov29_0231A364 arm_func_start ov29_0231A460 @@ -385,7 +385,7 @@ _0231A4E0: b _0231A5CC _0231A4FC: and r6, r6, #7 - ldr r1, _0231A690 ; =0x0235171C + ldr r1, _0231A690 ; =DIRECTIONS_XY mov r2, r6, lsl #2 ldrsh r3, [r1, r2] add r1, r1, r6, lsl #2 @@ -499,7 +499,7 @@ _0231A688: add sp, sp, #0x48 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0231A690: .word 0x0235171C +_0231A690: .word DIRECTIONS_XY arm_func_end ov29_0231A460 arm_func_start IsTargetInRange @@ -534,9 +534,9 @@ IsTargetInRange: ; 0x0231A694 and r0, r0, #0xff ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} _0231A708: - ldr r1, _0231A798 ; =0x0235171C + ldr r1, _0231A798 ; =DIRECTIONS_XY mov r2, r8, lsl #2 - ldr r0, _0231A79C ; =0x0235171E + ldr r0, _0231A79C ; =ov29_0235171E ldrsh r7, [sb, #4] ldrsh r8, [sb, #6] ldrsh sb, [r1, r2] @@ -574,8 +574,8 @@ _0231A790: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_0231A798: .word 0x0235171C -_0231A79C: .word 0x0235171E +_0231A798: .word DIRECTIONS_XY +_0231A79C: .word ov29_0235171E arm_func_end IsTargetInRange arm_func_start ShouldUsePp @@ -596,7 +596,7 @@ ShouldUsePp: ; 0x0231A7A0 movne r5, #1 cmp r5, #0 beq _0231A81C - ldr r0, _0231A870 ; =0x022C459C + ldr r0, _0231A870 ; =ov10_022C459C ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -616,7 +616,7 @@ _0231A81C: bne _0231A868 cmp r4, #0 beq _0231A868 - ldr r0, _0231A870 ; =0x022C459C + ldr r0, _0231A870 ; =ov10_022C459C ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -635,7 +635,7 @@ _0231A868: mov r0, r6 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0231A870: .word 0x022C459C +_0231A870: .word ov10_022C459C _0231A874: .word 0x00000DF5 _0231A878: .word 0x00000DF7 arm_func_end ShouldUsePp @@ -662,7 +662,7 @@ ov29_0231A8A0: ; 0x0231A8A0 bl IsMonster__0231A9D4 cmp r0, #0 beq _0231A910 - ldr r0, _0231A9CC ; =0x02353538 + ldr r0, _0231A9CC ; =ov29_02353538 ldr r4, [sb, #0xb4] ldr r0, [r0] add r0, r0, #0x4000 @@ -738,7 +738,7 @@ _0231A9C4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_0231A9CC: .word 0x02353538 +_0231A9CC: .word ov29_02353538 _0231A9D0: .word 0x00000DFD arm_func_end ov29_0231A8A0 @@ -794,7 +794,7 @@ _0231AA74: subs r1, r1, #1 strh r0, [r2], #2 bne _0231AA74 - ldr r0, _0231AC94 ; =0x02353538 + ldr r0, _0231AC94 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] @@ -939,7 +939,7 @@ _0231AC88: ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 _0231AC90: .word 0x00000DF8 -_0231AC94: .word 0x02353538 +_0231AC94: .word ov29_02353538 _0231AC98: .word 0x00000DF9 _0231AC9C: .word 0x00000DFA _0231ACA0: .word 0x00000DFB @@ -1103,7 +1103,7 @@ GetEntityNaturalGiftInfo: ; 0x0231AE90 cmpne r0, #0 beq _0231AF00 mov ip, #0 - ldr r3, _0231AF08 ; =0x022C5130 + ldr r3, _0231AF08 ; =ov10_022C5130 mov lr, ip mov r1, #6 _0231AEC0: @@ -1121,25 +1121,25 @@ _0231AEC0: b _0231AEC0 _0231AEF0: cmp ip, #0 - ldrne r0, _0231AF08 ; =0x022C5130 + ldrne r0, _0231AF08 ; =ov10_022C5130 addne r0, r0, r5 ldmneia sp!, {r3, r4, r5, pc} _0231AF00: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0231AF08: .word 0x022C5130 +_0231AF08: .word ov10_022C5130 arm_func_end GetEntityNaturalGiftInfo arm_func_start GetEntityWeatherBallType GetEntityWeatherBallType: ; 0x0231AF0C stmdb sp!, {r3, lr} bl GetApparentWeather - ldr r1, _0231AF20 ; =0x022C48DC + ldr r1, _0231AF20 ; =ov10_022C48DC ldrb r0, [r1, r0] ldmia sp!, {r3, pc} .align 2, 0 -_0231AF20: .word 0x022C48DC +_0231AF20: .word ov10_022C48DC arm_func_end GetEntityWeatherBallType arm_func_start ov29_0231AF24 @@ -1188,7 +1188,7 @@ _0231AFAC: ov29_0231AFB4: ; 0x0231AFB4 stmdb sp!, {r4, lr} mov ip, #0 - ldr r1, _0231B004 ; =0x02353538 + ldr r1, _0231B004 ; =ov29_02353538 mov r2, ip mov r3, ip _0231AFC8: @@ -1209,14 +1209,14 @@ _0231AFDC: blt _0231AFC8 ldmia sp!, {r4, pc} .align 2, 0 -_0231B004: .word 0x02353538 +_0231B004: .word ov29_02353538 arm_func_end ov29_0231AFB4 arm_func_start ov29_0231B008 ov29_0231B008: ; 0x0231B008 stmdb sp!, {r3, r4, r5, lr} mov lr, #0 - ldr r1, _0231B05C ; =0x02353538 + ldr r1, _0231B05C ; =ov29_02353538 mov r3, lr mov r2, #2 mov ip, lr @@ -1238,7 +1238,7 @@ _0231B034: blt _0231B020 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0231B05C: .word 0x02353538 +_0231B05C: .word ov29_02353538 arm_func_end ov29_0231B008 arm_func_start ActivateMotorDrive diff --git a/asm/overlay_29_0231B1B8.s b/asm/overlay_29_0231B1B8.s index 217d4f08..0c0c04a5 100644 --- a/asm/overlay_29_0231B1B8.s +++ b/asm/overlay_29_0231B1B8.s @@ -11,7 +11,7 @@ TryActivateBadDreams: ; 0x0231B1B8 ldr r0, [sl, #0xb4] mov r6, #0 ldrb r0, [r0, #6] - ldr r4, _0231B30C ; =0x02353538 + ldr r4, _0231B30C ; =ov29_02353538 mov r7, #0 cmp r0, #0 moveq r0, #1 @@ -51,7 +51,7 @@ _0231B240: mov r0, #2 mov r1, #0x69 bl ov29_0234B084 - ldr r0, _0231B310 ; =0x022C4530 + ldr r0, _0231B310 ; =ov10_022C4530 mov r8, #0 ldrsh r7, [r0] mov r4, #0x18 @@ -98,8 +98,8 @@ _0231B2FC: add sp, sp, #0x50 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0231B30C: .word 0x02353538 -_0231B310: .word 0x022C4530 +_0231B30C: .word ov29_02353538 +_0231B310: .word ov10_022C4530 _0231B314: .word 0x0000026E arm_func_end TryActivateBadDreams @@ -121,14 +121,14 @@ ActivateStench: ; 0x0231B33C stmdb sp!, {r4, lr} ldr r4, [r0, #0xb4] bl ov29_022E60E4 - ldr r0, _0231B360 ; =0x022C457C + ldr r0, _0231B360 ; =ov10_022C457C mov r1, #2 ldrsh r0, [r0] strb r1, [r4, #0x104] strb r0, [r4, #0x105] ldmia sp!, {r4, pc} .align 2, 0 -_0231B360: .word 0x022C457C +_0231B360: .word ov10_022C457C arm_func_end ActivateStench arm_func_start TryActivateSteadfast @@ -217,7 +217,7 @@ _0231B44C: arm_func_start ov29_0231B460 ov29_0231B460: ; 0x0231B460 stmdb sp!, {r3, lr} - ldr r0, _0231B48C ; =0x02353538 + ldr r0, _0231B48C ; =ov29_02353538 ldr r2, [r0] add r0, r2, #0x700 ldrsh r1, [r0, #0xa8] @@ -228,26 +228,26 @@ ov29_0231B460: ; 0x0231B460 bl ov29_0231B3CC ldmia sp!, {r3, pc} .align 2, 0 -_0231B48C: .word 0x02353538 +_0231B48C: .word ov29_02353538 arm_func_end ov29_0231B460 arm_func_start ov29_0231B490 ov29_0231B490: ; 0x0231B490 - ldr r0, _0231B4A8 ; =0x02353538 + ldr r0, _0231B4A8 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] add r0, r0, #0x3000 strb r1, [r0, #0xe3c] bx lr .align 2, 0 -_0231B4A8: .word 0x02353538 +_0231B4A8: .word ov29_02353538 arm_func_end ov29_0231B490 arm_func_start ov29_0231B4AC ov29_0231B4AC: ; 0x0231B4AC stmdb sp!, {r3, lr} cmp r0, #0 - ldreq r0, _0231B4E8 ; =0x02353538 + ldreq r0, _0231B4E8 ; =ov29_02353538 ldreq r0, [r0] addeq r0, r0, #0x3000 ldreqb r0, [r0, #0xe3c] @@ -255,13 +255,13 @@ ov29_0231B4AC: ; 0x0231B4AC cmp r0, #1 movne r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0231B4E8 ; =0x02353538 + ldr r0, _0231B4E8 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl IsSkyExclusiveDungeon ldmia sp!, {r3, pc} .align 2, 0 -_0231B4E8: .word 0x02353538 +_0231B4E8: .word ov29_02353538 arm_func_end ov29_0231B4AC arm_func_start ChangeShayminForme @@ -349,9 +349,9 @@ _0231B5F4: bl ov29_022E9FD0 ldr r0, _0231B684 ; =0x00000217 cmp r5, r0 - ldreq r0, _0231B688 ; =0x02353538 + ldreq r0, _0231B688 ; =ov29_02353538 moveq r1, #1 - ldrne r0, _0231B688 ; =0x02353538 + ldrne r0, _0231B688 ; =ov29_02353538 movne r1, #0 ldr r0, [r0] add r0, r0, #0x3000 @@ -375,7 +375,7 @@ _0231B678: .align 2, 0 _0231B680: .word 0x00000216 _0231B684: .word 0x00000217 -_0231B688: .word 0x02353538 +_0231B688: .word ov29_02353538 arm_func_end ChangeShayminForme arm_func_start ApplyItemEffect @@ -522,7 +522,7 @@ _0231B860: cmp sb, #0 beq _0231B8E4 add r1, sp, #0x21 - ldr r0, _0231C6D0 ; =0x022C4574 + ldr r0, _0231C6D0 ; =ov10_022C4574 str r1, [sp] mov r4, #0 ldrsh r2, [r0] @@ -572,7 +572,7 @@ _0231B94C: cmp sb, #0 beq _0231B994 add r1, sp, #0x20 - ldr r0, _0231C6D8 ; =0x022C4558 + ldr r0, _0231C6D8 ; =ov10_022C4558 str r1, [sp] mov r4, #0 ldrsh r2, [r0] @@ -912,7 +912,7 @@ _0231BE50: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x52 bl InitMove - ldr r0, _0231C704 ; =0x022C4624 + ldr r0, _0231C704 ; =ov10_022C4624 mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -927,7 +927,7 @@ _0231BE88: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x4a bl InitMove - ldr r0, _0231C708 ; =0x022C46E8 + ldr r0, _0231C708 ; =ov10_022C46E8 mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -942,7 +942,7 @@ _0231BEC0: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x42 bl InitMove - ldr r0, _0231C70C ; =0x022C46E4 + ldr r0, _0231C70C ; =ov10_022C46E4 mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -957,7 +957,7 @@ _0231BEF8: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x3a bl InitMove - ldr r0, _0231C710 ; =0x022C46E0 + ldr r0, _0231C710 ; =ov10_022C46E0 mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -972,7 +972,7 @@ _0231BF30: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x32 bl InitMove - ldr r0, _0231C714 ; =0x022C46DC + ldr r0, _0231C714 ; =ov10_022C46DC mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -987,7 +987,7 @@ _0231BF68: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x2a bl InitMove - ldr r0, _0231C718 ; =0x022C46D8 + ldr r0, _0231C718 ; =ov10_022C46D8 mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -1001,7 +1001,7 @@ _0231BF68: _0231BFA0: mov r4, #0 str r4, [sp] - ldr r0, _0231C71C ; =0x022C46B4 + ldr r0, _0231C71C ; =ov10_022C46B4 ldr r1, _0231C720 ; =0x0000024F str r4, [sp, #4] str r1, [sp, #8] @@ -1017,7 +1017,7 @@ _0231BFA0: _0231BFDC: mov r4, #0 str r4, [sp] - ldr r0, _0231C724 ; =0x022C46B8 + ldr r0, _0231C724 ; =ov10_022C46B8 ldr r1, _0231C720 ; =0x0000024F str r4, [sp, #4] str r1, [sp, #8] @@ -1034,7 +1034,7 @@ _0231C018: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x22 bl InitMove - ldr r0, _0231C728 ; =0x022C44D0 + ldr r0, _0231C728 ; =ov10_022C44D0 mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -1048,7 +1048,7 @@ _0231C018: _0231C050: mov r4, #0 str r4, [sp] - ldr r0, _0231C72C ; =0x022C46BC + ldr r0, _0231C72C ; =ov10_022C46BC ldr r1, _0231C720 ; =0x0000024F str r4, [sp, #4] str r1, [sp, #8] @@ -1069,8 +1069,8 @@ _0231C08C: bl EndNegativeStatusConditionWrapper b _0231CB14 _0231C0A4: - ldr r1, _0231C730 ; =0x022C45EC - ldr r0, _0231C734 ; =0x022C44F4 + ldr r1, _0231C730 ; =ov10_022C45EC + ldr r0, _0231C734 ; =ov10_022C44F4 ldrsh r2, [r1] ldrsh r3, [r0] mov r4, #1 @@ -1080,8 +1080,8 @@ _0231C0A4: bl TryIncreaseHp b _0231CB14 _0231C0CC: - ldr r1, _0231C738 ; =0x022C4478 - ldr r0, _0231C73C ; =0x022C45F4 + ldr r1, _0231C738 ; =ov10_022C4478 + ldr r0, _0231C73C ; =ov10_022C45F4 ldrsh r2, [r1] ldrsh r3, [r0] mov r4, #1 @@ -1091,7 +1091,7 @@ _0231C0CC: bl TryIncreaseHp b _0231CB14 _0231C0F4: - ldr r0, _0231C740 ; =0x022C44F8 + ldr r0, _0231C740 ; =ov10_022C44F8 mov r4, #1 ldrsh r3, [r0] mov r0, r8 @@ -1150,7 +1150,7 @@ _0231C1A4: bl TryWarp b _0231CB14 _0231C1BC: - ldr r1, _0231C744 ; =0x022C4720 + ldr r1, _0231C744 ; =ov10_022C4720 mov r0, r7 mov r2, #1 bl CalcStatusDuration @@ -1219,28 +1219,28 @@ _0231C28C: bl RestoreAllMovePP b _0231CB14 _0231C2A4: - ldr r1, _0231C750 ; =0x022C4420 + ldr r1, _0231C750 ; =ov10_022C4420 mov r0, r8 ldrsh r2, [r1] mov r1, r7 bl ApplyProteinEffect b _0231CB14 _0231C2BC: - ldr r1, _0231C754 ; =0x022C46CC + ldr r1, _0231C754 ; =ov10_022C46CC mov r0, r8 ldrsh r2, [r1] mov r1, r7 bl ApplyCalciumEffect b _0231CB14 _0231C2D4: - ldr r1, _0231C758 ; =0x022C46C8 + ldr r1, _0231C758 ; =ov10_022C46C8 mov r0, r8 ldrsh r2, [r1] mov r1, r7 bl ApplyIronEffect b _0231CB14 _0231C2EC: - ldr r1, _0231C75C ; =0x022C46C4 + ldr r1, _0231C75C ; =ov10_022C46C4 mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1322,7 +1322,7 @@ _0231C3F4: bl ApplyGrimyFoodEffect b _0231CB14 _0231C404: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1330,7 +1330,7 @@ _0231C404: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C420: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1338,7 +1338,7 @@ _0231C420: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C43C: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1346,7 +1346,7 @@ _0231C43C: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C458: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1354,7 +1354,7 @@ _0231C458: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C474: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1362,7 +1362,7 @@ _0231C474: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C490: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1370,7 +1370,7 @@ _0231C490: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C4AC: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1378,7 +1378,7 @@ _0231C4AC: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C4C8: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1386,7 +1386,7 @@ _0231C4C8: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C4E4: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1394,7 +1394,7 @@ _0231C4E4: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C500: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1402,7 +1402,7 @@ _0231C500: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C51C: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1410,7 +1410,7 @@ _0231C51C: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C538: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1418,7 +1418,7 @@ _0231C538: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C554: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1426,7 +1426,7 @@ _0231C554: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C570: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1434,7 +1434,7 @@ _0231C570: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C58C: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1442,7 +1442,7 @@ _0231C58C: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C5A8: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1450,7 +1450,7 @@ _0231C5A8: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C5C4: - ldr r1, _0231C760 ; =0x020A1888 + ldr r1, _0231C760 ; =GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1458,7 +1458,7 @@ _0231C5C4: bl ApplyGummiBoostsDungeonMode b _0231CB14 _0231C5E0: - ldr r1, _0231C764 ; =0x020A18B0 + ldr r1, _0231C764 ; =WONDER_GUMMI_STAT_BOOST mov r0, r8 ldrsh r3, [r1] mov r1, r7 @@ -1496,7 +1496,7 @@ _0231C65C: cmp sb, #0 beq _0231C6A4 add r1, sp, #0x1f - ldr r0, _0231C6D8 ; =0x022C4558 + ldr r0, _0231C6D8 ; =ov10_022C4558 str r1, [sp] mov r4, #0 ldrsh r2, [r0] @@ -1525,9 +1525,9 @@ _0231C6C0: .word 0x000001AB _0231C6C4: .word 0x00001317 _0231C6C8: .word 0x00000BE6 _0231C6CC: .word 0x00000BE7 -_0231C6D0: .word 0x022C4574 +_0231C6D0: .word ov10_022C4574 _0231C6D4: .word 0x00000256 -_0231C6D8: .word 0x022C4558 +_0231C6D8: .word ov10_022C4558 _0231C6DC: .word 0x00000BE8 _0231C6E0: .word 0x0000016B _0231C6E4: .word 0x00000192 @@ -1538,31 +1538,31 @@ _0231C6F4: .word 0x000001A2 _0231C6F8: .word 0x000001A6 _0231C6FC: .word 0x000001AA _0231C700: .word 0x00000195 -_0231C704: .word 0x022C4624 -_0231C708: .word 0x022C46E8 -_0231C70C: .word 0x022C46E4 -_0231C710: .word 0x022C46E0 -_0231C714: .word 0x022C46DC -_0231C718: .word 0x022C46D8 -_0231C71C: .word 0x022C46B4 +_0231C704: .word ov10_022C4624 +_0231C708: .word ov10_022C46E8 +_0231C70C: .word ov10_022C46E4 +_0231C710: .word ov10_022C46E0 +_0231C714: .word ov10_022C46DC +_0231C718: .word ov10_022C46D8 +_0231C71C: .word ov10_022C46B4 _0231C720: .word 0x0000024F -_0231C724: .word 0x022C46B8 -_0231C728: .word 0x022C44D0 -_0231C72C: .word 0x022C46BC -_0231C730: .word 0x022C45EC -_0231C734: .word 0x022C44F4 -_0231C738: .word 0x022C4478 -_0231C73C: .word 0x022C45F4 -_0231C740: .word 0x022C44F8 -_0231C744: .word 0x022C4720 +_0231C724: .word ov10_022C46B8 +_0231C728: .word ov10_022C44D0 +_0231C72C: .word ov10_022C46BC +_0231C730: .word ov10_022C45EC +_0231C734: .word ov10_022C44F4 +_0231C738: .word ov10_022C4478 +_0231C73C: .word ov10_022C45F4 +_0231C740: .word ov10_022C44F8 +_0231C744: .word ov10_022C4720 _0231C748: .word 0x00000BE9 _0231C74C: .word 0x000003E7 -_0231C750: .word 0x022C4420 -_0231C754: .word 0x022C46CC -_0231C758: .word 0x022C46C8 -_0231C75C: .word 0x022C46C4 -_0231C760: .word 0x020A1888 -_0231C764: .word 0x020A18B0 +_0231C750: .word ov10_022C4420 +_0231C754: .word ov10_022C46CC +_0231C758: .word ov10_022C46C8 +_0231C75C: .word ov10_022C46C4 +_0231C760: .word GUMMI_STAT_BOOST +_0231C764: .word WONDER_GUMMI_STAT_BOOST _0231C768: mov r0, r8 mov r1, r7 @@ -1591,7 +1591,7 @@ _0231C7B0: _0231C7C0: mov r4, #0 str r4, [sp] - ldr r0, _0231CBB0 ; =0x022C4438 + ldr r0, _0231CBB0 ; =ov10_022C4438 str r4, [sp, #4] mov r1, #0x270 str r1, [sp, #8] @@ -1630,7 +1630,7 @@ _0231C844: cmp sb, #0 beq _0231C88C add r1, sp, #0x1e - ldr r0, _0231C6D8 ; =0x022C4558 + ldr r0, _0231C6D8 ; =ov10_022C4558 str r1, [sp] mov r4, #0 ldrsh r2, [r0] @@ -1659,7 +1659,7 @@ _0231C8B0: cmp sb, #0 beq _0231C8F8 add r1, sp, #0x1d - ldr r0, _0231C6D8 ; =0x022C4558 + ldr r0, _0231C6D8 ; =ov10_022C4558 str r1, [sp] mov r4, #0 ldrsh r2, [r0] @@ -1688,7 +1688,7 @@ _0231C91C: cmp sb, #0 beq _0231C964 add r1, sp, #0x1c - ldr r0, _0231C6D8 ; =0x022C4558 + ldr r0, _0231C6D8 ; =ov10_022C4558 str r1, [sp] mov r4, #0 ldrsh r2, [r0] @@ -1717,7 +1717,7 @@ _0231C988: cmp sb, #0 beq _0231C9D0 add r1, sp, #0x1b - ldr r0, _0231C6D8 ; =0x022C4558 + ldr r0, _0231C6D8 ; =ov10_022C4558 str r1, [sp] mov r4, #0 ldrsh r2, [r0] @@ -1746,7 +1746,7 @@ _0231C9F4: cmp sb, #0 beq _0231CA3C add r1, sp, #0x1a - ldr r0, _0231C6D8 ; =0x022C4558 + ldr r0, _0231C6D8 ; =ov10_022C4558 str r1, [sp] mov r4, #0 ldrsh r2, [r0] @@ -1776,7 +1776,7 @@ _0231CA60: cmp sb, #0 beq _0231CAA8 add r1, sp, #0x19 - ldr r0, _0231CBBC ; =0x022C44EC + ldr r0, _0231CBBC ; =ov10_022C44EC str r1, [sp] mov r4, #0 ldrsh r2, [r0] @@ -1801,7 +1801,7 @@ _0231CABC: cmp sb, #0 beq _0231CB04 add r1, sp, #0x18 - ldr r0, _0231C6D8 ; =0x022C4558 + ldr r0, _0231C6D8 ; =ov10_022C4558 str r1, [sp] mov r4, #0 ldrsh r2, [r0] @@ -1838,14 +1838,14 @@ _0231CB14: _0231CB48: cmp r0, #0 beq _0231CB9C - ldr r0, _0231CBC0 ; =0x022C4EB8 + ldr r0, _0231CBC0 ; =ov10_022C4EB8 b _0231CB90 _0231CB58: cmp r4, r1 bne _0231CB8C mov r0, #0xa bl ov29_0234BA54 - ldr r0, _0231CBC4 ; =0x022C4864 + ldr r0, _0231CBC4 ; =ov10_022C4864 mov r4, #1 ldr r2, [r0] mov r0, r8 @@ -1868,10 +1868,10 @@ _0231CBA4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _0231CBAC: .word 0x00000C75 -_0231CBB0: .word 0x022C4438 +_0231CBB0: .word ov10_022C4438 _0231CBB4: .word 0x00000C67 _0231CBB8: .word 0x00000C76 -_0231CBBC: .word 0x022C44EC -_0231CBC0: .word 0x022C4EB8 -_0231CBC4: .word 0x022C4864 +_0231CBBC: .word ov10_022C44EC +_0231CBC0: .word ov10_022C4EB8 +_0231CBC4: .word ov10_022C4864 arm_func_end ApplyItemEffect diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index bb61d77a..1c48eb17 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -136,7 +136,7 @@ ApplyVileSeedEffect: ; 0x0231CD80 stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc mov r4, r1 - ldr r1, _0231CE10 ; =0x023529AC + ldr r1, _0231CE10 ; =ov29_023529AC ldr ip, [r4, #0xb4] ldrh r3, [r1] ldrh r2, [r1, #2] @@ -151,14 +151,14 @@ ApplyVileSeedEffect: ; 0x0231CD80 strh r2, [sp, #0xa] cmp r0, #0 strgth r0, [sp, #0xa] - ldr r0, _0231CE14 ; =0x02352AEC + ldr r0, _0231CE14 ; =ov29_02352AEC ldrsh r3, [sp, #8] ldr r2, [r0] mov r0, r5 mov r1, r4 str ip, [sp, #4] bl LowerDefensiveStat - ldr r0, _0231CE18 ; =0x02352AE8 + ldr r0, _0231CE18 ; =ov29_02352AE8 mov ip, #1 ldr r2, [r0] str ip, [sp] @@ -170,9 +170,9 @@ ApplyVileSeedEffect: ; 0x0231CD80 add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 -_0231CE10: .word 0x023529AC -_0231CE14: .word 0x02352AEC -_0231CE18: .word 0x02352AE8 +_0231CE10: .word ov29_023529AC +_0231CE14: .word ov29_02352AEC +_0231CE18: .word ov29_02352AE8 arm_func_end ApplyVileSeedEffect arm_func_start ApplyViolentSeedEffect @@ -180,14 +180,14 @@ ApplyViolentSeedEffect: ; 0x0231CE1C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 ldr r4, [r5, #0xb4] - ldr r2, _0231CE60 ; =0x02352AEC + ldr r2, _0231CE60 ; =ov29_02352AEC ldrsh r3, [r4, #0x24] ldr r2, [r2] mov r6, r0 rsb r3, r3, #0x14 bl BoostOffensiveStat ldrsh r3, [r4, #0x26] - ldr r1, _0231CE64 ; =0x02352AE8 + ldr r1, _0231CE64 ; =ov29_02352AE8 mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -195,8 +195,8 @@ ApplyViolentSeedEffect: ; 0x0231CE1C bl BoostOffensiveStat ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0231CE60: .word 0x02352AEC -_0231CE64: .word 0x02352AE8 +_0231CE60: .word ov29_02352AEC +_0231CE64: .word ov29_02352AE8 arm_func_end ApplyViolentSeedEffect arm_func_start ApplyGinsengEffect @@ -209,7 +209,7 @@ ApplyGinsengEffect: ; 0x0231CE68 mov r4, #0 mov r5, #1 bl DungeonRandInt - ldr r1, _0231CF78 ; =0x022C46C0 + ldr r1, _0231CF78 ; =ov10_022C46C0 mov ip, #0 ldrsh r1, [r1] add r3, r6, #0x124 @@ -275,7 +275,7 @@ _0231CF64: bl LogMessageByIdWithPopupCheckUserTarget ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0231CF78: .word 0x022C46C0 +_0231CF78: .word ov10_022C46C0 _0231CF7C: .word 0x00000BEF _0231CF80: .word 0x00000BEE arm_func_end ApplyGinsengEffect @@ -291,8 +291,8 @@ ApplyBlastSeedEffect: ; 0x0231CF84 ldr r7, [r5, #0xb4] bl IsCurrentFixedRoomBossFight cmp r0, #0 - ldrne r0, _0231D0A8 ; =0x022C45D8 - ldreq r0, _0231D0AC ; =0x022C45D4 + ldrne r0, _0231D0A8 ; =ov10_022C45D8 + ldreq r0, _0231D0AC ; =ov10_022C45D4 ldrsh r4, [r0] ldrb r0, [r7, #0xc4] cmp r0, #1 @@ -332,8 +332,8 @@ _0231D034: ldr r7, [r4, #0xb4] bl IsCurrentFixedRoomBossFight cmp r0, #0 - ldrne r0, _0231D0B8 ; =0x022C45DC - ldreq r0, _0231D0BC ; =0x022C44E8 + ldrne r0, _0231D0B8 ; =ov10_022C45DC + ldreq r0, _0231D0BC ; =ov10_022C44E8 ldrsh r5, [r0] ldrb r0, [r7, #0xc4] cmp r0, #1 @@ -361,12 +361,12 @@ _0231D0A0: add sp, sp, #0x1c ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 -_0231D0A8: .word 0x022C45D8 -_0231D0AC: .word 0x022C45D4 +_0231D0A8: .word ov10_022C45D8 +_0231D0AC: .word ov10_022C45D4 _0231D0B0: .word 0x00000255 _0231D0B4: .word 0x00000BF2 -_0231D0B8: .word 0x022C45DC -_0231D0BC: .word 0x022C44E8 +_0231D0B8: .word ov10_022C45DC +_0231D0BC: .word ov10_022C44E8 arm_func_end ApplyBlastSeedEffect arm_func_start ApplyGummiBoostsDungeonMode @@ -382,8 +382,8 @@ ApplyGummiBoostsDungeonMode: ; 0x0231D0C0 cmp r2, #0xff ldr r7, [sb, #0xb4] bne _0231D108 - ldr r1, _0231D468 ; =0x020A1890 - ldr r0, _0231D46C ; =0x020A1894 + ldr r1, _0231D468 ; =WONDER_GUMMI_IQ_GAIN + ldr r0, _0231D46C ; =_020A1894 ldrsh r1, [r1] ldrsh r0, [r0] add fp, r4, r1 @@ -394,7 +394,7 @@ _0231D108: ldrb r6, [r7, #0x5f] mov r0, #0x24 smulbb r1, r1, r0 - ldr fp, _0231D470 ; =0x020A22B0 + ldr fp, _0231D470 ; =IQ_GUMMI_GAIN_TABLE smulbb r6, r6, r0 add ip, fp, r1 mov r0, r2, lsl #1 @@ -404,7 +404,7 @@ _0231D108: cmp ip, r0 addgt fp, r4, ip addle fp, r4, r0 - ldr ip, _0231D474 ; =0x020A2538 + ldr ip, _0231D474 ; =_020A2538 mov r0, r2, lsl #1 add r2, ip, r1 add r1, ip, r6 @@ -471,13 +471,13 @@ _0231D214: movge fp, #2 movlt fp, #3 _0231D23C: - ldr r0, _0231D480 ; =0x023532D0 + ldr r0, _0231D480 ; =ov29_023532D0 mov r1, r5, lsl #1 ldrh r2, [r0, r1] mov r0, sl mov r1, sb bl LogMessageByIdWithPopupCheckUserTarget - ldr r0, _0231D484 ; =0x02353324 + ldr r0, _0231D484 ; =ov29_02353324 mov r1, fp, lsl #1 ldrh r2, [r0, r1] mov r0, sl @@ -492,13 +492,13 @@ _0231D23C: _0231D284: cmp r5, #3 beq _0231D460 - ldr r0, _0231D488 ; =0x022C44CC + ldr r0, _0231D488 ; =ov10_022C44CC ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 beq _0231D460 ldr r5, [sb, #0xb4] - ldr r0, _0231D48C ; =0x022C45E4 + ldr r0, _0231D48C ; =ov10_022C45E4 ldrb r1, [r5, #0x1a] ldrsh r0, [r0] str r1, [sp, #4] @@ -515,7 +515,7 @@ _0231D284: mov r0, #4 bl DungeonRandInt mov r0, r0, lsl #0x10 - ldr r1, _0231D490 ; =0x023529B0 + ldr r1, _0231D490 ; =ov29_023529B0 mov r0, r0, lsr #0xf ldrh r0, [r1, r0] _0231D2F4: @@ -628,17 +628,17 @@ _0231D460: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0231D468: .word 0x020A1890 -_0231D46C: .word 0x020A1894 -_0231D470: .word 0x020A22B0 -_0231D474: .word 0x020A2538 +_0231D468: .word WONDER_GUMMI_IQ_GAIN +_0231D46C: .word _020A1894 +_0231D470: .word IQ_GUMMI_GAIN_TABLE +_0231D474: .word _020A2538 _0231D478: .word 0x000003E7 _0231D47C: .word 0x00000BF3 -_0231D480: .word 0x023532D0 -_0231D484: .word 0x02353324 -_0231D488: .word 0x022C44CC -_0231D48C: .word 0x022C45E4 -_0231D490: .word 0x023529B0 +_0231D480: .word ov29_023532D0 +_0231D484: .word ov29_02353324 +_0231D488: .word ov10_022C44CC +_0231D48C: .word ov10_022C45E4 +_0231D490: .word ov29_023529B0 _0231D494: .word 0x00000BF7 _0231D498: .word 0x00000BF8 _0231D49C: .word 0x00000BF9 @@ -712,7 +712,7 @@ ApplyGrimyFoodEffect: ; 0x0231D534 _0231D580: mov r0, #0x64 bl DungeonRandInt - ldr r1, _0231D674 ; =0x022C4680 + ldr r1, _0231D674 ; =ov10_022C4680 ldrsh r1, [r1] cmp r0, r1 blt _0231D66C @@ -758,7 +758,7 @@ _0231D60C: bl TryInflictParalysisStatus b _0231D66C _0231D624: - ldr r0, _0231D678 ; =0x02352AEC + ldr r0, _0231D678 ; =ov29_02352AEC mov ip, #1 ldr r2, [r0] str ip, [sp] @@ -767,7 +767,7 @@ _0231D624: mov r3, #3 str ip, [sp, #4] bl LowerOffensiveStat - ldr r0, _0231D67C ; =0x02352AE8 + ldr r0, _0231D67C ; =ov29_02352AE8 mov ip, #1 str ip, [sp] ldr r2, [r0] @@ -780,9 +780,9 @@ _0231D66C: add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0231D674: .word 0x022C4680 -_0231D678: .word 0x02352AEC -_0231D67C: .word 0x02352AE8 +_0231D674: .word ov10_022C4680 +_0231D678: .word ov29_02352AEC +_0231D67C: .word ov29_02352AE8 arm_func_end ApplyGrimyFoodEffect arm_func_start ApplyMixElixirEffect @@ -896,7 +896,7 @@ ApplyGravelyrockEffect: ; 0x0231D7C0 mov r1, #1 mov r4, r0 str r1, [sp] - ldr r0, _0231D830 ; =0x022C47E0 + ldr r0, _0231D830 ; =ov10_022C47E0 mov r1, r5 ldrsh r2, [r0] ldrsh r3, [r0, #2] @@ -905,7 +905,7 @@ ApplyGravelyrockEffect: ; 0x0231D7C0 cmp r4, #0x1e0 cmpne r4, #0xb9 bne _0231D828 - ldr r1, _0231D834 ; =0x022C47F0 + ldr r1, _0231D834 ; =ov10_022C47F0 mov r0, r5 ldr r1, [r1] mov r2, #0 @@ -916,8 +916,8 @@ _0231D828: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0231D830: .word 0x022C47E0 -_0231D834: .word 0x022C47F0 +_0231D830: .word ov10_022C47E0 +_0231D834: .word ov10_022C47F0 arm_func_end ApplyGravelyrockEffect arm_func_start ApplyGonePebbleEffect @@ -972,7 +972,7 @@ ApplyGonePebbleEffect: ; 0x0231D838 mov r0, r6 mov r1, r5 bl TryInflictEndureStatus - ldr r0, _0231D9BC ; =0x02353538 + ldr r0, _0231D9BC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd6] @@ -1022,7 +1022,7 @@ _0231D9A8: _0231D9B0: .word 0x000003FF _0231D9B4: .word 0x00000C65 _0231D9B8: .word 0x00000C66 -_0231D9BC: .word 0x02353538 +_0231D9BC: .word ov29_02353538 arm_func_end ApplyGonePebbleEffect arm_func_start ApplyGracideaEffect @@ -1114,7 +1114,7 @@ _0231DAC8: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _0231DAF0: - ldr fp, _0231DBE8 ; =0x02353538 + ldr fp, _0231DBE8 ; =ov29_02353538 mov r4, #0 _0231DAF8: ldr r0, [fp] @@ -1179,7 +1179,7 @@ _0231DB70: .align 2, 0 _0231DBE0: .word 0x00000BE7 _0231DBE4: .word 0x00000BF4 -_0231DBE8: .word 0x02353538 +_0231DBE8: .word ov29_02353538 _0231DBEC: .word 0x00000141 arm_func_end ov29_0231DA80 @@ -1201,7 +1201,7 @@ ov29_0231DBF0: ; 0x0231DBF0 mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _0231DC2C: - ldr r4, _0231DD54 ; =0x02353538 + ldr r4, _0231DD54 ; =ov29_02353538 ldr r0, [r4] ldrb r0, [r0, #0x75c] cmp r0, #0 @@ -1269,7 +1269,7 @@ _0231DCEC: mov r0, sl mov r1, sb bl ov29_022E5AE4 - ldr r0, _0231DD54 ; =0x02353538 + ldr r0, _0231DD54 ; =ov29_02353538 ldr r2, _0231DD5C ; =0x00000142 ldr r3, [r0] mov r0, sl @@ -1280,7 +1280,7 @@ _0231DCEC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0231DD50: .word 0x00000BE7 -_0231DD54: .word 0x02353538 +_0231DD54: .word ov29_02353538 _0231DD58: .word 0x00000BA4 _0231DD5C: .word 0x00000142 arm_func_end ov29_0231DBF0 @@ -1306,7 +1306,7 @@ ov29_0231DD60: ; 0x0231DD60 mov r0, #0 b _0231E044 _0231DDA8: - ldr fp, _0231E050 ; =0x02353538 + ldr fp, _0231E050 ; =ov29_02353538 mov r5, #0 _0231DDB0: ldr r0, [fp] @@ -1495,7 +1495,7 @@ _0231E044: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0231E04C: .word 0x00000BE7 -_0231E050: .word 0x02353538 +_0231E050: .word ov29_02353538 _0231E054: .word 0x0000016A _0231E058: .word 0x00000BF5 arm_func_end ov29_0231DD60 @@ -2116,7 +2116,7 @@ ov29_0231E8F0: ; 0x0231E8F0 mov sb, r5 mov r8, r5 mov r7, sl - ldr r4, _0231E98C ; =0x0235171C + ldr r4, _0231E98C ; =DIRECTIONS_XY b _0231E97C _0231E914: mov r1, r5, lsl #2 @@ -2152,7 +2152,7 @@ _0231E97C: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_0231E98C: .word 0x0235171C +_0231E98C: .word DIRECTIONS_XY arm_func_end ov29_0231E8F0 arm_func_start ShouldTryEatItem @@ -2171,7 +2171,7 @@ _0231E9B0: cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0231E9EC ; =0x022C4B74 + ldr r0, _0231E9EC ; =ov10_022C4B74 b _0231E9D8 _0231E9C8: cmp r4, r1 @@ -2185,7 +2185,7 @@ _0231E9D8: mov r0, #1 ldmia sp!, {r4, pc} .align 2, 0 -_0231E9EC: .word 0x022C4B74 +_0231E9EC: .word ov10_022C4B74 arm_func_end ShouldTryEatItem arm_func_start GetMaxPpWrapper @@ -2232,7 +2232,7 @@ ov29_0231EA40: ; 0x0231EA40 bl IsFullFloorFixedRoom cmp r0, #0 bne _0231EA80 - ldr r0, _0231EDC8 ; =0x02353538 + ldr r0, _0231EDC8 ; =ov29_02353538 ldr r0, [r0] add r1, r0, #0x4000 ldrsh r0, [r1, #0xd4] @@ -2272,7 +2272,7 @@ _0231EAC8: mov r6, #0 mov sb, #1 _0231EAE0: - ldr fp, _0231EDC8 ; =0x02353538 + ldr fp, _0231EDC8 ; =ov29_02353538 mov r5, #1 mov r4, #0 _0231EAEC: @@ -2341,7 +2341,7 @@ _0231EBCC: add sb, sb, #1 cmp sb, #0x37 blt _0231EAE0 - ldr r0, _0231EDC8 ; =0x02353538 + ldr r0, _0231EDC8 ; =ov29_02353538 mov r2, #1 ldr r0, [r0] add r1, r0, #0xcc00 @@ -2378,7 +2378,7 @@ _0231EC4C: blt _0231EC10 _0231EC64: cmp r6, #0 - ldrne r0, _0231EDC8 ; =0x02353538 + ldrne r0, _0231EDC8 ; =ov29_02353538 mov r5, #0 ldrne r0, [r0] movne r1, #0 @@ -2406,7 +2406,7 @@ _0231ECA8: add r5, r5, #1 cmp r5, #0x38 blt _0231EC84 - ldr r4, _0231EDC8 ; =0x02353538 + ldr r4, _0231EDC8 ; =ov29_02353538 mov r5, #0 _0231ECD4: ldr r0, [r4] @@ -2441,7 +2441,7 @@ _0231ED08: mov r0, sl mov r1, #1 bl ov29_02305814 - ldr r4, _0231EDC8 ; =0x02353538 + ldr r4, _0231EDC8 ; =ov29_02353538 mov r6, #0 _0231ED58: ldr r0, [r4] @@ -2464,7 +2464,7 @@ _0231ED98: add r6, r6, #1 cmp r6, #0x14 blt _0231ED58 - ldr r0, _0231EDC8 ; =0x02353538 + ldr r0, _0231EDC8 ; =ov29_02353538 mov r3, #1 ldr r1, [r0] mov r0, #0x14 @@ -2474,7 +2474,7 @@ _0231ED98: bl ov29_022EA370 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0231EDC8: .word 0x02353538 +_0231EDC8: .word ov29_02353538 _0231EDCC: .word 0x00000E01 _0231EDD0: .word 0x00000DFF _0231EDD4: .word 0x00000DFE diff --git a/asm/overlay_29_0231EDFC.s b/asm/overlay_29_0231EDFC.s index 16db53ac..f3bf6e5e 100644 --- a/asm/overlay_29_0231EDFC.s +++ b/asm/overlay_29_0231EDFC.s @@ -66,10 +66,10 @@ _0231EEB8: b _0231F098 _0231EED4: mov sl, #0 - ldr fp, _0231F54C ; =0x0235171C + ldr fp, _0231F54C ; =DIRECTIONS_XY mov r6, sl _0231EEE0: - ldr r0, _0231F550 ; =0x02353538 + ldr r0, _0231F550 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r6, lsl #2 add r0, r0, #0x12000 @@ -287,7 +287,7 @@ _0231F1B0: movlt sb, #0xa bl GetDirectionTowardsPosition mov r6, r0 - ldr r0, _0231F54C ; =0x0235171C + ldr r0, _0231F54C ; =DIRECTIONS_XY mov r1, r6, lsl #2 ldrsh r0, [r0, r1] mov r1, #3 @@ -295,7 +295,7 @@ _0231F1B0: bl __divsi3 ldrsh sl, [sp, #0x40] mov r1, #0x18 - ldr r2, _0231F560 ; =0x0235171E + ldr r2, _0231F560 ; =ov29_0235171E mov r3, r6, lsl #2 smulbb r1, sl, r1 add r1, r1, #0xc @@ -393,7 +393,7 @@ _0231F31C: b _0231F53C _0231F394: mov r8, #0 - ldr r6, _0231F54C ; =0x0235171C + ldr r6, _0231F54C ; =DIRECTIONS_XY add sb, sp, #0x28 b _0231F40C _0231F3A4: @@ -459,7 +459,7 @@ _0231F454: bne _0231F4B4 mov r3, #0 str r3, [sp] - ldr r0, _0231F568 ; =0x022C4458 + ldr r0, _0231F568 ; =ov10_022C4458 ldr r1, _0231F56C ; =0x00000259 str r3, [sp, #4] str r1, [sp, #8] @@ -482,7 +482,7 @@ _0231F4B4: _0231F4D4: mov r3, #0 str r3, [sp] - ldr r0, _0231F568 ; =0x022C4458 + ldr r0, _0231F568 ; =ov10_022C4458 str r3, [sp, #4] mov r1, #0x258 str r1, [sp, #8] @@ -513,13 +513,13 @@ _0231F53C: .align 2, 0 _0231F544: .word 0x00000E45 _0231F548: .word 0x00000E46 -_0231F54C: .word 0x0235171C -_0231F550: .word 0x02353538 +_0231F54C: .word DIRECTIONS_XY +_0231F550: .word ov29_02353538 _0231F554: .word 0x00000E48 _0231F558: .word 0x00000E47 _0231F55C: .word 0x00000212 -_0231F560: .word 0x0235171E +_0231F560: .word ov29_0235171E _0231F564: .word 0x00000163 -_0231F568: .word 0x022C4458 +_0231F568: .word ov10_022C4458 _0231F56C: .word 0x00000259 arm_func_end ov29_0231EDFC diff --git a/asm/overlay_29_0231F594.s b/asm/overlay_29_0231F594.s index 8043b894..3392dd81 100644 --- a/asm/overlay_29_0231F594.s +++ b/asm/overlay_29_0231F594.s @@ -6,7 +6,7 @@ arm_func_start TryDrought TryDrought: ; 0x0231F594 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr r1, _0231F6D4 ; =0x02353538 + ldr r1, _0231F6D4 ; =ov29_02353538 mov r8, r0 ldr r0, [r1] mov r6, #0 @@ -86,7 +86,7 @@ _0231F6A8: mov r0, r8 bl LogMessageByIdWithPopupCheckUser _0231F6B4: - ldr r0, _0231F6D4 ; =0x02353538 + ldr r0, _0231F6D4 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x78f] @@ -95,7 +95,7 @@ _0231F6B4: bl UpdateTrapsVisibility ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0231F6D4: .word 0x02353538 +_0231F6D4: .word ov29_02353538 _0231F6D8: .word 0x00000C08 _0231F6DC: .word 0x00000C09 _0231F6E0: .word 0x00000C07 @@ -105,7 +105,7 @@ _0231F6E0: .word 0x00000C07 ov29_0231F6E4: ; 0x0231F6E4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x38 - ldr r1, _0231FBE4 ; =0x02353538 + ldr r1, _0231FBE4 ; =ov29_02353538 mov sl, r0 ldr r0, [r1] add r0, r0, #0x4000 @@ -188,7 +188,7 @@ _0231F7A0: mov r1, #0 strb r1, [r5, #0x22] str r1, [r5, #0x1c] - ldr r1, _0231FBE4 ; =0x02353538 + ldr r1, _0231FBE4 ; =ov29_02353538 add r0, r4, sb ldr r2, [r1] mov r1, #6 @@ -206,7 +206,7 @@ _0231F7A0: _0231F868: add r8, r8, #1 _0231F86C: - ldr r0, _0231FBE4 ; =0x02353538 + ldr r0, _0231FBE4 ; =ov29_02353538 ldr r1, [r0] add r0, r1, #0x3f00 ldrsh r0, [r0, #0xc0] @@ -233,7 +233,7 @@ _0231F8BC: ldrsh r1, [sl, #4] ldrsh r0, [sl, #6] mov r7, #0 - ldr r5, _0231FBF0 ; =0x02351844 + ldr r5, _0231FBF0 ; =ov29_02351844 mov r8, r7 strh r1, [sp, #0x14] strh r0, [sp, #0x16] @@ -346,7 +346,7 @@ _0231FA58: ldr r1, _0231FBF4 ; =0x00000222 mov r0, sl bl ov29_022E56A0 - ldr r0, _0231FBE4 ; =0x02353538 + ldr r0, _0231FBE4 ; =ov29_02353538 mov r7, #0 ldr r0, [r0] mov r8, r7 @@ -452,10 +452,10 @@ _0231FBDC: add sp, sp, #0x38 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0231FBE4: .word 0x02353538 +_0231FBE4: .word ov29_02353538 _0231FBE8: .word 0x000013BC _0231FBEC: .word 0x00000BCF -_0231FBF0: .word 0x02351844 +_0231FBF0: .word ov29_02351844 _0231FBF4: .word 0x00000222 _0231FBF8: .word 0x00000BD1 arm_func_end ov29_0231F6E4 diff --git a/asm/overlay_29_0231FC20.s b/asm/overlay_29_0231FC20.s index f0ce9d90..7f4bc2bd 100644 --- a/asm/overlay_29_0231FC20.s +++ b/asm/overlay_29_0231FC20.s @@ -46,7 +46,7 @@ _0231FC88: bl LogMessageByIdWithPopupCheckUserTarget ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _0231FCB4: - ldr r0, _0231FDD4 ; =0x02353538 + ldr r0, _0231FDD4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] @@ -65,7 +65,7 @@ _0231FCE4: mov r1, #6 mov r2, r5 bl ov29_023049A8 - ldr r1, _0231FDDC ; =0x0235171C + ldr r1, _0231FDDC ; =DIRECTIONS_XY mov r2, r5, lsl #2 add r0, r1, r5, lsl #2 mov r5, #0 @@ -122,16 +122,16 @@ _0231FDB4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0231FDD0: .word 0x00000E56 -_0231FDD4: .word 0x02353538 +_0231FDD4: .word ov29_02353538 _0231FDD8: .word 0x00000E55 -_0231FDDC: .word 0x0235171C +_0231FDDC: .word DIRECTIONS_XY arm_func_end TryPounce arm_func_start TryBlowAway TryBlowAway: ; 0x0231FDE0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x30 - ldr r3, _02320154 ; =0x02353538 + ldr r3, _02320154 ; =ov29_02353538 mov sl, r0 ldr r0, [r3] mov sb, r1 @@ -210,7 +210,7 @@ _0231FED4: mov r0, sl mov r1, sb bl LogMessageByIdWithPopupCheckUserTarget - ldr r1, _0232016C ; =0x0235171C + ldr r1, _0232016C ; =DIRECTIONS_XY mov r2, r4, lsl #2 add r0, r1, r4, lsl #2 ldrsh r8, [r1, r2] @@ -298,7 +298,7 @@ _0232003C: bl ov29_0232033C mov r3, #0 str r3, [sp] - ldr r0, _02320170 ; =0x022C4570 + ldr r0, _02320170 ; =ov10_022C4570 str r3, [sp, #4] mov r1, #0x258 str r1, [sp, #8] @@ -337,7 +337,7 @@ _0232009C: bl ov29_02307BDC mov r3, #0 str r3, [sp] - ldr r0, _02320170 ; =0x022C4570 + ldr r0, _02320170 ; =ov10_022C4570 ldr r1, _02320178 ; =0x00000259 str r3, [sp, #4] str r1, [sp, #8] @@ -366,14 +366,14 @@ _0232014C: add sp, sp, #0x30 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02320154: .word 0x02353538 +_02320154: .word ov29_02353538 _02320158: .word 0x00000B97 _0232015C: .word 0x00000B98 _02320160: .word 0x00000B99 _02320164: .word 0x00000212 _02320168: .word 0x00000B96 -_0232016C: .word 0x0235171C -_02320170: .word 0x022C4570 +_0232016C: .word DIRECTIONS_XY +_02320170: .word ov10_022C4570 _02320174: .word 0x00000163 _02320178: .word 0x00000259 arm_func_end TryBlowAway diff --git a/asm/overlay_29_023201A0.s b/asm/overlay_29_023201A0.s index dafc42c3..7210e9ae 100644 --- a/asm/overlay_29_023201A0.s +++ b/asm/overlay_29_023201A0.s @@ -33,7 +33,7 @@ ov29_023201D0: ; 0x023201D0 mov r5, #1 bl SubstitutePlaceholderStringTags ldrh r0, [sl, #4] - ldr r1, _02320330 ; =0x0235171C + ldr r1, _02320330 ; =DIRECTIONS_XY mov r2, r4, lsl #2 strh r0, [sp] ldrh r3, [sl, #6] @@ -116,7 +116,7 @@ _02320328: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02320330: .word 0x0235171C +_02320330: .word DIRECTIONS_XY _02320334: .word 0x0235171E _02320338: .word 0x00000212 arm_func_end ov29_023201D0 diff --git a/asm/overlay_29_0232145C.s b/asm/overlay_29_0232145C.s index 1a209cb9..9ce55e02 100644 --- a/asm/overlay_29_0232145C.s +++ b/asm/overlay_29_0232145C.s @@ -2038,7 +2038,7 @@ ov29_023230FC: ; 0x023230FC movne sl, #6 _02323160: ldrsh r2, [r8, #4] - ldr r0, _023238F8 ; =0x0235171C + ldr r0, _023238F8 ; =DIRECTIONS_XY ldr r1, _023238FC ; =0x0235171E strh r2, [sp, #0xbc] ldrsh r2, [r8, #6] @@ -2126,7 +2126,7 @@ _02323250: bl ov29_02322F78 ldrsh r2, [r5, #4] str r0, [sp, #0xb4] - ldr r0, _023238F8 ; =0x0235171C + ldr r0, _023238F8 ; =DIRECTIONS_XY strh r2, [sp, #0xb8] ldrsh r2, [r5, #6] ldr r1, _023238FC ; =0x0235171E @@ -2142,7 +2142,7 @@ _02323250: _023232E4: ldrsh r0, [r8, #4] ldr r5, _02323900 ; =0x0235175C - ldr r3, _023238F8 ; =0x0235171C + ldr r3, _023238F8 ; =DIRECTIONS_XY strh r0, [sp, #0xbc] ldrsh r1, [r8, #6] ldr r2, _023238FC ; =0x0235171E @@ -2556,7 +2556,7 @@ _023238EC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _023238F4: .word 0x02352A54 -_023238F8: .word 0x0235171C +_023238F8: .word DIRECTIONS_XY _023238FC: .word 0x0235171E _02323900: .word 0x0235175C _02323904: .word 0x00000FFF @@ -2601,7 +2601,7 @@ ov29_0232393C: ; 0x0232393C movne r6, #6 _02323984: ldr r0, [sp, #0x18] - ldr r4, _02323C30 ; =0x0235171C + ldr r4, _02323C30 ; =DIRECTIONS_XY ldrb r1, [r0, #0x4c] ldrsh r0, [sl, #4] ldr r5, _02323C34 ; =0x0235171E @@ -2784,7 +2784,7 @@ _02323BE0: add sp, sp, #0x38 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02323C30: .word 0x0235171C +_02323C30: .word DIRECTIONS_XY _02323C34: .word 0x0235171E _02323C38: .word 0x02352A8C _02323C3C: .word 0x02353538 @@ -3133,7 +3133,7 @@ _023240FC: b _0232419C _02324134: and r7, r7, #7 - ldr r1, _023243AC ; =0x0235171C + ldr r1, _023243AC ; =DIRECTIONS_XY mov r2, r7, lsl #2 ldrsh r2, [r1, r2] ldrsh r0, [sb, #4] @@ -3305,7 +3305,7 @@ _0232439C: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023243AC: .word 0x0235171C +_023243AC: .word DIRECTIONS_XY _023243B0: .word 0x02353538 arm_func_end ov29_02324030 diff --git a/asm/overlay_29_0232A3FC.s b/asm/overlay_29_0232A3FC.s index e939482a..196693be 100644 --- a/asm/overlay_29_0232A3FC.s +++ b/asm/overlay_29_0232A3FC.s @@ -33,7 +33,7 @@ DoMoveRest: ; 0x0232A414 bl TryInflictNappingStatus b _0232A474 _0232A454: - ldr r1, _0232A47C ; =0x022C4748 + ldr r1, _0232A47C ; =ov10_022C4748 mov r0, r4 mov r2, #0 bl CalcStatusDuration @@ -45,7 +45,7 @@ _0232A474: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232A47C: .word 0x022C4748 +_0232A47C: .word ov10_022C4748 arm_func_end DoMoveRest arm_func_start DoMoveIngrain @@ -64,7 +64,7 @@ DoMoveSwallow: ; 0x0232A490 ldrb r3, [r4, #0x11e] cmp r3, #0 beq _0232A4CC - ldr r2, _0232A4E0 ; =0x022C49D4 + ldr r2, _0232A4E0 ; =ov10_022C49D4 mov ip, #1 ldr r2, [r2, r3, lsl #2] mov r3, #0 @@ -81,7 +81,7 @@ _0232A4D4: add sp, sp, #4 ldmia sp!, {r3, r4, pc} .align 2, 0 -_0232A4E0: .word 0x022C49D4 +_0232A4E0: .word ov10_022C49D4 _0232A4E4: .word 0x00000EE4 arm_func_end DoMoveSwallow @@ -121,7 +121,7 @@ DoMoveSuperpower: ; 0x0232A524 movne r4, #1 cmp r4, #0 beq _0232A59C - ldr r0, _0232A5A8 ; =0x02352AEC + ldr r0, _0232A5A8 ; =ov29_02352AEC mov ip, #0 ldr r2, [r0] str ip, [sp] @@ -145,7 +145,7 @@ _0232A59C: add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 -_0232A5A8: .word 0x02352AEC +_0232A5A8: .word ov29_02352AEC arm_func_end DoMoveSuperpower arm_func_start DoMoveSteelWing @@ -162,7 +162,7 @@ DoMoveSteelWing: ; 0x0232A5AC bl DealDamage cmp r0, #0 beq _0232A628 - ldr r1, _0232A63C ; =0x022C44C4 + ldr r1, _0232A63C ; =ov10_022C44C4 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -188,7 +188,7 @@ _0232A628: add sp, sp, #0x10 bx lr .align 2, 0 -_0232A63C: .word 0x022C44C4 +_0232A63C: .word ov10_022C44C4 arm_func_end DoMoveSteelWing arm_func_start DoMoveSpitUp @@ -308,8 +308,8 @@ _0232A7B4: mov r1, r6 bl LogMessageByIdWithPopupCheckUserTarget ldrb r1, [r4, #0x4c] - ldr r0, _0232A82C ; =0x0235171C - ldr r5, _0232A830 ; =0x0235171E + ldr r0, _0232A82C ; =DIRECTIONS_XY + ldr r5, _0232A830 ; =ov29_0235171E mov r1, r1, lsl #2 ldrsh r1, [r0, r1] add r2, sp, #4 @@ -333,8 +333,8 @@ _0232A818: _0232A820: .word 0x00000EE6 _0232A824: .word 0x00000EE8 _0232A828: .word 0x00000EE7 -_0232A82C: .word 0x0235171C -_0232A830: .word 0x0235171E +_0232A82C: .word DIRECTIONS_XY +_0232A830: .word ov29_0235171E arm_func_end DoMoveKnockOff arm_func_start ov29_0232A834 @@ -508,7 +508,7 @@ _0232AA4C: bl GetDamageSourceWrapper mov r3, #0 str r3, [sp] - ldr r1, _0232AC40 ; =0x022C44B4 + ldr r1, _0232AC40 ; =ov10_022C44B4 str r3, [sp, #4] mov r2, #3 str r2, [sp, #8] @@ -533,7 +533,7 @@ _0232AAD8: beq _0232AC30 mov r3, #0 str r3, [sp] - ldr r0, _0232AC40 ; =0x022C44B4 + ldr r0, _0232AC40 ; =ov10_022C44B4 mov r1, #3 str r3, [sp, #4] str r1, [sp, #8] @@ -620,7 +620,7 @@ _0232AC30: .align 2, 0 _0232AC38: .word 0x00000EEA _0232AC3C: .word 0x00000163 -_0232AC40: .word 0x022C44B4 +_0232AC40: .word ov10_022C44B4 arm_func_end DoMoveSplash arm_func_start DoMoveSetDamage @@ -648,7 +648,7 @@ DoMoveBellyDrum: ; 0x0232AC54 bl CeilFixedPoint cmp r0, #1 ble _0232ACD8 - ldr r1, _0232AD00 ; =0x02352AEC + ldr r1, _0232AD00 ; =ov29_02352AEC mov r0, r7 ldr r2, [r1] mov r1, r6 @@ -679,7 +679,7 @@ _0232ACF8: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232AD00: .word 0x02352AEC +_0232AD00: .word ov29_02352AEC _0232AD04: .word 0x00000EEB arm_func_end DoMoveBellyDrum @@ -703,7 +703,7 @@ DoMoveSecretPower: ; 0x0232AD18 bl DealDamage cmp r0, #0 beq _0232AED0 - ldr r1, _0232AEDC ; =0x022C454C + ldr r1, _0232AEDC ; =ov10_022C454C mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -711,10 +711,10 @@ DoMoveSecretPower: ; 0x0232AD18 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232AED0 - ldr r0, _0232AEE0 ; =0x02353538 + ldr r0, _0232AEE0 ; =ov29_02353538 mov r1, #0xc ldr r0, [r0] - ldr r2, _0232AEE4 ; =0x022C6321 + ldr r2, _0232AEE4 ; =ov10_022C6321 add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] smulbb r0, r0, r1 @@ -741,7 +741,7 @@ _0232ADB4: bl TryInflictPoisonedStatus b _0232AED0 _0232ADCC: - ldr r1, _0232AEE8 ; =0x022C4720 + ldr r1, _0232AEE8 ; =ov10_022C4720 mov r0, r5 mov r2, r4 bl CalcStatusDuration @@ -759,7 +759,7 @@ _0232ADF4: bl LowerSpeed b _0232AED0 _0232AE0C: - ldr r0, _0232AEEC ; =0x02352AEC + ldr r0, _0232AEEC ; =ov29_02352AEC mov r3, r4 ldr r2, [r0] mov r1, r5 @@ -770,7 +770,7 @@ _0232AE0C: bl LowerOffensiveStat b _0232AED0 _0232AE34: - ldr r0, _0232AEEC ; =0x02352AEC + ldr r0, _0232AEEC ; =ov29_02352AEC mov r3, r4 ldr r2, [r0] mov r1, r5 @@ -781,7 +781,7 @@ _0232AE34: bl LowerDefensiveStat b _0232AED0 _0232AE5C: - ldr r1, _0232AEEC ; =0x02352AEC + ldr r1, _0232AEEC ; =ov29_02352AEC mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -819,11 +819,11 @@ _0232AED0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232AEDC: .word 0x022C454C -_0232AEE0: .word 0x02353538 -_0232AEE4: .word 0x022C6321 -_0232AEE8: .word 0x022C4720 -_0232AEEC: .word 0x02352AEC +_0232AEDC: .word ov10_022C454C +_0232AEE0: .word ov29_02353538 +_0232AEE4: .word ov10_022C6321 +_0232AEE8: .word ov10_022C4720 +_0232AEEC: .word ov29_02352AEC arm_func_end DoMoveSecretPower arm_func_start DoMoveDamageConfuse30 @@ -838,7 +838,7 @@ DoMoveDamageConfuse30: ; 0x0232AEF0 bl DealDamage cmp r0, #0 beq _0232AF4C - ldr r1, _0232AF58 ; =0x022C4548 + ldr r1, _0232AF58 ; =ov10_022C4548 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -856,13 +856,13 @@ _0232AF4C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232AF58: .word 0x022C4548 +_0232AF58: .word ov10_022C4548 arm_func_end DoMoveDamageConfuse30 arm_func_start DoMoveBulkUp DoMoveBulkUp: ; 0x0232AF5C stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232AF9C ; =0x02352AEC + ldr r2, _0232AF9C ; =ov29_02352AEC mov r3, #1 ldr r2, [r2] mov r5, r0 @@ -878,7 +878,7 @@ DoMoveBulkUp: ; 0x0232AF5C mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232AF9C: .word 0x02352AEC +_0232AF9C: .word ov29_02352AEC arm_func_end DoMoveBulkUp arm_func_start DoMovePause @@ -887,7 +887,7 @@ DoMovePause: ; 0x0232AFA0 sub sp, sp, #8 mov r4, r1 mov r5, r0 - ldr r1, _0232AFEC ; =0x022C471C + ldr r1, _0232AFEC ; =ov10_022C471C mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -903,14 +903,14 @@ DoMovePause: ; 0x0232AFA0 add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232AFEC: .word 0x022C471C +_0232AFEC: .word ov10_022C471C arm_func_end DoMovePause arm_func_start DoMoveFeatherDance DoMoveFeatherDance: ; 0x0232AFF0 stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr r2, _0232B020 ; =0x02352AEC + ldr r2, _0232B020 ; =ov29_02352AEC mov ip, #1 ldr r2, [r2] str ip, [sp] @@ -921,7 +921,7 @@ DoMoveFeatherDance: ; 0x0232AFF0 add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_0232B020: .word 0x02352AEC +_0232B020: .word ov29_02352AEC arm_func_end DoMoveFeatherDance arm_func_start DoMoveBeatUp @@ -934,12 +934,12 @@ DoMoveBeatUp: ; 0x0232B024 mov r4, #0 mov r5, #0 cmp r0, #0 - ldrne r0, _0232B110 ; =0x02353538 + ldrne r0, _0232B110 ; =ov29_02353538 movne r6, #0x10 ldrne r0, [r0] moveq r6, #4 addne r0, r0, #0x338 - ldreq r0, _0232B110 ; =0x02353538 + ldreq r0, _0232B110 ; =ov29_02353538 ldreq r0, [r0] addeq r0, r0, #0x328 add r7, r0, #0x12800 @@ -990,7 +990,7 @@ _0232B108: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0232B110: .word 0x02353538 +_0232B110: .word ov29_02353538 _0232B114: .word 0x00000EEC arm_func_end DoMoveBeatUp @@ -1029,7 +1029,7 @@ DoMoveCrushClaw: ; 0x0232B164 bl DealDamage cmp r0, #0 beq _0232B1D0 - ldr r1, _0232B1DC ; =0x022C4608 + ldr r1, _0232B1DC ; =ov10_022C4608 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1037,7 +1037,7 @@ DoMoveCrushClaw: ; 0x0232B164 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232B1D0 - ldr r0, _0232B1E0 ; =0x02352AEC + ldr r0, _0232B1E0 ; =ov29_02352AEC mov r3, r4 ldr r2, [r0] mov r0, r6 @@ -1051,8 +1051,8 @@ _0232B1D0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232B1DC: .word 0x022C4608 -_0232B1E0: .word 0x02352AEC +_0232B1DC: .word ov10_022C4608 +_0232B1E0: .word ov29_02352AEC arm_func_end DoMoveCrushClaw arm_func_start DoMoveBlazeKick @@ -1073,7 +1073,7 @@ DoMoveBlazeKick: ; 0x0232B1E4 bl DealDamage cmp r0, #0 beq _0232B25C - ldr r1, _0232B268 ; =0x022C4540 + ldr r1, _0232B268 ; =ov10_022C4540 mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1092,7 +1092,7 @@ _0232B25C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_0232B268: .word 0x022C4540 +_0232B268: .word ov10_022C4540 arm_func_end DoMoveBlazeKick arm_func_start DoMovePresent @@ -1206,7 +1206,7 @@ DoMoveEruption: ; 0x0232B368 movle r2, #2 movgt r2, #3 _0232B3FC: - ldr r1, _0232B430 ; =0x022C49C4 + ldr r1, _0232B430 ; =ov10_022C49C4 mov r0, r7 ldr r3, [r1, r2, lsl #2] mov r1, r6 @@ -1220,7 +1220,7 @@ _0232B3FC: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0232B42C: .word 0x000003E7 -_0232B430: .word 0x022C49C4 +_0232B430: .word ov10_022C49C4 arm_func_end DoMoveEruption arm_func_start DoMoveParalyze__0232B434 @@ -1269,7 +1269,7 @@ DoMovePoisonTail: ; 0x0232B494 bl DealDamage cmp r0, #0 beq _0232B4F0 - ldr r1, _0232B4FC ; =0x022C448C + ldr r1, _0232B4FC ; =ov10_022C448C mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1287,7 +1287,7 @@ _0232B4F0: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232B4FC: .word 0x022C448C +_0232B4FC: .word ov10_022C448C arm_func_end DoMovePoisonTail arm_func_start DoMoveBlowback @@ -1306,10 +1306,10 @@ DoMoveCamouflage: ; 0x0232B518 mov r5, r0 mov r4, r1 bl sub_02025888 - ldr r0, _0232B5B8 ; =0x02353538 + ldr r0, _0232B5B8 ; =ov29_02353538 mov r2, #0xc ldr r0, [r0] - ldr r3, _0232B5BC ; =0x022C6322 + ldr r3, _0232B5BC ; =ov10_022C6322 add r0, r0, #0x4000 ldrsh ip, [r0, #0xd4] mov r0, r4 @@ -1344,8 +1344,8 @@ _0232B578: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232B5B8: .word 0x02353538 -_0232B5BC: .word 0x022C6322 +_0232B5B8: .word ov29_02353538 +_0232B5BC: .word ov10_022C6322 _0232B5C0: .word 0x00000DC3 _0232B5C4: .word 0x00000EEE arm_func_end DoMoveCamouflage @@ -1353,14 +1353,14 @@ _0232B5C4: .word 0x00000EEE arm_func_start DoMoveTailGlow DoMoveTailGlow: ; 0x0232B5C8 stmdb sp!, {r3, lr} - ldr r2, _0232B5E4 ; =0x02352AE8 + ldr r2, _0232B5E4 ; =ov29_02352AE8 mov r3, #2 ldr r2, [r2] bl BoostOffensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232B5E4: .word 0x02352AE8 +_0232B5E4: .word ov29_02352AE8 arm_func_end DoMoveTailGlow arm_func_start DoMoveDamageConstrict10 @@ -1397,7 +1397,7 @@ _0232B640: bl DealDamage cmp r0, #0 beq _0232B694 - ldr r1, _0232B6A0 ; =0x022C44A4 + ldr r1, _0232B6A0 ; =ov10_022C44A4 mov r0, r7 ldrsh r2, [r1] mov r1, r6 @@ -1415,7 +1415,7 @@ _0232B694: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0232B69C: .word 0x00000123 -_0232B6A0: .word 0x022C44A4 +_0232B6A0: .word ov10_022C44A4 arm_func_end DoMoveDamageConstrict10 arm_func_start DoMovePerishSong @@ -1474,10 +1474,10 @@ _0232B734: .word 0x00000EEF DoMoveMagnitude: ; 0x0232B738 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 - ldr r4, _0232B7B0 ; =0x0237CA84 - ldr r5, _0232B7B4 ; =0x02353538 + ldr r4, _0232B7B0 ; =ov29_0237CA84 + ldr r5, _0232B7B4 ; =ov29_02353538 ldr ip, [r4] - ldr r6, _0232B7B8 ; =0x02352B1C + ldr r6, _0232B7B8 ; =ov29_02352B1C ldr r4, [r5] ldr r6, [r6, ip, lsl #2] ldr lr, [r1, #0xb4] @@ -1488,7 +1488,7 @@ DoMoveMagnitude: ; 0x0232B738 add r4, r4, #0x1a000 str r5, [r4, #0x238] ldrb r4, [lr, #0xd2] - ldr r5, _0232B7BC ; =0x022C4924 + ldr r5, _0232B7BC ; =ov10_022C4924 mov ip, ip, lsl #1 cmp r4, #0xa ldrsh r4, [r5, ip] @@ -1503,10 +1503,10 @@ DoMoveMagnitude: ; 0x0232B738 add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232B7B0: .word 0x0237CA84 -_0232B7B4: .word 0x02353538 -_0232B7B8: .word 0x02352B1C -_0232B7BC: .word 0x022C4924 +_0232B7B0: .word ov29_0237CA84 +_0232B7B4: .word ov29_02353538 +_0232B7B8: .word ov29_02352B1C +_0232B7BC: .word ov10_022C4924 arm_func_end DoMoveMagnitude arm_func_start DoMoveMagicCoat @@ -1528,14 +1528,14 @@ DoMoveProtect: ; 0x0232B7D0 arm_func_start DoMoveDefenseCurl DoMoveDefenseCurl: ; 0x0232B7E0 stmdb sp!, {r3, lr} - ldr r2, _0232B7FC ; =0x02352AEC + ldr r2, _0232B7FC ; =ov29_02352AEC mov r3, #1 ldr r2, [r2] bl BoostDefensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232B7FC: .word 0x02352AEC +_0232B7FC: .word ov29_02352AEC arm_func_end DoMoveDefenseCurl arm_func_start DoMoveDecoy @@ -1562,7 +1562,7 @@ DoMoveMistBall: ; 0x0232B820 bl DealDamage cmp r0, #0 beq _0232B88C - ldr r1, _0232B898 ; =0x022C44E0 + ldr r1, _0232B898 ; =ov10_022C44E0 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1570,7 +1570,7 @@ DoMoveMistBall: ; 0x0232B820 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232B88C - ldr r0, _0232B89C ; =0x02352AE8 + ldr r0, _0232B89C ; =ov29_02352AE8 mov r3, r4 ldr r2, [r0] mov r0, r6 @@ -1584,8 +1584,8 @@ _0232B88C: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232B898: .word 0x022C44E0 -_0232B89C: .word 0x02352AE8 +_0232B898: .word ov10_022C44E0 +_0232B89C: .word ov29_02352AE8 arm_func_end DoMoveMistBall arm_func_start DoMoveDestinyBond @@ -1620,7 +1620,7 @@ DoMoveMirrorCoat: ; 0x0232B8D4 arm_func_start DoMoveCalmMind DoMoveCalmMind: ; 0x0232B8E4 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232B924 ; =0x02352AE8 + ldr r2, _0232B924 ; =ov29_02352AE8 mov r3, #1 ldr r2, [r2] mov r5, r0 @@ -1636,7 +1636,7 @@ DoMoveCalmMind: ; 0x0232B8E4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232B924: .word 0x02352AE8 +_0232B924: .word ov29_02352AE8 arm_func_end DoMoveCalmMind arm_func_start DoMoveHiddenPower @@ -1662,7 +1662,7 @@ DoMoveMetalClaw: ; 0x0232B940 bl DealDamage cmp r0, #0 beq _0232B9B8 - ldr r1, _0232B9CC ; =0x022C4554 + ldr r1, _0232B9CC ; =ov10_022C4554 mov r0, r6 ldrsh r2, [r1] mov r1, r6 @@ -1688,7 +1688,7 @@ _0232B9B8: add sp, sp, #0x10 bx lr .align 2, 0 -_0232B9CC: .word 0x022C4554 +_0232B9CC: .word ov10_022C4554 arm_func_end DoMoveMetalClaw arm_func_start DoMoveAttract @@ -1813,7 +1813,7 @@ DoMoveFrustration: ; 0x0232BB4C mov r4, r2 ldr ip, [r6, #0xb4] mov sb, #1 - ldr r3, _0232BC28 ; =0x022C4C3C + ldr r3, _0232BC28 ; =ov10_022C4C3C ldr r0, _0232BC2C ; =0x000003E7 b _0232BBA8 _0232BB80: @@ -1823,7 +1823,7 @@ _0232BB80: blt _0232BBB0 ldrsh r1, [ip, #0xe] cmp r1, r2 - ldrlt r0, _0232BC30 ; =0x022C4C3E + ldrlt r0, _0232BC30 ; =ov10_022C4C3E ldrltsh sb, [r0, r8] blt _0232BBB0 add r7, r7, #1 @@ -1862,9 +1862,9 @@ _0232BBB0: add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_0232BC28: .word 0x022C4C3C +_0232BC28: .word ov10_022C4C3C _0232BC2C: .word 0x000003E7 -_0232BC30: .word 0x022C4C3E +_0232BC30: .word ov10_022C4C3E arm_func_end DoMoveFrustration arm_func_start DoMoveLeechSeed @@ -1887,17 +1887,17 @@ DoMoveLeechSeed: ; 0x0232BC34 DoMoveMetronome: ; 0x0232BC64 stmdb sp!, {r3, r4, r5, r6, r7, lr} sub sp, sp, #8 - ldr r2, _0232BCB8 ; =0x0237CA88 + ldr r2, _0232BCB8 ; =ov29_0237CA88 mov r5, r0 ldr r6, [r2] - ldr r0, _0232BCBC ; =0x022C5DDC + ldr r0, _0232BCBC ; =ov10_022C5DDC mov r2, r6, lsl #3 mov r4, r1 ldrh r1, [r0, r2] add r0, sp, #0 mov r7, r3 bl InitMove - ldr r0, _0232BCC0 ; =0x022C5DE0 + ldr r0, _0232BCC0 ; =ov10_022C5DE0 add r2, sp, #0 ldr ip, [r0, r6, lsl #3] mov r0, r5 @@ -1907,9 +1907,9 @@ DoMoveMetronome: ; 0x0232BC64 add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232BCB8: .word 0x0237CA88 -_0232BCBC: .word 0x022C5DDC -_0232BCC0: .word 0x022C5DE0 +_0232BCB8: .word ov29_0237CA88 +_0232BCBC: .word ov10_022C5DDC +_0232BCC0: .word ov10_022C5DE0 arm_func_end DoMoveMetronome arm_func_start DoMoveDreamEater @@ -2036,8 +2036,8 @@ DoMoveRecycle: ; 0x0232BE44 mov sb, #0 cmp r0, #0 bne _0232BF34 - ldr r7, _0232BF68 ; =0x02353538 - ldr r8, _0232BF6C ; =0x020AF6B8 + ldr r7, _0232BF68 ; =ov29_02353538 + ldr r8, _0232BF6C ; =BAG_ITEMS_PTR_MIRROR mov sl, sb mov fp, #6 _0232BE74: @@ -2108,8 +2108,8 @@ _0232BF60: mov r0, sb ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0232BF68: .word 0x02353538 -_0232BF6C: .word 0x020AF6B8 +_0232BF68: .word ov29_02353538 +_0232BF6C: .word BAG_ITEMS_PTR_MIRROR _0232BF70: .word 0x00000EF3 _0232BF74: .word 0x00000EF4 arm_func_end DoMoveRecycle @@ -2150,7 +2150,7 @@ DoMoveDragonRage: ; 0x0232BF88 mov r3, #1 str r3, [sp, #0x14] str r2, [sp, #0x18] - ldr r2, _0232C024 ; =0x022C46D4 + ldr r2, _0232C024 ; =ov10_022C46D4 mov r1, r8 ldrsh r2, [r2] mov r0, r4 @@ -2164,13 +2164,13 @@ DoMoveDragonRage: ; 0x0232BF88 add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_0232C024: .word 0x022C46D4 +_0232C024: .word ov10_022C46D4 arm_func_end DoMoveDragonRage arm_func_start DoMoveDragonDance DoMoveDragonDance: ; 0x0232C028 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232C060 ; =0x02352AEC + ldr r2, _0232C060 ; =ov29_02352AEC mov r5, r0 ldr r2, [r2] mov r4, r1 @@ -2184,7 +2184,7 @@ DoMoveDragonDance: ; 0x0232C028 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232C060: .word 0x02352AEC +_0232C060: .word ov29_02352AEC arm_func_end DoMoveDragonDance arm_func_start DoMoveSkullBash @@ -2198,7 +2198,7 @@ DoMoveSkullBash: ; 0x0232C064 bl IsChargingTwoTurnMove cmp r0, #0 beq _0232C0C0 - ldr r1, _0232C0EC ; =0x022C48BC + ldr r1, _0232C0EC ; =ov10_022C48BC mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -2226,7 +2226,7 @@ _0232C0E4: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232C0EC: .word 0x022C48BC +_0232C0EC: .word ov10_022C48BC _0232C0F0: .word 0x00000CEB arm_func_end DoMoveSkullBash @@ -2254,7 +2254,7 @@ _0232C128: bl DealDamage cmp r0, #0 beq _0232C18C - ldr r1, _0232C19C ; =0x022C450C + ldr r1, _0232C19C ; =ov10_022C450C mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -2262,7 +2262,7 @@ _0232C128: bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232C18C - ldr r0, _0232C1A0 ; =0x02352AE8 + ldr r0, _0232C1A0 ; =ov29_02352AE8 mov r3, r6 ldr r2, [r0] mov r1, r4 @@ -2277,8 +2277,8 @@ _0232C18C: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _0232C198: .word 0x0000014F -_0232C19C: .word 0x022C450C -_0232C1A0: .word 0x02352AE8 +_0232C19C: .word ov10_022C450C +_0232C1A0: .word ov29_02352AE8 arm_func_end DoMoveDamageLowerSpecialDefense50 arm_func_start DoMoveStruggle diff --git a/asm/overlay_29_0232C524.s b/asm/overlay_29_0232C524.s index 01c9e9f4..cb2daae8 100644 --- a/asm/overlay_29_0232C524.s +++ b/asm/overlay_29_0232C524.s @@ -47,7 +47,7 @@ DoMoveCleanse: ; 0x0232C578 cmp r0, #0 bne _0232C66C mov fp, #1 - ldr r4, _0232C6A8 ; =0x020AF6B8 + ldr r4, _0232C6A8 ; =BAG_ITEMS_PTR_MIRROR mov r2, r6 mov r8, r6 mov r5, fp @@ -72,7 +72,7 @@ _0232C5E8: cmp r2, #0x32 blt _0232C5B0 mov r8, #0 - ldr r4, _0232C6AC ; =0x02353538 + ldr r4, _0232C6AC ; =ov29_02353538 mov fp, r8 mov r5, #1 _0232C604: @@ -122,8 +122,8 @@ _0232C698: mov r0, r6 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0232C6A8: .word 0x020AF6B8 -_0232C6AC: .word 0x02353538 +_0232C6A8: .word BAG_ITEMS_PTR_MIRROR +_0232C6AC: .word ov29_02353538 _0232C6B0: .word 0x00000EFF arm_func_end DoMoveCleanse @@ -132,7 +132,7 @@ DoMoveSiesta: ; 0x0232C6B4 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _0232C6EC ; =0x022C4720 + ldr r1, _0232C6EC ; =ov10_022C4720 mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -144,7 +144,7 @@ DoMoveSiesta: ; 0x0232C6B4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232C6EC: .word 0x022C4720 +_0232C6EC: .word ov10_022C4720 arm_func_end DoMoveSiesta arm_func_start DoMoveTwoEdge @@ -433,7 +433,7 @@ DoMoveEscape: ; 0x0232CA70 mov r1, r5 mov r2, r0 bl SubstitutePlaceholderStringTags - ldr r0, _0232CAFC ; =0x02353538 + ldr r0, _0232CAFC ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x790] cmp r0, #0 @@ -465,7 +465,7 @@ _0232CAF4: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232CAFC: .word 0x02353538 +_0232CAFC: .word ov29_02353538 _0232CB00: .word 0x00000F04 _0232CB04: .word 0x00000F03 arm_func_end DoMoveEscape @@ -514,7 +514,7 @@ _0232CB74: add r5, r1, r0 b _0232CBD0 _0232CB94: - ldr r0, _0232CCB4 ; =0x02353538 + ldr r0, _0232CCB4 ; =ov29_02353538 ldrb r2, [r4, #7] ldr r0, [r0] mov r1, #0x1c @@ -530,7 +530,7 @@ _0232CB94: add r4, r1, #1 add r5, r0, #1 _0232CBD0: - ldr r0, _0232CCB8 ; =0x02352B38 + ldr r0, _0232CCB8 ; =ov29_02352B38 ldrh r1, [r0] ldrh r0, [r0, #2] strh r1, [sp, #4] @@ -596,8 +596,8 @@ _0232CCA8: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0232CCB0: .word 0x00000F07 -_0232CCB4: .word 0x02353538 -_0232CCB8: .word 0x02352B38 +_0232CCB4: .word ov29_02353538 +_0232CCB8: .word ov29_02352B38 _0232CCBC: .word 0x00000F05 _0232CCC0: .word 0x00000F06 arm_func_end DoMoveTrapBuster @@ -612,12 +612,12 @@ DoMoveWildCall: ; 0x0232CCC4 mov r6, #0 mov r4, #0 cmp r0, #0 - ldrne r0, _0232CD88 ; =0x02353538 + ldrne r0, _0232CD88 ; =ov29_02353538 movne r5, #0x10 ldrne r0, [r0] moveq r5, #4 addne r0, r0, #0x338 - ldreq r0, _0232CD88 ; =0x02353538 + ldreq r0, _0232CD88 ; =ov29_02353538 mov fp, #1 ldreq r0, [r0] addeq r0, r0, #0x328 @@ -658,7 +658,7 @@ _0232CD80: mov r0, r6 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0232CD88: .word 0x02353538 +_0232CD88: .word ov29_02353538 _0232CD8C: .word 0x00000F08 arm_func_end DoMoveWildCall @@ -726,7 +726,7 @@ DoMoveHpGauge: ; 0x0232CE40 arm_func_start DoMoveVacuumCut DoMoveVacuumCut: ; 0x0232CE50 stmdb sp!, {r3, lr} - ldr ip, _0232CE78 ; =0x022C456C + ldr ip, _0232CE78 ; =ov10_022C456C str r3, [sp] ldrsh r3, [ip] bl ov29_02332F18 @@ -736,7 +736,7 @@ DoMoveVacuumCut: ; 0x0232CE50 and r0, r0, #0xff ldmia sp!, {r3, pc} .align 2, 0 -_0232CE78: .word 0x022C456C +_0232CE78: .word ov10_022C456C arm_func_end DoMoveVacuumCut arm_func_start DoMoveReviver @@ -809,14 +809,14 @@ DoMoveEcho: ; 0x0232CEAC arm_func_start DoMoveFamish DoMoveFamish: ; 0x0232CF54 stmdb sp!, {r3, lr} - ldr r2, _0232CF70 ; =0x022C45BC + ldr r2, _0232CF70 ; =ov10_022C45BC mov r3, #0 ldrsh r2, [r2] bl TryDecreaseBelly mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232CF70: .word 0x022C45BC +_0232CF70: .word ov10_022C45BC arm_func_end DoMoveFamish arm_func_start DoMoveOneRoom @@ -844,11 +844,11 @@ DoMoveFillIn: ; 0x0232CF84 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} _0232CFB8: ldrb r1, [r5, #0x4c] - ldr r0, _0232D0E4 ; =0x0235171C + ldr r0, _0232D0E4 ; =DIRECTIONS_XY ldrsh r3, [r6, #4] mov r1, r1, lsl #2 ldrsh r2, [r0, r1] - ldr r1, _0232D0E8 ; =0x0235171E + ldr r1, _0232D0E8 ; =ov29_0235171E add r0, sp, #0 add r2, r3, r2 strh r2, [sp] @@ -926,8 +926,8 @@ _0232D0D0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0232D0E0: .word 0x00000F0B -_0232D0E4: .word 0x0235171C -_0232D0E8: .word 0x0235171E +_0232D0E4: .word DIRECTIONS_XY +_0232D0E8: .word ov29_0235171E _0232D0EC: .word 0x00000F0A arm_func_end DoMoveFillIn @@ -1091,7 +1091,7 @@ DoMoveHealingWish: ; 0x0232D298 cmp r5, r4 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r2, _0232D2E4 ; =0x022C46F4 + ldr r2, _0232D2E4 ; =ov10_022C46F4 mov ip, #1 ldrsh r2, [r2] mov r3, #0 @@ -1105,7 +1105,7 @@ DoMoveHealingWish: ; 0x0232D298 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D2E4: .word 0x022C46F4 +_0232D2E4: .word ov10_022C46F4 arm_func_end DoMoveHealingWish arm_func_start DoMoveCloseCombat @@ -1119,7 +1119,7 @@ DoMoveCloseCombat: ; 0x0232D2E8 cmp r0, #0 moveq r0, #0 beq _0232D358 - ldr r0, _0232D360 ; =0x02352AEC + ldr r0, _0232D360 ; =ov29_02352AEC mov r3, #1 ldr r2, [r0] mov r0, r4 @@ -1128,7 +1128,7 @@ DoMoveCloseCombat: ; 0x0232D2E8 mov ip, #0 str ip, [sp, #4] bl LowerDefensiveStat - ldr r0, _0232D364 ; =0x02352AE8 + ldr r0, _0232D364 ; =ov29_02352AE8 mov r3, #1 ldr r2, [r0] mov r0, r4 @@ -1142,8 +1142,8 @@ _0232D358: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_0232D360: .word 0x02352AEC -_0232D364: .word 0x02352AE8 +_0232D360: .word ov29_02352AEC +_0232D364: .word ov29_02352AE8 arm_func_end DoMoveCloseCombat arm_func_start DoMoveLuckyChant @@ -1186,7 +1186,7 @@ _0232D3D4: .word 0x00000F2E arm_func_start DoMoveHealOrder DoMoveHealOrder: ; 0x0232D3D8 stmdb sp!, {r3, lr} - ldr r2, _0232D3FC ; =0x022C44B8 + ldr r2, _0232D3FC ; =ov10_022C44B8 mov ip, #1 ldrsh r2, [r2] mov r3, #0 @@ -1195,7 +1195,7 @@ DoMoveHealOrder: ; 0x0232D3D8 mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232D3FC: .word 0x022C44B8 +_0232D3FC: .word ov10_022C44B8 arm_func_end DoMoveHealOrder arm_func_start DoMoveHealBlock @@ -1219,7 +1219,7 @@ DoMoveThunderFang: ; 0x0232D418 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r1, _0232D4A4 ; =0x022C452C + ldr r1, _0232D4A4 ; =ov10_022C452C mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1232,7 +1232,7 @@ DoMoveThunderFang: ; 0x0232D418 mov r3, r2 bl TryInflictParalysisStatus _0232D46C: - ldr r1, _0232D4A8 ; =0x022C4678 + ldr r1, _0232D4A8 ; =ov10_022C4678 mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1248,8 +1248,8 @@ _0232D49C: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D4A4: .word 0x022C452C -_0232D4A8: .word 0x022C4678 +_0232D4A4: .word ov10_022C452C +_0232D4A8: .word ov10_022C4678 arm_func_end DoMoveThunderFang arm_func_start DoMoveDefog @@ -1276,7 +1276,7 @@ _0232D4E0: mov r1, r5 bl EndReflectClassStatus _0232D4FC: - ldr r1, _0232D554 ; =0x02352AE8 + ldr r1, _0232D554 ; =ov29_02352AE8 mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -1286,8 +1286,8 @@ _0232D4FC: bl GetApparentWeather cmp r0, #6 bne _0232D548 - ldr r1, _0232D558 ; =0x022C4654 - ldr r0, _0232D55C ; =0x02353538 + ldr r1, _0232D558 ; =ov10_022C4654 + ldr r0, _0232D55C ; =ov29_02353538 ldrsh r3, [r1] ldr r1, [r0] mov r0, #1 @@ -1300,9 +1300,9 @@ _0232D548: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0232D550: .word 0x00000ED2 -_0232D554: .word 0x02352AE8 -_0232D558: .word 0x022C4654 -_0232D55C: .word 0x02353538 +_0232D554: .word ov29_02352AE8 +_0232D558: .word ov10_022C4654 +_0232D55C: .word ov29_02353538 arm_func_end DoMoveDefog arm_func_start DoMoveTrumpCard @@ -1372,7 +1372,7 @@ DoMoveIceFang: ; 0x0232D620 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r1, _0232D6A8 ; =0x022C4518 + ldr r1, _0232D6A8 ; =ov10_022C4518 mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1384,7 +1384,7 @@ DoMoveIceFang: ; 0x0232D620 mov r2, #0 bl TryInflictFrozenStatus _0232D670: - ldr r1, _0232D6AC ; =0x022C453C + ldr r1, _0232D6AC ; =ov10_022C453C mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1400,8 +1400,8 @@ _0232D6A0: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D6A8: .word 0x022C4518 -_0232D6AC: .word 0x022C453C +_0232D6A8: .word ov10_022C4518 +_0232D6AC: .word ov10_022C453C arm_func_end DoMoveIceFang arm_func_start DoMovePsychoShift @@ -1550,7 +1550,7 @@ DoMoveShadowForce: ; 0x0232D860 bl IsChargingTwoTurnMove cmp r0, #0 beq _0232D8CC - ldr r1, _0232D8F4 ; =0x022C47DC + ldr r1, _0232D8F4 ; =ov10_022C47DC mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -1581,7 +1581,7 @@ _0232D8EC: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232D8F4: .word 0x022C47DC +_0232D8F4: .word ov10_022C47DC _0232D8F8: .word 0x00000CD7 arm_func_end DoMoveShadowForce @@ -1639,14 +1639,14 @@ DoMoveChargeBeam: ; 0x0232D97C cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r1, _0232D9DC ; =0x022C44F0 + ldr r1, _0232D9DC ; =ov10_022C44F0 mov r0, r5 ldrsh r2, [r1] mov r1, r4 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232D9D4 - ldr r1, _0232D9E0 ; =0x02352AE8 + ldr r1, _0232D9E0 ; =ov29_02352AE8 mov r0, r5 ldr r2, [r1] mov r1, r5 @@ -1656,8 +1656,8 @@ _0232D9D4: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D9DC: .word 0x022C44F0 -_0232D9E0: .word 0x02352AE8 +_0232D9DC: .word ov10_022C44F0 +_0232D9E0: .word ov29_02352AE8 arm_func_end DoMoveChargeBeam arm_func_start DoMoveDamageEatItem @@ -1671,7 +1671,7 @@ DoMoveDamageEatItem: ; 0x0232D9E4 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _0232DACC ; =0x02353538 + ldr r0, _0232DACC ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #8] cmp r0, #0 @@ -1726,7 +1726,7 @@ _0232DAC4: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232DACC: .word 0x02353538 +_0232DACC: .word ov29_02353538 arm_func_end DoMoveDamageEatItem arm_func_start DoMoveAcupressure @@ -1735,7 +1735,7 @@ DoMoveAcupressure: ; 0x0232DAD0 sub sp, sp, #0x10 mov r4, r1 ldr ip, [r4, #0xb4] - ldr r1, _0232DC44 ; =0x02352B3C + ldr r1, _0232DC44 ; =ov29_02352B3C mov r5, r0 add lr, sp, #0 ldmia r1, {r0, r1, r2, r3} @@ -1780,7 +1780,7 @@ _0232DB7C: ldr r0, [r1, r0, lsl #2] cmp r0, #0 bne _0232DBAC - ldr r1, _0232DC4C ; =0x02352AEC + ldr r1, _0232DC4C ; =ov29_02352AEC mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1790,7 +1790,7 @@ _0232DB7C: _0232DBAC: cmp r0, #2 bne _0232DBD0 - ldr r1, _0232DC4C ; =0x02352AEC + ldr r1, _0232DC4C ; =ov29_02352AEC mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1800,7 +1800,7 @@ _0232DBAC: _0232DBD0: cmp r0, #1 bne _0232DBF4 - ldr r1, _0232DC50 ; =0x02352AE8 + ldr r1, _0232DC50 ; =ov29_02352AE8 mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1810,7 +1810,7 @@ _0232DBD0: _0232DBF4: cmp r0, #3 bne _0232DC18 - ldr r1, _0232DC50 ; =0x02352AE8 + ldr r1, _0232DC50 ; =ov29_02352AE8 mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1831,10 +1831,10 @@ _0232DC38: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232DC44: .word 0x02352B3C +_0232DC44: .word ov29_02352B3C _0232DC48: .word 0x00000F0E -_0232DC4C: .word 0x02352AEC -_0232DC50: .word 0x02352AE8 +_0232DC4C: .word ov29_02352AEC +_0232DC50: .word ov29_02352AE8 arm_func_end DoMoveAcupressure arm_func_start DoMoveMagnetRise @@ -1900,7 +1900,7 @@ DoMoveLastResort: ; 0x0232DCD4 _0232DD10: cmp r0, #0 ble _0232DD44 - ldr r1, _0232DD70 ; =0x022C4944 + ldr r1, _0232DD70 ; =ov10_022C4944 sub r0, r0, #1 ldr r3, [r1, r0, lsl #2] mov r0, r8 @@ -1925,7 +1925,7 @@ _0232DD64: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_0232DD70: .word 0x022C4944 +_0232DD70: .word ov10_022C4944 _0232DD74: .word 0x00000EBC arm_func_end DoMoveLastResort @@ -2053,7 +2053,7 @@ DoMoveDamageHpDependent: ; 0x0232DE84 movle r5, #2 movgt r5, #3 _0232DF08: - ldr r4, _0232DF34 ; =0x022C49B4 + ldr r4, _0232DF34 ; =ov10_022C49B4 str r3, [sp] ldr r3, [r4, r5, lsl #2] bl DealDamage @@ -2065,7 +2065,7 @@ _0232DF08: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0232DF30: .word 0x000003E7 -_0232DF34: .word 0x022C49B4 +_0232DF34: .word ov10_022C49B4 arm_func_end DoMoveDamageHpDependent arm_func_start DoMoveHeartSwap @@ -2119,7 +2119,7 @@ DoMoveRoost: ; 0x0232DFC8 bl GetApparentWeather mov r3, #1 str r3, [sp] - ldr r1, _0232E07C ; =0x022C4964 + ldr r1, _0232E07C ; =ov10_022C4964 mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -2159,7 +2159,7 @@ _0232E070: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232E07C: .word 0x022C4964 +_0232E07C: .word ov10_022C4964 _0232E080: .word 0x00000CC9 arm_func_end DoMoveRoost @@ -2241,7 +2241,7 @@ DoMoveFlareBlitz: ; 0x0232E130 bl EntityIsValidMoveEffects__0232E250 cmp r0, #0 beq _0232E1B4 - ldr r1, _0232E248 ; =0x022C4684 + ldr r1, _0232E248 ; =ov10_022C4684 mov r0, r5 ldrsh r2, [r1] mov r1, r7 @@ -2295,6 +2295,6 @@ _0232E240: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232E248: .word 0x022C4684 +_0232E248: .word ov10_022C4684 _0232E24C: .word 0x000003E7 arm_func_end DoMoveFlareBlitz diff --git a/asm/overlay_29_0232E274.s b/asm/overlay_29_0232E274.s index 1d59e455..b28260af 100644 --- a/asm/overlay_29_0232E274.s +++ b/asm/overlay_29_0232E274.s @@ -6,13 +6,13 @@ arm_func_start DoMoveDefendOrder DoMoveDefendOrder: ; 0x0232E274 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232E2B0 ; =0x02352AEC + ldr r2, _0232E2B0 ; =ov29_02352AEC mov r3, #1 ldr r2, [r2] mov r5, r0 mov r4, r1 bl BoostDefensiveStat - ldr r1, _0232E2B4 ; =0x02352AE8 + ldr r1, _0232E2B4 ; =ov29_02352AE8 mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -21,8 +21,8 @@ DoMoveDefendOrder: ; 0x0232E274 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232E2B0: .word 0x02352AEC -_0232E2B4: .word 0x02352AE8 +_0232E2B0: .word ov29_02352AEC +_0232E2B4: .word ov29_02352AE8 arm_func_end DoMoveDefendOrder arm_func_start DoMoveFireFang @@ -42,7 +42,7 @@ DoMoveFireFang: ; 0x0232E2B8 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} - ldr r1, _0232E360 ; =0x022C4684 + ldr r1, _0232E360 ; =ov10_022C4684 mov r0, r7 ldrsh r2, [r1] mov r1, r6 @@ -56,7 +56,7 @@ DoMoveFireFang: ; 0x0232E2B8 str r2, [sp] bl TryInflictBurnStatus _0232E328: - ldr r1, _0232E364 ; =0x022C449C + ldr r1, _0232E364 ; =ov10_022C449C mov r0, r7 ldrsh r2, [r1] mov r1, r6 @@ -72,8 +72,8 @@ _0232E358: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232E360: .word 0x022C4684 -_0232E364: .word 0x022C449C +_0232E360: .word ov10_022C4684 +_0232E364: .word ov10_022C449C arm_func_end DoMoveFireFang arm_func_start DoMoveLunarDance @@ -84,7 +84,7 @@ DoMoveLunarDance: ; 0x0232E368 cmp r5, r4 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r2, _0232E3C8 ; =0x022C46F4 + ldr r2, _0232E3C8 ; =ov10_022C46F4 mov ip, #1 ldrsh r2, [r2] mov r3, #0 @@ -103,7 +103,7 @@ DoMoveLunarDance: ; 0x0232E368 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232E3C8: .word 0x022C46F4 +_0232E3C8: .word ov10_022C46F4 _0232E3CC: .word 0x000003E7 arm_func_end DoMoveLunarDance @@ -249,7 +249,7 @@ DoMoveCaptivate: ; 0x0232E560 bl DefenderAbilityIsActiveMoveEffects__0232DE20 cmp r0, #0 bne _0232E5D4 - ldr r0, _0232E61C ; =0x02352AE8 + ldr r0, _0232E61C ; =ov29_02352AE8 mov ip, #1 ldr r2, [r0] str ip, [sp] @@ -281,7 +281,7 @@ _0232E614: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232E61C: .word 0x02352AE8 +_0232E61C: .word ov29_02352AE8 _0232E620: .word 0x00000F0F arm_func_end DoMoveCaptivate @@ -296,7 +296,7 @@ DoMoveLeafStorm: ; 0x0232E624 cmp r0, #0 moveq r0, #0 beq _0232E670 - ldr r0, _0232E678 ; =0x02352AE8 + ldr r0, _0232E678 ; =ov29_02352AE8 mov ip, #0 ldr r2, [r0] str ip, [sp] @@ -310,7 +310,7 @@ _0232E670: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_0232E678: .word 0x02352AE8 +_0232E678: .word ov29_02352AE8 arm_func_end DoMoveLeafStorm arm_func_start DoMoveDracoMeteor @@ -327,7 +327,7 @@ DoMoveDracoMeteor: ; 0x0232E67C ldrsh r0, [sp, #0x10] cmp r0, #0 bne _0232E6D0 - ldr r0, _0232E6DC ; =0x02352AE8 + ldr r0, _0232E6DC ; =ov29_02352AE8 mov ip, #0 ldr r2, [r0] str ip, [sp] @@ -342,7 +342,7 @@ _0232E6D4: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_0232E6DC: .word 0x02352AE8 +_0232E6DC: .word ov29_02352AE8 arm_func_end DoMoveDracoMeteor arm_func_start DoMoveRockPolish @@ -365,14 +365,14 @@ DoMoveRockPolish: ; 0x0232E6E0 arm_func_start DoMoveNastyPlot DoMoveNastyPlot: ; 0x0232E714 stmdb sp!, {r3, lr} - ldr r2, _0232E730 ; =0x02352AE8 + ldr r2, _0232E730 ; =ov29_02352AE8 mov r3, #2 ldr r2, [r2] bl BoostOffensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232E730: .word 0x02352AE8 +_0232E730: .word ov29_02352AE8 arm_func_end DoMoveNastyPlot arm_func_start DoMoveTag0x1AB @@ -450,17 +450,17 @@ _0232E808: .word 0x000003E7 arm_func_start ov29_0232E80C ov29_0232E80C: ; 0x0232E80C stmdb sp!, {r3, lr} - ldr r0, _0232E83C ; =0x02353718 + ldr r0, _0232E83C ; =ov29_02353718 ldr r0, [r0] cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, pc} bl EntityIsValid__0232E840 cmp r0, #0 - ldrne r0, _0232E83C ; =0x02353718 + ldrne r0, _0232E83C ; =ov29_02353718 ldrne r0, [r0] moveq r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_0232E83C: .word 0x02353718 +_0232E83C: .word ov29_02353718 arm_func_end ov29_0232E80C diff --git a/asm/overlay_29_0232E864.s b/asm/overlay_29_0232E864.s index 9ec81f7e..8b450f32 100644 --- a/asm/overlay_29_0232E864.s +++ b/asm/overlay_29_0232E864.s @@ -7,42 +7,42 @@ ExecuteMoveEffect: ; 0x0232E864 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xf0 - ldr fp, _0232F7AC ; =0x022C45F8 + ldr fp, _0232F7AC ; =ov10_022C45F8 str r0, [sp, #0x14] ldrsh r0, [fp] - ldr r5, _0232F7B0 ; =0x02352AE8 - ldr sl, _0232F7B4 ; =0x022C483C + ldr r5, _0232F7B0 ; =ov29_02352AE8 + ldr sl, _0232F7B4 ; =ov10_022C483C ldr r7, [r5] str r0, [sp, #0x34] ldr r0, [sl] - ldr r4, _0232F7B8 ; =0x02352AEC + ldr r4, _0232F7B8 ; =ov29_02352AEC mov r8, r2 ldr r6, [r4] mov r2, #0 str r2, [sp, #0x78] str r6, [sp, #0xa0] - ldr r5, _0232F7BC ; =0x022C4468 + ldr r5, _0232F7BC ; =ov10_022C4468 str r0, [sp, #0x30] ldrsh r0, [r5] - ldr r4, _0232F7C0 ; =0x022C460C + ldr r4, _0232F7C0 ; =ov10_022C460C ldrh r6, [r8, #4] str r0, [sp, #0x2c] ldrsh r0, [r4] - ldr r2, _0232F7C4 ; =0x022C4480 - ldr ip, _0232F7C8 ; =0x022C4614 + ldr r2, _0232F7C4 ; =ov10_022C4480 + ldr ip, _0232F7C8 ; =ov10_022C4614 str r0, [sp, #0x28] ldrsh r0, [r2] - ldr lr, _0232F7CC ; =0x022C4508 + ldr lr, _0232F7CC ; =ov10_022C4508 mov sb, r1 str r0, [sp, #0x24] ldrsh r0, [ip] str r7, [sp, #0x9c] - ldr r1, _0232F7D0 ; =0x02353718 + ldr r1, _0232F7D0 ; =ov29_02353718 str r0, [sp, #0x20] ldrsh r0, [lr] mov r7, r3 str r0, [sp, #0x1c] - ldr r0, _0232F7D4 ; =0x022C4504 + ldr r0, _0232F7D4 ; =ov10_022C4504 ldrsh r0, [r0] str r0, [sp, #0x18] mov r0, #1 @@ -97,7 +97,7 @@ _0232E9B0: mov r0, r6 bl CanBeSnatched cmp r0, #0 - ldrne r0, _0232F7D8 ; =0x02353538 + ldrne r0, _0232F7D8 ; =ov29_02353538 ldrne r0, [r0] addne r0, r0, #0x19000 ldrne r5, [r0, #0x904] @@ -220,8 +220,8 @@ _0232EB84: and r0, r0, #7 str r0, [sp, #0x50] mov r2, r0, lsl #2 - ldr r0, _0232F7E8 ; =0x0235171C - ldr r3, _0232F7E8 ; =0x0235171C + ldr r0, _0232F7E8 ; =DIRECTIONS_XY + ldr r3, _0232F7E8 ; =DIRECTIONS_XY ldrsh r0, [r0, r2] ldr r2, [sp, #0x50] ldrsh ip, [r4, #6] @@ -407,8 +407,8 @@ _0232ED9C: mov r2, #0xec0 bl LogMessageByIdWithPopupCheckUserTarget _0232EE54: - ldr r1, _0232F800 ; =0x0237CA80 - ldr r0, _0232F804 ; =0x0237CA74 + ldr r1, _0232F800 ; =ov29_0237CA80 + ldr r0, _0232F804 ; =ov29_0237CA74 ldr r3, [r1] ldr r2, [r0] add r3, r3, #1 @@ -839,7 +839,7 @@ _0232F498: ldr r2, [sb, #0xb4] cmp r0, #2 cmpne r0, #0x69 - ldreq r0, _0232F838 ; =0x0237CA69 + ldreq r0, _0232F838 ; =ov29_0237CA69 moveq r1, #1 streqb r1, [r0] ldrh r1, [r8, #4] @@ -1049,29 +1049,29 @@ _0232F79C: strh r0, [r8, #2] b _0232F87C .align 2, 0 -_0232F7AC: .word 0x022C45F8 -_0232F7B0: .word 0x02352AE8 -_0232F7B4: .word 0x022C483C -_0232F7B8: .word 0x02352AEC -_0232F7BC: .word 0x022C4468 -_0232F7C0: .word 0x022C460C -_0232F7C4: .word 0x022C4480 -_0232F7C8: .word 0x022C4614 -_0232F7CC: .word 0x022C4508 -_0232F7D0: .word 0x02353718 -_0232F7D4: .word 0x022C4504 -_0232F7D8: .word 0x02353538 +_0232F7AC: .word ov10_022C45F8 +_0232F7B0: .word ov29_02352AE8 +_0232F7B4: .word ov10_022C483C +_0232F7B8: .word ov29_02352AEC +_0232F7BC: .word ov10_022C4468 +_0232F7C0: .word ov10_022C460C +_0232F7C4: .word ov10_022C4480 +_0232F7C8: .word ov10_022C4614 +_0232F7CC: .word ov10_022C4508 +_0232F7D0: .word ov29_02353718 +_0232F7D4: .word ov10_022C4504 +_0232F7D8: .word ov29_02353538 _0232F7DC: .word 0x00000EAB _0232F7E0: .word 0x00000EAC _0232F7E4: .word 0x00000EAD -_0232F7E8: .word 0x0235171C +_0232F7E8: .word DIRECTIONS_XY _0232F7EC: .word 0x00000163 _0232F7F0: .word 0x00000EB1 _0232F7F4: .word 0x00000EAE _0232F7F8: .word 0x00000EB2 _0232F7FC: .word 0x00000EAF -_0232F800: .word 0x0237CA80 -_0232F804: .word 0x0237CA74 +_0232F800: .word ov29_0237CA80 +_0232F804: .word ov29_0237CA74 _0232F808: .word 0x00000EB3 _0232F80C: .word 0x00000EB5 _0232F810: .word 0x00000EB4 @@ -1084,7 +1084,7 @@ _0232F828: .word 0x00000131 _0232F82C: .word 0x00000EBA _0232F830: .word 0x000001F6 _0232F834: .word 0x00000232 -_0232F838: .word 0x0237CA69 +_0232F838: .word ov29_0237CA69 _0232F83C: .word 0x00001307 _0232F840: .word 0x00001306 _0232F844: .word 0x00000EBC @@ -5203,7 +5203,7 @@ _023326CC: streq r0, [sp, #0x74] beq _02332704 ldr r0, [sp, #0x78] - ldr r1, _023329D4 ; =0x02353718 + ldr r1, _023329D4 ; =ov29_02353718 add r0, r0, #1 mov r0, r0, lsl #0x10 str r4, [r1] @@ -5259,7 +5259,7 @@ _02332790: mov r1, #0 bl DungeonRandOutcomeUserAction cmp r0, #0 - ldrne r0, _023329DC ; =0x0237CA68 + ldrne r0, _023329DC ; =ov29_0237CA68 movne r1, #1 strneb r1, [r0] _023327C8: @@ -5404,9 +5404,9 @@ _023329CC: add sp, sp, #0xf0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023329D4: .word 0x02353718 +_023329D4: .word ov29_02353718 _023329D8: .word 0x000001F6 -_023329DC: .word 0x0237CA68 +_023329DC: .word ov29_0237CA68 _023329E0: .word 0x0000023A _023329E4: .word 0x00000EC2 arm_func_end ov29_023326AC @@ -5692,7 +5692,7 @@ PerformDamageSequence: ; 0x02332D6C bl DefenderAbilityIsActive__02332A0C cmp r0, #0 beq _02332DFC - ldr r1, _02332F08 ; =0x02353538 + ldr r1, _02332F08 ; =ov29_02353538 ldr r2, _02332F0C ; =0x000003E7 ldr r0, [r1] add r0, r0, #0x700 @@ -5778,7 +5778,7 @@ _02332EFC: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _02332F04: .word 0x0000013A -_02332F08: .word 0x02353538 +_02332F08: .word ov29_02353538 _02332F0C: .word 0x000003E7 _02332F10: .word 0x0000270F _02332F14: .word 0x00000EC3 @@ -6474,10 +6474,10 @@ _02333834: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02333850: - ldr r1, _02333FA4 ; =0x02353538 + ldr r1, _02333FA4 ; =ov29_02353538 mov r2, #0xc ldr r1, [r1] - ldr r3, _02333FA8 ; =0x022C6322 + ldr r3, _02333FA8 ; =ov10_022C6322 add r1, r1, #0x4000 ldrsh r1, [r1, #0xd4] smulbb r1, r1, r2 @@ -6619,7 +6619,7 @@ _02333A1C: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02333A44: - ldr r0, _02333FA4 ; =0x02353538 + ldr r0, _02333FA4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xc000 ldrb r0, [r0, #0xd5b] @@ -6628,7 +6628,7 @@ _02333A44: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02333A64: - ldr r0, _02333FA4 ; =0x02353538 + ldr r0, _02333FA4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xc000 ldrb r0, [r0, #0xd5c] @@ -6643,7 +6643,7 @@ _02333A84: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02333A98: - ldr r0, _02333FA4 ; =0x02353538 + ldr r0, _02333FA4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x3000 ldrb r0, [r0, #0xe38] @@ -6747,7 +6747,7 @@ _02333BF4: mov r5, #0 cmp r0, #0 beq _02333C78 - ldr r6, _02333FA4 ; =0x02353538 + ldr r6, _02333FA4 ; =ov29_02353538 b _02333C60 _02333C0C: ldr r0, [r6] @@ -6781,7 +6781,7 @@ _02333C68: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02333C78: - ldr r6, _02333FA4 ; =0x02353538 + ldr r6, _02333FA4 ; =ov29_02353538 b _02333CD4 _02333C80: ldr r0, [r6] @@ -6825,7 +6825,7 @@ _02333D00: mov r5, #0 cmp r0, #0 beq _02333D78 - ldr r6, _02333FA4 ; =0x02353538 + ldr r6, _02333FA4 ; =ov29_02353538 b _02333D60 _02333D18: ldr r0, [r6] @@ -6856,7 +6856,7 @@ _02333D68: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02333D78: - ldr r6, _02333FA4 ; =0x02353538 + ldr r6, _02333FA4 ; =ov29_02353538 b _02333DC8 _02333D80: ldr r0, [r6] @@ -6898,7 +6898,7 @@ _02333DF8: mov r5, #0 cmp r0, #0 beq _02333E8C - ldr r6, _02333FA4 ; =0x02353538 + ldr r6, _02333FA4 ; =ov29_02353538 b _02333E74 _02333E10: ldr r0, [r6] @@ -6936,7 +6936,7 @@ _02333E7C: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} _02333E8C: - ldr r6, _02333FA4 ; =0x02353538 + ldr r6, _02333FA4 ; =ov29_02353538 b _02333EF8 _02333E94: ldr r0, [r6] @@ -7020,6 +7020,6 @@ _02333F90: _02333F98: .word 0x00000109 _02333F9C: .word 0x00000127 _02333FA0: .word 0x0000021E -_02333FA4: .word 0x02353538 -_02333FA8: .word 0x022C6322 +_02333FA4: .word ov29_02353538 +_02333FA8: .word ov10_022C6322 arm_func_end StatusCheckerCheck diff --git a/asm/overlay_29_02333FD0.s b/asm/overlay_29_02333FD0.s index fabc89e2..b9d8b0a7 100644 --- a/asm/overlay_29_02333FD0.s +++ b/asm/overlay_29_02333FD0.s @@ -997,13 +997,13 @@ _02334D34: movne r0, #0 ldmneia sp!, {r4, pc} _02334D40: - ldr r0, _02334D54 ; =0x02353538 + ldr r0, _02334D54 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xc000 ldrb r0, [r0, #0xd38] ldmia sp!, {r4, pc} .align 2, 0 -_02334D54: .word 0x02353538 +_02334D54: .word ov29_02353538 arm_func_end GetApparentWeather arm_func_start ov29_02334D58 @@ -1012,7 +1012,7 @@ ov29_02334D58: ; 0x02334D58 bl IsSecretFloor cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _02334DA4 ; =0x02353538 + ldr r0, _02334DA4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x28000 ldrb r0, [r0, #0x6b6] @@ -1029,12 +1029,12 @@ _02334D8C: bl TryActivateWeather ldmia sp!, {r3, pc} .align 2, 0 -_02334DA4: .word 0x02353538 +_02334DA4: .word ov29_02353538 arm_func_end ov29_02334D58 arm_func_start ov29_02334DA8 ov29_02334DA8: ; 0x02334DA8 - ldr r3, _02334E6C ; =0x02353538 + ldr r3, _02334E6C ; =ov29_02353538 mov r1, #0 ldr r2, [r3] add r2, r2, #0xc000 @@ -1059,7 +1059,7 @@ _02334DDC: strh r0, [r2, #0x4a] cmp r1, #8 blt _02334DDC - ldr r2, _02334E6C ; =0x02353538 + ldr r2, _02334E6C ; =ov29_02353538 mov r3, #9 ldr r1, [r2] add r1, r1, #0xc000 @@ -1086,7 +1086,7 @@ _02334E34: blt _02334E34 bx lr .align 2, 0 -_02334E6C: .word 0x02353538 +_02334E6C: .word ov29_02353538 arm_func_end ov29_02334DA8 arm_func_start ov29_02334E70 @@ -1105,7 +1105,7 @@ ov29_02334E70: ; 0x02334E70 bl AdvanceFrame mov r0, #1 bl AnimationDelayOrSomething - ldr r0, _0233503C ; =0x02353562 + ldr r0, _0233503C ; =ov29_02353562 mov r1, #1 ldrb fp, [r0] mov r4, #0 @@ -1117,7 +1117,7 @@ _02334EC0: bl AdvanceFrame mov r8, r6 _02334ED0: - ldr r0, _02335040 ; =0x02353538 + ldr r0, _02335040 ; =ov29_02353538 ldrb r7, [r5, r8, lsl #2] ldr sl, [r0] add r0, sl, r8, lsl #2 @@ -1140,7 +1140,7 @@ _02334ED0: subhi r0, r0, #0xa strhib r0, [r1, #0x1e0] _02334F28: - ldr r0, _02335040 ; =0x02353538 + ldr r0, _02335040 ; =ov29_02353538 add r1, r5, r8, lsl #2 ldr sl, [r0] ldrb r7, [r1, #1] @@ -1164,7 +1164,7 @@ _02334F28: subhi r0, r0, #0xa strhib r0, [r1, #0x1e1] _02334F84: - ldr r0, _02335040 ; =0x02353538 + ldr r0, _02335040 ; =ov29_02353538 add r1, r5, r8, lsl #2 ldr sl, [r0] ldrb r7, [r1, #2] @@ -1203,25 +1203,25 @@ _0233500C: cmp r4, #0x40 blt _02334EC0 _02335014: - ldr r0, _02335040 ; =0x02353538 + ldr r0, _02335040 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xc000 ldrb r0, [r0, #0xd38] bl ov29_02338A4C - ldr r1, _0233503C ; =0x02353562 + ldr r1, _0233503C ; =ov29_02353562 ldr r0, [sp] strb fp, [r1] bl ov29_02335044 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0233503C: .word 0x02353562 -_02335040: .word 0x02353538 +_0233503C: .word ov29_02353562 +_02335040: .word ov29_02353538 arm_func_end ov29_02334E70 arm_func_start ov29_02335044 ov29_02335044: ; 0x02335044 stmdb sp!, {r4, r5, r6, lr} - ldr r1, _023350D4 ; =0x02353538 + ldr r1, _023350D4 ; =ov29_02353538 mov r5, r0 ldr r0, [r1] add r0, r0, #0x1a000 @@ -1242,7 +1242,7 @@ _0233506C: mov r1, r1, lsr #0x10 bl LogMessageByIdWithPopupCheckUser _02335094: - ldr r4, _023350D4 ; =0x02353538 + ldr r4, _023350D4 ; =ov29_02353538 mov r5, #0 _0233509C: ldr r0, [r4] @@ -1261,5 +1261,5 @@ _023350C4: blt _0233509C ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023350D4: .word 0x02353538 +_023350D4: .word ov29_02353538 arm_func_end ov29_02335044 diff --git a/asm/overlay_29_023350FC.s b/asm/overlay_29_023350FC.s index 23885914..2bc615d3 100644 --- a/asm/overlay_29_023350FC.s +++ b/asm/overlay_29_023350FC.s @@ -2547,7 +2547,7 @@ DrawTileGrid: ; 0x02337428 ldr r2, _02337780 ; =0x02353538 ldrsh r8, [r5, r1] ldr r1, [r2] - ldr r2, _02337788 ; =0x0235171C + ldr r2, _02337788 ; =DIRECTIONS_XY add r1, r1, #0x1a000 strb r6, [r1, #0x251] mov r3, r7, lsl #2 @@ -2768,7 +2768,7 @@ _02337730: .align 2, 0 _02337780: .word 0x02353538 _02337784: .word 0x0001A224 -_02337788: .word 0x0235171C +_02337788: .word DIRECTIONS_XY _0233778C: .word 0x02352B9C _02337790: .word 0x02352D58 _02337794: .word 0x0001A226 diff --git a/asm/overlay_29_02337CCC.s b/asm/overlay_29_02337CCC.s index 0cd276a5..2e2fdc25 100644 --- a/asm/overlay_29_02337CCC.s +++ b/asm/overlay_29_02337CCC.s @@ -82,7 +82,7 @@ _02337D9C: add r6, r6, #1 cmp r6, #1 ble _02337D98 - ldr r4, _02337E28 ; =0x02353538 + ldr r4, _02337E28 ; =ov29_02353538 mov r5, #0 _02337DE4: ldr r0, [r4] @@ -105,7 +105,7 @@ _02337E0C: bl ov29_022E66C4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02337E28: .word 0x02353538 +_02337E28: .word ov29_02353538 arm_func_start ov29_02337E2C ov29_02337E2C: ; 0x02337E2C @@ -123,7 +123,7 @@ _02337E54: and r0, r0, #3 cmp r0, #2 bne _02337E80 - ldr r0, _02337E8C ; =0x02353538 + ldr r0, _02337E8C ; =ov29_02353538 ldr r1, _02337E90 ; =SECONDARY_TERRAIN_TYPES ldr r0, [r0] add r0, r0, #0x4000 @@ -137,24 +137,24 @@ _02337E84: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02337E8C: .word 0x02353538 +_02337E8C: .word ov29_02353538 _02337E90: .word SECONDARY_TERRAIN_TYPES arm_func_end ov29_02337E2C arm_func_start IsWaterTileset IsWaterTileset: ; 0x02337E94 - ldr r0, _02337EB8 ; =0x02353538 + ldr r0, _02337EB8 ; =ov29_02353538 mov r1, #0xc ldr r0, [r0] - ldr r2, _02337EBC ; =0x022C6327 + ldr r2, _02337EBC ; =ov10_022C6327 add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] smulbb r0, r0, r1 ldrb r0, [r2, r0] bx lr .align 2, 0 -_02337EB8: .word 0x02353538 -_02337EBC: .word 0x022C6327 +_02337EB8: .word ov29_02353538 +_02337EBC: .word ov10_022C6327 arm_func_end IsWaterTileset arm_func_start ov29_02337EC0 @@ -175,7 +175,7 @@ ov29_02337EC0: ; 0x02337EC0 ov29_02337EE8: ; 0x02337EE8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x20 - ldr r0, _02337F8C ; =0x02353538 + ldr r0, _02337F8C ; =ov29_02353538 ldr r4, _02337F90 ; =0x0000022A ldr r0, [r0] ldr r6, _02337F94 ; =0x000003D7 @@ -218,7 +218,7 @@ _02337F70: add sp, sp, #0x20 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02337F8C: .word 0x02353538 +_02337F8C: .word ov29_02353538 _02337F90: .word 0x0000022A _02337F94: .word 0x000003D7 arm_func_end ov29_02337EE8 @@ -227,7 +227,7 @@ _02337F94: .word 0x000003D7 GetRandomSpawnMonsterID: ; 0x02337F98 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x20 - ldr r0, _02338040 ; =0x02353538 + ldr r0, _02338040 ; =ov29_02353538 ldr r4, _02338044 ; =0x0000022A ldr r0, [r0] ldr r6, _02338048 ; =0x000003D7 @@ -271,7 +271,7 @@ _02338024: add sp, sp, #0x20 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02338040: .word 0x02353538 +_02338040: .word ov29_02353538 _02338044: .word 0x0000022A _02338048: .word 0x000003D7 arm_func_end GetRandomSpawnMonsterID @@ -289,7 +289,7 @@ ov29_0233804C: ; 0x0233804C mov r1, r0, lsl #0x10 mov r0, #0 mov r3, r1, asr #0x10 - ldr r5, _023380F4 ; =0x02353538 + ldr r5, _023380F4 ; =ov29_02353538 ldr lr, _023380F8 ; =0x000286F2 mov r2, r0 mov r1, r0 @@ -322,7 +322,7 @@ _02338088: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023380F4: .word 0x02353538 +_023380F4: .word ov29_02353538 _023380F8: .word 0x000286F2 arm_func_end ov29_0233804C @@ -333,7 +333,7 @@ ov29_023380FC: ; 0x023380FC ldr r0, [sb, #0xb4] mov r6, #0 ldrb r0, [r0, #6] - ldr r4, _023381BC ; =0x0235171C + ldr r4, _023381BC ; =DIRECTIONS_XY mov r8, r1 mov r7, r6 cmp r0, #0 @@ -380,7 +380,7 @@ _023381A0: mov r0, r7 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_023381BC: .word 0x0235171C +_023381BC: .word DIRECTIONS_XY arm_func_end ov29_023380FC arm_func_start ov29_023381C0 @@ -390,7 +390,7 @@ ov29_023381C0: ; 0x023381C0 mov r7, r1 mov r6, r2 mov r5, #0 - ldr r4, _02338284 ; =0x0235171C + ldr r4, _02338284 ; =DIRECTIONS_XY b _02338274 _023381DC: mov r1, r5, lsl #2 @@ -439,7 +439,7 @@ _02338274: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02338284: .word 0x0235171C +_02338284: .word DIRECTIONS_XY arm_func_end ov29_023381C0 arm_func_start NearbyAllyIqSkillIsEnabled @@ -462,7 +462,7 @@ ov29_023382A8: ; 0x023382A8 mov r6, #0 ldrb r0, [r0, #6] mov r5, #0 - ldr r4, _0233834C ; =0x0235171C + ldr r4, _0233834C ; =DIRECTIONS_XY cmp r0, #0 movne r6, #1 b _0233833C @@ -502,7 +502,7 @@ _0233833C: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0233834C: .word 0x0235171C +_0233834C: .word DIRECTIONS_XY arm_func_end ov29_023382A8 arm_func_start ov29_02338350 @@ -518,7 +518,7 @@ ov29_02338350: ; 0x02338350 arm_func_start ResetGravity ResetGravity: ; 0x0233836C - ldr r0, _02338388 ; =0x02353538 + ldr r0, _02338388 ; =ov29_02353538 ldr ip, _0233838C ; =MemZero ldr r0, [r0] mov r1, #2 @@ -526,19 +526,19 @@ ResetGravity: ; 0x0233836C add r0, r0, #0x12800 bx ip .align 2, 0 -_02338388: .word 0x02353538 +_02338388: .word ov29_02353538 _0233838C: .word MemZero arm_func_end ResetGravity arm_func_start GravityIsActive GravityIsActive: ; 0x02338390 - ldr r0, _023383A4 ; =0x02353538 + ldr r0, _023383A4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x12000 ldrb r0, [r0, #0xafc] bx lr .align 2, 0 -_023383A4: .word 0x02353538 +_023383A4: .word ov29_02353538 arm_func_end GravityIsActive arm_func_start ov29_023383A8 @@ -559,7 +559,7 @@ ov29_023383BC: ; 0x023383BC cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _02338424 ; =0x02353538 + ldr r0, _02338424 ; =ov29_02353538 ldr r0, [r0] add r2, r0, #0x12000 ldrb r0, [r2, #0xafc] @@ -581,7 +581,7 @@ _02338400: mov r0, #1 ldmia sp!, {r4, pc} .align 2, 0 -_02338424: .word 0x02353538 +_02338424: .word ov29_02353538 _02338428: .word 0x00000C06 _0233842C: .word 0x00000C05 arm_func_end ov29_023383BC @@ -603,21 +603,21 @@ ov29_02338430: ; 0x02338430 arm_func_start ov29_0233845C ov29_0233845C: ; 0x0233845C - ldr r1, _02338474 ; =0x02353538 + ldr r1, _02338474 ; =ov29_02353538 ldr r0, _02338478 ; =0x00012AFE ldr r1, [r1] mov r2, #0 strh r2, [r1, r0] bx lr .align 2, 0 -_02338474: .word 0x02353538 +_02338474: .word ov29_02353538 _02338478: .word 0x00012AFE arm_func_end ov29_0233845C arm_func_start ov29_0233847C ov29_0233847C: ; 0x0233847C stmdb sp!, {r4, lr} - ldr r1, _023384B8 ; =0x02353538 + ldr r1, _023384B8 ; =ov29_02353538 ldr r0, _023384BC ; =0x00012AFE ldr r3, [r1] ldrsh r2, [r3, r0] @@ -632,36 +632,36 @@ ov29_0233847C: ; 0x0233847C bl SetVictoriesOnOneFloor ldmia sp!, {r4, pc} .align 2, 0 -_023384B8: .word 0x02353538 +_023384B8: .word ov29_02353538 _023384BC: .word 0x00012AFE arm_func_end ov29_0233847C arm_func_start ShouldBoostKecleonShopSpawnChance ShouldBoostKecleonShopSpawnChance: ; 0x023384C0 - ldr r0, _023384D4 ; =0x02353538 + ldr r0, _023384D4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x12000 ldrb r0, [r0, #0xb24] bx lr .align 2, 0 -_023384D4: .word 0x02353538 +_023384D4: .word ov29_02353538 arm_func_end ShouldBoostKecleonShopSpawnChance arm_func_start SetShouldBoostKecleonShopSpawnChance SetShouldBoostKecleonShopSpawnChance: ; 0x023384D8 - ldr r1, _023384EC ; =0x02353538 + ldr r1, _023384EC ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x12000 strb r0, [r1, #0xb24] bx lr .align 2, 0 -_023384EC: .word 0x02353538 +_023384EC: .word ov29_02353538 arm_func_end SetShouldBoostKecleonShopSpawnChance arm_func_start UpdateShouldBoostKecleonShopSpawnChance UpdateShouldBoostKecleonShopSpawnChance: ; 0x023384F0 stmdb sp!, {r3, lr} - ldr r0, _0233852C ; =0x02353538 + ldr r0, _0233852C ; =ov29_02353538 mov r2, #0 ldr r1, [r0] mov r0, #0x5e @@ -669,42 +669,42 @@ UpdateShouldBoostKecleonShopSpawnChance: ; 0x023384F0 strb r2, [r1, #0xb24] bl TeamMemberHasExclusiveItemEffectActive cmp r0, #0 - ldrne r0, _0233852C ; =0x02353538 + ldrne r0, _0233852C ; =ov29_02353538 movne r1, #1 ldrne r0, [r0] addne r0, r0, #0x12000 strneb r1, [r0, #0xb24] ldmia sp!, {r3, pc} .align 2, 0 -_0233852C: .word 0x02353538 +_0233852C: .word ov29_02353538 arm_func_end UpdateShouldBoostKecleonShopSpawnChance arm_func_start ov29_02338530 ov29_02338530: ; 0x02338530 - ldr r0, _02338544 ; =0x02353538 + ldr r0, _02338544 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xc8] bx lr .align 2, 0 -_02338544: .word 0x02353538 +_02338544: .word ov29_02353538 arm_func_end ov29_02338530 arm_func_start SetDoughSeedFlag SetDoughSeedFlag: ; 0x02338548 - ldr r1, _0233855C ; =0x02353538 + ldr r1, _0233855C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strb r0, [r1, #0xc8] bx lr .align 2, 0 -_0233855C: .word 0x02353538 +_0233855C: .word ov29_02353538 arm_func_end SetDoughSeedFlag arm_func_start TrySpawnDoughSeedPoke TrySpawnDoughSeedPoke: ; 0x02338560 stmdb sp!, {r3, lr} - ldr r0, _023385BC ; =0x02353538 + ldr r0, _023385BC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xc8] @@ -713,7 +713,7 @@ TrySpawnDoughSeedPoke: ; 0x02338560 bl IsFullFloorFixedRoom cmp r0, #0 bne _023385A4 - ldr r1, _023385C0 ; =0x02352B5C + ldr r1, _023385C0 ; =ov29_02352B5C add r0, sp, #0 ldrh r2, [r1] strh r2, [sp] @@ -721,20 +721,20 @@ TrySpawnDoughSeedPoke: ; 0x02338560 strh r1, [sp, #2] bl ov29_02344E88 _023385A4: - ldr r0, _023385BC ; =0x02353538 + ldr r0, _023385BC ; =ov29_02353538 mov r1, #0 ldr r0, [r0] add r0, r0, #0x4000 strb r1, [r0, #0xc8] ldmia sp!, {r3, pc} .align 2, 0 -_023385BC: .word 0x02353538 -_023385C0: .word 0x02352B5C +_023385BC: .word ov29_02353538 +_023385C0: .word ov29_02352B5C arm_func_end TrySpawnDoughSeedPoke arm_func_start IsSecretBazaar IsSecretBazaar: ; 0x023385C4 - ldr r0, _023385E8 ; =0x02353538 + ldr r0, _023385E8 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] @@ -744,35 +744,35 @@ IsSecretBazaar: ; 0x023385C4 and r0, r0, #0xff bx lr .align 2, 0 -_023385E8: .word 0x02353538 +_023385E8: .word ov29_02353538 arm_func_end IsSecretBazaar arm_func_start ShouldBoostHiddenStairsSpawnChance ShouldBoostHiddenStairsSpawnChance: ; 0x023385EC - ldr r0, _02338600 ; =0x02353538 + ldr r0, _02338600 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x12000 ldrb r0, [r0, #0xb25] bx lr .align 2, 0 -_02338600: .word 0x02353538 +_02338600: .word ov29_02353538 arm_func_end ShouldBoostHiddenStairsSpawnChance arm_func_start SetShouldBoostHiddenStairsSpawnChance SetShouldBoostHiddenStairsSpawnChance: ; 0x02338604 - ldr r1, _02338618 ; =0x02353538 + ldr r1, _02338618 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x12000 strb r0, [r1, #0xb25] bx lr .align 2, 0 -_02338618: .word 0x02353538 +_02338618: .word ov29_02353538 arm_func_end SetShouldBoostHiddenStairsSpawnChance arm_func_start UpdateShouldBoostHiddenStairsSpawnChance UpdateShouldBoostHiddenStairsSpawnChance: ; 0x0233861C stmdb sp!, {r3, lr} - ldr r0, _02338658 ; =0x02353538 + ldr r0, _02338658 ; =ov29_02353538 mov r2, #0 ldr r1, [r0] mov r0, #0x5f @@ -780,19 +780,19 @@ UpdateShouldBoostHiddenStairsSpawnChance: ; 0x0233861C strb r2, [r1, #0xb25] bl TeamMemberHasExclusiveItemEffectActive cmp r0, #0 - ldrne r0, _02338658 ; =0x02353538 + ldrne r0, _02338658 ; =ov29_02353538 movne r1, #1 ldrne r0, [r0] addne r0, r0, #0x12000 strneb r1, [r0, #0xb25] ldmia sp!, {r3, pc} .align 2, 0 -_02338658: .word 0x02353538 +_02338658: .word ov29_02353538 arm_func_end UpdateShouldBoostHiddenStairsSpawnChance arm_func_start IsSecretRoom IsSecretRoom: ; 0x0233865C - ldr r0, _02338680 ; =0x02353538 + ldr r0, _02338680 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] @@ -802,7 +802,7 @@ IsSecretRoom: ; 0x0233865C and r0, r0, #0xff bx lr .align 2, 0 -_02338680: .word 0x02353538 +_02338680: .word ov29_02353538 arm_func_end IsSecretRoom arm_func_start IsSecretFloor @@ -838,7 +838,7 @@ ov29_023386B0: ; 0x023386B0 arm_func_start HiddenStairsPresent HiddenStairsPresent: ; 0x023386D8 - ldr r0, _02338704 ; =0x02353538 + ldr r0, _02338704 ; =ov29_02353538 mvn r1, #0 ldr r0, [r0] add r0, r0, #0xcc00 @@ -850,12 +850,12 @@ HiddenStairsPresent: ; 0x023386D8 movne r0, #1 bx lr .align 2, 0 -_02338704: .word 0x02353538 +_02338704: .word ov29_02353538 arm_func_end HiddenStairsPresent arm_func_start ov29_02338708 ov29_02338708: ; 0x02338708 - ldr r1, _02338738 ; =0x02353538 + ldr r1, _02338738 ; =ov29_02353538 ldrsh r2, [r0] ldr r1, [r1] add r1, r1, #0xcc00 @@ -868,7 +868,7 @@ ov29_02338708: ; 0x02338708 movne r0, #0 bx lr .align 2, 0 -_02338738: .word 0x02353538 +_02338738: .word ov29_02353538 arm_func_end ov29_02338708 arm_func_start ov29_0233873C @@ -877,14 +877,14 @@ ov29_0233873C: ; 0x0233873C bl HiddenStairsPresent cmp r0, #0 ldmeqia sp!, {r3, pc} - ldr r0, _02338764 ; =0x02353538 + ldr r0, _02338764 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xe8 add r0, r0, #0xcc00 bl ov29_02338768 ldmia sp!, {r3, pc} .align 2, 0 -_02338764: .word 0x02353538 +_02338764: .word ov29_02353538 arm_func_end ov29_0233873C arm_func_start ov29_02338768 @@ -909,7 +909,7 @@ HiddenStairsTrigger: ; 0x02338794 bl HiddenStairsPresent cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _02338848 ; =0x02353538 + ldr r0, _02338848 ; =ov29_02353538 ldr r0, [r0] add r1, r0, #0xcc00 ldrsh r0, [r1, #0xe8] @@ -920,7 +920,7 @@ HiddenStairsTrigger: ; 0x02338794 ldrb r0, [r0, #0x20] cmp r0, #0 ldmneia sp!, {r3, r4, r5, pc} - ldr r0, _02338848 ; =0x02353538 + ldr r0, _02338848 ; =ov29_02353538 ldr r2, [r0] add r0, r2, #0x1a000 ldrb r1, [r0, #0x246] @@ -941,7 +941,7 @@ HiddenStairsTrigger: ; 0x02338794 _0233881C: ldr r1, [r4, #0x10] mov r2, #1 - ldr r0, _02338848 ; =0x02353538 + ldr r0, _02338848 ; =ov29_02353538 strb r2, [r1, #0x20] ldr r0, [r0] add r1, r0, #0xcc00 @@ -951,63 +951,63 @@ _0233881C: bl UpdateTrapsVisibility ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02338848: .word 0x02353538 +_02338848: .word ov29_02353538 _0233884C: .word 0x00000F31 arm_func_end HiddenStairsTrigger arm_func_start ov29_02338850 ov29_02338850: ; 0x02338850 - ldr r0, _02338864 ; =0x02353538 + ldr r0, _02338864 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldr r0, [r0, #0xcc] bx lr .align 2, 0 -_02338864: .word 0x02353538 +_02338864: .word ov29_02353538 arm_func_end ov29_02338850 arm_func_start ov29_02338868 ov29_02338868: ; 0x02338868 - ldr r1, _0233887C ; =0x02353538 + ldr r1, _0233887C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 str r0, [r1, #0xcc] bx lr .align 2, 0 -_0233887C: .word 0x02353538 +_0233887C: .word ov29_02353538 arm_func_end ov29_02338868 arm_func_start GetDungeonGenInfoUnk0C GetDungeonGenInfoUnk0C: ; 0x02338880 - ldr r0, _02338894 ; =0x02353538 + ldr r0, _02338894 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldr r0, [r0, #0xd0] bx lr .align 2, 0 -_02338894: .word 0x02353538 +_02338894: .word ov29_02353538 arm_func_end GetDungeonGenInfoUnk0C arm_func_start ov29_02338898 ov29_02338898: ; 0x02338898 - ldr r1, _023388AC ; =0x02353538 + ldr r1, _023388AC ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 str r0, [r1, #0xd0] bx lr .align 2, 0 -_023388AC: .word 0x02353538 +_023388AC: .word ov29_02353538 arm_func_end ov29_02338898 arm_func_start ov29_023388B0 ov29_023388B0: ; 0x023388B0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 - ldr r0, _02338974 ; =0x02352F1C + ldr r0, _02338974 ; =ov29_02352F1C mov sl, #0 ldr r1, [r0, #4] ldr r0, [r0] - ldr r7, _02338978 ; =0x02352F40 + ldr r7, _02338978 ; =ov29_02352F40 add r8, sp, #0 str r1, [sp, #4] str r0, [sp] @@ -1033,40 +1033,40 @@ _023388E8: add sl, sl, #1 cmp sl, #3 blt _023388E8 - ldr r0, _0233897C ; =0x0237CACC + ldr r0, _0233897C ; =ov29_0237CACC mov r1, #0 bl ov29_02338D94 - ldr r0, _02338980 ; =0x0237CD40 + ldr r0, _02338980 ; =ov29_0237CD40 mov r1, #1 bl ov29_02338D94 - ldr r0, _02338984 ; =0x02352F7C - ldr r2, _0233897C ; =0x0237CACC + ldr r0, _02338984 ; =ov29_02352F7C + ldr r2, _0233897C ; =ov29_0237CACC mov r1, #0 ldr r4, [r0] strb r1, [r2, #0x240] ldr r3, [r0, #4] str r4, [r2, #0x254] - ldr r0, _02338980 ; =0x0237CD40 + ldr r0, _02338980 ; =ov29_0237CD40 str r3, [r2, #0x258] bl ov29_02338D34 add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02338974: .word 0x02352F1C -_02338978: .word 0x02352F40 -_0233897C: .word 0x0237CACC -_02338980: .word 0x0237CD40 -_02338984: .word 0x02352F7C +_02338974: .word ov29_02352F1C +_02338978: .word ov29_02352F40 +_0233897C: .word ov29_0237CACC +_02338980: .word ov29_0237CD40 +_02338984: .word ov29_02352F7C arm_func_end ov29_023388B0 arm_func_start ov29_02338988 ov29_02338988: ; 0x02338988 stmdb sp!, {r3, lr} - ldr r0, _023389BC ; =0x0237CACC + ldr r0, _023389BC ; =ov29_0237CACC bl ov29_02338D58 cmp r0, #0 bne _023389AC - ldr r0, _023389C0 ; =0x0237CD40 + ldr r0, _023389C0 ; =ov29_0237CD40 bl ov29_02338D58 cmp r0, #0 beq _023389B4 @@ -1077,8 +1077,8 @@ _023389B4: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_023389BC: .word 0x0237CACC -_023389C0: .word 0x0237CD40 +_023389BC: .word ov29_0237CACC +_023389C0: .word ov29_0237CD40 arm_func_end ov29_02338988 arm_func_start ov29_023389C4 @@ -1088,13 +1088,13 @@ ov29_023389C4: ; 0x023389C4 mov r4, r0 mov r0, #0xc mul r2, r4, r0 - ldr r1, _02338A3C ; =0x022C6326 - ldr r0, _02338A40 ; =0x0237CACC + ldr r1, _02338A3C ; =ov10_022C6326 + ldr r0, _02338A40 ; =ov29_0237CACC ldrb r1, [r1, r2] bl ov29_02338D34 cmp r4, #0xc3 bne _02338A34 - ldr r1, _02338A44 ; =0x02352F1C + ldr r1, _02338A44 ; =ov29_02352F1C ldr r2, _02338A48 ; =0x000003EB ldr r3, [r1, #0xc] ldr ip, [r1, #8] @@ -1115,25 +1115,25 @@ _02338A34: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_02338A3C: .word 0x022C6326 -_02338A40: .word 0x0237CACC -_02338A44: .word 0x02352F1C +_02338A3C: .word ov10_022C6326 +_02338A40: .word ov29_0237CACC +_02338A44: .word ov29_02352F1C _02338A48: .word 0x000003EB arm_func_end ov29_023389C4 arm_func_start ov29_02338A4C ov29_02338A4C: ; 0x02338A4C stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} - ldr r1, _02338AB4 ; =0x02353730 + ldr r1, _02338AB4 ; =ov29_02353730 mov r4, r0 ldrb r1, [r1, r4, lsl #3] - ldr r0, _02338AB8 ; =0x0237CD40 + ldr r0, _02338AB8 ; =ov29_0237CD40 bl ov29_02338D34 - ldr r1, _02338ABC ; =0x0235372C + ldr r1, _02338ABC ; =ov29_0235372C mov sb, #0 ldr r7, [r1, r4, lsl #3] - ldr r0, _02338AC0 ; =0x0237CACC - ldr r5, _02338AB8 ; =0x0237CD40 + ldr r0, _02338AC0 ; =ov29_0237CACC + ldr r5, _02338AB8 ; =ov29_0237CD40 str r7, [r0, #0x4e4] mov r6, sb mov r4, #0xc0 @@ -1152,10 +1152,10 @@ _02338A8C: blt _02338A84 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02338AB4: .word 0x02353730 -_02338AB8: .word 0x0237CD40 -_02338ABC: .word 0x0235372C -_02338AC0: .word 0x0237CACC +_02338AB4: .word ov29_02353730 +_02338AB8: .word ov29_0237CD40 +_02338ABC: .word ov29_0235372C +_02338AC0: .word ov29_0237CACC arm_func_end ov29_02338A4C arm_func_start ov29_02338AC4 @@ -1163,7 +1163,7 @@ ov29_02338AC4: ; 0x02338AC4 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r5, #0 _02338ACC: - ldr r1, _02338D28 ; =0x0237CACC + ldr r1, _02338D28 ; =ov29_0237CACC mov r0, #0x274 mla r6, r5, r0, r1 ldrb r0, [r6, #0x240] @@ -1326,7 +1326,7 @@ _02338D18: blt _02338ACC ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02338D28: .word 0x0237CACC +_02338D28: .word ov29_0237CACC _02338D2C: .word 0x00000FFF arm_func_end ov29_02338AC4 @@ -1337,7 +1337,7 @@ ov29_02338D30: ; 0x02338D30 arm_func_start ov29_02338D34 ov29_02338D34: ; 0x02338D34 - ldr r3, _02338D54 ; =0x02352F7C + ldr r3, _02338D54 ; =ov29_02352F7C strb r1, [r0, #0x240] add r2, r3, r1, lsl #3 ldr r3, [r3, r1, lsl #3] @@ -1346,7 +1346,7 @@ ov29_02338D34: ; 0x02338D34 str r1, [r0, #0x258] bx lr .align 2, 0 -_02338D54: .word 0x02352F7C +_02338D54: .word ov29_02352F7C arm_func_end ov29_02338D34 arm_func_start ov29_02338D58 @@ -1428,7 +1428,7 @@ _02338E04: arm_func_start ov29_02338E50 ov29_02338E50: ; 0x02338E50 - ldr r3, _02338F08 ; =0x02352F40 + ldr r3, _02338F08 ; =ov29_02352F40 mov r2, #0x14 mla r2, r1, r2, r3 ldr r3, [r2, #4] @@ -1440,7 +1440,7 @@ ov29_02338E50: ; 0x02338E50 strh r1, [r0, #0x1a] strh r1, [r0, #0x1c] ldrh r3, [r0, #0x14] - ldr r1, _02338F0C ; =0x020AFC70 + ldr r1, _02338F0C ; =_020AFC70 bic r3, r3, #7 orr r3, r3, #4 strh r3, [r0, #0x14] @@ -1475,128 +1475,128 @@ ov29_02338E50: ; 0x02338E50 strb r1, [r0, #0x3e] bx lr .align 2, 0 -_02338F08: .word 0x02352F40 -_02338F0C: .word 0x020AFC70 +_02338F08: .word ov29_02352F40 +_02338F0C: .word _020AFC70 arm_func_end ov29_02338E50 arm_func_start ov29_02338F10 ov29_02338F10: ; 0x02338F10 - ldr r0, _02338F20 ; =0x0235376C + ldr r0, _02338F20 ; =ov29_0235376C mov r1, #0x64 strh r1, [r0, #2] bx lr .align 2, 0 -_02338F20: .word 0x0235376C +_02338F20: .word ov29_0235376C arm_func_end ov29_02338F10 arm_func_start ov29_02338F24 ov29_02338F24: ; 0x02338F24 - ldr r2, _02338F34 ; =0x0235376C + ldr r2, _02338F34 ; =ov29_0235376C strh r0, [r2, #2] strh r1, [r2, #4] bx lr .align 2, 0 -_02338F34: .word 0x0235376C +_02338F34: .word ov29_0235376C arm_func_end ov29_02338F24 arm_func_start ov29_02338F38 ov29_02338F38: ; 0x02338F38 - ldr r1, _02338F44 ; =0x0237CFB8 + ldr r1, _02338F44 ; =ov29_0237CFB8 strb r0, [r1, #2] bx lr .align 2, 0 -_02338F44: .word 0x0237CFB8 +_02338F44: .word ov29_0237CFB8 arm_func_end ov29_02338F38 arm_func_start ov29_02338F48 ov29_02338F48: ; 0x02338F48 - ldr r1, _02338F54 ; =0x0237CFB8 + ldr r1, _02338F54 ; =ov29_0237CFB8 strb r0, [r1] bx lr .align 2, 0 -_02338F54: .word 0x0237CFB8 +_02338F54: .word ov29_0237CFB8 arm_func_end ov29_02338F48 arm_func_start ov29_02338F58 ov29_02338F58: ; 0x02338F58 - ldr r1, _02338F64 ; =0x0235376C + ldr r1, _02338F64 ; =ov29_0235376C strb r0, [r1, #1] bx lr .align 2, 0 -_02338F64: .word 0x0235376C +_02338F64: .word ov29_0235376C arm_func_end ov29_02338F58 arm_func_start ov29_02338F68 ov29_02338F68: ; 0x02338F68 stmdb sp!, {r3, lr} ldr r1, _02338FBC ; =0x0000040B - ldr r2, _02338FC0 ; =0x02353784 + ldr r2, _02338FC0 ; =ov29_02353784 mov r0, #4 mov r3, #0 bl AllocAndLoadFileInPack - ldr r1, _02338FC4 ; =0x0235376C + ldr r1, _02338FC4 ; =ov29_0235376C add r0, sp, #0 ldr r1, [r1, #0x18] bl HandleSir0Translation ldr r1, [sp] - ldr r0, _02338FC4 ; =0x0235376C + ldr r0, _02338FC4 ; =ov29_0235376C str r1, [r0, #8] bl GetMinimapData add r0, r0, #0xe000 mov r2, #0 - ldr r1, _02338FC4 ; =0x0235376C + ldr r1, _02338FC4 ; =ov29_0235376C strb r2, [r0, #0x447] str r2, [r1, #0xc] strb r2, [r1] ldmia sp!, {r3, pc} .align 2, 0 _02338FBC: .word 0x0000040B -_02338FC0: .word 0x02353784 -_02338FC4: .word 0x0235376C +_02338FC0: .word ov29_02353784 +_02338FC4: .word ov29_0235376C arm_func_end ov29_02338F68 arm_func_start ov29_02338FC8 ov29_02338FC8: ; 0x02338FC8 stmdb sp!, {r3, lr} - ldr r0, _02339000 ; =0x0235376C + ldr r0, _02339000 ; =ov29_0235376C ldr r0, [r0, #8] cmp r0, #0 beq _02338FF0 - ldr r0, _02339004 ; =0x02353784 + ldr r0, _02339004 ; =ov29_02353784 bl UnloadFile - ldr r0, _02339000 ; =0x0235376C + ldr r0, _02339000 ; =ov29_0235376C mov r1, #0 str r1, [r0, #8] _02338FF0: - ldr r0, _02339008 ; =0x0237CFB8 + ldr r0, _02339008 ; =ov29_0237CFB8 mov r1, #0 strb r1, [r0, #2] ldmia sp!, {r3, pc} .align 2, 0 -_02339000: .word 0x0235376C -_02339004: .word 0x02353784 -_02339008: .word 0x0237CFB8 +_02339000: .word ov29_0235376C +_02339004: .word ov29_02353784 +_02339008: .word ov29_0237CFB8 arm_func_end ov29_02338FC8 arm_func_start ov29_0233900C ov29_0233900C: ; 0x0233900C stmdb sp!, {r3, lr} - ldr r0, _02339044 ; =0x0235352C + ldr r0, _02339044 ; =ov29_0235352C ldr r0, [r0] add r0, r0, #0x20 bl ov29_022DE288 - ldr r1, _02339044 ; =0x0235352C - ldr r2, _02339048 ; =0x0235376C + ldr r1, _02339044 ; =ov29_0235352C + ldr r2, _02339048 ; =ov29_0235376C ldr r1, [r1] str r0, [r2, #0x10] add r0, r1, #0x2c bl ov29_022DE288 - ldr r1, _02339048 ; =0x0235376C + ldr r1, _02339048 ; =ov29_0235376C str r0, [r1, #0x14] ldmia sp!, {r3, pc} .align 2, 0 -_02339044: .word 0x0235352C -_02339048: .word 0x0235376C +_02339044: .word ov29_0235352C +_02339048: .word ov29_0235376C arm_func_end ov29_0233900C arm_func_start ov29_0233904C @@ -1633,7 +1633,7 @@ _02339080: cmp r6, #0x10 blt _02339064 cmp fp, #0 - ldreq r0, _02339110 ; =0x0235376C + ldreq r0, _02339110 ; =ov29_0235376C moveq r1, #0x64 streqh r1, [r0, #2] streqh r1, [r0, #4] @@ -1642,24 +1642,24 @@ _02339080: str r3, [r0, #0x440] mov r2, #1 strb r2, [r0, #0x444] - ldr r1, _02339114 ; =0x0237CFB8 + ldr r1, _02339114 ; =ov29_0237CFB8 strb r3, [r0, #0x446] strb r2, [r1, #3] bl ov29_0233900C bl ov29_022E7F7C - ldr r0, _02339114 ; =0x0237CFB8 + ldr r0, _02339114 ; =ov29_0237CFB8 mov r1, #1 strb r1, [r0, #2] bl ov29_02339148 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02339110: .word 0x0235376C -_02339114: .word 0x0237CFB8 +_02339110: .word ov29_0235376C +_02339114: .word ov29_0237CFB8 arm_func_end ov29_0233904C arm_func_start GetMinimapData GetMinimapData: ; 0x02339118 - ldr r0, _02339134 ; =0x02353538 + ldr r0, _02339134 ; =ov29_02353538 ldr r0, [r0] cmp r0, #0 addne r0, r0, #0x264 @@ -1667,7 +1667,7 @@ GetMinimapData: ; 0x02339118 moveq r0, #0 bx lr .align 2, 0 -_02339134: .word 0x02353538 +_02339134: .word ov29_02353538 arm_func_end GetMinimapData arm_func_start ov29_02339138 @@ -1681,10 +1681,10 @@ ov29_02339138: ; 0x02339138 arm_func_start ov29_02339148 ov29_02339148: ; 0x02339148 stmdb sp!, {r4, lr} - ldr r0, _02339188 ; =0x02353538 + ldr r0, _02339188 ; =ov29_02353538 mov r2, #0xc ldr r0, [r0] - ldr r3, _0233918C ; =0x022C631C + ldr r3, _0233918C ; =ov10_022C631C add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] mov r1, #0 @@ -1697,41 +1697,41 @@ ov29_02339148: ; 0x02339148 bl ov29_0233A548 ldmia sp!, {r4, pc} .align 2, 0 -_02339188: .word 0x02353538 -_0233918C: .word 0x022C631C +_02339188: .word ov29_02353538 +_0233918C: .word ov10_022C631C arm_func_end ov29_02339148 arm_func_start ov29_02339190 ov29_02339190: ; 0x02339190 stmdb sp!, {r3, lr} - ldr r2, _023391B8 ; =0x0235376C + ldr r2, _023391B8 ; =ov29_0235376C ldr r2, [r2, #8] cmp r2, #0 - ldrne r2, _023391BC ; =0x0237CFB8 + ldrne r2, _023391BC ; =ov29_0237CFB8 ldrneb r2, [r2, #2] cmpne r2, #0 ldmeqia sp!, {r3, pc} bl ov29_0233A548 ldmia sp!, {r3, pc} .align 2, 0 -_023391B8: .word 0x0235376C -_023391BC: .word 0x0237CFB8 +_023391B8: .word ov29_0235376C +_023391BC: .word ov29_0237CFB8 arm_func_end ov29_02339190 arm_func_start ov29_023391C0 ov29_023391C0: ; 0x023391C0 - ldr r0, _023391E4 ; =0x02353538 + ldr r0, _023391E4 ; =ov29_02353538 mov r1, #0xc ldr r0, [r0] - ldr r2, _023391E8 ; =0x022C631C + ldr r2, _023391E8 ; =ov10_022C631C add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] smulbb r0, r0, r1 ldr r0, [r2, r0] bx lr .align 2, 0 -_023391E4: .word 0x02353538 -_023391E8: .word 0x022C631C +_023391E4: .word ov29_02353538 +_023391E8: .word ov10_022C631C arm_func_end ov29_023391C0 arm_func_start DrawMinimapTile @@ -1741,17 +1741,17 @@ DrawMinimapTile: ; 0x023391EC mov sl, r0 mov sb, r1 bl GetMinimapData - ldr r2, _023398C4 ; =0x02352FCC - ldr r3, _023398C8 ; =0x02353538 + ldr r2, _023398C4 ; =ov29_02352FCC + ldr r3, _023398C8 ; =ov29_02353538 ldrh r4, [r2] ldr r5, [r3] ldrh r3, [r2, #2] - ldr r1, _023398CC ; =0x0235376C + ldr r1, _023398CC ; =ov29_0235376C mov r7, #1 ldr r2, [r1, #8] mov fp, r0 cmp r2, #0 - ldrne r0, _023398D0 ; =0x0237CFB8 + ldrne r0, _023398D0 ; =ov29_0237CFB8 str r7, [sp, #0x14] ldrneb r0, [r0, #2] add r1, r5, #0x21c @@ -1792,7 +1792,7 @@ DrawMinimapTile: ; 0x023391EC ldrb r1, [r4, #0x33] cmp r1, #0 movne r1, #0 - ldreq r1, _023398D0 ; =0x0237CFB8 + ldreq r1, _023398D0 ; =ov29_0237CFB8 ldreqb r1, [r1, #3] and r1, r1, #0xff str r1, [sp, #8] @@ -1827,7 +1827,7 @@ _02339318: _02339344: bl sub_0204AF30 cmp r0, #0 - ldreq r0, _023398CC ; =0x0235376C + ldreq r0, _023398CC ; =ov29_0235376C ldreqb r1, [r0, #1] cmpeq r1, #0 beq _02339788 @@ -1838,7 +1838,7 @@ _02339344: ldr r0, [r6, #0xc] str r0, [sp, #4] cmp r0, #0 - ldrne r0, _023398D0 ; =0x0237CFB8 + ldrne r0, _023398D0 ; =ov29_0237CFB8 ldrneb r0, [r0, #3] cmpne r0, #0 beq _0233946C @@ -1896,7 +1896,7 @@ _0233943C: ldrb r0, [r0, #7] cmp r0, #0 beq _02339468 - ldr r0, _023398CC ; =0x0235376C + ldr r0, _023398CC ; =ov29_0235376C strh sl, [r0, #2] strh sb, [r0, #4] ldrb r0, [r4, #0x2d] @@ -1958,7 +1958,7 @@ _023394F4: beq _0233953C bl GetTrapInfo ldrb r1, [r0] - ldr r0, _023398D4 ; =0x02352FF4 + ldr r0, _023398D4 ; =ov29_02352FF4 mov r7, #0 ldrb r5, [r0, r1] b _0233963C @@ -2109,7 +2109,7 @@ _02339734: bl sub_0204AEC0 cmp r0, #0 bne _02339770 - ldr r0, _023398CC ; =0x0235376C + ldr r0, _023398CC ; =ov29_0235376C ldrb r0, [r0, #1] cmp r0, #0 addne r0, r5, #0x40 @@ -2136,7 +2136,7 @@ _0233979C: mov r5, r0, asr #1 mov r0, #0x700 mul r7, r5, r0 - ldr r0, _023398CC ; =0x0235376C + ldr r0, _023398CC ; =ov29_0235376C mov r2, sl, lsr #0x1f mov r4, r3, lsr #0x1f rsb r1, r2, sl, lsl #31 @@ -2155,7 +2155,7 @@ _0233979C: ldr r1, [r2, r1, lsl #2] mov r0, r6 bl InitMinimapDisplayTile - ldr r0, _023398CC ; =0x0235376C + ldr r0, _023398CC ; =ov29_0235376C ldrsh r1, [sp, #0x2e] ldr r0, [r0, #8] add r2, fp, #0x7000 @@ -2207,11 +2207,11 @@ _023398BC: add sp, sp, #0x30 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023398C4: .word 0x02352FCC -_023398C8: .word 0x02353538 -_023398CC: .word 0x0235376C -_023398D0: .word 0x0237CFB8 -_023398D4: .word 0x02352FF4 +_023398C4: .word ov29_02352FCC +_023398C8: .word ov29_02353538 +_023398CC: .word ov29_0235376C +_023398D0: .word ov29_0237CFB8 +_023398D4: .word ov29_02352FF4 arm_func_end DrawMinimapTile arm_func_start ov29_023398D8 @@ -2221,7 +2221,7 @@ ov29_023398D8: ; 0x023398D8 mla r6, r1, r2, r0 add r0, r0, #0xe000 mov r5, #0 - ldr r2, _02339928 ; =0x0235377C + ldr r2, _02339928 ; =ov29_0235377C strb r5, [r0, #0x445] ldr r7, [r2, r1, lsl #2] mov r4, #0x200 @@ -2239,20 +2239,20 @@ _0233991C: blo _02339900 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02339928: .word 0x0235377C +_02339928: .word ov29_0235377C arm_func_end ov29_023398D8 arm_func_start ov29_0233992C ov29_0233992C: ; 0x0233992C stmdb sp!, {r4, r5, r6, lr} - ldr r0, _02339A1C ; =0x02353538 + ldr r0, _02339A1C ; =ov29_02353538 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r4, r5, r6, pc} mov r4, #0 mov r5, r4 bl ov29_022EA408 - ldr r1, _02339A20 ; =0x0237CFB8 + ldr r1, _02339A20 ; =ov29_0237CFB8 ldrb r1, [r1] cmp r1, #0 beq _0233996C @@ -2311,26 +2311,26 @@ _02339A0C: str r1, [r0, #0x440] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02339A1C: .word 0x02353538 -_02339A20: .word 0x0237CFB8 +_02339A1C: .word ov29_02353538 +_02339A20: .word ov29_0237CFB8 arm_func_end ov29_0233992C arm_func_start ov29_02339A24 ov29_02339A24: ; 0x02339A24 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #8 - ldr r1, _02339CB8 ; =0x02353538 + ldr r1, _02339CB8 ; =ov29_02353538 mov r4, r0 ldr r0, [r1] add r0, r0, #0x1a000 ldrb r0, [r0, #0x249] cmp r0, #0 bne _02339CB0 - ldr r0, _02339CBC ; =0x0235376C + ldr r0, _02339CBC ; =ov29_0235376C ldrsh r0, [r0, #2] cmp r0, #0x64 bge _02339CB0 - ldr r0, _02339CC0 ; =0x0237CFB8 + ldr r0, _02339CC0 ; =ov29_0237CFB8 ldrb r1, [r0, #1] add r2, r1, #1 and r1, r2, #0xff @@ -2384,7 +2384,7 @@ ov29_02339A24: ; 0x02339A24 and r0, r0, r2 strh r0, [sp, #4] ldrh r0, [sp, #4] - ldr ip, _02339CBC ; =0x0235376C + ldr ip, _02339CBC ; =ov29_0235376C ldrh r3, [sp, #2] orr r5, r0, #0x70 add r0, r2, #0x200 @@ -2402,7 +2402,7 @@ ov29_02339A24: ; 0x02339A24 bic r1, r1, #0x2000 orr r6, r6, r2 orr r0, r3, #0xc000 - ldr r3, _02339CC4 ; =0x020AFC4C + ldr r3, _02339CC4 ; =_020AFC4C ldrh r5, [sp, #6] ldr r2, _02339CC8 ; =0xFFFF000F strh r1, [sp] @@ -2423,7 +2423,7 @@ ov29_02339A24: ; 0x02339A24 _02339BC0: cmp r4, #0 bne _02339CB0 - ldr r0, _02339CC0 ; =0x0237CFB8 + ldr r0, _02339CC0 ; =ov29_0237CFB8 ldrb r0, [r0] cmp r0, #0 beq _02339CB0 @@ -2445,7 +2445,7 @@ _02339BC0: ldrh r6, [sp, #2] add r2, r2, #0x200 orr r1, r0, #0xdd - ldr ip, _02339CBC ; =0x0235376C + ldr ip, _02339CBC ; =ov29_0235376C and r2, r6, r2 strh r2, [sp, #2] ldrsh r0, [ip, #2] @@ -2472,7 +2472,7 @@ _02339BC0: strh r0, [sp, #4] strh r1, [sp] ldrsh r1, [ip, #4] - ldr r4, _02339CC4 ; =0x020AFC4C + ldr r4, _02339CC4 ; =_020AFC4C ldrh r2, [sp, #6] ldr r0, [r4] mov r1, r1, lsl #0x16 @@ -2485,10 +2485,10 @@ _02339CB0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02339CB8: .word 0x02353538 -_02339CBC: .word 0x0235376C -_02339CC0: .word 0x0237CFB8 -_02339CC4: .word 0x020AFC4C +_02339CB8: .word ov29_02353538 +_02339CBC: .word ov29_0235376C +_02339CC0: .word ov29_0237CFB8 +_02339CC4: .word _020AFC4C _02339CC8: .word 0xFFFF000F _02339CCC: .word 0x0000013F _02339CD0: .word 0x000001DD @@ -2496,12 +2496,12 @@ _02339CD0: .word 0x000001DD arm_func_start ov29_02339CD4 ov29_02339CD4: ; 0x02339CD4 - ldr r0, _02339CE4 ; =0x0237CFB8 + ldr r0, _02339CE4 ; =ov29_0237CFB8 mov r1, #0 strb r1, [r0, #1] bx lr .align 2, 0 -_02339CE4: .word 0x0237CFB8 +_02339CE4: .word ov29_0237CFB8 arm_func_end ov29_02339CD4 arm_func_start UpdateMinimap @@ -2536,7 +2536,7 @@ _02339D10: strb r1, [r0, #0x447] ldmia sp!, {r4, r5, r6, pc} _02339D54: - ldr r0, _02339D78 ; =0x0235376C + ldr r0, _02339D78 ; =ov29_0235376C ldrb r0, [r0, #1] cmp r0, #0 ldmeqia sp!, {r4, r5, r6, pc} @@ -2546,7 +2546,7 @@ _02339D54: strb r1, [r0, #0x447] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02339D78: .word 0x0235376C +_02339D78: .word ov29_0235376C arm_func_end UpdateMinimap arm_func_start ov29_02339D7C @@ -2679,7 +2679,7 @@ _02339F18: ov29_02339F2C: ; 0x02339F2C stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr ip, _02339F60 ; =0x0235352C + ldr ip, _02339F60 ; =ov29_0235352C str r1, [sp, #4] ldr ip, [ip] mov r1, #0xc @@ -2691,12 +2691,12 @@ ov29_02339F2C: ; 0x02339F2C add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_02339F60: .word 0x0235352C +_02339F60: .word ov29_0235352C arm_func_end ov29_02339F2C arm_func_start ov29_02339F64 ov29_02339F64: ; 0x02339F64 - ldr r2, _02339F80 ; =0x0235352C + ldr r2, _02339F80 ; =ov29_0235352C mov r1, #0xc ldr r2, [r2] ldr ip, _02339F84 ; =sub_0200B330 @@ -2704,7 +2704,7 @@ ov29_02339F64: ; 0x02339F64 ldr r0, [r1, #0x24] bx ip .align 2, 0 -_02339F80: .word 0x0235352C +_02339F80: .word ov29_0235352C _02339F84: .word sub_0200B330 arm_func_end ov29_02339F64 @@ -2720,7 +2720,7 @@ ov29_02339F88: ; 0x02339F88 bl ov29_02339D7C ldmia sp!, {r4, pc} _02339FAC: - ldr r0, _02339FCC ; =0x0235376C + ldr r0, _02339FCC ; =ov29_0235376C ldrb r0, [r0, #1] cmp r0, #0 ldmeqia sp!, {r4, pc} @@ -2729,7 +2729,7 @@ _02339FAC: bl ov29_02339D7C ldmia sp!, {r4, pc} .align 2, 0 -_02339FCC: .word 0x0235376C +_02339FCC: .word ov29_0235376C arm_func_end ov29_02339F88 arm_func_start ov29_02339FD0 @@ -2844,7 +2844,7 @@ _0233A114: bl ov29_0233A01C ldmia sp!, {r4, pc} _0233A138: - ldr r0, _0233A158 ; =0x0235376C + ldr r0, _0233A158 ; =ov29_0235376C ldrb r0, [r0, #1] cmp r0, #0 ldmeqia sp!, {r4, pc} @@ -2853,7 +2853,7 @@ _0233A138: bl ov29_0233A01C ldmia sp!, {r4, pc} .align 2, 0 -_0233A158: .word 0x0235376C +_0233A158: .word ov29_0235376C arm_func_end ov29_0233A0E8 arm_func_start ov29_0233A15C @@ -2875,7 +2875,7 @@ _0233A17C: bl ov29_0233A01C ldmia sp!, {r4, pc} _0233A198: - ldr r0, _0233A1B8 ; =0x0235376C + ldr r0, _0233A1B8 ; =ov29_0235376C ldrb r0, [r0, #1] cmp r0, #0 ldmeqia sp!, {r4, pc} @@ -2884,7 +2884,7 @@ _0233A198: bl ov29_0233A01C ldmia sp!, {r4, pc} .align 2, 0 -_0233A1B8: .word 0x0235376C +_0233A1B8: .word ov29_0235376C arm_func_end ov29_0233A15C arm_func_start ov29_0233A1BC @@ -3096,7 +3096,7 @@ ov29_0233A470: ; 0x0233A470 add r2, r0, #0x21c0 add r5, r0, #0xe000 add ip, r2, #0xc000 - ldr r0, _0233A544 ; =0x0235377C + ldr r0, _0233A544 ; =ov29_0235377C mov r6, r4 b _0233A534 _0233A490: @@ -3147,14 +3147,14 @@ _0233A534: blt _0233A490 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0233A544: .word 0x0235377C +_0233A544: .word ov29_0235377C arm_func_end ov29_0233A470 arm_func_start ov29_0233A548 ov29_0233A548: ; 0x0233A548 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r2, _0233A5E0 ; =0x02352FD0 - ldr r7, _0233A5E4 ; =0x0235376C + ldr r2, _0233A5E0 ; =ov29_02352FD0 + ldr r7, _0233A5E4 ; =ov29_0235376C mov r6, r1 add r5, r2, r0, lsl #2 mov r4, #0 @@ -3195,14 +3195,14 @@ _0233A5D0: blt _0233A560 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0233A5E0: .word 0x02352FD0 -_0233A5E4: .word 0x0235376C +_0233A5E0: .word ov29_02352FD0 +_0233A5E4: .word ov29_0235376C arm_func_end ov29_0233A548 arm_func_start ov29_0233A5E8 ov29_0233A5E8: ; 0x0233A5E8 stmdb sp!, {r4, lr} - ldr ip, _0233A620 ; =0x0235352C + ldr ip, _0233A620 ; =ov29_0235352C mov r3, #0xc ldr ip, [ip] mov lr, r0 @@ -3216,7 +3216,7 @@ ov29_0233A5E8: ; 0x0233A5E8 bl sub_0200A174 ldmia sp!, {r4, pc} .align 2, 0 -_0233A620: .word 0x0235352C +_0233A620: .word ov29_0235352C arm_func_end ov29_0233A5E8 arm_func_start LoadFixedRoomDataVeneer @@ -3231,14 +3231,14 @@ _0233A62C: .word LoadFixedRoomData ov29_0233A630: ; 0x0233A630 stmdb sp!, {r3, lr} bl ov29_02343DD8 - ldr r0, _0233A650 ; =0x02353538 + ldr r0, _0233A650 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] add r0, r0, #0x12000 str r1, [r0, #0xaa4] ldmia sp!, {r3, pc} .align 2, 0 -_0233A650: .word 0x02353538 +_0233A650: .word ov29_02353538 arm_func_end ov29_0233A630 arm_func_start IsNormalFloor @@ -3263,7 +3263,7 @@ IsNormalFloor: ; 0x0233A654 bl IsCurrentMissionType cmp r0, #0 bne _0233A6C4 - ldr r0, _0233A6D4 ; =0x02353538 + ldr r0, _0233A6D4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] @@ -3278,14 +3278,14 @@ _0233A6CC: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0233A6D4: .word 0x02353538 +_0233A6D4: .word ov29_02353538 arm_func_end IsNormalFloor arm_func_start GenerateFloor GenerateFloor: ; 0x0233A6D8 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x54 - ldr r2, _0233AE64 ; =0x02353538 + ldr r2, _0233AE64 ; =ov29_02353538 mov r8, #0 ldr r3, [r2] ldr r0, _0233AE68 ; =0x000286B2 @@ -3297,8 +3297,8 @@ GenerateFloor: ; 0x0233A6D8 strh r8, [r0, #0xc2] bl LoadFixedRoomDataVeneer bl ov29_02343DC4 - ldr r1, _0233AE64 ; =0x02353538 - ldr r2, _0233AE6C ; =0x0237CFBC + ldr r1, _0233AE64 ; =ov29_02353538 + ldr r2, _0233AE6C ; =ov29_0237CFBC ldr r1, [r1] mov r3, r8 add r1, r1, #0x12000 @@ -3308,16 +3308,16 @@ GenerateFloor: ; 0x0233A6D8 strb r3, [r2, #7] bl ResetHiddenStairsSpawn bl IsOutlawMonsterHouseFloor - ldr r1, _0233AE64 ; =0x02353538 - ldr r3, _0233AE6C ; =0x0237CFBC + ldr r1, _0233AE64 ; =ov29_02353538 + ldr r3, _0233AE6C ; =ov29_0237CFBC ldr r2, [r1] mov r1, sb add r2, r2, #0xc4 strb r0, [r3, #8] add r0, r2, #0x4000 bl GetHiddenStairsType - ldr r1, _0233AE64 ; =0x02353538 - ldr r2, _0233AE6C ; =0x0237CFBC + ldr r1, _0233AE64 ; =ov29_02353538 + ldr r2, _0233AE6C ; =ov29_0237CFBC ldr r1, [r1] str r0, [r2, #0x2c] add r0, r1, #0x4000 @@ -3327,7 +3327,7 @@ GenerateFloor: ; 0x0233A6D8 mov r1, #0xff cmp r0, #2 moveq r2, #1 - ldr r0, _0233AE6C ; =0x0237CFBC + ldr r0, _0233AE6C ; =ov29_0237CFBC movne r2, r8 strb r2, [r0, #4] strb r1, [r0, #2] @@ -3335,7 +3335,7 @@ GenerateFloor: ; 0x0233A6D8 strb r1, [r0, #6] ldrb r0, [sb, #7] bl GetFinalKecleonShopSpawnChance - ldr r1, _0233AE6C ; =0x0237CFBC + ldr r1, _0233AE6C ; =ov29_0237CFBC strh r0, [r1, #0xc] ldrb r0, [sb, #8] strh r0, [r1, #0x10] @@ -3343,7 +3343,7 @@ GenerateFloor: ; 0x0233A6D8 cmp r0, #0 movne r0, #0x64 strneh r0, [r1, #0x10] - ldr r0, _0233AE6C ; =0x0237CFBC + ldr r0, _0233AE6C ; =ov29_0237CFBC mov r1, #1 strb r1, [r0] sub r1, r1, #2 @@ -3355,7 +3355,7 @@ GenerateFloor: ; 0x0233A6D8 bl IsNormalFloor cmp r0, #0 bne _0233A810 - ldr r0, _0233AE64 ; =0x02353538 + ldr r0, _0233AE64 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] add r0, r0, #0x700 @@ -3364,19 +3364,19 @@ GenerateFloor: ; 0x0233A6D8 _0233A810: ldrb r0, [sb, #6] bl abs - ldr r1, _0233AE64 ; =0x02353538 + ldr r1, _0233AE64 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x700 strh r0, [r1, #0x86] _0233A828: - ldr r3, _0233AE64 ; =0x02353538 + ldr r3, _0233AE64 ; =ov29_02353538 mov r7, #0 ldr r0, [r3] ldr r1, _0233AE74 ; =0x00012AFA add r0, r0, #0x4000 strb r7, [r0, #0xc5] ldr r0, [r3] - ldr r2, _0233AE6C ; =0x0237CFBC + ldr r2, _0233AE6C ; =ov29_0237CFBC add r0, r0, #0x4000 strb r7, [r0, #0xc6] ldr r0, [r3] @@ -3388,7 +3388,7 @@ _0233A828: str r0, [r2, #0x18] b _0233AD3C _0233A870: - ldr r1, _0233AE64 ; =0x02353538 + ldr r1, _0233AE64 ; =ov29_02353538 mov r0, #0 str r0, [sp] ldr r0, [r1] @@ -3397,7 +3397,7 @@ _0233A870: bl ResetImportantSpawnPositions mov r6, #0 mvn r5, #0 - ldr r4, _0233AE64 ; =0x02353538 + ldr r4, _0233AE64 ; =ov29_02353538 b _0233AC50 _0233A89C: ldr r0, [sp] @@ -3416,10 +3416,10 @@ _0233A8C8: cmp r6, #1 add r0, r0, #0x4000 strh r6, [r0, #0xde] - ldrge r0, _0233AE6C ; =0x0237CFBC + ldrge r0, _0233AE6C ; =ov29_0237CFBC movge r1, #0 strge r1, [r0, #0x18] - ldr r0, _0233AE6C ; =0x0237CFBC + ldr r0, _0233AE6C ; =ov29_0237CFBC mov r1, #0 strb r1, [r0, #5] strh r5, [r0, #0x20] @@ -3508,7 +3508,7 @@ _0233A9E4: add r2, r1, #0x4000 mov r1, #0xff strb r1, [r2, #0xc9] - ldr r1, _0233AE6C ; =0x0237CFBC + ldr r1, _0233AE6C ; =ov29_0237CFBC strle r0, [sp, #4] and r0, sl, #0xf cmp r0, #0xb @@ -3531,7 +3531,7 @@ _0233AA4C: ; jump table _0233AA7C: mov r0, #2 bl DungeonRandInt - ldr r1, _0233AE6C ; =0x0237CFBC + ldr r1, _0233AE6C ; =ov29_0237CFBC mov r2, #1 strb r2, [r1, #6] add r1, r0, #2 @@ -3543,7 +3543,7 @@ _0233AA7C: _0233AAA8: mov r0, #2 bl DungeonRandInt - ldr r1, _0233AE6C ; =0x0237CFBC + ldr r1, _0233AE6C ; =ov29_0237CFBC mov r2, #2 strb r2, [r1, #6] add r1, r0, #2 @@ -3605,7 +3605,7 @@ _0233AB64: _0233AB78: bl ResetInnerBoundaryTileRows bl EnsureImpassableTilesAreWalls - ldr r0, _0233AE6C ; =0x0237CFBC + ldr r0, _0233AE6C ; =ov29_0237CFBC ldrb r0, [r0, #5] cmp r0, #0 bne _0233AC4C @@ -3669,12 +3669,12 @@ _0233AC50: _0233AC58: cmp r6, #0xa bne _0233AC88 - ldr r0, _0233AE6C ; =0x0237CFBC + ldr r0, _0233AE6C ; =ov29_0237CFBC mvn r1, #0 strh r1, [r0, #0x20] strh r1, [r0, #0x22] bl GenerateOneRoomMonsterHouseFloor - ldr r0, _0233AE64 ; =0x02353538 + ldr r0, _0233AE64 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] add r0, r0, #0x4000 @@ -3700,7 +3700,7 @@ _0233ACA0: mov r1, r4 bl MarkEnemySpawns bl ResolveInvalidSpawns - ldr r0, _0233AE64 ; =0x02353538 + ldr r0, _0233AE64 ; =ov29_02353538 mvn r1, #0 ldr r0, [r0] add r0, r0, #0xcc00 @@ -3712,7 +3712,7 @@ _0233ACA0: bl GetFloorType cmp r0, #1 beq _0233AD44 - ldr r0, _0233AE64 ; =0x02353538 + ldr r0, _0233AE64 ; =ov29_02353538 mvn r2, #0 ldr r0, [r0] add r1, r0, #0xcc00 @@ -3733,13 +3733,13 @@ _0233AD3C: _0233AD44: cmp r7, #0xa bne _0233AD98 - ldr r0, _0233AE6C ; =0x0237CFBC + ldr r0, _0233AE6C ; =ov29_0237CFBC mvn r1, #0 strh r1, [r0, #0x20] strh r1, [r0, #0x22] bl ResetFloor bl GenerateOneRoomMonsterHouseFloor - ldr r0, _0233AE64 ; =0x02353538 + ldr r0, _0233AE64 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] add r0, r0, #0x4000 @@ -3753,29 +3753,29 @@ _0233AD44: bl MarkEnemySpawns bl ResolveInvalidSpawns _0233AD98: - ldr r0, _0233AE6C ; =0x0237CFBC + ldr r0, _0233AE6C ; =ov29_0237CFBC ldrsh r1, [r0, #0x20] cmp r1, #0 ldrgesh r0, [r0, #0x22] cmpge r0, #0 blt _0233ADCC bl GetKecleonIdToSpawnByFloor - ldr r1, _0233AE6C ; =0x0237CFBC + ldr r1, _0233AE6C ; =ov29_0237CFBC mov r2, r0 ldrsh r0, [r1, #0x20] ldrsh r1, [r1, #0x22] mov r3, #0 bl MarkShopkeeperSpawn _0233ADCC: - ldr r0, _0233AE6C ; =0x0237CFBC + ldr r0, _0233AE6C ; =ov29_0237CFBC ldr r0, [r0, #0x30] cmp r0, #0 - ldrlt r0, _0233AE64 ; =0x02353538 + ldrlt r0, _0233AE64 ; =ov29_02353538 movlt r1, #0 blt _0233ADF4 mov r0, sb bl ov29_023427E4 - ldr r0, _0233AE64 ; =0x02353538 + ldr r0, _0233AE64 ; =ov29_02353538 mov r1, #1 _0233ADF4: ldr r0, [r0] @@ -3786,13 +3786,13 @@ _0233ADF4: mov r1, r0 mov r3, #0x20 bl FlagHallwayJunctions - ldr r0, _0233AE6C ; =0x0237CFBC + ldr r0, _0233AE6C ; =ov29_0237CFBC ldrb r0, [r0, #4] cmp r0, #0 beq _0233AE28 bl ConvertSecondaryTerrainToChasms _0233AE28: - ldr r0, _0233AE64 ; =0x02353538 + ldr r0, _0233AE64 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] @@ -3809,9 +3809,9 @@ _0233AE58: add sp, sp, #0x54 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0233AE64: .word 0x02353538 +_0233AE64: .word ov29_02353538 _0233AE68: .word 0x000286B2 -_0233AE6C: .word 0x0237CFBC +_0233AE6C: .word ov29_0237CFBC _0233AE70: .word SECONDARY_TERRAIN_TYPES _0233AE74: .word 0x00012AFA arm_func_end GenerateFloor @@ -3835,11 +3835,11 @@ _0233AE90: .word DungeonRandInt arm_func_start ClearHiddenStairs ClearHiddenStairs: ; 0x0233AE94 stmdb sp!, {r3, lr} - ldr r0, _0233AF04 ; =0x0235378C + ldr r0, _0233AF04 ; =ov29_0235378C ldrb r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} - ldr r1, _0233AF08 ; =0x0237CFBC + ldr r1, _0233AF08 ; =ov29_0237CFBC mvn r2, #0 ldrsh r0, [r1, #0x1c] cmp r0, r2 @@ -3849,7 +3849,7 @@ ClearHiddenStairs: ; 0x0233AE94 bl GetTileSafe mov r2, #0 strh r2, [r0] - ldr r1, _0233AF08 ; =0x0237CFBC + ldr r1, _0233AF08 ; =ov29_0237CFBC strh r2, [r0, #2] ldrsh r0, [r1, #0x1c] ldrsh r1, [r1, #0x1e] @@ -3864,8 +3864,8 @@ _0233AEFC: bl ResetHiddenStairsSpawn ldmia sp!, {r3, pc} .align 2, 0 -_0233AF04: .word 0x0235378C -_0233AF08: .word 0x0237CFBC +_0233AF04: .word ov29_0235378C +_0233AF08: .word ov29_0237CFBC arm_func_end ClearHiddenStairs arm_func_start FlagHallwayJunctions @@ -4015,13 +4015,13 @@ GenerateStandardFloor: ; 0x0233B028 mov r1, r6 mov r2, r5 bl GenerateMazeRoom - ldr r3, _0233B18C ; =0x0237CFBC + ldr r3, _0233B18C ; =ov29_0237CFBC add r0, sp, #0x80 ldrsh r3, [r3, #0xc] mov r1, r6 mov r2, r5 bl GenerateKecleonShop - ldr r3, _0233B18C ; =0x0237CFBC + ldr r3, _0233B18C ; =ov29_0237CFBC add r0, sp, #0x80 ldrsh r3, [r3, #0x10] mov r1, r6 @@ -4044,7 +4044,7 @@ GenerateStandardFloor: ; 0x0233B028 add sp, sp, #0x1000 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0233B18C: .word 0x0237CFBC +_0233B18C: .word ov29_0237CFBC arm_func_end GenerateStandardFloor arm_func_start GenerateOuterRingFloor @@ -4325,13 +4325,13 @@ _0233B4A0: mov r2, #4 add r3, sp, #0x58 bl EnsureConnectedGrid - ldr r1, _0233B618 ; =0x0237CFBC + ldr r1, _0233B618 ; =ov29_0237CFBC add r0, sp, #0x94 ldrsh r3, [r1, #0xc] mov r1, #6 mov r2, #4 bl GenerateKecleonShop - ldr r1, _0233B618 ; =0x0237CFBC + ldr r1, _0233B618 ; =ov29_0237CFBC add r0, sp, #0x94 ldrsh r3, [r1, #0x10] mov r1, #6 @@ -4352,7 +4352,7 @@ _0233B4A0: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0233B614: .word 0x000001C2 -_0233B618: .word 0x0237CFBC +_0233B618: .word ov29_0237CFBC arm_func_end GenerateOuterRingFloor arm_func_start GenerateCrossroadsFloor @@ -4626,13 +4626,13 @@ _0233B9B0: mov r2, #4 str r4, [sp] bl EnsureConnectedGrid - ldr r1, _0233BA78 ; =0x0237CFBC + ldr r1, _0233BA78 ; =ov29_0237CFBC add r0, sp, #0x98 ldrsh r3, [r1, #0xc] mov r1, #5 mov r2, #4 bl GenerateKecleonShop - ldr r1, _0233BA78 ; =0x0237CFBC + ldr r1, _0233BA78 ; =ov29_0237CFBC add r0, sp, #0x98 ldrsh r3, [r1, #0x10] mov r1, #5 @@ -4653,7 +4653,7 @@ _0233B9B0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0233BA74: .word 0x000001C2 -_0233BA78: .word 0x0237CFBC +_0233BA78: .word ov29_0237CFBC arm_func_end GenerateCrossroadsFloor arm_func_start GenerateLineFloor @@ -4721,13 +4721,13 @@ GenerateLineFloor: ; 0x0233BA7C mov r2, #1 add r3, sp, #0x44 bl EnsureConnectedGrid - ldr r3, _0233BBD8 ; =0x0237CFBC + ldr r3, _0233BBD8 ; =ov29_0237CFBC add r0, sp, #0x80 ldrsh r3, [r3, #0xc] mov r1, #5 mov r2, #1 bl GenerateKecleonShop - ldr r1, _0233BBD8 ; =0x0237CFBC + ldr r1, _0233BBD8 ; =ov29_0237CFBC add r0, sp, #0x80 ldrsh r3, [r1, #0x10] mov r1, #5 @@ -4746,7 +4746,7 @@ GenerateLineFloor: ; 0x0233BA7C add sp, sp, #0x1000 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0233BBD8: .word 0x0237CFBC +_0233BBD8: .word ov29_0237CFBC arm_func_end GenerateLineFloor arm_func_start GenerateCrossFloor @@ -4829,13 +4829,13 @@ _0233BC58: mov r2, r1 str ip, [sp] bl EnsureConnectedGrid - ldr r1, _0233BD70 ; =0x0237CFBC + ldr r1, _0233BD70 ; =ov29_0237CFBC add r0, sp, #0x80 ldrsh r3, [r1, #0xc] mov r1, #3 mov r2, r1 bl GenerateKecleonShop - ldr r3, _0233BD70 ; =0x0237CFBC + ldr r3, _0233BD70 ; =ov29_0237CFBC mov r1, #3 ldrsh r3, [r3, #0x10] add r0, sp, #0x80 @@ -4855,7 +4855,7 @@ _0233BC58: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _0233BD6C: .word 0x000001C2 -_0233BD70: .word 0x0237CFBC +_0233BD70: .word ov29_0237CFBC arm_func_end GenerateCrossFloor arm_func_start GenerateBeetleFloor @@ -4948,13 +4948,13 @@ _0233BE48: mov r2, r1 add r3, sp, #0x44 bl EnsureConnectedGrid - ldr r3, _0233BF2C ; =0x0237CFBC + ldr r3, _0233BF2C ; =ov29_0237CFBC mov r1, #3 ldrsh r3, [r3, #0xc] add r0, sp, #0x80 mov r2, r1 bl GenerateKecleonShop - ldr r3, _0233BF2C ; =0x0237CFBC + ldr r3, _0233BF2C ; =ov29_0237CFBC mov r1, #3 ldrsh r3, [r3, #0x10] add r0, sp, #0x80 @@ -4974,7 +4974,7 @@ _0233BE48: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0233BF28: .word 0x000001C2 -_0233BF2C: .word 0x0237CFBC +_0233BF2C: .word ov29_0237CFBC arm_func_end GenerateBeetleFloor arm_func_start MergeRoomsVertically @@ -5217,13 +5217,13 @@ _0233C23C: mov r1, r6 mov r2, r5 bl GenerateMazeRoom - ldr r3, _0233C30C ; =0x0237CFBC + ldr r3, _0233C30C ; =ov29_0237CFBC add r0, sp, #0x80 ldrsh r3, [r3, #0xc] mov r1, r6 mov r2, r5 bl GenerateKecleonShop - ldr r3, _0233C30C ; =0x0237CFBC + ldr r3, _0233C30C ; =ov29_0237CFBC add r0, sp, #0x80 ldrsh r3, [r3, #0x10] mov r1, r6 @@ -5247,7 +5247,7 @@ _0233C23C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0233C308: .word 0x000001C2 -_0233C30C: .word 0x0237CFBC +_0233C30C: .word ov29_0237CFBC arm_func_end GenerateOuterRoomsFloor arm_func_start IsNotFullFloorFixedRoom @@ -5267,7 +5267,7 @@ GenerateFixedRoom: ; 0x0233C32C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x2f8 sub sp, sp, #0x1800 - ldr r2, _0233C764 ; =0x02353538 + ldr r2, _0233C764 ; =ov29_02353538 str r1, [sp, #0x10] ldr r2, [r2] mov sl, r0 @@ -5286,10 +5286,10 @@ _0233C374: bl IsNotFullFloorFixedRoom cmp r0, #0 bne _0233C590 - ldr r0, _0233C764 ; =0x02353538 - ldr r4, _0233C768 ; =0x0235378C + ldr r0, _0233C764 ; =ov29_02353538 + ldr r4, _0233C768 ; =ov29_0235378C ldr r0, [r0] - ldr r3, _0233C76C ; =0x0237CFBC + ldr r3, _0233C76C ; =ov29_0237CFBC add r2, r0, #0x12000 ldr r5, [r2, #0xaa4] add r1, r0, #0xcd00 @@ -5346,7 +5346,7 @@ _0233C450: blt _0233C3E0 mov r8, #0 add r4, r6, #5 - ldr sb, _0233C76C ; =0x0237CFBC + ldr sb, _0233C76C ; =ov29_0237CFBC add r5, r7, #5 mov r6, r8 _0233C46C: @@ -5560,9 +5560,9 @@ _0233C758: add sp, sp, #0x1800 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0233C764: .word 0x02353538 -_0233C768: .word 0x0235378C -_0233C76C: .word 0x0237CFBC +_0233C764: .word ov29_02353538 +_0233C768: .word ov29_0235378C +_0233C76C: .word ov29_0237CFBC _0233C770: .word 0x000001C2 arm_func_end GenerateFixedRoom @@ -5830,7 +5830,7 @@ _0233CAF0: mov r1, r7 bl GetTile ldrb sb, [r0, #7] - ldr r0, _0233CF7C ; =0x0235171C + ldr r0, _0233CF7C ; =DIRECTIONS_XY arm_func_end ov29_0233CAD8 arm_func_start ov29_0233CB10 @@ -5843,7 +5843,7 @@ _0233CB18: bl GetTile ldrb r0, [r0, #7] cmp sb, r0 - ldreq r0, _0233CF7C ; =0x0235171C + ldreq r0, _0233CF7C ; =DIRECTIONS_XY ldreqsh r1, [r0, r4] ldreqsh r0, [fp, #2] addeq r8, r8, r1 @@ -5853,7 +5853,7 @@ _0233CB18: ov29_0233CB3C: ; 0x0233CB3C addeq r7, r7, r0 beq _0233CB18 - ldr fp, _0233CF7C ; =0x0235171C + ldr fp, _0233CF7C ; =DIRECTIONS_XY mov sb, r6, lsl #2 add r4, fp, r6, lsl #2 _0233CB50: @@ -5914,7 +5914,7 @@ _0233CC04: bne _0233CF64 add r0, r6, #2 and r0, r0, #6 - ldr r1, _0233CF7C ; =0x0235171C + ldr r1, _0233CF7C ; =DIRECTIONS_XY mov r2, r0, lsl #2 add r0, r1, r0, lsl #2 ldrsh r2, [r1, r2] @@ -5928,7 +5928,7 @@ _0233CC04: beq _0233CF64 sub r0, r6, #2 and r0, r0, #6 - ldr r1, _0233CF7C ; =0x0235171C + ldr r1, _0233CF7C ; =DIRECTIONS_XY mov r2, r0, lsl #2 add r0, r1, r0, lsl #2 ldrsh r2, [r1, r2] @@ -5942,7 +5942,7 @@ _0233CC04: beq _0233CF64 mov r0, #3 bl DungeonRandInt - ldr r4, _0233CF7C ; =0x0235171C + ldr r4, _0233CF7C ; =DIRECTIONS_XY add sb, r0, #3 _0233CC8C: cmp r8, #1 @@ -6125,7 +6125,7 @@ _0233CE7C: cmp r8, #0x20 and r6, r6, #6 blt _0233CF2C - ldr r0, _0233CF80 ; =0x0237CFBC + ldr r0, _0233CF80 ; =ov29_0237CFBC ldrb r0, [r0, #6] cmp r0, #1 cmpeq r6, #2 @@ -6133,7 +6133,7 @@ _0233CE7C: _0233CF2C: cmp r8, #0x30 blt _0233CF48 - ldr r0, _0233CF80 ; =0x0237CFBC + ldr r0, _0233CF80 ; =ov29_0237CFBC ldrb r0, [r0, #6] cmp r0, #2 cmpeq r6, #2 @@ -6156,8 +6156,8 @@ _0233CF70: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0233CF78: .word 0x000001C2 -_0233CF7C: .word 0x0235171C -_0233CF80: .word 0x0237CFBC +_0233CF7C: .word DIRECTIONS_XY +_0233CF80: .word ov29_0237CFBC arm_func_end ov29_0233CDE4 arm_func_start GetGridPositions @@ -6219,7 +6219,7 @@ _0233D020: mov lr, r8 b _0233D0E4 _0233D040: - ldr sl, _0233D100 ; =0x0237CFBC + ldr sl, _0233D100 ; =ov29_0237CFBC ldrb sl, [sl, #6] cmp sl, #1 bne _0233D064 @@ -6273,7 +6273,7 @@ _0233D0F0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0233D0FC: .word 0x000001C2 -_0233D100: .word 0x0237CFBC +_0233D100: .word ov29_0237CFBC arm_func_end InitDungeonGrid arm_func_start AssignRooms @@ -6324,7 +6324,7 @@ _0233D178: strb r1, [r4, r5] strb r2, [r4, r0] blt _0233D178 - ldr r0, _0233D310 ; =0x0237CFBC + ldr r0, _0233D310 ; =ov29_0237CFBC mov fp, #0 sub r1, sb, #1 str fp, [r0, #0x14] @@ -6338,7 +6338,7 @@ _0233D1D0: ldr r1, _0233D314 ; =0x000001C2 mov r4, #0 mla r6, r3, r1, sl - ldr r1, _0233D310 ; =0x0237CFBC + ldr r1, _0233D310 ; =ov29_0237CFBC b _0233D250 _0233D1E4: mov r7, #0x1e @@ -6378,7 +6378,7 @@ _0233D250: _0233D25C: cmp r3, sb blt _0233D1D0 - ldr r0, _0233D310 ; =0x0237CFBC + ldr r0, _0233D310 ; =ov29_0237CFBC ldr r0, [r0, #0x14] cmp r0, #2 bge _0233D308 @@ -6425,14 +6425,14 @@ _0233D2F4: cmp r4, #0xc8 blt _0233D27C _0233D2FC: - ldr r0, _0233D310 ; =0x0237CFBC + ldr r0, _0233D310 ; =ov29_0237CFBC mov r1, #0 strb r1, [r0] _0233D308: add sp, sp, #0x104 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0233D310: .word 0x0237CFBC +_0233D310: .word ov29_0237CFBC _0233D314: .word 0x000001C2 arm_func_end AssignRooms @@ -6571,7 +6571,7 @@ _0233D4F0: movlt r0, r5 movge r0, #0 and r6, r0, #0xff - ldr r0, _0233D670 ; =0x0237CFBC + ldr r0, _0233D670 ; =ov29_0237CFBC ldr r0, [r0, #0x18] cmp r0, #0 ldr r0, [sp, #0x14] @@ -6664,7 +6664,7 @@ _0233D658: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0233D66C: .word 0x000001C2 -_0233D670: .word 0x0237CFBC +_0233D670: .word ov29_0237CFBC arm_func_end CreateRoomsAndAnchors arm_func_start GenerateSecondaryStructures @@ -6719,12 +6719,12 @@ _0233D714: ; jump table b _0233D938 ; case 4 b _0233D72C ; case 5 _0233D72C: - ldr r0, _0233E058 ; =0x0237CFBC + ldr r0, _0233E058 ; =ov29_0237CFBC ldr r0, [r0, #0x18] cmp r0, #0 beq _0233E014 sub r1, r0, #1 - ldr r0, _0233E058 ; =0x0237CFBC + ldr r0, _0233E058 ; =ov29_0237CFBC str r1, [r0, #0x18] add r0, sl, sb add r0, r0, r7 @@ -6883,7 +6883,7 @@ _0233D938: add r0, r4, r3 add r0, r0, r0, lsr #31 mov r5, r0, asr #1 - ldr r0, _0233E058 ; =0x0237CFBC + ldr r0, _0233E058 ; =ov29_0237CFBC add r1, r2, r1 ldr r0, [r0, #0x18] add r1, r1, r1, lsr #31 @@ -6891,7 +6891,7 @@ _0233D938: cmp r0, #0 beq _0233E014 sub r1, r0, #1 - ldr r0, _0233E058 ; =0x0237CFBC + ldr r0, _0233E058 ; =ov29_0237CFBC str r1, [r0, #0x18] add r0, sl, sb add r0, r0, r7 @@ -7121,12 +7121,12 @@ _0233DC9C: sub r1, r1, #3 bl DungeonRandRange mov fp, r0 - ldr r0, _0233E058 ; =0x0237CFBC + ldr r0, _0233E058 ; =ov29_0237CFBC ldr r0, [r0, #0x18] cmp r0, #0 beq _0233E014 sub r1, r0, #1 - ldr r0, _0233E058 ; =0x0237CFBC + ldr r0, _0233E058 ; =ov29_0237CFBC str r1, [r0, #0x18] add r0, sl, sb add r0, r0, r7 @@ -7178,12 +7178,12 @@ _0233DDC8: ldrsh r0, [r2, #2] sub r0, r1, r0 tst r0, #1 - ldrne r0, _0233E058 ; =0x0237CFBC + ldrne r0, _0233E058 ; =ov29_0237CFBC ldrne r0, [r0, #0x18] cmpne r0, #0 beq _0233E014 sub r1, r0, #1 - ldr r0, _0233E058 ; =0x0237CFBC + ldr r0, _0233E058 ; =ov29_0237CFBC str r1, [r0, #0x18] add r0, sl, sb add r0, r0, r7 @@ -7222,12 +7222,12 @@ _0233DE7C: strb r0, [r8, #9] b _0233E014 _0233DE94: - ldr r0, _0233E058 ; =0x0237CFBC + ldr r0, _0233E058 ; =ov29_0237CFBC ldr r0, [r0, #0x18] cmp r0, #0 beq _0233E014 sub r1, r0, #1 - ldr r0, _0233E058 ; =0x0237CFBC + ldr r0, _0233E058 ; =ov29_0237CFBC str r1, [r0, #0x18] mov r0, r8 ldrsh r2, [r0, #4] @@ -7343,7 +7343,7 @@ _0233E03C: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0233E054: .word 0x000001C2 -_0233E058: .word 0x0237CFBC +_0233E058: .word ov29_0237CFBC arm_func_end GenerateSecondaryStructures arm_func_start AssignGridCellConnections @@ -8416,7 +8416,7 @@ _0233EEFC: mov r5, #0 b _0233F014 _0233EF50: - ldr r0, _0233F118 ; =0x0235171C + ldr r0, _0233F118 ; =DIRECTIONS_XY mov r1, r5, lsl #2 ldrsh r2, [r0, r1] add r0, r0, r5, lsl #2 @@ -8478,13 +8478,13 @@ _0233F014: _0233F01C: cmp r5, #8 bne _0233F0C4 - ldr r1, _0233F11C ; =0x02353010 + ldr r1, _0233F11C ; =ov29_02353010 ldr r0, [sp, #0x20] mov r5, #0 add r6, r1, r0, lsl #3 b _0233F080 _0233F038: - ldr r0, _0233F118 ; =0x0235171C + ldr r0, _0233F118 ; =DIRECTIONS_XY mov r1, r5, lsl #2 ldrsh r2, [r0, r1] add r0, r0, r5, lsl #2 @@ -8550,8 +8550,8 @@ _0233F100: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0233F114: .word 0x000001C2 -_0233F118: .word 0x0235171C -_0233F11C: .word 0x02353010 +_0233F118: .word DIRECTIONS_XY +_0233F11C: .word ov29_02353010 arm_func_end GenerateRoomImperfections arm_func_start CreateHallway @@ -9266,7 +9266,7 @@ _0233FAFC: arm_func_start ov29_0233FB1C ov29_0233FB1C: ; 0x0233FB1C stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r0, _0233FBE4 ; =0x02353538 + ldr r0, _0233FBE4 ; =ov29_02353538 mov r1, #0 ldr r6, [r0] mov r7, r1 @@ -9320,15 +9320,15 @@ _0233FBC8: blt _0233FB48 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0233FBE4: .word 0x02353538 +_0233FBE4: .word ov29_02353538 arm_func_end ov29_0233FB1C arm_func_start GenerateKecleonShop GenerateKecleonShop: ; 0x0233FBE8 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x44 - ldr r5, _0233FF8C ; =0x02353538 - ldr r4, _0233FF90 ; =0x0237CFBC + ldr r5, _0233FF8C ; =ov29_02353538 + ldr r4, _0233FF90 ; =ov29_0237CFBC mvn r7, #0 ldr r6, [r5] strh r7, [r4, #0x20] @@ -9453,7 +9453,7 @@ _0233FD34: bl abs cmp r0, #4 blt _0233FF6C - ldr r0, _0233FF90 ; =0x0237CFBC + ldr r0, _0233FF90 ; =ov29_0237CFBC add r1, sl, fp mov r3, #1 strb r3, [r0, #3] @@ -9481,12 +9481,12 @@ _0233FD34: str r1, [r0, #0xd18] rsb r2, r1, #0 str r2, [r0, #0xd1c] - ldr r1, _0233FF90 ; =0x0237CFBC + ldr r1, _0233FF90 ; =ov29_0237CFBC str r2, [r0, #0xd20] ldr r4, [r1, #0x30] b _0233FED8 _0233FE54: - ldr sl, _0233FF90 ; =0x0237CFBC + ldr sl, _0233FF90 ; =ov29_0237CFBC add r8, r6, #0xc000 ldr r5, [sl, #0x34] b _0233FEC8 @@ -9522,7 +9522,7 @@ _0233FEC8: blt _0233FE64 add r4, r4, #1 _0233FED8: - ldr r0, _0233FF90 ; =0x0237CFBC + ldr r0, _0233FF90 ; =ov29_0237CFBC ldr r0, [r0, #0x38] cmp r4, r0 blt _0233FE54 @@ -9549,7 +9549,7 @@ _0233FF28: ldrsh r0, [r4, #4] cmp r5, r0 blt _0233FEF4 - ldr r1, _0233FF90 ; =0x0237CFBC + ldr r1, _0233FF90 ; =ov29_0237CFBC ldr r2, [r1, #0x30] ldr r0, [r1, #0x38] add r0, r2, r0 @@ -9577,8 +9577,8 @@ _0233FF84: add sp, sp, #0x44 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0233FF8C: .word 0x02353538 -_0233FF90: .word 0x0237CFBC +_0233FF8C: .word ov29_02353538 +_0233FF90: .word ov29_0237CFBC _0233FF94: .word 0x000001C2 _0233FF98: .word 0x0000270F arm_func_end GenerateKecleonShop @@ -9587,7 +9587,7 @@ _0233FF98: .word 0x0000270F GenerateMonsterHouse: ; 0x0233FF9C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x100 - ldr r4, _02340218 ; =0x02353538 + ldr r4, _02340218 ; =ov29_02353538 movs r5, r3 mov sl, r0 mov sb, r1 @@ -9598,7 +9598,7 @@ GenerateMonsterHouse: ; 0x0233FF9C bl DungeonRandInt cmp r5, r0 ble _02340210 - ldr r0, _0234021C ; =0x0237CFBC + ldr r0, _0234021C ; =ov29_0237CFBC ldrb r0, [r0, #3] cmp r0, #0 bne _02340210 @@ -9714,7 +9714,7 @@ _02340118: ldrb r0, [fp, r7] cmp r0, #0 beq _023401F4 - ldr r0, _0234021C ; =0x0237CFBC + ldr r0, _0234021C ; =ov29_0237CFBC add r2, sl, r3 mov r3, #1 strb r3, [r0, #1] @@ -9764,8 +9764,8 @@ _02340210: add sp, sp, #0x100 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02340218: .word 0x02353538 -_0234021C: .word 0x0237CFBC +_02340218: .word ov29_02353538 +_0234021C: .word ov29_0237CFBC _02340220: .word 0x000001C2 arm_func_end GenerateMonsterHouse @@ -9773,7 +9773,7 @@ _02340220: .word 0x000001C2 GenerateMazeRoom: ; 0x02340224 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x100 - ldr r7, _02340450 ; =0x02353538 + ldr r7, _02340450 ; =ov29_02353538 movs r8, r3 mov r6, r0 mov r5, r1 @@ -9925,7 +9925,7 @@ _02340448: add sp, sp, #0x100 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02340450: .word 0x02353538 +_02340450: .word ov29_02353538 _02340454: .word 0x000001C2 arm_func_end GenerateMazeRoom @@ -9933,7 +9933,7 @@ _02340454: .word 0x000001C2 GenerateMaze: ; 0x02340458 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x10 - ldr r2, _023406D0 ; =0x0237CFBC + ldr r2, _023406D0 ; =ov29_0237CFBC mov r3, #1 mov r5, r0 strb r3, [r2, #7] @@ -10109,7 +10109,7 @@ _023406B8: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_023406D0: .word 0x0237CFBC +_023406D0: .word ov29_0237CFBC arm_func_end GenerateMaze arm_func_start GenerateMazeLine @@ -10515,7 +10515,7 @@ _02340BEC: add r6, r6, #1 cmp r6, #0x38 blt _02340B18 - ldr r6, _02340CA8 ; =0x02353538 + ldr r6, _02340CA8 ; =ov29_02353538 mov sb, #0 ldr r0, [r6] mvn r1, #0 @@ -10543,7 +10543,7 @@ _02340C3C: add sb, sb, #1 cmp sb, #8 blt _02340C34 - ldr r1, _02340CA8 ; =0x02353538 + ldr r1, _02340CA8 ; =ov29_02353538 mov r3, #0 ldr r0, [r1] mov r2, r3 @@ -10560,7 +10560,7 @@ _02340C84: blt _02340C84 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02340CA8: .word 0x02353538 +_02340CA8: .word ov29_02353538 arm_func_end ResetFloor arm_func_start PosIsOutOfBounds @@ -10617,7 +10617,7 @@ _02340D40: MarkNonEnemySpawns: ; 0x02340D4C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xe00 - ldr r3, _02341458 ; =0x02353538 + ldr r3, _02341458 ; =ov29_02353538 mov sl, r0 ldr r5, [r3] mvn r2, #0 @@ -10677,7 +10677,7 @@ _02340DF4: add r1, r1, #0x4000 mov r2, #0 bl SpawnStairs - ldr r0, _0234145C ; =0x0237CFBC + ldr r0, _0234145C ; =ov29_0237CFBC ldr r0, [r0, #0x2c] cmp r0, #0 beq _02340EC8 @@ -10694,8 +10694,8 @@ _02340E54: _02340E6C: cmp r4, r0 blt _02340E54 - ldr r0, _02341458 ; =0x02353538 - ldr r1, _0234145C ; =0x0237CFBC + ldr r0, _02341458 ; =ov29_02353538 + ldr r1, _0234145C ; =ov29_0237CFBC ldr r2, [r0] ldr r4, [r1, #0x2c] add r0, r2, #0x2c000 @@ -10763,7 +10763,7 @@ _02340F30: cmp r4, #1 movlt r4, #1 _02340F74: - ldr r1, _02341458 ; =0x02353538 + ldr r1, _02341458 ; =ov29_02353538 ldr r0, _02341460 ; =0x0002C9E8 ldr r2, [r1] ldrsh r0, [r2, r0] @@ -10903,7 +10903,7 @@ _0234113C: mov r0, r4 bl DungeonRandRange mov r8, r0 - ldr r0, _02341468 ; =0x022C44AC + ldr r0, _02341468 ; =ov10_022C44AC cmp r8, #6 ldrsh r0, [r0] movlt r8, #6 @@ -10914,7 +10914,7 @@ _0234113C: bl ShuffleSpawnPositions mov r0, r6 bl DungeonRandInt - ldr r1, _0234146C ; =0x022C440C + ldr r1, _0234146C ; =ov10_022C440C mov r7, r0 ldrb fp, [r1] mov sb, #0 @@ -10933,7 +10933,7 @@ _023411B0: orrne r0, r0, #2 strneh r0, [r4, #2] bne _02341210 - ldr r0, _02341458 ; =0x02353538 + ldr r0, _02341458 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x75c] cmp r0, #0 @@ -11075,7 +11075,7 @@ _0234137C: tst r0, #1 bne _0234140C _023413E8: - ldr r0, _0234145C ; =0x0237CFBC + ldr r0, _0234145C ; =ov29_0237CFBC ldrb r0, [r0, #8] cmp r0, #0 ldrneb r0, [r4, #0xc9] @@ -11106,12 +11106,12 @@ _02341450: add sp, sp, #0xe00 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02341458: .word 0x02353538 -_0234145C: .word 0x0237CFBC +_02341458: .word ov29_02353538 +_0234145C: .word ov29_0237CFBC _02341460: .word 0x0002C9E8 _02341464: .word 0x00012AFA -_02341468: .word 0x022C44AC -_0234146C: .word 0x022C440C +_02341468: .word ov10_022C44AC +_0234146C: .word ov10_022C440C arm_func_end MarkNonEnemySpawns arm_func_start MarkEnemySpawns @@ -11121,7 +11121,7 @@ MarkEnemySpawns: ; 0x02341470 sub sp, sp, #0xc00 str r1, [sp] ldrb r1, [r0, #6] - ldr r0, _02341760 ; =0x02353538 + ldr r0, _02341760 ; =ov29_02353538 cmp r1, #1 ldr sb, [r0] blt _023414B0 @@ -11171,7 +11171,7 @@ _023414D4: ldreqsh r0, [r4, #0xe2] cmpeq r7, r0 beq _0234156C - ldr r0, _02341764 ; =0x0237CFBC + ldr r0, _02341764 ; =ov29_0237CFBC ldrb r0, [r0, #8] cmp r0, #0 beq _02341558 @@ -11226,7 +11226,7 @@ _023415F4: ldrb r2, [r0, #0xc4] cmp r2, #0 beq _02341754 - ldr r1, _02341768 ; =0x022C4660 + ldr r1, _02341768 ; =ov10_022C4660 ldr r0, [sp] ldrsh r6, [r1] cmp r0, #0 @@ -11320,9 +11320,9 @@ _02341754: add sp, sp, #0xc00 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02341760: .word 0x02353538 -_02341764: .word 0x0237CFBC -_02341768: .word 0x022C4660 +_02341760: .word ov29_02353538 +_02341764: .word ov29_0237CFBC +_02341768: .word ov10_022C4660 arm_func_end MarkEnemySpawns arm_func_start SetSecondaryTerrainOnWall @@ -11355,7 +11355,7 @@ GenerateSecondaryTerrainFormations: ; 0x023417AC beq _02341E60 mov r0, #8 bl DungeonRandInt - ldr r1, _02341E68 ; =0x02353030 + ldr r1, _02341E68 ; =ov29_02353030 ldr r0, [r1, r0, lsl #2] str r0, [sp, #0x28] b _02341C20 @@ -11816,7 +11816,7 @@ _02341E60: add sp, sp, #0x90 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02341E68: .word 0x02353030 +_02341E68: .word ov29_02353030 arm_func_end GenerateSecondaryTerrainFormations arm_func_start StairsAlwaysReachable @@ -11866,7 +11866,7 @@ _02341EF4: cmp r4, #0x38 blt _02341E84 add r1, sp, #0 - ldr r0, _02342174 ; =0x02353538 + ldr r0, _02342174 ; =ov29_02353538 add r2, r1, r7, lsl #5 ldrb r1, [r2, r6] ldr r0, [r0] @@ -11879,7 +11879,7 @@ _02341EF4: cmpeq r0, r6 movne r0, #0 bne _0234216C - ldr r0, _02342178 ; =0x0237CFBC + ldr r0, _02342178 ; =ov29_0237CFBC mov r4, #0 str r4, [r0, #0x24] _02341F50: @@ -11997,7 +11997,7 @@ _023420D0: blt _02341F64 cmp r3, #0 bne _02341F50 - ldr r0, _02342178 ; =0x0237CFBC + ldr r0, _02342178 ; =ov29_0237CFBC mov r8, #0 str r4, [r0, #0x24] add r6, sp, #0 @@ -12037,8 +12037,8 @@ _0234216C: add sp, sp, #0x700 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02342174: .word 0x02353538 -_02342178: .word 0x0237CFBC +_02342174: .word ov29_02353538 +_02342178: .word ov29_0237CFBC arm_func_end StairsAlwaysReachable arm_func_start ov29_0234217C @@ -12273,12 +12273,12 @@ _023424CC: .word 0x000001C2 arm_func_start GetNextFixedRoomAction GetNextFixedRoomAction: ; 0x023424D0 - ldr r1, _02342510 ; =0x0237CFBC + ldr r1, _02342510 ; =ov29_0237CFBC ldrh r0, [r1, #0xa] cmp r0, #0 subne r0, r0, #1 bne _02342504 - ldr r0, _02342514 ; =0x0235378C + ldr r0, _02342514 ; =ov29_0235378C ldr ip, [r0, #4] ldrh r3, [ip] add r2, ip, #2 @@ -12291,8 +12291,8 @@ _02342504: ldrh r0, [r1, #0xe] bx lr .align 2, 0 -_02342510: .word 0x0237CFBC -_02342514: .word 0x0235378C +_02342510: .word ov29_0237CFBC +_02342514: .word ov29_0235378C arm_func_end GetNextFixedRoomAction arm_func_start ov29_02342518 @@ -12340,10 +12340,10 @@ _02342558: ov29_02342594: ; 0x02342594 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x18 - ldr r2, _023427D8 ; =0x02353538 - ldr r4, _023427DC ; =0x0235378C + ldr r2, _023427D8 ; =ov29_02353538 + ldr r4, _023427DC ; =ov29_0235378C ldr sb, [r2] - ldr r3, _023427E0 ; =0x0237CFBC + ldr r3, _023427E0 ; =ov29_0237CFBC add r2, sb, #0x12000 ldr r5, [r2, #0xaa4] mov r6, #0 @@ -12495,9 +12495,9 @@ _023427D0: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023427D8: .word 0x02353538 -_023427DC: .word 0x0235378C -_023427E0: .word 0x0237CFBC +_023427D8: .word ov29_02353538 +_023427DC: .word ov29_0235378C +_023427E0: .word ov29_0237CFBC arm_func_end ov29_02342594 arm_func_start ov29_023427E4 @@ -12510,7 +12510,7 @@ ov29_023427E4: ; 0x023427E4 mov r5, #0 mov sb, r6 mov r4, r6 - ldr r8, _02342B74 ; =0x0237CFBC + ldr r8, _02342B74 ; =ov29_0237CFBC b _0234283C _0234280C: ldr r2, [r8, #0x38] @@ -12532,7 +12532,7 @@ _02342844: mov sb, #3 mov r5, #0 mov r4, sb - ldr r8, _02342B74 ; =0x0237CFBC + ldr r8, _02342B74 ; =ov29_0237CFBC b _02342888 _02342858: ldr r2, [r8, #0x3c] @@ -12558,7 +12558,7 @@ _02342890: mov r4, #0 b _0234295C _023428A8: - ldr r0, _02342B74 ; =0x0237CFBC + ldr r0, _02342B74 ; =ov29_0237CFBC ldr r1, [r0, #0x38] ldr r0, [r0, #0x30] sub r0, r1, r0 @@ -12568,7 +12568,7 @@ _023428A8: bl DungeonRandInt cmp r0, #0x32 bge _02342918 - ldr sb, _02342B74 ; =0x0237CFBC + ldr sb, _02342B74 ; =ov29_0237CFBC ldr r8, [sb, #0x34] b _023428F8 _023428DC: @@ -12583,13 +12583,13 @@ _023428F8: ldr r0, [sb, #0x3c] cmp r8, r0 blt _023428DC - ldr r0, _02342B74 ; =0x0237CFBC + ldr r0, _02342B74 ; =ov29_0237CFBC ldr r1, [r0, #0x30] add r1, r1, #1 str r1, [r0, #0x30] b _02342958 _02342918: - ldr sb, _02342B74 ; =0x0237CFBC + ldr sb, _02342B74 ; =ov29_0237CFBC ldr r0, [sb, #0x38] sub r0, r0, #1 str r0, [sb, #0x38] @@ -12616,7 +12616,7 @@ _02342964: mov r6, #0 b _02342A20 _0234296C: - ldr r0, _02342B74 ; =0x0237CFBC + ldr r0, _02342B74 ; =ov29_0237CFBC ldr r1, [r0, #0x3c] ldr r0, [r0, #0x34] sub r0, r1, r0 @@ -12626,7 +12626,7 @@ _0234296C: bl DungeonRandInt cmp r0, #0x32 bge _023429DC - ldr r8, _02342B74 ; =0x0237CFBC + ldr r8, _02342B74 ; =ov29_0237CFBC ldr r4, [r8, #0x30] b _023429BC _023429A0: @@ -12641,13 +12641,13 @@ _023429BC: ldr r0, [r8, #0x38] cmp r4, r0 blt _023429A0 - ldr r0, _02342B74 ; =0x0237CFBC + ldr r0, _02342B74 ; =ov29_0237CFBC ldr r1, [r0, #0x34] add r1, r1, #1 str r1, [r0, #0x34] b _02342A1C _023429DC: - ldr r8, _02342B74 ; =0x0237CFBC + ldr r8, _02342B74 ; =ov29_0237CFBC ldr r0, [r8, #0x3c] sub r0, r0, #1 str r0, [r8, #0x3c] @@ -12671,7 +12671,7 @@ _02342A20: cmp r6, r5 blt _0234296C _02342A28: - ldr r4, _02342B74 ; =0x0237CFBC + ldr r4, _02342B74 ; =ov29_0237CFBC ldr r6, [r4, #0x30] b _02342A74 _02342A34: @@ -12698,7 +12698,7 @@ _02342A74: ldr r3, [r4, #0x38] cmp r6, r3 blt _02342A34 - ldr r0, _02342B74 ; =0x0237CFBC + ldr r0, _02342B74 ; =ov29_0237CFBC mov r7, #0 ldr r1, [r0, #0x30] ldr r2, [r0, #0x34] @@ -12723,7 +12723,7 @@ _02342AC8: mov sl, r0 cmp r0, r5 bge _02342B58 - ldr r0, _02342B78 ; =0x022C52EC + ldr r0, _02342B78 ; =ov10_022C52EC add fp, r0, r7, lsl #1 _02342AE8: mov r0, sb @@ -12765,8 +12765,8 @@ _02342B6C: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02342B74: .word 0x0237CFBC -_02342B78: .word 0x022C52EC +_02342B74: .word ov29_0237CFBC +_02342B78: .word ov10_022C52EC arm_func_end ov29_023427E4 arm_func_start ResetInnerBoundaryTileRows @@ -12810,8 +12810,8 @@ ov29_02342BEC: ; 0x02342BEC add r4, r0, #6 mov r0, r5, lsl #1 mul r0, r6, r0 - ldr r3, _02342C60 ; =0x0235378C - ldr r2, _02342C64 ; =0x0237CFBC + ldr r3, _02342C60 ; =ov29_0235378C + ldr r2, _02342C64 ; =ov29_0237CFBC mov r1, #0 str r4, [r3, #4] strh r1, [r2, #0xa] @@ -12838,8 +12838,8 @@ _02342C50: mov r0, r7 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02342C60: .word 0x0235378C -_02342C64: .word 0x0237CFBC +_02342C60: .word ov29_0235378C +_02342C64: .word ov29_0237CFBC arm_func_end ov29_02342BEC arm_func_start ResetImportantSpawnPositions @@ -12871,11 +12871,11 @@ SpawnStairs: ; 0x02342C8C bic r0, r0, #2 strh r0, [r4, #2] beq _02342D00 - ldr r0, _02342D94 ; =0x0235378C + ldr r0, _02342D94 ; =ov29_0235378C ldrb r1, [r6] ldrb r0, [r0] cmp r0, #0 - ldrne r0, _02342D98 ; =0x0237CFBC + ldrne r0, _02342D98 ; =ov29_0237CFBC strneh r1, [r0, #0x1c] ldrneb r1, [r6, #1] strneh r1, [r0, #0x1e] @@ -12889,7 +12889,7 @@ SpawnStairs: ; 0x02342C8C _02342D00: ldrb r2, [r6] add r0, r8, #0x8c00 - ldr r1, _02342D98 ; =0x0237CFBC + ldr r1, _02342D98 ; =ov29_0237CFBC strh r2, [r0, #0x20] ldrb r2, [r6, #1] strh r2, [r0, #0x22] @@ -12928,14 +12928,14 @@ _02342D44: blt _02342D40 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02342D94: .word 0x0235378C -_02342D98: .word 0x0237CFBC +_02342D94: .word ov29_0235378C +_02342D98: .word ov29_0237CFBC arm_func_end SpawnStairs arm_func_start GetHiddenStairsType GetHiddenStairsType: ; 0x02342D9C stmdb sp!, {r4, r5, r6, lr} - ldr r2, _02342EB0 ; =0x02353538 + ldr r2, _02342EB0 ; =ov29_02353538 mov r5, r0 ldr r0, [r2] mov r6, r1 @@ -12961,7 +12961,7 @@ GetHiddenStairsType: ; 0x02342D9C _02342DFC: add r4, r0, #1 _02342E00: - ldr r0, _02342EB0 ; =0x02353538 + ldr r0, _02342EB0 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsb r0, [r0, #0x98] @@ -12977,7 +12977,7 @@ _02342E2C: mov r0, #0 _02342E30: tst r0, #0xff - ldrne r0, _02342EB4 ; =0x0235378C + ldrne r0, _02342EB4 ; =ov29_0235378C movne r1, #1 strneb r1, [r0] bne _02342EA4 @@ -12991,7 +12991,7 @@ _02342E30: bl ShouldBoostHiddenStairsSpawnChance cmp r0, #0 beq _02342E94 - ldr r1, _02342EB8 ; =0x022C4850 + ldr r1, _02342EB8 ; =ov10_022C4850 mov r0, r6, lsl #8 ldr r1, [r1] bl MultiplyByFixedPoint @@ -13003,7 +13003,7 @@ _02342E30: mov r6, r0, asr #8 _02342E94: cmp r5, r6 - ldrhs r0, _02342EB4 ; =0x0235378C + ldrhs r0, _02342EB4 ; =ov29_0235378C movhs r1, #1 strhsb r1, [r0] _02342EA4: @@ -13012,9 +13012,9 @@ _02342EA8: mov r0, r4 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02342EB0: .word 0x02353538 -_02342EB4: .word 0x0235378C -_02342EB8: .word 0x022C4850 +_02342EB0: .word ov29_02353538 +_02342EB4: .word ov29_0235378C +_02342EB8: .word ov10_022C4850 arm_func_end GetHiddenStairsType arm_func_start GetFinalKecleonShopSpawnChance @@ -13025,7 +13025,7 @@ GetFinalKecleonShopSpawnChance: ; 0x02342EBC cmp r0, #0 moveq r0, r4 ldmeqia sp!, {r4, pc} - ldr r1, _02342F04 ; =0x022C484C + ldr r1, _02342F04 ; =ov10_022C484C mov r0, r4, lsl #8 ldr r1, [r1] bl MultiplyByFixedPoint @@ -13038,22 +13038,22 @@ GetFinalKecleonShopSpawnChance: ; 0x02342EBC mov r0, r0, asr #0x10 ldmia sp!, {r4, pc} .align 2, 0 -_02342F04: .word 0x022C484C +_02342F04: .word ov10_022C484C arm_func_end GetFinalKecleonShopSpawnChance arm_func_start ResetHiddenStairsSpawn ResetHiddenStairsSpawn: ; 0x02342F08 - ldr r1, _02342F28 ; =0x0237CFBC + ldr r1, _02342F28 ; =ov29_0237CFBC mvn r2, #0 strh r2, [r1, #0x1c] - ldr r0, _02342F2C ; =0x0235378C + ldr r0, _02342F2C ; =ov29_0235378C strh r2, [r1, #0x1e] mov r1, #0 strb r1, [r0] bx lr .align 2, 0 -_02342F28: .word 0x0237CFBC -_02342F2C: .word 0x0235378C +_02342F28: .word ov29_0237CFBC +_02342F2C: .word ov29_0235378C arm_func_end ResetHiddenStairsSpawn arm_func_start PlaceFixedRoomTile @@ -13122,7 +13122,7 @@ _02343000: _02343010: cmp r1, #0x6d bne _023433B8 - ldr r3, _0234392C ; =0x02353538 + ldr r3, _0234392C ; =ov29_02353538 mov r1, r5 ldr r0, [r3] mov r2, r4 @@ -13173,7 +13173,7 @@ _023430B8: strh r2, [r6] ldrh r4, [r6] mov r3, sb, asr #0xc - ldr r2, _0234392C ; =0x02353538 + ldr r2, _0234392C ; =ov29_02353538 orr r4, r4, #1 strh r4, [r6] ldr r4, [r2] @@ -13192,7 +13192,7 @@ _023430B8: add r1, r1, #0xcc00 strh r4, [r1, #0xee] bl FixedRoomActionParamToDirection - ldr r1, _0234392C ; =0x02353538 + ldr r1, _0234392C ; =ov29_02353538 mov r2, #0 ldr r1, [r1] add r1, r1, #0xc000 @@ -13220,7 +13220,7 @@ _02343160: strb r0, [r6, #7] b _0234391C _02343184: - ldr r0, _02343930 ; =0x0237CFC0 + ldr r0, _02343930 ; =ov29_0237CFC0 mov r1, #1 strb r1, [r0] bl ov29_023365E8 @@ -13236,7 +13236,7 @@ _02343194: b _0234391C _023431B8: ldrh r2, [r6] - ldr r1, _0234392C ; =0x02353538 + ldr r1, _0234392C ; =ov29_02353538 mov r0, #0 bic r2, r2, #3 strh r2, [r6] @@ -13343,7 +13343,7 @@ _02343328: strb r0, [r6, #7] b _0234391C _0234334C: - ldr r2, _0234392C ; =0x02353538 + ldr r2, _0234392C ; =ov29_02353538 mov r3, sb, asr #0xc ldr r0, [r2] sub r7, r1, #0x5f @@ -13356,7 +13356,7 @@ _0234334C: add r1, r1, #0xcc00 strh r4, [r1, #0xee] bl FixedRoomActionParamToDirection - ldr r1, _0234392C ; =0x02353538 + ldr r1, _0234392C ; =ov29_02353538 mov r2, #0 ldr r1, [r1] add r1, r1, r7 @@ -13379,12 +13379,12 @@ _023433B8: sub r1, r1, #0x10 mov r0, #0xc smulbb r2, r1, r0 - ldr r0, _02343938 ; =0x023502F4 - ldr r1, _0234393C ; =0x023502EC + ldr r0, _02343938 ; =ov29_023502F4 + ldr r1, _0234393C ; =ov29_023502EC ldr r8, [r0, r2] ldr sl, [r1, r2] ldrb r0, [r8, #2] - ldr r1, _02343940 ; =0x023502F0 + ldr r1, _02343940 ; =ov29_023502F0 strb r0, [r6, #7] ldrsh r0, [sl] ldr r7, [r1, r2] @@ -13394,7 +13394,7 @@ _023433B8: beq _02343678 cmp r0, #0xb2 bne _02343468 - ldr r0, _0234392C ; =0x02353538 + ldr r0, _0234392C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsb r0, [r0, #0x98] @@ -13435,13 +13435,13 @@ _02343468: bl GenerateAndSpawnItem b _02343678 _023434B0: - ldr r0, _0234392C ; =0x02353538 + ldr r0, _0234392C ; =ov29_02353538 ldr r0, [r0] ldrb fp, [r0, #0x748] bl IsGoldenChamber cmp r0, #0 beq _023434D8 - ldr r0, _02343944 ; =0x022C4B34 + ldr r0, _02343944 ; =ov10_022C4B34 bl ov29_023442B8 mov r3, r0 b _02343528 @@ -13453,7 +13453,7 @@ _023434D8: mov r3, r0 b _02343528 _023434F0: - ldr r0, _02343948 ; =0x02353050 + ldr r0, _02343948 ; =ov29_02353050 b _02343504 _023434F8: cmp fp, r1 @@ -13541,8 +13541,8 @@ _023435BC: mov r0, #1 mov r3, r1 str r0, [sp, #4] - ldr fp, _02343958 ; =0x023534F0 - ldr r0, _0234395C ; =0x0234FDFC + ldr fp, _02343958 ; =ov29_023534F0 + ldr r0, _0234395C ; =ov29_0234FDFC ldr r3, [fp, r3, lsl #2] ldrsh r0, [r0, r2] ldrsh r3, [r3, sl] @@ -13656,7 +13656,7 @@ _023437C8: cmpne sb, #0xa str r1, [sp, #0x28] strb r1, [sp, #0x32] - ldreq r1, _02343964 ; =0x022C5938 + ldreq r1, _02343964 ; =ov10_022C5938 ldreq r0, [sp, #0x1c] strh fp, [sp, #0x24] ldreqsh r0, [r1, r0] @@ -13667,7 +13667,7 @@ _023437C8: beq _02343898 cmp sb, #1 bne _0234382C - ldr r0, _0234392C ; =0x02353538 + ldr r0, _0234392C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x348 add r0, r0, #0x400 @@ -13677,7 +13677,7 @@ _023437C8: _0234382C: cmp sb, #4 bne _02343850 - ldr r0, _0234392C ; =0x02353538 + ldr r0, _0234392C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x348 add r0, r0, #0x400 @@ -13687,7 +13687,7 @@ _0234382C: _02343850: cmp sb, #5 bne _02343874 - ldr r0, _0234392C ; =0x02353538 + ldr r0, _0234392C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x348 add r0, r0, #0x400 @@ -13699,7 +13699,7 @@ _02343874: cmp r7, r0 strneh r1, [sp, #0x2c] bne _02343898 - ldr r1, _0234392C ; =0x02353538 + ldr r1, _0234392C ; =ov29_02353538 ldr r0, _02343968 ; =0x0002C9E6 ldr r1, [r1] ldrsh r0, [r1, r0] @@ -13746,21 +13746,21 @@ _0234391C: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02343928: .word 0x00000FFF -_0234392C: .word 0x02353538 -_02343930: .word 0x0237CFC0 +_0234392C: .word ov29_02353538 +_02343930: .word ov29_0237CFC0 _02343934: .word 0x000001FF -_02343938: .word 0x023502F4 -_0234393C: .word 0x023502EC -_02343940: .word 0x023502F0 -_02343944: .word 0x022C4B34 -_02343948: .word 0x02353050 +_02343938: .word ov29_023502F4 +_0234393C: .word ov29_023502EC +_02343940: .word ov29_023502F0 +_02343944: .word ov10_022C4B34 +_02343948: .word ov29_02353050 _0234394C: .word 0x00000578 _02343950: .word 0x00000181 _02343954: .word 0xFFFFFA7E -_02343958: .word 0x023534F0 -_0234395C: .word 0x0234FDFC +_02343958: .word ov29_023534F0 +_0234395C: .word ov29_0234FDFC _02343960: .word 0x00000229 -_02343964: .word 0x022C5938 +_02343964: .word ov10_022C5938 _02343968: .word 0x0002C9E6 arm_func_end PlaceFixedRoomTile @@ -13806,7 +13806,7 @@ _023439BC: ov29_023439D8: ; 0x023439D8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x10 - ldr r4, _02343CD0 ; =0x02353538 + ldr r4, _02343CD0 ; =ov29_02353538 mov sb, r1 ldr r4, [r4] mov sl, r0 @@ -13833,7 +13833,7 @@ _02343A38: sub r4, r0, #0x14 b _02343B54 _02343A44: - ldr r0, _02343CD0 ; =0x02353538 + ldr r0, _02343CD0 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xc000 ldr r1, [r0, #0xd24] @@ -13868,7 +13868,7 @@ _02343A44: mov r0, #0xa0 mul r1, r5, r0 mov r0, #0x14 - ldr r2, _02343CD0 ; =0x02353538 + ldr r2, _02343CD0 ; =ov29_02353538 mul r0, r6, r0 ldr r2, [r2] add r2, r2, r1 @@ -13876,7 +13876,7 @@ _02343A44: add r2, r2, #0xcd00 ldrh r2, [r2, #0x60] strh r2, [r7] - ldr r2, _02343CD0 ; =0x02353538 + ldr r2, _02343CD0 ; =ov29_02353538 ldr r2, [r2] add r1, r2, r1 add r0, r0, r1 @@ -13886,7 +13886,7 @@ _02343A44: _02343B0C: mov r0, #1 str r0, [sp] - ldr r1, _02343CD0 ; =0x02353538 + ldr r1, _02343CD0 ; =ov29_02353538 mov r0, r7 ldr r1, [r1] mov r2, r4 @@ -13918,7 +13918,7 @@ _02343B68: b _02343C14 _02343B80: ldrsh r0, [sl, #4] - ldr r6, _02343CD0 ; =0x02353538 + ldr r6, _02343CD0 ; =ov29_02353538 sub r5, r0, #0x14 b _02343C00 _02343B90: @@ -13963,7 +13963,7 @@ _02343C14: cmp r4, r0 ble _02343B80 _02343C24: - ldr r0, _02343CD0 ; =0x02353538 + ldr r0, _02343CD0 ; =ov29_02353538 mov r2, #1 ldr r0, [r0] ldr r1, _02343CD4 ; =0xFFFFCFEF @@ -14010,7 +14010,7 @@ _02343CC8: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02343CD0: .word 0x02353538 +_02343CD0: .word ov29_02353538 _02343CD4: .word 0xFFFFCFEF arm_func_end ov29_023439D8 @@ -14075,52 +14075,52 @@ _02343D8C: .word 0x00000B93 arm_func_start LoadFixedRoomData LoadFixedRoomData: ; 0x02343D90 stmdb sp!, {r3, lr} - ldr r0, _02343DBC ; =0x02353794 - ldr r1, _02343DC0 ; =0x02353110 + ldr r0, _02343DBC ; =ov29_02353794 + ldr r1, _02343DC0 ; =ov29_02353110 ldr r0, [r0] mov r2, #0 bl LoadFileFromRom - ldr r0, _02343DBC ; =0x02353794 + ldr r0, _02343DBC ; =ov29_02353794 ldr r0, [r0] ldr r1, [r0], #8 bl HandleSir0Translation ldmia sp!, {r3, pc} .align 2, 0 -_02343DBC: .word 0x02353794 -_02343DC0: .word 0x02353110 +_02343DBC: .word ov29_02353794 +_02343DC0: .word ov29_02353110 arm_func_end LoadFixedRoomData arm_func_start ov29_02343DC4 ov29_02343DC4: ; 0x02343DC4 - ldr r0, _02343DD4 ; =0x02353794 + ldr r0, _02343DD4 ; =ov29_02353794 ldr r0, [r0] ldr r0, [r0, #8] bx lr .align 2, 0 -_02343DD4: .word 0x02353794 +_02343DD4: .word ov29_02353794 arm_func_end ov29_02343DC4 arm_func_start ov29_02343DD8 ov29_02343DD8: ; 0x02343DD8 stmdb sp!, {r3, lr} - ldr r0, _02343E1C ; =0x02353794 + ldr r0, _02343E1C ; =ov29_02353794 ldr r0, [r0] bl PointsToZero cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _02343E1C ; =0x02353794 + ldr r0, _02343E1C ; =ov29_02353794 ldr r0, [r0] bl UnloadFile - ldr r0, _02343E1C ; =0x02353794 + ldr r0, _02343E1C ; =ov29_02353794 ldr r0, [r0] bl ZInit8 - ldr r0, _02343E1C ; =0x02353794 + ldr r0, _02343E1C ; =ov29_02353794 mov r1, #0 ldr r0, [r0] str r1, [r0, #8] ldmia sp!, {r3, pc} .align 2, 0 -_02343E1C: .word 0x02353794 +_02343E1C: .word ov29_02353794 arm_func_end ov29_02343DD8 arm_func_start LoadFixedRoom @@ -14134,7 +14134,7 @@ LoadFixedRoom: ; 0x02343E20 moveq r0, #0 beq _0234402C bl LoadFixedRoomData - ldr r0, _02344034 ; =0x02353794 + ldr r0, _02344034 ; =ov29_02353794 ldr r0, [r0] ldr r0, [r0, #8] ldr r0, [r0, r4, lsl #2] @@ -14159,7 +14159,7 @@ _02343E78: sub r0, r1, #0xe00 cmp r2, r0 bgt _0234400C - ldr r1, _0234403C ; =0x023502EC + ldr r1, _0234403C ; =ov29_023502EC sub r2, r2, #0x10 mov r0, #0xc smlabb r0, r2, r0, r1 @@ -14191,7 +14191,7 @@ _02343F04: ldrb r0, [r6, #3] cmp r0, #1 bne _02343F40 - ldr r0, _02344048 ; =0x02353538 + ldr r0, _02344048 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x348 add r0, r0, #0x400 @@ -14204,7 +14204,7 @@ _02343F04: _02343F40: cmp r0, #4 bne _02343F70 - ldr r0, _02344048 ; =0x02353538 + ldr r0, _02344048 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x348 add r0, r0, #0x400 @@ -14217,7 +14217,7 @@ _02343F40: _02343F70: cmp r0, #5 bne _02343FA0 - ldr r0, _02344048 ; =0x02353538 + ldr r0, _02344048 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x348 add r0, r0, #0x400 @@ -14242,7 +14242,7 @@ _02343FA0: _02343FCC: mov r0, #0xc mul r2, r3, r0 - ldr r1, _02344050 ; =0x022C5938 + ldr r1, _02344050 ; =ov10_022C5938 add r0, sp, #0xc ldrsh r1, [r1, r2] mov r2, r8 @@ -14273,14 +14273,14 @@ _0234402C: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02344034: .word 0x02353794 +_02344034: .word ov29_02353794 _02344038: .word 0x00000FFF -_0234403C: .word 0x023502EC +_0234403C: .word ov29_023502EC _02344040: .word 0x00000229 _02344044: .word 0x00000483 -_02344048: .word 0x02353538 +_02344048: .word ov29_02353538 _0234404C: .word 0x00000485 -_02344050: .word 0x022C5938 +_02344050: .word ov10_022C5938 arm_func_end LoadFixedRoom arm_func_start OpenFixedBin @@ -14289,30 +14289,30 @@ OpenFixedBin: ; 0x02344054 mov r0, #0xc mov r1, #0 bl MemAlloc - ldr r2, _02344084 ; =0x02353794 + ldr r2, _02344084 ; =ov29_02353794 mov r1, #0xc str r0, [r2] bl MemZero - ldr r0, _02344084 ; =0x02353794 + ldr r0, _02344084 ; =ov29_02353794 ldr r0, [r0] bl ZInit8 ldmia sp!, {r3, pc} .align 2, 0 -_02344084: .word 0x02353794 +_02344084: .word ov29_02353794 arm_func_end OpenFixedBin arm_func_start CloseFixedBin CloseFixedBin: ; 0x02344088 stmdb sp!, {r3, lr} - ldr r0, _023440A8 ; =0x02353794 + ldr r0, _023440A8 ; =ov29_02353794 ldr r0, [r0] bl MemFree - ldr r0, _023440A8 ; =0x02353794 + ldr r0, _023440A8 ; =ov29_02353794 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_023440A8: .word 0x02353794 +_023440A8: .word ov29_02353794 arm_func_end CloseFixedBin arm_func_start AreOrbsAllowed @@ -14327,11 +14327,11 @@ _023440BC: _023440C4: mov r1, #0xc mul r1, r0, r1 - ldr r0, _023440D8 ; =0x022C6C77 + ldr r0, _023440D8 ; =ov10_022C6C77 ldrb r0, [r0, r1] bx lr .align 2, 0 -_023440D8: .word 0x022C6C77 +_023440D8: .word ov10_022C6C77 arm_func_end AreOrbsAllowed arm_func_start AreTileJumpsAllowed @@ -14346,11 +14346,11 @@ _023440EC: _023440F4: mov r1, #0xc mul r1, r0, r1 - ldr r0, _02344108 ; =0x022C6C78 + ldr r0, _02344108 ; =ov10_022C6C78 ldrb r0, [r0, r1] bx lr .align 2, 0 -_02344108: .word 0x022C6C78 +_02344108: .word ov10_022C6C78 arm_func_end AreTileJumpsAllowed arm_func_start AreTrawlOrbsAllowed @@ -14365,11 +14365,11 @@ _0234411C: _02344124: mov r1, #0xc mul r1, r0, r1 - ldr r0, _02344138 ; =0x022C6C79 + ldr r0, _02344138 ; =ov10_022C6C79 ldrb r0, [r0, r1] bx lr .align 2, 0 -_02344138: .word 0x022C6C79 +_02344138: .word ov10_022C6C79 arm_func_end AreTrawlOrbsAllowed arm_func_start AreOrbsAllowedVeneer @@ -14384,33 +14384,33 @@ _02344144: .word AreOrbsAllowed AreLateGameTrapsEnabled: ; 0x02344148 mov r1, #0xc mul r1, r0, r1 - ldr r0, _0234415C ; =0x022C6C75 + ldr r0, _0234415C ; =ov10_022C6C75 ldrb r0, [r0, r1] bx lr .align 2, 0 -_0234415C: .word 0x022C6C75 +_0234415C: .word ov10_022C6C75 arm_func_end AreLateGameTrapsEnabled arm_func_start AreMovesEnabled AreMovesEnabled: ; 0x02344160 mov r1, #0xc mul r1, r0, r1 - ldr r0, _02344174 ; =0x022C6C76 + ldr r0, _02344174 ; =ov10_022C6C76 ldrb r0, [r0, r1] bx lr .align 2, 0 -_02344174: .word 0x022C6C76 +_02344174: .word ov10_022C6C76 arm_func_end AreMovesEnabled arm_func_start IsRoomIlluminated IsRoomIlluminated: ; 0x02344178 mov r1, #0xc mul r1, r0, r1 - ldr r0, _0234418C ; =0x022C6C74 + ldr r0, _0234418C ; =ov10_022C6C74 ldrb r0, [r0, r1] bx lr .align 2, 0 -_0234418C: .word 0x022C6C74 +_0234418C: .word ov10_022C6C74 arm_func_end IsRoomIlluminated arm_func_start GetMatchingMonsterId @@ -14473,7 +14473,7 @@ _02344254: rsb r1, r2, #0x690 cmp r0, r1 bne _02344298 - ldr r0, _023442B0 ; =0x02353538 + ldr r0, _023442B0 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsb r1, [r0, #0x98] @@ -14497,7 +14497,7 @@ _0234429C: _023442A4: .word 0x00000483 _023442A8: .word 0x00000467 _023442AC: .word 0x0000020F -_023442B0: .word 0x02353538 +_023442B0: .word ov29_02353538 _023442B4: .word 0x0000020D arm_func_end GetMatchingMonsterId @@ -14650,7 +14650,7 @@ _023444A0: add r1, sp, #4 mov r2, #1 bl SpawnItem - ldr r0, _023444D0 ; =0x02353538 + ldr r0, _023444D0 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x3f00 ldrsh r1, [r0, #0xc2] @@ -14659,13 +14659,13 @@ _023444A0: add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 -_023444D0: .word 0x02353538 +_023444D0: .word ov29_02353538 arm_func_end GenerateAndSpawnItem arm_func_start ov29_023444D4 ov29_023444D4: ; 0x023444D4 stmdb sp!, {r3, lr} - ldr r0, _02344508 ; =0x02353538 + ldr r0, _02344508 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] add r0, r0, #0x7e @@ -14678,7 +14678,7 @@ ov29_023444D4: ; 0x023444D4 bl ov29_022F07D8 ldmia sp!, {r3, pc} .align 2, 0 -_02344508: .word 0x02353538 +_02344508: .word ov29_02353538 arm_func_end ov29_023444D4 arm_func_start IsHiddenStairsFloor @@ -14738,7 +14738,7 @@ _023445A0: ; jump table b _0234485C ; case 3 b _02344950 ; case 4 _023445B4: - ldr r2, _02344A60 ; =0x0237CFFC + ldr r2, _02344A60 ; =ov29_0237CFFC mov r3, #0 mov r0, r4 mov r1, r5 @@ -14750,13 +14750,13 @@ _023445B4: bl ov29_022F0604 b _02344A34 _023445E0: - ldr r2, _02344A60 ; =0x0237CFFC + ldr r2, _02344A60 ; =ov29_0237CFFC mov r3, #1 mov r0, r4 mov r1, r5 str r3, [r2] bl ov29_022F0654 - ldr r0, _02344A68 ; =0x02353538 + ldr r0, _02344A68 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x77e] cmp r0, #0 @@ -14774,7 +14774,7 @@ _02344620: mov r1, r4 mov r2, #0 bl ov29_022F0604 - ldr r1, _02344A74 ; =0x02353798 + ldr r1, _02344A74 ; =ov29_02353798 ldr r0, _02344A78 ; =0x00000F4B ldr r3, [r1, #4] mov r1, r4 @@ -14824,7 +14824,7 @@ _02344690: ldr r0, _02344A8C ; =0x00000F51 bl ov29_022F0780 mov r3, #1 - ldr r1, _02344A68 ; =0x02353538 + ldr r1, _02344A68 ; =ov29_02353538 mov r0, #0xf50 ldr r2, [r1] mov r1, r4 @@ -14833,7 +14833,7 @@ _02344690: bl ov29_022F0604 b _02344A34 _0234471C: - ldr r2, _02344A60 ; =0x0237CFFC + ldr r2, _02344A60 ; =ov29_0237CFFC mov r3, #2 mov r0, r4 mov r1, r5 @@ -14849,7 +14849,7 @@ _0234471C: ldr r0, _02344A94 ; =0x00000F34 mov r1, r4 mov r2, #0 - ldr r3, _02344A74 ; =0x02353798 + ldr r3, _02344A74 ; =ov29_02353798 ldr r3, [r3, #8] bl ov29_022F062C cmp r0, #0 @@ -14918,7 +14918,7 @@ _023447FC: bl ov29_022F0604 b _02344A34 _0234485C: - ldr r2, _02344A60 ; =0x0237CFFC + ldr r2, _02344A60 ; =ov29_0237CFFC mov r3, #3 mov r0, r4 mov r1, r5 @@ -14934,7 +14934,7 @@ _0234485C: ldr r0, _02344ABC ; =0x00000F55 mov r1, r4 mov r2, #0 - ldr r3, _02344A74 ; =0x02353798 + ldr r3, _02344A74 ; =ov29_02353798 ldr r3, [r3, #0xc] bl ov29_022F062C cmp r0, #0 @@ -14983,7 +14983,7 @@ _02344904: bl ov29_022F0604 b _02344A34 _02344950: - ldr r2, _02344A60 ; =0x0237CFFC + ldr r2, _02344A60 ; =ov29_0237CFFC mov r3, #4 mov r0, r4 mov r1, r5 @@ -14999,7 +14999,7 @@ _02344950: mov r0, #0xf40 mov r1, r4 mov r2, #0 - ldr r3, _02344A74 ; =0x02353798 + ldr r3, _02344A74 ; =ov29_02353798 ldr r3, [r3, #0x10] bl ov29_022F062C cmp r0, #0 @@ -15019,7 +15019,7 @@ _023449B8: bl ov29_022F0604 b _02344A34 _023449D8: - ldr r1, _02344A74 ; =0x02353798 + ldr r1, _02344A74 ; =ov29_02353798 ldr r0, _02344AE8 ; =0x00000F43 ldr r3, [r1, #0x14] mov r1, r4 @@ -15057,12 +15057,12 @@ _02344A58: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02344A60: .word 0x0237CFFC +_02344A60: .word ov29_0237CFFC _02344A64: .word 0x00000F32 -_02344A68: .word 0x02353538 +_02344A68: .word ov29_02353538 _02344A6C: .word 0x00000F4C _02344A70: .word 0x00000F4A -_02344A74: .word 0x02353798 +_02344A74: .word ov29_02353798 _02344A78: .word 0x00000F4B _02344A7C: .word 0x00000F4D _02344A80: .word 0x00000F4E diff --git a/asm/overlay_29_02344B1C.s b/asm/overlay_29_02344B1C.s index 88b81ad7..104e4ccd 100644 --- a/asm/overlay_29_02344B1C.s +++ b/asm/overlay_29_02344B1C.s @@ -5,22 +5,22 @@ arm_func_start ov29_02344B1C ov29_02344B1C: ; 0x02344B1C - ldr r0, _02344B2C ; =0x023537B0 + ldr r0, _02344B2C ; =ov29_023537B0 mov r1, #1 strb r1, [r0] bx lr .align 2, 0 -_02344B2C: .word 0x023537B0 +_02344B2C: .word ov29_023537B0 arm_func_end ov29_02344B1C arm_func_start ov29_02344B30 ov29_02344B30: ; 0x02344B30 - ldr r0, _02344B40 ; =0x023537B0 + ldr r0, _02344B40 ; =ov29_023537B0 mov r1, #0 strb r1, [r0] bx lr .align 2, 0 -_02344B40: .word 0x023537B0 +_02344B40: .word ov29_023537B0 arm_func_end ov29_02344B30 arm_func_start ov29_02344B44 @@ -30,13 +30,13 @@ ov29_02344B44: ; 0x02344B44 mov r4, r1 orr r1, r5, #0x40000 bl ov29_0234B084 - ldr r2, _02344B6C ; =0x023531BC + ldr r2, _02344B6C ; =ov29_023531BC mov r0, r5 mov r1, r4 bl sub_02024FE8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02344B6C: .word 0x023531BC +_02344B6C: .word ov29_023531BC arm_func_end ov29_02344B44 arm_func_start ov29_02344B70 @@ -46,13 +46,13 @@ ov29_02344B70: ; 0x02344B70 mov r4, r1 orr r1, r5, #0x40000 bl ov29_0234B084 - ldr r2, _02344B98 ; =0x023531A4 + ldr r2, _02344B98 ; =ov29_023531A4 mov r0, r5 mov r1, r4 bl sub_02024FE8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02344B98: .word 0x023531A4 +_02344B98: .word ov29_023531A4 arm_func_end ov29_02344B70 arm_func_start ov29_02344B9C @@ -70,12 +70,12 @@ ov29_02344BA8: ; 0x02344BA8 orr ip, r1, #0x40000 mov r0, r1 mov r1, r2 - ldr r2, _02344BCC ; =0x023531BC + ldr r2, _02344BCC ; =ov29_023531BC str ip, [r3, #0x10] bl sub_02024FE8 ldmia sp!, {r3, pc} .align 2, 0 -_02344BCC: .word 0x023531BC +_02344BCC: .word ov29_023531BC arm_func_end ov29_02344BA8 arm_func_start GenerateStandardItem @@ -102,7 +102,7 @@ _02344BF4: .word GenerateItem ov29_02344BF8: ; 0x02344BF8 stmdb sp!, {r4, lr} sub sp, sp, #0x48 - ldr r3, _02344C48 ; =0x023531CC + ldr r3, _02344C48 ; =ov29_023531CC add r2, sp, #0 mov r4, r0 mov r1, #0x24 @@ -122,7 +122,7 @@ _02344C10: add sp, sp, #0x48 ldmia sp!, {r4, pc} .align 2, 0 -_02344C48: .word 0x023531CC +_02344C48: .word ov29_023531CC arm_func_end ov29_02344BF8 arm_func_start ov29_02344C4C @@ -134,7 +134,7 @@ ov29_02344C4C: ; 0x02344C4C mov r8, sb bl IsDestinationFloorWithItem cmp r0, #0 - ldr r1, _02344E7C ; =0x02353538 + ldr r1, _02344E7C ; =ov29_02353538 ldr r0, _02344E80 ; =0x0002C9E8 ldr r1, [r1] movne sb, #1 @@ -147,10 +147,10 @@ ov29_02344C4C: ; 0x02344C4C mov r6, r0 mov r0, #0x20 bl DungeonRandInt - ldr r1, _02344E7C ; =0x02353538 + ldr r1, _02344E7C ; =ov29_02353538 mov r5, #0 ldr r1, [r1] - ldr r2, _02344E84 ; =0x023531A0 + ldr r2, _02344E84 ; =ov29_023531A0 add r1, r1, #0x3f00 strh r5, [r1, #0xc0] ldrh r3, [r2] @@ -225,7 +225,7 @@ _02344DB0: ldr r0, [sp, #8] cmp r0, #0 beq _02344DE0 - ldr r0, _02344E7C ; =0x02353538 + ldr r0, _02344E7C ; =ov29_02353538 ldr r1, [r0] mov r0, #0 str r0, [sp, #8] @@ -265,7 +265,7 @@ _02344E40: add r5, r5, #1 cmp r5, #0x20 blt _02344CC8 - ldr r0, _02344E7C ; =0x02353538 + ldr r0, _02344E7C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x3f00 ldrsh r2, [r0, #0xc0] @@ -275,9 +275,9 @@ _02344E40: add sp, sp, #0x20 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02344E7C: .word 0x02353538 +_02344E7C: .word ov29_02353538 _02344E80: .word 0x0002C9E8 -_02344E84: .word 0x023531A0 +_02344E84: .word ov29_023531A0 arm_func_end ov29_02344C4C arm_func_start ov29_02344E88 @@ -447,7 +447,7 @@ TryLeaderItemPickUp: ; 0x02345058 mov r0, #0 mov r1, #0x40000 bl ov29_0234B084 - ldr r2, _02345510 ; =0x023531BC + ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 bl sub_02024FE8 @@ -469,7 +469,7 @@ _02345108: mov r0, #0 mov r1, #0x40000 bl ov29_0234B084 - ldr r2, _02345510 ; =0x023531BC + ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 bl sub_02024FE8 @@ -505,7 +505,7 @@ _0234515C: mov r0, #0 mov r1, #0x40000 bl ov29_0234B084 - ldr r2, _02345510 ; =0x023531BC + ldr r2, _02345510 ; =ov29_023531BC mov r0, #0 mov r1, r5 bl sub_02024FE8 @@ -519,7 +519,7 @@ _0234515C: bl ov29_0234CCB4 b _02345508 _023451EC: - ldr r0, _02345524 ; =0x02353538 + ldr r0, _02345524 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75b] cmp r0, #0 @@ -601,7 +601,7 @@ _023452D8: mov r0, #0 mov r1, #0x40000 bl ov29_0234B084 - ldr r2, _02345510 ; =0x023531BC + ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 bl sub_02024FE8 @@ -658,7 +658,7 @@ _023453B4: mov r0, #0 mov r1, #0x40000 bl ov29_0234B084 - ldr r2, _02345510 ; =0x023531BC + ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 bl sub_02024FE8 @@ -686,7 +686,7 @@ _02345418: ldrh r2, [r5, #4] strh r2, [r7, #0x66] bl ov29_0234B084 - ldr r2, _02345510 ; =0x023531BC + ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 bl sub_02024FE8 @@ -716,7 +716,7 @@ _02345480: _023454BC: mov r1, #0x40000 bl ov29_0234B084 - ldr r2, _02345510 ; =0x023531BC + ldr r2, _02345510 ; =ov29_023531BC mov r1, r5 mov r0, #0 bl sub_02024FE8 @@ -738,12 +738,12 @@ _02345508: add sp, sp, #0x198 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02345510: .word 0x023531BC +_02345510: .word ov29_023531BC _02345514: .word 0x00000BD2 _02345518: .word 0x00000BD3 _0234551C: .word 0x00001308 _02345520: .word 0x00000BD6 -_02345524: .word 0x02353538 +_02345524: .word ov29_02353538 _02345528: .word 0x00001304 _0234552C: .word 0x00000BD4 _02345530: .word 0x00000BD5 @@ -786,7 +786,7 @@ _023455A8: ldrsh r0, [r7] ldrsh r1, [r7, #2] bl GetTileSafe - ldr r1, _02345690 ; =0x023537B0 + ldr r1, _02345690 ; =ov29_023537B0 str r4, [r0, #0x10] ldrb r1, [r1] cmp r1, #0 @@ -805,7 +805,7 @@ _023455A8: beq _0234563C mov r0, r6 bl GetActualBuyPrice - ldr r1, _02345694 ; =0x02353538 + ldr r1, _02345694 ; =ov29_02353538 ldr r2, [r1] ldr r1, [r2, #0x7bc] add r0, r1, r0 @@ -814,14 +814,14 @@ _023455A8: _02345620: mov r0, r6 bl GetActualSellPrice - ldr r1, _02345694 ; =0x02353538 + ldr r1, _02345694 ; =ov29_02353538 ldr r2, [r1] ldr r1, [r2, #0x7c0] add r0, r1, r0 str r0, [r2, #0x7c0] _0234563C: mov r4, #0 - ldr r5, _02345694 ; =0x02353538 + ldr r5, _02345694 ; =ov29_02353538 mov r6, r4 _02345648: ldr r0, [r5] @@ -834,7 +834,7 @@ _02345648: add r6, r6, #1 cmp r6, #0x40 blt _02345648 - ldr r0, _02345694 ; =0x02353538 + ldr r0, _02345694 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x3f00 strh r4, [r0, #0xc0] @@ -843,6 +843,6 @@ _02345648: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02345690: .word 0x023537B0 -_02345694: .word 0x02353538 +_02345690: .word ov29_023537B0 +_02345694: .word ov29_02353538 arm_func_end SpawnItem diff --git a/asm/overlay_29_023456BC.s b/asm/overlay_29_023456BC.s index aa9af840..26dc4a79 100644 --- a/asm/overlay_29_023456BC.s +++ b/asm/overlay_29_023456BC.s @@ -1366,7 +1366,7 @@ _023469DC: .word 0x02353538 ov29_023469E0: ; 0x023469E0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r8, #0 - ldr r5, _02346A60 ; =0x020AF6B8 + ldr r5, _02346A60 ; =BAG_ITEMS_PTR_MIRROR mov sl, r0 mov r6, r8 mov r7, #1 @@ -1399,7 +1399,7 @@ _02346A48: bl ov29_022FB920 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02346A60: .word 0x020AF6B8 +_02346A60: .word BAG_ITEMS_PTR_MIRROR arm_func_end ov29_023469E0 arm_func_start ov29_02346A64 @@ -1474,7 +1474,7 @@ _02346B5C: cmp sb, #4 blt _02346AE8 mov r4, #0 - ldr r6, _02346BD4 ; =0x020AF6B8 + ldr r6, _02346BD4 ; =BAG_ITEMS_PTR_MIRROR mov r8, #0x55 mov r7, r4 mov r5, #6 @@ -1503,13 +1503,13 @@ _02346BB8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02346BD0: .word 0x02353538 -_02346BD4: .word 0x020AF6B8 +_02346BD4: .word BAG_ITEMS_PTR_MIRROR arm_func_end ov29_02346A64 arm_func_start CheckTeamItemsFlags CheckTeamItemsFlags: ; 0x02346BD8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr r1, _02346CB4 ; =0x020AF6B8 + ldr r1, _02346CB4 ; =BAG_ITEMS_PTR_MIRROR mov r7, #0 mov r5, r0 ldr r8, [r1] @@ -1570,7 +1570,7 @@ _02346CA4: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02346CB4: .word 0x020AF6B8 +_02346CB4: .word BAG_ITEMS_PTR_MIRROR _02346CB8: .word 0x02353538 arm_func_end CheckTeamItemsFlags @@ -1579,7 +1579,7 @@ ov29_02346CBC: ; 0x02346CBC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sb, #0 mov r8, #1 - ldr r5, _02346DA0 ; =0x020AF6B8 + ldr r5, _02346DA0 ; =BAG_ITEMS_PTR_MIRROR mov r7, sb mov fp, sb mov r6, r8 @@ -1638,7 +1638,7 @@ _02346D8C: bl RemoveEmptyItemsInBag ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02346DA0: .word 0x020AF6B8 +_02346DA0: .word BAG_ITEMS_PTR_MIRROR arm_func_end ov29_02346CBC arm_func_start ov29_02346DA4 @@ -1701,7 +1701,7 @@ ov29_02346E48: ; 0x02346E48 ov29_02346E5C: ; 0x02346E5C stmdb sp!, {r3, r4, r5, lr} mov r5, #0 - ldr r1, _02346EB8 ; =0x020AF6B8 + ldr r1, _02346EB8 ; =BAG_ITEMS_PTR_MIRROR mov r3, r5 mov ip, #1 mov r0, #6 @@ -1725,7 +1725,7 @@ _02346EA8: blt _02346E74 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02346EB8: .word 0x020AF6B8 +_02346EB8: .word BAG_ITEMS_PTR_MIRROR arm_func_end ov29_02346E5C arm_func_start ov29_02346EBC @@ -1763,7 +1763,7 @@ AddHeldItemToBag: ; 0x02346F14 stmdb sp!, {r4, r5, r6, lr} mov r5, r0 bl GetCurrentBagCapacity - ldr r1, _02346FB4 ; =0x020AF6B8 + ldr r1, _02346FB4 ; =BAG_ITEMS_PTR_MIRROR mov lr, #0 ldr r6, [r1] mov r2, lr @@ -1782,7 +1782,7 @@ _02346F3C: mov r0, r5 bl ov29_02346EBC strb r0, [r5, #0x63] - ldr r0, _02346FB4 ; =0x020AF6B8 + ldr r0, _02346FB4 ; =BAG_ITEMS_PTR_MIRROR ldrh r1, [r5, #0x62] ldr r2, [r0] add r0, r5, #0x62 @@ -1804,7 +1804,7 @@ _02346FA4: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02346FB4: .word 0x020AF6B8 +_02346FB4: .word BAG_ITEMS_PTR_MIRROR arm_func_end AddHeldItemToBag arm_func_start ov29_02346FB8 @@ -1865,7 +1865,7 @@ ov29_02347040: ; 0x02347040 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r8, #0 ldr r5, _023470F8 ; =0x02353538 - ldr r6, _023470FC ; =0x020AF6B8 + ldr r6, _023470FC ; =BAG_ITEMS_PTR_MIRROR mov fp, r8 mov r7, #1 mov r4, #6 @@ -1913,7 +1913,7 @@ _023470E8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _023470F8: .word 0x02353538 -_023470FC: .word 0x020AF6B8 +_023470FC: .word BAG_ITEMS_PTR_MIRROR arm_func_end ov29_02347040 arm_func_start ov29_02347100 @@ -2282,7 +2282,7 @@ _023475E8: ldrb r0, [r8] cmp r0, #0 bne _023476BC - ldr r1, _02347B40 ; =0x0235171C + ldr r1, _02347B40 ; =DIRECTIONS_XY mov r2, sb, lsl #2 add r0, r1, sb, lsl #2 ldrsh r7, [r4, #0xd0] @@ -2309,7 +2309,7 @@ _02347668: ldrb fp, [r7, r0] cmp fp, #8 bge _023476B0 - ldr r0, _02347B40 ; =0x0235171C + ldr r0, _02347B40 ; =DIRECTIONS_XY mov r1, fp, lsl #2 ldrsh r1, [r0, r1] add r0, r0, fp, lsl #2 @@ -2331,7 +2331,7 @@ _023476B4: _023476BC: mov r0, sb, lsl #0x10 mov r1, r0, lsr #0x10 - ldr r0, _02347B40 ; =0x0235171C + ldr r0, _02347B40 ; =DIRECTIONS_XY mov r2, r1, lsl #2 ldrh r2, [r0, r2] add r1, r0, r1, lsl #2 @@ -2598,7 +2598,7 @@ _02347A94: _02347A9C: mov r0, sb, lsl #0x10 mov r0, r0, lsr #0x10 - ldr r1, _02347B40 ; =0x0235171C + ldr r1, _02347B40 ; =DIRECTIONS_XY mov r2, r0, lsl #2 add r0, r1, r0, lsl #2 ldrh r1, [r1, r2] @@ -2641,7 +2641,7 @@ _02347B34: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02347B3C: .word 0x02353538 -_02347B40: .word 0x0235171C +_02347B40: .word DIRECTIONS_XY _02347B44: .word 0x023516FC _02347B48: .word 0x00000BE1 _02347B4C: .word 0x00000BE5 diff --git a/asm/overlay_29_02347BC8.s b/asm/overlay_29_02347BC8.s index 0eaa6f7a..21962e5a 100644 --- a/asm/overlay_29_02347BC8.s +++ b/asm/overlay_29_02347BC8.s @@ -7,7 +7,7 @@ ov29_02347BC8: ; 0x02347BC8 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x44 - ldr r4, _0234800C ; =0x02353538 + ldr r4, _0234800C ; =ov29_02353538 mov sl, r0 ldr r4, [r4] mov r6, #3 @@ -294,7 +294,7 @@ _02348004: add sp, sp, #0x44 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0234800C: .word 0x02353538 +_0234800C: .word ov29_02353538 _02348010: .word 0x00000195 _02348014: .word 0x00000BE1 _02348018: .word 0x00000BE4 @@ -317,7 +317,7 @@ ov29_02348020: ; 0x02348020 ldmeqia sp!, {r4, r5, r6, pc} mov r0, #0x64 bl DungeonRandInt - ldr r1, _023480F8 ; =0x022C46B0 + ldr r1, _023480F8 ; =ov10_022C46B0 ldrsh r1, [r1] cmp r0, r1 movlt r1, #1 @@ -361,7 +361,7 @@ _023480F0: mov r0, r6 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023480F8: .word 0x022C46B0 +_023480F8: .word ov10_022C46B0 arm_func_end ov29_02348020 arm_func_start ov29_023480FC @@ -396,7 +396,7 @@ _02348124: mov r1, #0x4c bl ExclusiveItemEffectIsActive__023482B0 cmp r0, #0 - ldrne r0, _023482AC ; =0x020A1878 + ldrne r0, _023482AC ; =_020A1878 ldrnesh r1, [r7, #0x16] ldrnesh r0, [r0] addne r0, r1, r0 @@ -405,7 +405,7 @@ _02348124: mov r1, #0x4d bl ExclusiveItemEffectIsActive__023482B0 cmp r0, #0 - ldrne r0, _023482AC ; =0x020A1878 + ldrne r0, _023482AC ; =_020A1878 ldrnesh r1, [r7, #0x16] ldrnesh r0, [r0] addne r0, r1, r0, lsl #1 @@ -415,7 +415,7 @@ _02348124: bl ExclusiveItemEffectIsActive__023482B0 cmp r0, #0 beq _023481C4 - ldr r0, _023482AC ; =0x020A1878 + ldr r0, _023482AC ; =_020A1878 ldrsh r1, [r7, #0x16] ldrsh r0, [r0] add r0, r0, r0, lsl #1 @@ -484,7 +484,7 @@ _02348294: blt _023481FC ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_023482AC: .word 0x020A1878 +_023482AC: .word _020A1878 arm_func_end ov29_02348100 arm_func_start ExclusiveItemEffectIsActive__023482B0 @@ -503,7 +503,7 @@ ExclusiveItemEffectIsActive__023482B0: ; 0x023482B0 arm_func_start ov29_023482D4 ov29_023482D4: ; 0x023482D4 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _02348308 ; =0x02353538 + ldr r1, _02348308 ; =ov29_02353538 mov r5, r0 ldr r4, [r1] bl ov29_023386B0 @@ -516,7 +516,7 @@ ov29_023482D4: ; 0x023482D4 bl ov29_0234830C ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02348308: .word 0x02353538 +_02348308: .word ov29_02353538 arm_func_end ov29_023482D4 arm_func_start ov29_0234830C @@ -530,7 +530,7 @@ ov29_0234830C: ; 0x0234830C mov r5, r2 mov r4, r3 bl MemAlloc - ldr r2, _02348498 ; =0x023537C4 + ldr r2, _02348498 ; =ov29_023537C4 mov r1, #4 str r0, [r2] bl MemZero @@ -586,7 +586,7 @@ _023483F8: mov r0, #0 bl ov29_0234C738 mov r6, #2 - ldr r4, _0234849C ; =0x0237C694 + ldr r4, _0234849C ; =ov29_0237C694 b _02348424 _0234840C: mov r0, r6 @@ -616,32 +616,32 @@ _0234842C: bl ov29_022E0DE4 bl ov29_022E0E44 bl sub_0201551C - ldr r0, _02348498 ; =0x023537C4 + ldr r0, _02348498 ; =ov29_023537C4 ldr r0, [r0] cmp r0, #0 beq _02348490 bl MemFree - ldr r0, _02348498 ; =0x023537C4 + ldr r0, _02348498 ; =ov29_023537C4 mov r1, #0 str r1, [r0] _02348490: add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02348498: .word 0x023537C4 -_0234849C: .word 0x0237C694 +_02348498: .word ov29_023537C4 +_0234849C: .word ov29_0237C694 arm_func_end ov29_0234830C arm_func_start ov29_023484A0 ov29_023484A0: ; 0x023484A0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r0, _02348804 ; =0x02353538 + ldr r0, _02348804 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x348 add r7, r0, #0x400 add r0, r7, #0x18 bl ov29_023496EC - ldr r0, _02348804 ; =0x02353538 + ldr r0, _02348804 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsb r0, [r0, #0x98] @@ -655,7 +655,7 @@ ov29_023484A0: ; 0x023484A0 mov sl, #0xa5 mov r5, #3 mov r6, #1 - ldr r4, _02348804 ; =0x02353538 + ldr r4, _02348804 ; =ov29_02353538 b _02348798 _023484FC: mov r0, r7 @@ -722,7 +722,7 @@ _023485AC: mov r0, #4 bl DungeonRandInt mov r1, r0, lsl #1 - ldr r0, _02348808 ; =0x022C48E4 + ldr r0, _02348808 ; =ov10_022C48E4 strb fp, [r7, #0x2e] ldrsh r0, [r0, r1] strh r0, [r7, #0x1c] @@ -850,7 +850,7 @@ _02348798: cmp r8, #8 blt _023484FC _023487A0: - ldr r0, _02348804 ; =0x02353538 + ldr r0, _02348804 ; =ov29_02353538 ldr r4, [r0] ldrb r0, [r4, #0x760] cmp r0, #0 @@ -864,7 +864,7 @@ _023487A0: bl TrySpawnGoldenChamber ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _023487D4: - ldr r1, _02348804 ; =0x02353538 + ldr r1, _02348804 ; =ov29_02353538 ldrb r2, [r4, #0x776] ldr r0, [r1] add r0, r0, #0x4000 @@ -877,8 +877,8 @@ _023487D4: streqh r1, [r0, #0xd4] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02348804: .word 0x02353538 -_02348808: .word 0x022C48E4 +_02348804: .word ov29_02353538 +_02348808: .word ov10_022C48E4 arm_func_end ov29_023484A0 arm_func_start ov29_0234880C @@ -907,7 +907,7 @@ _02348840: arm_func_start ov29_02348850 ov29_02348850: ; 0x02348850 stmdb sp!, {r3, lr} - ldr r0, _02348884 ; =0x02353538 + ldr r0, _02348884 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x760] cmp r0, #0 @@ -915,12 +915,12 @@ ov29_02348850: ; 0x02348850 add r0, r1, #0x348 add r0, r0, #0x400 bl ov29_0234880C - ldr r1, _02348884 ; =0x02353538 + ldr r1, _02348884 ; =ov29_02353538 ldr r1, [r1] strb r0, [r1, #0x763] ldmia sp!, {r3, pc} .align 2, 0 -_02348884: .word 0x02353538 +_02348884: .word ov29_02353538 arm_func_end ov29_02348850 arm_func_start ov29_02348888 @@ -978,7 +978,7 @@ _02348908: arm_func_start ov29_02348918 ov29_02348918: ; 0x02348918 stmdb sp!, {r4, r5, r6, lr} - ldr r0, _02348990 ; =0x02353538 + ldr r0, _02348990 ; =ov29_02353538 ldr r0, [r0] add r5, r0, #0x348 bl GetForcedLossReason @@ -1010,13 +1010,13 @@ _02348980: blt _0234893C ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02348990: .word 0x02353538 +_02348990: .word ov29_02353538 arm_func_end ov29_02348918 arm_func_start ov29_02348994 ov29_02348994: ; 0x02348994 stmdb sp!, {r4, r5, r6, lr} - ldr r0, _02348A14 ; =0x02353538 + ldr r0, _02348A14 ; =ov29_02353538 mov r4, #0 ldr r0, [r0] add r6, r0, #0x348 @@ -1050,7 +1050,7 @@ _02348A04: blt _023489A8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02348A14: .word 0x02353538 +_02348A14: .word ov29_02353538 arm_func_end ov29_02348994 arm_func_start ov29_02348A18 @@ -1111,7 +1111,7 @@ ov29_02348ABC: ; 0x02348ABC mov r1, r0 mov r0, #1 bl ov29_02344B9C - ldr r1, _02348B20 ; =0x02353538 + ldr r1, _02348B20 ; =ov29_02353538 ldr r0, _02348B24 ; =0x00000E22 ldr r1, [r1] mov r2, #0 @@ -1123,20 +1123,20 @@ ov29_02348ABC: ; 0x02348ABC mov r1, r0 mov r0, #0 bl ov29_02349AD4 - ldr r0, _02348B20 ; =0x02353538 + ldr r0, _02348B20 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x77a] ldmia sp!, {r3, pc} .align 2, 0 -_02348B20: .word 0x02353538 +_02348B20: .word ov29_02353538 _02348B24: .word 0x00000E22 arm_func_end ov29_02348ABC arm_func_start ov29_02348B28 ov29_02348B28: ; 0x02348B28 stmdb sp!, {r4, lr} - ldr r1, _02348B94 ; =0x02353538 + ldr r1, _02348B94 ; =ov29_02353538 mov r4, r0 ldr r1, [r1] mov r0, #0 @@ -1158,12 +1158,12 @@ ov29_02348B28: ; 0x02348B28 ldr r0, _02348B9C ; =0x00000E44 bl ov29_02348A18 mov r1, #1 - ldr r0, _02348B94 ; =0x02353538 + ldr r0, _02348B94 ; =ov29_02353538 ldr r0, [r0] strb r1, [r0, #0x77a] ldmia sp!, {r4, pc} .align 2, 0 -_02348B94: .word 0x02353538 +_02348B94: .word ov29_02353538 _02348B98: .word 0x00000E17 _02348B9C: .word 0x00000E44 arm_func_end ov29_02348B28 @@ -1233,7 +1233,7 @@ _02348C60: .word 0x00000E3D ov29_02348C64: ; 0x02348C64 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x40 - ldr r1, _02348CFC ; =0x02353538 + ldr r1, _02348CFC ; =ov29_02353538 mov r5, r0 ldr r0, [r1] mov r4, #0 @@ -1274,7 +1274,7 @@ _02348CF4: add sp, sp, #0x40 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02348CFC: .word 0x02353538 +_02348CFC: .word ov29_02353538 arm_func_end ov29_02348C64 arm_func_start ov29_02348D00 @@ -1328,7 +1328,7 @@ _02348D78: movne r4, #3 b _02348DCC _02348DA8: - ldr r0, _02348DD4 ; =0x02353538 + ldr r0, _02348DD4 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x777] cmp r0, #0 @@ -1341,7 +1341,7 @@ _02348DCC: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02348DD4: .word 0x02353538 +_02348DD4: .word ov29_02353538 arm_func_end ov29_02348D3C arm_func_start ov29_02348DD8 @@ -1449,7 +1449,7 @@ ov29_02348F20: ; 0x02348F20 stmdb sp!, {r3, lr} bl MissionTargetEnemyIsDefeated cmp r0, #0 - ldrne r0, _02348FD4 ; =0x02353538 + ldrne r0, _02348FD4 ; =ov29_02353538 ldrne r0, [r0] ldrneb r0, [r0, #1] cmpne r0, #0 @@ -1458,7 +1458,7 @@ ov29_02348F20: ; 0x02348F20 bl IsCurrentMissionType cmp r0, #0 beq _02348F68 - ldr r0, _02348FD4 ; =0x02353538 + ldr r0, _02348FD4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsh r0, [r0, #0x6e] @@ -1469,7 +1469,7 @@ _02348F68: bl IsCurrentMissionType cmp r0, #0 beq _02348F90 - ldr r0, _02348FD4 ; =0x02353538 + ldr r0, _02348FD4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsh r0, [r0, #0x6e] @@ -1480,13 +1480,13 @@ _02348F90: bl IsCurrentMissionType cmp r0, #0 beq _02348FB4 - ldr r0, _02348FD4 ; =0x02353538 + ldr r0, _02348FD4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsh r0, [r0, #0x6e] bl ov29_0234ABB0 _02348FB4: - ldr r0, _02348FD4 ; =0x02353538 + ldr r0, _02348FD4 ; =ov29_02353538 mov r2, #0 ldr r1, [r0] mov r0, #1 @@ -1496,7 +1496,7 @@ _02348FCC: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_02348FD4: .word 0x02353538 +_02348FD4: .word ov29_02353538 arm_func_end ov29_02348F20 arm_func_start ov29_02348FD8 @@ -1506,7 +1506,7 @@ ov29_02348FD8: ; 0x02348FD8 bl IsDestinationFloorWithItem cmp r0, #0 beq _02349014 - ldr r0, _02349088 ; =0x02353538 + ldr r0, _02349088 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x77a] cmp r0, #0 @@ -1521,7 +1521,7 @@ _02349014: bl IsCurrentMissionType cmp r0, #0 beq _02349050 - ldr r0, _02349088 ; =0x02353538 + ldr r0, _02349088 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x77a] cmp r0, #0 @@ -1542,7 +1542,7 @@ _02349058: mov r1, r0 mov r0, #0 bl ov29_02349AD4 - ldr r0, _02349088 ; =0x02353538 + ldr r0, _02349088 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x77a] @@ -1550,7 +1550,7 @@ _02349080: mov r0, r4 ldmia sp!, {r4, pc} .align 2, 0 -_02349088: .word 0x02353538 +_02349088: .word ov29_02353538 arm_func_end ov29_02348FD8 arm_func_start ov29_0234908C @@ -1561,7 +1561,7 @@ ov29_0234908C: ; 0x0234908C bl IsDestinationFloorWithItem cmp r0, #0 beq _023490CC - ldr r0, _02349148 ; =0x02353538 + ldr r0, _02349148 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x77a] cmp r0, #0 @@ -1576,7 +1576,7 @@ _023490CC: bl IsCurrentMissionType cmp r0, #0 beq _02349110 - ldr r0, _02349148 ; =0x02353538 + ldr r0, _02349148 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x77a] cmp r0, #0 @@ -1599,7 +1599,7 @@ _02349118: mov r1, r0 mov r0, #0 bl ov29_02349AD4 - ldr r0, _02349148 ; =0x02353538 + ldr r0, _02349148 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x77a] @@ -1607,13 +1607,13 @@ _02349140: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02349148: .word 0x02353538 +_02349148: .word ov29_02353538 arm_func_end ov29_0234908C arm_func_start CheckActiveChallengeRequest CheckActiveChallengeRequest: ; 0x0234914C stmdb sp!, {r3, lr} - ldr r0, _02349184 ; =0x02353538 + ldr r0, _02349184 ; =ov29_02353538 mov r1, #5 ldr r0, [r0] strb r1, [sp] @@ -1627,29 +1627,29 @@ CheckActiveChallengeRequest: ; 0x0234914C and r0, r0, #0xff ldmia sp!, {r3, pc} .align 2, 0 -_02349184: .word 0x02353538 +_02349184: .word ov29_02353538 arm_func_end CheckActiveChallengeRequest arm_func_start ov29_02349188 ov29_02349188: ; 0x02349188 - ldr r0, _0234919C ; =0x02353538 + ldr r0, _0234919C ; =ov29_02353538 ldr ip, _023491A0 ; =ov29_023496EC ldr r0, [r0] add r0, r0, #0x760 bx ip .align 2, 0 -_0234919C: .word 0x02353538 +_0234919C: .word ov29_02353538 _023491A0: .word ov29_023496EC arm_func_end ov29_02349188 arm_func_start GetMissionDestination GetMissionDestination: ; 0x023491A4 - ldr r0, _023491B4 ; =0x02353538 + ldr r0, _023491B4 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x760 bx lr .align 2, 0 -_023491B4: .word 0x02353538 +_023491B4: .word ov29_02353538 arm_func_end GetMissionDestination arm_func_start ov29_023491B8 @@ -1685,17 +1685,17 @@ _02349200: arm_func_start IsDestinationFloor IsDestinationFloor: ; 0x02349208 - ldr r0, _02349218 ; =0x02353538 + ldr r0, _02349218 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x760] bx lr .align 2, 0 -_02349218: .word 0x02353538 +_02349218: .word ov29_02353538 arm_func_end IsDestinationFloor arm_func_start IsCurrentMissionType IsCurrentMissionType: ; 0x0234921C - ldr r1, _0234924C ; =0x02353538 + ldr r1, _0234924C ; =ov29_02353538 ldr r2, [r1] ldrb r1, [r2, #0x760] cmp r1, #0 @@ -1710,12 +1710,12 @@ _02349244: mov r0, #1 bx lr .align 2, 0 -_0234924C: .word 0x02353538 +_0234924C: .word ov29_02353538 arm_func_end IsCurrentMissionType arm_func_start IsCurrentMissionTypeExact IsCurrentMissionTypeExact: ; 0x02349250 - ldr r2, _02349288 ; =0x02353538 + ldr r2, _02349288 ; =ov29_02353538 ldr r3, [r2] ldrb r2, [r3, #0x760] cmp r2, #0 @@ -1732,7 +1732,7 @@ _02349280: mov r0, #1 bx lr .align 2, 0 -_02349288: .word 0x02353538 +_02349288: .word ov29_02353538 arm_func_end IsCurrentMissionTypeExact arm_func_start IsOutlawMonsterHouseFloor @@ -1768,7 +1768,7 @@ IsLegendaryChallengeFloor: ; 0x023492D4 bl IsCurrentMissionType cmp r0, #0 beq _02349308 - ldr r0, _02349310 ; =0x02353538 + ldr r0, _02349310 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x762] add r0, r0, #0xff @@ -1780,7 +1780,7 @@ _02349308: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_02349310: .word 0x02353538 +_02349310: .word ov29_02353538 arm_func_end IsLegendaryChallengeFloor arm_func_start IsJirachiChallengeFloor @@ -1790,7 +1790,7 @@ IsJirachiChallengeFloor: ; 0x02349314 bl IsCurrentMissionType cmp r0, #0 beq _02349340 - ldr r0, _02349348 ; =0x02353538 + ldr r0, _02349348 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x762] cmp r0, #5 @@ -1800,13 +1800,13 @@ _02349340: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_02349348: .word 0x02353538 +_02349348: .word ov29_02353538 arm_func_end IsJirachiChallengeFloor arm_func_start IsDestinationFloorWithMonster IsDestinationFloorWithMonster: ; 0x0234934C stmdb sp!, {r3, lr} - ldr r0, _02349374 ; =0x02353538 + ldr r0, _02349374 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x760 bl FloorHasMissionMonster @@ -1816,13 +1816,13 @@ IsDestinationFloorWithMonster: ; 0x0234934C and r0, r0, #0xff ldmia sp!, {r3, pc} .align 2, 0 -_02349374: .word 0x02353538 +_02349374: .word ov29_02353538 arm_func_end IsDestinationFloorWithMonster arm_func_start ov29_02349378 ov29_02349378: ; 0x02349378 stmdb sp!, {r4, r5, r6, lr} - ldr r0, _023493F4 ; =0x02353538 + ldr r0, _023493F4 ; =ov29_02353538 ldr r0, [r0] add r6, r0, #0x760 mov r0, r6 @@ -1856,13 +1856,13 @@ _023493E0: mov r0, r4 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023493F4: .word 0x02353538 +_023493F4: .word ov29_02353538 arm_func_end ov29_02349378 arm_func_start LoadMissionMonsterSprites LoadMissionMonsterSprites: ; 0x023493F8 stmdb sp!, {r4, r5, r6, lr} - ldr r0, _0234946C ; =0x02353538 + ldr r0, _0234946C ; =ov29_02353538 ldr r0, [r0] add r6, r0, #0x760 mov r0, r6 @@ -1895,12 +1895,12 @@ _0234945C: blt _02349438 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0234946C: .word 0x02353538 +_0234946C: .word ov29_02353538 arm_func_end LoadMissionMonsterSprites arm_func_start MissionTargetEnemyIsDefeated MissionTargetEnemyIsDefeated: ; 0x02349470 - ldr r0, _0234948C ; =0x02353538 + ldr r0, _0234948C ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x760] cmp r0, #0 @@ -1908,22 +1908,22 @@ MissionTargetEnemyIsDefeated: ; 0x02349470 moveq r0, #0 bx lr .align 2, 0 -_0234948C: .word 0x02353538 +_0234948C: .word ov29_02353538 arm_func_end MissionTargetEnemyIsDefeated arm_func_start SetMissionTargetEnemyDefeated SetMissionTargetEnemyDefeated: ; 0x02349490 - ldr r1, _023494A0 ; =0x02353538 + ldr r1, _023494A0 ; =ov29_02353538 ldr r1, [r1] strb r0, [r1, #0x77b] bx lr .align 2, 0 -_023494A0: .word 0x02353538 +_023494A0: .word ov29_02353538 arm_func_end SetMissionTargetEnemyDefeated arm_func_start IsDestinationFloorWithFixedRoom IsDestinationFloorWithFixedRoom: ; 0x023494A4 - ldr r0, _023494C8 ; =0x02353538 + ldr r0, _023494C8 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x760] cmp r0, #0 @@ -1933,12 +1933,12 @@ IsDestinationFloorWithFixedRoom: ; 0x023494A4 movne r0, #1 bx lr .align 2, 0 -_023494C8: .word 0x02353538 +_023494C8: .word ov29_02353538 arm_func_end IsDestinationFloorWithFixedRoom arm_func_start GetItemToRetrieve GetItemToRetrieve: ; 0x023494CC - ldr r0, _023494EC ; =0x02353538 + ldr r0, _023494EC ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x760] add r1, r1, #0x760 @@ -1947,13 +1947,13 @@ GetItemToRetrieve: ; 0x023494CC moveq r0, #0 bx lr .align 2, 0 -_023494EC: .word 0x02353538 +_023494EC: .word ov29_02353538 arm_func_end GetItemToRetrieve arm_func_start GetItemToDeliver GetItemToDeliver: ; 0x023494F0 stmdb sp!, {r4, lr} - ldr r1, _02349518 ; =0x02353538 + ldr r1, _02349518 ; =ov29_02353538 mov r0, #7 ldr r1, [r1] add r4, r1, #0x760 @@ -1963,13 +1963,13 @@ GetItemToDeliver: ; 0x023494F0 moveq r0, #0 ldmia sp!, {r4, pc} .align 2, 0 -_02349518: .word 0x02353538 +_02349518: .word ov29_02353538 arm_func_end GetItemToDeliver arm_func_start GetSpecialTargetItem GetSpecialTargetItem: ; 0x0234951C stmdb sp!, {r4, lr} - ldr r1, _02349560 ; =0x02353538 + ldr r1, _02349560 ; =ov29_02353538 mov r0, #3 ldr r2, [r1] mov r1, #1 @@ -1988,13 +1988,13 @@ _02349558: mov r0, #0 ldmia sp!, {r4, pc} .align 2, 0 -_02349560: .word 0x02353538 +_02349560: .word ov29_02353538 arm_func_end GetSpecialTargetItem arm_func_start IsDestinationFloorWithItem IsDestinationFloorWithItem: ; 0x02349564 stmdb sp!, {r4, lr} - ldr r0, _023495C0 ; =0x02353538 + ldr r0, _023495C0 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x760] add r4, r1, #0x760 @@ -2019,7 +2019,7 @@ _023495B8: mov r0, #1 ldmia sp!, {r4, pc} .align 2, 0 -_023495C0: .word 0x02353538 +_023495C0: .word ov29_02353538 arm_func_end IsDestinationFloorWithItem arm_func_start IsDestinationFloorWithHiddenOutlaw @@ -2056,18 +2056,18 @@ _02349618: arm_func_start GetMissionTargetEnemy GetMissionTargetEnemy: ; 0x02349620 - ldr r0, _02349634 ; =0x02353538 + ldr r0, _02349634 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsh r0, [r0, #0x6e] bx lr .align 2, 0 -_02349634: .word 0x02353538 +_02349634: .word ov29_02353538 arm_func_end GetMissionTargetEnemy arm_func_start GetMissionEnemyMinionGroup GetMissionEnemyMinionGroup: ; 0x02349638 - ldr r1, _02349654 ; =0x02353538 + ldr r1, _02349654 ; =ov29_02353538 add r0, r0, #1 ldr r1, [r1] add r0, r1, r0, lsl #1 @@ -2075,12 +2075,12 @@ GetMissionEnemyMinionGroup: ; 0x02349638 ldrsh r0, [r0, #0x6e] bx lr .align 2, 0 -_02349654: .word 0x02353538 +_02349654: .word ov29_02353538 arm_func_end GetMissionEnemyMinionGroup arm_func_start ov29_02349658 ov29_02349658: ; 0x02349658 - ldr r0, _02349684 ; =0x02353538 + ldr r0, _02349684 ; =ov29_02353538 mov r2, #0 ldr r1, [r0] strb r2, [r1] @@ -2092,57 +2092,57 @@ ov29_02349658: ; 0x02349658 strb r2, [r0, #3] bx lr .align 2, 0 -_02349684: .word 0x02353538 +_02349684: .word ov29_02353538 arm_func_end ov29_02349658 arm_func_start ov29_02349688 ov29_02349688: ; 0x02349688 - ldr r1, _02349698 ; =0x02353538 + ldr r1, _02349698 ; =ov29_02353538 ldr r1, [r1] strb r0, [r1, #1] bx lr .align 2, 0 -_02349698: .word 0x02353538 +_02349698: .word ov29_02353538 arm_func_end ov29_02349688 arm_func_start ov29_0234969C ov29_0234969C: ; 0x0234969C - ldr r1, _023496AC ; =0x02353538 + ldr r1, _023496AC ; =ov29_02353538 ldr r1, [r1] strb r0, [r1, #2] bx lr .align 2, 0 -_023496AC: .word 0x02353538 +_023496AC: .word ov29_02353538 arm_func_end ov29_0234969C arm_func_start ov29_023496B0 ov29_023496B0: ; 0x023496B0 - ldr r0, _023496C0 ; =0x02353538 + ldr r0, _023496C0 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #2] bx lr .align 2, 0 -_023496C0: .word 0x02353538 +_023496C0: .word ov29_02353538 arm_func_end ov29_023496B0 arm_func_start SetTargetMonsterNotFoundFlag SetTargetMonsterNotFoundFlag: ; 0x023496C4 - ldr r1, _023496D4 ; =0x02353538 + ldr r1, _023496D4 ; =ov29_02353538 ldr r1, [r1] strb r0, [r1, #3] bx lr .align 2, 0 -_023496D4: .word 0x02353538 +_023496D4: .word ov29_02353538 arm_func_end SetTargetMonsterNotFoundFlag arm_func_start GetTargetMonsterNotFoundFlag GetTargetMonsterNotFoundFlag: ; 0x023496D8 - ldr r0, _023496E8 ; =0x02353538 + ldr r0, _023496E8 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #3] bx lr .align 2, 0 -_023496E8: .word 0x02353538 +_023496E8: .word ov29_02353538 arm_func_end GetTargetMonsterNotFoundFlag arm_func_start ov29_023496EC diff --git a/asm/overlay_29_023498A0.s b/asm/overlay_29_023498A0.s index 8800dc72..d3635bdb 100644 --- a/asm/overlay_29_023498A0.s +++ b/asm/overlay_29_023498A0.s @@ -767,7 +767,7 @@ _0234A32C: mov r7, #0 mov fp, r7 mov r6, #1 - ldr r5, _0234A5B8 ; =0x020AF6B8 + ldr r5, _0234A5B8 ; =BAG_ITEMS_PTR_MIRROR mov r4, #6 b _0234A3D8 _0234A374: @@ -815,7 +815,7 @@ _0234A3E0: b _0234A5A8 _0234A40C: mov r0, #6 - ldr r1, _0234A5B8 ; =0x020AF6B8 + ldr r1, _0234A5B8 ; =BAG_ITEMS_PTR_MIRROR mul r4, r7, r0 ldr r0, [r1] ldr r0, [r0, #0x384] @@ -844,7 +844,7 @@ _0234A468: add r0, r0, #0x62 bl ItemZInit _0234A47C: - ldr r0, _0234A5B8 ; =0x020AF6B8 + ldr r0, _0234A5B8 ; =BAG_ITEMS_PTR_MIRROR ldr r0, [r0] ldr r0, [r0, #0x384] add r0, r0, r4 @@ -854,7 +854,7 @@ _0234A47C: mov r0, #0 mov r2, #1 bl DisplayMessage - ldr r1, _0234A5B8 ; =0x020AF6B8 + ldr r1, _0234A5B8 ; =BAG_ITEMS_PTR_MIRROR mov r0, #0 ldr r1, [r1] ldr r1, [r1, #0x384] @@ -927,7 +927,7 @@ _0234A5A8: .align 2, 0 _0234A5B0: .word 0x00000E27 _0234A5B4: .word 0x00000E21 -_0234A5B8: .word 0x020AF6B8 +_0234A5B8: .word BAG_ITEMS_PTR_MIRROR _0234A5BC: .word 0x00000E26 _0234A5C0: .word 0x02353538 _0234A5C4: .word 0x00000E1D diff --git a/asm/overlay_29_0234DDF4.s b/asm/overlay_29_0234DDF4.s index 1a3cc952..06adc10c 100644 --- a/asm/overlay_29_0234DDF4.s +++ b/asm/overlay_29_0234DDF4.s @@ -10,7 +10,7 @@ OpenMenu: ; 0x0234DDF4 mov r0, #0x22 mov sl, r2 bl LoadOverlay - ldr r0, _0234E8E8 ; =0x02353538 + ldr r0, _0234E8E8 ; =ov29_02353538 mov r6, #0 ldr r1, [r0] mov r4, #0xa @@ -50,7 +50,7 @@ _0234DE78: bl ov29_022EA428 mov r0, #1 bl ov29_022EB398 - ldr r0, _0234E8EC ; =0x02382804 + ldr r0, _0234E8EC ; =ov29_02382804 mvn r1, #0 str r1, [r0, #4] bl GetLeader @@ -294,7 +294,7 @@ _0234E200: mov r8, r7 b _0234E27C _0234E214: - ldr r0, _0234E8E8 ; =0x02353538 + ldr r0, _0234E8E8 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r8, lsl #2 add r0, r0, #0x12000 @@ -307,7 +307,7 @@ _0234E214: ldrb r0, [r0, #4] cmp r8, r0 bne _0234E274 - ldr r0, _0234E8EC ; =0x02382804 + ldr r0, _0234E8EC ; =ov29_02382804 str r7, [r0, #4] bl ov29_022F0B9C cmp r0, #0 @@ -329,11 +329,11 @@ _0234E27C: _0234E288: mov sb, #0 _0234E28C: - ldr r0, _0234E8F0 ; =0x0235352C + ldr r0, _0234E8F0 ; =ov29_0235352C ldr r0, [r0] ldr r0, [r0, #0x24] bl sub_0200B3D4 - ldr r0, _0234E8F0 ; =0x0235352C + ldr r0, _0234E8F0 ; =ov29_0235352C ldr r0, [r0] ldr r0, [r0, #0x24] bl sub_0200B330 @@ -353,7 +353,7 @@ _0234E2C4: mov r7, r8 b _0234E318 _0234E2E0: - ldr r0, _0234E8E8 ; =0x02353538 + ldr r0, _0234E8E8 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r7, lsl #2 add r0, r0, #0x12000 @@ -377,7 +377,7 @@ _0234E320: mov sb, r7 str r0, [sp, #0x24] _0234E334: - ldr r0, _0234E8E8 ; =0x02353538 + ldr r0, _0234E8E8 ; =ov29_02353538 ldr r0, [r0] add r0, r0, sb, lsl #2 add r0, r0, #0x12000 @@ -415,7 +415,7 @@ _0234E38C: strb r8, [r0, #0x4e] mov r0, #0 bl ov29_022EB398 - ldr sb, _0234E8E8 ; =0x02353538 + ldr sb, _0234E8E8 ; =ov29_02353538 mvn r8, #0 _0234E3CC: mov r0, #0 @@ -724,7 +724,7 @@ _0234E834: cmp r4, #5 bne _0234E86C bl RestMenu - ldr r0, _0234E8E8 ; =0x02353538 + ldr r0, _0234E8E8 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #8] cmp r0, #0 @@ -772,9 +772,9 @@ _0234E8E0: add sp, sp, #0x38 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0234E8E8: .word 0x02353538 -_0234E8EC: .word 0x02382804 -_0234E8F0: .word 0x0235352C +_0234E8E8: .word ov29_02353538 +_0234E8EC: .word ov29_02382804 +_0234E8F0: .word ov29_0235352C _0234E8F4: .word 0x00000B6A arm_func_end OpenMenu @@ -887,7 +887,7 @@ ov29_0234EA18: ; 0x0234EA18 bne _0234EB1C _0234EA50: mov r4, #0 - ldr fp, _0234EB24 ; =0x02353538 + ldr fp, _0234EB24 ; =ov29_02353538 b _0234EAE4 _0234EA5C: cmp sb, #1 @@ -949,7 +949,7 @@ _0234EB1C: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0234EB24: .word 0x02353538 +_0234EB24: .word ov29_02353538 arm_func_end ov29_0234EA18 arm_func_start ov29_0234EB28 @@ -1007,7 +1007,7 @@ ov29_0234EBAC: ; 0x0234EBAC arm_func_start ov29_0234EBCC ov29_0234EBCC: ; 0x0234EBCC stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r4, _0234EC10 ; =0x02353538 + ldr r4, _0234EC10 ; =ov29_02353538 mov r6, #0 mov r5, #1 _0234EBDC: @@ -1025,5 +1025,5 @@ _0234EBDC: blt _0234EBDC ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0234EC10: .word 0x02353538 +_0234EC10: .word ov29_02353538 arm_func_end ov29_0234EBCC diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index b6cb2dd2..d9292844 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -184,7 +184,7 @@ _0234EEAC: mov r3, r2 mov r1, #2 bl ov31_02388114 - ldr r1, _0234EF20 ; =0x023533B0 + ldr r1, _0234EF20 ; =ov29_023533B0 str r0, [sp, #8] bl ov31_02388444 ldr r0, [sp, #8] @@ -210,7 +210,7 @@ _0234EEFC: add sp, sp, #0x98 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0234EF20: .word 0x023533B0 +_0234EF20: .word ov29_023533B0 arm_func_end ov29_0234EE10 arm_func_start ov29_0234EF24 @@ -246,7 +246,7 @@ _0234EF7C: mov r3, r2 mov r1, #2 bl ov31_02388114 - ldr r1, _0234F004 ; =0x023533B0 + ldr r1, _0234F004 ; =ov29_023533B0 str r0, [sp, #8] bl ov31_02388444 ldr r0, [sp, #8] @@ -275,7 +275,7 @@ _0234EFD4: add sp, sp, #0x98 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0234F004: .word 0x023533B0 +_0234F004: .word ov29_023533B0 arm_func_end ov29_0234EF24 arm_func_start ov29_0234F008 @@ -289,7 +289,7 @@ ov29_0234F008: ; 0x0234F008 mov r0, #8 mov r5, r2 bl ov29_022EA428 - ldr r0, _0234F1D8 ; =0x0235352C + ldr r0, _0234F1D8 ; =ov29_0235352C ldr r0, [r0] ldr r0, [r0, #0x24] bl sub_0200B3D4 @@ -413,14 +413,14 @@ _0234F1CC: add sp, sp, #0x40 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_0234F1D8: .word 0x0235352C +_0234F1D8: .word ov29_0235352C arm_func_end ov29_0234F008 arm_func_start ov29_0234F1DC ov29_0234F1DC: ; 0x0234F1DC stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - ldr r0, _0234F214 ; =0x023533D0 + ldr r0, _0234F214 ; =ov29_023533D0 mov r4, r1 bl sub_020348E4 cmp r0, #0 @@ -429,18 +429,18 @@ ov29_0234F1DC: ; 0x0234F1DC mov r1, r4 mov r2, #0 bl ov29_0234F2CC - ldr r1, _0234F218 ; =0x02353834 + ldr r1, _0234F218 ; =ov29_02353834 str r0, [r1] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234F214: .word 0x023533D0 -_0234F218: .word 0x02353834 +_0234F214: .word ov29_023533D0 +_0234F218: .word ov29_02353834 arm_func_end ov29_0234F1DC arm_func_start ov29_0234F21C ov29_0234F21C: ; 0x0234F21C stmdb sp!, {r3, lr} - ldr r0, _0234F244 ; =0x02353834 + ldr r0, _0234F244 ; =ov29_02353834 ldr r0, [r0] bl ov29_0234F304 cmp r0, #0 @@ -450,17 +450,17 @@ ov29_0234F21C: ; 0x0234F21C mov r0, #4 ldmia sp!, {r3, pc} .align 2, 0 -_0234F244: .word 0x02353834 +_0234F244: .word ov29_02353834 arm_func_end ov29_0234F21C arm_func_start ov29_0234F248 ov29_0234F248: ; 0x0234F248 ldr ip, _0234F254 ; =ov29_0234F3F4 - ldr r0, _0234F258 ; =0x02353834 + ldr r0, _0234F258 ; =ov29_02353834 bx ip .align 2, 0 _0234F254: .word ov29_0234F3F4 -_0234F258: .word 0x02353834 +_0234F258: .word ov29_02353834 arm_func_end ov29_0234F248 arm_func_start ov29_0234F25C @@ -468,28 +468,28 @@ ov29_0234F25C: ; 0x0234F25C stmdb sp!, {r3, lr} mov r2, #1 bl ov29_0234F2CC - ldr r1, _0234F274 ; =0x02353834 + ldr r1, _0234F274 ; =ov29_02353834 str r0, [r1, #4] ldmia sp!, {r3, pc} .align 2, 0 -_0234F274: .word 0x02353834 +_0234F274: .word ov29_02353834 arm_func_end ov29_0234F25C arm_func_start ov29_0234F278 ov29_0234F278: ; 0x0234F278 - ldr r0, _0234F288 ; =0x02353834 + ldr r0, _0234F288 ; =ov29_02353834 ldr ip, _0234F28C ; =ov29_0234F304 ldr r0, [r0, #4] bx ip .align 2, 0 -_0234F288: .word 0x02353834 +_0234F288: .word ov29_02353834 _0234F28C: .word ov29_0234F304 arm_func_end ov29_0234F278 arm_func_start ov29_0234F290 ov29_0234F290: ; 0x0234F290 stmdb sp!, {r3, lr} - ldr r0, _0234F2B4 ; =0x02353834 + ldr r0, _0234F2B4 ; =ov29_02353834 mvn r1, #1 ldr r0, [r0, #4] ldrsb r0, [r0, #2] @@ -498,17 +498,17 @@ ov29_0234F290: ; 0x0234F290 bl sub_0203083C ldmia sp!, {r3, pc} .align 2, 0 -_0234F2B4: .word 0x02353834 +_0234F2B4: .word ov29_02353834 arm_func_end ov29_0234F290 arm_func_start ov29_0234F2B8 ov29_0234F2B8: ; 0x0234F2B8 ldr ip, _0234F2C4 ; =ov29_0234F3F4 - ldr r0, _0234F2C8 ; =0x02353838 + ldr r0, _0234F2C8 ; =ov29_02353838 bx ip .align 2, 0 _0234F2C4: .word ov29_0234F3F4 -_0234F2C8: .word 0x02353838 +_0234F2C8: .word ov29_02353838 arm_func_end ov29_0234F2B8 arm_func_start ov29_0234F2CC @@ -553,14 +553,14 @@ _0234F334: cmp r0, #0 movne r1, #4 strne r1, [r4, #4] - ldrne r0, _0234F3E4 ; =0x023533E0 + ldrne r0, _0234F3E4 ; =ov29_023533E0 movne r1, #0x800 bne _0234F374 ldr r0, [r4, #4] ldr r1, _0234F3E8 ; =0x00001813 add r0, r0, #1 str r0, [r4, #4] - ldr r0, _0234F3EC ; =0x023533C0 + ldr r0, _0234F3EC ; =ov29_023533C0 _0234F374: str r4, [sp] mov ip, #0 @@ -595,9 +595,9 @@ _0234F3D8: ldmia sp!, {r3, r4, pc} .align 2, 0 _0234F3E0: .word 0x000008DD -_0234F3E4: .word 0x023533E0 +_0234F3E4: .word ov29_023533E0 _0234F3E8: .word 0x00001813 -_0234F3EC: .word 0x023533C0 +_0234F3EC: .word ov29_023533C0 _0234F3F0: .word ov29_0234F430 arm_func_end ov29_0234F304 @@ -642,7 +642,7 @@ _0234F460: ldrsb r0, [sp, #4] bl sub_0205B77C mov r6, r0 - ldr r3, _0234F764 ; =0x023533F0 + ldr r3, _0234F764 ; =ov29_023533F0 mov r0, r5 mov r1, #0xa mov r2, #0x13 @@ -656,7 +656,7 @@ _0234F460: add r4, sp, #8 mul r2, r1, r2 str r2, [sp, #0x2c] - ldr r2, _0234F768 ; =0x023533F8 + ldr r2, _0234F768 ; =ov29_023533F8 add r0, sp, #0x58 mov r1, #0x64 mov r3, #0 @@ -689,7 +689,7 @@ _0234F508: blo _0234F578 cmp r0, #0x56 bhi _0234F578 - ldr r0, _0234F76C ; =0x02353538 + ldr r0, _0234F76C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x700 ldrsh r0, [r0, #0x4c] @@ -746,11 +746,11 @@ _0234F5AC: mov r1, #0xa mov r2, r7 bne _0234F610 - ldr r3, _0234F774 ; =0x02353404 + ldr r3, _0234F774 ; =ov29_02353404 bl sub_02026214 b _0234F618 _0234F610: - ldr r3, _0234F764 ; =0x023533F0 + ldr r3, _0234F764 ; =ov29_023533F0 bl sub_02026214 _0234F618: ldrb r1, [sl, #1] @@ -774,7 +774,7 @@ _0234F618: add r0, sp, #0x58 mul r3, r2, r3 str r3, [sp, #0x2c] - ldr r2, _0234F768 ; =0x023533F8 + ldr r2, _0234F768 ; =ov29_023533F8 mov r1, #0x64 mov r3, #0 str fp, [sp] @@ -834,7 +834,7 @@ _0234F718: bl sub_02026214 b _0234F75C _0234F748: - ldr r3, _0234F778 ; =0x0235340C + ldr r3, _0234F778 ; =ov29_0235340C mov r0, r5 mov r1, #0xa mov r2, #0x13 @@ -843,25 +843,25 @@ _0234F75C: add sp, sp, #0xbc ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0234F764: .word 0x023533F0 -_0234F768: .word 0x023533F8 -_0234F76C: .word 0x02353538 +_0234F764: .word ov29_023533F0 +_0234F768: .word ov29_023533F8 +_0234F76C: .word ov29_02353538 _0234F770: .word 0x000008DE -_0234F774: .word 0x02353404 -_0234F778: .word 0x0235340C +_0234F774: .word ov29_02353404 +_0234F778: .word ov29_0235340C arm_func_end ov29_0234F430 arm_func_start ov29_0234F77C ov29_0234F77C: ; 0x0234F77C stmdb sp!, {r3, lr} - ldr r0, _0234F7B8 ; =0x0235342C + ldr r0, _0234F7B8 ; =ov29_0235342C bl sub_020348E4 cmp r0, #0 ldmeqia sp!, {r3, pc} mov r0, #0x10 mov r1, #8 bl MemAlloc - ldr r1, _0234F7BC ; =0x0235383C + ldr r1, _0234F7BC ; =ov29_0235383C mov r2, #0 str r0, [r1, #4] str r2, [r0, #0xc] @@ -869,15 +869,15 @@ ov29_0234F77C: ; 0x0234F77C str r0, [r1, #8] ldmia sp!, {r3, pc} .align 2, 0 -_0234F7B8: .word 0x0235342C -_0234F7BC: .word 0x0235383C +_0234F7B8: .word ov29_0235342C +_0234F7BC: .word ov29_0235383C arm_func_end ov29_0234F77C arm_func_start OthersMenuLoop OthersMenuLoop: ; 0x0234F7C0 stmdb sp!, {r4, lr} sub sp, sp, #0x98 - ldr r0, _0234F9C8 ; =0x0235383C + ldr r0, _0234F9C8 ; =ov29_0235383C ldr r2, [r0, #4] ldr r1, [r2, #0xc] cmp r1, #3 @@ -901,17 +901,17 @@ _0234F7F8: mov r0, #0x1d bl GetPerformanceFlagWithChecks cmp r0, #0 - ldreq r4, _0234F9CC ; =0x0235343C + ldreq r4, _0234F9CC ; =ov29_0235343C beq _0234F840 - ldr r4, _0234F9D0 ; =0x02353474 + ldr r4, _0234F9D0 ; =ov29_02353474 bl IsFullFloorFixedRoom cmp r0, #0 - ldrne r0, _0234F9C8 ; =0x0235383C + ldrne r0, _0234F9C8 ; =ov29_0235383C movne r1, #3 ldrne r0, [r0, #4] strneb r1, [r0, #6] _0234F840: - ldr r1, _0234F9C8 ; =0x0235383C + ldr r1, _0234F9C8 ; =ov29_0235383C mov r0, #1 ldr r1, [r1, #4] add r1, r1, #1 @@ -920,14 +920,14 @@ _0234F840: str r0, [sp] ldr lr, _0234F9D4 ; =0x000008B9 mov ip, #0x10 - ldr r0, _0234F9D8 ; =0x0235341C + ldr r0, _0234F9D8 ; =ov29_0235341C ldr r1, _0234F9DC ; =0x00001A33 add r2, sp, #0 mov r3, r4 strh lr, [sp, #8] str ip, [sp, #0xc] bl sub_0202A5CC - ldr r1, _0234F9C8 ; =0x0235383C + ldr r1, _0234F9C8 ; =ov29_0235383C ldr r2, [r1, #4] strb r0, [r2] ldr r1, [r1, #4] @@ -940,7 +940,7 @@ _0234F8A0: bl sub_0202AB40 cmp r0, #0 beq _0234F8D0 - ldr r0, _0234F9C8 ; =0x0235383C + ldr r0, _0234F9C8 ; =ov29_0235383C ldr r0, [r0, #4] ldrsb r0, [r0] bl sub_0202AB80 @@ -949,7 +949,7 @@ _0234F8A0: bl Arm9StoreUnkFieldNa0x2029ED8 b _0234F9BC _0234F8D0: - ldr r0, _0234F9C8 ; =0x0235383C + ldr r0, _0234F9C8 ; =ov29_0235383C ldr r1, [r0, #4] ldr r0, [r1, #0xc] add r0, r0, #1 @@ -961,7 +961,7 @@ _0234F8E8: ldr r0, [r0, #4] ldrsb r0, [r0] bl sub_0202ABB0 - ldr r1, _0234F9C8 ; =0x0235383C + ldr r1, _0234F9C8 ; =ov29_0235383C cmp r0, #8 str r0, [r1, #8] addls pc, pc, r0, lsl #2 @@ -995,7 +995,7 @@ _0234F95C: mov r0, #4 b _0234F9C0 _0234F96C: - ldr r0, _0234F9E4 ; =0x02353538 + ldr r0, _0234F9E4 ; =ov29_02353538 ldr r1, [r0] add r0, r1, #0x700 ldrsb r0, [r0, #0x98] @@ -1014,7 +1014,7 @@ _0234F998: b _0234F9B4 _0234F9A4: bl ov30_02382820 - ldr r0, _0234F9C8 ; =0x0235383C + ldr r0, _0234F9C8 ; =ov29_0235383C mov r1, #8 str r1, [r0] _0234F9B4: @@ -1026,47 +1026,47 @@ _0234F9C0: add sp, sp, #0x98 ldmia sp!, {r4, pc} .align 2, 0 -_0234F9C8: .word 0x0235383C -_0234F9CC: .word 0x0235343C -_0234F9D0: .word 0x02353474 +_0234F9C8: .word ov29_0235383C +_0234F9CC: .word ov29_0235343C +_0234F9D0: .word ov29_02353474 _0234F9D4: .word 0x000008B9 -_0234F9D8: .word 0x0235341C +_0234F9D8: .word ov29_0235341C _0234F9DC: .word 0x00001A33 _0234F9E0: .word ov29_0234F77C -_0234F9E4: .word 0x02353538 +_0234F9E4: .word ov29_02353538 arm_func_end OthersMenuLoop arm_func_start ov29_0234F9E8 ov29_0234F9E8: ; 0x0234F9E8 stmdb sp!, {r3, lr} - ldr r0, _0234FA20 ; =0x0235383C + ldr r0, _0234FA20 ; =ov29_0235383C ldr r0, [r0, #4] cmp r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] bl sub_0202AABC - ldr r0, _0234FA20 ; =0x0235383C + ldr r0, _0234FA20 ; =ov29_0235383C ldr r0, [r0, #4] bl MemFree - ldr r0, _0234FA20 ; =0x0235383C + ldr r0, _0234FA20 ; =ov29_0235383C mov r1, #0 str r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_0234FA20: .word 0x0235383C +_0234FA20: .word ov29_0235383C arm_func_end ov29_0234F9E8 arm_func_start OthersMenu OthersMenu: ; 0x0234FA24 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r0, _0234FAE4 ; =0x0235383C + ldr r0, _0234FAE4 ; =ov29_0235383C mov r1, #9 str r1, [r0] bl ov29_0234F77C mov r0, #0 - ldr r5, _0234FAE8 ; =0x0238280C + ldr r5, _0234FAE8 ; =ov29_0238280C mov r7, #9 - ldr r4, _0234FAE4 ; =0x0235383C + ldr r4, _0234FAE4 ; =ov29_0235383C strh r0, [r5] mov sb, r0 mov fp, #1 @@ -1111,8 +1111,8 @@ _0234FADC: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0234FAE4: .word 0x0235383C -_0234FAE8: .word 0x0238280C +_0234FAE4: .word ov29_0235383C +_0234FAE8: .word ov29_0238280C arm_func_end OthersMenu arm_func_start ov29_0234FAEC @@ -1195,7 +1195,7 @@ _0234FBCC: ov29_0234FBD4: ; 0x0234FBD4 stmdb sp!, {r3, r4, r5, lr} mov r5, #0 - ldr r4, _0234FC18 ; =0x02353538 + ldr r4, _0234FC18 ; =ov29_02353538 b _0234FC08 _0234FBE4: ldr r0, [r4] @@ -1213,13 +1213,13 @@ _0234FC08: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234FC18: .word 0x02353538 +_0234FC18: .word ov29_02353538 arm_func_end ov29_0234FBD4 arm_func_start ov29_0234FC1C ov29_0234FC1C: ; 0x0234FC1C stmdb sp!, {r4, lr} - ldr r1, _0234FC4C ; =0x02353848 + ldr r1, _0234FC4C ; =ov29_02353848 mov r4, r0 ldr r0, [r1] ldrh r0, [r0, #2] @@ -1231,13 +1231,13 @@ ov29_0234FC1C: ; 0x0234FC1C bl sub_02026214 ldmia sp!, {r4, pc} .align 2, 0 -_0234FC4C: .word 0x02353848 +_0234FC4C: .word ov29_02353848 arm_func_end ov29_0234FC1C arm_func_start ov29_0234FC50 ov29_0234FC50: ; 0x0234FC50 stmdb sp!, {r4, lr} - ldr r1, _0234FC9C ; =0x02353848 + ldr r1, _0234FC9C ; =ov29_02353848 mov r4, r0 ldr r0, [r1] cmp r0, #0 @@ -1245,46 +1245,46 @@ ov29_0234FC50: ; 0x0234FC50 mov r0, #4 mov r1, #8 bl MemAlloc - ldr r2, _0234FC9C ; =0x02353848 + ldr r2, _0234FC9C ; =ov29_02353848 ldr r1, _0234FCA0 ; =ov29_0234FC1C str r0, [r2] strh r4, [r0, #2] - ldr r0, _0234FCA4 ; =0x023534B4 + ldr r0, _0234FCA4 ; =ov29_023534B4 bl sub_0202F8C4 - ldr r1, _0234FC9C ; =0x02353848 + ldr r1, _0234FC9C ; =ov29_02353848 ldr r1, [r1] strb r0, [r1] ldmia sp!, {r4, pc} .align 2, 0 -_0234FC9C: .word 0x02353848 +_0234FC9C: .word ov29_02353848 _0234FCA0: .word ov29_0234FC1C -_0234FCA4: .word 0x023534B4 +_0234FCA4: .word ov29_023534B4 arm_func_end ov29_0234FC50 arm_func_start ov29_0234FCA8 ov29_0234FCA8: ; 0x0234FCA8 stmdb sp!, {r3, lr} - ldr r0, _0234FCF8 ; =0x02353848 + ldr r0, _0234FCF8 ; =ov29_02353848 ldr r0, [r0] cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] bl sub_0202F954 - ldr r0, _0234FCF8 ; =0x02353848 + ldr r0, _0234FCF8 ; =ov29_02353848 ldr r0, [r0] ldrsb r0, [r0] bl sub_0202F8FC - ldr r0, _0234FCF8 ; =0x02353848 + ldr r0, _0234FCF8 ; =ov29_02353848 ldr r0, [r0] bl MemFree - ldr r0, _0234FCF8 ; =0x02353848 + ldr r0, _0234FCF8 ; =ov29_02353848 mov r1, #0 str r1, [r0] mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0234FCF8: .word 0x02353848 +_0234FCF8: .word ov29_02353848 arm_func_end ov29_0234FCA8 ; 0x0234FCFC @@ -1393,6 +1393,8 @@ ov29_0234FDF4: .global ov29_0234FDF8 ov29_0234FDF8: .byte 0x19, 0x00, 0x00, 0x00 + .global ov29_0234FDFC +ov29_0234FDFC: .byte 0x6C, 0x01, 0x6F, 0x01, 0x72, 0x01, 0x75, 0x01, 0x78, 0x01, 0x7B, 0x01, 0x7E, 0x01, 0x81, 0x01 .byte 0x84, 0x01, 0x87, 0x01, 0x8A, 0x01, 0x8D, 0x01 .global FIXED_ROOM_REVISIT_OVERRIDES @@ -1961,8 +1963,14 @@ ov29_023502DC: .global ov29_023502E4 ov29_023502E4: .byte 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_023502EC +ov29_023502EC: .word FIXED_ROOM_ITEM_SPAWN_TABLE + .global ov29_023502F0 +ov29_023502F0: .word ov29_0234FF4C + .global ov29_023502F4 +ov29_023502F4: .word FIXED_ROOM_TILE_SPAWN_TABLE .word FIXED_ROOM_ITEM_SPAWN_TABLE .word ov29_0234FF68 @@ -2810,7 +2818,10 @@ ov29_023510C0: ov29_023510C8: .byte 0x44, 0x47, 0x5F, 0x56 .byte 0x52, 0x41, 0x4D, 0x5F, 0x53, 0x50, 0x52, 0x49, 0x54, 0x45, 0x5F, 0x4E, 0x41, 0x4D, 0x45, 0x3A - .byte 0x25, 0x64, 0x0A, 0x00, 0xD0, 0x01, 0x20, 0x00, 0xD1, 0x01, 0x40, 0x00, 0xD2, 0x01, 0x80, 0x00 + .byte 0x25, 0x64, 0x0A, 0x00 + .global ov29_023510E0 +ov29_023510E0: + .byte 0xD0, 0x01, 0x20, 0x00, 0xD1, 0x01, 0x40, 0x00, 0xD2, 0x01, 0x80, 0x00 .byte 0xD4, 0x01, 0x20, 0x00, 0xD5, 0x01, 0x40, 0x00, 0xD6, 0x01, 0x00, 0x01, 0xDA, 0x01, 0x20, 0x00 .byte 0xDB, 0x01, 0x20, 0x00, 0xDC, 0x01, 0x20, 0x00, 0xDD, 0x01, 0x20, 0x00, 0xDE, 0x01, 0x80, 0x00 .global ov29_0235110C @@ -2975,10 +2986,16 @@ ov29_023515F4: ov29_02351604: .byte 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFC, 0xFF + .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .global ov29_02351628 +ov29_02351628: + .byte 0xFC, 0xFF, 0xFC, 0xFF .byte 0xF8, 0xFF, 0xFC, 0xFF, 0xF0, 0xFF, 0xFC, 0xFF, 0xF0, 0xFF, 0xFC, 0xFF, 0xF0, 0xFF, 0xFC, 0xFF .byte 0xF0, 0xFF, 0xFC, 0xFF, 0xFC, 0xFF, 0xFC, 0xFF, 0xF8, 0xFF, 0xFC, 0xFF, 0xF0, 0xFF, 0xF8, 0xFF - .byte 0xF0, 0xFF, 0xF8, 0xFF, 0xF0, 0xFF, 0xF8, 0xFF, 0xF0, 0xFF, 0xF8, 0xFF, 0x00, 0x00, 0x00, 0x00 + .byte 0xF0, 0xFF, 0xF8, 0xFF, 0xF0, 0xFF, 0xF8, 0xFF, 0xF0, 0xFF, 0xF8, 0xFF + .global ov29_02351658 +ov29_02351658: + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xD0, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xD1, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xD2, 0x01, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xE8, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 @@ -2987,13 +3004,19 @@ ov29_02351604: .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0xD6, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0xEA, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xEA, 0x01, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xEA, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xEA, 0x01, 0x00, 0x00 + .global ov29_023516E8 +ov29_023516E8: + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x7C, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0xA8, 0x00, 0x00, 0x00, 0xA9, 0x00, 0x00, 0x00 .byte 0x02, 0x06, 0x04, 0x00, 0x02, 0x00, 0x04, 0x06, 0x04, 0x00, 0x06, 0x02, 0x04, 0x02, 0x06, 0x00 .byte 0x06, 0x02, 0x00, 0x04, 0x06, 0x04, 0x02, 0x00, 0x00, 0x04, 0x02, 0x06, 0x00, 0x06, 0x02, 0x04 .global DIRECTIONS_XY DIRECTIONS_XY: - .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF + .byte 0x00, 0x00 + .global ov29_0235171E +ov29_0235171E: + .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF .byte 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x01, 0x00 .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF .byte 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x01 @@ -3001,8 +3024,15 @@ DIRECTIONS_XY: .byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00 .byte 0xFE, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00 + .global ov29_0235179C +ov29_0235179C: .word ov29_02351974 - .byte 0x01, 0x00, 0x01, 0x00 + .global ov29_023517A0 +ov29_023517A0: + .byte 0x01, 0x00 + .global ov29_023517A2 +ov29_023517A2: + .byte 0x01, 0x00 .word ov29_02351B00 .byte 0x01, 0x00, 0x01, 0x00 .word ov29_02351C94 @@ -3017,19 +3047,26 @@ DIRECTIONS_XY: .byte 0xFF, 0xFF, 0xFF, 0xFF .word ov29_02351B00 .byte 0xFF, 0xFF, 0x01, 0x00 + .global ov29_023517DC +ov29_023517DC: .byte 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00 .byte 0x02, 0x00, 0xFE, 0xFF, 0xFE, 0xFF, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0xFE, 0xFF, 0xFE, 0xFF .byte 0xFF, 0xFF, 0xFE, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0xFF, 0xFF .byte 0xFE, 0xFF, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00 .byte 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x63, 0x00, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0x00, 0x63, 0x00, 0x63, 0x00 + .global ov29_02351844 +ov29_02351844: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .byte 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFE, 0xFF, 0xFE, 0xFF .byte 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0xFE, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0x02, 0x00, 0xFE, 0xFF .byte 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0xFE, 0xFF, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0xFE, 0xFF, 0x02, 0x00, 0xFF, 0xFF, 0x02, 0x00 .byte 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x63, 0x00, 0x63, 0x00 + .global ov29_023518AC +ov29_023518AC: .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00 @@ -3126,7 +3163,10 @@ ov29_02351C94: .byte 0x0A, 0x00, 0xFD, 0xFF, 0x0A, 0x00, 0x03, 0x00, 0x0A, 0x00, 0xFC, 0xFF, 0x0A, 0x00, 0x04, 0x00 .byte 0x0A, 0x00, 0xFB, 0xFF, 0x0A, 0x00, 0x05, 0x00, 0x0A, 0x00, 0xFA, 0xFF, 0x0A, 0x00, 0x06, 0x00 .byte 0x0A, 0x00, 0xF9, 0xFF, 0x0A, 0x00, 0x07, 0x00, 0x0A, 0x00, 0xF8, 0xFF, 0x0A, 0x00, 0x08, 0x00 - .byte 0x0A, 0x00, 0xF7, 0xFF, 0x0A, 0x00, 0x09, 0x00, 0x63, 0x00, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0A, 0x00, 0xF7, 0xFF, 0x0A, 0x00, 0x09, 0x00, 0x63, 0x00, 0x63, 0x00 + .global ov29_02351E28 +ov29_02351E28: + .byte 0x00, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF .byte 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00 @@ -3157,13 +3197,28 @@ ov29_02351C94: .byte 0xFB, 0xFF, 0xFC, 0xFF, 0x05, 0x00, 0xFC, 0xFF, 0xFC, 0xFF, 0xFB, 0xFF, 0xFC, 0xFF, 0x05, 0x00 .byte 0xFB, 0xFF, 0x04, 0x00, 0x05, 0x00, 0x04, 0x00, 0x04, 0x00, 0xFB, 0xFF, 0x04, 0x00, 0x05, 0x00 .byte 0xFB, 0xFF, 0xFB, 0xFF, 0x05, 0x00, 0xFB, 0xFF, 0xFB, 0xFF, 0xFB, 0xFF, 0xFB, 0xFF, 0x05, 0x00 - .byte 0x63, 0x00, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x10, 0x00 + .byte 0x63, 0x00, 0x63, 0x00 + .global ov29_02352010 +ov29_02352010: + .byte 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x10, 0x00 .byte 0x00, 0x00, 0x12, 0x00, 0x12, 0x00, 0x31, 0x00, 0x2C, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x8B, 0x08, 0x8C, 0x08, 0x8D, 0x08, 0x8E, 0x08, 0x8F, 0x08, 0x90, 0x08 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02352030 +ov29_02352030: + .byte 0x8B, 0x08 + .global ov29_02352032 +ov29_02352032: + .byte 0x8C, 0x08, 0x8D, 0x08, 0x8E, 0x08, 0x8F, 0x08, 0x90, 0x08 .byte 0x91, 0x08, 0x92, 0x08, 0x93, 0x08, 0x94, 0x08, 0x95, 0x08, 0x96, 0x08, 0x97, 0x08, 0x98, 0x08 .byte 0x99, 0x08, 0x9A, 0x08, 0x9B, 0x08, 0x9C, 0x08, 0x9D, 0x08, 0x9E, 0x08, 0x9F, 0x08, 0xA0, 0x08 .byte 0xA1, 0x08, 0xA2, 0x08, 0xA3, 0x08, 0xA4, 0x08, 0xA5, 0x08, 0xA6, 0x08, 0xA7, 0x08, 0xA8, 0x08 - .byte 0xA9, 0x08, 0xAA, 0x08, 0x58, 0x00, 0x00, 0x00, 0x87, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 + .byte 0xA9, 0x08, 0xAA, 0x08 + .global ov29_02352070 +ov29_02352070: + .byte 0x58, 0x00, 0x00, 0x00 + .global ov29_02352074 +ov29_02352074: + .byte 0x87, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0x88, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x89, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0x8A, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x8B, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0x8C, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x8D, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 @@ -3196,10 +3251,16 @@ ov29_02351C94: .byte 0xC2, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xC3, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0xC4, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xC5, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0xC6, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xC7, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0xC8, 0x09, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xC8, 0x09, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 + .global ov29_02352284 +ov29_02352284: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 + .global ov29_023522B6 +ov29_023522B6: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00 @@ -3212,8 +3273,14 @@ ov29_02351C94: .byte 0x28, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x2B, 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2E, 0x00, 0x2F, 0x00 .byte 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 0x00 .byte 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3F, 0x00 - .byte 0x40, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00 - .byte 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x40, 0x00, 0x00, 0x00 + .global ov29_02352380 +ov29_02352380: + .byte 0x67, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00 + .byte 0x69, 0x00, 0x00, 0x00 + .global ov29_02352390 +ov29_02352390: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .byte 0x01, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF .byte 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF .byte 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF @@ -3261,20 +3328,64 @@ ov29_02351C94: .byte 0x08, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0xFF, 0x08, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0xFF .byte 0x08, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0xFF, 0x08, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0xFF .byte 0x08, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0xFF, 0x08, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0xFF - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x16, 0x02, 0x08, 0x05, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x43, 0x53, 0x3A - .byte 0x56, 0x5D, 0x5B, 0x67, 0x6F, 0x6C, 0x64, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01 - .byte 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x08, 0x00, 0x00, 0x00 + .global ov29_02352690 +ov29_02352690: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02352698 +ov29_02352698: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023526A0 +ov29_023526A0: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_023526A8 +ov29_023526A8: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x16, 0x02, 0x08, 0x05, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_023526B8 +ov29_023526B8: + .byte 0x5B, 0x43, 0x53, 0x3A + .byte 0x56, 0x5D, 0x5B, 0x67, 0x6F, 0x6C, 0x64, 0x3A, 0x30, 0x5D, 0x00, 0x00 + .global ov29_023526C8 +ov29_023526C8: + .byte 0x00, 0x00, 0x01, 0x01 + .byte 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00 + .global ov29_023526D8 +ov29_023526D8: + .byte 0xFF, 0xFF, 0xFF, 0xFF .byte 0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 - .byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xDA, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 + .byte 0xFF, 0xFF, 0x00, 0x00 + .global ov29_023526F0 +ov29_023526F0: + .byte 0x00, 0x00 + .global ov29_023526F2 +ov29_023526F2: + .byte 0x01, 0x00 + .global ov29_023526F4 +ov29_023526F4: + .byte 0xDA, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .byte 0x01, 0x00, 0x01, 0x00, 0xDB, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xDC, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xDB, 0x01, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xDA, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00 .byte 0xDC, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0xDB, 0x01, 0x00, 0x00 - .byte 0x01, 0x01, 0x00, 0x00, 0x6D, 0x6F, 0x76, 0x65, 0x3A, 0x00, 0x00, 0x00, 0x81, 0x45, 0x81, 0x45 - .byte 0x81, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 + .byte 0x01, 0x01, 0x00, 0x00 + .global ov29_02352750 +ov29_02352750: + .byte 0x6D, 0x6F, 0x76, 0x65, 0x3A, 0x00, 0x00, 0x00 + .global ov29_02352758 +ov29_02352758: + .byte 0x81, 0x45, 0x81, 0x45 + .byte 0x81, 0x45, 0x00, 0x00 + .global ov29_02352760 +ov29_02352760: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02352768 +ov29_02352768: + .byte 0x05, 0x00, 0x00, 0x00 + .global ov29_0235276C +ov29_0235276C: .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x01, 0x02, 0x04, 0x08 .byte 0x10, 0x20, 0x40, 0x80, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x01, 0x02, 0x04, 0x08 .byte 0x10, 0x20, 0x40, 0x80, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x01, 0x02, 0x04, 0x08 @@ -3292,18 +3403,54 @@ ov29_023527E4: .global ov29_023527E8 ov29_023527E8: .byte 0x5B, 0x4B, 0x5D, 0x0A - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023527F0 +ov29_023527F0: + .byte 0x00, 0x01, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x05, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x07, 0x07, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07 + .global ov29_0235280C +ov29_0235280C: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02352810 +ov29_02352810: + .byte 0x00, 0x01, 0x07, 0x07, 0x07, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07 .byte 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07 - .byte 0x07, 0x07, 0x07, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07, 0x0B, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00 + .byte 0x07, 0x07, 0x07, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07, 0x0B, 0x07, 0x00 + .global ov29_02352838 +ov29_02352838: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_0235283C +ov29_0235283C: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00 + .global ov29_02352844 +ov29_02352844: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00 + .global ov29_0235284C +ov29_0235284C: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00 + .global ov29_0235285C +ov29_0235285C: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00 + .global ov29_02352864 +ov29_02352864: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00 + .global ov29_0235286C +ov29_0235286C: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE7, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00 + .global ov29_0235287C +ov29_0235287C: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 + .global ov29_02352884 +ov29_02352884: + .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 + .global ov29_02352894 +ov29_02352894: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .global ov29_023528A4 +ov29_023528A4: + .byte 0x02, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00 .byte 0x05, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00 .byte 0x09, 0x00, 0x00, 0x00, 0x6B, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00 @@ -3317,10 +3464,26 @@ ov29_023527E8: .byte 0x0C, 0x00, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x00 .byte 0x0E, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00 .byte 0x10, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00, 0x46, 0x4C, 0x56, 0x20, 0x3A, 0x20, 0x25, 0x64 - .byte 0x0A, 0x00, 0x00, 0x00, 0x41, 0x54, 0x20, 0x3A, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00, 0x00 - .byte 0x44, 0x45, 0x46, 0x20, 0x3A, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x04, 0x00, 0x08, 0x00 + .byte 0x12, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00 + .global ov29_02352984 +ov29_02352984: + .byte 0x46, 0x4C, 0x56, 0x20, 0x3A, 0x20, 0x25, 0x64 + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov29_02352990 +ov29_02352990: + .byte 0x41, 0x54, 0x20, 0x3A, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00, 0x00 + .global ov29_0235299C +ov29_0235299C: + .byte 0x44, 0x45, 0x46, 0x20, 0x3A, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00 + .global ov29_023529A8 +ov29_023529A8: + .byte 0x0D, 0x00, 0x00, 0x00 + .global ov29_023529AC +ov29_023529AC: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023529B0 +ov29_023529B0: + .byte 0x01, 0x00, 0x02, 0x00, 0x04, 0x00, 0x08, 0x00 .word ov29_023529C4 .word ov29_023529C4 .word ov29_023529EC @@ -3346,14 +3509,28 @@ ov29_023529EC: .byte 0x97, 0x00, 0x02, 0x00, 0x64, 0x00, 0x03, 0x00, 0x3C, 0x00, 0x04, 0x00, 0x4B, 0x00, 0x05, 0x00 .byte 0x5C, 0x01, 0x06, 0x00, 0x99, 0x00, 0x07, 0x00, 0xCD, 0x00, 0x08, 0x00, 0x9C, 0x00, 0x09, 0x00 .byte 0x08, 0x00, 0x0A, 0x00, 0xDD, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02352AE8 +ov29_02352AE8: + .byte 0x01, 0x00, 0x00, 0x00 + .global ov29_02352AEC +ov29_02352AEC: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x19, 0x01, 0x00, 0x00, 0x33, 0x01, 0x00, 0x00 .byte 0x4C, 0x01, 0x00, 0x00, 0x66, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00 .byte 0xB3, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00, 0xE6, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02352B1C +ov29_02352B1C: .byte 0x06, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x18, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00 + .global ov29_02352B38 +ov29_02352B38: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02352B3C +ov29_02352B3C: .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02352B5C +ov29_02352B5C: .byte 0x04, 0x00, 0x08, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -3414,26 +3591,50 @@ ov29_023529EC: .byte 0x39, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3A, 0x00, 0x3A, 0x00, 0x3B, 0x00, 0x3B, 0x00, 0x3B, 0x00 .byte 0x3C, 0x00, 0x3C, 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3D, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x3E, 0x00 .byte 0x3E, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x73, 0x74, 0x61, 0x69, 0x72, 0x0A, 0x00, 0x00 + .global ov29_02352F1C +ov29_02352F1C: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xEB, 0x03, 0x00, 0x00, 0x00, 0xB0, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 - .byte 0x23, 0x00, 0x00, 0x00, 0x07, 0x04, 0x00, 0x00, 0x00, 0xB0, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + .byte 0x23, 0x00, 0x00, 0x00 + .global ov29_02352F40 +ov29_02352F40: + .byte 0x07, 0x04, 0x00, 0x00, 0x00, 0xB0, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 .byte 0x32, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0xED, 0x03, 0x00, 0x00, 0x00, 0xD0, 0x00, 0x00 .byte 0x15, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0xE9, 0x03, 0x00, 0x00 .byte 0x00, 0xF0, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00 + .global ov29_02352F7C +ov29_02352F7C: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00 .byte 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x60, 0x00, 0x00, 0x00, 0xA0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xFF, 0xFF, 0xFF .byte 0xA0, 0xFF, 0xFF, 0xFF, 0xA0, 0xFF, 0xFF, 0xFF, 0xA0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 .byte 0xA0, 0xFF, 0xFF, 0xFF, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00 + .global ov29_02352FCC +ov29_02352FCC: + .byte 0x01, 0x00, 0x01, 0x00 + .global ov29_02352FD0 +ov29_02352FD0: + .byte 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x80, 0x00, 0x00 - .byte 0x80, 0x00, 0xFF, 0x00, 0xFF, 0x80, 0xC0, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 + .byte 0x80, 0x00, 0xFF, 0x00, 0xFF, 0x80, 0xC0, 0x00 + .global ov29_02352FF4 +ov29_02352FF4: + .byte 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 .byte 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 - .byte 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x04, 0x00, 0x00, 0x00 + .global ov29_02353010 +ov29_02353010: + .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00 + .global ov29_02353030 +ov29_02353030: + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .global ov29_02353050 +ov29_02353050: + .byte 0x32, 0x00, 0x00, 0x00 .word ov10_022C4760 .byte 0x57, 0x00, 0x00, 0x00 .word ov10_022C4A34 @@ -3480,7 +3681,10 @@ ov29_023529EC: .byte 0x6E, 0x00, 0x00, 0x00 .word ov10_022C4814 .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0x6D, 0x30, 0x3A, 0x42, 0x41, 0x4C, 0x41, 0x4E, 0x43, 0x45 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02353110 +ov29_02353110: + .byte 0x72, 0x6F, 0x6D, 0x30, 0x3A, 0x42, 0x41, 0x4C, 0x41, 0x4E, 0x43, 0x45 .byte 0x2F, 0x66, 0x69, 0x78, 0x65, 0x64, 0x2E, 0x62, 0x69, 0x6E, 0x00, 0x00 .global ov29_02353128 ov29_02353128: @@ -3504,16 +3708,48 @@ ov29_02353170: ov29_02353188: .byte 0x52, 0x0F, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x53, 0x0F, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xFF, 0xFF, 0xFF, 0xFF + .global ov29_023531A0 +ov29_023531A0: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023531A4 +ov29_023531A4: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .global ov29_023531BC +ov29_023531BC: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04 + .global ov29_023531CC +ov29_023531CC: .byte 0x6C, 0x01, 0x6D, 0x01, 0x6E, 0x01, 0x6F, 0x01, 0x70, 0x01, 0x71, 0x01, 0x72, 0x01, 0x73, 0x01 .byte 0x74, 0x01, 0x75, 0x01, 0x76, 0x01, 0x77, 0x01, 0x78, 0x01, 0x79, 0x01, 0x7A, 0x01, 0x7B, 0x01 .byte 0x7C, 0x01, 0x7D, 0x01, 0x7E, 0x01, 0x7F, 0x01, 0x80, 0x01, 0x81, 0x01, 0x82, 0x01, 0x83, 0x01 .byte 0x84, 0x01, 0x85, 0x01, 0x86, 0x01, 0x87, 0x01, 0x88, 0x01, 0x89, 0x01, 0x8A, 0x01, 0x8B, 0x01 - .byte 0x8C, 0x01, 0x8D, 0x01, 0x8E, 0x01, 0x8F, 0x01, 0x5B, 0x52, 0x5D, 0x00, 0x33, 0x0B, 0x34, 0x0B - .byte 0x2F, 0x0B, 0x30, 0x0B, 0x3D, 0x0B, 0x3E, 0x0B, 0x37, 0x0B, 0x38, 0x0B, 0x31, 0x0B, 0x32, 0x0B - .byte 0x39, 0x0B, 0x3A, 0x0B, 0x35, 0x0B, 0x36, 0x0B, 0x3B, 0x0B, 0x3C, 0x0B, 0x08, 0x00, 0x00, 0x00 + .byte 0x8C, 0x01, 0x8D, 0x01, 0x8E, 0x01, 0x8F, 0x01, 0x5B, 0x52, 0x5D, 0x00 + .global ov29_02353218 +ov29_02353218: + .byte 0x33, 0x0B, 0x34, 0x0B + .global ov29_0235321C +ov29_0235321C: + .byte 0x2F, 0x0B, 0x30, 0x0B + .global ov29_02353220 +ov29_02353220: + .byte 0x3D, 0x0B, 0x3E, 0x0B + .global ov29_02353224 +ov29_02353224: + .byte 0x37, 0x0B, 0x38, 0x0B + .global ov29_02353228 +ov29_02353228: + .byte 0x31, 0x0B, 0x32, 0x0B + .global ov29_0235322C +ov29_0235322C: + .byte 0x39, 0x0B, 0x3A, 0x0B + .global ov29_02353230 +ov29_02353230: + .byte 0x35, 0x0B, 0x36, 0x0B + .global ov29_02353234 +ov29_02353234: + .byte 0x3B, 0x0B, 0x3C, 0x0B, 0x08, 0x00, 0x00, 0x00 .byte 0xD6, 0x3F, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xD1, 0x3F, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 .byte 0xDD, 0x3F, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0xDC, 0x3F, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 .byte 0xE2, 0x3F, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0xE6, 0x3F, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00 @@ -3523,13 +3759,22 @@ ov29_02353188: .byte 0xD3, 0x3F, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xD2, 0x3F, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 .byte 0xE0, 0x3F, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xD0, 0x3F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xCF, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCE, 0x3F, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 - .byte 0xDB, 0x3F, 0x00, 0x00, 0x48, 0x0B, 0x49, 0x0B, 0x4A, 0x0B, 0x4B, 0x0B, 0x0C, 0x00, 0x00, 0x00 + .byte 0xDB, 0x3F, 0x00, 0x00 + .global ov29_023532D0 +ov29_023532D0: + .byte 0x48, 0x0B, 0x49, 0x0B, 0x4A, 0x0B, 0x4B, 0x0B, 0x0C, 0x00, 0x00, 0x00 .byte 0xDA, 0x3F, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0xD7, 0x3F, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00 .byte 0xE5, 0x3F, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xD8, 0x3F, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00 .byte 0xD9, 0x3F, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0xE1, 0x3F, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 .byte 0xE7, 0x3F, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0xE8, 0x3F, 0x00, 0x00, 0x3F, 0x0B, 0x40, 0x0B - .byte 0x41, 0x0B, 0x42, 0x0B, 0x43, 0x0B, 0x00, 0x00, 0x4C, 0x0B, 0x4D, 0x0B, 0x4E, 0x0B, 0x4F, 0x0B - .byte 0x50, 0x0B, 0x00, 0x00, 0x78, 0x0B, 0x79, 0x0B, 0x7A, 0x0B, 0x7B, 0x0B, 0x7C, 0x0B, 0x7D, 0x0B + .byte 0x41, 0x0B, 0x42, 0x0B, 0x43, 0x0B, 0x00, 0x00 + .global ov29_02353324 +ov29_02353324: + .byte 0x4C, 0x0B, 0x4D, 0x0B, 0x4E, 0x0B, 0x4F, 0x0B + .byte 0x50, 0x0B, 0x00, 0x00 + .global ov29_02353330 +ov29_02353330: + .byte 0x78, 0x0B, 0x79, 0x0B, 0x7A, 0x0B, 0x7B, 0x0B, 0x7C, 0x0B, 0x7D, 0x0B .byte 0x7E, 0x0B, 0x7F, 0x0B, 0x80, 0x0B, 0x81, 0x0B, 0x82, 0x0B, 0x83, 0x0B, 0x84, 0x0B, 0x85, 0x0B .byte 0x00, 0x00, 0x86, 0x0B, 0x87, 0x0B, 0x88, 0x0B, 0x89, 0x0B, 0x8A, 0x0B, 0x8B, 0x0B, 0x8D, 0x0B .byte 0x8C, 0x0B, 0x8E, 0x0B, 0x8F, 0x0B, 0x90, 0x0B, 0x91, 0x0B, 0x00, 0x00, 0x30, 0x3A, 0x83, 0x82 @@ -3537,27 +3782,61 @@ ov29_02353188: .byte 0x7A, 0x00, 0x00, 0x00, 0x31, 0x3A, 0x83, 0x82, 0x83, 0x93, 0x83, 0x58, 0x83, 0x5E, 0x81, 0x5B .byte 0x2D, 0x49, 0x44, 0x81, 0x79, 0x25, 0x64, 0x81, 0x7A, 0x00, 0x00, 0x00, 0xAB, 0x08, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0xAC, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0F, 0x00, 0x00, 0xFF, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x1C, 0x14, 0x00, 0xFF, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xFF, 0xFF, 0xFF, 0xFF + .global ov29_023533B0 +ov29_023533B0: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0F, 0x00, 0x00, 0xFF, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023533C0 +ov29_023533C0: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x1C, 0x14, 0x00, 0xFF, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023533D0 +ov29_023533D0: + .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .word ov29_0234F248 .word ov29_0234F21C + .global ov29_023533E0 +ov29_023533E0: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x1C, 0x14, 0x01, 0xFF, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x52, 0x34, 0x5D, 0x00, 0x00, 0x5B, 0x66, 0x6C, 0x6F - .byte 0x6F, 0x72, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x53, 0x32, 0x5D, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023533F0 +ov29_023533F0: + .byte 0x5B, 0x4D, 0x3A, 0x52, 0x34, 0x5D, 0x00, 0x00 + .global ov29_023533F8 +ov29_023533F8: + .byte 0x5B, 0x66, 0x6C, 0x6F + .byte 0x6F, 0x72, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00 + .global ov29_02353404 +ov29_02353404: + .byte 0x5B, 0x4D, 0x3A, 0x53, 0x32, 0x5D, 0x00, 0x00 + .global ov29_0235340C +ov29_0235340C: .byte 0x5B, 0x43, 0x53, 0x3A, 0x57, 0x5D, 0x3F, 0x3F, 0x3F, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00, 0x00 + .global ov29_0235341C +ov29_0235341C: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_0235342C +ov29_0235342C: .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .word ov29_0234F9E8 .word OthersMenuLoop + .global ov29_0235343C +ov29_0235343C: .byte 0xBA, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBB, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xBC, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xBD, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 .byte 0xBE, 0x08, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xC0, 0x08, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xBA, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 + .global ov29_02353474 +ov29_02353474: + .byte 0xBA, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xBB, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xBC, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0xBD, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xBE, 0x08, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 .byte 0xBF, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xC0, 0x08, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x1C, 0x05 + .byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 + .global ov29_023534B4 +ov29_023534B4: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x1C, 0x05 .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .data @@ -3569,6 +3848,8 @@ ov29_023534E0: ov29_023534E8: .word ov29_0234FD58 .word ov29_0234FD38 + .global ov29_023534F0 +ov29_023534F0: .word ov29_0234FDB8 .word ov29_0234FDC8 .word ov29_0234FDC0 @@ -3600,7 +3881,13 @@ ov29_02353534: .global ov29_02353538 ov29_02353538: .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02353540 +ov29_02353540: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02353544 +ov29_02353544: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov29_0235354C ov29_0235354C: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -3612,19 +3899,54 @@ ov29_02353558: .byte 0x00, 0x00, 0x00, 0x00 .global ov29_0235355C ov29_0235355C: - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02353560 +ov29_02353560: + .byte 0x00, 0x00 + .global ov29_02353562 +ov29_02353562: + .byte 0x00 .global ov29_02353563 ov29_02353563: .byte 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x00, 0x2F, 0x30, 0x31, 0x32 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02353570 +ov29_02353570: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02353584 +ov29_02353584: + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .global ov29_02353598 +ov29_02353598: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_0235359C +ov29_0235359C: + .byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00 + .global ov29_023535A4 +ov29_023535A4: + .byte 0xFE, 0x00, 0x00, 0x00 + .global ov29_023535A8 +ov29_023535A8: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023535AC +ov29_023535AC: + .byte 0xFF, 0xFF, 0xFF, 0xFF + .global ov29_023535B0 +ov29_023535B0: + .byte 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x00 + .global ov29_023535B8 +ov29_023535B8: + .byte 0x2F, 0x30, 0x31, 0x32 .byte 0x33, 0x34, 0x35, 0x00, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x00 + .global ov29_023535C8 +ov29_023535C8: .word ov29_023527E0 .word ov29_023527E8 .word ov29_023527E4 + .global ov29_023535D4 +ov29_023535D4: .byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x0C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 .word ov29_0230D738 @@ -3680,31 +4002,72 @@ ov29_02353563: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .word ov29_0230D704 .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023536FC +ov29_023536FC: .byte 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x00 + .global ov29_02353718 +ov29_02353718: + .byte 0x00, 0x00, 0x00, 0x00 .byte 0xF4, 0x03, 0xF4, 0x03, 0xF5, 0x03, 0xF5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_0235372C +ov29_0235372C: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02353730 +ov29_02353730: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_0235376C +ov29_0235376C: .byte 0x00, 0x00, 0x64, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_0235377C +ov29_0235377C: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02353784 +ov29_02353784: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_0235378C +ov29_0235378C: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02353794 +ov29_02353794: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02353798 +ov29_02353798: + .byte 0x00, 0x00, 0x00, 0x00 .word ov29_02353188 .word ov29_02353170 .word ov29_02353128 .word ov29_02353158 .word ov29_02353140 + .global ov29_023537B0 +ov29_023537B0: .byte 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x16, 0x00, 0x15, 0x00, 0x16, 0x00 - .byte 0x02, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02 + .global ov29_023537C4 +ov29_023537C4: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0x00, 0xB8, 0x04 .byte 0xD9, 0x00, 0xB5, 0x04, 0xDB, 0x00, 0xB6, 0x04, 0xDC, 0x00, 0xB4, 0x04, 0xDD, 0x00, 0xB7, 0x04 .byte 0xDE, 0x00, 0xBE, 0x04, 0xDF, 0x00, 0xC0, 0x04, 0xE0, 0x00, 0xC1, 0x04, 0xE1, 0x00, 0xD2, 0x04 .byte 0xE2, 0x00, 0xBD, 0x04, 0xEC, 0x00, 0xBF, 0x04, 0xEE, 0x00, 0xC5, 0x04, 0xEF, 0x00, 0xC2, 0x04 .byte 0xF0, 0x00, 0xC3, 0x04, 0xE3, 0x00, 0xC4, 0x04, 0xF1, 0x00, 0x00, 0x00, 0xF2, 0x00, 0x00, 0x00 - .byte 0xF3, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xF3, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00 + .global ov29_02353834 +ov29_02353834: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02353838 +ov29_02353838: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_0235383C +ov29_0235383C: + .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00 + .global ov29_02353848 +ov29_02353848: + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .bss @@ -3746,7 +4109,25 @@ ov29_0237368C: .space 0x4 .global ov29_02373690 ov29_02373690: - .space 0x9044 + .space 0x9000 + .global ov29_0237C690 +ov29_0237C690: + .space 0x4 + .global ov29_0237C694 +ov29_0237C694: + .space 0x2 + .global ov29_0237C696 +ov29_0237C696: + .space 0x2 + .global ov29_0237C698 +ov29_0237C698: + .space 0xC + .global ov29_0237C6A4 +ov29_0237C6A4: + .space 0x14 + .global ov29_0237C6B8 +ov29_0237C6B8: + .space 0x1C .global ov29_0237C6D4 ov29_0237C6D4: .space 0x40 @@ -3764,7 +4145,10 @@ ov29_0237C84C: .space 0x4 .global ov29_0237C850 ov29_0237C850: - .space 0x38 + .space 0x14 + .global ov29_0237C864 +ov29_0237C864: + .space 0x24 .global ov29_0237C888 ov29_0237C888: .space 0x2 @@ -3779,4 +4163,127 @@ ov29_0237C890: .space 0x2 .global ov29_0237C892 ov29_0237C892: - .space 0x5F8E + .space 0x86 + .global ov29_0237C918 +ov29_0237C918: + .space 0x4 + .global ov29_0237C91C +ov29_0237C91C: + .space 0x2 + .global ov29_0237C91E +ov29_0237C91E: + .space 0x2 + .global ov29_0237C920 +ov29_0237C920: + .space 0x2 + .global ov29_0237C922 +ov29_0237C922: + .space 0x4A + .global ov29_0237C96C +ov29_0237C96C: + .space 0x8 + .global ov29_0237C974 +ov29_0237C974: + .space 0x28 + .global ov29_0237C99C +ov29_0237C99C: + .space 0x4 + .global ov29_0237C9A0 +ov29_0237C9A0: + .space 0x4 + .global ov29_0237C9A4 +ov29_0237C9A4: + .space 0x8 + .global ov29_0237C9AC +ov29_0237C9AC: + .space 0x4 + .global ov29_0237C9B0 +ov29_0237C9B0: + .space 0x8 + .global ov29_0237C9B8 +ov29_0237C9B8: + .space 0x8 + .global ov29_0237C9C0 +ov29_0237C9C0: + .space 0x4 + .global ov29_0237C9C4 +ov29_0237C9C4: + .space 0x1 + .global ov29_0237C9C5 +ov29_0237C9C5: + .space 0x3 + .global ov29_0237C9C8 +ov29_0237C9C8: + .space 0x1 + .global ov29_0237C9C9 +ov29_0237C9C9: + .space 0x7 + .global ov29_0237C9D0 +ov29_0237C9D0: + .space 0x8 + .global ov29_0237C9D8 +ov29_0237C9D8: + .space 0x20 + .global ov29_0237C9F8 +ov29_0237C9F8: + .space 0x20 + .global ov29_0237CA18 +ov29_0237CA18: + .space 0x8 + .global ov29_0237CA20 +ov29_0237CA20: + .space 0x8 + .global ov29_0237CA28 +ov29_0237CA28: + .space 0x20 + .global ov29_0237CA48 +ov29_0237CA48: + .space 0x20 + .global ov29_0237CA68 +ov29_0237CA68: + .space 0x1 + .global ov29_0237CA69 +ov29_0237CA69: + .space 0x3 + .global ov29_0237CA6C +ov29_0237CA6C: + .space 0x8 + .global ov29_0237CA74 +ov29_0237CA74: + .space 0xC + .global ov29_0237CA80 +ov29_0237CA80: + .space 0x4 + .global ov29_0237CA84 +ov29_0237CA84: + .space 0x4 + .global ov29_0237CA88 +ov29_0237CA88: + .space 0x44 + .global ov29_0237CACC +ov29_0237CACC: + .space 0x274 + .global ov29_0237CD40 +ov29_0237CD40: + .space 0x278 + .global ov29_0237CFB8 +ov29_0237CFB8: + .space 0x3 + .global ov29_0237CFBB +ov29_0237CFBB: + .space 0x1 + .global ov29_0237CFBC +ov29_0237CFBC: + .space 0x4 + .global ov29_0237CFC0 +ov29_0237CFC0: + .space 0x3C + .global ov29_0237CFFC +ov29_0237CFFC: + .space 0x5808 + .global ov29_02382804 +ov29_02382804: + .space 0x8 + .global ov29_0238280C +ov29_0238280C: + .space 0x14 From f9b70b820b697c9be5cc1b449d591c5c73fd5734 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 20 Sep 2023 00:05:09 -0400 Subject: [PATCH 2/2] Synced symbols with pmdsky-debug --- asm/include/overlay_29_022E9618.inc | 9 +- asm/include/overlay_29_022EAB50.inc | 10 +- asm/include/overlay_29_022EE36C.inc | 8 +- asm/include/overlay_29_022F7388.inc | 8 +- asm/include/overlay_29_022FC9C0.inc | 4 +- asm/include/overlay_29_02307F1C.inc | 2 +- asm/include/overlay_29_02308FE0.inc | 90 +++--- asm/include/overlay_29_0230F02C.inc | 18 +- asm/include/overlay_29_02319FB0.inc | 4 +- asm/include/overlay_29_0231B1B8.inc | 44 +-- asm/include/overlay_29_0231CBEC.inc | 104 +++---- asm/include/overlay_29_0231F594.inc | 2 +- asm/include/overlay_29_0232A3FC.inc | 38 +-- asm/include/overlay_29_0232C524.inc | 32 +-- asm/include/overlay_29_0232E274.inc | 10 +- asm/include/overlay_29_0232E864.inc | 6 +- asm/include/overlay_29_02337CCC.inc | 24 +- asm/main_0200C4CC.s | 36 +-- asm/overlay_10.s | 424 ++++++++++++++-------------- asm/overlay_29_022E9618.s | 12 +- asm/overlay_29_022EAB50.s | 26 +- asm/overlay_29_022EE36C.s | 20 +- asm/overlay_29_022F7388.s | 16 +- asm/overlay_29_022FC9C0.s | 4 +- asm/overlay_29_02307F1C.s | 4 +- asm/overlay_29_02308FE0.s | 238 ++++++++-------- asm/overlay_29_0230F02C.s | 40 +-- asm/overlay_29_02319FB0.s | 10 +- asm/overlay_29_0231B1B8.s | 88 +++--- asm/overlay_29_0231CBEC.s | 40 +-- asm/overlay_29_0231F594.s | 4 +- asm/overlay_29_0232A3FC.s | 120 ++++---- asm/overlay_29_0232C524.s | 84 +++--- asm/overlay_29_0232E274.s | 36 +-- asm/overlay_29_0232E864.s | 12 +- asm/overlay_29_02337CCC.s | 60 ++-- asm/overlay_29_0234EC38.s | 88 +++--- 37 files changed, 887 insertions(+), 888 deletions(-) diff --git a/asm/include/overlay_29_022E9618.inc b/asm/include/overlay_29_022E9618.inc index b836d370..6b4d5558 100644 --- a/asm/include/overlay_29_022E9618.inc +++ b/asm/include/overlay_29_022E9618.inc @@ -2,6 +2,10 @@ .public __divsi3 .public _020AFC4C .public abs +.public DIRECTIONS_XY +.public DISPLACEMENTS_WITHIN_2_LARGEST_FIRST +.public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST +.public DISPLACEMENTS_WITHIN_3 .public DisplayUi .public EntityIsValid__022E95F4 .public GetLeader @@ -32,14 +36,10 @@ .public ov29_0234B854 .public ov29_02351628 .public ov29_02351658 -.public DIRECTIONS_XY .public ov29_0235171E .public ov29_0235179C .public ov29_023517A0 .public ov29_023517A2 -.public ov29_023517DC -.public ov29_02351844 -.public ov29_023518AC .public ov29_02353538 .public ov29_02353540 .public ov29_02353560 @@ -54,4 +54,3 @@ .public sub_02051E20 .public UpdateCamera .public UpdateMinimap - diff --git a/asm/include/overlay_29_022EAB50.inc b/asm/include/overlay_29_022EAB50.inc index c783cde7..30abef21 100644 --- a/asm/include/overlay_29_022EAB50.inc +++ b/asm/include/overlay_29_022EAB50.inc @@ -12,6 +12,8 @@ .public EnemyEvolution .public EntityIsValid__022EC608 .public ExecuteMonsterAction +.public FIXED_ROOM_PROPERTIES_TABLE +.public FRACTIONAL_TURN_SEQUENCE .public GetCanMoveFlag .public GetEquivItemIndex .public GetFloorType @@ -25,12 +27,11 @@ .public IsCurrentFixedRoomBossFight .public IsFloorOver .public IsHM +.public ITEM_CATEGORY_ACTIONS .public ItemZInit .public LogMessageByIdWithPopupCheckUserTarget .public MoveMonsterToPos -.public ov10_022C51FC -.public ov10_022C555C -.public ov10_022C6C70 +.public MUSIC_ID_TABLE .public ov29_022E555C .public ov29_022E81F8 .public ov29_022EF9C8 @@ -39,12 +40,10 @@ .public ov29_02347040 .public ov29_02348FD8 .public ov29_023516E8 -.public ov29_02352010 .public ov29_02352030 .public ov29_02352032 .public ov29_02352070 .public ov29_02352074 -.public ov29_02352284 .public ov29_023522B6 .public ov29_02353538 .public ov29_02353570 @@ -54,6 +53,7 @@ .public ov29_0237C920 .public ov29_0237C922 .public ov29_0237C96C +.public RANDOM_MUSIC_ID_TABLE .public RemoveEmptyItemsInBagWrapper .public RemoveEquivItemNoHole .public RemoveGroundItem diff --git a/asm/include/overlay_29_022EE36C.inc b/asm/include/overlay_29_022EE36C.inc index 334e1b51..47d6a504 100644 --- a/asm/include/overlay_29_022EE36C.inc +++ b/asm/include/overlay_29_022EE36C.inc @@ -3,9 +3,11 @@ .public AnimationDelayOrSomething .public ApplyDamageAndEffectsWrapper .public AreLateGameTrapsEnabled +.public ATK_STAT_IDX .public BAG_ITEMS_PTR_MIRROR .public CalcStatusDuration .public DIRECTIONS_XY +.public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST .public DrawMinimapTile .public DungeonRandInt .public EntityIsValid__022EE348 @@ -39,7 +41,6 @@ .public ov10_022C44E4 .public ov10_022C45C8 .public ov10_022C45CC -.public ov10_022C4720 .public ov10_022C4770 .public ov10_022C4B18 .public ov10_022C6C7A @@ -59,14 +60,13 @@ .public ov29_02346344 .public ov29_0234B084 .public ov29_0235171E -.public ov29_02351844 -.public ov29_02352AE8 -.public ov29_02352AEC .public ov29_02353538 .public RemoveEmptyItemsInBagWrapper .public RemoveGroundItem .public RemoveHeldItemNoHole .public ShouldDisplayEntityWrapper +.public SLEEP_TURN_RANGE +.public SPATK_STAT_IDX .public SpawnMonster .public sub_02001888 .public sub_0200FA68 diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc index 2c91df71..f6f5083e 100644 --- a/asm/include/overlay_29_022F7388.inc +++ b/asm/include/overlay_29_022F7388.inc @@ -7,10 +7,12 @@ .public AnimationDelayOrSomething .public ApplyItemEffect .public BAG_ITEMS_PTR_MIRROR +.public BELLY_DRAIN_IN_WALLS_INT .public CanAttackInDirection .public CanMonsterSpawn .public CanMonsterUseItem .public CanSeeTarget +.public CASTFORM_WEATHER_ATTRIBUTE_TABLE .public CeilFixedPoint .public CheckTeamMemberIdx .public Conversion2IsActive @@ -32,6 +34,7 @@ .public EntityIsValid__022F7364 .public EntityIsValid__022FC99C .public ExclusiveItemEffectFlagTest +.public FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE .public FreeOtherWrappedMonsters .public GendersEqualNotGenderless .public GetAbility @@ -116,11 +119,8 @@ .public MemFree .public MonsterIsType .public OpenMessageLog -.public ov10_022C48DC -.public ov10_022C4C6C .public ov10_022C4C6E .public ov10_022C4C70 -.public ov10_022C5938 .public ov29_022DDA54 .public ov29_022DDB68 .public ov29_022E0A04 @@ -177,7 +177,6 @@ .public ov29_0234EF24 .public ov29_0235171E .public ov29_02351E28 -.public ov29_02352768 .public ov29_02353538 .public ov29_0235355C .public ov29_0237C9B0 @@ -225,4 +224,5 @@ .public UpdateMinimap .public UpdateStatusIconFlags .public WAN_TABLE +.public WEATHER_BALL_TYPE_TABLE .public YesNoMenu diff --git a/asm/include/overlay_29_022FC9C0.inc b/asm/include/overlay_29_022FC9C0.inc index 4f233dd5..867066da 100644 --- a/asm/include/overlay_29_022FC9C0.inc +++ b/asm/include/overlay_29_022FC9C0.inc @@ -1,10 +1,10 @@ #pragma once -.public OUTLAW_LEVEL_TABLE .public AbilityIsActiveVeneer .public AddHeldItemToBag .public AdvanceFrame .public AnimationDelayOrSomething .public CalcSpeedStageWrapper +.public CASTFORM_WEATHER_ATTRIBUTE_TABLE .public CreateEnemyEntity .public DIRECTIONS_XY .public DisplayActions @@ -63,11 +63,11 @@ .public MewSpawnCheck .public MoveMonsterToPos .public MultiplyByFixedPoint +.public OUTLAW_LEVEL_TABLE .public ov10_022C4520 .public ov10_022C45A4 .public ov10_022C4858 .public ov10_022C489C -.public ov10_022C4C6C .public ov10_022C4F3C .public ov10_022C4F3D .public ov29_022DDA54 diff --git a/asm/include/overlay_29_02307F1C.inc b/asm/include/overlay_29_02307F1C.inc index 7f036be9..743559b6 100644 --- a/asm/include/overlay_29_02307F1C.inc +++ b/asm/include/overlay_29_02307F1C.inc @@ -10,8 +10,8 @@ .public GetTileSafe .public HasHeldItem .public MewSpawnCheck +.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS .public MultiplyByFixedPoint .public ov10_022C4560 -.public ov10_022C4660 .public ov29_02353538 .public SpawnMonster diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc index ccff7fd8..acfd28c2 100644 --- a/asm/include/overlay_29_02308FE0.inc +++ b/asm/include/overlay_29_02308FE0.inc @@ -1,31 +1,42 @@ #pragma once .public __divsi3 -.public _020A18CC -.public _020A18D4 -.public _020A18D8 -.public _020A18E8 -.public _020A18EC -.public _020A18F0 -.public _020A18F4 -.public _020A18F8 .public AbilityIsActiveVeneer .public abs .public ActivateMotorDrive .public AddExpSpecial .public AddFixedPoint64 .public AdvanceFrame +.public AFTERMATH_CHANCE +.public AIR_BLADE_DAMAGE_MULTIPLIER .public ApplyDamageAndEffects .public AURA_BOW_STAT_BOOST .public AuraBowIsActive .public BAG_ITEMS_PTR_MIRROR +.public BURN_DAMAGE_MULTIPLIER .public CanEnemyEvolve .public CanSeeTarget .public CeilFixedPoint .public ChangeDungeonMusic .public ClampedLn +.public CLOUDY_DAMAGE_MULTIPLIER +.public DAMAGE_FORMULA_AT_PREFACTOR +.public DAMAGE_FORMULA_CONSTANT_SHIFT +.public DAMAGE_FORMULA_DEF_PREFACTOR +.public DAMAGE_FORMULA_FLV_DEFICIT_DIVISOR +.public DAMAGE_FORMULA_FLV_SHIFT +.public DAMAGE_FORMULA_LN_ARG_PREFACTOR +.public DAMAGE_FORMULA_LN_PREFACTOR +.public DAMAGE_FORMULA_MAX_BASE +.public DAMAGE_FORMULA_MIN_BASE +.public DAMAGE_FORMULA_NON_TEAM_MEMBER_MODIFIER +.public DAMAGE_MULTIPLIER_0_5 +.public DAMAGE_MULTIPLIER_1_5 +.public DAMAGE_MULTIPLIER_2 +.public DAMAGE_STRING_IDS .public DebugPrint0 .public DebugRecruitingEnabled .public DEF_SCARF_STAT_BOOST +.public DEFENSIVE_STAT_STAGE_MULTIPLIERS .public DivideFixedPoint64 .public DungeonRandInt .public DungeonRandOutcome__022EAB20 @@ -95,6 +106,15 @@ .public LogMessageByIdWithPopupCheckParticipants .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget +.public MATCHUP_IMMUNE_MULTIPLIER +.public MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER +.public MATCHUP_NEUTRAL_MULTIPLIER +.public MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER +.public MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER +.public MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +.public MATCHUP_SUPER_EFFECTIVE_MULTIPLIER +.public MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +.public ME_FIRST_MULTIPLIER .public MemZero .public MewSpawnCheck .public MonsterHasNegativeStatus @@ -106,52 +126,25 @@ .public MUNCH_BELT_STAT_BOOST .public MusicTableIdxToMusicId .public NearbyAllyIqSkillIsEnabled +.public OFFENSIVE_STAT_STAGE_MULTIPLIERS .public OtherMonsterAbilityIsActive .public ov10_022BDC68 .public ov10_022BDE50 .public ov10_022BF964 .public ov10_022C4410 .public ov10_022C441C -.public ov10_022C4430 .public ov10_022C443C .public ov10_022C447C -.public ov10_022C44DC .public ov10_022C44FC -.public ov10_022C4510 -.public ov10_022C455C -.public ov10_022C4594 -.public ov10_022C4598 .public ov10_022C45B4 .public ov10_022C45C4 -.public ov10_022C45E0 .public ov10_022C45FC -.public ov10_022C4640 -.public ov10_022C46A4 -.public ov10_022C46F0 .public ov10_022C46FC .public ov10_022C4700 .public ov10_022C4704 .public ov10_022C4708 .public ov10_022C470C -.public ov10_022C4710 -.public ov10_022C4744 -.public ov10_022C474C -.public ov10_022C4758 -.public ov10_022C47C0 -.public ov10_022C47F8 -.public ov10_022C4810 -.public ov10_022C4818 -.public ov10_022C481C -.public ov10_022C4820 -.public ov10_022C4824 -.public ov10_022C482C .public ov10_022C4834 -.public ov10_022C4844 -.public ov10_022C4D14 -.public ov10_022C4D98 -.public ov10_022C4DEC -.public ov10_022C5064 -.public ov10_022C56B0 .public ov10_022C593C .public ov29_022E1B28 .public ov29_022E2470 @@ -213,16 +206,8 @@ .public ov29_0234EE10 .public ov29_0234F008 .public ov29_02352838 -.public ov29_0235283C -.public ov29_02352844 -.public ov29_0235284C -.public ov29_0235285C -.public ov29_02352864 -.public ov29_0235286C -.public ov29_0235287C .public ov29_02352884 .public ov29_02352894 -.public ov29_023528A4 .public ov29_02352984 .public ov29_02352990 .public ov29_0235299C @@ -234,7 +219,6 @@ .public ov29_0235322C .public ov29_02353230 .public ov29_02353234 -.public ov29_02353330 .public ov29_02353538 .public ov29_023535D4 .public ov29_0237CA6C @@ -250,16 +234,25 @@ .public PlayEffectAnimationEntity .public PointCameraToMonster .public POWER_BAND_STAT_BOOST +.public POWER_PITCHER_DAMAGE_MULTIPLIER .public PreprocessString +.public RECRUITMENT_LEVEL_BOOST_TABLE .public ResetDamageData .public RestorePpAllMovesSetFlags .public RestoreRandomMovePP .public RoundUpDiv256 +.public SCOPE_LENS_CRIT_RATE_BOOST +.public SET_DAMAGE_STATUS_DAMAGE .public SetItemAcquired .public SetMonsterFlag2 .public SetPokemonBattled .public SetPokemonJoined .public ShouldDisplayEntityWrapper +.public SOLID_ROCK_MULTIPLIER +.public SPAWN_CAP_NO_MONSTER_HOUSE +.public SPAWN_CAP_WITH_MONSTER_HOUSE +.public SPAWN_COOLDOWN +.public SPAWN_COOLDOWN_THIEF_ALERT .public SpawnDroppedItemWrapper .public SpawnMonster .public SPECIAL_BAND_STAT_BOOST @@ -280,9 +273,16 @@ .public sub_02058EB0 .public SubInitMonster .public SubstitutePlaceholderStringTags +.public SUPER_LUCK_CRIT_RATE_BOOST +.public TECHNICIAN_MOVE_POWER_THRESHOLD +.public TINTED_LENS_MULTIPLIER .public TryAftermathExplosion .public TryIncreaseHp .public TrySpawnEnemyItemDrop +.public TYPE_ADVANTAGE_MASTER_CRIT_RATE +.public TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS +.public TYPE_MATCHUP_COMBINATOR_TABLE +.public TYPE_MATCHUP_TABLE .public UpdateAiTargetPos .public UpdateEntityPixelPos .public UpdateStateFlags diff --git a/asm/include/overlay_29_0230F02C.inc b/asm/include/overlay_29_0230F02C.inc index 928c18b8..b1ab3cb7 100644 --- a/asm/include/overlay_29_0230F02C.inc +++ b/asm/include/overlay_29_0230F02C.inc @@ -3,9 +3,13 @@ .public abs .public AddMoneyCarried .public ApplyDamageAndEffectsWrapper +.public BAD_POISON_DAMAGE_COOLDOWN +.public BAD_POISON_DAMAGE_TABLE .public BAG_ITEMS_PTR_MIRROR .public BinToDecFixedPoint .public BoostSpeedOneStage +.public BURN_DAMAGE +.public BURN_DAMAGE_COOLDOWN .public CanSeeTarget .public CeilFixedPoint .public DIRECTIONS_XY @@ -38,35 +42,28 @@ .public IsFloating .public IsFloorOver .public ItemIsActive__02311034 +.public LEECH_SEED_DAMAGE_COOLDOWN +.public LEECH_SEED_HP_DRAIN .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUser .public MonsterHasNegativeStatus .public MonsterIsType .public MultiplyFixedPoint64 -.public ov10_022C4414 .public ov10_022C4454 .public ov10_022C446C .public ov10_022C44BC -.public ov10_022C44D4 -.public ov10_022C44D8 -.public ov10_022C4588 .public ov10_022C4590 .public ov10_022C45D0 .public ov10_022C45E8 .public ov10_022C45F0 -.public ov10_022C4610 .public ov10_022C464C .public ov10_022C4650 .public ov10_022C4664 -.public ov10_022C466C .public ov10_022C46A0 -.public ov10_022C46A8 -.public ov10_022C46AC .public ov10_022C46EC .public ov10_022C4A5C .public ov10_022C4BBC .public ov10_022C4BE4 -.public ov10_022C4C9C .public ov10_022C4FC4 .public ov29_022E42E8 .public ov29_022E53F0 @@ -103,9 +100,12 @@ .public ov29_023529A8 .public ov29_02353538 .public ov29_023536FC +.public POISON_DAMAGE +.public POISON_DAMAGE_COOLDOWN .public RemoveGroundItem .public ShouldMonsterRunAwayVariation .public SpawnDroppedItemWrapper +.public SPEED_BOOST_TURNS .public sub_0200D8AC .public sub_0201116C .public sub_02050FF8 diff --git a/asm/include/overlay_29_02319FB0.inc b/asm/include/overlay_29_02319FB0.inc index 0777093a..d3cc0da3 100644 --- a/asm/include/overlay_29_02319FB0.inc +++ b/asm/include/overlay_29_02319FB0.inc @@ -36,9 +36,8 @@ .public LogMessageByIdWithPopupCheckUserTarget .public MonsterHasNegativeStatus .public MonsterIsType +.public NATURAL_GIFT_ITEM_TABLE .public ov10_022C459C -.public ov10_022C48DC -.public ov10_022C5130 .public ov29_022E3ED0 .public ov29_022E4110 .public ov29_022EB4E8 @@ -67,3 +66,4 @@ .public TryActivateTruant .public UpdateAiTargetPos .public UpdateMovePp +.public WEATHER_BALL_TYPE_TABLE diff --git a/asm/include/overlay_29_0231B1B8.inc b/asm/include/overlay_29_0231B1B8.inc index fb286d28..f3b14c68 100644 --- a/asm/include/overlay_29_0231B1B8.inc +++ b/asm/include/overlay_29_0231B1B8.inc @@ -2,6 +2,7 @@ .public AbilityIsActiveVeneer .public AddHeldItemToBag .public AnimationDelayOrSomething +.public APPLES_AND_BERRIES_ITEM_IDS .public ApplyBlastSeedEffect .public ApplyCalciumEffect .public ApplyCheriBerryEffect @@ -26,8 +27,11 @@ .public ApplyZincEffect .public BoostIQ .public BoostSpeedOneStage +.public CACNEA_SPIKE_POWER .public CalcDamageFixedNoCategory +.public CALCIUM_STAT_BOOST .public CalcStatusDuration +.public CORSOLA_TWIG_POWER .public DealDamageProjectile .public DungeonGetSpriteIndex .public EndNegativeStatusConditionWrapper @@ -36,46 +40,34 @@ .public EntityIsValid__0231CBC8 .public ExclusiveItemEffectFlagTest .public FemaleToMaleForm +.public GEO_PEBBLE_DAMAGE .public GetActiveTeamMember .public GetItemCategoryVeneer .public GetSleepAnimationId +.public GOLD_FANG_POWER +.public GOLD_THORN_POWER +.public GRAVELEROCK_DAMAGE .public GUMMI_STAT_BOOST .public InitMove .public IqSkillIsEnabled +.public IRON_STAT_BOOST +.public IRON_THORN_POWER .public IsBagFull .public IsMonsterSleeping .public IsShaymin .public IsSkyExclusiveDungeon .public LevelUpItemEffect +.public LIFE_SEED_HP_BOOST .public LogMessageByIdWithPopupCheckUserTarget -.public ov10_022C4420 -.public ov10_022C4438 -.public ov10_022C4478 -.public ov10_022C44D0 +.public ORAN_BERRY_FULL_HP_BOOST +.public ORAN_BERRY_HP_RESTORATION +.public OREN_BERRY_DAMAGE .public ov10_022C44EC -.public ov10_022C44F4 -.public ov10_022C44F8 .public ov10_022C4530 .public ov10_022C4558 .public ov10_022C4574 .public ov10_022C457C -.public ov10_022C45EC -.public ov10_022C45F4 -.public ov10_022C4624 -.public ov10_022C46B4 -.public ov10_022C46B8 -.public ov10_022C46BC -.public ov10_022C46C4 -.public ov10_022C46C8 -.public ov10_022C46CC -.public ov10_022C46D8 -.public ov10_022C46DC -.public ov10_022C46E0 -.public ov10_022C46E4 -.public ov10_022C46E8 -.public ov10_022C4720 .public ov10_022C4864 -.public ov10_022C4EB8 .public ov29_022E28D4 .public ov29_022E3590 .public ov29_022E5A00 @@ -98,9 +90,16 @@ .public ov29_0234B084 .public ov29_0234BA54 .public ov29_02353538 +.public PROTEIN_STAT_BOOST +.public RARE_FOSSIL_DAMAGE .public RestoreAllMovePP .public SetMonsterTypeAndAbility +.public SILVER_SPIKE_POWER +.public SITRUS_BERRY_FULL_HP_BOOST +.public SITRUS_BERRY_HP_RESTORATION +.public SLEEP_TURN_RANGE .public SpawnDroppedItemWrapper +.public STICK_POWER .public sub_020017EC .public sub_0201CF80 .public SubstitutePlaceholderStringTags @@ -121,3 +120,4 @@ .public TryWarp .public UpdateShopkeeperModeAfterAttack .public WONDER_GUMMI_STAT_BOOST +.public ZINC_STAT_BOOST diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index c2cc8223..c1c4d8f4 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -1,16 +1,26 @@ #pragma once +.public _020A1894 .public AbilityIsActiveVeneer .public AllocAndLoadFileInPack +.public ATK_STAT_IDX +.public BoostIQ .public BoostOffensiveStat .public CalcDamageFixedNoCategory .public CanSeeInvisibleMonsters .public CeilFixedPoint +.public ChangeDungeonMusic +.public ChangeShayminForme .public CheckTeamMemberIdxVeneer .public ClearMonsterActionFields +.public DetermineTileWalkableNeighbors +.public DIRECTIONS_XY .public DisplayMessage2 .public DungeonRandInt .public DungeonRandOutcome__022EAB20 +.public EAT_ITEM_EFFECT_IGNORE_LIST +.public EndBurnClassStatus .public EndFrozenClassStatus +.public EnsureCanStandCurrentTile .public EntityIsValid__0231CBC8 .public EntityIsValid__0231EDD8 .public FemaleToMaleForm @@ -25,12 +35,19 @@ .public GetPerformanceFlagWithChecks .public GetTile .public GetTileSafe +.public GetWeatherColorTable +.public GINSENG_CHANCE_3 +.public GUMMI_BELLY_RESTORE_TABLE +.public GUMMI_IQ_STRING_IDS .public HandleSir0Translation .public InitMove +.public IQ_GUMMI_GAIN_TABLE .public IqSkillIsEnabled .public IsBlinded +.public IsCurrentFixedRoomBossFight .public IsEdible .public IsExperienceLocked +.public IsFullFloorFixedRoom .public IsHM .public IsItemValidVeneer .public LogMessageByIdWithPopup @@ -38,33 +55,28 @@ .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat .public LowerOffensiveStat -.public RestoreAllMovePP -.public SetMonsterActionFields -.public StairsAlwaysReachable -.public SubstitutePlaceholderStringTags -.public TryInflictBurnStatus -.public TryInflictParalysisStatus -.public TryInflictPoisonedStatus -.public TryInflictShadowHoldStatus -.public TryWarp -.public UnloadFile +.public MonsterHasNegativeStatus +.public MusicTableIdxToMusicId +.public ov10_022C44CC +.public ov10_022C44E8 +.public ov10_022C45D4 +.public ov10_022C45D8 +.public ov10_022C45DC +.public ov10_022C45E4 +.public ov10_022C4680 +.public ov10_022C47E0 +.public ov10_022C47F0 .public ov29_022DD828 .public ov29_022DE47C .public ov29_022DE608 -.public GetWeatherColorTable .public ov29_022E0378 -.public IsCurrentFixedRoomBossFight -.public ShouldDisplayEntityWrapper .public ov29_022E5AE4 .public ov29_022E5BD8 .public ov29_022EA370 .public ov29_022EA428 -.public MusicTableIdxToMusicId -.public ChangeDungeonMusic .public ov29_022EAF20 .public ov29_022EAF34 .public ov29_022EB398 -.public RemoveUsedItem .public ov29_022EB668 .public ov29_022EFB20 .public ov29_022EFB84 @@ -76,9 +88,7 @@ .public ov29_022F8830 .public ov29_022F9C74 .public ov29_022FA02C -.public BoostIQ .public ov29_022FBA54 -.public MonsterHasNegativeStatus .public ov29_02300818 .public ov29_023008DC .public ov29_023009A0 @@ -87,27 +97,19 @@ .public ov29_023038D4 .public ov29_02304B64 .public ov29_02305814 -.public EndBurnClassStatus -.public TryDecreaseBelly -.public TryIncreaseBelly -.public TryInflictEndureStatus -.public ChangeShayminForme -.public EnsureCanStandCurrentTile -.public IsFullFloorFixedRoom .public ov29_0233665C -.public DetermineTileWalkableNeighbors -.public UpdateTrapsVisibility .public ov29_0233785C .public ov29_02338530 -.public SetDoughSeedFlag -.public UpdateMinimap .public ov29_02339FF4 .public ov29_0233FB1C .public ov29_02344B44 .public ov29_0234B084 .public ov29_0234B09C .public ov29_0234BA54 -.public YesNoMenu +.public ov29_023529AC +.public ov29_023529B0 +.public ov29_02353324 +.public ov29_02353538 .public ov30_023853BC .public ov30_023853E0 .public ov30_02385FE0 @@ -116,28 +118,26 @@ .public ov31_02386204 .public ov31_02386308 .public ov31_023877EC +.public RemoveUsedItem +.public RestoreAllMovePP +.public SetDoughSeedFlag +.public SetMonsterActionFields +.public ShouldDisplayEntityWrapper +.public SPATK_STAT_IDX +.public StairsAlwaysReachable .public sub_02050FF8 .public sub_02053D1C -.public DIRECTIONS_XY +.public SubstitutePlaceholderStringTags +.public TryDecreaseBelly +.public TryIncreaseBelly +.public TryInflictBurnStatus +.public TryInflictEndureStatus +.public TryInflictParalysisStatus +.public TryInflictPoisonedStatus +.public TryInflictShadowHoldStatus +.public TryWarp +.public UnloadFile +.public UpdateMinimap +.public UpdateTrapsVisibility .public WONDER_GUMMI_IQ_GAIN -.public _020A1894 -.public IQ_GUMMI_GAIN_TABLE -.public _020A2538 -.public ov10_022C44CC -.public ov10_022C44E8 -.public ov10_022C45D4 -.public ov10_022C45D8 -.public ov10_022C45DC -.public ov10_022C45E4 -.public ov10_022C4680 -.public ov10_022C46C0 -.public ov10_022C47E0 -.public ov10_022C47F0 -.public ov10_022C4B74 -.public ov29_023529AC -.public ov29_023529B0 -.public ov29_02352AE8 -.public ov29_02352AEC -.public ov29_023532D0 -.public ov29_02353324 -.public ov29_02353538 +.public YesNoMenu diff --git a/asm/include/overlay_29_0231F594.inc b/asm/include/overlay_29_0231F594.inc index e75ac35d..ca837670 100644 --- a/asm/include/overlay_29_0231F594.inc +++ b/asm/include/overlay_29_0231F594.inc @@ -5,6 +5,7 @@ .public AreOrbsAllowedVeneer .public AreTrawlOrbsAllowed .public DetermineTileWalkableNeighbors +.public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST .public DrawMinimapTile .public EntityIsValid__0231FBFC .public GetItemInfo @@ -21,7 +22,6 @@ .public ov29_02304B64 .public ov29_02336694 .public ov29_023457C8 -.public ov29_02351844 .public ov29_02353538 .public RemoveGroundItem .public SpawnItem diff --git a/asm/include/overlay_29_0232A3FC.inc b/asm/include/overlay_29_0232A3FC.inc index 66cadf9d..0d4936c1 100644 --- a/asm/include/overlay_29_0232A3FC.inc +++ b/asm/include/overlay_29_0232A3FC.inc @@ -5,16 +5,21 @@ .public AdvanceFrame .public AnimationDelayOrSomething .public ApplyDamageAndEffectsWrapper +.public ATK_STAT_IDX .public BAG_ITEMS_PTR_MIRROR +.public BLAZE_KICK_BURN_CHANCE .public BoostDefensiveStat .public BoostOffensiveStat .public BoostSpeedOneStage .public CalcDamageFixedWrapper .public CalcStatusDuration .public CeilFixedPoint +.public CRUSH_CLAW_LOWER_DEFENSE_CHANCE .public DealDamage .public DefenderAbilityIsActiveMoveEffects__02329F14 .public DIRECTIONS_XY +.public DIZZY_PUNCH_CONFUSE_CHANCE +.public DRAGON_RAGE_FIXED_DAMAGE .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public DungeonRandOutcomeUserAction @@ -22,10 +27,12 @@ .public EndFrozenStatus .public EntityIsValidMoveEffects__0232A3D8 .public EntityIsValidMoveEffects__0232C500 +.public ERUPTION_DAMAGE_MULT_TABLE .public GetDamageSourceWrapper .public GetMoveCategory .public GetMoveType .public GetTileSafe +.public IMPRISON_TURN_RANGE .public InitMove .public InitStandardItem .public IsBagFull @@ -40,29 +47,16 @@ .public LowerHitChanceStat .public LowerOffensiveStat .public LowerSpeed +.public LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE +.public METAL_CLAW_BOOST_ATTACK_CHANCE +.public METRONOME_TABLE +.public MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE .public MoveMonsterToPos -.public ov10_022C448C -.public ov10_022C44A4 .public ov10_022C44B4 -.public ov10_022C44C4 -.public ov10_022C44E0 -.public ov10_022C450C -.public ov10_022C4540 -.public ov10_022C4548 -.public ov10_022C454C -.public ov10_022C4554 -.public ov10_022C4608 -.public ov10_022C46D4 -.public ov10_022C471C -.public ov10_022C4720 -.public ov10_022C4748 -.public ov10_022C48BC .public ov10_022C4924 -.public ov10_022C49C4 .public ov10_022C49D4 .public ov10_022C4C3C .public ov10_022C4C3E -.public ov10_022C5DDC .public ov10_022C5DE0 .public ov10_022C6321 .public ov10_022C6322 @@ -83,15 +77,20 @@ .public ov29_02332F18 .public ov29_0234B084 .public ov29_0235171E -.public ov29_02352AE8 -.public ov29_02352AEC .public ov29_02352B1C .public ov29_02353538 .public ov29_0237CA84 .public ov29_0237CA88 +.public POISON_TAIL_POISON_CHANCE .public RemoveEquivItem +.public REST_TURN_RANGE .public RevealTrapsNearby +.public SECRET_POWER_EFFECT_CHANCE +.public SKULL_BASH_DAMAGE_MULTIPLIER +.public SLEEP_TURN_RANGE +.public SPATK_STAT_IDX .public SpawnDroppedItem +.public STEEL_WING_BOOST_DEFENSE_CHANCE .public StringFromMessageId .public sub_02025888 .public sub_02050FF8 @@ -131,3 +130,4 @@ .public TwoTurnMoveForcedMiss .public UpdateEntityPixelPos .public UpdateTrapsVisibility +.public WHIRLPOOL_CONSTRICTION_CHANCE diff --git a/asm/include/overlay_29_0232C524.inc b/asm/include/overlay_29_0232C524.inc index 61b919ef..5244ea7a 100644 --- a/asm/include/overlay_29_0232C524.inc +++ b/asm/include/overlay_29_0232C524.inc @@ -1,6 +1,7 @@ #pragma once .public __divsi3 .public AbilityIsActiveVeneer +.public ATK_STAT_IDX .public BAG_ITEMS_PTR_MIRROR .public BoostDefensiveStat .public BoostOffensiveStat @@ -8,6 +9,7 @@ .public CalcDamageFixedWrapper .public CalcRecoilDamageFixed .public CalcStatusDuration +.public CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE .public CountMovesOutOfPp .public DealDamage .public DealDamageWithTypeAndPowerBoost @@ -22,6 +24,7 @@ .public EntityIsValidMoveEffects__0232C500 .public EntityIsValidMoveEffects__0232E250 .public FixedRoomIsSubstituteRoom +.public FLARE_BLITZ_BURN_CHANCE .public GenerateStandardItem .public GetApparentWeather .public GetBodySize @@ -40,9 +43,14 @@ .public GetVisibilityRange .public HandleFaint .public HasDropeyeStatus +.public HEAL_ORDER_HP_RESTORATION +.public HEALING_WISH_HP_RESTORATION +.public ICE_FANG_CRINGE_CHANCE +.public ICE_FANG_FREEZE_CHANCE .public IsChargingTwoTurnMove .public IsCurrentFixedRoomBossFight .public IsFullFloorFixedRoom +.public LAST_RESORT_DAMAGE_MULT_TABLE .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat @@ -50,22 +58,8 @@ .public LowerSpeed .public MewSpawnCheck .public MistIsActive -.public ov10_022C44B8 -.public ov10_022C44F0 -.public ov10_022C4518 -.public ov10_022C452C -.public ov10_022C453C .public ov10_022C456C .public ov10_022C45BC -.public ov10_022C4654 -.public ov10_022C4678 -.public ov10_022C4684 -.public ov10_022C46F4 -.public ov10_022C4720 -.public ov10_022C47DC -.public ov10_022C4944 -.public ov10_022C4964 -.public ov10_022C49B4 .public ov29_022E09E8 .public ov29_022E1AAC .public ov29_022E1AD4 @@ -101,8 +95,6 @@ .public ov29_0234B0B4 .public ov29_0234BA54 .public ov29_0235171E -.public ov29_02352AE8 -.public ov29_02352AEC .public ov29_02352B38 .public ov29_02352B3C .public ov29_02353538 @@ -110,10 +102,16 @@ .public RevealEnemies .public RevealItems .public RevealStairs +.public ROOST_HP_RESTORATION_TABLE +.public SHADOW_FORCE_DAMAGE_MULTIPLIER +.public SLEEP_TURN_RANGE +.public SPATK_STAT_IDX .public SpawnDroppedItemWrapper .public StringFromMessageId .public sub_02024FB8 .public SubstitutePlaceholderStringTags +.public THUNDER_FANG_CRINGE_CHANCE +.public THUNDER_FANG_PARALYZE_CHANCE .public TransferNegativeStatusCondition .public TryActivateIdentifyCondition .public TryActivateWeather @@ -146,3 +144,5 @@ .public TryWarp .public UpdateMinimap .public UpdateTrapsVisibility +.public WEATHER_MOVE_TURN_COUNT +.public WRING_OUT_DAMAGE_MULT_TABLE diff --git a/asm/include/overlay_29_0232E274.inc b/asm/include/overlay_29_0232E274.inc index 7012cf38..26e030e5 100644 --- a/asm/include/overlay_29_0232E274.inc +++ b/asm/include/overlay_29_0232E274.inc @@ -1,5 +1,6 @@ #pragma once .public AbilityIsActiveVeneer +.public ATK_STAT_IDX .public BoostDefensiveStat .public BoostOffensiveStat .public BoostSpeedOneStage @@ -14,18 +15,17 @@ .public EndSleepClassStatus .public EntityIsValid__0232E840 .public EntityIsValidMoveEffects__0232E250 +.public FIRE_FANG_CRINGE_CHANCE +.public FLARE_BLITZ_BURN_CHANCE +.public HEALING_WISH_HP_RESTORATION .public LogMessageByIdWithPopupCheckUserTarget .public LowerOffensiveStat -.public ov10_022C449C -.public ov10_022C4684 -.public ov10_022C46F4 .public ov29_02318D98 .public ov29_0234AFFC -.public ov29_02352AE8 -.public ov29_02352AEC .public ov29_02353718 .public ResetHitChanceStat .public RestoreAllMovePP +.public SPATK_STAT_IDX .public sub_02054EC8 .public SubstitutePlaceholderStringTags .public TryIncreaseHp diff --git a/asm/include/overlay_29_0232E864.inc b/asm/include/overlay_29_0232E864.inc index cd75ae84..e1f63c9c 100644 --- a/asm/include/overlay_29_0232E864.inc +++ b/asm/include/overlay_29_0232E864.inc @@ -5,6 +5,7 @@ .public ApplyDamageAndEffects .public ApplyDamageAndEffectsWrapper .public AreEntitiesAdjacent +.public ATK_STAT_IDX .public CalcDamage .public CanAttackInDirection .public CanBeSnatched @@ -335,6 +336,7 @@ .public EntityIsValid__0232E840 .public EntityIsValid__02333FAC .public ExclusiveItemEffectFlagTest +.public FOREWARN_FORCED_MISS_CHANCE .public GetApparentWeather .public GetDamageSourceWrapper .public GetDirectionTowardsPosition @@ -369,7 +371,6 @@ .public ov01_0233103C .public ov01_023315F4 .public ov10_022BFD6C -.public ov10_022C4468 .public ov10_022C4480 .public ov10_022C4504 .public ov10_022C4508 @@ -414,8 +415,6 @@ .public ov29_023381C0 .public ov29_02344B44 .public ov29_0234B034 -.public ov29_02352AE8 -.public ov29_02352AEC .public ov29_02353538 .public ov29_02353718 .public ov29_0237CA68 @@ -424,6 +423,7 @@ .public ov29_0237CA80 .public PlayMoveAnimation .public ShouldDisplayEntityWrapper +.public SPATK_STAT_IDX .public sub_02050FF8 .public SubFixedPoint .public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_02337CCC.inc b/asm/include/overlay_29_02337CCC.inc index baaf706c..8d1da943 100644 --- a/asm/include/overlay_29_02337CCC.inc +++ b/asm/include/overlay_29_02337CCC.inc @@ -4,6 +4,7 @@ .public _020AFC70 .public abs .public AllocAndLoadFileInPack +.public CORNER_CARDINAL_NEIGHBOR_IS_OPEN .public DetermineAllTilesWalkableNeighbors .public DetermineTileWalkableNeighbors .public DIRECTIONS_XY @@ -14,6 +15,9 @@ .public DungeonRngSetSecondary .public EntityIsValid__02337CA8 .public EntityIsValid__02344AF8 +.public FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS +.public FIXED_ROOM_ENTITY_SPAWN_TABLE +.public FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE .public GenerateCleanItem .public GenerateStandardItem .public GetActiveTeamMember @@ -39,6 +43,7 @@ .public GetTrapInfo .public GetVictoriesOnOneFloor .public HandleSir0Translation +.public HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER .public InitOtherMonsterData .public InitRender3dElement64 .public InitStandardItem @@ -55,26 +60,22 @@ .public IsItemInBag .public IsOutlawMonsterHouseFloor .public IsTreasureBox +.public KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER .public LoadFileFromRom .public LoadScriptVariableValue .public LoadWteFromFileDirectory .public LogMessageByIdWithPopupCheckUser +.public MAP_COLOR_TABLE .public MarkShopkeeperSpawn .public MemAlloc .public Memcpy32 .public MemFree .public MemZero +.public MONSTER_HOUSE_MAX_MONSTER_SPAWNS +.public MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS .public MultiplyByFixedPoint .public ov10_022BFD20 -.public ov10_022C440C -.public ov10_022C44AC -.public ov10_022C4660 -.public ov10_022C484C -.public ov10_022C4850 .public ov10_022C4B34 -.public ov10_022C52EC -.public ov10_022C5938 -.public ov10_022C631C .public ov10_022C6326 .public ov10_022C6327 .public ov10_022C6C74 @@ -121,8 +122,6 @@ .public ov29_0234B1A4 .public ov29_0234C668 .public ov29_0234C738 -.public ov29_0234FDFC -.public ov29_023502EC .public ov29_023502F0 .public ov29_023502F4 .public ov29_02352B5C @@ -130,9 +129,7 @@ .public ov29_02352F40 .public ov29_02352F7C .public ov29_02352FCC -.public ov29_02352FD0 .public ov29_02352FF4 -.public ov29_02353010 .public ov29_02353030 .public ov29_02353050 .public ov29_02353110 @@ -160,6 +157,7 @@ .public SECONDARY_TERRAIN_TYPES .public SetMonsterLevelAndId .public SetVictoriesOnOneFloor +.public SHOP_ITEM_CHANCES .public ShouldMinimapDisplayEntity .public SpawnEnemyTrapAtPos .public SpawnItem @@ -179,6 +177,8 @@ .public sub_02056880 .public SubstitutePlaceholderStringTags .public TeamMemberHasExclusiveItemEffectActive +.public TILESET_PROPERTIES +.public TREASURE_BOX_1_ITEM_IDS .public UnloadFile .public UpdateTrapsVisibility .public ZInit8 diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index 7b2c0bb8..2e7adf96 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -169954,17 +169954,17 @@ EVOLUTION_HP_BONUS: .global _020A18C8 _020A18C8: .byte 0x02, 0x00, 0x00, 0x00 - .global _020A18CC -_020A18CC: + .global DAMAGE_FORMULA_FLV_SHIFT +DAMAGE_FORMULA_FLV_SHIFT: .byte 0x00, 0x32, 0x00, 0x00 .global EVOLUTION_PHYSICAL_STAT_BONUSES EVOLUTION_PHYSICAL_STAT_BONUSES: .byte 0x05, 0x00, 0x05, 0x00 - .global _020A18D4 -_020A18D4: + .global DAMAGE_FORMULA_CONSTANT_SHIFT +DAMAGE_FORMULA_CONSTANT_SHIFT: .byte 0x00, 0xC9, 0xFE, 0xFF - .global _020A18D8 -_020A18D8: + .global DAMAGE_FORMULA_FLV_DEFICIT_DIVISOR +DAMAGE_FORMULA_FLV_DEFICIT_DIVISOR: .byte 0x00, 0x08, 0x00, 0x00 .global EGG_STAT_BONUSES EGG_STAT_BONUSES: @@ -169975,20 +169975,20 @@ _020A18E0: .global EVOLUTION_SPECIAL_STAT_BONUSES EVOLUTION_SPECIAL_STAT_BONUSES: .byte 0x05, 0x00, 0x05, 0x00 - .global _020A18E8 -_020A18E8: + .global DAMAGE_FORMULA_NON_TEAM_MEMBER_MODIFIER +DAMAGE_FORMULA_NON_TEAM_MEMBER_MODIFIER: .byte 0x54, 0x01, 0x00, 0x00 - .global _020A18EC -_020A18EC: + .global DAMAGE_FORMULA_LN_PREFACTOR +DAMAGE_FORMULA_LN_PREFACTOR: .byte 0x00, 0x32, 0x00, 0x00 - .global _020A18F0 -_020A18F0: + .global DAMAGE_FORMULA_DEF_PREFACTOR +DAMAGE_FORMULA_DEF_PREFACTOR: .byte 0x80, 0xFF, 0xFF, 0xFF - .global _020A18F4 -_020A18F4: + .global DAMAGE_FORMULA_AT_PREFACTOR +DAMAGE_FORMULA_AT_PREFACTOR: .byte 0x99, 0x00, 0x00, 0x00 - .global _020A18F8 -_020A18F8: + .global DAMAGE_FORMULA_LN_ARG_PREFACTOR +DAMAGE_FORMULA_LN_ARG_PREFACTOR: .byte 0x00, 0x0A, 0x00, 0x00 .global _020A18FC _020A18FC: @@ -170248,8 +170248,8 @@ IQ_GUMMI_GAIN_TABLE: .byte 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00 .byte 0x01, 0x00, 0x04, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x05, 0x00 - .global _020A2538 -_020A2538: + .global GUMMI_BELLY_RESTORE_TABLE +GUMMI_BELLY_RESTORE_TABLE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x0F, 0x00, 0x0F, 0x00 diff --git a/asm/overlay_10.s b/asm/overlay_10.s index e990016a..8fb67795 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -9113,14 +9113,14 @@ ov10_022C43F8: .global ov10_022C4404 ov10_022C4404: .byte 0x20, 0x20, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00 - .global ov10_022C440C -ov10_022C440C: + .global FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS +FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS: .byte 0x1C, 0x00, 0x00, 0x00 .global ov10_022C4410 ov10_022C4410: .byte 0xC8, 0x00, 0x00, 0x00 - .global ov10_022C4414 -ov10_022C4414: + .global BAD_POISON_DAMAGE_COOLDOWN +BAD_POISON_DAMAGE_COOLDOWN: .byte 0x05, 0x00, 0x00, 0x00 .global ov10_022C4418 ov10_022C4418: @@ -9128,18 +9128,18 @@ ov10_022C4418: .global ov10_022C441C ov10_022C441C: .byte 0xC8, 0x00, 0x00, 0x00 - .global ov10_022C4420 -ov10_022C4420: + .global PROTEIN_STAT_BOOST +PROTEIN_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00 .byte 0x1E, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00 - .global ov10_022C4430 -ov10_022C4430: + .global SPAWN_CAP_NO_MONSTER_HOUSE +SPAWN_CAP_NO_MONSTER_HOUSE: .byte 0x0F, 0x00, 0x00, 0x00 .global ov10_022C4434 ov10_022C4434: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4438 -ov10_022C4438: + .global OREN_BERRY_DAMAGE +OREN_BERRY_DAMAGE: .byte 0x0A, 0x00, 0x00, 0x00 .global ov10_022C443C ov10_022C443C: @@ -9155,15 +9155,15 @@ ov10_022C4458: ov10_022C445C: .byte 0x1E, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 .byte 0x18, 0x00, 0x00, 0x00 - .global ov10_022C4468 -ov10_022C4468: + .global FOREWARN_FORCED_MISS_CHANCE +FOREWARN_FORCED_MISS_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C446C ov10_022C446C: .byte 0x05, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 .byte 0x21, 0x00, 0x00, 0x00 - .global ov10_022C4478 -ov10_022C4478: + .global SITRUS_BERRY_HP_RESTORATION +SITRUS_BERRY_HP_RESTORATION: .byte 0x64, 0x00, 0x00, 0x00 .global ov10_022C447C ov10_022C447C: @@ -9172,48 +9172,48 @@ ov10_022C447C: ov10_022C4480: .byte 0x14, 0x00, 0x00, 0x00 .byte 0x28, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 - .global ov10_022C448C -ov10_022C448C: + .global POISON_TAIL_POISON_CHANCE +POISON_TAIL_POISON_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0x1E, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 - .global ov10_022C449C -ov10_022C449C: + .global FIRE_FANG_CRINGE_CHANCE +FIRE_FANG_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 - .global ov10_022C44A4 -ov10_022C44A4: + .global WHIRLPOOL_CONSTRICTION_CHANCE +WHIRLPOOL_CONSTRICTION_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C44AC -ov10_022C44AC: + .global MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS +MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS: .byte 0x07, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .global ov10_022C44B4 ov10_022C44B4: .byte 0x05, 0x00, 0x00, 0x00 - .global ov10_022C44B8 -ov10_022C44B8: + .global HEAL_ORDER_HP_RESTORATION +HEAL_ORDER_HP_RESTORATION: .byte 0x28, 0x00, 0x00, 0x00 .global ov10_022C44BC ov10_022C44BC: .byte 0x03, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C44C4 -ov10_022C44C4: + .global STEEL_WING_BOOST_DEFENSE_CHANCE +STEEL_WING_BOOST_DEFENSE_CHANCE: .byte 0x14, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 .global ov10_022C44CC ov10_022C44CC: .byte 0x19, 0x00, 0x00, 0x00 - .global ov10_022C44D0 -ov10_022C44D0: + .global GOLD_THORN_POWER +GOLD_THORN_POWER: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C44D4 -ov10_022C44D4: + .global BURN_DAMAGE +BURN_DAMAGE: .byte 0x06, 0x00, 0x00, 0x00 - .global ov10_022C44D8 -ov10_022C44D8: + .global POISON_DAMAGE +POISON_DAMAGE: .byte 0x02, 0x00, 0x00, 0x00 - .global ov10_022C44DC -ov10_022C44DC: + .global SPAWN_COOLDOWN +SPAWN_COOLDOWN: .byte 0x24, 0x00, 0x00, 0x00 - .global ov10_022C44E0 -ov10_022C44E0: + .global MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE +MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE: .byte 0x32, 0x00, 0x00, 0x00 .global ov10_022C44E4 ov10_022C44E4: @@ -9224,14 +9224,14 @@ ov10_022C44E8: .global ov10_022C44EC ov10_022C44EC: .byte 0x3C, 0x00, 0x00, 0x00 - .global ov10_022C44F0 -ov10_022C44F0: + .global CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE +CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE: .byte 0x28, 0x00, 0x00, 0x00 - .global ov10_022C44F4 -ov10_022C44F4: + .global ORAN_BERRY_FULL_HP_BOOST +ORAN_BERRY_FULL_HP_BOOST: .byte 0x00, 0x00, 0x00, 0x00 - .global ov10_022C44F8 -ov10_022C44F8: + .global LIFE_SEED_HP_BOOST +LIFE_SEED_HP_BOOST: .byte 0x03, 0x00, 0x00, 0x00 .global ov10_022C44FC ov10_022C44FC: @@ -9242,48 +9242,48 @@ ov10_022C4504: .global ov10_022C4508 ov10_022C4508: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C450C -ov10_022C450C: + .global LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE +LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE: .byte 0x32, 0x00, 0x00, 0x00 - .global ov10_022C4510 -ov10_022C4510: + .global SUPER_LUCK_CRIT_RATE_BOOST +SUPER_LUCK_CRIT_RATE_BOOST: .byte 0x0A, 0x00, 0x00, 0x00 .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4518 -ov10_022C4518: + .global ICE_FANG_FREEZE_CHANCE +ICE_FANG_FREEZE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00 .global ov10_022C4520 ov10_022C4520: .byte 0x19, 0x00, 0x00, 0x00 .byte 0x0C, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C452C -ov10_022C452C: + .global THUNDER_FANG_PARALYZE_CHANCE +THUNDER_FANG_PARALYZE_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 .global ov10_022C4530 ov10_022C4530: .byte 0x0F, 0x00, 0x00, 0x00 .byte 0x14, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 - .global ov10_022C453C -ov10_022C453C: + .global ICE_FANG_CRINGE_CHANCE +ICE_FANG_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00 - .global ov10_022C4540 -ov10_022C4540: + .global BLAZE_KICK_BURN_CHANCE +BLAZE_KICK_BURN_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4548 -ov10_022C4548: + .global DIZZY_PUNCH_CONFUSE_CHANCE +DIZZY_PUNCH_CONFUSE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C454C -ov10_022C454C: + .global SECRET_POWER_EFFECT_CHANCE +SECRET_POWER_EFFECT_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C4554 -ov10_022C4554: + .global METAL_CLAW_BOOST_ATTACK_CHANCE +METAL_CLAW_BOOST_ATTACK_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C4558 ov10_022C4558: .byte 0x01, 0x00, 0x00, 0x00 - .global ov10_022C455C -ov10_022C455C: + .global TECHNICIAN_MOVE_POWER_THRESHOLD +TECHNICIAN_MOVE_POWER_THRESHOLD: .byte 0x04, 0x00, 0x00, 0x00 .global ov10_022C4560 ov10_022C4560: @@ -9302,17 +9302,17 @@ ov10_022C4574: ov10_022C457C: .byte 0x03, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00 .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4588 -ov10_022C4588: + .global LEECH_SEED_HP_DRAIN +LEECH_SEED_HP_DRAIN: .byte 0x0A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 .global ov10_022C4590 ov10_022C4590: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4594 -ov10_022C4594: + .global AFTERMATH_CHANCE +AFTERMATH_CHANCE: .byte 0x32, 0x00, 0x00, 0x00 - .global ov10_022C4598 -ov10_022C4598: + .global SET_DAMAGE_STATUS_DAMAGE +SET_DAMAGE_STATUS_DAMAGE: .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C459C ov10_022C459C: @@ -9353,8 +9353,8 @@ ov10_022C45D8: .global ov10_022C45DC ov10_022C45DC: .byte 0x23, 0x00, 0x00, 0x00 - .global ov10_022C45E0 -ov10_022C45E0: + .global TYPE_ADVANTAGE_MASTER_CRIT_RATE +TYPE_ADVANTAGE_MASTER_CRIT_RATE: .byte 0x28, 0x00, 0x00, 0x00 .global ov10_022C45E4 ov10_022C45E4: @@ -9362,14 +9362,14 @@ ov10_022C45E4: .global ov10_022C45E8 ov10_022C45E8: .byte 0x05, 0x00, 0x00, 0x00 - .global ov10_022C45EC -ov10_022C45EC: + .global ORAN_BERRY_HP_RESTORATION +ORAN_BERRY_HP_RESTORATION: .byte 0x64, 0x00, 0x00, 0x00 .global ov10_022C45F0 ov10_022C45F0: .byte 0x02, 0x00, 0x00, 0x00 - .global ov10_022C45F4 -ov10_022C45F4: + .global SITRUS_BERRY_FULL_HP_BOOST +SITRUS_BERRY_FULL_HP_BOOST: .byte 0x02, 0x00, 0x00, 0x00 .global ov10_022C45F8 ov10_022C45F8: @@ -9378,24 +9378,24 @@ ov10_022C45F8: ov10_022C45FC: .byte 0x05, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00 .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4608 -ov10_022C4608: + .global CRUSH_CLAW_LOWER_DEFENSE_CHANCE +CRUSH_CLAW_LOWER_DEFENSE_CHANCE: .byte 0x32, 0x00, 0x00, 0x00 .global ov10_022C460C ov10_022C460C: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4610 -ov10_022C4610: + .global BURN_DAMAGE_COOLDOWN +BURN_DAMAGE_COOLDOWN: .byte 0x32, 0x00, 0x00, 0x00 .global ov10_022C4614 ov10_022C4614: .byte 0x14, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 - .global ov10_022C4624 -ov10_022C4624: + .global STICK_POWER +STICK_POWER: .byte 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x9C, 0xFF, 0x00, 0x00 .byte 0x0F, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 - .global ov10_022C4640 -ov10_022C4640: + .global SPAWN_COOLDOWN_THIEF_ALERT +SPAWN_COOLDOWN_THIEF_ALERT: .byte 0x03, 0x00, 0x00, 0x00 .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C4648 @@ -9407,91 +9407,91 @@ ov10_022C464C: .global ov10_022C4650 ov10_022C4650: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4654 -ov10_022C4654: + .global WEATHER_MOVE_TURN_COUNT +WEATHER_MOVE_TURN_COUNT: .byte 0xB8, 0x0B, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C4660 -ov10_022C4660: + .global MONSTER_HOUSE_MAX_MONSTER_SPAWNS +MONSTER_HOUSE_MAX_MONSTER_SPAWNS: .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C4664 ov10_022C4664: .byte 0x14, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C466C -ov10_022C466C: + .global SPEED_BOOST_TURNS +SPEED_BOOST_TURNS: .byte 0xFA, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00 .byte 0x9C, 0xFF, 0x00, 0x00 - .global ov10_022C4678 -ov10_022C4678: + .global THUNDER_FANG_CRINGE_CHANCE +THUNDER_FANG_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 .global ov10_022C4680 ov10_022C4680: .byte 0x3C, 0x00, 0x00, 0x00 - .global ov10_022C4684 -ov10_022C4684: + .global FLARE_BLITZ_BURN_CHANCE +FLARE_BLITZ_BURN_CHANCE: .byte 0x19, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0x14, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 .global ov10_022C46A0 ov10_022C46A0: .byte 0x32, 0x00, 0x00, 0x00 - .global ov10_022C46A4 -ov10_022C46A4: + .global SPAWN_CAP_WITH_MONSTER_HOUSE +SPAWN_CAP_WITH_MONSTER_HOUSE: .byte 0x04, 0x00, 0x00, 0x00 - .global ov10_022C46A8 -ov10_022C46A8: + .global POISON_DAMAGE_COOLDOWN +POISON_DAMAGE_COOLDOWN: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C46AC -ov10_022C46AC: + .global LEECH_SEED_DAMAGE_COOLDOWN +LEECH_SEED_DAMAGE_COOLDOWN: .byte 0x02, 0x00, 0x00, 0x00 .global ov10_022C46B0 ov10_022C46B0: .byte 0x5A, 0x00, 0x00, 0x00 - .global ov10_022C46B4 -ov10_022C46B4: + .global GEO_PEBBLE_DAMAGE +GEO_PEBBLE_DAMAGE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C46B8 -ov10_022C46B8: + .global GRAVELEROCK_DAMAGE +GRAVELEROCK_DAMAGE: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C46BC -ov10_022C46BC: + .global RARE_FOSSIL_DAMAGE +RARE_FOSSIL_DAMAGE: .byte 0x64, 0x00, 0x00, 0x00 - .global ov10_022C46C0 -ov10_022C46C0: + .global GINSENG_CHANCE_3 +GINSENG_CHANCE_3: .byte 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C46C4 -ov10_022C46C4: + .global ZINC_STAT_BOOST +ZINC_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C46C8 -ov10_022C46C8: + .global IRON_STAT_BOOST +IRON_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C46CC -ov10_022C46CC: + .global CALCIUM_STAT_BOOST +CALCIUM_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00, 0x24, 0xFF, 0x00, 0x00 - .global ov10_022C46D4 -ov10_022C46D4: + .global DRAGON_RAGE_FIXED_DAMAGE +DRAGON_RAGE_FIXED_DAMAGE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C46D8 -ov10_022C46D8: + .global CORSOLA_TWIG_POWER +CORSOLA_TWIG_POWER: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C46DC -ov10_022C46DC: + .global CACNEA_SPIKE_POWER +CACNEA_SPIKE_POWER: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C46E0 -ov10_022C46E0: + .global GOLD_FANG_POWER +GOLD_FANG_POWER: .byte 0x07, 0x00, 0x00, 0x00 - .global ov10_022C46E4 -ov10_022C46E4: + .global SILVER_SPIKE_POWER +SILVER_SPIKE_POWER: .byte 0x06, 0x00, 0x00, 0x00 - .global ov10_022C46E8 -ov10_022C46E8: + .global IRON_THORN_POWER +IRON_THORN_POWER: .byte 0x04, 0x00, 0x00, 0x00 .global ov10_022C46EC ov10_022C46EC: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C46F0 -ov10_022C46F0: + .global SCOPE_LENS_CRIT_RATE_BOOST +SCOPE_LENS_CRIT_RATE_BOOST: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C46F4 -ov10_022C46F4: + .global HEALING_WISH_HP_RESTORATION +HEALING_WISH_HP_RESTORATION: .byte 0xE7, 0x03, 0x00, 0x00, 0x9C, 0xFF, 0x00, 0x00 .global ov10_022C46FC ov10_022C46FC: @@ -9508,15 +9508,15 @@ ov10_022C4708: .global ov10_022C470C ov10_022C470C: .byte 0xC8, 0x00, 0x00, 0x00 - .global ov10_022C4710 -ov10_022C4710: + .global ME_FIRST_MULTIPLIER +ME_FIRST_MULTIPLIER: .byte 0x80, 0x01, 0x00, 0x00 .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00 - .global ov10_022C471C -ov10_022C471C: + .global IMPRISON_TURN_RANGE +IMPRISON_TURN_RANGE: .byte 0x03, 0x00, 0x06, 0x00 - .global ov10_022C4720 -ov10_022C4720: + .global SLEEP_TURN_RANGE +SLEEP_TURN_RANGE: .byte 0x03, 0x00, 0x07, 0x00 .byte 0x04, 0x00, 0x08, 0x00, 0x7F, 0x00, 0x7F, 0x00 .global ov10_022C472C @@ -9537,21 +9537,21 @@ ov10_022C473C: .global ov10_022C4740 ov10_022C4740: .byte 0x0A, 0x00, 0x0C, 0x00 - .global ov10_022C4744 -ov10_022C4744: + .global BURN_DAMAGE_MULTIPLIER +BURN_DAMAGE_MULTIPLIER: .byte 0xCC, 0x00, 0x00, 0x00 - .global ov10_022C4748 -ov10_022C4748: + .global REST_TURN_RANGE +REST_TURN_RANGE: .byte 0x01, 0x00, 0x04, 0x00 - .global ov10_022C474C -ov10_022C474C: + .global MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER: .byte 0xB3, 0x01, 0x00, 0x00 .global ov10_022C4750 ov10_022C4750: .byte 0x06, 0x00, 0x0C, 0x00 .byte 0x03, 0x00, 0x05, 0x00 - .global ov10_022C4758 -ov10_022C4758: + .global MATCHUP_IMMUNE_MULTIPLIER +MATCHUP_IMMUNE_MULTIPLIER: .byte 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0A, 0x00 .global ov10_022C4760 ov10_022C4760: @@ -9570,16 +9570,16 @@ ov10_022C4794: .global ov10_022C47B8 ov10_022C47B8: .byte 0x01, 0x00, 0x03, 0x00, 0x0A, 0x00, 0x0C, 0x00 - .global ov10_022C47C0 -ov10_022C47C0: + .global TINTED_LENS_MULTIPLIER +TINTED_LENS_MULTIPLIER: .byte 0x33, 0x01, 0x00, 0x00 .byte 0x01, 0x00, 0x04, 0x00, 0x14, 0x00, 0x1E, 0x00 .global ov10_022C47CC ov10_022C47CC: .byte 0x0A, 0x00, 0x0C, 0x00, 0x03, 0x00, 0x03, 0x00 .byte 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00 - .global ov10_022C47DC -ov10_022C47DC: + .global SHADOW_FORCE_DAMAGE_MULTIPLIER +SHADOW_FORCE_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C47E0 ov10_022C47E0: @@ -9591,33 +9591,33 @@ ov10_022C47F0: .global ov10_022C47F4 ov10_022C47F4: .byte 0x01, 0x00, 0x04, 0x00 - .global ov10_022C47F8 -ov10_022C47F8: + .global POWER_PITCHER_DAMAGE_MULTIPLIER +POWER_PITCHER_DAMAGE_MULTIPLIER: .byte 0x80, 0x01, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00 .global ov10_022C4800 ov10_022C4800: .byte 0x78, 0x00, 0x00, 0x00 .byte 0x04, 0x00, 0x06, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00 - .global ov10_022C4810 -ov10_022C4810: + .global MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER +MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER: .byte 0xB5, 0x00, 0x00, 0x00 .global ov10_022C4814 ov10_022C4814: .byte 0x44, 0x00, 0x00, 0x00 - .global ov10_022C4818 -ov10_022C4818: + .global MATCHUP_SUPER_EFFECTIVE_MULTIPLIER +MATCHUP_SUPER_EFFECTIVE_MULTIPLIER: .byte 0x66, 0x01, 0x00, 0x00 - .global ov10_022C481C -ov10_022C481C: + .global MATCHUP_NEUTRAL_MULTIPLIER +MATCHUP_NEUTRAL_MULTIPLIER: .byte 0x00, 0x01, 0x00, 0x00 - .global ov10_022C4820 -ov10_022C4820: + .global MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER +MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER: .byte 0x40, 0x00, 0x00, 0x00 - .global ov10_022C4824 -ov10_022C4824: + .global MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER: .byte 0x80, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 - .global ov10_022C482C -ov10_022C482C: + .global MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER +MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER: .byte 0x00, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 .global ov10_022C4834 ov10_022C4834: @@ -9628,14 +9628,14 @@ ov10_022C483C: .global ov10_022C4840 ov10_022C4840: .byte 0x01, 0x00, 0x03, 0x00 - .global ov10_022C4844 -ov10_022C4844: + .global AIR_BLADE_DAMAGE_MULTIPLIER +AIR_BLADE_DAMAGE_MULTIPLIER: .byte 0x80, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 - .global ov10_022C484C -ov10_022C484C: + .global KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER +KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER: .byte 0x33, 0x01, 0x00, 0x00 - .global ov10_022C4850 -ov10_022C4850: + .global HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER +HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER: .byte 0x33, 0x01, 0x00, 0x00 .global ov10_022C4854 ov10_022C4854: @@ -9660,8 +9660,8 @@ ov10_022C489C: .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00 .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00 .byte 0x00, 0x02, 0x00, 0x00, 0x0F, 0x00, 0x1E, 0x00 - .global ov10_022C48BC -ov10_022C48BC: + .global SKULL_BASH_DAMAGE_MULTIPLIER +SKULL_BASH_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 .global ov10_022C48C4 ov10_022C48C4: @@ -9672,8 +9672,8 @@ ov10_022C48CC: .global ov10_022C48D4 ov10_022C48D4: .byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov10_022C48DC -ov10_022C48DC: + .global WEATHER_BALL_TYPE_TABLE +WEATHER_BALL_TYPE_TABLE: .byte 0x01, 0x02, 0x0D, 0x01, 0x03, 0x06, 0x01, 0x06 .global ov10_022C48E4 ov10_022C48E4: @@ -9695,22 +9695,22 @@ ov10_022C4924: .global ov10_022C4934 ov10_022C4934: .byte 0x4D, 0x00, 0x47, 0x00, 0x7B, 0x05, 0x49, 0x00, 0x88, 0x00, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov10_022C4944 -ov10_022C4944: + .global LAST_RESORT_DAMAGE_MULT_TABLE +LAST_RESORT_DAMAGE_MULT_TABLE: .byte 0x00, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 - .global ov10_022C4964 -ov10_022C4964: + .global ROOST_HP_RESTORATION_TABLE +ROOST_HP_RESTORATION_TABLE: .byte 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00 .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 .byte 0x00, 0x02, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 - .global ov10_022C49B4 -ov10_022C49B4: + .global WRING_OUT_DAMAGE_MULT_TABLE +WRING_OUT_DAMAGE_MULT_TABLE: .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 - .global ov10_022C49C4 -ov10_022C49C4: + .global ERUPTION_DAMAGE_MULT_TABLE +ERUPTION_DAMAGE_MULT_TABLE: .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .global ov10_022C49D4 ov10_022C49D4: @@ -9785,8 +9785,8 @@ ov10_022C4B34: .byte 0x5D, 0x00, 0xBA, 0x00, 0x90, 0x00, 0x90, 0x00, 0x37, 0x00, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 - .global ov10_022C4B74 -ov10_022C4B74: + .global EAT_ITEM_EFFECT_IGNORE_LIST +EAT_ITEM_EFFECT_IGNORE_LIST: .byte 0x4A, 0x00, 0x4B, 0x00, 0x4C, 0x00, 0x4F, 0x00, 0x53, 0x00, 0x54, 0x00, 0x56, 0x00, 0x5B, 0x00 .byte 0x57, 0x00, 0x5C, 0x00, 0x5E, 0x00, 0x5F, 0x00, 0x6F, 0x00, 0x68, 0x00, 0x6B, 0x00, 0x75, 0x00 .byte 0x71, 0x00, 0x00, 0x00 @@ -9817,8 +9817,8 @@ ov10_022C4C3E: .byte 0x64, 0x00, 0x28, 0x00, 0xC8, 0x00, 0x23, 0x00, 0x2C, 0x01, 0x1E, 0x00, 0x90, 0x01, 0x19, 0x00 .byte 0xF4, 0x01, 0x14, 0x00, 0x58, 0x02, 0x0F, 0x00, 0xBC, 0x02, 0x0A, 0x00, 0xE8, 0x03, 0x05, 0x00 .byte 0x10, 0x27, 0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00 - .global ov10_022C4C6C -ov10_022C4C6C: + .global CASTFORM_WEATHER_ATTRIBUTE_TABLE +CASTFORM_WEATHER_ATTRIBUTE_TABLE: .byte 0x01, 0x00 .global ov10_022C4C6E ov10_022C4C6E: @@ -9829,8 +9829,8 @@ ov10_022C4C70: .byte 0x7D, 0x01, 0xD5, 0x03, 0x01, 0x00, 0x7B, 0x01, 0xD3, 0x03, 0x01, 0x00, 0x7B, 0x01, 0xD3, 0x03 .byte 0x03, 0x00, 0x7E, 0x01, 0xD6, 0x03, 0x06, 0x00, 0x7C, 0x01, 0xD4, 0x03, 0x01, 0x00, 0x7B, 0x01 .byte 0xD3, 0x03, 0x06, 0x00, 0x7C, 0x01, 0xD4, 0x03 - .global ov10_022C4C9C -ov10_022C4C9C: + .global BAD_POISON_DAMAGE_TABLE +BAD_POISON_DAMAGE_TABLE: .byte 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00 .byte 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00 .byte 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00 @@ -9839,8 +9839,8 @@ ov10_022C4C9C: .byte 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00, 0x53, 0x00 .byte 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x59, 0x00, 0x5A, 0x00, 0x5B, 0x00, 0x5D, 0x00, 0x5E, 0x00 .byte 0x5F, 0x00, 0x60, 0x00, 0x61, 0x00, 0x6A, 0x00, 0x6B, 0x00, 0x68, 0x00, 0x75, 0x00, 0x00, 0x00 - .global ov10_022C4D14 -ov10_022C4D14: + .global TYPE_MATCHUP_COMBINATOR_TABLE +TYPE_MATCHUP_COMBINATOR_TABLE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 @@ -9852,16 +9852,16 @@ ov10_022C4D54: .byte 0x0D, 0x00, 0x0D, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00 .byte 0x0D, 0x00, 0x0F, 0x00 - .global ov10_022C4D98 -ov10_022C4D98: + .global OFFENSIVE_STAT_STAGE_MULTIPLIERS +OFFENSIVE_STAT_STAGE_MULTIPLIERS: .byte 0x80, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x8A, 0x00, 0x00, 0x00 .byte 0x8F, 0x00, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0xA1, 0x00, 0x00, 0x00 .byte 0xAB, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .byte 0x33, 0x01, 0x00, 0x00, 0x4C, 0x01, 0x00, 0x00, 0x66, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00 .byte 0x99, 0x01, 0x00, 0x00, 0xA6, 0x01, 0x00, 0x00, 0xB3, 0x01, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00 .byte 0xCC, 0x01, 0x00, 0x00, 0xD9, 0x01, 0x00, 0x00 - .global ov10_022C4DEC -ov10_022C4DEC: + .global DEFENSIVE_STAT_STAGE_MULTIPLIERS +DEFENSIVE_STAT_STAGE_MULTIPLIERS: .byte 0x07, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 .byte 0x19, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00 .byte 0x4C, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00 @@ -9876,8 +9876,8 @@ ov10_022C4DEC: .byte 0xC0, 0x5D, 0x32, 0x02, 0x0E, 0x01, 0x00, 0x00, 0xF4, 0x7A, 0x32, 0x02, 0x59, 0x01, 0x00, 0x00 .byte 0xF4, 0x7A, 0x32, 0x02, 0xE6, 0x01, 0x00, 0x00, 0xC0, 0x5D, 0x32, 0x02, 0xF5, 0x01, 0x00, 0x00 .byte 0x00, 0x90, 0x32, 0x02 - .global ov10_022C4EB8 -ov10_022C4EB8: + .global APPLES_AND_BERRIES_ITEM_IDS +APPLES_AND_BERRIES_ITEM_IDS: .byte 0x45, 0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x49, 0x00, 0x4A, 0x00 .byte 0x4B, 0x00, 0x4C, 0x00, 0x4D, 0x00, 0x4E, 0x00, 0x4F, 0x00, 0x50, 0x00, 0x51, 0x00, 0x52, 0x00 .byte 0x53, 0x00, 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 0x00, 0x58, 0x00, 0x59, 0x00, 0x5A, 0x00 @@ -9913,8 +9913,8 @@ ov10_022C4FC4: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 - .global ov10_022C5064 -ov10_022C5064: + .global RECRUITMENT_LEVEL_BOOST_TABLE +RECRUITMENT_LEVEL_BOOST_TABLE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -9928,8 +9928,8 @@ ov10_022C5064: .byte 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00 .byte 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00 .byte 0x7D, 0x00, 0x7D, 0x00, 0x7D, 0x00, 0xF5, 0x00, 0xF5, 0x00, 0x00, 0x00 - .global ov10_022C5130 -ov10_022C5130: + .global NATURAL_GIFT_ITEM_TABLE +NATURAL_GIFT_ITEM_TABLE: .byte 0x45, 0x00, 0x04, 0x00 .byte 0x01, 0x00, 0x46, 0x00, 0x08, 0x00, 0x01, 0x00, 0x47, 0x00, 0x0B, 0x00, 0x03, 0x00, 0x48, 0x00 .byte 0x0E, 0x00, 0x02, 0x00, 0x49, 0x00, 0x09, 0x00, 0x01, 0x00, 0x4A, 0x00, 0x10, 0x00, 0x02, 0x00 @@ -9944,8 +9944,8 @@ ov10_022C5130: .byte 0x0E, 0x00, 0x02, 0x00, 0x69, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x6A, 0x00, 0x06, 0x00, 0x02, 0x00 .byte 0x6B, 0x00, 0x08, 0x00, 0x02, 0x00, 0x75, 0x00, 0x08, 0x00, 0x05, 0x00, 0x76, 0x00, 0x11, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov10_022C51FC -ov10_022C51FC: + .global RANDOM_MUSIC_ID_TABLE +RANDOM_MUSIC_ID_TABLE: .byte 0x24, 0x00, 0x3B, 0x00, 0x1D, 0x00, 0x3A, 0x00 .byte 0x2E, 0x00, 0x1A, 0x00, 0x37, 0x00, 0x15, 0x00, 0x2F, 0x00, 0x16, 0x00, 0x36, 0x00, 0x2A, 0x00 .byte 0x22, 0x00, 0x24, 0x00, 0x23, 0x00, 0x1E, 0x00, 0x35, 0x00, 0x3A, 0x00, 0x17, 0x00, 0x28, 0x00 @@ -9962,8 +9962,8 @@ ov10_022C51FC: .byte 0x29, 0x00, 0x2E, 0x00, 0x16, 0x00, 0x1F, 0x00, 0x23, 0x00, 0x24, 0x00, 0x1D, 0x00, 0x5E, 0x00 .byte 0x3E, 0x00, 0x3F, 0x00, 0x28, 0x00, 0x2A, 0x00, 0x1A, 0x00, 0x18, 0x00, 0x16, 0x00, 0x91, 0x00 .byte 0x1E, 0x00, 0x1F, 0x00, 0x8F, 0x00, 0x90, 0x00 - .global ov10_022C52EC -ov10_022C52EC: + .global SHOP_ITEM_CHANCES +SHOP_ITEM_CHANCES: .byte 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00 .byte 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00 .byte 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00 @@ -10004,8 +10004,8 @@ ov10_022C52EC: .byte 0xCC, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00 .byte 0x66, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00 .byte 0x33, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00 - .global ov10_022C555C -ov10_022C555C: + .global MUSIC_ID_TABLE +MUSIC_ID_TABLE: .byte 0xE7, 0x03, 0x15, 0x00, 0x16, 0x00, 0x17, 0x00 .byte 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x1E, 0x00, 0x1F, 0x00 .byte 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00, 0x25, 0x00, 0x26, 0x00, 0x27, 0x00 @@ -10028,8 +10028,8 @@ ov10_022C555C: .byte 0x12, 0x00, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x8A, 0x00 .byte 0x12, 0x00, 0x0B, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x10, 0x00, 0xA5, 0x00, 0xA5, 0x00 .byte 0x0F, 0x00, 0x0F, 0x00, 0x0F, 0x00, 0x12, 0x00, 0x46, 0x00, 0x13, 0x00 - .global ov10_022C56B0 -ov10_022C56B0: + .global TYPE_MATCHUP_TABLE +TYPE_MATCHUP_TABLE: .byte 0x02, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00 @@ -10072,8 +10072,8 @@ ov10_022C56B0: .byte 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x02, 0x00 .byte 0x02, 0x00, 0x01, 0x00 - .global ov10_022C5938 -ov10_022C5938: + .global FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE +FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE: .byte 0x0A, 0x00, 0x64, 0x00 .global ov10_022C593C ov10_022C593C: @@ -10152,8 +10152,8 @@ ov10_022C593C: .byte 0x32, 0x32, 0xFF, 0x00, 0x37, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x41, 0x3C, 0x32, 0x32, 0xFF, 0x00 .byte 0x1E, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x78, 0x78, 0x78, 0x78, 0xFF, 0x00, 0x37, 0x00, 0xC8, 0x00 .byte 0x00, 0x00, 0x41, 0x3C, 0x32, 0x32, 0xFF, 0x00 - .global ov10_022C5DDC -ov10_022C5DDC: + .global METRONOME_TABLE +METRONOME_TABLE: .byte 0x01, 0x00, 0x00, 0x00 .global ov10_022C5DE0 ov10_022C5DE0: @@ -10242,8 +10242,8 @@ ov10_022C5DE0: .byte 0x13, 0x02, 0x00, 0x00, 0x00, 0xE4, 0x32, 0x02, 0x15, 0x02, 0x00, 0x00, 0xA0, 0xE4, 0x32, 0x02 .byte 0x16, 0x02, 0x00, 0x00, 0x60, 0xE5, 0x32, 0x02, 0x1B, 0x02, 0x00, 0x00, 0xC0, 0x5D, 0x32, 0x02 .byte 0x1D, 0x02, 0x00, 0x00, 0x08, 0x7C, 0x32, 0x02 - .global ov10_022C631C -ov10_022C631C: + .global TILESET_PROPERTIES +TILESET_PROPERTIES: .byte 0x01, 0x00, 0x00, 0x00 .global ov10_022C6320 ov10_022C6320: @@ -10409,8 +10409,8 @@ ov10_022C6327: .byte 0x00, 0x02, 0x04, 0x00, 0x0E, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x00 .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x07, 0x0D, 0x00, 0x07, 0x00, 0x00, 0x00 - .global ov10_022C6C70 -ov10_022C6C70: + .global FIXED_ROOM_PROPERTIES_TABLE +FIXED_ROOM_PROPERTIES_TABLE: .byte 0x00, 0x00, 0x00, 0x00 .global ov10_022C6C74 ov10_022C6C74: diff --git a/asm/overlay_29_022E9618.s b/asm/overlay_29_022E9618.s index 5b9e879a..f0d2e51a 100644 --- a/asm/overlay_29_022E9618.s +++ b/asm/overlay_29_022E9618.s @@ -299,36 +299,36 @@ _022E99EC: .word ov29_02353538 FindClosestUnoccupiedTileWithin2: ; 0x022E99F0 stmdb sp!, {r3, lr} str r2, [sp] - ldr r2, _022E9A08 ; =ov29_02351844 + ldr r2, _022E9A08 ; =DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST mov r3, #0x19 bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 -_022E9A08: .word ov29_02351844 +_022E9A08: .word DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST arm_func_end FindClosestUnoccupiedTileWithin2 arm_func_start FindFarthestUnoccupiedTileWithin2 FindFarthestUnoccupiedTileWithin2: ; 0x022E9A0C stmdb sp!, {r3, lr} str r2, [sp] - ldr r2, _022E9A24 ; =ov29_023517DC + ldr r2, _022E9A24 ; =DISPLACEMENTS_WITHIN_2_LARGEST_FIRST mov r3, #0x19 bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 -_022E9A24: .word ov29_023517DC +_022E9A24: .word DISPLACEMENTS_WITHIN_2_LARGEST_FIRST arm_func_end FindFarthestUnoccupiedTileWithin2 arm_func_start FindUnoccupiedTileWithin3 FindUnoccupiedTileWithin3: ; 0x022E9A28 stmdb sp!, {r3, lr} str r2, [sp] - ldr r2, _022E9A40 ; =ov29_023518AC + ldr r2, _022E9A40 ; =DISPLACEMENTS_WITHIN_3 mov r3, #0x31 bl FindNearbyUnoccupiedTile ldmia sp!, {r3, pc} .align 2, 0 -_022E9A40: .word ov29_023518AC +_022E9A40: .word DISPLACEMENTS_WITHIN_3 arm_func_end FindUnoccupiedTileWithin3 arm_func_start TickStatusTurnCounter diff --git a/asm/overlay_29_022EAB50.s b/asm/overlay_29_022EAB50.s index db4f6de3..db2942ac 100644 --- a/asm/overlay_29_022EAB50.s +++ b/asm/overlay_29_022EAB50.s @@ -164,7 +164,7 @@ MusicTableIdxToMusicId: ; 0x022EAD00 stmdb sp!, {r4, lr} mov r1, #0xaa bl __divsi3 - ldr r0, _022EAD5C ; =ov10_022C555C + ldr r0, _022EAD5C ; =MUSIC_ID_TABLE mov r1, r1, lsl #1 ldrh r4, [r0, r1] tst r4, #0x8000 @@ -178,16 +178,16 @@ MusicTableIdxToMusicId: ; 0x022EAD00 ldr r1, _022EAD60 ; =0x00007FFF mov r0, r0, lsl #0x10 and r1, r4, r1 - ldr r3, _022EAD64 ; =ov10_022C51FC + ldr r3, _022EAD64 ; =RANDOM_MUSIC_ID_TABLE mov r1, r1, lsl #0x10 mov r2, r0, asr #0xf add r0, r3, r1, lsr #13 ldrh r0, [r2, r0] ldmia sp!, {r4, pc} .align 2, 0 -_022EAD5C: .word ov10_022C555C +_022EAD5C: .word MUSIC_ID_TABLE _022EAD60: .word 0x00007FFF -_022EAD64: .word ov10_022C51FC +_022EAD64: .word RANDOM_MUSIC_ID_TABLE arm_func_end MusicTableIdxToMusicId arm_func_start ov29_022EAD68 @@ -215,7 +215,7 @@ _022EADAC: ldr r0, _022EAE0C ; =ov29_02353538 mov r1, #0xc ldr r0, [r0] - ldr r2, _022EAE10 ; =ov10_022C6C70 + ldr r2, _022EAE10 ; =FIXED_ROOM_PROPERTIES_TABLE add r0, r0, #0x4000 ldrb r3, [r0, #0xda] smulbb r1, r3, r1 @@ -239,7 +239,7 @@ _022EAE00: .align 2, 0 _022EAE08: .word 0x00001410 _022EAE0C: .word ov29_02353538 -_022EAE10: .word ov10_022C6C70 +_022EAE10: .word FIXED_ROOM_PROPERTIES_TABLE arm_func_end ov29_022EAD68 arm_func_start ChangeDungeonMusic @@ -881,13 +881,13 @@ GetItemAction: ; 0x022EB5D8 moveq r0, #0x35 ldmeqia sp!, {r3, pc} bl GetItemCategoryVeneer - ldr r1, _022EB608 ; =ov29_02352010 + ldr r1, _022EB608 ; =ITEM_CATEGORY_ACTIONS mov r0, r0, lsl #1 ldrh r0, [r1, r0] ldmia sp!, {r3, pc} .align 2, 0 _022EB604: .word 0x0000016B -_022EB608: .word ov29_02352010 +_022EB608: .word ITEM_CATEGORY_ACTIONS arm_func_end GetItemAction arm_func_start RemoveUsedItem @@ -1539,7 +1539,7 @@ _022EBD80: strb r1, [r6, #0x14e] bl CalcSpeedStageWrapper ldr r1, _022EC2FC ; =ov29_02353538 - ldr r3, _022EC300 ; =ov29_02352284 + ldr r3, _022EC300 ; =FRACTIONAL_TURN_SEQUENCE ldr r2, [r1] mov r1, #0x32 add r2, r2, #0x700 @@ -1730,7 +1730,7 @@ _022EC094: mov sb, #0 mov r5, sb mov r7, sb - ldr r6, _022EC300 ; =ov29_02352284 + ldr r6, _022EC300 ; =FRACTIONAL_TURN_SEQUENCE mov fp, #0x32 ldr r4, _022EC2FC ; =ov29_02353538 b _022EC1C0 @@ -1893,7 +1893,7 @@ _022EC2F4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022EC2FC: .word ov29_02353538 -_022EC300: .word ov29_02352284 +_022EC300: .word FRACTIONAL_TURN_SEQUENCE _022EC304: .word ov29_023522B6 arm_func_end RunFractionalTurn @@ -1910,7 +1910,7 @@ RunLeaderTurn: ; 0x022EC308 mov r0, r4 bl CalcSpeedStageWrapper ldr r1, _022EC600 ; =ov29_02353538 - ldr r3, _022EC604 ; =ov29_02352284 + ldr r3, _022EC604 ; =FRACTIONAL_TURN_SEQUENCE ldr r2, [r1] mov r1, #0x32 add r2, r2, #0x700 @@ -2100,5 +2100,5 @@ _022EC5DC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _022EC600: .word ov29_02353538 -_022EC604: .word ov29_02352284 +_022EC604: .word FRACTIONAL_TURN_SEQUENCE arm_func_end RunLeaderTurn diff --git a/asm/overlay_29_022EE36C.s b/asm/overlay_29_022EE36C.s index 91a694f6..81fd936b 100644 --- a/asm/overlay_29_022EE36C.s +++ b/asm/overlay_29_022EE36C.s @@ -16,7 +16,7 @@ ApplyMudTrapEffect: ; 0x022EE36C mov ip, #1 mov r3, #3 bge _022EE3B8 - ldr r0, _022EE42C ; =ov29_02352AEC + ldr r0, _022EE42C ; =ATK_STAT_IDX str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -27,7 +27,7 @@ ApplyMudTrapEffect: ; 0x022EE36C _022EE3B8: cmp r0, #0x32 bge _022EE3E0 - ldr r0, _022EE430 ; =ov29_02352AE8 + ldr r0, _022EE430 ; =SPATK_STAT_IDX str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -38,7 +38,7 @@ _022EE3B8: _022EE3E0: cmp r0, #0x4b bge _022EE408 - ldr r0, _022EE42C ; =ov29_02352AEC + ldr r0, _022EE42C ; =ATK_STAT_IDX str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -47,7 +47,7 @@ _022EE3E0: bl LowerDefensiveStat b _022EE424 _022EE408: - ldr r0, _022EE430 ; =ov29_02352AE8 + ldr r0, _022EE430 ; =SPATK_STAT_IDX str ip, [sp] ldr r2, [r0] mov r0, r5 @@ -58,8 +58,8 @@ _022EE424: add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022EE42C: .word ov29_02352AEC -_022EE430: .word ov29_02352AE8 +_022EE42C: .word ATK_STAT_IDX +_022EE430: .word SPATK_STAT_IDX arm_func_end ApplyMudTrapEffect arm_func_start ApplyStickyTrapEffect @@ -773,7 +773,7 @@ _022EEDC4: ldrsh r2, [r1, r4] ldrsh r3, [r5, #6] mov r4, #1 - ldr r1, _022EEE4C ; =ov29_02351844 + ldr r1, _022EEE4C ; =DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST add r2, r3, r2 strh r2, [sp, #0xe] str r4, [sp] @@ -790,7 +790,7 @@ _022EEE38: _022EEE40: .word 0x0000130F _022EEE44: .word DIRECTIONS_XY _022EEE48: .word ov29_0235171E -_022EEE4C: .word ov29_02351844 +_022EEE4C: .word DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST arm_func_end ApplyTripTrapEffect arm_func_start ApplyStealthRockTrapEffect @@ -1122,7 +1122,7 @@ _022EF2A4: _022EF2C4: cmp r5, #0 beq _022EF454 - ldr r1, _022EF460 ; =ov10_022C4720 + ldr r1, _022EF460 ; =SLEEP_TURN_RANGE mov r0, r5 mov r2, #1 bl CalcStatusDuration @@ -1240,7 +1240,7 @@ _022EF454: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022EF460: .word ov10_022C4720 +_022EF460: .word SLEEP_TURN_RANGE _022EF464: .word 0x00000251 _022EF468: .word ov10_022C45C8 _022EF46C: .word 0x00000252 diff --git a/asm/overlay_29_022F7388.s b/asm/overlay_29_022F7388.s index 03bf4489..0cd6791c 100644 --- a/asm/overlay_29_022F7388.s +++ b/asm/overlay_29_022F7388.s @@ -2174,7 +2174,7 @@ SetMonsterTypeAndAbility: ; 0x022F9194 bl GetApparentWeather mov r1, #6 mul r2, r0, r1 - ldr r1, _022F9234 ; =ov10_022C4C6C + ldr r1, _022F9234 ; =CASTFORM_WEATHER_ATTRIBUTE_TABLE mov r0, #0 ldrb r1, [r1, r2] strb r1, [r4, #0x5e] @@ -2208,7 +2208,7 @@ _022F9200: strb r1, [r0, #0xe] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_022F9234: .word ov10_022C4C6C +_022F9234: .word CASTFORM_WEATHER_ATTRIBUTE_TABLE _022F9238: .word ov29_02353538 arm_func_end SetMonsterTypeAndAbility @@ -2502,7 +2502,7 @@ _022F95FC: bne _022F9658 mov r0, sb bl GetApparentWeather - ldr r1, _022F96C4 ; =ov10_022C48DC + ldr r1, _022F96C4 ; =WEATHER_BALL_TYPE_TABLE ldrb r4, [r1, r0] _022F9658: cmp r4, #0 @@ -2533,7 +2533,7 @@ _022F9658: .align 2, 0 _022F96BC: .word ov29_02353538 _022F96C0: .word 0x00000C18 -_022F96C4: .word ov10_022C48DC +_022F96C4: .word WEATHER_BALL_TYPE_TABLE _022F96C8: .word 0x00000C19 arm_func_end TryActivateTraceAndColorChange @@ -3062,7 +3062,7 @@ _022F9D50: mov r0, r1 strh r4, [r3] strh r0, [r3, #2] - ldr r1, _022F9E94 ; =ov29_02352768 + ldr r1, _022F9E94 ; =BELLY_DRAIN_IN_WALLS_INT ldr r0, [r3] ldrh r2, [r1] strh r4, [sp, #8] @@ -3135,7 +3135,7 @@ _022F9E80: _022F9E88: .word ov29_02353538 _022F9E8C: .word SECONDARY_TERRAIN_TYPES _022F9E90: .word 0x00000115 -_022F9E94: .word ov29_02352768 +_022F9E94: .word BELLY_DRAIN_IN_WALLS_INT _022F9E98: .word 0x00000C1A _022F9E9C: .word 0x00000C1B arm_func_end ov29_022F9C74 @@ -5590,7 +5590,7 @@ InitOtherMonsterData: ; 0x022FBE58 strb r6, [ip, #0x100] ldrsh r5, [ip, #0x12] ldrsh r3, [ip, #0x16] - ldr r7, _022FBF04 ; =ov10_022C5938 + ldr r7, _022FBF04 ; =FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE mov r0, #0xc add r5, r5, r3 smlabb r3, r1, r0, r7 @@ -5627,7 +5627,7 @@ InitOtherMonsterData: ; 0x022FBE58 bl ov29_022FB83C ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022FBF04: .word ov10_022C5938 +_022FBF04: .word FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE arm_func_end InitOtherMonsterData arm_func_start ov29_022FBF08 diff --git a/asm/overlay_29_022FC9C0.s b/asm/overlay_29_022FC9C0.s index f7768bf3..b1914413 100644 --- a/asm/overlay_29_022FC9C0.s +++ b/asm/overlay_29_022FC9C0.s @@ -1472,7 +1472,7 @@ _022FDEA0: bl GetApparentWeather mov r1, #6 mul r2, r0, r1 - ldr r1, _022FDF9C ; =ov10_022C4C6C + ldr r1, _022FDF9C ; =CASTFORM_WEATHER_ATTRIBUTE_TABLE mov r0, #0 ldrb r1, [r1, r2] strb r1, [sl, #0x5e] @@ -1512,7 +1512,7 @@ _022FDF48: bl ov29_02307DC0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_022FDF9C: .word ov10_022C4C6C +_022FDF9C: .word CASTFORM_WEATHER_ATTRIBUTE_TABLE _022FDFA0: .word ov29_02353538 arm_func_end SubInitMonster diff --git a/asm/overlay_29_02307F1C.s b/asm/overlay_29_02307F1C.s index 0a64e448..b0c264eb 100644 --- a/asm/overlay_29_02307F1C.s +++ b/asm/overlay_29_02307F1C.s @@ -152,7 +152,7 @@ _0230811C: blt _023080B4 _02308124: ldr r0, _02308274 ; =ov10_022C4560 - ldr r1, _02308278 ; =ov10_022C4660 + ldr r1, _02308278 ; =MONSTER_HOUSE_MAX_MONSTER_SPAWNS ldrsh r0, [r0] ldrsh r1, [r1] bl DungeonRandRange @@ -248,5 +248,5 @@ _02308268: .align 2, 0 _02308270: .word ov29_02353538 _02308274: .word ov10_022C4560 -_02308278: .word ov10_022C4660 +_02308278: .word MONSTER_HOUSE_MAX_MONSTER_SPAWNS arm_func_end TryTriggerMonsterHouse diff --git a/asm/overlay_29_02308FE0.s b/asm/overlay_29_02308FE0.s index e7428395..c14aa8c9 100644 --- a/asm/overlay_29_02308FE0.s +++ b/asm/overlay_29_02308FE0.s @@ -52,7 +52,7 @@ _0230905C: cmpeq r0, #3 ldreqb r0, [r6, #0xf] cmpeq r0, #0 - ldreq r0, _02309F98 ; =ov10_022C4598 + ldreq r0, _02309F98 ; =SET_DAMAGE_STATUS_DAMAGE ldreqsh r0, [r0] streq r0, [r6] ldr r0, [r8] @@ -274,7 +274,7 @@ _02309398: mov r0, #0 b _0230A918 _023093D8: - ldr sl, _02309FAC ; =ov29_023528A4 + ldr sl, _02309FAC ; =TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS b _0230944C _023093E0: ldrb r0, [r6, #0xc] @@ -521,7 +521,7 @@ _02309740: ldr r1, [r6, #4] ldr r2, [r4, #0xb8] cmp r1, #0x1b - ldrlt r0, _02309FD8 ; =ov29_02353330 + ldrlt r0, _02309FD8 ; =DAMAGE_STRING_IDS movge sl, #0 movlt r1, r1, lsl #1 ldrlth sl, [r0, r1] @@ -1092,12 +1092,12 @@ _02309F44: ldr r6, _02309FFC ; =ov29_02353538 b _0230A090 .align 2, 0 -_02309F98: .word ov10_022C4598 +_02309F98: .word SET_DAMAGE_STATUS_DAMAGE _02309F9C: .word 0x00000C46 _02309FA0: .word 0x0000024D _02309FA4: .word 0x0000270F _02309FA8: .word 0x00000C41 -_02309FAC: .word ov29_023528A4 +_02309FAC: .word TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS _02309FB0: .word ov10_022C45C4 _02309FB4: .word 0x00000C42 _02309FB8: .word 0x00000C43 @@ -1108,7 +1108,7 @@ _02309FC8: .word ov29_023535D4 _02309FCC: .word 0x000002B6 _02309FD0: .word 0x00000C48 _02309FD4: .word 0x000003E7 -_02309FD8: .word ov29_02353330 +_02309FD8: .word DAMAGE_STRING_IDS _02309FDC: .word 0x0000025F _02309FE0: .word 0x00000C49 _02309FE4: .word 0x00000C4A @@ -1829,7 +1829,7 @@ AftermathCheck: ; 0x0230AA0C bl DefenderAbilityIsActive__0230A940 cmp r0, #0 beq _0230AA78 - ldr r0, _0230AA84 ; =ov10_022C4594 + ldr r0, _0230AA84 ; =AFTERMATH_CHANCE ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -1852,7 +1852,7 @@ _0230AA7C: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0230AA84: .word ov10_022C4594 +_0230AA84: .word AFTERMATH_CHANCE _0230AA88: .word 0x0000026F arm_func_end AftermathCheck @@ -1904,7 +1904,7 @@ _0230AB18: cmp r6, #2 blt _0230AAC8 ldrsh r2, [sp] - ldr r0, _0230AB54 ; =ov10_022C4D14 + ldr r0, _0230AB54 ; =TYPE_MATCHUP_COMBINATOR_TABLE ldrsh r1, [sp, #2] add r0, r0, r2, lsl #4 ldr r0, [r0, r1, lsl #2] @@ -1912,7 +1912,7 @@ _0230AB18: .align 2, 0 _0230AB4C: .word ov29_02352838 _0230AB50: .word ov29_02353538 -_0230AB54: .word ov10_022C4D14 +_0230AB54: .word TYPE_MATCHUP_COMBINATOR_TABLE arm_func_end GetTypeMatchupBothTypes arm_func_start ScrappyShouldActivate @@ -2040,7 +2040,7 @@ _0230ACCC: movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} _0230ACE0: - ldr r1, _0230AD00 ; =ov10_022C56B0 + ldr r1, _0230AD00 ; =TYPE_MATCHUP_TABLE mov r0, #0x24 mla r0, r5, r0, r1 add r1, r4, r6 @@ -2049,7 +2049,7 @@ _0230ACE0: ldrsh r0, [r1, r0] ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0230AD00: .word ov10_022C56B0 +_0230AD00: .word TYPE_MATCHUP_TABLE arm_func_end GetTypeMatchup arm_func_start CalcTypeBasedDamageEffects @@ -2100,30 +2100,30 @@ CalcTypeBasedDamageEffects: ; 0x0230AD04 mov r2, r8 str r3, [r7, #8] bl ScrappyShouldActivate - ldr r3, _0230B778 ; =ov10_022C4820 + ldr r3, _0230B778 ; =MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER str r0, [sp, #0x28] ldr r0, [r3] - ldr r2, _0230B77C ; =ov10_022C4824 + ldr r2, _0230B77C ; =MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER str r0, [sp, #0x24] ldr r0, [r2] - ldr r1, _0230B780 ; =ov10_022C482C + ldr r1, _0230B780 ; =MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER str r0, [sp, #0x20] ldr r0, [r1] - ldr r1, _0230B784 ; =ov10_022C4758 + ldr r1, _0230B784 ; =MATCHUP_IMMUNE_MULTIPLIER str r0, [sp, #0x1c] - ldr r0, _0230B788 ; =ov10_022C474C + ldr r0, _0230B788 ; =MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER mov r4, #0 ldr r0, [r0] str r0, [sp, #0x18] ldr r0, [r1] - ldr r1, _0230B78C ; =ov10_022C481C + ldr r1, _0230B78C ; =MATCHUP_NEUTRAL_MULTIPLIER str r0, [sp, #0x14] - ldr r0, _0230B790 ; =ov10_022C4810 + ldr r0, _0230B790 ; =MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER ldr r0, [r0] str r0, [sp, #0x10] ldr r0, [r1] str r0, [sp, #0xc] - ldr r0, _0230B794 ; =ov10_022C4818 + ldr r0, _0230B794 ; =MATCHUP_SUPER_EFFECTIVE_MULTIPLIER ldr r0, [r0] str r0, [sp, #8] b _0230AF8C @@ -2231,7 +2231,7 @@ _0230AF94: ldr r0, _0230B798 ; =ov29_02353538 ldr r4, [sp, #0x34] ldr r2, [r0] - ldr r1, _0230B79C ; =ov10_022C4D14 + ldr r1, _0230B79C ; =TYPE_MATCHUP_COMBINATOR_TABLE strb r4, [r2, #0x18c] ldr r3, [sp, #0x38] ldr r2, [r0] @@ -2259,7 +2259,7 @@ _0230AFEC: ldr r0, [r7, #8] cmp r0, #1 bne _0230B02C - ldr r1, _0230B7A0 ; =ov10_022C47C0 + ldr r1, _0230B7A0 ; =TINTED_LENS_MULTIPLIER add r0, sp, #0x3c ldr r1, [r1] bl FixedPoint32To64 @@ -2286,7 +2286,7 @@ _0230B064: ldr r0, [r7, #8] cmp r0, #3 bne _0230B080 - ldr r2, _0230B7A4 ; =ov29_02352864 + ldr r2, _0230B7A4 ; =SOLID_ROCK_MULTIPLIER mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2296,7 +2296,7 @@ _0230B080: bl ExclusiveItemEffectIsActive__0230A9B8 cmp r0, #0 beq _0230B0A4 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2309,12 +2309,12 @@ _0230B0A4: bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B104 - ldr r0, _0230B7AC ; =ov10_022C455C + ldr r0, _0230B7AC ; =TECHNICIAN_MOVE_POWER_THRESHOLD ldrsh r1, [r0] ldr r0, [sp, #4] cmp r0, r1 bgt _0230B104 - ldr r2, _0230B7B0 ; =ov29_02352844 + ldr r2, _0230B7B0 ; =DAMAGE_MULTIPLIER_1_5 mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2337,7 +2337,7 @@ _0230B104: cmp r0, #0 beq _0230B14C ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2375,7 +2375,7 @@ _0230B198: cmp r0, #0 beq _0230B1DC ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2441,7 +2441,7 @@ _0230B248: cmp r7, #0 beq _0230B2D4 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2486,7 +2486,7 @@ _0230B2F4: cmp r7, #0 beq _0230B380 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2531,7 +2531,7 @@ _0230B3A0: cmp r7, #0 beq _0230B42C ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2576,7 +2576,7 @@ _0230B44C: cmp r7, #0 beq _0230B4D8 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2601,7 +2601,7 @@ _0230B4F8: cmp r0, #0 beq _0230B534 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7B0 ; =ov29_02352844 + ldr r2, _0230B7B0 ; =DAMAGE_MULTIPLIER_1_5 ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2612,7 +2612,7 @@ _0230B534: ldrb r0, [r6, #0xbf] cmp r0, #1 bne _0230B560 - ldr r1, _0230B7CC ; =ov10_022C4744 + ldr r1, _0230B7CC ; =BURN_DAMAGE_MULTIPLIER add r0, sp, #0x3c ldr r1, [r1] bl FixedPoint32To64 @@ -2639,13 +2639,13 @@ _0230B560: bl AbilityIsActiveVeneer cmp r0, #0 beq _0230B5BC - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 mov r0, fp mov r1, fp bl MultiplyFixedPoint64 b _0230B5CC _0230B5BC: - ldr r2, _0230B7B0 ; =ov29_02352844 + ldr r2, _0230B7B0 ; =DAMAGE_MULTIPLIER_1_5 mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2658,7 +2658,7 @@ _0230B5CC: cmp r8, #2 bne _0230B60C ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7B0 ; =ov29_02352844 + ldr r2, _0230B7B0 ; =DAMAGE_MULTIPLIER_1_5 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2670,7 +2670,7 @@ _0230B60C: cmp r8, #3 bne _0230B634 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2683,7 +2683,7 @@ _0230B634: cmp r8, #2 bne _0230B668 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2695,7 +2695,7 @@ _0230B668: cmp r8, #3 bne _0230B690 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7B0 ; =ov29_02352844 + ldr r2, _0230B7B0 ; =DAMAGE_MULTIPLIER_1_5 ldr r3, [r0] mov r7, #1 mov r0, fp @@ -2707,7 +2707,7 @@ _0230B690: bne _0230B6C0 cmp r8, #1 beq _0230B6C0 - ldr r2, _0230B7D0 ; =ov29_0235285C + ldr r2, _0230B7D0 ; =CLOUDY_DAMAGE_MULTIPLIER mov r0, fp mov r1, fp bl MultiplyFixedPoint64 @@ -2727,7 +2727,7 @@ _0230B6C0: _0230B6E0: cmp r8, #5 bne _0230B700 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 mov r3, #1 mov r0, fp mov r1, fp @@ -2742,7 +2742,7 @@ _0230B700: beq _0230B738 cmp r8, #2 bne _0230B738 - ldr r2, _0230B7A8 ; =ov29_0235283C + ldr r2, _0230B7A8 ; =DAMAGE_MULTIPLIER_0_5 mov r3, #1 mov r0, fp mov r1, fp @@ -2754,7 +2754,7 @@ _0230B738: cmpeq r0, #0xb bne _0230B768 ldr r0, _0230B798 ; =ov29_02353538 - ldr r2, _0230B7BC ; =ov29_0235284C + ldr r2, _0230B7BC ; =DAMAGE_MULTIPLIER_2 ldr r3, [r0] mov r5, #1 mov r0, fp @@ -2768,29 +2768,29 @@ _0230B76C: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0230B774: .word ov29_02352838 -_0230B778: .word ov10_022C4820 -_0230B77C: .word ov10_022C4824 -_0230B780: .word ov10_022C482C -_0230B784: .word ov10_022C4758 -_0230B788: .word ov10_022C474C -_0230B78C: .word ov10_022C481C -_0230B790: .word ov10_022C4810 -_0230B794: .word ov10_022C4818 +_0230B778: .word MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER +_0230B77C: .word MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +_0230B780: .word MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER +_0230B784: .word MATCHUP_IMMUNE_MULTIPLIER +_0230B788: .word MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER +_0230B78C: .word MATCHUP_NEUTRAL_MULTIPLIER +_0230B790: .word MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER +_0230B794: .word MATCHUP_SUPER_EFFECTIVE_MULTIPLIER _0230B798: .word ov29_02353538 -_0230B79C: .word ov10_022C4D14 -_0230B7A0: .word ov10_022C47C0 -_0230B7A4: .word ov29_02352864 -_0230B7A8: .word ov29_0235283C -_0230B7AC: .word ov10_022C455C -_0230B7B0: .word ov29_02352844 +_0230B79C: .word TYPE_MATCHUP_COMBINATOR_TABLE +_0230B7A0: .word TINTED_LENS_MULTIPLIER +_0230B7A4: .word SOLID_ROCK_MULTIPLIER +_0230B7A8: .word DAMAGE_MULTIPLIER_0_5 +_0230B7AC: .word TECHNICIAN_MOVE_POWER_THRESHOLD +_0230B7B0: .word DAMAGE_MULTIPLIER_1_5 _0230B7B4: .word 0x00000C3E _0230B7B8: .word 0x000003E7 -_0230B7BC: .word ov29_0235284C +_0230B7BC: .word DAMAGE_MULTIPLIER_2 _0230B7C0: .word 0x00000C4F _0230B7C4: .word 0x00000C51 _0230B7C8: .word 0x00000C52 -_0230B7CC: .word ov10_022C4744 -_0230B7D0: .word ov29_0235285C +_0230B7CC: .word BURN_DAMAGE_MULTIPLIER +_0230B7D0: .word CLOUDY_DAMAGE_MULTIPLIER arm_func_end CalcTypeBasedDamageEffects arm_func_start ov29_0230B7D4 @@ -3089,7 +3089,7 @@ CalcDamage: ; 0x0230BBAC ldrb r0, [r6, #0x221] cmp r0, #0 beq _0230BC1C - ldr r1, _0230C454 ; =ov10_022C4710 + ldr r1, _0230C454 ; =ME_FIRST_MULTIPLIER ldr r0, [sp, #0x1c] ldr r1, [r1] bl MultiplyByFixedPoint @@ -3513,7 +3513,7 @@ _0230C23C: movlt r0, #0 strlt r0, [sp, #0x44] ldr r0, [sp, #0x44] - ldr r2, _0230C470 ; =ov10_022C4D98 + ldr r2, _0230C470 ; =OFFENSIVE_STAT_STAGE_MULTIPLIERS cmp r0, #0x14 movgt r0, #0x14 strgt r0, [sp, #0x44] @@ -3541,7 +3541,7 @@ _0230C23C: strb r4, [r5, #0xb] add r0, r7, #0x1c ldrb r2, [r0, r1] - ldr r1, _0230C474 ; =ov10_022C4DEC + ldr r1, _0230C474 ; =DEFENSIVE_STAT_STAGE_MULTIPLIERS strh r2, [r5, #0xe] ldr r2, [sp, #0x18] ldr r1, [r1, r4, lsl #2] @@ -3648,15 +3648,15 @@ _0230C41C: b _0230C5E0 .align 2, 0 _0230C450: .word ov29_02353538 -_0230C454: .word ov10_022C4710 +_0230C454: .word ME_FIRST_MULTIPLIER _0230C458: .word 0x000001D3 _0230C45C: .word 0x00000163 _0230C460: .word 0x000001A3 _0230C464: .word 0x000001A5 _0230C468: .word 0x00000211 _0230C46C: .word 0x000001BD -_0230C470: .word ov10_022C4D98 -_0230C474: .word ov10_022C4DEC +_0230C470: .word OFFENSIVE_STAT_STAGE_MULTIPLIERS +_0230C474: .word DEFENSIVE_STAT_STAGE_MULTIPLIERS _0230C478: .word POWER_BAND_STAT_BOOST _0230C47C: .word MUNCH_BELT_STAT_BOOST _0230C480: .word AURA_BOW_STAT_BOOST @@ -3667,20 +3667,20 @@ _0230C490: .word 0x00000C53 _0230C494: .word 0x00000C54 _0230C498: .word 0x00000C55 _0230C49C: .word 0x000003E7 -_0230C4A0: .word _020A18D8 +_0230C4A0: .word DAMAGE_FORMULA_FLV_DEFICIT_DIVISOR _0230C4A4: .word ov29_02352984 _0230C4A8: .word ov29_02352990 _0230C4AC: .word ov29_0235299C -_0230C4B0: .word _020A18F4 -_0230C4B4: .word _020A18F0 -_0230C4B8: .word _020A18CC -_0230C4BC: .word _020A18F8 -_0230C4C0: .word _020A18EC -_0230C4C4: .word _020A18D4 -_0230C4C8: .word _020A18E8 -_0230C4CC: .word ov29_0235286C +_0230C4B0: .word DAMAGE_FORMULA_AT_PREFACTOR +_0230C4B4: .word DAMAGE_FORMULA_DEF_PREFACTOR +_0230C4B8: .word DAMAGE_FORMULA_FLV_SHIFT +_0230C4BC: .word DAMAGE_FORMULA_LN_ARG_PREFACTOR +_0230C4C0: .word DAMAGE_FORMULA_LN_PREFACTOR +_0230C4C4: .word DAMAGE_FORMULA_CONSTANT_SHIFT +_0230C4C8: .word DAMAGE_FORMULA_NON_TEAM_MEMBER_MODIFIER +_0230C4CC: .word DAMAGE_FORMULA_MAX_BASE _0230C4D0: .word ov29_02352838 -_0230C4D4: .word ov29_0235287C +_0230C4D4: .word DAMAGE_FORMULA_MIN_BASE _0230C4D8: ldr r0, [sp, #0xf8] cmp r0, #0 @@ -4004,7 +4004,7 @@ _0230C940: add r0, sp, #0x88 sub r1, r2, r1 bl IntToFixedPoint64 - ldr r1, _0230C4A0 ; =_020A18D8 + ldr r1, _0230C4A0 ; =DAMAGE_FORMULA_FLV_DEFICIT_DIVISOR add r0, sp, #0x80 ldr r1, [r1] bl FixedPoint32To64 @@ -4049,7 +4049,7 @@ _0230C940: mov r1, r0 ldr r0, _0230C4AC ; =ov29_0235299C bl DebugPrint0 - ldr r1, _0230C4B0 ; =_020A18F4 + ldr r1, _0230C4B0 ; =DAMAGE_FORMULA_AT_PREFACTOR add r0, sp, #0x70 ldr r1, [r1] bl FixedPoint32To64 @@ -4057,7 +4057,7 @@ _0230C940: add r1, sp, #0xa0 mov r2, r0 bl MultiplyFixedPoint64 - ldr r1, _0230C4B4 ; =_020A18F0 + ldr r1, _0230C4B4 ; =DAMAGE_FORMULA_DEF_PREFACTOR add r0, sp, #0x68 ldr r1, [r1] bl FixedPoint32To64 @@ -4065,7 +4065,7 @@ _0230C940: add r1, sp, #0x98 mov r2, r0 bl MultiplyFixedPoint64 - ldr r1, _0230C4B8 ; =_020A18CC + ldr r1, _0230C4B8 ; =DAMAGE_FORMULA_FLV_SHIFT add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4073,7 +4073,7 @@ _0230C940: add r1, sp, #0xa8 add r2, sp, #0x78 bl AddFixedPoint64 - ldr r1, _0230C4BC ; =_020A18F8 + ldr r1, _0230C4BC ; =DAMAGE_FORMULA_LN_ARG_PREFACTOR add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4086,7 +4086,7 @@ _0230C940: mov r1, r0 add r0, sp, #0x60 bl ClampedLn - ldr r1, _0230C4C0 ; =_020A18EC + ldr r1, _0230C4C0 ; =DAMAGE_FORMULA_LN_PREFACTOR add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4102,7 +4102,7 @@ _0230C940: add r2, sp, #0x60 mov r1, r0 bl AddFixedPoint64 - ldr r1, _0230C4C4 ; =_020A18D4 + ldr r1, _0230C4C4 ; =DAMAGE_FORMULA_CONSTANT_SHIFT add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4116,7 +4116,7 @@ _0230C940: ldrb r0, [r6, #6] cmp r0, #0 beq _0230CB78 - ldr r1, _0230C4C8 ; =_020A18E8 + ldr r1, _0230C4C8 ; =DAMAGE_FORMULA_NON_TEAM_MEMBER_MODIFIER add r0, sp, #0x78 ldr r1, [r1] bl FixedPoint32To64 @@ -4125,7 +4125,7 @@ _0230C940: mov r1, r0 bl DivideFixedPoint64 _0230CB78: - ldr r0, _0230C4CC ; =ov29_0235286C + ldr r0, _0230C4CC ; =DAMAGE_FORMULA_MAX_BASE add r1, sp, #0xb0 bl FixedPoint64CmpLt cmp r0, #0 @@ -4134,7 +4134,7 @@ _0230CB78: ldrne r0, [r0, #0x34] strne r1, [sp, #0xb4] strne r0, [sp, #0xb0] - ldr r1, _0230C4D4 ; =ov29_0235287C + ldr r1, _0230C4D4 ; =DAMAGE_FORMULA_MIN_BASE add r0, sp, #0xb0 bl FixedPoint64CmpLt cmp r0, #0 @@ -4218,7 +4218,7 @@ _0230CCD0: mov r0, sb bl PlayEffectAnimation0x171 add r0, sp, #0xb8 - ldr r2, _0230D064 ; =ov29_0235283C + ldr r2, _0230D064 ; =DAMAGE_MULTIPLIER_0_5 mov r1, r0 bl MultiplyFixedPoint64 mov r0, #1 @@ -4239,7 +4239,7 @@ _0230CD1C: mov r0, sb bl PlayEffectAnimation0x171Full add r0, sp, #0xb8 - ldr r2, _0230D064 ; =ov29_0235283C + ldr r2, _0230D064 ; =DAMAGE_MULTIPLIER_0_5 mov r1, r0 bl MultiplyFixedPoint64 mov r0, #1 @@ -4291,7 +4291,7 @@ _0230CD3C: cmp r0, #0 beq _0230CE04 _0230CDF0: - ldr r0, _0230D068 ; =ov10_022C46F0 + ldr r0, _0230D068 ; =SCOPE_LENS_CRIT_RATE_BOOST mov r1, #1 ldrsh r0, [r0] strb r1, [r5, #0x38] @@ -4301,7 +4301,7 @@ _0230CE04: mov r1, #0x58 bl AbilityIsActiveVeneer cmp r0, #0 - ldrne r0, _0230D06C ; =ov10_022C4510 + ldrne r0, _0230D06C ; =SUPER_LUCK_CRIT_RATE_BOOST movne r1, #1 ldrnesh r0, [r0] strneb r1, [r5, #0x49] @@ -4310,7 +4310,7 @@ _0230CE04: mov r0, sb bl ItemIsActive__0230A9DC cmp r0, #0 - ldrne r0, _0230D068 ; =ov10_022C46F0 + ldrne r0, _0230D068 ; =SCOPE_LENS_CRIT_RATE_BOOST movne r1, #1 ldrnesh r0, [r0] strneb r1, [r5, #0x39] @@ -4321,7 +4321,7 @@ _0230CE04: mov r1, #1 bl IqSkillIsEnabled cmp r0, #0 - ldrne r0, _0230D070 ; =ov10_022C45E0 + ldrne r0, _0230D070 ; =TYPE_ADVANTAGE_MASTER_CRIT_RATE movne r1, #1 ldrnesh r4, [r0] strneb r1, [r5, #0x3d] @@ -4347,14 +4347,14 @@ _0230CE74: cmp r0, #0 add r0, sp, #0xb8 beq _0230CEE0 - ldr r2, _0230D074 ; =ov29_0235284C + ldr r2, _0230D074 ; =DAMAGE_MULTIPLIER_2 mov r1, r0 bl MultiplyFixedPoint64 mov r0, #1 strb r0, [r5, #0x4a] b _0230CEEC _0230CEE0: - ldr r2, _0230D078 ; =ov29_02352844 + ldr r2, _0230D078 ; =DAMAGE_MULTIPLIER_1_5 mov r1, r0 bl MultiplyFixedPoint64 _0230CEEC: @@ -4420,7 +4420,7 @@ _0230CFBC: bl IqSkillIsEnabled cmp r0, #0 beq _0230CFFC - ldr r0, _0230D080 ; =ov10_022C47F8 + ldr r0, _0230D080 ; =POWER_PITCHER_DAMAGE_MULTIPLIER ldr r2, [r8] ldr r1, [r0] mov r0, r2, lsl #8 @@ -4440,7 +4440,7 @@ ov29_0230D000: ; 0x0230D000 bl ExclusiveItemEffectIsActive__0230A9B8 cmp r0, #0 beq _0230D038 - ldr r0, _0230D084 ; =ov10_022C4844 + ldr r0, _0230D084 ; =AIR_BLADE_DAMAGE_MULTIPLIER ldr r2, [r8] ldr r1, [r0] mov r0, r2, lsl #8 @@ -4461,15 +4461,15 @@ _0230D054: .align 2, 0 _0230D05C: .word 0x00000C58 _0230D060: .word 0x00000C57 -_0230D064: .word ov29_0235283C -_0230D068: .word ov10_022C46F0 -_0230D06C: .word ov10_022C4510 -_0230D070: .word ov10_022C45E0 -_0230D074: .word ov29_0235284C -_0230D078: .word ov29_02352844 +_0230D064: .word DAMAGE_MULTIPLIER_0_5 +_0230D068: .word SCOPE_LENS_CRIT_RATE_BOOST +_0230D06C: .word SUPER_LUCK_CRIT_RATE_BOOST +_0230D070: .word TYPE_ADVANTAGE_MASTER_CRIT_RATE +_0230D074: .word DAMAGE_MULTIPLIER_2 +_0230D078: .word DAMAGE_MULTIPLIER_1_5 _0230D07C: .word 0x00000195 -_0230D080: .word ov10_022C47F8 -_0230D084: .word ov10_022C4844 +_0230D080: .word POWER_PITCHER_DAMAGE_MULTIPLIER +_0230D084: .word AIR_BLADE_DAMAGE_MULTIPLIER arm_func_end ov29_0230D000 arm_func_start ov29_0230D088 @@ -4644,7 +4644,7 @@ _0230D298: cmp r0, #0 beq _0230D2F8 ldr r2, [sp, #0x10] - ldr r0, _0230D39C ; =ov10_022C4D14 + ldr r0, _0230D39C ; =TYPE_MATCHUP_COMBINATOR_TABLE ldr r1, [sp, #0x14] add r0, r0, r2, lsl #4 ldr r0, [r0, r1, lsl #2] @@ -4661,7 +4661,7 @@ _0230D2F8: bl IqSkillIsEnabled cmp r0, #0 beq _0230D334 - ldr r1, _0230D3A4 ; =ov10_022C47F8 + ldr r1, _0230D3A4 ; =POWER_PITCHER_DAMAGE_MULTIPLIER mov r0, r8 ldr r1, [r1] bl MultiplyByFixedPoint @@ -4694,9 +4694,9 @@ _0230D334: add sp, sp, #0x2c ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_0230D39C: .word ov10_022C4D14 +_0230D39C: .word TYPE_MATCHUP_COMBINATOR_TABLE _0230D3A0: .word 0x00000256 -_0230D3A4: .word ov10_022C47F8 +_0230D3A4: .word POWER_PITCHER_DAMAGE_MULTIPLIER arm_func_end CalcDamageFixed arm_func_start CalcDamageFixedNoCategory @@ -5627,7 +5627,7 @@ _0230DFD4: ldrnesh r0, [r0] mov r1, r1, lsl #1 addne r6, r6, r0 - ldr r0, _0230E060 ; =ov10_022C5064 + ldr r0, _0230E060 ; =RECRUITMENT_LEVEL_BOOST_TABLE ldrsh r0, [r0, r1] add r0, r6, r0 cmp r4, r0 @@ -5654,7 +5654,7 @@ _0230E050: .word ov10_022C4708 _0230E054: .word ov10_022C4704 _0230E058: .word ov10_022C4700 _0230E05C: .word ov10_022C46FC -_0230E060: .word ov10_022C5064 +_0230E060: .word RECRUITMENT_LEVEL_BOOST_TABLE arm_func_end RecruitCheck arm_func_start TryRecruit @@ -6123,14 +6123,14 @@ TrySpawnMonsterAndTickSpawnCounter: ; 0x0230E6BC ldrb r1, [r7, #0x790] cmp r1, #0 bne _0230E710 - ldr r1, _0230E8DC ; =ov10_022C44DC + ldr r1, _0230E8DC ; =SPAWN_COOLDOWN ldrsh r2, [r0, #0x82] ldrsh r0, [r1] cmp r2, r0 bge _0230E724 b _0230E8D0 _0230E710: - ldr r1, _0230E8E0 ; =ov10_022C4640 + ldr r1, _0230E8E0 ; =SPAWN_COOLDOWN_THIEF_ALERT ldrsh r2, [r0, #0x82] ldrsh r0, [r1] cmp r2, r0 @@ -6188,13 +6188,13 @@ _0230E7B8: ldrb r0, [r0, #0xc9] cmp r0, #0xff bne _0230E7FC - ldr r0, _0230E8E4 ; =ov10_022C4430 + ldr r0, _0230E8E4 ; =SPAWN_CAP_NO_MONSTER_HOUSE ldrsh r0, [r0] cmp r5, r0 blt _0230E80C b _0230E8D0 _0230E7FC: - ldr r0, _0230E8E8 ; =ov10_022C46A4 + ldr r0, _0230E8E8 ; =SPAWN_CAP_WITH_MONSTER_HOUSE ldrsh r0, [r0] cmp r5, r0 bge _0230E8D0 @@ -6256,9 +6256,9 @@ _0230E8D0: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _0230E8D8: .word ov29_02353538 -_0230E8DC: .word ov10_022C44DC -_0230E8E0: .word ov10_022C4640 -_0230E8E4: .word ov10_022C4430 -_0230E8E8: .word ov10_022C46A4 +_0230E8DC: .word SPAWN_COOLDOWN +_0230E8E0: .word SPAWN_COOLDOWN_THIEF_ALERT +_0230E8E4: .word SPAWN_CAP_NO_MONSTER_HOUSE +_0230E8E8: .word SPAWN_CAP_WITH_MONSTER_HOUSE _0230E8EC: .word 0x00000C5D arm_func_end TrySpawnMonsterAndTickSpawnCounter diff --git a/asm/overlay_29_0230F02C.s b/asm/overlay_29_0230F02C.s index 2f1cc3fd..8b5779d9 100644 --- a/asm/overlay_29_0230F02C.s +++ b/asm/overlay_29_0230F02C.s @@ -1460,7 +1460,7 @@ _02310474: cmp r0, #0 beq _023104C0 ldrb r1, [r4, #0x11f] - ldr r0, _02310AA8 ; =ov10_022C466C + ldr r0, _02310AA8 ; =SPEED_BOOST_TURNS add r2, r1, #1 ldrsh r0, [r0] and r1, r2, #0xff @@ -1508,13 +1508,13 @@ _023104F8: bl IsFloorOver cmp r0, #0 bne _02310FF4 - ldr r1, _02310AAC ; =ov10_022C4610 + ldr r1, _02310AAC ; =BURN_DAMAGE_COOLDOWN mov r0, r5 ldrsh r2, [r1] mov r1, r5 strb r2, [r4, #0xc1] bl ov29_02307BDC - ldr r0, _02310AB0 ; =ov10_022C44D4 + ldr r0, _02310AB0 ; =BURN_DAMAGE mov r2, #1 ldrsh r1, [r0] mov r0, r5 @@ -1671,7 +1671,7 @@ _02310754: ldreqb r0, [r4, #0xbf] cmpeq r0, #2 bne _02310FF4 - ldr r1, _02310AC0 ; =ov10_022C46A8 + ldr r1, _02310AC0 ; =POISON_DAMAGE_COOLDOWN mov r0, r5 ldrsh r2, [r1] mov r1, r5 @@ -1682,7 +1682,7 @@ _02310754: bl AbilityIsActiveVeneer cmp r0, #0 beq _023107F8 - ldr r0, _02310AC4 ; =ov10_022C44D8 + ldr r0, _02310AC4 ; =POISON_DAMAGE mov r6, #1 ldrsh r2, [r0] mov r0, r5 @@ -1692,7 +1692,7 @@ _02310754: bl TryIncreaseHp b _02310810 _023107F8: - ldr r0, _02310AC4 ; =ov10_022C44D8 + ldr r0, _02310AC4 ; =POISON_DAMAGE mov r2, #3 ldrsh r1, [r0] mov r0, r5 @@ -1721,7 +1721,7 @@ _02310830: cmp r6, #0x1d addlo r0, r6, #1 strlob r0, [r4, #0xc2] - ldr r0, _02310AC8 ; =ov10_022C4414 + ldr r0, _02310AC8 ; =BAD_POISON_DAMAGE_COOLDOWN cmp r6, #0x1d ldrsh r0, [r0] movge r6, #0x1d @@ -1747,7 +1747,7 @@ _02310830: bl AbilityIsActiveVeneer cmp r0, #0 beq _023108F4 - ldr r0, _02310ACC ; =ov10_022C4C9C + ldr r0, _02310ACC ; =BAD_POISON_DAMAGE_TABLE mov r1, r6, lsl #1 ldrsh r2, [r0, r1] mov r6, #1 @@ -1758,7 +1758,7 @@ _02310830: bl TryIncreaseHp b _02310910 _023108F4: - ldr r0, _02310ACC ; =ov10_022C4C9C + ldr r0, _02310ACC ; =BAD_POISON_DAMAGE_TABLE mov r1, r6, lsl #1 ldrsh r1, [r0, r1] mov r2, #3 @@ -1873,16 +1873,16 @@ _02310A98: .word 0x00000DBD _02310A9C: .word ov10_022C46EC _02310AA0: .word 0x0000025F _02310AA4: .word ov10_022C46A0 -_02310AA8: .word ov10_022C466C -_02310AAC: .word ov10_022C4610 -_02310AB0: .word ov10_022C44D4 +_02310AA8: .word SPEED_BOOST_TURNS +_02310AAC: .word BURN_DAMAGE_COOLDOWN +_02310AB0: .word BURN_DAMAGE _02310AB4: .word 0x000003E7 _02310AB8: .word ov10_022C4664 _02310ABC: .word ov10_022C464C -_02310AC0: .word ov10_022C46A8 -_02310AC4: .word ov10_022C44D8 -_02310AC8: .word ov10_022C4414 -_02310ACC: .word ov10_022C4C9C +_02310AC0: .word POISON_DAMAGE_COOLDOWN +_02310AC4: .word POISON_DAMAGE +_02310AC8: .word BAD_POISON_DAMAGE_COOLDOWN +_02310ACC: .word BAD_POISON_DAMAGE_TABLE _02310AD0: .word ov10_022C4454 _02310AD4: .word ov10_022C446C _02310AD8: .word ov10_022C45F0 @@ -1891,8 +1891,8 @@ _02310AE0: .word 0x0000024A _02310AE4: .word ov10_022C45E8 _02310AE8: .word ov10_022C4590 _02310AEC: .word ov10_022C44BC -_02310AF0: .word ov10_022C46AC -_02310AF4: .word ov10_022C4588 +_02310AF0: .word LEECH_SEED_DAMAGE_COOLDOWN +_02310AF4: .word LEECH_SEED_HP_DRAIN _02310AF8: cmp r0, #5 bne _02310B6C @@ -1994,12 +1994,12 @@ _02310C28: ldr r0, _02310A84 ; =ov29_02353538 ldrb r2, [r4, #0xe8] ldr r0, [r0] - ldr r1, _02310AF0 ; =ov10_022C46AC + ldr r1, _02310AF0 ; =LEECH_SEED_DAMAGE_COOLDOWN add r0, r0, r2, lsl #2 add r0, r0, #0x12000 ldr r7, [r0, #0xb78] ldrsh r1, [r1] - ldr r0, _02310AF4 ; =ov10_022C4588 + ldr r0, _02310AF4 ; =LEECH_SEED_HP_DRAIN cmp r7, #0 ldrsh r6, [r0] strb r1, [r4, #0xea] diff --git a/asm/overlay_29_02319FB0.s b/asm/overlay_29_02319FB0.s index 0ac4b77a..5c7289e3 100644 --- a/asm/overlay_29_02319FB0.s +++ b/asm/overlay_29_02319FB0.s @@ -1103,7 +1103,7 @@ GetEntityNaturalGiftInfo: ; 0x0231AE90 cmpne r0, #0 beq _0231AF00 mov ip, #0 - ldr r3, _0231AF08 ; =ov10_022C5130 + ldr r3, _0231AF08 ; =NATURAL_GIFT_ITEM_TABLE mov lr, ip mov r1, #6 _0231AEC0: @@ -1121,25 +1121,25 @@ _0231AEC0: b _0231AEC0 _0231AEF0: cmp ip, #0 - ldrne r0, _0231AF08 ; =ov10_022C5130 + ldrne r0, _0231AF08 ; =NATURAL_GIFT_ITEM_TABLE addne r0, r0, r5 ldmneia sp!, {r3, r4, r5, pc} _0231AF00: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0231AF08: .word ov10_022C5130 +_0231AF08: .word NATURAL_GIFT_ITEM_TABLE arm_func_end GetEntityNaturalGiftInfo arm_func_start GetEntityWeatherBallType GetEntityWeatherBallType: ; 0x0231AF0C stmdb sp!, {r3, lr} bl GetApparentWeather - ldr r1, _0231AF20 ; =ov10_022C48DC + ldr r1, _0231AF20 ; =WEATHER_BALL_TYPE_TABLE ldrb r0, [r1, r0] ldmia sp!, {r3, pc} .align 2, 0 -_0231AF20: .word ov10_022C48DC +_0231AF20: .word WEATHER_BALL_TYPE_TABLE arm_func_end GetEntityWeatherBallType arm_func_start ov29_0231AF24 diff --git a/asm/overlay_29_0231B1B8.s b/asm/overlay_29_0231B1B8.s index 0c0c04a5..e46a75cf 100644 --- a/asm/overlay_29_0231B1B8.s +++ b/asm/overlay_29_0231B1B8.s @@ -912,7 +912,7 @@ _0231BE50: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x52 bl InitMove - ldr r0, _0231C704 ; =ov10_022C4624 + ldr r0, _0231C704 ; =STICK_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -927,7 +927,7 @@ _0231BE88: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x4a bl InitMove - ldr r0, _0231C708 ; =ov10_022C46E8 + ldr r0, _0231C708 ; =IRON_THORN_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -942,7 +942,7 @@ _0231BEC0: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x42 bl InitMove - ldr r0, _0231C70C ; =ov10_022C46E4 + ldr r0, _0231C70C ; =SILVER_SPIKE_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -957,7 +957,7 @@ _0231BEF8: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x3a bl InitMove - ldr r0, _0231C710 ; =ov10_022C46E0 + ldr r0, _0231C710 ; =GOLD_FANG_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -972,7 +972,7 @@ _0231BF30: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x32 bl InitMove - ldr r0, _0231C714 ; =ov10_022C46DC + ldr r0, _0231C714 ; =CACNEA_SPIKE_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -987,7 +987,7 @@ _0231BF68: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x2a bl InitMove - ldr r0, _0231C718 ; =ov10_022C46D8 + ldr r0, _0231C718 ; =CORSOLA_TWIG_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -1001,7 +1001,7 @@ _0231BF68: _0231BFA0: mov r4, #0 str r4, [sp] - ldr r0, _0231C71C ; =ov10_022C46B4 + ldr r0, _0231C71C ; =GEO_PEBBLE_DAMAGE ldr r1, _0231C720 ; =0x0000024F str r4, [sp, #4] str r1, [sp, #8] @@ -1017,7 +1017,7 @@ _0231BFA0: _0231BFDC: mov r4, #0 str r4, [sp] - ldr r0, _0231C724 ; =ov10_022C46B8 + ldr r0, _0231C724 ; =GRAVELEROCK_DAMAGE ldr r1, _0231C720 ; =0x0000024F str r4, [sp, #4] str r1, [sp, #8] @@ -1034,7 +1034,7 @@ _0231C018: ldr r1, _0231C700 ; =0x00000195 add r0, sp, #0x22 bl InitMove - ldr r0, _0231C728 ; =ov10_022C44D0 + ldr r0, _0231C728 ; =GOLD_THORN_POWER mov r4, #0x100 ldrsh r3, [r0] str r4, [sp] @@ -1048,7 +1048,7 @@ _0231C018: _0231C050: mov r4, #0 str r4, [sp] - ldr r0, _0231C72C ; =ov10_022C46BC + ldr r0, _0231C72C ; =RARE_FOSSIL_DAMAGE ldr r1, _0231C720 ; =0x0000024F str r4, [sp, #4] str r1, [sp, #8] @@ -1069,8 +1069,8 @@ _0231C08C: bl EndNegativeStatusConditionWrapper b _0231CB14 _0231C0A4: - ldr r1, _0231C730 ; =ov10_022C45EC - ldr r0, _0231C734 ; =ov10_022C44F4 + ldr r1, _0231C730 ; =ORAN_BERRY_HP_RESTORATION + ldr r0, _0231C734 ; =ORAN_BERRY_FULL_HP_BOOST ldrsh r2, [r1] ldrsh r3, [r0] mov r4, #1 @@ -1080,8 +1080,8 @@ _0231C0A4: bl TryIncreaseHp b _0231CB14 _0231C0CC: - ldr r1, _0231C738 ; =ov10_022C4478 - ldr r0, _0231C73C ; =ov10_022C45F4 + ldr r1, _0231C738 ; =SITRUS_BERRY_HP_RESTORATION + ldr r0, _0231C73C ; =SITRUS_BERRY_FULL_HP_BOOST ldrsh r2, [r1] ldrsh r3, [r0] mov r4, #1 @@ -1091,7 +1091,7 @@ _0231C0CC: bl TryIncreaseHp b _0231CB14 _0231C0F4: - ldr r0, _0231C740 ; =ov10_022C44F8 + ldr r0, _0231C740 ; =LIFE_SEED_HP_BOOST mov r4, #1 ldrsh r3, [r0] mov r0, r8 @@ -1150,7 +1150,7 @@ _0231C1A4: bl TryWarp b _0231CB14 _0231C1BC: - ldr r1, _0231C744 ; =ov10_022C4720 + ldr r1, _0231C744 ; =SLEEP_TURN_RANGE mov r0, r7 mov r2, #1 bl CalcStatusDuration @@ -1219,28 +1219,28 @@ _0231C28C: bl RestoreAllMovePP b _0231CB14 _0231C2A4: - ldr r1, _0231C750 ; =ov10_022C4420 + ldr r1, _0231C750 ; =PROTEIN_STAT_BOOST mov r0, r8 ldrsh r2, [r1] mov r1, r7 bl ApplyProteinEffect b _0231CB14 _0231C2BC: - ldr r1, _0231C754 ; =ov10_022C46CC + ldr r1, _0231C754 ; =CALCIUM_STAT_BOOST mov r0, r8 ldrsh r2, [r1] mov r1, r7 bl ApplyCalciumEffect b _0231CB14 _0231C2D4: - ldr r1, _0231C758 ; =ov10_022C46C8 + ldr r1, _0231C758 ; =IRON_STAT_BOOST mov r0, r8 ldrsh r2, [r1] mov r1, r7 bl ApplyIronEffect b _0231CB14 _0231C2EC: - ldr r1, _0231C75C ; =ov10_022C46C4 + ldr r1, _0231C75C ; =ZINC_STAT_BOOST mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1538,29 +1538,29 @@ _0231C6F4: .word 0x000001A2 _0231C6F8: .word 0x000001A6 _0231C6FC: .word 0x000001AA _0231C700: .word 0x00000195 -_0231C704: .word ov10_022C4624 -_0231C708: .word ov10_022C46E8 -_0231C70C: .word ov10_022C46E4 -_0231C710: .word ov10_022C46E0 -_0231C714: .word ov10_022C46DC -_0231C718: .word ov10_022C46D8 -_0231C71C: .word ov10_022C46B4 +_0231C704: .word STICK_POWER +_0231C708: .word IRON_THORN_POWER +_0231C70C: .word SILVER_SPIKE_POWER +_0231C710: .word GOLD_FANG_POWER +_0231C714: .word CACNEA_SPIKE_POWER +_0231C718: .word CORSOLA_TWIG_POWER +_0231C71C: .word GEO_PEBBLE_DAMAGE _0231C720: .word 0x0000024F -_0231C724: .word ov10_022C46B8 -_0231C728: .word ov10_022C44D0 -_0231C72C: .word ov10_022C46BC -_0231C730: .word ov10_022C45EC -_0231C734: .word ov10_022C44F4 -_0231C738: .word ov10_022C4478 -_0231C73C: .word ov10_022C45F4 -_0231C740: .word ov10_022C44F8 -_0231C744: .word ov10_022C4720 +_0231C724: .word GRAVELEROCK_DAMAGE +_0231C728: .word GOLD_THORN_POWER +_0231C72C: .word RARE_FOSSIL_DAMAGE +_0231C730: .word ORAN_BERRY_HP_RESTORATION +_0231C734: .word ORAN_BERRY_FULL_HP_BOOST +_0231C738: .word SITRUS_BERRY_HP_RESTORATION +_0231C73C: .word SITRUS_BERRY_FULL_HP_BOOST +_0231C740: .word LIFE_SEED_HP_BOOST +_0231C744: .word SLEEP_TURN_RANGE _0231C748: .word 0x00000BE9 _0231C74C: .word 0x000003E7 -_0231C750: .word ov10_022C4420 -_0231C754: .word ov10_022C46CC -_0231C758: .word ov10_022C46C8 -_0231C75C: .word ov10_022C46C4 +_0231C750: .word PROTEIN_STAT_BOOST +_0231C754: .word CALCIUM_STAT_BOOST +_0231C758: .word IRON_STAT_BOOST +_0231C75C: .word ZINC_STAT_BOOST _0231C760: .word GUMMI_STAT_BOOST _0231C764: .word WONDER_GUMMI_STAT_BOOST _0231C768: @@ -1591,7 +1591,7 @@ _0231C7B0: _0231C7C0: mov r4, #0 str r4, [sp] - ldr r0, _0231CBB0 ; =ov10_022C4438 + ldr r0, _0231CBB0 ; =OREN_BERRY_DAMAGE str r4, [sp, #4] mov r1, #0x270 str r1, [sp, #8] @@ -1838,7 +1838,7 @@ _0231CB14: _0231CB48: cmp r0, #0 beq _0231CB9C - ldr r0, _0231CBC0 ; =ov10_022C4EB8 + ldr r0, _0231CBC0 ; =APPLES_AND_BERRIES_ITEM_IDS b _0231CB90 _0231CB58: cmp r4, r1 @@ -1868,10 +1868,10 @@ _0231CBA4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _0231CBAC: .word 0x00000C75 -_0231CBB0: .word ov10_022C4438 +_0231CBB0: .word OREN_BERRY_DAMAGE _0231CBB4: .word 0x00000C67 _0231CBB8: .word 0x00000C76 _0231CBBC: .word ov10_022C44EC -_0231CBC0: .word ov10_022C4EB8 +_0231CBC0: .word APPLES_AND_BERRIES_ITEM_IDS _0231CBC4: .word ov10_022C4864 arm_func_end ApplyItemEffect diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index 1c48eb17..6ffb95da 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -151,14 +151,14 @@ ApplyVileSeedEffect: ; 0x0231CD80 strh r2, [sp, #0xa] cmp r0, #0 strgth r0, [sp, #0xa] - ldr r0, _0231CE14 ; =ov29_02352AEC + ldr r0, _0231CE14 ; =ATK_STAT_IDX ldrsh r3, [sp, #8] ldr r2, [r0] mov r0, r5 mov r1, r4 str ip, [sp, #4] bl LowerDefensiveStat - ldr r0, _0231CE18 ; =ov29_02352AE8 + ldr r0, _0231CE18 ; =SPATK_STAT_IDX mov ip, #1 ldr r2, [r0] str ip, [sp] @@ -171,8 +171,8 @@ ApplyVileSeedEffect: ; 0x0231CD80 ldmia sp!, {r4, r5, pc} .align 2, 0 _0231CE10: .word ov29_023529AC -_0231CE14: .word ov29_02352AEC -_0231CE18: .word ov29_02352AE8 +_0231CE14: .word ATK_STAT_IDX +_0231CE18: .word SPATK_STAT_IDX arm_func_end ApplyVileSeedEffect arm_func_start ApplyViolentSeedEffect @@ -180,14 +180,14 @@ ApplyViolentSeedEffect: ; 0x0231CE1C stmdb sp!, {r4, r5, r6, lr} mov r5, r1 ldr r4, [r5, #0xb4] - ldr r2, _0231CE60 ; =ov29_02352AEC + ldr r2, _0231CE60 ; =ATK_STAT_IDX ldrsh r3, [r4, #0x24] ldr r2, [r2] mov r6, r0 rsb r3, r3, #0x14 bl BoostOffensiveStat ldrsh r3, [r4, #0x26] - ldr r1, _0231CE64 ; =ov29_02352AE8 + ldr r1, _0231CE64 ; =SPATK_STAT_IDX mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -195,8 +195,8 @@ ApplyViolentSeedEffect: ; 0x0231CE1C bl BoostOffensiveStat ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0231CE60: .word ov29_02352AEC -_0231CE64: .word ov29_02352AE8 +_0231CE60: .word ATK_STAT_IDX +_0231CE64: .word SPATK_STAT_IDX arm_func_end ApplyViolentSeedEffect arm_func_start ApplyGinsengEffect @@ -209,7 +209,7 @@ ApplyGinsengEffect: ; 0x0231CE68 mov r4, #0 mov r5, #1 bl DungeonRandInt - ldr r1, _0231CF78 ; =ov10_022C46C0 + ldr r1, _0231CF78 ; =GINSENG_CHANCE_3 mov ip, #0 ldrsh r1, [r1] add r3, r6, #0x124 @@ -275,7 +275,7 @@ _0231CF64: bl LogMessageByIdWithPopupCheckUserTarget ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0231CF78: .word ov10_022C46C0 +_0231CF78: .word GINSENG_CHANCE_3 _0231CF7C: .word 0x00000BEF _0231CF80: .word 0x00000BEE arm_func_end ApplyGinsengEffect @@ -404,7 +404,7 @@ _0231D108: cmp ip, r0 addgt fp, r4, ip addle fp, r4, r0 - ldr ip, _0231D474 ; =_020A2538 + ldr ip, _0231D474 ; =GUMMI_BELLY_RESTORE_TABLE mov r0, r2, lsl #1 add r2, ip, r1 add r1, ip, r6 @@ -471,7 +471,7 @@ _0231D214: movge fp, #2 movlt fp, #3 _0231D23C: - ldr r0, _0231D480 ; =ov29_023532D0 + ldr r0, _0231D480 ; =GUMMI_IQ_STRING_IDS mov r1, r5, lsl #1 ldrh r2, [r0, r1] mov r0, sl @@ -631,10 +631,10 @@ _0231D460: _0231D468: .word WONDER_GUMMI_IQ_GAIN _0231D46C: .word _020A1894 _0231D470: .word IQ_GUMMI_GAIN_TABLE -_0231D474: .word _020A2538 +_0231D474: .word GUMMI_BELLY_RESTORE_TABLE _0231D478: .word 0x000003E7 _0231D47C: .word 0x00000BF3 -_0231D480: .word ov29_023532D0 +_0231D480: .word GUMMI_IQ_STRING_IDS _0231D484: .word ov29_02353324 _0231D488: .word ov10_022C44CC _0231D48C: .word ov10_022C45E4 @@ -758,7 +758,7 @@ _0231D60C: bl TryInflictParalysisStatus b _0231D66C _0231D624: - ldr r0, _0231D678 ; =ov29_02352AEC + ldr r0, _0231D678 ; =ATK_STAT_IDX mov ip, #1 ldr r2, [r0] str ip, [sp] @@ -767,7 +767,7 @@ _0231D624: mov r3, #3 str ip, [sp, #4] bl LowerOffensiveStat - ldr r0, _0231D67C ; =ov29_02352AE8 + ldr r0, _0231D67C ; =SPATK_STAT_IDX mov ip, #1 str ip, [sp] ldr r2, [r0] @@ -781,8 +781,8 @@ _0231D66C: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0231D674: .word ov10_022C4680 -_0231D678: .word ov29_02352AEC -_0231D67C: .word ov29_02352AE8 +_0231D678: .word ATK_STAT_IDX +_0231D67C: .word SPATK_STAT_IDX arm_func_end ApplyGrimyFoodEffect arm_func_start ApplyMixElixirEffect @@ -2171,7 +2171,7 @@ _0231E9B0: cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _0231E9EC ; =ov10_022C4B74 + ldr r0, _0231E9EC ; =EAT_ITEM_EFFECT_IGNORE_LIST b _0231E9D8 _0231E9C8: cmp r4, r1 @@ -2185,7 +2185,7 @@ _0231E9D8: mov r0, #1 ldmia sp!, {r4, pc} .align 2, 0 -_0231E9EC: .word ov10_022C4B74 +_0231E9EC: .word EAT_ITEM_EFFECT_IGNORE_LIST arm_func_end ShouldTryEatItem arm_func_start GetMaxPpWrapper diff --git a/asm/overlay_29_0231F594.s b/asm/overlay_29_0231F594.s index 3392dd81..42909c79 100644 --- a/asm/overlay_29_0231F594.s +++ b/asm/overlay_29_0231F594.s @@ -233,7 +233,7 @@ _0231F8BC: ldrsh r1, [sl, #4] ldrsh r0, [sl, #6] mov r7, #0 - ldr r5, _0231FBF0 ; =ov29_02351844 + ldr r5, _0231FBF0 ; =DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST mov r8, r7 strh r1, [sp, #0x14] strh r0, [sp, #0x16] @@ -455,7 +455,7 @@ _0231FBDC: _0231FBE4: .word ov29_02353538 _0231FBE8: .word 0x000013BC _0231FBEC: .word 0x00000BCF -_0231FBF0: .word ov29_02351844 +_0231FBF0: .word DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST _0231FBF4: .word 0x00000222 _0231FBF8: .word 0x00000BD1 arm_func_end ov29_0231F6E4 diff --git a/asm/overlay_29_0232A3FC.s b/asm/overlay_29_0232A3FC.s index 196693be..58d70277 100644 --- a/asm/overlay_29_0232A3FC.s +++ b/asm/overlay_29_0232A3FC.s @@ -33,7 +33,7 @@ DoMoveRest: ; 0x0232A414 bl TryInflictNappingStatus b _0232A474 _0232A454: - ldr r1, _0232A47C ; =ov10_022C4748 + ldr r1, _0232A47C ; =REST_TURN_RANGE mov r0, r4 mov r2, #0 bl CalcStatusDuration @@ -45,7 +45,7 @@ _0232A474: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232A47C: .word ov10_022C4748 +_0232A47C: .word REST_TURN_RANGE arm_func_end DoMoveRest arm_func_start DoMoveIngrain @@ -121,7 +121,7 @@ DoMoveSuperpower: ; 0x0232A524 movne r4, #1 cmp r4, #0 beq _0232A59C - ldr r0, _0232A5A8 ; =ov29_02352AEC + ldr r0, _0232A5A8 ; =ATK_STAT_IDX mov ip, #0 ldr r2, [r0] str ip, [sp] @@ -145,7 +145,7 @@ _0232A59C: add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 -_0232A5A8: .word ov29_02352AEC +_0232A5A8: .word ATK_STAT_IDX arm_func_end DoMoveSuperpower arm_func_start DoMoveSteelWing @@ -162,7 +162,7 @@ DoMoveSteelWing: ; 0x0232A5AC bl DealDamage cmp r0, #0 beq _0232A628 - ldr r1, _0232A63C ; =ov10_022C44C4 + ldr r1, _0232A63C ; =STEEL_WING_BOOST_DEFENSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -188,7 +188,7 @@ _0232A628: add sp, sp, #0x10 bx lr .align 2, 0 -_0232A63C: .word ov10_022C44C4 +_0232A63C: .word STEEL_WING_BOOST_DEFENSE_CHANCE arm_func_end DoMoveSteelWing arm_func_start DoMoveSpitUp @@ -648,7 +648,7 @@ DoMoveBellyDrum: ; 0x0232AC54 bl CeilFixedPoint cmp r0, #1 ble _0232ACD8 - ldr r1, _0232AD00 ; =ov29_02352AEC + ldr r1, _0232AD00 ; =ATK_STAT_IDX mov r0, r7 ldr r2, [r1] mov r1, r6 @@ -679,7 +679,7 @@ _0232ACF8: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232AD00: .word ov29_02352AEC +_0232AD00: .word ATK_STAT_IDX _0232AD04: .word 0x00000EEB arm_func_end DoMoveBellyDrum @@ -703,7 +703,7 @@ DoMoveSecretPower: ; 0x0232AD18 bl DealDamage cmp r0, #0 beq _0232AED0 - ldr r1, _0232AEDC ; =ov10_022C454C + ldr r1, _0232AEDC ; =SECRET_POWER_EFFECT_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -741,7 +741,7 @@ _0232ADB4: bl TryInflictPoisonedStatus b _0232AED0 _0232ADCC: - ldr r1, _0232AEE8 ; =ov10_022C4720 + ldr r1, _0232AEE8 ; =SLEEP_TURN_RANGE mov r0, r5 mov r2, r4 bl CalcStatusDuration @@ -759,7 +759,7 @@ _0232ADF4: bl LowerSpeed b _0232AED0 _0232AE0C: - ldr r0, _0232AEEC ; =ov29_02352AEC + ldr r0, _0232AEEC ; =ATK_STAT_IDX mov r3, r4 ldr r2, [r0] mov r1, r5 @@ -770,7 +770,7 @@ _0232AE0C: bl LowerOffensiveStat b _0232AED0 _0232AE34: - ldr r0, _0232AEEC ; =ov29_02352AEC + ldr r0, _0232AEEC ; =ATK_STAT_IDX mov r3, r4 ldr r2, [r0] mov r1, r5 @@ -781,7 +781,7 @@ _0232AE34: bl LowerDefensiveStat b _0232AED0 _0232AE5C: - ldr r1, _0232AEEC ; =ov29_02352AEC + ldr r1, _0232AEEC ; =ATK_STAT_IDX mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -819,11 +819,11 @@ _0232AED0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232AEDC: .word ov10_022C454C +_0232AEDC: .word SECRET_POWER_EFFECT_CHANCE _0232AEE0: .word ov29_02353538 _0232AEE4: .word ov10_022C6321 -_0232AEE8: .word ov10_022C4720 -_0232AEEC: .word ov29_02352AEC +_0232AEE8: .word SLEEP_TURN_RANGE +_0232AEEC: .word ATK_STAT_IDX arm_func_end DoMoveSecretPower arm_func_start DoMoveDamageConfuse30 @@ -838,7 +838,7 @@ DoMoveDamageConfuse30: ; 0x0232AEF0 bl DealDamage cmp r0, #0 beq _0232AF4C - ldr r1, _0232AF58 ; =ov10_022C4548 + ldr r1, _0232AF58 ; =DIZZY_PUNCH_CONFUSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -856,13 +856,13 @@ _0232AF4C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232AF58: .word ov10_022C4548 +_0232AF58: .word DIZZY_PUNCH_CONFUSE_CHANCE arm_func_end DoMoveDamageConfuse30 arm_func_start DoMoveBulkUp DoMoveBulkUp: ; 0x0232AF5C stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232AF9C ; =ov29_02352AEC + ldr r2, _0232AF9C ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] mov r5, r0 @@ -878,7 +878,7 @@ DoMoveBulkUp: ; 0x0232AF5C mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232AF9C: .word ov29_02352AEC +_0232AF9C: .word ATK_STAT_IDX arm_func_end DoMoveBulkUp arm_func_start DoMovePause @@ -887,7 +887,7 @@ DoMovePause: ; 0x0232AFA0 sub sp, sp, #8 mov r4, r1 mov r5, r0 - ldr r1, _0232AFEC ; =ov10_022C471C + ldr r1, _0232AFEC ; =IMPRISON_TURN_RANGE mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -903,14 +903,14 @@ DoMovePause: ; 0x0232AFA0 add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232AFEC: .word ov10_022C471C +_0232AFEC: .word IMPRISON_TURN_RANGE arm_func_end DoMovePause arm_func_start DoMoveFeatherDance DoMoveFeatherDance: ; 0x0232AFF0 stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr r2, _0232B020 ; =ov29_02352AEC + ldr r2, _0232B020 ; =ATK_STAT_IDX mov ip, #1 ldr r2, [r2] str ip, [sp] @@ -921,7 +921,7 @@ DoMoveFeatherDance: ; 0x0232AFF0 add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_0232B020: .word ov29_02352AEC +_0232B020: .word ATK_STAT_IDX arm_func_end DoMoveFeatherDance arm_func_start DoMoveBeatUp @@ -1029,7 +1029,7 @@ DoMoveCrushClaw: ; 0x0232B164 bl DealDamage cmp r0, #0 beq _0232B1D0 - ldr r1, _0232B1DC ; =ov10_022C4608 + ldr r1, _0232B1DC ; =CRUSH_CLAW_LOWER_DEFENSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1037,7 +1037,7 @@ DoMoveCrushClaw: ; 0x0232B164 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232B1D0 - ldr r0, _0232B1E0 ; =ov29_02352AEC + ldr r0, _0232B1E0 ; =ATK_STAT_IDX mov r3, r4 ldr r2, [r0] mov r0, r6 @@ -1051,8 +1051,8 @@ _0232B1D0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232B1DC: .word ov10_022C4608 -_0232B1E0: .word ov29_02352AEC +_0232B1DC: .word CRUSH_CLAW_LOWER_DEFENSE_CHANCE +_0232B1E0: .word ATK_STAT_IDX arm_func_end DoMoveCrushClaw arm_func_start DoMoveBlazeKick @@ -1073,7 +1073,7 @@ DoMoveBlazeKick: ; 0x0232B1E4 bl DealDamage cmp r0, #0 beq _0232B25C - ldr r1, _0232B268 ; =ov10_022C4540 + ldr r1, _0232B268 ; =BLAZE_KICK_BURN_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1092,7 +1092,7 @@ _0232B25C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_0232B268: .word ov10_022C4540 +_0232B268: .word BLAZE_KICK_BURN_CHANCE arm_func_end DoMoveBlazeKick arm_func_start DoMovePresent @@ -1206,7 +1206,7 @@ DoMoveEruption: ; 0x0232B368 movle r2, #2 movgt r2, #3 _0232B3FC: - ldr r1, _0232B430 ; =ov10_022C49C4 + ldr r1, _0232B430 ; =ERUPTION_DAMAGE_MULT_TABLE mov r0, r7 ldr r3, [r1, r2, lsl #2] mov r1, r6 @@ -1220,7 +1220,7 @@ _0232B3FC: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0232B42C: .word 0x000003E7 -_0232B430: .word ov10_022C49C4 +_0232B430: .word ERUPTION_DAMAGE_MULT_TABLE arm_func_end DoMoveEruption arm_func_start DoMoveParalyze__0232B434 @@ -1269,7 +1269,7 @@ DoMovePoisonTail: ; 0x0232B494 bl DealDamage cmp r0, #0 beq _0232B4F0 - ldr r1, _0232B4FC ; =ov10_022C448C + ldr r1, _0232B4FC ; =POISON_TAIL_POISON_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1287,7 +1287,7 @@ _0232B4F0: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232B4FC: .word ov10_022C448C +_0232B4FC: .word POISON_TAIL_POISON_CHANCE arm_func_end DoMovePoisonTail arm_func_start DoMoveBlowback @@ -1353,14 +1353,14 @@ _0232B5C4: .word 0x00000EEE arm_func_start DoMoveTailGlow DoMoveTailGlow: ; 0x0232B5C8 stmdb sp!, {r3, lr} - ldr r2, _0232B5E4 ; =ov29_02352AE8 + ldr r2, _0232B5E4 ; =SPATK_STAT_IDX mov r3, #2 ldr r2, [r2] bl BoostOffensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232B5E4: .word ov29_02352AE8 +_0232B5E4: .word SPATK_STAT_IDX arm_func_end DoMoveTailGlow arm_func_start DoMoveDamageConstrict10 @@ -1397,7 +1397,7 @@ _0232B640: bl DealDamage cmp r0, #0 beq _0232B694 - ldr r1, _0232B6A0 ; =ov10_022C44A4 + ldr r1, _0232B6A0 ; =WHIRLPOOL_CONSTRICTION_CHANCE mov r0, r7 ldrsh r2, [r1] mov r1, r6 @@ -1415,7 +1415,7 @@ _0232B694: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0232B69C: .word 0x00000123 -_0232B6A0: .word ov10_022C44A4 +_0232B6A0: .word WHIRLPOOL_CONSTRICTION_CHANCE arm_func_end DoMoveDamageConstrict10 arm_func_start DoMovePerishSong @@ -1528,14 +1528,14 @@ DoMoveProtect: ; 0x0232B7D0 arm_func_start DoMoveDefenseCurl DoMoveDefenseCurl: ; 0x0232B7E0 stmdb sp!, {r3, lr} - ldr r2, _0232B7FC ; =ov29_02352AEC + ldr r2, _0232B7FC ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] bl BoostDefensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232B7FC: .word ov29_02352AEC +_0232B7FC: .word ATK_STAT_IDX arm_func_end DoMoveDefenseCurl arm_func_start DoMoveDecoy @@ -1562,7 +1562,7 @@ DoMoveMistBall: ; 0x0232B820 bl DealDamage cmp r0, #0 beq _0232B88C - ldr r1, _0232B898 ; =ov10_022C44E0 + ldr r1, _0232B898 ; =MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1570,7 +1570,7 @@ DoMoveMistBall: ; 0x0232B820 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232B88C - ldr r0, _0232B89C ; =ov29_02352AE8 + ldr r0, _0232B89C ; =SPATK_STAT_IDX mov r3, r4 ldr r2, [r0] mov r0, r6 @@ -1584,8 +1584,8 @@ _0232B88C: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232B898: .word ov10_022C44E0 -_0232B89C: .word ov29_02352AE8 +_0232B898: .word MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE +_0232B89C: .word SPATK_STAT_IDX arm_func_end DoMoveMistBall arm_func_start DoMoveDestinyBond @@ -1620,7 +1620,7 @@ DoMoveMirrorCoat: ; 0x0232B8D4 arm_func_start DoMoveCalmMind DoMoveCalmMind: ; 0x0232B8E4 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232B924 ; =ov29_02352AE8 + ldr r2, _0232B924 ; =SPATK_STAT_IDX mov r3, #1 ldr r2, [r2] mov r5, r0 @@ -1636,7 +1636,7 @@ DoMoveCalmMind: ; 0x0232B8E4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232B924: .word ov29_02352AE8 +_0232B924: .word SPATK_STAT_IDX arm_func_end DoMoveCalmMind arm_func_start DoMoveHiddenPower @@ -1662,7 +1662,7 @@ DoMoveMetalClaw: ; 0x0232B940 bl DealDamage cmp r0, #0 beq _0232B9B8 - ldr r1, _0232B9CC ; =ov10_022C4554 + ldr r1, _0232B9CC ; =METAL_CLAW_BOOST_ATTACK_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r6 @@ -1688,7 +1688,7 @@ _0232B9B8: add sp, sp, #0x10 bx lr .align 2, 0 -_0232B9CC: .word ov10_022C4554 +_0232B9CC: .word METAL_CLAW_BOOST_ATTACK_CHANCE arm_func_end DoMoveMetalClaw arm_func_start DoMoveAttract @@ -1890,7 +1890,7 @@ DoMoveMetronome: ; 0x0232BC64 ldr r2, _0232BCB8 ; =ov29_0237CA88 mov r5, r0 ldr r6, [r2] - ldr r0, _0232BCBC ; =ov10_022C5DDC + ldr r0, _0232BCBC ; =METRONOME_TABLE mov r2, r6, lsl #3 mov r4, r1 ldrh r1, [r0, r2] @@ -1908,7 +1908,7 @@ DoMoveMetronome: ; 0x0232BC64 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0232BCB8: .word ov29_0237CA88 -_0232BCBC: .word ov10_022C5DDC +_0232BCBC: .word METRONOME_TABLE _0232BCC0: .word ov10_022C5DE0 arm_func_end DoMoveMetronome @@ -2150,7 +2150,7 @@ DoMoveDragonRage: ; 0x0232BF88 mov r3, #1 str r3, [sp, #0x14] str r2, [sp, #0x18] - ldr r2, _0232C024 ; =ov10_022C46D4 + ldr r2, _0232C024 ; =DRAGON_RAGE_FIXED_DAMAGE mov r1, r8 ldrsh r2, [r2] mov r0, r4 @@ -2164,13 +2164,13 @@ DoMoveDragonRage: ; 0x0232BF88 add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_0232C024: .word ov10_022C46D4 +_0232C024: .word DRAGON_RAGE_FIXED_DAMAGE arm_func_end DoMoveDragonRage arm_func_start DoMoveDragonDance DoMoveDragonDance: ; 0x0232C028 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232C060 ; =ov29_02352AEC + ldr r2, _0232C060 ; =ATK_STAT_IDX mov r5, r0 ldr r2, [r2] mov r4, r1 @@ -2184,7 +2184,7 @@ DoMoveDragonDance: ; 0x0232C028 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232C060: .word ov29_02352AEC +_0232C060: .word ATK_STAT_IDX arm_func_end DoMoveDragonDance arm_func_start DoMoveSkullBash @@ -2198,7 +2198,7 @@ DoMoveSkullBash: ; 0x0232C064 bl IsChargingTwoTurnMove cmp r0, #0 beq _0232C0C0 - ldr r1, _0232C0EC ; =ov10_022C48BC + ldr r1, _0232C0EC ; =SKULL_BASH_DAMAGE_MULTIPLIER mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -2226,7 +2226,7 @@ _0232C0E4: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232C0EC: .word ov10_022C48BC +_0232C0EC: .word SKULL_BASH_DAMAGE_MULTIPLIER _0232C0F0: .word 0x00000CEB arm_func_end DoMoveSkullBash @@ -2254,7 +2254,7 @@ _0232C128: bl DealDamage cmp r0, #0 beq _0232C18C - ldr r1, _0232C19C ; =ov10_022C450C + ldr r1, _0232C19C ; =LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -2262,7 +2262,7 @@ _0232C128: bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232C18C - ldr r0, _0232C1A0 ; =ov29_02352AE8 + ldr r0, _0232C1A0 ; =SPATK_STAT_IDX mov r3, r6 ldr r2, [r0] mov r1, r4 @@ -2277,8 +2277,8 @@ _0232C18C: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _0232C198: .word 0x0000014F -_0232C19C: .word ov10_022C450C -_0232C1A0: .word ov29_02352AE8 +_0232C19C: .word LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE +_0232C1A0: .word SPATK_STAT_IDX arm_func_end DoMoveDamageLowerSpecialDefense50 arm_func_start DoMoveStruggle diff --git a/asm/overlay_29_0232C524.s b/asm/overlay_29_0232C524.s index cb2daae8..94493556 100644 --- a/asm/overlay_29_0232C524.s +++ b/asm/overlay_29_0232C524.s @@ -132,7 +132,7 @@ DoMoveSiesta: ; 0x0232C6B4 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _0232C6EC ; =ov10_022C4720 + ldr r1, _0232C6EC ; =SLEEP_TURN_RANGE mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -144,7 +144,7 @@ DoMoveSiesta: ; 0x0232C6B4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232C6EC: .word ov10_022C4720 +_0232C6EC: .word SLEEP_TURN_RANGE arm_func_end DoMoveSiesta arm_func_start DoMoveTwoEdge @@ -1091,7 +1091,7 @@ DoMoveHealingWish: ; 0x0232D298 cmp r5, r4 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r2, _0232D2E4 ; =ov10_022C46F4 + ldr r2, _0232D2E4 ; =HEALING_WISH_HP_RESTORATION mov ip, #1 ldrsh r2, [r2] mov r3, #0 @@ -1105,7 +1105,7 @@ DoMoveHealingWish: ; 0x0232D298 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D2E4: .word ov10_022C46F4 +_0232D2E4: .word HEALING_WISH_HP_RESTORATION arm_func_end DoMoveHealingWish arm_func_start DoMoveCloseCombat @@ -1119,7 +1119,7 @@ DoMoveCloseCombat: ; 0x0232D2E8 cmp r0, #0 moveq r0, #0 beq _0232D358 - ldr r0, _0232D360 ; =ov29_02352AEC + ldr r0, _0232D360 ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r0] mov r0, r4 @@ -1128,7 +1128,7 @@ DoMoveCloseCombat: ; 0x0232D2E8 mov ip, #0 str ip, [sp, #4] bl LowerDefensiveStat - ldr r0, _0232D364 ; =ov29_02352AE8 + ldr r0, _0232D364 ; =SPATK_STAT_IDX mov r3, #1 ldr r2, [r0] mov r0, r4 @@ -1142,8 +1142,8 @@ _0232D358: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_0232D360: .word ov29_02352AEC -_0232D364: .word ov29_02352AE8 +_0232D360: .word ATK_STAT_IDX +_0232D364: .word SPATK_STAT_IDX arm_func_end DoMoveCloseCombat arm_func_start DoMoveLuckyChant @@ -1186,7 +1186,7 @@ _0232D3D4: .word 0x00000F2E arm_func_start DoMoveHealOrder DoMoveHealOrder: ; 0x0232D3D8 stmdb sp!, {r3, lr} - ldr r2, _0232D3FC ; =ov10_022C44B8 + ldr r2, _0232D3FC ; =HEAL_ORDER_HP_RESTORATION mov ip, #1 ldrsh r2, [r2] mov r3, #0 @@ -1195,7 +1195,7 @@ DoMoveHealOrder: ; 0x0232D3D8 mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232D3FC: .word ov10_022C44B8 +_0232D3FC: .word HEAL_ORDER_HP_RESTORATION arm_func_end DoMoveHealOrder arm_func_start DoMoveHealBlock @@ -1219,7 +1219,7 @@ DoMoveThunderFang: ; 0x0232D418 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r1, _0232D4A4 ; =ov10_022C452C + ldr r1, _0232D4A4 ; =THUNDER_FANG_PARALYZE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1232,7 +1232,7 @@ DoMoveThunderFang: ; 0x0232D418 mov r3, r2 bl TryInflictParalysisStatus _0232D46C: - ldr r1, _0232D4A8 ; =ov10_022C4678 + ldr r1, _0232D4A8 ; =THUNDER_FANG_CRINGE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1248,8 +1248,8 @@ _0232D49C: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D4A4: .word ov10_022C452C -_0232D4A8: .word ov10_022C4678 +_0232D4A4: .word THUNDER_FANG_PARALYZE_CHANCE +_0232D4A8: .word THUNDER_FANG_CRINGE_CHANCE arm_func_end DoMoveThunderFang arm_func_start DoMoveDefog @@ -1276,7 +1276,7 @@ _0232D4E0: mov r1, r5 bl EndReflectClassStatus _0232D4FC: - ldr r1, _0232D554 ; =ov29_02352AE8 + ldr r1, _0232D554 ; =SPATK_STAT_IDX mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -1286,7 +1286,7 @@ _0232D4FC: bl GetApparentWeather cmp r0, #6 bne _0232D548 - ldr r1, _0232D558 ; =ov10_022C4654 + ldr r1, _0232D558 ; =WEATHER_MOVE_TURN_COUNT ldr r0, _0232D55C ; =ov29_02353538 ldrsh r3, [r1] ldr r1, [r0] @@ -1300,8 +1300,8 @@ _0232D548: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0232D550: .word 0x00000ED2 -_0232D554: .word ov29_02352AE8 -_0232D558: .word ov10_022C4654 +_0232D554: .word SPATK_STAT_IDX +_0232D558: .word WEATHER_MOVE_TURN_COUNT _0232D55C: .word ov29_02353538 arm_func_end DoMoveDefog @@ -1372,7 +1372,7 @@ DoMoveIceFang: ; 0x0232D620 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r1, _0232D6A8 ; =ov10_022C4518 + ldr r1, _0232D6A8 ; =ICE_FANG_FREEZE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1384,7 +1384,7 @@ DoMoveIceFang: ; 0x0232D620 mov r2, #0 bl TryInflictFrozenStatus _0232D670: - ldr r1, _0232D6AC ; =ov10_022C453C + ldr r1, _0232D6AC ; =ICE_FANG_CRINGE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1400,8 +1400,8 @@ _0232D6A0: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D6A8: .word ov10_022C4518 -_0232D6AC: .word ov10_022C453C +_0232D6A8: .word ICE_FANG_FREEZE_CHANCE +_0232D6AC: .word ICE_FANG_CRINGE_CHANCE arm_func_end DoMoveIceFang arm_func_start DoMovePsychoShift @@ -1550,7 +1550,7 @@ DoMoveShadowForce: ; 0x0232D860 bl IsChargingTwoTurnMove cmp r0, #0 beq _0232D8CC - ldr r1, _0232D8F4 ; =ov10_022C47DC + ldr r1, _0232D8F4 ; =SHADOW_FORCE_DAMAGE_MULTIPLIER mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -1581,7 +1581,7 @@ _0232D8EC: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232D8F4: .word ov10_022C47DC +_0232D8F4: .word SHADOW_FORCE_DAMAGE_MULTIPLIER _0232D8F8: .word 0x00000CD7 arm_func_end DoMoveShadowForce @@ -1639,14 +1639,14 @@ DoMoveChargeBeam: ; 0x0232D97C cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r1, _0232D9DC ; =ov10_022C44F0 + ldr r1, _0232D9DC ; =CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232D9D4 - ldr r1, _0232D9E0 ; =ov29_02352AE8 + ldr r1, _0232D9E0 ; =SPATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r5 @@ -1656,8 +1656,8 @@ _0232D9D4: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232D9DC: .word ov10_022C44F0 -_0232D9E0: .word ov29_02352AE8 +_0232D9DC: .word CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE +_0232D9E0: .word SPATK_STAT_IDX arm_func_end DoMoveChargeBeam arm_func_start DoMoveDamageEatItem @@ -1780,7 +1780,7 @@ _0232DB7C: ldr r0, [r1, r0, lsl #2] cmp r0, #0 bne _0232DBAC - ldr r1, _0232DC4C ; =ov29_02352AEC + ldr r1, _0232DC4C ; =ATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1790,7 +1790,7 @@ _0232DB7C: _0232DBAC: cmp r0, #2 bne _0232DBD0 - ldr r1, _0232DC4C ; =ov29_02352AEC + ldr r1, _0232DC4C ; =ATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1800,7 +1800,7 @@ _0232DBAC: _0232DBD0: cmp r0, #1 bne _0232DBF4 - ldr r1, _0232DC50 ; =ov29_02352AE8 + ldr r1, _0232DC50 ; =SPATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1810,7 +1810,7 @@ _0232DBD0: _0232DBF4: cmp r0, #3 bne _0232DC18 - ldr r1, _0232DC50 ; =ov29_02352AE8 + ldr r1, _0232DC50 ; =SPATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1833,8 +1833,8 @@ _0232DC38: .align 2, 0 _0232DC44: .word ov29_02352B3C _0232DC48: .word 0x00000F0E -_0232DC4C: .word ov29_02352AEC -_0232DC50: .word ov29_02352AE8 +_0232DC4C: .word ATK_STAT_IDX +_0232DC50: .word SPATK_STAT_IDX arm_func_end DoMoveAcupressure arm_func_start DoMoveMagnetRise @@ -1900,7 +1900,7 @@ DoMoveLastResort: ; 0x0232DCD4 _0232DD10: cmp r0, #0 ble _0232DD44 - ldr r1, _0232DD70 ; =ov10_022C4944 + ldr r1, _0232DD70 ; =LAST_RESORT_DAMAGE_MULT_TABLE sub r0, r0, #1 ldr r3, [r1, r0, lsl #2] mov r0, r8 @@ -1925,7 +1925,7 @@ _0232DD64: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_0232DD70: .word ov10_022C4944 +_0232DD70: .word LAST_RESORT_DAMAGE_MULT_TABLE _0232DD74: .word 0x00000EBC arm_func_end DoMoveLastResort @@ -2053,7 +2053,7 @@ DoMoveDamageHpDependent: ; 0x0232DE84 movle r5, #2 movgt r5, #3 _0232DF08: - ldr r4, _0232DF34 ; =ov10_022C49B4 + ldr r4, _0232DF34 ; =WRING_OUT_DAMAGE_MULT_TABLE str r3, [sp] ldr r3, [r4, r5, lsl #2] bl DealDamage @@ -2065,7 +2065,7 @@ _0232DF08: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _0232DF30: .word 0x000003E7 -_0232DF34: .word ov10_022C49B4 +_0232DF34: .word WRING_OUT_DAMAGE_MULT_TABLE arm_func_end DoMoveDamageHpDependent arm_func_start DoMoveHeartSwap @@ -2119,7 +2119,7 @@ DoMoveRoost: ; 0x0232DFC8 bl GetApparentWeather mov r3, #1 str r3, [sp] - ldr r1, _0232E07C ; =ov10_022C4964 + ldr r1, _0232E07C ; =ROOST_HP_RESTORATION_TABLE mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -2159,7 +2159,7 @@ _0232E070: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232E07C: .word ov10_022C4964 +_0232E07C: .word ROOST_HP_RESTORATION_TABLE _0232E080: .word 0x00000CC9 arm_func_end DoMoveRoost @@ -2241,7 +2241,7 @@ DoMoveFlareBlitz: ; 0x0232E130 bl EntityIsValidMoveEffects__0232E250 cmp r0, #0 beq _0232E1B4 - ldr r1, _0232E248 ; =ov10_022C4684 + ldr r1, _0232E248 ; =FLARE_BLITZ_BURN_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r7 @@ -2295,6 +2295,6 @@ _0232E240: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232E248: .word ov10_022C4684 +_0232E248: .word FLARE_BLITZ_BURN_CHANCE _0232E24C: .word 0x000003E7 arm_func_end DoMoveFlareBlitz diff --git a/asm/overlay_29_0232E274.s b/asm/overlay_29_0232E274.s index b28260af..8493c481 100644 --- a/asm/overlay_29_0232E274.s +++ b/asm/overlay_29_0232E274.s @@ -6,13 +6,13 @@ arm_func_start DoMoveDefendOrder DoMoveDefendOrder: ; 0x0232E274 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0232E2B0 ; =ov29_02352AEC + ldr r2, _0232E2B0 ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] mov r5, r0 mov r4, r1 bl BoostDefensiveStat - ldr r1, _0232E2B4 ; =ov29_02352AE8 + ldr r1, _0232E2B4 ; =SPATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -21,8 +21,8 @@ DoMoveDefendOrder: ; 0x0232E274 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232E2B0: .word ov29_02352AEC -_0232E2B4: .word ov29_02352AE8 +_0232E2B0: .word ATK_STAT_IDX +_0232E2B4: .word SPATK_STAT_IDX arm_func_end DoMoveDefendOrder arm_func_start DoMoveFireFang @@ -42,7 +42,7 @@ DoMoveFireFang: ; 0x0232E2B8 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} - ldr r1, _0232E360 ; =ov10_022C4684 + ldr r1, _0232E360 ; =FLARE_BLITZ_BURN_CHANCE mov r0, r7 ldrsh r2, [r1] mov r1, r6 @@ -56,7 +56,7 @@ DoMoveFireFang: ; 0x0232E2B8 str r2, [sp] bl TryInflictBurnStatus _0232E328: - ldr r1, _0232E364 ; =ov10_022C449C + ldr r1, _0232E364 ; =FIRE_FANG_CRINGE_CHANCE mov r0, r7 ldrsh r2, [r1] mov r1, r6 @@ -72,8 +72,8 @@ _0232E358: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0232E360: .word ov10_022C4684 -_0232E364: .word ov10_022C449C +_0232E360: .word FLARE_BLITZ_BURN_CHANCE +_0232E364: .word FIRE_FANG_CRINGE_CHANCE arm_func_end DoMoveFireFang arm_func_start DoMoveLunarDance @@ -84,7 +84,7 @@ DoMoveLunarDance: ; 0x0232E368 cmp r5, r4 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r2, _0232E3C8 ; =ov10_022C46F4 + ldr r2, _0232E3C8 ; =HEALING_WISH_HP_RESTORATION mov ip, #1 ldrsh r2, [r2] mov r3, #0 @@ -103,7 +103,7 @@ DoMoveLunarDance: ; 0x0232E368 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232E3C8: .word ov10_022C46F4 +_0232E3C8: .word HEALING_WISH_HP_RESTORATION _0232E3CC: .word 0x000003E7 arm_func_end DoMoveLunarDance @@ -249,7 +249,7 @@ DoMoveCaptivate: ; 0x0232E560 bl DefenderAbilityIsActiveMoveEffects__0232DE20 cmp r0, #0 bne _0232E5D4 - ldr r0, _0232E61C ; =ov29_02352AE8 + ldr r0, _0232E61C ; =SPATK_STAT_IDX mov ip, #1 ldr r2, [r0] str ip, [sp] @@ -281,7 +281,7 @@ _0232E614: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232E61C: .word ov29_02352AE8 +_0232E61C: .word SPATK_STAT_IDX _0232E620: .word 0x00000F0F arm_func_end DoMoveCaptivate @@ -296,7 +296,7 @@ DoMoveLeafStorm: ; 0x0232E624 cmp r0, #0 moveq r0, #0 beq _0232E670 - ldr r0, _0232E678 ; =ov29_02352AE8 + ldr r0, _0232E678 ; =SPATK_STAT_IDX mov ip, #0 ldr r2, [r0] str ip, [sp] @@ -310,7 +310,7 @@ _0232E670: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_0232E678: .word ov29_02352AE8 +_0232E678: .word SPATK_STAT_IDX arm_func_end DoMoveLeafStorm arm_func_start DoMoveDracoMeteor @@ -327,7 +327,7 @@ DoMoveDracoMeteor: ; 0x0232E67C ldrsh r0, [sp, #0x10] cmp r0, #0 bne _0232E6D0 - ldr r0, _0232E6DC ; =ov29_02352AE8 + ldr r0, _0232E6DC ; =SPATK_STAT_IDX mov ip, #0 ldr r2, [r0] str ip, [sp] @@ -342,7 +342,7 @@ _0232E6D4: add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 -_0232E6DC: .word ov29_02352AE8 +_0232E6DC: .word SPATK_STAT_IDX arm_func_end DoMoveDracoMeteor arm_func_start DoMoveRockPolish @@ -365,14 +365,14 @@ DoMoveRockPolish: ; 0x0232E6E0 arm_func_start DoMoveNastyPlot DoMoveNastyPlot: ; 0x0232E714 stmdb sp!, {r3, lr} - ldr r2, _0232E730 ; =ov29_02352AE8 + ldr r2, _0232E730 ; =SPATK_STAT_IDX mov r3, #2 ldr r2, [r2] bl BoostOffensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232E730: .word ov29_02352AE8 +_0232E730: .word SPATK_STAT_IDX arm_func_end DoMoveNastyPlot arm_func_start DoMoveTag0x1AB diff --git a/asm/overlay_29_0232E864.s b/asm/overlay_29_0232E864.s index 8b450f32..9b295cde 100644 --- a/asm/overlay_29_0232E864.s +++ b/asm/overlay_29_0232E864.s @@ -10,18 +10,18 @@ ExecuteMoveEffect: ; 0x0232E864 ldr fp, _0232F7AC ; =ov10_022C45F8 str r0, [sp, #0x14] ldrsh r0, [fp] - ldr r5, _0232F7B0 ; =ov29_02352AE8 + ldr r5, _0232F7B0 ; =SPATK_STAT_IDX ldr sl, _0232F7B4 ; =ov10_022C483C ldr r7, [r5] str r0, [sp, #0x34] ldr r0, [sl] - ldr r4, _0232F7B8 ; =ov29_02352AEC + ldr r4, _0232F7B8 ; =ATK_STAT_IDX mov r8, r2 ldr r6, [r4] mov r2, #0 str r2, [sp, #0x78] str r6, [sp, #0xa0] - ldr r5, _0232F7BC ; =ov10_022C4468 + ldr r5, _0232F7BC ; =FOREWARN_FORCED_MISS_CHANCE str r0, [sp, #0x30] ldrsh r0, [r5] ldr r4, _0232F7C0 ; =ov10_022C460C @@ -1050,10 +1050,10 @@ _0232F79C: b _0232F87C .align 2, 0 _0232F7AC: .word ov10_022C45F8 -_0232F7B0: .word ov29_02352AE8 +_0232F7B0: .word SPATK_STAT_IDX _0232F7B4: .word ov10_022C483C -_0232F7B8: .word ov29_02352AEC -_0232F7BC: .word ov10_022C4468 +_0232F7B8: .word ATK_STAT_IDX +_0232F7BC: .word FOREWARN_FORCED_MISS_CHANCE _0232F7C0: .word ov10_022C460C _0232F7C4: .word ov10_022C4480 _0232F7C8: .word ov10_022C4614 diff --git a/asm/overlay_29_02337CCC.s b/asm/overlay_29_02337CCC.s index 2e2fdc25..bb66de5e 100644 --- a/asm/overlay_29_02337CCC.s +++ b/asm/overlay_29_02337CCC.s @@ -1684,7 +1684,7 @@ ov29_02339148: ; 0x02339148 ldr r0, _02339188 ; =ov29_02353538 mov r2, #0xc ldr r0, [r0] - ldr r3, _0233918C ; =ov10_022C631C + ldr r3, _0233918C ; =TILESET_PROPERTIES add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] mov r1, #0 @@ -1698,7 +1698,7 @@ ov29_02339148: ; 0x02339148 ldmia sp!, {r4, pc} .align 2, 0 _02339188: .word ov29_02353538 -_0233918C: .word ov10_022C631C +_0233918C: .word TILESET_PROPERTIES arm_func_end ov29_02339148 arm_func_start ov29_02339190 @@ -1723,7 +1723,7 @@ ov29_023391C0: ; 0x023391C0 ldr r0, _023391E4 ; =ov29_02353538 mov r1, #0xc ldr r0, [r0] - ldr r2, _023391E8 ; =ov10_022C631C + ldr r2, _023391E8 ; =TILESET_PROPERTIES add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] smulbb r0, r0, r1 @@ -1731,7 +1731,7 @@ ov29_023391C0: ; 0x023391C0 bx lr .align 2, 0 _023391E4: .word ov29_02353538 -_023391E8: .word ov10_022C631C +_023391E8: .word TILESET_PROPERTIES arm_func_end ov29_023391C0 arm_func_start DrawMinimapTile @@ -3153,7 +3153,7 @@ _0233A544: .word ov29_0235377C arm_func_start ov29_0233A548 ov29_0233A548: ; 0x0233A548 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r2, _0233A5E0 ; =ov29_02352FD0 + ldr r2, _0233A5E0 ; =MAP_COLOR_TABLE ldr r7, _0233A5E4 ; =ov29_0235376C mov r6, r1 add r5, r2, r0, lsl #2 @@ -3195,7 +3195,7 @@ _0233A5D0: blt _0233A560 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0233A5E0: .word ov29_02352FD0 +_0233A5E0: .word MAP_COLOR_TABLE _0233A5E4: .word ov29_0235376C arm_func_end ov29_0233A548 @@ -8478,7 +8478,7 @@ _0233F014: _0233F01C: cmp r5, #8 bne _0233F0C4 - ldr r1, _0233F11C ; =ov29_02353010 + ldr r1, _0233F11C ; =CORNER_CARDINAL_NEIGHBOR_IS_OPEN ldr r0, [sp, #0x20] mov r5, #0 add r6, r1, r0, lsl #3 @@ -8551,7 +8551,7 @@ _0233F100: .align 2, 0 _0233F114: .word 0x000001C2 _0233F118: .word DIRECTIONS_XY -_0233F11C: .word ov29_02353010 +_0233F11C: .word CORNER_CARDINAL_NEIGHBOR_IS_OPEN arm_func_end GenerateRoomImperfections arm_func_start CreateHallway @@ -10903,7 +10903,7 @@ _0234113C: mov r0, r4 bl DungeonRandRange mov r8, r0 - ldr r0, _02341468 ; =ov10_022C44AC + ldr r0, _02341468 ; =MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS cmp r8, #6 ldrsh r0, [r0] movlt r8, #6 @@ -10914,7 +10914,7 @@ _0234113C: bl ShuffleSpawnPositions mov r0, r6 bl DungeonRandInt - ldr r1, _0234146C ; =ov10_022C440C + ldr r1, _0234146C ; =FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS mov r7, r0 ldrb fp, [r1] mov sb, #0 @@ -11110,8 +11110,8 @@ _02341458: .word ov29_02353538 _0234145C: .word ov29_0237CFBC _02341460: .word 0x0002C9E8 _02341464: .word 0x00012AFA -_02341468: .word ov10_022C44AC -_0234146C: .word ov10_022C440C +_02341468: .word MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS +_0234146C: .word FIRST_DUNGEON_WITH_MONSTER_HOUSE_TRAPS arm_func_end MarkNonEnemySpawns arm_func_start MarkEnemySpawns @@ -11226,7 +11226,7 @@ _023415F4: ldrb r2, [r0, #0xc4] cmp r2, #0 beq _02341754 - ldr r1, _02341768 ; =ov10_022C4660 + ldr r1, _02341768 ; =MONSTER_HOUSE_MAX_MONSTER_SPAWNS ldr r0, [sp] ldrsh r6, [r1] cmp r0, #0 @@ -11322,7 +11322,7 @@ _02341754: .align 2, 0 _02341760: .word ov29_02353538 _02341764: .word ov29_0237CFBC -_02341768: .word ov10_022C4660 +_02341768: .word MONSTER_HOUSE_MAX_MONSTER_SPAWNS arm_func_end MarkEnemySpawns arm_func_start SetSecondaryTerrainOnWall @@ -12723,7 +12723,7 @@ _02342AC8: mov sl, r0 cmp r0, r5 bge _02342B58 - ldr r0, _02342B78 ; =ov10_022C52EC + ldr r0, _02342B78 ; =SHOP_ITEM_CHANCES add fp, r0, r7, lsl #1 _02342AE8: mov r0, sb @@ -12766,7 +12766,7 @@ _02342B6C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02342B74: .word ov29_0237CFBC -_02342B78: .word ov10_022C52EC +_02342B78: .word SHOP_ITEM_CHANCES arm_func_end ov29_023427E4 arm_func_start ResetInnerBoundaryTileRows @@ -12991,7 +12991,7 @@ _02342E30: bl ShouldBoostHiddenStairsSpawnChance cmp r0, #0 beq _02342E94 - ldr r1, _02342EB8 ; =ov10_022C4850 + ldr r1, _02342EB8 ; =HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER mov r0, r6, lsl #8 ldr r1, [r1] bl MultiplyByFixedPoint @@ -13014,7 +13014,7 @@ _02342EA8: .align 2, 0 _02342EB0: .word ov29_02353538 _02342EB4: .word ov29_0235378C -_02342EB8: .word ov10_022C4850 +_02342EB8: .word HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER arm_func_end GetHiddenStairsType arm_func_start GetFinalKecleonShopSpawnChance @@ -13025,7 +13025,7 @@ GetFinalKecleonShopSpawnChance: ; 0x02342EBC cmp r0, #0 moveq r0, r4 ldmeqia sp!, {r4, pc} - ldr r1, _02342F04 ; =ov10_022C484C + ldr r1, _02342F04 ; =KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER mov r0, r4, lsl #8 ldr r1, [r1] bl MultiplyByFixedPoint @@ -13038,7 +13038,7 @@ GetFinalKecleonShopSpawnChance: ; 0x02342EBC mov r0, r0, asr #0x10 ldmia sp!, {r4, pc} .align 2, 0 -_02342F04: .word ov10_022C484C +_02342F04: .word KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER arm_func_end GetFinalKecleonShopSpawnChance arm_func_start ResetHiddenStairsSpawn @@ -13380,7 +13380,7 @@ _023433B8: mov r0, #0xc smulbb r2, r1, r0 ldr r0, _02343938 ; =ov29_023502F4 - ldr r1, _0234393C ; =ov29_023502EC + ldr r1, _0234393C ; =FIXED_ROOM_ENTITY_SPAWN_TABLE ldr r8, [r0, r2] ldr sl, [r1, r2] ldrb r0, [r8, #2] @@ -13542,7 +13542,7 @@ _023435BC: mov r3, r1 str r0, [sp, #4] ldr fp, _02343958 ; =ov29_023534F0 - ldr r0, _0234395C ; =ov29_0234FDFC + ldr r0, _0234395C ; =TREASURE_BOX_1_ITEM_IDS ldr r3, [fp, r3, lsl #2] ldrsh r0, [r0, r2] ldrsh r3, [r3, sl] @@ -13656,7 +13656,7 @@ _023437C8: cmpne sb, #0xa str r1, [sp, #0x28] strb r1, [sp, #0x32] - ldreq r1, _02343964 ; =ov10_022C5938 + ldreq r1, _02343964 ; =FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE ldreq r0, [sp, #0x1c] strh fp, [sp, #0x24] ldreqsh r0, [r1, r0] @@ -13750,7 +13750,7 @@ _0234392C: .word ov29_02353538 _02343930: .word ov29_0237CFC0 _02343934: .word 0x000001FF _02343938: .word ov29_023502F4 -_0234393C: .word ov29_023502EC +_0234393C: .word FIXED_ROOM_ENTITY_SPAWN_TABLE _02343940: .word ov29_023502F0 _02343944: .word ov10_022C4B34 _02343948: .word ov29_02353050 @@ -13758,9 +13758,9 @@ _0234394C: .word 0x00000578 _02343950: .word 0x00000181 _02343954: .word 0xFFFFFA7E _02343958: .word ov29_023534F0 -_0234395C: .word ov29_0234FDFC +_0234395C: .word TREASURE_BOX_1_ITEM_IDS _02343960: .word 0x00000229 -_02343964: .word ov10_022C5938 +_02343964: .word FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE _02343968: .word 0x0002C9E6 arm_func_end PlaceFixedRoomTile @@ -14159,7 +14159,7 @@ _02343E78: sub r0, r1, #0xe00 cmp r2, r0 bgt _0234400C - ldr r1, _0234403C ; =ov29_023502EC + ldr r1, _0234403C ; =FIXED_ROOM_ENTITY_SPAWN_TABLE sub r2, r2, #0x10 mov r0, #0xc smlabb r0, r2, r0, r1 @@ -14242,7 +14242,7 @@ _02343FA0: _02343FCC: mov r0, #0xc mul r2, r3, r0 - ldr r1, _02344050 ; =ov10_022C5938 + ldr r1, _02344050 ; =FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE add r0, sp, #0xc ldrsh r1, [r1, r2] mov r2, r8 @@ -14275,12 +14275,12 @@ _0234402C: .align 2, 0 _02344034: .word ov29_02353794 _02344038: .word 0x00000FFF -_0234403C: .word ov29_023502EC +_0234403C: .word FIXED_ROOM_ENTITY_SPAWN_TABLE _02344040: .word 0x00000229 _02344044: .word 0x00000483 _02344048: .word ov29_02353538 _0234404C: .word 0x00000485 -_02344050: .word ov10_022C5938 +_02344050: .word FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE arm_func_end LoadFixedRoom arm_func_start OpenFixedBin diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index d9292844..916b4bf5 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -1393,8 +1393,8 @@ ov29_0234FDF4: .global ov29_0234FDF8 ov29_0234FDF8: .byte 0x19, 0x00, 0x00, 0x00 - .global ov29_0234FDFC -ov29_0234FDFC: + .global TREASURE_BOX_1_ITEM_IDS +TREASURE_BOX_1_ITEM_IDS: .byte 0x6C, 0x01, 0x6F, 0x01, 0x72, 0x01, 0x75, 0x01, 0x78, 0x01, 0x7B, 0x01, 0x7E, 0x01, 0x81, 0x01 .byte 0x84, 0x01, 0x87, 0x01, 0x8A, 0x01, 0x8D, 0x01 .global FIXED_ROOM_REVISIT_OVERRIDES @@ -1963,8 +1963,8 @@ ov29_023502DC: .global ov29_023502E4 ov29_023502E4: .byte 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_023502EC -ov29_023502EC: + .global FIXED_ROOM_ENTITY_SPAWN_TABLE +FIXED_ROOM_ENTITY_SPAWN_TABLE: .word FIXED_ROOM_ITEM_SPAWN_TABLE .global ov29_023502F0 ov29_023502F0: @@ -3047,8 +3047,8 @@ ov29_023517A2: .byte 0xFF, 0xFF, 0xFF, 0xFF .word ov29_02351B00 .byte 0xFF, 0xFF, 0x01, 0x00 - .global ov29_023517DC -ov29_023517DC: + .global DISPLACEMENTS_WITHIN_2_LARGEST_FIRST +DISPLACEMENTS_WITHIN_2_LARGEST_FIRST: .byte 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00 .byte 0x02, 0x00, 0xFE, 0xFF, 0xFE, 0xFF, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0xFE, 0xFF, 0xFE, 0xFF .byte 0xFF, 0xFF, 0xFE, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0xFF, 0xFF @@ -3056,8 +3056,8 @@ ov29_023517DC: .byte 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x63, 0x00, 0x63, 0x00 - .global ov29_02351844 -ov29_02351844: + .global DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST +DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .byte 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFE, 0xFF, 0xFE, 0xFF @@ -3065,8 +3065,8 @@ ov29_02351844: .byte 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0xFE, 0xFF, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0xFE, 0xFF, 0x02, 0x00, 0xFF, 0xFF, 0x02, 0x00 .byte 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x63, 0x00, 0x63, 0x00 - .global ov29_023518AC -ov29_023518AC: + .global DISPLACEMENTS_WITHIN_3 +DISPLACEMENTS_WITHIN_3: .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0x01, 0x00 @@ -3198,8 +3198,8 @@ ov29_02351E28: .byte 0xFB, 0xFF, 0x04, 0x00, 0x05, 0x00, 0x04, 0x00, 0x04, 0x00, 0xFB, 0xFF, 0x04, 0x00, 0x05, 0x00 .byte 0xFB, 0xFF, 0xFB, 0xFF, 0x05, 0x00, 0xFB, 0xFF, 0xFB, 0xFF, 0xFB, 0xFF, 0xFB, 0xFF, 0x05, 0x00 .byte 0x63, 0x00, 0x63, 0x00 - .global ov29_02352010 -ov29_02352010: + .global ITEM_CATEGORY_ACTIONS +ITEM_CATEGORY_ACTIONS: .byte 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x10, 0x00 .byte 0x00, 0x00, 0x12, 0x00, 0x12, 0x00, 0x31, 0x00, 0x2C, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -3252,8 +3252,8 @@ ov29_02352074: .byte 0xC4, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xC5, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0xC6, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xC7, 0x09, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .byte 0xC8, 0x09, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - .global ov29_02352284 -ov29_02352284: + .global FRACTIONAL_TURN_SEQUENCE +FRACTIONAL_TURN_SEQUENCE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -3381,8 +3381,8 @@ ov29_02352758: .global ov29_02352760 ov29_02352760: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_02352768 -ov29_02352768: + .global BELLY_DRAIN_IN_WALLS_INT +BELLY_DRAIN_IN_WALLS_INT: .byte 0x05, 0x00, 0x00, 0x00 .global ov29_0235276C ov29_0235276C: @@ -3419,26 +3419,26 @@ ov29_02352810: .global ov29_02352838 ov29_02352838: .byte 0x00, 0x00, 0x00, 0x00 - .global ov29_0235283C -ov29_0235283C: + .global DAMAGE_MULTIPLIER_0_5 +DAMAGE_MULTIPLIER_0_5: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00 - .global ov29_02352844 -ov29_02352844: + .global DAMAGE_MULTIPLIER_1_5 +DAMAGE_MULTIPLIER_1_5: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00 - .global ov29_0235284C -ov29_0235284C: + .global DAMAGE_MULTIPLIER_2 +DAMAGE_MULTIPLIER_2: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_0235285C -ov29_0235285C: + .global CLOUDY_DAMAGE_MULTIPLIER +CLOUDY_DAMAGE_MULTIPLIER: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00 - .global ov29_02352864 -ov29_02352864: + .global SOLID_ROCK_MULTIPLIER +SOLID_ROCK_MULTIPLIER: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00 - .global ov29_0235286C -ov29_0235286C: + .global DAMAGE_FORMULA_MAX_BASE +DAMAGE_FORMULA_MAX_BASE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE7, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_0235287C -ov29_0235287C: + .global DAMAGE_FORMULA_MIN_BASE +DAMAGE_FORMULA_MIN_BASE: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 .global ov29_02352884 ov29_02352884: @@ -3448,8 +3448,8 @@ ov29_02352884: ov29_02352894: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .global ov29_023528A4 -ov29_023528A4: + .global TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS +TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS: .byte 0x02, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00 .byte 0x05, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00 @@ -3510,11 +3510,11 @@ ov29_023529EC: .byte 0x5C, 0x01, 0x06, 0x00, 0x99, 0x00, 0x07, 0x00, 0xCD, 0x00, 0x08, 0x00, 0x9C, 0x00, 0x09, 0x00 .byte 0x08, 0x00, 0x0A, 0x00, 0xDD, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_02352AE8 -ov29_02352AE8: + .global SPATK_STAT_IDX +SPATK_STAT_IDX: .byte 0x01, 0x00, 0x00, 0x00 - .global ov29_02352AEC -ov29_02352AEC: + .global ATK_STAT_IDX +ATK_STAT_IDX: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x19, 0x01, 0x00, 0x00, 0x33, 0x01, 0x00, 0x00 .byte 0x4C, 0x01, 0x00, 0x00, 0x66, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00 .byte 0xB3, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00, 0xE6, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -3612,8 +3612,8 @@ ov29_02352F7C: .global ov29_02352FCC ov29_02352FCC: .byte 0x01, 0x00, 0x01, 0x00 - .global ov29_02352FD0 -ov29_02352FD0: + .global MAP_COLOR_TABLE +MAP_COLOR_TABLE: .byte 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x80, 0x00, 0x00 .byte 0x80, 0x00, 0xFF, 0x00, 0xFF, 0x80, 0xC0, 0x00 @@ -3622,8 +3622,8 @@ ov29_02352FF4: .byte 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 .byte 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 .byte 0x04, 0x00, 0x00, 0x00 - .global ov29_02353010 -ov29_02353010: + .global CORNER_CARDINAL_NEIGHBOR_IS_OPEN +CORNER_CARDINAL_NEIGHBOR_IS_OPEN: .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 .byte 0x01, 0x00, 0x00, 0x00 @@ -3760,8 +3760,8 @@ ov29_02353234: .byte 0xE0, 0x3F, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xD0, 0x3F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xCF, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCE, 0x3F, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 .byte 0xDB, 0x3F, 0x00, 0x00 - .global ov29_023532D0 -ov29_023532D0: + .global GUMMI_IQ_STRING_IDS +GUMMI_IQ_STRING_IDS: .byte 0x48, 0x0B, 0x49, 0x0B, 0x4A, 0x0B, 0x4B, 0x0B, 0x0C, 0x00, 0x00, 0x00 .byte 0xDA, 0x3F, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0xD7, 0x3F, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00 .byte 0xE5, 0x3F, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xD8, 0x3F, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00 @@ -3772,8 +3772,8 @@ ov29_023532D0: ov29_02353324: .byte 0x4C, 0x0B, 0x4D, 0x0B, 0x4E, 0x0B, 0x4F, 0x0B .byte 0x50, 0x0B, 0x00, 0x00 - .global ov29_02353330 -ov29_02353330: + .global DAMAGE_STRING_IDS +DAMAGE_STRING_IDS: .byte 0x78, 0x0B, 0x79, 0x0B, 0x7A, 0x0B, 0x7B, 0x0B, 0x7C, 0x0B, 0x7D, 0x0B .byte 0x7E, 0x0B, 0x7F, 0x0B, 0x80, 0x0B, 0x81, 0x0B, 0x82, 0x0B, 0x83, 0x0B, 0x84, 0x0B, 0x85, 0x0B .byte 0x00, 0x00, 0x86, 0x0B, 0x87, 0x0B, 0x88, 0x0B, 0x89, 0x0B, 0x8A, 0x0B, 0x8B, 0x0B, 0x8D, 0x0B