From a7deff2aa00ab5712a4fdfb7de9af9c56c8bf36c Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 21 Sep 2023 22:54:13 -0400 Subject: [PATCH 1/5] Defined more overlay 29 pointers --- asm/include/overlay_29_02300108.inc | 53 ++- asm/include/overlay_29_023047DC.inc | 32 +- asm/include/overlay_29_023055B0.inc | 54 +-- asm/include/overlay_29_023082A0.inc | 34 +- asm/include/overlay_29_02311034.inc | 32 +- asm/include/overlay_29_023118D8.inc | 38 +- asm/include/overlay_29_0231513C.inc | 83 ++-- asm/include/overlay_29_023201A0.inc | 24 +- asm/include/overlay_29_02320788.inc | 36 +- asm/include/overlay_29_0232145C.inc | 94 +++-- asm/include/overlay_29_02325644.inc | 118 ++++-- asm/include/overlay_29_02328030.inc | 98 +++-- asm/include/overlay_29_023350FC.inc | 54 ++- asm/include/overlay_29_023456BC.inc | 63 +-- asm/include/overlay_29_023498A0.inc | 105 +++-- asm/main_0200C4CC.s | 7 +- asm/overlay_10.s | 530 +++++++++++++++++++++---- asm/overlay_29_02300108.s | 134 +++---- asm/overlay_29_023047DC.s | 72 ++-- asm/overlay_29_023055B0.s | 14 +- asm/overlay_29_023082A0.s | 72 ++-- asm/overlay_29_02311034.s | 26 +- asm/overlay_29_023118D8.s | 104 ++--- asm/overlay_29_0231513C.s | 172 ++++---- asm/overlay_29_023201A0.s | 18 +- asm/overlay_29_02320788.s | 34 +- asm/overlay_29_0232145C.s | 194 ++++----- asm/overlay_29_02325644.s | 282 ++++++------- asm/overlay_29_02328030.s | 218 +++++----- asm/overlay_29_023350FC.s | 354 ++++++++--------- asm/overlay_29_023456BC.s | 154 +++---- asm/overlay_29_023498A0.s | 596 ++++++++++++++-------------- asm/overlay_29_0234EC38.s | 382 +++++++++++++++--- 33 files changed, 2625 insertions(+), 1656 deletions(-) diff --git a/asm/include/overlay_29_02300108.inc b/asm/include/overlay_29_02300108.inc index 849bc17c..ff0a4c06 100644 --- a/asm/include/overlay_29_02300108.inc +++ b/asm/include/overlay_29_02300108.inc @@ -1,8 +1,13 @@ #pragma once -.public CanLearnIqSkill -.public CanThrowItems -.public DisableIqSkill .public __divsi3 +.public _020A188C +.public _020A18A4 +.public CanLearnIqSkill +.public CanSeeTarget +.public CanThrowItems +.public DIRECTIONS_XY +.public DisableIqSkill +.public DungeonGetSpriteIndex .public DungeonRandInt .public EnableIqSkill .public EntityIsValid__023000E4 @@ -12,9 +17,12 @@ .public ExclusiveItemEffectIsActive__022FFF28 .public GetActiveTeamMember .public GetApparentWeather +.public GetEntityNaturalGiftInfo +.public GetEntityWeatherBallType .public GetEvolutions .public GetExplorerMazeMonster .public GetForcedLossReason +.public GetMobilityTypeCheckSlipAndFloating .public GetMoveBasePower .public GetMoveType .public GetName @@ -22,45 +30,56 @@ .public GetNameWithGender .public GetPerformanceFlagWithChecks .public GetSpeciesIqSkill -.public DungeonGetSpriteIndex .public GetTile .public GravityIsActive .public HasHeldItem .public IqSkillFlagTest .public IsBlinded +.public IsCurrentTilesetBackground .public IsExpEnabledInDungeon .public IsExperienceLocked .public IsOnMonsterSpawnList .public IsRegularAttackOrProjectile .public ItemIsActive__022FF898 +.public LevelUp .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUserTarget +.public MistIsActive .public MultiplyByFixedPoint -.public strcpy -.public StringFromMessageId -.public SubstitutePlaceholderStringTags -.public vsprintf +.public ov10_022C44A8 +.public ov10_022C458C +.public ov10_022C4698 +.public ov10_022C469C .public ov29_022E2470 -.public CanSeeTarget .public ov29_022E62A8 .public ov29_022FAFD4 .public ov29_022FBDE0 -.public GetMobilityTypeCheckSlipAndFloating .public ov29_02302C04 .public ov29_02302CC8 -.public LevelUp .public ov29_0230F654 .public ov29_02314DC4 -.public MistIsActive -.public GetEntityNaturalGiftInfo -.public GetEntityWeatherBallType .public ov29_0232461C .public ov29_02324BE8 -.public IsCurrentTilesetBackground .public ov29_02344B44 .public ov29_0234B034 .public ov29_0234B09C .public ov29_0234B0B4 +.public ov29_0235171E +.public ov29_02352770 +.public ov29_02352778 +.public ov29_02352780 +.public ov29_02352788 +.public ov29_02352790 +.public ov29_02352798 +.public ov29_023527A0 +.public ov29_023527C0 +.public ov29_023527D0 +.public ov29_023527F8 +.public ov29_02353538 +.public ov29_023535C0 +.public SECONDARY_TERRAIN_TYPES +.public strcpy +.public StringFromMessageId .public sub_02024FB8 .public sub_02025888 .public sub_020258E4 @@ -69,5 +88,5 @@ .public sub_0205858C .public sub_020585B4 .public sub_02058C9C -.public SECONDARY_TERRAIN_TYPES -.public DIRECTIONS_XY +.public SubstitutePlaceholderStringTags +.public vsprintf diff --git a/asm/include/overlay_29_023047DC.inc b/asm/include/overlay_29_023047DC.inc index e8899003..14947efe 100644 --- a/asm/include/overlay_29_023047DC.inc +++ b/asm/include/overlay_29_023047DC.inc @@ -1,40 +1,46 @@ #pragma once -.public AdvanceFrame .public __divsi3 +.public AdvanceFrame +.public CheckLeaderTile +.public CheckNonLeaderTile +.public DiscoverMinimap +.public DungeonGetSpriteIndex .public EnemyEvolution +.public EnsureCanStandCurrentTile .public EntityIsValid__023047B8 .public EntityIsValid__0230558C .public GetDirectionTowardsPosition .public GetShadowSize -.public DungeonGetSpriteIndex .public GetTileAtEntity .public IsFloorOver -.public Rand16Bit -.public TryForcedLoss -.public UpdateEntityPixelPos +.public IsWaterTileset .public ov29_022E1A90 -.public ShouldDisplayEntityWrapper .public ov29_022E8104 .public ov29_022EA370 .public ov29_022EF9BC .public ov29_022EF9C8 -.public CheckLeaderTile .public ov29_022F62CC .public ov29_022F9C74 .public ov29_02300818 .public ov29_02300CB0 -.public CheckNonLeaderTile .public ov29_02305814 .public ov29_02307DD0 .public ov29_0230FC24 -.public EnsureCanStandCurrentTile -.public DiscoverMinimap -.public IsWaterTileset .public ov29_02346888 .public ov29_0234AD10 .public ov29_0234BA18 -.public SetSpriteIdForAnimationControl +.public ov29_0235173C +.public ov29_0235173E +.public ov29_02352808 +.public ov29_02353538 +.public ov29_0237C9C1 +.public ov29_0237C9CC +.public Rand16Bit +.public SECONDARY_TERRAIN_TYPES .public SetAndPlayAnimationForAnimationControl +.public SetSpriteIdForAnimationControl +.public ShouldDisplayEntityWrapper .public sub_0204AEE0 .public sub_02053038 -.public SECONDARY_TERRAIN_TYPES +.public TryForcedLoss +.public UpdateEntityPixelPos diff --git a/asm/include/overlay_29_023055B0.inc b/asm/include/overlay_29_023055B0.inc index 373425a0..eac66690 100644 --- a/asm/include/overlay_29_023055B0.inc +++ b/asm/include/overlay_29_023055B0.inc @@ -1,50 +1,52 @@ #pragma once .public AbilityIsActiveVeneer .public CalcSpeedStageWrapper +.public EndBlinkerClassStatus +.public EndBurnClassStatus .public EndCringeClassStatus +.public EndCurseClassStatus .public EndFrozenClassStatus +.public EndLeechSeedClassStatus +.public EndMiracleEyeStatus +.public EndMuzzledStatus +.public EndSleepClassStatus +.public EndSureShotClassStatus .public EntityIsValid__0230558C .public EntityIsValid__02305C04 .public GetDirectionTowardsPosition .public GetLeader .public GetSleepAnimationId .public GetTileAtEntity +.public GetTrapInfo .public HasHeldItem .public IqSkillIsEnabled .public IsFloorOver +.public IsMonsterDrowsy +.public IsMonsterMuzzled +.public IsMonsterVisuallyImpaired .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget -.public SubstitutePlaceholderStringTags -.public UpdateStatusIconFlags -.public GetTrapInfo +.public MonsterHasAttackInterferingStatus +.public MonsterHasImmobilizingStatus +.public MonsterHasLeechSeedStatus +.public MonsterHasMiracleEyeStatus +.public MonsterHasNegativeStatus +.public MonsterHasNonvolatileNonsleepStatus +.public MonsterHasSkillInterferingStatus +.public MonsterHasWhifferStatus .public ov29_022E2CA0 .public ov29_022E3A58 .public ov29_022E543C .public ov29_022EA370 -.public TryTriggerTrap .public ov29_022FBE04 -.public IsMonsterDrowsy -.public MonsterHasNonvolatileNonsleepStatus -.public MonsterHasImmobilizingStatus -.public MonsterHasAttackInterferingStatus -.public MonsterHasSkillInterferingStatus -.public MonsterHasLeechSeedStatus -.public MonsterHasWhifferStatus -.public IsMonsterVisuallyImpaired -.public IsMonsterMuzzled -.public MonsterHasMiracleEyeStatus -.public MonsterHasNegativeStatus .public ov29_02300818 .public ov29_023049A8 -.public EndSleepClassStatus -.public EndBurnClassStatus -.public EndCurseClassStatus -.public EndLeechSeedClassStatus -.public EndSureShotClassStatus -.public EndBlinkerClassStatus -.public EndMuzzledStatus -.public EndMiracleEyeStatus -.public TryTriggerMonsterHouse -.public TryNonLeaderItemPickUp -.public UpdateTrapsVisibility .public ov29_02337D68 +.public ov29_02353318 +.public ov29_02353538 +.public SubstitutePlaceholderStringTags +.public TryNonLeaderItemPickUp +.public TryTriggerMonsterHouse +.public TryTriggerTrap +.public UpdateStatusIconFlags +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_023082A0.inc b/asm/include/overlay_29_023082A0.inc index 73e08e4f..60a934f6 100644 --- a/asm/include/overlay_29_023082A0.inc +++ b/asm/include/overlay_29_023082A0.inc @@ -2,8 +2,11 @@ .public abs .public AiMovement .public ApplyDamage +.public ApplyDamageAndEffectsWrapper +.public ATK_STAT_IDX .public BoostOffensiveStat .public CanTargetEntity +.public CategoryIsNotPhysical .public ChooseAiMove .public ClearMonsterActionFields .public DefenderAbilityIsActive__0230A940 @@ -16,32 +19,47 @@ .public GravityIsActive .public HasLowHealth .public HasStatusThatPreventsActing +.public HasTypeAffectedByGravity .public IqSkillIsEnabled .public LevitateIsActive .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public MonsterIsType -.public ResetDamageData -.public SetActionPassTurnOrWalk -.public SubstitutePlaceholderStringTags -.public UpdateAiTargetPos +.public ov10_022C442C +.public ov10_022C4460 +.public ov10_022C4464 +.public ov10_022C44C0 +.public ov10_022C4524 +.public ov10_022C4550 +.public ov10_022C4564 +.public ov10_022C45AC +.public ov10_022C45B0 +.public ov10_022C45B4 +.public ov10_022C45C0 +.public ov10_022C4638 +.public ov10_022C467C +.public ov10_022C468C .public ov29_022E3F24 .public ov29_022E40C0 .public ov29_022E45D0 .public ov29_022E57D4 .public ov29_022E5E84 -.public ShouldRunMonsterAi .public ov29_022FB538 .public ov29_02300B40 .public ov29_02300D50 .public ov29_0230175C -.public HasTypeAffectedByGravity -.public ApplyDamageAndEffectsWrapper .public ov29_0230D654 .public ov29_0230E914 .public ov29_0230F728 -.public CategoryIsNotPhysical .public ov29_0231EDFC .public ov29_023380FC +.public ov29_02353538 +.public ov29_023535DC +.public ov29_0237CA6D +.public ResetDamageData +.public SetActionPassTurnOrWalk +.public ShouldRunMonsterAi .public sub_02054EC8 .public sub_02058C3C +.public SubstitutePlaceholderStringTags +.public UpdateAiTargetPos diff --git a/asm/include/overlay_29_02311034.inc b/asm/include/overlay_29_02311034.inc index 492046e2..68c58d37 100644 --- a/asm/include/overlay_29_02311034.inc +++ b/asm/include/overlay_29_02311034.inc @@ -1,9 +1,21 @@ #pragma once .public AbilityIsActiveVeneer +.public ApplyAquaRingHealing .public CalcSpeedStageWrapper .public DisplayActions +.public EndBlinkerClassStatus +.public EndBurnClassStatus .public EndCringeClassStatus +.public EndCurseClassStatus .public EndFrozenClassStatus +.public EndInvisibleClassStatus +.public EndLeechSeedClassStatus +.public EndMagnetRiseStatus +.public EndMiracleEyeStatus +.public EndMuzzledStatus +.public EndReflectClassStatus +.public EndSleepClassStatus +.public EndSureShotClassStatus .public EntityIsValid__02311010 .public EntityIsValid__023118B4 .public ExclusiveItemEffectFlagTest @@ -13,19 +25,13 @@ .public IqSkillIsEnabled .public IsFloorOver .public LogMessageByIdWithPopupCheckUser +.public ov10_022C4578 +.public ov10_022C4630 +.public ov10_022C4674 +.public ov10_022C46D0 +.public ov10_022C46F8 +.public ov29_0234B294 +.public ov29_02353318 .public SubstitutePlaceholderStringTags .public TickStatusTurnCounter .public UpdateStatusIconFlags -.public EndSleepClassStatus -.public EndBurnClassStatus -.public EndReflectClassStatus -.public EndCurseClassStatus -.public EndLeechSeedClassStatus -.public EndSureShotClassStatus -.public EndInvisibleClassStatus -.public EndBlinkerClassStatus -.public EndMuzzledStatus -.public EndMiracleEyeStatus -.public EndMagnetRiseStatus -.public ApplyAquaRingHealing -.public ov29_0234B294 diff --git a/asm/include/overlay_29_023118D8.inc b/asm/include/overlay_29_023118D8.inc index 79714b17..eddda8a3 100644 --- a/asm/include/overlay_29_023118D8.inc +++ b/asm/include/overlay_29_023118D8.inc @@ -3,6 +3,8 @@ .public CalcSpeedStage .public CalcSpeedStageWrapper .public CalcStatusDuration +.public ChangeShayminForme +.public DIRECTIONS_XY .public DungeonRandInt .public DungeonRandOutcome__022EAB20 .public EntityIsValid__023118B4 @@ -13,12 +15,30 @@ .public HasHeldItem .public InflictSleepStatusSingle .public IqSkillIsEnabled +.public IsProtectedFromNegativeStatus +.public IsProtectedFromStatDrops .public ItemIsActive__0231513C .public LogMessageByIdWithPopupCheckUserTarget .public MonsterIsType .public MultiplyByFixedPoint -.public SubstitutePlaceholderStringTags -.public UpdateStatusIconFlags +.public ov10_022C4618 +.public ov10_022C4728 +.public ov10_022C479C +.public ov10_022C47A0 +.public ov10_022C4804 +.public ov10_022C4870 +.public ov10_022C4874 +.public ov10_022C4878 +.public ov10_022C4880 +.public ov10_022C4884 +.public ov10_022C4888 +.public ov10_022C488C +.public ov10_022C4890 +.public ov10_022C4894 +.public ov10_022C4898 +.public ov10_022C48A0 +.public ov10_022C48AC +.public ov10_022C48B8 .public ov29_022E3E74 .public ov29_022E41CC .public ov29_022E41F0 @@ -55,19 +75,19 @@ .public ov29_022E60E4 .public ov29_0230040C .public ov29_023018AC -.public SafeguardIsActive -.public IsProtectedFromStatDrops -.public IsProtectedFromNegativeStatus .public ov29_02304A48 .public ov29_02304A84 .public ov29_0230F654 -.public TryActivateSteadfast -.public ChangeShayminForme .public ov29_02344B44 .public ov29_0234B034 .public ov29_0234B084 .public ov29_0234B0B4 +.public ov29_02353318 +.public ov29_02353538 +.public SafeguardIsActive +.public SECONDARY_TERRAIN_TYPES .public sub_02025888 .public sub_020258E4 -.public SECONDARY_TERRAIN_TYPES -.public DIRECTIONS_XY +.public SubstitutePlaceholderStringTags +.public TryActivateSteadfast +.public UpdateStatusIconFlags diff --git a/asm/include/overlay_29_0231513C.inc b/asm/include/overlay_29_0231513C.inc index d2c26d53..8a249105 100644 --- a/asm/include/overlay_29_0231513C.inc +++ b/asm/include/overlay_29_0231513C.inc @@ -1,41 +1,76 @@ #pragma once +.public __divsi3 .public AbilityIsActiveVeneer .public AdvanceFrame .public AiMovement +.public AnimationDelayOrSomething +.public ATK_STAT_IDX .public BoostDefensiveStat .public BoostOffensiveStat .public CalcStatusDuration .public CeilFixedPoint -.public __divsi3 +.public DungeonGetSpriteIndex .public DungeonRandInt +.public EndCurseClassStatus +.public EndInvisibleClassStatus .public EntityIsValid__02315118 .public EntityIsValid__02318D34 +.public ExclusiveItemEffectIsActiveWithLogging .public GetFloorType .public GetMaxPp .public GetMaxPpWrapper .public GetMobilityType +.public GetMonsterApparentId .public GetMonsterIdFromSpawnEntry .public GetNameWithGender .public GetSleepAnimationId -.public DungeonGetSpriteIndex .public GravityIsActive .public HasHeldItem +.public HasTypeAffectedByGravity +.public HiddenStairsTrigger .public IqSkillIsEnabled +.public IsProtectedFromNegativeStatus .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public LogMessageWithPopupCheckUserTarget .public LowerSpeed .public MewSpawnCheck .public MonsterIsType +.public MonsterSpawnListPartialCopy .public MultiplyByFixedPoint -.public strcpy -.public SubFixedPoint -.public SubstitutePlaceholderStringTags -.public TryActivateQuickFeet -.public UpdateStatusIconFlags -.public ShouldDisplayEntityWrapper -.public UpdateCamera -.public AnimationDelayOrSomething +.public ov10_022C4470 +.public ov10_022C44B0 +.public ov10_022C4620 +.public ov10_022C4628 +.public ov10_022C4754 +.public ov10_022C475C +.public ov10_022C4764 +.public ov10_022C4768 +.public ov10_022C476C +.public ov10_022C4774 +.public ov10_022C4778 +.public ov10_022C477C +.public ov10_022C4780 +.public ov10_022C4784 +.public ov10_022C4788 +.public ov10_022C4790 +.public ov10_022C47A4 +.public ov10_022C47AC +.public ov10_022C47B0 +.public ov10_022C47B4 +.public ov10_022C47BC +.public ov10_022C47C8 +.public ov10_022C47D0 +.public ov10_022C47D4 +.public ov10_022C47D8 +.public ov10_022C47FC +.public ov10_022C480C +.public ov10_022C4828 +.public ov10_022C4830 +.public ov10_022C4838 +.public ov10_022C4848 +.public ov10_022C486C +.public ov10_022C487C .public ov29_022E41B0 .public ov29_022E41DC .public ov29_022E442C @@ -69,37 +104,37 @@ .public ov29_022E486C .public ov29_022E48B8 .public ov29_022E4914 -.public ShowPpRestoreEffect .public ov29_022E49B4 .public ov29_022E4A04 .public ov29_022E4A54 .public ov29_022E4AA4 .public ov29_022E4AF0 .public ov29_022E4B3C -.public MonsterSpawnListPartialCopy .public ov29_022E81F8 .public ov29_022EA718 .public ov29_022EACCC -.public GetMonsterApparentId .public ov29_022FB984 -.public SafeguardIsActive -.public HasTypeAffectedByGravity -.public IsProtectedFromNegativeStatus .public ov29_02304830 .public ov29_02304BAC -.public TryRemoveSnatchedMonsterFromDungeonStruct -.public EndCurseClassStatus -.public EndInvisibleClassStatus -.public ExclusiveItemEffectIsActiveWithLogging -.public TryActivateSteadfast -.public UpdateTrapsVisibility -.public HiddenStairsTrigger -.public UpdateMinimap .public ov29_0234B09C .public ov29_0234B0B4 +.public ov29_02353538 +.public SafeguardIsActive +.public ShouldDisplayEntityWrapper +.public ShowPpRestoreEffect +.public strcpy .public sub_01FFB62C .public sub_02001888 .public sub_02024FB8 .public sub_02050EBC .public sub_02050F78 .public sub_02050FF8 +.public SubFixedPoint +.public SubstitutePlaceholderStringTags +.public TryActivateQuickFeet +.public TryActivateSteadfast +.public TryRemoveSnatchedMonsterFromDungeonStruct +.public UpdateCamera +.public UpdateMinimap +.public UpdateStatusIconFlags +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_023201A0.inc b/asm/include/overlay_29_023201A0.inc index 9fc9a801..6ac08d8a 100644 --- a/asm/include/overlay_29_023201A0.inc +++ b/asm/include/overlay_29_023201A0.inc @@ -1,8 +1,11 @@ #pragma once +.public __divsi3 .public AbilityIsActiveVeneer .public abs .public AdvanceFrame -.public __divsi3 +.public DetermineTileWalkableNeighbors +.public DIRECTIONS_XY +.public EnsureCanStandCurrentTile .public EntityIsValid__0232017C .public EntityIsValid__02320764 .public GetApparentWeather @@ -11,23 +14,24 @@ .public IsFloorOver .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget -.public SubstitutePlaceholderStringTags -.public UpdateEntityPixelPos +.public MoveMonsterToPos .public ov29_022E1A90 -.public ShouldDisplayEntityWrapper .public ov29_022E5560 .public ov29_022E55F0 .public ov29_022E56A0 -.public MoveMonsterToPos .public ov29_022F9C74 .public ov29_022FFB90 .public ov29_02320AA4 -.public EnsureCanStandCurrentTile .public ov29_02321238 .public ov29_02336694 -.public DetermineTileWalkableNeighbors -.public UpdateTrapsVisibility -.public UpdateMinimap +.public ov29_0235171E +.public ov29_023529B8 +.public ov29_02353538 +.public ov29_02353700 .public RemoveGroundItem +.public ShouldDisplayEntityWrapper .public sub_020018D0 -.public DIRECTIONS_XY +.public SubstitutePlaceholderStringTags +.public UpdateEntityPixelPos +.public UpdateMinimap +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_02320788.inc b/asm/include/overlay_29_02320788.inc index 66e42531..b9ca8a9a 100644 --- a/asm/include/overlay_29_02320788.inc +++ b/asm/include/overlay_29_02320788.inc @@ -1,10 +1,16 @@ #pragma once .public AbilityIsActiveVeneer .public AdvanceFrame +.public AreTileJumpsAllowed .public CalcDamageFixedNoCategory .public CanMonsterUseMove +.public DetermineTileWalkableNeighbors +.public DiscoverMinimap .public EntityIsValid__02320764 .public EntityIsValid__02321438 +.public ExclusiveItemEffectIsActiveWithLogging +.public FindClosestUnoccupiedTileWithin2 +.public FindUnoccupiedTileWithin3 .public GetApparentWeather .public GetLeader .public GetTileSafe @@ -12,23 +18,15 @@ .public IsFloorOver .public LogMessageByIdWithPopupCheckUserTarget .public MonsterIsType -.public SubstitutePlaceholderStringTags -.public TryInflictPetrifiedStatus -.public UpdateMovePp -.public UpdateEntityPixelPos -.public ShouldDisplayEntityWrapper -.public UpdateCamera +.public MoveMonsterToPos .public ov29_022E4C84 .public ov29_022E4CD4 .public ov29_022E5560 .public ov29_022E55F0 .public ov29_022E5650 .public ov29_022E9628 -.public FindClosestUnoccupiedTileWithin2 -.public FindUnoccupiedTileWithin3 .public ov29_022F42F8 .public ov29_022F62CC -.public MoveMonsterToPos .public ov29_022F87C0 .public ov29_022F9C74 .public ov29_022FAA04 @@ -37,15 +35,21 @@ .public ov29_02304A48 .public ov29_02305814 .public ov29_02307BDC -.public ExclusiveItemEffectIsActiveWithLogging .public ov29_02322374 .public ov29_023247B4 -.public TwoTurnMoveForcedMiss .public ov29_02336694 -.public DetermineTileWalkableNeighbors -.public UpdateTrapsVisibility -.public DiscoverMinimap -.public UpdateMinimap -.public AreTileJumpsAllowed +.public ov29_023529B8 +.public ov29_02353538 +.public ov29_02353700 +.public ov29_0237C850 .public RemoveGroundItem +.public ShouldDisplayEntityWrapper .public sub_01FFB62C +.public SubstitutePlaceholderStringTags +.public TryInflictPetrifiedStatus +.public TwoTurnMoveForcedMiss +.public UpdateCamera +.public UpdateEntityPixelPos +.public UpdateMinimap +.public UpdateMovePp +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_0232145C.inc b/asm/include/overlay_29_0232145C.inc index a4b79979..b7bc280f 100644 --- a/asm/include/overlay_29_0232145C.inc +++ b/asm/include/overlay_29_0232145C.inc @@ -1,14 +1,19 @@ #pragma once +.public __divsi3 .public AbilityIsActiveVeneer +.public ActivateStench .public AdvanceFrame +.public AnimationDelayOrSomething .public AnimationHasMoreFrames +.public AreEntitiesAdjacent .public BoostSpeedOneStage .public CalcStatusDuration -.public __divsi3 +.public DIRECTIONS_XY .public DungeonRandInt .public DungeonRandOutcome__022EAB50 .public DungeonRandRange .public EndFrozenClassStatus +.public EndLeechSeedClassStatus .public EnemyEvolution .public EntityIsValid__02321438 .public EntityIsValid__02325620 @@ -20,7 +25,6 @@ .public GetBodySize .public GetDamageSource .public GetEntityMoveTargetAndRange -.public InitMoveCheckId .public GetMonsterGenderVeneer .public GetMoveAccuracyOrAiChance .public GetMoveAnimation @@ -29,41 +33,27 @@ .public GetMoveMaxGinsengBoost .public GetMoveMessageFromId .public GetMoveNbStrikes +.public GetNaturePowerVariant .public GetSpriteIndex__02052708 .public GetTile .public GravityIsActive .public HasHeldItem .public InitMove +.public InitMoveCheckId .public IqSkillIsEnabled .public Is2TurnsMove .public IsAffectedByTaunt .public IsCopyingMove .public IsFloorOver +.public IsMonsterSleeping .public IsTrappingMove .public LogMessageByIdWithPopupCheckUser .public LogMessageQuiet .public LogMessageWithPopup .public LogMessageWithPopupCheckUser .public LowerSpeed +.public METRONOME_TABLE .public MoveIsNotPhysical -.public ShouldMovePlayAlternativeAnimation -.public StringFromMessageId -.public SubstitutePlaceholderStringTags -.public TryInflictBurnStatus -.public TryInflictConfusedStatus -.public TryInflictConstrictionStatus -.public TryInflictCringeStatus -.public TryInflictFrozenStatus -.public TryInflictInfatuatedStatus -.public TryInflictNightmareStatus -.public TryInflictParalysisStatus -.public TryInflictPausedStatus -.public TryInflictPoisonedStatus -.public TryInflictShadowHoldStatus -.public TryInflictSleepStatus -.public TrySealMove -.public TryWarp -.public UpdateAiTargetPos .public ov00_022BFDAC .public ov00_022BFDEC .public ov10_022BDE50 @@ -78,13 +68,20 @@ .public ov10_022BFD6C .public ov10_022BFD8C .public ov10_022BFDCC +.public ov10_022C4584 +.public ov10_022C45B8 +.public ov10_022C4714 +.public ov10_022C4724 +.public ov10_022C47A8 +.public ov10_022C4808 +.public ov10_022C4E40 +.public ov10_022C540C +.public ov10_022C5460 .public ov29_022DE5D8 .public ov29_022DE5F0 -.public ShouldDisplayEntityWrapper .public ov29_022E28D4 .public ov29_022E2CA0 .public ov29_022E3560 -.public AnimationDelayOrSomething .public ov29_022E56A0 .public ov29_022E5864 .public ov29_022E5ED0 @@ -95,46 +92,75 @@ .public ov29_022ED0C4 .public ov29_022ED0D4 .public ov29_022ED868 -.public SetAndLoadCurrentAttackAnimation .public ov29_022F87C0 .public ov29_022F8830 .public ov29_022F88C0 .public ov29_022F9840 .public ov29_022FAA04 .public ov29_022FAFD4 -.public AreEntitiesAdjacent .public ov29_022FBAB4 .public ov29_0230040C -.public IsMonsterSleeping .public ov29_02300DCC .public ov29_0230175C .public ov29_023024E0 .public ov29_023049A8 .public ov29_02304A48 .public ov29_02304B14 -.public EndLeechSeedClassStatus -.public TryInflictInvisibleStatus -.public TryInflictPerishSongStatus -.public TryInflictBlinkerStatus .public ov29_02318D58 -.public ActivateStench .public ov29_02321288 .public ov29_02325644 -.public PlayMoveAnimation .public ov29_02325D20 .public ov29_02325D7C -.public GetNaturePowerVariant -.public PositionHasMonster .public ov29_023383A8 .public ov29_02344B9C .public ov29_0234B034 .public ov29_0234B084 .public ov29_0234B09C .public ov29_0234B4CC +.public ov29_0235171E +.public ov29_0235175C +.public ov29_02352A54 +.public ov29_02352A60 +.public ov29_02352A6C +.public ov29_02352A8C +.public ov29_02352AAC +.public ov29_02352AD8 +.public ov29_02352B1C +.public ov29_02353538 +.public ov29_0235370C +.public ov29_02353710 +.public ov29_0237CA68 +.public ov29_0237CA84 +.public ov29_0237CA88 +.public PlayMoveAnimation +.public PositionHasMonster +.public SetAndLoadCurrentAttackAnimation +.public ShouldDisplayEntityWrapper +.public ShouldMovePlayAlternativeAnimation +.public SLEEP_TURN_RANGE +.public StringFromMessageId .public sub_020018D0 .public sub_02001980 .public sub_0201CF90 .public sub_0201D1B0 .public sub_0201D1D4 +.public SubstitutePlaceholderStringTags +.public TryInflictBlinkerStatus +.public TryInflictBurnStatus +.public TryInflictConfusedStatus +.public TryInflictConstrictionStatus +.public TryInflictCringeStatus +.public TryInflictFrozenStatus +.public TryInflictInfatuatedStatus +.public TryInflictInvisibleStatus +.public TryInflictNightmareStatus +.public TryInflictParalysisStatus +.public TryInflictPausedStatus +.public TryInflictPerishSongStatus +.public TryInflictPoisonedStatus +.public TryInflictShadowHoldStatus +.public TryInflictSleepStatus +.public TrySealMove +.public TryWarp +.public UpdateAiTargetPos .public WanTableSpriteHasAnimationGroup -.public DIRECTIONS_XY diff --git a/asm/include/overlay_29_02325644.inc b/asm/include/overlay_29_02325644.inc index a915110a..ae9eaa6e 100644 --- a/asm/include/overlay_29_02325644.inc +++ b/asm/include/overlay_29_02325644.inc @@ -2,8 +2,10 @@ .public AbilityIsActiveVeneer .public AdvanceFrame .public AnimationHasMoreFrames +.public ApplyDamageAndEffectsWrapper .public ApplyDefensiveStatMultiplier .public ApplyOffensiveStatMultiplier +.public ATK_STAT_IDX .public BoostDefensiveStat .public BoostHitChanceStat .public BoostOffensiveStat @@ -12,14 +14,21 @@ .public CalcRecoilDamageFixed .public CalcStatusDuration .public DealDamage +.public DealDamageWithType .public DungeonRandOutcomeUserAction .public DungeonRandOutcomeUserTargetInteraction .public DungeonRandRange +.public EndBurnClassStatus +.public EndFrozenStatus +.public EndNegativeStatusConditionWrapper +.public EndReflectClassStatus .public EntityIsValid__02325620 .public EntityIsValidMoveEffects__0232800C .public ExclusiveItemEffectFlagTest +.public FlashFireShouldActivate .public FormatMoveStringMore .public GetApparentWeather +.public GetDamageSourceWrapper .public GetEffectAnimation .public GetLowKickMultiplier .public GetMoveAnimation @@ -27,60 +36,97 @@ .public GetMoveType .public GetTileAtEntity .public InitMove +.public IsChargingTwoTurnMove +.public IsMonsterSleeping .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat .public LowerHitChanceStat .public LowerOffensiveStat .public LowerSpeed -.public StringFromMessageId -.public SubstitutePlaceholderStringTags -.public TryIncreaseHp -.public TryInflictBurnStatus -.public TryInflictConfusedStatus -.public TryInflictConstrictionStatus -.public TryInflictCringeStatus -.public TryInflictFrozenStatus -.public TryInflictNightmareStatus -.public TryInflictParalysisStatus -.public TryInflictShadowHoldStatus -.public TryInflictSleepStatus -.public TryInflictSleeplessStatus -.public TryInflictYawningStatus +.public MirrorMoveIsActive .public ov10_022BED90 .public ov10_022BF160 .public ov10_022BFC5C +.public ov10_022C4428 +.public ov10_022C4440 +.public ov10_022C444C +.public ov10_022C4450 +.public ov10_022C4488 +.public ov10_022C4500 +.public ov10_022C4514 +.public ov10_022C4534 +.public ov10_022C4538 +.public ov10_022C4544 +.public ov10_022C4600 +.public ov10_022C4604 +.public ov10_022C462C +.public ov10_022C4634 +.public ov10_022C4658 +.public ov10_022C4688 +.public ov10_022C4690 +.public ov10_022C4718 +.public ov10_022C4724 +.public ov10_022C4798 +.public ov10_022C47C4 +.public ov10_022C47E4 +.public ov10_022C4860 +.public ov10_022C48A8 +.public ov10_022C48B0 +.public ov10_022C48B4 +.public ov10_022C4954 +.public ov10_022C4984 +.public ov10_022C4994 +.public ov10_022C49A4 +.public ov10_022C4B54 +.public ov10_022C4C0C +.public ov10_022C4C0E .public ov29_022E2CA0 .public ov29_022E5474 .public ov29_022E5ED0 .public ov29_022E6D68 .public ov29_022EA428 -.public IsMonsterSleeping -.public EndNegativeStatusConditionWrapper -.public EndBurnClassStatus -.public EndReflectClassStatus -.public EndFrozenStatus -.public ApplyDamageAndEffectsWrapper -.public FlashFireShouldActivate -.public TryInflictGrudgeStatus -.public TryInflictSureShotStatus -.public TryInflictWhifferStatus -.public TryInflictFocusEnergyStatus -.public TryInflictEncoreStatus -.public TryInflictExposedStatus .public ov29_02318BBC .public ov29_02318D58 .public ov29_02318D98 -.public TryInflictEndureStatus -.public TryInflictMirrorMoveStatus -.public TryInflictVitalThrowStatus -.public TryResetStatChanges -.public MirrorMoveIsActive -.public IsChargingTwoTurnMove -.public GetDamageSourceWrapper -.public DealDamageWithType .public ov29_02332F18 -.public TryActivateWeather .public ov29_02337E2C .public ov29_0234B034 .public ov29_0234BA54 +.public ov29_02352AD8 +.public ov29_02352AF0 +.public ov29_02353538 +.public ov29_0237CA69 +.public ov29_0237CA6A +.public ov29_0237CA6D +.public ov29_0237CA70 +.public SLEEP_TURN_RANGE +.public SPATK_STAT_IDX +.public StringFromMessageId .public sub_0201CF90 +.public SubstitutePlaceholderStringTags +.public TryActivateWeather +.public TryIncreaseHp +.public TryInflictBurnStatus +.public TryInflictConfusedStatus +.public TryInflictConstrictionStatus +.public TryInflictCringeStatus +.public TryInflictEncoreStatus +.public TryInflictEndureStatus +.public TryInflictExposedStatus +.public TryInflictFocusEnergyStatus +.public TryInflictFrozenStatus +.public TryInflictGrudgeStatus +.public TryInflictMirrorMoveStatus +.public TryInflictNightmareStatus +.public TryInflictParalysisStatus +.public TryInflictShadowHoldStatus +.public TryInflictSleeplessStatus +.public TryInflictSleepStatus +.public TryInflictSureShotStatus +.public TryInflictVitalThrowStatus +.public TryInflictWhifferStatus +.public TryInflictYawningStatus +.public TryResetStatChanges +.public WEATHER_BALL_TYPE_TABLE +.public WEATHER_MOVE_TURN_COUNT +.public WHIRLPOOL_CONSTRICTION_CHANCE diff --git a/asm/include/overlay_29_02328030.inc b/asm/include/overlay_29_02328030.inc index f24ed6a5..19356570 100644 --- a/asm/include/overlay_29_02328030.inc +++ b/asm/include/overlay_29_02328030.inc @@ -1,5 +1,10 @@ #pragma once .public AbilityIsActiveVeneer +.public ActivateMotorDrive +.public ActivateSportCondition +.public AddHeldItemToBag +.public ApplyDamageAndEffectsWrapper +.public ATK_STAT_IDX .public BoostDefensiveStat .public BoostHitChanceStat .public BoostOffensiveStat @@ -7,13 +12,17 @@ .public CalcDamageFixedWrapper .public CalcRecoilDamageFixed .public DealDamage +.public DoMoveTakeaway .public DungeonRandInt .public DungeonRandOutcomeUserAction .public DungeonRandOutcomeUserTargetInteraction +.public EndFrozenStatus .public EntityIsValidMoveEffects__0232800C .public EntityIsValidMoveEffects__0232A3D8 .public ExclusiveItemEffectFlagTest +.public GenerateStandardItem .public GetApparentWeather +.public GetDamageSourceWrapper .public GetMoveCategory .public GetMoveCritChance .public GetMovePower @@ -21,60 +30,85 @@ .public GetMoveTypeForMonster .public GetTileAtEntity .public InitMove +.public IsChargingTwoTurnMove .public IsSameMove .public LevitateIsActive .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat .public LowerHitChanceStat .public LowerOffensiveStat -.public RemoveEquivItemNoHole -.public StringFromMessageId -.public SubstitutePlaceholderStringTags -.public TryIncreaseHp -.public TryInflictBadlyPoisonedStatus -.public TryInflictBurnStatus -.public TryInflictConfusedStatus -.public TryInflictCringeStatus -.public TryInflictFrozenStatus -.public TryInflictParalysisStatus -.public TryInflictPoisonedStatus -.public TryInflictShadowHoldStatus -.public TryWarp +.public ov10_022C4424 +.public ov10_022C4444 +.public ov10_022C4448 +.public ov10_022C4484 +.public ov10_022C4490 +.public ov10_022C4494 +.public ov10_022C4498 +.public ov10_022C44A0 +.public ov10_022C451C +.public ov10_022C4528 +.public ov10_022C4568 +.public ov10_022C461C +.public ov10_022C463C +.public ov10_022C4644 +.public ov10_022C465C +.public ov10_022C4668 +.public ov10_022C4670 +.public ov10_022C4694 +.public ov10_022C47E8 +.public ov10_022C47EC +.public ov10_022C48A4 +.public ov10_022C48C0 +.public ov10_022C4974 +.public ov10_022C4E40 +.public ov10_022C4E44 +.public ov10_022C6324 .public ov29_022E56A0 .public ov29_022E5ED0 .public ov29_022EA370 .public ov29_022ECAFC .public ov29_022F9EA0 -.public TryEndStatusWithAbility .public ov29_0230040C .public ov29_023049A8 -.public EndFrozenStatus -.public ApplyDamageAndEffectsWrapper .public ov29_0230D4A4 -.public TryInflictTauntStatus -.public TryInflictStockpileStatus .public ov29_02318A90 .public ov29_02318AD4 .public ov29_02318B48 .public ov29_02318BBC .public ov29_02318D58 -.public TryInflictSafeguardStatus -.public TryInflictMistStatus -.public TryInflictWishStatus -.public TryInflictConversion2Status -.public ActivateMotorDrive -.public TryExplosion -.public IsChargingTwoTurnMove -.public GetDamageSourceWrapper .public ov29_0232A834 -.public DoMoveTakeaway -.public ActivateSportCondition -.public TryActivateWeather .public ov29_02337E2C -.public GenerateStandardItem -.public AddHeldItemToBag -.public RemoveEmptyItemsInBagWrapper .public ov29_0234B034 .public ov29_0234B084 .public ov29_0234C668 .public ov29_0234C738 +.public ov29_02352B18 +.public ov29_02353538 +.public ov29_0237CA6B +.public ov29_0237CA78 +.public ov29_0237CA7C +.public RemoveEmptyItemsInBagWrapper +.public RemoveEquivItemNoHole +.public SPATK_STAT_IDX +.public StringFromMessageId +.public SubstitutePlaceholderStringTags +.public TryActivateWeather +.public TryEndStatusWithAbility +.public TryExplosion +.public TryIncreaseHp +.public TryInflictBadlyPoisonedStatus +.public TryInflictBurnStatus +.public TryInflictConfusedStatus +.public TryInflictConversion2Status +.public TryInflictCringeStatus +.public TryInflictFrozenStatus +.public TryInflictMistStatus +.public TryInflictParalysisStatus +.public TryInflictPoisonedStatus +.public TryInflictSafeguardStatus +.public TryInflictShadowHoldStatus +.public TryInflictStockpileStatus +.public TryInflictTauntStatus +.public TryInflictWishStatus +.public TryWarp +.public WEATHER_MOVE_TURN_COUNT diff --git a/asm/include/overlay_29_023350FC.inc b/asm/include/overlay_29_023350FC.inc index 358aa59a..db109f11 100644 --- a/asm/include/overlay_29_023350FC.inc +++ b/asm/include/overlay_29_023350FC.inc @@ -1,11 +1,16 @@ #pragma once +.public __divsi3 +.public _020AFC70 .public AbilityIsActiveVeneer .public CalcSpeedStageWrapper .public CalcStatusDuration +.public CASTFORM_WEATHER_ATTRIBUTE_TABLE .public CeilFixedPoint .public Conversion2IsActive .public DebugPrint0 -.public __divsi3 +.public DIRECTIONS_XY +.public DrawMinimapTile +.public DungeonGetSpriteIndex .public DungeonGoesUp .public EntityIsValid__023350D8 .public EntityIsValid__02337CA8 @@ -13,21 +18,20 @@ .public GetBgRegionArea .public GetLanguage .public GetLeader +.public GetMonsterApparentId .public GetSleepAnimationId -.public DungeonGetSpriteIndex .public GetType +.public GetVisibilityRange +.public GetWeatherColorTable .public HasLowHealth +.public InitRender3dElement64 +.public IsBackgroundTileset +.public IsCurrentFixedRoomBossFight .public IsGoldenChamber .public IsSecretBazaar .public LoadWteFromFileDirectory .public LoadWtuFromBin .public LogMessageByIdWithPopupCheckUser -.public ProcessWte -.public RandIntSafe -.public SetBothScreensWindowColorToDefault -.public SetScreenWindowsColor -.public TickStatusTurnCounter -.public IsBackgroundTileset .public ov10_022C2588 .public ov10_022C25EC .public ov10_022C2638 @@ -35,29 +39,47 @@ .public ov10_022C26A0 .public ov10_022C26BC .public ov10_022C2720 +.public ov10_022C478C .public ov29_022DE0EC .public ov29_022DE608 -.public GetWeatherColorTable .public ov29_022E0378 -.public IsCurrentFixedRoomBossFight .public ov29_022E2930 -.public GetVisibilityRange .public ov29_022E65F4 .public ov29_022E66C4 .public ov29_022E9A6C .public ov29_022E9F80 -.public GetMonsterApparentId .public ov29_022FF958 .public ov29_02304830 .public ov29_02304BAC .public ov29_02334E70 -.public DrawMinimapTile +.public ov29_02352B4C +.public ov29_02352B60 +.public ov29_02352B74 +.public ov29_02352B88 +.public ov29_02352B9C +.public ov29_02352D58 +.public ov29_02352F14 +.public ov29_02353538 +.public ov29_0235371C +.public ov29_02353720 +.public ov29_02353724 +.public ov29_0237C850 +.public ov29_0237C9B8 +.public ov29_0237CA8C +.public ov29_0237CA90 +.public ov29_0237CA96 +.public ov29_0237CAA0 +.public ov29_0237CAAC +.public ov29_0237CAB8 +.public ProcessWte +.public RandIntSafe +.public SECONDARY_TERRAIN_TYPES +.public SetBothScreensWindowColorToDefault +.public SetScreenWindowsColor .public sub_0201E020 .public sub_0201E080 -.public InitRender3dElement64 .public sub_0201F2A0 .public sub_0204AED0 .public sub_02051D8C .public sub_02051E60 -.public SECONDARY_TERRAIN_TYPES -.public DIRECTIONS_XY +.public TickStatusTurnCounter diff --git a/asm/include/overlay_29_023456BC.inc b/asm/include/overlay_29_023456BC.inc index d719dfc3..013d4712 100644 --- a/asm/include/overlay_29_023456BC.inc +++ b/asm/include/overlay_29_023456BC.inc @@ -1,12 +1,18 @@ #pragma once +.public __divsi3 +.public _020AFC4C .public AbilityIsActiveVeneer .public abs .public AddMoneyCarried .public AdvanceFrame .public ApplyItemEffect +.public BAG_ITEMS_PTR_MIRROR .public ClearItem +.public DIRECTIONS_XY +.public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST +.public DISPLACEMENTS_WITHIN_3 .public DisplayMessage2 -.public __divsi3 +.public DrawMinimapTile .public DungeonRand16Bit .public DungeonRandInt .public DungeonRandOutcome__022EAB20 @@ -18,10 +24,13 @@ .public GetActualSellPrice .public GetCurrentBagCapacity .public GetExclusiveItem +.public GetItemAction .public GetItemAtIdx .public GetItemCategoryVeneer +.public GetItemInfo .public GetItemMoveId16 .public GetItemSpriteId +.public GetItemToUseByIndex .public GetLeader .public GetTile .public GetTileSafe @@ -29,34 +38,33 @@ .public InitMove .public InitStandardItem .public IqSkillIsEnabled +.public IsCurrentFixedRoomBossFight .public IsCurrentMissionType .public IsHM +.public IsLosableItem +.public IsMarowakTrainingMaze .public IsMonsterIdInNormalRange .public IsNotMoney +.public IsShoppableItem .public IsUnown +.public IsWaterTileset .public ItemZInit .public LogMessageByIdQuiet .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget .public LogMessageByIdWithPopupCheckUserUnknown -.public RemoveEmptyItemsInBag -.public RetrieveFromItemList1 -.public SetItemAcquired -.public SubstitutePlaceholderStringTags -.public TestItemAiFlag -.public IsCurrentFixedRoomBossFight -.public IsMarowakTrainingMaze +.public MONEY_QUANTITY_TABLE +.public MonsterHasEmbargoStatus +.public ov10_022C4474 +.public ov10_022C44C8 +.public ov10_022C48EC +.public ov10_022C4CD8 .public ov29_022E09E8 -.public GetItemInfo -.public UpdateEntityPixelPos .public ov29_022E1A84 .public ov29_022E1A90 -.public ShouldDisplayEntityWrapper .public ov29_022E563C .public ov29_022E9488 .public ov29_022EACBC -.public GetItemToUseByIndex -.public GetItemAction .public ov29_022EBB8C .public ov29_022EBB98 .public ov29_022FAFD4 @@ -66,22 +74,27 @@ .public ov29_022FBA70 .public ov29_023009A0 .public ov29_02307BDC -.public MonsterHasEmbargoStatus -.public TwoTurnMoveForcedMiss -.public IsWaterTileset .public ov29_02338430 -.public DrawMinimapTile .public ov29_02344B44 .public ov29_02344B70 .public ov29_02344BF8 -.public SpawnItem .public ov29_02348020 .public ov29_0234B084 .public ov29_0234B4CC -.public YesNoMenu +.public ov29_023516FC +.public ov29_023531BC +.public ov29_023531C8 +.public ov29_02353538 +.public ov29_023537B4 +.public ov29_023537BC +.public ov29_0237C864 +.public RemoveEmptyItemsInBag +.public RetrieveFromItemList1 +.public SECONDARY_TERRAIN_TYPES +.public SetItemAcquired +.public ShouldDisplayEntityWrapper +.public SpawnItem .public sub_020018D0 -.public IsLosableItem -.public IsShoppableItem .public sub_0200CF6C .public sub_0200D1FC .public sub_0200D894 @@ -92,6 +105,8 @@ .public sub_0204F7A8 .public sub_02053D1C .public sub_02057CE8 -.public SECONDARY_TERRAIN_TYPES -.public DIRECTIONS_XY -.public BAG_ITEMS_PTR_MIRROR +.public SubstitutePlaceholderStringTags +.public TestItemAiFlag +.public TwoTurnMoveForcedMiss +.public UpdateEntityPixelPos +.public YesNoMenu diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc index 2ab93495..6a028e6d 100644 --- a/asm/include/overlay_29_023498A0.inc +++ b/asm/include/overlay_29_023498A0.inc @@ -1,5 +1,10 @@ #pragma once .public AdvanceFrame +.public AllowPortraitDefault +.public AnimationDelayOrSomething +.public BAG_ITEMS_PTR_MIRROR +.public CanSeeTarget +.public ChangeDungeonMusic .public CreateDBox .public CreatePortraitBox .public DebugPrint0 @@ -7,6 +12,7 @@ .public DungeonFree .public DungeonRandInt .public DungeonZInit +.public EndNegativeStatusConditionWrapper .public EntityIsValid__0234987C .public FemaleToMaleForm .public FixedRoomIsSubstituteRoom @@ -22,11 +28,13 @@ .public GetItemToDeliver .public GetItemToRetrieve .public GetLeader +.public GetMissionDestination .public GetMissionTargetEnemy .public GetMonsterGenderVeneer .public GetMonsterPreEvolution .public GetName .public GetPerformanceFlagWithChecks +.public GetRandomSpawnMonsterID .public GetSecondFormIfValid .public GetSpecialTargetItem .public GetTargetMonsterNotFoundFlag @@ -34,14 +42,17 @@ .public HidePortraitBox .public InitPortraitBox .public InitPreprocessorArgs +.public InitRender3dElement64 .public IsCastform .public IsCherrim .public IsCurrentMissionType .public IsCurrentMissionTypeExact .public IsDBoxActive +.public IsDestinationFloor .public IsDestinationFloorWithFleeingOutlaw .public IsDestinationFloorWithHiddenOutlaw .public IsExperienceLocked +.public IsFullFloorFixedRoom .public IsFutureDungeon .public IsJirachiChallengeFloor .public IsSecretFloor @@ -51,21 +62,7 @@ .public MemAlloc .public MemFree .public MemZero -.public OverlayIsLoaded -.public PreprocessString -.public RunDungeon -.public SetAdventureLogDungeonFloor -.public SetBothScreensWindowsColor -.public SetDungeonTipShown -.public SetPortraitLayout -.public ShouldMonsterHeadToStairs -.public ShowPortraitBox -.public StringFromMessageId -.public strlen -.public strncmp -.public strncpy -.public SubstitutePlaceholderStringTags -.public UnloadOverlay +.public MusicTableIdxToMusicId .public ov10_022BF764 .public ov10_022BF7D4 .public ov10_022BFD20 @@ -96,10 +93,7 @@ .public ov29_022E0CFC .public ov29_022E0E8C .public ov29_022E0F14 -.public ShouldDisplayEntityWrapper -.public CanSeeTarget .public ov29_022E2CA0 -.public AnimationDelayOrSomething .public ov29_022E550C .public ov29_022E68F0 .public ov29_022E6DD0 @@ -112,8 +106,6 @@ .public ov29_022EAC8C .public ov29_022EACBC .public ov29_022EACE4 -.public MusicTableIdxToMusicId -.public ChangeDungeonMusic .public ov29_022EAEFC .public ov29_022EAF34 .public ov29_022EAFB0 @@ -125,27 +117,62 @@ .public ov29_022FBBEC .public ov29_023009CC .public ov29_02300B04 -.public EndNegativeStatusConditionWrapper .public ov29_0231ADA8 .public ov29_0231AF24 -.public IsFullFloorFixedRoom -.public PositionIsOnStairs .public ov29_02337EE8 -.public GetRandomSpawnMonsterID .public ov29_0233804C .public ov29_02339148 .public ov29_0233992C .public ov29_0233A248 .public ov29_02344B44 .public ov29_02344B9C -.public RemoveGroundItem -.public RemoveEmptyItemsInBagWrapper .public ov29_02348888 .public ov29_02348A18 -.public GetMissionDestination .public ov29_023491B8 -.public IsDestinationFloor .public ov29_023496B0 +.public ov29_02353214 +.public ov29_02353238 +.public ov29_02353240 +.public ov29_02353248 +.public ov29_02353250 +.public ov29_02353258 +.public ov29_02353260 +.public ov29_02353268 +.public ov29_02353270 +.public ov29_02353278 +.public ov29_02353280 +.public ov29_02353288 +.public ov29_02353290 +.public ov29_02353298 +.public ov29_023532A0 +.public ov29_023532A8 +.public ov29_023532B0 +.public ov29_023532B8 +.public ov29_023532C0 +.public ov29_023532C8 +.public ov29_023532D8 +.public ov29_023532E0 +.public ov29_023532E8 +.public ov29_023532F0 +.public ov29_023532F8 +.public ov29_02353300 +.public ov29_02353308 +.public ov29_02353310 +.public ov29_02353368 +.public ov29_02353380 +.public ov29_02353398 +.public ov29_0235352C +.public ov29_02353538 +.public ov29_02353563 +.public ov29_023537C8 +.public ov29_023537CC +.public ov29_023537D8 +.public ov29_023537E0 +.public ov29_023537E4 +.public ov29_023537E8 +.public ov29_0237C694 +.public ov29_0237D000 +.public ov29_02382800 .public ov30_02382820 .public ov30_02382874 .public ov30_0238298C @@ -155,6 +182,23 @@ .public ov30_02382C30 .public ov30_02382C68 .public ov30_023842F4 +.public OverlayIsLoaded +.public PositionIsOnStairs +.public PreprocessString +.public RemoveEmptyItemsInBagWrapper +.public RemoveGroundItem +.public RunDungeon +.public SetAdventureLogDungeonFloor +.public SetBothScreensWindowsColor +.public SetDungeonTipShown +.public SetPortraitLayout +.public ShouldDisplayEntityWrapper +.public ShouldMonsterHeadToStairs +.public ShowPortraitBox +.public StringFromMessageId +.public strlen +.public strncmp +.public strncpy .public sub_02001808 .public sub_0200383C .public sub_020038D8 @@ -191,7 +235,6 @@ .public sub_0201D804 .public sub_0201DDFC .public sub_0201DE10 -.public InitRender3dElement64 .public sub_0201F2A0 .public sub_0201F464 .public sub_02024FB8 @@ -229,10 +272,10 @@ .public sub_02048360 .public sub_02048DC4 .public sub_0204AFF8 -.public AllowPortraitDefault .public sub_0204F9CC .public sub_02051DD0 .public sub_02051E60 .public sub_0205BAB0 .public sub_020778D0 -.public BAG_ITEMS_PTR_MIRROR +.public SubstitutePlaceholderStringTags +.public UnloadOverlay diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index 2e7adf96..0832f426 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -169910,7 +169910,10 @@ _020A1884: .byte 0x2C, 0x01, 0x00, 0x00 .global GUMMI_STAT_BOOST GUMMI_STAT_BOOST: - .byte 0x01, 0x00, 0x00, 0x00, 0x4B, 0x01, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00 + .global _020A188C +_020A188C: + .byte 0x4B, 0x01, 0x00, 0x00 .global WONDER_GUMMI_IQ_GAIN WONDER_GUMMI_IQ_GAIN: .byte 0x0F, 0x00, 0x00, 0x00 @@ -169926,6 +169929,8 @@ _020A189C: .global _020A18A0 _020A18A0: .byte 0x05, 0x00, 0x00, 0x00 + .global _020A18A4 +_020A18A4: .byte 0x96, 0x00, 0x00, 0x00 .global DEF_SCARF_STAT_BOOST DEF_SCARF_STAT_BOOST: diff --git a/asm/overlay_10.s b/asm/overlay_10.s index 8fb67795..361ba844 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -9131,7 +9131,15 @@ ov10_022C441C: .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_022C4424 +ov10_022C4424: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C4428 +ov10_022C4428: + .byte 0x3C, 0x00, 0x00, 0x00 + .global ov10_022C442C +ov10_022C442C: + .byte 0x21, 0x00, 0x00, 0x00 .global SPAWN_CAP_NO_MONSTER_HOUSE SPAWN_CAP_NO_MONSTER_HOUSE: .byte 0x0F, 0x00, 0x00, 0x00 @@ -9143,8 +9151,22 @@ OREN_BERRY_DAMAGE: .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 0xC9, 0x00, 0x00, 0x00 + .global ov10_022C4440 +ov10_022C4440: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C4444 +ov10_022C4444: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4448 +ov10_022C4448: + .byte 0x0F, 0x00, 0x00, 0x00 + .global ov10_022C444C +ov10_022C444C: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C4450 +ov10_022C4450: + .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C4454 ov10_022C4454: .byte 0x02, 0x00, 0x00, 0x00 @@ -9153,14 +9175,24 @@ ov10_022C4458: .byte 0x0A, 0x00, 0x00, 0x00 .global ov10_022C445C ov10_022C445C: - .byte 0x1E, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C4460 +ov10_022C4460: + .byte 0x0C, 0x00, 0x00, 0x00 + .global ov10_022C4464 +ov10_022C4464: .byte 0x18, 0x00, 0x00, 0x00 .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 0x05, 0x00, 0x00, 0x00 + .global ov10_022C4470 +ov10_022C4470: + .byte 0x0F, 0x00, 0x00, 0x00 + .global ov10_022C4474 +ov10_022C4474: .byte 0x21, 0x00, 0x00, 0x00 .global SITRUS_BERRY_HP_RESTORATION SITRUS_BERRY_HP_RESTORATION: @@ -9171,20 +9203,42 @@ ov10_022C447C: .global ov10_022C4480 ov10_022C4480: .byte 0x14, 0x00, 0x00, 0x00 - .byte 0x28, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4484 +ov10_022C4484: + .byte 0x28, 0x00, 0x00, 0x00 + .global ov10_022C4488 +ov10_022C4488: + .byte 0x14, 0x00, 0x00, 0x00 .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 + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4490 +ov10_022C4490: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4494 +ov10_022C4494: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C4498 +ov10_022C4498: + .byte 0x19, 0x00, 0x00, 0x00 .global FIRE_FANG_CRINGE_CHANCE FIRE_FANG_CRINGE_CHANCE: - .byte 0x19, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 + .byte 0x19, 0x00, 0x00, 0x00 + .global ov10_022C44A0 +ov10_022C44A0: + .byte 0x32, 0x00, 0x00, 0x00 .global WHIRLPOOL_CONSTRICTION_CHANCE WHIRLPOOL_CONSTRICTION_CHANCE: - .byte 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C44A8 +ov10_022C44A8: + .byte 0x0A, 0x00, 0x00, 0x00 .global MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS: - .byte 0x07, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 + .byte 0x07, 0x00, 0x00, 0x00 + .global ov10_022C44B0 +ov10_022C44B0: + .byte 0x0A, 0x00, 0x00, 0x00 .global ov10_022C44B4 ov10_022C44B4: .byte 0x05, 0x00, 0x00, 0x00 @@ -9193,10 +9247,16 @@ HEAL_ORDER_HP_RESTORATION: .byte 0x28, 0x00, 0x00, 0x00 .global ov10_022C44BC ov10_022C44BC: - .byte 0x03, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .global ov10_022C44C0 +ov10_022C44C0: + .byte 0x0A, 0x00, 0x00, 0x00 .global STEEL_WING_BOOST_DEFENSE_CHANCE STEEL_WING_BOOST_DEFENSE_CHANCE: - .byte 0x14, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C44C8 +ov10_022C44C8: + .byte 0x19, 0x00, 0x00, 0x00 .global ov10_022C44CC ov10_022C44CC: .byte 0x19, 0x00, 0x00, 0x00 @@ -9235,7 +9295,10 @@ LIFE_SEED_HP_BOOST: .byte 0x03, 0x00, 0x00, 0x00 .global ov10_022C44FC ov10_022C44FC: - .byte 0x32, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00 + .byte 0x32, 0x00, 0x00, 0x00 + .global ov10_022C4500 +ov10_022C4500: + .byte 0x3C, 0x00, 0x00, 0x00 .global ov10_022C4504 ov10_022C4504: .byte 0x14, 0x00, 0x00, 0x00 @@ -9248,34 +9311,54 @@ LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE: .global SUPER_LUCK_CRIT_RATE_BOOST SUPER_LUCK_CRIT_RATE_BOOST: .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4514 +ov10_022C4514: .byte 0x14, 0x00, 0x00, 0x00 .global ICE_FANG_FREEZE_CHANCE ICE_FANG_FREEZE_CHANCE: - .byte 0x0F, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00 + .byte 0x0F, 0x00, 0x00, 0x00 + .global ov10_022C451C +ov10_022C451C: + .byte 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_022C4524 +ov10_022C4524: + .byte 0x0C, 0x00, 0x00, 0x00 + .global ov10_022C4528 +ov10_022C4528: + .byte 0x0F, 0x00, 0x00, 0x00 .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_022C4534 +ov10_022C4534: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4538 +ov10_022C4538: + .byte 0x19, 0x00, 0x00, 0x00 .global ICE_FANG_CRINGE_CHANCE ICE_FANG_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00 .global BLAZE_KICK_BURN_CHANCE BLAZE_KICK_BURN_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4544 +ov10_022C4544: .byte 0x0A, 0x00, 0x00, 0x00 .global DIZZY_PUNCH_CONFUSE_CHANCE DIZZY_PUNCH_CONFUSE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 .global SECRET_POWER_EFFECT_CHANCE SECRET_POWER_EFFECT_CHANCE: - .byte 0x1E, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C4550 +ov10_022C4550: + .byte 0x0C, 0x00, 0x00, 0x00 .global METAL_CLAW_BOOST_ATTACK_CHANCE METAL_CLAW_BOOST_ATTACK_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 @@ -9288,7 +9371,12 @@ TECHNICIAN_MOVE_POWER_THRESHOLD: .global ov10_022C4560 ov10_022C4560: .byte 0x08, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4564 +ov10_022C4564: + .byte 0x0C, 0x00, 0x00, 0x00 + .global ov10_022C4568 +ov10_022C4568: + .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C456C ov10_022C456C: .byte 0x12, 0x00, 0x00, 0x00 @@ -9297,14 +9385,22 @@ ov10_022C4570: .byte 0x05, 0x00, 0x00, 0x00 .global ov10_022C4574 ov10_022C4574: - .byte 0x02, 0x00, 0x00, 0x00, 0x6A, 0xFF, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00 + .global ov10_022C4578 +ov10_022C4578: + .byte 0x6A, 0xFF, 0x00, 0x00 .global ov10_022C457C ov10_022C457C: .byte 0x03, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00 + .global ov10_022C4584 +ov10_022C4584: .byte 0x1E, 0x00, 0x00, 0x00 .global LEECH_SEED_HP_DRAIN LEECH_SEED_HP_DRAIN: - .byte 0x0A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C458C +ov10_022C458C: + .byte 0x0C, 0x00, 0x00, 0x00 .global ov10_022C4590 ov10_022C4590: .byte 0x0A, 0x00, 0x00, 0x00 @@ -9325,13 +9421,25 @@ 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 + .byte 0x08, 0x00, 0x00, 0x00 + .global ov10_022C45AC +ov10_022C45AC: + .byte 0x0C, 0x00, 0x00, 0x00 + .global ov10_022C45B0 +ov10_022C45B0: + .byte 0x32, 0x00, 0x00, 0x00 .global ov10_022C45B4 ov10_022C45B4: - .byte 0x1E, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C45B8 +ov10_022C45B8: + .byte 0x20, 0x00, 0x00, 0x00 .global ov10_022C45BC ov10_022C45BC: - .byte 0x0A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C45C0 +ov10_022C45C0: + .byte 0x0C, 0x00, 0x00, 0x00 .global ov10_022C45C4 ov10_022C45C4: .byte 0x1E, 0x00, 0x00, 0x00 @@ -9376,7 +9484,12 @@ ov10_022C45F8: .byte 0x02, 0x00, 0x00, 0x00 .global ov10_022C45FC ov10_022C45FC: - .byte 0x05, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .global ov10_022C4600 +ov10_022C4600: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C4604 +ov10_022C4604: .byte 0x14, 0x00, 0x00, 0x00 .global CRUSH_CLAW_LOWER_DEFENSE_CHANCE CRUSH_CLAW_LOWER_DEFENSE_CHANCE: @@ -9389,14 +9502,42 @@ 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 + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4618 +ov10_022C4618: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C461C +ov10_022C461C: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4620 +ov10_022C4620: + .byte 0x04, 0x00, 0x00, 0x00 .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 + .byte 0x01, 0x00, 0x00, 0x00 + .global ov10_022C4628 +ov10_022C4628: + .byte 0x08, 0x00, 0x00, 0x00 + .global ov10_022C462C +ov10_022C462C: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4630 +ov10_022C4630: + .byte 0x9C, 0xFF, 0x00, 0x00 + .global ov10_022C4634 +ov10_022C4634: + .byte 0x0F, 0x00, 0x00, 0x00 + .global ov10_022C4638 +ov10_022C4638: + .byte 0x0C, 0x00, 0x00, 0x00 + .global ov10_022C463C +ov10_022C463C: + .byte 0x12, 0x00, 0x00, 0x00 .global SPAWN_COOLDOWN_THIEF_ALERT SPAWN_COOLDOWN_THIEF_ALERT: .byte 0x03, 0x00, 0x00, 0x00 + .global ov10_022C4644 +ov10_022C4644: .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C4648 ov10_022C4648: @@ -9409,27 +9550,61 @@ ov10_022C4650: .byte 0x0A, 0x00, 0x00, 0x00 .global WEATHER_MOVE_TURN_COUNT WEATHER_MOVE_TURN_COUNT: - .byte 0xB8, 0x0B, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 + .byte 0xB8, 0x0B, 0x00, 0x00 + .global ov10_022C4658 +ov10_022C4658: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C465C +ov10_022C465C: + .byte 0x0F, 0x00, 0x00, 0x00 .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 + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4668 +ov10_022C4668: + .byte 0x0F, 0x00, 0x00, 0x00 .global SPEED_BOOST_TURNS SPEED_BOOST_TURNS: - .byte 0xFA, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00 + .byte 0xFA, 0x00, 0x00, 0x00 + .global ov10_022C4670 +ov10_022C4670: + .byte 0x23, 0x00, 0x00, 0x00 + .global ov10_022C4674 +ov10_022C4674: .byte 0x9C, 0xFF, 0x00, 0x00 .global THUNDER_FANG_CRINGE_CHANCE THUNDER_FANG_CRINGE_CHANCE: - .byte 0x19, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 + .byte 0x19, 0x00, 0x00, 0x00 + .global ov10_022C467C +ov10_022C467C: + .byte 0x0C, 0x00, 0x00, 0x00 .global ov10_022C4680 ov10_022C4680: .byte 0x3C, 0x00, 0x00, 0x00 .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 + .byte 0x19, 0x00, 0x00, 0x00 + .global ov10_022C4688 +ov10_022C4688: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C468C +ov10_022C468C: + .byte 0x0C, 0x00, 0x00, 0x00 + .global ov10_022C4690 +ov10_022C4690: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C4694 +ov10_022C4694: + .byte 0x14, 0x00, 0x00, 0x00 + .global ov10_022C4698 +ov10_022C4698: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C469C +ov10_022C469C: + .byte 0x0F, 0x00, 0x00, 0x00 .global ov10_022C46A0 ov10_022C46A0: .byte 0x32, 0x00, 0x00, 0x00 @@ -9465,7 +9640,10 @@ IRON_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00 .global CALCIUM_STAT_BOOST CALCIUM_STAT_BOOST: - .byte 0x03, 0x00, 0x00, 0x00, 0x24, 0xFF, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .global ov10_022C46D0 +ov10_022C46D0: + .byte 0x24, 0xFF, 0x00, 0x00 .global DRAGON_RAGE_FIXED_DAMAGE DRAGON_RAGE_FIXED_DAMAGE: .byte 0x1E, 0x00, 0x00, 0x00 @@ -9492,7 +9670,10 @@ SCOPE_LENS_CRIT_RATE_BOOST: .byte 0x0F, 0x00, 0x00, 0x00 .global HEALING_WISH_HP_RESTORATION HEALING_WISH_HP_RESTORATION: - .byte 0xE7, 0x03, 0x00, 0x00, 0x9C, 0xFF, 0x00, 0x00 + .byte 0xE7, 0x03, 0x00, 0x00 + .global ov10_022C46F8 +ov10_022C46F8: + .byte 0x9C, 0xFF, 0x00, 0x00 .global ov10_022C46FC ov10_022C46FC: .byte 0xC8, 0x00, 0x00, 0x00 @@ -9511,14 +9692,24 @@ ov10_022C470C: .global ME_FIRST_MULTIPLIER ME_FIRST_MULTIPLIER: .byte 0x80, 0x01, 0x00, 0x00 - .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00 + .global ov10_022C4714 +ov10_022C4714: + .byte 0x01, 0x00, 0x01, 0x00 + .global ov10_022C4718 +ov10_022C4718: + .byte 0x00, 0x02, 0x00, 0x00 .global IMPRISON_TURN_RANGE IMPRISON_TURN_RANGE: .byte 0x03, 0x00, 0x06, 0x00 .global SLEEP_TURN_RANGE SLEEP_TURN_RANGE: .byte 0x03, 0x00, 0x07, 0x00 - .byte 0x04, 0x00, 0x08, 0x00, 0x7F, 0x00, 0x7F, 0x00 + .global ov10_022C4724 +ov10_022C4724: + .byte 0x04, 0x00, 0x08, 0x00 + .global ov10_022C4728 +ov10_022C4728: + .byte 0x7F, 0x00, 0x7F, 0x00 .global ov10_022C472C ov10_022C472C: .byte 0x0A, 0x00, 0x0C, 0x00 @@ -9549,42 +9740,123 @@ MATCHUP_SUPER_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER: .global ov10_022C4750 ov10_022C4750: .byte 0x06, 0x00, 0x0C, 0x00 + .global ov10_022C4754 +ov10_022C4754: .byte 0x03, 0x00, 0x05, 0x00 .global MATCHUP_IMMUNE_MULTIPLIER MATCHUP_IMMUNE_MULTIPLIER: - .byte 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0A, 0x00 + .byte 0x80, 0x00, 0x00, 0x00 + .global ov10_022C475C +ov10_022C475C: + .byte 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 + .global ov10_022C4764 +ov10_022C4764: + .byte 0x08, 0x00, 0x10, 0x00 + .global ov10_022C4768 +ov10_022C4768: + .byte 0x08, 0x00, 0x10, 0x00 + .global ov10_022C476C +ov10_022C476C: + .byte 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_022C4774 +ov10_022C4774: + .byte 0x04, 0x00, 0x0A, 0x00 + .global ov10_022C4778 +ov10_022C4778: + .byte 0x04, 0x00, 0x0A, 0x00 + .global ov10_022C477C +ov10_022C477C: + .byte 0x7F, 0x00, 0x7F, 0x00 + .global ov10_022C4780 +ov10_022C4780: + .byte 0x04, 0x00, 0x0A, 0x00 + .global ov10_022C4784 +ov10_022C4784: + .byte 0x03, 0x00, 0x09, 0x00 + .global ov10_022C4788 +ov10_022C4788: + .byte 0x03, 0x00, 0x05, 0x00 + .global ov10_022C478C +ov10_022C478C: + .byte 0x0A, 0x00, 0x0C, 0x00 + .global ov10_022C4790 +ov10_022C4790: + .byte 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 0x0A, 0x00, 0x0C, 0x00 + .global ov10_022C4798 +ov10_022C4798: + .byte 0x0A, 0x00, 0x0C, 0x00 + .global ov10_022C479C +ov10_022C479C: + .byte 0x0A, 0x00, 0x14, 0x00 + .global ov10_022C47A0 +ov10_022C47A0: + .byte 0x7F, 0x00, 0x7F, 0x00 + .global ov10_022C47A4 +ov10_022C47A4: + .byte 0x02, 0x00, 0x04, 0x00 + .global ov10_022C47A8 +ov10_022C47A8: + .byte 0x1E, 0x00, 0x00, 0x00 + .global ov10_022C47AC +ov10_022C47AC: + .byte 0x02, 0x00, 0x04, 0x00 + .global ov10_022C47B0 +ov10_022C47B0: + .byte 0x0A, 0x00, 0x0C, 0x00 + .global ov10_022C47B4 +ov10_022C47B4: .byte 0x14, 0x00, 0x32, 0x00 .global ov10_022C47B8 ov10_022C47B8: - .byte 0x01, 0x00, 0x03, 0x00, 0x0A, 0x00, 0x0C, 0x00 + .byte 0x01, 0x00, 0x03, 0x00 + .global ov10_022C47BC +ov10_022C47BC: + .byte 0x0A, 0x00, 0x0C, 0x00 .global TINTED_LENS_MULTIPLIER TINTED_LENS_MULTIPLIER: .byte 0x33, 0x01, 0x00, 0x00 - .byte 0x01, 0x00, 0x04, 0x00, 0x14, 0x00, 0x1E, 0x00 + .global ov10_022C47C4 +ov10_022C47C4: + .byte 0x01, 0x00, 0x04, 0x00 + .global ov10_022C47C8 +ov10_022C47C8: + .byte 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 + .byte 0x0A, 0x00, 0x0C, 0x00 + .global ov10_022C47D0 +ov10_022C47D0: + .byte 0x03, 0x00, 0x03, 0x00 + .global ov10_022C47D4 +ov10_022C47D4: + .byte 0x0A, 0x00, 0x0A, 0x00 + .global ov10_022C47D8 +ov10_022C47D8: + .byte 0x0A, 0x00, 0x0A, 0x00 .global SHADOW_FORCE_DAMAGE_MULTIPLIER SHADOW_FORCE_DAMAGE_MULTIPLIER: .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_022C47E4 +ov10_022C47E4: + .byte 0x00, 0x02, 0x00, 0x00 + .global ov10_022C47E8 +ov10_022C47E8: + .byte 0x00, 0x02, 0x00, 0x00 + .global ov10_022C47EC +ov10_022C47EC: + .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C47F0 ov10_022C47F0: .byte 0x0A, 0x00, 0x00, 0x00 @@ -9593,11 +9865,22 @@ ov10_022C47F4: .byte 0x01, 0x00, 0x04, 0x00 .global POWER_PITCHER_DAMAGE_MULTIPLIER POWER_PITCHER_DAMAGE_MULTIPLIER: - .byte 0x80, 0x01, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00 + .byte 0x80, 0x01, 0x00, 0x00 + .global ov10_022C47FC +ov10_022C47FC: + .byte 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_022C4804 +ov10_022C4804: + .byte 0x04, 0x00, 0x06, 0x00 + .global ov10_022C4808 +ov10_022C4808: + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov10_022C480C +ov10_022C480C: + .byte 0x7F, 0x00, 0x7F, 0x00 .global MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER: .byte 0xB5, 0x00, 0x00, 0x00 @@ -9615,13 +9898,22 @@ MATCHUP_IMMUNE_MULTIPLIER_ERRATIC_PLAYER: .byte 0x40, 0x00, 0x00, 0x00 .global MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER MATCHUP_NOT_VERY_EFFECTIVE_MULTIPLIER_ERRATIC_PLAYER: - .byte 0x80, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 + .byte 0x80, 0x00, 0x00, 0x00 + .global ov10_022C4828 +ov10_022C4828: + .byte 0x0A, 0x00, 0x0A, 0x00 .global MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER MATCHUP_NEUTRAL_MULTIPLIER_ERRATIC_PLAYER: - .byte 0x00, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 + .byte 0x00, 0x01, 0x00, 0x00 + .global ov10_022C4830 +ov10_022C4830: + .byte 0x0A, 0x00, 0x0A, 0x00 .global ov10_022C4834 ov10_022C4834: - .byte 0x32, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00 + .byte 0x32, 0x00, 0x00, 0x00 + .global ov10_022C4838 +ov10_022C4838: + .byte 0x7F, 0x00, 0x7F, 0x00 .global ov10_022C483C ov10_022C483C: .byte 0x3C, 0x00, 0x00, 0x00 @@ -9630,7 +9922,10 @@ ov10_022C4840: .byte 0x01, 0x00, 0x03, 0x00 .global AIR_BLADE_DAMAGE_MULTIPLIER AIR_BLADE_DAMAGE_MULTIPLIER: - .byte 0x80, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00 + .byte 0x80, 0x01, 0x00, 0x00 + .global ov10_022C4848 +ov10_022C4848: + .byte 0x0A, 0x00, 0x0A, 0x00 .global KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER: .byte 0x33, 0x01, 0x00, 0x00 @@ -9645,24 +9940,82 @@ ov10_022C4858: .byte 0x59, 0x01, 0x00, 0x00 .global ov10_022C485C ov10_022C485C: - .byte 0x0F, 0x00, 0x14, 0x00, 0x02, 0x00, 0x02, 0x00 + .byte 0x0F, 0x00, 0x14, 0x00 + .global ov10_022C4860 +ov10_022C4860: + .byte 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 + .byte 0x04, 0x00, 0x08, 0x00 + .global ov10_022C486C +ov10_022C486C: + .byte 0x7F, 0x00, 0x7F, 0x00 + .global ov10_022C4870 +ov10_022C4870: + .byte 0x03, 0x00, 0x05, 0x00 + .global ov10_022C4874 +ov10_022C4874: + .byte 0x7F, 0x00, 0x7F, 0x00 + .global ov10_022C4878 +ov10_022C4878: + .byte 0x7F, 0x00, 0x7F, 0x00 + .global ov10_022C487C +ov10_022C487C: + .byte 0x28, 0x00, 0x32, 0x00 + .global ov10_022C4880 +ov10_022C4880: + .byte 0x7F, 0x00, 0x7F, 0x00 + .global ov10_022C4884 +ov10_022C4884: + .byte 0x01, 0x00, 0x01, 0x00 + .global ov10_022C4888 +ov10_022C4888: + .byte 0x08, 0x00, 0x0A, 0x00 + .global ov10_022C488C +ov10_022C488C: + .byte 0x06, 0x00, 0x08, 0x00 + .global ov10_022C4890 +ov10_022C4890: + .byte 0x06, 0x00, 0x0C, 0x00 + .global ov10_022C4894 +ov10_022C4894: + .byte 0x01, 0x00, 0x02, 0x00 + .global ov10_022C4898 +ov10_022C4898: + .byte 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 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov10_022C48A0 +ov10_022C48A0: + .byte 0x03, 0x00, 0x06, 0x00 + .global ov10_022C48A4 +ov10_022C48A4: + .byte 0x00, 0x02, 0x00, 0x00 + .global ov10_022C48A8 +ov10_022C48A8: + .byte 0x00, 0x02, 0x00, 0x00 + .global ov10_022C48AC +ov10_022C48AC: + .byte 0x02, 0x00, 0x05, 0x00 + .global ov10_022C48B0 +ov10_022C48B0: + .byte 0x00, 0x02, 0x00, 0x00 + .global ov10_022C48B4 +ov10_022C48B4: + .byte 0x00, 0x02, 0x00, 0x00 + .global ov10_022C48B8 +ov10_022C48B8: + .byte 0x0F, 0x00, 0x1E, 0x00 .global SKULL_BASH_DAMAGE_MULTIPLIER SKULL_BASH_DAMAGE_MULTIPLIER: - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00 + .global ov10_022C48C0 +ov10_022C48C0: + .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C48C4 ov10_022C48C4: .byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -9677,7 +10030,10 @@ WEATHER_BALL_TYPE_TABLE: .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 + .byte 0x20, 0x00, 0x20, 0x00, 0x47, 0x00, 0x47, 0x00 + .global ov10_022C48EC +ov10_022C48EC: + .byte 0x00, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00 .global ov10_022C48F4 ov10_022C48F4: .byte 0x7C, 0x05, 0x79, 0x05, 0x7A, 0x05, 0x7B, 0x05, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x14, 0x00 @@ -9698,13 +10054,23 @@ ov10_022C4934: .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 + .global ov10_022C4954 +ov10_022C4954: .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 .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 + .global ov10_022C4974 +ov10_022C4974: .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 + .global ov10_022C4984 +ov10_022C4984: .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 + .global ov10_022C4994 +ov10_022C4994: .byte 0x00, 0x02, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 + .global ov10_022C49A4 +ov10_022C49A4: .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .global WRING_OUT_DAMAGE_MULT_TABLE WRING_OUT_DAMAGE_MULT_TABLE: @@ -9783,6 +10149,8 @@ ov10_022C4B18: 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 + .global ov10_022C4B54 +ov10_022C4B54: .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 EAT_ITEM_EFFECT_IGNORE_LIST @@ -9804,7 +10172,13 @@ ov10_022C4BBC: 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 0x22, 0x01, 0x36, 0x01, 0xE7, 0x03, 0xE7, 0x03 + .global ov10_022C4C0C +ov10_022C4C0C: + .byte 0x32, 0x00 + .global ov10_022C4C0E +ov10_022C4C0E: + .byte 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 @@ -9835,7 +10209,10 @@ BAD_POISON_DAMAGE_TABLE: .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 - .byte 0x06, 0x00, 0x06, 0x00, 0x45, 0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x4A, 0x00, 0x4B, 0x00 + .byte 0x06, 0x00, 0x06, 0x00 + .global ov10_022C4CD8 +ov10_022C4CD8: + .byte 0x45, 0x00, 0x46, 0x00, 0x47, 0x00, 0x48, 0x00, 0x4A, 0x00, 0x4B, 0x00 .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 @@ -9867,7 +10244,12 @@ DEFENSIVE_STAT_STAGE_MULTIPLIERS: .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 .byte 0x19, 0x02, 0x00, 0x00, 0x4C, 0x02, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xB3, 0x02, 0x00, 0x00 - .byte 0xE6, 0x02, 0x00, 0x00, 0x19, 0x03, 0x00, 0x00, 0x4C, 0x03, 0x00, 0x00, 0xDB, 0x00, 0x00, 0x00 + .byte 0xE6, 0x02, 0x00, 0x00, 0x19, 0x03, 0x00, 0x00, 0x4C, 0x03, 0x00, 0x00 + .global ov10_022C4E40 +ov10_022C4E40: + .byte 0xDB, 0x00, 0x00, 0x00 + .global ov10_022C4E44 +ov10_022C4E44: .byte 0x70, 0x2A, 0x33, 0x02, 0x7C, 0x00, 0x00, 0x00, 0x30, 0x82, 0x32, 0x02, 0x7F, 0x00, 0x00, 0x00 .byte 0x34, 0x70, 0x32, 0x02, 0x91, 0x00, 0x00, 0x00, 0x70, 0x2A, 0x33, 0x02, 0x76, 0x00, 0x00, 0x00 .byte 0x70, 0x2A, 0x33, 0x02, 0xFB, 0x00, 0x00, 0x00, 0x70, 0x2A, 0x33, 0x02, 0xFF, 0x00, 0x00, 0x00 @@ -9982,12 +10364,18 @@ SHOP_ITEM_CHANCES: .byte 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00 .byte 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x64, 0x00 .byte 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00 - .byte 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x54, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00 + .byte 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00 + .global ov10_022C540C +ov10_022C540C: + .byte 0x54, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00 .byte 0x5E, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00 .byte 0x8C, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x00, 0x00 .byte 0x00, 0x01, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00 .byte 0xA6, 0x01, 0x00, 0x00, 0xB3, 0x01, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00 - .byte 0xD9, 0x01, 0x00, 0x00, 0xE6, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + .byte 0xD9, 0x01, 0x00, 0x00, 0xE6, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + .global ov10_022C5460 +ov10_022C5460: + .byte 0x00, 0x02, 0x00, 0x00 .byte 0xE6, 0x01, 0x00, 0x00, 0xD9, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00 .byte 0xB3, 0x01, 0x00, 0x00, 0xA6, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00 .byte 0x59, 0x01, 0x00, 0x00, 0x07, 0x01, 0x00, 0x00, 0xCC, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00 @@ -10254,6 +10642,8 @@ ov10_022C6321: .global ov10_022C6322 ov10_022C6322: .byte 0x01, 0x00 + .global ov10_022C6324 +ov10_022C6324: .byte 0x09, 0x00 .global ov10_022C6326 ov10_022C6326: diff --git a/asm/overlay_29_02300108.s b/asm/overlay_29_02300108.s index d46a2b6d..5cd7bd92 100644 --- a/asm/overlay_29_02300108.s +++ b/asm/overlay_29_02300108.s @@ -5,7 +5,7 @@ arm_func_start GetMonsterDisplayNameType GetMonsterDisplayNameType: ; 0x02300108 - ldr r1, _02300160 ; =0x02353538 + ldr r1, _02300160 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r2, [r1, #0x23e] @@ -30,7 +30,7 @@ _0230014C: movne r0, #0 bx lr .align 2, 0 -_02300160: .word 0x02353538 +_02300160: .word ov29_02353538 arm_func_end GetMonsterDisplayNameType arm_func_start GetMonsterName @@ -126,7 +126,7 @@ ov29_0230027C: ; 0x0230027C ldr r1, _023002C0 ; =0x00000C32 add r0, sp, #0 bl sub_020258E4 - ldr r1, _023002C4 ; =0x023527C0 + ldr r1, _023002C4 ; =ov29_023527C0 add r2, sp, #0 mov r0, r4 bl SprintfStatic @@ -138,7 +138,7 @@ _023002B8: ldmia sp!, {r4, pc} .align 2, 0 _023002C0: .word 0x00000C32 -_023002C4: .word 0x023527C0 +_023002C4: .word ov29_023527C0 arm_func_end ov29_0230027C arm_func_start SprintfStatic @@ -166,7 +166,7 @@ ov29_023002F0: ; 0x023002F0 ldr r0, _02300350 ; =0x00000C33 bl StringFromMessageId mov r3, r0 - ldr r1, _02300354 ; =0x023527D0 + ldr r1, _02300354 ; =ov29_023527D0 mov r0, r5 mov r2, r4 bl SprintfStatic @@ -185,13 +185,13 @@ _02300344: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02300350: .word 0x00000C33 -_02300354: .word 0x023527D0 +_02300354: .word ov29_023527D0 arm_func_end ov29_023002F0 arm_func_start ov29_02300358 ov29_02300358: ; 0x02300358 stmdb sp!, {r4, lr} - ldr r2, _02300400 ; =0x02353538 + ldr r2, _02300400 ; =ov29_02353538 mov r4, r0 ldr r0, [r2] add r0, r0, #0x1a000 @@ -237,7 +237,7 @@ _023003F0: bl sub_0205858C ldmia sp!, {r4, pc} .align 2, 0 -_02300400: .word 0x02353538 +_02300400: .word ov29_02353538 _02300404: .word 0x00000C35 _02300408: .word 0x00000C33 arm_func_end ov29_02300358 @@ -1042,7 +1042,7 @@ ov29_02300E78: ; 0x02300E78 bl GetMobilityTypeCheckSlipAndFloating ldr r2, _02300F24 ; =DIRECTIONS_XY mov ip, r5, lsl #2 - ldr r1, _02300F28 ; =0x0235171E + ldr r1, _02300F28 ; =ov29_0235171E ldrsh r3, [r2, ip] ldrsh lr, [r6, #4] mov r4, r0 @@ -1068,7 +1068,7 @@ ov29_02300E78: ; 0x02300E78 ldrsh r1, [r6, #6] bl GetTile add r0, r0, r4 - ldr r1, _02300F2C ; =0x02352798 + ldr r1, _02300F2C ; =ov29_02352798 and r2, r5, #7 ldrb r1, [r1, r2] ldrb r0, [r0, #8] @@ -1079,8 +1079,8 @@ ov29_02300E78: ; 0x02300E78 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02300F24: .word DIRECTIONS_XY -_02300F28: .word 0x0235171E -_02300F2C: .word 0x02352798 +_02300F28: .word ov29_0235171E +_02300F2C: .word ov29_02352798 arm_func_end ov29_02300E78 arm_func_start GetDirectionalMobilityType @@ -1135,7 +1135,7 @@ ov29_02300FCC: ; 0x02300FCC mov r4, r1 ldr r1, _02301050 ; =DIRECTIONS_XY mov ip, r4, lsl #2 - ldr r0, _02301054 ; =0x0235171E + ldr r0, _02301054 ; =ov29_0235171E ldrsh r3, [r1, ip] ldrsh lr, [r5, #4] ldrsh r1, [r0, ip] @@ -1154,7 +1154,7 @@ ov29_02300FCC: ; 0x02300FCC ldrsh r0, [r5, #4] ldrsh r1, [r5, #6] bl GetTile - ldr r1, _02301058 ; =0x02352790 + ldr r1, _02301058 ; =ov29_02352790 and r2, r4, #7 ldrb r1, [r1, r2] ldrb r0, [r0, #8] @@ -1165,8 +1165,8 @@ ov29_02300FCC: ; 0x02300FCC ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _02301050: .word DIRECTIONS_XY -_02301054: .word 0x0235171E -_02301058: .word 0x02352790 +_02301054: .word ov29_0235171E +_02301058: .word ov29_02352790 arm_func_end ov29_02300FCC arm_func_start CanMonsterMoveInDirection @@ -1179,7 +1179,7 @@ CanMonsterMoveInDirection: ; 0x0230105C bl GetMobilityTypeCheckSlipAndFloating ldr r2, _0230110C ; =DIRECTIONS_XY mov ip, r5, lsl #2 - ldr r1, _02301110 ; =0x0235171E + ldr r1, _02301110 ; =ov29_0235171E ldrsh r3, [r2, ip] ldrsh lr, [r6, #4] mov r4, r0 @@ -1207,7 +1207,7 @@ CanMonsterMoveInDirection: ; 0x0230105C ldrsh r1, [r6, #6] bl GetTile add r0, r0, r4 - ldr r1, _02301114 ; =0x02352788 + ldr r1, _02301114 ; =ov29_02352788 and r2, r5, #7 ldrb r1, [r1, r2] ldrb r0, [r0, #8] @@ -1217,8 +1217,8 @@ CanMonsterMoveInDirection: ; 0x0230105C ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _0230110C: .word DIRECTIONS_XY -_02301110: .word 0x0235171E -_02301114: .word 0x02352788 +_02301110: .word ov29_0235171E +_02301114: .word ov29_02352788 arm_func_end CanMonsterMoveInDirection arm_func_start IsMonsterCornered @@ -1253,7 +1253,7 @@ ov29_02301158: ; 0x02301158 bl GetMobilityTypeCheckSlipAndFloating ldr r2, _02301228 ; =DIRECTIONS_XY mov ip, r5, lsl #2 - ldr r1, _0230122C ; =0x0235171E + ldr r1, _0230122C ; =ov29_0235171E ldrsh r3, [r2, ip] ldrsh lr, [r6, #4] mov r4, r0 @@ -1289,7 +1289,7 @@ _023011E0: ldrsh r1, [r6, #6] bl GetTile add r0, r0, r4 - ldr r1, _02301230 ; =0x02352780 + ldr r1, _02301230 ; =ov29_02352780 and r2, r5, #7 ldrb r1, [r1, r2] ldrb r0, [r0, #8] @@ -1300,8 +1300,8 @@ _023011E0: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02301228: .word DIRECTIONS_XY -_0230122C: .word 0x0235171E -_02301230: .word 0x02352780 +_0230122C: .word ov29_0235171E +_02301230: .word ov29_02352780 arm_func_end ov29_02301158 arm_func_start CanAttackInDirection @@ -1316,7 +1316,7 @@ CanAttackInDirection: ; 0x02301234 ldr r1, _023012EC ; =DIRECTIONS_XY mov ip, r5, lsl #2 cmp r4, #1 - ldr r0, _023012F0 ; =0x0235171E + ldr r0, _023012F0 ; =ov29_0235171E ldrsh r3, [r1, ip] ldrsh lr, [r6, #4] ldrsh r1, [r0, ip] @@ -1344,7 +1344,7 @@ CanAttackInDirection: ; 0x02301234 ldrsh r1, [r6, #6] bl GetTile add r0, r0, r4 - ldr r1, _023012F4 ; =0x02352778 + ldr r1, _023012F4 ; =ov29_02352778 and r2, r5, #7 ldrb r1, [r1, r2] ldrb r0, [r0, #8] @@ -1354,8 +1354,8 @@ CanAttackInDirection: ; 0x02301234 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _023012EC: .word DIRECTIONS_XY -_023012F0: .word 0x0235171E -_023012F4: .word 0x02352778 +_023012F0: .word ov29_0235171E +_023012F4: .word ov29_02352778 arm_func_end CanAttackInDirection arm_func_start CanAiMonsterMoveInDirection @@ -1371,7 +1371,7 @@ CanAiMonsterMoveInDirection: ; 0x023012F8 strb r1, [r6] ldr r2, _02301484 ; =DIRECTIONS_XY mov r4, r7, lsl #2 - ldr r1, _02301488 ; =0x0235171E + ldr r1, _02301488 ; =ov29_0235171E ldrsh r3, [r2, r4] ldrsh ip, [r8, #4] mov r5, r0 @@ -1387,7 +1387,7 @@ CanAiMonsterMoveInDirection: ; 0x023012F8 ldmneia sp!, {r4, r5, r6, r7, r8, pc} tst r0, #0x40 beq _02301390 - ldr r0, _0230148C ; =0x02353538 + ldr r0, _0230148C ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x793] cmp r0, #0 @@ -1426,7 +1426,7 @@ _023013E4: and r0, r0, #3 cmp r0, #2 bne _0230142C - ldr r0, _0230148C ; =0x02353538 + ldr r0, _0230148C ; =ov29_02353538 ldr r1, _02301490 ; =SECONDARY_TERRAIN_TYPES ldr r0, [r0] add r0, r0, #0x4000 @@ -1450,7 +1450,7 @@ _0230142C: ldrsh r1, [r8, #6] bl GetTile add r0, r0, r5 - ldr r1, _02301494 ; =0x02352770 + ldr r1, _02301494 ; =ov29_02352770 and r2, r7, #7 ldrb r1, [r1, r2] ldrb r0, [r0, #8] @@ -1465,10 +1465,10 @@ _0230142C: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _02301484: .word DIRECTIONS_XY -_02301488: .word 0x0235171E -_0230148C: .word 0x02353538 +_02301488: .word ov29_0235171E +_0230148C: .word ov29_02353538 _02301490: .word SECONDARY_TERRAIN_TYPES -_02301494: .word 0x02352770 +_02301494: .word ov29_02352770 arm_func_end CanAiMonsterMoveInDirection arm_func_start ov29_02301498 @@ -1499,7 +1499,7 @@ ov29_02301498: ; 0x02301498 movge r0, #1 ldmia sp!, {r3, r4, r5, pc} _023014FC: - ldr r0, _0230158C ; =0x02353538 + ldr r0, _0230158C ; =ov29_02353538 ldr r1, _02301590 ; =SECONDARY_TERRAIN_TYPES ldr r0, [r0] add r0, r0, #0x4000 @@ -1537,7 +1537,7 @@ _02301534: and r0, r0, #0xff ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0230158C: .word 0x02353538 +_0230158C: .word ov29_02353538 _02301590: .word SECONDARY_TERRAIN_TYPES arm_func_end ov29_02301498 @@ -1760,7 +1760,7 @@ _0230187C: ldrb r0, [r5, #0xd8] movne r3, #0 cmp r0, #2 - ldr r0, _023018A8 ; =0x023527A0 + ldr r0, _023018A8 ; =ov29_023527A0 moveq r4, #1 add r0, r0, r1, lsl #3 add r0, r0, r2, lsl #2 @@ -1769,7 +1769,7 @@ _0230187C: ldrb r0, [r4, r0] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023018A8: .word 0x023527A0 +_023018A8: .word ov29_023527A0 arm_func_end ov29_0230175C arm_func_start ov29_023018AC @@ -1926,7 +1926,7 @@ ov29_02301A84: ; 0x02301A84 mov r0, r4 mov sb, r2 bl GetApparentWeather - ldr r6, _02301B24 ; =0x023535C0 + ldr r6, _02301B24 ; =ov29_023535C0 mov r7, r0 ldrb r0, [r6, r7] mov r8, #0 @@ -1962,7 +1962,7 @@ _02301B18: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02301B24: .word 0x023535C0 +_02301B24: .word ov29_023535C0 _02301B28: .word 0x00000C39 arm_func_end ov29_02301A84 @@ -2156,7 +2156,7 @@ OtherMonsterAbilityIsActive: ; 0x02301D84 mov r6, r1 mov r5, #0 mov r4, #1 - ldr r8, _02301E14 ; =0x02353538 + ldr r8, _02301E14 ; =ov29_02353538 b _02301E04 _02301DA0: ldr r0, [r8] @@ -2191,7 +2191,7 @@ _02301E04: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02301E14: .word 0x02353538 +_02301E14: .word ov29_02353538 arm_func_end OtherMonsterAbilityIsActive arm_func_start LevitateIsActive @@ -2324,7 +2324,7 @@ IqSkillIsEnabled: ; 0x02301F80 ldrb r0, [r2, #6] cmp r0, #0 bne _02301FAC - ldr r0, _02301FB8 ; =0x02353538 + ldr r0, _02301FB8 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x12] cmp r0, #0 @@ -2335,7 +2335,7 @@ _02301FAC: bl IqSkillFlagTest ldmia sp!, {r3, pc} .align 2, 0 -_02301FB8: .word 0x02353538 +_02301FB8: .word ov29_02353538 arm_func_end IqSkillIsEnabled arm_func_start UpdateIqSkills @@ -2374,7 +2374,7 @@ _0230202C: cmp r6, #0x19 blt _02301FE4 _02302034: - ldr r0, _023021E8 ; =0x020A188C + ldr r0, _023021E8 ; =_020A188C ldrsh r1, [r4, #0xe] ldrsh r0, [r0] cmp r1, r0 @@ -2392,7 +2392,7 @@ _02302068: bl ov29_022FBDE0 cmp r0, #0 bne _0230208C - ldr r0, _023021EC ; =0x020A18A4 + ldr r0, _023021EC ; =_020A18A4 ldrsh r1, [r4, #0xe] ldrsh r0, [r0] cmp r1, r0 @@ -2497,8 +2497,8 @@ _023021C4: bl EnableIqSkill ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023021E8: .word 0x020A188C -_023021EC: .word 0x020A18A4 +_023021E8: .word _020A188C +_023021EC: .word _020A18A4 arm_func_end UpdateIqSkills arm_func_start ov29_023021F0 @@ -2520,7 +2520,7 @@ ov29_02302200: ; 0x02302200 movne r0, #0 ldmneia sp!, {r3, r4, r5, r6, r7, pc} mov r6, #0 - ldr r5, _02302278 ; =0x02353538 + ldr r5, _02302278 ; =ov29_02353538 b _02302268 _02302228: ldr r1, [r5] @@ -2546,7 +2546,7 @@ _02302268: mov r0, #0 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02302278: .word 0x02353538 +_02302278: .word ov29_02353538 arm_func_end ov29_02302200 arm_func_start GetMoveTypeForMonster @@ -2780,7 +2780,7 @@ AddExpSpecial: ; 0x0230253C cmp r0, #0x64 bne _02302580 cmp r6, #0 - ldrgt r0, _023026B4 ; =0x02353538 + ldrgt r0, _023026B4 ; =ov29_02353538 movgt r1, #1 ldrgt r0, [r0] strgtb r1, [r0, #0xf] @@ -2793,7 +2793,7 @@ _02302580: bl IqSkillIsEnabled cmp r0, #0 beq _023025C0 - ldr r0, _023026B8 ; =0x022C44A8 + ldr r0, _023026B8 ; =ov10_022C44A8 mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2808,7 +2808,7 @@ _023025C0: bl ItemIsActive__023026CC cmp r0, #0 beq _023025F8 - ldr r0, _023026BC ; =0x022C469C + ldr r0, _023026BC ; =ov10_022C469C mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2823,7 +2823,7 @@ _023025F8: bl ItemIsActive__023026CC cmp r0, #0 beq _02302630 - ldr r0, _023026C0 ; =0x022C4698 + ldr r0, _023026C0 ; =ov10_022C4698 mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2844,7 +2844,7 @@ _02302630: _02302650: cmp r0, #0 beq _0230267C - ldr r0, _023026C4 ; =0x022C458C + ldr r0, _023026C4 ; =ov10_022C458C mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2861,7 +2861,7 @@ _0230267C: subs r2, r4, r0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} ldr r1, [r5, #0x214] - ldr r0, _023026B4 ; =0x02353538 + ldr r0, _023026B4 ; =ov29_02353538 add r1, r1, r2 str r1, [r5, #0x214] ldr r0, [r0] @@ -2869,11 +2869,11 @@ _0230267C: strb r1, [r0, #0xf] ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_023026B4: .word 0x02353538 -_023026B8: .word 0x022C44A8 -_023026BC: .word 0x022C469C -_023026C0: .word 0x022C4698 -_023026C4: .word 0x022C458C +_023026B4: .word ov29_02353538 +_023026B8: .word ov10_022C44A8 +_023026BC: .word ov10_022C469C +_023026C0: .word ov10_022C4698 +_023026C4: .word ov10_022C458C _023026C8: .word 0x0098967F arm_func_end AddExpSpecial @@ -2899,7 +2899,7 @@ EnemyEvolution: ; 0x023026FC sub sp, sp, #0x168 mov sl, r0 bl sub_02025888 - ldr r0, _02302A28 ; =0x02353538 + ldr r0, _02302A28 ; =ov29_02353538 ldr r2, [r0] ldrb r1, [r2, #0xf] ldrb r0, [r2, #0x748] @@ -2919,7 +2919,7 @@ EnemyEvolution: ; 0x023026FC bl ov29_022E2470 add sl, sp, #0xb0 _02302758: - ldr r0, _02302A2C ; =0x023527F8 + ldr r0, _02302A2C ; =ov29_023527F8 mov r4, #0 ldr r3, [r0] ldr r2, [r0, #4] @@ -2930,7 +2930,7 @@ _02302758: str r1, [sp, #0xc] str r0, [sp, #0x10] _02302780: - ldr r0, _02302A28 ; =0x02353538 + ldr r0, _02302A28 ; =ov29_02353538 ldr r3, [sp, #0x14] ldr r0, [r0] ldr r2, [sp, #0x18] @@ -3113,8 +3113,8 @@ _02302A20: add sp, sp, #0x168 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02302A28: .word 0x02353538 -_02302A2C: .word 0x023527F8 +_02302A28: .word ov29_02353538 +_02302A2C: .word ov29_023527F8 _02302A30: .word 0x000003E7 _02302A34: .word 0x00000F1F arm_func_end EnemyEvolution diff --git a/asm/overlay_29_023047DC.s b/asm/overlay_29_023047DC.s index f3d89213..2513c01f 100644 --- a/asm/overlay_29_023047DC.s +++ b/asm/overlay_29_023047DC.s @@ -6,7 +6,7 @@ arm_func_start ov29_023047DC ov29_023047DC: ; 0x023047DC stmdb sp!, {r4, r5, r6, lr} - ldr r4, _0230482C ; =0x02353538 + ldr r4, _0230482C ; =ov29_02353538 mov r5, #0 _023047E8: ldr r0, [r4] @@ -28,14 +28,14 @@ _0230481C: blt _023047E8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0230482C: .word 0x02353538 +_0230482C: .word ov29_02353538 arm_func_end ov29_023047DC arm_func_start ov29_02304830 ov29_02304830: ; 0x02304830 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x10 - ldr r2, _0230494C ; =0x02353538 + ldr r2, _0230494C ; =ov29_02353538 mov r5, r0 ldr r0, [r2] ldr r4, [r5, #0xb4] @@ -108,14 +108,14 @@ _02304944: add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0230494C: .word 0x02353538 +_0230494C: .word ov29_02353538 _02304950: .word 0x00000229 arm_func_end ov29_02304830 arm_func_start ov29_02304954 ov29_02304954: ; 0x02304954 stmdb sp!, {r4, r5, r6, lr} - ldr r4, _023049A4 ; =0x02353538 + ldr r4, _023049A4 ; =ov29_02353538 mov r5, #0 _02304960: ldr r0, [r4] @@ -137,7 +137,7 @@ _02304994: blt _02304960 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023049A4: .word 0x02353538 +_023049A4: .word ov29_02353538 arm_func_end ov29_02304954 arm_func_start ov29_023049A8 @@ -290,7 +290,7 @@ _02304B58: arm_func_start ov29_02304B64 ov29_02304B64: ; 0x02304B64 stmdb sp!, {r4, r5, r6, lr} - ldr r4, _02304BA8 ; =0x02353538 + ldr r4, _02304BA8 ; =ov29_02353538 mov r5, #0 _02304B70: ldr r0, [r4] @@ -309,7 +309,7 @@ _02304B98: blt _02304B70 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02304BA8: .word 0x02353538 +_02304BA8: .word ov29_02353538 arm_func_end ov29_02304B64 arm_func_start ov29_02304BAC @@ -330,28 +330,28 @@ ov29_02304BAC: ; 0x02304BAC bne _02304BF8 bl IsWaterTileset cmp r0, #0 - ldrne r0, _02304C30 ; =0x02352808 + ldrne r0, _02304C30 ; =ov29_02352808 ldrneb r4, [r0, r4] b _02304C24 _02304BF8: cmp r6, #2 bne _02304C24 - ldr r0, _02304C34 ; =0x02353538 + ldr r0, _02304C34 ; =ov29_02353538 ldr r1, _02304C38 ; =SECONDARY_TERRAIN_TYPES ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] ldrb r0, [r1, r0] cmp r0, #1 - ldrne r0, _02304C30 ; =0x02352808 + ldrne r0, _02304C30 ; =ov29_02352808 ldrneb r4, [r0, r4] _02304C24: mov r0, r4 strb r4, [r5, #0x220] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02304C30: .word 0x02352808 -_02304C34: .word 0x02353538 +_02304C30: .word ov29_02352808 +_02304C34: .word ov29_02353538 _02304C38: .word SECONDARY_TERRAIN_TYPES arm_func_end ov29_02304BAC @@ -436,7 +436,7 @@ ov29_02304D20: ; 0x02304D20 bl sub_0204AEE0 cmp r0, #0 movne r1, #2 - ldr r2, _02304FD4 ; =0x0237C9CC + ldr r2, _02304FD4 ; =ov29_0237C9CC moveq r1, #1 str r1, [r2] add r0, sb, #0x200 @@ -450,10 +450,10 @@ ov29_02304D20: ; 0x02304D20 str r5, [r7, #0xc] ldrsh r8, [r6, #4] mov r3, r5, lsl #2 - ldr r1, _02304FD8 ; =0x0235173C + ldr r1, _02304FD8 ; =ov29_0235173C strh r8, [r0, sl] ldrsh r5, [r6, #6] - ldr r0, _02304FDC ; =0x0235173E + ldr r0, _02304FDC ; =ov29_0235173E ldrsh r1, [r1, r3] strh r5, [r7, #2] ldrsh r5, [r4] @@ -470,7 +470,7 @@ ov29_02304D20: ; 0x02304D20 bl sub_0204AEE0 cmp r0, #0 movne r1, #2 - ldr r5, _02304FD4 ; =0x0237C9CC + ldr r5, _02304FD4 ; =ov29_0237C9CC moveq r1, #1 add r0, sb, #0x200 str r1, [r5] @@ -536,7 +536,7 @@ _02304E80: mov r0, r0, asr #1 str r0, [r8, #0x1b0] blt _02304E80 - ldr r1, _02304FD4 ; =0x0237C9CC + ldr r1, _02304FD4 ; =ov29_0237C9CC mov r0, #0x18 ldr r1, [r1] add r1, r1, r1, lsl #1 @@ -581,7 +581,7 @@ _02304F2C: str r0, [sl, #0x1b0] cmp r8, #3 blt _02304F2C - ldr r1, _02304FD4 ; =0x0237C9CC + ldr r1, _02304FD4 ; =ov29_0237C9CC mov r0, #0x18 ldr r1, [r1] mov r1, r1, lsl #2 @@ -601,16 +601,16 @@ _02304FC0: strh r0, [r7, #0x18] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02304FD4: .word 0x0237C9CC -_02304FD8: .word 0x0235173C -_02304FDC: .word 0x0235173E +_02304FD4: .word ov29_0237C9CC +_02304FD8: .word ov29_0235173C +_02304FDC: .word ov29_0235173E arm_func_end ov29_02304D20 arm_func_start DisplayActions DisplayActions: ; 0x02304FE0 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x14 - ldr r1, _02305580 ; =0x0237C9C1 + ldr r1, _02305580 ; =ov29_0237C9C1 mov r6, #0 mov sl, r0 mov r7, r6 @@ -619,13 +619,13 @@ DisplayActions: ; 0x02304FE0 cmp r0, #0 mov r5, #0 movne r1, #2 - ldr r0, _02305584 ; =0x0237C9CC + ldr r0, _02305584 ; =ov29_0237C9CC moveq r1, #1 str r1, [r0] mov r4, r5 mov fp, r5 _02305020: - ldr r0, _02305588 ; =0x02353538 + ldr r0, _02305588 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r5, lsl #2 add r0, r0, #0x12000 @@ -714,7 +714,7 @@ _02305160: cmp r6, #0 moveq r0, #0 beq _02305578 - ldr r0, _02305588 ; =0x02353538 + ldr r0, _02305588 ; =ov29_02353538 ldr r1, [r0] ldr r6, [r1, #0xc4] str sl, [r1, #0xc4] @@ -732,7 +732,7 @@ _023051B0: mov r0, #7 bl AdvanceFrame mov sl, #0 - ldr r4, _02305588 ; =0x02353538 + ldr r4, _02305588 ; =ov29_02353538 mov fp, sl _023051C4: ldr r0, [r4] @@ -822,7 +822,7 @@ _02305304: blt _023051C4 add r5, r5, #1 _02305314: - ldr r1, _02305584 ; =0x0237C9CC + ldr r1, _02305584 ; =ov29_0237C9CC mov r0, #0x18 ldr r1, [r1] bl __divsi3 @@ -830,7 +830,7 @@ _02305314: blt _023051B0 _0230532C: mov r7, #0 - ldr r8, _02305588 ; =0x02353538 + ldr r8, _02305588 ; =ov29_02353538 mov r4, r7 _02305338: ldr r0, [r8] @@ -860,8 +860,8 @@ _02305390: mov sl, #0 mov fp, sl mov r7, #1 - ldr r5, _02305588 ; =0x02353538 - ldr r4, _02305580 ; =0x0237C9C1 + ldr r5, _02305588 ; =ov29_02353538 + ldr r4, _02305580 ; =ov29_0237C9C1 b _02305530 _023053A8: ldr r0, [r5] @@ -979,13 +979,13 @@ _02305538: bl ov29_022EF9C8 bl IsFloorOver cmp r0, #0 - ldrne r1, _02305588 ; =0x02353538 + ldrne r1, _02305588 ; =ov29_02353538 movne r0, #1 ldrne r1, [r1] strne r6, [r1, #0xc4] bne _02305578 bl ov29_022EF9BC - ldr r1, _02305588 ; =0x02353538 + ldr r1, _02305588 ; =ov29_02353538 mov r0, #1 ldr r1, [r1] str r6, [r1, #0xc4] @@ -993,7 +993,7 @@ _02305578: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02305580: .word 0x0237C9C1 -_02305584: .word 0x0237C9CC -_02305588: .word 0x02353538 +_02305580: .word ov29_0237C9C1 +_02305584: .word ov29_0237C9CC +_02305588: .word ov29_02353538 arm_func_end DisplayActions diff --git a/asm/overlay_29_023055B0.s b/asm/overlay_29_023055B0.s index c9c344f8..f7cc4bfc 100644 --- a/asm/overlay_29_023055B0.s +++ b/asm/overlay_29_023055B0.s @@ -8,7 +8,7 @@ ov29_023055B0: ; 0x023055B0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r6, #0 mov r5, #1 - ldr r4, _02305690 ; =0x02353538 + ldr r4, _02305690 ; =ov29_02353538 b _02305684 _023055C4: ldr r0, [r4] @@ -65,7 +65,7 @@ _02305684: blt _023055C4 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02305690: .word 0x02353538 +_02305690: .word ov29_02353538 arm_func_end ov29_023055B0 arm_func_start CheckNonLeaderTile @@ -191,7 +191,7 @@ ov29_02305814: ; 0x02305814 ldmneia sp!, {r3, r4, r5, pc} bl IsFloorOver cmp r0, #0 - ldreq r0, _023058BC ; =0x02353538 + ldreq r0, _023058BC ; =ov29_02353538 ldreq r0, [r0] ldreqb r0, [r0, #0x793] cmpeq r0, #0 @@ -204,7 +204,7 @@ ov29_02305814: ; 0x02305814 bl GetLeader ldr r1, _023058C0 ; =0x00000C82 bl LogMessageByIdWithPopupCheckUser - ldr r1, _023058BC ; =0x02353538 + ldr r1, _023058BC ; =ov29_02353538 mov r0, r5 ldr r2, [r1] mov r3, #1 @@ -222,7 +222,7 @@ ov29_02305814: ; 0x02305814 bl ov29_022EA370 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023058BC: .word 0x02353538 +_023058BC: .word ov29_02353538 _023058C0: .word 0x00000C82 arm_func_end ov29_02305814 @@ -395,7 +395,7 @@ _02305AEC: mov r4, #1 bl SubstitutePlaceholderStringTags ldr r1, [r6, #0x110] - ldr r0, _02305BF8 ; =0x02353318 + ldr r0, _02305BF8 ; =ov29_02353318 mov r1, r1, lsl #1 ldrh r2, [r0, r1] mov r0, sl @@ -454,7 +454,7 @@ _02305BE0: .align 2, 0 _02305BF0: .word 0x00000C83 _02305BF4: .word 0x00000C84 -_02305BF8: .word 0x02353318 +_02305BF8: .word ov29_02353318 _02305BFC: .word 0x00000C85 _02305C00: .word 0x00000C86 arm_func_end EndNegativeStatusCondition diff --git a/asm/overlay_29_023082A0.s b/asm/overlay_29_023082A0.s index 989706b1..8b8418d4 100644 --- a/asm/overlay_29_023082A0.s +++ b/asm/overlay_29_023082A0.s @@ -297,7 +297,7 @@ ApplyDamageAndEffects: ; 0x0230863C ldrb r0, [r0, #0xd2] cmp r0, #0xc bne _023086D4 - ldr r1, _02308F70 ; =0x02352AEC + ldr r1, _02308F70 ; =ATK_STAT_IDX mov r0, sl ldr r2, [r1] mov r1, sb @@ -322,7 +322,7 @@ _023086D4: beq _02308730 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308F74 ; =0x022C442C + ldr r1, _02308F74 ; =ov10_022C442C ldrsh r1, [r1] cmp r0, r1 movlt r0, #0 @@ -427,7 +427,7 @@ _02308858: beq _023088B0 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308F78 ; =0x022C44C0 + ldr r1, _02308F78 ; =ov10_022C44C0 mov r0, r0, lsl #0x10 ldrsh r1, [r1] cmp r1, r0, asr #16 @@ -440,7 +440,7 @@ _023088B0: beq _023088F8 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308F7C ; =0x022C4464 + ldr r1, _02308F7C ; =ov10_022C4464 mov r0, r0, lsl #0x10 ldrsh r1, [r1] cmp r1, r0, asr #16 @@ -569,7 +569,7 @@ _02308A74: bne _02308B04 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308F84 ; =0x022C45B4 + ldr r1, _02308F84 ; =ov10_022C45B4 ldrsh r1, [r1] cmp r0, r1 bge _02308B04 @@ -595,7 +595,7 @@ _02308AFC: mov r3, #0x80 bl ov29_0230F728 _02308B04: - ldr r5, _02308F88 ; =0x023535DC + ldr r5, _02308F88 ; =ov29_023535DC b _02308B54 _02308B0C: ldrb r1, [r5] @@ -628,7 +628,7 @@ _02308B54: beq _02308BB0 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308F8C ; =0x022C45B0 + ldr r1, _02308F8C ; =ov10_022C45B0 ldrsh r1, [r1] cmp r0, r1 bge _02308BB0 @@ -671,7 +671,7 @@ _02308C0C: bne _02308C38 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308F90 ; =0x022C4564 + ldr r1, _02308F90 ; =ov10_022C4564 ldrsh r1, [r1] cmp r0, r1 addlt r0, r6, #0x100 @@ -688,13 +688,13 @@ _02308C38: beq _02308C88 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308F94 ; =0x022C468C + ldr r1, _02308F94 ; =ov10_022C468C ldrsh r1, [r1] cmp r0, r1 bge _02308C88 add r0, r6, #0x100 ldrh r3, [r0, #0x92] - ldr r1, _02308F98 ; =0x0237CA6D + ldr r1, _02308F98 ; =ov29_0237CA6D mov r2, #0 orr r3, r3, #2 strh r3, [r0, #0x92] @@ -714,7 +714,7 @@ _02308C88: beq _02308CDC mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308F9C ; =0x022C4460 + ldr r1, _02308F9C ; =ov10_022C4460 ldrsh r1, [r1] cmp r0, r1 addlt r0, r6, #0x100 @@ -733,7 +733,7 @@ _02308CDC: bne _02308D24 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308FA0 ; =0x022C4550 + ldr r1, _02308FA0 ; =ov10_022C4550 ldrsh r1, [r1] cmp r0, r1 addlt r0, r6, #0x100 @@ -750,7 +750,7 @@ _02308D24: beq _02308D64 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308FA4 ; =0x022C45C0 + ldr r1, _02308FA4 ; =ov10_022C45C0 ldrsh r1, [r1] cmp r0, r1 addlt r0, r6, #0x100 @@ -769,7 +769,7 @@ _02308D64: bne _02308DE0 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308FA8 ; =0x022C45AC + ldr r1, _02308FA8 ; =ov10_022C45AC ldrsh r1, [r1] cmp r0, r1 bge _02308DE0 @@ -799,7 +799,7 @@ _02308DE0: beq _02308E20 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308FAC ; =0x022C467C + ldr r1, _02308FAC ; =ov10_022C467C ldrsh r1, [r1] cmp r0, r1 addlt r0, r6, #0x100 @@ -824,7 +824,7 @@ _02308E20: bne _02308E80 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308FB0 ; =0x022C4524 + ldr r1, _02308FB0 ; =ov10_022C4524 ldrsh r1, [r1] cmp r0, r1 addlt r0, r6, #0x100 @@ -841,7 +841,7 @@ _02308E80: beq _02308EC0 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02308FB4 ; =0x022C4638 + ldr r1, _02308FB4 ; =ov10_022C4638 ldrsh r1, [r1] cmp r0, r1 addlt r0, r6, #0x100 @@ -860,7 +860,7 @@ _02308ECC: ldrb r1, [r0, #0xe0] cmp r1, #2 bne _02308F4C - ldr r1, _02308FB8 ; =0x02353538 + ldr r1, _02308FB8 ; =ov29_02353538 ldrb r2, [r0, #0xe8] ldr r1, [r1] add r1, r1, r2, lsl #2 @@ -898,23 +898,23 @@ _02308F68: add sp, sp, #0x40 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02308F70: .word 0x02352AEC -_02308F74: .word 0x022C442C -_02308F78: .word 0x022C44C0 -_02308F7C: .word 0x022C4464 +_02308F70: .word ATK_STAT_IDX +_02308F74: .word ov10_022C442C +_02308F78: .word ov10_022C44C0 +_02308F7C: .word ov10_022C4464 _02308F80: .word 0x00000C3F -_02308F84: .word 0x022C45B4 -_02308F88: .word 0x023535DC -_02308F8C: .word 0x022C45B0 -_02308F90: .word 0x022C4564 -_02308F94: .word 0x022C468C -_02308F98: .word 0x0237CA6D -_02308F9C: .word 0x022C4460 -_02308FA0: .word 0x022C4550 -_02308FA4: .word 0x022C45C0 -_02308FA8: .word 0x022C45AC -_02308FAC: .word 0x022C467C -_02308FB0: .word 0x022C4524 -_02308FB4: .word 0x022C4638 -_02308FB8: .word 0x02353538 +_02308F84: .word ov10_022C45B4 +_02308F88: .word ov29_023535DC +_02308F8C: .word ov10_022C45B0 +_02308F90: .word ov10_022C4564 +_02308F94: .word ov10_022C468C +_02308F98: .word ov29_0237CA6D +_02308F9C: .word ov10_022C4460 +_02308FA0: .word ov10_022C4550 +_02308FA4: .word ov10_022C45C0 +_02308FA8: .word ov10_022C45AC +_02308FAC: .word ov10_022C467C +_02308FB0: .word ov10_022C4524 +_02308FB4: .word ov10_022C4638 +_02308FB8: .word ov29_02353538 arm_func_end ApplyDamageAndEffects diff --git a/asm/overlay_29_02311034.s b/asm/overlay_29_02311034.s index 8b5e5730..f9155a40 100644 --- a/asm/overlay_29_02311034.s +++ b/asm/overlay_29_02311034.s @@ -87,14 +87,14 @@ _02311120: cmp r0, #0 beq _0231115C _02311150: - ldr r0, _02311800 ; =0x022C46F8 + ldr r0, _02311800 ; =ov10_022C46F8 ldrsh r0, [r0] add r4, r4, r0 _0231115C: ldrb r0, [r7, #0xd5] mov r1, #3 cmp r0, #6 - ldreq r0, _02311804 ; =0x022C46D0 + ldreq r0, _02311804 ; =ov10_022C46D0 ldreqsh r0, [r0] addeq r4, r4, r0 mov r0, sl @@ -104,7 +104,7 @@ _0231115C: mov r0, sl bl GetApparentWeather cmp r0, #4 - ldreq r0, _02311808 ; =0x022C4578 + ldreq r0, _02311808 ; =ov10_022C4578 ldreqsh r0, [r0] addeq r4, r4, r0 _0231119C: @@ -116,7 +116,7 @@ _0231119C: mov r0, sl bl GetApparentWeather cmp r0, #4 - ldreq r0, _02311808 ; =0x022C4578 + ldreq r0, _02311808 ; =ov10_022C4578 ldreqsh r0, [r0] addeq r4, r4, r0 _023111C8: @@ -128,7 +128,7 @@ _023111C8: mov r0, sl bl GetApparentWeather cmp r0, #5 - ldreq r0, _0231180C ; =0x022C4630 + ldreq r0, _0231180C ; =ov10_022C4630 ldreqsh r0, [r0] addeq r4, r4, r0 _023111F4: @@ -136,7 +136,7 @@ _023111F4: mov r1, #0x49 bl ExclusiveItemEffectIsActive__02311064 cmp r0, #0 - ldrne r0, _02311810 ; =0x022C4674 + ldrne r0, _02311810 ; =ov10_022C4674 ldrsh r2, [r7, #0x12] ldrnesh r0, [r0] ldrsh r1, [r7, #0x16] @@ -537,22 +537,22 @@ _023117A8: mov r1, sl mov r2, r0 bl SubstitutePlaceholderStringTags - ldr r0, _02311820 ; =0x02353318 + ldr r0, _02311820 ; =ov29_02353318 mov r1, r4, lsl #1 ldrh r1, [r0, r1] mov r0, sl bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02311800: .word 0x022C46F8 -_02311804: .word 0x022C46D0 -_02311808: .word 0x022C4578 -_0231180C: .word 0x022C4630 -_02311810: .word 0x022C4674 +_02311800: .word ov10_022C46F8 +_02311804: .word ov10_022C46D0 +_02311808: .word ov10_022C4578 +_0231180C: .word ov10_022C4630 +_02311810: .word ov10_022C4674 _02311814: .word 0x000003E7 _02311818: .word 0x00000CC6 _0231181C: .word 0x00000CC7 -_02311820: .word 0x02353318 +_02311820: .word ov29_02353318 arm_func_end TickStatusAndHealthRegen arm_func_start InflictSleepStatusSingle diff --git a/asm/overlay_29_023118D8.s b/asm/overlay_29_023118D8.s index 4be0bad7..45494093 100644 --- a/asm/overlay_29_023118D8.s +++ b/asm/overlay_29_023118D8.s @@ -524,7 +524,7 @@ TryInflictSleeplessStatus: ; 0x02311F80 ldrb r0, [r5, #0xbd] cmp r0, #2 beq _02312040 - ldr r1, _0231205C ; =0x022C4728 + ldr r1, _0231205C ; =ov10_022C4728 mov r3, #2 mov r0, r6 mov r2, #0 @@ -562,7 +562,7 @@ _02312050: bl UpdateStatusIconFlags ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0231205C: .word 0x022C4728 +_0231205C: .word ov10_022C4728 _02312060: .word 0x00000D13 _02312064: .word 0x00000D15 _02312068: .word 0x00000D14 @@ -730,7 +730,7 @@ _02312260: ldrb r0, [r6, #0xd0] cmp r0, #7 beq _02312300 - ldr r1, _0231232C ; =0x022C4804 + ldr r1, _0231232C ; =ov10_022C4804 mov r3, #7 mov r0, r4 mov r2, #1 @@ -763,7 +763,7 @@ _0231231C: .align 2, 0 _02312324: .word 0x00000DA3 _02312328: .word 0x00000DBB -_0231232C: .word 0x022C4804 +_0231232C: .word ov10_022C4804 _02312330: .word 0x00000D1A _02312334: .word 0x00000D1B arm_func_end TryInflictInfatuatedStatus @@ -839,7 +839,7 @@ _02312424: and r0, r0, #3 cmp r0, #2 bne _0231247C - ldr r0, _023125F8 ; =0x02353538 + ldr r0, _023125F8 ; =ov29_02353538 ldr r1, _023125FC ; =SECONDARY_TERRAIN_TYPES ldr r0, [r0] add r0, r0, #0x4000 @@ -865,7 +865,7 @@ _0231247C: mov r5, #1 cmp r0, #1 beq _023124F4 - ldr r1, _02312604 ; =0x022C4874 + ldr r1, _02312604 ; =ov10_022C4874 mov r0, sb mov r2, r5 strb r5, [r7, #0xbf] @@ -960,10 +960,10 @@ _023125E8: .align 2, 0 _023125F0: .word 0x00000DAB _023125F4: .word 0x00000DAC -_023125F8: .word 0x02353538 +_023125F8: .word ov29_02353538 _023125FC: .word SECONDARY_TERRAIN_TYPES _02312600: .word 0x00000DB9 -_02312604: .word 0x022C4874 +_02312604: .word ov10_022C4874 _02312608: .word 0x00000D1C _0231260C: .word 0x00000D1D _02312610: .word DIRECTIONS_XY @@ -974,7 +974,7 @@ _02312614: .word 0x00000DC5 TryInflictBurnStatusWholeTeam: ; 0x02312618 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r7, #0 - ldr r4, _02312660 ; =0x02353538 + ldr r4, _02312660 ; =ov29_02353538 mov r6, r7 mov r5, #1 _0231262C: @@ -992,7 +992,7 @@ _0231262C: blt _0231262C ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02312660: .word 0x02353538 +_02312660: .word ov29_02353538 arm_func_end TryInflictBurnStatusWholeTeam arm_func_start TryInflictPoisonedStatus @@ -1090,7 +1090,7 @@ _02312798: beq _02312830 cmp r0, #2 beq _0231281C - ldr r1, _0231292C ; =0x022C4878 + ldr r1, _0231292C ; =ov10_022C4878 mov r3, #2 mov r0, sb mov r2, r4 @@ -1190,7 +1190,7 @@ _02312914: .align 2, 0 _02312924: .word 0x00000DAD _02312928: .word 0x00000DAE -_0231292C: .word 0x022C4878 +_0231292C: .word ov10_022C4878 _02312930: .word 0x00000D1E _02312934: .word DIRECTIONS_XY _02312938: .word 0x00000DC5 @@ -1289,7 +1289,7 @@ _02312A70: mov r4, #1 cmp r0, #3 beq _02312AEC - ldr r1, _02312BE8 ; =0x022C4880 + ldr r1, _02312BE8 ; =ov10_022C4880 mov r3, #3 mov r0, sb mov r2, r4 @@ -1383,7 +1383,7 @@ _02312BD0: .align 2, 0 _02312BE0: .word 0x00000DAD _02312BE4: .word 0x00000DAE -_02312BE8: .word 0x022C4880 +_02312BE8: .word ov10_022C4880 _02312BEC: .word 0x00000D1F _02312BF0: .word DIRECTIONS_XY _02312BF4: .word 0x00000DC5 @@ -1462,7 +1462,7 @@ _02312CF4: and r0, r0, #3 cmp r0, #2 bne _02312D48 - ldr r0, _02312E08 ; =0x02353538 + ldr r0, _02312E08 ; =ov29_02353538 ldr r1, _02312E0C ; =SECONDARY_TERRAIN_TYPES ldr r0, [r0] add r0, r0, #0x4000 @@ -1498,7 +1498,7 @@ _02312D88: mov r0, r6 bl ov29_022E4C4C mov r2, #1 - ldr r1, _02312E14 ; =0x022C4870 + ldr r1, _02312E14 ; =ov10_022C4870 mov r0, r6 strb r2, [r4, #0xc4] bl CalcStatusDuration @@ -1528,10 +1528,10 @@ _02312D88: .align 2, 0 _02312E00: .word 0x00000DA8 _02312E04: .word 0x00000DA9 -_02312E08: .word 0x02353538 +_02312E08: .word ov29_02353538 _02312E0C: .word SECONDARY_TERRAIN_TYPES _02312E10: .word 0x00000DAA -_02312E14: .word 0x022C4870 +_02312E14: .word ov10_022C4870 _02312E18: .word 0x00000D22 _02312E1C: .word 0x00000D23 arm_func_end TryInflictFrozenStatus @@ -1590,7 +1590,7 @@ _02312ECC: ldrb r0, [r4, #0xc4] cmp r0, #7 beq _02312F48 - ldr r1, _02312F6C ; =0x022C48A0 + ldr r1, _02312F6C ; =ov10_022C48A0 mov r3, #7 mov r0, r6 mov r2, #1 @@ -1626,7 +1626,7 @@ _02312F58: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02312F68: .word 0x00000C9B -_02312F6C: .word 0x022C48A0 +_02312F6C: .word ov10_022C48A0 _02312F70: .word 0x00000D24 _02312F74: .word 0x00000D25 arm_func_end TryInflictConstrictionStatus @@ -1711,7 +1711,7 @@ _02313084: ldrb r0, [r4, #0xc4] cmp r0, #2 beq _023130FC - ldr r1, _02313124 ; =0x022C4898 + ldr r1, _02313124 ; =ov10_022C4898 mov r3, #2 mov r0, r5 mov r2, #1 @@ -1747,7 +1747,7 @@ _0231310C: .align 2, 0 _0231311C: .word 0x00000D28 _02313120: .word 0x00000C9B -_02313124: .word 0x022C4898 +_02313124: .word ov10_022C4898 _02313128: .word 0x00000D26 _0231312C: .word 0x00000D27 arm_func_end TryInflictShadowHoldStatus @@ -1777,7 +1777,7 @@ _0231316C: ldrb r0, [r4, #0xc4] cmp r0, #5 beq _023131CC - ldr r1, _023131E8 ; =0x022C48B8 + ldr r1, _023131E8 ; =ov10_022C48B8 mov r3, #5 mov r0, r5 mov r2, #0 @@ -1804,7 +1804,7 @@ _023131DC: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023131E8: .word 0x022C48B8 +_023131E8: .word ov10_022C48B8 _023131EC: .word 0x00000D29 _023131F0: .word 0x00000D2A arm_func_end TryInflictIngrainStatus @@ -1844,7 +1844,7 @@ TryInflictWrappedStatus: ; 0x023131F4 mov r0, #0x7f strb r0, [r4, #0xcc] mov r2, #0 - ldr r1, _023133DC ; =0x022C48AC + ldr r1, _023133DC ; =ov10_022C48AC mov r0, r6 strb r2, [r4, #0xcd] mov r3, #4 @@ -1854,7 +1854,7 @@ TryInflictWrappedStatus: ; 0x023131F4 add r0, r0, #1 strb r0, [r5, #0xcc] mov r0, #0 - ldr r3, _023133E0 ; =0x02353538 + ldr r3, _023133E0 ; =ov29_02353538 strb r0, [r5, #0xcd] ldr r1, [r3] mov r0, r7 @@ -1939,8 +1939,8 @@ _023133D0: bl UpdateStatusIconFlags ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_023133DC: .word 0x022C48AC -_023133E0: .word 0x02353538 +_023133DC: .word ov10_022C48AC +_023133E0: .word ov29_02353538 _023133E4: .word 0x00000D2B _023133E8: .word 0x00000D2C _023133EC: .word 0x00000D2D @@ -1950,7 +1950,7 @@ _023133EC: .word 0x00000D2D FreeOtherWrappedMonsters: ; 0x023133F0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} mov r4, #0 - ldr r7, _02313468 ; =0x02353538 + ldr r7, _02313468 ; =ov29_02353538 mov r6, r0 mov sb, r4 mov r8, r4 @@ -1982,7 +1982,7 @@ _02313458: blt _02313408 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02313468: .word 0x02353538 +_02313468: .word ov29_02353538 arm_func_end FreeOtherWrappedMonsters arm_func_start TryInflictPetrifiedStatus @@ -2030,12 +2030,12 @@ _023134E0: mov r2, #1 cmp r0, #0 beq _02313524 - ldr r1, _023135E8 ; =0x022C479C + ldr r1, _023135E8 ; =ov10_022C479C mov r0, r5 bl CalcStatusDuration b _02313530 _02313524: - ldr r1, _023135EC ; =0x022C47A0 + ldr r1, _023135EC ; =ov10_022C47A0 mov r0, r5 bl CalcStatusDuration _02313530: @@ -2061,7 +2061,7 @@ _02313570: cmp r0, #0 beq _023135DC mov r4, #0 - ldr r6, _023135F8 ; =0x02353538 + ldr r6, _023135F8 ; =ov29_02353538 mov r8, #6 mov r7, r4 _0231358C: @@ -2091,11 +2091,11 @@ _023135DC: bl UpdateStatusIconFlags ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_023135E8: .word 0x022C479C -_023135EC: .word 0x022C47A0 +_023135E8: .word ov10_022C479C +_023135EC: .word ov10_022C47A0 _023135F0: .word 0x00000D32 _023135F4: .word 0x00000D33 -_023135F8: .word 0x02353538 +_023135F8: .word ov29_02353538 arm_func_end TryInflictPetrifiedStatus arm_func_start LowerOffensiveStat @@ -3161,7 +3161,7 @@ _02314498: ldrb r0, [r4, #0xd0] cmp r0, #1 beq _02314514 - ldr r1, _02314538 ; =0x022C4884 + ldr r1, _02314538 ; =ov10_022C4884 mov r2, #1 mov r0, r6 strb r2, [r4, #0xd0] @@ -3193,7 +3193,7 @@ _02314524: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02314534: .word 0x00000DA2 -_02314538: .word 0x022C4884 +_02314538: .word ov10_022C4884 _0231453C: .word 0x00000D02 _02314540: .word 0x00000D03 arm_func_end TryInflictCringeStatus @@ -3284,7 +3284,7 @@ _02314654: ldrb r0, [r7, #0xbf] cmp r0, #4 beq _023146E0 - ldr r1, _023147DC ; =0x022C4894 + ldr r1, _023147DC ; =ov10_022C4894 mov r3, #4 mov r0, sb mov r2, r4 @@ -3378,7 +3378,7 @@ _023147D0: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _023147D8: .word 0x00000DA1 -_023147DC: .word 0x022C4894 +_023147DC: .word ov10_022C4894 _023147E0: .word 0x00000D01 _023147E4: .word DIRECTIONS_XY _023147E8: .word 0x00000DC5 @@ -3410,7 +3410,7 @@ BoostSpeed: ; 0x02314810 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} cmp r6, #0 bne _02314850 - ldr r1, _0231492C ; =0x022C4888 + ldr r1, _0231492C ; =ov10_022C4888 mov r0, r8 mov r2, #0 bl CalcStatusDuration @@ -3463,7 +3463,7 @@ _023148C4: _023148F0: mov r0, r8 bl ov29_022E44CC - ldr r0, _02314938 ; =0x02353318 + ldr r0, _02314938 ; =ov29_02353318 mov r1, r6, lsl #1 ldrh r2, [r0, r1] mov r0, sb @@ -3478,10 +3478,10 @@ _02314920: bl UpdateStatusIconFlags ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0231492C: .word 0x022C4888 +_0231492C: .word ov10_022C4888 _02314930: .word 0x00000DDB _02314934: .word 0x00000DDA -_02314938: .word 0x02353318 +_02314938: .word ov29_02353318 arm_func_end BoostSpeed arm_func_start BoostSpeedOneStage @@ -3544,7 +3544,7 @@ _023149F8: ldrb r0, [r6, #0x119] cmp r0, #0 bne _02314A24 - ldr r1, _02314AB0 ; =0x022C488C + ldr r1, _02314AB0 ; =ov10_022C488C mov r0, sb mov r2, #1 bl CalcStatusDuration @@ -3576,7 +3576,7 @@ _02314A34: _02314A6C: mov r0, sb bl ov29_022E451C - ldr r0, _02314AB8 ; =0x02353318 + ldr r0, _02314AB8 ; =ov29_02353318 mov r1, r4, lsl #1 ldrh r2, [r0, r1] mov r0, sl @@ -3593,9 +3593,9 @@ _02314AA0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02314AAC: .word 0x00000DDC -_02314AB0: .word 0x022C488C +_02314AB0: .word ov10_022C488C _02314AB4: .word 0x00000DDA -_02314AB8: .word 0x02353318 +_02314AB8: .word ov29_02353318 arm_func_end LowerSpeed arm_func_start TrySealMove @@ -3876,7 +3876,7 @@ TryActivateQuickFeet: ; 0x02314E1C arm_func_start TryInflictTerrifiedStatus TryInflictTerrifiedStatus: ; 0x02314E60 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _02314EB0 ; =0x022C4618 + ldr r2, _02314EB0 ; =ov10_022C4618 mov r4, r1 ldr ip, [r4, #0xb4] mov r3, #1 @@ -3896,7 +3896,7 @@ TryInflictTerrifiedStatus: ; 0x02314E60 bl LogMessageByIdWithPopupCheckUserTarget ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02314EB0: .word 0x022C4618 +_02314EB0: .word ov10_022C4618 _02314EB4: .word 0x00000DE5 arm_func_end TryInflictTerrifiedStatus @@ -4038,7 +4038,7 @@ _0231507C: ldrb r0, [r4, #0xd0] cmp r0, #2 beq _023150E0 - ldr r1, _0231510C ; =0x022C4890 + ldr r1, _0231510C ; =ov10_022C4890 mov r3, #2 mov r0, r6 mov r2, #1 @@ -4068,7 +4068,7 @@ _023150F0: _02315100: .word 0x00000DAF _02315104: .word 0x00000DBA _02315108: .word 0x00000DA7 -_0231510C: .word 0x022C4890 +_0231510C: .word ov10_022C4890 _02315110: .word 0x00000CFE _02315114: .word 0x00000CFF arm_func_end TryInflictConfusedStatus diff --git a/asm/overlay_29_0231513C.s b/asm/overlay_29_0231513C.s index dd3f2e1e..745adae0 100644 --- a/asm/overlay_29_0231513C.s +++ b/asm/overlay_29_0231513C.s @@ -56,7 +56,7 @@ TryInflictCoweringStatus: ; 0x0231516C ldrb r0, [r6, #0xd0] cmp r0, #4 beq _02315240 - ldr r1, _02315260 ; =0x022C47B0 + ldr r1, _02315260 ; =ov10_022C47B0 mov r3, #4 mov r0, r4 mov r2, #1 @@ -85,7 +85,7 @@ _02315250: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02315260: .word 0x022C47B0 +_02315260: .word ov10_022C47B0 _02315264: .word 0x00000D43 _02315268: .word 0x00000D44 arm_func_end TryInflictCoweringStatus @@ -159,7 +159,7 @@ _02315348: bl IqSkillIsEnabled cmp r0, #0 beq _0231537C - ldr r1, _023155F0 ; =0x022C4470 + ldr r1, _023155F0 ; =ov10_022C4470 mov r0, r5, lsl #8 ldrsh r1, [r1] mov r1, r1, lsl #8 @@ -340,7 +340,7 @@ _023155E4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _023155EC: .word 0x00000D83 -_023155F0: .word 0x022C4470 +_023155F0: .word ov10_022C4470 _023155F4: .word 0x000003E7 _023155F8: .word 0x00000CFD _023155FC: .word 0x00000CFA @@ -567,7 +567,7 @@ _023158E8: mov r1, r5 bl LogMessageByIdWithPopupCheckUserTarget _02315908: - ldr r1, _023159C8 ; =0x022C4790 + ldr r1, _023159C8 ; =ov10_022C4790 mov r2, #1 mov r0, r5 strb r2, [r4, #0xe0] @@ -588,7 +588,7 @@ _02315948: mov r0, r5 bl ov29_022E4668 mov r0, #0xff - ldr r1, _023159D0 ; =0x02353538 + ldr r1, _023159D0 ; =ov29_02353538 strb r0, [r4, #0xe8] mov r2, #0 _02315960: @@ -619,9 +619,9 @@ _02315960: _023159BC: .word 0x00000DE1 _023159C0: .word 0x00000DE2 _023159C4: .word 0x00000CAF -_023159C8: .word 0x022C4790 +_023159C8: .word ov10_022C4790 _023159CC: .word 0x00000CE1 -_023159D0: .word 0x02353538 +_023159D0: .word ov29_02353538 arm_func_end TryInflictLeechSeedStatus arm_func_start ov29_023159D4 @@ -629,7 +629,7 @@ ov29_023159D4: ; 0x023159D4 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r4, #0 ldr r5, [r0, #0xb4] - ldr r7, _02315A4C ; =0x02353538 + ldr r7, _02315A4C ; =ov29_02353538 mov r8, r4 _023159E8: ldr r0, [r7] @@ -659,7 +659,7 @@ _02315A3C: blt _023159E8 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02315A4C: .word 0x02353538 +_02315A4C: .word ov29_02353538 arm_func_end ov29_023159D4 arm_func_start TryInflictDestinyBondStatus @@ -691,7 +691,7 @@ TryInflictDestinyBondStatus: ; 0x02315A50 mov r1, r5 bl LogMessageByIdWithPopupCheckUserTarget _02315AB8: - ldr r1, _02315B60 ; =0x022C47D4 + ldr r1, _02315B60 ; =ov10_022C47D4 mov r3, #2 mov r0, r5 mov r2, #1 @@ -712,7 +712,7 @@ _02315AF8: mov r0, r5 bl ov29_022E45CC mov r0, #0xff - ldr r1, _02315B68 ; =0x02353538 + ldr r1, _02315B68 ; =ov29_02353538 strb r0, [r4, #0xe8] mov r2, #0 _02315B10: @@ -737,9 +737,9 @@ _02315B10: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02315B5C: .word 0x00000C94 -_02315B60: .word 0x022C47D4 +_02315B60: .word ov10_022C47D4 _02315B64: .word 0x00000D54 -_02315B68: .word 0x02353538 +_02315B68: .word ov29_02353538 _02315B6C: .word 0x00000D53 arm_func_end TryInflictDestinyBondStatus @@ -868,7 +868,7 @@ TryInflictSetDamageStatus: ; 0x02315CE8 ldrb r0, [r4, #0xec] cmp r0, #3 beq _02315D60 - ldr r1, _02315D7C ; =0x022C47A4 + ldr r1, _02315D7C ; =ov10_022C47A4 mov r3, #3 mov r0, r5 mov r2, #0 @@ -893,7 +893,7 @@ _02315D70: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02315D7C: .word 0x022C47A4 +_02315D7C: .word ov10_022C47A4 _02315D80: .word 0x00000D3F arm_func_end TryInflictSetDamageStatus @@ -914,7 +914,7 @@ TryInflictFocusEnergyStatus: ; 0x02315D84 ldrb r0, [r4, #0xec] cmp r0, #4 beq _02315DFC - ldr r1, _02315E18 ; =0x022C47AC + ldr r1, _02315E18 ; =ov10_022C47AC mov r3, #4 mov r0, r5 mov r2, #0 @@ -939,7 +939,7 @@ _02315E0C: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02315E18: .word 0x022C47AC +_02315E18: .word ov10_022C47AC _02315E1C: .word 0x00000D41 _02315E20: .word 0x00000D42 arm_func_end TryInflictFocusEnergyStatus @@ -992,7 +992,7 @@ _02315EC4: cmp r0, #0 movne r0, #1 bne _023160C4 - ldr fp, _023160D0 ; =0x02353538 + ldr fp, _023160D0 ; =ov29_02353538 mov r4, #0 _02315EDC: ldr r0, [fp] @@ -1042,7 +1042,7 @@ _02315F78: mov r0, #2 strb r0, [r6, #0xd8] ldr r0, [sl, #0xb4] - ldr r1, _023160D4 ; =0x022C47B4 + ldr r1, _023160D4 ; =ov10_022C47B4 ldrb r3, [r0, #6] mov r0, sb mov r2, #1 @@ -1063,7 +1063,7 @@ _02315FCC: mov r1, r0 mov r0, sb bl ov29_02304830 - ldr r0, _023160D0 ; =0x02353538 + ldr r0, _023160D0 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] cmp r7, #0 @@ -1083,7 +1083,7 @@ _0231600C: mov r6, #6 mov r5, sl _02316028: - ldr r0, _023160D0 ; =0x02353538 + ldr r0, _023160D0 ; =ov29_02353538 ldr r0, [r0] add r0, r0, sl, lsl #2 add r0, r0, #0x12000 @@ -1130,8 +1130,8 @@ _023160C4: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _023160CC: .word 0x00000D46 -_023160D0: .word 0x02353538 -_023160D4: .word 0x022C47B4 +_023160D0: .word ov29_02353538 +_023160D4: .word ov10_022C47B4 _023160D8: .word 0x00000D45 arm_func_end TryInflictDecoyStatus @@ -1194,7 +1194,7 @@ TryInflictCurseStatus: ; 0x023160DC mov r1, r7 bl TryRemoveSnatchedMonsterFromDungeonStruct mov r2, #1 - ldr r1, _02316274 ; =0x022C4784 + ldr r1, _02316274 ; =ov10_022C4784 mov r0, r7 strb r2, [r5, #0xd8] bl CalcStatusDuration @@ -1219,7 +1219,7 @@ _02316208: bl TryActivateQuickFeet b _02316260 _02316218: - ldr r1, _0231627C ; =0x02352AEC + ldr r1, _0231627C ; =ATK_STAT_IDX mov r0, r8 ldr r2, [r1] mov r1, r8 @@ -1245,9 +1245,9 @@ _0231626C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02316274: .word 0x022C4784 +_02316274: .word ov10_022C4784 _02316278: .word 0x00000CEC -_0231627C: .word 0x02352AEC +_0231627C: .word ATK_STAT_IDX arm_func_end TryInflictCurseStatus arm_func_start TryInflictSnatchStatus @@ -1265,7 +1265,7 @@ TryInflictSnatchStatus: ; 0x02316280 mov r3, #1 bl EndCurseClassStatus mov sb, #0 - ldr r6, _0231639C ; =0x02353538 + ldr r6, _0231639C ; =ov29_02353538 mov r8, sb mov r7, #1 _023162C0: @@ -1296,7 +1296,7 @@ _02316304: ldrb r0, [r6, #0xd8] cmp r0, #3 beq _02316350 - ldr r1, _023163A0 ; =0x022C4788 + ldr r1, _023163A0 ; =ov10_022C4788 mov r3, #3 mov r0, r4 mov r2, #0 @@ -1307,7 +1307,7 @@ _02316304: mov r0, #0 strb r0, [r6, #0xdc] _02316350: - ldr r3, _0231639C ; =0x02353538 + ldr r3, _0231639C ; =ov29_02353538 mov r0, #0 ldr r2, [r3] mov r1, r4 @@ -1327,8 +1327,8 @@ _02316350: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_0231639C: .word 0x02353538 -_023163A0: .word 0x022C4788 +_0231639C: .word ov29_02353538 +_023163A0: .word ov10_022C4788 _023163A4: .word 0x00000CED arm_func_end TryInflictSnatchStatus @@ -1379,7 +1379,7 @@ TryInflictTauntStatus: ; 0x023163A8 ldrb r0, [r6, #0xd0] cmp r0, #5 beq _023164A4 - ldr r1, _023164CC ; =0x022C47BC + ldr r1, _023164CC ; =ov10_022C47BC mov r3, #5 mov r0, r4 mov r2, #1 @@ -1411,7 +1411,7 @@ _023164C0: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _023164C8: .word 0x00000C39 -_023164CC: .word 0x022C47BC +_023164CC: .word ov10_022C47BC _023164D0: .word 0x00000D49 _023164D4: .word 0x00000D4A arm_func_end TryInflictTauntStatus @@ -1486,7 +1486,7 @@ TryInflictInvisibleStatus: ; 0x0231657C mov r2, #0 bl EndInvisibleClassStatus mov r3, #1 - ldr r1, _02316620 ; =0x022C47C8 + ldr r1, _02316620 ; =ov10_022C47C8 mov r0, r5 mov r2, #0 strb r3, [r4, #0xef] @@ -1510,7 +1510,7 @@ _02316614: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02316620: .word 0x022C47C8 +_02316620: .word ov10_022C47C8 _02316624: .word 0x00000D4D _02316628: .word 0x00000D4E arm_func_end TryInflictInvisibleStatus @@ -1553,7 +1553,7 @@ TryInflictPerishSongStatus: ; 0x0231662C ldrb r0, [r4, #0x106] cmp r0, #0 bne _023166F4 - ldr r1, _02316714 ; =0x022C47D0 + ldr r1, _02316714 ; =ov10_022C47D0 mov r0, r5 mov r2, #0 bl CalcStatusDuration @@ -1578,7 +1578,7 @@ _02316704: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02316714: .word 0x022C47D0 +_02316714: .word ov10_022C47D0 _02316718: .word 0x00000D51 _0231671C: .word 0x00000D52 arm_func_end TryInflictPerishSongStatus @@ -1670,7 +1670,7 @@ _02316834: ldrb r0, [r4, #0xd0] cmp r0, #6 beq _023168A4 - ldr r1, _023168CC ; =0x022C47D8 + ldr r1, _023168CC ; =ov10_022C47D8 mov r3, #6 mov r0, r6 mov r2, #1 @@ -1701,7 +1701,7 @@ _023168B4: .align 2, 0 _023168C4: .word 0x00000C39 _023168C8: .word 0x00000D57 -_023168CC: .word 0x022C47D8 +_023168CC: .word ov10_022C47D8 _023168D0: .word 0x00000D55 _023168D4: .word 0x00000D56 arm_func_end TryInflictEncoreStatus @@ -1923,7 +1923,7 @@ TryIncreaseBelly: ; 0x02316BB0 cmp r0, #0 beq _02316C38 _02316C08: - ldr r1, _02317104 ; =0x022C44B0 + ldr r1, _02317104 ; =ov10_022C44B0 mov r0, r8, lsl #8 ldrsh r1, [r1] mov r1, r1, lsl #8 @@ -2253,7 +2253,7 @@ _023170FC: add sp, sp, #0x2c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02317104: .word 0x022C44B0 +_02317104: .word ov10_022C44B0 _02317108: .word 0x000003E7 _0231710C: .word 0x00000D6C _02317110: .word 0x00000D6A @@ -2299,7 +2299,7 @@ TryInflictMuzzledStatus: ; 0x02317124 ldrb r0, [r4, #0xf3] cmp r0, #1 beq _023171F0 - ldr r1, _02317210 ; =0x022C4848 + ldr r1, _02317210 ; =ov10_022C4848 mov r2, #1 mov r0, r5 strb r2, [r4, #0xf3] @@ -2327,7 +2327,7 @@ _02317200: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02317210: .word 0x022C4848 +_02317210: .word ov10_022C4848 _02317214: .word 0x00000D72 _02317218: .word 0x00000D73 arm_func_end TryInflictMuzzledStatus @@ -2436,7 +2436,7 @@ _02317350: bl EndInvisibleClassStatus mov r0, #2 strb r0, [r8, #0xef] - ldr r1, _02317404 ; =0x022C47FC + ldr r1, _02317404 ; =ov10_022C47FC mov r0, sb mov r2, #1 bl CalcStatusDuration @@ -2466,7 +2466,7 @@ _023173F4: .align 2, 0 _023173FC: .word 0x00000D6F _02317400: .word 0x00000D6E -_02317404: .word 0x022C47FC +_02317404: .word ov10_022C47FC _02317408: .word 0x00000D6D arm_func_end TryTransform @@ -2488,7 +2488,7 @@ TryInflictMobileStatus: ; 0x0231740C mov r2, #1 bl EndInvisibleClassStatus mov r3, #3 - ldr r1, _023174C0 ; =0x022C480C + ldr r1, _023174C0 ; =ov10_022C480C mov r0, r5 mov r2, #0 strb r3, [r4, #0xef] @@ -2520,7 +2520,7 @@ _023174B4: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023174C0: .word 0x022C480C +_023174C0: .word ov10_022C480C _023174C4: .word 0x00000D71 arm_func_end TryInflictMobileStatus @@ -2640,14 +2640,14 @@ TryActivateIdentifyCondition: ; 0x02317648 bl EntityIsValid__02315118 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _023176C0 ; =0x02353538 + ldr r0, _023176C0 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x78d] cmp r0, #0 bne _023176AC mov r0, r4 bl ov29_022E4868 - ldr r1, _023176C0 ; =0x02353538 + ldr r1, _023176C0 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] mov r2, #1 @@ -2665,7 +2665,7 @@ _023176AC: bl LogMessageByIdWithPopupCheckUserTarget ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023176C0: .word 0x02353538 +_023176C0: .word ov29_02353538 _023176C4: .word 0x00000D78 _023176C8: .word 0x00000D79 arm_func_end TryActivateIdentifyCondition @@ -2712,7 +2712,7 @@ TryInflictBlinkerStatus: ; 0x023176CC strb r2, [r6, #0xf1] movne r0, #0x7f bne _0231777C - ldr r1, _023177D8 ; =0x022C4828 + ldr r1, _023177D8 ; =ov10_022C4828 mov r0, r4 bl CalcStatusDuration add r0, r0, #1 @@ -2743,7 +2743,7 @@ _023177C8: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_023177D8: .word 0x022C4828 +_023177D8: .word ov10_022C4828 _023177DC: .word 0x00000D34 _023177E0: .word 0x00000D35 arm_func_end TryInflictBlinkerStatus @@ -2821,7 +2821,7 @@ TryInflictCrossEyedStatus: ; 0x02317844 mov r1, r5 bl LogMessageByIdWithPopupCheckUserTarget mov r3, #2 - ldr r1, _02317954 ; =0x022C4830 + ldr r1, _02317954 ; =ov10_022C4830 mov r0, r5 mov r2, #1 strb r3, [r4, #0xf1] @@ -2851,7 +2851,7 @@ _02317940: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02317950: .word 0x00000D36 -_02317954: .word 0x022C4830 +_02317954: .word ov10_022C4830 _02317958: .word 0x00000D37 arm_func_end TryInflictCrossEyedStatus @@ -2872,7 +2872,7 @@ TryInflictEyedropStatus: ; 0x0231795C ldrb r0, [r4, #0xf1] cmp r0, #3 beq _023179E4 - ldr r1, _02317A00 ; =0x022C4838 + ldr r1, _02317A00 ; =ov10_022C4838 mov r3, #3 mov r0, r5 mov r2, #0 @@ -2901,7 +2901,7 @@ _023179F4: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02317A00: .word 0x022C4838 +_02317A00: .word ov10_022C4838 _02317A04: .word 0x00000D38 _02317A08: .word 0x00000D39 arm_func_end TryInflictEyedropStatus @@ -2937,7 +2937,7 @@ _02317A54: mov r2, #0 bl EndInvisibleClassStatus mov r3, #4 - ldr r1, _02317AE8 ; =0x022C486C + ldr r1, _02317AE8 ; =ov10_022C486C mov r0, r4 mov r2, #1 strb r3, [r6, #0xef] @@ -2968,7 +2968,7 @@ _02317AD8: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02317AE8: .word 0x022C486C +_02317AE8: .word ov10_022C486C _02317AEC: .word 0x00000D3A _02317AF0: .word 0x00000D3B arm_func_end TryInflictSlipStatus @@ -3016,7 +3016,7 @@ _02317B70: ldrb r0, [r4, #0xf1] cmp r0, #4 beq _02317BEC - ldr r1, _02317C10 ; =0x022C487C + ldr r1, _02317C10 ; =ov10_022C487C mov r3, #4 mov r0, r5 mov r2, #1 @@ -3052,7 +3052,7 @@ _02317BFC: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02317C0C: .word 0x00000D3E -_02317C10: .word 0x022C487C +_02317C10: .word ov10_022C487C _02317C14: .word 0x00000115 _02317C18: .word 0x00000D3C _02317C1C: .word 0x00000D3D @@ -3577,7 +3577,7 @@ TryInflictGastroAcidStatus: ; 0x0231827C mov r1, r6 bl TryRemoveSnatchedMonsterFromDungeonStruct mov r3, #4 - ldr r1, _023183B0 ; =0x022C476C + ldr r1, _023183B0 ; =ov10_022C476C mov r0, r6 mov r2, #1 strb r3, [r4, #0xd8] @@ -3585,7 +3585,7 @@ TryInflictGastroAcidStatus: ; 0x0231827C add r0, r0, #1 strb r0, [r4, #0xdb] mov r1, #0 - ldr r0, _023183B4 ; =0x02353538 + ldr r0, _023183B4 ; =ov29_02353538 strb r1, [r4, #0xdc] ldr r0, [r0] mov r1, #1 @@ -3616,8 +3616,8 @@ _023183A0: mov r0, #1 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_023183B0: .word 0x022C476C -_023183B4: .word 0x02353538 +_023183B0: .word ov10_022C476C +_023183B4: .word ov29_02353538 _023183B8: .word 0x00000D7B _023183BC: .word 0x00000D7C arm_func_end TryInflictGastroAcidStatus @@ -3628,13 +3628,13 @@ SetAquaRingHealingCountdownTo4: ; 0x023183C0 mov r4, r0 bl EntityIsValid__02315118 cmp r0, #0 - ldrne r0, _023183E4 ; =0x022C4620 + ldrne r0, _023183E4 ; =ov10_022C4620 ldrne r1, [r4, #0xb4] ldrnesh r0, [r0] strneb r0, [r1, #0xd7] ldmia sp!, {r4, pc} .align 2, 0 -_023183E4: .word 0x022C4620 +_023183E4: .word ov10_022C4620 arm_func_end SetAquaRingHealingCountdownTo4 arm_func_start ApplyAquaRingHealing @@ -3655,7 +3655,7 @@ ApplyAquaRingHealing: ; 0x023183E8 ldrsh r0, [r3, #0x10] cmp r0, r1 bge _02318444 - ldr r0, _02318458 ; =0x022C4628 + ldr r0, _02318458 ; =ov10_022C4628 mov r3, #0 ldrsh r2, [r0] mov r0, r4 @@ -3670,7 +3670,7 @@ _0231844C: ldmia sp!, {r3, r4, pc} .align 2, 0 _02318454: .word 0x000003E7 -_02318458: .word 0x022C4628 +_02318458: .word ov10_022C4628 arm_func_end ApplyAquaRingHealing arm_func_start TryInflictAquaRingStatus @@ -3693,7 +3693,7 @@ TryInflictAquaRingStatus: ; 0x0231845C ldrb r0, [r4, #0xd5] cmp r0, #0x10 beq _023184E0 - ldr r1, _023184FC ; =0x022C4764 + ldr r1, _023184FC ; =ov10_022C4764 mov r3, #0x10 mov r0, r5 mov r2, #0 @@ -3718,7 +3718,7 @@ _023184F0: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023184FC: .word 0x022C4764 +_023184FC: .word ov10_022C4764 _02318500: .word 0x00000D7D _02318504: .word 0x00000D7E arm_func_end TryInflictAquaRingStatus @@ -3743,7 +3743,7 @@ TryInflictLuckyChantStatus: ; 0x02318508 ldrb r0, [r4, #0xd5] cmp r0, #0x11 beq _02318584 - ldr r1, _023185A0 ; =0x022C4768 + ldr r1, _023185A0 ; =ov10_022C4768 mov r3, #0x11 mov r0, r5 mov r2, #0 @@ -3766,7 +3766,7 @@ _02318594: bl UpdateStatusIconFlags ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023185A0: .word 0x022C4768 +_023185A0: .word ov10_022C4768 _023185A4: .word 0x00000D7F arm_func_end TryInflictLuckyChantStatus @@ -3815,7 +3815,7 @@ TryInflictHealBlockStatus: ; 0x023185A8 mov r1, r5 bl TryRemoveSnatchedMonsterFromDungeonStruct mov r3, #5 - ldr r1, _023186C0 ; =0x022C4774 + ldr r1, _023186C0 ; =ov10_022C4774 mov r0, r5 mov r2, #1 strb r3, [r7, #0xd8] @@ -3846,7 +3846,7 @@ _023186B0: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_023186C0: .word 0x022C4774 +_023186C0: .word ov10_022C4774 _023186C4: .word 0x00000D81 _023186C8: .word 0x00000D82 arm_func_end TryInflictHealBlockStatus @@ -3929,7 +3929,7 @@ TryInflictEmbargoStatus: ; 0x0231872C mov r1, r5 bl TryRemoveSnatchedMonsterFromDungeonStruct mov r3, #6 - ldr r1, _02318844 ; =0x022C4778 + ldr r1, _02318844 ; =ov10_022C4778 mov r0, r5 mov r2, #1 strb r3, [r7, #0xd8] @@ -3960,7 +3960,7 @@ _02318834: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02318844: .word 0x022C4778 +_02318844: .word ov10_022C4778 _02318848: .word 0x00000D84 _0231884C: .word 0x00000D85 arm_func_end TryInflictEmbargoStatus @@ -4019,7 +4019,7 @@ _02318900: ldrb r0, [r4, #0xf5] cmp r0, #1 beq _02318954 - ldr r1, _02318978 ; =0x022C477C + ldr r1, _02318978 ; =ov10_022C477C mov r2, #1 mov r0, r6 strb r2, [r4, #0xf5] @@ -4046,7 +4046,7 @@ _02318964: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _02318974: .word 0x00000D89 -_02318978: .word 0x022C477C +_02318978: .word ov10_022C477C _0231897C: .word 0x00000D87 _02318980: .word 0x00000D88 arm_func_end TryInflictMiracleEyeStatus @@ -4081,7 +4081,7 @@ _023189B0: ldrb r0, [r4, #0xf7] cmp r0, #1 beq _02318A20 - ldr r1, _02318A40 ; =0x022C4780 + ldr r1, _02318A40 ; =ov10_022C4780 mov r2, #1 mov r0, r5 strb r2, [r4, #0xf7] @@ -4104,7 +4104,7 @@ _02318A30: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02318A3C: .word 0x00000D8C -_02318A40: .word 0x022C4780 +_02318A40: .word ov10_022C4780 _02318A44: .word 0x00000D8A _02318A48: .word 0x00000D8B arm_func_end TryInflictMagnetRiseStatus @@ -4284,7 +4284,7 @@ _02318C44: _02318C7C: cmp r7, #1 bne _02318CD0 - ldr r1, _02318D24 ; =0x022C4754 + ldr r1, _02318D24 ; =ov10_022C4754 mov r0, r8 mov r2, #0 bl CalcStatusDuration @@ -4306,7 +4306,7 @@ _02318C7C: _02318CD0: cmp r7, #0xc bne _02318CF0 - ldr r1, _02318D30 ; =0x022C475C + ldr r1, _02318D30 ; =ov10_022C475C mov r0, r8 mov r2, #0 bl CalcStatusDuration @@ -4327,8 +4327,8 @@ _02318CF0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _02318D20: .word 0x00000D7A -_02318D24: .word 0x022C4754 +_02318D24: .word ov10_022C4754 _02318D28: .word 0x00000166 _02318D2C: .word 0x00000217 -_02318D30: .word 0x022C475C +_02318D30: .word ov10_022C475C arm_func_end ov29_02318BBC diff --git a/asm/overlay_29_023201A0.s b/asm/overlay_29_023201A0.s index 7210e9ae..8f7a5469 100644 --- a/asm/overlay_29_023201A0.s +++ b/asm/overlay_29_023201A0.s @@ -38,7 +38,7 @@ ov29_023201D0: ; 0x023201D0 strh r0, [sp] ldrh r3, [sl, #6] ldrsh r6, [r1, r2] - ldr r0, _02320334 ; =0x0235171E + ldr r0, _02320334 ; =ov29_0235171E ldrsh r1, [sp] ldrsh r7, [r0, r2] strh r3, [sp, #2] @@ -117,7 +117,7 @@ _02320328: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 _02320330: .word DIRECTIONS_XY -_02320334: .word 0x0235171E +_02320334: .word ov29_0235171E _02320338: .word 0x00000212 arm_func_end ov29_023201D0 @@ -209,7 +209,7 @@ TryExplosion: ; 0x02320448 ldr fp, [sp, #0x3c] mov r5, #0 mov r7, #0x15 - ldr r4, _0232074C ; =0x02353538 + ldr r4, _0232074C ; =ov29_02353538 b _023204B4 _0232047C: ldr r0, [r4] @@ -268,7 +268,7 @@ _02320518: mov r0, sl mov r1, sb bl LogMessageByIdWithPopupCheckUserTarget - ldr r0, _02320758 ; =0x023529B8 + ldr r0, _02320758 ; =ov29_023529B8 mov r6, #0 ldr r4, [r0, r8, lsl #2] mov r7, r6 @@ -352,7 +352,7 @@ _02320664: ldr r0, [r1] cmp r0, #1 bne _023206A8 - ldr r2, _0232075C ; =0x02353700 + ldr r2, _0232075C ; =ov29_02353700 mov r0, sl ldr r5, [r2, r8, lsl #2] ldr r2, [sp, #0x38] @@ -378,7 +378,7 @@ _023206B8: ldr r0, _02320760 ; =0x0000026F cmp fp, r0 beq _023206FC - ldr r1, _0232075C ; =0x02353700 + ldr r1, _0232075C ; =ov29_02353700 ldr r2, [sp, #0x38] ldr r4, [r1, r8, lsl #2] mov r0, sl @@ -412,10 +412,10 @@ _02320744: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0232074C: .word 0x02353538 +_0232074C: .word ov29_02353538 _02320750: .word 0x00000BFC _02320754: .word 0x00000BFB -_02320758: .word 0x023529B8 -_0232075C: .word 0x02353700 +_02320758: .word ov29_023529B8 +_0232075C: .word ov29_02353700 _02320760: .word 0x0000026F arm_func_end TryExplosion diff --git a/asm/overlay_29_02320788.s b/asm/overlay_29_02320788.s index d53cbb5f..e52d441b 100644 --- a/asm/overlay_29_02320788.s +++ b/asm/overlay_29_02320788.s @@ -16,7 +16,7 @@ TryAftermathExplosion: ; 0x02320788 ldr fp, [sp, #0x3c] mov r5, #0 mov r7, #0x15 - ldr r4, _02320A8C ; =0x02353538 + ldr r4, _02320A8C ; =ov29_02353538 b _023207F4 _023207BC: ldr r0, [r4] @@ -75,7 +75,7 @@ _02320858: mov r0, sl mov r1, sb bl LogMessageByIdWithPopupCheckUserTarget - ldr r0, _02320A98 ; =0x023529B8 + ldr r0, _02320A98 ; =ov29_023529B8 mov r6, #0 ldr r4, [r0, r8, lsl #2] mov r7, r6 @@ -159,7 +159,7 @@ _023209A4: ldr r0, [r1] cmp r0, #1 bne _023209E8 - ldr r2, _02320A9C ; =0x02353700 + ldr r2, _02320A9C ; =ov29_02353700 mov r0, sl ldr r5, [r2, r8, lsl #2] ldr r2, [sp, #0x38] @@ -185,7 +185,7 @@ _023209F8: ldr r0, _02320AA0 ; =0x0000026F cmp fp, r0 beq _02320A3C - ldr r1, _02320A9C ; =0x02353700 + ldr r1, _02320A9C ; =ov29_02353700 ldr r2, [sp, #0x38] ldr r4, [r1, r8, lsl #2] mov r0, sl @@ -219,11 +219,11 @@ _02320A84: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02320A8C: .word 0x02353538 +_02320A8C: .word ov29_02353538 _02320A90: .word 0x00000BFC _02320A94: .word 0x00000BFB -_02320A98: .word 0x023529B8 -_02320A9C: .word 0x02353700 +_02320A98: .word ov29_023529B8 +_02320A9C: .word ov29_02353700 _02320AA0: .word 0x0000026F arm_func_end TryAftermathExplosion @@ -442,7 +442,7 @@ _02320D84: bl LogMessageByIdWithPopupCheckUserTarget ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} _02320DA0: - ldr r0, _023210EC ; =0x02353538 + ldr r0, _023210EC ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] @@ -457,7 +457,7 @@ _02320DA0: _02320DD0: cmp r7, #1 bne _02320E20 - ldr r0, _023210EC ; =0x02353538 + ldr r0, _023210EC ; =ov29_02353538 ldrsh r1, [r8, #4] ldr r0, [r0] add r0, r0, #0xcc00 @@ -491,7 +491,7 @@ _02320E20: cmp r0, #0 beq _02320EA4 ldrb sl, [r5, #0x4c] - ldr fp, _023210FC ; =0x0237C850 + ldr fp, _023210FC ; =ov29_0237C850 _02320E60: ldr r0, [r8, #0x1c] add r0, r0, #0x800 @@ -535,7 +535,7 @@ _02320EC8: strh r0, [sp, #2] b _02321008 _02320EF4: - ldr r1, _023210EC ; =0x02353538 + ldr r1, _023210EC ; =ov29_02353538 add r0, sp, #0 ldr r1, [r1] mov r2, #0 @@ -570,7 +570,7 @@ _02320F60: strh r0, [sp, #2] b _02321008 _02320F74: - ldr r1, _023210EC ; =0x02353538 + ldr r1, _023210EC ; =ov29_02353538 add r0, sp, #0 ldr r1, [r1] mov r2, #1 @@ -628,7 +628,7 @@ _02321008: beq _023210A0 ldrb sl, [r5, #0x4c] mov r0, #0xa000 - ldr r6, _023210FC ; =0x0237C850 + ldr r6, _023210FC ; =ov29_0237C850 str r0, [r8, #0x1c] mov fp, #0x22 _0232105C: @@ -673,11 +673,11 @@ _023210DC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _023210E8: .word 0x00000E74 -_023210EC: .word 0x02353538 +_023210EC: .word ov29_02353538 _023210F0: .word 0x00000E72 _023210F4: .word 0x00000E73 _023210F8: .word 0x00000E71 -_023210FC: .word 0x0237C850 +_023210FC: .word ov29_0237C850 _02321100: .word 0x00000E75 arm_func_end TryWarp @@ -768,7 +768,7 @@ _02321200: _02321210: mov r0, r4 bl ov29_022F9C74 - ldr r1, _02321234 ; =0x02353538 + ldr r1, _02321234 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x4000 @@ -776,7 +776,7 @@ _02321210: bl ov29_02305814 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02321234: .word 0x02353538 +_02321234: .word ov29_02353538 arm_func_end ov29_0232119C arm_func_start ov29_02321238 diff --git a/asm/overlay_29_0232145C.s b/asm/overlay_29_0232145C.s index 9ce55e02..4943b904 100644 --- a/asm/overlay_29_0232145C.s +++ b/asm/overlay_29_0232145C.s @@ -55,7 +55,7 @@ _023214EC: mov r0, #0 b _02321A40 _02321518: - ldr r1, _02321A54 ; =0x0237CA68 + ldr r1, _02321A54 ; =ov29_0237CA68 mov r2, r0 strb r0, [r1] str r0, [r1, #0x18] @@ -129,7 +129,7 @@ _02321610: cmp r0, #0 bne _02321888 _02321620: - ldr r0, _02321A54 ; =0x0237CA68 + ldr r0, _02321A54 ; =ov29_0237CA68 ldrb r0, [r0, #4] cmp r0, #0 bne _02321888 @@ -169,7 +169,7 @@ _023216AC: ldr r0, [sp, #0x18] cmp r0, #0 beq _02321848 - ldr r1, _02321A54 ; =0x0237CA68 + ldr r1, _02321A54 ; =ov29_0237CA68 mov r0, #0 str r0, [sp, #0x10] ldr r0, [r1, #0x18] @@ -262,7 +262,7 @@ _023217E4: orreq r0, r0, #8 streqh r0, [r4, #2] _02321810: - ldr r0, _02321A54 ; =0x0237CA68 + ldr r0, _02321A54 ; =ov29_0237CA68 ldr r1, [r0, #0x18] ldr r0, [sp, #0xc] cmp r0, r1 @@ -384,7 +384,7 @@ _023219A0: cmp r0, #0 moveq r0, #1 beq _02321A40 - ldr r1, _02321A54 ; =0x0237CA68 + ldr r1, _02321A54 ; =ov29_0237CA68 ldrb r0, [r1] cmp r0, #0 beq _02321A3C @@ -394,7 +394,7 @@ _023219A0: bl EntityIsValid__02321438 cmp r0, #0 beq _02321A3C - ldr r1, _02321A74 ; =0x022C4714 + ldr r1, _02321A74 ; =ov10_022C4714 mov r0, sl ldr r4, [sl, #0xb4] mov r2, #1 @@ -420,7 +420,7 @@ _02321A40: _02321A48: .word 0x00000E7C _02321A4C: .word 0x00000E7D _02321A50: .word 0x00000E78 -_02321A54: .word 0x0237CA68 +_02321A54: .word ov29_0237CA68 _02321A58: .word 0x00000E7E _02321A5C: .word 0x00000E7F _02321A60: .word 0x00000E81 @@ -428,7 +428,7 @@ _02321A64: .word 0x00000E79 _02321A68: .word 0x000001D1 _02321A6C: .word 0x00000E76 _02321A70: .word 0x00000E77 -_02321A74: .word 0x022C4714 +_02321A74: .word ov10_022C4714 arm_func_end ov29_0232145C arm_func_start TryActivateNondamagingDefenderAbility @@ -534,7 +534,7 @@ _02321BD4: ldr r1, _02321CDC ; =0x00000E89 mov r0, r5 bl LogMessageByIdWithPopupCheckUser - ldr r1, _02321CE0 ; =0x022C4720 + ldr r1, _02321CE0 ; =SLEEP_TURN_RANGE mov r0, r5 mov r2, #1 bl CalcStatusDuration @@ -599,7 +599,7 @@ _02321CD0: .word 0x00000E86 _02321CD4: .word 0x00000E87 _02321CD8: .word 0x00000E88 _02321CDC: .word 0x00000E89 -_02321CE0: .word 0x022C4720 +_02321CE0: .word SLEEP_TURN_RANGE _02321CE4: .word 0x00000E8A _02321CE8: .word 0x00000E8B _02321CEC: .word 0x00000E8C @@ -670,7 +670,7 @@ _02321DB8: ldr r1, _02322258 ; =0x00000EA3 mov r0, r6 bl LogMessageByIdWithPopupCheckUser - ldr r1, _0232225C ; =0x022C4724 + ldr r1, _0232225C ; =ov10_022C4724 mov r0, r5 mov r2, #1 bl CalcStatusDuration @@ -753,7 +753,7 @@ _02321EF0: ldr r1, _0232226C ; =0x00000E94 mov r0, r6 bl LogMessageByIdWithPopupCheckUser - ldr r1, _02322270 ; =0x022C4720 + ldr r1, _02322270 ; =SLEEP_TURN_RANGE mov r0, r6 mov r2, #1 bl CalcStatusDuration @@ -978,12 +978,12 @@ _0232224C: .word 0x00000E8D _02322250: .word 0x00000E8E _02322254: .word 0x00000E8F _02322258: .word 0x00000EA3 -_0232225C: .word 0x022C4724 +_0232225C: .word ov10_022C4724 _02322260: .word 0x00000E91 _02322264: .word 0x00000E92 _02322268: .word 0x00000E93 _0232226C: .word 0x00000E94 -_02322270: .word 0x022C4720 +_02322270: .word SLEEP_TURN_RANGE _02322274: .word 0x00000E95 _02322278: .word 0x00000E96 _0232227C: .word 0x00000E98 @@ -1095,10 +1095,10 @@ _023223D4: mov r0, #0xa8 bl DungeonRandInt mov r2, r0 - ldr r1, _02322D1C ; =0x0237CA88 + ldr r1, _02322D1C ; =ov29_0237CA88 add r0, sp, #0x28 str r2, [r1] - ldr r1, _02322D20 ; =0x022C5DDC + ldr r1, _02322D20 ; =METRONOME_TABLE mov r2, r2, lsl #3 ldrh r1, [r1, r2] bl InitMove @@ -1124,7 +1124,7 @@ _02322460: cmp r1, #0x77 bne _023224C4 bl GetNaturePowerVariant - ldr r1, _02322D28 ; =0x022C4E40 + ldr r1, _02322D28 ; =ov10_022C4E40 mov r0, r0, lsl #3 ldrh r1, [r1, r0] add r0, sp, #0x30 @@ -1288,7 +1288,7 @@ _023226C8: mov r0, #0 b _02322D10 _023226D0: - ldr r0, _02322D44 ; =0x0237CA68 + ldr r0, _02322D44 ; =ov29_0237CA68 mov r1, #0 str r1, [r0, #0x10] str r1, [r0, #0xc] @@ -1323,7 +1323,7 @@ _02322714: beq _02322768 mov r0, #0x64 bl DungeonRandInt - ldr r1, _02322D4C ; =0x022C4584 + ldr r1, _02322D4C ; =ov10_022C4584 ldrsh r1, [r1] cmp r0, r1 movlt r7, #1 @@ -1348,13 +1348,13 @@ _023227A8: bl ov29_02324514 str r0, [sp, #0x24] _023227B0: - ldr r0, _02322D50 ; =0x022C45B8 + ldr r0, _02322D50 ; =ov10_022C45B8 mov r7, #0 ldrsh r0, [r0] str r0, [sp, #0x14] b _02322C8C _023227C4: - ldr r0, _02322D44 ; =0x0237CA68 + ldr r0, _02322D44 ; =ov29_0237CA68 mov sb, #1 ldrb r1, [r0, #1] cmp r1, #0 @@ -1425,7 +1425,7 @@ _023228A4: bl UpdateAiTargetPos mov sb, #0 _023228CC: - ldr r0, _02322D58 ; =0x0235370C + ldr r0, _02322D58 ; =ov29_0235370C mov r1, #0 str r1, [r0] str r1, [sp, #0x38] @@ -1547,7 +1547,7 @@ _02322A68: mov r0, r6 mov r1, r8 bl ov29_02322DDC - ldr r1, _02322D58 ; =0x0235370C + ldr r1, _02322D58 ; =ov29_0235370C mov sb, r0 ldr r0, [r1] mov r1, #0 @@ -1564,7 +1564,7 @@ _02322AC0: movne r1, #0 strneh r1, [r0, #0x7e] strneh r1, [r0, #0x80] - ldr r0, _02322D44 ; =0x0237CA68 + ldr r0, _02322D44 ; =ov29_0237CA68 cmp fp, #0 ldr r1, [r0, #0x10] add r1, r1, #1 @@ -1650,7 +1650,7 @@ _02322BE8: mov r2, #0 strb r2, [r1, #0xd3] ldr r1, [r6, #0xb4] - ldr r0, _02322D44 ; =0x0237CA68 + ldr r0, _02322D44 ; =ov29_0237CA68 strb r2, [r1, #0x154] ldr r1, [r6, #0xb4] sub r7, r7, #1 @@ -1684,7 +1684,7 @@ _02322C8C: cmp r7, r0 blt _023227C4 _02322C98: - ldr r0, _02322D44 ; =0x0237CA68 + ldr r0, _02322D44 ; =ov29_0237CA68 ldrb r0, [r0, #5] cmp r0, #0 beq _02322CC4 @@ -1696,7 +1696,7 @@ _02322C98: mov r1, r6 bl EndLeechSeedClassStatus _02322CC4: - ldr r0, _02322D44 ; =0x0237CA68 + ldr r0, _02322D44 ; =ov29_0237CA68 ldrb r0, [r0, #2] cmp r0, #0 beq _02322D0C @@ -1721,22 +1721,22 @@ _02322D10: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02322D18: .word 0x0000014A -_02322D1C: .word 0x0237CA88 -_02322D20: .word 0x022C5DDC +_02322D1C: .word ov29_0237CA88 +_02322D20: .word METRONOME_TABLE _02322D24: .word 0x00000EA4 -_02322D28: .word 0x022C4E40 +_02322D28: .word ov10_022C4E40 _02322D2C: .word 0x00000EA5 _02322D30: .word 0x00000EA6 _02322D34: .word 0x00000EA7 _02322D38: .word 0x00000E7B _02322D3C: .word 0x00000E79 _02322D40: .word 0x00000E7A -_02322D44: .word 0x0237CA68 +_02322D44: .word ov29_0237CA68 _02322D48: .word 0x00000163 -_02322D4C: .word 0x022C4584 -_02322D50: .word 0x022C45B8 +_02322D4C: .word ov10_022C4584 +_02322D50: .word ov10_022C45B8 _02322D54: .word 0x000001ED -_02322D58: .word 0x0235370C +_02322D58: .word ov29_0235370C _02322D5C: .word 0x00000EA9 _02322D60: .word 0x000001F6 arm_func_end ov29_02322374 @@ -1906,7 +1906,7 @@ _02322F74: .word 0x00000163 ov29_02322F78: ; 0x02322F78 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x18 - ldr r4, _023230F4 ; =0x02353538 + ldr r4, _023230F4 ; =ov29_02353538 mov r7, r0 ldr r0, [r4] mov r6, r1 @@ -1962,7 +1962,7 @@ _02322FC8: mov r2, r0 mvn r0, #0 cmp r2, r0 - ldreq r0, _023230F8 ; =0x02352A54 + ldreq r0, _023230F8 ; =ov29_02352A54 ldreqh r1, [r0] streqh r1, [sp, #0xc] ldreqh r0, [r0, #2] @@ -2005,15 +2005,15 @@ _023230EC: add sp, sp, #0x18 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_023230F4: .word 0x02353538 -_023230F8: .word 0x02352A54 +_023230F4: .word ov29_02353538 +_023230F8: .word ov29_02352A54 arm_func_end ov29_02322F78 arm_func_start ov29_023230FC ov29_023230FC: ; 0x023230FC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xc0 - ldr r4, _023238F4 ; =0x02352A54 + ldr r4, _023238F4 ; =ov29_02352A54 mov r8, r0 mov r0, #0 str r0, [sp, #0x88] @@ -2039,7 +2039,7 @@ ov29_023230FC: ; 0x023230FC _02323160: ldrsh r2, [r8, #4] ldr r0, _023238F8 ; =DIRECTIONS_XY - ldr r1, _023238FC ; =0x0235171E + ldr r1, _023238FC ; =ov29_0235171E strh r2, [sp, #0xbc] ldrsh r2, [r8, #6] mov r4, #0 @@ -2129,7 +2129,7 @@ _02323250: ldr r0, _023238F8 ; =DIRECTIONS_XY strh r2, [sp, #0xb8] ldrsh r2, [r5, #6] - ldr r1, _023238FC ; =0x0235171E + ldr r1, _023238FC ; =ov29_0235171E strh r2, [sp, #0xba] ldrb r2, [sb, #0x4c] add r2, r2, #4 @@ -2141,11 +2141,11 @@ _02323250: str r0, [sp, #0x60] _023232E4: ldrsh r0, [r8, #4] - ldr r5, _02323900 ; =0x0235175C + ldr r5, _02323900 ; =ov29_0235175C ldr r3, _023238F8 ; =DIRECTIONS_XY strh r0, [sp, #0xbc] ldrsh r1, [r8, #6] - ldr r2, _023238FC ; =0x0235171E + ldr r2, _023238FC ; =ov29_0235171E mov r0, #0x18 strh r1, [sp, #0xbe] ldrb r1, [sb, #0x4c] @@ -2206,7 +2206,7 @@ _02323360: str r0, [sp, #0x30] rsb r0, r4, #0 str r0, [sp, #0x34] - ldr r1, _02323908 ; =0x02352A6C + ldr r1, _02323908 ; =ov29_02352A6C ldr r0, [sp, #0x1c] ldr r5, [sp, #0xb4] ldr r0, [r1, r0, lsl #2] @@ -2250,7 +2250,7 @@ _0232347C: bl ov29_022E2CA0 cmp r0, #0 beq _02323740 - ldr r0, _0232390C ; =0x02353538 + ldr r0, _0232390C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1a000 ldrb r0, [r0, #0x23e] @@ -2334,7 +2334,7 @@ _023235B4: mov r0, r0, asr #8 strh r0, [sp, #0x9c] ldr r0, [sp, #0x50] - ldr r2, _0232390C ; =0x02353538 + ldr r2, _0232390C ; =ov29_02353538 sub r0, sl, r0 mov r0, r0, asr #8 ldr r3, [r2] @@ -2387,7 +2387,7 @@ _0232367C: mov r0, r0, asr #8 strh r0, [sp, #0x98] ldr r0, [sp, #0x4c] - ldr r2, _0232390C ; =0x02353538 + ldr r2, _0232390C ; =ov29_02353538 sub r0, r1, r0 mov r0, r0, asr #8 ldr r3, [r2] @@ -2555,13 +2555,13 @@ _023238EC: add sp, sp, #0xc0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023238F4: .word 0x02352A54 +_023238F4: .word ov29_02352A54 _023238F8: .word DIRECTIONS_XY -_023238FC: .word 0x0235171E -_02323900: .word 0x0235175C +_023238FC: .word ov29_0235171E +_02323900: .word ov29_0235175C _02323904: .word 0x00000FFF -_02323908: .word 0x02352A6C -_0232390C: .word 0x02353538 +_02323908: .word ov29_02352A6C +_0232390C: .word ov29_02353538 _02323910: .word 0x0001A226 _02323914: .word 0x000001E5 arm_func_end ov29_023230FC @@ -2604,7 +2604,7 @@ _02323984: ldr r4, _02323C30 ; =DIRECTIONS_XY ldrb r1, [r0, #0x4c] ldrsh r0, [sl, #4] - ldr r5, _02323C34 ; =0x0235171E + ldr r5, _02323C34 ; =ov29_0235171E add r1, r1, #4 strh r0, [sp, #0x34] and r0, r1, #7 @@ -2646,7 +2646,7 @@ _02323A20: bl __divsi3 str r0, [sp, #0x1c] ldrb r2, [r7, #0x4c] - ldr r1, _02323C38 ; =0x02352A8C + ldr r1, _02323C38 ; =ov29_02352A8C mov r0, #1 ldr r1, [r1, r2, lsl #2] str r1, [sp, #0x10] @@ -2683,7 +2683,7 @@ _02323A6C: bl ov29_022E2CA0 cmp r0, #0 beq _02323BB0 - ldr r0, _02323C3C ; =0x02353538 + ldr r0, _02323C3C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1a000 ldrb r0, [r0, #0x23e] @@ -2716,7 +2716,7 @@ _02323B14: mul r0, r1, r0 _02323B3C: sub r0, r8, r0 - ldr r2, _02323C3C ; =0x02353538 + ldr r2, _02323C3C ; =ov29_02353538 mov r0, r0, asr #8 strh r0, [sp, #0x2e] mov r0, r7, asr #8 @@ -2785,9 +2785,9 @@ _02323BE0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02323C30: .word DIRECTIONS_XY -_02323C34: .word 0x0235171E -_02323C38: .word 0x02352A8C -_02323C3C: .word 0x02353538 +_02323C34: .word ov29_0235171E +_02323C38: .word ov29_02352A8C +_02323C3C: .word ov29_02353538 _02323C40: .word 0x0001A226 _02323C44: .word 0x00000232 arm_func_end ov29_0232393C @@ -2863,14 +2863,14 @@ _02323D00: bl HasHeldItem _02323D4C: cmp r0, #0 - ldrne r0, _02324014 ; =0x022C47A8 + ldrne r0, _02324014 ; =ov10_022C47A8 mov r1, #5 ldrne r0, [r0] subne r8, r8, r0 mov r0, r6 bl IqSkillIsEnabled cmp r0, #0 - ldrne r0, _02324018 ; =0x022C4808 + ldrne r0, _02324018 ; =ov10_022C4808 mov r1, #0x33 ldrne r0, [r0] ldrsh sb, [sb, #0x2c] @@ -2987,7 +2987,7 @@ _02323F14: _02323F18: mov r0, r6 bl GetApparentWeather - ldr r2, _02324024 ; =0x02353710 + ldr r2, _02324024 ; =ov29_02353710 ldrb r1, [r2, r0] cmp r1, #0 beq _02323F44 @@ -3018,7 +3018,7 @@ _02323F44: cmp sb, #0x14 movgt sb, #0x14 _02323F94: - ldr r2, _02324028 ; =0x022C540C + ldr r2, _02324028 ; =ov10_022C540C ldr r0, [sp, #4] mov r1, #0xa8 mla r1, r0, r1, r2 @@ -3030,7 +3030,7 @@ _02323F94: cmp r3, #0 movlt r3, #0 cmp r3, #0x6400 - ldr r2, _0232402C ; =0x022C5460 + ldr r2, _0232402C ; =ov10_022C5460 ldr r0, [sp] mov r1, #0xa8 mla r1, r0, r1, r2 @@ -3052,13 +3052,13 @@ _02324008: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02324010: .word 0x00000163 -_02324014: .word 0x022C47A8 -_02324018: .word 0x022C4808 +_02324014: .word ov10_022C47A8 +_02324018: .word ov10_022C4808 _0232401C: .word 0x0000010E _02324020: .word 0x000003E7 -_02324024: .word 0x02353710 -_02324028: .word 0x022C540C -_0232402C: .word 0x022C5460 +_02324024: .word ov29_02353710 +_02324028: .word ov10_022C540C +_0232402C: .word ov10_022C5460 arm_func_end MoveHitCheck arm_func_start ov29_02324030 @@ -3169,7 +3169,7 @@ _023241AC: bne _02324248 mov fp, #0 _023241B8: - ldr r0, _023243B0 ; =0x02353538 + ldr r0, _023243B0 ; =ov29_02353538 ldr r0, [r0] add r0, r0, fp, lsl #2 add r0, r0, #0x12000 @@ -3264,7 +3264,7 @@ _0232430C: bne _02324370 mov r7, #0 _02324318: - ldr r0, _023243B0 ; =0x02353538 + ldr r0, _023243B0 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r7, lsl #2 add r0, r0, #0x12000 @@ -3306,7 +3306,7 @@ _0232439C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _023243AC: .word DIRECTIONS_XY -_023243B0: .word 0x02353538 +_023243B0: .word ov29_02353538 arm_func_end ov29_02324030 arm_func_start ov29_023243B4 @@ -3397,7 +3397,7 @@ _023244C0: add r8, r8, #1 ldrb r0, [r0, #6] cmp r0, #0 - ldreq r0, _02324510 ; =0x0235370C + ldreq r0, _02324510 ; =ov29_0235370C ldreq r1, [r0] cmpeq r1, #0 streq r5, [r0] @@ -3405,7 +3405,7 @@ _02324508: mov r0, r8 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02324510: .word 0x0235370C +_02324510: .word ov29_0235370C arm_func_end ov29_023243B4 arm_func_start ov29_02324514 @@ -3464,7 +3464,7 @@ IsChargingTwoTurnMove: ; 0x023245A4 ldmeqia sp!, {r3, r4, r5, pc} ldr ip, [r5, #0xb4] mov lr, #0 - ldr r2, _02324618 ; =0x02352AAC + ldr r2, _02324618 ; =ov29_02352AAC b _02324608 _023245D0: mov r3, lr, lsl #2 @@ -3487,7 +3487,7 @@ _02324608: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02324618: .word 0x02352AAC +_02324618: .word ov29_02352AAC arm_func_end IsChargingTwoTurnMove arm_func_start ov29_0232461C @@ -3501,7 +3501,7 @@ ov29_0232461C: ; 0x0232461C ldmeqia sp!, {r3, r4, r5, pc} ldr ip, [r5, #0xb4] mov r3, #0 - ldr r2, _02324694 ; =0x02352A60 + ldr r2, _02324694 ; =ov29_02352A60 b _0232466C _02324648: ldrb r1, [r2, r3] @@ -3526,7 +3526,7 @@ _0232468C: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02324694: .word 0x02352A60 +_02324694: .word ov29_02352A60 arm_func_end ov29_0232461C arm_func_start ov29_02324698 @@ -3534,7 +3534,7 @@ ov29_02324698: ; 0x02324698 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x140 mov r6, #0 - ldr fp, _02324740 ; =0x02353538 + ldr fp, _02324740 ; =ov29_02353538 mov r7, r6 add r4, sp, #0 _023246B0: @@ -3579,7 +3579,7 @@ _02324738: add sp, sp, #0x140 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02324740: .word 0x02353538 +_02324740: .word ov29_02353538 _02324744: .word 0x00000163 arm_func_end ov29_02324698 @@ -3716,7 +3716,7 @@ _023248D8: cmp r0, #0x77 bne _02324920 bl GetNaturePowerVariant - ldr r1, _02324930 ; =0x022C4E40 + ldr r1, _02324930 ; =ov10_022C4E40 mov r0, r0, lsl #3 ldrh r0, [r1, r0] cmp r0, #0x76 @@ -3729,7 +3729,7 @@ _02324928: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_02324930: .word 0x022C4E40 +_02324930: .word ov10_022C4E40 arm_func_end TwoTurnMoveForcedMiss arm_func_start DungeonRandOutcomeUserTargetInteraction @@ -4205,7 +4205,7 @@ ov29_02324E78: ; 0x02324E78 mov r2, r0 mvn r0, #0 cmp r2, r0 - ldreq r0, _023250D0 ; =0x02352AD8 + ldreq r0, _023250D0 ; =ov29_02352AD8 ldreqh r1, [r0, #8] streqh r1, [sp, #8] ldreqh r0, [r0, #0xa] @@ -4303,7 +4303,7 @@ _023250C8: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023250D0: .word 0x02352AD8 +_023250D0: .word ov29_02352AD8 arm_func_end ov29_02324E78 arm_func_start ov29_023250D4 @@ -4351,7 +4351,7 @@ ov29_023250D4: ; 0x023250D4 mov r2, r0 mvn r0, #0 cmp r2, r0 - ldreq r0, _02325608 ; =0x02352AD8 + ldreq r0, _02325608 ; =ov29_02352AD8 ldreqh r1, [r0, #4] streqh r1, [sp, #0xc] ldreqh r0, [r0, #6] @@ -4384,14 +4384,14 @@ _023251E8: mov r1, #1 bl ov10_022BF1FC cmp r0, #0 - ldrne r0, _0232560C ; =0x02353538 + ldrne r0, _0232560C ; =ov29_02353538 ldrne r0, [r0] addne r0, r0, #0x1a000 ldrne r5, [r0, #0x22c] bne _02325228 ldrh r0, [sb, #4] cmp r0, #0x52 - ldreq r0, _0232560C ; =0x02353538 + ldreq r0, _0232560C ; =ov29_02353538 ldreq r0, [r0] addeq r0, r0, #0x1a000 ldreq r5, [r0, #0x22c] @@ -4421,10 +4421,10 @@ _02325228: bne _023252E4 mov r0, #7 bl DungeonRandInt - ldr r1, _0232560C ; =0x02353538 - ldr r6, _02325610 ; =0x02352B1C + ldr r1, _0232560C ; =ov29_02353538 + ldr r6, _02325610 ; =ov29_02352B1C ldr r3, [r1] - ldr r2, _02325614 ; =0x0237CA84 + ldr r2, _02325614 ; =ov29_0237CA84 ldr r6, [r6, r0, lsl #2] str r0, [r2] add r0, r3, #0x1a000 @@ -4447,7 +4447,7 @@ _02325228: _023252E4: cmp r0, #0x76 bne _0232531C - ldr r2, _0232560C ; =0x02353538 + ldr r2, _0232560C ; =ov29_02353538 mov r3, #0xc ldr r1, [r2] mov r0, r5 @@ -4542,7 +4542,7 @@ _0232543C: cmp r0, #2 moveq fp, #1 beq _02325470 - ldr r0, _0232560C ; =0x02353538 + ldr r0, _0232560C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x1a000 ldr r1, [r0, #0x22c] @@ -4556,7 +4556,7 @@ _02325470: bne _02325524 mov r5, #0 _02325480: - ldr r0, _0232560C ; =0x02353538 + ldr r0, _0232560C ; =ov29_02353538 ldr r0, [r0] add r0, r0, r5, lsl #2 add r0, r0, #0x12000 @@ -4664,10 +4664,10 @@ _02325600: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02325608: .word 0x02352AD8 -_0232560C: .word 0x02353538 -_02325610: .word 0x02352B1C -_02325614: .word 0x0237CA84 +_02325608: .word ov29_02352AD8 +_0232560C: .word ov29_02353538 +_02325610: .word ov29_02352B1C +_02325614: .word ov29_0237CA84 _02325618: .word 0x00000EAA _0232561C: .word 0x00000229 arm_func_end ov29_023250D4 diff --git a/asm/overlay_29_02325644.s b/asm/overlay_29_02325644.s index 24033f0a..5cfe87f9 100644 --- a/asm/overlay_29_02325644.s +++ b/asm/overlay_29_02325644.s @@ -84,7 +84,7 @@ _02325740: bne _023258E0 cmp r5, #0 beq _023258E0 - ldr r1, _023258E8 ; =0x02352AD8 + ldr r1, _023258E8 ; =ov29_02352AD8 mov r0, r5 ldrh r2, [r1] ldrh r1, [r1, #2] @@ -189,7 +189,7 @@ _023258E0: add sp, sp, #0x18 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_023258E8: .word 0x02352AD8 +_023258E8: .word ov29_02352AD8 arm_func_end PlayMoveAnimation arm_func_start ov29_023258EC @@ -242,7 +242,7 @@ _02325958: beq _02325B04 cmp r7, #0 beq _02325B04 - ldr r1, _02325B0C ; =0x02352AD8 + ldr r1, _02325B0C ; =ov29_02352AD8 mov r0, r7 ldrh r2, [r1, #0xc] ldrh r1, [r1, #0xe] @@ -338,7 +338,7 @@ _02325B04: add sp, sp, #0x2c ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02325B0C: .word 0x02352AD8 +_02325B0C: .word ov29_02352AD8 arm_func_end ov29_023258EC arm_func_start GetMoveAnimationId @@ -580,7 +580,7 @@ DoMoveIronTail: ; 0x02325DE4 bl DealDamage cmp r0, #0 beq _02325E50 - ldr r1, _02325E5C ; =0x022C4440 + ldr r1, _02325E5C ; =ov10_022C4440 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -588,7 +588,7 @@ DoMoveIronTail: ; 0x02325DE4 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _02325E50 - ldr r0, _02325E60 ; =0x02352AEC + ldr r0, _02325E60 ; =ATK_STAT_IDX mov r3, r4 ldr r2, [r0] mov r0, r6 @@ -602,26 +602,26 @@ _02325E50: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02325E5C: .word 0x022C4440 -_02325E60: .word 0x02352AEC +_02325E5C: .word ov10_022C4440 +_02325E60: .word ATK_STAT_IDX arm_func_end DoMoveIronTail arm_func_start DoMoveDamageMultihitUntilMiss DoMoveDamageMultihitUntilMiss: ; 0x02325E64 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 - ldr ip, _02325EB8 ; =0x0237CA70 + ldr ip, _02325EB8 ; =ov29_0237CA70 str r3, [sp] ldr ip, [ip] - ldr r3, _02325EBC ; =0x02352AF0 + ldr r3, _02325EBC ; =ov29_02352AF0 mov r4, #0 ldr r3, [r3, ip, lsl #2] bl DealDamage cmp r0, #0 - ldreq r0, _02325EC0 ; =0x0237CA69 + ldreq r0, _02325EC0 ; =ov29_0237CA69 moveq r1, #1 streqb r1, [r0] - ldr r1, _02325EB8 ; =0x0237CA70 + ldr r1, _02325EB8 ; =ov29_0237CA70 movne r4, #1 ldr r2, [r1] mov r0, r4 @@ -630,9 +630,9 @@ DoMoveDamageMultihitUntilMiss: ; 0x02325E64 add sp, sp, #4 ldmia sp!, {r3, r4, pc} .align 2, 0 -_02325EB8: .word 0x0237CA70 -_02325EBC: .word 0x02352AF0 -_02325EC0: .word 0x0237CA69 +_02325EB8: .word ov29_0237CA70 +_02325EBC: .word ov29_02352AF0 +_02325EC0: .word ov29_0237CA69 arm_func_end DoMoveDamageMultihitUntilMiss arm_func_start DoMoveYawn @@ -640,7 +640,7 @@ DoMoveYawn: ; 0x02325EC4 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _02325EFC ; =0x022C4860 + ldr r1, _02325EFC ; =ov10_022C4860 mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -652,7 +652,7 @@ DoMoveYawn: ; 0x02325EC4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02325EFC: .word 0x022C4860 +_02325EFC: .word ov10_022C4860 arm_func_end DoMoveYawn arm_func_start DoMoveSleep @@ -660,7 +660,7 @@ DoMoveSleep: ; 0x02325F00 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _02325F38 ; =0x022C4720 + ldr r1, _02325F38 ; =SLEEP_TURN_RANGE mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -672,7 +672,7 @@ DoMoveSleep: ; 0x02325F00 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02325F38: .word 0x022C4720 +_02325F38: .word SLEEP_TURN_RANGE arm_func_end DoMoveSleep arm_func_start DoMoveNightmare @@ -680,7 +680,7 @@ DoMoveNightmare: ; 0x02325F3C stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _02325F70 ; =0x022C4724 + ldr r1, _02325F70 ; =ov10_022C4724 mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -691,7 +691,7 @@ DoMoveNightmare: ; 0x02325F3C mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02325F70: .word 0x022C4724 +_02325F70: .word ov10_022C4724 arm_func_end DoMoveNightmare arm_func_start DoMoveMorningSun @@ -701,7 +701,7 @@ DoMoveMorningSun: ; 0x02325F74 mov r4, r1 bl GetApparentWeather mov ip, #1 - ldr r1, _02325FB0 ; =0x022C4984 + ldr r1, _02325FB0 ; =ov10_022C4984 mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -712,7 +712,7 @@ DoMoveMorningSun: ; 0x02325F74 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02325FB0: .word 0x022C4984 +_02325FB0: .word ov10_022C4984 arm_func_end DoMoveMorningSun arm_func_start DoMoveVitalThrow @@ -752,7 +752,7 @@ _02326014: bl IsChargingTwoTurnMove cmp r0, #0 beq _02326050 - ldr r1, _02326080 ; =0x022C47E4 + ldr r1, _02326080 ; =ov10_022C47E4 mov r0, r8 ldr r3, [r1] mov r1, r7 @@ -778,27 +778,27 @@ _02326074: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0232607C: .word 0x00000EC4 -_02326080: .word 0x022C47E4 +_02326080: .word ov10_022C47E4 _02326084: .word 0x00000CD6 arm_func_end DoMoveDig arm_func_start DoMoveSweetScent DoMoveSweetScent: ; 0x02326088 stmdb sp!, {r3, lr} - ldr r2, _023260A4 ; =0x02352AE8 + ldr r2, _023260A4 ; =SPATK_STAT_IDX mov r3, #1 ldr r2, [r2] bl LowerHitChanceStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_023260A4: .word 0x02352AE8 +_023260A4: .word SPATK_STAT_IDX arm_func_end DoMoveSweetScent arm_func_start DoMoveCharm DoMoveCharm: ; 0x023260A8 stmdb sp!, {r3, lr} - ldr r2, _023260CC ; =0x02352AEC + ldr r2, _023260CC ; =ATK_STAT_IDX mov ip, #1 ldr r2, [r2] mov r3, #0x80 @@ -807,14 +807,14 @@ DoMoveCharm: ; 0x023260A8 mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_023260CC: .word 0x02352AEC +_023260CC: .word ATK_STAT_IDX arm_func_end DoMoveCharm arm_func_start DoMoveRainDance DoMoveRainDance: ; 0x023260D0 stmdb sp!, {r3, r4, r5, lr} - ldr r3, _02326120 ; =0x022C4654 - ldr r2, _02326124 ; =0x02353538 + ldr r3, _02326120 ; =WEATHER_MOVE_TURN_COUNT + ldr r2, _02326124 ; =ov29_02353538 ldrsh r3, [r3] ldr r2, [r2] mov r5, r0 @@ -834,16 +834,16 @@ _02326118: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02326120: .word 0x022C4654 -_02326124: .word 0x02353538 +_02326120: .word WEATHER_MOVE_TURN_COUNT +_02326124: .word ov29_02353538 _02326128: .word 0x00000EC5 arm_func_end DoMoveRainDance arm_func_start DoMoveHail DoMoveHail: ; 0x0232612C stmdb sp!, {r3, r4, r5, lr} - ldr r3, _0232617C ; =0x022C4654 - ldr r2, _02326180 ; =0x02353538 + ldr r3, _0232617C ; =WEATHER_MOVE_TURN_COUNT + ldr r2, _02326180 ; =ov29_02353538 ldrsh r3, [r3] ldr r2, [r2] mov r5, r0 @@ -863,8 +863,8 @@ _02326174: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232617C: .word 0x022C4654 -_02326180: .word 0x02353538 +_0232617C: .word WEATHER_MOVE_TURN_COUNT +_02326180: .word ov29_02353538 _02326184: .word 0x00000EC8 arm_func_end DoMoveHail @@ -890,7 +890,7 @@ DoMoveBubble: ; 0x023261A0 bl DealDamage cmp r0, #0 beq _023261FC - ldr r1, _02326208 ; =0x022C462C + ldr r1, _02326208 ; =ov10_022C462C mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -908,7 +908,7 @@ _023261FC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02326208: .word 0x022C462C +_02326208: .word ov10_022C462C arm_func_end DoMoveBubble arm_func_start DoMoveEncore @@ -1173,7 +1173,7 @@ DoMoveSwagger: ; 0x02326568 mov r5, r0 mov r4, r1 bl TryInflictConfusedStatus - ldr r1, _023265A0 ; =0x02352AEC + ldr r1, _023265A0 ; =ATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1182,7 +1182,7 @@ DoMoveSwagger: ; 0x02326568 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023265A0: .word 0x02352AEC +_023265A0: .word ATK_STAT_IDX arm_func_end DoMoveSwagger arm_func_start DoMoveSnore @@ -1205,7 +1205,7 @@ DoMoveSnore: ; 0x023265A4 bl DealDamage cmp r0, #0 beq _02326634 - ldr r1, _02326640 ; =0x022C4600 + ldr r1, _02326640 ; =ov10_022C4600 mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1229,14 +1229,14 @@ _02326634: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326640: .word 0x022C4600 +_02326640: .word ov10_022C4600 _02326644: .word 0x00000ECD arm_func_end DoMoveSnore arm_func_start DoMoveScreech DoMoveScreech: ; 0x02326648 stmdb sp!, {r3, lr} - ldr r2, _0232666C ; =0x02352AEC + ldr r2, _0232666C ; =ATK_STAT_IDX mov ip, #1 ldr r2, [r2] mov r3, #0x40 @@ -1245,7 +1245,7 @@ DoMoveScreech: ; 0x02326648 mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232666C: .word 0x02352AEC +_0232666C: .word ATK_STAT_IDX arm_func_end DoMoveScreech arm_func_start DoMoveDamageCringe30 @@ -1260,7 +1260,7 @@ DoMoveDamageCringe30: ; 0x02326670 bl DealDamage cmp r0, #0 beq _023266CC - ldr r1, _023266D8 ; =0x022C444C + ldr r1, _023266D8 ; =ov10_022C444C mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1278,7 +1278,7 @@ _023266CC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023266D8: .word 0x022C444C +_023266D8: .word ov10_022C444C arm_func_end DoMoveDamageCringe30 arm_func_start DoMoveWeatherBall @@ -1294,8 +1294,8 @@ DoMoveWeatherBall: ; 0x023266DC mov r0, r8 mov r1, r7 bl EndFrozenStatus - ldr ip, _02326748 ; =0x022C4B54 - ldr r2, _0232674C ; =0x022C48DC + ldr ip, _02326748 ; =ov10_022C4B54 + ldr r2, _0232674C ; =WEATHER_BALL_TYPE_TABLE ldr ip, [ip, r4, lsl #2] ldrb r2, [r2, r4] str ip, [sp] @@ -1311,8 +1311,8 @@ DoMoveWeatherBall: ; 0x023266DC add sp, sp, #8 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326748: .word 0x022C4B54 -_0232674C: .word 0x022C48DC +_02326748: .word ov10_022C4B54 +_0232674C: .word WEATHER_BALL_TYPE_TABLE arm_func_end DoMoveWeatherBall arm_func_start DoMoveWhirlpool @@ -1334,7 +1334,7 @@ DoMoveWhirlpool: ; 0x02326750 bl DealDamage cmp r0, #0 beq _023267C8 - ldr r1, _023267D4 ; =0x022C44A4 + ldr r1, _023267D4 ; =WHIRLPOOL_CONSTRICTION_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1352,14 +1352,14 @@ _023267C8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023267D4: .word 0x022C44A4 +_023267D4: .word WHIRLPOOL_CONSTRICTION_CHANCE arm_func_end DoMoveWhirlpool arm_func_start DoMoveFakeTears DoMoveFakeTears: ; 0x023267D8 stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr r2, _02326808 ; =0x02352AE8 + ldr r2, _02326808 ; =SPATK_STAT_IDX mov ip, #1 ldr r2, [r2] str ip, [sp] @@ -1370,7 +1370,7 @@ DoMoveFakeTears: ; 0x023267D8 add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_02326808: .word 0x02352AE8 +_02326808: .word SPATK_STAT_IDX arm_func_end DoMoveFakeTears arm_func_start DoMoveSpite @@ -1439,7 +1439,7 @@ DoMoveSmokescreen: ; 0x023268CC stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _02326904 ; =0x022C47C4 + ldr r1, _02326904 ; =ov10_022C47C4 mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -1451,7 +1451,7 @@ DoMoveSmokescreen: ; 0x023268CC mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02326904: .word 0x022C47C4 +_02326904: .word ov10_022C47C4 arm_func_end DoMoveSmokescreen arm_func_start DoMoveMirrorMove @@ -1509,7 +1509,7 @@ DoMoveAuroraBeam: ; 0x02326990 bl DealDamage cmp r0, #0 beq _023269F8 - ldr r1, _02326A04 ; =0x022C4428 + ldr r1, _02326A04 ; =ov10_022C4428 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1517,7 +1517,7 @@ DoMoveAuroraBeam: ; 0x02326990 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _023269F8 - ldr r0, _02326A08 ; =0x02352AEC + ldr r0, _02326A08 ; =ATK_STAT_IDX mov ip, #0 ldr r2, [r0] mov r0, r6 @@ -1530,8 +1530,8 @@ _023269F8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02326A04: .word 0x022C4428 -_02326A08: .word 0x02352AEC +_02326A04: .word ov10_022C4428 +_02326A08: .word ATK_STAT_IDX arm_func_end DoMoveAuroraBeam arm_func_start DoMoveMemento @@ -1539,7 +1539,7 @@ DoMoveMemento: ; 0x02326A0C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 mov r6, r0 - ldr r2, _02326A6C ; =0x02352AEC + ldr r2, _02326A6C ; =ATK_STAT_IDX ldr r4, [r6, #0xb4] mov ip, #1 strh ip, [r4, #0x10] @@ -1548,7 +1548,7 @@ DoMoveMemento: ; 0x02326A0C mov r5, r1 str ip, [sp] bl ApplyOffensiveStatMultiplier - ldr r0, _02326A70 ; =0x02352AE8 + ldr r0, _02326A70 ; =SPATK_STAT_IDX mov ip, #1 ldr r2, [r0] mov r0, r6 @@ -1561,8 +1561,8 @@ DoMoveMemento: ; 0x02326A0C add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02326A6C: .word 0x02352AEC -_02326A70: .word 0x02352AE8 +_02326A6C: .word ATK_STAT_IDX +_02326A70: .word SPATK_STAT_IDX arm_func_end DoMoveMemento arm_func_start DoMoveOctazooka @@ -1577,7 +1577,7 @@ DoMoveOctazooka: ; 0x02326A74 bl DealDamage cmp r0, #0 beq _02326AD4 - ldr r1, _02326AE0 ; =0x022C4500 + ldr r1, _02326AE0 ; =ov10_022C4500 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1585,7 +1585,7 @@ DoMoveOctazooka: ; 0x02326A74 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _02326AD4 - ldr r1, _02326AE4 ; =0x02352AEC + ldr r1, _02326AE4 ; =ATK_STAT_IDX mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -1596,8 +1596,8 @@ _02326AD4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02326AE0: .word 0x022C4500 -_02326AE4: .word 0x02352AEC +_02326AE0: .word ov10_022C4500 +_02326AE4: .word ATK_STAT_IDX arm_func_end DoMoveOctazooka arm_func_start DoMoveFlatter @@ -1608,7 +1608,7 @@ DoMoveFlatter: ; 0x02326AE8 mov r5, r0 mov r4, r1 bl TryInflictConfusedStatus - ldr r1, _02326B20 ; =0x02352AE8 + ldr r1, _02326B20 ; =SPATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1617,7 +1617,7 @@ DoMoveFlatter: ; 0x02326AE8 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02326B20: .word 0x02352AE8 +_02326B20: .word SPATK_STAT_IDX arm_func_end DoMoveFlatter arm_func_start DoMoveWillOWisp @@ -1678,7 +1678,7 @@ DoMoveReturn: ; 0x02326BC0 ldr lr, [sb, #0xb4] mov r6, #1 mov ip, #0 - ldr r3, _02326C98 ; =0x022C4C0C + ldr r3, _02326C98 ; =ov10_022C4C0C ldr r0, _02326C9C ; =0x000003E7 b _02326C18 _02326BF0: @@ -1688,7 +1688,7 @@ _02326BF0: blt _02326C20 ldrsh r1, [lr, #0xe] cmp r1, r2 - ldrlt r0, _02326CA0 ; =0x022C4C0E + ldrlt r0, _02326CA0 ; =ov10_022C4C0E ldrltsh r6, [r0, r5] blt _02326C20 add ip, ip, #1 @@ -1727,9 +1727,9 @@ _02326C20: add sp, sp, #0x20 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02326C98: .word 0x022C4C0C +_02326C98: .word ov10_022C4C0C _02326C9C: .word 0x000003E7 -_02326CA0: .word 0x022C4C0E +_02326CA0: .word ov10_022C4C0E arm_func_end DoMoveReturn arm_func_start DoMoveGrudge @@ -1768,7 +1768,7 @@ DoMoveDamageBurn10FlameWheel: ; 0x02326CC8 bl DealDamage cmp r0, #0 beq _02326D40 - ldr r1, _02326D4C ; =0x022C4688 + ldr r1, _02326D4C ; =ov10_022C4688 mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1787,7 +1787,7 @@ _02326D40: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326D4C: .word 0x022C4688 +_02326D4C: .word ov10_022C4688 arm_func_end DoMoveDamageBurn10FlameWheel arm_func_start DoMoveDamageBurn10 @@ -1808,7 +1808,7 @@ DoMoveDamageBurn10: ; 0x02326D50 bl DealDamage cmp r0, #0 beq _02326DC8 - ldr r1, _02326DD4 ; =0x022C4544 + ldr r1, _02326DD4 ; =ov10_022C4544 mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1827,7 +1827,7 @@ _02326DC8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326DD4: .word 0x022C4544 +_02326DD4: .word ov10_022C4544 arm_func_end DoMoveDamageBurn10 arm_func_start DoMoveExpose @@ -1849,13 +1849,13 @@ _02326E00: .word 0x0000013B arm_func_start DoMoveDoubleTeam DoMoveDoubleTeam: ; 0x02326E04 stmdb sp!, {r3, lr} - ldr r2, _02326E1C ; =0x02352AE8 + ldr r2, _02326E1C ; =SPATK_STAT_IDX ldr r2, [r2] bl BoostHitChanceStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_02326E1C: .word 0x02352AE8 +_02326E1C: .word SPATK_STAT_IDX arm_func_end DoMoveDoubleTeam arm_func_start DoMoveGust @@ -1881,14 +1881,14 @@ DoMoveGust: ; 0x02326E20 arm_func_start DoMoveBoostDefense1 DoMoveBoostDefense1: ; 0x02326E60 stmdb sp!, {r3, lr} - ldr r2, _02326E7C ; =0x02352AEC + ldr r2, _02326E7C ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] bl BoostDefensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_02326E7C: .word 0x02352AEC +_02326E7C: .word ATK_STAT_IDX arm_func_end DoMoveBoostDefense1 arm_func_start DoMoveParalyze__02326E80 @@ -1904,14 +1904,14 @@ DoMoveParalyze__02326E80: ; 0x02326E80 arm_func_start DoMoveBoostAttack1 DoMoveBoostAttack1: ; 0x02326E98 stmdb sp!, {r3, lr} - ldr r2, _02326EB4 ; =0x02352AEC + ldr r2, _02326EB4 ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] bl BoostOffensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_02326EB4: .word 0x02352AEC +_02326EB4: .word ATK_STAT_IDX arm_func_end DoMoveBoostAttack1 arm_func_start DoMoveRazorWind @@ -1925,7 +1925,7 @@ DoMoveRazorWind: ; 0x02326EB8 bl IsChargingTwoTurnMove cmp r0, #0 beq _02326F14 - ldr r1, _02326F40 ; =0x022C48B0 + ldr r1, _02326F40 ; =ov10_022C48B0 mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -1953,7 +1953,7 @@ _02326F38: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02326F40: .word 0x022C48B0 +_02326F40: .word ov10_022C48B0 _02326F44: .word 0x00000CCD arm_func_end DoMoveRazorWind @@ -2038,7 +2038,7 @@ DoMoveCrunch: ; 0x02327034 bl DealDamage cmp r0, #0 beq _023270A0 - ldr r1, _023270AC ; =0x022C4450 + ldr r1, _023270AC ; =ov10_022C4450 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2046,7 +2046,7 @@ DoMoveCrunch: ; 0x02327034 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _023270A0 - ldr r0, _023270B0 ; =0x02352AEC + ldr r0, _023270B0 ; =ATK_STAT_IDX mov r3, r4 ldr r2, [r0] mov r0, r6 @@ -2060,8 +2060,8 @@ _023270A0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023270AC: .word 0x022C4450 -_023270B0: .word 0x02352AEC +_023270AC: .word ov10_022C4450 +_023270B0: .word ATK_STAT_IDX arm_func_end DoMoveCrunch arm_func_start DoMoveDamageCringe20 @@ -2076,7 +2076,7 @@ DoMoveDamageCringe20: ; 0x023270B4 bl DealDamage cmp r0, #0 beq _02327110 - ldr r1, _0232711C ; =0x022C4534 + ldr r1, _0232711C ; =ov10_022C4534 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2094,7 +2094,7 @@ _02327110: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232711C: .word 0x022C4534 +_0232711C: .word ov10_022C4534 arm_func_end DoMoveDamageCringe20 arm_func_start DoMoveDamageParalyze20 @@ -2109,7 +2109,7 @@ DoMoveDamageParalyze20: ; 0x02327120 bl DealDamage cmp r0, #0 beq _0232717C - ldr r1, _02327188 ; =0x022C4658 + ldr r1, _02327188 ; =ov10_022C4658 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2127,7 +2127,7 @@ _0232717C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327188: .word 0x022C4658 +_02327188: .word ov10_022C4658 arm_func_end DoMoveDamageParalyze20 arm_func_start DoMoveEndeavor @@ -2189,7 +2189,7 @@ DoMoveFacade: ; 0x0232724C mov lr, #0x100 ldrb ip, [ip, #0xbf] cmp ip, #0 - ldrne ip, _02327288 ; =0x022C4718 + ldrne ip, _02327288 ; =ov10_022C4718 str r3, [sp] ldrne lr, [ip] mov r3, lr @@ -2200,7 +2200,7 @@ DoMoveFacade: ; 0x0232724C and r0, r0, #0xff ldmia sp!, {r3, pc} .align 2, 0 -_02327288: .word 0x022C4718 +_02327288: .word ov10_022C4718 arm_func_end DoMoveFacade arm_func_start DoMoveDamageLowerSpeed20 @@ -2215,7 +2215,7 @@ DoMoveDamageLowerSpeed20: ; 0x0232728C bl DealDamage cmp r0, #0 beq _023272E8 - ldr r1, _023272F4 ; =0x022C4514 + ldr r1, _023272F4 ; =ov10_022C4514 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2233,7 +2233,7 @@ _023272E8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023272F4: .word 0x022C4514 +_023272F4: .word ov10_022C4514 arm_func_end DoMoveDamageLowerSpeed20 arm_func_start DoMoveBrickBreak @@ -2311,7 +2311,7 @@ DoMoveFocusPunch: ; 0x023273CC bl IsChargingTwoTurnMove cmp r0, #0 beq _02327428 - ldr r1, _02327454 ; =0x022C48B4 + ldr r1, _02327454 ; =ov10_022C48B4 mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -2339,7 +2339,7 @@ _0232744C: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02327454: .word 0x022C48B4 +_02327454: .word ov10_022C48B4 arm_func_end DoMoveFocusPunch arm_func_start DoMoveDamageDrain @@ -2468,7 +2468,7 @@ DoMoveReversal: ; 0x02327598 movle r5, #2 movgt r5, #3 _0232761C: - ldr r4, _02327648 ; =0x022C4994 + ldr r4, _02327648 ; =ov10_022C4994 str r3, [sp] ldr r3, [r4, r5, lsl #2] bl DealDamage @@ -2480,7 +2480,7 @@ _0232761C: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02327644: .word 0x000003E7 -_02327648: .word 0x022C4994 +_02327648: .word ov10_022C4994 arm_func_end DoMoveReversal arm_func_start DoMoveSmellingSalt @@ -2519,7 +2519,7 @@ _023276AC: DoMoveMetalSound: ; 0x023276B4 stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr r2, _023276E4 ; =0x02352AE8 + ldr r2, _023276E4 ; =SPATK_STAT_IDX mov ip, #1 ldr r2, [r2] str ip, [sp] @@ -2530,14 +2530,14 @@ DoMoveMetalSound: ; 0x023276B4 add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_023276E4: .word 0x02352AE8 +_023276E4: .word SPATK_STAT_IDX arm_func_end DoMoveMetalSound arm_func_start DoMoveTickle DoMoveTickle: ; 0x023276E8 stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc - ldr r2, _02327740 ; =0x02352AE8 + ldr r2, _02327740 ; =SPATK_STAT_IDX mov r3, #1 ldr r2, [r2, #4] str r3, [sp] @@ -2558,7 +2558,7 @@ DoMoveTickle: ; 0x023276E8 add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 -_02327740: .word 0x02352AE8 +_02327740: .word SPATK_STAT_IDX arm_func_end DoMoveTickle arm_func_start DoMoveShadowHold @@ -2594,14 +2594,14 @@ DoMoveDamageMultihitFatigue: ; 0x0232776C mov r4, #1 bl DungeonRandOutcomeUserAction cmp r0, #0 - ldrne r0, _023277B4 ; =0x0237CA6A + ldrne r0, _023277B4 ; =ov29_0237CA6A movne r1, r4 strneb r1, [r0] _023277AC: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023277B4: .word 0x0237CA6A +_023277B4: .word ov29_0237CA6A arm_func_end DoMoveDamageMultihitFatigue arm_func_start DoMoveDamageWeightDependent @@ -2638,7 +2638,7 @@ DoMoveDamageBoostAllStats: ; 0x02327804 bl DealDamage cmp r0, #0 beq _023278D4 - ldr r1, _023278E0 ; =0x022C4488 + ldr r1, _023278E0 ; =ov10_022C4488 mov r0, r6 ldrsh r1, [r1] mov r4, #1 @@ -2651,14 +2651,14 @@ DoMoveDamageBoostAllStats: ; 0x02327804 mov r3, r4 ldr r5, [r6, #0xb4] bl BoostSpeedOneStage - ldr r1, _023278E4 ; =0x02352AE8 + ldr r1, _023278E4 ; =SPATK_STAT_IDX mov r0, r6 ldr r2, [r1, #4] mov r1, r6 mov r3, r4 str r2, [sp, #8] bl BoostOffensiveStat - ldr r1, _023278E4 ; =0x02352AE8 + ldr r1, _023278E4 ; =SPATK_STAT_IDX mov r0, r6 ldr r2, [r1] mov r1, r6 @@ -2686,8 +2686,8 @@ _023278D4: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023278E0: .word 0x022C4488 -_023278E4: .word 0x02352AE8 +_023278E0: .word ov10_022C4488 +_023278E4: .word SPATK_STAT_IDX arm_func_end DoMoveDamageBoostAllStats arm_func_start DoMoveSynthesis @@ -2697,7 +2697,7 @@ DoMoveSynthesis: ; 0x023278E8 mov r4, r1 bl GetApparentWeather mov ip, #1 - ldr r1, _02327924 ; =0x022C4954 + ldr r1, _02327924 ; =ov10_022C4954 mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -2708,7 +2708,7 @@ DoMoveSynthesis: ; 0x023278E8 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02327924: .word 0x022C4954 +_02327924: .word ov10_022C4954 arm_func_end DoMoveSynthesis arm_func_start DoMoveBoostSpeed1 @@ -2741,17 +2741,17 @@ DoMoveRapidSpin: ; 0x02327940 add r0, r0, #0x100 ldrh r0, [r0, #0x92] tst r0, #2 - ldrne r0, _023279A8 ; =0x0237CA6D + ldrne r0, _023279A8 ; =ov29_0237CA6D movne r1, #0 strneb r1, [r0] - ldreq r0, _023279A8 ; =0x0237CA6D + ldreq r0, _023279A8 ; =ov29_0237CA6D moveq r1, r4 streqb r1, [r0] _023279A0: mov r0, r4 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023279A8: .word 0x0237CA6D +_023279A8: .word ov29_0237CA6D arm_func_end DoMoveRapidSpin arm_func_start DoMoveSureShot @@ -2759,7 +2759,7 @@ DoMoveSureShot: ; 0x023279AC stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _023279E0 ; =0x022C4798 + ldr r1, _023279E0 ; =ov10_022C4798 mov r0, r4 mov r2, #0 bl CalcStatusDuration @@ -2770,19 +2770,19 @@ DoMoveSureShot: ; 0x023279AC mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023279E0: .word 0x022C4798 +_023279E0: .word ov10_022C4798 arm_func_end DoMoveSureShot arm_func_start DoMoveCosmicPower DoMoveCosmicPower: ; 0x023279E4 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _02327A20 ; =0x02352AEC + ldr r2, _02327A20 ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] mov r5, r0 mov r4, r1 bl BoostDefensiveStat - ldr r1, _02327A24 ; =0x02352AE8 + ldr r1, _02327A24 ; =SPATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -2791,8 +2791,8 @@ DoMoveCosmicPower: ; 0x023279E4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02327A20: .word 0x02352AEC -_02327A24: .word 0x02352AE8 +_02327A20: .word ATK_STAT_IDX +_02327A24: .word SPATK_STAT_IDX arm_func_end DoMoveCosmicPower arm_func_start DoMoveSkyAttack @@ -2808,7 +2808,7 @@ DoMoveSkyAttack: ; 0x02327A28 bl IsChargingTwoTurnMove cmp r0, #0 beq _02327AB8 - ldr r1, _02327AE8 ; =0x022C48A8 + ldr r1, _02327AE8 ; =ov10_022C48A8 mov r0, r8 ldr r3, [r1] mov r1, r7 @@ -2817,7 +2817,7 @@ DoMoveSkyAttack: ; 0x02327A28 bl DealDamage cmp r0, #0 beq _02327AAC - ldr r1, _02327AEC ; =0x022C4538 + ldr r1, _02327AEC ; =ov10_022C4538 mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -2849,8 +2849,8 @@ _02327ADC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02327AE8: .word 0x022C48A8 -_02327AEC: .word 0x022C4538 +_02327AE8: .word ov10_022C48A8 +_02327AEC: .word ov10_022C4538 _02327AF0: .word 0x00000CD1 arm_func_end DoMoveSkyAttack @@ -2866,7 +2866,7 @@ DoMoveDamageFreeze15: ; 0x02327AF4 bl DealDamage cmp r0, #0 beq _02327B4C - ldr r1, _02327B58 ; =0x022C4634 + ldr r1, _02327B58 ; =ov10_022C4634 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2883,7 +2883,7 @@ _02327B4C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327B58: .word 0x022C4634 +_02327B58: .word ov10_022C4634 arm_func_end DoMoveDamageFreeze15 arm_func_start DoMoveMeteorMash @@ -2897,7 +2897,7 @@ DoMoveMeteorMash: ; 0x02327B5C bl DealDamage cmp r0, #0 beq _02327BCC - ldr r1, _02327BD8 ; =0x022C4604 + ldr r1, _02327BD8 ; =ov10_022C4604 mov r0, r6 ldrsh r2, [r1] mov r1, r6 @@ -2905,7 +2905,7 @@ DoMoveMeteorMash: ; 0x02327B5C bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _02327BCC - ldr r0, _02327BDC ; =0x02352AEC + ldr r0, _02327BDC ; =ATK_STAT_IDX ldr r5, [r6, #0xb4] ldr r2, [r0] mov r0, r6 @@ -2921,8 +2921,8 @@ _02327BCC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327BD8: .word 0x022C4604 -_02327BDC: .word 0x02352AEC +_02327BD8: .word ov10_022C4604 +_02327BDC: .word ATK_STAT_IDX arm_func_end DoMoveMeteorMash arm_func_start DoMoveEndure @@ -2955,7 +2955,7 @@ DoMoveDamageConfuse10: ; 0x02327C08 bl DealDamage cmp r0, #0 beq _02327C64 - ldr r1, _02327C70 ; =0x022C4690 + ldr r1, _02327C70 ; =ov10_022C4690 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2973,7 +2973,7 @@ _02327C64: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327C70: .word 0x022C4690 +_02327C70: .word ov10_022C4690 arm_func_end DoMoveDamageConfuse10 arm_func_start DoMovePsywave @@ -3061,7 +3061,7 @@ DoMovePsychoBoost: ; 0x02327D60 bl DungeonRandOutcomeUserAction cmp r0, #0 beq _02327DC0 - ldr r0, _02327DCC ; =0x02352AE8 + ldr r0, _02327DCC ; =SPATK_STAT_IDX mov ip, #0 ldr r2, [r0] str ip, [sp] @@ -3075,7 +3075,7 @@ _02327DC0: add sp, sp, #8 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02327DCC: .word 0x02352AE8 +_02327DCC: .word SPATK_STAT_IDX arm_func_end DoMovePsychoBoost arm_func_start DoMoveUproar @@ -3122,7 +3122,7 @@ DoMoveWaterSpout: ; 0x02327DE0 movle r5, #2 movgt r5, #3 _02327E64: - ldr r4, _02327E90 ; =0x022C49A4 + ldr r4, _02327E90 ; =ov10_022C49A4 str r3, [sp] ldr r3, [r4, r5, lsl #2] bl DealDamage @@ -3134,7 +3134,7 @@ _02327E64: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02327E8C: .word 0x000003E7 -_02327E90: .word 0x022C49A4 +_02327E90: .word ov10_022C49A4 arm_func_end DoMoveWaterSpout arm_func_start DoMovePsychUp diff --git a/asm/overlay_29_02328030.s b/asm/overlay_29_02328030.s index d55cc678..3dbbfa5b 100644 --- a/asm/overlay_29_02328030.s +++ b/asm/overlay_29_02328030.s @@ -28,7 +28,7 @@ _02328070: .word 0x000003E7 arm_func_start DoMoveEarthquake DoMoveEarthquake: ; 0x02328074 stmdb sp!, {r3, r4, r5, lr} - ldr lr, _023280D0 ; =0x02353538 + ldr lr, _023280D0 ; =ov29_02353538 ldr r5, [r1, #0xb4] ldr ip, [lr] mov r4, #0xc @@ -51,12 +51,12 @@ DoMoveEarthquake: ; 0x02328074 and r0, r0, #0xff ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023280D0: .word 0x02353538 +_023280D0: .word ov29_02353538 arm_func_end DoMoveEarthquake arm_func_start GetNaturePowerVariant GetNaturePowerVariant: ; 0x023280D4 - ldr r0, _02328108 ; =0x02353538 + ldr r0, _02328108 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrsh r2, [r0, #0xd4] @@ -66,12 +66,12 @@ GetNaturePowerVariant: ; 0x023280D4 cmp r2, #0xc7 movge r2, #0xc6 mul r1, r2, r0 - ldr r0, _0232810C ; =0x022C6324 + ldr r0, _0232810C ; =ov10_022C6324 ldrsh r0, [r0, r1] bx lr .align 2, 0 -_02328108: .word 0x02353538 -_0232810C: .word 0x022C6324 +_02328108: .word ov29_02353538 +_0232810C: .word ov10_022C6324 arm_func_end GetNaturePowerVariant arm_func_start DoMoveNaturePower @@ -83,12 +83,12 @@ DoMoveNaturePower: ; 0x02328110 mov r5, r3 bl GetNaturePowerVariant mov r4, r0 - ldr r0, _02328164 ; =0x022C4E40 + ldr r0, _02328164 ; =ov10_022C4E40 mov r1, r4, lsl #3 ldrh r1, [r0, r1] add r0, sp, #0 bl InitMove - ldr ip, _02328168 ; =0x022C4E44 + ldr ip, _02328168 ; =ov10_022C4E44 mov r0, r7 ldr ip, [ip, r4, lsl #3] mov r1, r6 @@ -98,8 +98,8 @@ DoMoveNaturePower: ; 0x02328110 add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02328164: .word 0x022C4E40 -_02328168: .word 0x022C4E44 +_02328164: .word ov10_022C4E40 +_02328168: .word ov10_022C4E44 arm_func_end DoMoveNaturePower arm_func_start DoMoveDamageParalyze10 @@ -114,7 +114,7 @@ DoMoveDamageParalyze10: ; 0x0232816C bl DealDamage cmp r0, #0 beq _023281C8 - ldr r1, _023281D4 ; =0x022C4528 + ldr r1, _023281D4 ; =ov10_022C4528 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -132,7 +132,7 @@ _023281C8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023281D4: .word 0x022C4528 +_023281D4: .word ov10_022C4528 arm_func_end DoMoveDamageParalyze10 arm_func_start DoMoveSelfdestruct @@ -183,7 +183,7 @@ DoMoveShadowBall: ; 0x02328248 bl DealDamage cmp r0, #0 beq _023282B4 - ldr r1, _023282C0 ; =0x022C461C + ldr r1, _023282C0 ; =ov10_022C461C mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -191,7 +191,7 @@ DoMoveShadowBall: ; 0x02328248 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _023282B4 - ldr r0, _023282C4 ; =0x02352AE8 + ldr r0, _023282C4 ; =SPATK_STAT_IDX mov r3, r4 ldr r2, [r0] mov r0, r6 @@ -205,8 +205,8 @@ _023282B4: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023282C0: .word 0x022C461C -_023282C4: .word 0x02352AE8 +_023282C0: .word ov10_022C461C +_023282C4: .word SPATK_STAT_IDX arm_func_end DoMoveShadowBall arm_func_start DoMoveCharge @@ -224,7 +224,7 @@ DoMoveCharge: ; 0x023282C8 mov r3, r4 mov r2, #0xb bl ov29_02318BBC - ldr r2, _02328324 ; =0x02352AE8 + ldr r2, _02328324 ; =SPATK_STAT_IDX mov r0, r6 mov r1, r5 ldr r2, [r2] @@ -235,7 +235,7 @@ DoMoveCharge: ; 0x023282C8 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02328320: .word 0x00000CD9 -_02328324: .word 0x02352AE8 +_02328324: .word SPATK_STAT_IDX arm_func_end DoMoveCharge arm_func_start DoMoveThunderbolt @@ -250,7 +250,7 @@ DoMoveThunderbolt: ; 0x02328328 bl DealDamage cmp r0, #0 beq _02328384 - ldr r1, _02328390 ; =0x022C465C + ldr r1, _02328390 ; =ov10_022C465C mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -268,7 +268,7 @@ _02328384: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328390: .word 0x022C465C +_02328390: .word ov10_022C465C arm_func_end DoMoveThunderbolt arm_func_start DoMoveMist @@ -369,7 +369,7 @@ DoMoveDamageCringe10: ; 0x023284BC bl DealDamage cmp r0, #0 beq _02328518 - ldr r1, _02328524 ; =0x022C4448 + ldr r1, _02328524 ; =ov10_022C4448 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -387,7 +387,7 @@ _02328518: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328524: .word 0x022C4448 +_02328524: .word ov10_022C4448 arm_func_end DoMoveDamageCringe10 arm_func_start DoMoveSafeguard @@ -538,7 +538,7 @@ _02328714: ldrb r8, [r5, #0x60] ldrb lr, [r5, #0x61] ldrb r0, [r4, #0x60] - ldr r1, _0232878C ; =0x02353538 + ldr r1, _0232878C ; =ov29_02353538 mov ip, #1 strb r0, [r5, #0x60] ldrb r3, [r4, #0x61] @@ -566,7 +566,7 @@ _02328714: .align 2, 0 _02328784: .word 0x00000ED5 _02328788: .word 0x00000ED6 -_0232878C: .word 0x02353538 +_0232878C: .word ov29_02353538 _02328790: .word 0x00000ED4 arm_func_end DoMoveSkillSwap @@ -671,7 +671,7 @@ DoMoveHeadbutt: ; 0x023288C4 bl DealDamage cmp r0, #0 beq _02328920 - ldr r1, _0232892C ; =0x022C4498 + ldr r1, _0232892C ; =ov10_022C4498 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -689,7 +689,7 @@ _02328920: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232892C: .word 0x022C4498 +_0232892C: .word ov10_022C4498 arm_func_end DoMoveHeadbutt arm_func_start DoMoveDoubleEdge @@ -751,8 +751,8 @@ _023289F4: .word 0x000003E7 arm_func_start DoMoveSandstorm DoMoveSandstorm: ; 0x023289F8 stmdb sp!, {r3, r4, r5, lr} - ldr r3, _02328A48 ; =0x022C4654 - ldr r2, _02328A4C ; =0x02353538 + ldr r3, _02328A48 ; =WEATHER_MOVE_TURN_COUNT + ldr r2, _02328A4C ; =ov29_02353538 ldrsh r3, [r3] ldr r2, [r2] mov r5, r0 @@ -772,22 +772,22 @@ _02328A40: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02328A48: .word 0x022C4654 -_02328A4C: .word 0x02353538 +_02328A48: .word WEATHER_MOVE_TURN_COUNT +_02328A4C: .word ov29_02353538 _02328A50: .word 0x00000EC6 arm_func_end DoMoveSandstorm arm_func_start DoMoveLowerAccuracy1 DoMoveLowerAccuracy1: ; 0x02328A54 stmdb sp!, {r3, lr} - ldr r2, _02328A70 ; =0x02352AEC + ldr r2, _02328A70 ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] bl LowerHitChanceStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_02328A70: .word 0x02352AEC +_02328A70: .word ATK_STAT_IDX arm_func_end DoMoveLowerAccuracy1 arm_func_start DoMoveDamagePoison40 @@ -802,7 +802,7 @@ DoMoveDamagePoison40: ; 0x02328A74 bl DealDamage cmp r0, #0 beq _02328AD0 - ldr r1, _02328ADC ; =0x022C451C + ldr r1, _02328ADC ; =ov10_022C451C mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -820,20 +820,20 @@ _02328AD0: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328ADC: .word 0x022C451C +_02328ADC: .word ov10_022C451C arm_func_end DoMoveDamagePoison40 arm_func_start DoMoveGrowth DoMoveGrowth: ; 0x02328AE0 stmdb sp!, {r3, lr} - ldr r2, _02328AFC ; =0x02352AE8 + ldr r2, _02328AFC ; =SPATK_STAT_IDX mov r3, #1 ldr r2, [r2] bl BoostOffensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_02328AFC: .word 0x02352AE8 +_02328AFC: .word SPATK_STAT_IDX arm_func_end DoMoveGrowth arm_func_start DoMoveSacredFire @@ -854,7 +854,7 @@ DoMoveSacredFire: ; 0x02328B00 bl DealDamage cmp r0, #0 beq _02328B78 - ldr r1, _02328B84 ; =0x022C44A0 + ldr r1, _02328B84 ; =ov10_022C44A0 mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -873,7 +873,7 @@ _02328B78: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02328B84: .word 0x022C44A0 +_02328B84: .word ov10_022C44A0 arm_func_end DoMoveSacredFire arm_func_start DoMoveOhko @@ -961,7 +961,7 @@ DoMoveSolarBeam: ; 0x02328C74 _02328CAC: cmp r0, #0 beq _02328D0C - ldr r0, _02328D3C ; =0x022C48A4 + ldr r0, _02328D3C ; =ov10_022C48A4 cmp r8, #2 ldr r3, [r0] beq _02328CD4 @@ -1000,7 +1000,7 @@ _02328D30: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02328D3C: .word 0x022C48A4 +_02328D3C: .word ov10_022C48A4 _02328D40: .word 0x00000CD2 arm_func_end DoMoveSolarBeam @@ -1032,7 +1032,7 @@ DoMoveSonicBoom: ; 0x02328D44 mov r3, #1 str r3, [sp, #0x14] str r2, [sp, #0x18] - ldr r2, _02328DE0 ; =0x022C4568 + ldr r2, _02328DE0 ; =ov10_022C4568 mov r1, r8 ldrsh r2, [r2] mov r0, r4 @@ -1046,7 +1046,7 @@ DoMoveSonicBoom: ; 0x02328D44 add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02328DE0: .word 0x022C4568 +_02328DE0: .word ov10_022C4568 arm_func_end DoMoveSonicBoom arm_func_start DoMoveFly @@ -1060,7 +1060,7 @@ DoMoveFly: ; 0x02328DE4 bl IsChargingTwoTurnMove cmp r0, #0 beq _02328E40 - ldr r1, _02328E6C ; =0x022C48C0 + ldr r1, _02328E6C ; =ov10_022C48C0 mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -1088,7 +1088,7 @@ _02328E64: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02328E6C: .word 0x022C48C0 +_02328E6C: .word ov10_022C48C0 _02328E70: .word 0x00000CD3 arm_func_end DoMoveFly @@ -1142,7 +1142,7 @@ _02328F0C: bl IsChargingTwoTurnMove cmp r0, #0 beq _02328F58 - ldr r1, _02328F8C ; =0x022C47E8 + ldr r1, _02328F8C ; =ov10_022C47E8 mov r0, r8 ldr r3, [r1] mov r1, r7 @@ -1172,7 +1172,7 @@ _02328F7C: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _02328F88: .word 0x00000ED8 -_02328F8C: .word 0x022C47E8 +_02328F8C: .word ov10_022C47E8 _02328F90: .word 0x00000CD5 arm_func_end DoMoveDive @@ -1188,7 +1188,7 @@ DoMoveWaterfall: ; 0x02328F94 bl DealDamage cmp r0, #0 beq _02328FF0 - ldr r1, _02328FFC ; =0x022C4424 + ldr r1, _02328FFC ; =ov10_022C4424 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1206,7 +1206,7 @@ _02328FF0: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328FFC: .word 0x022C4424 +_02328FFC: .word ov10_022C4424 arm_func_end DoMoveWaterfall arm_func_start DoMoveDamageLowerAccuracy40 @@ -1221,7 +1221,7 @@ DoMoveDamageLowerAccuracy40: ; 0x02329000 bl DealDamage cmp r0, #0 beq _02329060 - ldr r1, _0232906C ; =0x022C4484 + ldr r1, _0232906C ; =ov10_022C4484 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1229,7 +1229,7 @@ DoMoveDamageLowerAccuracy40: ; 0x02329000 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _02329060 - ldr r1, _02329070 ; =0x02352AEC + ldr r1, _02329070 ; =ATK_STAT_IDX mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -1240,8 +1240,8 @@ _02329060: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232906C: .word 0x022C4484 -_02329070: .word 0x02352AEC +_0232906C: .word ov10_022C4484 +_02329070: .word ATK_STAT_IDX arm_func_end DoMoveDamageLowerAccuracy40 arm_func_start DoMoveStockpile @@ -1252,13 +1252,13 @@ DoMoveStockpile: ; 0x02329074 bl TryInflictStockpileStatus cmp r0, #0 beq _023290BC - ldr r1, _023290C4 ; =0x02352AEC + ldr r1, _023290C4 ; =ATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 mov r3, #1 bl BoostDefensiveStat - ldr r1, _023290C8 ; =0x02352AE8 + ldr r1, _023290C8 ; =SPATK_STAT_IDX mov r0, r5 ldr r2, [r1] mov r1, r4 @@ -1268,8 +1268,8 @@ _023290BC: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023290C4: .word 0x02352AEC -_023290C8: .word 0x02352AE8 +_023290C4: .word ATK_STAT_IDX +_023290C8: .word SPATK_STAT_IDX arm_func_end DoMoveStockpile arm_func_start DoMoveTwister @@ -1293,7 +1293,7 @@ DoMoveTwister: ; 0x023290CC bl DealDamage cmp r0, #0 beq _0232914C - ldr r1, _02329158 ; =0x022C4668 + ldr r1, _02329158 ; =ov10_022C4668 mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1311,7 +1311,7 @@ _0232914C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329158: .word 0x022C4668 +_02329158: .word ov10_022C4668 arm_func_end DoMoveTwister arm_func_start DoMoveTwineedle @@ -1325,18 +1325,18 @@ DoMoveTwineedle: ; 0x0232915C mov r4, #0 bl DealDamage cmp r0, #0 - ldrne r0, _023291E8 ; =0x0237CA6B + ldrne r0, _023291E8 ; =ov29_0237CA6B movne r4, #1 strneb r4, [r0] - ldr r0, _023291E8 ; =0x0237CA6B + ldr r0, _023291E8 ; =ov29_0237CA6B ldrb r0, [r0] cmp r0, #0 beq _023291DC - ldr r0, _023291EC ; =0x0237CA78 + ldr r0, _023291EC ; =ov29_0237CA78 ldr r0, [r0] cmp r0, #2 bne _023291DC - ldr r1, _023291F0 ; =0x022C4444 + ldr r1, _023291F0 ; =ov10_022C4444 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1353,9 +1353,9 @@ _023291DC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023291E8: .word 0x0237CA6B -_023291EC: .word 0x0237CA78 -_023291F0: .word 0x022C4444 +_023291E8: .word ov29_0237CA6B +_023291EC: .word ov29_0237CA78 +_023291F0: .word ov10_022C4444 arm_func_end DoMoveTwineedle arm_func_start DoMoveRecoverHpTeam @@ -1384,13 +1384,13 @@ _02329238: .word 0x000003E7 arm_func_start DoMoveMinimize DoMoveMinimize: ; 0x0232923C stmdb sp!, {r3, lr} - ldr r2, _02329254 ; =0x02352AE8 + ldr r2, _02329254 ; =SPATK_STAT_IDX ldr r2, [r2] bl BoostHitChanceStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_02329254: .word 0x02352AE8 +_02329254: .word SPATK_STAT_IDX arm_func_end DoMoveMinimize arm_func_start DoMoveSeismicToss @@ -1518,7 +1518,7 @@ DoMoveMoonlight: ; 0x023293F8 mov r4, r1 bl GetApparentWeather mov ip, #1 - ldr r1, _02329434 ; =0x022C4974 + ldr r1, _02329434 ; =ov10_022C4974 mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -1529,7 +1529,7 @@ DoMoveMoonlight: ; 0x023293F8 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02329434: .word 0x022C4974 +_02329434: .word ov10_022C4974 arm_func_end DoMoveMoonlight arm_func_start DoMoveHornDrill @@ -1605,14 +1605,14 @@ _02329530: .word 0x0000270F arm_func_start DoMoveSwordsDance DoMoveSwordsDance: ; 0x02329534 stmdb sp!, {r3, lr} - ldr r2, _02329550 ; =0x02352AEC + ldr r2, _02329550 ; =ATK_STAT_IDX mov r3, #2 ldr r2, [r2] bl BoostOffensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_02329550: .word 0x02352AEC +_02329550: .word ATK_STAT_IDX arm_func_end DoMoveSwordsDance arm_func_start DoMoveConversion @@ -1713,11 +1713,11 @@ DoMoveHelpingHand: ; 0x02329674 bl LogMessageByIdWithPopupCheckUserTarget b _023296C4 _02329698: - ldr r2, _023296D0 ; =0x02352AEC + ldr r2, _023296D0 ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] bl BoostOffensiveStat - ldr r1, _023296D4 ; =0x02352AE8 + ldr r1, _023296D4 ; =SPATK_STAT_IDX mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -1729,21 +1729,21 @@ _023296C4: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _023296CC: .word 0x00000EDA -_023296D0: .word 0x02352AEC -_023296D4: .word 0x02352AE8 +_023296D0: .word ATK_STAT_IDX +_023296D4: .word SPATK_STAT_IDX arm_func_end DoMoveHelpingHand arm_func_start DoMoveBoostDefense2 DoMoveBoostDefense2: ; 0x023296D8 stmdb sp!, {r3, lr} - ldr r2, _023296F4 ; =0x02352AEC + ldr r2, _023296F4 ; =ATK_STAT_IDX mov r3, #2 ldr r2, [r2] bl BoostDefensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_023296F4: .word 0x02352AEC +_023296F4: .word ATK_STAT_IDX arm_func_end DoMoveBoostDefense2 arm_func_start DoMoveWarp @@ -1768,7 +1768,7 @@ DoMoveThundershock: ; 0x02329710 bl DealDamage cmp r0, #0 beq _0232976C - ldr r1, _02329778 ; =0x022C4490 + ldr r1, _02329778 ; =ov10_022C4490 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1786,7 +1786,7 @@ _0232976C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329778: .word 0x022C4490 +_02329778: .word ov10_022C4490 arm_func_end DoMoveThundershock arm_func_start DoMoveThunderWave @@ -1894,7 +1894,7 @@ DoMovePoisonFang: ; 0x02329898 bl DealDamage cmp r0, #0 beq _023298F4 - ldr r1, _02329900 ; =0x022C4644 + ldr r1, _02329900 ; =ov10_022C4644 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1912,7 +1912,7 @@ _023298F4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329900: .word 0x022C4644 +_02329900: .word ov10_022C4644 arm_func_end DoMovePoisonFang arm_func_start DoMoveDamagePoison18 @@ -1927,7 +1927,7 @@ DoMoveDamagePoison18: ; 0x02329904 bl DealDamage cmp r0, #0 beq _02329960 - ldr r1, _0232996C ; =0x022C463C + ldr r1, _0232996C ; =ov10_022C463C mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1945,7 +1945,7 @@ _02329960: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232996C: .word 0x022C463C +_0232996C: .word ov10_022C463C arm_func_end DoMoveDamagePoison18 arm_func_start DoMoveJumpKick @@ -2043,7 +2043,7 @@ DoMoveBounce: ; 0x02329A9C bl IsChargingTwoTurnMove cmp r0, #0 beq _02329B2C - ldr r1, _02329B5C ; =0x022C47EC + ldr r1, _02329B5C ; =ov10_022C47EC mov r0, r8 ldr r3, [r1] mov r1, r7 @@ -2052,7 +2052,7 @@ DoMoveBounce: ; 0x02329A9C bl DealDamage cmp r0, #0 beq _02329B20 - ldr r1, _02329B60 ; =0x022C4494 + ldr r1, _02329B60 ; =ov10_022C4494 mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -2084,8 +2084,8 @@ _02329B50: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02329B5C: .word 0x022C47EC -_02329B60: .word 0x022C4494 +_02329B5C: .word ov10_022C47EC +_02329B60: .word ov10_022C4494 _02329B64: .word 0x00000CD4 arm_func_end DoMoveBounce @@ -2183,7 +2183,7 @@ DoMoveTriAttack: ; 0x02329C94 bl DealDamage cmp r0, #0 beq _02329D40 - ldr r1, _02329D4C ; =0x022C4694 + ldr r1, _02329D4C ; =ov10_022C4694 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2224,7 +2224,7 @@ _02329D40: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329D4C: .word 0x022C4694 +_02329D4C: .word ov10_022C4694 arm_func_end DoMoveTriAttack arm_func_start DoMoveSwapItems @@ -2386,7 +2386,7 @@ _02329F68: arm_func_start DoMoveTripleKick DoMoveTripleKick: ; 0x02329F78 stmdb sp!, {r3, lr} - ldr ip, _02329FB0 ; =0x0237CA7C + ldr ip, _02329FB0 ; =ov29_0237CA7C ldr lr, [ip] add lr, lr, #1 str lr, [ip] @@ -2400,7 +2400,7 @@ DoMoveTripleKick: ; 0x02329F78 and r0, r0, #0xff ldmia sp!, {r3, pc} .align 2, 0 -_02329FB0: .word 0x0237CA7C +_02329FB0: .word ov29_0237CA7C arm_func_end DoMoveTripleKick arm_func_start DoMoveSport @@ -2439,7 +2439,7 @@ DoMoveMudSlap: ; 0x02329FE0 bl DungeonRandOutcomeUserTargetInteraction cmp r0, #0 beq _0232A03C - ldr r1, _0232A048 ; =0x02352AEC + ldr r1, _0232A048 ; =ATK_STAT_IDX mov r0, r6 ldr r2, [r1] mov r1, r5 @@ -2450,7 +2450,7 @@ _0232A03C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232A048: .word 0x02352AEC +_0232A048: .word ATK_STAT_IDX arm_func_end DoMoveMudSlap arm_func_start DoMoveDamageStealItem @@ -2464,14 +2464,14 @@ _0232A054: .word DoMoveTakeaway arm_func_start DoMoveAmnesia DoMoveAmnesia: ; 0x0232A058 stmdb sp!, {r3, lr} - ldr r2, _0232A074 ; =0x02352AE8 + ldr r2, _0232A074 ; =SPATK_STAT_IDX mov r3, #2 ldr r2, [r2] bl BoostDefensiveStat mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0232A074: .word 0x02352AE8 +_0232A074: .word SPATK_STAT_IDX arm_func_end DoMoveAmnesia arm_func_start DoMoveNightShade @@ -2522,7 +2522,7 @@ DoMoveNightShade: ; 0x0232A078 DoMoveGrowl: ; 0x0232A118 stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr r2, _0232A144 ; =0x02352AEC + ldr r2, _0232A144 ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] str r3, [sp] @@ -2532,7 +2532,7 @@ DoMoveGrowl: ; 0x0232A118 add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_0232A144: .word 0x02352AEC +_0232A144: .word ATK_STAT_IDX arm_func_end DoMoveGrowl arm_func_start DoMoveSurf @@ -2575,7 +2575,7 @@ DoMoveRolePlay: ; 0x0232A188 ldmia sp!, {r3, r4, r5, r6, r7, pc} _0232A1C8: ldrb r2, [r7, #0x60] - ldr r0, _0232A21C ; =0x02353538 + ldr r0, _0232A21C ; =ov29_02353538 mov r1, #1 strb r2, [r4, #0x60] ldrb r2, [r7, #0x61] @@ -2596,14 +2596,14 @@ _0232A1C8: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _0232A218: .word 0x00000EE1 -_0232A21C: .word 0x02353538 +_0232A21C: .word ov29_02353538 arm_func_end DoMoveRolePlay arm_func_start DoMoveSunnyDay DoMoveSunnyDay: ; 0x0232A220 stmdb sp!, {r3, r4, r5, lr} - ldr r3, _0232A270 ; =0x022C4654 - ldr r2, _0232A274 ; =0x02353538 + ldr r3, _0232A270 ; =WEATHER_MOVE_TURN_COUNT + ldr r2, _0232A274 ; =ov29_02353538 ldrsh r3, [r3] ldr r2, [r2] mov r5, r0 @@ -2623,8 +2623,8 @@ _0232A268: mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0232A270: .word 0x022C4654 -_0232A274: .word 0x02353538 +_0232A270: .word WEATHER_MOVE_TURN_COUNT +_0232A274: .word ov29_02353538 _0232A278: .word 0x00000EC7 arm_func_end DoMoveSunnyDay @@ -2632,7 +2632,7 @@ _0232A278: .word 0x00000EC7 DoMoveLowerDefense1: ; 0x0232A27C stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr r2, _0232A2A8 ; =0x02352AEC + ldr r2, _0232A2A8 ; =ATK_STAT_IDX mov r3, #1 ldr r2, [r2] str r3, [sp] @@ -2642,7 +2642,7 @@ DoMoveLowerDefense1: ; 0x0232A27C add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_0232A2A8: .word 0x02352AEC +_0232A2A8: .word ATK_STAT_IDX arm_func_end DoMoveLowerDefense1 arm_func_start DoMoveWish @@ -2665,7 +2665,7 @@ DoMoveFakeOut: ; 0x0232A2BC bl DealDamage cmp r0, #0 beq _0232A318 - ldr r1, _0232A324 ; =0x022C4670 + ldr r1, _0232A324 ; =ov10_022C4670 mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2683,7 +2683,7 @@ _0232A318: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232A324: .word 0x022C4670 +_0232A324: .word ov10_022C4670 arm_func_end DoMoveFakeOut arm_func_start DoMoveSleepTalk @@ -2719,7 +2719,7 @@ DoMovePayDay: ; 0x0232A340 bl EntityIsValidMoveEffects__0232A3D8 cmp r0, #0 bne _0232A3C8 - ldr r3, _0232A3D4 ; =0x02352B18 + ldr r3, _0232A3D4 ; =ov29_02352B18 add r0, sp, #8 ldrh ip, [r3] mov r1, #0xb7 @@ -2738,5 +2738,5 @@ _0232A3C8: add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0232A3D4: .word 0x02352B18 +_0232A3D4: .word ov29_02352B18 arm_func_end DoMovePayDay diff --git a/asm/overlay_29_023350FC.s b/asm/overlay_29_023350FC.s index 2bc615d3..de0149fa 100644 --- a/asm/overlay_29_023350FC.s +++ b/asm/overlay_29_023350FC.s @@ -9,7 +9,7 @@ ov29_023350FC: ; 0x023350FC mov r0, #0 bl GetApparentWeather bl GetWeatherColorTable - ldr r2, _0233516C ; =0x02353538 + ldr r2, _0233516C ; =ov29_02353538 mov r1, #0 _02335114: ldr r3, [r2] @@ -35,7 +35,7 @@ _02335114: bl ov29_022DE608 ldmia sp!, {r3, pc} .align 2, 0 -_0233516C: .word 0x02353538 +_0233516C: .word ov29_02353538 arm_func_end ov29_023350FC arm_func_start TryWeatherFormChange @@ -62,7 +62,7 @@ TryWeatherFormChange: ; 0x02335170 bl GetApparentWeather mov r1, #6 mul r2, r0, r1 - ldr r1, _02335434 ; =0x022C4C6C + ldr r1, _02335434 ; =CASTFORM_WEATHER_ATTRIBUTE_TABLE mov r0, r5 ldrb r1, [r1, r2] strb r1, [r7, #0x5e] @@ -234,7 +234,7 @@ _02335420: bl ov29_022E65F4 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02335434: .word 0x022C4C6C +_02335434: .word CASTFORM_WEATHER_ATTRIBUTE_TABLE _02335438: .word 0x0000017B _0233543C: .word 0x000003D3 _02335440: .word 0x000001CD @@ -248,10 +248,10 @@ ActivateSportCondition: ; 0x0233544C cmp r0, #0 mov r0, #0 bne _02335488 - ldr r1, _023354B4 ; =0x022C478C + ldr r1, _023354B4 ; =ov10_022C478C mov r2, r0 bl CalcStatusDuration - ldr r1, _023354B8 ; =0x02353538 + ldr r1, _023354B8 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0xc000 strb r0, [r1, #0xd5b] @@ -260,10 +260,10 @@ ActivateSportCondition: ; 0x0233544C bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, pc} _02335488: - ldr r1, _023354B4 ; =0x022C478C + ldr r1, _023354B4 ; =ov10_022C478C mov r2, r0 bl CalcStatusDuration - ldr r1, _023354B8 ; =0x02353538 + ldr r1, _023354B8 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0xc000 strb r0, [r1, #0xd5c] @@ -272,8 +272,8 @@ _02335488: bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, pc} .align 2, 0 -_023354B4: .word 0x022C478C -_023354B8: .word 0x02353538 +_023354B4: .word ov10_022C478C +_023354B8: .word ov29_02353538 _023354BC: .word 0x00000CDA _023354C0: .word 0x00000CDB arm_func_end ActivateSportCondition @@ -288,7 +288,7 @@ TryActivateWeather: ; 0x023354C4 mov r6, r4 sub r5, r4, #1 bl GetApparentWeather - ldr fp, _02335664 ; =0x02353538 + ldr fp, _02335664 ; =ov29_02353538 mov r7, r0 mov r8, r4 _023354F0: @@ -320,13 +320,13 @@ _02335524: addge r0, r1, #0xc000 strgeb r5, [r0, #0xd38] bge _02335570 - ldr r0, _02335664 ; =0x02353538 + ldr r0, _02335664 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xc000 ldrb r1, [r0, #0xd39] strb r1, [r0, #0xd38] _02335570: - ldr r0, _02335664 ; =0x02353538 + ldr r0, _02335664 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xc000 ldrb r1, [r0, #0xd5d] @@ -342,7 +342,7 @@ _02335570: mov r6, #1 bl ov29_02334E70 _023355AC: - ldr r0, _02335664 ; =0x02353538 + ldr r0, _02335664 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xc000 ldrb r1, [r0, #0xd5a] @@ -350,7 +350,7 @@ _023355AC: subne r1, r1, #1 moveq r1, #9 strb r1, [r0, #0xd5a] - ldr r0, _02335664 ; =0x02353538 + ldr r0, _02335664 ; =ov29_02353538 ldr r1, [r0] add r0, r1, #0xc000 ldrb r0, [r0, #0xd5b] @@ -359,7 +359,7 @@ _023355AC: add r0, r1, #0x5b add r0, r0, #0xcd00 bl TickStatusTurnCounter - ldr r0, _02335664 ; =0x02353538 + ldr r0, _02335664 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xc000 ldrb r0, [r0, #0xd5b] @@ -369,7 +369,7 @@ _023355AC: ldr r1, _02335668 ; =0x00000C93 bl LogMessageByIdWithPopupCheckUser _02335614: - ldr r0, _02335664 ; =0x02353538 + ldr r0, _02335664 ; =ov29_02353538 ldr r1, [r0] add r0, r1, #0xc000 ldrb r0, [r0, #0xd5c] @@ -378,7 +378,7 @@ _02335614: add r0, r1, #0x15c add r0, r0, #0xcc00 bl TickStatusTurnCounter - ldr r0, _02335664 ; =0x02353538 + ldr r0, _02335664 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xc000 ldrb r0, [r0, #0xd5c] @@ -391,7 +391,7 @@ _0233565C: mov r0, r6 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02335664: .word 0x02353538 +_02335664: .word ov29_02353538 _02335668: .word 0x00000C93 _0233566C: .word 0x00000C92 arm_func_end TryActivateWeather @@ -426,13 +426,13 @@ _023356B0: LoadTextureUi: ; 0x023356C0 stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr r0, _02335750 ; =0x02352B4C + ldr r0, _02335750 ; =ov29_02352B4C ldr r1, [r0, #4] ldr r0, [r0] str r1, [sp, #4] str r0, [sp] bl GetLanguage - ldr r1, _02335754 ; =0x0235371C + ldr r1, _02335754 ; =ov29_0235371C mov r0, r0, lsl #1 ldrh r2, [r1, r0] add r0, sp, #0 @@ -446,12 +446,12 @@ LoadTextureUi: ; 0x023356C0 bl ProcessWte bl GetLanguage mov r3, r0, lsl #1 - ldr r1, _02335758 ; =0x02353720 + ldr r1, _02335758 ; =ov29_02353720 mov r0, #4 ldrh r1, [r1, r3] mov r2, #0 bl LoadWtuFromBin - ldr r1, _0233575C ; =0x0237CA8C + ldr r1, _0233575C ; =ov29_0237CA8C ldr r2, [sp, #4] str r0, [r1, #4] ldrh r2, [r2, #0xc] @@ -461,27 +461,27 @@ LoadTextureUi: ; 0x023356C0 add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_02335750: .word 0x02352B4C -_02335754: .word 0x0235371C -_02335758: .word 0x02353720 -_0233575C: .word 0x0237CA8C +_02335750: .word ov29_02352B4C +_02335754: .word ov29_0235371C +_02335758: .word ov29_02353720 +_0233575C: .word ov29_0237CA8C arm_func_end LoadTextureUi arm_func_start ov29_02335760 ov29_02335760: ; 0x02335760 ldr ip, _0233576C ; =sub_0201E020 - ldr r0, _02335770 ; =0x0237CA90 + ldr r0, _02335770 ; =ov29_0237CA90 bx ip .align 2, 0 _0233576C: .word sub_0201E020 -_02335770: .word 0x0237CA90 +_02335770: .word ov29_0237CA90 arm_func_end ov29_02335760 arm_func_start ov29_02335774 ov29_02335774: ; 0x02335774 stmdb sp!, {r3, lr} sub sp, sp, #8 - ldr r1, _023357F4 ; =0x02352B4C + ldr r1, _023357F4 ; =ov29_02352B4C ldr r2, _023357F8 ; =0x000003EF ldr r3, [r1, #0xc] ldr ip, [r1, #8] @@ -497,7 +497,7 @@ ov29_02335774: ; 0x02335774 mov r3, r1 bl ProcessWte ldr ip, [sp, #4] - ldr r2, _023357FC ; =0x0237CA96 + ldr r2, _023357FC ; =ov29_0237CA96 add r3, ip, #0x10 mov r1, #4 _023357C8: @@ -506,17 +506,17 @@ _023357C8: strh r0, [r2], #2 bne _023357C8 ldrh r2, [ip, #0xc] - ldr r1, _02335800 ; =0x0237CA8C + ldr r1, _02335800 ; =ov29_0237CA8C ldr r0, [sp] strh r2, [r1, #8] bl sub_0201E080 add sp, sp, #8 ldmia sp!, {r3, pc} .align 2, 0 -_023357F4: .word 0x02352B4C +_023357F4: .word ov29_02352B4C _023357F8: .word 0x000003EF -_023357FC: .word 0x0237CA96 -_02335800: .word 0x0237CA8C +_023357FC: .word ov29_0237CA96 +_02335800: .word ov29_0237CA8C arm_func_end ov29_02335774 arm_func_start ov29_02335804 @@ -535,7 +535,7 @@ ov29_02335808: ; 0x02335808 strb r1, [r4, #0x3c] mov r2, #0x28 strh r2, [r4, #0x2a] - ldr r2, _02335860 ; =0x0237CA8C + ldr r2, _02335860 ; =ov29_0237CA8C strb r1, [r4, #0x3e] ldrh r3, [r2] mov r0, r0, asr #0x10 @@ -543,32 +543,32 @@ ov29_02335808: ; 0x02335808 strh r3, [r4, #0x14] str r2, [r4, #0x20] bl ov29_02335864 - ldr r1, _02335860 ; =0x0237CA8C + ldr r1, _02335860 ; =ov29_0237CA8C str r0, [r4, #0x24] mov r0, #0 strb r0, [r1, #0x12] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02335860: .word 0x0237CA8C +_02335860: .word ov29_0237CA8C arm_func_end ov29_02335808 arm_func_start ov29_02335864 ov29_02335864: ; 0x02335864 - ldr r2, _0233587C ; =0x020AFC70 + ldr r2, _0233587C ; =_020AFC70 add r0, r1, r0, lsl #8 ldr r1, [r2] ldr r1, [r1, #0xe0] add r0, r1, r0, lsl #1 bx lr .align 2, 0 -_0233587C: .word 0x020AFC70 +_0233587C: .word _020AFC70 arm_func_end ov29_02335864 arm_func_start DisplayNumberTextureUi DisplayNumberTextureUi: ; 0x02335880 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x40 - ldr r4, _02335984 ; =0x0237CA8C + ldr r4, _02335984 ; =ov29_0237CA8C mov r5, r0 ldr r4, [r4, #4] mov fp, r1 @@ -634,13 +634,13 @@ _02335968: add sp, sp, #0x40 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02335984: .word 0x0237CA8C +_02335984: .word ov29_0237CA8C arm_func_end DisplayNumberTextureUi arm_func_start DisplayCharTextureUi DisplayCharTextureUi: ; 0x02335988 stmdb sp!, {r4, r5, r6, lr} - ldr r4, _023359F4 ; =0x0237CA8C + ldr r4, _023359F4 ; =ov29_0237CA8C mov r6, r0 ldr r0, [r4, #4] mov r5, r3 @@ -667,17 +667,17 @@ DisplayCharTextureUi: ; 0x02335988 ldrsh r0, [r0, #4] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023359F4: .word 0x0237CA8C +_023359F4: .word ov29_0237CA8C arm_func_end DisplayCharTextureUi arm_func_start ov29_023359F8 ov29_023359F8: ; 0x023359F8 - ldr r1, _02335A08 ; =0x0237CA8C + ldr r1, _02335A08 ; =ov29_0237CA8C ldr ip, _02335A0C ; =SetBothScreensWindowColorToDefault strb r0, [r1, #0x12] bx ip .align 2, 0 -_02335A08: .word 0x0237CA8C +_02335A08: .word ov29_0237CA8C _02335A0C: .word SetBothScreensWindowColorToDefault arm_func_end ov29_023359F8 @@ -685,7 +685,7 @@ _02335A0C: .word SetBothScreensWindowColorToDefault DisplayUi: ; 0x02335A10 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x44 - ldr r0, _02335F2C ; =0x02353538 + ldr r0, _02335F2C ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x21c add r5, r0, #0x1a000 @@ -701,7 +701,7 @@ DisplayUi: ; 0x02335A10 _02335A4C: cmp r1, #0 beq _02335F24 - ldr r1, _02335F30 ; =0x0237CA8C + ldr r1, _02335F30 ; =ov29_0237CA8C ldrb r1, [r1, #0x12] cmp r1, #0 bne _02335F24 @@ -714,7 +714,7 @@ _02335A4C: add r4, r3, r2 cmp r4, r1 movgt r4, r1 - ldr r1, _02335F2C ; =0x02353538 + ldr r1, _02335F2C ; =ov29_02353538 ldrsh r8, [sl, #0x10] ldr r1, [r1] ldrb sb, [sl, #0xa] @@ -736,7 +736,7 @@ _02335A4C: moveq fp, #1 cmp r6, #0 beq _02335B18 - ldr r0, _02335F38 ; =0x0237C850 + ldr r0, _02335F38 ; =ov29_0237C850 ldr r0, [r0] tst r0, #0x10 beq _02335B04 @@ -757,7 +757,7 @@ _02335B18: _02335B20: cmp fp, #0 beq _02335B5C - ldr r0, _02335F38 ; =0x0237C850 + ldr r0, _02335F38 ; =ov29_0237C850 ldr r0, [r0] ands r0, r0, #0x10 movne sl, #0x30 @@ -782,7 +782,7 @@ _02335B5C: movne r0, r0, lsl #0x10 movne r6, r0, asr #0x10 bne _02335C48 - ldr r0, _02335F2C ; =0x02353538 + ldr r0, _02335F2C ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl DungeonGoesUp @@ -896,7 +896,7 @@ _02335C48: and r3, r3, #0xff mov r1, #0 bl DisplayNumberTextureUi - ldr r0, _02335F30 ; =0x0237CA8C + ldr r0, _02335F30 ; =ov29_0237CA8C cmp r4, #0 ldr r0, [r0, #4] mov r5, #0x90 @@ -905,14 +905,14 @@ _02335C48: blt _02335F24 add r0, sp, #4 bl InitRender3dElement64 - ldr r0, _02335F30 ; =0x0237CA8C + ldr r0, _02335F30 ; =ov29_0237CA8C mov fp, #5 ldrh r3, [r0] mov r0, r8, lsl #0x10 mov sl, #0x28 mov r2, #0x1000 mov r7, r0, asr #0x10 - ldr r1, _02335F3C ; =0x020AFC70 + ldr r1, _02335F3C ; =_020AFC70 str r2, [sp, #0x24] ldr r0, [r1] cmp r7, #0x70 @@ -1023,11 +1023,11 @@ _02335F24: add sp, sp, #0x44 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02335F2C: .word 0x02353538 -_02335F30: .word 0x0237CA8C +_02335F2C: .word ov29_02353538 +_02335F30: .word ov29_0237CA8C _02335F34: .word 0x000003E7 -_02335F38: .word 0x0237C850 -_02335F3C: .word 0x020AFC70 +_02335F38: .word ov29_0237C850 +_02335F3C: .word _020AFC70 arm_func_end DisplayUi arm_func_start ov29_02335F40 @@ -1050,7 +1050,7 @@ ov29_02335F40: ; 0x02335F40 str r0, [sp, #0x20] bl ov29_02335864 mov r3, #0x31 - ldr r2, _023360F8 ; =0x0237CA8C + ldr r2, _023360F8 ; =ov29_0237CA8C rsb r1, r3, #0x2740 ldrh r2, [r2, #8] str r0, [sp, #0x24] @@ -1148,28 +1148,28 @@ _023360F0: add sp, sp, #0x40 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023360F8: .word 0x0237CA8C +_023360F8: .word ov29_0237CA8C arm_func_end ov29_02335F40 arm_func_start GetTile GetTile: ; 0x023360FC cmp r0, #0 - ldrlt r0, _0233615C ; =0x02353724 + ldrlt r0, _0233615C ; =ov29_02353724 ldrlt r0, [r0] bxlt lr cmp r1, #0 - ldrlt r0, _0233615C ; =0x02353724 + ldrlt r0, _0233615C ; =ov29_02353724 ldrlt r0, [r0] bxlt lr cmp r0, #0x38 - ldrge r0, _0233615C ; =0x02353724 + ldrge r0, _0233615C ; =ov29_02353724 ldrge r0, [r0] bxge lr cmp r1, #0x20 - ldrge r0, _0233615C ; =0x02353724 + ldrge r0, _0233615C ; =ov29_02353724 ldrge r0, [r0] bxge lr - ldr r3, _02336160 ; =0x02353538 + ldr r3, _02336160 ; =ov29_02353538 mov r2, #0xe0 ldr r3, [r3] mla r2, r1, r2, r3 @@ -1178,8 +1178,8 @@ GetTile: ; 0x023360FC ldr r0, [r0, #0x2e4] bx lr .align 2, 0 -_0233615C: .word 0x02353724 -_02336160: .word 0x02353538 +_0233615C: .word ov29_02353724 +_02336160: .word ov29_02353538 arm_func_end GetTile arm_func_start GetTileSafe @@ -1192,8 +1192,8 @@ GetTileSafe: ; 0x02336164 cmplt r1, #0x20 blt _023361A8 _02336180: - ldr r0, _023361C8 ; =0x02353724 - ldr lr, _023361CC ; =0x0237CAB8 + ldr r0, _023361C8 ; =ov29_02353724 + ldr lr, _023361CC ; =ov29_0237CAB8 ldr r4, [r0] mov ip, lr ldmia r4!, {r0, r1, r2, r3} @@ -1203,7 +1203,7 @@ _02336180: str r1, [lr] ldmia sp!, {r4, pc} _023361A8: - ldr r3, _023361D0 ; =0x02353538 + ldr r3, _023361D0 ; =ov29_02353538 mov r2, #0xe0 ldr r3, [r3] mla r2, r1, r2, r3 @@ -1212,14 +1212,14 @@ _023361A8: ldr r0, [r0, #0x2e4] ldmia sp!, {r4, pc} .align 2, 0 -_023361C8: .word 0x02353724 -_023361CC: .word 0x0237CAB8 -_023361D0: .word 0x02353538 +_023361C8: .word ov29_02353724 +_023361CC: .word ov29_0237CAB8 +_023361D0: .word ov29_02353538 arm_func_end GetTileSafe arm_func_start IsFullFloorFixedRoom IsFullFloorFixedRoom: ; 0x023361D4 - ldr r0, _02336200 ; =0x02353538 + ldr r0, _02336200 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrb r0, [r0, #0xda] @@ -1232,19 +1232,19 @@ _023361F8: mov r0, #0 bx lr .align 2, 0 -_02336200: .word 0x02353538 +_02336200: .word ov29_02353538 arm_func_end IsFullFloorFixedRoom arm_func_start IsCurrentTilesetBackground IsCurrentTilesetBackground: ; 0x02336204 - ldr r0, _0233621C ; =0x02353538 + ldr r0, _0233621C ; =ov29_02353538 ldr ip, _02336220 ; =IsBackgroundTileset ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] bx ip .align 2, 0 -_0233621C: .word 0x02353538 +_0233621C: .word ov29_02353538 _02336220: .word IsBackgroundTileset arm_func_end IsCurrentTilesetBackground @@ -1254,7 +1254,7 @@ TrySpawnGoldenChamber: ; 0x02336224 bl IsGoldenChamber cmp r0, #0 ldmeqia sp!, {r3, pc} - ldr r1, _0233625C ; =0x02353538 + ldr r1, _0233625C ; =ov29_02353538 mov r3, #0x3c ldr r0, [r1] mov r2, #0x6f @@ -1265,7 +1265,7 @@ TrySpawnGoldenChamber: ; 0x02336224 strb r2, [r0, #0xda] ldmia sp!, {r3, pc} .align 2, 0 -_0233625C: .word 0x02353538 +_0233625C: .word ov29_02353538 arm_func_end TrySpawnGoldenChamber arm_func_start CountItemsOnFloorForAcuteSniffer @@ -1301,14 +1301,14 @@ _023362C0: ldrsh r0, [sp, #2] cmp r0, #0x20 blt _0233627C - ldr r1, _023362E4 ; =0x02353538 + ldr r1, _023362E4 ; =ov29_02353538 ldr r0, _023362E8 ; =0x00012AF8 ldr r1, [r1] strh r6, [r1, r0] add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023362E4: .word 0x02353538 +_023362E4: .word ov29_02353538 _023362E8: .word 0x00012AF8 arm_func_end CountItemsOnFloorForAcuteSniffer @@ -1316,7 +1316,7 @@ _023362E8: .word 0x00012AF8 ov29_023362EC: ; 0x023362EC stmdb sp!, {r4, r5, r6, r7, r8, lr} mov ip, #0 - ldr r8, _023363BC ; =0x02353538 + ldr r8, _023363BC ; =ov29_02353538 mov r2, ip mov r5, #0x14 mov r6, #0x460 @@ -1341,7 +1341,7 @@ _02336314: add ip, ip, #1 cmp ip, #0x20 blt _02336308 - ldr r1, _023363BC ; =0x02353538 + ldr r1, _023363BC ; =ov29_02353538 mov r2, #0 ldr r0, [r1] add r0, r0, #0x4000 @@ -1353,7 +1353,7 @@ _02336314: add r0, r0, #0x12000 strb r2, [r0, #0xaa8] bl ov29_023369F8 - ldr r1, _023363BC ; =0x02353538 + ldr r1, _023363BC ; =ov29_02353538 mov r2, #0 ldr r0, [r1] add r0, r0, #0x4000 @@ -1369,12 +1369,12 @@ _02336314: strb r2, [r0, #0xb25] ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_023363BC: .word 0x02353538 +_023363BC: .word ov29_02353538 arm_func_end ov29_023362EC arm_func_start GetStairsSpawnPosition GetStairsSpawnPosition: ; 0x023363C0 - ldr r3, _023363E8 ; =0x02353538 + ldr r3, _023363E8 ; =ov29_02353538 ldr r2, [r3] add r2, r2, #0xcc00 ldrsh r2, [r2, #0xe4] @@ -1385,12 +1385,12 @@ GetStairsSpawnPosition: ; 0x023363C0 strh r0, [r1] bx lr .align 2, 0 -_023363E8: .word 0x02353538 +_023363E8: .word ov29_02353538 arm_func_end GetStairsSpawnPosition arm_func_start PositionIsOnStairs PositionIsOnStairs: ; 0x023363EC - ldr r2, _02336424 ; =0x02353538 + ldr r2, _02336424 ; =ov29_02353538 mov ip, #0 ldr r2, [r2] add r2, r2, #0xcc00 @@ -1405,13 +1405,13 @@ PositionIsOnStairs: ; 0x023363EC and r0, r0, #0xff bx lr .align 2, 0 -_02336424: .word 0x02353538 +_02336424: .word ov29_02353538 arm_func_end PositionIsOnStairs arm_func_start GetStairsRoom GetStairsRoom: ; 0x02336428 stmdb sp!, {r3, lr} - ldr r0, _0233644C ; =0x02353538 + ldr r0, _0233644C ; =ov29_02353538 ldr r0, [r0] add r1, r0, #0xcc00 ldrsh r0, [r1, #0xe4] @@ -1420,33 +1420,33 @@ GetStairsRoom: ; 0x02336428 ldrb r0, [r0, #7] ldmia sp!, {r3, pc} .align 2, 0 -_0233644C: .word 0x02353538 +_0233644C: .word ov29_02353538 arm_func_end GetStairsRoom arm_func_start GetDefaultTileTextureId GetDefaultTileTextureId: ; 0x02336450 - ldr r0, _0233645C ; =0x02353724 + ldr r0, _0233645C ; =ov29_02353724 ldr r0, [r0, #4] bx lr .align 2, 0 -_0233645C: .word 0x02353724 +_0233645C: .word ov29_02353724 arm_func_end GetDefaultTileTextureId arm_func_start ov29_02336460 ov29_02336460: ; 0x02336460 stmdb sp!, {r4, lr} - ldr r1, _02336598 ; =0x02353538 - ldr r0, _0233659C ; =0x0237CAAC + ldr r1, _02336598 ; =ov29_02353538 + ldr r0, _0233659C ; =ov29_0237CAAC ldr r1, [r1] mov r2, #0 add r1, r1, #0x4000 ldrsh r4, [r1, #0xd4] mov r1, r4 bl ov10_022C25EC - ldr r1, _023365A0 ; =0x0237CAA0 + ldr r1, _023365A0 ; =ov29_0237CAA0 mov r0, #0 ldr ip, [r1, #0x14] - ldr r3, _023365A4 ; =0x02353724 + ldr r3, _023365A4 ; =ov29_02353724 mov r2, r0 mov r1, #1 str ip, [r3, #4] @@ -1454,14 +1454,14 @@ ov29_02336460: ; 0x02336460 mov r1, r4 mov r2, #0 bl ov10_022C2588 - ldr r0, _02336598 ; =0x02353538 + ldr r0, _02336598 ; =ov29_02353538 mov r1, r4 ldr r0, [r0] mov r2, #0 add r0, r0, #0x2a8 add r0, r0, #0x10000 bl ov10_022C26BC - ldr r1, _02336598 ; =0x02353538 + ldr r1, _02336598 ; =ov29_02353538 ldr r0, _023365A8 ; =0x00012162 ldr r2, [r1] mov r1, r4 @@ -1471,15 +1471,15 @@ ov29_02336460: ; 0x02336460 mov r0, #0 mov r1, r0 bl ov29_022E9F80 - ldr r0, _023365AC ; =0x0237CAA0 + ldr r0, _023365AC ; =ov29_0237CAA0 mov r1, r4 mov r2, #0 bl ov10_022C2654 - ldr r0, _023365A0 ; =0x0237CAA0 + ldr r0, _023365A0 ; =ov29_0237CAA0 mov r1, #0x20 ldr r0, [r0, #8] bl ov29_022DE0EC - ldr r1, _023365B0 ; =0x0237C9B8 + ldr r1, _023365B0 ; =ov29_0237C9B8 mov r4, #0 mov r3, #1 strb r4, [r1] @@ -1488,7 +1488,7 @@ ov29_02336460: ; 0x02336460 strb r0, [r1, #2] mov r0, #3 strb r0, [r1, #3] - ldr r0, _02336598 ; =0x02353538 + ldr r0, _02336598 ; =ov29_02353538 ldr r2, _023365B4 ; =SECONDARY_TERRAIN_TYPES ldr ip, [r0] add r0, ip, #0x4000 @@ -1507,43 +1507,43 @@ ov29_02336460: ; 0x02336460 mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 cmp r0, #1 - ldrls r0, _023365B0 ; =0x0237C9B8 + ldrls r0, _023365B0 ; =ov29_0237C9B8 movls r1, #0 strlsb r1, [r0, #4] strlsb r1, [r0, #5] ldmia sp!, {r4, pc} .align 2, 0 -_02336598: .word 0x02353538 -_0233659C: .word 0x0237CAAC -_023365A0: .word 0x0237CAA0 -_023365A4: .word 0x02353724 +_02336598: .word ov29_02353538 +_0233659C: .word ov29_0237CAAC +_023365A0: .word ov29_0237CAA0 +_023365A4: .word ov29_02353724 _023365A8: .word 0x00012162 -_023365AC: .word 0x0237CAA0 -_023365B0: .word 0x0237C9B8 +_023365AC: .word ov29_0237CAA0 +_023365B0: .word ov29_0237C9B8 _023365B4: .word SECONDARY_TERRAIN_TYPES arm_func_end ov29_02336460 arm_func_start ov29_023365B8 ov29_023365B8: ; 0x023365B8 stmdb sp!, {r3, lr} - ldr r0, _023365DC ; =0x0237CAAC + ldr r0, _023365DC ; =ov29_0237CAAC bl ov10_022C2638 - ldr r0, _023365E0 ; =0x0237CAA0 + ldr r0, _023365E0 ; =ov29_0237CAA0 bl ov10_022C26A0 - ldr r0, _023365E4 ; =0x02353724 + ldr r0, _023365E4 ; =ov29_02353724 mov r1, #0 str r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_023365DC: .word 0x0237CAAC -_023365E0: .word 0x0237CAA0 -_023365E4: .word 0x02353724 +_023365DC: .word ov29_0237CAAC +_023365E0: .word ov29_0237CAA0 +_023365E4: .word ov29_02353724 arm_func_end ov29_023365B8 arm_func_start ov29_023365E8 ov29_023365E8: ; 0x023365E8 stmdb sp!, {r3, lr} - ldr r0, _02336648 ; =0x02353538 + ldr r0, _02336648 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd4] @@ -1553,25 +1553,25 @@ ov29_023365E8: ; 0x023365E8 mov r1, r1, lsl #0x10 mov r1, r1, lsr #0x10 cmp r1, #1 - ldrls r1, _0233664C ; =0x02352B60 - ldrls r0, _02336650 ; =0x02353724 + ldrls r1, _0233664C ; =ov29_02352B60 + ldrls r0, _02336650 ; =ov29_02353724 strls r1, [r0] ldmlsia sp!, {r3, pc} bl ov29_022E0378 cmp r0, #0 - ldrne r1, _02336654 ; =0x02352B88 - ldrne r0, _02336650 ; =0x02353724 + ldrne r1, _02336654 ; =ov29_02352B88 + ldrne r0, _02336650 ; =ov29_02353724 strne r1, [r0] - ldreq r1, _02336658 ; =0x02352B74 - ldreq r0, _02336650 ; =0x02353724 + ldreq r1, _02336658 ; =ov29_02352B74 + ldreq r0, _02336650 ; =ov29_02353724 streq r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_02336648: .word 0x02353538 -_0233664C: .word 0x02352B60 -_02336650: .word 0x02353724 -_02336654: .word 0x02352B88 -_02336658: .word 0x02352B74 +_02336648: .word ov29_02353538 +_0233664C: .word ov29_02352B60 +_02336650: .word ov29_02353724 +_02336654: .word ov29_02352B88 +_02336658: .word ov29_02352B74 arm_func_end ov29_023365E8 arm_func_start ov29_0233665C @@ -1607,7 +1607,7 @@ ov29_02336694: ; 0x02336694 cmplt r8, #0x20 bge _023369E8 bl GetTile - ldr r1, _023369F0 ; =0x02353538 + ldr r1, _023369F0 ; =ov29_02353538 ldrh r2, [r0] ldr r4, [r1] add r0, r4, #0x4000 @@ -1726,7 +1726,7 @@ _02336828: _02336884: cmp r1, #3 bne _02336954 - ldr r1, _023369F0 ; =0x02353538 + ldr r1, _023369F0 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 ldrsh r1, [r1, #0xd4] @@ -1808,7 +1808,7 @@ _0233699C: mov r1, r8 movne r4, #0 bl GetTileSafe - ldr r1, _023369F0 ; =0x02353538 + ldr r1, _023369F0 ; =ov29_02353538 add r2, sl, sl, lsl #1 ldr r1, [r1] add r1, r1, r2 @@ -1820,13 +1820,13 @@ _023369E8: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023369F0: .word 0x02353538 +_023369F0: .word ov29_02353538 _023369F4: .word 0x00012162 arm_func_end ov29_02336694 arm_func_start ov29_023369F8 ov29_023369F8: ; 0x023369F8 - ldr r1, _02336A48 ; =0x02353538 + ldr r1, _02336A48 ; =ov29_02353538 mov ip, #0 mvn r3, #0 mov r2, #0xff @@ -1848,7 +1848,7 @@ _02336A08: blt _02336A08 bx lr .align 2, 0 -_02336A48: .word 0x02353538 +_02336A48: .word ov29_02353538 arm_func_end ov29_023369F8 arm_func_start DetermineAllTilesWalkableNeighbors @@ -2095,7 +2095,7 @@ ov29_02336DB0: ; 0x02336DB0 ldrh r0, [r4] tst r0, #0x200 beq _02336DE0 - ldr r0, _02336F48 ; =0x02352F14 + ldr r0, _02336F48 ; =ov29_02352F14 bl DebugPrint0 _02336DE0: ldrh r1, [r4] @@ -2196,14 +2196,14 @@ _02336F2C: add r0, r0, r5, lsl #1 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02336F48: .word 0x02352F14 +_02336F48: .word ov29_02352F14 arm_func_end ov29_02336DB0 arm_func_start UpdateTrapsVisibility UpdateTrapsVisibility: ; 0x02336F4C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x30 - ldr r0, _02337108 ; =0x02353538 + ldr r0, _02337108 ; =ov29_02353538 ldr sl, [r0] add r1, sl, #0x1a000 ldrb r0, [r1, #0x245] @@ -2211,9 +2211,9 @@ UpdateTrapsVisibility: ; 0x02336F4C ldrb fp, [r1, #0x244] bl IsSecretBazaar ldr r1, _0233710C ; =0x0001A224 - ldr r2, _02337110 ; =0x02352B9C + ldr r2, _02337110 ; =ov29_02352B9C ldrsh r3, [sl, r1] - ldr r1, _02337114 ; =0x02352D58 + ldr r1, _02337114 ; =ov29_02352D58 mov sb, r3, asr #3 str r0, [sp, #0x14] add r0, sb, #0x1e @@ -2226,12 +2226,12 @@ _02336FA0: ldr r0, _02337118 ; =0x0001A226 add r1, sl, #0xc4 ldrsh r3, [sl, r0] - ldr r0, _02337110 ; =0x02352B9C + ldr r0, _02337110 ; =ov29_02352B9C mov r2, r5, lsl #0x10 mov r3, r3, asr #3 sub r4, r3, #1 add r3, r0, r4, lsl #1 - ldr r0, _02337114 ; =0x02352D58 + ldr r0, _02337114 ; =ov29_02352D58 ldrsh r8, [r3, #0x3c] add r0, r0, r4, lsl #1 ldrsh r6, [r0, #0x3c] @@ -2316,10 +2316,10 @@ _023370B8: add sp, sp, #0x30 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02337108: .word 0x02353538 +_02337108: .word ov29_02353538 _0233710C: .word 0x0001A224 -_02337110: .word 0x02352B9C -_02337114: .word 0x02352D58 +_02337110: .word ov29_02352B9C +_02337114: .word ov29_02352D58 _02337118: .word 0x0001A226 arm_func_end UpdateTrapsVisibility @@ -2327,7 +2327,7 @@ _02337118: .word 0x0001A226 ov29_0233711C: ; 0x0233711C stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x1c - ldr r2, _02337294 ; =0x02353538 + ldr r2, _02337294 ; =ov29_02353538 mov r4, r1 ldr sl, [r2] mov r5, r0 @@ -2337,7 +2337,7 @@ ov29_0233711C: ; 0x0233711C ldrb fp, [r1, #0x244] bl IsSecretBazaar ldr r2, _02337298 ; =0x0001A224 - ldr r1, _0233729C ; =0x02352B9C + ldr r1, _0233729C ; =ov29_02352B9C add r3, r2, #2 ldrsh r6, [sl, r2] ldrsh r2, [sl, r3] @@ -2358,7 +2358,7 @@ ov29_0233711C: ; 0x0233711C add r0, r8, #0x1e mov r3, r0, lsl #1 ldrsh r6, [r1, r3] - ldr r1, _023372A0 ; =0x02352D58 + ldr r1, _023372A0 ; =ov29_02352D58 add r0, sl, #0xc4 ldrsh r4, [r1, r3] ldrsh r5, [r1, r2] @@ -2422,17 +2422,17 @@ _0233726C: add sp, sp, #0x1c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02337294: .word 0x02353538 +_02337294: .word ov29_02353538 _02337298: .word 0x0001A224 -_0233729C: .word 0x02352B9C -_023372A0: .word 0x02352D58 +_0233729C: .word ov29_02352B9C +_023372A0: .word ov29_02352D58 arm_func_end ov29_0233711C arm_func_start ov29_023372A4 ov29_023372A4: ; 0x023372A4 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x1c - ldr r2, _02337418 ; =0x02353538 + ldr r2, _02337418 ; =ov29_02353538 mov r4, r1 ldr sl, [r2] mov r5, r0 @@ -2442,7 +2442,7 @@ ov29_023372A4: ; 0x023372A4 ldrb fp, [r1, #0x244] bl IsSecretBazaar ldr r2, _0233741C ; =0x0001A224 - ldr r1, _02337420 ; =0x02352B9C + ldr r1, _02337420 ; =ov29_02352B9C add r3, r2, #2 ldrsh r6, [sl, r2] ldrsh r2, [sl, r3] @@ -2455,7 +2455,7 @@ ov29_023372A4: ; 0x023372A4 str fp, [sp] mov r2, r0, lsl #1 ldr r0, [sp, #0x18] - ldr r3, _02337424 ; =0x02352D58 + ldr r3, _02337424 ; =ov29_02352D58 str r0, [sp, #4] ldr r0, [sp, #0x14] ldrsh r5, [r3, r2] @@ -2526,17 +2526,17 @@ _023373F0: add sp, sp, #0x1c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02337418: .word 0x02353538 +_02337418: .word ov29_02353538 _0233741C: .word 0x0001A224 -_02337420: .word 0x02352B9C -_02337424: .word 0x02352D58 +_02337420: .word ov29_02352B9C +_02337424: .word ov29_02352D58 arm_func_end ov29_023372A4 arm_func_start DrawTileGrid DrawTileGrid: ; 0x02337428 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x44 - ldr r5, _02337780 ; =0x02353538 + ldr r5, _02337780 ; =ov29_02353538 str r2, [sp, #4] mov r4, r0 mov r7, r1 @@ -2544,7 +2544,7 @@ DrawTileGrid: ; 0x02337428 ldr r5, [r5] bl GetLeader ldr r1, _02337784 ; =0x0001A224 - ldr r2, _02337780 ; =0x02353538 + ldr r2, _02337780 ; =ov29_02353538 ldrsh r8, [r5, r1] ldr r1, [r2] ldr r2, _02337788 ; =DIRECTIONS_XY @@ -2572,18 +2572,18 @@ _02337490: blt _02337490 add r0, sb, #0x1e mov r2, r0, lsl #1 - ldr r1, _0233778C ; =0x02352B9C - ldr r0, _02337790 ; =0x02352D58 + ldr r1, _0233778C ; =ov29_02352B9C + ldr r0, _02337790 ; =ov29_02352D58 ldrsh r8, [r1, r2] ldrsh r6, [r0, r2] mov r0, #0 str r0, [sp, #0xc] _023374D4: ldr r0, _02337794 ; =0x0001A226 - ldr r2, _0233778C ; =0x02352B9C + ldr r2, _0233778C ; =ov29_02352B9C ldrsh r3, [r5, r0] ldr r0, [sp, #4] - ldr r1, _02337790 ; =0x02352D58 + ldr r1, _02337790 ; =ov29_02352D58 mov fp, r3, asr #3 cmp r0, #0 add r0, r2, fp, lsl #1 @@ -2766,11 +2766,11 @@ _02337730: add sp, sp, #0x44 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02337780: .word 0x02353538 +_02337780: .word ov29_02353538 _02337784: .word 0x0001A224 _02337788: .word DIRECTIONS_XY -_0233778C: .word 0x02352B9C -_02337790: .word 0x02352D58 +_0233778C: .word ov29_02352B9C +_02337790: .word ov29_02352D58 _02337794: .word 0x0001A226 _02337798: .word 0x0001213E arm_func_end DrawTileGrid @@ -2803,7 +2803,7 @@ _023377BC: mov r0, #0 mov r1, r0 bl sub_02051E60 - ldr r0, _02337818 ; =0x02353538 + ldr r0, _02337818 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] add r0, r0, #0x1a000 @@ -2811,7 +2811,7 @@ _023377BC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02337818: .word 0x02353538 +_02337818: .word ov29_02353538 arm_func_end HideTileGrid arm_func_start ov29_0233781C @@ -2841,7 +2841,7 @@ ov29_0233785C: ; 0x0233785C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} ldr r1, _02337A34 ; =0x0000270F mov r3, #0 - ldr r6, _02337A38 ; =0x02353538 + ldr r6, _02337A38 ; =ov29_02353538 mov sb, r3 rsb r0, r1, #0 mov r4, #0x1c @@ -2879,7 +2879,7 @@ _023378EC: add r5, sl, #1 mov r0, sl, lsl #0x10 mov r1, r5, lsl #0x10 - ldr fp, _02337A38 ; =0x02353538 + ldr fp, _02337A38 ; =ov29_02353538 mov r8, #0 mov r6, r0, asr #0x10 mov r4, r1, asr #0x10 @@ -2921,7 +2921,7 @@ _0233797C: cmp sl, #0x20 blt _023378EC mov r2, #0x18 - ldr r7, _02337A38 ; =0x02353538 + ldr r7, _02337A38 ; =ov29_02353538 mov r1, #0 mov r3, r2 mov r4, r2 @@ -2956,7 +2956,7 @@ _02337A10: add r1, r1, #1 cmp r1, #0x20 blt _023379B0 - ldr r0, _02337A38 ; =0x02353538 + ldr r0, _02337A38 ; =ov29_02353538 add r1, sb, #1 ldr r0, [r0] add r0, r0, #0xe000 @@ -2964,7 +2964,7 @@ _02337A10: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02337A34: .word 0x0000270F -_02337A38: .word 0x02353538 +_02337A38: .word ov29_02353538 arm_func_end ov29_0233785C arm_func_start DiscoverMinimap @@ -2976,7 +2976,7 @@ DiscoverMinimap: ; 0x02337A3C bl GetTile ldrb r4, [r0, #7] bl GetVisibilityRange - ldr r1, _02337B28 ; =0x02353538 + ldr r1, _02337B28 ; =ov29_02353538 ldr r3, [r1] add r1, r3, #0x1a000 ldrb r2, [r1, #0x23e] @@ -3035,7 +3035,7 @@ _02337B1C: ble _02337AE0 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02337B28: .word 0x02353538 +_02337B28: .word ov29_02353538 arm_func_end DiscoverMinimap arm_func_start PositionHasItem @@ -3138,7 +3138,7 @@ _02337C4C: arm_func_start ov29_02337C54 ov29_02337C54: ; 0x02337C54 - ldr r4, _02337CA4 ; =0x02353538 + ldr r4, _02337CA4 ; =ov29_02353538 mov r6, #0 _02337C5C: ldr r0, [r4] @@ -3162,5 +3162,5 @@ _02337C9C: mov r0, r5 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02337CA4: .word 0x02353538 +_02337CA4: .word ov29_02353538 arm_func_end ov29_02337C54 diff --git a/asm/overlay_29_023456BC.s b/asm/overlay_29_023456BC.s index 26dc4a79..1d024e50 100644 --- a/asm/overlay_29_023456BC.s +++ b/asm/overlay_29_023456BC.s @@ -37,7 +37,7 @@ RemoveGroundItem: ; 0x023456BC beq _02345770 mov r0, r4 bl GetActualBuyPrice - ldr r1, _023457C4 ; =0x02353538 + ldr r1, _023457C4 ; =ov29_02353538 ldr r2, [r1] ldr r1, [r2, #0x7bc] sub r0, r1, r0 @@ -46,7 +46,7 @@ RemoveGroundItem: ; 0x023456BC _02345754: mov r0, r4 bl GetActualSellPrice - ldr r1, _023457C4 ; =0x02353538 + ldr r1, _023457C4 ; =ov29_02353538 ldr r2, [r1] ldr r1, [r2, #0x7c0] sub r0, r1, r0 @@ -54,7 +54,7 @@ _02345754: _02345770: mov r4, #0 str r4, [r5, #0x10] - ldr r5, _023457C4 ; =0x02353538 + ldr r5, _023457C4 ; =ov29_02353538 mov r7, r4 str r4, [r6] _02345784: @@ -68,14 +68,14 @@ _02345784: add r7, r7, #1 cmp r7, #0x40 blt _02345784 - ldr r1, _023457C4 ; =0x02353538 + ldr r1, _023457C4 ; =ov29_02353538 mov r0, #1 ldr r1, [r1] add r1, r1, #0x3f00 strh r4, [r1, #0xc0] ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_023457C4: .word 0x02353538 +_023457C4: .word ov29_02353538 arm_func_end RemoveGroundItem arm_func_start ov29_023457C8 @@ -107,7 +107,7 @@ ov29_023457C8: ; 0x023457C8 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} _02345830: - ldr r0, _02345A20 ; =0x02353538 + ldr r0, _02345A20 ; =ov29_02353538 ldr r3, _02345A24 ; =0x0001A224 ldr r2, [r0] add r0, r3, #2 @@ -135,7 +135,7 @@ _02345830: cmp r8, r0 cmple sb, #0xe0 bgt _02345A18 - ldr r0, _02345A28 ; =0x0237C864 + ldr r0, _02345A28 ; =ov29_0237C864 cmp r6, #0 ldrh r1, [r0, #2] bic r1, r1, #0x3e00 @@ -159,11 +159,11 @@ _023458D8: cmp r6, #0 cmpne r6, #0x3b bne _0234592C - ldr r0, _02345A28 ; =0x0237C864 - ldr r1, _02345A2C ; =0x023537BC + ldr r0, _02345A28 ; =ov29_0237C864 + ldr r1, _02345A2C ; =ov29_023537BC ldrh r2, [r0, #2] ldrb r1, [r1, r5] - ldr r3, _02345A30 ; =0x023537B4 + ldr r3, _02345A30 ; =ov29_023537B4 bic r2, r2, #0x3e00 strh r2, [r0, #2] ldrh r2, [r0, #2] @@ -175,7 +175,7 @@ _0234592C: ldr r0, [r7, #0xb4] ldrsh r0, [r0, #4] bl sub_0200D1FC - ldr r1, _02345A28 ; =0x0237C864 + ldr r1, _02345A28 ; =ov29_0237C864 mov r0, r0, lsl #0x1c ldrh r2, [r1, #4] bic r2, r2, #0xf000 @@ -184,7 +184,7 @@ _0234592C: orr r0, r2, r0, lsr #16 strh r0, [r1, #4] _02345958: - ldr r1, _02345A28 ; =0x0237C864 + ldr r1, _02345A28 ; =ov29_0237C864 mov r2, r6, lsl #1 ldrh r5, [r1, #6] ldr r0, _02345A34 ; =0xFFFF000F @@ -226,8 +226,8 @@ _02345958: mov r2, sl orr r0, r0, r3 strh r0, [r1, #4] - ldr r0, _02345A38 ; =0x020AFC4C - ldr r1, _02345A28 ; =0x0237C864 + ldr r0, _02345A38 ; =_020AFC4C + ldr r1, _02345A28 ; =ov29_0237C864 ldr r0, [r0] bl sub_0201B9F8 mov r0, #1 @@ -236,13 +236,13 @@ _02345A18: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02345A20: .word 0x02353538 +_02345A20: .word ov29_02353538 _02345A24: .word 0x0001A224 -_02345A28: .word 0x0237C864 -_02345A2C: .word 0x023537BC -_02345A30: .word 0x023537B4 +_02345A28: .word ov29_0237C864 +_02345A2C: .word ov29_023537BC +_02345A30: .word ov29_023537B4 _02345A34: .word 0xFFFF000F -_02345A38: .word 0x020AFC4C +_02345A38: .word _020AFC4C arm_func_end ov29_023457C8 arm_func_start SpawnDroppedItemWrapper @@ -330,7 +330,7 @@ _02345B5C: strh r0, [sp, #0xc] ldrsh r0, [r8, #6] ldrh r1, [sp, #0xc] - ldr fp, _02345D68 ; =0x02351844 + ldr fp, _02345D68 ; =DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST strh r0, [sp, #0xe] ldrh r0, [sp, #0xe] strh r1, [sp, #8] @@ -388,7 +388,7 @@ _02345C44: mov r0, #0 mov r1, #0x40000 bl ov29_0234B084 - ldr r2, _02345D6C ; =0x023531BC + ldr r2, _02345D6C ; =ov29_023531BC mov r1, r7 mov r0, #0 bl sub_02024FE8 @@ -468,8 +468,8 @@ _02345D5C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02345D64: .word 0x00000BD8 -_02345D68: .word 0x02351844 -_02345D6C: .word 0x023531BC +_02345D68: .word DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST +_02345D6C: .word ov29_023531BC _02345D70: .word 0x00000BD9 _02345D74: .word 0x00000BDA _02345D78: .word 0x00000BDB @@ -487,7 +487,7 @@ ov29_02345D84: ; 0x02345D84 str r2, [sp, #4] mov sb, r3 bl GetTile - ldr r0, _02346048 ; =0x02353538 + ldr r0, _02346048 ; =ov29_02353538 mov r4, #0 ldr r0, [r0] ldr r1, _0234604C ; =SECONDARY_TERRAIN_TYPES @@ -501,7 +501,7 @@ ov29_02345D84: ; 0x02345D84 cmp r0, #1 ldrsh r0, [sl, #4] moveq r7, #1 - ldr r5, _02346050 ; =0x023518AC + ldr r5, _02346050 ; =DISPLACEMENTS_WITHIN_3 strh r0, [sp, #0x14] ldrsh r0, [sl, #6] ldrh r1, [sp, #0x14] @@ -548,7 +548,7 @@ _02345E00: cmp r2, #2 beq _02345F70 _02345E90: - ldr r0, _02346048 ; =0x02353538 + ldr r0, _02346048 ; =ov29_02353538 ldrsh r2, [sp, #0x14] ldr r3, [r0] mov r0, #0x18 @@ -615,7 +615,7 @@ _02345F7C: mov r0, #0 mov r1, #0x40000 bl ov29_0234B084 - ldr r2, _02346054 ; =0x023531BC + ldr r2, _02346054 ; =ov29_023531BC ldr r1, [sp, #4] mov r0, #0 bl sub_02024FE8 @@ -668,10 +668,10 @@ _02346040: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02346048: .word 0x02353538 +_02346048: .word ov29_02353538 _0234604C: .word SECONDARY_TERRAIN_TYPES -_02346050: .word 0x023518AC -_02346054: .word 0x023531BC +_02346050: .word DISPLACEMENTS_WITHIN_3 +_02346054: .word ov29_023531BC _02346058: .word 0x00000B74 _0234605C: .word 0x00000B75 arm_func_end ov29_02345D84 @@ -690,7 +690,7 @@ TryGenerateUnownStoneDrop: ; 0x02346060 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _023460D8 ; =0x022C4474 + ldr r0, _023460D8 ; =ov10_022C4474 ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -709,7 +709,7 @@ TryGenerateUnownStoneDrop: ; 0x02346060 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023460D8: .word 0x022C4474 +_023460D8: .word ov10_022C4474 arm_func_end TryGenerateUnownStoneDrop arm_func_start ov29_023460DC @@ -746,7 +746,7 @@ _0234613C: bl GetTreasureBoxChances cmp r5, #0 ble _02346184 - ldr r1, _02346338 ; =0x022C48EC + ldr r1, _02346338 ; =ov10_022C48EC mov lr, #0 add r3, sp, #0 _02346160: @@ -803,7 +803,7 @@ _023461FC: beq _02346230 mov r0, #0x64 bl DungeonRandInt - ldr r1, _0234633C ; =0x022C44C8 + ldr r1, _0234633C ; =ov10_022C44C8 ldrsh r1, [r1] cmp r1, r0 movlt r5, #1 @@ -811,7 +811,7 @@ _02346230: cmp r5, #0 movne r5, #0x67 bne _02346310 - ldr r0, _02346340 ; =0x02353538 + ldr r0, _02346340 ; =ov29_02353538 ldr r0, [r0] add r5, r0, #0x348 add r0, r5, #0x400 @@ -833,7 +833,7 @@ _0234626C: movs r5, r0 mov r4, #1 bne _02346310 - ldr r0, _02346340 ; =0x02353538 + ldr r0, _02346340 ; =ov29_02353538 ldr r0, [r0] ldr r0, [r0, #0x7cc] cmp r0, #0 @@ -853,7 +853,7 @@ _023462C8: movs r5, r0 mov r4, #2 bne _02346310 - ldr r0, _02346340 ; =0x02353538 + ldr r0, _02346340 ; =ov29_02353538 ldr r0, [r0] ldr r0, [r0, #0x7cc] cmp r0, #0 @@ -879,9 +879,9 @@ _02346330: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02346338: .word 0x022C48EC -_0234633C: .word 0x022C44C8 -_02346340: .word 0x02353538 +_02346338: .word ov10_022C48EC +_0234633C: .word ov10_022C44C8 +_02346340: .word ov29_02353538 arm_func_end ov29_023460DC arm_func_start ov29_02346344 @@ -1069,7 +1069,7 @@ _023465E4: mov r0, #0 mov r1, #0x40000 bl ov29_0234B084 - ldr r2, _023467D4 ; =0x023531BC + ldr r2, _023467D4 ; =ov29_023531BC mov r1, sl mov r0, #0 bl sub_02024FE8 @@ -1087,7 +1087,7 @@ _02346614: ldr r0, [sp, #4] bl LogMessageByIdWithPopupCheckUser _0234662C: - ldr r0, _023467E0 ; =0x02353538 + ldr r0, _023467E0 ; =ov29_02353538 mov r6, #0 ldr r0, [r0] mov fp, r6 @@ -1170,7 +1170,7 @@ _02346724: mov r0, fp mov r1, #0x40000 bl ov29_0234B084 - ldr r2, _023467D4 ; =0x023531BC + ldr r2, _023467D4 ; =ov29_023531BC mov r0, #0 mov r1, sl bl sub_02024FE8 @@ -1203,10 +1203,10 @@ _023467C4: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _023467D0: .word 0x00000BDD -_023467D4: .word 0x023531BC +_023467D4: .word ov29_023531BC _023467D8: .word 0x00000BDC _023467DC: .word 0x00000BDE -_023467E0: .word 0x02353538 +_023467E0: .word ov29_02353538 arm_func_end ov29_02346344 arm_func_start HasHeldItem @@ -1241,7 +1241,7 @@ GenerateMoneyQuantity: ; 0x02346834 mov r4, r1 bl DungeonRandInt mov r3, #0 - ldr r2, _02346884 ; =0x020A1F20 + ldr r2, _02346884 ; =MONEY_QUANTITY_TABLE b _02346870 _02346854: ldr r1, [r2, r0, lsl #2] @@ -1258,19 +1258,19 @@ _02346870: strh r0, [r5, #2] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02346884: .word 0x020A1F20 +_02346884: .word MONEY_QUANTITY_TABLE arm_func_end GenerateMoneyQuantity arm_func_start ov29_02346888 ov29_02346888: ; 0x02346888 stmdb sp!, {r3, r4, lr} sub sp, sp, #4 - ldr r1, _023468F8 ; =0x02353538 + ldr r1, _023468F8 ; =ov29_02353538 mov r0, #7 ldr r1, [r1] ldrb r4, [r1, #0xc] bl IsCurrentMissionType - ldr r1, _023468F8 ; =0x02353538 + ldr r1, _023468F8 ; =ov29_02353538 mov r0, #0 ldr r2, [r1] strb r0, [r2, #0xc] @@ -1293,7 +1293,7 @@ _023468F0: add sp, sp, #4 ldmia sp!, {r3, r4, pc} .align 2, 0 -_023468F8: .word 0x02353538 +_023468F8: .word ov29_02353538 arm_func_end ov29_02346888 arm_func_start ov29_023468FC @@ -1316,7 +1316,7 @@ ov29_023468FC: ; 0x023468FC mov r6, r7 mov r5, r7 mov fp, r7 - ldr r4, _023469DC ; =0x02353538 + ldr r4, _023469DC ; =ov29_02353538 b _023469C4 _0234694C: ldr r0, [r4] @@ -1359,7 +1359,7 @@ _023469D4: mov r0, #1 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023469DC: .word 0x02353538 +_023469DC: .word ov29_02353538 arm_func_end ov29_023468FC arm_func_start ov29_023469E0 @@ -1406,7 +1406,7 @@ _02346A60: .word BAG_ITEMS_PTR_MIRROR ov29_02346A64: ; 0x02346A64 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r4, #0 - ldr r5, _02346BD0 ; =0x02353538 + ldr r5, _02346BD0 ; =ov29_02353538 mov r7, #0x55 mov r6, r4 _02346A78: @@ -1502,7 +1502,7 @@ _02346BB8: bl ov29_022FB920 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02346BD0: .word 0x02353538 +_02346BD0: .word ov29_02353538 _02346BD4: .word BAG_ITEMS_PTR_MIRROR arm_func_end ov29_02346A64 @@ -1540,7 +1540,7 @@ _02346C30: mov r4, #0 mov r7, r4 mov r8, #1 - ldr r6, _02346CB8 ; =0x02353538 + ldr r6, _02346CB8 ; =ov29_02353538 b _02346CA4 _02346C54: ldr r0, [r6] @@ -1571,7 +1571,7 @@ _02346CA4: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _02346CB4: .word BAG_ITEMS_PTR_MIRROR -_02346CB8: .word 0x02353538 +_02346CB8: .word ov29_02353538 arm_func_end CheckTeamItemsFlags arm_func_start ov29_02346CBC @@ -1733,7 +1733,7 @@ ov29_02346EBC: ; 0x02346EBC ldrb r1, [r0, #6] cmp r1, #0 bne _02346F04 - ldr r1, _02346F0C ; =0x02353538 + ldr r1, _02346F0C ; =ov29_02353538 mov r3, #0 ldr r1, [r1] add r1, r1, #0x3f4 @@ -1743,7 +1743,7 @@ _02346EE0: add r1, r3, r3, lsl #3 add r1, r2, r1, lsl #6 cmp r1, r0 - ldreq r0, _02346F10 ; =0x023531C8 + ldreq r0, _02346F10 ; =ov29_023531C8 ldreqb r0, [r0, r3] bxeq lr add r3, r3, #1 @@ -1754,8 +1754,8 @@ _02346F04: mov r0, #0 bx lr .align 2, 0 -_02346F0C: .word 0x02353538 -_02346F10: .word 0x023531C8 +_02346F0C: .word ov29_02353538 +_02346F10: .word ov29_023531C8 arm_func_end ov29_02346EBC arm_func_start AddHeldItemToBag @@ -1809,7 +1809,7 @@ _02346FB4: .word BAG_ITEMS_PTR_MIRROR arm_func_start ov29_02346FB8 ov29_02346FB8: ; 0x02346FB8 - ldr r1, _02346FFC ; =0x02353538 + ldr r1, _02346FFC ; =ov29_02353538 mov r3, #0 ldr r1, [r1] add r1, r1, #0x56 @@ -1830,12 +1830,12 @@ _02346FEC: movne r0, r3 bx lr .align 2, 0 -_02346FFC: .word 0x02353538 +_02346FFC: .word ov29_02353538 arm_func_end ov29_02346FB8 arm_func_start ov29_02347000 ov29_02347000: ; 0x02347000 - ldr r1, _0234702C ; =0x022C4CD8 + ldr r1, _0234702C ; =ov10_022C4CD8 b _02347018 _02347008: cmp r0, r2 @@ -1849,7 +1849,7 @@ _02347018: mov r0, #0 bx lr .align 2, 0 -_0234702C: .word 0x022C4CD8 +_0234702C: .word ov10_022C4CD8 arm_func_end ov29_02347000 arm_func_start RemoveEmptyItemsInBagWrapper @@ -1864,7 +1864,7 @@ RemoveEmptyItemsInBagWrapper: ; 0x02347030 ov29_02347040: ; 0x02347040 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov r8, #0 - ldr r5, _023470F8 ; =0x02353538 + ldr r5, _023470F8 ; =ov29_02353538 ldr r6, _023470FC ; =BAG_ITEMS_PTR_MIRROR mov fp, r8 mov r7, #1 @@ -1912,7 +1912,7 @@ _023470E8: blt _0234705C ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023470F8: .word 0x02353538 +_023470F8: .word ov29_02353538 _023470FC: .word BAG_ITEMS_PTR_MIRROR arm_func_end ov29_02347040 @@ -2024,7 +2024,7 @@ _02347224: ldrb r1, [r3, #1] cmp r1, #0 beq _023472B4 - ldr r0, _023472C0 ; =0x02353538 + ldr r0, _023472C0 ; =ov29_02353538 sub r1, r1, #1 ldr r0, [r0] add r1, r1, r1, lsl #3 @@ -2045,7 +2045,7 @@ _023472B8: add sp, sp, #0xc8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023472C0: .word 0x02353538 +_023472C0: .word ov29_02353538 arm_func_end ov29_02347184 arm_func_start GenerateItem @@ -2065,7 +2065,7 @@ GenerateItem: ; 0x023472C4 bne _0234731C mov r0, #0x64 bl DungeonRandInt - ldr r1, _02347374 ; =0x02353538 + ldr r1, _02347374 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x28000 ldrb r1, [r1, #0x6bc] @@ -2084,7 +2084,7 @@ _02347324: bl GetItemCategoryVeneer cmp r0, #6 ldmneia sp!, {r3, r4, r5, r6, r7, pc} - ldr r0, _02347374 ; =0x02353538 + ldr r0, _02347374 ; =ov29_02353538 ldr r1, [r0] ldr r0, [r1, #0x7cc] cmp r0, #0 @@ -2097,14 +2097,14 @@ _02347324: bl GenerateMoneyQuantity ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02347374: .word 0x02353538 +_02347374: .word ov29_02353538 arm_func_end GenerateItem arm_func_start ov29_02347378 ov29_02347378: ; 0x02347378 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x14 - ldr r3, _02347514 ; =0x02353538 + ldr r3, _02347514 ; =ov29_02353538 mov sl, r0 ldr r0, [r3] cmp r2, #0 @@ -2213,14 +2213,14 @@ _02347504: add sp, sp, #0x14 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02347514: .word 0x02353538 +_02347514: .word ov29_02353538 arm_func_end ov29_02347378 arm_func_start ov29_02347518 ov29_02347518: ; 0x02347518 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x248 - ldr r4, _02347B3C ; =0x02353538 + ldr r4, _02347B3C ; =ov29_02353538 mov sl, r0 ldr r4, [r4] mov r6, #3 @@ -2300,7 +2300,7 @@ _023475E8: str r0, [sp, #0x10] ldrsh r0, [sp, #0x44] str r0, [sp, #0xc] - ldr r0, _02347B44 ; =0x023516FC + ldr r0, _02347B44 ; =ov29_023516FC add r0, r0, sb, lsl #2 str r0, [sp, #0x28] b _023476B4 @@ -2640,9 +2640,9 @@ _02347B34: add sp, sp, #0x248 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02347B3C: .word 0x02353538 +_02347B3C: .word ov29_02353538 _02347B40: .word DIRECTIONS_XY -_02347B44: .word 0x023516FC +_02347B44: .word ov29_023516FC _02347B48: .word 0x00000BE1 _02347B4C: .word 0x00000BE5 arm_func_end ov29_02347518 diff --git a/asm/overlay_29_023498A0.s b/asm/overlay_29_023498A0.s index d3635bdb..ca9117fd 100644 --- a/asm/overlay_29_023498A0.s +++ b/asm/overlay_29_023498A0.s @@ -137,7 +137,7 @@ _02349A6C: .word 0x00000418 ov29_02349A70: ; 0x02349A70 stmdb sp!, {r4, r5, r6, lr} mov r5, #0 - ldr r4, _02349AD0 ; =0x02353538 + ldr r4, _02349AD0 ; =ov29_02353538 b _02349AC0 _02349A80: ldr r0, [r4] @@ -163,13 +163,13 @@ _02349AC0: mov r0, #0 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02349AD0: .word 0x02353538 +_02349AD0: .word ov29_02353538 arm_func_end ov29_02349A70 arm_func_start ov29_02349AD4 ov29_02349AD4: ; 0x02349AD4 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _02349C80 ; =0x02353538 + ldr r2, _02349C80 ; =ov29_02353538 mov r5, r0 ldr r2, [r2] mov r4, r1 @@ -286,7 +286,7 @@ _02349C78: bl ov29_022E8244 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02349C80: .word 0x02353538 +_02349C80: .word ov29_02353538 arm_func_end ov29_02349AD4 arm_func_start ov29_02349C84 @@ -298,7 +298,7 @@ ov29_02349C84: ; 0x02349C84 moveq r0, #0 beq _0234A1F8 bl GetMissionDestination - ldr r1, _0234A200 ; =0x023537C8 + ldr r1, _0234A200 ; =ov29_023537C8 mov r2, #0 mov r4, r0 str r2, [r1] @@ -409,7 +409,7 @@ _02349DC8: mov r1, #0 ldrsh r0, [r0, #2] bl ov29_02348888 - ldr r2, _0234A21C ; =0x02353538 + ldr r2, _0234A21C ; =ov29_02353538 ldr r3, _0234A220 ; =0x00000E33 ldr r2, [r2] mov r0, r5 @@ -454,7 +454,7 @@ _02349E6C: mov r1, #0 ldrsh r0, [r0, #2] bl ov29_02348888 - ldr r2, _0234A21C ; =0x02353538 + ldr r2, _0234A21C ; =ov29_02353538 ldr r3, _0234A220 ; =0x00000E33 ldr r2, [r2] mov r0, r5 @@ -654,7 +654,7 @@ _0234A1D4: mov r0, #0 mov r1, r0 bl ov29_022EA428 - ldr r0, _0234A200 ; =0x023537C8 + ldr r0, _0234A200 ; =ov29_023537C8 ldr r0, [r0] cmp r0, #0 beq _0234A1F4 @@ -665,14 +665,14 @@ _0234A1F8: add sp, sp, #0xa0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234A200: .word 0x023537C8 +_0234A200: .word ov29_023537C8 _0234A204: .word 0x00000E11 _0234A208: .word 0x00000E04 _0234A20C: .word 0x00000E34 _0234A210: .word 0x00000E35 _0234A214: .word 0x00000E31 _0234A218: .word 0x00000E32 -_0234A21C: .word 0x02353538 +_0234A21C: .word ov29_02353538 _0234A220: .word 0x00000E33 _0234A224: .word 0x00000E0A _0234A228: .word 0x00000E0B @@ -823,7 +823,7 @@ _0234A40C: ldrb r1, [r0, #1] cmp r1, #0 beq _0234A47C - ldr r0, _0234A5C0 ; =0x02353538 + ldr r0, _0234A5C0 ; =ov29_02353538 sub r1, r1, #1 ldr r0, [r0] add r0, r0, r1, lsl #2 @@ -910,7 +910,7 @@ _0234A570: ldrsh r0, [sb, #2] mov r1, #0 bl ov29_02348888 - ldr r1, _0234A5C0 ; =0x02353538 + ldr r1, _0234A5C0 ; =ov29_02353538 mov r0, sl ldr r1, [r1] mov r3, r4 @@ -929,7 +929,7 @@ _0234A5B0: .word 0x00000E27 _0234A5B4: .word 0x00000E21 _0234A5B8: .word BAG_ITEMS_PTR_MIRROR _0234A5BC: .word 0x00000E26 -_0234A5C0: .word 0x02353538 +_0234A5C0: .word ov29_02353538 _0234A5C4: .word 0x00000E1D _0234A5C8: .word 0x00000E1E _0234A5CC: .word 0x00000E1F @@ -1020,7 +1020,7 @@ _0234A6B8: ldrsh r0, [r6, #2] mov r1, #0 bl ov29_02348888 - ldr r2, _0234A75C ; =0x02353538 + ldr r2, _0234A75C ; =ov29_02353538 ldr r3, _0234A760 ; =0x00000E2B ldr r2, [r2] mov r0, r4 @@ -1042,7 +1042,7 @@ _0234A74C: .word 0x00000E2C _0234A750: .word 0x00000E28 _0234A754: .word 0x00000E29 _0234A758: .word 0x00000E2A -_0234A75C: .word 0x02353538 +_0234A75C: .word ov29_02353538 _0234A760: .word 0x00000E2B arm_func_end ov29_0234A5E4 @@ -1120,7 +1120,7 @@ _0234A84C: bl ov29_02348888 cmp r4, #0 beq _0234A890 - ldr r0, _0234A8B4 ; =0x02353538 + ldr r0, _0234A8B4 ; =ov29_02353538 ldr r3, _0234A8B8 ; =0x00000E44 ldr r1, [r0] mov r0, r5 @@ -1142,7 +1142,7 @@ _0234A8A4: .align 2, 0 _0234A8AC: .word 0x00000E14 _0234A8B0: .word 0x00000E18 -_0234A8B4: .word 0x02353538 +_0234A8B4: .word ov29_02353538 _0234A8B8: .word 0x00000E44 arm_func_end ov29_0234A790 @@ -1257,7 +1257,7 @@ _0234A9DC: mov r0, #0 mov r1, r0 bl ov29_02348888 - ldr r2, _0234AA90 ; =0x02353538 + ldr r2, _0234AA90 ; =ov29_02353538 ldr r3, _0234AA94 ; =0x00000E3A ldr r2, [r2] mov r0, r5 @@ -1276,7 +1276,7 @@ _0234AA80: .word 0x00000E39 _0234AA84: .word 0x00000E36 _0234AA88: .word 0x00000E37 _0234AA8C: .word 0x00000E38 -_0234AA90: .word 0x02353538 +_0234AA90: .word ov29_02353538 _0234AA94: .word 0x00000E3A arm_func_end ov29_0234A980 @@ -1335,7 +1335,7 @@ _0234AAC4: mov r1, r0 mov r0, #0 bl ov29_02348888 - ldr r2, _0234ABA8 ; =0x02353538 + ldr r2, _0234ABA8 ; =ov29_02353538 ldr r3, _0234ABAC ; =0x00000E42 ldr r2, [r2] mov r0, r4 @@ -1353,7 +1353,7 @@ _0234AB94: _0234AB9C: .word 0x00000E2D _0234ABA0: .word 0x00000E3F _0234ABA4: .word 0x00000E41 -_0234ABA8: .word 0x02353538 +_0234ABA8: .word ov29_02353538 _0234ABAC: .word 0x00000E42 arm_func_end ov29_0234AA98 @@ -1379,7 +1379,7 @@ ov29_0234ABB0: ; 0x0234ABB0 bl IsJirachiChallengeFloor cmp r0, #0 bne _0234AC40 - ldr r0, _0234AC84 ; =0x02353538 + ldr r0, _0234AC84 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x790] cmp r0, #0 @@ -1387,7 +1387,7 @@ ov29_0234ABB0: ; 0x0234ABB0 bl ov29_022EAEFC cmp r0, #0 beq _0234AC38 - ldr r0, _0234AC84 ; =0x02353538 + ldr r0, _0234AC84 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd6] @@ -1417,7 +1417,7 @@ _0234AC70: ldmia sp!, {r4, pc} .align 2, 0 _0234AC80: .word 0x00000E13 -_0234AC84: .word 0x02353538 +_0234AC84: .word ov29_02353538 _0234AC88: .word 0x00000E43 arm_func_end ov29_0234ABB0 @@ -1571,14 +1571,14 @@ ov29_0234AE40: ; 0x0234AE40 mov r2, #1 bl DisplayMessage ldr r1, _0234AE9C ; =ov29_0234AEA4 - ldr r0, _0234AEA0 ; =0x023537C8 + ldr r0, _0234AEA0 ; =ov29_023537C8 str r1, [r0] add sp, sp, #0x10 ldmia sp!, {r4, pc} .align 2, 0 _0234AE98: .word 0x00000E06 _0234AE9C: .word ov29_0234AEA4 -_0234AEA0: .word 0x023537C8 +_0234AEA0: .word ov29_023537C8 arm_func_end ov29_0234AE40 arm_func_start ov29_0234AEA4 @@ -1605,7 +1605,7 @@ ov29_0234AEA4: ; 0x0234AEA4 arm_func_start ov29_0234AEE8 ov29_0234AEE8: ; 0x0234AEE8 stmdb sp!, {r3, lr} - ldr r0, _0234AF30 ; =0x02353538 + ldr r0, _0234AF30 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x790] cmp r0, #0 @@ -1613,7 +1613,7 @@ ov29_0234AEE8: ; 0x0234AEE8 bl ov29_022EAEFC cmp r0, #0 beq _0234AF24 - ldr r0, _0234AF30 ; =0x02353538 + ldr r0, _0234AF30 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x4000 ldrsh r0, [r0, #0xd6] @@ -1624,7 +1624,7 @@ _0234AF24: bl ov29_022EAF34 ldmia sp!, {r3, pc} .align 2, 0 -_0234AF30: .word 0x02353538 +_0234AF30: .word ov29_02353538 arm_func_end ov29_0234AEE8 arm_func_start ov29_0234AF34 @@ -1668,127 +1668,127 @@ ov29_0234AFA4: ; 0x0234AFA4 mov r0, #0xcf0 mov r1, #0 bl MemAlloc - ldr r2, _0234AFCC ; =0x023537CC + ldr r2, _0234AFCC ; =ov29_023537CC mov r1, #0xcf0 str r0, [r2, #4] bl MemZero bl ov29_0234B130 ldmia sp!, {r3, pc} .align 2, 0 -_0234AFCC: .word 0x023537CC +_0234AFCC: .word ov29_023537CC arm_func_end ov29_0234AFA4 arm_func_start ov29_0234AFD0 ov29_0234AFD0: ; 0x0234AFD0 stmdb sp!, {r3, lr} - ldr r0, _0234AFF8 ; =0x023537CC + ldr r0, _0234AFF8 ; =ov29_023537CC ldr r0, [r0, #4] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _0234AFF8 ; =0x023537CC + ldr r0, _0234AFF8 ; =ov29_023537CC mov r1, #0 str r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_0234AFF8: .word 0x023537CC +_0234AFF8: .word ov29_023537CC arm_func_end ov29_0234AFD0 arm_func_start ov29_0234AFFC ov29_0234AFFC: ; 0x0234AFFC - ldr r1, _0234B00C ; =0x023537CC + ldr r1, _0234B00C ; =ov29_023537CC ldr r1, [r1, #4] strb r0, [r1, #0xced] bx lr .align 2, 0 -_0234B00C: .word 0x023537CC +_0234B00C: .word ov29_023537CC arm_func_end ov29_0234AFFC arm_func_start ov29_0234B010 ov29_0234B010: ; 0x0234B010 - ldr r1, _0234B020 ; =0x023537CC + ldr r1, _0234B020 ; =ov29_023537CC ldr r1, [r1, #4] strb r0, [r1, #0xcee] bx lr .align 2, 0 -_0234B020: .word 0x023537CC +_0234B020: .word ov29_023537CC arm_func_end ov29_0234B010 arm_func_start ov29_0234B024 ov29_0234B024: ; 0x0234B024 - ldr r1, _0234B030 ; =0x023537CC + ldr r1, _0234B030 ; =ov29_023537CC strb r0, [r1] bx lr .align 2, 0 -_0234B030: .word 0x023537CC +_0234B030: .word ov29_023537CC arm_func_end ov29_0234B024 arm_func_start ov29_0234B034 ov29_0234B034: ; 0x0234B034 - ldr r0, _0234B048 ; =0x023537CC + ldr r0, _0234B048 ; =ov29_023537CC ldr r0, [r0, #4] add r0, r0, #0x9c add r0, r0, #0xc00 bx lr .align 2, 0 -_0234B048: .word 0x023537CC +_0234B048: .word ov29_023537CC arm_func_end ov29_0234B034 arm_func_start ov29_0234B04C ov29_0234B04C: ; 0x0234B04C - ldr r0, _0234B064 ; =0x023537CC + ldr r0, _0234B064 ; =ov29_023537CC ldr ip, _0234B068 ; =InitPreprocessorArgs ldr r0, [r0, #4] add r0, r0, #0x9c add r0, r0, #0xc00 bx ip .align 2, 0 -_0234B064: .word 0x023537CC +_0234B064: .word ov29_023537CC _0234B068: .word InitPreprocessorArgs arm_func_end ov29_0234B04C arm_func_start ov29_0234B06C ov29_0234B06C: ; 0x0234B06C - ldr r2, _0234B080 ; =0x023537CC + ldr r2, _0234B080 ; =ov29_023537CC ldr r2, [r2, #4] add r0, r2, r0, lsl #2 str r1, [r0, #0xc9c] bx lr .align 2, 0 -_0234B080: .word 0x023537CC +_0234B080: .word ov29_023537CC arm_func_end ov29_0234B06C arm_func_start ov29_0234B084 ov29_0234B084: ; 0x0234B084 - ldr r2, _0234B098 ; =0x023537CC + ldr r2, _0234B098 ; =ov29_023537CC ldr r2, [r2, #4] add r0, r2, r0, lsl #2 str r1, [r0, #0xcac] bx lr .align 2, 0 -_0234B098: .word 0x023537CC +_0234B098: .word ov29_023537CC arm_func_end ov29_0234B084 arm_func_start ov29_0234B09C ov29_0234B09C: ; 0x0234B09C - ldr r2, _0234B0B0 ; =0x023537CC + ldr r2, _0234B0B0 ; =ov29_023537CC ldr r2, [r2, #4] add r0, r2, r0, lsl #2 str r1, [r0, #0xcc0] bx lr .align 2, 0 -_0234B0B0: .word 0x023537CC +_0234B0B0: .word ov29_023537CC arm_func_end ov29_0234B09C arm_func_start ov29_0234B0B4 ov29_0234B0B4: ; 0x0234B0B4 - ldr r2, _0234B0C8 ; =0x023537CC + ldr r2, _0234B0C8 ; =ov29_023537CC ldr r2, [r2, #4] add r0, r2, r0, lsl #2 str r1, [r0, #0xcd4] bx lr .align 2, 0 -_0234B0C8: .word 0x023537CC +_0234B0C8: .word ov29_023537CC arm_func_end ov29_0234B0B4 arm_func_start ov29_0234B0CC @@ -1801,41 +1801,41 @@ ov29_0234B0CC: ; 0x0234B0CC mov r2, #0x4e mov r4, r0 bl GetName - ldr r0, _0234B100 ; =0x023537CC + ldr r0, _0234B100 ; =ov29_023537CC ldr r0, [r0, #4] add r0, r0, r5, lsl #2 str r4, [r0, #0xcd4] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234B100: .word 0x023537CC +_0234B100: .word ov29_023537CC arm_func_end ov29_0234B0CC arm_func_start ov29_0234B104 ov29_0234B104: ; 0x0234B104 - ldr r1, _0234B114 ; =0x023537CC + ldr r1, _0234B114 ; =ov29_023537CC ldr r1, [r1, #4] str r0, [r1, #0xce8] bx lr .align 2, 0 -_0234B114: .word 0x023537CC +_0234B114: .word ov29_023537CC arm_func_end ov29_0234B104 arm_func_start ov29_0234B118 ov29_0234B118: ; 0x0234B118 - ldr r1, _0234B12C ; =0x023537CC + ldr r1, _0234B12C ; =ov29_023537CC orr r2, r0, #0x30000 ldr r0, [r1, #4] str r2, [r0, #0xce8] bx lr .align 2, 0 -_0234B12C: .word 0x023537CC +_0234B12C: .word ov29_023537CC arm_func_end ov29_0234B118 arm_func_start ov29_0234B130 ov29_0234B130: ; 0x0234B130 stmdb sp!, {r3, lr} mov r3, #0 - ldr r1, _0234B1A0 ; =0x023537CC + ldr r1, _0234B1A0 ; =ov29_023537CC mov r0, r3 _0234B140: ldr r2, [r1, #4] @@ -1844,7 +1844,7 @@ _0234B140: strb r0, [r2, #0xc80] cmp r3, #0xa blt _0234B140 - ldr r1, _0234B1A0 ; =0x023537CC + ldr r1, _0234B1A0 ; =ov29_023537CC mvn ip, #1 ldr r3, [r1, #4] mov r2, #1 @@ -1856,14 +1856,14 @@ _0234B140: str r0, [r1, #8] strb r2, [r1] bl ov29_0234B1A4 - ldr r0, _0234B1A0 ; =0x023537CC + ldr r0, _0234B1A0 ; =ov29_023537CC ldr r0, [r0, #4] add r0, r0, #0x9c add r0, r0, #0xc00 bl InitPreprocessorArgs ldmia sp!, {r3, pc} .align 2, 0 -_0234B1A0: .word 0x023537CC +_0234B1A0: .word ov29_023537CC arm_func_end ov29_0234B130 arm_func_start ov29_0234B1A4 @@ -1874,7 +1874,7 @@ ov29_0234B1A4: ; 0x0234B1A4 cmp r0, #0 ldmeqia sp!, {r4, pc} mov ip, #0 - ldr r2, _0234B24C ; =0x023537CC + ldr r2, _0234B24C ; =ov29_023537CC mov r0, ip _0234B1C4: ldr r3, [r2, #4] @@ -1883,7 +1883,7 @@ _0234B1C4: strb r0, [r3, r1, lsl #6] cmp ip, #0xa blt _0234B1C4 - ldr r2, _0234B24C ; =0x023537CC + ldr r2, _0234B24C ; =ov29_023537CC mov r3, #4 ldr r1, [r2, #4] strb r0, [r1, #0xc8b] @@ -1912,13 +1912,13 @@ _0234B1C4: bl AdvanceFrame ldmia sp!, {r4, pc} .align 2, 0 -_0234B24C: .word 0x023537CC +_0234B24C: .word ov29_023537CC arm_func_end ov29_0234B1A4 arm_func_start LogMessageByIdWithPopupCheckParticipants LogMessageByIdWithPopupCheckParticipants: ; 0x0234B250 stmdb sp!, {r3, lr} - ldr ip, _0234B290 ; =0x023537CC + ldr ip, _0234B290 ; =ov29_023537CC cmp r1, #0 ldr ip, [ip, #4] ldrsh lr, [sp, #8] @@ -1935,7 +1935,7 @@ _0234B27C: bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, pc} .align 2, 0 -_0234B290: .word 0x023537CC +_0234B290: .word ov29_023537CC arm_func_end LogMessageByIdWithPopupCheckParticipants arm_func_start ov29_0234B294 @@ -2129,39 +2129,39 @@ _0234B4C8: .word LogMessage arm_func_start ov29_0234B4CC ov29_0234B4CC: ; 0x0234B4CC - ldr r1, _0234B4DC ; =0x023537CC + ldr r1, _0234B4DC ; =ov29_023537CC ldr r1, [r1, #4] strb r0, [r1, #0xc8a] bx lr .align 2, 0 -_0234B4DC: .word 0x023537CC +_0234B4DC: .word ov29_023537CC arm_func_end ov29_0234B4CC arm_func_start ov29_0234B4E0 ov29_0234B4E0: ; 0x0234B4E0 - ldr r0, _0234B4F0 ; =0x023537CC + ldr r0, _0234B4F0 ; =ov29_023537CC ldr r0, [r0, #4] ldrb r0, [r0, #0xc8b] bx lr .align 2, 0 -_0234B4F0: .word 0x023537CC +_0234B4F0: .word ov29_023537CC arm_func_end ov29_0234B4E0 arm_func_start ov29_0234B4F4 ov29_0234B4F4: ; 0x0234B4F4 - ldr r0, _0234B504 ; =0x023537CC + ldr r0, _0234B504 ; =ov29_023537CC ldr r0, [r0, #4] ldr r0, [r0, #0xc98] bx lr .align 2, 0 -_0234B504: .word 0x023537CC +_0234B504: .word ov29_023537CC arm_func_end ov29_0234B4F4 arm_func_start LogMessage LogMessage: ; 0x0234B508 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x284 - ldr r4, _0234B708 ; =0x023537CC + ldr r4, _0234B708 ; =ov29_023537CC mov fp, r2 ldr r3, [r4, #4] ldrb r2, [r3, #0xced] @@ -2169,7 +2169,7 @@ LogMessage: ; 0x0234B508 ldreqb r2, [r3, #0xcee] cmpeq r2, #0 bne _0234B700 - ldr r3, _0234B70C ; =0x02353538 + ldr r3, _0234B70C ; =ov29_02353538 mov r7, #0 ldr r2, [r3] mvn r5, #0 @@ -2184,7 +2184,7 @@ LogMessage: ; 0x0234B508 cmp r2, r0 movne sl, #1 ldreqb sl, [r4] - ldr r2, _0234B708 ; =0x023537CC + ldr r2, _0234B708 ; =ov29_023537CC mov r6, #1 str r0, [r2, #8] strb r7, [r2] @@ -2196,7 +2196,7 @@ LogMessage: ; 0x0234B508 mov r1, #0x140 str r4, [sp] bl PreprocessString - ldr r4, _0234B708 ; =0x023537CC + ldr r4, _0234B708 ; =ov29_023537CC add r5, sp, #0x144 _0234B5A4: ldr r0, [r4, #4] @@ -2234,13 +2234,13 @@ _0234B5D8: strb r2, [r1, r0] cmp sb, #0 beq _0234B660 - ldr r1, _0234B710 ; =0x02353214 + ldr r1, _0234B710 ; =ov29_02353214 add r0, r5, r8 mov r2, #3 bl strncmp cmp r0, #0 bne _0234B654 - ldr r0, _0234B710 ; =0x02353214 + ldr r0, _0234B710 ; =ov29_02353214 bl strlen add r8, r8, r0 b _0234B660 @@ -2281,7 +2281,7 @@ _0234B660: _0234B6D4: cmp r7, #0 beq _0234B700 - ldr r0, _0234B708 ; =0x023537CC + ldr r0, _0234B708 ; =ov29_023537CC mov r2, #0xf0 strh r2, [r1, #0x90] ldr r1, [r0, #4] @@ -2294,9 +2294,9 @@ _0234B700: add sp, sp, #0x284 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0234B708: .word 0x023537CC -_0234B70C: .word 0x02353538 -_0234B710: .word 0x02353214 +_0234B708: .word ov29_023537CC +_0234B70C: .word ov29_02353538 +_0234B710: .word ov29_02353214 arm_func_end LogMessage arm_func_start LogMessageById @@ -2315,7 +2315,7 @@ LogMessageById: ; 0x0234B714 arm_func_start ov29_0234B73C ov29_0234B73C: ; 0x0234B73C - ldr r0, _0234B764 ; =0x023537CC + ldr r0, _0234B764 ; =ov29_023537CC mvn r1, #1 ldr r0, [r0, #4] add r0, r0, #0xc00 @@ -2326,13 +2326,13 @@ ov29_0234B73C: ; 0x0234B73C and r0, r0, #0xff bx lr .align 2, 0 -_0234B764: .word 0x023537CC +_0234B764: .word ov29_023537CC arm_func_end ov29_0234B73C arm_func_start ov29_0234B768 ov29_0234B768: ; 0x0234B768 stmdb sp!, {r3, lr} - ldr r0, _0234B7E8 ; =0x023537CC + ldr r0, _0234B7E8 ; =ov29_023537CC mvn r1, #1 ldr r0, [r0, #4] add r0, r0, #0xc00 @@ -2344,17 +2344,17 @@ ov29_0234B768: ; 0x0234B768 moveq r0, #0 ldmeqia sp!, {r3, pc} bl sub_0202836C - ldr r0, _0234B7E8 ; =0x023537CC + ldr r0, _0234B7E8 ; =ov29_023537CC ldr r0, [r0, #4] add r0, r0, #0xc00 ldrsb r0, [r0, #0xec] bl sub_02030214 - ldr r0, _0234B7E8 ; =0x023537CC + ldr r0, _0234B7E8 ; =ov29_023537CC ldr r0, [r0, #4] add r0, r0, #0xc00 ldrsb r0, [r0, #0xec] bl sub_02030044 - ldr r0, _0234B7E8 ; =0x023537CC + ldr r0, _0234B7E8 ; =ov29_023537CC mvn r3, #1 ldr r1, [r0, #4] mov r2, #0 @@ -2364,13 +2364,13 @@ ov29_0234B768: ; 0x0234B768 str r2, [r1, #0xc98] ldmia sp!, {r3, pc} .align 2, 0 -_0234B7E8: .word 0x023537CC +_0234B7E8: .word ov29_023537CC arm_func_end ov29_0234B768 arm_func_start ov29_0234B7EC ov29_0234B7EC: ; 0x0234B7EC stmdb sp!, {r3, lr} - ldr r0, _0234B850 ; =0x023537CC + ldr r0, _0234B850 ; =ov29_023537CC mvn r1, #1 ldr r0, [r0, #4] add r0, r0, #0xc00 @@ -2381,7 +2381,7 @@ ov29_0234B7EC: ; 0x0234B7EC tst r1, #0xff moveq r0, #0 ldmeqia sp!, {r3, pc} - ldr r1, _0234B850 ; =0x023537CC + ldr r1, _0234B850 ; =ov29_023537CC ldr r1, [r1, #4] add r1, r1, #0xc00 ldrsh r2, [r1, #0x8c] @@ -2396,13 +2396,13 @@ _0234B848: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_0234B850: .word 0x023537CC +_0234B850: .word ov29_023537CC arm_func_end ov29_0234B7EC arm_func_start ov29_0234B854 ov29_0234B854: ; 0x0234B854 stmdb sp!, {r3, r4, r5, lr} - ldr r0, _0234BA14 ; =0x023537CC + ldr r0, _0234BA14 ; =ov29_023537CC ldr r1, [r0, #4] cmp r1, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -2410,7 +2410,7 @@ ov29_0234B854: ; 0x0234B854 cmp r0, #0 movne r0, #0 strne r0, [r1, #0xc98] - ldr r0, _0234BA14 ; =0x023537CC + ldr r0, _0234BA14 ; =ov29_023537CC ldr r4, [r0, #4] ldr r0, [r4, #0xc98] cmp r0, #0 @@ -2427,7 +2427,7 @@ _0234B8A0: bl sub_02001808 cmp r0, #0x3000 blt _0234B9C8 - ldr r0, _0234BA14 ; =0x023537CC + ldr r0, _0234BA14 ; =ov29_023537CC mvn r1, #1 ldr r0, [r0, #4] add r0, r0, #0xc00 @@ -2439,7 +2439,7 @@ _0234B8A0: bne _0234B900 mov r0, #0 bl sub_0202FFB0 - ldr r1, _0234BA14 ; =0x023537CC + ldr r1, _0234BA14 ; =ov29_023537CC mov r2, #0 ldr r3, [r1, #4] strb r0, [r3, #0xcec] @@ -2449,7 +2449,7 @@ _0234B900: mov r0, #2 str r0, [r4, #0xc98] _0234B908: - ldr r0, _0234BA14 ; =0x023537CC + ldr r0, _0234BA14 ; =ov29_023537CC mvn r2, #1 ldr r1, [r0, #4] add r0, r1, #0xc00 @@ -2460,7 +2460,7 @@ _0234B908: tst r2, #0xff moveq r0, #1 beq _0234B9BC - ldr r3, _0234BA14 ; =0x023537CC + ldr r3, _0234BA14 ; =ov29_023537CC mov r2, #0x140 ldr r5, [r3, #4] add r3, r5, #0xc00 @@ -2521,13 +2521,13 @@ _0234B9C8: bl ov29_022EA428 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234BA14: .word 0x023537CC +_0234BA14: .word ov29_023537CC arm_func_end ov29_0234B854 arm_func_start ov29_0234BA18 ov29_0234BA18: ; 0x0234BA18 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _0234BA50 ; =0x023537CC + ldr r1, _0234BA50 ; =ov29_023537CC mov r5, r0 ldr r4, [r1, #4] _0234BA28: @@ -2544,19 +2544,19 @@ _0234BA40: _0234BA4C: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234BA50: .word 0x023537CC +_0234BA50: .word ov29_023537CC arm_func_end ov29_0234BA18 arm_func_start ov29_0234BA54 ov29_0234BA54: ; 0x0234BA54 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r1, _0234BAB8 ; =0x023537CC + ldr r1, _0234BAB8 ; =ov29_023537CC mov r5, r0 ldr r6, [r1, #4] bl ov29_0234BA18 mov r4, #0 add r6, r6, #0xc00 - ldr r7, _0234BABC ; =0x0237C694 + ldr r7, _0234BABC ; =ov29_0237C694 b _0234BAAC _0234BA78: ldrsh r0, [r6, #0x90] @@ -2577,8 +2577,8 @@ _0234BAAC: blt _0234BA78 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0234BAB8: .word 0x023537CC -_0234BABC: .word 0x0237C694 +_0234BAB8: .word ov29_023537CC +_0234BABC: .word ov29_0237C694 arm_func_end ov29_0234BA54 arm_func_start InitPortraitDungeon @@ -2704,7 +2704,7 @@ _0234BBE4: .word ov29_022E0B60 arm_func_start ov29_0234BBE8 ov29_0234BBE8: ; 0x0234BBE8 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r0, _0234BED4 ; =0x023537D8 + ldr r0, _0234BED4 ; =ov29_023537D8 mov sl, #0 ldr r6, [r0, #4] bl ov29_022DC61C @@ -2755,7 +2755,7 @@ _0234BC8C: mov r6, sb mov r5, sb mov fp, r8 - ldr r4, _0234BED4 ; =0x023537D8 + ldr r4, _0234BED4 ; =ov29_023537D8 b _0234BD70 _0234BCAC: bl ov29_022DDEF8 @@ -2811,7 +2811,7 @@ _0234BCD8: _0234BD70: cmp sl, #0 beq _0234BCAC - ldr r0, _0234BED4 ; =0x023537D8 + ldr r0, _0234BED4 ; =ov29_023537D8 ldr r0, [r0, #4] adds r4, r0, #0x10 beq _0234BEB8 @@ -2827,7 +2827,7 @@ _0234BDA0: mvnne r0, #1 cmpne r1, r0 bne _0234BEB8 - ldr r0, _0234BED4 ; =0x023537D8 + ldr r0, _0234BED4 ; =ov29_023537D8 ldr r4, [r0, #4] bl ov29_022DE418 mov r0, #0 @@ -2874,7 +2874,7 @@ _0234BE44: bl ov30_023829CC mov r0, #0x10 bl ov29_022DDE00 - ldr r4, _0234BED4 ; =0x023537D8 + ldr r4, _0234BED4 ; =ov29_023537D8 mov r1, #1 ldr r0, [r4, #4] strb r1, [r0, #0x1bc] @@ -2898,7 +2898,7 @@ _0234BE80: bl ov29_0234C738 _0234BEB8: bl ov29_022DC65C - ldr r0, _0234BED4 ; =0x023537D8 + ldr r0, _0234BED4 ; =ov29_023537D8 mov r1, #1 ldr r0, [r0, #4] strb r1, [r0, #0x1bd] @@ -2906,14 +2906,14 @@ _0234BECC: bl ov29_022DDEF8 b _0234BECC .align 2, 0 -_0234BED4: .word 0x023537D8 +_0234BED4: .word ov29_023537D8 _0234BED8: .word 0x000F1208 _0234BEDC: .word 0x000F1209 arm_func_end ov29_0234BBE8 arm_func_start ov29_0234BEE0 ov29_0234BEE0: ; 0x0234BEE0 - ldr r2, _0234BEFC ; =0x0235352C + ldr r2, _0234BEFC ; =ov29_0235352C mov r1, #0xc ldr r2, [r2] ldr ip, _0234BF00 ; =sub_0200B3D4 @@ -2921,13 +2921,13 @@ ov29_0234BEE0: ; 0x0234BEE0 ldr r0, [r1, #0x24] bx ip .align 2, 0 -_0234BEFC: .word 0x0235352C +_0234BEFC: .word ov29_0235352C _0234BF00: .word sub_0200B3D4 arm_func_end ov29_0234BEE0 arm_func_start ov29_0234BF04 ov29_0234BF04: ; 0x0234BF04 - ldr r2, _0234BF20 ; =0x0235352C + ldr r2, _0234BF20 ; =ov29_0235352C mov r1, #0xc ldr r2, [r2] ldr ip, _0234BF24 ; =sub_0200B330 @@ -2935,7 +2935,7 @@ ov29_0234BF04: ; 0x0234BF04 ldr r0, [r1, #0x24] bx ip .align 2, 0 -_0234BF20: .word 0x0235352C +_0234BF20: .word ov29_0235352C _0234BF24: .word sub_0200B330 arm_func_end ov29_0234BF04 @@ -2964,11 +2964,11 @@ RunDungeonMode: ; 0x0234BF28 mov r0, #0x1c0 mov r1, #0 bl MemAlloc - ldr r2, _0234C1C8 ; =0x023537D8 + ldr r2, _0234C1C8 ; =ov29_023537D8 mov r1, #0x1c0 str r0, [r2, #4] bl MemZero - ldr r0, _0234C1C8 ; =0x023537D8 + ldr r0, _0234C1C8 ; =ov29_023537D8 mov r2, #0 ldr r1, [r0, #4] strb r2, [r1, #0x1bc] @@ -2977,14 +2977,14 @@ RunDungeonMode: ; 0x0234BF28 ldr r0, [r0, #4] str r4, [r0, #0xc] bl DungeonAlloc - ldr r1, _0234C1C8 ; =0x023537D8 + ldr r1, _0234C1C8 ; =ov29_023537D8 ldr r1, [r1, #4] str r0, [r1, #4] bl DungeonZInit bl ov29_022DDFF0 bl ov29_022DDFFC bl ov29_022DE300 - ldr r0, _0234C1C8 ; =0x023537D8 + ldr r0, _0234C1C8 ; =ov29_023537D8 mov ip, r5 ldr r0, [r0, #4] mov r4, #0x1a @@ -2997,7 +2997,7 @@ _0234BFE8: ldmia ip, {r0, r1, r2} stmia r6, {r0, r1, r2} bl ov29_0234C9FC - ldr r0, _0234C1CC ; =0x0234BBDC + ldr r0, _0234C1CC ; =ov29_0234BBDC bl sub_02006EC4 bl sub_02017A68 bl ov29_022E0CFC @@ -3018,7 +3018,7 @@ _0234C040: bl ov29_0234C584 _0234C04C: bl ov29_022DDC00 - ldr r1, _0234C1C8 ; =0x023537D8 + ldr r1, _0234C1C8 ; =ov29_023537D8 mov r2, #1 ldr r0, _0234C1D0 ; =ov29_0234C1D8 strb r2, [r1] @@ -3027,7 +3027,7 @@ _0234C04C: ldr r0, _0234C1D4 ; =ov29_0234BBE8 mov r2, r1 bl ov29_022DDD50 - ldr r4, _0234C1C8 ; =0x023537D8 + ldr r4, _0234C1C8 ; =ov29_023537D8 mov r6, #0 _0234C07C: bl sub_020038E8 @@ -3057,7 +3057,7 @@ _0234C0C0: bl ov29_0234CA2C cmp r5, #0 beq _0234C108 - ldr r0, _0234C1C8 ; =0x023537D8 + ldr r0, _0234C1C8 ; =ov29_023537D8 mov r4, #0x1a ldr r0, [r0, #4] add ip, r0, #0x10 @@ -3074,18 +3074,18 @@ _0234C108: bl ov29_0234C544 mov r0, #0 bl sub_02006EC4 - ldr r0, _0234C1C8 ; =0x023537D8 + ldr r0, _0234C1C8 ; =ov29_023537D8 ldr r0, [r0, #4] cmp r0, #0 beq _0234C154 bl DungeonFree - ldr r0, _0234C1C8 ; =0x023537D8 + ldr r0, _0234C1C8 ; =ov29_023537D8 mov r2, #0 ldr r1, [r0, #4] str r2, [r1, #4] ldr r0, [r0, #4] bl MemFree - ldr r0, _0234C1C8 ; =0x023537D8 + ldr r0, _0234C1C8 ; =ov29_023537D8 mov r1, #0 str r1, [r0, #4] _0234C154: @@ -3119,8 +3119,8 @@ _0234C154: mov r0, #1 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_0234C1C8: .word 0x023537D8 -_0234C1CC: .word 0x0234BBDC +_0234C1C8: .word ov29_023537D8 +_0234C1CC: .word ov29_0234BBDC _0234C1D0: .word ov29_0234C1D8 _0234C1D4: .word ov29_0234BBE8 arm_func_end RunDungeonMode @@ -3141,7 +3141,7 @@ _0234C1F4: bl ov29_0234C9E4 bl sub_02034A80 bl ov29_022EA008 - ldr r0, _0234C2EC ; =0x02353538 + ldr r0, _0234C2EC ; =ov29_02353538 ldr r0, [r0] cmp r0, #0 beq _0234C230 @@ -3156,7 +3156,7 @@ _0234C230: _0234C238: bl sub_02028848 bl ov29_022DE868 - ldr r0, _0234C2F0 ; =0x023537D8 + ldr r0, _0234C2F0 ; =ov29_023537D8 ldr r0, [r0, #4] ldr r0, [r0] cmp r0, #0 @@ -3165,7 +3165,7 @@ _0234C238: _0234C258: bl ov29_022DC670 bl sub_0201F464 - ldr r0, _0234C2F0 ; =0x023537D8 + ldr r0, _0234C2F0 ; =ov29_023537D8 ldrb r0, [r0] cmp r0, #0 bne _0234C274 @@ -3181,7 +3181,7 @@ _0234C274: bl sub_0201BE84 bl sub_0204F9CC bl sub_02003A40 - ldr r1, _0234C2F0 ; =0x023537D8 + ldr r1, _0234C2F0 ; =ov29_023537D8 mov r4, r0 ldrb r0, [r1] cmp r0, #0 @@ -3197,14 +3197,14 @@ _0234C2B8: bl sub_02028E88 bl ov29_022DE0CC bl sub_0201BF4C - ldr r1, _0234C2F0 ; =0x023537D8 + ldr r1, _0234C2F0 ; =ov29_023537D8 mov r2, #0 mov r0, r4 strb r2, [r1] ldmia sp!, {r4, pc} .align 2, 0 -_0234C2EC: .word 0x02353538 -_0234C2F0: .word 0x023537D8 +_0234C2EC: .word ov29_02353538 +_0234C2F0: .word ov29_023537D8 arm_func_end ov29_0234C1D8 arm_func_start ov29_0234C2F4 @@ -3367,49 +3367,49 @@ ov29_0234C4F8: ; 0x0234C4F8 mov r0, #0x144 mov r1, #0 bl MemAlloc - ldr r2, _0234C540 ; =0x023537E0 + ldr r2, _0234C540 ; =ov29_023537E0 mov r1, #0x144 str r0, [r2] bl MemZero - ldr r0, _0234C540 ; =0x023537E0 + ldr r0, _0234C540 ; =ov29_023537E0 mov r1, #0 ldr r0, [r0] bl ov29_0234C2F4 - ldr r0, _0234C540 ; =0x023537E0 + ldr r0, _0234C540 ; =ov29_023537E0 mov r1, #1 ldr r0, [r0] add r0, r0, #0x9c bl ov29_0234C2F4 ldmia sp!, {r3, pc} .align 2, 0 -_0234C540: .word 0x023537E0 +_0234C540: .word ov29_023537E0 arm_func_end ov29_0234C4F8 arm_func_start ov29_0234C544 ov29_0234C544: ; 0x0234C544 stmdb sp!, {r3, lr} - ldr r0, _0234C580 ; =0x023537E0 + ldr r0, _0234C580 ; =ov29_023537E0 ldr r0, [r0] bl ov29_0234C354 - ldr r0, _0234C580 ; =0x023537E0 + ldr r0, _0234C580 ; =ov29_023537E0 ldr r0, [r0] add r0, r0, #0x9c bl ov29_0234C354 - ldr r0, _0234C580 ; =0x023537E0 + ldr r0, _0234C580 ; =ov29_023537E0 ldr r0, [r0] bl MemFree - ldr r0, _0234C580 ; =0x023537E0 + ldr r0, _0234C580 ; =ov29_023537E0 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0234C580: .word 0x023537E0 +_0234C580: .word ov29_023537E0 arm_func_end ov29_0234C544 arm_func_start ov29_0234C584 ov29_0234C584: ; 0x0234C584 stmdb sp!, {r3, lr} - ldr r1, _0234C5E8 ; =0x023537E0 + ldr r1, _0234C5E8 ; =ov29_023537E0 mov r2, #0x10000 ldr r3, [r1] mov r1, #0x9c @@ -3435,13 +3435,13 @@ _0234C5CC: bl ov29_0234C3A0 ldmia sp!, {r3, pc} .align 2, 0 -_0234C5E8: .word 0x023537E0 +_0234C5E8: .word ov29_023537E0 arm_func_end ov29_0234C584 arm_func_start ov29_0234C5EC ov29_0234C5EC: ; 0x0234C5EC stmdb sp!, {r3, lr} - ldr r2, _0234C650 ; =0x023537E0 + ldr r2, _0234C650 ; =ov29_023537E0 mov r1, #0x9c ldr r3, [r2] mov r2, #0x10000 @@ -3467,23 +3467,23 @@ _0234C630: bl ov29_0234C3A0 ldmia sp!, {r3, pc} .align 2, 0 -_0234C650: .word 0x023537E0 +_0234C650: .word ov29_023537E0 arm_func_end ov29_0234C5EC arm_func_start ov29_0234C654 ov29_0234C654: ; 0x0234C654 - ldr r1, _0234C664 ; =0x023537E0 + ldr r1, _0234C664 ; =ov29_023537E0 ldr r1, [r1] strh r0, [r1, #0x72] bx lr .align 2, 0 -_0234C664: .word 0x023537E0 +_0234C664: .word ov29_023537E0 arm_func_end ov29_0234C654 arm_func_start ov29_0234C668 ov29_0234C668: ; 0x0234C668 stmdb sp!, {r3, lr} - ldr r3, _0234C708 ; =0x023537E0 + ldr r3, _0234C708 ; =ov29_023537E0 mov ip, #0 ldr lr, [r3] add lr, lr, r2, lsl #2 @@ -3531,12 +3531,12 @@ _0234C6FC: bl ov29_0234C408 ldmia sp!, {r3, pc} .align 2, 0 -_0234C708: .word 0x023537E0 +_0234C708: .word ov29_023537E0 arm_func_end ov29_0234C668 arm_func_start ov29_0234C70C ov29_0234C70C: ; 0x0234C70C - ldr r2, _0234C734 ; =0x023537E0 + ldr r2, _0234C734 ; =ov29_023537E0 mov r1, #0x9c ldr r2, [r2] mla r1, r0, r1, r2 @@ -3547,7 +3547,7 @@ ov29_0234C70C: ; 0x0234C70C movne r0, #1 bx lr .align 2, 0 -_0234C734: .word 0x023537E0 +_0234C734: .word ov29_023537E0 arm_func_end ov29_0234C70C arm_func_start ov29_0234C738 @@ -3556,7 +3556,7 @@ ov29_0234C738: ; 0x0234C738 mov r5, r0 mov r0, #0x9c mul r4, r5, r0 - ldr r6, _0234C7D0 ; =0x023537E0 + ldr r6, _0234C7D0 ; =ov29_023537E0 mov r7, #5 _0234C750: ldr r1, [r6] @@ -3597,13 +3597,13 @@ _0234C7C0: _0234C7CC: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0234C7D0: .word 0x023537E0 +_0234C7D0: .word ov29_023537E0 arm_func_end ov29_0234C738 arm_func_start ov29_0234C7D4 ov29_0234C7D4: ; 0x0234C7D4 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _0234C9E0 ; =0x023537E0 + ldr r1, _0234C9E0 ; =ov29_023537E0 mov r5, r0 ldr r4, [r1] add r0, r4, r5, lsl #2 @@ -3645,7 +3645,7 @@ _0234C864: mov r2, #4 bl ov29_0234C408 _0234C86C: - ldr r0, _0234C9E0 ; =0x023537E0 + ldr r0, _0234C9E0 ; =ov29_023537E0 ldr r0, [r0] add r1, r0, #0x140 ldrb r0, [r1, r5] @@ -3666,7 +3666,7 @@ _0234C888: bl ov29_0234C354 ldmia sp!, {r3, r4, r5, pc} _0234C8B8: - ldr r1, _0234C9E0 ; =0x023537E0 + ldr r1, _0234C9E0 ; =ov29_023537E0 mov r0, #0x9c ldr r1, [r1] mla r4, r5, r0, r1 @@ -3749,7 +3749,7 @@ _0234C9BC: strpl r0, [r4, #0x8c] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234C9E0: .word 0x023537E0 +_0234C9E0: .word ov29_023537E0 arm_func_end ov29_0234C7D4 arm_func_start ov29_0234C9E4 @@ -3768,7 +3768,7 @@ ov29_0234C9FC: ; 0x0234C9FC mov r0, #8 mov r1, #0 bl MemAlloc - ldr r1, _0234CA28 ; =0x023537E4 + ldr r1, _0234CA28 ; =ov29_023537E4 mov r2, #0 str r0, [r1] str r2, [r0, #4] @@ -3776,7 +3776,7 @@ ov29_0234C9FC: ; 0x0234C9FC str r2, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0234CA28: .word 0x023537E4 +_0234CA28: .word ov29_023537E4 arm_func_end ov29_0234C9FC arm_func_start ov29_0234CA2C @@ -3789,25 +3789,25 @@ ov29_0234CA2C: ; 0x0234CA2C mov r0, #0x21 bl UnloadOverlay _0234CA48: - ldr r0, _0234CA64 ; =0x023537E4 + ldr r0, _0234CA64 ; =ov29_023537E4 ldr r0, [r0] bl MemFree - ldr r0, _0234CA64 ; =0x023537E4 + ldr r0, _0234CA64 ; =ov29_023537E4 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0234CA64: .word 0x023537E4 +_0234CA64: .word ov29_023537E4 arm_func_end ov29_0234CA2C arm_func_start ov29_0234CA68 ov29_0234CA68: ; 0x0234CA68 - ldr r0, _0234CA78 ; =0x023537E4 + ldr r0, _0234CA78 ; =ov29_023537E4 ldr r0, [r0] ldr r0, [r0, #4] bx lr .align 2, 0 -_0234CA78: .word 0x023537E4 +_0234CA78: .word ov29_023537E4 arm_func_end ov29_0234CA68 arm_func_start ov29_0234CA7C @@ -3819,24 +3819,24 @@ ov29_0234CA7C: ; 0x0234CA7C arm_func_start ov29_0234CA84 ov29_0234CA84: ; 0x0234CA84 stmdb sp!, {r3, lr} - ldr r0, _0234CAC4 ; =0x023537E4 + ldr r0, _0234CAC4 ; =ov29_023537E4 mov r3, #1 ldr r1, [r0] - ldr r2, _0234CAC8 ; =0x0237D000 + ldr r2, _0234CAC8 ; =ov29_0237D000 str r3, [r1] ldr r1, [r0] mov r0, #0x21 str r2, [r1, #4] bl LoadOverlay - ldr r0, _0234CAC4 ; =0x023537E4 + ldr r0, _0234CAC4 ; =ov29_023537E4 mov r1, #0x5800 ldr r0, [r0] ldr r0, [r0, #4] bl ov30_02382C68 ldmia sp!, {r3, pc} .align 2, 0 -_0234CAC4: .word 0x023537E4 -_0234CAC8: .word 0x0237D000 +_0234CAC4: .word ov29_023537E4 +_0234CAC8: .word ov29_0237D000 arm_func_end ov29_0234CA84 arm_func_start ov29_0234CACC @@ -3849,21 +3849,21 @@ ov29_0234CACC: ; 0x0234CACC mov r0, #0x21 bl UnloadOverlay _0234CAE8: - ldr r0, _0234CAFC ; =0x023537E4 + ldr r0, _0234CAFC ; =ov29_023537E4 mov r1, #0 ldr r0, [r0] str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0234CAFC: .word 0x023537E4 +_0234CAFC: .word ov29_023537E4 arm_func_end ov29_0234CACC arm_func_start ov29_0234CB00 ov29_0234CB00: ; 0x0234CB00 - ldr r0, _0234CB28 ; =0x023537E4 + ldr r0, _0234CB28 ; =ov29_023537E4 mov r3, #2 ldr r1, [r0] - ldr r2, _0234CB2C ; =0x0237D000 + ldr r2, _0234CB2C ; =ov29_0237D000 str r3, [r1] ldr r1, [r0] ldr ip, _0234CB30 ; =LoadOverlay @@ -3871,21 +3871,21 @@ ov29_0234CB00: ; 0x0234CB00 str r2, [r1, #4] bx ip .align 2, 0 -_0234CB28: .word 0x023537E4 -_0234CB2C: .word 0x0237D000 +_0234CB28: .word ov29_023537E4 +_0234CB2C: .word ov29_0237D000 _0234CB30: .word LoadOverlay arm_func_end ov29_0234CB00 arm_func_start ov29_0234CB34 ov29_0234CB34: ; 0x0234CB34 - ldr r0, _0234CB4C ; =0x023537E4 + ldr r0, _0234CB4C ; =ov29_023537E4 ldr ip, _0234CB50 ; =ov30_023842F4 ldr r0, [r0] mov r1, #0x5800 ldr r0, [r0, #4] bx ip .align 2, 0 -_0234CB4C: .word 0x023537E4 +_0234CB4C: .word ov29_023537E4 _0234CB50: .word ov30_023842F4 arm_func_end ov29_0234CB34 @@ -3899,23 +3899,23 @@ ov29_0234CB54: ; 0x0234CB54 mov r0, #0x21 bl UnloadOverlay _0234CB70: - ldr r0, _0234CB84 ; =0x023537E4 + ldr r0, _0234CB84 ; =ov29_023537E4 mov r1, #0 ldr r0, [r0] str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_0234CB84: .word 0x023537E4 +_0234CB84: .word ov29_023537E4 arm_func_end ov29_0234CB54 arm_func_start ov29_0234CB88 ov29_0234CB88: ; 0x0234CB88 stmdb sp!, {r3, lr} bl GetLeader - ldr r2, _0234CC88 ; =0x02353538 + ldr r2, _0234CC88 ; =ov29_02353538 mvn r3, #0 ldr r1, [r2] - ldr r0, _0234CC8C ; =0x023532C0 + ldr r0, _0234CC8C ; =ov29_023532C0 add r1, r1, #0x100 strh r3, [r1, #0xd8] ldr r2, [r2] @@ -3925,73 +3925,73 @@ ov29_0234CB88: ; 0x0234CB88 bl DisplayDungeonTip cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0234CC90 ; =0x023532B8 + ldr r0, _0234CC90 ; =ov29_023532B8 mov r1, #1 bl DisplayDungeonTip cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0234CC94 ; =0x023532B0 + ldr r0, _0234CC94 ; =ov29_023532B0 mov r1, #1 bl DisplayDungeonTip cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0234CC98 ; =0x02353240 + ldr r0, _0234CC98 ; =ov29_02353240 mov r1, #1 bl DisplayDungeonTip cmp r0, #0 - ldreq r0, _0234CC88 ; =0x02353538 + ldreq r0, _0234CC88 ; =ov29_02353538 ldreq r0, [r0] ldreqb r0, [r0, #0x748] cmpeq r0, #3 ldmneia sp!, {r3, pc} - ldr r0, _0234CC9C ; =0x023532A0 + ldr r0, _0234CC9C ; =ov29_023532A0 mov r1, #1 bl DisplayDungeonTip cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0234CCA0 ; =0x02353298 + ldr r0, _0234CCA0 ; =ov29_02353298 mov r1, #1 bl DisplayDungeonTip cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0234CCA4 ; =0x02353290 + ldr r0, _0234CCA4 ; =ov29_02353290 mov r1, #1 bl DisplayDungeonTip cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0234CCA8 ; =0x02353278 + ldr r0, _0234CCA8 ; =ov29_02353278 mov r1, #1 bl DisplayDungeonTip cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0234CCAC ; =0x02353238 + ldr r0, _0234CCAC ; =ov29_02353238 mov r1, #1 bl DisplayDungeonTip cmp r0, #0 ldmneia sp!, {r3, pc} - ldr r0, _0234CCB0 ; =0x023532E0 + ldr r0, _0234CCB0 ; =ov29_023532E0 mov r1, #1 bl DisplayDungeonTip cmp r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_0234CC88: .word 0x02353538 -_0234CC8C: .word 0x023532C0 -_0234CC90: .word 0x023532B8 -_0234CC94: .word 0x023532B0 -_0234CC98: .word 0x02353240 -_0234CC9C: .word 0x023532A0 -_0234CCA0: .word 0x02353298 -_0234CCA4: .word 0x02353290 -_0234CCA8: .word 0x02353278 -_0234CCAC: .word 0x02353238 -_0234CCB0: .word 0x023532E0 +_0234CC88: .word ov29_02353538 +_0234CC8C: .word ov29_023532C0 +_0234CC90: .word ov29_023532B8 +_0234CC94: .word ov29_023532B0 +_0234CC98: .word ov29_02353240 +_0234CC9C: .word ov29_023532A0 +_0234CCA0: .word ov29_02353298 +_0234CCA4: .word ov29_02353290 +_0234CCA8: .word ov29_02353278 +_0234CCAC: .word ov29_02353238 +_0234CCB0: .word ov29_023532E0 arm_func_end ov29_0234CB88 arm_func_start ov29_0234CCB4 ov29_0234CCB4: ; 0x0234CCB4 stmdb sp!, {r4, lr} - ldr r2, _0234CEA4 ; =0x02353538 + ldr r2, _0234CEA4 ; =ov29_02353538 mvn r3, #0 ldr r1, [r2] mov r4, r0 @@ -4003,117 +4003,117 @@ ov29_0234CCB4: ; 0x0234CCB4 bl GetItemCategoryVeneer cmp r0, #3 bne _0234CCF8 - ldr r0, _0234CEA8 ; =0x023532F0 + ldr r0, _0234CEA8 ; =ov29_023532F0 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CCF8: cmp r4, #0x46 bne _0234CD10 - ldr r0, _0234CEAC ; =0x023532F8 + ldr r0, _0234CEAC ; =ov29_023532F8 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CD10: cmp r4, #0x52 bne _0234CD28 - ldr r0, _0234CEB0 ; =0x023532D8 + ldr r0, _0234CEB0 ; =ov29_023532D8 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CD28: cmp r4, #0x57 bne _0234CD40 - ldr r0, _0234CEB4 ; =0x023532C8 + ldr r0, _0234CEB4 ; =ov29_023532C8 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CD40: cmp r4, #8 bne _0234CD58 - ldr r0, _0234CEB8 ; =0x02353250 + ldr r0, _0234CEB8 ; =ov29_02353250 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CD58: cmp r4, #0x51 bne _0234CD70 - ldr r0, _0234CEBC ; =0x02353248 + ldr r0, _0234CEBC ; =ov29_02353248 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CD70: cmp r4, #0x54 bne _0234CD88 - ldr r0, _0234CEC0 ; =0x02353270 + ldr r0, _0234CEC0 ; =ov29_02353270 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CD88: cmp r4, #0xb7 bne _0234CDA0 - ldr r0, _0234CEC4 ; =0x02353280 + ldr r0, _0234CEC4 ; =ov29_02353280 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CDA0: cmp r4, #0x63 bne _0234CDB8 - ldr r0, _0234CEC8 ; =0x023532A8 + ldr r0, _0234CEC8 ; =ov29_023532A8 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CDB8: cmp r4, #0x45 bne _0234CDD0 - ldr r0, _0234CECC ; =0x02353300 + ldr r0, _0234CECC ; =ov29_02353300 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CDD0: cmp r4, #0x5b bne _0234CDE8 - ldr r0, _0234CED0 ; =0x02353258 + ldr r0, _0234CED0 ; =ov29_02353258 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CDE8: cmp r4, #0x56 bne _0234CE00 - ldr r0, _0234CED4 ; =0x02353268 + ldr r0, _0234CED4 ; =ov29_02353268 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CE00: cmp r4, #0x5e bne _0234CE18 - ldr r0, _0234CED8 ; =0x02353288 + ldr r0, _0234CED8 ; =ov29_02353288 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CE18: cmp r4, #0x4c bne _0234CE30 - ldr r0, _0234CEDC ; =0x023532E8 + ldr r0, _0234CEDC ; =ov29_023532E8 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CE30: cmp r4, #0x60 bne _0234CE48 - ldr r0, _0234CEE0 ; =0x02353260 + ldr r0, _0234CEE0 ; =ov29_02353260 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CE48: cmp r4, #0x75 bne _0234CE60 - ldr r0, _0234CEE4 ; =0x02353308 + ldr r0, _0234CEE4 ; =ov29_02353308 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} _0234CE60: - ldr r0, _0234CEA4 ; =0x02353538 + ldr r0, _0234CEA4 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] cmp r0, #0x7b @@ -4126,30 +4126,30 @@ _0234CE60: mov r0, r0, lsr #0x10 cmp r0, #1 ldmhiia sp!, {r4, pc} - ldr r0, _0234CEEC ; =0x02353310 + ldr r0, _0234CEEC ; =ov29_02353310 mov r1, #0 bl DisplayDungeonTip ldmia sp!, {r4, pc} .align 2, 0 -_0234CEA4: .word 0x02353538 -_0234CEA8: .word 0x023532F0 -_0234CEAC: .word 0x023532F8 -_0234CEB0: .word 0x023532D8 -_0234CEB4: .word 0x023532C8 -_0234CEB8: .word 0x02353250 -_0234CEBC: .word 0x02353248 -_0234CEC0: .word 0x02353270 -_0234CEC4: .word 0x02353280 -_0234CEC8: .word 0x023532A8 -_0234CECC: .word 0x02353300 -_0234CED0: .word 0x02353258 -_0234CED4: .word 0x02353268 -_0234CED8: .word 0x02353288 -_0234CEDC: .word 0x023532E8 -_0234CEE0: .word 0x02353260 -_0234CEE4: .word 0x02353308 +_0234CEA4: .word ov29_02353538 +_0234CEA8: .word ov29_023532F0 +_0234CEAC: .word ov29_023532F8 +_0234CEB0: .word ov29_023532D8 +_0234CEB4: .word ov29_023532C8 +_0234CEB8: .word ov29_02353250 +_0234CEBC: .word ov29_02353248 +_0234CEC0: .word ov29_02353270 +_0234CEC4: .word ov29_02353280 +_0234CEC8: .word ov29_023532A8 +_0234CECC: .word ov29_02353300 +_0234CED0: .word ov29_02353258 +_0234CED4: .word ov29_02353268 +_0234CED8: .word ov29_02353288 +_0234CEDC: .word ov29_023532E8 +_0234CEE0: .word ov29_02353260 +_0234CEE4: .word ov29_02353308 _0234CEE8: .word 0xFFFFFED2 -_0234CEEC: .word 0x02353310 +_0234CEEC: .word ov29_02353310 arm_func_end ov29_0234CCB4 arm_func_start DisplayDungeonTip @@ -4215,7 +4215,7 @@ ov29_0234CFA0: ; 0x0234CFA0 cmp r0, #0 movne r0, #2 ldmneia sp!, {r3, pc} - ldr r0, _0234CFE8 ; =0x02353538 + ldr r0, _0234CFE8 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl IsFutureDungeon @@ -4231,7 +4231,7 @@ _0234CFE0: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_0234CFE8: .word 0x02353538 +_0234CFE8: .word ov29_02353538 arm_func_end ov29_0234CFA0 arm_func_start GetPersonalityIndex @@ -4288,7 +4288,7 @@ _0234D0A0: beq _0234D1E0 cmp r0, #0xed bne _0234D148 - ldr r0, _0234D204 ; =0x02353538 + ldr r0, _0234D204 ; =ov29_02353538 ldr r0, [r0] ldrb r1, [r0, #0x748] add r0, r1, #0x7b @@ -4337,7 +4337,7 @@ _0234D148: mov r4, r0 b _0234D1E0 _0234D170: - ldr r1, _0234D228 ; =0x023537E8 + ldr r1, _0234D228 ; =ov29_023537E8 b _0234D1C4 _0234D178: ldrb r0, [r5, #0x48] @@ -4381,7 +4381,7 @@ _0234D1F4: .word 0x000004CD _0234D1F8: .word 0x000004CF _0234D1FC: .word 0x000004D1 _0234D200: .word 0x000004B3 -_0234D204: .word 0x02353538 +_0234D204: .word ov29_02353538 _0234D208: .word 0x000004C4 _0234D20C: .word 0x000004C6 _0234D210: .word 0x000004C7 @@ -4390,7 +4390,7 @@ _0234D218: .word 0x000004C9 _0234D21C: .word 0x000004CA _0234D220: .word 0x000004CB _0234D224: .word 0x000004CC -_0234D228: .word 0x023537E8 +_0234D228: .word ov29_023537E8 _0234D22C: .word 0x000004B8 _0234D230: .word 0x000004D3 arm_func_end GetPersonalityIndex @@ -4463,7 +4463,7 @@ DisplayMessage2: ; 0x0234D2AC ov29_0234D304: ; 0x0234D304 stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x58 - ldr r4, _0234D454 ; =0x02353563 + ldr r4, _0234D454 ; =ov29_02353563 mov r8, r0 ldrb r0, [r4] mov r7, r1 @@ -4502,7 +4502,7 @@ _0234D38C: streq r0, [sp, #8] beq _0234D3D0 ldr r1, [r0, #0xb4] - ldr r0, _0234D458 ; =0x02353368 + ldr r0, _0234D458 ; =ov29_02353368 ldrb r1, [r1, #0xbc] sub r1, r1, #0xb orr r1, r1, #0x90000 @@ -4512,7 +4512,7 @@ _0234D38C: _0234D3BC: bl ov29_02337EE8 mov r1, r0 - ldr r0, _0234D45C ; =0x02353380 + ldr r0, _0234D45C ; =ov29_02353380 str r1, [sp, #8] bl DebugPrint0 _0234D3D0: @@ -4553,9 +4553,9 @@ _0234D440: add sp, sp, #0x58 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_0234D454: .word 0x02353563 -_0234D458: .word 0x02353368 -_0234D45C: .word 0x02353380 +_0234D454: .word ov29_02353563 +_0234D458: .word ov29_02353368 +_0234D45C: .word ov29_02353380 arm_func_end ov29_0234D304 arm_func_start IsMonster__0234D460 @@ -4733,7 +4733,7 @@ _0234D664: .word ov29_0234DBE0 arm_func_start ov29_0234D668 ov29_0234D668: ; 0x0234D668 stmdb sp!, {r3, lr} - ldr r0, _0234D68C ; =0x02382800 + ldr r0, _0234D68C ; =ov29_02382800 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #0x12] @@ -4742,7 +4742,7 @@ ov29_0234D668: ; 0x0234D668 bl HidePortraitBox ldmia sp!, {r3, pc} .align 2, 0 -_0234D68C: .word 0x02382800 +_0234D68C: .word ov29_02382800 arm_func_end ov29_0234D668 arm_func_start ov29_0234D690 @@ -4829,13 +4829,13 @@ ov29_0234D750: ; 0x0234D750 mov r3, #0 bl ov29_0234DC3C bl ov29_0234D9C0 - ldr r0, _0234D7BC ; =0x02382800 + ldr r0, _0234D7BC ; =ov29_02382800 ldr r0, [r0] ldr r0, [r0, #0x46c] add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0234D7BC: .word 0x02382800 +_0234D7BC: .word ov29_02382800 arm_func_end ov29_0234D750 arm_func_start ov29_0234D7C0 @@ -4864,19 +4864,19 @@ ov29_0234D7C0: ; 0x0234D7C0 mov r3, #0 bl ov29_0234DC3C bl ov29_0234D9C0 - ldr r0, _0234D834 ; =0x02382800 + ldr r0, _0234D834 ; =ov29_02382800 ldr r0, [r0] ldr r0, [r0, #0x46c] add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 -_0234D834: .word 0x02382800 +_0234D834: .word ov29_02382800 arm_func_end ov29_0234D7C0 arm_func_start ov29_0234D838 ov29_0234D838: ; 0x0234D838 stmdb sp!, {r3, lr} - ldr r0, _0234D85C ; =0x02382800 + ldr r0, _0234D85C ; =ov29_02382800 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #0x10] @@ -4885,7 +4885,7 @@ ov29_0234D838: ; 0x0234D838 bl sub_0202F334 ldmia sp!, {r3, pc} .align 2, 0 -_0234D85C: .word 0x02382800 +_0234D85C: .word ov29_02382800 arm_func_end ov29_0234D838 arm_func_start ov29_0234D860 @@ -4900,22 +4900,22 @@ ov29_0234D860: ; 0x0234D860 arm_func_start ov29_0234D878 ov29_0234D878: ; 0x0234D878 - ldr r1, _0234D888 ; =0x02382800 + ldr r1, _0234D888 ; =ov29_02382800 ldr r1, [r1] str r0, [r1, #0x474] bx lr .align 2, 0 -_0234D888: .word 0x02382800 +_0234D888: .word ov29_02382800 arm_func_end ov29_0234D878 arm_func_start ov29_0234D88C ov29_0234D88C: ; 0x0234D88C - ldr r0, _0234D89C ; =0x02382800 + ldr r0, _0234D89C ; =ov29_02382800 ldr r0, [r0] ldr r0, [r0, #0x46c] bx lr .align 2, 0 -_0234D89C: .word 0x02382800 +_0234D89C: .word ov29_02382800 arm_func_end ov29_0234D88C arm_func_start ov29_0234D8A0 @@ -4931,7 +4931,7 @@ _0234D8B0: .word ov29_0234D8B4 arm_func_start ov29_0234D8B4 ov29_0234D8B4: ; 0x0234D8B4 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0234D9BC ; =0x02382800 + ldr r2, _0234D9BC ; =ov29_02382800 mov r5, r0 ldr r0, [r2] mov r4, r1 @@ -4943,14 +4943,14 @@ ov29_0234D8B4: ; 0x0234D8B4 beq _0234D8E4 bl HidePortraitBox _0234D8E4: - ldr r0, _0234D9BC ; =0x02382800 + ldr r0, _0234D9BC ; =ov29_02382800 ldr r0, [r0] ldrsb r0, [r0, #0x10] bl sub_0202F334 mov r0, #8 mov r1, #0x62 bl ov29_022EA370 - ldr r0, _0234D9BC ; =0x02382800 + ldr r0, _0234D9BC ; =ov29_02382800 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #0x11] @@ -4958,26 +4958,26 @@ _0234D8E4: beq _0234D91C bl sub_0202AABC _0234D91C: - ldr r0, _0234D9BC ; =0x02382800 + ldr r0, _0234D9BC ; =ov29_02382800 mvn r1, #1 ldr r0, [r0] ldrsb r0, [r0, #0x12] cmp r0, r1 beq _0234D948 bl FreePortraitBox - ldr r0, _0234D9BC ; =0x02382800 + ldr r0, _0234D9BC ; =ov29_02382800 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x12] _0234D948: - ldr r0, _0234D9BC ; =0x02382800 + ldr r0, _0234D9BC ; =ov29_02382800 ldr r0, [r0] ldrsb r0, [r0, #0x10] bl FreeDBox - ldr r0, _0234D9BC ; =0x02382800 + ldr r0, _0234D9BC ; =ov29_02382800 ldr r0, [r0] bl MemFree - ldr r0, _0234D9BC ; =0x02382800 + ldr r0, _0234D9BC ; =ov29_02382800 mov r1, #0 str r1, [r0] _0234D970: @@ -5003,7 +5003,7 @@ _0234D9A8: bl ov29_0234B4CC ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0234D9BC: .word 0x02382800 +_0234D9BC: .word ov29_02382800 arm_func_end ov29_0234D8B4 arm_func_start ov29_0234D9C0 @@ -5011,7 +5011,7 @@ ov29_0234D9C0: ; 0x0234D9C0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mvn r8, #1 mov r7, #0 - ldr r6, _0234DB50 ; =0x02382800 + ldr r6, _0234DB50 ; =ov29_02382800 sub r5, r8, #3 sub r4, r8, #2 mov sb, #1 @@ -5039,7 +5039,7 @@ _0234D9E0: ldr r3, [r0, #0x470] ldrb r0, [r0, #0x467] cmp r3, #0 - ldreq r3, _0234DB54 ; =0x02353398 + ldreq r3, _0234DB54 ; =ov29_02353398 cmp r0, #0 movne r1, #0x11 mov r0, #0 @@ -5115,8 +5115,8 @@ _0234DB44: beq _0234D9E0 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_0234DB50: .word 0x02382800 -_0234DB54: .word 0x02353398 +_0234DB50: .word ov29_02382800 +_0234DB54: .word ov29_02353398 arm_func_end ov29_0234D9C0 arm_func_start ov29_0234DB58 @@ -5125,18 +5125,18 @@ ov29_0234DB58: ; 0x0234DB58 ldr r0, _0234DBD8 ; =0x00000478 mov r1, #8 bl MemAlloc - ldr r2, _0234DBDC ; =0x02382800 + ldr r2, _0234DBDC ; =ov29_02382800 ldr r1, _0234DBD8 ; =0x00000478 str r0, [r2] bl MemZero - ldr r0, _0234DBDC ; =0x02382800 + ldr r0, _0234DBDC ; =ov29_02382800 mvn r2, #0 ldr r1, [r0] str r2, [r1, #0x46c] ldr r0, [r0] add r0, r0, #0x14 bl InitPreprocessorArgs - ldr r1, _0234DBDC ; =0x02382800 + ldr r1, _0234DBDC ; =ov29_02382800 mov r3, #0 ldr r0, [r1] sub r2, r3, #2 @@ -5155,7 +5155,7 @@ ov29_0234DB58: ; 0x0234DB58 ldmia sp!, {r3, pc} .align 2, 0 _0234DBD8: .word 0x00000478 -_0234DBDC: .word 0x02382800 +_0234DBDC: .word ov29_02382800 arm_func_end ov29_0234DB58 arm_func_start ov29_0234DBE0 @@ -5163,7 +5163,7 @@ ov29_0234DBE0: ; 0x0234DBE0 stmdb sp!, {r4, lr} movs r4, r0 ldmeqia sp!, {r4, pc} - ldr r1, _0234DC38 ; =0x02382800 + ldr r1, _0234DC38 ; =ov29_02382800 mvn r0, #1 ldr r1, [r1] ldrsb r1, [r1, #0x12] @@ -5173,24 +5173,24 @@ ov29_0234DBE0: ; 0x0234DBE0 mov r1, #3 mov r2, #1 bl CreatePortraitBox - ldr r1, _0234DC38 ; =0x02382800 + ldr r1, _0234DC38 ; =ov29_02382800 ldr r1, [r1] strb r0, [r1, #0x12] _0234DC20: - ldr r0, _0234DC38 ; =0x02382800 + ldr r0, _0234DC38 ; =ov29_02382800 mov r1, r4 ldr r0, [r0] ldrsb r0, [r0, #0x12] bl ShowPortraitBox ldmia sp!, {r4, pc} .align 2, 0 -_0234DC38: .word 0x02382800 +_0234DC38: .word ov29_02382800 arm_func_end ov29_0234DBE0 arm_func_start ov29_0234DC3C ov29_0234DC3C: ; 0x0234DC3C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr r4, _0234DD88 ; =0x02382800 + ldr r4, _0234DD88 ; =ov29_02382800 mvn ip, #1 ldr r4, [r4] mov r7, r0 @@ -5202,7 +5202,7 @@ ov29_0234DC3C: ; 0x0234DC3C bne _0234DC8C mov r0, #0 bl CreateDBox - ldr r2, _0234DD88 ; =0x02382800 + ldr r2, _0234DD88 ; =ov29_02382800 mov r1, #0 ldr r3, [r2] strb r0, [r3, #0x10] @@ -5210,7 +5210,7 @@ ov29_0234DC3C: ; 0x0234DC3C ldrsb r0, [r0, #0x10] bl sub_0202F474 _0234DC8C: - ldr r0, _0234DD88 ; =0x02382800 + ldr r0, _0234DD88 ; =ov29_02382800 mov r8, r6 ldr sb, [r0] mov ip, #5 @@ -5225,7 +5225,7 @@ _0234DCA0: strh r1, [r0, #0x64] cmp r4, #0 beq _0234DCDC - ldr r0, _0234DD88 ; =0x02382800 + ldr r0, _0234DD88 ; =ov29_02382800 ldr r0, [r0] add r0, r0, #0x400 ldrh r1, [r0, #0x64] @@ -5237,7 +5237,7 @@ _0234DCDC: beq _0234DD24 cmp r5, #0 beq _0234DD0C - ldr r0, _0234DD88 ; =0x02382800 + ldr r0, _0234DD88 ; =ov29_02382800 ldr r0, [r0] add r0, r0, #0x400 ldrh r1, [r0, #0x64] @@ -5245,7 +5245,7 @@ _0234DCDC: strh r1, [r0, #0x64] b _0234DD24 _0234DD0C: - ldr r0, _0234DD88 ; =0x02382800 + ldr r0, _0234DD88 ; =ov29_02382800 ldr r0, [r0] add r0, r0, #0x400 ldrh r1, [r0, #0x64] @@ -5254,7 +5254,7 @@ _0234DD0C: _0234DD24: cmp r5, #0 beq _0234DD64 - ldr r1, _0234DD88 ; =0x02382800 + ldr r1, _0234DD88 ; =ov29_02382800 mov r2, #1 ldr r0, [r1] strb r2, [r0, #0x466] @@ -5269,7 +5269,7 @@ _0234DD24: ldr r0, [r1] str r2, [r0, #0x470] _0234DD64: - ldr r0, _0234DD88 ; =0x02382800 + ldr r0, _0234DD88 ; =ov29_02382800 mov r2, r7 ldr r0, [r0] mov r3, r6 @@ -5279,7 +5279,7 @@ _0234DD64: bl sub_0202F23C ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0234DD88: .word 0x02382800 +_0234DD88: .word ov29_02382800 _0234DD8C: .word 0x00001004 arm_func_end ov29_0234DC3C diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index 916b4bf5..3ec3172c 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -3009,6 +3009,8 @@ ov29_02351658: ov29_023516E8: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x7C, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0xA8, 0x00, 0x00, 0x00, 0xA9, 0x00, 0x00, 0x00 + .global ov29_023516FC +ov29_023516FC: .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 @@ -3018,8 +3020,15 @@ DIRECTIONS_XY: 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 + .global ov29_0235173C +ov29_0235173C: + .byte 0x00, 0x00 + .global ov29_0235173E +ov29_0235173E: + .byte 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 + .global ov29_0235175C +ov29_0235175C: .byte 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 .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 @@ -3386,13 +3395,40 @@ BELLY_DRAIN_IN_WALLS_INT: .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 - .byte 0x10, 0x20, 0x40, 0x80, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x02 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02352770 +ov29_02352770: + .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 + .global ov29_02352778 +ov29_02352778: + .byte 0x01, 0x02, 0x04, 0x08 + .byte 0x10, 0x20, 0x40, 0x80 + .global ov29_02352780 +ov29_02352780: + .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 + .global ov29_02352788 +ov29_02352788: + .byte 0x01, 0x02, 0x04, 0x08 + .byte 0x10, 0x20, 0x40, 0x80 + .global ov29_02352790 +ov29_02352790: + .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 + .global ov29_02352798 +ov29_02352798: + .byte 0x01, 0x02, 0x04, 0x08 + .byte 0x10, 0x20, 0x40, 0x80 + .global ov29_023527A0 +ov29_023527A0: + .byte 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x02 .byte 0x01, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01 - .byte 0x01, 0x02, 0x00, 0x02, 0x5B, 0x43, 0x53, 0x3A, 0x46, 0x5D, 0x25, 0x73, 0x5B, 0x43, 0x52, 0x5D - .byte 0x00, 0x00, 0x00, 0x00, 0x5B, 0x43, 0x53, 0x3A, 0x25, 0x63, 0x5D, 0x25, 0x73, 0x5B, 0x43, 0x52 + .byte 0x01, 0x02, 0x00, 0x02 + .global ov29_023527C0 +ov29_023527C0: + .byte 0x5B, 0x43, 0x53, 0x3A, 0x46, 0x5D, 0x25, 0x73, 0x5B, 0x43, 0x52, 0x5D + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023527D0 +ov29_023527D0: + .byte 0x5B, 0x43, 0x53, 0x3A, 0x25, 0x63, 0x5D, 0x25, 0x73, 0x5B, 0x43, 0x52 .byte 0x5D, 0x00, 0x00, 0x00 .global ov29_023527E0 ov29_023527E0: @@ -3406,8 +3442,14 @@ ov29_023527E8: .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, 0x01, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00 + .global ov29_023527F8 +ov29_023527F8: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02352808 +ov29_02352808: + .byte 0x03, 0x04, 0x05, 0x00 .global ov29_0235280C ov29_0235280C: .byte 0x00, 0x00, 0x00, 0x00 @@ -3484,6 +3526,8 @@ ov29_023529AC: .global ov29_023529B0 ov29_023529B0: .byte 0x01, 0x00, 0x02, 0x00, 0x04, 0x00, 0x08, 0x00 + .global ov29_023529B8 +ov29_023529B8: .word ov29_023529C4 .word ov29_023529C4 .word ov29_023529EC @@ -3500,24 +3544,45 @@ ov29_023529EC: .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0xFF, 0xFF, 0x02, 0x00, 0xFE, 0xFF .byte 0x01, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF .byte 0xFE, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0xFE, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0x02, 0x00 - .byte 0xFF, 0xFF, 0x02, 0x00, 0x63, 0x00, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0D, 0x00, 0x00 + .byte 0xFF, 0xFF, 0x02, 0x00, 0x63, 0x00, 0x63, 0x00 + .global ov29_02352A54 +ov29_02352A54: + .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0xFF, 0xFF, 0xFF, 0xFF + .global ov29_02352A60 +ov29_02352A60: + .byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0D, 0x00, 0x00 + .global ov29_02352A6C +ov29_02352A6C: .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .global ov29_02352A8C +ov29_02352A8C: .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .global ov29_02352AAC +ov29_02352AAC: .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 0x08, 0x00, 0x0A, 0x00, 0xDD, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02352AD8 +ov29_02352AD8: + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global SPATK_STAT_IDX SPATK_STAT_IDX: .byte 0x01, 0x00, 0x00, 0x00 .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 0x00, 0x00, 0x00, 0x00 + .global ov29_02352AF0 +ov29_02352AF0: + .byte 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 + .byte 0xB3, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00, 0xE6, 0x01, 0x00, 0x00 + .global ov29_02352B18 +ov29_02352B18: + .byte 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 @@ -3528,13 +3593,26 @@ ov29_02352B38: .global ov29_02352B3C ov29_02352B3C: .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF + .global ov29_02352B4C +ov29_02352B4C: .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 + .byte 0x04, 0x00, 0x08, 0x00 + .global ov29_02352B60 +ov29_02352B60: + .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02352B74 +ov29_02352B74: + .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02352B88 +ov29_02352B88: + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_02352B9C +ov29_02352B9C: .byte 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00 @@ -3562,7 +3640,10 @@ ov29_02352B5C: .byte 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00 - .byte 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0xF7, 0xFF, 0xF7, 0xFF + .byte 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00 + .global ov29_02352D58 +ov29_02352D58: + .byte 0xF7, 0xFF, 0xF7, 0xFF .byte 0xF7, 0xFF, 0xF6, 0xFF, 0xF6, 0xFF, 0xF6, 0xFF, 0xF8, 0xFF, 0xF8, 0xFF, 0xF8, 0xFF, 0xF9, 0xFF .byte 0xF9, 0xFF, 0xF9, 0xFF, 0xFA, 0xFF, 0xFA, 0xFF, 0xFA, 0xFF, 0xFB, 0xFF, 0xFB, 0xFF, 0xFB, 0xFF .byte 0xFC, 0xFF, 0xFC, 0xFF, 0xFC, 0xFF, 0xFD, 0xFF, 0xFD, 0xFF, 0xFD, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF @@ -3590,7 +3671,10 @@ ov29_02352B5C: .byte 0x36, 0x00, 0x37, 0x00, 0x37, 0x00, 0x37, 0x00, 0x38, 0x00, 0x38, 0x00, 0x38, 0x00, 0x39, 0x00 .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 + .byte 0x3E, 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x3F, 0x00 + .global ov29_02352F14 +ov29_02352F14: + .byte 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 @@ -3718,14 +3802,20 @@ ov29_023531A4: .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 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .global ov29_023531C8 +ov29_023531C8: + .byte 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 + .byte 0x8C, 0x01, 0x8D, 0x01, 0x8E, 0x01, 0x8F, 0x01 + .global ov29_02353214 +ov29_02353214: + .byte 0x5B, 0x52, 0x5D, 0x00 .global ov29_02353218 ov29_02353218: .byte 0x33, 0x0B, 0x34, 0x0B @@ -3749,24 +3839,108 @@ 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 - .byte 0xE3, 0x3F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xDE, 0x3F, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 - .byte 0xD5, 0x3F, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0xDF, 0x3F, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00 - .byte 0xE4, 0x3F, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xD4, 0x3F, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - .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 0x3B, 0x0B, 0x3C, 0x0B + .global ov29_02353238 +ov29_02353238: + .byte 0x08, 0x00, 0x00, 0x00 + .byte 0xD6, 0x3F, 0x00, 0x00 + .global ov29_02353240 +ov29_02353240: + .byte 0x03, 0x00, 0x00, 0x00, 0xD1, 0x3F, 0x00, 0x00 + .global ov29_02353248 +ov29_02353248: + .byte 0x0F, 0x00, 0x00, 0x00 + .byte 0xDD, 0x3F, 0x00, 0x00 + .global ov29_02353250 +ov29_02353250: + .byte 0x0E, 0x00, 0x00, 0x00, 0xDC, 0x3F, 0x00, 0x00 + .global ov29_02353258 +ov29_02353258: + .byte 0x14, 0x00, 0x00, 0x00 + .byte 0xE2, 0x3F, 0x00, 0x00 + .global ov29_02353260 +ov29_02353260: + .byte 0x18, 0x00, 0x00, 0x00, 0xE6, 0x3F, 0x00, 0x00 + .global ov29_02353268 +ov29_02353268: + .byte 0x15, 0x00, 0x00, 0x00 + .byte 0xE3, 0x3F, 0x00, 0x00 + .global ov29_02353270 +ov29_02353270: + .byte 0x10, 0x00, 0x00, 0x00, 0xDE, 0x3F, 0x00, 0x00 + .global ov29_02353278 +ov29_02353278: + .byte 0x07, 0x00, 0x00, 0x00 + .byte 0xD5, 0x3F, 0x00, 0x00 + .global ov29_02353280 +ov29_02353280: + .byte 0x11, 0x00, 0x00, 0x00, 0xDF, 0x3F, 0x00, 0x00 + .global ov29_02353288 +ov29_02353288: + .byte 0x16, 0x00, 0x00, 0x00 + .byte 0xE4, 0x3F, 0x00, 0x00 + .global ov29_02353290 +ov29_02353290: + .byte 0x06, 0x00, 0x00, 0x00, 0xD4, 0x3F, 0x00, 0x00 + .global ov29_02353298 +ov29_02353298: + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0xD3, 0x3F, 0x00, 0x00 + .global ov29_023532A0 +ov29_023532A0: + .byte 0x04, 0x00, 0x00, 0x00, 0xD2, 0x3F, 0x00, 0x00 + .global ov29_023532A8 +ov29_023532A8: + .byte 0x12, 0x00, 0x00, 0x00 + .byte 0xE0, 0x3F, 0x00, 0x00 + .global ov29_023532B0 +ov29_023532B0: + .byte 0x02, 0x00, 0x00, 0x00, 0xD0, 0x3F, 0x00, 0x00 + .global ov29_023532B8 +ov29_023532B8: + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0xCF, 0x3F, 0x00, 0x00 + .global ov29_023532C0 +ov29_023532C0: + .byte 0x00, 0x00, 0x00, 0x00, 0xCE, 0x3F, 0x00, 0x00 + .global ov29_023532C8 +ov29_023532C8: + .byte 0x0D, 0x00, 0x00, 0x00 .byte 0xDB, 0x3F, 0x00, 0x00 .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 - .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 0x48, 0x0B, 0x49, 0x0B, 0x4A, 0x0B, 0x4B, 0x0B + .global ov29_023532D8 +ov29_023532D8: + .byte 0x0C, 0x00, 0x00, 0x00 + .byte 0xDA, 0x3F, 0x00, 0x00 + .global ov29_023532E0 +ov29_023532E0: + .byte 0x09, 0x00, 0x00, 0x00, 0xD7, 0x3F, 0x00, 0x00 + .global ov29_023532E8 +ov29_023532E8: + .byte 0x17, 0x00, 0x00, 0x00 + .byte 0xE5, 0x3F, 0x00, 0x00 + .global ov29_023532F0 +ov29_023532F0: + .byte 0x0A, 0x00, 0x00, 0x00, 0xD8, 0x3F, 0x00, 0x00 + .global ov29_023532F8 +ov29_023532F8: + .byte 0x0B, 0x00, 0x00, 0x00 + .byte 0xD9, 0x3F, 0x00, 0x00 + .global ov29_02353300 +ov29_02353300: + .byte 0x13, 0x00, 0x00, 0x00, 0xE1, 0x3F, 0x00, 0x00 + .global ov29_02353308 +ov29_02353308: + .byte 0x19, 0x00, 0x00, 0x00 + .byte 0xE7, 0x3F, 0x00, 0x00 + .global ov29_02353310 +ov29_02353310: + .byte 0x1A, 0x00, 0x00, 0x00, 0xE8, 0x3F, 0x00, 0x00 + .global ov29_02353318 +ov29_02353318: + .byte 0x3F, 0x0B, 0x40, 0x0B .byte 0x41, 0x0B, 0x42, 0x0B, 0x43, 0x0B, 0x00, 0x00 .global ov29_02353324 ov29_02353324: @@ -3777,10 +3951,19 @@ 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 - .byte 0x8C, 0x0B, 0x8E, 0x0B, 0x8F, 0x0B, 0x90, 0x0B, 0x91, 0x0B, 0x00, 0x00, 0x30, 0x3A, 0x83, 0x82 + .byte 0x8C, 0x0B, 0x8E, 0x0B, 0x8F, 0x0B, 0x90, 0x0B, 0x91, 0x0B, 0x00, 0x00 + .global ov29_02353368 +ov29_02353368: + .byte 0x30, 0x3A, 0x83, 0x82 .byte 0x83, 0x93, 0x83, 0x58, 0x83, 0x5E, 0x81, 0x5B, 0x2D, 0x49, 0x44, 0x81, 0x79, 0x25, 0x64, 0x81 - .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 0x7A, 0x00, 0x00, 0x00 + .global ov29_02353380 +ov29_02353380: + .byte 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 + .global ov29_02353398 +ov29_02353398: + .byte 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 .global ov29_023533B0 @@ -3939,7 +4122,10 @@ ov29_023535B0: .global ov29_023535B8 ov29_023535B8: .byte 0x2F, 0x30, 0x31, 0x32 - .byte 0x33, 0x34, 0x35, 0x00, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x00 + .byte 0x33, 0x34, 0x35, 0x00 + .global ov29_023535C0 +ov29_023535C0: + .byte 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x00 .global ov29_023535C8 ov29_023535C8: .word ov29_023527E0 @@ -3948,6 +4134,8 @@ ov29_023535C8: .global ov29_023535D4 ov29_023535D4: .byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_023535DC +ov29_023535DC: .byte 0x0C, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 .word ov29_0230D738 .byte 0x00, 0x00, 0x00, 0x00 @@ -4004,12 +4192,28 @@ ov29_023535D4: .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 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02353700 +ov29_02353700: + .byte 0x28, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00 + .global ov29_0235370C +ov29_0235370C: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_02353710 +ov29_02353710: + .byte 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 + .global ov29_0235371C +ov29_0235371C: + .byte 0xF4, 0x03, 0xF4, 0x03 + .global ov29_02353720 +ov29_02353720: + .byte 0xF5, 0x03, 0xF5, 0x03 + .global ov29_02353724 +ov29_02353724: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov29_0235372C ov29_0235372C: .byte 0x00, 0x00, 0x00, 0x00 @@ -4044,13 +4248,35 @@ ov29_02353798: .word ov29_02353140 .global ov29_023537B0 ov29_023537B0: - .byte 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x16, 0x00, 0x15, 0x00, 0x16, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023537B4 +ov29_023537B4: + .byte 0x15, 0x00, 0x16, 0x00, 0x15, 0x00, 0x16, 0x00 + .global ov29_023537BC +ov29_023537BC: .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 0x00, 0x00, 0x00, 0x00 + .global ov29_023537C8 +ov29_023537C8: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023537CC +ov29_023537CC: + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov29_023537D8 +ov29_023537D8: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023537E0 +ov29_023537E0: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023537E4 +ov29_023537E4: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov29_023537E8 +ov29_023537E8: + .byte 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 @@ -4205,7 +4431,10 @@ ov29_0237C9B8: .space 0x8 .global ov29_0237C9C0 ov29_0237C9C0: - .space 0x4 + .space 0x1 + .global ov29_0237C9C1 +ov29_0237C9C1: + .space 0x3 .global ov29_0237C9C4 ov29_0237C9C4: .space 0x1 @@ -4217,7 +4446,10 @@ ov29_0237C9C8: .space 0x1 .global ov29_0237C9C9 ov29_0237C9C9: - .space 0x7 + .space 0x3 + .global ov29_0237C9CC +ov29_0237C9CC: + .space 0x4 .global ov29_0237C9D0 ov29_0237C9D0: .space 0x8 @@ -4244,13 +4476,31 @@ ov29_0237CA68: .space 0x1 .global ov29_0237CA69 ov29_0237CA69: - .space 0x3 + .space 0x1 + .global ov29_0237CA6A +ov29_0237CA6A: + .space 0x1 + .global ov29_0237CA6B +ov29_0237CA6B: + .space 0x1 .global ov29_0237CA6C ov29_0237CA6C: - .space 0x8 + .space 0x1 + .global ov29_0237CA6D +ov29_0237CA6D: + .space 0x3 + .global ov29_0237CA70 +ov29_0237CA70: + .space 0x4 .global ov29_0237CA74 ov29_0237CA74: - .space 0xC + .space 0x4 + .global ov29_0237CA78 +ov29_0237CA78: + .space 0x4 + .global ov29_0237CA7C +ov29_0237CA7C: + .space 0x4 .global ov29_0237CA80 ov29_0237CA80: .space 0x4 @@ -4259,7 +4509,25 @@ ov29_0237CA84: .space 0x4 .global ov29_0237CA88 ov29_0237CA88: - .space 0x44 + .space 0x4 + .global ov29_0237CA8C +ov29_0237CA8C: + .space 0x4 + .global ov29_0237CA90 +ov29_0237CA90: + .space 0x6 + .global ov29_0237CA96 +ov29_0237CA96: + .space 0xA + .global ov29_0237CAA0 +ov29_0237CAA0: + .space 0xC + .global ov29_0237CAAC +ov29_0237CAAC: + .space 0xC + .global ov29_0237CAB8 +ov29_0237CAB8: + .space 0x14 .global ov29_0237CACC ov29_0237CACC: .space 0x274 @@ -4280,7 +4548,13 @@ ov29_0237CFC0: .space 0x3C .global ov29_0237CFFC ov29_0237CFFC: - .space 0x5808 + .space 0x4 + .global ov29_0237D000 +ov29_0237D000: + .space 0x5800 + .global ov29_02382800 +ov29_02382800: + .space 0x4 .global ov29_02382804 ov29_02382804: .space 0x8 From 37c3e6fd5f9863b23cec3309570b309af7f888d0 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 21 Sep 2023 23:47:30 -0400 Subject: [PATCH 2/5] Defined pointers for overlay 30 --- asm/include/overlay_30.inc | 58 +++--- asm/overlay_30.s | 402 +++++++++++++++++++------------------ 2 files changed, 235 insertions(+), 225 deletions(-) diff --git a/asm/include/overlay_30.inc b/asm/include/overlay_30.inc index 44418961..b4f8f03d 100644 --- a/asm/include/overlay_30.inc +++ b/asm/include/overlay_30.inc @@ -1,37 +1,39 @@ #pragma once -.public ov29_022DEA10 -.public sub_02029FBC -.public ov29_023021F0 .public BindTrapToTile +.public DungeonGetSpriteIndex +.public GetItemInfo +.public GetTileSafe +.public GetTrapInfo .public MemAlloc -.public sub_02029F88 -.public ov29_02338F24 -.public sub_02003BC8 -.public ReadQuickSaveInfo -.public SpawnTrap .public MemFree .public memset -.public ov29_02344B30 -.public GetTrapInfo -.public SpawnItem -.public UpdateEntityPixelPos -.public sub_02048DC4 -.public ov29_022E2018 -.public NoteSaveBase -.public ov29_022E1C84 -.public WriteQuickSaveInfo -.public sub_02034DA8 .public MemZero +.public NoteSaveBase .public ov29_022DE9F8 -.public ov29_022E2978 -.public ov29_02338768 -.public ov29_02344B1C -.public DungeonGetSpriteIndex -.public ov29_022FB920 -.public sub_02034EB4 -.public sub_02034D0C -.public GetItemInfo -.public sub_02003B94 +.public ov29_022DEA10 .public ov29_022E1AF4 +.public ov29_022E1C84 .public ov29_022E1EC4 -.public GetTileSafe +.public ov29_022E2018 +.public ov29_022E2978 +.public ov29_022FB920 +.public ov29_023021F0 +.public ov29_02338768 +.public ov29_02338F24 +.public ov29_02344B1C +.public ov29_02344B30 +.public ov29_02353538 +.public ov29_0235355C +.public ReadQuickSaveInfo +.public SpawnItem +.public SpawnTrap +.public sub_02003B94 +.public sub_02003BC8 +.public sub_02029F88 +.public sub_02029FBC +.public sub_02034D0C +.public sub_02034DA8 +.public sub_02034EB4 +.public sub_02048DC4 +.public UpdateEntityPixelPos +.public WriteQuickSaveInfo diff --git a/asm/overlay_30.s b/asm/overlay_30.s index e035eb0f..852e9991 100644 --- a/asm/overlay_30.s +++ b/asm/overlay_30.s @@ -147,7 +147,7 @@ ov30_023829CC: ; 0x023829CC mov r1, #5 mov r4, r2 bl MemAlloc - ldr r1, _02382A2C ; =0x023860A4 + ldr r1, _02382A2C ; =ov30_023860A4 ldr r3, _02382A30 ; =0x21061522 str r0, [r1] str r6, [r0, #4] @@ -165,14 +165,14 @@ ov30_023829CC: ; 0x023829CC str r2, [r0] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02382A2C: .word 0x023860A4 +_02382A2C: .word ov30_023860A4 _02382A30: .word 0x21061522 arm_func_end ov30_023829CC arm_func_start ov30_02382A34 ov30_02382A34: ; 0x02382A34 stmdb sp!, {r3, lr} - ldr r0, _02382C0C ; =0x023860A4 + ldr r0, _02382C0C ; =ov30_023860A4 ldr r1, [r0] ldr r0, [r1] cmp r0, #5 @@ -198,7 +198,7 @@ _02382A88: ldr r1, _02382C18 ; =0x00000242 bl sub_02034EB4 _02382A90: - ldr r0, _02382C0C ; =0x023860A4 + ldr r0, _02382C0C ; =ov30_023860A4 mov r1, #1 ldr r0, [r0] str r1, [r0] @@ -214,11 +214,11 @@ _02382AA4: bl sub_02003B94 ldr r0, _02382C1C ; =0x000F1209 bl sub_02048DC4 - ldr r0, _02382C0C ; =0x023860A4 + ldr r0, _02382C0C ; =ov30_023860A4 ldr r1, [r0] ldmib r1, {r0, r1} bl WriteQuickSaveInfo - ldr r1, _02382C0C ; =0x023860A4 + ldr r1, _02382C0C ; =ov30_023860A4 mov r2, #2 ldr r3, [r1] str r0, [r3, #0x10] @@ -232,7 +232,7 @@ _02382AFC: bne _02382B40 mov r0, #2 bl NoteSaveBase - ldr r1, _02382C0C ; =0x023860A4 + ldr r1, _02382C0C ; =ov30_023860A4 ldr r2, [r1] str r0, [r2, #0x10] ldr r0, [r1] @@ -241,13 +241,13 @@ _02382AFC: bne _02382B40 ldr r0, _02382C20 ; =0x000F1207 bl sub_02048DC4 - ldr r1, _02382C0C ; =0x023860A4 + ldr r1, _02382C0C ; =ov30_023860A4 ldr r1, [r1] str r0, [r1, #0x10] _02382B40: bl sub_02003BC8 bl sub_02029FBC - ldr r0, _02382C0C ; =0x023860A4 + ldr r0, _02382C0C ; =ov30_023860A4 ldr r0, [r0] ldr r0, [r0, #0x10] cmp r0, #0 @@ -260,7 +260,7 @@ _02382B68: mov r1, #0x244 mov r2, #0 bl sub_02034EB4 - ldr r0, _02382C0C ; =0x023860A4 + ldr r0, _02382C0C ; =ov30_023860A4 mov r1, #3 ldr r0, [r0] str r1, [r0] @@ -270,7 +270,7 @@ _02382B8C: mov r1, #0x238 mov r2, #0 bl sub_02034EB4 - ldr r0, _02382C0C ; =0x023860A4 + ldr r0, _02382C0C ; =ov30_023860A4 mov r1, #4 ldr r0, [r0] str r1, [r0] @@ -280,7 +280,7 @@ _02382BB0: ldr r1, _02382C2C ; =0x00000239 mov r2, #0 bl sub_02034EB4 - ldr r0, _02382C0C ; =0x023860A4 + ldr r0, _02382C0C ; =ov30_023860A4 mov r1, #3 ldr r0, [r0] str r1, [r0] @@ -288,7 +288,7 @@ _02382BB0: _02382BD4: bl sub_02034DA8 cmp r0, #0 - ldreq r0, _02382C0C ; =0x023860A4 + ldreq r0, _02382C0C ; =ov30_023860A4 moveq r1, #5 ldreq r0, [r0] streq r1, [r0] @@ -303,7 +303,7 @@ _02382C04: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_02382C0C: .word 0x023860A4 +_02382C0C: .word ov30_023860A4 _02382C10: .word 0x00000408 _02382C14: .word 0x00000241 _02382C18: .word 0x00000242 @@ -317,20 +317,20 @@ _02382C2C: .word 0x00000239 arm_func_start ov30_02382C30 ov30_02382C30: ; 0x02382C30 stmdb sp!, {r3, lr} - ldr r0, _02382C64 ; =0x023860A4 + ldr r0, _02382C64 ; =ov30_023860A4 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl sub_02034D0C - ldr r0, _02382C64 ; =0x023860A4 + ldr r0, _02382C64 ; =ov30_023860A4 ldr r0, [r0] bl MemFree - ldr r0, _02382C64 ; =0x023860A4 + ldr r0, _02382C64 ; =ov30_023860A4 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_02382C64: .word 0x023860A4 +_02382C64: .word ov30_023860A4 arm_func_end ov30_02382C30 arm_func_start ov30_02382C68 @@ -352,26 +352,26 @@ WriteQuicksaveData: ; 0x02382C6C mov r2, #4 str r3, [sp] bl ov30_02385C54 - ldr r1, _02382D6C ; =0x02386080 + ldr r1, _02382D6C ; =ov30_02386080 add r0, sp, #4 bl ov30_02385CE0 - ldr r1, _02382D70 ; =0x02353538 + ldr r1, _02382D70 ; =ov29_02353538 add r0, sp, #4 ldr r1, [r1] mov r2, #0xac add r1, r1, #0x348 add r1, r1, #0x400 bl ov30_02385C54 - ldr r1, _02382D6C ; =0x02386080 + ldr r1, _02382D6C ; =ov30_02386080 add r0, sp, #4 bl ov30_02385CE0 - ldr r2, _02382D70 ; =0x02353538 + ldr r2, _02382D70 ; =ov29_02353538 ldr r1, _02382D74 ; =0x0002C9E6 ldr r2, [r2] add r0, sp, #4 ldrsh r1, [r2, r1] bl ov30_02385D34 - ldr r5, _02382D70 ; =0x02353538 + ldr r5, _02382D70 ; =ov29_02353538 ldr r4, _02382D78 ; =0x0002C9EA mov r7, #0 add r6, sp, #4 @@ -398,7 +398,7 @@ _02382CF8: bl ov30_02382FB8 add r0, sp, #4 bl ov30_02383084 - ldr r1, _02382D7C ; =0x0238608C + ldr r1, _02382D7C ; =ov30_0238608C add r0, sp, #4 bl ov30_02385CE0 add r0, sp, #4 @@ -406,11 +406,11 @@ _02382CF8: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02382D6C: .word 0x02386080 -_02382D70: .word 0x02353538 +_02382D6C: .word ov30_02386080 +_02382D70: .word ov29_02353538 _02382D74: .word 0x0002C9E6 _02382D78: .word 0x0002C9EA -_02382D7C: .word 0x0238608C +_02382D7C: .word ov30_0238608C arm_func_end WriteQuicksaveData arm_func_start ov31_02382D80 @@ -426,12 +426,12 @@ _02382D98: add r2, r2, #1 cmp r2, #5 blt _02382D98 - ldr r1, _02382E8C ; =0x02386080 + ldr r1, _02382E8C ; =ov30_02386080 mov r0, sl bl ov30_02385CE0 mov sb, #0 mov r5, #1 - ldr r4, _02382E90 ; =0x02353538 + ldr r4, _02382E90 ; =ov29_02353538 mov fp, r5 mov r7, sb _02382DC8: @@ -495,8 +495,8 @@ _02382E78: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02382E8C: .word 0x02386080 -_02382E90: .word 0x02353538 +_02382E8C: .word ov30_02386080 +_02382E90: .word ov29_02353538 arm_func_end ov30_02382E18 arm_func_start ov30_02382E94 @@ -512,12 +512,12 @@ _02382EAC: add r2, r2, #1 cmp r2, #7 blt _02382EAC - ldr r1, _02382FB0 ; =0x02386080 + ldr r1, _02382FB0 ; =ov30_02386080 mov r0, sl bl ov30_02385CE0 mov sb, #0 mov r5, #1 - ldr r4, _02382FB4 ; =0x02353538 + ldr r4, _02382FB4 ; =ov29_02353538 mov fp, r5 mov r7, sb _02382EDC: @@ -577,15 +577,15 @@ _02382F9C: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02382FB0: .word 0x02386080 -_02382FB4: .word 0x02353538 +_02382FB0: .word ov30_02386080 +_02382FB4: .word ov29_02353538 arm_func_end ov30_02382E94 arm_func_start ov30_02382FB8 ov30_02382FB8: ; 0x02382FB8 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _0238307C ; =0x02353538 - ldr r1, _02383080 ; =0x02386080 + ldr r2, _0238307C ; =ov29_02353538 + ldr r1, _02383080 ; =ov30_02386080 ldr r2, [r2] mov r5, r0 add r2, r2, #0x2c @@ -634,77 +634,77 @@ _02383034: bl ov30_02385C54 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_0238307C: .word 0x02353538 -_02383080: .word 0x02386080 +_0238307C: .word ov29_02353538 +_02383080: .word ov30_02386080 arm_func_end ov30_02382FB8 arm_func_start ov30_02383084 ov30_02383084: ; 0x02383084 stmdb sp!, {r4, r5, r6, lr} - ldr r1, _023831E0 ; =0x02386080 + ldr r1, _023831E0 ; =ov30_02386080 mov r4, r0 bl ov30_02385CE0 - ldr r1, _023831E4 ; =0x02353538 + ldr r1, _023831E4 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x3000 ldr r1, [r1, #0xe2c] bl ov30_02385D74 - ldr r1, _023831E4 ; =0x02353538 + ldr r1, _023831E4 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x3000 ldr r1, [r1, #0xe30] bl ov30_02385D74 - ldr r1, _023831E4 ; =0x02353538 + ldr r1, _023831E4 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x3000 ldrb r1, [r1, #0xe34] bl ov30_02385DD4 - ldr r1, _023831E4 ; =0x02353538 + ldr r1, _023831E4 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x3000 ldrb r1, [r1, #0xe35] bl ov30_02385DD4 - ldr r1, _023831E4 ; =0x02353538 + ldr r1, _023831E4 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x3000 ldrb r1, [r1, #0xe36] bl ov30_02385DD4 - ldr r1, _023831E4 ; =0x02353538 + ldr r1, _023831E4 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x3000 ldrb r1, [r1, #0xe37] bl ov30_02385DD4 - ldr r1, _023831E4 ; =0x02353538 + ldr r1, _023831E4 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x3000 ldrb r1, [r1, #0xe38] bl ov30_02385DD4 - ldr r1, _023831E4 ; =0x02353538 + ldr r1, _023831E4 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x3000 ldrb r1, [r1, #0xe39] bl ov30_02385DD4 - ldr r1, _023831E4 ; =0x02353538 + ldr r1, _023831E4 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x3000 ldrb r1, [r1, #0xe3c] bl ov30_02385DD4 - ldr r1, _023831E4 ; =0x02353538 + ldr r1, _023831E4 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x3e00 ldrh r1, [r1, #0x3a] bl ov30_02385D14 - ldr r5, _023831E4 ; =0x02353538 + ldr r5, _023831E4 ; =ov29_02353538 mov r6, #0 _0238318C: ldr r1, [r5] @@ -716,7 +716,7 @@ _0238318C: add r6, r6, #1 cmp r6, #4 blt _0238318C - ldr r5, _023831E4 ; =0x02353538 + ldr r5, _023831E4 ; =ov29_02353538 mov r6, #0 _023831B8: ldr r1, [r5] @@ -730,8 +730,8 @@ _023831B8: blt _023831B8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023831E0: .word 0x02386080 -_023831E4: .word 0x02353538 +_023831E0: .word ov30_02386080 +_023831E4: .word ov29_02353538 arm_func_end ov30_02383084 arm_func_start ov30_023831E8 @@ -1437,97 +1437,97 @@ _02383C4C: arm_func_start ov30_02383C70 ov30_02383C70: ; 0x02383C70 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r1, _02384090 ; =0x02386080 + ldr r1, _02384090 ; =ov30_02386080 mov sl, r0 bl ov30_02385CE0 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc4] bl ov30_02385DD4 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc5] bl ov30_02385DD4 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc6] bl ov30_02385DD4 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc7] bl ov30_02385DD4 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc8] bl ov30_02385DD4 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xc9] bl ov30_02385D54 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xca] bl ov30_02385D54 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldr r1, [r1, #0xcc] and r1, r1, #0xff bl ov30_02385D54 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldr r1, [r1, #0xd0] and r1, r1, #0xff bl ov30_02385D54 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrsh r1, [r1, #0xd4] bl ov30_02385D34 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrsh r1, [r1, #0xd6] bl ov30_02385D34 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrsh r1, [r1, #0xd8] bl ov30_02385D34 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrb r1, [r1, #0xda] bl ov30_02385D34 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x4000 ldrsh r1, [r1, #0xde] bl ov30_02385D34 mov r8, #0 - ldr r6, _02384094 ; =0x02353538 + ldr r6, _02384094 ; =ov29_02353538 mov fp, r8 mov r4, #0x14 mov r5, #0x460 @@ -1548,19 +1548,19 @@ _02383DF4: add r8, r8, #1 cmp r8, #0x20 blt _02383DEC - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0xce0 add r1, r1, #0xc000 bl ov30_02385DF8 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0xe4 add r1, r1, #0xcc00 bl ov30_02385DF8 - ldr r0, _02384094 ; =0x02353538 + ldr r0, _02384094 ; =ov29_02353538 mvn r1, #0 ldr r0, [r0] add r0, r0, #0xcc00 @@ -1580,7 +1580,7 @@ _02383DF4: add r1, sp, #0 mov r0, sl bl ov30_02385DF8 - ldr r4, _02384094 ; =0x02353538 + ldr r4, _02384094 ; =ov29_02353538 mov r5, #0 _02383EB0: ldr r1, [r4] @@ -1592,7 +1592,7 @@ _02383EB0: add r5, r5, #1 cmp r5, #8 blt _02383EB0 - ldr r4, _02384094 ; =0x02353538 + ldr r4, _02384094 ; =ov29_02353538 mov r5, #0 _02383EDC: ldr r1, [r4] @@ -1604,26 +1604,26 @@ _02383EDC: add r5, r5, #1 cmp r5, #8 blt _02383EDC - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x114 add r1, r1, #0xcc00 bl ov30_02385E48 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x124 add r1, r1, #0xcc00 bl ov30_02385E48 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x134 add r1, r1, #0xcc00 bl ov30_02385E90 mov r8, #0 - ldr r6, _02384094 ; =0x02353538 + ldr r6, _02384094 ; =ov29_02353538 mov fp, r8 mov r4, #0x14 mov r5, #0xa0 @@ -1651,7 +1651,7 @@ _02383F64: add r8, r8, #1 cmp r8, #8 blt _02383F5C - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] mov r2, #1 @@ -1688,7 +1688,7 @@ _02383FE8: ldrb r1, [r4, #0x25] mov r0, sl bl ov30_02385DD4 - ldr r1, _02384094 ; =0x02353538 + ldr r1, _02384094 ; =ov29_02353538 mov r0, sl ldr r1, [r1] mov r2, #1 @@ -1701,130 +1701,130 @@ _02383FE8: mov r2, #1 bl ov30_02385C54 mov r0, sl - ldr r2, _02384094 ; =0x02353538 + ldr r2, _02384094 ; =ov29_02353538 ldr r1, _02384098 ; =0x00012AFE ldr r2, [r2] ldrsh r1, [r2, r1] bl ov30_02385D34 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02384090: .word 0x02386080 -_02384094: .word 0x02353538 +_02384090: .word ov30_02386080 +_02384094: .word ov29_02353538 _02384098: .word 0x00012AFE arm_func_end ov30_02383C70 arm_func_start ov30_0238409C ov30_0238409C: ; 0x0238409C stmdb sp!, {r4, lr} - ldr r1, _02384200 ; =0x02386080 + ldr r1, _02384200 ; =ov30_02386080 mov r4, r0 bl ov30_02385CE0 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x23c] bl ov30_02385D54 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x23d] bl ov30_02385D54 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x23e] bl ov30_02385DD4 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x23f] bl ov30_02385DD4 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x240] bl ov30_02385DD4 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 mov r0, r4 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x242] bl ov30_02385DD4 mov r0, r4 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x24f] bl ov30_02385DD4 mov r0, r4 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x243] bl ov30_02385DD4 mov r0, r4 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x24e] bl ov30_02385DD4 mov r0, r4 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x250] bl ov30_02385DD4 mov r0, r4 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x244] bl ov30_02385DD4 mov r0, r4 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x245] bl ov30_02385DD4 mov r0, r4 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x246] bl ov30_02385DD4 mov r0, r4 - ldr r1, _02384204 ; =0x02353538 + ldr r1, _02384204 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 ldrb r1, [r1, #0x248] bl ov30_02385DD4 ldmia sp!, {r4, pc} .align 2, 0 -_02384200: .word 0x02386080 -_02384204: .word 0x02353538 +_02384200: .word ov30_02386080 +_02384204: .word ov29_02353538 arm_func_end ov30_0238409C arm_func_start ov30_02384208 ov30_02384208: ; 0x02384208 stmdb sp!, {r4, lr} - ldr r2, _02384258 ; =0x02353538 + ldr r2, _02384258 ; =ov29_02353538 ldr r1, _0238425C ; =0x0002CB02 ldr r2, [r2] mov r4, r0 ldrsh r1, [r2, r1] bl ov30_02385D34 - ldr r0, _02384258 ; =0x02353538 + ldr r0, _02384258 ; =ov29_02353538 ldr r1, _02384260 ; =0x0002CB04 ldr r2, [r0] mov r0, r4 ldrsh r1, [r2, r1] bl ov30_02385D34 - ldr r0, _02384258 ; =0x02353538 + ldr r0, _02384258 ; =ov29_02353538 ldr r1, _02384264 ; =0x0002CB06 ldr r2, [r0] mov r0, r4 @@ -1832,7 +1832,7 @@ ov30_02384208: ; 0x02384208 bl ov30_02385D34 ldmia sp!, {r4, pc} .align 2, 0 -_02384258: .word 0x02353538 +_02384258: .word ov29_02353538 _0238425C: .word 0x0002CB02 _02384260: .word 0x0002CB04 _02384264: .word 0x0002CB06 @@ -1894,22 +1894,22 @@ ov30_023842F4: ; 0x023842F4 add r1, sp, #0 mov r2, #4 bl ov30_02385CA4 - ldr r1, _023843F0 ; =0x02386080 + ldr r1, _023843F0 ; =ov30_02386080 add r0, sp, #4 bl ov30_02385CF0 - ldr r1, _023843F4 ; =0x02353538 + ldr r1, _023843F4 ; =ov29_02353538 add r0, sp, #4 ldr r1, [r1] mov r2, #0xac add r1, r1, #0x348 add r1, r1, #0x400 bl ov30_02385CA4 - ldr r1, _023843F0 ; =0x02386080 + ldr r1, _023843F0 ; =ov30_02386080 add r0, sp, #4 bl ov30_02385CF0 add r0, sp, #4 bl ov30_02385EDC - ldr r6, _023843F4 ; =0x02353538 + ldr r6, _023843F4 ; =ov29_02353538 ldr r1, _023843F8 ; =0x0002C9E6 ldr r2, [r6] mov r4, #0 @@ -1939,7 +1939,7 @@ _02384378: bl ov30_02384C6C add r0, sp, #4 bl ov30_02384CD4 - ldr r1, _023843FC ; =0x0238608C + ldr r1, _023843FC ; =ov30_0238608C add r0, sp, #4 bl ov30_02385CF0 add r0, sp, #4 @@ -1948,99 +1948,99 @@ _02384378: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_023843F0: .word 0x02386080 -_023843F4: .word 0x02353538 +_023843F0: .word ov30_02386080 +_023843F4: .word ov29_02353538 _023843F8: .word 0x0002C9E6 -_023843FC: .word 0x0238608C +_023843FC: .word ov30_0238608C arm_func_end ov30_023842F4 arm_func_start ov30_02384400 ov30_02384400: ; 0x02384400 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r1, _02384830 ; =0x02386080 + ldr r1, _02384830 ; =ov30_02386080 mov sl, r0 bl ov30_02385CF0 mov r0, sl bl ov30_02385F54 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strb r0, [r1, #0xc4] mov r0, sl bl ov30_02385F54 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strb r0, [r1, #0xc5] mov r0, sl bl ov30_02385F54 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strb r0, [r1, #0xc6] mov r0, sl bl ov30_02385F54 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strb r0, [r1, #0xc7] mov r0, sl bl ov30_02385F54 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strb r0, [r1, #0xc8] mov r0, sl bl ov30_02385EF4 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strb r0, [r1, #0xc9] mov r0, sl bl ov30_02385EF4 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strb r0, [r1, #0xca] mov r0, sl bl ov30_02385EF4 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 str r0, [r1, #0xcc] mov r0, sl bl ov30_02385EF4 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 str r0, [r1, #0xd0] mov r0, sl bl ov30_02385EDC - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strh r0, [r1, #0xd4] mov r0, sl bl ov30_02385EDC - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strh r0, [r1, #0xd6] mov r0, sl bl ov30_02385EDC - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strh r0, [r1, #0xd8] mov r0, sl bl ov30_02385EDC - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x4000 strb r0, [r1, #0xda] mov r0, sl bl ov30_02385EDC - ldr r6, _02384834 ; =0x02353538 + ldr r6, _02384834 ; =ov29_02353538 mov r8, #0 ldr r1, [r6] mov fp, r8 @@ -2065,26 +2065,26 @@ _02384578: add r8, r8, #1 cmp r8, #0x20 blt _02384570 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0xce0 add r1, r1, #0xc000 bl ov30_02385F7C - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0xe4 add r1, r1, #0xcc00 bl ov30_02385F7C - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0xe8 add r1, r1, #0xcc00 bl ov30_02385F7C - ldr r0, _02384834 ; =0x02353538 - ldr r4, _02384834 ; =0x02353538 + ldr r0, _02384834 ; =ov29_02353538 + ldr r4, _02384834 ; =ov29_02353538 ldr r0, [r0] mov r5, #0 add r0, r0, #0xcc00 @@ -2092,7 +2092,7 @@ _02384578: cmp r1, #0xff mvneq r1, #0 streqh r1, [r0, #0xe8] - ldr r0, _02384834 ; =0x02353538 + ldr r0, _02384834 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0xcc00 ldrsh r1, [r0, #0xea] @@ -2109,7 +2109,7 @@ _02384634: add r5, r5, #1 cmp r5, #8 blt _02384634 - ldr r4, _02384834 ; =0x02353538 + ldr r4, _02384834 ; =ov29_02353538 mov r5, #0 _02384660: mov r0, sl @@ -2121,26 +2121,26 @@ _02384660: strb r0, [r1, #0xd0c] cmp r5, #8 blt _02384660 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x114 add r1, r1, #0xcc00 bl ov30_02385FE4 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x124 add r1, r1, #0xcc00 bl ov30_02385FE4 - ldr r1, _02384834 ; =0x02353538 + ldr r1, _02384834 ; =ov29_02353538 mov r0, sl ldr r1, [r1] add r1, r1, #0x134 add r1, r1, #0xcc00 bl ov30_02386040 mov r8, #0 - ldr r6, _02384834 ; =0x02353538 + ldr r6, _02384834 ; =ov29_02353538 mov fp, r8 mov r4, #0x14 mov r5, #0xa0 @@ -2168,7 +2168,7 @@ _023846E8: add r8, r8, #1 cmp r8, #8 blt _023846E0 - ldr r0, _02384834 ; =0x02353538 + ldr r0, _02384834 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] mov r2, #0x26 @@ -2209,7 +2209,7 @@ _0238477C: mov r0, sl bl ov30_02385F54 strb r0, [r4, #0x25] - ldr r0, _02384834 ; =0x02353538 + ldr r0, _02384834 ; =ov29_02353538 mov r1, #2 ldr r0, [r0] add r0, r0, #0x2fc @@ -2226,14 +2226,14 @@ _0238477C: bl ov30_02385CA4 mov r0, sl bl ov30_02385EDC - ldr r2, _02384834 ; =0x02353538 + ldr r2, _02384834 ; =ov29_02353538 ldr r1, _02384838 ; =0x00012AFE ldr r2, [r2] strh r0, [r2, r1] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02384830: .word 0x02386080 -_02384834: .word 0x02353538 +_02384830: .word ov30_02386080 +_02384834: .word ov29_02353538 _02384838: .word 0x00012AFE arm_func_end ov30_02384400 @@ -2269,102 +2269,102 @@ ov30_0238483C: ; 0x0238483C arm_func_start ov30_023848A0 ov30_023848A0: ; 0x023848A0 stmdb sp!, {r4, lr} - ldr r1, _02384A18 ; =0x02386080 + ldr r1, _02384A18 ; =ov30_02386080 mov r4, r0 bl ov30_02385CF0 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 mov r0, r4 ldr r1, [r1] mov r2, #0 add r1, r1, #0x1a000 str r2, [r1, #0x22c] bl ov30_02385EF4 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x23c] mov r0, r4 bl ov30_02385EF4 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x23d] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x23e] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x23f] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x240] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x242] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x24f] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x243] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x24e] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x250] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x244] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x245] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x246] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384A1C ; =0x02353538 + ldr r1, _02384A1C ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x1a000 strb r0, [r1, #0x248] ldmia sp!, {r4, pc} .align 2, 0 -_02384A18: .word 0x02386080 -_02384A1C: .word 0x02353538 +_02384A18: .word ov30_02386080 +_02384A1C: .word ov29_02353538 arm_func_end ov30_023848A0 arm_func_start ov30_02384A20 @@ -2372,19 +2372,19 @@ ov30_02384A20: ; 0x02384A20 stmdb sp!, {r4, lr} mov r4, r0 bl ov30_02385EDC - ldr r2, _02384A80 ; =0x02353538 + ldr r2, _02384A80 ; =ov29_02353538 ldr r1, _02384A84 ; =0x0002CB02 ldr r2, [r2] strh r0, [r2, r1] mov r0, r4 bl ov30_02385EDC - ldr r2, _02384A80 ; =0x02353538 + ldr r2, _02384A80 ; =ov29_02353538 ldr r1, _02384A88 ; =0x0002CB04 ldr r2, [r2] strh r0, [r2, r1] mov r0, r4 bl ov30_02385EDC - ldr r2, _02384A80 ; =0x02353538 + ldr r2, _02384A80 ; =ov29_02353538 ldr r1, _02384A8C ; =0x0002CB06 ldr ip, [r2] ldr r3, _02384A90 ; =0x000003E7 @@ -2394,7 +2394,7 @@ ov30_02384A20: ; 0x02384A20 strh r3, [r2, r0] ldmia sp!, {r4, pc} .align 2, 0 -_02384A80: .word 0x02353538 +_02384A80: .word ov29_02353538 _02384A84: .word 0x0002CB02 _02384A88: .word 0x0002CB04 _02384A8C: .word 0x0002CB06 @@ -2407,7 +2407,7 @@ ov30_02384A94: ; 0x02384A94 sub sp, sp, #0xc mov r7, r0 bl ov29_02344B1C - ldr r1, _02384B20 ; =0x02386080 + ldr r1, _02384B20 ; =ov30_02386080 mov r0, r7 bl ov30_02385CF0 mov r6, #0 @@ -2441,7 +2441,7 @@ _02384B08: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02384B20: .word 0x02386080 +_02384B20: .word ov30_02386080 arm_func_end ov30_02384A94 arm_func_start ov30_02384B24 @@ -2476,7 +2476,7 @@ ov30_02384B24: ; 0x02384B24 ov30_02384B84: ; 0x02384B84 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 - ldr r1, _02384C68 ; =0x02386080 + ldr r1, _02384C68 ; =ov30_02386080 mov sl, r0 bl ov30_02385CF0 mov sb, #0 @@ -2534,14 +2534,14 @@ _02384C54: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02384C68: .word 0x02386080 +_02384C68: .word ov30_02386080 arm_func_end ov30_02384B84 arm_func_start ov30_02384C6C ov30_02384C6C: ; 0x02384C6C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 - ldr r1, _02384CCC ; =0x02386080 + ldr r1, _02384CCC ; =ov30_02386080 mov r6, r0 bl ov30_02385CF0 mov r0, r6 @@ -2557,7 +2557,7 @@ ov30_02384C6C: ; 0x02384C6C beq _02384CC4 add r0, sp, #0 bl ov29_02338768 - ldr r0, _02384CD0 ; =0x02353538 + ldr r0, _02384CD0 ; =ov29_02353538 ldr r0, [r0] add r0, r0, #0x19000 strb r4, [r0, #0x84c] @@ -2565,73 +2565,73 @@ _02384CC4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02384CCC: .word 0x02386080 -_02384CD0: .word 0x02353538 +_02384CCC: .word ov30_02386080 +_02384CD0: .word ov29_02353538 arm_func_end ov30_02384C6C arm_func_start ov30_02384CD4 ov30_02384CD4: ; 0x02384CD4 stmdb sp!, {r4, r5, r6, lr} - ldr r1, _02384E20 ; =0x02386080 + ldr r1, _02384E20 ; =ov30_02386080 mov r4, r0 bl ov30_02385CF0 mov r0, r4 bl ov30_02385F0C - ldr r1, _02384E24 ; =0x02353538 + ldr r1, _02384E24 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x3000 str r0, [r1, #0xe2c] mov r0, r4 bl ov30_02385F0C - ldr r1, _02384E24 ; =0x02353538 + ldr r1, _02384E24 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x3000 str r0, [r1, #0xe30] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384E24 ; =0x02353538 + ldr r1, _02384E24 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x3000 strb r0, [r1, #0xe34] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384E24 ; =0x02353538 + ldr r1, _02384E24 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x3000 strb r0, [r1, #0xe35] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384E24 ; =0x02353538 + ldr r1, _02384E24 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x3000 strb r0, [r1, #0xe36] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384E24 ; =0x02353538 + ldr r1, _02384E24 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x3000 strb r0, [r1, #0xe37] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384E24 ; =0x02353538 + ldr r1, _02384E24 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x3000 strb r0, [r1, #0xe38] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384E24 ; =0x02353538 + ldr r1, _02384E24 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x3000 strb r0, [r1, #0xe39] mov r0, r4 bl ov30_02385F54 - ldr r1, _02384E24 ; =0x02353538 + ldr r1, _02384E24 ; =ov29_02353538 ldr r1, [r1] add r1, r1, #0x3000 strb r0, [r1, #0xe3c] mov r0, r4 bl ov30_02385EC4 - ldr r1, _02384E24 ; =0x02353538 + ldr r1, _02384E24 ; =ov29_02353538 mov r6, #0 ldr r1, [r1] mov r5, #1 @@ -2657,8 +2657,8 @@ _02384E00: blt _02384E00 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02384E20: .word 0x02386080 -_02384E24: .word 0x02353538 +_02384E20: .word ov30_02386080 +_02384E24: .word ov29_02353538 arm_func_end ov30_02384CD4 arm_func_start ov30_02384E28 @@ -2688,7 +2688,7 @@ ov30_02384E28: ; 0x02384E28 mov r0, sl bl ov30_02385EC4 mov r6, r0 - ldr r1, _023859D8 ; =0x0235355C + ldr r1, _023859D8 ; =ov29_0235355C mov r2, #0 mov r0, sl str r2, [r1] @@ -3369,7 +3369,7 @@ _023858D8: strb r0, [r1, #0x16b] cmp r4, #5 blt _023858D8 - ldr r0, _023859D8 ; =0x0235355C + ldr r0, _023859D8 ; =ov29_0235355C mov r1, #0 str r1, [r0] cmp fp, #0 @@ -3413,7 +3413,7 @@ _02385988: stmia sb!, {r0, r1, r2, r3} subs r8, r8, #1 bne _02385988 - ldr r0, _023859D8 ; =0x0235355C + ldr r0, _023859D8 ; =ov29_0235355C mov r1, #0 str r1, [r0] ldrb r0, [r4, #7] @@ -3432,7 +3432,7 @@ _023859D0: add sp, sp, #0x258 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_023859D8: .word 0x0235355C +_023859D8: .word ov29_0235355C arm_func_end ov30_023853E0 arm_func_start ov30_023859DC @@ -3457,7 +3457,7 @@ ov30_023859DC: ; 0x023859DC cmp r0, #0 moveq r0, #0 beq _02385B04 - ldr r2, _02385B0C ; =0x02353538 + ldr r2, _02385B0C ; =ov29_02353538 mov r1, #1 ldr r0, [r2] add r3, r7, r7, lsl #3 @@ -3515,7 +3515,7 @@ _02385B04: add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02385B0C: .word 0x02353538 +_02385B0C: .word ov29_02353538 arm_func_end ov30_023859DC arm_func_start ov30_02385B10 @@ -3540,7 +3540,7 @@ ov30_02385B10: ; 0x02385B10 cmp r0, #0 mov r0, #0 beq _02385C30 - ldr ip, _02385C38 ; =0x02353538 + ldr ip, _02385C38 ; =ov29_02353538 mov r1, #1 ldr r2, [ip] add r3, r7, r7, lsl #3 @@ -3596,7 +3596,7 @@ _02385C30: add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02385C38: .word 0x02353538 +_02385C38: .word ov29_02353538 arm_func_end ov30_02385B10 arm_func_start ov30_02385C3C @@ -4008,10 +4008,18 @@ _0238607C: .word ov30_02385CA4 arm_func_end ov30_02386074 ; 0x02386080 - .byte 0x82, 0xDD, 0x82, 0xB3, 0x82, 0xAB, 0x97, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x82, 0xE2, 0x82, 0xE6 + .global ov30_02386080 +ov30_02386080: + .byte 0x82, 0xDD, 0x82, 0xB3, 0x82, 0xAB, 0x97, 0x6C, 0x00, 0x00, 0x00, 0x00 + .global ov30_0238608C +ov30_0238608C: + .byte 0x82, 0xE2, 0x82, 0xE6 .byte 0x82, 0xA2, 0x97, 0x6C, 0x00, 0x00, 0x00, 0x00 .data .global ov30_023860A0 ov30_023860A0: - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov30_023860A4 +ov30_023860A4: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 From 50315397863efb231893bbafbfda44a519772fe6 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 21 Sep 2023 23:52:42 -0400 Subject: [PATCH 3/5] Defined pointers for overlay 34 --- asm/include/overlay_31.inc | 477 ++++++------- asm/include/overlay_34.inc | 116 ++-- asm/overlay_31.s | 1301 +++++++++++++++++++++--------------- asm/overlay_34.s | 278 ++++---- 4 files changed, 1207 insertions(+), 965 deletions(-) diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index afbfd359..23eed5f9 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -1,241 +1,248 @@ #pragma once -.public ov29_0234FB6C -.public GetRecruitRate2 -.public ov29_022EA428 -.public sub_02030A2C -.public AllManip1 -.public IsBlinded -.public sub_020585B4 -.public CheckTeamMemberIdxVeneer -.public DisableDungeonSubMenuOption -.public sub_020348E4 -.public sub_0203083C -.public ov29_023468FC -.public GetItemInfo -.public ov29_0234EBCC -.public UpdateMapSurveyorFlag -.public ov10_022BCCF4 -.public Arm9LoadUnkFieldNa0x2029EC8 -.public GetMaxPp -.public SpecificRecruitCheck -.public sub_02041178 -.public ov10_022BCE58 -.public sub_020265A8 -.public ov29_022E87DC -.public DebugPrint0 -.public FreeDBox -.public sub_02028284 -.public ov29_022EBA70 -.public Arm9StoreUnkFieldNa0x2029ED8 -.public sub_0202F23C -.public sub_0203FD44 -.public sub_02027B1C -.public ov29_022EBAB0 -.public ov29_022EBB68 -.public IsHeldItemInBag -.public ov29_0234FBD4 -.public sub_02058C4C -.public sub_0203F150 -.public ov29_022EAC78 -.public ov29_0234B084 -.public GetPressedButtons -.public sub_0204F10C -.public PositionHasItem -.public GetCurrentBagCapacity -.public sub_02041094 -.public ov29_022EB398 -.public sub_020305B4 -.public SetMonsterActionFields -.public CeilFixedPoint -.public sub_0202E6E4 -.public GetTile -.public sub_0202F954 -.public ov10_022BCD68 -.public MemZero -.public sub_0202AB40 -.public sub_0200D894 -.public ov29_022EBC2C -.public ov00_022EA62C -.public FormatMoveStringMore -.public ov29_02056264 -.public sub_02032960 -.public sub_020308A0 -.public sub_0202F8DC -.public GetKecleonIdToSpawnByFloor -.public IsNot2TurnsMoveOrSketch -.public sub_0203F398 -.public sub_0204F9E0 -.public ov29_02346E5C -.public ov29_022E08F4 -.public sub_0202B030 -.public ov01_02337428 -.public ov29_022F0B9C -.public ov29_022EB9A0 -.public ov29_022E1620 -.public sub_0203F9CC -.public ov10_022BCD10 -.public ov00_022E2A78 -.public ItemZInit -.public CanAiUseMove -.public sub_020282F4 -.public GetTrapInfo -.public sub_0202F9B8 -.public sub_02017CCC -.public ov29_02302388 -.public ov29_022EBA84 -.public sub_020416DC -.public sub_02041A00 -.public sub_02041B7C -.public sub_0203FE5C -.public ov29_022E0C2C -.public ov29_02300BF8 -.public CanMonsterSpawn -.public ov29_022E1618 -.public sub_020420F4 -.public sub_02041154 -.public ov29_022EACCC -.public sub_02030850 -.public GetDexNumber -.public ov10_022BCE44 -.public GetTeamMemberIndex -.public ov29_0233A0E8 -.public MonsterHasEmbargoStatus -.public GetItemToUseByIndex -.public sub_0202F474 -.public ov29_023021F0 -.public ov29_02347100 -.public ov29_022EBBE8 -.public sub_02041484 -.public PrintIqSkillsMenu -.public GetItemAction -.public StringFromMessageId -.public ov29_0234B034 -.public sub_02041364 -.public sub_0202810C -.public ov10_022BD394 -.public MemAlloc -.public sub_0202A5CC -.public GetLeaderChangeFlag -.public ov29_022EBA94 -.public memcpy -.public ov00_023002F0 -.public GetFloorType -.public sub_02041A18 -.public sub_0202A98C -.public ov00_022BCA80 -.public YesNoMenu -.public sub_02026214 -.public sub_0202AB94 -.public GetLeaderMonster -.public GetLeader -.public HideTileGrid -.public sub_0202812C -.public ov29_02300818 -.public sub_020416BC -.public sub_020308C4 -.public ov29_022E8708 -.public sub_0200B3D4 -.public MemFree -.public sub_0202F8C4 -.public ov29_022EBB4C -.public GetItemCategoryVeneer -.public sub_02030A18 -.public GetNbItemsInBag -.public memset -.public sub_0202AABC -.public ov29_0234FB50 -.public sub_02054F44 -.public LogMessageByIdWithPopupCheckUser -.public sub_0202F8FC -.public strcpy -.public sub_0200D310 -.public PreprocessStringFromMessageId -.public ov29_022EB8B0 -.public ov29_02302368 -.public AllManip2 -.public sub_02001808 -.public ov29_0234E988 -.public sub_0202AB80 -.public ov29_02338708 -.public GetActiveTeamMember -.public ov10_022BCC7C -.public ov29_02300B40 -.public ov10_022BCDF4 -.public BaseFormsEqual -.public InitPreprocessorArgs -.public ov29_022EBBA8 -.public IqSkillFlagTest -.public sub_020275F8 -.public sub_0203FD38 -.public ov29_022F89CC -.public sub_020417A8 -.public ov29_02348D00 -.public sub_020407EC -.public sub_0204018C -.public sub_0202A690 -.public sub_02017C80 -.public GetStringFromFileVeneer -.public sub_0203FD14 -.public AdvanceFrame -.public sub_0202E6C8 -.public ov00_022EBB98 -.public sub_0202ABB0 -.public ov10_022BCDA8 -.public sub_0200FC24 -.public IsBagFull -.public IsItemUsableNow -.public ov29_0234EA18 -.public ov29_022EB2C8 -.public PreprocessString -.public GetLeaderAction -.public sub_0204AEA0 -.public ov00_022F98B4 -.public sub_020407C0 -.public sub_020355DC -.public DisplayMessage -.public ov10_022BCDBC -.public sub_02035CE4 -.public IsMonsterOnTeam -.public ov10_022BCC60 -.public sub_0203088C -.public sub_0202E3CC -.public sub_0202A730 -.public sub_0203F990 -.public GetMonsterName -.public sub_0202A954 -.public ov29_022EBB8C -.public GetItemToUse -.public ov10_022BD474 -.public ov29_022EA370 -.public ov29_022ECDE4 -.public ov10_022BCCB0 -.public ov29_022EB804 -.public sub_0202F918 -.public FormatMoveString -.public JoinedAtRangeCheck2Veneer -.public GetMonsterIdFromSpawnEntry +.public _020A1870 .public AddDungeonSubMenuOption -.public sub_02025888 -.public CreateDBox -.public sub_02053CA0 -.public ov00_022FBAF0 -.public GetGold -.public GetApparentWeather -.public sub_02027AF0 -.public sub_020307EC -.public sub_0202F334 -.public sub_020416FC -.public sub_020410A4 +.public AdvanceFrame .public AiMovement -.public ov29_0234FB60 -.public ov29_022F9C40 -.public sub_02017C74 -.public sub_0204019C +.public AllManip1 +.public AllManip2 +.public Arm9LoadUnkFieldNa0x2029EC8 +.public Arm9StoreUnkFieldNa0x2029ED8 +.public BAG_ITEMS_PTR_MIRROR +.public BaseFormsEqual +.public CanAiUseMove +.public CanMonsterSpawn +.public CeilFixedPoint .public CheckTeamMemberIdx -.public ShouldMonsterRunAwayVariation -.public sub_020307A4 -.public IsRecruitingAllowed -.public ov29_0234F77C +.public CheckTeamMemberIdxVeneer +.public CreateDBox +.public DebugPrint0 +.public DisableDungeonSubMenuOption +.public DisplayMessage +.public FormatMoveString +.public FormatMoveStringMore +.public FreeDBox +.public GetActiveTeamMember +.public GetApparentWeather +.public GetCurrentBagCapacity +.public GetDexNumber +.public GetFloorType +.public GetGold +.public GetItemAction +.public GetItemCategoryVeneer +.public GetItemInfo +.public GetItemToUse +.public GetItemToUseByIndex +.public GetKecleonIdToSpawnByFloor +.public GetLeader +.public GetLeaderAction +.public GetLeaderChangeFlag +.public GetLeaderMonster +.public GetMaxPp +.public GetMonsterIdFromSpawnEntry +.public GetMonsterName +.public GetNbItemsInBag +.public GetPressedButtons +.public GetRecruitRate2 .public GetSpeciesString +.public GetStringFromFileVeneer +.public GetTeamMemberIndex +.public GetTile +.public GetTrapInfo +.public HideTileGrid +.public InitPreprocessorArgs +.public IqSkillFlagTest +.public IsBagFull +.public IsBlinded +.public IsHeldItemInBag +.public IsItemUsableNow +.public IsMonsterOnTeam +.public IsNot2TurnsMoveOrSketch +.public IsRecruitingAllowed +.public ItemZInit +.public JoinedAtRangeCheck2Veneer +.public LogMessageByIdWithPopupCheckUser +.public MemAlloc +.public memcpy +.public MemFree +.public memset +.public MemZero +.public MonsterHasEmbargoStatus +.public ov00_022BCA80 +.public ov00_022E2A78 +.public ov00_022EA62C +.public ov00_022EBB98 +.public ov00_022F98B4 +.public ov00_022FBAF0 +.public ov00_023002F0 +.public ov01_02337428 +.public ov10_022BCC60 +.public ov10_022BCC7C +.public ov10_022BCCB0 +.public ov10_022BCCF4 +.public ov10_022BCD10 +.public ov10_022BCD68 +.public ov10_022BCDA8 +.public ov10_022BCDBC +.public ov10_022BCDF4 +.public ov10_022BCE44 +.public ov10_022BCE58 +.public ov10_022BD394 +.public ov10_022BD474 +.public ov29_02056264 +.public ov29_022E08F4 +.public ov29_022E0C2C +.public ov29_022E1618 +.public ov29_022E1620 +.public ov29_022E8708 +.public ov29_022E87DC +.public ov29_022EA370 +.public ov29_022EA428 +.public ov29_022EAC78 +.public ov29_022EACCC +.public ov29_022EB2C8 +.public ov29_022EB398 +.public ov29_022EB804 +.public ov29_022EB8B0 +.public ov29_022EB9A0 +.public ov29_022EBA70 +.public ov29_022EBA84 +.public ov29_022EBA94 +.public ov29_022EBAB0 +.public ov29_022EBB4C +.public ov29_022EBB68 +.public ov29_022EBB8C +.public ov29_022EBBA8 +.public ov29_022EBBE8 +.public ov29_022EBC2C +.public ov29_022ECDE4 +.public ov29_022F0B9C +.public ov29_022F89CC +.public ov29_022F9C40 +.public ov29_02300818 +.public ov29_02300B40 +.public ov29_02300BF8 +.public ov29_023021F0 +.public ov29_02302368 +.public ov29_02302388 +.public ov29_02338708 +.public ov29_0233A0E8 +.public ov29_023468FC +.public ov29_02346E5C +.public ov29_02347100 +.public ov29_02348D00 +.public ov29_0234B034 +.public ov29_0234B084 +.public ov29_0234E988 +.public ov29_0234EA18 +.public ov29_0234EBCC +.public ov29_0234F77C +.public ov29_0234FB50 +.public ov29_0234FB60 +.public ov29_0234FB6C +.public ov29_0234FBD4 +.public ov29_0235352C +.public ov29_02353538 +.public ov29_0237C91C +.public ov29_0238280C +.public ov31_02389E20 +.public PositionHasItem +.public PreprocessString +.public PreprocessStringFromMessageId +.public PrintIqSkillsMenu +.public SetMonsterActionFields +.public ShouldMonsterRunAwayVariation +.public SpecificRecruitCheck +.public strcpy +.public StringFromMessageId +.public sub_02001808 +.public sub_0200B3D4 +.public sub_0200D310 +.public sub_0200D894 +.public sub_0200FC24 +.public sub_02017C74 +.public sub_02017C80 +.public sub_02017CCC +.public sub_02025888 +.public sub_02026214 +.public sub_020265A8 +.public sub_020275F8 +.public sub_02027AF0 +.public sub_02027B1C +.public sub_0202810C +.public sub_0202812C +.public sub_02028284 +.public sub_020282F4 +.public sub_02028354 +.public sub_0202A5CC +.public sub_0202A690 +.public sub_0202A730 +.public sub_0202A954 +.public sub_0202A98C +.public sub_0202AABC +.public sub_0202AB40 +.public sub_0202AB80 +.public sub_0202AB94 +.public sub_0202ABB0 +.public sub_0202B030 +.public sub_0202E3CC +.public sub_0202E6C8 +.public sub_0202E6E4 +.public sub_0202F23C +.public sub_0202F334 +.public sub_0202F474 +.public sub_0202F8C4 +.public sub_0202F8DC +.public sub_0202F8FC +.public sub_0202F918 +.public sub_0202F954 +.public sub_0202F9B8 +.public sub_020305B4 +.public sub_020307A4 +.public sub_020307EC +.public sub_0203083C +.public sub_02030850 +.public sub_0203088C +.public sub_020308A0 +.public sub_020308C4 +.public sub_02030A18 +.public sub_02030A2C +.public sub_02032960 +.public sub_020348E4 +.public sub_020355DC +.public sub_02035CE4 +.public sub_0203F150 +.public sub_0203F398 +.public sub_0203F990 +.public sub_0203F9CC +.public sub_0203FD14 +.public sub_0203FD38 +.public sub_0203FD44 +.public sub_0203FE5C +.public sub_0204018C +.public sub_0204019C +.public sub_020407C0 +.public sub_020407EC +.public sub_02041094 +.public sub_020410A4 +.public sub_02041154 +.public sub_02041178 +.public sub_02041364 +.public sub_02041484 +.public sub_020416BC +.public sub_020416DC +.public sub_020416FC +.public sub_020417A8 +.public sub_02041A00 +.public sub_02041A18 +.public sub_02041B7C +.public sub_020420F4 +.public sub_0204AEA0 +.public sub_0204F10C +.public sub_0204F9E0 +.public sub_02053CA0 +.public sub_02054F44 +.public sub_020585B4 +.public sub_02058C4C +.public UpdateMapSurveyorFlag .public vsprintf -.public sub_02028354 \ No newline at end of file +.public YesNoMenu diff --git a/asm/include/overlay_34.inc b/asm/include/overlay_34.inc index a8d4a8eb..155ab6c9 100644 --- a/asm/include/overlay_34.inc +++ b/asm/include/overlay_34.inc @@ -1,65 +1,65 @@ #pragma once -.public sub_02008F64 -.public sub_02002878 -.public sub_0202A5CC -.public sub_020038D8 -.public MemFree -.public sub_0201BE84 -.public sub_020038E8 -.public FreeDBox -.public sub_02028A64 -.public sub_0200B8B8 -.public sub_0200BD14 -.public sub_0201DE10 -.public GetDebugFlag -.public sub_020519D0 -.public sub_02028E2C -.public sub_0201BE28 -.public MemAlloc -.public sub_0201BF64 -.public sub_02017A80 -.public sub_02052060 -.public sub_02008F3C -.public sub_02051B44 -.public sub_020348E4 -.public sub_0201DCD0 -.public sub_02028E88 -.public sub_0201DC90 -.public sub_02006E14 -.public sub_0200BD2C -.public sub_0201F464 -.public sub_0201BF4C -.public sub_0204A0E8 -.public sub_0202ABB0 -.public ShowMessageInDBox -.public sub_02028848 -.public sub_0202AB60 -.public sub_0200B894 -.public sub_0201BE5C -.public sub_02008F4C -.public sub_02008F88 -.public sub_02008ED0 -.public sub_0200383C -.public sub_02003A40 -.public sub_02051C24 -.public sub_0202F334 -.public sub_0202AB40 .public CreateDBox -.public sub_0204964C -.public sub_0200BB74 -.public sub_020778D0 -.public sub_02017A68 -.public sub_02028E40 -.public sub_0201DDFC -.public sub_0200B8D4 -.public sub_02034710 -.public sub_0202AABC -.public sub_02003990 -.public sub_0200BC54 -.public sub_02017B70 +.public FreeDBox +.public GetDebugFlag .public IsDBoxActive +.public MemAlloc +.public MemFree +.public ShowMessageInDBox +.public sub_02002878 +.public sub_0200383C +.public sub_020038D8 +.public sub_020038E8 +.public sub_02003990 .public sub_020039E4 +.public sub_02003A40 +.public sub_02006E14 +.public sub_02008ED0 +.public sub_02008F3C +.public sub_02008F4C +.public sub_02008F64 .public sub_02008F84 -.public sub_02034A80 +.public sub_02008F88 +.public sub_0200B894 +.public sub_0200B8B8 +.public sub_0200B8D4 .public sub_0200BB60 +.public sub_0200BB74 +.public sub_0200BC54 +.public sub_0200BD14 +.public sub_0200BD2C +.public sub_02017A68 +.public sub_02017A80 +.public sub_02017B70 +.public sub_0201BE28 +.public sub_0201BE5C +.public sub_0201BE84 +.public sub_0201BF4C +.public sub_0201BF64 +.public sub_0201DC90 +.public sub_0201DCD0 .public sub_0201DD48 +.public sub_0201DDFC +.public sub_0201DE10 +.public sub_0201F464 +.public sub_02028848 +.public sub_02028A64 +.public sub_02028E2C +.public sub_02028E40 +.public sub_02028E88 +.public sub_0202A5CC +.public sub_0202AABC +.public sub_0202AB40 +.public sub_0202AB60 +.public sub_0202ABB0 +.public sub_0202F334 +.public sub_02034710 +.public sub_020348E4 +.public sub_02034A80 +.public sub_0204964C +.public sub_0204A0E8 +.public sub_020519D0 +.public sub_02051B44 +.public sub_02051C24 +.public sub_02052060 +.public sub_020778D0 diff --git a/asm/overlay_31.s b/asm/overlay_31.s index bcd1419f..e2daa2da 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -6,7 +6,7 @@ arm_func_start EntryOverlay31 EntryOverlay31: ; 0x02382820 stmdb sp!, {r3, lr} - ldr r0, _0238285C ; =0x02389DB4 + ldr r0, _0238285C ; =ov31_02389DB4 bl sub_020348E4 cmp r0, #0 ldmeqia sp!, {r3, pc} @@ -21,7 +21,7 @@ EntryOverlay31: ; 0x02382820 str r0, [r1, #4] ldmia sp!, {r3, pc} .align 2, 0 -_0238285C: .word 0x02389DB4 +_0238285C: .word ov31_02389DB4 _02382860: .word ov31_0238A260 arm_func_end EntryOverlay31 @@ -134,7 +134,7 @@ ov31_023829A0: ; 0x023829A0 arm_func_start ov31_023829CC ov31_023829CC: ; 0x023829CC add r4, sp, #0x204 - ldr fp, _02382AB8 ; =0x02353538 + ldr fp, _02382AB8 ; =ov29_02353538 b _02382A88 _023829D8: ldr r0, [fp] @@ -202,7 +202,7 @@ _02382AA8: .word 0x000008B6 _02382AAC: .word 0x000008B7 _02382AB0: .word 0x0000C402 _02382AB4: .word 0x000003E7 -_02382AB8: .word 0x02353538 +_02382AB8: .word ov29_02353538 _02382ABC: .word 0x000008B8 arm_func_end ov31_02382A34 @@ -210,7 +210,7 @@ _02382ABC: .word 0x000008B8 DungeonMenuSwitch: ; 0x02382AC0 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x54 - ldr r1, _02382B4C ; =0x02353538 + ldr r1, _02382B4C ; =ov29_02353538 mov r4, r0 ldr r1, [r1] ldrb r0, [r1, #0x748] @@ -220,7 +220,7 @@ DungeonMenuSwitch: ; 0x02382AC0 str r0, [sp, #0x28] bl sub_02025888 add r5, sp, #4 - ldr r2, _02382B50 ; =0x02389E14 + ldr r2, _02382B50 ; =ov31_02389E14 mov r1, #0x400 mov r3, #0 mov r6, r0 @@ -244,8 +244,8 @@ DungeonMenuSwitch: ; 0x02382AC0 add sp, sp, #0x54 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02382B4C: .word 0x02353538 -_02382B50: .word 0x02389E14 +_02382B4C: .word ov29_02353538 +_02382B50: .word ov31_02389E14 arm_func_end DungeonMenuSwitch arm_func_start ov31_02382B54 @@ -300,22 +300,22 @@ _02382BEC: str r1, [sp, #0x64] bl Arm9LoadUnkFieldNa0x2029EC8 str r0, [sp, #4] - ldr r0, _02382D90 ; =0x02389D94 + ldr r0, _02382D90 ; =ov31_02389D94 ldr r1, _02382D94 ; =0x00000233 - ldr r3, _02382D98 ; =0x02389DD4 + ldr r3, _02382D98 ; =ov31_02389DD4 add r2, sp, #4 bl sub_0202A5CC ldr r2, _02382D8C ; =ov31_0238A260 ldr r1, _02382D9C ; =ov31_02382864 ldr r2, [r2] strb r0, [r2] - ldr r0, _02382DA0 ; =0x02389DC4 + ldr r0, _02382DA0 ; =ov31_02389DC4 bl sub_0202F8C4 ldr r2, _02382D8C ; =ov31_0238A260 ldr r1, _02382DA4 ; =DungeonMenuSwitch ldr r2, [r2] strb r0, [r2, #2] - ldr r0, _02382DA8 ; =0x02389DA4 + ldr r0, _02382DA8 ; =ov31_02389DA4 bl sub_0202F8C4 ldr r1, _02382D8C ; =ov31_0238A260 ldr r2, [r1] @@ -404,13 +404,13 @@ _02382D84: ldmia sp!, {pc} .align 2, 0 _02382D8C: .word ov31_0238A260 -_02382D90: .word 0x02389D94 +_02382D90: .word ov31_02389D94 _02382D94: .word 0x00000233 -_02382D98: .word 0x02389DD4 +_02382D98: .word ov31_02389DD4 _02382D9C: .word ov31_02382864 -_02382DA0: .word 0x02389DC4 +_02382DA0: .word ov31_02389DC4 _02382DA4: .word DungeonMenuSwitch -_02382DA8: .word 0x02389DA4 +_02382DA8: .word ov31_02389DA4 arm_func_end ov31_02382B54 arm_func_start ov31_02382DAC @@ -511,7 +511,7 @@ _02382ED0: .word ov31_0238A2A0 ov31_02382ED4: ; 0x02382ED4 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - ldr r0, _02382F60 ; =0x02389E30 + ldr r0, _02382F60 ; =ov31_02389E30 bl sub_020348E4 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -546,7 +546,7 @@ _02382F50: str r4, [r0, #0x14] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02382F60: .word 0x02389E30 +_02382F60: .word ov31_02389E30 _02382F64: .word ov31_0238A2A0 arm_func_end ov31_02382ED4 @@ -554,7 +554,7 @@ _02382F64: .word ov31_0238A2A0 ov31_02382F68: ; 0x02382F68 stmdb sp!, {r4, lr} ldr r1, _02382FB4 ; =ov31_0238A2A0 - ldr r2, _02382FB8 ; =0x02389E22 + ldr r2, _02382FB8 ; =ov31_02389E22 ldr r1, [r1, #4] mov r4, r0 ldr r0, [r1, #0x14] @@ -573,7 +573,7 @@ ov31_02382F68: ; 0x02382F68 ldmia sp!, {r4, pc} .align 2, 0 _02382FB4: .word ov31_0238A2A0 -_02382FB8: .word 0x02389E22 +_02382FB8: .word ov31_02389E22 arm_func_end ov31_02382F68 arm_func_start ov31_02382FBC @@ -595,21 +595,21 @@ _02382FDC: ; jump table b _0238320C ; case 5 _02382FF4: ldr r2, [r1, #0x14] - ldr r3, _0238321C ; =0x02389E70 - ldr r0, _02383220 ; =0x02389E60 + ldr r3, _0238321C ; =ov31_02389E70 + ldr r0, _02383220 ; =ov31_02389E60 add r3, r3, r2, lsl #5 ldr r1, _02383224 ; =0x00400013 mov r2, #0 bl sub_0202A5CC ldr r1, _02383218 ; =ov31_0238A2A0 - ldr r3, _02383228 ; =0x02389E22 + ldr r3, _02383228 ; =ov31_02389E22 ldr r4, [r1, #4] mov r2, #0x10 strb r0, [r4, #1] ldr r0, [r1, #4] mov r4, #0 ldr r1, [r0, #0x14] - ldr r0, _0238322C ; =0x02389E50 + ldr r0, _0238322C ; =ov31_02389E50 mov r1, r1, lsl #2 ldrh r3, [r3, r1] str r2, [sp, #0xac] @@ -662,7 +662,7 @@ _023830D8: ; jump table b _02383144 ; case 6 _023830F4: ldr r1, [r1, #8] - ldr r0, _02383238 ; =0x0237C91C + ldr r0, _02383238 ; =ov29_0237C91C ldr r4, [r1, #0xb4] ldrh r1, [r0] add r0, r4, #0x4a @@ -703,11 +703,11 @@ _02383170: mov r0, #0x10 str r0, [sp, #0x14] ldr r1, [r1, #0x14] - ldr r0, _02383228 ; =0x02389E22 + ldr r0, _02383228 ; =ov31_02389E22 mov r1, r1, lsl #2 ldrh r1, [r0, r1] mov ip, #1 - ldr r0, _0238323C ; =0x02389E40 + ldr r0, _0238323C ; =ov31_02389E40 strh r1, [sp, #0x10] str ip, [sp] ldr r1, _02383240 ; =0x00001812 @@ -742,15 +742,15 @@ _02383210: ldmia sp!, {r4, pc} .align 2, 0 _02383218: .word ov31_0238A2A0 -_0238321C: .word 0x02389E70 -_02383220: .word 0x02389E60 +_0238321C: .word ov31_02389E70 +_02383220: .word ov31_02389E60 _02383224: .word 0x00400013 -_02383228: .word 0x02389E22 -_0238322C: .word 0x02389E50 +_02383228: .word ov31_02389E22 +_0238322C: .word ov31_02389E50 _02383230: .word 0x80000813 _02383234: .word ov31_02382F68 -_02383238: .word 0x0237C91C -_0238323C: .word 0x02389E40 +_02383238: .word ov29_0237C91C +_0238323C: .word ov31_02389E40 _02383240: .word 0x00001812 _02383244: .word ov31_02383248 arm_func_end ov31_02382FBC @@ -759,7 +759,7 @@ _02383244: .word ov31_02383248 ov31_02383248: ; 0x02383248 stmdb sp!, {r4, lr} ldr r1, _02383284 ; =ov31_0238A2A0 - ldr r2, _02383288 ; =0x02389E20 + ldr r2, _02383288 ; =ov31_02389E20 ldr r1, [r1, #4] mov r4, r0 ldr r0, [r1, #0x14] @@ -774,7 +774,7 @@ ov31_02383248: ; 0x02383248 ldmia sp!, {r4, pc} .align 2, 0 _02383284: .word ov31_0238A2A0 -_02383288: .word 0x02389E20 +_02383288: .word ov31_02389E20 arm_func_end ov31_02383248 arm_func_start ov31_0238328C @@ -831,24 +831,24 @@ _02383324: .word ov31_0238A2A0 ov31_02383328: ; 0x02383328 stmdb sp!, {r3, lr} bl sub_0204AEA0 - ldr r1, _02383354 ; =0x0238A2A8 + ldr r1, _02383354 ; =ov31_0238A2A8 ldrb r1, [r1] cmp r1, r0 ldmeqia sp!, {r3, pc} bl ov29_022E8708 - ldr r0, _02383358 ; =0x0238A268 + ldr r0, _02383358 ; =ov31_0238A268 mov r1, #1 strb r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_02383354: .word 0x0238A2A8 -_02383358: .word 0x0238A268 +_02383354: .word ov31_0238A2A8 +_02383358: .word ov31_0238A268 arm_func_end ov31_02383328 arm_func_start ov31_0238335C ov31_0238335C: ; 0x0238335C stmdb sp!, {r4, lr} - ldr r1, _023833B0 ; =0x0238A268 + ldr r1, _023833B0 ; =ov31_0238A268 mov r4, r0 ldrb r0, [r1] cmp r0, #0 @@ -857,7 +857,7 @@ ov31_0238335C: ; 0x0238335C cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} - ldr r0, _023833B0 ; =0x0238A268 + ldr r0, _023833B0 ; =ov31_0238A268 mov r1, #0 strb r1, [r0] _02383390: @@ -865,13 +865,13 @@ _02383390: beq _0238339C blx r4 _0238339C: - ldr r0, _023833B0 ; =0x0238A268 + ldr r0, _023833B0 ; =ov31_0238A268 mov r1, #0 strb r1, [r0, #1] mov r0, #1 ldmia sp!, {r4, pc} .align 2, 0 -_023833B0: .word 0x0238A268 +_023833B0: .word ov31_0238A268 arm_func_end ov31_0238335C arm_func_start ov31_023833B4 @@ -881,12 +881,12 @@ ov31_023833B4: ; 0x023833B4 beq _023833C4 blx r0 _023833C4: - ldr r0, _023833D4 ; =0x0238A268 + ldr r0, _023833D4 ; =ov31_0238A268 mov r1, #0 strb r1, [r0, #1] ldmia sp!, {r3, pc} .align 2, 0 -_023833D4: .word 0x0238A268 +_023833D4: .word ov31_0238A268 arm_func_end ov31_023833B4 arm_func_start ov31_023833D8 @@ -894,7 +894,7 @@ ov31_023833D8: ; 0x023833D8 stmdb sp!, {r3, lr} sub sp, sp, #0x98 ldr lr, _02383424 ; =ov31_02383328 - ldr r3, _02383428 ; =0x0238A268 + ldr r3, _02383428 ; =ov31_0238A268 mov ip, #1 str r0, [sp, #0x88] strb ip, [r3, #1] @@ -906,23 +906,23 @@ ov31_023833D8: ; 0x023833D8 strb ip, [r3] bl sub_020355DC bl sub_0204AEA0 - ldr r1, _02383430 ; =0x0238A2A8 + ldr r1, _02383430 ; =ov31_0238A2A8 strb r0, [r1] add sp, sp, #0x98 ldmia sp!, {r3, pc} .align 2, 0 _02383424: .word ov31_02383328 -_02383428: .word 0x0238A268 +_02383428: .word ov31_0238A268 _0238342C: .word ov31_0238335C -_02383430: .word 0x0238A2A8 +_02383430: .word ov31_0238A2A8 arm_func_end ov31_023833D8 arm_func_start ov31_02383434 ov31_02383434: ; 0x02383434 stmdb sp!, {r3, lr} sub sp, sp, #0x98 - ldr ip, _02383470 ; =0x023833B4 - ldr r3, _02383474 ; =0x0238A268 + ldr ip, _02383470 ; =ov31_023833B4 + ldr r3, _02383474 ; =ov31_0238A268 mov r1, #1 str r0, [sp, #0x88] strb r1, [r3, #1] @@ -935,8 +935,8 @@ ov31_02383434: ; 0x02383434 add sp, sp, #0x98 ldmia sp!, {r3, pc} .align 2, 0 -_02383470: .word 0x023833B4 -_02383474: .word 0x0238A268 +_02383470: .word ov31_023833B4 +_02383474: .word ov31_0238A268 arm_func_end ov31_02383434 arm_func_start ov31_02383478 @@ -948,14 +948,14 @@ ov31_02383478: ; 0x02383478 mov r6, r2 mov r4, #1 bmi _023834AC - ldr r0, _02383644 ; =0x0238A26C + ldr r0, _02383644 ; =ov31_0238A26C mov r1, #0 ldr r0, [r0] add r0, r0, r7 add r0, r0, #0x1000 strb r1, [r0, #0x1f8] _023834AC: - ldr r0, _02383644 ; =0x0238A26C + ldr r0, _02383644 ; =ov31_0238A26C ldr r3, [r0] add r0, r3, #0x1000 ldr r2, [r0, #0x1b4] @@ -963,7 +963,7 @@ _023834AC: beq _02383508 cmp r7, #0 blt _02383508 - ldr r1, _02383648 ; =0x020AF6B8 + ldr r1, _02383648 ; =BAG_ITEMS_PTR_MIRROR mov r0, #6 ldr r1, [r1] ldr r1, [r1, #0x384] @@ -980,7 +980,7 @@ _023834F4: strb r1, [r0, #0x1f8] mov r4, #0 _02383508: - ldr r0, _02383644 ; =0x0238A26C + ldr r0, _02383644 ; =ov31_0238A26C ldr r1, [r0] add r0, r1, #0x1000 ldrb r0, [r0, #0x1b2] @@ -1003,23 +1003,23 @@ _02383528: moveq r0, #0 tst r0, #0xff beq _02383590 - ldr r2, _0238364C ; =0x02389EF0 + ldr r2, _0238364C ; =ov31_02389EF0 mov r5, #1 mov r0, r8 mov r3, r4 str r5, [sp] bl sub_0200D310 - ldr r0, _02383644 ; =0x0238A26C + ldr r0, _02383644 ; =ov31_0238A26C mov r1, #0 ldr r0, [r0] add r0, r0, #0x1000 strb r1, [r0, #0x277] b _02383638 _02383590: - ldr r1, _02383650 ; =0x02389F5C + ldr r1, _02383650 ; =ov31_02389F5C mov r0, r8 bl strcpy - ldr r0, _02383644 ; =0x0238A26C + ldr r0, _02383644 ; =ov31_0238A26C mov r1, #3 ldr r0, [r0] add r0, r0, #0x1000 @@ -1027,7 +1027,7 @@ _02383590: b _02383638 _023835B4: mov r0, #6 - ldr r1, _02383648 ; =0x020AF6B8 + ldr r1, _02383648 ; =BAG_ITEMS_PTR_MIRROR mul r5, r7, r0 ldr r0, [r1] ldr r1, [r0, #0x384] @@ -1040,7 +1040,7 @@ _023835B4: ldrneb r1, [r0, #1] cmpne r1, #0 beq _02383624 - ldr r0, _02383654 ; =0x02353538 + ldr r0, _02383654 ; =ov29_02353538 sub r1, r1, #1 ldr r0, [r0] add r0, r0, r1, lsl #2 @@ -1049,7 +1049,7 @@ _023835B4: bl ov31_02383658 cmp r0, #0 bne _02383624 - ldr r0, _02383648 ; =0x020AF6B8 + ldr r0, _02383648 ; =BAG_ITEMS_PTR_MIRROR ldr r0, [r0] ldr r0, [r0, #0x384] add r0, r0, r5 @@ -1065,11 +1065,11 @@ _02383638: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02383644: .word 0x0238A26C -_02383648: .word 0x020AF6B8 -_0238364C: .word 0x02389EF0 -_02383650: .word 0x02389F5C -_02383654: .word 0x02353538 +_02383644: .word ov31_0238A26C +_02383648: .word BAG_ITEMS_PTR_MIRROR +_0238364C: .word ov31_02389EF0 +_02383650: .word ov31_02389F5C +_02383654: .word ov29_02353538 arm_func_end ov31_02383478 arm_func_start ov31_02383658 @@ -1107,7 +1107,7 @@ ov31_0238367C: ; 0x0238367C str r2, [sp, #0x38] str lr, [sp] ldrsh r4, [r0, #4] - ldr r0, _02383728 ; =0x02389EFC + ldr r0, _02383728 ; =ov31_02389EFC add ip, r4, #0xd1 add r4, ip, #0x2900 mov ip, r4, lsl #0x10 @@ -1132,13 +1132,13 @@ _023836F0: .align 2, 0 _02383720: .word 0x00001013 _02383724: .word 0x000008E4 -_02383728: .word 0x02389EFC +_02383728: .word ov31_02389EFC arm_func_end ov31_0238367C arm_func_start ov31_0238372C ov31_0238372C: ; 0x0238372C stmdb sp!, {r3, lr} - ldr r1, _02383764 ; =0x0238A26C + ldr r1, _02383764 ; =ov31_0238A26C ldr r1, [r1] add r1, r1, #0x1000 ldrb r1, [r1, #0x1b1] @@ -1153,7 +1153,7 @@ _0238375C: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_02383764: .word 0x0238A26C +_02383764: .word ov31_0238A26C arm_func_end ov31_0238372C arm_func_start ov31_02383768 @@ -1189,12 +1189,12 @@ _023837B4: arm_func_start ov31_023837C8 ov31_023837C8: ; 0x023837C8 stmdb sp!, {r3, lr} - ldr r0, _02383850 ; =0x0238A26C + ldr r0, _02383850 ; =ov31_0238A26C ldr r0, [r0] add r0, r0, #0x92 add r0, r0, #0x1100 bl ov29_0234E988 - ldr r0, _02383850 ; =0x0238A26C + ldr r0, _02383850 ; =ov31_0238A26C mvn r1, #1 ldr r0, [r0] add r0, r0, #0x1100 @@ -1203,7 +1203,7 @@ ov31_023837C8: ; 0x023837C8 beq _02383800 bl sub_0202F918 _02383800: - ldr r0, _02383850 ; =0x0238A26C + ldr r0, _02383850 ; =ov31_0238A26C mvn r1, #1 ldr r0, [r0] add r0, r0, #0x1100 @@ -1212,20 +1212,20 @@ _02383800: beq _02383820 bl sub_0202F918 _02383820: - ldr r0, _02383850 ; =0x0238A26C + ldr r0, _02383850 ; =ov31_0238A26C ldr r0, [r0] add r0, r0, #0x93 add r0, r0, #0x1100 bl ov31_02383768 - ldr r0, _02383850 ; =0x0238A26C + ldr r0, _02383850 ; =ov31_0238A26C ldr r0, [r0] bl MemFree - ldr r0, _02383850 ; =0x0238A26C + ldr r0, _02383850 ; =ov31_0238A26C mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_02383850: .word 0x0238A26C +_02383850: .word ov31_0238A26C arm_func_end ov31_023837C8 arm_func_start ov31_02383854 @@ -1250,7 +1250,7 @@ ov31_02383880: ; 0x02383880 mov r5, #0 mov r7, r0 add r0, r5, #1 - ldr r8, _023838E0 ; =0x02353538 + ldr r8, _023838E0 ; =ov29_02353538 strb r5, [r7] and r6, r0, #0xff mov r4, r5 @@ -1272,7 +1272,7 @@ _023838A0: blt _023838A0 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_023838E0: .word 0x02353538 +_023838E0: .word ov29_02353538 arm_func_end ov31_02383880 arm_func_start ov31_023838E4 @@ -1291,7 +1291,7 @@ ov31_023838E4: ; 0x023838E4 mov r0, #0x1280 mov r1, #8 bl MemAlloc - ldr r1, _02384898 ; =0x0238A26C + ldr r1, _02384898 ; =ov31_0238A26C mvn r4, #1 str r0, [r1] add r0, r0, #0x1000 @@ -1335,7 +1335,7 @@ ov31_023838E4: ; 0x023838E4 ldrb r0, [sb] cmp r0, #0 beq _023839E4 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r1, [sb, #4] ldr r0, [r0] mov r6, #1 @@ -1344,14 +1344,14 @@ ov31_023838E4: ; 0x023838E4 _023839E4: ldrb r0, [sb, #1] cmp r0, #0 - ldreq r0, _02384898 ; =0x0238A26C + ldreq r0, _02384898 ; =ov31_0238A26C moveq r1, #0 ldreq r0, [r0] addeq r0, r0, #0x1000 streqb r1, [r0, #0x1b1] ldrb r0, [sb, #2] cmp r0, #0 - ldrne r0, _02384898 ; =0x0238A26C + ldrne r0, _02384898 ; =ov31_0238A26C movne r1, #1 ldrne r0, [r0] addne r0, r0, #0x1000 @@ -1360,10 +1360,10 @@ _02383A1C: mov r0, #3 bl Arm9LoadUnkFieldNa0x2029EC8 mov r1, r0 - ldr r0, _0238489C ; =0x02389F64 + ldr r0, _0238489C ; =ov31_02389F64 bl DebugPrint0 bl GetNbItemsInBag - ldr r2, _02384898 ; =0x0238A26C + ldr r2, _02384898 ; =ov31_0238A26C cmp r6, #0 ldr r1, [r2] add r1, r1, #0x1000 @@ -1375,12 +1375,12 @@ _02383A1C: bne _02383A74 mov r0, sl bl ov31_0238372C - ldr r1, _02384898 ; =0x0238A26C + ldr r1, _02384898 ; =ov31_0238A26C ldr r1, [r1] add r1, r1, #0x1000 strb r0, [r1, #0x1b3] _02383A74: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r2, [r0] add r0, r2, #0x1000 ldrb r1, [r0, #0x1b2] @@ -1407,7 +1407,7 @@ _02383AC4: bne _02383B08 mov r0, sl bl ov31_0238372C - ldr r2, _02384898 ; =0x0238A26C + ldr r2, _02384898 ; =ov31_0238A26C mov r3, #1 ldr r1, [r2] add r1, r1, #0x1000 @@ -1419,7 +1419,7 @@ _02383AC4: add r0, r0, #0x1000 strb r3, [r0, #0x1b1] _02383B08: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C mvn r1, #1 ldr r0, [r0] add r0, r0, #0x1100 @@ -1429,7 +1429,7 @@ _02383B08: bl ov10_022BCD68 cmp r0, #0 bne _02383D78 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r0, [r0] add r0, r0, #0x1100 ldrsb r0, [r0, #0x93] @@ -1437,7 +1437,7 @@ _02383B08: b _02383D78 _02383B48: bl GetNbItemsInBag - ldr r4, _02384898 ; =0x0238A26C + ldr r4, _02384898 ; =ov31_0238A26C ldr r1, [r4] add r1, r1, #0x1000 str r0, [r1, #0x1a8] @@ -1446,7 +1446,7 @@ _02383B48: ldr r0, [r0, #0x1a8] cmp r0, #0 beq _02383C44 - ldr fp, _023848A4 ; =0x020AF6B8 + ldr fp, _023848A4 ; =BAG_ITEMS_PTR_MIRROR mov r8, #0 _02383B78: mov r0, #6 @@ -1477,7 +1477,7 @@ _02383BD8: add r8, r8, #1 cmp r8, #0x32 blt _02383B78 - ldr fp, _023848A8 ; =0x02353538 + ldr fp, _023848A8 ; =ov29_02353538 mov r4, #0 _02383BEC: ldr r0, [fp] @@ -1504,7 +1504,7 @@ _02383C38: cmp r4, #4 blt _02383BEC _02383C44: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r4, [r0] add r0, r4, #0x1000 ldrb r1, [r0, #0x1b2] @@ -1522,7 +1522,7 @@ _02383C44: str r1, [sp, #4] add r1, r4, #0x1000 ldrb r2, [r1, #0x1b3] - ldr r1, _02384898 ; =0x0238A26C + ldr r1, _02384898 ; =ov31_0238A26C add r3, r4, #0x1f8 str r2, [sp, #8] ldr r1, [r1] @@ -1532,25 +1532,25 @@ _02383C44: mov r1, r6 add r3, r3, #0x1000 bl ov10_022BD474 - ldr r1, _02384898 ; =0x0238A26C + ldr r1, _02384898 ; =ov31_0238A26C cmp r6, #0 ldr r1, [r1] add r1, r1, #0x1000 strb r0, [r1, #0x193] beq _02383CEC - ldr r0, _023848B0 ; =0x02389F1C + ldr r0, _023848B0 ; =ov31_02389F1C ldr r1, _023848B4 ; =ov31_02383854 bl sub_0202F8C4 - ldr r1, _02384898 ; =0x0238A26C + ldr r1, _02384898 ; =ov31_0238A26C ldr r1, [r1] add r1, r1, #0x1000 strb r0, [r1, #0x194] b _02383D78 _02383CEC: - ldr r0, _023848B8 ; =0x02389F2C + ldr r0, _023848B8 ; =ov31_02389F2C mov r1, #0 bl sub_0202F8C4 - ldr r2, _02384898 ; =0x0238A26C + ldr r2, _02384898 ; =ov31_0238A26C mvn r3, #0 ldr r1, [r2] add r1, r1, #0x1000 @@ -1573,13 +1573,13 @@ _02383D1C: add r2, sp, #0x500 str r4, [sp, #8] mov r4, #0 - ldr r0, _023848C0 ; =0x02389F3C + ldr r0, _023848C0 ; =ov31_02389F3C ldr r1, _023848C4 ; =0x00400813 ldr r3, _023848AC ; =ov31_02383478 add r2, r2, #0x9c str r4, [sp, #0xc] bl ov00_022BCA80 - ldr r1, _02384898 ; =0x0238A26C + ldr r1, _02384898 ; =ov31_0238A26C ldr r1, [r1] add r1, r1, #0x1000 strb r0, [r1, #0x193] @@ -1587,7 +1587,7 @@ _02383D78: mvn r0, #0 str r0, [sp, #0x38] sub r0, r0, #1 - ldr r4, _02384898 ; =0x0238A26C + ldr r4, _02384898 ; =ov31_0238A26C str r0, [sp, #0x3c] _02383D8C: mov r0, #0x14 @@ -1640,7 +1640,7 @@ _02383D8C: ldr r1, [sp, #0x34] mov r0, #6 mul r2, r1, r0 - ldr r0, _023848A4 ; =0x020AF6B8 + ldr r0, _023848A4 ; =BAG_ITEMS_PTR_MIRROR ldr r0, [r0] ldr r0, [r0, #0x384] add r1, r0, r2 @@ -1654,7 +1654,7 @@ _02383D8C: str r0, [sp, #0x10] cmp r0, #0 beq _02383F00 - ldr r1, _023848A8 ; =0x02353538 + ldr r1, _023848A8 ; =ov29_02353538 add r0, sp, #0x400 ldr r3, [r1] ldr r1, [sp, #0x10] @@ -1675,7 +1675,7 @@ _02383D8C: mov r1, #0x400 mov r3, #0 bl PreprocessStringFromMessageId - ldr r0, _023848A8 ; =0x02353538 + ldr r0, _023848A8 ; =ov29_02353538 ldr r1, [r0] ldr r0, [sp, #0x10] add r0, r1, r0, lsl #2 @@ -1695,7 +1695,7 @@ _02383F00: bl strcpy b _02383F34 _02383F28: - ldr r1, _023848CC ; =0x02389F5C + ldr r1, _023848CC ; =ov31_02389F5C add r0, sp, #0x4c bl strcpy _02383F34: @@ -1745,7 +1745,7 @@ _02383F7C: bl strcpy b _02383FF0 _02383FE4: - ldr r1, _023848CC ; =0x02389F5C + ldr r1, _023848CC ; =ov31_02389F5C add r0, sp, #0x4c bl strcpy _02383FF0: @@ -1795,14 +1795,14 @@ _02384088: bl ov10_022BCD68 cmp r0, #0 bne _023841A4 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r0, [r0] add r0, r0, #0x1100 ldrsb r0, [r0, #0x93] bl ov10_022BCDBC movs r4, r0 bmi _0238419C - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C and r1, r4, #0xff ldr r2, [r0] mov r0, #3 @@ -1811,13 +1811,13 @@ _02384088: bl Arm9StoreUnkFieldNa0x2029ED8 cmp fp, #0 bne _02384138 - ldr r1, _02384898 ; =0x0238A26C + ldr r1, _02384898 ; =ov31_0238A26C mov r0, #6 ldr r1, [r1] mul r8, r4, r0 add r0, r1, #0x1000 ldrb r3, [r0, #0x1b2] - ldr r2, _023848A4 ; =0x020AF6B8 + ldr r2, _023848A4 ; =BAG_ITEMS_PTR_MIRROR add r1, sl, #4 str r3, [sp] ldr r2, [r2] @@ -1827,14 +1827,14 @@ _02384088: add r2, r2, r8 ldrb r2, [r2, #1] bl ov29_022EBAB0 - ldr r0, _023848A4 ; =0x020AF6B8 + ldr r0, _023848A4 ; =BAG_ITEMS_PTR_MIRROR ldr r0, [r0] ldr r0, [r0, #0x384] add r0, r0, r8 str r0, [sb, #4] b _02384194 _02384138: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C add r1, sl, #4 ldr r0, [r0] mov r2, #0 @@ -1869,17 +1869,17 @@ _023841A4: beq _023842DC ldr r0, _023848D0 ; =0x00003F04 bl sub_02017C80 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r0, [r0] add r0, r0, #0x1100 ldrsb r0, [r0, #0x93] bl ov10_022BCDF4 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r0, [r0] add r0, r0, #0x1100 ldrsb r0, [r0, #0x93] bl ov10_022BCDBC - ldr r2, _02384898 ; =0x0238A26C + ldr r2, _02384898 ; =ov31_0238A26C ldr r1, [r2] add r1, r1, #0x1000 str r0, [r1, #0x1ac] @@ -1891,8 +1891,8 @@ _023841A4: bl Arm9StoreUnkFieldNa0x2029ED8 cmp fp, #0 bne _02384278 - ldr r0, _02384898 ; =0x0238A26C - ldr r3, _023848A4 ; =0x020AF6B8 + ldr r0, _02384898 ; =ov31_0238A26C + ldr r3, _023848A4 ; =BAG_ITEMS_PTR_MIRROR ldr r0, [r0] mov r2, #6 add r0, r0, #0x1000 @@ -1906,8 +1906,8 @@ _023841A4: mla r2, r0, r2, r4 ldrb r2, [r2, #1] bl ov29_022EBAB0 - ldr r0, _02384898 ; =0x0238A26C - ldr r1, _023848A4 ; =0x020AF6B8 + ldr r0, _02384898 ; =ov31_0238A26C + ldr r1, _023848A4 ; =BAG_ITEMS_PTR_MIRROR ldr r0, [r0] ldr r1, [r1] add r0, r0, #0x1000 @@ -1918,7 +1918,7 @@ _023841A4: str r0, [sb, #4] b _023842D4 _02384278: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C add r1, sl, #4 ldr r0, [r0] mov r2, #0 @@ -1965,7 +1965,7 @@ _02384314: bl sub_0200FC24 mov r8, #0 _02384320: - ldr r0, _023848A8 ; =0x02353538 + ldr r0, _023848A8 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r8, lsl #2 add r0, r0, #0x12000 @@ -2015,7 +2015,7 @@ _023843D0: add r0, r1, #0x1100 ldrsb r0, [r0, #0x93] bl ov10_022BCDF4 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C add r1, sl, #4 ldr r0, [r0] mov r2, #0 @@ -2041,7 +2041,7 @@ _023843D0: _02384438: mov r0, #0x14 bl AdvanceFrame - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r1, [r0] add r0, r1, #0x1000 ldrb r0, [r0, #0x1b2] @@ -2052,7 +2052,7 @@ _02384438: bl ov10_022BCE44 cmp r0, #0 bne _02384490 - ldr r0, _023848A4 ; =0x020AF6B8 + ldr r0, _023848A4 ; =BAG_ITEMS_PTR_MIRROR ldr r0, [r0] ldr r0, [r0, #0x384] ldrb r0, [r0] @@ -2114,7 +2114,7 @@ _023844FC: bl GetItemCategoryVeneer cmp r0, #6 beq _02384598 - ldr r0, _023848A8 ; =0x02353538 + ldr r0, _023848A8 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75b] cmp r0, #0 @@ -2137,7 +2137,7 @@ _02384598: bl ov00_022EBB98 cmp r0, #0x80 bne _023845C4 - ldr r0, _023848A8 ; =0x02353538 + ldr r0, _023848A8 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75b] cmp r0, #0 @@ -2213,7 +2213,7 @@ _023846A8: mov r0, #0x3c bl AddDungeonSubMenuOption _023846B0: - ldr r0, _023848A4 ; =0x020AF6B8 + ldr r0, _023848A4 ; =BAG_ITEMS_PTR_MIRROR mov r3, #0 ldr r4, [r0] mov lr, #1 @@ -2260,7 +2260,7 @@ _02384728: bl AddDungeonSubMenuOption mov r4, #0 _02384758: - ldr r0, _023848A8 ; =0x02353538 + ldr r0, _023848A8 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r4, lsl #2 add r0, r0, #0x12000 @@ -2306,7 +2306,7 @@ _023847EC: bl DisableDungeonSubMenuOption b _02384860 _02384804: - ldr r0, _023848A8 ; =0x02353538 + ldr r0, _023848A8 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75b] cmp r0, #0 @@ -2346,20 +2346,20 @@ _02384860: bl AddDungeonSubMenuOption b _02384908 .align 2, 0 -_02384898: .word 0x0238A26C -_0238489C: .word 0x02389F64 +_02384898: .word ov31_0238A26C +_0238489C: .word ov31_02389F64 _023848A0: .word 0x000008E5 -_023848A4: .word 0x020AF6B8 -_023848A8: .word 0x02353538 +_023848A4: .word BAG_ITEMS_PTR_MIRROR +_023848A8: .word ov29_02353538 _023848AC: .word ov31_02383478 -_023848B0: .word 0x02389F1C +_023848B0: .word ov31_02389F1C _023848B4: .word ov31_02383854 -_023848B8: .word 0x02389F2C +_023848B8: .word ov31_02389F2C _023848BC: .word 0x000008E3 -_023848C0: .word 0x02389F3C +_023848C0: .word ov31_02389F3C _023848C4: .word 0x00400813 _023848C8: .word 0x000008E7 -_023848CC: .word 0x02389F5C +_023848CC: .word ov31_02389F5C _023848D0: .word 0x00003F04 _023848D4: ldr r0, [r0] @@ -2443,7 +2443,7 @@ _023849D8: b _02384C48 _023849F4: bl ov00_022EBB98 - ldr r1, _023848A8 ; =0x02353538 + ldr r1, _023848A8 ; =ov29_02353538 sub r2, r0, #0x90 ldr r0, [r1] add r0, r0, r2, lsl #2 @@ -2470,7 +2470,7 @@ _023849F4: moveq r4, #1 bl GetItemCategoryVeneer cmp r0, #9 - ldr r0, _023848A8 ; =0x02353538 + ldr r0, _023848A8 ; =ov29_02353538 moveq r4, #1 ldr r0, [r0] ldrb r0, [r0, #0x75b] @@ -2613,8 +2613,8 @@ _02384C48: bl ov29_022EB9A0 bl ov29_022EBA84 mov r2, #0 - ldr r1, _02385128 ; =0x0237C91C - ldr r4, _02384898 ; =0x0238A26C + ldr r1, _02385128 ; =ov29_0237C91C + ldr r4, _02384898 ; =ov31_0238A26C b _02384C9C _02384C6C: add r8, r1, r2, lsl #3 @@ -2632,7 +2632,7 @@ _02384C6C: _02384C9C: cmp r2, r0 blt _02384C6C - ldr r3, _02384898 ; =0x0238A26C + ldr r3, _02384898 ; =ov31_0238A26C ldr r4, _0238512C ; =0x000008E8 ldr r1, [r3] mvn r0, #0 @@ -2656,7 +2656,7 @@ _02384C9C: add r0, r0, #0x92 add r0, r0, #0x1100 bl ov29_0234E988 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C mov r2, r4 ldr r1, [r0] add r0, r1, #0x138 @@ -2664,7 +2664,7 @@ _02384C9C: add r0, r0, #0x1000 add r1, r1, #0x1000 bl ov31_0238513C - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C add r2, sp, #0x500 ldr r1, [r0] add r2, r2, #0x9c @@ -2677,10 +2677,10 @@ _02384C9C: ldr r1, _02385130 ; =0x00000213 add r3, r3, #0x1000 cmp r0, #0 - ldrne r0, _02385134 ; =0x02389F4C - ldreq r0, _02385138 ; =0x02389F0C + ldrne r0, _02385134 ; =ov31_02389F4C + ldreq r0, _02385138 ; =ov31_02389F0C bl sub_0202A5CC - ldr r4, _02384898 ; =0x0238A26C + ldr r4, _02384898 ; =ov31_0238A26C mov r8, #0x14 ldr r1, [r4] add r1, r1, #0x1000 @@ -2692,14 +2692,14 @@ _02384D78: bl sub_0202AB40 cmp r0, #0 bne _02384E24 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r0, [r0] add r0, r0, #0x1100 ldrsb r0, [r0, #0x92] bl sub_0202ABB0 cmp r0, #0 blt _02384E04 - ldr r1, _02384898 ; =0x0238A26C + ldr r1, _02384898 ; =ov31_0238A26C sub r2, r0, #1 ldr r0, [r1] add r0, r0, #0x1000 @@ -2711,8 +2711,8 @@ _02384D78: cmp r0, #0 mov r4, #0 beq _02384E30 - ldr r0, _02384898 ; =0x0238A26C - ldr r2, _02385128 ; =0x0237C91C + ldr r0, _02384898 ; =ov31_0238A26C + ldr r2, _02385128 ; =ov29_0237C91C ldr r1, [r0] add r0, r7, #0x4a add r1, r1, #0x1000 @@ -2722,7 +2722,7 @@ _02384D78: bl ov29_022EBBA8 b _02384E30 _02384E04: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C mov r4, #1 ldr r0, [r0] add r0, r0, #0x1000 @@ -2735,18 +2735,18 @@ _02384E24: bl AdvanceFrame b _02384D78 _02384E30: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r0, [r0] add r0, r0, #0x92 add r0, r0, #0x1100 bl ov29_0234E988 - ldr r0, _023848A8 ; =0x02353538 + ldr r0, _023848A8 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] cmp r4, #1 add r0, r0, #0x1a000 strb r1, [r0, #0x247] - ldreq r0, _02384898 ; =0x0238A26C + ldreq r0, _02384898 ; =ov31_0238A26C ldreq r0, [r0] addeq r0, r0, #0x1000 ldreqb r0, [r0, #0x1b2] @@ -2776,7 +2776,7 @@ _02384E90: _02384EC4: cmp r0, #0x36 bne _02384FA0 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C mvn r1, #1 ldr r0, [r0] add r0, r0, #0x1100 @@ -2784,13 +2784,13 @@ _02384EC4: cmp r0, r1 beq _02384F00 bl sub_0202F918 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C mvn r1, #1 ldr r0, [r0] add r0, r0, #0x1000 strb r1, [r0, #0x194] _02384F00: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C mvn r1, #1 ldr r0, [r0] add r0, r0, #0x1100 @@ -2798,13 +2798,13 @@ _02384F00: cmp r0, r1 beq _02384F34 bl sub_0202F918 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C mvn r1, #1 ldr r0, [r0] add r0, r0, #0x1000 strb r1, [r0, #0x195] _02384F34: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r0, [r0] add r0, r0, #0x93 add r0, r0, #0x1100 @@ -2842,7 +2842,7 @@ _02384FA0: cmp r0, #1 bhi _023850C8 _02384FC0: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C mvn r1, #1 ldr r0, [r0] add r0, r0, #0x1100 @@ -2850,13 +2850,13 @@ _02384FC0: cmp r0, r1 beq _02384FF4 bl sub_0202F918 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C mvn r1, #1 ldr r0, [r0] add r0, r0, #0x1000 strb r1, [r0, #0x194] _02384FF4: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C mvn r1, #1 ldr r0, [r0] add r0, r0, #0x1100 @@ -2864,13 +2864,13 @@ _02384FF4: cmp r0, r1 beq _02385028 bl sub_0202F918 - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C mvn r1, #1 ldr r0, [r0] add r0, r0, #0x1000 strb r1, [r0, #0x195] _02385028: - ldr r0, _02384898 ; =0x0238A26C + ldr r0, _02384898 ; =ov31_0238A26C ldr r0, [r0] add r0, r0, #0x93 add r0, r0, #0x1100 @@ -2887,7 +2887,7 @@ _02385028: cmp r0, #0 beq _023850B0 ldr r1, [sp, #0x44] - ldr r0, _023848A8 ; =0x02353538 + ldr r0, _023848A8 ; =ov29_02353538 strb r1, [r7, #0x54] ldr r2, [r0] ldr r0, [sp, #0x44] @@ -2917,7 +2917,7 @@ _023850C8: bl ov29_022EA428 mov r5, #0 _023850D8: - ldr r0, _023848A8 ; =0x02353538 + ldr r0, _023848A8 ; =ov29_02353538 mov r1, #0 ldr r0, [r0] add r0, r0, #0x1a000 @@ -2940,11 +2940,11 @@ _0238511C: add sp, sp, #0x400 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02385128: .word 0x0237C91C +_02385128: .word ov29_0237C91C _0238512C: .word 0x000008E8 _02385130: .word 0x00000213 -_02385134: .word 0x02389F4C -_02385138: .word 0x02389F0C +_02385134: .word ov31_02389F4C +_02385138: .word ov31_02389F0C arm_func_end ov31_023838E4 arm_func_start ov31_0238513C @@ -2991,7 +2991,7 @@ _023851BC: .word 0x000008E8 MovesMenu: ; 0x023851C0 stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0xc - ldr r1, _023853B8 ; =0x02353538 + ldr r1, _023853B8 ; =ov29_02353538 ldrb r4, [r0, #4] ldr r0, [r1] add r0, r0, r4, lsl #2 @@ -3000,7 +3000,7 @@ MovesMenu: ; 0x023851C0 str r5, [sp, #8] _023851E4: mov r6, #0 - ldr sb, _023853B8 ; =0x02353538 + ldr sb, _023853B8 ; =ov29_02353538 mov r7, r6 mov r8, r6 _023851F4: @@ -3126,7 +3126,7 @@ _023853B0: add sp, sp, #0xc ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_023853B8: .word 0x02353538 +_023853B8: .word ov29_02353538 arm_func_end MovesMenu arm_func_start ov31_023853BC @@ -3165,7 +3165,7 @@ HandleMovesMenu: ; 0x02385404 mov r1, #8 str r2, [sp, #8] bl MemAlloc - ldr r1, _02385F70 ; =0x0238A270 + ldr r1, _02385F70 ; =ov31_0238A270 mov r2, #0 str r0, [r1, #8] str r2, [r0, #0x10] @@ -3174,7 +3174,7 @@ HandleMovesMenu: ; 0x02385404 ldr r0, [sp, #0x154] cmp r0, #1 bne _0238547C - ldr r0, _02385F74 ; =0x02389F88 + ldr r0, _02385F74 ; =ov31_02389F88 bl CreateDBox mov r1, #0 str r0, [sp, #0x14] @@ -3188,7 +3188,7 @@ HandleMovesMenu: ; 0x02385404 bl sub_0202F23C b _023854AC _0238547C: - ldr r0, _02385F80 ; =0x02389FA8 + ldr r0, _02385F80 ; =ov31_02389FA8 bl CreateDBox mov r1, #0 str r0, [sp, #0x14] @@ -3209,7 +3209,7 @@ _023854AC: mov r0, r6 bl sub_0203F9CC mov r8, #0 - ldr sb, _02385F88 ; =0x02353538 + ldr sb, _02385F88 ; =ov29_02353538 mov r4, r8 add fp, sp, #0x2c _023854D8: @@ -3238,7 +3238,7 @@ _02385514: bl sub_0204018C str r0, [sp, #0x18] bl sub_02041094 - ldr r1, _02385F70 ; =0x0238A270 + ldr r1, _02385F70 ; =ov31_0238A270 str r0, [r1] mov r0, #0x1e bl AdvanceFrame @@ -3247,7 +3247,7 @@ _02385548: str r4, [sp, #0xc] mov sb, r4 bl ov00_022EA62C - ldr fp, _02385F70 ; =0x0238A270 + ldr fp, _02385F70 ; =ov31_0238A270 _0238555C: bl sub_020407EC mov r8, r0 @@ -3279,7 +3279,7 @@ _023855A8: add r1, sp, #0x2c str r0, [sp, #0x10] ldr sb, [r1, r0, lsl #2] - ldr r0, _02385F88 ; =0x02353538 + ldr r0, _02385F88 ; =ov29_02353538 ldr r0, [r0] add r0, r0, sb, lsl #2 add r0, r0, #0x12000 @@ -3367,7 +3367,7 @@ _023856D0: ldr r0, [sp, #0xc] cmp r0, #1 bne _02385738 - ldr r0, _02385F70 ; =0x0238A270 + ldr r0, _02385F70 ; =ov31_0238A270 ldrb r1, [r6, #0x24] ldr r2, [r0] add r0, r7, #0x4a @@ -3384,7 +3384,7 @@ _023856D0: b _02385EFC _02385738: ldr r8, [r6, #0xb4] - ldr r0, _02385F70 ; =0x0238A270 + ldr r0, _02385F70 ; =ov31_0238A270 add sb, r8, #0x124 ldr fp, [r0] bl ov29_022EBA70 @@ -3440,7 +3440,7 @@ _023857E0: bl DisableDungeonSubMenuOption b _0238595C _02385804: - ldr r0, _02385F70 ; =0x0238A270 + ldr r0, _02385F70 ; =ov31_0238A270 ldr fp, [r0] add r0, r8, fp, lsl #3 add r0, r0, #0x100 @@ -3531,7 +3531,7 @@ _0238592C: mov r0, #0x20 bl DisableDungeonSubMenuOption _0238593C: - ldr r1, _02385F70 ; =0x0238A270 + ldr r1, _02385F70 ; =ov31_0238A270 mov r0, r8 ldr r1, [r1] bl ov31_023863F8 @@ -3540,7 +3540,7 @@ _0238593C: mov r0, #0x21 bl DisableDungeonSubMenuOption _0238595C: - ldr r1, _02385F70 ; =0x0238A270 + ldr r1, _02385F70 ; =ov31_0238A270 mov r0, r8 ldr r1, [r1] bl ov31_023863F8 @@ -3552,7 +3552,7 @@ _0238597C: ldr r0, [sp, #8] cmp r0, #0 beq _023859C0 - ldr r0, _02385F70 ; =0x0238A270 + ldr r0, _02385F70 ; =ov31_0238A270 mov r8, #0 ldr r1, [r0] cmp r1, #4 @@ -3690,7 +3690,7 @@ _02385B30: str r4, [sb, #0x1c] ldrh r4, [sl, fp] ldrb sl, [r0, #1] - ldr fp, _02385F70 ; =0x0238A270 + ldr fp, _02385F70 ; =ov31_0238A270 strh r4, [sb, #0x10] strb sl, [r0, #3] ldrb r4, [r3, r1] @@ -3750,7 +3750,7 @@ _02385C60: cmp r3, #0 moveq r1, #3 streqb r1, [r0] - ldr r0, _02385F90 ; =0x02389F98 + ldr r0, _02385F90 ; =ov31_02389F98 ldr r1, _02385F94 ; =0x80000213 add r2, sp, #0x3c add r3, sp, #0xd4 @@ -3863,19 +3863,19 @@ _02385DEC: bne _02385E4C mov r0, r6 bl sub_0203F9CC - ldr r0, _02385F70 ; =0x0238A270 + ldr r0, _02385F70 ; =ov31_0238A270 ldr r0, [r0] mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl sub_020416BC - ldr r2, _02385F70 ; =0x0238A270 + ldr r2, _02385F70 ; =ov31_0238A270 mov r1, r0, lsl #0x10 str r0, [r2] mov r0, r1, asr #0x10 bl sub_020410A4 mov r0, r6 bl sub_0203FD44 - ldr r1, _02385F70 ; =0x0238A270 + ldr r1, _02385F70 ; =ov31_0238A270 str r0, [r1] ldr r0, [sp, #0x18] bl sub_020307EC @@ -3888,19 +3888,19 @@ _02385E4C: bne _02385EAC mov r0, r6 bl sub_0203F9CC - ldr r0, _02385F70 ; =0x0238A270 + ldr r0, _02385F70 ; =ov31_0238A270 ldr r0, [r0] mov r0, r0, lsl #0x10 mov r0, r0, asr #0x10 bl sub_020416DC - ldr r2, _02385F70 ; =0x0238A270 + ldr r2, _02385F70 ; =ov31_0238A270 mov r1, r0, lsl #0x10 str r0, [r2] mov r0, r1, asr #0x10 bl sub_020410A4 mov r0, r6 bl sub_0203FD44 - ldr r1, _02385F70 ; =0x0238A270 + ldr r1, _02385F70 ; =ov31_0238A270 str r0, [r1] ldr r0, [sp, #0x18] bl sub_020307EC @@ -3945,12 +3945,12 @@ _02385EFC: mov r0, #0x1b bl AdvanceFrame bl sub_020407C0 - ldr r0, _02385F70 ; =0x0238A270 + ldr r0, _02385F70 ; =ov31_0238A270 ldr r0, [r0, #8] cmp r0, #0 beq _02385F50 bl MemFree - ldr r0, _02385F70 ; =0x0238A270 + ldr r0, _02385F70 ; =ov31_0238A270 mov r1, #0 str r1, [r0, #8] _02385F50: @@ -3963,15 +3963,15 @@ _02385F50: add sp, sp, #0x12c ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02385F70: .word 0x0238A270 -_02385F74: .word 0x02389F88 +_02385F70: .word ov31_0238A270 +_02385F74: .word ov31_02389F88 _02385F78: .word 0x00003FCD _02385F7C: .word 0x00000404 -_02385F80: .word 0x02389FA8 +_02385F80: .word ov31_02389FA8 _02385F84: .word 0x00003FCC -_02385F88: .word 0x02353538 +_02385F88: .word ov29_02353538 _02385F8C: .word 0x000008DC -_02385F90: .word 0x02389F98 +_02385F90: .word ov31_02389F98 _02385F94: .word 0x80000213 _02385F98: .word 0x0000099B _02385F9C: .word 0x000009A8 @@ -3982,26 +3982,26 @@ _02385FA4: .word 0x00003F07 arm_func_start ov31_02385FA8 ov31_02385FA8: ; 0x02385FA8 stmdb sp!, {r3, r4, r5, lr} - ldr r3, _02385FD8 ; =0x0237C91C + ldr r3, _02385FD8 ; =ov29_0237C91C mov r1, r1, lsl #3 ldrh r1, [r3, r1] mov r5, r0 mov r4, r2 bl SetMonsterActionFields - ldr r0, _02385FDC ; =0x0238A270 + ldr r0, _02385FDC ; =ov31_0238A270 strb r4, [r5, #4] ldr r0, [r0] strb r0, [r5, #0xa] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02385FD8: .word 0x0237C91C -_02385FDC: .word 0x0238A270 +_02385FD8: .word ov29_0237C91C +_02385FDC: .word ov31_0238A270 arm_func_end ov31_02385FA8 arm_func_start ov31_02385FE0 ov31_02385FE0: ; 0x02385FE0 stmdb sp!, {r3, lr} - ldr r1, _0238604C ; =0x02353538 + ldr r1, _0238604C ; =ov29_02353538 ldrb r3, [r0, #4] ldr r1, [r1] ldrb r2, [r0, #0xa] @@ -4029,7 +4029,7 @@ _02386038: bl ov31_02386050 ldmia sp!, {r3, pc} .align 2, 0 -_0238604C: .word 0x02353538 +_0238604C: .word ov29_02353538 arm_func_end ov31_02385FE0 arm_func_start ov31_02386050 @@ -4063,7 +4063,7 @@ _02386098: arm_func_start ov31_023860A4 ov31_023860A4: ; 0x023860A4 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r2, _02386190 ; =0x02353538 + ldr r2, _02386190 ; =ov29_02353538 ldrb r3, [r0, #4] ldr r4, [r2] ldrb r2, [r0, #0xa] @@ -4125,7 +4125,7 @@ _02386180: bl ov29_022EA370 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02386190: .word 0x02353538 +_02386190: .word ov29_02353538 _02386194: .word 0x000008D8 _02386198: .word 0x000008D9 arm_func_end ov31_023860A4 @@ -4133,7 +4133,7 @@ _02386198: .word 0x000008D9 arm_func_start ov31_0238619C ov31_0238619C: ; 0x0238619C stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r1, _02386200 ; =0x02353538 + ldr r1, _02386200 ; =ov29_02353538 ldrb r2, [r0, #4] ldr r1, [r1] ldrb r4, [r0, #0xa] @@ -4158,14 +4158,14 @@ ov31_0238619C: ; 0x0238619C strh r0, [r6, #2] ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02386200: .word 0x02353538 +_02386200: .word ov29_02353538 arm_func_end ov31_0238619C arm_func_start ov31_02386204 ov31_02386204: ; 0x02386204 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0xa0 - ldr r1, _02386304 ; =0x02353538 + ldr r1, _02386304 ; =ov29_02353538 ldrb r2, [r0, #4] ldr r1, [r1] ldrb r5, [r0, #0xa] @@ -4232,13 +4232,13 @@ _023862F4: add sp, sp, #0xa0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02386304: .word 0x02353538 +_02386304: .word ov29_02353538 arm_func_end ov31_02386204 arm_func_start ov31_02386308 ov31_02386308: ; 0x02386308 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r2, _023863EC ; =0x02353538 + ldr r2, _023863EC ; =ov29_02353538 ldrb r3, [r0, #4] ldr r2, [r2] ldrb r7, [r0, #0xa] @@ -4300,7 +4300,7 @@ _023863DC: bl ov29_022EA370 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_023863EC: .word 0x02353538 +_023863EC: .word ov29_02353538 _023863F0: .word 0x000008DA _023863F4: .word 0x000008DB arm_func_end ov31_02386308 @@ -4337,17 +4337,17 @@ _0238643C: arm_func_start ov31_02386450 ov31_02386450: ; 0x02386450 stmdb sp!, {r3, lr} - ldr r0, _02386478 ; =0x0238A270 + ldr r0, _02386478 ; =ov31_0238A270 ldr r0, [r0, #4] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _02386478 ; =0x0238A270 + ldr r0, _02386478 ; =ov31_0238A270 mov r1, #0 str r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_02386478: .word 0x0238A270 +_02386478: .word ov31_0238A270 arm_func_end ov31_02386450 arm_func_start ov31_0238647C @@ -4362,7 +4362,7 @@ ov31_0238647C: ; 0x0238647C str r3, [sp, #8] mvn r4, #1 bl MemAlloc - ldr r1, _02386B0C ; =0x0238A270 + ldr r1, _02386B0C ; =ov31_0238A270 mov r2, #0 str r0, [r1, #4] str r2, [r1] @@ -4370,12 +4370,12 @@ _023864B4: mov r0, #6 mov r1, #0 bl ov29_022EA428 - ldr r0, _02386B10 ; =0x0235352C + ldr r0, _02386B10 ; =ov29_0235352C ldr r0, [r0] ldr r0, [r0, #0x24] bl sub_0200B3D4 mvn sb, #1 - ldr r7, _02386B0C ; =0x0238A270 + ldr r7, _02386B0C ; =ov31_0238A270 add r8, sb, #1 add fp, sp, #0xbc _023864E0: @@ -4441,7 +4441,7 @@ _023865B4: mov r0, #0x1e bl AdvanceFrame cmp sl, #1 - ldreq r0, _02386B0C ; =0x0238A270 + ldreq r0, _02386B0C ; =ov31_0238A270 mvneq r1, #0 streq r1, [r0] beq _02386924 @@ -4564,7 +4564,7 @@ _0238674C: strh r0, [fp, r1] add r0, fp, r2, lsl #3 str r8, [r0, #4] - ldr r0, _02386B18 ; =0x02389F98 + ldr r0, _02386B18 ; =ov31_02389F98 ldr r1, _02386B1C ; =0x00000213 add r2, sp, #0x24 mov r3, fp @@ -4688,7 +4688,7 @@ _02386924: mvn r4, #1 bl sub_020407C0 _02386950: - ldr r0, _02386B0C ; =0x0238A270 + ldr r0, _02386B0C ; =ov31_0238A270 ldr r1, [r0] cmp r1, #0 blt _02386AE8 @@ -4701,7 +4701,7 @@ _02386950: mov r1, r0 mov r0, #0 bl ov29_0234B084 - ldr r0, _02386B0C ; =0x0238A270 + ldr r0, _02386B0C ; =ov31_0238A270 ldr r0, [r0] cmp r0, #4 bge _023869D8 @@ -4741,7 +4741,7 @@ _02386A04: _02386A08: cmp r7, #1 bne _023864B4 - ldr r0, _02386B0C ; =0x0238A270 + ldr r0, _02386B0C ; =ov31_0238A270 ldr r0, [r0] cmp r0, #4 movge r1, #0 @@ -4805,7 +4805,7 @@ _02386AE0: blt _02386AD0 _02386AE8: bl ov31_02386450 - ldr r0, _02386B0C ; =0x0238A270 + ldr r0, _02386B0C ; =ov31_0238A270 ldr r0, [r0] cmp r0, #0 movge r0, #1 @@ -4814,10 +4814,10 @@ _02386AE8: add sp, sp, #0x114 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02386B0C: .word 0x0238A270 -_02386B10: .word 0x0235352C +_02386B0C: .word ov31_0238A270 +_02386B10: .word ov29_0235352C _02386B14: .word 0x000008DC -_02386B18: .word 0x02389F98 +_02386B18: .word ov31_02389F98 _02386B1C: .word 0x00000213 _02386B20: .word 0x000008D6 _02386B24: .word 0x000008D7 @@ -4827,7 +4827,7 @@ _02386B24: .word 0x000008D7 ov31_02386B28: ; 0x02386B28 stmdb sp!, {r3, r4, lr} sub sp, sp, #0xa4 - ldr r0, _02386C08 ; =0x0238A27C + ldr r0, _02386C08 ; =ov31_0238A27C ldr r0, [r0] ldr r1, [r0, #0x64] ldrsh r0, [r1, #4] @@ -4836,7 +4836,7 @@ ov31_02386B28: ; 0x02386B28 mov r4, r0 ldr r0, _02386C0C ; =0x000008D1 bl StringFromMessageId - ldr r1, _02386C08 ; =0x0238A27C + ldr r1, _02386C08 ; =ov31_0238A27C mov r3, r0 ldr r0, [r1] mov r1, #8 @@ -4872,7 +4872,7 @@ _02386B98: mov r1, #0x50 mov r3, #0 bl PreprocessString - ldr r0, _02386C08 ; =0x0238A27C + ldr r0, _02386C08 ; =ov31_0238A27C mov r1, #0x10 ldr r0, [r0] mov r2, #0x12 @@ -4884,7 +4884,7 @@ _02386C00: add sp, sp, #0xa4 ldmia sp!, {r3, r4, pc} .align 2, 0 -_02386C08: .word 0x0238A27C +_02386C08: .word ov31_0238A27C _02386C0C: .word 0x000008D1 _02386C10: .word 0x000008D2 arm_func_end ov31_02386B28 @@ -4892,12 +4892,12 @@ _02386C10: .word 0x000008D2 arm_func_start ov31_02386C14 ov31_02386C14: ; 0x02386C14 stmdb sp!, {r3, lr} - ldr r0, _02386C68 ; =0x0238A27C + ldr r0, _02386C68 ; =ov31_0238A27C ldr r0, [r0] add r0, r0, #0x61 add r0, r0, #0x100 bl ov29_0234E988 - ldr r0, _02386C68 ; =0x0238A27C + ldr r0, _02386C68 ; =ov31_0238A27C ldr r0, [r0] add r0, r0, #0x100 ldrsb r0, [r0, #0x60] @@ -4906,14 +4906,14 @@ ov31_02386C14: ; 0x02386C14 bl AdvanceFrame mov r0, #0x62 bl AdvanceFrame - ldr r0, _02386C68 ; =0x0238A27C + ldr r0, _02386C68 ; =ov31_0238A27C ldr r0, [r0] add r0, r0, #0x100 ldrsb r0, [r0, #0x60] bl sub_0202F8FC ldmia sp!, {r3, pc} .align 2, 0 -_02386C68: .word 0x0238A27C +_02386C68: .word ov31_0238A27C arm_func_end ov31_02386C14 arm_func_start ov31_02386C6C @@ -4924,15 +4924,15 @@ ov31_02386C6C: ; 0x02386C6C mov r0, #0x164 mov r1, #8 bl MemAlloc - ldr r1, _02386F0C ; =0x0238A27C + ldr r1, _02386F0C ; =ov31_0238A27C str r0, [r1] str r5, [r0, #0x64] _02386C90: bl ov00_022EA62C - ldr r0, _02386F10 ; =0x02389FC8 + ldr r0, _02386F10 ; =ov31_02389FC8 ldr r1, _02386F14 ; =ov31_02386B28 bl sub_0202F8C4 - ldr r1, _02386F0C ; =0x0238A27C + ldr r1, _02386F0C ; =ov31_0238A27C ldr r1, [r1] strb r0, [r1, #0x160] bl ov29_022EBA70 @@ -4945,7 +4945,7 @@ _02386C90: bl ov29_022EB9A0 bl ov29_022EBA84 mov r1, #0 - ldr r2, _02386F0C ; =0x0238A27C + ldr r2, _02386F0C ; =ov31_0238A27C b _02386CF0 _02386CDC: ldr r3, [r2] @@ -4956,7 +4956,7 @@ _02386CDC: _02386CF0: cmp r1, r0 blt _02386CDC - ldr r0, _02386F0C ; =0x0238A27C + ldr r0, _02386F0C ; =ov31_0238A27C mov r2, #0 ldr r4, [r0] mov r3, r1, lsl #3 @@ -4974,15 +4974,15 @@ _02386CF0: ldr r0, [r0] add r1, r0, #0x58 bl ov31_0238513C - ldr r1, _02386F0C ; =0x0238A27C - ldr r0, _02386F18 ; =0x02389FB8 + ldr r1, _02386F0C ; =ov31_0238A27C + ldr r0, _02386F18 ; =ov31_02389FB8 ldr r3, [r1] ldr r1, _02386F1C ; =0x00000213 add r4, r3, #0x58 add r2, sp, #0x5c str r4, [sp, #0xbc] bl sub_0202A5CC - ldr r6, _02386F0C ; =0x0238A27C + ldr r6, _02386F0C ; =ov31_0238A27C mov r4, #0x2d ldr r1, [r6] strb r0, [r1, #0x161] @@ -5026,7 +5026,7 @@ _02386D70: str r3, [sp, #0x1c] str r2, [sp] ldrb r2, [r0] - ldr r0, _02386F24 ; =0x02389FD8 + ldr r0, _02386F24 ; =ov31_02389FD8 sub r3, r1, #0x740 add r2, r2, #0xda add r2, r2, #0x3400 @@ -5057,10 +5057,10 @@ _02386E70: bl ov29_022EB804 cmp r0, #0 beq _02386D70 - ldr r0, _02386F0C ; =0x0238A27C + ldr r0, _02386F0C ; =ov31_0238A27C ldr r4, [r5, #0xb4] ldr r0, [r0] - ldr r1, _02386F28 ; =0x0237C91C + ldr r1, _02386F28 ; =ov29_0237C91C ldr r2, [r0, #0x124] add r0, r4, #0x4a mov r2, r2, lsl #3 @@ -5078,15 +5078,15 @@ _02386EBC: bl AdvanceFrame cmp r6, #2 beq _02386C90 - ldr r0, _02386F0C ; =0x0238A27C + ldr r0, _02386F0C ; =ov31_0238A27C ldr r0, [r0] cmp r0, #0 beq _02386EF8 bl ov31_02386C14 - ldr r0, _02386F0C ; =0x0238A27C + ldr r0, _02386F0C ; =ov31_0238A27C ldr r0, [r0] bl MemFree - ldr r0, _02386F0C ; =0x0238A27C + ldr r0, _02386F0C ; =ov31_0238A27C mov r1, #0 str r1, [r0] _02386EF8: @@ -5096,25 +5096,25 @@ _02386EF8: add sp, sp, #0xf4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02386F0C: .word 0x0238A27C -_02386F10: .word 0x02389FC8 +_02386F0C: .word ov31_0238A27C +_02386F10: .word ov31_02389FC8 _02386F14: .word ov31_02386B28 -_02386F18: .word 0x02389FB8 +_02386F18: .word ov31_02389FB8 _02386F1C: .word 0x00000213 _02386F20: .word 0x00001013 -_02386F24: .word 0x02389FD8 -_02386F28: .word 0x0237C91C +_02386F24: .word ov31_02389FD8 +_02386F28: .word ov29_0237C91C arm_func_end ov31_02386C6C arm_func_start ov31_02386F2C ov31_02386F2C: ; 0x02386F2C stmdb sp!, {r3, lr} - ldr r0, _02387010 ; =0x0238A280 + ldr r0, _02387010 ; =ov31_0238A280 ldr r0, [r0] add r0, r0, #0x294 add r0, r0, #0x400 bl ov29_0234E988 - ldr r0, _02387010 ; =0x0238A280 + ldr r0, _02387010 ; =ov31_0238A280 mvn r1, #1 ldr r0, [r0] add r0, r0, #0x600 @@ -5123,7 +5123,7 @@ ov31_02386F2C: ; 0x02386F2C beq _02386F64 bl sub_020308A0 _02386F64: - ldr r0, _02387010 ; =0x0238A280 + ldr r0, _02387010 ; =ov31_0238A280 mvn r1, #1 ldr r0, [r0] add r0, r0, #0x600 @@ -5132,12 +5132,12 @@ _02386F64: beq _02386F98 bl sub_020308A0 bl sub_020407C0 - ldr r0, _02387010 ; =0x0238A280 + ldr r0, _02387010 ; =ov31_0238A280 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x698] _02386F98: - ldr r0, _02387010 ; =0x0238A280 + ldr r0, _02387010 ; =ov31_0238A280 mvn r1, #1 ldr r0, [r0] add r0, r0, #0x600 @@ -5146,30 +5146,30 @@ _02386F98: beq _02386FB8 bl sub_0202F8FC _02386FB8: - ldr r0, _02387010 ; =0x0238A280 + ldr r0, _02387010 ; =ov31_0238A280 ldr r0, [r0] add r0, r0, #0x3a4 add r0, r0, #0x400 bl ov31_023899D4 - ldr r0, _02387010 ; =0x0238A280 + ldr r0, _02387010 ; =ov31_0238A280 ldr r0, [r0] add r0, r0, #0x3a8 add r0, r0, #0x400 bl ov31_02388714 - ldr r0, _02387010 ; =0x0238A280 + ldr r0, _02387010 ; =ov31_0238A280 ldr r0, [r0] add r0, r0, #0x95 add r0, r0, #0x600 bl ov29_0234E988 - ldr r0, _02387010 ; =0x0238A280 + ldr r0, _02387010 ; =ov31_0238A280 ldr r0, [r0] bl MemFree - ldr r0, _02387010 ; =0x0238A280 + ldr r0, _02387010 ; =ov31_0238A280 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_02387010: .word 0x0238A280 +_02387010: .word ov31_0238A280 arm_func_end ov31_02386F2C arm_func_start ov31_02387014 @@ -5180,7 +5180,7 @@ ov31_02387014: ; 0x02387014 mov r2, #1 cmp r0, #0 movne r1, #0xb - ldr r0, _02387048 ; =0x0238A280 + ldr r0, _02387048 ; =ov31_0238A280 ldreqb r1, [r1, #0xa8] ldr r0, [r0] and r1, r1, #0xff @@ -5188,7 +5188,7 @@ ov31_02387014: ; 0x02387014 bx ip .align 2, 0 _02387044: .word ov31_023899B8 -_02387048: .word 0x0238A280 +_02387048: .word ov31_0238A280 arm_func_end ov31_02387014 arm_func_start TeamMenu @@ -5199,10 +5199,10 @@ TeamMenu: ; 0x0238704C ldr r0, _02387614 ; =0x000007AC mov r1, #8 bl MemAlloc - ldr r1, _02387618 ; =0x0238A280 + ldr r1, _02387618 ; =ov31_0238A280 str r0, [r1] bl ov31_023880D8 - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 ldr r0, [r0] str sl, [r0, #0x69c] bl ov29_0234EBCC @@ -5214,19 +5214,19 @@ TeamMenu: ; 0x0238704C str r7, [sp] mov r8, r7 bl ov29_0234EA18 - ldr r2, _0238761C ; =0x02387014 + ldr r2, _0238761C ; =ov31_02387014 add r0, sp, #0xb0 mov r1, #0xe mov r3, r7 bl ov31_02388114 - ldr r2, _02387618 ; =0x0238A280 - ldr r1, _02387620 ; =0x0238A014 + ldr r2, _02387618 ; =ov31_0238A280 + ldr r1, _02387620 ; =ov31_0238A014 ldr r3, [r2] str r0, [r3, #0x7a8] ldr r0, [r2] ldr r0, [r0, #0x7a8] bl ov31_02388444 - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 add r1, sp, #8 ldr r0, [r0] ldr r0, [r0, #0x7a8] @@ -5239,7 +5239,7 @@ TeamMenu: ; 0x0238704C mov r0, r0, asr #0x10 mov r1, r1, asr #0x10 bl ov31_0238991C - ldr r3, _02387618 ; =0x0238A280 + ldr r3, _02387618 ; =ov31_0238A280 mov r1, #0xb ldr r4, [r3] mov r2, r7 @@ -5248,11 +5248,11 @@ TeamMenu: ; 0x0238704C ldr r0, [r0, #0x7a4] bl ov31_023899B8 _02387124: - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 ldr r0, [r0] ldr r0, [r0, #0x7a8] bl ov31_02388534 - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 ldr r0, [r0] ldr r0, [r0, #0x7a8] bl ov31_023886D4 @@ -5261,12 +5261,12 @@ _02387124: beq _023875D8 cmp r0, #2 bne _02387184 - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 mov r8, #1 ldr r0, [r0] ldr r0, [r0, #0x7a8] bl ov31_023886DC - ldr r1, _02387618 ; =0x0238A280 + ldr r1, _02387618 ; =ov31_0238A280 ldr r2, [r1] str r0, [r2, #0x760] ldr r0, [r1] @@ -5275,21 +5275,21 @@ _02387124: _02387184: cmp r0, #3 bne _023871B0 - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 ldr r0, [r0] ldr r0, [r0, #0x7a8] bl ov31_023886DC - ldr r1, _02387618 ; =0x0238A280 + ldr r1, _02387618 ; =ov31_0238A280 ldr r2, [r1] str r0, [r2, #0x760] ldr r0, [r1] ldr sb, [r0, #0x760] _023871B0: bl ov29_022EBA70 - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 add r1, sp, #0xb0 ldr r2, [r0] - ldr r0, _02387624 ; =0x02353538 + ldr r0, _02387624 ; =ov29_02353538 ldr r2, [r2, #0x760] ldr r3, [r0] add r0, r1, r2, lsl #5 @@ -5307,7 +5307,7 @@ _023871B0: ldrb r0, [r5, #7] cmp r0, #0 bne _02387278 - ldr r0, _02387624 ; =0x02353538 + ldr r0, _02387624 ; =ov29_02353538 ldr r1, [r0] ldrb r0, [r1, #0x75d] cmp r0, #0 @@ -5324,7 +5324,7 @@ _023871B0: bl JoinedAtRangeCheck2Veneer cmp r0, #0 beq _02387260 - ldr r0, _02387624 ; =0x02353538 + ldr r0, _02387624 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75c] cmp r0, #0 @@ -5346,7 +5346,7 @@ _02387278: bl AddDungeonSubMenuOption ldrb r0, [r5, #7] cmp r0, #0 - ldreq r0, _02387624 ; =0x02353538 + ldreq r0, _02387624 ; =ov29_02353538 ldreq r1, [r0] ldreqb r0, [r1, #0x75e] cmpeq r0, #0 @@ -5411,7 +5411,7 @@ _02387380: bl ov29_022EB9A0 cmp r8, #0 beq _023873C8 - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 ldr r3, [sl, #0xb4] ldr r0, [r0] add r1, sp, #0xb4 @@ -5419,7 +5419,7 @@ _02387380: add r0, r3, #0x4a ldr r1, [r1, r2, lsl #5] bl ov29_022EBA94 - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 mov r7, #0 ldr r0, [r0] add r0, r0, #0x294 @@ -5427,7 +5427,7 @@ _02387380: bl ov29_0234E988 b _023875D8 _023873C8: - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 cmp sb, #0 ldr r0, [r0] moveq r2, #1 @@ -5438,7 +5438,7 @@ _023873C8: bl ov31_0238513C bl ov29_022EBA84 mov r2, #0 - ldr r1, _02387618 ; =0x0238A280 + ldr r1, _02387618 ; =ov31_0238A280 b _02387410 _023873FC: ldr r3, [r1] @@ -5449,7 +5449,7 @@ _023873FC: _02387410: cmp r2, r0 blt _023873FC - ldr r4, _02387618 ; =0x0238A280 + ldr r4, _02387618 ; =ov31_0238A280 ldr r3, _0238762C ; =0x00000A3C ldr r0, [r4] mvn r1, #0 @@ -5474,15 +5474,15 @@ _02387410: str r1, [sp, #0x78] bl Arm9LoadUnkFieldNa0x2029EC8 add r4, r0, #1 - ldr r1, _02387618 ; =0x0238A280 - ldr r0, _02387630 ; =0x0238A024 + ldr r1, _02387618 ; =ov31_0238A280 + ldr r0, _02387630 ; =ov31_0238A024 ldr r3, [r1] ldr r1, _02387634 ; =0x00000233 add r2, sp, #0x18 add r3, r3, #0x530 str r4, [sp, #0x18] bl sub_0202A5CC - ldr r4, _02387618 ; =0x0238A280 + ldr r4, _02387618 ; =ov31_0238A280 mov r6, #0x1b ldr r1, [r4] add fp, sp, #4 @@ -5512,8 +5512,8 @@ _023874B0: bl ov29_022EB804 cmp r0, #0 beq _023874B0 - ldr r0, _02387618 ; =0x0238A280 - ldr r1, _02387638 ; =0x0237C91C + ldr r0, _02387618 ; =ov31_0238A280 + ldr r1, _02387638 ; =ov29_0237C91C ldr r0, [r0] ldr r5, [sl, #0xb4] ldr r2, [r0, #0x760] @@ -5528,12 +5528,12 @@ _023874B0: strb r0, [r5, #0x4e] b _02387594 _0238754C: - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 ldr r0, [r0] add r0, r0, #0x294 add r0, r0, #0x400 bl ov29_0234E988 - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 ldr r0, [r0] ldr r0, [r0, #0x7a8] bl ov31_023886F4 @@ -5548,19 +5548,19 @@ _02387578: bl Arm9StoreUnkFieldNa0x2029ED8 b _023874B0 _02387594: - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 ldr r0, [r0] add r0, r0, #0x294 add r0, r0, #0x400 bl ov29_0234E988 cmp r4, #1 beq _02387124 - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 ldr r0, [r0] add r0, r0, #0x95 add r0, r0, #0x600 bl ov29_0234E988 - ldr r0, _02387618 ; =0x0238A280 + ldr r0, _02387618 ; =ov31_0238A280 ldr r0, [r0] add r0, r0, #0x3a4 add r0, r0, #0x400 @@ -5584,15 +5584,15 @@ _023875F0: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02387614: .word 0x000007AC -_02387618: .word 0x0238A280 -_0238761C: .word 0x02387014 -_02387620: .word 0x0238A014 -_02387624: .word 0x02353538 +_02387618: .word ov31_0238A280 +_0238761C: .word ov31_02387014 +_02387620: .word ov31_0238A014 +_02387624: .word ov29_02353538 _02387628: .word 0x00005AA5 _0238762C: .word 0x00000A3C -_02387630: .word 0x0238A024 +_02387630: .word ov31_0238A024 _02387634: .word 0x00000233 -_02387638: .word 0x0237C91C +_02387638: .word ov29_0237C91C arm_func_end TeamMenu arm_func_start ov31_0238763C @@ -5610,7 +5610,7 @@ ov31_0238763C: ; 0x0238763C arm_func_start ov31_02387660 ov31_02387660: ; 0x02387660 - ldr r1, _02387680 ; =0x02353538 + ldr r1, _02387680 ; =ov29_02353538 ldrb r0, [r0, #4] ldr r1, [r1] ldr ip, _02387684 ; =ov31_0238948C @@ -5619,7 +5619,7 @@ ov31_02387660: ; 0x02387660 ldr r0, [r0, #0xb28] bx ip .align 2, 0 -_02387680: .word 0x02353538 +_02387680: .word ov29_02353538 _02387684: .word ov31_0238948C arm_func_end ov31_02387660 @@ -5627,7 +5627,7 @@ _02387684: .word ov31_0238948C ov31_02387688: ; 0x02387688 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x78 - ldr r2, _02387788 ; =0x02353538 + ldr r2, _02387788 ; =ov29_02353538 ldrb r0, [r0, #4] ldr r2, [r2] mov r4, r1 @@ -5696,13 +5696,13 @@ _0238776C: add sp, sp, #0x78 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02387788: .word 0x02353538 +_02387788: .word ov29_02353538 arm_func_end ov31_02387688 arm_func_start ov31_0238778C ov31_0238778C: ; 0x0238778C stmdb sp!, {r4, lr} - ldr r1, _023877C0 ; =0x0238A280 + ldr r1, _023877C0 ; =ov31_0238A280 mov r4, r0 ldr r0, [r1] add r0, r0, #0x600 @@ -5715,12 +5715,12 @@ ov31_0238778C: ; 0x0238778C bl sub_02026214 ldmia sp!, {r4, pc} .align 2, 0 -_023877C0: .word 0x0238A280 +_023877C0: .word ov31_0238A280 arm_func_end ov31_0238778C arm_func_start ov31_023877C4 ov31_023877C4: ; 0x023877C4 - ldr r2, _023877E4 ; =0x0238A280 + ldr r2, _023877E4 ; =ov31_0238A280 ldr ip, _023877E8 ; =sub_02026214 ldr r3, [r2] mov r1, #2 @@ -5729,7 +5729,7 @@ ov31_023877C4: ; 0x023877C4 add r3, r3, #0x600 bx ip .align 2, 0 -_023877E4: .word 0x0238A280 +_023877E4: .word ov31_0238A280 _023877E8: .word sub_02026214 arm_func_end ov31_023877C4 @@ -5747,13 +5747,13 @@ ov31_023877EC: ; 0x023877EC mov r1, #8 mov fp, r2 bl MemAlloc - ldr r1, _02388084 ; =0x0238A280 + ldr r1, _02388084 ; =ov31_0238A280 str r0, [r1] bl ov31_023880D8 mov r7, #0 mov r6, r7 _02387830: - ldr r0, _02388088 ; =0x02353538 + ldr r0, _02388088 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r6, lsl #2 add r0, r0, #0x12000 @@ -5801,7 +5801,7 @@ _023878D0: blt _023878BC mov r0, #0xb bl Arm9LoadUnkFieldNa0x2029EC8 - ldr r1, _02388084 ; =0x0238A280 + ldr r1, _02388084 ; =ov31_0238A280 mov r2, #0 ldr r3, [r1] str r0, [r3, #0x760] @@ -5818,7 +5818,7 @@ _023878D0: ldr r0, [r1] str r2, [r0, #0x758] bl ov00_022EA62C - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 ldr r0, [r0] add r0, r0, #0x95 add r0, r0, #0x600 @@ -5837,7 +5837,7 @@ _02387958: ldr r1, [r0, #4] cmp r1, #0 blt _02387B7C - ldr r0, _02388088 ; =0x02353538 + ldr r0, _02388088 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r1, lsl #2 add r0, r0, #0x12000 @@ -5876,7 +5876,7 @@ _02387958: add r2, r3, r2, lsr #30 cmp r0, r2, asr #2 bgt _02387A18 - ldr r1, _02388090 ; =0x0238A044 + ldr r1, _02388090 ; =ov31_0238A044 add r0, sp, #0xa8 bl strcpy b _02387B20 @@ -5889,7 +5889,7 @@ _02387A18: mov r2, r2, asr #2 cmp r0, r2, lsl #1 bgt _02387A48 - ldr r1, _02388094 ; =0x0238A04C + ldr r1, _02388094 ; =ov31_0238A04C add r0, sp, #0xa8 bl strcpy b _02387B20 @@ -5903,11 +5903,11 @@ _02387A48: cmp r0, r1 add r0, sp, #0xa8 bgt _02387A78 - ldr r1, _02388098 ; =0x0238A054 + ldr r1, _02388098 ; =ov31_0238A054 bl strcpy b _02387B20 _02387A78: - ldr r1, _0238809C ; =0x0238A05C + ldr r1, _0238809C ; =ov31_0238A05C bl strcpy b _02387B20 _02387A84: @@ -5920,7 +5920,7 @@ _02387A84: add r2, r3, r2, lsr #30 cmp r0, r2, asr #2 bgt _02387AB8 - ldr r1, _023880A0 ; =0x0238A064 + ldr r1, _023880A0 ; =ov31_0238A064 add r0, sp, #0xa8 bl strcpy b _02387B20 @@ -5933,7 +5933,7 @@ _02387AB8: mov r2, r2, asr #2 cmp r0, r2, lsl #1 bgt _02387AE8 - ldr r1, _023880A4 ; =0x0238A06C + ldr r1, _023880A4 ; =ov31_0238A06C add r0, sp, #0xa8 bl strcpy b _02387B20 @@ -5947,32 +5947,32 @@ _02387AE8: cmp r0, r1 add r0, sp, #0xa8 bgt _02387B18 - ldr r1, _023880A8 ; =0x0238A074 + ldr r1, _023880A8 ; =ov31_0238A074 bl strcpy b _02387B20 _02387B18: - ldr r1, _023880AC ; =0x0238A07C + ldr r1, _023880AC ; =ov31_0238A07C bl strcpy _02387B20: add r0, sp, #0xa8 str r0, [sp, #0x54] add r0, sp, #0x18 str r0, [sp] - ldr r0, _02388084 ; =0x0238A280 - ldr r2, _023880B0 ; =0x0238A084 + ldr r0, _02388084 ; =ov31_0238A280 + ldr r2, _023880B0 ; =ov31_0238A084 ldr r0, [r0] mov r1, #0x100 add r0, r0, #0x30 add r0, r0, r5, lsl #8 mov r3, #0 bl PreprocessString - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 mov r1, r5, lsl #3 ldr r2, [r0] add r0, r2, #0x30 add r0, r0, r5, lsl #8 str r0, [r2, r5, lsl #3] - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 add r5, r5, #1 ldr r0, [r0] add r0, r0, r1 @@ -5982,13 +5982,13 @@ _02387B7C: _02387B80: cmp r8, r7 blt _02387958 - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 mov r3, #0 ldr r1, [r0] sub r2, r3, #1 str r3, [r1, r5, lsl #3] ldr r1, [r0] - ldr r0, _02388088 ; =0x02353538 + ldr r0, _02388088 ; =ov29_02353538 add r1, r1, r5, lsl #3 str r2, [r1, #4] ldr r0, [r0] @@ -6000,7 +6000,7 @@ _02387B80: mov r0, #0xb strneh r1, [sp, #0xf0] bl Arm9LoadUnkFieldNa0x2029EC8 - ldr r1, _02388084 ; =0x0238A280 + ldr r1, _02388084 ; =ov31_0238A280 cmp r5, #0 ldr r3, [r1] add r2, sp, #0x29c @@ -6011,21 +6011,21 @@ _02387B80: moveq r1, #0 add r0, r0, #1 str r0, [sp, #0xe8] - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 orr r1, r1, #0x33 ldr r3, [r0] str r2, [sp, #0x148] - ldr r0, _023880B8 ; =0x0238A004 + ldr r0, _023880B8 ; =ov31_0238A004 add r2, sp, #0xe8 orr r1, r1, #0x1200 bl sub_0202A690 - ldr r2, _02388084 ; =0x0238A280 + ldr r2, _02388084 ; =ov31_0238A280 ldr r1, _023880BC ; =ov31_0238778C ldr r2, [r2] strb r0, [r2, #0x695] - ldr r0, _023880C0 ; =0x0238A034 + ldr r0, _023880C0 ; =ov31_0238A034 bl sub_0202F8C4 - ldr r1, _02388084 ; =0x0238A280 + ldr r1, _02388084 ; =ov31_0238A280 ldr r3, _023880C4 ; =0x00000A36 ldr r2, [r1] mov r5, #0x10 @@ -6044,13 +6044,13 @@ _02387B80: strh r1, [r0, #0x92] mov r5, #0 str r5, [sp] - ldr r0, _023880C8 ; =0x02389FF4 - ldr r3, _023880CC ; =0x023877C4 + ldr r0, _023880C8 ; =ov31_02389FF4 + ldr r3, _023880CC ; =ov31_023877C4 add r2, sp, #0x180 mov r1, #0x800 str r5, [sp, #4] bl sub_020305B4 - ldr r1, _02388084 ; =0x0238A280 + ldr r1, _02388084 ; =ov31_0238A280 ldr r1, [r1] strb r0, [r1, #0x697] b _02387CF4 @@ -6065,13 +6065,13 @@ _02387CA8: strh r1, [r0, #0x92] mov r5, #0 str r5, [sp] - ldr r0, _023880C8 ; =0x02389FF4 - ldr r3, _023880CC ; =0x023877C4 + ldr r0, _023880C8 ; =ov31_02389FF4 + ldr r3, _023880CC ; =ov31_023877C4 add r2, sp, #0x180 mov r1, #0x800 str r5, [sp, #4] bl sub_020305B4 - ldr r1, _02388084 ; =0x0238A280 + ldr r1, _02388084 ; =ov31_0238A280 ldr r1, [r1] strb r0, [r1, #0x697] _02387CF4: @@ -6079,7 +6079,7 @@ _02387CF4: mvn r7, #0x3d8 str r0, [sp, #0x10] add r0, r7, #0xe10 - ldr r5, _02388084 ; =0x0238A280 + ldr r5, _02388084 ; =ov31_0238A280 str r0, [sp, #0x14] mov fp, r7, asr #9 _02387D10: @@ -6101,7 +6101,7 @@ _02387D10: ldr r6, [r0, #4] cmp r6, #0 blt _02387EC0 - ldr r0, _02388088 ; =0x02353538 + ldr r0, _02388088 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r6, lsl #2 add r0, r0, #0x12000 @@ -6179,7 +6179,7 @@ _02387E6C: mov r0, #1 str r0, [sp] ldr r0, [r5] - ldr r2, _023880D4 ; =0x02389FE8 + ldr r2, _023880D4 ; =ov31_02389FE8 add r0, r0, #0x12 add r1, r7, #0x62 add r0, r0, #0x600 @@ -6208,14 +6208,14 @@ _02387EC0: bl sub_0202AB40 cmp r0, #0 bne _02387D10 - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 ldr r0, [r0] add r0, r0, #0x600 ldrsb r0, [r0, #0x95] bl sub_0202ABB0 subs r3, r0, #1 bmi _02387F24 - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 add r1, sp, #0x29c ldr r2, [r0] str r3, [r2, #0x760] @@ -6228,7 +6228,7 @@ _02387EC0: _02387F24: mov r4, #1 _02387F28: - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 mvn r1, #1 ldr r0, [r0] add r0, r0, #0x600 @@ -6236,12 +6236,12 @@ _02387F28: cmp r0, r1 beq _02387F58 bl sub_020308A0 - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x697] _02387F58: - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 mvn r1, #1 ldr r0, [r0] add r0, r0, #0x600 @@ -6250,17 +6250,17 @@ _02387F58: beq _02387F8C bl sub_020308A0 bl sub_020407C0 - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 mvn r1, #1 ldr r0, [r0] strb r1, [r0, #0x698] _02387F8C: - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 ldr r0, [r0] add r0, r0, #0x600 ldrsb r0, [r0, #0x96] bl sub_0202F8FC - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 mvn r2, #1 ldr r1, [r0] mov r0, #0x1b @@ -6301,7 +6301,7 @@ _0238800C: mov r0, #0 b _02388078 _02388038: - ldr r0, _02388084 ; =0x0238A280 + ldr r0, _02388084 ; =ov31_0238A280 add r1, sp, #0x21c ldr r0, [r0] cmp sl, #0 @@ -6312,7 +6312,7 @@ _02388038: cmp r4, #0 movlt r0, #0 blt _02388078 - ldr r0, _02388088 ; =0x02353538 + ldr r0, _02388088 ; =ov29_02353538 ldr r0, [r0] add r0, r0, r4, lsl #2 add r0, r0, #0x12000 @@ -6322,27 +6322,27 @@ _02388078: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02388080: .word 0x000007AC -_02388084: .word 0x0238A280 -_02388088: .word 0x02353538 +_02388084: .word ov31_0238A280 +_02388088: .word ov29_02353538 _0238808C: .word 0x000003E7 -_02388090: .word 0x0238A044 -_02388094: .word 0x0238A04C -_02388098: .word 0x0238A054 -_0238809C: .word 0x0238A05C -_023880A0: .word 0x0238A064 -_023880A4: .word 0x0238A06C -_023880A8: .word 0x0238A074 -_023880AC: .word 0x0238A07C -_023880B0: .word 0x0238A084 +_02388090: .word ov31_0238A044 +_02388094: .word ov31_0238A04C +_02388098: .word ov31_0238A054 +_0238809C: .word ov31_0238A05C +_023880A0: .word ov31_0238A064 +_023880A4: .word ov31_0238A06C +_023880A8: .word ov31_0238A074 +_023880AC: .word ov31_0238A07C +_023880B0: .word ov31_0238A084 _023880B4: .word 0x00000A3A -_023880B8: .word 0x0238A004 +_023880B8: .word ov31_0238A004 _023880BC: .word ov31_0238778C -_023880C0: .word 0x0238A034 +_023880C0: .word ov31_0238A034 _023880C4: .word 0x00000A36 -_023880C8: .word 0x02389FF4 -_023880CC: .word 0x023877C4 +_023880C8: .word ov31_02389FF4 +_023880CC: .word ov31_023877C4 _023880D0: .word 0x00000A3D -_023880D4: .word 0x02389FE8 +_023880D4: .word ov31_02389FE8 arm_func_end ov31_023877EC arm_func_start ov31_023880D8 @@ -6505,14 +6505,14 @@ _023882E8: cmp r5, r0, asr #2 mov r0, r0, asr #2 bgt _02388320 - ldr r1, _02388420 ; =0x0238A0A8 + ldr r1, _02388420 ; =ov31_0238A0A8 add r0, sp, #0x4c bl strcpy b _023883B8 _02388320: cmp r5, r0, lsl #1 bgt _02388338 - ldr r1, _02388424 ; =0x0238A0B0 + ldr r1, _02388424 ; =ov31_0238A0B0 add r0, sp, #0x4c bl strcpy b _023883B8 @@ -6521,25 +6521,25 @@ _02388338: cmp r5, r0 add r0, sp, #0x4c bgt _02388354 - ldr r1, _02388428 ; =0x0238A0B8 + ldr r1, _02388428 ; =ov31_0238A0B8 bl strcpy b _023883B8 _02388354: - ldr r1, _0238842C ; =0x0238A0C0 + ldr r1, _0238842C ; =ov31_0238A0C0 bl strcpy b _023883B8 _02388360: cmp r5, r0, asr #2 mov r0, r0, asr #2 bgt _0238837C - ldr r1, _02388430 ; =0x0238A0C8 + ldr r1, _02388430 ; =ov31_0238A0C8 add r0, sp, #0x4c bl strcpy b _023883B8 _0238837C: cmp r5, r0, lsl #1 bgt _02388394 - ldr r1, _02388434 ; =0x0238A0D0 + ldr r1, _02388434 ; =ov31_0238A0D0 add r0, sp, #0x4c bl strcpy b _023883B8 @@ -6548,18 +6548,18 @@ _02388394: cmp r5, r0 add r0, sp, #0x4c bgt _023883B0 - ldr r1, _02388438 ; =0x0238A0D8 + ldr r1, _02388438 ; =ov31_0238A0D8 bl strcpy b _023883B8 _023883B0: - ldr r1, _0238843C ; =0x0238A0E0 + ldr r1, _0238843C ; =ov31_0238A0E0 bl strcpy _023883B8: add r0, sp, #0x4c str r0, [sp, #0xc8] add r0, sp, #0x8c str r0, [sp] - ldr r2, _02388440 ; =0x0238A0E8 + ldr r2, _02388440 ; =ov31_0238A0E8 add r0, fp, r4, lsl #8 mov r1, #0x100 mov r3, #0 @@ -6584,15 +6584,15 @@ _023883F4: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _0238841C: .word 0x000003E7 -_02388420: .word 0x0238A0A8 -_02388424: .word 0x0238A0B0 -_02388428: .word 0x0238A0B8 -_0238842C: .word 0x0238A0C0 -_02388430: .word 0x0238A0C8 -_02388434: .word 0x0238A0D0 -_02388438: .word 0x0238A0D8 -_0238843C: .word 0x0238A0E0 -_02388440: .word 0x0238A0E8 +_02388420: .word ov31_0238A0A8 +_02388424: .word ov31_0238A0B0 +_02388428: .word ov31_0238A0B8 +_0238842C: .word ov31_0238A0C0 +_02388430: .word ov31_0238A0C8 +_02388434: .word ov31_0238A0D0 +_02388438: .word ov31_0238A0D8 +_0238843C: .word ov31_0238A0E0 +_02388440: .word ov31_0238A0E8 arm_func_end ov31_02388158 arm_func_start ov31_02388444 @@ -6615,7 +6615,7 @@ ov31_02388444: ; 0x02388444 str r0, [r6, #0x670] str r0, [r6, #0x674] bl ov00_022EA62C - ldr r0, _02388528 ; =0x02353538 + ldr r0, _02388528 ; =ov29_02353538 ldr r0, [r0] ldrb r4, [r0, #0x75b] cmp r4, #0 @@ -6657,7 +6657,7 @@ _0238851C: add sp, sp, #0x98 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02388528: .word 0x02353538 +_02388528: .word ov29_02353538 _0238852C: .word 0x00000A3A _02388530: .word 0x00401233 arm_func_end ov31_02388444 @@ -6854,14 +6854,14 @@ ov31_02388744: ; 0x02388744 RestMenu: ; 0x0238878C stmdb sp!, {r4, r5, lr} sub sp, sp, #0x9c - ldr r0, _023889B8 ; =0x0238A284 + ldr r0, _023889B8 ; =ov31_0238A284 ldr r0, [r0] cmp r0, #0 bne _023887CC mov r0, #0x10 mov r1, #8 bl MemAlloc - ldr r1, _023889B8 ; =0x0238A284 + ldr r1, _023889B8 ; =ov31_0238A284 mov r2, #0 str r0, [r1] str r2, [r0] @@ -6870,7 +6870,7 @@ RestMenu: ; 0x0238878C strb r1, [r0, #4] _023887CC: mov r3, #0 - ldr r0, _023889B8 ; =0x0238A284 + ldr r0, _023889B8 ; =ov31_0238A284 mov r2, r3 _023887D8: ldr r1, [r0] @@ -6881,24 +6881,24 @@ _023887D8: blt _023887D8 bl ov29_022E08F4 cmp r0, #0 - ldreq r0, _023889B8 ; =0x0238A284 + ldreq r0, _023889B8 ; =ov31_0238A284 moveq r1, #3 ldreq r0, [r0] ldr ip, _023889BC ; =0x000008C2 streqb r1, [r0, #0xc] - ldr r0, _023889B8 ; =0x0238A284 + ldr r0, _023889B8 ; =ov31_0238A284 mov r5, #0x10 ldr r1, [r0] - ldr r0, _023889C0 ; =0x0238A10C + ldr r0, _023889C0 ; =ov31_0238A10C add r4, r1, #0xc ldr r1, _023889C4 ; =0x00001A13 - ldr r3, _023889C8 ; =0x0238A11C + ldr r3, _023889C8 ; =ov31_0238A11C add r2, sp, #4 strh ip, [sp, #0xc] str r5, [sp, #0x10] str r4, [sp, #0x64] bl sub_0202A5CC - ldr r4, _023889B8 ; =0x0238A284 + ldr r4, _023889B8 ; =ov31_0238A284 mov r5, #0x62 ldr r1, [r4] strb r0, [r1, #4] @@ -6910,20 +6910,20 @@ _0238884C: bl sub_0202AB40 cmp r0, #0 bne _0238884C - ldr r0, _023889B8 ; =0x0238A284 + ldr r0, _023889B8 ; =ov31_0238A284 ldr r0, [r0] ldrsb r0, [r0, #4] bl sub_0202ABB0 - ldr r1, _023889B8 ; =0x0238A284 + ldr r1, _023889B8 ; =ov31_0238A284 ldr r1, [r1] str r0, [r1, #8] mov r0, #0x62 bl AdvanceFrame - ldr r0, _023889B8 ; =0x0238A284 + ldr r0, _023889B8 ; =ov31_0238A284 ldr r0, [r0] ldrsb r0, [r0, #4] bl sub_0202AABC - ldr r0, _023889B8 ; =0x0238A284 + ldr r0, _023889B8 ; =ov31_0238A284 ldr r1, [r0] ldr r0, [r1, #8] cmp r0, #1 @@ -6947,7 +6947,7 @@ _023888BC: mov r0, #0 _023888F0: cmp r0, #0 - ldreq r0, _023889B8 ; =0x0238A284 + ldreq r0, _023889B8 ; =ov31_0238A284 mvneq r1, #0 ldreq r0, [r0] streq r1, [r0, #8] @@ -6971,14 +6971,14 @@ _02388908: ldr r0, _023889D4 ; =0x0000025A mov r3, r1 bl ov29_022ECDE4 - ldr r0, _023889D8 ; =0x02353538 + ldr r0, _023889D8 ; =ov29_02353538 mov r1, #1 ldr r0, [r0] mov r2, #0 strb r1, [r0, #0x758] _02388964: cmp r2, #0 - ldreq r0, _023889B8 ; =0x0238A284 + ldreq r0, _023889B8 ; =ov31_0238A284 mvneq r1, #0 ldreq r0, [r0] streq r1, [r0, #8] @@ -6987,7 +6987,7 @@ _0238897C: mvn r0, #0 str r0, [r1, #8] _02388984: - ldr r0, _023889B8 ; =0x0238A284 + ldr r0, _023889B8 ; =ov31_0238A284 ldr r0, [r0] ldr r1, [r0, #8] cmp r1, #0 @@ -6995,22 +6995,22 @@ _02388984: cmp r0, #0 beq _023889B0 bl MemFree - ldr r0, _023889B8 ; =0x0238A284 + ldr r0, _023889B8 ; =ov31_0238A284 mov r1, #0 str r1, [r0] _023889B0: add sp, sp, #0x9c ldmia sp!, {r4, r5, pc} .align 2, 0 -_023889B8: .word 0x0238A284 +_023889B8: .word ov31_0238A284 _023889BC: .word 0x000008C2 -_023889C0: .word 0x0238A10C +_023889C0: .word ov31_0238A10C _023889C4: .word 0x00001A13 -_023889C8: .word 0x0238A11C +_023889C8: .word ov31_0238A11C _023889CC: .word 0x000008C5 _023889D0: .word 0x000008C6 _023889D4: .word 0x0000025A -_023889D8: .word 0x02353538 +_023889D8: .word ov29_02353538 arm_func_end RestMenu arm_func_start ov31_023889DC @@ -7062,7 +7062,7 @@ _02388A44: bne _02388AA8 cmp r0, #0 beq _02388AF8 - ldr r0, _02388BFC ; =0x020A1870 + ldr r0, _02388BFC ; =_020A1870 ldrsh r1, [r4, #0x16] ldrsh r0, [r0] add r0, r1, r0 @@ -7071,7 +7071,7 @@ _02388A44: _02388AA8: cmp r0, #0 bne _02388AF8 - ldr r0, _02388BFC ; =0x020A1870 + ldr r0, _02388BFC ; =_020A1870 ldrsh r1, [r4, #0x16] ldrsh r0, [r0] ldr r2, _02388C00 ; =0x000003E7 @@ -7161,7 +7161,7 @@ _02388BE8: add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02388BFC: .word 0x020A1870 +_02388BFC: .word _020A1870 _02388C00: .word 0x000003E7 arm_func_end ov31_023889DC @@ -7169,7 +7169,7 @@ _02388C00: .word 0x000003E7 RecruitmentSearchMenuLoop: ; 0x02388C04 stmdb sp!, {r3, lr} sub sp, sp, #0xa0 - ldr r0, _02388D30 ; =0x0238A288 + ldr r0, _02388D30 ; =ov31_0238A288 ldr r1, [r0] ldr r0, [r1, #0xd94] cmp r0, #3 @@ -7181,22 +7181,22 @@ _02388C24: ; jump table b _02388CF8 ; case 2 b _02388D18 ; case 3 _02388C34: - ldr r0, _02388D34 ; =0x02353538 + ldr r0, _02388D34 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x748] bl IsRecruitingAllowed cmp r0, #0 ldreq r2, _02388D38 ; =0x00000B44 - ldreq r1, _02388D3C ; =0x0238280C + ldreq r1, _02388D3C ; =ov29_0238280C moveq r0, #4 streqh r2, [r1] beq _02388D28 - ldr r0, _02388D34 ; =0x02353538 + ldr r0, _02388D34 ; =ov29_02353538 ldr r0, [r0] ldrb r0, [r0, #0x75d] cmp r0, #0 ldrne r2, _02388D40 ; =0x00000B45 - ldrne r1, _02388D3C ; =0x0238280C + ldrne r1, _02388D3C ; =ov29_0238280C movne r0, #4 strneh r2, [r1] bne _02388D28 @@ -7206,13 +7206,13 @@ _02388C34: str r0, [sp, #0x14] mov ip, #0 str ip, [sp] - ldr r0, _02388D48 ; =0x0238A134 + ldr r0, _02388D48 ; =ov31_0238A134 ldr r1, _02388D4C ; =0x00001813 ldr r3, _02388D50 ; =ov31_02388D54 add r2, sp, #8 str ip, [sp, #4] bl sub_020305B4 - ldr r1, _02388D30 ; =0x0238A288 + ldr r1, _02388D30 ; =ov31_0238A288 ldr r2, [r1] strb r0, [r2] ldr r1, [r1] @@ -7225,7 +7225,7 @@ _02388CD0: bl sub_020308C4 cmp r0, #0 bne _02388D24 - ldr r0, _02388D30 ; =0x0238A288 + ldr r0, _02388D30 ; =ov31_0238A288 ldr r1, [r0] ldr r0, [r1, #0xd94] add r0, r0, #1 @@ -7234,7 +7234,7 @@ _02388CD0: _02388CF8: ldrsb r0, [r1] bl sub_020308A0 - ldr r0, _02388D30 ; =0x0238A288 + ldr r0, _02388D30 ; =ov31_0238A288 ldr r1, [r0] ldr r0, [r1, #0xd94] add r0, r0, #1 @@ -7250,13 +7250,13 @@ _02388D28: add sp, sp, #0xa0 ldmia sp!, {r3, pc} .align 2, 0 -_02388D30: .word 0x0238A288 -_02388D34: .word 0x02353538 +_02388D30: .word ov31_0238A288 +_02388D34: .word ov29_02353538 _02388D38: .word 0x00000B44 -_02388D3C: .word 0x0238280C +_02388D3C: .word ov29_0238280C _02388D40: .word 0x00000B45 _02388D44: .word 0x00000B46 -_02388D48: .word 0x0238A134 +_02388D48: .word ov31_0238A134 _02388D4C: .word 0x00001813 _02388D50: .word ov31_02388D54 arm_func_end RecruitmentSearchMenuLoop @@ -7265,7 +7265,7 @@ _02388D50: .word ov31_02388D54 ov31_02388D54: ; 0x02388D54 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0xd4 - ldr r4, _02388E54 ; =0x0238A288 + ldr r4, _02388E54 ; =ov31_0238A288 mov sl, r0 ldr r0, [r4] mov r8, #4 @@ -7291,7 +7291,7 @@ _02388D90: str r0, [sp, #0xa8] add r2, r2, r7 ldrb r2, [r2, #0x90a] - ldr r1, _02388E58 ; =0x0238A154 + ldr r1, _02388E58 ; =ov31_0238A154 mov r0, fp mov r3, r6 bl ov31_02388E60 @@ -7333,8 +7333,8 @@ _02388E4C: add sp, sp, #0xd4 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02388E54: .word 0x0238A288 -_02388E58: .word 0x0238A154 +_02388E54: .word ov31_0238A288 +_02388E58: .word ov31_0238A154 _02388E5C: .word 0x00000B47 arm_func_end ov31_02388D54 @@ -7357,14 +7357,14 @@ ov31_02388E88: ; 0x02388E88 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x84 sub sp, sp, #0x400 - ldr r0, _02389164 ; =0x0238A144 + ldr r0, _02389164 ; =ov31_0238A144 bl sub_020348E4 cmp r0, #0 beq _02389158 ldr r0, _02389168 ; =0x00000D98 mov r1, #8 bl MemAlloc - ldr r1, _0238916C ; =0x0238A288 + ldr r1, _0238916C ; =ov31_0238A288 mov r3, #0 str r0, [r1] add r5, r0, #4 @@ -7381,7 +7381,7 @@ _02388ECC: mov sb, #1 mov r8, #2 add r7, sp, #0 - ldr r6, _02389174 ; =0x02353538 + ldr r6, _02389174 ; =ov29_02353538 b _02388F3C _02388EF8: ldr r1, [r6] @@ -7416,7 +7416,7 @@ _02388F3C: mov r2, #1 strb r2, [r1, r0] _02388F6C: - ldr r0, _02389174 ; =0x02353538 + ldr r0, _02389174 ; =ov29_02353538 mov sl, #0 ldr r0, [r0] mov sb, #1 @@ -7548,7 +7548,7 @@ _02389134: _02389140: cmp r8, sl blt _023890D8 - ldr r0, _0238916C ; =0x0238A288 + ldr r0, _0238916C ; =ov31_0238A288 mov r1, #0 ldr r0, [r0] str r1, [r0, #0xd94] @@ -7557,28 +7557,28 @@ _02389158: add sp, sp, #0x400 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02389164: .word 0x0238A144 +_02389164: .word ov31_0238A144 _02389168: .word 0x00000D98 -_0238916C: .word 0x0238A288 +_0238916C: .word ov31_0238A288 _02389170: .word 0x00000483 -_02389174: .word 0x02353538 +_02389174: .word ov29_02353538 _02389178: .word 0xFFFFFC19 arm_func_end ov31_02388E88 arm_func_start ov31_0238917C ov31_0238917C: ; 0x0238917C stmdb sp!, {r3, lr} - ldr r0, _023891A4 ; =0x0238A288 + ldr r0, _023891A4 ; =ov31_0238A288 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _023891A4 ; =0x0238A288 + ldr r0, _023891A4 ; =ov31_0238A288 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_023891A4: .word 0x0238A288 +_023891A4: .word ov31_0238A288 arm_func_end ov31_0238917C arm_func_start ov31_023891A8 @@ -7587,7 +7587,7 @@ ov31_023891A8: ; 0x023891A8 mov r5, r0 bl sub_02030A18 mov r4, r0 - ldr r0, _023891F8 ; =0x0238A1A0 + ldr r0, _023891F8 ; =ov31_0238A1A0 mov r1, r4, lsl #3 ldrh r1, [r0, r1] mov r0, r5 @@ -7604,14 +7604,14 @@ ov31_023891A8: ; 0x023891A8 bl sub_02026214 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023891F8: .word 0x0238A1A0 +_023891F8: .word ov31_0238A1A0 arm_func_end ov31_023891A8 arm_func_start HelpMenuLoop HelpMenuLoop: ; 0x023891FC stmdb sp!, {r4, lr} sub sp, sp, #0xa0 - ldr r0, _023893FC ; =0x0238A28C + ldr r0, _023893FC ; =ov31_0238A28C ldr r2, [r0] ldr r0, [r2, #8] cmp r0, #6 @@ -7628,14 +7628,14 @@ _0238921C: ; jump table _02389238: ldr ip, _02389400 ; =0x00003FA7 mov r4, #0x10 - ldr r0, _02389404 ; =0x0238A170 + ldr r0, _02389404 ; =ov31_0238A170 ldr r1, _02389408 ; =0x00401813 - ldr r3, _0238940C ; =0x0238A1A0 + ldr r3, _0238940C ; =ov31_0238A1A0 add r2, sp, #8 strh ip, [sp, #0x10] str r4, [sp, #0x14] bl sub_0202A5CC - ldr r1, _023893FC ; =0x0238A28C + ldr r1, _023893FC ; =ov31_0238A28C mov r2, #1 ldr r3, [r1] strb r0, [r3] @@ -7647,27 +7647,27 @@ _02389278: bl sub_02028354 cmp r0, #3 bne _02389298 - ldr r0, _023893FC ; =0x0238A28C + ldr r0, _023893FC ; =ov31_0238A28C ldr r0, [r0] ldrsb r0, [r0] bl sub_0202810C _02389298: - ldr r0, _023893FC ; =0x0238A28C + ldr r0, _023893FC ; =ov31_0238A28C ldr r0, [r0] ldrsb r0, [r0] bl sub_0202A954 - ldr r0, _023893FC ; =0x0238A28C + ldr r0, _023893FC ; =ov31_0238A28C mov r1, #1 ldr r0, [r0] str r1, [r0, #8] _023892B8: - ldr r0, _023893FC ; =0x0238A28C + ldr r0, _023893FC ; =ov31_0238A28C ldr r0, [r0] ldrsb r0, [r0] bl sub_0202AB40 cmp r0, #0 bne _023893F0 - ldr r0, _023893FC ; =0x0238A28C + ldr r0, _023893FC ; =ov31_0238A28C ldr r0, [r0] ldrsb r0, [r0] bl sub_0202ABB0 @@ -7675,12 +7675,12 @@ _023892B8: bmi _02389320 bl sub_02001808 cmp r0, #0xa000 - ldrlt r0, _023893FC ; =0x0238A28C + ldrlt r0, _023893FC ; =ov31_0238A28C movlt r1, #2 ldrlt r0, [r0] strlt r1, [r0, #8] blt _023893F0 - ldr r0, _023893FC ; =0x0238A28C + ldr r0, _023893FC ; =ov31_0238A28C mov r1, #3 ldr r2, [r0] str r4, [r2, #4] @@ -7688,12 +7688,12 @@ _023892B8: str r1, [r0, #8] b _02389330 _02389320: - ldr r0, _023893FC ; =0x0238A28C + ldr r0, _023893FC ; =ov31_0238A28C mov r1, #6 ldr r0, [r0] str r1, [r0, #8] _02389330: - ldr r0, _023893FC ; =0x0238A28C + ldr r0, _023893FC ; =ov31_0238A28C ldr r0, [r0] ldrsb r0, [r0] bl sub_0202812C @@ -7702,11 +7702,11 @@ _02389344: mov r0, #0x10 str r0, [sp, #0x14] ldr r1, [r2, #4] - ldr r0, _0238940C ; =0x0238A1A0 + ldr r0, _0238940C ; =ov31_0238A1A0 mov r1, r1, lsl #3 ldrh r1, [r0, r1] mov ip, #8 - ldr r0, _02389410 ; =0x0238A180 + ldr r0, _02389410 ; =ov31_0238A180 strh r1, [sp, #0x10] ldr r2, [r2, #4] ldr r1, _02389414 ; =0x00009833 @@ -7717,7 +7717,7 @@ _02389344: add r2, sp, #8 str ip, [sp, #4] bl sub_020305B4 - ldr r1, _023893FC ; =0x0238A28C + ldr r1, _023893FC ; =ov31_0238A28C mov r2, #4 ldr r3, [r1] strb r0, [r3, #1] @@ -7729,11 +7729,11 @@ _023893A8: bl sub_020308C4 cmp r0, #0 bne _023893F0 - ldr r0, _023893FC ; =0x0238A28C + ldr r0, _023893FC ; =ov31_0238A28C ldr r0, [r0] ldrsb r0, [r0, #1] bl sub_020308A0 - ldr r0, _023893FC ; =0x0238A28C + ldr r0, _023893FC ; =ov31_0238A28C mov r1, #2 ldr r0, [r0] str r1, [r0, #8] @@ -7750,12 +7750,12 @@ _023893F4: add sp, sp, #0xa0 ldmia sp!, {r4, pc} .align 2, 0 -_023893FC: .word 0x0238A28C +_023893FC: .word ov31_0238A28C _02389400: .word 0x00003FA7 -_02389404: .word 0x0238A170 +_02389404: .word ov31_0238A170 _02389408: .word 0x00401813 -_0238940C: .word 0x0238A1A0 -_02389410: .word 0x0238A180 +_0238940C: .word ov31_0238A1A0 +_02389410: .word ov31_0238A180 _02389414: .word 0x00009833 _02389418: .word ov31_023891A8 arm_func_end HelpMenuLoop @@ -7763,14 +7763,14 @@ _02389418: .word ov31_023891A8 arm_func_start ov31_0238941C ov31_0238941C: ; 0x0238941C stmdb sp!, {r3, lr} - ldr r0, _02389458 ; =0x0238A190 + ldr r0, _02389458 ; =ov31_0238A190 bl sub_020348E4 cmp r0, #0 ldmeqia sp!, {r3, pc} mov r0, #0xc mov r1, #8 bl MemAlloc - ldr r1, _0238945C ; =0x0238A28C + ldr r1, _0238945C ; =ov31_0238A28C mov r2, #0 str r0, [r1] str r2, [r0, #4] @@ -7778,24 +7778,24 @@ ov31_0238941C: ; 0x0238941C str r2, [r0, #8] ldmia sp!, {r3, pc} .align 2, 0 -_02389458: .word 0x0238A190 -_0238945C: .word 0x0238A28C +_02389458: .word ov31_0238A190 +_0238945C: .word ov31_0238A28C arm_func_end ov31_0238941C arm_func_start ov31_02389460 ov31_02389460: ; 0x02389460 stmdb sp!, {r3, lr} - ldr r0, _02389488 ; =0x0238A28C + ldr r0, _02389488 ; =ov31_0238A28C ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} bl MemFree - ldr r0, _02389488 ; =0x0238A28C + ldr r0, _02389488 ; =ov31_0238A28C mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_02389488: .word 0x0238A28C +_02389488: .word ov31_0238A28C arm_func_end ov31_02389460 arm_func_start ov31_0238948C @@ -7854,7 +7854,7 @@ ov31_0238948C: ; 0x0238948C add r0, r5, #0x78 str r0, [sp, #0xe4] _02389560: - ldr r0, _023898F8 ; =0x0238A208 + ldr r0, _023898F8 ; =ov31_0238A208 ldr r1, _023898FC ; =0x80401813 add r2, sp, #0x9c add r3, r5, #0xc4 @@ -7927,7 +7927,7 @@ _02389640: add r0, r5, #1 str r1, [r2, #0x10] bl ov29_0234E988 - ldr r0, _02389908 ; =0x0238A1F8 + ldr r0, _02389908 ; =ov31_0238A1F8 ldr r1, _0238990C ; =0x80000213 add r2, sp, #4 add r3, r5, #4 @@ -8105,11 +8105,11 @@ _023898B0: .align 2, 0 _023898F0: .word 0x00000F5F _023898F4: .word 0x00000F5E -_023898F8: .word 0x0238A208 +_023898F8: .word ov31_0238A208 _023898FC: .word 0x80401813 _02389900: .word 0x00003F02 _02389904: .word 0x00000A3C -_02389908: .word 0x0238A1F8 +_02389908: .word ov31_0238A1F8 _0238990C: .word 0x80000213 _02389910: .word 0x00003F07 _02389914: .word 0x00003F04 @@ -8141,7 +8141,7 @@ ov31_0238994C: ; 0x0238994C mov r0, r1, asr #2 add r2, r2, r3, lsr #29 add ip, r1, r0, lsr #29 - ldr r6, _023899B0 ; =0x0238A218 + ldr r6, _023899B0 ; =ov31_0238A218 mov lr, r2, asr #3 add r5, sp, #0 ldmia r6, {r0, r1, r2, r3} @@ -8160,7 +8160,7 @@ ov31_0238994C: ; 0x0238994C add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023899B0: .word 0x0238A218 +_023899B0: .word ov31_0238A218 _023899B4: .word ov31_02389A04 arm_func_end ov31_0238994C @@ -8246,7 +8246,7 @@ ov31_02389A78: ; 0x02389A78 ldrb r1, [r0, #0xa] add r0, sp, #8 bl sub_02058C4C - ldr r4, _02389C20 ; =0x02353538 + ldr r4, _02389C20 ; =ov29_02353538 mov r7, r6 add r5, sp, #4 _02389AD0: @@ -8309,7 +8309,7 @@ _02389B7C: beq _02389BC4 cmp r6, r1 bne _02389BC4 - ldr r2, _02389C24 ; =0x0238A228 + ldr r2, _02389C24 ; =ov31_0238A228 mov r1, #0x40 add r0, r4, r8, lsl #6 mov r3, #0 @@ -8318,7 +8318,7 @@ _02389B7C: bl PreprocessString b _02389BE0 _02389BC4: - ldr r2, _02389C28 ; =0x0238A23C + ldr r2, _02389C28 ; =ov31_0238A23C mov r1, #0x40 add r0, r4, r8, lsl #6 mov r3, #0 @@ -8345,9 +8345,9 @@ _02389BFC: add sp, sp, #0x70 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02389C20: .word 0x02353538 -_02389C24: .word 0x0238A228 -_02389C28: .word 0x0238A23C +_02389C20: .word ov29_02353538 +_02389C24: .word ov31_0238A228 +_02389C28: .word ov31_0238A23C arm_func_end ov31_02389A78 arm_func_start ov31_02389C2C @@ -8372,7 +8372,7 @@ ov31_02389C2C: ; 0x02389C2C arm_func_start ov31_02389C68 ov31_02389C68: ; 0x02389C68 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r5, _02389CBC ; =0x02353538 + ldr r5, _02389CBC ; =ov29_02353538 mov r4, r0 mov r6, #0 _02389C78: @@ -8395,7 +8395,7 @@ _02389CA4: blt _02389C78 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02389CBC: .word 0x02353538 +_02389CBC: .word ov29_02353538 arm_func_end ov31_02389C68 arm_func_start ov31_02389CC0 @@ -8416,7 +8416,7 @@ ov31_02389CC0: ; 0x02389CC0 str r1, [sp] str r2, [sp, #4] mov r2, #0 - ldr r0, _02389D74 ; =0x0238A1E8 + ldr r0, _02389D74 ; =ov31_0238A1E8 ldr r1, _02389D78 ; =0x00001013 ldr r3, _02389D7C ; =0x00000A3B str r2, [sp, #8] @@ -8448,7 +8448,7 @@ _02389D6C: add sp, sp, #0x5c ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 -_02389D74: .word 0x0238A1E8 +_02389D74: .word ov31_0238A1E8 _02389D78: .word 0x00001013 _02389D7C: .word 0x00000A3B arm_func_end ov31_02389CC0 @@ -8463,20 +8463,53 @@ ov31_02389D80: ; 0x02389D80 arm_func_end ov31_02389D80 ; 0x02389D94 + .global ov31_02389D94 +ov31_02389D94: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x0C, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389DA4 +ov31_02389DA4: .byte 0x00, 0x00, 0x00, 0x00, 0x0B, 0x04, 0x13, 0x02, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389DB4 +ov31_02389DB4: .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC, 0x2D, 0x38, 0x02, 0x54, 0x2B, 0x38, 0x02 + .global ov31_02389DC4 +ov31_02389DC4: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x1C, 0x06, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389DD4 +ov31_02389DD4: .byte 0xAD, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAE, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xAF, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xB0, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 .byte 0xB1, 0x08, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xB3, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 .byte 0xB4, 0x08, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x5B, 0x64, 0x75, 0x6E, 0x67, 0x65, 0x6F, 0x6E, 0x3A, 0x30, 0x5D, 0x00, 0xC7, 0x08, 0xCB, 0x08 - .byte 0xC8, 0x08, 0xCC, 0x08, 0xC9, 0x08, 0xCD, 0x08, 0xCA, 0x08, 0xCE, 0x08, 0x0E, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0xF0, 0x32, 0x38, 0x02, 0xBC, 0x2F, 0x38, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x02, 0x1C, 0x0D, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x02, 0x13, 0x04, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x02, 0x07, 0x06, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x09, 0x00, 0x00 + .global ov31_02389E14 +ov31_02389E14: + .byte 0x5B, 0x64, 0x75, 0x6E, 0x67, 0x65, 0x6F, 0x6E, 0x3A, 0x30, 0x5D, 0x00 + .global ov31_02389E20 +ov31_02389E20: + .byte 0xC7, 0x08 + .global ov31_02389E22 +ov31_02389E22: + .byte 0xCB, 0x08 + .byte 0xC8, 0x08, 0xCC, 0x08, 0xC9, 0x08, 0xCD, 0x08, 0xCA, 0x08, 0xCE, 0x08 + .global ov31_02389E30 +ov31_02389E30: + .byte 0x0E, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0xF0, 0x32, 0x38, 0x02, 0xBC, 0x2F, 0x38, 0x02 + .global ov31_02389E40 +ov31_02389E40: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x02, 0x1C, 0x0D, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389E50 +ov31_02389E50: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x02, 0x13, 0x04, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389E60 +ov31_02389E60: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x17, 0x02, 0x07, 0x06, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389E70 +ov31_02389E70: + .byte 0xAD, 0x09, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0xCF, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xD0, 0x08, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0x09, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0xCF, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xD0, 0x08, 0x00, 0x00 @@ -8484,71 +8517,245 @@ ov31_02389D80: ; 0x02389D80 .byte 0x03, 0x00, 0x00, 0x00, 0xCF, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xD0, 0x08, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0x09, 0x00, 0x00 .byte 0x04, 0x00, 0x00, 0x00, 0xCF, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xD0, 0x08, 0x00, 0x00 - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13 - .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x07, 0x00 - .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x08, 0x02 - .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x14, 0x12, 0x02 - .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x13, 0x00 - .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x02, 0x07, 0x00 - .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00 + .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .global ov31_02389EF0 +ov31_02389EF0: + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x00, 0x00 + .global ov31_02389EFC +ov31_02389EFC: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13 + .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389F0C +ov31_02389F0C: + .byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x07, 0x00 + .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389F1C +ov31_02389F1C: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x08, 0x02 + .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389F2C +ov31_02389F2C: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x14, 0x12, 0x02 + .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389F3C +ov31_02389F3C: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x13, 0x00 + .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389F4C +ov31_02389F4C: + .byte 0x00, 0x00, 0x00, 0x00, 0x17, 0x02, 0x07, 0x00 + .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_02389F5C +ov31_02389F5C: + .byte 0x20, 0x20, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00 + .global ov31_02389F64 +ov31_02389F64: .byte 0x0A, 0x0A, 0x2D, 0x2D, 0x2D, 0x2D, 0x81, 0x40, 0x20, 0x8F, 0x89, 0x8A, 0xFA, 0x83, 0x7C, 0x83 .byte 0x57, 0x83, 0x56, 0x83, 0x87, 0x83, 0x93, 0x3D, 0x25, 0x64, 0x81, 0x40, 0x2D, 0x2D, 0x2D, 0x2D - .byte 0x2D, 0x20, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x1C, 0x05, 0x00, 0xFF, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00, 0x00, 0xFF, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x1C, 0x04, 0x00, 0xFF, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x02, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x13, 0x04, 0x00, 0xFE, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x2D, 0x20, 0x0A, 0x00 + .global ov31_02389F88 +ov31_02389F88: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x1C, 0x05, 0x00, 0xFF, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_02389F98 +ov31_02389F98: + .byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00, 0x00, 0xFF, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_02389FA8 +ov31_02389FA8: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x1C, 0x04, 0x00, 0xFF, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_02389FB8 +ov31_02389FB8: + .byte 0x00, 0x00, 0x00, 0x00, 0x17, 0x02, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_02389FC8 +ov31_02389FC8: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x13, 0x04, 0x00, 0xFE, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_02389FD8 +ov31_02389FD8: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_02389FE8 +ov31_02389FE8: + .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x00, 0x00 + .global ov31_02389FF4 +ov31_02389FF4: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x0E, 0x12, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A004 +ov31_0238A004: .byte 0x00, 0x00, 0x00, 0x00, 0x0E, 0x02, 0x10, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A014 +ov31_0238A014: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0F, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A024 +ov31_0238A024: .byte 0x00, 0x00, 0x00, 0x00, 0x13, 0x02, 0x0B, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A034 +ov31_0238A034: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0A, 0x02, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x5B, 0x4D, 0x3A, 0x48, 0x30, 0x5D, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48, 0x31, 0x5D, 0x00, 0x00 - .byte 0x5B, 0x4D, 0x3A, 0x48, 0x32, 0x5D, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48, 0x33, 0x5D, 0x00, 0x00 - .byte 0x5B, 0x4D, 0x3A, 0x48, 0x34, 0x5D, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48, 0x35, 0x5D, 0x00, 0x00 - .byte 0x5B, 0x4D, 0x3A, 0x48, 0x36, 0x5D, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48, 0x37, 0x5D, 0x00, 0x00 + .global ov31_0238A044 +ov31_0238A044: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x30, 0x5D, 0x00, 0x00 + .global ov31_0238A04C +ov31_0238A04C: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x31, 0x5D, 0x00, 0x00 + .global ov31_0238A054 +ov31_0238A054: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x32, 0x5D, 0x00, 0x00 + .global ov31_0238A05C +ov31_0238A05C: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x33, 0x5D, 0x00, 0x00 + .global ov31_0238A064 +ov31_0238A064: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x34, 0x5D, 0x00, 0x00 + .global ov31_0238A06C +ov31_0238A06C: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x35, 0x5D, 0x00, 0x00 + .global ov31_0238A074 +ov31_0238A074: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x36, 0x5D, 0x00, 0x00 + .global ov31_0238A07C +ov31_0238A07C: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x37, 0x5D, 0x00, 0x00 + .global ov31_0238A084 +ov31_0238A084: .byte 0x5B, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3A, 0x30, 0x5D, 0x5B, 0x43, 0x4C, 0x55, 0x4D, 0x5F .byte 0x53, 0x45, 0x54, 0x3A, 0x38, 0x30, 0x5D, 0x5B, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3A, 0x31 - .byte 0x5D, 0x00, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48, 0x30, 0x5D, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48 - .byte 0x31, 0x5D, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48, 0x32, 0x5D, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48 - .byte 0x33, 0x5D, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48, 0x34, 0x5D, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48 - .byte 0x35, 0x5D, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48, 0x36, 0x5D, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x48 - .byte 0x37, 0x5D, 0x00, 0x00, 0x5B, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3A, 0x30, 0x5D, 0x5B, 0x43 + .byte 0x5D, 0x00, 0x00, 0x00 + .global ov31_0238A0A8 +ov31_0238A0A8: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x30, 0x5D, 0x00, 0x00 + .global ov31_0238A0B0 +ov31_0238A0B0: + .byte 0x5B, 0x4D, 0x3A, 0x48 + .byte 0x31, 0x5D, 0x00, 0x00 + .global ov31_0238A0B8 +ov31_0238A0B8: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x32, 0x5D, 0x00, 0x00 + .global ov31_0238A0C0 +ov31_0238A0C0: + .byte 0x5B, 0x4D, 0x3A, 0x48 + .byte 0x33, 0x5D, 0x00, 0x00 + .global ov31_0238A0C8 +ov31_0238A0C8: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x34, 0x5D, 0x00, 0x00 + .global ov31_0238A0D0 +ov31_0238A0D0: + .byte 0x5B, 0x4D, 0x3A, 0x48 + .byte 0x35, 0x5D, 0x00, 0x00 + .global ov31_0238A0D8 +ov31_0238A0D8: + .byte 0x5B, 0x4D, 0x3A, 0x48, 0x36, 0x5D, 0x00, 0x00 + .global ov31_0238A0E0 +ov31_0238A0E0: + .byte 0x5B, 0x4D, 0x3A, 0x48 + .byte 0x37, 0x5D, 0x00, 0x00 + .global ov31_0238A0E8 +ov31_0238A0E8: + .byte 0x5B, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3A, 0x30, 0x5D, 0x5B, 0x43 .byte 0x4C, 0x55, 0x4D, 0x5F, 0x53, 0x45, 0x54, 0x3A, 0x38, 0x30, 0x5D, 0x5B, 0x73, 0x74, 0x72, 0x69 - .byte 0x6E, 0x67, 0x3A, 0x31, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0C, 0x00 - .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x6E, 0x67, 0x3A, 0x31, 0x5D, 0x00, 0x00, 0x00 + .global ov31_0238A10C +ov31_0238A10C: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0C, 0x00 + .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A11C +ov31_0238A11C: + .byte 0xC3, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xC4, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .global ov31_0238A134 +ov31_0238A134: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x1C, 0x12, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A144 +ov31_0238A144: .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x91, 0x38, 0x02, 0x04, 0x8C, 0x38, 0x02 + .global ov31_0238A154 +ov31_0238A154: .byte 0x5B, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x3A, 0x30, 0x3A, 0x33, 0x5D, 0x20, 0x5B, 0x43, 0x53, 0x3A - .byte 0x25, 0x63, 0x5D, 0x25, 0x73, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x02, 0x0F, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x02, 0x1C, 0x14, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x60, 0x94, 0x38, 0x02, 0xFC, 0x91, 0x38, 0x02, 0xA8, 0x3F, 0x00, 0x00 + .byte 0x25, 0x63, 0x5D, 0x25, 0x73, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00, 0x00 + .global ov31_0238A170 +ov31_0238A170: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x02, 0x0F, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A180 +ov31_0238A180: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x02, 0x02, 0x1C, 0x14, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A190 +ov31_0238A190: + .byte 0x0E, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x60, 0x94, 0x38, 0x02, 0xFC, 0x91, 0x38, 0x02 + .global ov31_0238A1A0 +ov31_0238A1A0: + .byte 0xA8, 0x3F, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xA9, 0x3F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xAA, 0x3F, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0xAB, 0x3F, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xAC, 0x3F, 0x00, 0x00 .byte 0x04, 0x00, 0x00, 0x00, 0xAD, 0x3F, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xAE, 0x3F, 0x00, 0x00 .byte 0x06, 0x00, 0x00, 0x00, 0xAF, 0x3F, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00, 0x00, 0xFF, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x12, 0x00, 0x00, 0xFF, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x14, 0x0F, 0x02, 0x00, 0xFE, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x53, 0x32, 0x5D, 0x5B, 0x74, 0x61, 0x63, 0x74, 0x69 - .byte 0x63, 0x73, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00, 0x5B, 0x4D, 0x3A, 0x53, 0x31, 0x5D, 0x5B, 0x74 + .byte 0xFF, 0xFF, 0xFF, 0xFF + .global ov31_0238A1E8 +ov31_0238A1E8: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A1F8 +ov31_0238A1F8: + .byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00, 0x00, 0xFF, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A208 +ov31_0238A208: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x12, 0x00, 0x00, 0xFF, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A218 +ov31_0238A218: + .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x14, 0x0F, 0x02, 0x00, 0xFE, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A228 +ov31_0238A228: + .byte 0x5B, 0x4D, 0x3A, 0x53, 0x32, 0x5D, 0x5B, 0x74, 0x61, 0x63, 0x74, 0x69 + .byte 0x63, 0x73, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00 + .global ov31_0238A23C +ov31_0238A23C: + .byte 0x5B, 0x4D, 0x3A, 0x53, 0x31, 0x5D, 0x5B, 0x74 .byte 0x61, 0x63, 0x74, 0x69, 0x63, 0x73, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00 .data .global ov31_0238A260 ov31_0238A260: .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 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 + .byte 0x0A, 0x00, 0x00, 0x00 + .global ov31_0238A268 +ov31_0238A268: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A26C +ov31_0238A26C: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A270 +ov31_0238A270: + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A27C +ov31_0238A27C: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A280 +ov31_0238A280: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A284 +ov31_0238A284: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A288 +ov31_0238A288: + .byte 0x00, 0x00, 0x00, 0x00 + .global ov31_0238A28C +ov31_0238A28C: + .byte 0x00, 0x00, 0x00, 0x00 .bss .global ov31_0238A2A0 ov31_0238A2A0: - .space 0x20 + .space 0x8 + .global ov31_0238A2A8 +ov31_0238A2A8: + .space 0x18 diff --git a/asm/overlay_34.s b/asm/overlay_34.s index 80dfea54..11ce6104 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -182,7 +182,7 @@ _022DC4A0: bne _022DC54C mov r1, #0 str r8, [sp] - ldr r0, _022DC5A8 ; =0x022DCFF4 + ldr r0, _022DC5A8 ; =ov34_022DCFF4 str r8, [sp, #4] mov r2, r1 mov r3, r1 @@ -191,7 +191,7 @@ _022DC4A0: str r7, [sp] mov r0, #0 str r0, [sp, #4] - ldr r0, _022DC5AC ; =0x022DD004 + ldr r0, _022DC5AC ; =ov34_022DD004 mov r2, r1 mov r3, r1 bl sub_02052060 @@ -247,8 +247,8 @@ _022DC598: .word ov34_022DC738 _022DC59C: .word ov34_022DD0A0 _022DC5A0: .word ov34_022DD080 _022DC5A4: .word ov34_022DC5B0 -_022DC5A8: .word 0x022DCFF4 -_022DC5AC: .word 0x022DD004 +_022DC5A8: .word ov34_022DCFF4 +_022DC5AC: .word ov34_022DD004 arm_func_end ExplorersOfSkyMain arm_func_start ov34_022DC5B0 @@ -377,37 +377,37 @@ _022DC744: .word ov34_022DC718 arm_func_start ov34_022DC748 ov34_022DC748: ; 0x022DC748 stmdb sp!, {r3, lr} - ldr r0, _022DC770 ; =0x022DD104 + ldr r0, _022DC770 ; =ov34_022DD104 mov r1, #1 bl sub_0200B894 - ldr r0, _022DC774 ; =0x022DD0C0 + ldr r0, _022DC774 ; =ov34_022DD0C0 mov r1, #1 bl sub_0200B894 bl ov34_022DC798 bl ov34_022DC810 ldmia sp!, {r3, pc} .align 2, 0 -_022DC770: .word 0x022DD104 -_022DC774: .word 0x022DD0C0 +_022DC770: .word ov34_022DD104 +_022DC774: .word ov34_022DD0C0 arm_func_end ov34_022DC748 arm_func_start ov34_022DC778 ov34_022DC778: ; 0x022DC778 stmdb sp!, {r3, lr} - ldr r0, _022DC790 ; =0x022DD104 + ldr r0, _022DC790 ; =ov34_022DD104 bl sub_0200B8B8 - ldr r0, _022DC794 ; =0x022DD0C0 + ldr r0, _022DC794 ; =ov34_022DD0C0 bl sub_0200B8B8 ldmia sp!, {r3, pc} .align 2, 0 -_022DC790: .word 0x022DD104 -_022DC794: .word 0x022DD0C0 +_022DC790: .word ov34_022DD104 +_022DC794: .word ov34_022DD0C0 arm_func_end ov34_022DC778 arm_func_start ov34_022DC798 ov34_022DC798: ; 0x022DC798 stmdb sp!, {r3, lr} - ldr r1, _022DC808 ; =0x022DD0B0 + ldr r1, _022DC808 ; =ov34_022DD0B0 mov r0, #0 strb r0, [r1] str r0, [r1, #0xc] @@ -417,7 +417,7 @@ ov34_022DC798: ; 0x022DC798 bl sub_02008F4C cmp r0, #0x100 bne _022DC7D4 - ldr r0, _022DC80C ; =0x022DD104 + ldr r0, _022DC80C ; =ov34_022DD104 mov r1, #2 bl sub_0200B8D4 ldmia sp!, {r3, pc} @@ -427,18 +427,18 @@ _022DC7D4: mvn r1, #0xff cmp r0, r1 bne _022DC7F8 - ldr r0, _022DC80C ; =0x022DD104 + ldr r0, _022DC80C ; =ov34_022DD104 mov r1, #1 bl sub_0200B8D4 ldmia sp!, {r3, pc} _022DC7F8: - ldr r0, _022DC80C ; =0x022DD104 + ldr r0, _022DC80C ; =ov34_022DD104 mov r1, #0 bl sub_0200B8D4 ldmia sp!, {r3, pc} .align 2, 0 -_022DC808: .word 0x022DD0B0 -_022DC80C: .word 0x022DD104 +_022DC808: .word ov34_022DD0B0 +_022DC80C: .word ov34_022DD104 arm_func_end ov34_022DC798 arm_func_start ov34_022DC810 @@ -448,7 +448,7 @@ ov34_022DC810: ; 0x022DC810 bl sub_02008F4C cmp r0, #0x100 bne _022DC834 - ldr r0, _022DC868 ; =0x022DD0C0 + ldr r0, _022DC868 ; =ov34_022DD0C0 mov r1, #2 bl sub_0200B8D4 ldmia sp!, {r3, pc} @@ -458,17 +458,17 @@ _022DC834: mvn r1, #0xff cmp r0, r1 bne _022DC858 - ldr r0, _022DC868 ; =0x022DD0C0 + ldr r0, _022DC868 ; =ov34_022DD0C0 mov r1, #1 bl sub_0200B8D4 ldmia sp!, {r3, pc} _022DC858: - ldr r0, _022DC868 ; =0x022DD0C0 + ldr r0, _022DC868 ; =ov34_022DD0C0 mov r1, #0 bl sub_0200B8D4 ldmia sp!, {r3, pc} .align 2, 0 -_022DC868: .word 0x022DD0C0 +_022DC868: .word ov34_022DD0C0 arm_func_end ov34_022DC810 arm_func_start ov34_022DC86C @@ -478,22 +478,22 @@ ov34_022DC86C: ; 0x022DC86C mov r0, #2 bl sub_02002878 cmp r0, #0 - ldreq r0, _022DC8B0 ; =0x022DD0B0 + ldreq r0, _022DC8B0 ; =ov34_022DD0B0 moveq r1, #1 streq r1, [r0, #8] streq r4, [r0, #4] beq _022DC8A8 - ldr r0, _022DC8B4 ; =0x022DD104 + ldr r0, _022DC8B4 ; =ov34_022DD104 mov r1, r4 bl sub_0200BB60 - ldr r0, _022DC8B0 ; =0x022DD0B0 + ldr r0, _022DC8B0 ; =ov34_022DD0B0 mov r1, #1 _022DC8A8: strb r1, [r0, #1] ldmia sp!, {r4, pc} .align 2, 0 -_022DC8B0: .word 0x022DD0B0 -_022DC8B4: .word 0x022DD104 +_022DC8B0: .word ov34_022DD0B0 +_022DC8B4: .word ov34_022DD104 arm_func_end ov34_022DC86C arm_func_start ov34_022DC8B8 @@ -503,23 +503,23 @@ ov34_022DC8B8: ; 0x022DC8B8 mov r0, #2 bl sub_02002878 cmp r0, #0 - ldreq r0, _022DC900 ; =0x022DD0B0 + ldreq r0, _022DC900 ; =ov34_022DD0B0 moveq r1, #2 streq r1, [r0, #8] streq r4, [r0, #4] beq _022DC8F4 - ldr r0, _022DC904 ; =0x022DD104 + ldr r0, _022DC904 ; =ov34_022DD104 mov r2, r4 mov r1, #1 bl sub_0200BB74 - ldr r0, _022DC900 ; =0x022DD0B0 + ldr r0, _022DC900 ; =ov34_022DD0B0 _022DC8F4: mov r1, #1 strb r1, [r0, #1] ldmia sp!, {r4, pc} .align 2, 0 -_022DC900: .word 0x022DD0B0 -_022DC904: .word 0x022DD104 +_022DC900: .word ov34_022DD0B0 +_022DC904: .word ov34_022DD104 arm_func_end ov34_022DC8B8 arm_func_start ov34_022DC908 @@ -529,78 +529,78 @@ ov34_022DC908: ; 0x022DC908 mov r0, #2 bl sub_02002878 cmp r0, #0 - ldreq r0, _022DC950 ; =0x022DD0B0 + ldreq r0, _022DC950 ; =ov34_022DD0B0 moveq r1, #3 streq r1, [r0, #8] streq r4, [r0, #4] beq _022DC944 - ldr r0, _022DC954 ; =0x022DD104 + ldr r0, _022DC954 ; =ov34_022DD104 mov r2, r4 mov r1, #2 bl sub_0200BB74 - ldr r0, _022DC950 ; =0x022DD0B0 + ldr r0, _022DC950 ; =ov34_022DD0B0 _022DC944: mov r1, #1 strb r1, [r0, #1] ldmia sp!, {r4, pc} .align 2, 0 -_022DC950: .word 0x022DD0B0 -_022DC954: .word 0x022DD104 +_022DC950: .word ov34_022DD0B0 +_022DC954: .word ov34_022DD104 arm_func_end ov34_022DC908 arm_func_start ov34_022DC958 ov34_022DC958: ; 0x022DC958 ldr ip, _022DC968 ; =sub_0200BB60 mov r1, r0 - ldr r0, _022DC96C ; =0x022DD0C0 + ldr r0, _022DC96C ; =ov34_022DD0C0 bx ip .align 2, 0 _022DC968: .word sub_0200BB60 -_022DC96C: .word 0x022DD0C0 +_022DC96C: .word ov34_022DD0C0 arm_func_end ov34_022DC958 arm_func_start ov34_022DC970 ov34_022DC970: ; 0x022DC970 ldr ip, _022DC984 ; =sub_0200BB74 mov r2, r0 - ldr r0, _022DC988 ; =0x022DD0C0 + ldr r0, _022DC988 ; =ov34_022DD0C0 mov r1, #2 bx ip .align 2, 0 _022DC984: .word sub_0200BB74 -_022DC988: .word 0x022DD0C0 +_022DC988: .word ov34_022DD0C0 arm_func_end ov34_022DC970 arm_func_start ov34_022DC98C ov34_022DC98C: ; 0x022DC98C stmdb sp!, {r3, lr} - ldr r0, _022DC9B0 ; =0x022DD0B0 + ldr r0, _022DC9B0 ; =ov34_022DD0B0 ldrb r0, [r0] cmp r0, #0 movne r0, #1 ldmneia sp!, {r3, pc} - ldr r0, _022DC9B4 ; =0x022DD104 + ldr r0, _022DC9B4 ; =ov34_022DD104 bl sub_0200BD14 ldmia sp!, {r3, pc} .align 2, 0 -_022DC9B0: .word 0x022DD0B0 -_022DC9B4: .word 0x022DD104 +_022DC9B0: .word ov34_022DD0B0 +_022DC9B4: .word ov34_022DD104 arm_func_end ov34_022DC98C arm_func_start ov34_022DC9B8 ov34_022DC9B8: ; 0x022DC9B8 ldr ip, _022DC9C4 ; =sub_0200BD14 - ldr r0, _022DC9C8 ; =0x022DD0C0 + ldr r0, _022DC9C8 ; =ov34_022DD0C0 bx ip .align 2, 0 _022DC9C4: .word sub_0200BD14 -_022DC9C8: .word 0x022DD0C0 +_022DC9C8: .word ov34_022DD0C0 arm_func_end ov34_022DC9B8 arm_func_start ov34_022DC9CC ov34_022DC9CC: ; 0x022DC9CC stmdb sp!, {r3, lr} - ldr r0, _022DCA68 ; =0x022DD0B0 + ldr r0, _022DCA68 ; =ov34_022DD0B0 ldr r1, [r0, #8] cmp r1, #0 beq _022DCA48 @@ -613,110 +613,110 @@ ov34_022DC9CC: ; 0x022DC9CC b _022DCA30 _022DC9FC: ldr r1, [r0, #4] - ldr r0, _022DCA6C ; =0x022DD104 + ldr r0, _022DCA6C ; =ov34_022DD104 bl sub_0200BB60 b _022DCA30 _022DCA0C: ldr r2, [r0, #4] - ldr r0, _022DCA6C ; =0x022DD104 + ldr r0, _022DCA6C ; =ov34_022DD104 mov r1, #1 bl sub_0200BB74 b _022DCA30 _022DCA20: ldr r2, [r0, #4] - ldr r0, _022DCA6C ; =0x022DD104 + ldr r0, _022DCA6C ; =ov34_022DD104 mov r1, #2 bl sub_0200BB74 _022DCA30: - ldr r0, _022DCA68 ; =0x022DD0B0 + ldr r0, _022DCA68 ; =ov34_022DD0B0 mov r1, #0 str r1, [r0, #8] mov r1, #1 strb r1, [r0, #1] ldmia sp!, {r3, pc} _022DCA48: - ldr r0, _022DCA6C ; =0x022DD104 + ldr r0, _022DCA6C ; =ov34_022DD104 ldr r0, [r0, #4] cmp r0, #0 movne r1, #1 - ldr r0, _022DCA68 ; =0x022DD0B0 + ldr r0, _022DCA68 ; =ov34_022DD0B0 moveq r1, #0 strb r1, [r0, #1] ldmia sp!, {r3, pc} .align 2, 0 -_022DCA68: .word 0x022DD0B0 -_022DCA6C: .word 0x022DD104 +_022DCA68: .word ov34_022DD0B0 +_022DCA6C: .word ov34_022DD104 arm_func_end ov34_022DC9CC arm_func_start ov34_022DCA70 ov34_022DCA70: ; 0x022DCA70 stmdb sp!, {r4, lr} - ldr r0, _022DCB58 ; =0x022DD0B0 + ldr r0, _022DCB58 ; =ov34_022DD0B0 mov r4, #1 ldrb r0, [r0] cmp r0, #0 beq _022DCB2C - ldr r0, _022DCB5C ; =0x022DD104 + ldr r0, _022DCB5C ; =ov34_022DD104 bl sub_0200BD2C cmp r0, #0 bne _022DCAB4 - ldr r1, _022DCB58 ; =0x022DD0B0 - ldr r0, _022DCB5C ; =0x022DD104 + ldr r1, _022DCB58 ; =ov34_022DD0B0 + ldr r0, _022DCB5C ; =ov34_022DD104 ldr r2, [r1, #0xc] mov r1, r4 bl sub_0200BB74 mov r4, #0 b _022DCAC4 _022DCAB4: - ldr r0, _022DCB5C ; =0x022DD104 + ldr r0, _022DCB5C ; =ov34_022DD104 bl sub_0200BC54 cmp r0, #0 movne r4, #0 _022DCAC4: - ldr r0, _022DCB5C ; =0x022DD104 + ldr r0, _022DCB5C ; =ov34_022DD104 ldrsh r0, [r0, #0x14] bl ov34_022DCB64 - ldr r0, _022DCB60 ; =0x022DD0C0 + ldr r0, _022DCB60 ; =ov34_022DD0C0 bl sub_0200BD2C cmp r0, #0 bne _022DCAFC - ldr r1, _022DCB58 ; =0x022DD0B0 - ldr r0, _022DCB60 ; =0x022DD0C0 + ldr r1, _022DCB58 ; =ov34_022DD0B0 + ldr r0, _022DCB60 ; =ov34_022DD0C0 ldr r2, [r1, #0xc] mov r1, #1 bl sub_0200BB74 mov r4, #0 b _022DCB0C _022DCAFC: - ldr r0, _022DCB60 ; =0x022DD0C0 + ldr r0, _022DCB60 ; =ov34_022DD0C0 bl sub_0200BC54 cmp r0, #0 movne r4, #0 _022DCB0C: - ldr r0, _022DCB60 ; =0x022DD0C0 + ldr r0, _022DCB60 ; =ov34_022DD0C0 ldrsh r0, [r0, #0x14] bl ov34_022DCB98 cmp r4, #0 - ldrne r0, _022DCB58 ; =0x022DD0B0 + ldrne r0, _022DCB58 ; =ov34_022DD0B0 movne r1, #0 strneb r1, [r0] ldmia sp!, {r4, pc} _022DCB2C: - ldr r0, _022DCB5C ; =0x022DD104 + ldr r0, _022DCB5C ; =ov34_022DD104 bl sub_0200BC54 - ldr r0, _022DCB5C ; =0x022DD104 + ldr r0, _022DCB5C ; =ov34_022DD104 ldrsh r0, [r0, #0x14] bl ov34_022DCB64 - ldr r0, _022DCB60 ; =0x022DD0C0 + ldr r0, _022DCB60 ; =ov34_022DD0C0 bl sub_0200BC54 - ldr r0, _022DCB60 ; =0x022DD0C0 + ldr r0, _022DCB60 ; =ov34_022DD0C0 ldrsh r0, [r0, #0x14] bl ov34_022DCB98 ldmia sp!, {r4, pc} .align 2, 0 -_022DCB58: .word 0x022DD0B0 -_022DCB5C: .word 0x022DD104 -_022DCB60: .word 0x022DD0C0 +_022DCB58: .word ov34_022DD0B0 +_022DCB5C: .word ov34_022DD104 +_022DCB60: .word ov34_022DD0C0 arm_func_end ov34_022DCA70 arm_func_start ov34_022DCB64 @@ -758,16 +758,16 @@ _022DCBC0: arm_func_start ov34_022DCBCC ov34_022DCBCC: ; 0x022DCBCC stmdb sp!, {r3, lr} - ldr r0, _022DCBEC ; =0x022DD014 + ldr r0, _022DCBEC ; =ov34_022DD014 bl sub_020348E4 cmp r0, #0 - ldrne r0, _022DCBF0 ; =0x022DD084 + ldrne r0, _022DCBF0 ; =ov34_022DD084 movne r1, #0 strne r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_022DCBEC: .word 0x022DD014 -_022DCBF0: .word 0x022DD084 +_022DCBEC: .word ov34_022DD014 +_022DCBF0: .word ov34_022DD084 arm_func_end ov34_022DCBCC arm_func_start ov34_022DCBF4 @@ -777,21 +777,21 @@ ov34_022DCBF4: ; 0x022DCBF4 mov r0, #8 mov r1, r0 bl MemAlloc - ldr r1, _022DCC84 ; =0x022DD084 + ldr r1, _022DCC84 ; =ov34_022DD084 mov ip, #1 str r0, [r1] - ldr r3, _022DCC88 ; =0x022DD024 + ldr r3, _022DCC88 ; =ov34_022DD024 add r2, sp, #0 mov r0, #0 mov r1, #0x31 str ip, [sp] bl sub_0202A5CC - ldr r1, _022DCC84 ; =0x022DD084 + ldr r1, _022DCC84 ; =ov34_022DD084 ldr r1, [r1] strb r0, [r1] mov r0, #0 bl CreateDBox - ldr r3, _022DCC84 ; =0x022DD084 + ldr r3, _022DCC84 ; =ov34_022DD084 ldr r1, _022DCC8C ; =0x00000408 ldr ip, [r3] ldr r2, _022DCC90 ; =0x00000255 @@ -800,7 +800,7 @@ ov34_022DCBF4: ; 0x022DCBF4 mov r3, #0 ldrsb r0, [r0, #1] bl ShowMessageInDBox - ldr r1, _022DCC84 ; =0x022DD084 + ldr r1, _022DCC84 ; =ov34_022DD084 mov r3, #0 ldr r2, [r1] mov r0, #1 @@ -809,8 +809,8 @@ ov34_022DCBF4: ; 0x022DCBF4 add sp, sp, #0x98 ldmia sp!, {r3, pc} .align 2, 0 -_022DCC84: .word 0x022DD084 -_022DCC88: .word 0x022DD024 +_022DCC84: .word ov34_022DD084 +_022DCC88: .word ov34_022DD024 _022DCC8C: .word 0x00000408 _022DCC90: .word 0x00000255 arm_func_end ov34_022DCBF4 @@ -818,31 +818,31 @@ _022DCC90: .word 0x00000255 arm_func_start ov34_022DCC94 ov34_022DCC94: ; 0x022DCC94 stmdb sp!, {r3, lr} - ldr r0, _022DCCDC ; =0x022DD084 + ldr r0, _022DCCDC ; =ov34_022DD084 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] bl sub_0202AABC - ldr r0, _022DCCDC ; =0x022DD084 + ldr r0, _022DCCDC ; =ov34_022DD084 ldr r0, [r0] ldrsb r0, [r0, #1] bl FreeDBox - ldr r0, _022DCCDC ; =0x022DD084 + ldr r0, _022DCCDC ; =ov34_022DD084 ldr r0, [r0] bl MemFree - ldr r0, _022DCCDC ; =0x022DD084 + ldr r0, _022DCCDC ; =ov34_022DD084 mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_022DCCDC: .word 0x022DD084 +_022DCCDC: .word ov34_022DD084 arm_func_end ov34_022DCC94 arm_func_start ov34_022DCCE0 ov34_022DCCE0: ; 0x022DCCE0 stmdb sp!, {r3, lr} - ldr r0, _022DCDC8 ; =0x022DD084 + ldr r0, _022DCDC8 ; =ov34_022DD084 ldr r2, [r0] ldr r1, [r2, #4] cmp r1, #0 @@ -857,16 +857,16 @@ _022DCD0C: bl sub_0202AB60 cmp r0, #0 bne _022DCDC0 - ldr r0, _022DCDC8 ; =0x022DD084 + ldr r0, _022DCDC8 ; =ov34_022DD084 ldr r0, [r0] ldrsb r0, [r0] bl sub_0202ABB0 - ldr r1, _022DCDC8 ; =0x022DD084 + ldr r1, _022DCDC8 ; =ov34_022DD084 str r0, [r1, #4] ldr r0, [r1] ldrsb r0, [r0, #1] bl sub_0202F334 - ldr r0, _022DCDC8 ; =0x022DD084 + ldr r0, _022DCDC8 ; =ov34_022DD084 mov r1, #1 ldr r0, [r0] str r1, [r0, #4] @@ -876,12 +876,12 @@ _022DCD54: bl sub_0202AB40 cmp r0, #0 bne _022DCDC0 - ldr r0, _022DCDC8 ; =0x022DD084 + ldr r0, _022DCDC8 ; =ov34_022DD084 ldr r0, [r0] ldrsb r0, [r0, #1] bl IsDBoxActive cmp r0, #0 - ldreq r0, _022DCDC8 ; =0x022DD084 + ldreq r0, _022DCDC8 ; =ov34_022DD084 moveq r1, #2 ldreq r0, [r0] streq r1, [r0, #4] @@ -907,22 +907,22 @@ _022DCDC0: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_022DCDC8: .word 0x022DD084 +_022DCDC8: .word ov34_022DD084 arm_func_end ov34_022DCCE0 arm_func_start ov34_022DCDCC ov34_022DCDCC: ; 0x022DCDCC stmdb sp!, {r3, lr} - ldr r0, _022DCDEC ; =0x022DD03C + ldr r0, _022DCDEC ; =ov34_022DD03C bl sub_020348E4 cmp r0, #0 - ldrne r0, _022DCDF0 ; =0x022DD08C + ldrne r0, _022DCDF0 ; =ov34_022DD08C movne r1, #0 strne r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_022DCDEC: .word 0x022DD03C -_022DCDF0: .word 0x022DD08C +_022DCDEC: .word ov34_022DD03C +_022DCDF0: .word ov34_022DD08C arm_func_end ov34_022DCDCC arm_func_start ov34_022DCDF4 @@ -932,19 +932,19 @@ ov34_022DCDF4: ; 0x022DCDF4 mov r0, #8 mov r1, r0 bl MemAlloc - ldr r1, _022DCE7C ; =0x022DD08C - ldr r3, _022DCE80 ; =0x022DD04C + ldr r1, _022DCE7C ; =ov34_022DD08C + ldr r3, _022DCE80 ; =ov34_022DD04C str r0, [r1] add r2, sp, #0 mov r0, #0 mov r1, #0x11 bl sub_0202A5CC - ldr r1, _022DCE7C ; =0x022DD08C + ldr r1, _022DCE7C ; =ov34_022DD08C ldr r1, [r1] strb r0, [r1] mov r0, #0 bl CreateDBox - ldr r3, _022DCE7C ; =0x022DD08C + ldr r3, _022DCE7C ; =ov34_022DD08C ldr r1, _022DCE84 ; =0x00000408 ldr ip, [r3] ldr r2, _022DCE88 ; =0x00003D1C @@ -953,7 +953,7 @@ ov34_022DCDF4: ; 0x022DCDF4 mov r3, #0 ldrsb r0, [r0, #1] bl ShowMessageInDBox - ldr r1, _022DCE7C ; =0x022DD08C + ldr r1, _022DCE7C ; =ov34_022DD08C mov r3, #0 ldr r2, [r1] mov r0, #1 @@ -962,8 +962,8 @@ ov34_022DCDF4: ; 0x022DCDF4 add sp, sp, #0x98 ldmia sp!, {r3, pc} .align 2, 0 -_022DCE7C: .word 0x022DD08C -_022DCE80: .word 0x022DD04C +_022DCE7C: .word ov34_022DD08C +_022DCE80: .word ov34_022DD04C _022DCE84: .word 0x00000408 _022DCE88: .word 0x00003D1C arm_func_end ov34_022DCDF4 @@ -971,31 +971,31 @@ _022DCE88: .word 0x00003D1C arm_func_start ov34_022DCE8C ov34_022DCE8C: ; 0x022DCE8C stmdb sp!, {r3, lr} - ldr r0, _022DCED4 ; =0x022DD08C + ldr r0, _022DCED4 ; =ov34_022DD08C ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r3, pc} ldrsb r0, [r0] bl sub_0202AABC - ldr r0, _022DCED4 ; =0x022DD08C + ldr r0, _022DCED4 ; =ov34_022DD08C ldr r0, [r0] ldrsb r0, [r0, #1] bl FreeDBox - ldr r0, _022DCED4 ; =0x022DD08C + ldr r0, _022DCED4 ; =ov34_022DD08C ldr r0, [r0] bl MemFree - ldr r0, _022DCED4 ; =0x022DD08C + ldr r0, _022DCED4 ; =ov34_022DD08C mov r1, #0 str r1, [r0] ldmia sp!, {r3, pc} .align 2, 0 -_022DCED4: .word 0x022DD08C +_022DCED4: .word ov34_022DD08C arm_func_end ov34_022DCE8C arm_func_start ov34_022DCED8 ov34_022DCED8: ; 0x022DCED8 stmdb sp!, {r3, lr} - ldr r0, _022DCFF0 ; =0x022DD08C + ldr r0, _022DCFF0 ; =ov34_022DD08C ldr r3, [r0] ldr r1, [r3, #4] cmp r1, #0 @@ -1010,16 +1010,16 @@ _022DCF04: bl sub_0202AB60 cmp r0, #0 bne _022DCFE8 - ldr r0, _022DCFF0 ; =0x022DD08C + ldr r0, _022DCFF0 ; =ov34_022DD08C ldr r0, [r0] ldrsb r0, [r0] bl sub_0202ABB0 - ldr r1, _022DCFF0 ; =0x022DD08C + ldr r1, _022DCFF0 ; =ov34_022DD08C str r0, [r1, #4] ldr r0, [r1] ldrsb r0, [r0, #1] bl sub_0202F334 - ldr r0, _022DCFF0 ; =0x022DD08C + ldr r0, _022DCFF0 ; =ov34_022DD08C mov r1, #1 ldr r0, [r0] str r1, [r0, #4] @@ -1029,12 +1029,12 @@ _022DCF4C: bl sub_0202AB40 cmp r0, #0 bne _022DCFE8 - ldr r0, _022DCFF0 ; =0x022DD08C + ldr r0, _022DCFF0 ; =ov34_022DD08C ldr r0, [r0] ldrsb r0, [r0, #1] bl IsDBoxActive cmp r0, #0 - ldreq r0, _022DCFF0 ; =0x022DD08C + ldreq r0, _022DCFF0 ; =ov34_022DD08C moveq r1, #2 ldreq r0, [r0] streq r1, [r0, #4] @@ -1076,16 +1076,30 @@ _022DCFE8: mov r0, #1 ldmia sp!, {r3, pc} .align 2, 0 -_022DCFF0: .word 0x022DD08C +_022DCFF0: .word ov34_022DD08C arm_func_end ov34_022DCED8 ; 0x022DCFF4 + .global ov34_022DCFF4 +ov34_022DCFF4: .byte 0x42, 0x41, 0x43, 0x4B, 0x2F, 0x6E, 0x5F, 0x6C, 0x6F, 0x67, 0x6F, 0x2E, 0x62, 0x67, 0x70, 0x00 + .global ov34_022DD004 +ov34_022DD004: .byte 0x42, 0x41, 0x43, 0x4B, 0x2F, 0x77, 0x5F, 0x65, 0x73, 0x72, 0x62, 0x2E, 0x62, 0x67, 0x70, 0x00 + .global ov34_022DD014 +ov34_022DD014: .byte 0x0F, 0x00, 0x00, 0x00, 0xF4, 0xCB, 0x2D, 0x02, 0x94, 0xCC, 0x2D, 0x02, 0xE0, 0xCC, 0x2D, 0x02 + .global ov34_022DD024 +ov34_022DD024: .byte 0x56, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x57, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0xF4, 0xCD, 0x2D, 0x02 - .byte 0x8C, 0xCE, 0x2D, 0x02, 0xD8, 0xCE, 0x2D, 0x02, 0x1D, 0x3D, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .global ov34_022DD03C +ov34_022DD03C: + .byte 0x0F, 0x00, 0x00, 0x00, 0xF4, 0xCD, 0x2D, 0x02 + .byte 0x8C, 0xCE, 0x2D, 0x02, 0xD8, 0xCE, 0x2D, 0x02 + .global ov34_022DD04C +ov34_022DD04C: + .byte 0x1D, 0x3D, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x1E, 0x3D, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1F, 0x3D, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 .byte 0x20, 0x3D, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 @@ -1093,8 +1107,22 @@ _022DCFF0: .word 0x022DD08C .global ov34_022DD080 ov34_022DD080: .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov34_022DD084 +ov34_022DD084: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .global ov34_022DD08C +ov34_022DD08C: + .byte 0x00, 0x00, 0x00, 0x00 .bss ov34_022DD0A0: - .space 0xC0 + .space 0x10 + .global ov34_022DD0B0 +ov34_022DD0B0: + .space 0x10 + .global ov34_022DD0C0 +ov34_022DD0C0: + .space 0x44 + .global ov34_022DD104 +ov34_022DD104: + .space 0x5C From 54e9ffec87b2a168685038f4324cc4cb9e8efeef Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 21 Sep 2023 23:55:17 -0400 Subject: [PATCH 4/5] Synced symbols from pmdsky-debug --- asm/include/overlay_29_02300108.inc | 12 +- asm/include/overlay_29_02311034.inc | 6 +- asm/include/overlay_29_023118D8.inc | 2 +- asm/include/overlay_29_0232145C.inc | 16 +- asm/include/overlay_29_02325644.inc | 62 ++--- asm/include/overlay_29_02328030.inc | 48 ++-- asm/include/overlay_29_023350FC.inc | 2 +- asm/include/overlay_29_023456BC.inc | 2 +- asm/include/overlay_31.inc | 2 +- asm/main_0200C4CC.s | 8 +- asm/overlay_10.s | 276 ++++++++++----------- asm/overlay_29_02300108.s | 24 +- asm/overlay_29_02311034.s | 14 +- asm/overlay_29_023118D8.s | 4 +- asm/overlay_29_0232145C.s | 36 +-- asm/overlay_29_02325644.s | 124 +++++----- asm/overlay_29_02328030.s | 96 ++++---- asm/overlay_29_023350FC.s | 6 +- asm/overlay_29_023456BC.s | 4 +- asm/overlay_29_0234EC38.s | 8 +- asm/overlay_30.s | 76 +++--- asm/overlay_31.s | 356 ++++++++++++++-------------- asm/overlay_34.s | 32 +-- 23 files changed, 608 insertions(+), 608 deletions(-) diff --git a/asm/include/overlay_29_02300108.inc b/asm/include/overlay_29_02300108.inc index ff0a4c06..e5274640 100644 --- a/asm/include/overlay_29_02300108.inc +++ b/asm/include/overlay_29_02300108.inc @@ -1,7 +1,5 @@ #pragma once .public __divsi3 -.public _020A188C -.public _020A18A4 .public CanLearnIqSkill .public CanSeeTarget .public CanThrowItems @@ -13,8 +11,10 @@ .public EntityIsValid__023000E4 .public EntityIsValid__02302A38 .public EvolveMonster +.public EXCLUSIVE_ITEM_EXP_BOOST .public ExclusiveItemEffectFlagTest .public ExclusiveItemEffectIsActive__022FFF28 +.public EXP_ELITE_EXP_BOOST .public GetActiveTeamMember .public GetApparentWeather .public GetEntityNaturalGiftInfo @@ -44,12 +44,11 @@ .public LevelUp .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUserTarget +.public MIN_IQ_EXCLUSIVE_MOVE_USER +.public MIN_IQ_ITEM_MASTER +.public MIRACLE_CHEST_EXP_BOOST .public MistIsActive .public MultiplyByFixedPoint -.public ov10_022C44A8 -.public ov10_022C458C -.public ov10_022C4698 -.public ov10_022C469C .public ov29_022E2470 .public ov29_022E62A8 .public ov29_022FAFD4 @@ -90,3 +89,4 @@ .public sub_02058C9C .public SubstitutePlaceholderStringTags .public vsprintf +.public WONDER_CHEST_EXP_BOOST diff --git a/asm/include/overlay_29_02311034.inc b/asm/include/overlay_29_02311034.inc index 68c58d37..329cb4c9 100644 --- a/asm/include/overlay_29_02311034.inc +++ b/asm/include/overlay_29_02311034.inc @@ -22,16 +22,16 @@ .public GetApparentWeather .public GetRegenSpeed .public HasHeldItem +.public ICE_BODY_BONUS_REGEN .public IqSkillIsEnabled .public IsFloorOver .public LogMessageByIdWithPopupCheckUser -.public ov10_022C4578 -.public ov10_022C4630 .public ov10_022C4674 -.public ov10_022C46D0 .public ov10_022C46F8 .public ov29_0234B294 .public ov29_02353318 +.public RAIN_ABILITY_BONUS_REGEN .public SubstitutePlaceholderStringTags .public TickStatusTurnCounter .public UpdateStatusIconFlags +.public WISH_BONUS_REGEN diff --git a/asm/include/overlay_29_023118D8.inc b/asm/include/overlay_29_023118D8.inc index eddda8a3..4638c0a0 100644 --- a/asm/include/overlay_29_023118D8.inc +++ b/asm/include/overlay_29_023118D8.inc @@ -31,7 +31,6 @@ .public ov10_022C4878 .public ov10_022C4880 .public ov10_022C4884 -.public ov10_022C4888 .public ov10_022C488C .public ov10_022C4890 .public ov10_022C4894 @@ -86,6 +85,7 @@ .public ov29_02353538 .public SafeguardIsActive .public SECONDARY_TERRAIN_TYPES +.public SPEED_BOOST_TURN_RANGE .public sub_02025888 .public sub_020258E4 .public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_0232145C.inc b/asm/include/overlay_29_0232145C.inc index b7bc280f..2672a83e 100644 --- a/asm/include/overlay_29_0232145C.inc +++ b/asm/include/overlay_29_0232145C.inc @@ -8,6 +8,7 @@ .public AreEntitiesAdjacent .public BoostSpeedOneStage .public CalcStatusDuration +.public DETECT_BAND_MOVE_ACCURACY_DROP .public DIRECTIONS_XY .public DungeonRandInt .public DungeonRandOutcome__022EAB50 @@ -40,6 +41,7 @@ .public HasHeldItem .public InitMove .public InitMoveCheckId +.public INTIMIDATOR_ACTIVATION_CHANCE .public IqSkillIsEnabled .public Is2TurnsMove .public IsAffectedByTaunt @@ -52,8 +54,12 @@ .public LogMessageWithPopup .public LogMessageWithPopupCheckUser .public LowerSpeed +.public MALE_ACCURACY_STAGE_MULTIPLIERS +.public MALE_EVASION_STAGE_MULTIPLIERS .public METRONOME_TABLE .public MoveIsNotPhysical +.public NATURE_POWER_TABLE +.public NIGHTMARE_TURN_RANGE .public ov00_022BFDAC .public ov00_022BFDEC .public ov10_022BDE50 @@ -69,14 +75,7 @@ .public ov10_022BFD8C .public ov10_022BFDCC .public ov10_022C4584 -.public ov10_022C45B8 .public ov10_022C4714 -.public ov10_022C4724 -.public ov10_022C47A8 -.public ov10_022C4808 -.public ov10_022C4E40 -.public ov10_022C540C -.public ov10_022C5460 .public ov29_022DE5D8 .public ov29_022DE5F0 .public ov29_022E28D4 @@ -123,7 +122,6 @@ .public ov29_02352A60 .public ov29_02352A6C .public ov29_02352A8C -.public ov29_02352AAC .public ov29_02352AD8 .public ov29_02352B1C .public ov29_02353538 @@ -134,6 +132,7 @@ .public ov29_0237CA88 .public PlayMoveAnimation .public PositionHasMonster +.public QUICK_DODGER_MOVE_ACCURACY_DROP .public SetAndLoadCurrentAttackAnimation .public ShouldDisplayEntityWrapper .public ShouldMovePlayAlternativeAnimation @@ -162,5 +161,6 @@ .public TryInflictSleepStatus .public TrySealMove .public TryWarp +.public TWO_TURN_MOVES_AND_STATUSES .public UpdateAiTargetPos .public WanTableSpriteHasAnimationGroup diff --git a/asm/include/overlay_29_02325644.inc b/asm/include/overlay_29_02325644.inc index ae9eaa6e..b8c4cf3c 100644 --- a/asm/include/overlay_29_02325644.inc +++ b/asm/include/overlay_29_02325644.inc @@ -6,15 +6,21 @@ .public ApplyDefensiveStatMultiplier .public ApplyOffensiveStatMultiplier .public ATK_STAT_IDX +.public AURORA_BEAM_LOWER_ATTACK_CHANCE +.public BITE_CRINGE_CHANCE .public BoostDefensiveStat .public BoostHitChanceStat .public BoostOffensiveStat .public BoostSpeedOneStage +.public BUBBLE_LOWER_SPEED_CHANCE .public CalcDamageFixedWrapper .public CalcRecoilDamageFixed .public CalcStatusDuration +.public CONSTRICT_LOWER_SPEED_CHANCE +.public CRUNCH_LOWER_DEFENSE_CHANCE .public DealDamage .public DealDamageWithType +.public DIG_DAMAGE_MULTIPLIER .public DungeonRandOutcomeUserAction .public DungeonRandOutcomeUserTargetInteraction .public DungeonRandRange @@ -25,7 +31,11 @@ .public EntityIsValid__02325620 .public EntityIsValidMoveEffects__0232800C .public ExclusiveItemEffectFlagTest +.public FACADE_DAMAGE_MULTIPLIER +.public FLAME_WHEEL_BURN_CHANCE +.public FLAMETHROWER_BURN_CHANCE .public FlashFireShouldActivate +.public FOCUS_PUNCH_DAMAGE_MULTIPLIER .public FormatMoveStringMore .public GetApparentWeather .public GetDamageSourceWrapper @@ -36,6 +46,7 @@ .public GetMoveType .public GetTileAtEntity .public InitMove +.public IRON_TAIL_LOWER_DEFENSE_CHANCE .public IsChargingTwoTurnMove .public IsMonsterSleeping .public LogMessageByIdWithPopupCheckUserTarget @@ -43,41 +54,15 @@ .public LowerHitChanceStat .public LowerOffensiveStat .public LowerSpeed +.public METEOR_MASH_BOOST_ATTACK_CHANCE .public MirrorMoveIsActive +.public MORNING_SUN_HP_RESTORATION_TABLE +.public NIGHTMARE_TURN_RANGE +.public OCTAZOOKA_LOWER_ACCURACY_CHANCE .public ov10_022BED90 .public ov10_022BF160 .public ov10_022BFC5C -.public ov10_022C4428 -.public ov10_022C4440 -.public ov10_022C444C -.public ov10_022C4450 -.public ov10_022C4488 -.public ov10_022C4500 -.public ov10_022C4514 -.public ov10_022C4534 -.public ov10_022C4538 -.public ov10_022C4544 -.public ov10_022C4600 -.public ov10_022C4604 -.public ov10_022C462C -.public ov10_022C4634 -.public ov10_022C4658 -.public ov10_022C4688 -.public ov10_022C4690 -.public ov10_022C4718 -.public ov10_022C4724 -.public ov10_022C4798 -.public ov10_022C47C4 -.public ov10_022C47E4 -.public ov10_022C4860 .public ov10_022C48A8 -.public ov10_022C48B0 -.public ov10_022C48B4 -.public ov10_022C4954 -.public ov10_022C4984 -.public ov10_022C4994 -.public ov10_022C49A4 -.public ov10_022C4B54 .public ov10_022C4C0C .public ov10_022C4C0E .public ov29_022E2CA0 @@ -93,17 +78,29 @@ .public ov29_0234B034 .public ov29_0234BA54 .public ov29_02352AD8 -.public ov29_02352AF0 .public ov29_02353538 .public ov29_0237CA69 .public ov29_0237CA6A .public ov29_0237CA6D .public ov29_0237CA70 +.public POWDER_SNOW_FREEZE_CHANCE +.public PSYBEAM_CONFUSE_CHANCE +.public RAZOR_WIND_DAMAGE_MULTIPLIER +.public REVERSAL_DAMAGE_MULT_TABLE +.public ROCK_SLIDE_CRINGE_CHANCE +.public ROLLOUT_DAMAGE_MULT_TABLE +.public SILVER_WIND_BOOST_CHANCE +.public SKY_ATTACK_CRINGE_CHANCE .public SLEEP_TURN_RANGE +.public SMOKESCREEN_TURN_RANGE +.public SNORE_CRINGE_CHANCE .public SPATK_STAT_IDX .public StringFromMessageId .public sub_0201CF90 .public SubstitutePlaceholderStringTags +.public SURE_SHOT_TURN_RANGE +.public SYNTHESIS_HP_RESTORATION_TABLE +.public THUNDER_PARALYZE_CHANCE .public TryActivateWeather .public TryIncreaseHp .public TryInflictBurnStatus @@ -127,6 +124,9 @@ .public TryInflictWhifferStatus .public TryInflictYawningStatus .public TryResetStatChanges +.public WATER_SPOUT_DAMAGE_MULT_TABLE +.public WEATHER_BALL_DAMAGE_MULT_TABLE .public WEATHER_BALL_TYPE_TABLE .public WEATHER_MOVE_TURN_COUNT .public WHIRLPOOL_CONSTRICTION_CHANCE +.public YAWN_TURN_RANGE diff --git a/asm/include/overlay_29_02328030.inc b/asm/include/overlay_29_02328030.inc index 19356570..a7926ea7 100644 --- a/asm/include/overlay_29_02328030.inc +++ b/asm/include/overlay_29_02328030.inc @@ -8,10 +8,13 @@ .public BoostDefensiveStat .public BoostHitChanceStat .public BoostOffensiveStat +.public BOUNCE_DAMAGE_MULTIPLIER +.public BOUNCE_PARALYZE_CHANCE .public CalcDamage .public CalcDamageFixedWrapper .public CalcRecoilDamageFixed .public DealDamage +.public DIVE_DAMAGE_MULTIPLIER .public DoMoveTakeaway .public DungeonRandInt .public DungeonRandOutcomeUserAction @@ -20,6 +23,9 @@ .public EntityIsValidMoveEffects__0232800C .public EntityIsValidMoveEffects__0232A3D8 .public ExclusiveItemEffectFlagTest +.public EXTRASENSORY_CRINGE_CHANCE +.public FAKE_OUT_CRINGE_CHANCE +.public FLY_DAMAGE_MULTIPLIER .public GenerateStandardItem .public GetApparentWeather .public GetDamageSourceWrapper @@ -29,38 +35,19 @@ .public GetMoveType .public GetMoveTypeForMonster .public GetTileAtEntity +.public HEADBUTT_CRINGE_CHANCE .public InitMove .public IsChargingTwoTurnMove .public IsSameMove .public LevitateIsActive +.public LICK_PARALYZE_CHANCE .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat .public LowerHitChanceStat .public LowerOffensiveStat -.public ov10_022C4424 -.public ov10_022C4444 -.public ov10_022C4448 -.public ov10_022C4484 -.public ov10_022C4490 -.public ov10_022C4494 -.public ov10_022C4498 -.public ov10_022C44A0 -.public ov10_022C451C -.public ov10_022C4528 -.public ov10_022C4568 -.public ov10_022C461C -.public ov10_022C463C -.public ov10_022C4644 -.public ov10_022C465C -.public ov10_022C4668 -.public ov10_022C4670 -.public ov10_022C4694 -.public ov10_022C47E8 -.public ov10_022C47EC -.public ov10_022C48A4 -.public ov10_022C48C0 -.public ov10_022C4974 -.public ov10_022C4E40 +.public MOONLIGHT_HP_RESTORATION_TABLE +.public MUDDY_WATER_LOWER_ACCURACY_CHANCE +.public NATURE_POWER_TABLE .public ov10_022C4E44 .public ov10_022C6324 .public ov29_022E56A0 @@ -87,11 +74,21 @@ .public ov29_0237CA6B .public ov29_0237CA78 .public ov29_0237CA7C +.public POISON_FANG_POISON_CHANCE +.public POISON_STING_POISON_CHANCE .public RemoveEmptyItemsInBagWrapper .public RemoveEquivItemNoHole +.public SACRED_FIRE_BURN_CHANCE +.public SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE +.public SMOG_POISON_CHANCE +.public SOLARBEAM_DAMAGE_MULTIPLIER +.public SONICBOOM_FIXED_DAMAGE .public SPATK_STAT_IDX .public StringFromMessageId .public SubstitutePlaceholderStringTags +.public THUNDERBOLT_PARALYZE_CHANCE +.public THUNDERSHOCK_PARALYZE_CHANCE +.public TRI_ATTACK_STATUS_CHANCE .public TryActivateWeather .public TryEndStatusWithAbility .public TryExplosion @@ -111,4 +108,7 @@ .public TryInflictTauntStatus .public TryInflictWishStatus .public TryWarp +.public TWINEEDLE_POISON_CHANCE +.public TWISTER_CRINGE_CHANCE +.public WATERFALL_CRINGE_CHANCE .public WEATHER_MOVE_TURN_COUNT diff --git a/asm/include/overlay_29_023350FC.inc b/asm/include/overlay_29_023350FC.inc index db109f11..b9154c7c 100644 --- a/asm/include/overlay_29_023350FC.inc +++ b/asm/include/overlay_29_023350FC.inc @@ -39,7 +39,6 @@ .public ov10_022C26A0 .public ov10_022C26BC .public ov10_022C2720 -.public ov10_022C478C .public ov29_022DE0EC .public ov29_022DE608 .public ov29_022E0378 @@ -76,6 +75,7 @@ .public SECONDARY_TERRAIN_TYPES .public SetBothScreensWindowColorToDefault .public SetScreenWindowsColor +.public SPORT_CONDITION_TURN_RANGE .public sub_0201E020 .public sub_0201E080 .public sub_0201F2A0 diff --git a/asm/include/overlay_29_023456BC.inc b/asm/include/overlay_29_023456BC.inc index 013d4712..ca6b78f2 100644 --- a/asm/include/overlay_29_023456BC.inc +++ b/asm/include/overlay_29_023456BC.inc @@ -55,7 +55,6 @@ .public LogMessageByIdWithPopupCheckUserUnknown .public MONEY_QUANTITY_TABLE .public MonsterHasEmbargoStatus -.public ov10_022C4474 .public ov10_022C44C8 .public ov10_022C48EC .public ov10_022C4CD8 @@ -108,5 +107,6 @@ .public SubstitutePlaceholderStringTags .public TestItemAiFlag .public TwoTurnMoveForcedMiss +.public UNOWN_STONE_DROP_CHANCE .public UpdateEntityPixelPos .public YesNoMenu diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index 23eed5f9..16a97030 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -144,7 +144,7 @@ .public ov29_02353538 .public ov29_0237C91C .public ov29_0238280C -.public ov31_02389E20 +.public OVERLAY31_UNKNOWN_STRING_IDS .public PositionHasItem .public PreprocessString .public PreprocessStringFromMessageId diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s index 0832f426..1c27657c 100644 --- a/asm/main_0200C4CC.s +++ b/asm/main_0200C4CC.s @@ -169911,8 +169911,8 @@ _020A1884: .global GUMMI_STAT_BOOST GUMMI_STAT_BOOST: .byte 0x01, 0x00, 0x00, 0x00 - .global _020A188C -_020A188C: + .global MIN_IQ_EXCLUSIVE_MOVE_USER +MIN_IQ_EXCLUSIVE_MOVE_USER: .byte 0x4B, 0x01, 0x00, 0x00 .global WONDER_GUMMI_IQ_GAIN WONDER_GUMMI_IQ_GAIN: @@ -169929,8 +169929,8 @@ _020A189C: .global _020A18A0 _020A18A0: .byte 0x05, 0x00, 0x00, 0x00 - .global _020A18A4 -_020A18A4: + .global MIN_IQ_ITEM_MASTER +MIN_IQ_ITEM_MASTER: .byte 0x96, 0x00, 0x00, 0x00 .global DEF_SCARF_STAT_BOOST DEF_SCARF_STAT_BOOST: diff --git a/asm/overlay_10.s b/asm/overlay_10.s index 361ba844..a271ce6f 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -9131,11 +9131,11 @@ ov10_022C441C: .global PROTEIN_STAT_BOOST PROTEIN_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C4424 -ov10_022C4424: + .global WATERFALL_CRINGE_CHANCE +WATERFALL_CRINGE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4428 -ov10_022C4428: + .global AURORA_BEAM_LOWER_ATTACK_CHANCE +AURORA_BEAM_LOWER_ATTACK_CHANCE: .byte 0x3C, 0x00, 0x00, 0x00 .global ov10_022C442C ov10_022C442C: @@ -9152,20 +9152,20 @@ OREN_BERRY_DAMAGE: .global ov10_022C443C ov10_022C443C: .byte 0xC9, 0x00, 0x00, 0x00 - .global ov10_022C4440 -ov10_022C4440: + .global IRON_TAIL_LOWER_DEFENSE_CHANCE +IRON_TAIL_LOWER_DEFENSE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4444 -ov10_022C4444: + .global TWINEEDLE_POISON_CHANCE +TWINEEDLE_POISON_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4448 -ov10_022C4448: + .global EXTRASENSORY_CRINGE_CHANCE +EXTRASENSORY_CRINGE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C444C -ov10_022C444C: + .global ROCK_SLIDE_CRINGE_CHANCE +ROCK_SLIDE_CRINGE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4450 -ov10_022C4450: + .global CRUNCH_LOWER_DEFENSE_CHANCE +CRUNCH_LOWER_DEFENSE_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C4454 ov10_022C4454: @@ -9191,8 +9191,8 @@ ov10_022C446C: .global ov10_022C4470 ov10_022C4470: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C4474 -ov10_022C4474: + .global UNOWN_STONE_DROP_CHANCE +UNOWN_STONE_DROP_CHANCE: .byte 0x21, 0x00, 0x00, 0x00 .global SITRUS_BERRY_HP_RESTORATION SITRUS_BERRY_HP_RESTORATION: @@ -9203,35 +9203,35 @@ ov10_022C447C: .global ov10_022C4480 ov10_022C4480: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4484 -ov10_022C4484: + .global MUDDY_WATER_LOWER_ACCURACY_CHANCE +MUDDY_WATER_LOWER_ACCURACY_CHANCE: .byte 0x28, 0x00, 0x00, 0x00 - .global ov10_022C4488 -ov10_022C4488: + .global SILVER_WIND_BOOST_CHANCE +SILVER_WIND_BOOST_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global POISON_TAIL_POISON_CHANCE POISON_TAIL_POISON_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4490 -ov10_022C4490: + .global THUNDERSHOCK_PARALYZE_CHANCE +THUNDERSHOCK_PARALYZE_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4494 -ov10_022C4494: + .global BOUNCE_PARALYZE_CHANCE +BOUNCE_PARALYZE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4498 -ov10_022C4498: + .global HEADBUTT_CRINGE_CHANCE +HEADBUTT_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00 .global FIRE_FANG_CRINGE_CHANCE FIRE_FANG_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00 - .global ov10_022C44A0 -ov10_022C44A0: + .global SACRED_FIRE_BURN_CHANCE +SACRED_FIRE_BURN_CHANCE: .byte 0x32, 0x00, 0x00, 0x00 .global WHIRLPOOL_CONSTRICTION_CHANCE WHIRLPOOL_CONSTRICTION_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C44A8 -ov10_022C44A8: + .global EXP_ELITE_EXP_BOOST +EXP_ELITE_EXP_BOOST: .byte 0x0A, 0x00, 0x00, 0x00 .global MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS MONSTER_HOUSE_MAX_NON_MONSTER_SPAWNS: @@ -9296,8 +9296,8 @@ LIFE_SEED_HP_BOOST: .global ov10_022C44FC ov10_022C44FC: .byte 0x32, 0x00, 0x00, 0x00 - .global ov10_022C4500 -ov10_022C4500: + .global OCTAZOOKA_LOWER_ACCURACY_CHANCE +OCTAZOOKA_LOWER_ACCURACY_CHANCE: .byte 0x3C, 0x00, 0x00, 0x00 .global ov10_022C4504 ov10_022C4504: @@ -9311,14 +9311,14 @@ LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE: .global SUPER_LUCK_CRIT_RATE_BOOST SUPER_LUCK_CRIT_RATE_BOOST: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4514 -ov10_022C4514: + .global CONSTRICT_LOWER_SPEED_CHANCE +CONSTRICT_LOWER_SPEED_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global ICE_FANG_FREEZE_CHANCE ICE_FANG_FREEZE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C451C -ov10_022C451C: + .global SMOG_POISON_CHANCE +SMOG_POISON_CHANCE: .byte 0x28, 0x00, 0x00, 0x00 .global ov10_022C4520 ov10_022C4520: @@ -9326,8 +9326,8 @@ ov10_022C4520: .global ov10_022C4524 ov10_022C4524: .byte 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C4528 -ov10_022C4528: + .global LICK_PARALYZE_CHANCE +LICK_PARALYZE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 .global THUNDER_FANG_PARALYZE_CHANCE THUNDER_FANG_PARALYZE_CHANCE: @@ -9335,11 +9335,11 @@ THUNDER_FANG_PARALYZE_CHANCE: .global ov10_022C4530 ov10_022C4530: .byte 0x0F, 0x00, 0x00, 0x00 - .global ov10_022C4534 -ov10_022C4534: + .global BITE_CRINGE_CHANCE +BITE_CRINGE_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4538 -ov10_022C4538: + .global SKY_ATTACK_CRINGE_CHANCE +SKY_ATTACK_CRINGE_CHANCE: .byte 0x19, 0x00, 0x00, 0x00 .global ICE_FANG_CRINGE_CHANCE ICE_FANG_CRINGE_CHANCE: @@ -9347,8 +9347,8 @@ ICE_FANG_CRINGE_CHANCE: .global BLAZE_KICK_BURN_CHANCE BLAZE_KICK_BURN_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4544 -ov10_022C4544: + .global FLAMETHROWER_BURN_CHANCE +FLAMETHROWER_BURN_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 .global DIZZY_PUNCH_CONFUSE_CHANCE DIZZY_PUNCH_CONFUSE_CHANCE: @@ -9374,8 +9374,8 @@ ov10_022C4560: .global ov10_022C4564 ov10_022C4564: .byte 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C4568 -ov10_022C4568: + .global SONICBOOM_FIXED_DAMAGE +SONICBOOM_FIXED_DAMAGE: .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C456C ov10_022C456C: @@ -9386,8 +9386,8 @@ ov10_022C4570: .global ov10_022C4574 ov10_022C4574: .byte 0x02, 0x00, 0x00, 0x00 - .global ov10_022C4578 -ov10_022C4578: + .global RAIN_ABILITY_BONUS_REGEN +RAIN_ABILITY_BONUS_REGEN: .byte 0x6A, 0xFF, 0x00, 0x00 .global ov10_022C457C ov10_022C457C: @@ -9398,8 +9398,8 @@ ov10_022C4584: .global LEECH_SEED_HP_DRAIN LEECH_SEED_HP_DRAIN: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C458C -ov10_022C458C: + .global EXCLUSIVE_ITEM_EXP_BOOST +EXCLUSIVE_ITEM_EXP_BOOST: .byte 0x0C, 0x00, 0x00, 0x00 .global ov10_022C4590 ov10_022C4590: @@ -9431,8 +9431,8 @@ ov10_022C45B0: .global ov10_022C45B4 ov10_022C45B4: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C45B8 -ov10_022C45B8: + .global INTIMIDATOR_ACTIVATION_CHANCE +INTIMIDATOR_ACTIVATION_CHANCE: .byte 0x20, 0x00, 0x00, 0x00 .global ov10_022C45BC ov10_022C45BC: @@ -9485,11 +9485,11 @@ ov10_022C45F8: .global ov10_022C45FC ov10_022C45FC: .byte 0x05, 0x00, 0x00, 0x00 - .global ov10_022C4600 -ov10_022C4600: + .global SNORE_CRINGE_CHANCE +SNORE_CRINGE_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C4604 -ov10_022C4604: + .global METEOR_MASH_BOOST_ATTACK_CHANCE +METEOR_MASH_BOOST_ATTACK_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global CRUSH_CLAW_LOWER_DEFENSE_CHANCE CRUSH_CLAW_LOWER_DEFENSE_CHANCE: @@ -9506,8 +9506,8 @@ ov10_022C4614: .global ov10_022C4618 ov10_022C4618: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C461C -ov10_022C461C: + .global SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE +SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 .global ov10_022C4620 ov10_022C4620: @@ -9518,26 +9518,26 @@ STICK_POWER: .global ov10_022C4628 ov10_022C4628: .byte 0x08, 0x00, 0x00, 0x00 - .global ov10_022C462C -ov10_022C462C: + .global BUBBLE_LOWER_SPEED_CHANCE +BUBBLE_LOWER_SPEED_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4630 -ov10_022C4630: + .global ICE_BODY_BONUS_REGEN +ICE_BODY_BONUS_REGEN: .byte 0x9C, 0xFF, 0x00, 0x00 - .global ov10_022C4634 -ov10_022C4634: + .global POWDER_SNOW_FREEZE_CHANCE +POWDER_SNOW_FREEZE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 .global ov10_022C4638 ov10_022C4638: .byte 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C463C -ov10_022C463C: + .global POISON_STING_POISON_CHANCE +POISON_STING_POISON_CHANCE: .byte 0x12, 0x00, 0x00, 0x00 .global SPAWN_COOLDOWN_THIEF_ALERT SPAWN_COOLDOWN_THIEF_ALERT: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C4644 -ov10_022C4644: + .global POISON_FANG_POISON_CHANCE +POISON_FANG_POISON_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C4648 ov10_022C4648: @@ -9551,11 +9551,11 @@ ov10_022C4650: .global WEATHER_MOVE_TURN_COUNT WEATHER_MOVE_TURN_COUNT: .byte 0xB8, 0x0B, 0x00, 0x00 - .global ov10_022C4658 -ov10_022C4658: + .global THUNDER_PARALYZE_CHANCE +THUNDER_PARALYZE_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C465C -ov10_022C465C: + .global THUNDERBOLT_PARALYZE_CHANCE +THUNDERBOLT_PARALYZE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 .global MONSTER_HOUSE_MAX_MONSTER_SPAWNS MONSTER_HOUSE_MAX_MONSTER_SPAWNS: @@ -9563,14 +9563,14 @@ MONSTER_HOUSE_MAX_MONSTER_SPAWNS: .global ov10_022C4664 ov10_022C4664: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4668 -ov10_022C4668: + .global TWISTER_CRINGE_CHANCE +TWISTER_CRINGE_CHANCE: .byte 0x0F, 0x00, 0x00, 0x00 .global SPEED_BOOST_TURNS SPEED_BOOST_TURNS: .byte 0xFA, 0x00, 0x00, 0x00 - .global ov10_022C4670 -ov10_022C4670: + .global FAKE_OUT_CRINGE_CHANCE +FAKE_OUT_CRINGE_CHANCE: .byte 0x23, 0x00, 0x00, 0x00 .global ov10_022C4674 ov10_022C4674: @@ -9587,23 +9587,23 @@ ov10_022C4680: .global FLARE_BLITZ_BURN_CHANCE FLARE_BLITZ_BURN_CHANCE: .byte 0x19, 0x00, 0x00, 0x00 - .global ov10_022C4688 -ov10_022C4688: + .global FLAME_WHEEL_BURN_CHANCE +FLAME_WHEEL_BURN_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 .global ov10_022C468C ov10_022C468C: .byte 0x0C, 0x00, 0x00, 0x00 - .global ov10_022C4690 -ov10_022C4690: + .global PSYBEAM_CONFUSE_CHANCE +PSYBEAM_CONFUSE_CHANCE: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C4694 -ov10_022C4694: + .global TRI_ATTACK_STATUS_CHANCE +TRI_ATTACK_STATUS_CHANCE: .byte 0x14, 0x00, 0x00, 0x00 - .global ov10_022C4698 -ov10_022C4698: + .global MIRACLE_CHEST_EXP_BOOST +MIRACLE_CHEST_EXP_BOOST: .byte 0x1E, 0x00, 0x00, 0x00 - .global ov10_022C469C -ov10_022C469C: + .global WONDER_CHEST_EXP_BOOST +WONDER_CHEST_EXP_BOOST: .byte 0x0F, 0x00, 0x00, 0x00 .global ov10_022C46A0 ov10_022C46A0: @@ -9641,8 +9641,8 @@ IRON_STAT_BOOST: .global CALCIUM_STAT_BOOST CALCIUM_STAT_BOOST: .byte 0x03, 0x00, 0x00, 0x00 - .global ov10_022C46D0 -ov10_022C46D0: + .global WISH_BONUS_REGEN +WISH_BONUS_REGEN: .byte 0x24, 0xFF, 0x00, 0x00 .global DRAGON_RAGE_FIXED_DAMAGE DRAGON_RAGE_FIXED_DAMAGE: @@ -9695,8 +9695,8 @@ ME_FIRST_MULTIPLIER: .global ov10_022C4714 ov10_022C4714: .byte 0x01, 0x00, 0x01, 0x00 - .global ov10_022C4718 -ov10_022C4718: + .global FACADE_DAMAGE_MULTIPLIER +FACADE_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global IMPRISON_TURN_RANGE IMPRISON_TURN_RANGE: @@ -9704,8 +9704,8 @@ IMPRISON_TURN_RANGE: .global SLEEP_TURN_RANGE SLEEP_TURN_RANGE: .byte 0x03, 0x00, 0x07, 0x00 - .global ov10_022C4724 -ov10_022C4724: + .global NIGHTMARE_TURN_RANGE +NIGHTMARE_TURN_RANGE: .byte 0x04, 0x00, 0x08, 0x00 .global ov10_022C4728 ov10_022C4728: @@ -9782,8 +9782,8 @@ ov10_022C4784: .global ov10_022C4788 ov10_022C4788: .byte 0x03, 0x00, 0x05, 0x00 - .global ov10_022C478C -ov10_022C478C: + .global SPORT_CONDITION_TURN_RANGE +SPORT_CONDITION_TURN_RANGE: .byte 0x0A, 0x00, 0x0C, 0x00 .global ov10_022C4790 ov10_022C4790: @@ -9791,8 +9791,8 @@ ov10_022C4790: .global ov10_022C4794 ov10_022C4794: .byte 0x0A, 0x00, 0x0C, 0x00 - .global ov10_022C4798 -ov10_022C4798: + .global SURE_SHOT_TURN_RANGE +SURE_SHOT_TURN_RANGE: .byte 0x0A, 0x00, 0x0C, 0x00 .global ov10_022C479C ov10_022C479C: @@ -9803,8 +9803,8 @@ ov10_022C47A0: .global ov10_022C47A4 ov10_022C47A4: .byte 0x02, 0x00, 0x04, 0x00 - .global ov10_022C47A8 -ov10_022C47A8: + .global DETECT_BAND_MOVE_ACCURACY_DROP +DETECT_BAND_MOVE_ACCURACY_DROP: .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C47AC ov10_022C47AC: @@ -9824,8 +9824,8 @@ ov10_022C47BC: .global TINTED_LENS_MULTIPLIER TINTED_LENS_MULTIPLIER: .byte 0x33, 0x01, 0x00, 0x00 - .global ov10_022C47C4 -ov10_022C47C4: + .global SMOKESCREEN_TURN_RANGE +SMOKESCREEN_TURN_RANGE: .byte 0x01, 0x00, 0x04, 0x00 .global ov10_022C47C8 ov10_022C47C8: @@ -9848,14 +9848,14 @@ SHADOW_FORCE_DAMAGE_MULTIPLIER: .global ov10_022C47E0 ov10_022C47E0: .byte 0x0A, 0x00, 0x05, 0x00 - .global ov10_022C47E4 -ov10_022C47E4: + .global DIG_DAMAGE_MULTIPLIER +DIG_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 - .global ov10_022C47E8 -ov10_022C47E8: + .global DIVE_DAMAGE_MULTIPLIER +DIVE_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 - .global ov10_022C47EC -ov10_022C47EC: + .global BOUNCE_DAMAGE_MULTIPLIER +BOUNCE_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C47F0 ov10_022C47F0: @@ -9875,8 +9875,8 @@ ov10_022C4800: .global ov10_022C4804 ov10_022C4804: .byte 0x04, 0x00, 0x06, 0x00 - .global ov10_022C4808 -ov10_022C4808: + .global QUICK_DODGER_MOVE_ACCURACY_DROP +QUICK_DODGER_MOVE_ACCURACY_DROP: .byte 0x0A, 0x00, 0x00, 0x00 .global ov10_022C480C ov10_022C480C: @@ -9941,8 +9941,8 @@ ov10_022C4858: .global ov10_022C485C ov10_022C485C: .byte 0x0F, 0x00, 0x14, 0x00 - .global ov10_022C4860 -ov10_022C4860: + .global YAWN_TURN_RANGE +YAWN_TURN_RANGE: .byte 0x02, 0x00, 0x02, 0x00 .global ov10_022C4864 ov10_022C4864: @@ -9971,8 +9971,8 @@ ov10_022C4880: .global ov10_022C4884 ov10_022C4884: .byte 0x01, 0x00, 0x01, 0x00 - .global ov10_022C4888 -ov10_022C4888: + .global SPEED_BOOST_TURN_RANGE +SPEED_BOOST_TURN_RANGE: .byte 0x08, 0x00, 0x0A, 0x00 .global ov10_022C488C ov10_022C488C: @@ -9992,8 +9992,8 @@ ov10_022C489C: .global ov10_022C48A0 ov10_022C48A0: .byte 0x03, 0x00, 0x06, 0x00 - .global ov10_022C48A4 -ov10_022C48A4: + .global SOLARBEAM_DAMAGE_MULTIPLIER +SOLARBEAM_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C48A8 ov10_022C48A8: @@ -10001,11 +10001,11 @@ ov10_022C48A8: .global ov10_022C48AC ov10_022C48AC: .byte 0x02, 0x00, 0x05, 0x00 - .global ov10_022C48B0 -ov10_022C48B0: + .global RAZOR_WIND_DAMAGE_MULTIPLIER +RAZOR_WIND_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 - .global ov10_022C48B4 -ov10_022C48B4: + .global FOCUS_PUNCH_DAMAGE_MULTIPLIER +FOCUS_PUNCH_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C48B8 ov10_022C48B8: @@ -10013,8 +10013,8 @@ ov10_022C48B8: .global SKULL_BASH_DAMAGE_MULTIPLIER SKULL_BASH_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 - .global ov10_022C48C0 -ov10_022C48C0: + .global FLY_DAMAGE_MULTIPLIER +FLY_DAMAGE_MULTIPLIER: .byte 0x00, 0x02, 0x00, 0x00 .global ov10_022C48C4 ov10_022C48C4: @@ -10054,23 +10054,23 @@ ov10_022C4934: .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 - .global ov10_022C4954 -ov10_022C4954: + .global SYNTHESIS_HP_RESTORATION_TABLE +SYNTHESIS_HP_RESTORATION_TABLE: .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 .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 - .global ov10_022C4974 -ov10_022C4974: + .global MOONLIGHT_HP_RESTORATION_TABLE +MOONLIGHT_HP_RESTORATION_TABLE: .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 - .global ov10_022C4984 -ov10_022C4984: + .global MORNING_SUN_HP_RESTORATION_TABLE +MORNING_SUN_HP_RESTORATION_TABLE: .byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00 - .global ov10_022C4994 -ov10_022C4994: + .global REVERSAL_DAMAGE_MULT_TABLE +REVERSAL_DAMAGE_MULT_TABLE: .byte 0x00, 0x02, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 - .global ov10_022C49A4 -ov10_022C49A4: + .global WATER_SPOUT_DAMAGE_MULT_TABLE +WATER_SPOUT_DAMAGE_MULT_TABLE: .byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 .global WRING_OUT_DAMAGE_MULT_TABLE WRING_OUT_DAMAGE_MULT_TABLE: @@ -10149,8 +10149,8 @@ ov10_022C4B18: 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 - .global ov10_022C4B54 -ov10_022C4B54: + .global WEATHER_BALL_DAMAGE_MULT_TABLE +WEATHER_BALL_DAMAGE_MULT_TABLE: .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 EAT_ITEM_EFFECT_IGNORE_LIST @@ -10245,8 +10245,8 @@ DEFENSIVE_STAT_STAGE_MULTIPLIERS: .byte 0x00, 0x01, 0x00, 0x00, 0x4C, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00, 0xE6, 0x01, 0x00, 0x00 .byte 0x19, 0x02, 0x00, 0x00, 0x4C, 0x02, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0xB3, 0x02, 0x00, 0x00 .byte 0xE6, 0x02, 0x00, 0x00, 0x19, 0x03, 0x00, 0x00, 0x4C, 0x03, 0x00, 0x00 - .global ov10_022C4E40 -ov10_022C4E40: + .global NATURE_POWER_TABLE +NATURE_POWER_TABLE: .byte 0xDB, 0x00, 0x00, 0x00 .global ov10_022C4E44 ov10_022C4E44: @@ -10365,16 +10365,16 @@ SHOP_ITEM_CHANCES: .byte 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x64, 0x00 .byte 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x64, 0x00, 0x1E, 0x00 .byte 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x1E, 0x00 - .global ov10_022C540C -ov10_022C540C: + .global MALE_ACCURACY_STAGE_MULTIPLIERS +MALE_ACCURACY_STAGE_MULTIPLIERS: .byte 0x54, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00 .byte 0x5E, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00 .byte 0x8C, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x00, 0x00 .byte 0x00, 0x01, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00 .byte 0xA6, 0x01, 0x00, 0x00, 0xB3, 0x01, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00 .byte 0xD9, 0x01, 0x00, 0x00, 0xE6, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 - .global ov10_022C5460 -ov10_022C5460: + .global MALE_EVASION_STAGE_MULTIPLIERS +MALE_EVASION_STAGE_MULTIPLIERS: .byte 0x00, 0x02, 0x00, 0x00 .byte 0xE6, 0x01, 0x00, 0x00, 0xD9, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00 .byte 0xB3, 0x01, 0x00, 0x00, 0xA6, 0x01, 0x00, 0x00, 0x99, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00 diff --git a/asm/overlay_29_02300108.s b/asm/overlay_29_02300108.s index 5cd7bd92..afcc9b82 100644 --- a/asm/overlay_29_02300108.s +++ b/asm/overlay_29_02300108.s @@ -2374,7 +2374,7 @@ _0230202C: cmp r6, #0x19 blt _02301FE4 _02302034: - ldr r0, _023021E8 ; =_020A188C + ldr r0, _023021E8 ; =MIN_IQ_EXCLUSIVE_MOVE_USER ldrsh r1, [r4, #0xe] ldrsh r0, [r0] cmp r1, r0 @@ -2392,7 +2392,7 @@ _02302068: bl ov29_022FBDE0 cmp r0, #0 bne _0230208C - ldr r0, _023021EC ; =_020A18A4 + ldr r0, _023021EC ; =MIN_IQ_ITEM_MASTER ldrsh r1, [r4, #0xe] ldrsh r0, [r0] cmp r1, r0 @@ -2497,8 +2497,8 @@ _023021C4: bl EnableIqSkill ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023021E8: .word _020A188C -_023021EC: .word _020A18A4 +_023021E8: .word MIN_IQ_EXCLUSIVE_MOVE_USER +_023021EC: .word MIN_IQ_ITEM_MASTER arm_func_end UpdateIqSkills arm_func_start ov29_023021F0 @@ -2793,7 +2793,7 @@ _02302580: bl IqSkillIsEnabled cmp r0, #0 beq _023025C0 - ldr r0, _023026B8 ; =ov10_022C44A8 + ldr r0, _023026B8 ; =EXP_ELITE_EXP_BOOST mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2808,7 +2808,7 @@ _023025C0: bl ItemIsActive__023026CC cmp r0, #0 beq _023025F8 - ldr r0, _023026BC ; =ov10_022C469C + ldr r0, _023026BC ; =WONDER_CHEST_EXP_BOOST mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2823,7 +2823,7 @@ _023025F8: bl ItemIsActive__023026CC cmp r0, #0 beq _02302630 - ldr r0, _023026C0 ; =ov10_022C4698 + ldr r0, _023026C0 ; =MIRACLE_CHEST_EXP_BOOST mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2844,7 +2844,7 @@ _02302630: _02302650: cmp r0, #0 beq _0230267C - ldr r0, _023026C4 ; =ov10_022C458C + ldr r0, _023026C4 ; =EXCLUSIVE_ITEM_EXP_BOOST mov r1, #0x64 ldrsh r0, [r0] mov r0, r0, lsl #8 @@ -2870,10 +2870,10 @@ _0230267C: ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 _023026B4: .word ov29_02353538 -_023026B8: .word ov10_022C44A8 -_023026BC: .word ov10_022C469C -_023026C0: .word ov10_022C4698 -_023026C4: .word ov10_022C458C +_023026B8: .word EXP_ELITE_EXP_BOOST +_023026BC: .word WONDER_CHEST_EXP_BOOST +_023026C0: .word MIRACLE_CHEST_EXP_BOOST +_023026C4: .word EXCLUSIVE_ITEM_EXP_BOOST _023026C8: .word 0x0098967F arm_func_end AddExpSpecial diff --git a/asm/overlay_29_02311034.s b/asm/overlay_29_02311034.s index f9155a40..14444419 100644 --- a/asm/overlay_29_02311034.s +++ b/asm/overlay_29_02311034.s @@ -94,7 +94,7 @@ _0231115C: ldrb r0, [r7, #0xd5] mov r1, #3 cmp r0, #6 - ldreq r0, _02311804 ; =ov10_022C46D0 + ldreq r0, _02311804 ; =WISH_BONUS_REGEN ldreqsh r0, [r0] addeq r4, r4, r0 mov r0, sl @@ -104,7 +104,7 @@ _0231115C: mov r0, sl bl GetApparentWeather cmp r0, #4 - ldreq r0, _02311808 ; =ov10_022C4578 + ldreq r0, _02311808 ; =RAIN_ABILITY_BONUS_REGEN ldreqsh r0, [r0] addeq r4, r4, r0 _0231119C: @@ -116,7 +116,7 @@ _0231119C: mov r0, sl bl GetApparentWeather cmp r0, #4 - ldreq r0, _02311808 ; =ov10_022C4578 + ldreq r0, _02311808 ; =RAIN_ABILITY_BONUS_REGEN ldreqsh r0, [r0] addeq r4, r4, r0 _023111C8: @@ -128,7 +128,7 @@ _023111C8: mov r0, sl bl GetApparentWeather cmp r0, #5 - ldreq r0, _0231180C ; =ov10_022C4630 + ldreq r0, _0231180C ; =ICE_BODY_BONUS_REGEN ldreqsh r0, [r0] addeq r4, r4, r0 _023111F4: @@ -545,9 +545,9 @@ _023117A8: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02311800: .word ov10_022C46F8 -_02311804: .word ov10_022C46D0 -_02311808: .word ov10_022C4578 -_0231180C: .word ov10_022C4630 +_02311804: .word WISH_BONUS_REGEN +_02311808: .word RAIN_ABILITY_BONUS_REGEN +_0231180C: .word ICE_BODY_BONUS_REGEN _02311810: .word ov10_022C4674 _02311814: .word 0x000003E7 _02311818: .word 0x00000CC6 diff --git a/asm/overlay_29_023118D8.s b/asm/overlay_29_023118D8.s index 45494093..e32b8c99 100644 --- a/asm/overlay_29_023118D8.s +++ b/asm/overlay_29_023118D8.s @@ -3410,7 +3410,7 @@ BoostSpeed: ; 0x02314810 ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} cmp r6, #0 bne _02314850 - ldr r1, _0231492C ; =ov10_022C4888 + ldr r1, _0231492C ; =SPEED_BOOST_TURN_RANGE mov r0, r8 mov r2, #0 bl CalcStatusDuration @@ -3478,7 +3478,7 @@ _02314920: bl UpdateStatusIconFlags ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_0231492C: .word ov10_022C4888 +_0231492C: .word SPEED_BOOST_TURN_RANGE _02314930: .word 0x00000DDB _02314934: .word 0x00000DDA _02314938: .word ov29_02353318 diff --git a/asm/overlay_29_0232145C.s b/asm/overlay_29_0232145C.s index 4943b904..a0d9f625 100644 --- a/asm/overlay_29_0232145C.s +++ b/asm/overlay_29_0232145C.s @@ -670,7 +670,7 @@ _02321DB8: ldr r1, _02322258 ; =0x00000EA3 mov r0, r6 bl LogMessageByIdWithPopupCheckUser - ldr r1, _0232225C ; =ov10_022C4724 + ldr r1, _0232225C ; =NIGHTMARE_TURN_RANGE mov r0, r5 mov r2, #1 bl CalcStatusDuration @@ -978,7 +978,7 @@ _0232224C: .word 0x00000E8D _02322250: .word 0x00000E8E _02322254: .word 0x00000E8F _02322258: .word 0x00000EA3 -_0232225C: .word ov10_022C4724 +_0232225C: .word NIGHTMARE_TURN_RANGE _02322260: .word 0x00000E91 _02322264: .word 0x00000E92 _02322268: .word 0x00000E93 @@ -1124,7 +1124,7 @@ _02322460: cmp r1, #0x77 bne _023224C4 bl GetNaturePowerVariant - ldr r1, _02322D28 ; =ov10_022C4E40 + ldr r1, _02322D28 ; =NATURE_POWER_TABLE mov r0, r0, lsl #3 ldrh r1, [r1, r0] add r0, sp, #0x30 @@ -1348,7 +1348,7 @@ _023227A8: bl ov29_02324514 str r0, [sp, #0x24] _023227B0: - ldr r0, _02322D50 ; =ov10_022C45B8 + ldr r0, _02322D50 ; =INTIMIDATOR_ACTIVATION_CHANCE mov r7, #0 ldrsh r0, [r0] str r0, [sp, #0x14] @@ -1724,7 +1724,7 @@ _02322D18: .word 0x0000014A _02322D1C: .word ov29_0237CA88 _02322D20: .word METRONOME_TABLE _02322D24: .word 0x00000EA4 -_02322D28: .word ov10_022C4E40 +_02322D28: .word NATURE_POWER_TABLE _02322D2C: .word 0x00000EA5 _02322D30: .word 0x00000EA6 _02322D34: .word 0x00000EA7 @@ -1734,7 +1734,7 @@ _02322D40: .word 0x00000E7A _02322D44: .word ov29_0237CA68 _02322D48: .word 0x00000163 _02322D4C: .word ov10_022C4584 -_02322D50: .word ov10_022C45B8 +_02322D50: .word INTIMIDATOR_ACTIVATION_CHANCE _02322D54: .word 0x000001ED _02322D58: .word ov29_0235370C _02322D5C: .word 0x00000EA9 @@ -2863,14 +2863,14 @@ _02323D00: bl HasHeldItem _02323D4C: cmp r0, #0 - ldrne r0, _02324014 ; =ov10_022C47A8 + ldrne r0, _02324014 ; =DETECT_BAND_MOVE_ACCURACY_DROP mov r1, #5 ldrne r0, [r0] subne r8, r8, r0 mov r0, r6 bl IqSkillIsEnabled cmp r0, #0 - ldrne r0, _02324018 ; =ov10_022C4808 + ldrne r0, _02324018 ; =QUICK_DODGER_MOVE_ACCURACY_DROP mov r1, #0x33 ldrne r0, [r0] ldrsh sb, [sb, #0x2c] @@ -3018,7 +3018,7 @@ _02323F44: cmp sb, #0x14 movgt sb, #0x14 _02323F94: - ldr r2, _02324028 ; =ov10_022C540C + ldr r2, _02324028 ; =MALE_ACCURACY_STAGE_MULTIPLIERS ldr r0, [sp, #4] mov r1, #0xa8 mla r1, r0, r1, r2 @@ -3030,7 +3030,7 @@ _02323F94: cmp r3, #0 movlt r3, #0 cmp r3, #0x6400 - ldr r2, _0232402C ; =ov10_022C5460 + ldr r2, _0232402C ; =MALE_EVASION_STAGE_MULTIPLIERS ldr r0, [sp] mov r1, #0xa8 mla r1, r0, r1, r2 @@ -3052,13 +3052,13 @@ _02324008: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02324010: .word 0x00000163 -_02324014: .word ov10_022C47A8 -_02324018: .word ov10_022C4808 +_02324014: .word DETECT_BAND_MOVE_ACCURACY_DROP +_02324018: .word QUICK_DODGER_MOVE_ACCURACY_DROP _0232401C: .word 0x0000010E _02324020: .word 0x000003E7 _02324024: .word ov29_02353710 -_02324028: .word ov10_022C540C -_0232402C: .word ov10_022C5460 +_02324028: .word MALE_ACCURACY_STAGE_MULTIPLIERS +_0232402C: .word MALE_EVASION_STAGE_MULTIPLIERS arm_func_end MoveHitCheck arm_func_start ov29_02324030 @@ -3464,7 +3464,7 @@ IsChargingTwoTurnMove: ; 0x023245A4 ldmeqia sp!, {r3, r4, r5, pc} ldr ip, [r5, #0xb4] mov lr, #0 - ldr r2, _02324618 ; =ov29_02352AAC + ldr r2, _02324618 ; =TWO_TURN_MOVES_AND_STATUSES b _02324608 _023245D0: mov r3, lr, lsl #2 @@ -3487,7 +3487,7 @@ _02324608: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02324618: .word ov29_02352AAC +_02324618: .word TWO_TURN_MOVES_AND_STATUSES arm_func_end IsChargingTwoTurnMove arm_func_start ov29_0232461C @@ -3716,7 +3716,7 @@ _023248D8: cmp r0, #0x77 bne _02324920 bl GetNaturePowerVariant - ldr r1, _02324930 ; =ov10_022C4E40 + ldr r1, _02324930 ; =NATURE_POWER_TABLE mov r0, r0, lsl #3 ldrh r0, [r1, r0] cmp r0, #0x76 @@ -3729,7 +3729,7 @@ _02324928: mov r0, #0 ldmia sp!, {r3, pc} .align 2, 0 -_02324930: .word ov10_022C4E40 +_02324930: .word NATURE_POWER_TABLE arm_func_end TwoTurnMoveForcedMiss arm_func_start DungeonRandOutcomeUserTargetInteraction diff --git a/asm/overlay_29_02325644.s b/asm/overlay_29_02325644.s index 5cfe87f9..14afbf01 100644 --- a/asm/overlay_29_02325644.s +++ b/asm/overlay_29_02325644.s @@ -580,7 +580,7 @@ DoMoveIronTail: ; 0x02325DE4 bl DealDamage cmp r0, #0 beq _02325E50 - ldr r1, _02325E5C ; =ov10_022C4440 + ldr r1, _02325E5C ; =IRON_TAIL_LOWER_DEFENSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -602,7 +602,7 @@ _02325E50: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02325E5C: .word ov10_022C4440 +_02325E5C: .word IRON_TAIL_LOWER_DEFENSE_CHANCE _02325E60: .word ATK_STAT_IDX arm_func_end DoMoveIronTail @@ -613,7 +613,7 @@ DoMoveDamageMultihitUntilMiss: ; 0x02325E64 ldr ip, _02325EB8 ; =ov29_0237CA70 str r3, [sp] ldr ip, [ip] - ldr r3, _02325EBC ; =ov29_02352AF0 + ldr r3, _02325EBC ; =ROLLOUT_DAMAGE_MULT_TABLE mov r4, #0 ldr r3, [r3, ip, lsl #2] bl DealDamage @@ -631,7 +631,7 @@ DoMoveDamageMultihitUntilMiss: ; 0x02325E64 ldmia sp!, {r3, r4, pc} .align 2, 0 _02325EB8: .word ov29_0237CA70 -_02325EBC: .word ov29_02352AF0 +_02325EBC: .word ROLLOUT_DAMAGE_MULT_TABLE _02325EC0: .word ov29_0237CA69 arm_func_end DoMoveDamageMultihitUntilMiss @@ -640,7 +640,7 @@ DoMoveYawn: ; 0x02325EC4 stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _02325EFC ; =ov10_022C4860 + ldr r1, _02325EFC ; =YAWN_TURN_RANGE mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -652,7 +652,7 @@ DoMoveYawn: ; 0x02325EC4 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02325EFC: .word ov10_022C4860 +_02325EFC: .word YAWN_TURN_RANGE arm_func_end DoMoveYawn arm_func_start DoMoveSleep @@ -680,7 +680,7 @@ DoMoveNightmare: ; 0x02325F3C stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _02325F70 ; =ov10_022C4724 + ldr r1, _02325F70 ; =NIGHTMARE_TURN_RANGE mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -691,7 +691,7 @@ DoMoveNightmare: ; 0x02325F3C mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02325F70: .word ov10_022C4724 +_02325F70: .word NIGHTMARE_TURN_RANGE arm_func_end DoMoveNightmare arm_func_start DoMoveMorningSun @@ -701,7 +701,7 @@ DoMoveMorningSun: ; 0x02325F74 mov r4, r1 bl GetApparentWeather mov ip, #1 - ldr r1, _02325FB0 ; =ov10_022C4984 + ldr r1, _02325FB0 ; =MORNING_SUN_HP_RESTORATION_TABLE mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -712,7 +712,7 @@ DoMoveMorningSun: ; 0x02325F74 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02325FB0: .word ov10_022C4984 +_02325FB0: .word MORNING_SUN_HP_RESTORATION_TABLE arm_func_end DoMoveMorningSun arm_func_start DoMoveVitalThrow @@ -752,7 +752,7 @@ _02326014: bl IsChargingTwoTurnMove cmp r0, #0 beq _02326050 - ldr r1, _02326080 ; =ov10_022C47E4 + ldr r1, _02326080 ; =DIG_DAMAGE_MULTIPLIER mov r0, r8 ldr r3, [r1] mov r1, r7 @@ -778,7 +778,7 @@ _02326074: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _0232607C: .word 0x00000EC4 -_02326080: .word ov10_022C47E4 +_02326080: .word DIG_DAMAGE_MULTIPLIER _02326084: .word 0x00000CD6 arm_func_end DoMoveDig @@ -890,7 +890,7 @@ DoMoveBubble: ; 0x023261A0 bl DealDamage cmp r0, #0 beq _023261FC - ldr r1, _02326208 ; =ov10_022C462C + ldr r1, _02326208 ; =BUBBLE_LOWER_SPEED_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -908,7 +908,7 @@ _023261FC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02326208: .word ov10_022C462C +_02326208: .word BUBBLE_LOWER_SPEED_CHANCE arm_func_end DoMoveBubble arm_func_start DoMoveEncore @@ -1205,7 +1205,7 @@ DoMoveSnore: ; 0x023265A4 bl DealDamage cmp r0, #0 beq _02326634 - ldr r1, _02326640 ; =ov10_022C4600 + ldr r1, _02326640 ; =SNORE_CRINGE_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1229,7 +1229,7 @@ _02326634: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326640: .word ov10_022C4600 +_02326640: .word SNORE_CRINGE_CHANCE _02326644: .word 0x00000ECD arm_func_end DoMoveSnore @@ -1260,7 +1260,7 @@ DoMoveDamageCringe30: ; 0x02326670 bl DealDamage cmp r0, #0 beq _023266CC - ldr r1, _023266D8 ; =ov10_022C444C + ldr r1, _023266D8 ; =ROCK_SLIDE_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1278,7 +1278,7 @@ _023266CC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023266D8: .word ov10_022C444C +_023266D8: .word ROCK_SLIDE_CRINGE_CHANCE arm_func_end DoMoveDamageCringe30 arm_func_start DoMoveWeatherBall @@ -1294,7 +1294,7 @@ DoMoveWeatherBall: ; 0x023266DC mov r0, r8 mov r1, r7 bl EndFrozenStatus - ldr ip, _02326748 ; =ov10_022C4B54 + ldr ip, _02326748 ; =WEATHER_BALL_DAMAGE_MULT_TABLE ldr r2, _0232674C ; =WEATHER_BALL_TYPE_TABLE ldr ip, [ip, r4, lsl #2] ldrb r2, [r2, r4] @@ -1311,7 +1311,7 @@ DoMoveWeatherBall: ; 0x023266DC add sp, sp, #8 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326748: .word ov10_022C4B54 +_02326748: .word WEATHER_BALL_DAMAGE_MULT_TABLE _0232674C: .word WEATHER_BALL_TYPE_TABLE arm_func_end DoMoveWeatherBall @@ -1439,7 +1439,7 @@ DoMoveSmokescreen: ; 0x023268CC stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _02326904 ; =ov10_022C47C4 + ldr r1, _02326904 ; =SMOKESCREEN_TURN_RANGE mov r0, r4 mov r2, #1 bl CalcStatusDuration @@ -1451,7 +1451,7 @@ DoMoveSmokescreen: ; 0x023268CC mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02326904: .word ov10_022C47C4 +_02326904: .word SMOKESCREEN_TURN_RANGE arm_func_end DoMoveSmokescreen arm_func_start DoMoveMirrorMove @@ -1509,7 +1509,7 @@ DoMoveAuroraBeam: ; 0x02326990 bl DealDamage cmp r0, #0 beq _023269F8 - ldr r1, _02326A04 ; =ov10_022C4428 + ldr r1, _02326A04 ; =AURORA_BEAM_LOWER_ATTACK_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1530,7 +1530,7 @@ _023269F8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02326A04: .word ov10_022C4428 +_02326A04: .word AURORA_BEAM_LOWER_ATTACK_CHANCE _02326A08: .word ATK_STAT_IDX arm_func_end DoMoveAuroraBeam @@ -1577,7 +1577,7 @@ DoMoveOctazooka: ; 0x02326A74 bl DealDamage cmp r0, #0 beq _02326AD4 - ldr r1, _02326AE0 ; =ov10_022C4500 + ldr r1, _02326AE0 ; =OCTAZOOKA_LOWER_ACCURACY_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1596,7 +1596,7 @@ _02326AD4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02326AE0: .word ov10_022C4500 +_02326AE0: .word OCTAZOOKA_LOWER_ACCURACY_CHANCE _02326AE4: .word ATK_STAT_IDX arm_func_end DoMoveOctazooka @@ -1768,7 +1768,7 @@ DoMoveDamageBurn10FlameWheel: ; 0x02326CC8 bl DealDamage cmp r0, #0 beq _02326D40 - ldr r1, _02326D4C ; =ov10_022C4688 + ldr r1, _02326D4C ; =FLAME_WHEEL_BURN_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1787,7 +1787,7 @@ _02326D40: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326D4C: .word ov10_022C4688 +_02326D4C: .word FLAME_WHEEL_BURN_CHANCE arm_func_end DoMoveDamageBurn10FlameWheel arm_func_start DoMoveDamageBurn10 @@ -1808,7 +1808,7 @@ DoMoveDamageBurn10: ; 0x02326D50 bl DealDamage cmp r0, #0 beq _02326DC8 - ldr r1, _02326DD4 ; =ov10_022C4544 + ldr r1, _02326DD4 ; =FLAMETHROWER_BURN_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -1827,7 +1827,7 @@ _02326DC8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02326DD4: .word ov10_022C4544 +_02326DD4: .word FLAMETHROWER_BURN_CHANCE arm_func_end DoMoveDamageBurn10 arm_func_start DoMoveExpose @@ -1925,7 +1925,7 @@ DoMoveRazorWind: ; 0x02326EB8 bl IsChargingTwoTurnMove cmp r0, #0 beq _02326F14 - ldr r1, _02326F40 ; =ov10_022C48B0 + ldr r1, _02326F40 ; =RAZOR_WIND_DAMAGE_MULTIPLIER mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -1953,7 +1953,7 @@ _02326F38: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02326F40: .word ov10_022C48B0 +_02326F40: .word RAZOR_WIND_DAMAGE_MULTIPLIER _02326F44: .word 0x00000CCD arm_func_end DoMoveRazorWind @@ -2038,7 +2038,7 @@ DoMoveCrunch: ; 0x02327034 bl DealDamage cmp r0, #0 beq _023270A0 - ldr r1, _023270AC ; =ov10_022C4450 + ldr r1, _023270AC ; =CRUNCH_LOWER_DEFENSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2060,7 +2060,7 @@ _023270A0: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023270AC: .word ov10_022C4450 +_023270AC: .word CRUNCH_LOWER_DEFENSE_CHANCE _023270B0: .word ATK_STAT_IDX arm_func_end DoMoveCrunch @@ -2076,7 +2076,7 @@ DoMoveDamageCringe20: ; 0x023270B4 bl DealDamage cmp r0, #0 beq _02327110 - ldr r1, _0232711C ; =ov10_022C4534 + ldr r1, _0232711C ; =BITE_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2094,7 +2094,7 @@ _02327110: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232711C: .word ov10_022C4534 +_0232711C: .word BITE_CRINGE_CHANCE arm_func_end DoMoveDamageCringe20 arm_func_start DoMoveDamageParalyze20 @@ -2109,7 +2109,7 @@ DoMoveDamageParalyze20: ; 0x02327120 bl DealDamage cmp r0, #0 beq _0232717C - ldr r1, _02327188 ; =ov10_022C4658 + ldr r1, _02327188 ; =THUNDER_PARALYZE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2127,7 +2127,7 @@ _0232717C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327188: .word ov10_022C4658 +_02327188: .word THUNDER_PARALYZE_CHANCE arm_func_end DoMoveDamageParalyze20 arm_func_start DoMoveEndeavor @@ -2189,7 +2189,7 @@ DoMoveFacade: ; 0x0232724C mov lr, #0x100 ldrb ip, [ip, #0xbf] cmp ip, #0 - ldrne ip, _02327288 ; =ov10_022C4718 + ldrne ip, _02327288 ; =FACADE_DAMAGE_MULTIPLIER str r3, [sp] ldrne lr, [ip] mov r3, lr @@ -2200,7 +2200,7 @@ DoMoveFacade: ; 0x0232724C and r0, r0, #0xff ldmia sp!, {r3, pc} .align 2, 0 -_02327288: .word ov10_022C4718 +_02327288: .word FACADE_DAMAGE_MULTIPLIER arm_func_end DoMoveFacade arm_func_start DoMoveDamageLowerSpeed20 @@ -2215,7 +2215,7 @@ DoMoveDamageLowerSpeed20: ; 0x0232728C bl DealDamage cmp r0, #0 beq _023272E8 - ldr r1, _023272F4 ; =ov10_022C4514 + ldr r1, _023272F4 ; =CONSTRICT_LOWER_SPEED_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2233,7 +2233,7 @@ _023272E8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023272F4: .word ov10_022C4514 +_023272F4: .word CONSTRICT_LOWER_SPEED_CHANCE arm_func_end DoMoveDamageLowerSpeed20 arm_func_start DoMoveBrickBreak @@ -2311,7 +2311,7 @@ DoMoveFocusPunch: ; 0x023273CC bl IsChargingTwoTurnMove cmp r0, #0 beq _02327428 - ldr r1, _02327454 ; =ov10_022C48B4 + ldr r1, _02327454 ; =FOCUS_PUNCH_DAMAGE_MULTIPLIER mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -2339,7 +2339,7 @@ _0232744C: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02327454: .word ov10_022C48B4 +_02327454: .word FOCUS_PUNCH_DAMAGE_MULTIPLIER arm_func_end DoMoveFocusPunch arm_func_start DoMoveDamageDrain @@ -2468,7 +2468,7 @@ DoMoveReversal: ; 0x02327598 movle r5, #2 movgt r5, #3 _0232761C: - ldr r4, _02327648 ; =ov10_022C4994 + ldr r4, _02327648 ; =REVERSAL_DAMAGE_MULT_TABLE str r3, [sp] ldr r3, [r4, r5, lsl #2] bl DealDamage @@ -2480,7 +2480,7 @@ _0232761C: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02327644: .word 0x000003E7 -_02327648: .word ov10_022C4994 +_02327648: .word REVERSAL_DAMAGE_MULT_TABLE arm_func_end DoMoveReversal arm_func_start DoMoveSmellingSalt @@ -2638,7 +2638,7 @@ DoMoveDamageBoostAllStats: ; 0x02327804 bl DealDamage cmp r0, #0 beq _023278D4 - ldr r1, _023278E0 ; =ov10_022C4488 + ldr r1, _023278E0 ; =SILVER_WIND_BOOST_CHANCE mov r0, r6 ldrsh r1, [r1] mov r4, #1 @@ -2686,7 +2686,7 @@ _023278D4: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023278E0: .word ov10_022C4488 +_023278E0: .word SILVER_WIND_BOOST_CHANCE _023278E4: .word SPATK_STAT_IDX arm_func_end DoMoveDamageBoostAllStats @@ -2697,7 +2697,7 @@ DoMoveSynthesis: ; 0x023278E8 mov r4, r1 bl GetApparentWeather mov ip, #1 - ldr r1, _02327924 ; =ov10_022C4954 + ldr r1, _02327924 ; =SYNTHESIS_HP_RESTORATION_TABLE mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -2708,7 +2708,7 @@ DoMoveSynthesis: ; 0x023278E8 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02327924: .word ov10_022C4954 +_02327924: .word SYNTHESIS_HP_RESTORATION_TABLE arm_func_end DoMoveSynthesis arm_func_start DoMoveBoostSpeed1 @@ -2759,7 +2759,7 @@ DoMoveSureShot: ; 0x023279AC stmdb sp!, {r3, r4, r5, lr} mov r4, r1 mov r5, r0 - ldr r1, _023279E0 ; =ov10_022C4798 + ldr r1, _023279E0 ; =SURE_SHOT_TURN_RANGE mov r0, r4 mov r2, #0 bl CalcStatusDuration @@ -2770,7 +2770,7 @@ DoMoveSureShot: ; 0x023279AC mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023279E0: .word ov10_022C4798 +_023279E0: .word SURE_SHOT_TURN_RANGE arm_func_end DoMoveSureShot arm_func_start DoMoveCosmicPower @@ -2817,7 +2817,7 @@ DoMoveSkyAttack: ; 0x02327A28 bl DealDamage cmp r0, #0 beq _02327AAC - ldr r1, _02327AEC ; =ov10_022C4538 + ldr r1, _02327AEC ; =SKY_ATTACK_CRINGE_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -2850,7 +2850,7 @@ _02327ADC: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _02327AE8: .word ov10_022C48A8 -_02327AEC: .word ov10_022C4538 +_02327AEC: .word SKY_ATTACK_CRINGE_CHANCE _02327AF0: .word 0x00000CD1 arm_func_end DoMoveSkyAttack @@ -2866,7 +2866,7 @@ DoMoveDamageFreeze15: ; 0x02327AF4 bl DealDamage cmp r0, #0 beq _02327B4C - ldr r1, _02327B58 ; =ov10_022C4634 + ldr r1, _02327B58 ; =POWDER_SNOW_FREEZE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2883,7 +2883,7 @@ _02327B4C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327B58: .word ov10_022C4634 +_02327B58: .word POWDER_SNOW_FREEZE_CHANCE arm_func_end DoMoveDamageFreeze15 arm_func_start DoMoveMeteorMash @@ -2897,7 +2897,7 @@ DoMoveMeteorMash: ; 0x02327B5C bl DealDamage cmp r0, #0 beq _02327BCC - ldr r1, _02327BD8 ; =ov10_022C4604 + ldr r1, _02327BD8 ; =METEOR_MASH_BOOST_ATTACK_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r6 @@ -2921,7 +2921,7 @@ _02327BCC: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327BD8: .word ov10_022C4604 +_02327BD8: .word METEOR_MASH_BOOST_ATTACK_CHANCE _02327BDC: .word ATK_STAT_IDX arm_func_end DoMoveMeteorMash @@ -2955,7 +2955,7 @@ DoMoveDamageConfuse10: ; 0x02327C08 bl DealDamage cmp r0, #0 beq _02327C64 - ldr r1, _02327C70 ; =ov10_022C4690 + ldr r1, _02327C70 ; =PSYBEAM_CONFUSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2973,7 +2973,7 @@ _02327C64: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02327C70: .word ov10_022C4690 +_02327C70: .word PSYBEAM_CONFUSE_CHANCE arm_func_end DoMoveDamageConfuse10 arm_func_start DoMovePsywave @@ -3122,7 +3122,7 @@ DoMoveWaterSpout: ; 0x02327DE0 movle r5, #2 movgt r5, #3 _02327E64: - ldr r4, _02327E90 ; =ov10_022C49A4 + ldr r4, _02327E90 ; =WATER_SPOUT_DAMAGE_MULT_TABLE str r3, [sp] ldr r3, [r4, r5, lsl #2] bl DealDamage @@ -3134,7 +3134,7 @@ _02327E64: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02327E8C: .word 0x000003E7 -_02327E90: .word ov10_022C49A4 +_02327E90: .word WATER_SPOUT_DAMAGE_MULT_TABLE arm_func_end DoMoveWaterSpout arm_func_start DoMovePsychUp diff --git a/asm/overlay_29_02328030.s b/asm/overlay_29_02328030.s index 3dbbfa5b..488200f2 100644 --- a/asm/overlay_29_02328030.s +++ b/asm/overlay_29_02328030.s @@ -83,7 +83,7 @@ DoMoveNaturePower: ; 0x02328110 mov r5, r3 bl GetNaturePowerVariant mov r4, r0 - ldr r0, _02328164 ; =ov10_022C4E40 + ldr r0, _02328164 ; =NATURE_POWER_TABLE mov r1, r4, lsl #3 ldrh r1, [r0, r1] add r0, sp, #0 @@ -98,7 +98,7 @@ DoMoveNaturePower: ; 0x02328110 add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02328164: .word ov10_022C4E40 +_02328164: .word NATURE_POWER_TABLE _02328168: .word ov10_022C4E44 arm_func_end DoMoveNaturePower @@ -114,7 +114,7 @@ DoMoveDamageParalyze10: ; 0x0232816C bl DealDamage cmp r0, #0 beq _023281C8 - ldr r1, _023281D4 ; =ov10_022C4528 + ldr r1, _023281D4 ; =LICK_PARALYZE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -132,7 +132,7 @@ _023281C8: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_023281D4: .word ov10_022C4528 +_023281D4: .word LICK_PARALYZE_CHANCE arm_func_end DoMoveDamageParalyze10 arm_func_start DoMoveSelfdestruct @@ -183,7 +183,7 @@ DoMoveShadowBall: ; 0x02328248 bl DealDamage cmp r0, #0 beq _023282B4 - ldr r1, _023282C0 ; =ov10_022C461C + ldr r1, _023282C0 ; =SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -205,7 +205,7 @@ _023282B4: add sp, sp, #8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023282C0: .word ov10_022C461C +_023282C0: .word SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE _023282C4: .word SPATK_STAT_IDX arm_func_end DoMoveShadowBall @@ -250,7 +250,7 @@ DoMoveThunderbolt: ; 0x02328328 bl DealDamage cmp r0, #0 beq _02328384 - ldr r1, _02328390 ; =ov10_022C465C + ldr r1, _02328390 ; =THUNDERBOLT_PARALYZE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -268,7 +268,7 @@ _02328384: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328390: .word ov10_022C465C +_02328390: .word THUNDERBOLT_PARALYZE_CHANCE arm_func_end DoMoveThunderbolt arm_func_start DoMoveMist @@ -369,7 +369,7 @@ DoMoveDamageCringe10: ; 0x023284BC bl DealDamage cmp r0, #0 beq _02328518 - ldr r1, _02328524 ; =ov10_022C4448 + ldr r1, _02328524 ; =EXTRASENSORY_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -387,7 +387,7 @@ _02328518: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328524: .word ov10_022C4448 +_02328524: .word EXTRASENSORY_CRINGE_CHANCE arm_func_end DoMoveDamageCringe10 arm_func_start DoMoveSafeguard @@ -671,7 +671,7 @@ DoMoveHeadbutt: ; 0x023288C4 bl DealDamage cmp r0, #0 beq _02328920 - ldr r1, _0232892C ; =ov10_022C4498 + ldr r1, _0232892C ; =HEADBUTT_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -689,7 +689,7 @@ _02328920: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232892C: .word ov10_022C4498 +_0232892C: .word HEADBUTT_CRINGE_CHANCE arm_func_end DoMoveHeadbutt arm_func_start DoMoveDoubleEdge @@ -802,7 +802,7 @@ DoMoveDamagePoison40: ; 0x02328A74 bl DealDamage cmp r0, #0 beq _02328AD0 - ldr r1, _02328ADC ; =ov10_022C451C + ldr r1, _02328ADC ; =SMOG_POISON_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -820,7 +820,7 @@ _02328AD0: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328ADC: .word ov10_022C451C +_02328ADC: .word SMOG_POISON_CHANCE arm_func_end DoMoveDamagePoison40 arm_func_start DoMoveGrowth @@ -854,7 +854,7 @@ DoMoveSacredFire: ; 0x02328B00 bl DealDamage cmp r0, #0 beq _02328B78 - ldr r1, _02328B84 ; =ov10_022C44A0 + ldr r1, _02328B84 ; =SACRED_FIRE_BURN_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -873,7 +873,7 @@ _02328B78: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02328B84: .word ov10_022C44A0 +_02328B84: .word SACRED_FIRE_BURN_CHANCE arm_func_end DoMoveSacredFire arm_func_start DoMoveOhko @@ -961,7 +961,7 @@ DoMoveSolarBeam: ; 0x02328C74 _02328CAC: cmp r0, #0 beq _02328D0C - ldr r0, _02328D3C ; =ov10_022C48A4 + ldr r0, _02328D3C ; =SOLARBEAM_DAMAGE_MULTIPLIER cmp r8, #2 ldr r3, [r0] beq _02328CD4 @@ -1000,7 +1000,7 @@ _02328D30: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02328D3C: .word ov10_022C48A4 +_02328D3C: .word SOLARBEAM_DAMAGE_MULTIPLIER _02328D40: .word 0x00000CD2 arm_func_end DoMoveSolarBeam @@ -1032,7 +1032,7 @@ DoMoveSonicBoom: ; 0x02328D44 mov r3, #1 str r3, [sp, #0x14] str r2, [sp, #0x18] - ldr r2, _02328DE0 ; =ov10_022C4568 + ldr r2, _02328DE0 ; =SONICBOOM_FIXED_DAMAGE mov r1, r8 ldrsh r2, [r2] mov r0, r4 @@ -1046,7 +1046,7 @@ DoMoveSonicBoom: ; 0x02328D44 add sp, sp, #0x20 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 -_02328DE0: .word ov10_022C4568 +_02328DE0: .word SONICBOOM_FIXED_DAMAGE arm_func_end DoMoveSonicBoom arm_func_start DoMoveFly @@ -1060,7 +1060,7 @@ DoMoveFly: ; 0x02328DE4 bl IsChargingTwoTurnMove cmp r0, #0 beq _02328E40 - ldr r1, _02328E6C ; =ov10_022C48C0 + ldr r1, _02328E6C ; =FLY_DAMAGE_MULTIPLIER mov r0, r7 ldr r3, [r1] mov r1, r6 @@ -1088,7 +1088,7 @@ _02328E64: mov r0, r4 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02328E6C: .word ov10_022C48C0 +_02328E6C: .word FLY_DAMAGE_MULTIPLIER _02328E70: .word 0x00000CD3 arm_func_end DoMoveFly @@ -1142,7 +1142,7 @@ _02328F0C: bl IsChargingTwoTurnMove cmp r0, #0 beq _02328F58 - ldr r1, _02328F8C ; =ov10_022C47E8 + ldr r1, _02328F8C ; =DIVE_DAMAGE_MULTIPLIER mov r0, r8 ldr r3, [r1] mov r1, r7 @@ -1172,7 +1172,7 @@ _02328F7C: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 _02328F88: .word 0x00000ED8 -_02328F8C: .word ov10_022C47E8 +_02328F8C: .word DIVE_DAMAGE_MULTIPLIER _02328F90: .word 0x00000CD5 arm_func_end DoMoveDive @@ -1188,7 +1188,7 @@ DoMoveWaterfall: ; 0x02328F94 bl DealDamage cmp r0, #0 beq _02328FF0 - ldr r1, _02328FFC ; =ov10_022C4424 + ldr r1, _02328FFC ; =WATERFALL_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1206,7 +1206,7 @@ _02328FF0: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02328FFC: .word ov10_022C4424 +_02328FFC: .word WATERFALL_CRINGE_CHANCE arm_func_end DoMoveWaterfall arm_func_start DoMoveDamageLowerAccuracy40 @@ -1221,7 +1221,7 @@ DoMoveDamageLowerAccuracy40: ; 0x02329000 bl DealDamage cmp r0, #0 beq _02329060 - ldr r1, _0232906C ; =ov10_022C4484 + ldr r1, _0232906C ; =MUDDY_WATER_LOWER_ACCURACY_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1240,7 +1240,7 @@ _02329060: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232906C: .word ov10_022C4484 +_0232906C: .word MUDDY_WATER_LOWER_ACCURACY_CHANCE _02329070: .word ATK_STAT_IDX arm_func_end DoMoveDamageLowerAccuracy40 @@ -1293,7 +1293,7 @@ DoMoveTwister: ; 0x023290CC bl DealDamage cmp r0, #0 beq _0232914C - ldr r1, _02329158 ; =ov10_022C4668 + ldr r1, _02329158 ; =TWISTER_CRINGE_CHANCE mov r0, r5 ldrsh r2, [r1] mov r1, r4 @@ -1311,7 +1311,7 @@ _0232914C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329158: .word ov10_022C4668 +_02329158: .word TWISTER_CRINGE_CHANCE arm_func_end DoMoveTwister arm_func_start DoMoveTwineedle @@ -1336,7 +1336,7 @@ DoMoveTwineedle: ; 0x0232915C ldr r0, [r0] cmp r0, #2 bne _023291DC - ldr r1, _023291F0 ; =ov10_022C4444 + ldr r1, _023291F0 ; =TWINEEDLE_POISON_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1355,7 +1355,7 @@ _023291DC: .align 2, 0 _023291E8: .word ov29_0237CA6B _023291EC: .word ov29_0237CA78 -_023291F0: .word ov10_022C4444 +_023291F0: .word TWINEEDLE_POISON_CHANCE arm_func_end DoMoveTwineedle arm_func_start DoMoveRecoverHpTeam @@ -1518,7 +1518,7 @@ DoMoveMoonlight: ; 0x023293F8 mov r4, r1 bl GetApparentWeather mov ip, #1 - ldr r1, _02329434 ; =ov10_022C4974 + ldr r1, _02329434 ; =MOONLIGHT_HP_RESTORATION_TABLE mov r0, r0, lsl #1 ldrsh r2, [r1, r0] mov r0, r5 @@ -1529,7 +1529,7 @@ DoMoveMoonlight: ; 0x023293F8 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02329434: .word ov10_022C4974 +_02329434: .word MOONLIGHT_HP_RESTORATION_TABLE arm_func_end DoMoveMoonlight arm_func_start DoMoveHornDrill @@ -1768,7 +1768,7 @@ DoMoveThundershock: ; 0x02329710 bl DealDamage cmp r0, #0 beq _0232976C - ldr r1, _02329778 ; =ov10_022C4490 + ldr r1, _02329778 ; =THUNDERSHOCK_PARALYZE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1786,7 +1786,7 @@ _0232976C: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329778: .word ov10_022C4490 +_02329778: .word THUNDERSHOCK_PARALYZE_CHANCE arm_func_end DoMoveThundershock arm_func_start DoMoveThunderWave @@ -1894,7 +1894,7 @@ DoMovePoisonFang: ; 0x02329898 bl DealDamage cmp r0, #0 beq _023298F4 - ldr r1, _02329900 ; =ov10_022C4644 + ldr r1, _02329900 ; =POISON_FANG_POISON_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1912,7 +1912,7 @@ _023298F4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329900: .word ov10_022C4644 +_02329900: .word POISON_FANG_POISON_CHANCE arm_func_end DoMovePoisonFang arm_func_start DoMoveDamagePoison18 @@ -1927,7 +1927,7 @@ DoMoveDamagePoison18: ; 0x02329904 bl DealDamage cmp r0, #0 beq _02329960 - ldr r1, _0232996C ; =ov10_022C463C + ldr r1, _0232996C ; =POISON_STING_POISON_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -1945,7 +1945,7 @@ _02329960: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232996C: .word ov10_022C463C +_0232996C: .word POISON_STING_POISON_CHANCE arm_func_end DoMoveDamagePoison18 arm_func_start DoMoveJumpKick @@ -2043,7 +2043,7 @@ DoMoveBounce: ; 0x02329A9C bl IsChargingTwoTurnMove cmp r0, #0 beq _02329B2C - ldr r1, _02329B5C ; =ov10_022C47EC + ldr r1, _02329B5C ; =BOUNCE_DAMAGE_MULTIPLIER mov r0, r8 ldr r3, [r1] mov r1, r7 @@ -2052,7 +2052,7 @@ DoMoveBounce: ; 0x02329A9C bl DealDamage cmp r0, #0 beq _02329B20 - ldr r1, _02329B60 ; =ov10_022C4494 + ldr r1, _02329B60 ; =BOUNCE_PARALYZE_CHANCE mov r0, r8 ldrsh r2, [r1] mov r1, r7 @@ -2084,8 +2084,8 @@ _02329B50: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} .align 2, 0 -_02329B5C: .word ov10_022C47EC -_02329B60: .word ov10_022C4494 +_02329B5C: .word BOUNCE_DAMAGE_MULTIPLIER +_02329B60: .word BOUNCE_PARALYZE_CHANCE _02329B64: .word 0x00000CD4 arm_func_end DoMoveBounce @@ -2183,7 +2183,7 @@ DoMoveTriAttack: ; 0x02329C94 bl DealDamage cmp r0, #0 beq _02329D40 - ldr r1, _02329D4C ; =ov10_022C4694 + ldr r1, _02329D4C ; =TRI_ATTACK_STATUS_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2224,7 +2224,7 @@ _02329D40: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02329D4C: .word ov10_022C4694 +_02329D4C: .word TRI_ATTACK_STATUS_CHANCE arm_func_end DoMoveTriAttack arm_func_start DoMoveSwapItems @@ -2665,7 +2665,7 @@ DoMoveFakeOut: ; 0x0232A2BC bl DealDamage cmp r0, #0 beq _0232A318 - ldr r1, _0232A324 ; =ov10_022C4670 + ldr r1, _0232A324 ; =FAKE_OUT_CRINGE_CHANCE mov r0, r6 ldrsh r2, [r1] mov r1, r5 @@ -2683,7 +2683,7 @@ _0232A318: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_0232A324: .word ov10_022C4670 +_0232A324: .word FAKE_OUT_CRINGE_CHANCE arm_func_end DoMoveFakeOut arm_func_start DoMoveSleepTalk diff --git a/asm/overlay_29_023350FC.s b/asm/overlay_29_023350FC.s index de0149fa..46b95571 100644 --- a/asm/overlay_29_023350FC.s +++ b/asm/overlay_29_023350FC.s @@ -248,7 +248,7 @@ ActivateSportCondition: ; 0x0233544C cmp r0, #0 mov r0, #0 bne _02335488 - ldr r1, _023354B4 ; =ov10_022C478C + ldr r1, _023354B4 ; =SPORT_CONDITION_TURN_RANGE mov r2, r0 bl CalcStatusDuration ldr r1, _023354B8 ; =ov29_02353538 @@ -260,7 +260,7 @@ ActivateSportCondition: ; 0x0233544C bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, pc} _02335488: - ldr r1, _023354B4 ; =ov10_022C478C + ldr r1, _023354B4 ; =SPORT_CONDITION_TURN_RANGE mov r2, r0 bl CalcStatusDuration ldr r1, _023354B8 ; =ov29_02353538 @@ -272,7 +272,7 @@ _02335488: bl LogMessageByIdWithPopupCheckUser ldmia sp!, {r3, pc} .align 2, 0 -_023354B4: .word ov10_022C478C +_023354B4: .word SPORT_CONDITION_TURN_RANGE _023354B8: .word ov29_02353538 _023354BC: .word 0x00000CDA _023354C0: .word 0x00000CDB diff --git a/asm/overlay_29_023456BC.s b/asm/overlay_29_023456BC.s index 1d024e50..27eb6afd 100644 --- a/asm/overlay_29_023456BC.s +++ b/asm/overlay_29_023456BC.s @@ -690,7 +690,7 @@ TryGenerateUnownStoneDrop: ; 0x02346060 cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - ldr r0, _023460D8 ; =ov10_022C4474 + ldr r0, _023460D8 ; =UNOWN_STONE_DROP_CHANCE ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -709,7 +709,7 @@ TryGenerateUnownStoneDrop: ; 0x02346060 mov r0, #1 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023460D8: .word ov10_022C4474 +_023460D8: .word UNOWN_STONE_DROP_CHANCE arm_func_end TryGenerateUnownStoneDrop arm_func_start ov29_023460DC diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index 3ec3172c..0b6d9f93 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -3560,8 +3560,8 @@ ov29_02352A6C: ov29_02352A8C: .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .global ov29_02352AAC -ov29_02352AAC: + .global TWO_TURN_MOVES_AND_STATUSES +TWO_TURN_MOVES_AND_STATUSES: .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 @@ -3575,8 +3575,8 @@ SPATK_STAT_IDX: .global ATK_STAT_IDX ATK_STAT_IDX: .byte 0x00, 0x00, 0x00, 0x00 - .global ov29_02352AF0 -ov29_02352AF0: + .global ROLLOUT_DAMAGE_MULT_TABLE +ROLLOUT_DAMAGE_MULT_TABLE: .byte 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 diff --git a/asm/overlay_30.s b/asm/overlay_30.s index 852e9991..fc737a6b 100644 --- a/asm/overlay_30.s +++ b/asm/overlay_30.s @@ -352,7 +352,7 @@ WriteQuicksaveData: ; 0x02382C6C mov r2, #4 str r3, [sp] bl ov30_02385C54 - ldr r1, _02382D6C ; =ov30_02386080 + ldr r1, _02382D6C ; =OVERLAY30_JP_STRING_1 add r0, sp, #4 bl ov30_02385CE0 ldr r1, _02382D70 ; =ov29_02353538 @@ -362,7 +362,7 @@ WriteQuicksaveData: ; 0x02382C6C add r1, r1, #0x348 add r1, r1, #0x400 bl ov30_02385C54 - ldr r1, _02382D6C ; =ov30_02386080 + ldr r1, _02382D6C ; =OVERLAY30_JP_STRING_1 add r0, sp, #4 bl ov30_02385CE0 ldr r2, _02382D70 ; =ov29_02353538 @@ -398,7 +398,7 @@ _02382CF8: bl ov30_02382FB8 add r0, sp, #4 bl ov30_02383084 - ldr r1, _02382D7C ; =ov30_0238608C + ldr r1, _02382D7C ; =OVERLAY30_JP_STRING_2 add r0, sp, #4 bl ov30_02385CE0 add r0, sp, #4 @@ -406,11 +406,11 @@ _02382CF8: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02382D6C: .word ov30_02386080 +_02382D6C: .word OVERLAY30_JP_STRING_1 _02382D70: .word ov29_02353538 _02382D74: .word 0x0002C9E6 _02382D78: .word 0x0002C9EA -_02382D7C: .word ov30_0238608C +_02382D7C: .word OVERLAY30_JP_STRING_2 arm_func_end WriteQuicksaveData arm_func_start ov31_02382D80 @@ -426,7 +426,7 @@ _02382D98: add r2, r2, #1 cmp r2, #5 blt _02382D98 - ldr r1, _02382E8C ; =ov30_02386080 + ldr r1, _02382E8C ; =OVERLAY30_JP_STRING_1 mov r0, sl bl ov30_02385CE0 mov sb, #0 @@ -495,7 +495,7 @@ _02382E78: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02382E8C: .word ov30_02386080 +_02382E8C: .word OVERLAY30_JP_STRING_1 _02382E90: .word ov29_02353538 arm_func_end ov30_02382E18 @@ -512,7 +512,7 @@ _02382EAC: add r2, r2, #1 cmp r2, #7 blt _02382EAC - ldr r1, _02382FB0 ; =ov30_02386080 + ldr r1, _02382FB0 ; =OVERLAY30_JP_STRING_1 mov r0, sl bl ov30_02385CE0 mov sb, #0 @@ -577,7 +577,7 @@ _02382F9C: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02382FB0: .word ov30_02386080 +_02382FB0: .word OVERLAY30_JP_STRING_1 _02382FB4: .word ov29_02353538 arm_func_end ov30_02382E94 @@ -585,7 +585,7 @@ _02382FB4: .word ov29_02353538 ov30_02382FB8: ; 0x02382FB8 stmdb sp!, {r3, r4, r5, lr} ldr r2, _0238307C ; =ov29_02353538 - ldr r1, _02383080 ; =ov30_02386080 + ldr r1, _02383080 ; =OVERLAY30_JP_STRING_1 ldr r2, [r2] mov r5, r0 add r2, r2, #0x2c @@ -635,13 +635,13 @@ _02383034: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0238307C: .word ov29_02353538 -_02383080: .word ov30_02386080 +_02383080: .word OVERLAY30_JP_STRING_1 arm_func_end ov30_02382FB8 arm_func_start ov30_02383084 ov30_02383084: ; 0x02383084 stmdb sp!, {r4, r5, r6, lr} - ldr r1, _023831E0 ; =ov30_02386080 + ldr r1, _023831E0 ; =OVERLAY30_JP_STRING_1 mov r4, r0 bl ov30_02385CE0 ldr r1, _023831E4 ; =ov29_02353538 @@ -730,7 +730,7 @@ _023831B8: blt _023831B8 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023831E0: .word ov30_02386080 +_023831E0: .word OVERLAY30_JP_STRING_1 _023831E4: .word ov29_02353538 arm_func_end ov30_02383084 @@ -1437,7 +1437,7 @@ _02383C4C: arm_func_start ov30_02383C70 ov30_02383C70: ; 0x02383C70 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r1, _02384090 ; =ov30_02386080 + ldr r1, _02384090 ; =OVERLAY30_JP_STRING_1 mov sl, r0 bl ov30_02385CE0 ldr r1, _02384094 ; =ov29_02353538 @@ -1708,7 +1708,7 @@ _02383FE8: bl ov30_02385D34 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02384090: .word ov30_02386080 +_02384090: .word OVERLAY30_JP_STRING_1 _02384094: .word ov29_02353538 _02384098: .word 0x00012AFE arm_func_end ov30_02383C70 @@ -1716,7 +1716,7 @@ _02384098: .word 0x00012AFE arm_func_start ov30_0238409C ov30_0238409C: ; 0x0238409C stmdb sp!, {r4, lr} - ldr r1, _02384200 ; =ov30_02386080 + ldr r1, _02384200 ; =OVERLAY30_JP_STRING_1 mov r4, r0 bl ov30_02385CE0 ldr r1, _02384204 ; =ov29_02353538 @@ -1805,7 +1805,7 @@ ov30_0238409C: ; 0x0238409C bl ov30_02385DD4 ldmia sp!, {r4, pc} .align 2, 0 -_02384200: .word ov30_02386080 +_02384200: .word OVERLAY30_JP_STRING_1 _02384204: .word ov29_02353538 arm_func_end ov30_0238409C @@ -1894,7 +1894,7 @@ ov30_023842F4: ; 0x023842F4 add r1, sp, #0 mov r2, #4 bl ov30_02385CA4 - ldr r1, _023843F0 ; =ov30_02386080 + ldr r1, _023843F0 ; =OVERLAY30_JP_STRING_1 add r0, sp, #4 bl ov30_02385CF0 ldr r1, _023843F4 ; =ov29_02353538 @@ -1904,7 +1904,7 @@ ov30_023842F4: ; 0x023842F4 add r1, r1, #0x348 add r1, r1, #0x400 bl ov30_02385CA4 - ldr r1, _023843F0 ; =ov30_02386080 + ldr r1, _023843F0 ; =OVERLAY30_JP_STRING_1 add r0, sp, #4 bl ov30_02385CF0 add r0, sp, #4 @@ -1939,7 +1939,7 @@ _02384378: bl ov30_02384C6C add r0, sp, #4 bl ov30_02384CD4 - ldr r1, _023843FC ; =ov30_0238608C + ldr r1, _023843FC ; =OVERLAY30_JP_STRING_2 add r0, sp, #4 bl ov30_02385CF0 add r0, sp, #4 @@ -1948,16 +1948,16 @@ _02384378: add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, r6, r7, pc} .align 2, 0 -_023843F0: .word ov30_02386080 +_023843F0: .word OVERLAY30_JP_STRING_1 _023843F4: .word ov29_02353538 _023843F8: .word 0x0002C9E6 -_023843FC: .word ov30_0238608C +_023843FC: .word OVERLAY30_JP_STRING_2 arm_func_end ov30_023842F4 arm_func_start ov30_02384400 ov30_02384400: ; 0x02384400 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r1, _02384830 ; =ov30_02386080 + ldr r1, _02384830 ; =OVERLAY30_JP_STRING_1 mov sl, r0 bl ov30_02385CF0 mov r0, sl @@ -2232,7 +2232,7 @@ _0238477C: strh r0, [r2, r1] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02384830: .word ov30_02386080 +_02384830: .word OVERLAY30_JP_STRING_1 _02384834: .word ov29_02353538 _02384838: .word 0x00012AFE arm_func_end ov30_02384400 @@ -2269,7 +2269,7 @@ ov30_0238483C: ; 0x0238483C arm_func_start ov30_023848A0 ov30_023848A0: ; 0x023848A0 stmdb sp!, {r4, lr} - ldr r1, _02384A18 ; =ov30_02386080 + ldr r1, _02384A18 ; =OVERLAY30_JP_STRING_1 mov r4, r0 bl ov30_02385CF0 ldr r1, _02384A1C ; =ov29_02353538 @@ -2363,7 +2363,7 @@ ov30_023848A0: ; 0x023848A0 strb r0, [r1, #0x248] ldmia sp!, {r4, pc} .align 2, 0 -_02384A18: .word ov30_02386080 +_02384A18: .word OVERLAY30_JP_STRING_1 _02384A1C: .word ov29_02353538 arm_func_end ov30_023848A0 @@ -2407,7 +2407,7 @@ ov30_02384A94: ; 0x02384A94 sub sp, sp, #0xc mov r7, r0 bl ov29_02344B1C - ldr r1, _02384B20 ; =ov30_02386080 + ldr r1, _02384B20 ; =OVERLAY30_JP_STRING_1 mov r0, r7 bl ov30_02385CF0 mov r6, #0 @@ -2441,7 +2441,7 @@ _02384B08: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc} .align 2, 0 -_02384B20: .word ov30_02386080 +_02384B20: .word OVERLAY30_JP_STRING_1 arm_func_end ov30_02384A94 arm_func_start ov30_02384B24 @@ -2476,7 +2476,7 @@ ov30_02384B24: ; 0x02384B24 ov30_02384B84: ; 0x02384B84 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #8 - ldr r1, _02384C68 ; =ov30_02386080 + ldr r1, _02384C68 ; =OVERLAY30_JP_STRING_1 mov sl, r0 bl ov30_02385CF0 mov sb, #0 @@ -2534,14 +2534,14 @@ _02384C54: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02384C68: .word ov30_02386080 +_02384C68: .word OVERLAY30_JP_STRING_1 arm_func_end ov30_02384B84 arm_func_start ov30_02384C6C ov30_02384C6C: ; 0x02384C6C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 - ldr r1, _02384CCC ; =ov30_02386080 + ldr r1, _02384CCC ; =OVERLAY30_JP_STRING_1 mov r6, r0 bl ov30_02385CF0 mov r0, r6 @@ -2565,14 +2565,14 @@ _02384CC4: add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 -_02384CCC: .word ov30_02386080 +_02384CCC: .word OVERLAY30_JP_STRING_1 _02384CD0: .word ov29_02353538 arm_func_end ov30_02384C6C arm_func_start ov30_02384CD4 ov30_02384CD4: ; 0x02384CD4 stmdb sp!, {r4, r5, r6, lr} - ldr r1, _02384E20 ; =ov30_02386080 + ldr r1, _02384E20 ; =OVERLAY30_JP_STRING_1 mov r4, r0 bl ov30_02385CF0 mov r0, r4 @@ -2657,7 +2657,7 @@ _02384E00: blt _02384E00 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02384E20: .word ov30_02386080 +_02384E20: .word OVERLAY30_JP_STRING_1 _02384E24: .word ov29_02353538 arm_func_end ov30_02384CD4 @@ -4008,11 +4008,11 @@ _0238607C: .word ov30_02385CA4 arm_func_end ov30_02386074 ; 0x02386080 - .global ov30_02386080 -ov30_02386080: + .global OVERLAY30_JP_STRING_1 +OVERLAY30_JP_STRING_1: .byte 0x82, 0xDD, 0x82, 0xB3, 0x82, 0xAB, 0x97, 0x6C, 0x00, 0x00, 0x00, 0x00 - .global ov30_0238608C -ov30_0238608C: + .global OVERLAY30_JP_STRING_2 +OVERLAY30_JP_STRING_2: .byte 0x82, 0xE2, 0x82, 0xE6 .byte 0x82, 0xA2, 0x97, 0x6C, 0x00, 0x00, 0x00, 0x00 diff --git a/asm/overlay_31.s b/asm/overlay_31.s index e2daa2da..731da6c4 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -6,7 +6,7 @@ arm_func_start EntryOverlay31 EntryOverlay31: ; 0x02382820 stmdb sp!, {r3, lr} - ldr r0, _0238285C ; =ov31_02389DB4 + ldr r0, _0238285C ; =DUNGEON_D_BOX_LAYOUT_3 bl sub_020348E4 cmp r0, #0 ldmeqia sp!, {r3, pc} @@ -21,7 +21,7 @@ EntryOverlay31: ; 0x02382820 str r0, [r1, #4] ldmia sp!, {r3, pc} .align 2, 0 -_0238285C: .word ov31_02389DB4 +_0238285C: .word DUNGEON_D_BOX_LAYOUT_3 _02382860: .word ov31_0238A260 arm_func_end EntryOverlay31 @@ -300,22 +300,22 @@ _02382BEC: str r1, [sp, #0x64] bl Arm9LoadUnkFieldNa0x2029EC8 str r0, [sp, #4] - ldr r0, _02382D90 ; =ov31_02389D94 + ldr r0, _02382D90 ; =DUNGEON_D_BOX_LAYOUT_1 ldr r1, _02382D94 ; =0x00000233 - ldr r3, _02382D98 ; =ov31_02389DD4 + ldr r3, _02382D98 ; =DUNGEON_MAIN_MENU add r2, sp, #4 bl sub_0202A5CC ldr r2, _02382D8C ; =ov31_0238A260 ldr r1, _02382D9C ; =ov31_02382864 ldr r2, [r2] strb r0, [r2] - ldr r0, _02382DA0 ; =ov31_02389DC4 + ldr r0, _02382DA0 ; =DUNGEON_D_BOX_LAYOUT_4 bl sub_0202F8C4 ldr r2, _02382D8C ; =ov31_0238A260 ldr r1, _02382DA4 ; =DungeonMenuSwitch ldr r2, [r2] strb r0, [r2, #2] - ldr r0, _02382DA8 ; =ov31_02389DA4 + ldr r0, _02382DA8 ; =DUNGEON_D_BOX_LAYOUT_2 bl sub_0202F8C4 ldr r1, _02382D8C ; =ov31_0238A260 ldr r2, [r1] @@ -404,13 +404,13 @@ _02382D84: ldmia sp!, {pc} .align 2, 0 _02382D8C: .word ov31_0238A260 -_02382D90: .word ov31_02389D94 +_02382D90: .word DUNGEON_D_BOX_LAYOUT_1 _02382D94: .word 0x00000233 -_02382D98: .word ov31_02389DD4 +_02382D98: .word DUNGEON_MAIN_MENU _02382D9C: .word ov31_02382864 -_02382DA0: .word ov31_02389DC4 +_02382DA0: .word DUNGEON_D_BOX_LAYOUT_4 _02382DA4: .word DungeonMenuSwitch -_02382DA8: .word ov31_02389DA4 +_02382DA8: .word DUNGEON_D_BOX_LAYOUT_2 arm_func_end ov31_02382B54 arm_func_start ov31_02382DAC @@ -511,7 +511,7 @@ _02382ED0: .word ov31_0238A2A0 ov31_02382ED4: ; 0x02382ED4 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 - ldr r0, _02382F60 ; =ov31_02389E30 + ldr r0, _02382F60 ; =OVERLAY31_UNKNOWN_STRUCT__NA_2389E30 bl sub_020348E4 cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} @@ -546,7 +546,7 @@ _02382F50: str r4, [r0, #0x14] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_02382F60: .word ov31_02389E30 +_02382F60: .word OVERLAY31_UNKNOWN_STRUCT__NA_2389E30 _02382F64: .word ov31_0238A2A0 arm_func_end ov31_02382ED4 @@ -595,8 +595,8 @@ _02382FDC: ; jump table b _0238320C ; case 5 _02382FF4: ldr r2, [r1, #0x14] - ldr r3, _0238321C ; =ov31_02389E70 - ldr r0, _02383220 ; =ov31_02389E60 + ldr r3, _0238321C ; =DUNGEON_SUBMENU_1 + ldr r0, _02383220 ; =DUNGEON_D_BOX_LAYOUT_7 add r3, r3, r2, lsl #5 ldr r1, _02383224 ; =0x00400013 mov r2, #0 @@ -609,7 +609,7 @@ _02382FF4: ldr r0, [r1, #4] mov r4, #0 ldr r1, [r0, #0x14] - ldr r0, _0238322C ; =ov31_02389E50 + ldr r0, _0238322C ; =DUNGEON_D_BOX_LAYOUT_6 mov r1, r1, lsl #2 ldrh r3, [r3, r1] str r2, [sp, #0xac] @@ -707,7 +707,7 @@ _02383170: mov r1, r1, lsl #2 ldrh r1, [r0, r1] mov ip, #1 - ldr r0, _0238323C ; =ov31_02389E40 + ldr r0, _0238323C ; =DUNGEON_D_BOX_LAYOUT_5 strh r1, [sp, #0x10] str ip, [sp] ldr r1, _02383240 ; =0x00001812 @@ -742,15 +742,15 @@ _02383210: ldmia sp!, {r4, pc} .align 2, 0 _02383218: .word ov31_0238A2A0 -_0238321C: .word ov31_02389E70 -_02383220: .word ov31_02389E60 +_0238321C: .word DUNGEON_SUBMENU_1 +_02383220: .word DUNGEON_D_BOX_LAYOUT_7 _02383224: .word 0x00400013 _02383228: .word ov31_02389E22 -_0238322C: .word ov31_02389E50 +_0238322C: .word DUNGEON_D_BOX_LAYOUT_6 _02383230: .word 0x80000813 _02383234: .word ov31_02382F68 _02383238: .word ov29_0237C91C -_0238323C: .word ov31_02389E40 +_0238323C: .word DUNGEON_D_BOX_LAYOUT_5 _02383240: .word 0x00001812 _02383244: .word ov31_02383248 arm_func_end ov31_02382FBC @@ -759,7 +759,7 @@ _02383244: .word ov31_02383248 ov31_02383248: ; 0x02383248 stmdb sp!, {r4, lr} ldr r1, _02383284 ; =ov31_0238A2A0 - ldr r2, _02383288 ; =ov31_02389E20 + ldr r2, _02383288 ; =OVERLAY31_UNKNOWN_STRING_IDS ldr r1, [r1, #4] mov r4, r0 ldr r0, [r1, #0x14] @@ -774,7 +774,7 @@ ov31_02383248: ; 0x02383248 ldmia sp!, {r4, pc} .align 2, 0 _02383284: .word ov31_0238A2A0 -_02383288: .word ov31_02389E20 +_02383288: .word OVERLAY31_UNKNOWN_STRING_IDS arm_func_end ov31_02383248 arm_func_start ov31_0238328C @@ -1003,7 +1003,7 @@ _02383528: moveq r0, #0 tst r0, #0xff beq _02383590 - ldr r2, _0238364C ; =ov31_02389EF0 + ldr r2, _0238364C ; =OVERLAY31_UNKNOWN_STRUCT__NA_2389EF0 mov r5, #1 mov r0, r8 mov r3, r4 @@ -1067,7 +1067,7 @@ _02383638: .align 2, 0 _02383644: .word ov31_0238A26C _02383648: .word BAG_ITEMS_PTR_MIRROR -_0238364C: .word ov31_02389EF0 +_0238364C: .word OVERLAY31_UNKNOWN_STRUCT__NA_2389EF0 _02383650: .word ov31_02389F5C _02383654: .word ov29_02353538 arm_func_end ov31_02383478 @@ -1107,7 +1107,7 @@ ov31_0238367C: ; 0x0238367C str r2, [sp, #0x38] str lr, [sp] ldrsh r4, [r0, #4] - ldr r0, _02383728 ; =ov31_02389EFC + ldr r0, _02383728 ; =DUNGEON_D_BOX_LAYOUT_8 add ip, r4, #0xd1 add r4, ip, #0x2900 mov ip, r4, lsl #0x10 @@ -1132,7 +1132,7 @@ _023836F0: .align 2, 0 _02383720: .word 0x00001013 _02383724: .word 0x000008E4 -_02383728: .word ov31_02389EFC +_02383728: .word DUNGEON_D_BOX_LAYOUT_8 arm_func_end ov31_0238367C arm_func_start ov31_0238372C @@ -1360,7 +1360,7 @@ _02383A1C: mov r0, #3 bl Arm9LoadUnkFieldNa0x2029EC8 mov r1, r0 - ldr r0, _0238489C ; =ov31_02389F64 + ldr r0, _0238489C ; =OVERLAY31_JP_STRING bl DebugPrint0 bl GetNbItemsInBag ldr r2, _02384898 ; =ov31_0238A26C @@ -1538,7 +1538,7 @@ _02383C44: add r1, r1, #0x1000 strb r0, [r1, #0x193] beq _02383CEC - ldr r0, _023848B0 ; =ov31_02389F1C + ldr r0, _023848B0 ; =DUNGEON_D_BOX_LAYOUT_10 ldr r1, _023848B4 ; =ov31_02383854 bl sub_0202F8C4 ldr r1, _02384898 ; =ov31_0238A26C @@ -1547,7 +1547,7 @@ _02383C44: strb r0, [r1, #0x194] b _02383D78 _02383CEC: - ldr r0, _023848B8 ; =ov31_02389F2C + ldr r0, _023848B8 ; =DUNGEON_D_BOX_LAYOUT_11 mov r1, #0 bl sub_0202F8C4 ldr r2, _02384898 ; =ov31_0238A26C @@ -1573,7 +1573,7 @@ _02383D1C: add r2, sp, #0x500 str r4, [sp, #8] mov r4, #0 - ldr r0, _023848C0 ; =ov31_02389F3C + ldr r0, _023848C0 ; =DUNGEON_D_BOX_LAYOUT_12 ldr r1, _023848C4 ; =0x00400813 ldr r3, _023848AC ; =ov31_02383478 add r2, r2, #0x9c @@ -2347,16 +2347,16 @@ _02384860: b _02384908 .align 2, 0 _02384898: .word ov31_0238A26C -_0238489C: .word ov31_02389F64 +_0238489C: .word OVERLAY31_JP_STRING _023848A0: .word 0x000008E5 _023848A4: .word BAG_ITEMS_PTR_MIRROR _023848A8: .word ov29_02353538 _023848AC: .word ov31_02383478 -_023848B0: .word ov31_02389F1C +_023848B0: .word DUNGEON_D_BOX_LAYOUT_10 _023848B4: .word ov31_02383854 -_023848B8: .word ov31_02389F2C +_023848B8: .word DUNGEON_D_BOX_LAYOUT_11 _023848BC: .word 0x000008E3 -_023848C0: .word ov31_02389F3C +_023848C0: .word DUNGEON_D_BOX_LAYOUT_12 _023848C4: .word 0x00400813 _023848C8: .word 0x000008E7 _023848CC: .word ov31_02389F5C @@ -2677,8 +2677,8 @@ _02384C9C: ldr r1, _02385130 ; =0x00000213 add r3, r3, #0x1000 cmp r0, #0 - ldrne r0, _02385134 ; =ov31_02389F4C - ldreq r0, _02385138 ; =ov31_02389F0C + ldrne r0, _02385134 ; =DUNGEON_D_BOX_LAYOUT_13 + ldreq r0, _02385138 ; =DUNGEON_D_BOX_LAYOUT_9 bl sub_0202A5CC ldr r4, _02384898 ; =ov31_0238A26C mov r8, #0x14 @@ -2943,8 +2943,8 @@ _0238511C: _02385128: .word ov29_0237C91C _0238512C: .word 0x000008E8 _02385130: .word 0x00000213 -_02385134: .word ov31_02389F4C -_02385138: .word ov31_02389F0C +_02385134: .word DUNGEON_D_BOX_LAYOUT_13 +_02385138: .word DUNGEON_D_BOX_LAYOUT_9 arm_func_end ov31_023838E4 arm_func_start ov31_0238513C @@ -3174,7 +3174,7 @@ HandleMovesMenu: ; 0x02385404 ldr r0, [sp, #0x154] cmp r0, #1 bne _0238547C - ldr r0, _02385F74 ; =ov31_02389F88 + ldr r0, _02385F74 ; =DUNGEON_D_BOX_LAYOUT_14 bl CreateDBox mov r1, #0 str r0, [sp, #0x14] @@ -3188,7 +3188,7 @@ HandleMovesMenu: ; 0x02385404 bl sub_0202F23C b _023854AC _0238547C: - ldr r0, _02385F80 ; =ov31_02389FA8 + ldr r0, _02385F80 ; =DUNGEON_D_BOX_LAYOUT_16 bl CreateDBox mov r1, #0 str r0, [sp, #0x14] @@ -3750,7 +3750,7 @@ _02385C60: cmp r3, #0 moveq r1, #3 streqb r1, [r0] - ldr r0, _02385F90 ; =ov31_02389F98 + ldr r0, _02385F90 ; =DUNGEON_D_BOX_LAYOUT_15 ldr r1, _02385F94 ; =0x80000213 add r2, sp, #0x3c add r3, sp, #0xd4 @@ -3964,14 +3964,14 @@ _02385F50: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 _02385F70: .word ov31_0238A270 -_02385F74: .word ov31_02389F88 +_02385F74: .word DUNGEON_D_BOX_LAYOUT_14 _02385F78: .word 0x00003FCD _02385F7C: .word 0x00000404 -_02385F80: .word ov31_02389FA8 +_02385F80: .word DUNGEON_D_BOX_LAYOUT_16 _02385F84: .word 0x00003FCC _02385F88: .word ov29_02353538 _02385F8C: .word 0x000008DC -_02385F90: .word ov31_02389F98 +_02385F90: .word DUNGEON_D_BOX_LAYOUT_15 _02385F94: .word 0x80000213 _02385F98: .word 0x0000099B _02385F9C: .word 0x000009A8 @@ -4564,7 +4564,7 @@ _0238674C: strh r0, [fp, r1] add r0, fp, r2, lsl #3 str r8, [r0, #4] - ldr r0, _02386B18 ; =ov31_02389F98 + ldr r0, _02386B18 ; =DUNGEON_D_BOX_LAYOUT_15 ldr r1, _02386B1C ; =0x00000213 add r2, sp, #0x24 mov r3, fp @@ -4817,7 +4817,7 @@ _02386AE8: _02386B0C: .word ov31_0238A270 _02386B10: .word ov29_0235352C _02386B14: .word 0x000008DC -_02386B18: .word ov31_02389F98 +_02386B18: .word DUNGEON_D_BOX_LAYOUT_15 _02386B1C: .word 0x00000213 _02386B20: .word 0x000008D6 _02386B24: .word 0x000008D7 @@ -4929,7 +4929,7 @@ ov31_02386C6C: ; 0x02386C6C str r5, [r0, #0x64] _02386C90: bl ov00_022EA62C - ldr r0, _02386F10 ; =ov31_02389FC8 + ldr r0, _02386F10 ; =DUNGEON_D_BOX_LAYOUT_18 ldr r1, _02386F14 ; =ov31_02386B28 bl sub_0202F8C4 ldr r1, _02386F0C ; =ov31_0238A27C @@ -4975,7 +4975,7 @@ _02386CF0: add r1, r0, #0x58 bl ov31_0238513C ldr r1, _02386F0C ; =ov31_0238A27C - ldr r0, _02386F18 ; =ov31_02389FB8 + ldr r0, _02386F18 ; =DUNGEON_D_BOX_LAYOUT_17 ldr r3, [r1] ldr r1, _02386F1C ; =0x00000213 add r4, r3, #0x58 @@ -5026,7 +5026,7 @@ _02386D70: str r3, [sp, #0x1c] str r2, [sp] ldrb r2, [r0] - ldr r0, _02386F24 ; =ov31_02389FD8 + ldr r0, _02386F24 ; =DUNGEON_D_BOX_LAYOUT_19 sub r3, r1, #0x740 add r2, r2, #0xda add r2, r2, #0x3400 @@ -5097,12 +5097,12 @@ _02386EF8: ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 _02386F0C: .word ov31_0238A27C -_02386F10: .word ov31_02389FC8 +_02386F10: .word DUNGEON_D_BOX_LAYOUT_18 _02386F14: .word ov31_02386B28 -_02386F18: .word ov31_02389FB8 +_02386F18: .word DUNGEON_D_BOX_LAYOUT_17 _02386F1C: .word 0x00000213 _02386F20: .word 0x00001013 -_02386F24: .word ov31_02389FD8 +_02386F24: .word DUNGEON_D_BOX_LAYOUT_19 _02386F28: .word ov29_0237C91C arm_func_end ov31_02386C6C @@ -5220,7 +5220,7 @@ TeamMenu: ; 0x0238704C mov r3, r7 bl ov31_02388114 ldr r2, _02387618 ; =ov31_0238A280 - ldr r1, _02387620 ; =ov31_0238A014 + ldr r1, _02387620 ; =DUNGEON_D_BOX_LAYOUT_22 ldr r3, [r2] str r0, [r3, #0x7a8] ldr r0, [r2] @@ -5475,7 +5475,7 @@ _02387410: bl Arm9LoadUnkFieldNa0x2029EC8 add r4, r0, #1 ldr r1, _02387618 ; =ov31_0238A280 - ldr r0, _02387630 ; =ov31_0238A024 + ldr r0, _02387630 ; =DUNGEON_D_BOX_LAYOUT_23 ldr r3, [r1] ldr r1, _02387634 ; =0x00000233 add r2, sp, #0x18 @@ -5586,11 +5586,11 @@ _023875F0: _02387614: .word 0x000007AC _02387618: .word ov31_0238A280 _0238761C: .word ov31_02387014 -_02387620: .word ov31_0238A014 +_02387620: .word DUNGEON_D_BOX_LAYOUT_22 _02387624: .word ov29_02353538 _02387628: .word 0x00005AA5 _0238762C: .word 0x00000A3C -_02387630: .word ov31_0238A024 +_02387630: .word DUNGEON_D_BOX_LAYOUT_23 _02387634: .word 0x00000233 _02387638: .word ov29_0237C91C arm_func_end TeamMenu @@ -6015,7 +6015,7 @@ _02387B80: orr r1, r1, #0x33 ldr r3, [r0] str r2, [sp, #0x148] - ldr r0, _023880B8 ; =ov31_0238A004 + ldr r0, _023880B8 ; =DUNGEON_D_BOX_LAYOUT_21 add r2, sp, #0xe8 orr r1, r1, #0x1200 bl sub_0202A690 @@ -6023,7 +6023,7 @@ _02387B80: ldr r1, _023880BC ; =ov31_0238778C ldr r2, [r2] strb r0, [r2, #0x695] - ldr r0, _023880C0 ; =ov31_0238A034 + ldr r0, _023880C0 ; =DUNGEON_D_BOX_LAYOUT_24 bl sub_0202F8C4 ldr r1, _02388084 ; =ov31_0238A280 ldr r3, _023880C4 ; =0x00000A36 @@ -6044,7 +6044,7 @@ _02387B80: strh r1, [r0, #0x92] mov r5, #0 str r5, [sp] - ldr r0, _023880C8 ; =ov31_02389FF4 + ldr r0, _023880C8 ; =DUNGEON_D_BOX_LAYOUT_20 ldr r3, _023880CC ; =ov31_023877C4 add r2, sp, #0x180 mov r1, #0x800 @@ -6065,7 +6065,7 @@ _02387CA8: strh r1, [r0, #0x92] mov r5, #0 str r5, [sp] - ldr r0, _023880C8 ; =ov31_02389FF4 + ldr r0, _023880C8 ; =DUNGEON_D_BOX_LAYOUT_20 ldr r3, _023880CC ; =ov31_023877C4 add r2, sp, #0x180 mov r1, #0x800 @@ -6179,7 +6179,7 @@ _02387E6C: mov r0, #1 str r0, [sp] ldr r0, [r5] - ldr r2, _023880D4 ; =ov31_02389FE8 + ldr r2, _023880D4 ; =OVERLAY31_UNKNOWN_STRUCT__NA_2389FE8 add r0, r0, #0x12 add r1, r7, #0x62 add r0, r0, #0x600 @@ -6335,14 +6335,14 @@ _023880A8: .word ov31_0238A074 _023880AC: .word ov31_0238A07C _023880B0: .word ov31_0238A084 _023880B4: .word 0x00000A3A -_023880B8: .word ov31_0238A004 +_023880B8: .word DUNGEON_D_BOX_LAYOUT_21 _023880BC: .word ov31_0238778C -_023880C0: .word ov31_0238A034 +_023880C0: .word DUNGEON_D_BOX_LAYOUT_24 _023880C4: .word 0x00000A36 -_023880C8: .word ov31_02389FF4 +_023880C8: .word DUNGEON_D_BOX_LAYOUT_20 _023880CC: .word ov31_023877C4 _023880D0: .word 0x00000A3D -_023880D4: .word ov31_02389FE8 +_023880D4: .word OVERLAY31_UNKNOWN_STRUCT__NA_2389FE8 arm_func_end ov31_023877EC arm_func_start ov31_023880D8 @@ -6889,10 +6889,10 @@ _023887D8: ldr r0, _023889B8 ; =ov31_0238A284 mov r5, #0x10 ldr r1, [r0] - ldr r0, _023889C0 ; =ov31_0238A10C + ldr r0, _023889C0 ; =DUNGEON_D_BOX_LAYOUT_25 add r4, r1, #0xc ldr r1, _023889C4 ; =0x00001A13 - ldr r3, _023889C8 ; =ov31_0238A11C + ldr r3, _023889C8 ; =DUNGEON_SUBMENU_5 add r2, sp, #4 strh ip, [sp, #0xc] str r5, [sp, #0x10] @@ -7004,9 +7004,9 @@ _023889B0: .align 2, 0 _023889B8: .word ov31_0238A284 _023889BC: .word 0x000008C2 -_023889C0: .word ov31_0238A10C +_023889C0: .word DUNGEON_D_BOX_LAYOUT_25 _023889C4: .word 0x00001A13 -_023889C8: .word ov31_0238A11C +_023889C8: .word DUNGEON_SUBMENU_5 _023889CC: .word 0x000008C5 _023889D0: .word 0x000008C6 _023889D4: .word 0x0000025A @@ -7206,7 +7206,7 @@ _02388C34: str r0, [sp, #0x14] mov ip, #0 str ip, [sp] - ldr r0, _02388D48 ; =ov31_0238A134 + ldr r0, _02388D48 ; =DUNGEON_D_BOX_LAYOUT_26 ldr r1, _02388D4C ; =0x00001813 ldr r3, _02388D50 ; =ov31_02388D54 add r2, sp, #8 @@ -7256,7 +7256,7 @@ _02388D38: .word 0x00000B44 _02388D3C: .word ov29_0238280C _02388D40: .word 0x00000B45 _02388D44: .word 0x00000B46 -_02388D48: .word ov31_0238A134 +_02388D48: .word DUNGEON_D_BOX_LAYOUT_26 _02388D4C: .word 0x00001813 _02388D50: .word ov31_02388D54 arm_func_end RecruitmentSearchMenuLoop @@ -7357,7 +7357,7 @@ ov31_02388E88: ; 0x02388E88 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #0x84 sub sp, sp, #0x400 - ldr r0, _02389164 ; =ov31_0238A144 + ldr r0, _02389164 ; =OVERLAY31_UNKNOWN_STRUCT__NA_238A144 bl sub_020348E4 cmp r0, #0 beq _02389158 @@ -7557,7 +7557,7 @@ _02389158: add sp, sp, #0x400 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02389164: .word ov31_0238A144 +_02389164: .word OVERLAY31_UNKNOWN_STRUCT__NA_238A144 _02389168: .word 0x00000D98 _0238916C: .word ov31_0238A288 _02389170: .word 0x00000483 @@ -7587,7 +7587,7 @@ ov31_023891A8: ; 0x023891A8 mov r5, r0 bl sub_02030A18 mov r4, r0 - ldr r0, _023891F8 ; =ov31_0238A1A0 + ldr r0, _023891F8 ; =DUNGEON_SUBMENU_6 mov r1, r4, lsl #3 ldrh r1, [r0, r1] mov r0, r5 @@ -7604,7 +7604,7 @@ ov31_023891A8: ; 0x023891A8 bl sub_02026214 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 -_023891F8: .word ov31_0238A1A0 +_023891F8: .word DUNGEON_SUBMENU_6 arm_func_end ov31_023891A8 arm_func_start HelpMenuLoop @@ -7628,9 +7628,9 @@ _0238921C: ; jump table _02389238: ldr ip, _02389400 ; =0x00003FA7 mov r4, #0x10 - ldr r0, _02389404 ; =ov31_0238A170 + ldr r0, _02389404 ; =DUNGEON_D_BOX_LAYOUT_27 ldr r1, _02389408 ; =0x00401813 - ldr r3, _0238940C ; =ov31_0238A1A0 + ldr r3, _0238940C ; =DUNGEON_SUBMENU_6 add r2, sp, #8 strh ip, [sp, #0x10] str r4, [sp, #0x14] @@ -7702,11 +7702,11 @@ _02389344: mov r0, #0x10 str r0, [sp, #0x14] ldr r1, [r2, #4] - ldr r0, _0238940C ; =ov31_0238A1A0 + ldr r0, _0238940C ; =DUNGEON_SUBMENU_6 mov r1, r1, lsl #3 ldrh r1, [r0, r1] mov ip, #8 - ldr r0, _02389410 ; =ov31_0238A180 + ldr r0, _02389410 ; =DUNGEON_D_BOX_LAYOUT_28 strh r1, [sp, #0x10] ldr r2, [r2, #4] ldr r1, _02389414 ; =0x00009833 @@ -7752,10 +7752,10 @@ _023893F4: .align 2, 0 _023893FC: .word ov31_0238A28C _02389400: .word 0x00003FA7 -_02389404: .word ov31_0238A170 +_02389404: .word DUNGEON_D_BOX_LAYOUT_27 _02389408: .word 0x00401813 -_0238940C: .word ov31_0238A1A0 -_02389410: .word ov31_0238A180 +_0238940C: .word DUNGEON_SUBMENU_6 +_02389410: .word DUNGEON_D_BOX_LAYOUT_28 _02389414: .word 0x00009833 _02389418: .word ov31_023891A8 arm_func_end HelpMenuLoop @@ -7763,7 +7763,7 @@ _02389418: .word ov31_023891A8 arm_func_start ov31_0238941C ov31_0238941C: ; 0x0238941C stmdb sp!, {r3, lr} - ldr r0, _02389458 ; =ov31_0238A190 + ldr r0, _02389458 ; =OVERLAY31_UNKNOWN_STRUCT__NA_238A190 bl sub_020348E4 cmp r0, #0 ldmeqia sp!, {r3, pc} @@ -7778,7 +7778,7 @@ ov31_0238941C: ; 0x0238941C str r2, [r0, #8] ldmia sp!, {r3, pc} .align 2, 0 -_02389458: .word ov31_0238A190 +_02389458: .word OVERLAY31_UNKNOWN_STRUCT__NA_238A190 _0238945C: .word ov31_0238A28C arm_func_end ov31_0238941C @@ -7854,7 +7854,7 @@ ov31_0238948C: ; 0x0238948C add r0, r5, #0x78 str r0, [sp, #0xe4] _02389560: - ldr r0, _023898F8 ; =ov31_0238A208 + ldr r0, _023898F8 ; =DUNGEON_D_BOX_LAYOUT_31 ldr r1, _023898FC ; =0x80401813 add r2, sp, #0x9c add r3, r5, #0xc4 @@ -7927,7 +7927,7 @@ _02389640: add r0, r5, #1 str r1, [r2, #0x10] bl ov29_0234E988 - ldr r0, _02389908 ; =ov31_0238A1F8 + ldr r0, _02389908 ; =DUNGEON_D_BOX_LAYOUT_30 ldr r1, _0238990C ; =0x80000213 add r2, sp, #4 add r3, r5, #4 @@ -8105,11 +8105,11 @@ _023898B0: .align 2, 0 _023898F0: .word 0x00000F5F _023898F4: .word 0x00000F5E -_023898F8: .word ov31_0238A208 +_023898F8: .word DUNGEON_D_BOX_LAYOUT_31 _023898FC: .word 0x80401813 _02389900: .word 0x00003F02 _02389904: .word 0x00000A3C -_02389908: .word ov31_0238A1F8 +_02389908: .word DUNGEON_D_BOX_LAYOUT_30 _0238990C: .word 0x80000213 _02389910: .word 0x00003F07 _02389914: .word 0x00003F04 @@ -8141,7 +8141,7 @@ ov31_0238994C: ; 0x0238994C mov r0, r1, asr #2 add r2, r2, r3, lsr #29 add ip, r1, r0, lsr #29 - ldr r6, _023899B0 ; =ov31_0238A218 + ldr r6, _023899B0 ; =DUNGEON_D_BOX_LAYOUT_32 mov lr, r2, asr #3 add r5, sp, #0 ldmia r6, {r0, r1, r2, r3} @@ -8160,7 +8160,7 @@ ov31_0238994C: ; 0x0238994C add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_023899B0: .word ov31_0238A218 +_023899B0: .word DUNGEON_D_BOX_LAYOUT_32 _023899B4: .word ov31_02389A04 arm_func_end ov31_0238994C @@ -8416,7 +8416,7 @@ ov31_02389CC0: ; 0x02389CC0 str r1, [sp] str r2, [sp, #4] mov r2, #0 - ldr r0, _02389D74 ; =ov31_0238A1E8 + ldr r0, _02389D74 ; =DUNGEON_D_BOX_LAYOUT_29 ldr r1, _02389D78 ; =0x00001013 ldr r3, _02389D7C ; =0x00000A3B str r2, [sp, #8] @@ -8448,7 +8448,7 @@ _02389D6C: add sp, sp, #0x5c ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 -_02389D74: .word ov31_0238A1E8 +_02389D74: .word DUNGEON_D_BOX_LAYOUT_29 _02389D78: .word 0x00001013 _02389D7C: .word 0x00000A3B arm_func_end ov31_02389CC0 @@ -8463,20 +8463,20 @@ ov31_02389D80: ; 0x02389D80 arm_func_end ov31_02389D80 ; 0x02389D94 - .global ov31_02389D94 -ov31_02389D94: + .global DUNGEON_D_BOX_LAYOUT_1 +DUNGEON_D_BOX_LAYOUT_1: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x0C, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389DA4 -ov31_02389DA4: + .global DUNGEON_D_BOX_LAYOUT_2 +DUNGEON_D_BOX_LAYOUT_2: .byte 0x00, 0x00, 0x00, 0x00, 0x0B, 0x04, 0x13, 0x02, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389DB4 -ov31_02389DB4: + .global DUNGEON_D_BOX_LAYOUT_3 +DUNGEON_D_BOX_LAYOUT_3: .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC, 0x2D, 0x38, 0x02, 0x54, 0x2B, 0x38, 0x02 - .global ov31_02389DC4 -ov31_02389DC4: + .global DUNGEON_D_BOX_LAYOUT_4 +DUNGEON_D_BOX_LAYOUT_4: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x1C, 0x06, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389DD4 -ov31_02389DD4: + .global DUNGEON_MAIN_MENU +DUNGEON_MAIN_MENU: .byte 0xAD, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAE, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xAF, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xB0, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 .byte 0xB1, 0x08, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xB3, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 @@ -8484,31 +8484,31 @@ ov31_02389DD4: .global ov31_02389E14 ov31_02389E14: .byte 0x5B, 0x64, 0x75, 0x6E, 0x67, 0x65, 0x6F, 0x6E, 0x3A, 0x30, 0x5D, 0x00 - .global ov31_02389E20 -ov31_02389E20: + .global OVERLAY31_UNKNOWN_STRING_IDS +OVERLAY31_UNKNOWN_STRING_IDS: .byte 0xC7, 0x08 .global ov31_02389E22 ov31_02389E22: .byte 0xCB, 0x08 .byte 0xC8, 0x08, 0xCC, 0x08, 0xC9, 0x08, 0xCD, 0x08, 0xCA, 0x08, 0xCE, 0x08 - .global ov31_02389E30 -ov31_02389E30: + .global OVERLAY31_UNKNOWN_STRUCT__NA_2389E30 +OVERLAY31_UNKNOWN_STRUCT__NA_2389E30: .byte 0x0E, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xF0, 0x32, 0x38, 0x02, 0xBC, 0x2F, 0x38, 0x02 - .global ov31_02389E40 -ov31_02389E40: + .global DUNGEON_D_BOX_LAYOUT_5 +DUNGEON_D_BOX_LAYOUT_5: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x02, 0x1C, 0x0D, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389E50 -ov31_02389E50: + .global DUNGEON_D_BOX_LAYOUT_6 +DUNGEON_D_BOX_LAYOUT_6: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x02, 0x13, 0x04, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389E60 -ov31_02389E60: + .global DUNGEON_D_BOX_LAYOUT_7 +DUNGEON_D_BOX_LAYOUT_7: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x17, 0x02, 0x07, 0x06, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389E70 -ov31_02389E70: + .global DUNGEON_SUBMENU_1 +DUNGEON_SUBMENU_1: .byte 0xAD, 0x09, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0xCF, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xD0, 0x08, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0x09, 0x00, 0x00 @@ -8518,83 +8518,83 @@ ov31_02389E70: .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0x09, 0x00, 0x00 .byte 0x04, 0x00, 0x00, 0x00, 0xCF, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xD0, 0x08, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF - .global ov31_02389EF0 -ov31_02389EF0: + .global OVERLAY31_UNKNOWN_STRUCT__NA_2389EF0 +OVERLAY31_UNKNOWN_STRUCT__NA_2389EF0: .byte 0x01, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x00, 0x00 - .global ov31_02389EFC -ov31_02389EFC: + .global DUNGEON_D_BOX_LAYOUT_8 +DUNGEON_D_BOX_LAYOUT_8: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F0C -ov31_02389F0C: + .global DUNGEON_D_BOX_LAYOUT_9 +DUNGEON_D_BOX_LAYOUT_9: .byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x07, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F1C -ov31_02389F1C: + .global DUNGEON_D_BOX_LAYOUT_10 +DUNGEON_D_BOX_LAYOUT_10: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x08, 0x02 .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F2C -ov31_02389F2C: + .global DUNGEON_D_BOX_LAYOUT_11 +DUNGEON_D_BOX_LAYOUT_11: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x14, 0x12, 0x02 .byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F3C -ov31_02389F3C: + .global DUNGEON_D_BOX_LAYOUT_12 +DUNGEON_D_BOX_LAYOUT_12: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x13, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F4C -ov31_02389F4C: + .global DUNGEON_D_BOX_LAYOUT_13 +DUNGEON_D_BOX_LAYOUT_13: .byte 0x00, 0x00, 0x00, 0x00, 0x17, 0x02, 0x07, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov31_02389F5C ov31_02389F5C: .byte 0x20, 0x20, 0x3F, 0x3F, 0x3F, 0x00, 0x00, 0x00 - .global ov31_02389F64 -ov31_02389F64: + .global OVERLAY31_JP_STRING +OVERLAY31_JP_STRING: .byte 0x0A, 0x0A, 0x2D, 0x2D, 0x2D, 0x2D, 0x81, 0x40, 0x20, 0x8F, 0x89, 0x8A, 0xFA, 0x83, 0x7C, 0x83 .byte 0x57, 0x83, 0x56, 0x83, 0x87, 0x83, 0x93, 0x3D, 0x25, 0x64, 0x81, 0x40, 0x2D, 0x2D, 0x2D, 0x2D .byte 0x2D, 0x20, 0x0A, 0x00 - .global ov31_02389F88 -ov31_02389F88: + .global DUNGEON_D_BOX_LAYOUT_14 +DUNGEON_D_BOX_LAYOUT_14: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x1C, 0x05, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389F98 -ov31_02389F98: + .global DUNGEON_D_BOX_LAYOUT_15 +DUNGEON_D_BOX_LAYOUT_15: .byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389FA8 -ov31_02389FA8: + .global DUNGEON_D_BOX_LAYOUT_16 +DUNGEON_D_BOX_LAYOUT_16: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x1C, 0x04, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389FB8 -ov31_02389FB8: + .global DUNGEON_D_BOX_LAYOUT_17 +DUNGEON_D_BOX_LAYOUT_17: .byte 0x00, 0x00, 0x00, 0x00, 0x17, 0x02, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389FC8 -ov31_02389FC8: + .global DUNGEON_D_BOX_LAYOUT_18 +DUNGEON_D_BOX_LAYOUT_18: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x13, 0x04, 0x00, 0xFE, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389FD8 -ov31_02389FD8: + .global DUNGEON_D_BOX_LAYOUT_19 +DUNGEON_D_BOX_LAYOUT_19: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_02389FE8 -ov31_02389FE8: + .global OVERLAY31_UNKNOWN_STRUCT__NA_2389FE8 +OVERLAY31_UNKNOWN_STRUCT__NA_2389FE8: .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x00, 0x00 - .global ov31_02389FF4 -ov31_02389FF4: + .global DUNGEON_D_BOX_LAYOUT_20 +DUNGEON_D_BOX_LAYOUT_20: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x0E, 0x12, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A004 -ov31_0238A004: + .global DUNGEON_D_BOX_LAYOUT_21 +DUNGEON_D_BOX_LAYOUT_21: .byte 0x00, 0x00, 0x00, 0x00, 0x0E, 0x02, 0x10, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A014 -ov31_0238A014: + .global DUNGEON_D_BOX_LAYOUT_22 +DUNGEON_D_BOX_LAYOUT_22: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0F, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A024 -ov31_0238A024: + .global DUNGEON_D_BOX_LAYOUT_23 +DUNGEON_D_BOX_LAYOUT_23: .byte 0x00, 0x00, 0x00, 0x00, 0x13, 0x02, 0x0B, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A034 -ov31_0238A034: + .global DUNGEON_D_BOX_LAYOUT_24 +DUNGEON_D_BOX_LAYOUT_24: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0A, 0x02, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global ov31_0238A044 ov31_0238A044: @@ -8658,58 +8658,58 @@ ov31_0238A0E8: .byte 0x5B, 0x73, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3A, 0x30, 0x5D, 0x5B, 0x43 .byte 0x4C, 0x55, 0x4D, 0x5F, 0x53, 0x45, 0x54, 0x3A, 0x38, 0x30, 0x5D, 0x5B, 0x73, 0x74, 0x72, 0x69 .byte 0x6E, 0x67, 0x3A, 0x31, 0x5D, 0x00, 0x00, 0x00 - .global ov31_0238A10C -ov31_0238A10C: + .global DUNGEON_D_BOX_LAYOUT_25 +DUNGEON_D_BOX_LAYOUT_25: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0C, 0x00 .byte 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A11C -ov31_0238A11C: + .global DUNGEON_SUBMENU_5 +DUNGEON_SUBMENU_5: .byte 0xC3, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0xC4, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF - .global ov31_0238A134 -ov31_0238A134: + .global DUNGEON_D_BOX_LAYOUT_26 +DUNGEON_D_BOX_LAYOUT_26: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x1C, 0x12, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A144 -ov31_0238A144: + .global OVERLAY31_UNKNOWN_STRUCT__NA_238A144 +OVERLAY31_UNKNOWN_STRUCT__NA_238A144: .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x91, 0x38, 0x02, 0x04, 0x8C, 0x38, 0x02 .global ov31_0238A154 ov31_0238A154: .byte 0x5B, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x3A, 0x30, 0x3A, 0x33, 0x5D, 0x20, 0x5B, 0x43, 0x53, 0x3A .byte 0x25, 0x63, 0x5D, 0x25, 0x73, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00, 0x00 - .global ov31_0238A170 -ov31_0238A170: + .global DUNGEON_D_BOX_LAYOUT_27 +DUNGEON_D_BOX_LAYOUT_27: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x02, 0x0F, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A180 -ov31_0238A180: + .global DUNGEON_D_BOX_LAYOUT_28 +DUNGEON_D_BOX_LAYOUT_28: .byte 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x02, 0x1C, 0x14, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A190 -ov31_0238A190: + .global OVERLAY31_UNKNOWN_STRUCT__NA_238A190 +OVERLAY31_UNKNOWN_STRUCT__NA_238A190: .byte 0x0E, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x60, 0x94, 0x38, 0x02, 0xFC, 0x91, 0x38, 0x02 - .global ov31_0238A1A0 -ov31_0238A1A0: + .global DUNGEON_SUBMENU_6 +DUNGEON_SUBMENU_6: .byte 0xA8, 0x3F, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xA9, 0x3F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xAA, 0x3F, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0xAB, 0x3F, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xAC, 0x3F, 0x00, 0x00 .byte 0x04, 0x00, 0x00, 0x00, 0xAD, 0x3F, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xAE, 0x3F, 0x00, 0x00 .byte 0x06, 0x00, 0x00, 0x00, 0xAF, 0x3F, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF - .global ov31_0238A1E8 -ov31_0238A1E8: + .global DUNGEON_D_BOX_LAYOUT_29 +DUNGEON_D_BOX_LAYOUT_29: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A1F8 -ov31_0238A1F8: + .global DUNGEON_D_BOX_LAYOUT_30 +DUNGEON_D_BOX_LAYOUT_30: .byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A208 -ov31_0238A208: + .global DUNGEON_D_BOX_LAYOUT_31 +DUNGEON_D_BOX_LAYOUT_31: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x12, 0x00, 0x00, 0xFF, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global ov31_0238A218 -ov31_0238A218: + .global DUNGEON_D_BOX_LAYOUT_32 +DUNGEON_D_BOX_LAYOUT_32: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x14, 0x0F, 0x02, 0x00, 0xFE, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .global ov31_0238A228 diff --git a/asm/overlay_34.s b/asm/overlay_34.s index 11ce6104..445e5258 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -758,7 +758,7 @@ _022DCBC0: arm_func_start ov34_022DCBCC ov34_022DCBCC: ; 0x022DCBCC stmdb sp!, {r3, lr} - ldr r0, _022DCBEC ; =ov34_022DD014 + ldr r0, _022DCBEC ; =OVERLAY34_UNKNOWN_STRUCT__NA_22DD014 bl sub_020348E4 cmp r0, #0 ldrne r0, _022DCBF0 ; =ov34_022DD084 @@ -766,7 +766,7 @@ ov34_022DCBCC: ; 0x022DCBCC strne r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_022DCBEC: .word ov34_022DD014 +_022DCBEC: .word OVERLAY34_UNKNOWN_STRUCT__NA_22DD014 _022DCBF0: .word ov34_022DD084 arm_func_end ov34_022DCBCC @@ -780,7 +780,7 @@ ov34_022DCBF4: ; 0x022DCBF4 ldr r1, _022DCC84 ; =ov34_022DD084 mov ip, #1 str r0, [r1] - ldr r3, _022DCC88 ; =ov34_022DD024 + ldr r3, _022DCC88 ; =START_MENU_CONFIRM add r2, sp, #0 mov r0, #0 mov r1, #0x31 @@ -810,7 +810,7 @@ ov34_022DCBF4: ; 0x022DCBF4 ldmia sp!, {r3, pc} .align 2, 0 _022DCC84: .word ov34_022DD084 -_022DCC88: .word ov34_022DD024 +_022DCC88: .word START_MENU_CONFIRM _022DCC8C: .word 0x00000408 _022DCC90: .word 0x00000255 arm_func_end ov34_022DCBF4 @@ -913,7 +913,7 @@ _022DCDC8: .word ov34_022DD084 arm_func_start ov34_022DCDCC ov34_022DCDCC: ; 0x022DCDCC stmdb sp!, {r3, lr} - ldr r0, _022DCDEC ; =ov34_022DD03C + ldr r0, _022DCDEC ; =OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C bl sub_020348E4 cmp r0, #0 ldrne r0, _022DCDF0 ; =ov34_022DD08C @@ -921,7 +921,7 @@ ov34_022DCDCC: ; 0x022DCDCC strne r1, [r0, #4] ldmia sp!, {r3, pc} .align 2, 0 -_022DCDEC: .word ov34_022DD03C +_022DCDEC: .word OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C _022DCDF0: .word ov34_022DD08C arm_func_end ov34_022DCDCC @@ -933,7 +933,7 @@ ov34_022DCDF4: ; 0x022DCDF4 mov r1, r0 bl MemAlloc ldr r1, _022DCE7C ; =ov34_022DD08C - ldr r3, _022DCE80 ; =ov34_022DD04C + ldr r3, _022DCE80 ; =DUNGEON_DEBUG_MENU str r0, [r1] add r2, sp, #0 mov r0, #0 @@ -963,7 +963,7 @@ ov34_022DCDF4: ; 0x022DCDF4 ldmia sp!, {r3, pc} .align 2, 0 _022DCE7C: .word ov34_022DD08C -_022DCE80: .word ov34_022DD04C +_022DCE80: .word DUNGEON_DEBUG_MENU _022DCE84: .word 0x00000408 _022DCE88: .word 0x00003D1C arm_func_end ov34_022DCDF4 @@ -1086,19 +1086,19 @@ ov34_022DCFF4: .global ov34_022DD004 ov34_022DD004: .byte 0x42, 0x41, 0x43, 0x4B, 0x2F, 0x77, 0x5F, 0x65, 0x73, 0x72, 0x62, 0x2E, 0x62, 0x67, 0x70, 0x00 - .global ov34_022DD014 -ov34_022DD014: + .global OVERLAY34_UNKNOWN_STRUCT__NA_22DD014 +OVERLAY34_UNKNOWN_STRUCT__NA_22DD014: .byte 0x0F, 0x00, 0x00, 0x00, 0xF4, 0xCB, 0x2D, 0x02, 0x94, 0xCC, 0x2D, 0x02, 0xE0, 0xCC, 0x2D, 0x02 - .global ov34_022DD024 -ov34_022DD024: + .global START_MENU_CONFIRM +START_MENU_CONFIRM: .byte 0x56, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x57, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .global ov34_022DD03C -ov34_022DD03C: + .global OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C +OVERLAY34_UNKNOWN_STRUCT__NA_22DD03C: .byte 0x0F, 0x00, 0x00, 0x00, 0xF4, 0xCD, 0x2D, 0x02 .byte 0x8C, 0xCE, 0x2D, 0x02, 0xD8, 0xCE, 0x2D, 0x02 - .global ov34_022DD04C -ov34_022DD04C: + .global DUNGEON_DEBUG_MENU +DUNGEON_DEBUG_MENU: .byte 0x1D, 0x3D, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x1E, 0x3D, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x1F, 0x3D, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 .byte 0x20, 0x3D, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 From 02220f6cef5ac6e483f7abb1358a38f230214725 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 22 Sep 2023 00:30:35 -0400 Subject: [PATCH 5/5] Defined pointers for ARM7 WRAM --- sub/asm/main.s | 2 +- sub/asm/wram.s | 1940 +++++++++++++++++++++++++++--------------------- 2 files changed, 1110 insertions(+), 832 deletions(-) diff --git a/sub/asm/main.s b/sub/asm/main.s index 8ed448d5..1d446b35 100644 --- a/sub/asm/main.s +++ b/sub/asm/main.s @@ -27477,7 +27477,7 @@ _027F7174: bne _027F70C4 bx lr arm_func_end sub_027F70BC - ; 0x02026974 + ; 0x027F7184 .byte 0xF0, 0x29, 0x7E, 0x02, 0x90, 0x2A, 0x7E, 0x02, 0xA0, 0x2E, 0x7E, 0x02, 0xF8, 0x7D, 0x7E, 0x02 .byte 0xF4, 0x7F, 0x7E, 0x02, 0x5C, 0x80, 0x7E, 0x02, 0x14, 0x83, 0x7E, 0x02, 0x50, 0x2F, 0x7E, 0x02 diff --git a/sub/asm/wram.s b/sub/asm/wram.s index 06a8087e..721c7d36 100644 --- a/sub/asm/wram.s +++ b/sub/asm/wram.s @@ -267,7 +267,7 @@ _037F83B8: mov r0, #6 bl sub_037FEEF8 bl sub_037FE5C0 - ldr r1, _037F8464 ; =0x037F84BC + ldr r1, _037F8464 ; =sub_037F84BC mov r0, #1 bl sub_037FB7BC mov r0, #1 @@ -310,7 +310,7 @@ _037F8454: .word 0x0000FFFF _037F8458: .word 0x027FFC80 _037F845C: .word 0xFFFFFF2A _037F8460: .word 0xFFFFFF60 -_037F8464: .word 0x037F84BC +_037F8464: .word sub_037F84BC _037F8468: .word 0x04000004 arm_func_end sub_037F8000 @@ -352,7 +352,7 @@ _037F84B8: .word 0x027FFE1D arm_func_start sub_037F84BC sub_037F84BC: ; 0x037F84BC stmdb sp!, {r3, lr} - ldr r0, _037F84DC ; =0x03809E50 + ldr r0, _037F84DC ; =_03809E50 ldr r0, [r0] cmp r0, #0 beq _037F84D4 @@ -361,7 +361,7 @@ _037F84D4: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037F84DC: .word 0x03809E50 +_037F84DC: .word _03809E50 arm_func_end sub_037F84BC arm_func_start sub_037F84E0 @@ -2472,7 +2472,7 @@ _037FA1B0: add r0, r0, #0xc0 add r0, r0, r1, lsl #2 mov r0, r0, lsl #0x10 - ldr r1, _037FA218 ; =0x037FA660 + ldr r1, _037FA218 ; =sub_037FA660 mov r0, r0, lsr #0x10 bl sub_027EAB5C ldr r0, _037FA210 ; =0x0380FFF4 @@ -2492,7 +2492,7 @@ _037FA208: .align 2, 0 _037FA210: .word 0x0380FFF4 _037FA214: .word 0x04808010 -_037FA218: .word 0x037FA660 +_037FA218: .word sub_037FA660 arm_func_end sub_037FA12C arm_func_start sub_037FA21C @@ -3877,18 +3877,18 @@ _037FB4D0: _037FB4D4: beq _037FB4C4 str r2, [ip, #4] - ldr r1, _037FB4EC ; =0x038074F4 + ldr r1, _037FB4EC ; =_038074F4 ldr r0, [r1, r0, lsl #2] - ldr lr, _037FB4F0 ; =0x037FB4F4 + ldr lr, _037FB4F0 ; =sub_037FB4F4 bx r0 .align 2, 0 -_037FB4EC: .word 0x038074F4 -_037FB4F0: .word 0x037FB4F4 +_037FB4EC: .word _038074F4 +_037FB4F0: .word sub_037FB4F4 arm_func_end sub_037FB488 arm_func_start sub_037FB4F4 sub_037FB4F4: ; 0x037FB4F4 - ldr ip, _037FB630 ; =wramBssFiller + ldr ip, _037FB630 ; =_03807608 mov r3, #0 ldr ip, [ip] mov r2, #1 @@ -3903,14 +3903,14 @@ _037FB50C: mov ip, r0 cmp ip, #0 bne _037FB50C - ldr ip, _037FB630 ; =wramBssFiller + ldr ip, _037FB630 ; =_03807608 str r3, [ip] str r3, [ip, #4] - ldr ip, _037FB634 ; =0x038076A4 + ldr ip, _037FB634 ; =_038076A4 mov r1, #1 strh r1, [ip] _037FB544: - ldr ip, _037FB634 ; =0x038076A4 + ldr ip, _037FB634 ; =_038076A4 ldrh r1, [ip] cmp r1, #0 beq _037FB558 @@ -3983,8 +3983,8 @@ _037FB5DC: stmda sp!, {r0, r1, r2, r3, ip, lr} ldmia sp!, {pc} .align 2, 0 -_037FB630: .word wramBssFiller -_037FB634: .word 0x038076A4 +_037FB630: .word _03807608 +_037FB634: .word _038076A4 arm_func_end sub_037FB4F4 arm_func_start sub_037FB638 @@ -3997,8 +3997,8 @@ sub_037FB63C: ; 0x037FB63C stmdb sp!, {r3, r4, r5, lr} mov r1, #0xc mul r5, r0, r1 - ldr r2, _037FB6B4 ; =0x03807610 - ldr r3, _037FB6B8 ; =0x038074E0 + ldr r2, _037FB6B4 ; =_03807610 + ldr r3, _037FB6B8 ; =_038074E0 mov r4, r0, lsl #1 ldr r1, [r2, r5] mov r0, #0 @@ -4008,13 +4008,13 @@ sub_037FB63C: ; 0x037FB63C cmp r1, #0 mov r4, r4, lsl r3 beq _037FB684 - ldr r0, _037FB6BC ; =0x03807618 + ldr r0, _037FB6BC ; =_03807618 ldr r0, [r0, r5] mov lr, pc bx r1 _037FB684: ldr r2, _037FB6C0 ; =0x0380FFF8 - ldr r0, _037FB6C4 ; =0x03807614 + ldr r0, _037FB6C4 ; =_03807614 ldr r1, [r2] orr r1, r1, r4 str r1, [r2] @@ -4027,11 +4027,11 @@ _037FB6AC: ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_037FB6B4: .word 0x03807610 -_037FB6B8: .word 0x038074E0 -_037FB6BC: .word 0x03807618 +_037FB6B4: .word _03807610 +_037FB6B8: .word _038074E0 +_037FB6BC: .word _03807618 _037FB6C0: .word 0x0380FFF8 -_037FB6C4: .word 0x03807614 +_037FB6C4: .word _03807614 arm_func_end sub_037FB63C arm_func_start sub_037FB6C8 @@ -4110,7 +4110,7 @@ _037FB744: .word sub_037FB63C sub_037FB748: ; 0x037FB748 stmdb sp!, {r3, lr} ldr r2, _037FB78C ; =0x027FFC3C - ldr r0, _037FB790 ; =0x03807610 + ldr r0, _037FB790 ; =_03807610 ldr r1, [r2] ldr r3, [r0, #0x60] add r0, r1, #1 @@ -4128,13 +4128,13 @@ _037FB774: bx lr .align 2, 0 _037FB78C: .word 0x027FFC3C -_037FB790: .word 0x03807610 +_037FB790: .word _03807610 _037FB794: .word 0x0380FFF8 arm_func_end sub_037FB748 arm_func_start sub_037FB798 sub_037FB798: ; 0x037FB798 - ldr r0, _037FB7B4 ; =wramBssFiller + ldr r0, _037FB7B4 ; =_03807608 mov r2, #0 str r2, [r0, #4] ldr r1, _037FB7B8 ; =0x027FFC3C @@ -4142,18 +4142,18 @@ sub_037FB798: ; 0x037FB798 str r2, [r1] bx lr .align 2, 0 -_037FB7B4: .word wramBssFiller +_037FB7B4: .word _03807608 _037FB7B8: .word 0x027FFC3C arm_func_end sub_037FB798 arm_func_start sub_037FB7BC sub_037FB7BC: ; 0x037FB7BC stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} - ldr r4, _037FB84C ; =0x038074F4 + ldr r4, _037FB84C ; =_038074F4 mov sb, #0 mov r2, #0xc - ldr r5, _037FB850 ; =0x03807670 - ldr r7, _037FB854 ; =0x03807610 + ldr r5, _037FB850 ; =_03807670 + ldr r7, _037FB854 ; =_03807610 mov r8, sb mov lr, sb mov ip, #1 @@ -4190,9 +4190,9 @@ _037FB834: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, lr} bx lr .align 2, 0 -_037FB84C: .word 0x038074F4 -_037FB850: .word 0x03807670 -_037FB854: .word 0x03807610 +_037FB84C: .word _038074F4 +_037FB850: .word _03807670 +_037FB854: .word _03807610 arm_func_end sub_037FB7BC arm_func_start sub_037FB858 @@ -4200,23 +4200,23 @@ sub_037FB858: ; 0x037FB858 stmdb sp!, {r4, lr} mov r3, #0xc mul r4, r0, r3 - ldr ip, _037FB898 ; =0x03807640 - ldr r3, _037FB89C ; =0x03807648 + ldr ip, _037FB898 ; =_03807640 + ldr r3, _037FB89C ; =_03807648 str r1, [ip, r4] add r0, r0, #3 mov r1, #1 mov r0, r1, lsl r0 str r2, [r3, r4] bl sub_037FB8F0 - ldr r0, _037FB8A0 ; =0x03807644 + ldr r0, _037FB8A0 ; =_03807644 mov r1, #1 str r1, [r0, r4] ldmia sp!, {r4, lr} bx lr .align 2, 0 -_037FB898: .word 0x03807640 -_037FB89C: .word 0x03807648 -_037FB8A0: .word 0x03807644 +_037FB898: .word _03807640 +_037FB89C: .word _03807648 +_037FB8A0: .word _03807644 arm_func_end sub_037FB858 arm_func_start sub_037FB8A4 @@ -4308,7 +4308,7 @@ _037FB994: .word 0x04000214 arm_func_start sub_037FB998 sub_037FB998: ; 0x037FB998 stmdb sp!, {r3, r4, r5, lr} - ldr r0, _037FBA00 ; =0x0380767C + ldr r0, _037FBA00 ; =_0380767C ldr r1, [r0] cmp r1, #0 bne _037FB9F8 @@ -4337,7 +4337,7 @@ _037FB9F8: ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_037FBA00: .word 0x0380767C +_037FBA00: .word _0380767C _037FBA04: .word 0x027FFFF0 _037FBA08: .word 0x027FFFB8 arm_func_end sub_037FB998 @@ -4434,7 +4434,7 @@ _037FBAFC: sub_037FBB08: ; 0x037FBB08 stmdb sp!, {r4, r5, r6, r7, r8, lr} ldr r6, _037FBB50 ; =0x027FFFE8 - ldr r5, _037FBB54 ; =0x037FBBA4 + ldr r5, _037FBB54 ; =sub_037FBBA4 mov r8, r0 mov r7, #0x400 mov r4, #1 @@ -4454,20 +4454,20 @@ _037FBB2C: bx lr .align 2, 0 _037FBB50: .word 0x027FFFE8 -_037FBB54: .word 0x037FBBA4 +_037FBB54: .word sub_037FBBA4 arm_func_end sub_037FBB08 arm_func_start sub_037FBB58 sub_037FBB58: ; 0x037FBB58 ldr ip, _037FBB6C ; =sub_037FBA18 ldr r1, _037FBB70 ; =0x027FFFE8 - ldr r2, _037FBB74 ; =0x037FBBA8 + ldr r2, _037FBB74 ; =sub_037FBBA8 mov r3, #1 bx ip .align 2, 0 _037FBB6C: .word sub_037FBA18 _037FBB70: .word 0x027FFFE8 -_037FBB74: .word 0x037FBBA8 +_037FBB74: .word sub_037FBBA8 arm_func_end sub_037FBB58 arm_func_start sub_037FBB78 @@ -4482,13 +4482,13 @@ _037FBB80: .word sub_037FBB58 sub_037FBB84: ; 0x037FBB84 ldr ip, _037FBB98 ; =sub_037FBA94 ldr r1, _037FBB9C ; =0x027FFFE8 - ldr r2, _037FBBA0 ; =0x037FBBA4 + ldr r2, _037FBBA0 ; =sub_037FBBA4 mov r3, #1 bx ip .align 2, 0 _037FBB98: .word sub_037FBA94 _037FBB9C: .word 0x027FFFE8 -_037FBBA0: .word 0x037FBBA4 +_037FBBA0: .word sub_037FBBA4 arm_func_end sub_037FBB84 arm_func_start sub_037FBBA4 @@ -4505,26 +4505,26 @@ sub_037FBBA8: ; 0x037FBBA8 sub_037FBBAC: ; 0x037FBBAC ldr ip, _037FBBC0 ; =sub_037FBA18 ldr r1, _037FBBC4 ; =0x027FFFE0 - ldr r2, _037FBBC8 ; =0x037FBBF0 + ldr r2, _037FBBC8 ; =sub_037FBBF0 mov r3, #0 bx ip .align 2, 0 _037FBBC0: .word sub_037FBA18 _037FBBC4: .word 0x027FFFE0 -_037FBBC8: .word 0x037FBBF0 +_037FBBC8: .word sub_037FBBF0 arm_func_end sub_037FBBAC arm_func_start sub_037FBBCC sub_037FBBCC: ; 0x037FBBCC ldr ip, _037FBBE0 ; =sub_037FBA94 ldr r1, _037FBBE4 ; =0x027FFFE0 - ldr r2, _037FBBE8 ; =0x037FBBEC + ldr r2, _037FBBE8 ; =sub_037FBBEC mov r3, #0 bx ip .align 2, 0 _037FBBE0: .word sub_037FBA94 _037FBBE4: .word 0x027FFFE0 -_037FBBE8: .word 0x037FBBEC +_037FBBE8: .word sub_037FBBEC arm_func_end sub_037FBBCC arm_func_start sub_037FBBEC @@ -4716,7 +4716,7 @@ _037FBDE4: arm_func_start sub_037FBDEC sub_037FBDEC: ; 0x037FBDEC stmdb sp!, {r3, lr} - ldr r1, _037FBE48 ; =0x03807680 + ldr r1, _037FBE48 ; =_03807680 mov ip, #0 ldr lr, [r1, #0x2c] mov r3, lr @@ -4733,7 +4733,7 @@ _037FBE0C: blo _037FBE04 _037FBE24: cmp ip, #0 - ldreq r1, _037FBE48 ; =0x03807680 + ldreq r1, _037FBE48 ; =_03807680 streq lr, [r0, #0x4c] streq r0, [r1, #0x2c] ldrne r1, [ip, #0x4c] @@ -4742,12 +4742,12 @@ _037FBE24: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FBE48: .word 0x03807680 +_037FBE48: .word _03807680 arm_func_end sub_037FBDEC arm_func_start sub_037FBE4C sub_037FBE4C: ; 0x037FBE4C - ldr r1, _037FBE8C ; =0x03807680 + ldr r1, _037FBE8C ; =_03807680 mov r2, #0 ldr r1, [r1, #0x2c] b _037FBE64 @@ -4760,24 +4760,24 @@ _037FBE64: bne _037FBE5C cmp r2, #0 ldreq r1, [r0, #0x4c] - ldreq r0, _037FBE8C ; =0x03807680 + ldreq r0, _037FBE8C ; =_03807680 streq r1, [r0, #0x2c] ldrne r0, [r0, #0x4c] strne r0, [r2, #0x4c] bx lr .align 2, 0 -_037FBE8C: .word 0x03807680 +_037FBE8C: .word _03807680 arm_func_end sub_037FBE4C arm_func_start sub_037FBE90 sub_037FBE90: ; 0x037FBE90 stmdb sp!, {r4, r5, r6, lr} - ldr r0, _037FBF5C ; =0x03807680 + ldr r0, _037FBF5C ; =_03807680 ldr r1, [r0, #4] cmp r1, #0 bne _037FBF54 ldrh r0, [r0, #0x26] - ldr r4, _037FBF60 ; =0x038076A4 + ldr r4, _037FBF60 ; =_038076A4 cmp r0, #0 bne _037FBEC0 bl sub_037FDD58 @@ -4788,7 +4788,7 @@ _037FBEC0: strh r0, [r4] b _037FBF54 _037FBECC: - ldr r0, _037FBF5C ; =0x03807680 + ldr r0, _037FBF5C ; =_03807680 ldr r0, [r0, #8] ldr r6, [r0] bl sub_037FC398 @@ -4804,7 +4804,7 @@ _037FBECC: cmp r0, #0 bne _037FBF54 _037FBF08: - ldr r0, _037FBF5C ; =0x03807680 + ldr r0, _037FBF5C ; =_03807680 ldr r2, [r0] cmp r2, #0 beq _037FBF28 @@ -4821,7 +4821,7 @@ _037FBF28: mov lr, pc bx r2 _037FBF44: - ldr r1, _037FBF5C ; =0x03807680 + ldr r1, _037FBF5C ; =_03807680 mov r0, r5 str r5, [r1, #0x28] bl sub_037FC680 @@ -4829,18 +4829,18 @@ _037FBF54: ldmia sp!, {r4, r5, r6, lr} bx lr .align 2, 0 -_037FBF5C: .word 0x03807680 -_037FBF60: .word 0x038076A4 +_037FBF5C: .word _03807680 +_037FBF60: .word _038076A4 arm_func_end sub_037FBE90 arm_func_start sub_037FBF64 sub_037FBF64: ; 0x037FBF64 stmdb sp!, {r3, lr} - ldr r0, _037FC028 ; =0x03807680 + ldr r0, _037FC028 ; =_03807680 ldr r1, [r0, #0xc] cmp r1, #0 bne _037FC020 - ldr r1, _037FC02C ; =0x038076A8 + ldr r1, _037FC02C ; =_038076A8 mov r2, #1 str r2, [r0, #0xc] str r1, [r0, #8] @@ -4851,19 +4851,19 @@ sub_037FBF64: ; 0x037FBF64 str r2, [r0, #0x120] str r3, [r0, #0x124] ldr r2, _037FC030 ; =0x00000400 - ldr r1, _037FC034 ; =0x03807758 + ldr r1, _037FC034 ; =_03807758 str r3, [r0, #0x130] str r1, [r0, #0x2c] str r1, [r0, #0x28] cmp r2, #0 - ldrle r0, _037FC038 ; =0x037F8000 + ldrle r0, _037FC038 ; =sub_037F8000 ldrgt r1, _037FC03C ; =0x00000400 ldrgt r0, _037FC040 ; =0x0380FF80 subgt r0, r0, r1 sub ip, r0, r2 ldr r2, _037FC03C ; =0x00000400 ldr r0, _037FC040 ; =0x0380FF80 - ldr r1, _037FC028 ; =0x03807680 + ldr r1, _037FC028 ; =_03807680 sub r3, r0, r2 str r3, [r1, #0x150] str ip, [r1, #0x14c] @@ -4873,7 +4873,7 @@ sub_037FBF64: ; 0x037FBF64 str r2, [r3, #-4] ldr r2, [r1, #0x14c] ldr ip, _037FC048 ; =0xFBDD37BB - ldr r3, _037FC04C ; =0x038076A4 + ldr r3, _037FC04C ; =_038076A4 str ip, [r2] str r0, [r1, #0x15c] str r0, [r1, #0x158] @@ -4886,16 +4886,16 @@ _037FC020: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FC028: .word 0x03807680 -_037FC02C: .word 0x038076A8 +_037FC028: .word _03807680 +_037FC02C: .word _038076A8 _037FC030: .word 0x00000400 -_037FC034: .word 0x03807758 -_037FC038: .word 0x037F8000 +_037FC034: .word _03807758 +_037FC038: .word sub_037F8000 _037FC03C: .word 0x00000400 _037FC040: .word 0x0380FF80 _037FC044: .word 0xD73BFDF7 _037FC048: .word 0xFBDD37BB -_037FC04C: .word 0x038076A4 +_037FC04C: .word _038076A4 _037FC050: .word 0x027FFFA4 arm_func_end sub_037FBF64 @@ -4907,7 +4907,7 @@ sub_037FC054: ; 0x037FC054 mov r7, r2 mov r6, r3 bl sub_037FDD00 - ldr r1, _037FC14C ; =0x03807680 + ldr r1, _037FC14C ; =_03807680 ldr r2, [sp, #0x1c] ldr r3, [r1, #0x20] mov r4, r0 @@ -4938,7 +4938,7 @@ sub_037FC054: ; 0x037FC054 mov r0, r8 str ip, [r8, #0x80] bl sub_037FC5C8 - ldr r2, _037FC158 ; =0x037FC15C + ldr r2, _037FC158 ; =sub_037FC15C str r7, [r8, #4] str r2, [r8, #0x3c] ldr r2, [sp, #0x18] @@ -4964,36 +4964,36 @@ sub_037FC054: ; 0x037FC054 ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_037FC14C: .word 0x03807680 +_037FC14C: .word _03807680 _037FC150: .word 0xD73BFDF7 _037FC154: .word 0xFBDD37BB -_037FC158: .word 0x037FC15C +_037FC158: .word sub_037FC15C arm_func_end sub_037FC054 arm_func_start sub_037FC15C sub_037FC15C: ; 0x037FC15C stmdb sp!, {r3, lr} bl sub_037FDD00 - ldr r0, _037FC17C ; =0x03807680 + ldr r0, _037FC17C ; =_03807680 mov r1, #0 ldr r0, [r0, #0x28] bl sub_037FC180 ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FC17C: .word 0x03807680 +_037FC17C: .word _03807680 arm_func_end sub_037FC15C arm_func_start sub_037FC180 sub_037FC180: ; 0x037FC180 stmdb sp!, {r3, r4, r5, lr} - ldr r2, _037FC1D8 ; =0x03807680 + ldr r2, _037FC1D8 ; =_03807680 mov r5, r0 ldr r2, [r2, #0x1c] mov r4, r1 cmp r2, #0 beq _037FC1C8 - ldr r1, _037FC1DC ; =0x037FC1E0 + ldr r1, _037FC1DC ; =sub_037FC1E0 bl sub_037FC5C8 str r4, [r5, #4] ldr r1, [r5] @@ -5011,14 +5011,14 @@ _037FC1D0: ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_037FC1D8: .word 0x03807680 -_037FC1DC: .word 0x037FC1E0 +_037FC1D8: .word _03807680 +_037FC1DC: .word sub_037FC1E0 arm_func_end sub_037FC180 arm_func_start sub_037FC1E0 sub_037FC1E0: ; 0x037FC1E0 stmdb sp!, {r3, lr} - ldr r1, _037FC21C ; =0x03807680 + ldr r1, _037FC21C ; =_03807680 ldr r1, [r1, #8] ldr r3, [r1] ldr r2, [r3, #0x98] @@ -5035,13 +5035,13 @@ _037FC210: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FC21C: .word 0x03807680 +_037FC21C: .word _03807680 arm_func_end sub_037FC1E0 arm_func_start sub_037FC220 sub_037FC220: ; 0x037FC220 stmdb sp!, {r4, lr} - ldr r0, _037FC28C ; =0x03807680 + ldr r0, _037FC28C ; =_03807680 ldr r0, [r0, #8] ldr r4, [r0] bl sub_037FC558 @@ -5069,7 +5069,7 @@ _037FC250: ldmia sp!, {r4, lr} bx lr .align 2, 0 -_037FC28C: .word 0x03807680 +_037FC28C: .word _03807680 arm_func_end sub_037FC220 arm_func_start sub_037FC290 @@ -5077,7 +5077,7 @@ sub_037FC290: ; 0x037FC290 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 bl sub_037FDD00 - ldr r1, _037FC2E0 ; =0x03807680 + ldr r1, _037FC2E0 ; =_03807680 mov r4, r0 ldr r0, [r1, #8] cmp r6, #0 @@ -5096,7 +5096,7 @@ _037FC2C4: ldmia sp!, {r4, r5, r6, lr} bx lr .align 2, 0 -_037FC2E0: .word 0x03807680 +_037FC2E0: .word _03807680 arm_func_end sub_037FC290 arm_func_start sub_037FC2E4 @@ -5158,7 +5158,7 @@ sub_037FC36C: ; 0x037FC36C arm_func_start sub_037FC398 sub_037FC398: ; 0x037FC398 - ldr r0, _037FC3BC ; =0x03807680 + ldr r0, _037FC3BC ; =_03807680 ldr r0, [r0, #0x2c] b _037FC3A8 _037FC3A4: @@ -5170,13 +5170,13 @@ _037FC3A8: bne _037FC3A4 bx lr .align 2, 0 -_037FC3BC: .word 0x03807680 +_037FC3BC: .word _03807680 arm_func_end sub_037FC398 arm_func_start sub_037FC3C0 sub_037FC3C0: ; 0x037FC3C0 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r2, _037FC460 ; =0x03807680 + ldr r2, _037FC460 ; =_03807680 mov r7, r0 ldr r8, [r2, #0x2c] mov r6, r1 @@ -5192,7 +5192,7 @@ _037FC3EC: cmpne r8, r7 bne _037FC3E4 cmp r8, #0 - ldrne r0, _037FC464 ; =0x038076B4 + ldrne r0, _037FC464 ; =_038076B4 cmpne r8, r0 bne _037FC418 mov r0, r5 @@ -5205,7 +5205,7 @@ _037FC418: beq _037FC44C cmp r4, #0 ldreq r1, [r7, #0x4c] - ldreq r0, _037FC460 ; =0x03807680 + ldreq r0, _037FC460 ; =_03807680 streq r1, [r0, #0x2c] ldrne r0, [r7, #0x4c] strne r0, [r4, #0x4c] @@ -5221,8 +5221,8 @@ _037FC458: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_037FC460: .word 0x03807680 -_037FC464: .word 0x038076B4 +_037FC460: .word _03807680 +_037FC464: .word _038076B4 arm_func_end sub_037FC3C0 arm_func_start sub_037FC468 @@ -5232,7 +5232,7 @@ sub_037FC468: ; 0x037FC468 mov r4, r0 add r0, sp, #8 bl sub_037FD3A0 - ldr r0, _037FC500 ; =0x03807680 + ldr r0, _037FC500 ; =_03807680 ldr r0, [r0, #8] ldr r0, [r0] str r0, [sp, #4] @@ -5251,7 +5251,7 @@ sub_037FC468: ; 0x037FC468 str r2, [sp] mov r2, r3, lsr #6 orr r1, r1, r3, lsl #26 - ldr r3, _037FC508 ; =0x037FC50C + ldr r3, _037FC508 ; =sub_037FC50C bl sub_037FD4DC mov r4, #0 b _037FC4E0 @@ -5268,9 +5268,9 @@ _037FC4E0: ldmia sp!, {r4, r5, lr} bx lr .align 2, 0 -_037FC500: .word 0x03807680 +_037FC500: .word _03807680 _037FC504: .word 0x000082EA -_037FC508: .word 0x037FC50C +_037FC508: .word sub_037FC50C arm_func_end sub_037FC468 arm_func_start sub_037FC50C @@ -5291,7 +5291,7 @@ sub_037FC52C: ; 0x037FC52C stmdb sp!, {r3, r4, r5, lr} mov r5, r0 bl sub_037FDD00 - ldr r1, _037FC554 ; =0x03807680 + ldr r1, _037FC554 ; =_03807680 ldr r4, [r1, #0x30] str r5, [r1, #0x30] bl sub_037FDD14 @@ -5299,14 +5299,14 @@ sub_037FC52C: ; 0x037FC52C ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_037FC554: .word 0x03807680 +_037FC554: .word _03807680 arm_func_end sub_037FC52C arm_func_start sub_037FC558 sub_037FC558: ; 0x037FC558 stmdb sp!, {r4, lr} bl sub_037FDD00 - ldr r2, _037FC58C ; =0x03807680 + ldr r2, _037FC58C ; =_03807680 mvn r1, #0 ldr r3, [r2, #4] cmp r3, r1 @@ -5318,14 +5318,14 @@ sub_037FC558: ; 0x037FC558 ldmia sp!, {r4, lr} bx lr .align 2, 0 -_037FC58C: .word 0x03807680 +_037FC58C: .word _03807680 arm_func_end sub_037FC558 arm_func_start sub_037FC590 sub_037FC590: ; 0x037FC590 stmdb sp!, {r4, lr} bl sub_037FDD00 - ldr r1, _037FC5C4 ; =0x03807680 + ldr r1, _037FC5C4 ; =_03807680 mov r4, #0 ldr r3, [r1, #4] cmp r3, #0 @@ -5337,7 +5337,7 @@ sub_037FC590: ; 0x037FC590 ldmia sp!, {r4, lr} bx lr .align 2, 0 -_037FC5C4: .word 0x03807680 +_037FC5C4: .word _03807680 arm_func_end sub_037FC590 arm_func_start sub_037FC5C8 @@ -5571,7 +5571,7 @@ sub_037FC888: ; 0x037FC888 stmdb sp!, {r3, r4, r5, r6, r7, lr} mov r5, r0 bl sub_037FDD00 - ldr r1, _037FC908 ; =0x038076A4 + ldr r1, _037FC908 ; =_038076A4 mov r4, r0 ldr r7, [r1, #4] mov r6, #0 @@ -5604,7 +5604,7 @@ _037FC8F8: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_037FC908: .word 0x038076A4 +_037FC908: .word _038076A4 arm_func_end sub_037FC888 arm_func_start sub_037FC90C @@ -5612,7 +5612,7 @@ sub_037FC90C: ; 0x037FC90C stmdb sp!, {r3, r4, r5, lr} mov r5, r0 bl sub_037FDD00 - ldr r1, _037FC968 ; =0x038076A4 + ldr r1, _037FC968 ; =_038076A4 mov r4, r0 ldr r0, [r1, #4] ldr r1, [r5, #8] @@ -5634,7 +5634,7 @@ _037FC958: ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_037FC968: .word 0x038076A4 +_037FC968: .word _038076A4 arm_func_end sub_037FC90C arm_func_start sub_037FC96C @@ -5702,7 +5702,7 @@ sub_037FC9EC: ; 0x037FC9EC arm_func_start sub_037FCA1C sub_037FCA1C: ; 0x037FCA1C stmdb sp!, {r3, lr} - ldr r1, _037FCA54 ; =0x038077FC + ldr r1, _037FCA54 ; =_038077FC ldr r0, [r1] cmp r0, #0 bne _037FCA4C @@ -5717,7 +5717,7 @@ _037FCA4C: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FCA54: .word 0x038077FC +_037FCA54: .word _038077FC arm_func_end sub_037FCA1C arm_func_start sub_037FCA58 @@ -5775,7 +5775,7 @@ _037FCAE0: _037FCAE8: ldr r2, _037FCB28 ; =0x00000400 ldr r0, _037FCB2C ; =0x0380FF80 - ldr r1, _037FCB30 ; =0x0380B488 + ldr r1, _037FCB30 ; =_0380B488 sub r2, r0, r2 mov r0, #0x3800000 cmp r1, #0x3800000 @@ -5793,7 +5793,7 @@ _037FCB1C: _037FCB24: .word 0x027FF000 _037FCB28: .word 0x00000400 _037FCB2C: .word 0x0380FF80 -_037FCB30: .word 0x0380B488 +_037FCB30: .word _0380B488 _037FCB34: .word 0x00000400 arm_func_end sub_037FCABC @@ -5810,12 +5810,12 @@ _037FCB54: ldr r0, _037FCB88 ; =0x027F91E0 bx lr _037FCB5C: - ldr r0, _037FCB8C ; =0x0380B488 + ldr r0, _037FCB8C ; =_0380B488 cmp r0, #0x3800000 movhi r0, #0x3800000 bx lr _037FCB6C: - ldr r1, _037FCB8C ; =0x0380B488 + ldr r1, _037FCB8C ; =_0380B488 mov r0, #0x3800000 cmp r1, #0x3800000 movhi r0, r1 @@ -5825,7 +5825,7 @@ _037FCB80: bx lr .align 2, 0 _037FCB88: .word 0x027F91E0 -_037FCB8C: .word 0x0380B488 +_037FCB8C: .word _0380B488 arm_func_end sub_037FCB38 arm_func_start sub_037FCB90 @@ -5910,7 +5910,7 @@ sub_037FCC74: ; 0x037FCC74 mov r5, r1 mov r7, r2 bl sub_037FDD00 - ldr r1, _037FCD80 ; =0x03807800 + ldr r1, _037FCD80 ; =_03807800 mov r6, r0 ldr r1, [r1, r4, lsl #2] cmp r1, #0 @@ -5981,7 +5981,7 @@ _037FCD78: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_037FCD80: .word 0x03807800 +_037FCD80: .word _03807800 arm_func_end sub_037FCC74 arm_func_start sub_037FCD84 @@ -5991,7 +5991,7 @@ sub_037FCD84: ; 0x037FCD84 mov r6, r1 mov r5, r2 bl sub_037FDD00 - ldr r1, _037FCDEC ; =0x03807800 + ldr r1, _037FCDEC ; =_03807800 mov r4, r0 ldr r0, [r1, r7, lsl #2] cmp r6, #0 @@ -6013,7 +6013,7 @@ sub_037FCD84: ; 0x037FCD84 ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_037FCDEC: .word 0x03807800 +_037FCDEC: .word _03807800 arm_func_end sub_037FCD84 arm_func_start sub_037FCDF0 @@ -6022,7 +6022,7 @@ sub_037FCDF0: ; 0x037FCDF0 mov r4, r0 mov r5, r1 bl sub_037FDD00 - ldr r1, _037FCE20 ; =0x03807800 + ldr r1, _037FCE20 ; =_03807800 ldr r1, [r1, r4, lsl #2] ldr r4, [r1] str r5, [r1] @@ -6031,7 +6031,7 @@ sub_037FCDF0: ; 0x037FCDF0 ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_037FCE20: .word 0x03807800 +_037FCE20: .word _03807800 arm_func_end sub_037FCDF0 arm_func_start sub_037FCE24 @@ -6042,7 +6042,7 @@ sub_037FCE24: ; 0x037FCE24 mov r4, r2 mov r6, r3 bl sub_037FDD00 - ldr r2, _037FCEC8 ; =0x03807800 + ldr r2, _037FCEC8 ; =_03807800 mov r1, #0xc str r5, [r2, r7, lsl #2] add r2, r5, #0x14 @@ -6080,7 +6080,7 @@ _037FCE88: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_037FCEC8: .word 0x03807800 +_037FCEC8: .word _03807800 arm_func_end sub_037FCE24 arm_func_start sub_037FCECC @@ -6090,7 +6090,7 @@ sub_037FCECC: ; 0x037FCECC mov r6, r1 mov r5, r2 bl sub_037FDD00 - ldr r2, _037FCF68 ; =0x03807800 + ldr r2, _037FCF68 ; =_03807800 add r1, r6, #0x1f ldr lr, [r2, r4, lsl #2] bic r6, r1, #0x1f @@ -6129,7 +6129,7 @@ _037FCF60: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_037FCF68: .word 0x03807800 +_037FCF68: .word _03807800 arm_func_end sub_037FCECC arm_func_start sub_037FCF6C @@ -6141,7 +6141,7 @@ sub_037FCF6C: ; 0x037FCF6C mov r5, r4 sub r6, r4, #1 bl sub_037FDD00 - ldr r1, _037FD108 ; =0x03807800 + ldr r1, _037FD108 ; =_03807800 mvn r2, #0 ldr r1, [r1, r8, lsl #2] cmp r7, r2 @@ -6244,25 +6244,25 @@ _037FD0F8: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_037FD108: .word 0x03807800 +_037FD108: .word _03807800 arm_func_end sub_037FCF6C arm_func_start sub_037FD10C sub_037FD10C: ; 0x037FD10C - ldr r1, _037FD124 ; =0x03807824 + ldr r1, _037FD124 ; =_03807824 mov r2, #1 ldrh r3, [r1] orr r0, r3, r2, lsl r0 strh r0, [r1] bx lr .align 2, 0 -_037FD124: .word 0x03807824 +_037FD124: .word _03807824 arm_func_end sub_037FD10C arm_func_start sub_037FD128 sub_037FD128: ; 0x037FD128 stmdb sp!, {r3, lr} - ldr r1, _037FD198 ; =0x03807828 + ldr r1, _037FD198 ; =_03807828 ldrh r0, [r1] cmp r0, #0 bne _037FD190 @@ -6270,13 +6270,13 @@ sub_037FD128: ; 0x037FD128 mov r0, #0 strh r2, [r1] bl sub_037FD10C - ldr r0, _037FD198 ; =0x03807828 + ldr r0, _037FD198 ; =_03807828 mov r2, #0 str r2, [r0, #8] ldr r3, _037FD19C ; =0x04000102 str r2, [r0, #0xc] strh r2, [r3] - ldr r1, _037FD1A0 ; =0x037FD1B4 + ldr r1, _037FD1A0 ; =sub_037FD1B4 strh r2, [r3, #-2] mov r2, #0xc1 mov r0, #8 @@ -6284,30 +6284,30 @@ sub_037FD128: ; 0x037FD128 bl sub_037FB7BC mov r0, #8 bl sub_037FB8F0 - ldr r0, _037FD198 ; =0x03807828 + ldr r0, _037FD198 ; =_03807828 mov r1, #0 str r1, [r0, #4] _037FD190: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FD198: .word 0x03807828 +_037FD198: .word _03807828 _037FD19C: .word 0x04000102 -_037FD1A0: .word 0x037FD1B4 +_037FD1A0: .word sub_037FD1B4 arm_func_end sub_037FD128 arm_func_start sub_037FD1A4 sub_037FD1A4: ; 0x037FD1A4 - ldr r0, _037FD1B0 ; =0x03807828 + ldr r0, _037FD1B0 ; =_03807828 ldrh r0, [r0] bx lr .align 2, 0 -_037FD1B0: .word 0x03807828 +_037FD1B0: .word _03807828 arm_func_end sub_037FD1A4 arm_func_start sub_037FD1B4 sub_037FD1B4: ; 0x037FD1B4 - ldr r0, _037FD20C ; =0x03807828 + ldr r0, _037FD20C ; =_03807828 mov r3, #0 ldr r2, [r0, #8] ldr r1, [r0, #0xc] @@ -6327,14 +6327,14 @@ sub_037FD1B4: ; 0x037FD1B4 _037FD1F8: ldr ip, _037FD214 ; =sub_037FB858 mov r0, #0 - ldr r1, _037FD218 ; =0x037FD1B4 + ldr r1, _037FD218 ; =sub_037FD1B4 mov r2, r0 bx ip .align 2, 0 -_037FD20C: .word 0x03807828 +_037FD20C: .word _03807828 _037FD210: .word 0x04000102 _037FD214: .word sub_037FB858 -_037FD218: .word 0x037FD1B4 +_037FD218: .word sub_037FD1B4 arm_func_end sub_037FD1B4 arm_func_start sub_037FD21C @@ -6343,7 +6343,7 @@ sub_037FD21C: ; 0x037FD21C sub sp, sp, #0xc bl sub_037FDD00 ldr lr, _037FD2B4 ; =0x04000100 - ldr r1, _037FD2B8 ; =0x03807828 + ldr r1, _037FD2B8 ; =_03807828 ldrh r3, [lr] ldr r2, _037FD2BC ; =0x0000FFFF strh r3, [sp] @@ -6380,7 +6380,7 @@ _037FD288: bx lr .align 2, 0 _037FD2B4: .word 0x04000100 -_037FD2B8: .word 0x03807828 +_037FD2B8: .word _03807828 _037FD2BC: .word 0x0000FFFF arm_func_end sub_037FD21C @@ -6396,7 +6396,7 @@ sub_037FD2C0: ; 0x037FD2C0 ldr r3, [r4, #0x10] subs r5, ip, r0 sbc r4, r3, r1 - ldr r1, _037FD340 ; =0x037FD648 + ldr r1, _037FD340 ; =sub_037FD648 mov r0, #1 bl sub_037FB858 subs r0, r5, #0 @@ -6420,7 +6420,7 @@ _037FD31C: bx lr .align 2, 0 _037FD33C: .word 0x04000106 -_037FD340: .word 0x037FD648 +_037FD340: .word sub_037FD648 _037FD344: .word 0x0000FFFE _037FD348: .word 0x04000104 arm_func_end sub_037FD2C0 @@ -6428,14 +6428,14 @@ _037FD348: .word 0x04000104 arm_func_start sub_037FD34C sub_037FD34C: ; 0x037FD34C stmdb sp!, {r3, lr} - ldr r1, _037FD38C ; =0x03807838 + ldr r1, _037FD38C ; =_03807838 ldrh r0, [r1] cmp r0, #0 bne _037FD384 mov r0, #1 strh r0, [r1] bl sub_037FD10C - ldr r1, _037FD38C ; =0x03807838 + ldr r1, _037FD38C ; =_03807838 mov r2, #0 str r2, [r1, #4] mov r0, #0x10 @@ -6445,16 +6445,16 @@ _037FD384: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FD38C: .word 0x03807838 +_037FD38C: .word _03807838 arm_func_end sub_037FD34C arm_func_start sub_037FD390 sub_037FD390: ; 0x037FD390 - ldr r0, _037FD39C ; =0x03807838 + ldr r0, _037FD39C ; =_03807838 ldrh r0, [r0] bx lr .align 2, 0 -_037FD39C: .word 0x03807838 +_037FD39C: .word _03807838 arm_func_end sub_037FD390 arm_func_start sub_037FD3A0 @@ -6498,7 +6498,7 @@ sub_037FD3B0: ; 0x037FD3B0 adc r6, r6, r1 _037FD424: str r7, [r8, #0xc] - ldr r0, _037FD4D8 ; =0x03807838 + ldr r0, _037FD4D8 ; =_03807838 str r6, [r8, #0x10] mov r2, #0 ldr r5, [r0, #4] @@ -6520,7 +6520,7 @@ _037FD440: cmp r0, #0 strne r8, [r0, #0x18] bne _037FD4D0 - ldr r1, _037FD4D8 ; =0x03807838 + ldr r1, _037FD4D8 ; =_03807838 mov r0, r8 str r8, [r1, #4] bl sub_037FD2C0 @@ -6530,7 +6530,7 @@ _037FD490: _037FD494: cmp r5, #0 bne _037FD440 - ldr r1, _037FD4D8 ; =0x03807838 + ldr r1, _037FD4D8 ; =_03807838 mov r0, #0 str r0, [r8, #0x18] ldr r0, [r1, #8] @@ -6547,7 +6547,7 @@ _037FD4D0: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_037FD4D8: .word 0x03807838 +_037FD4D8: .word _03807838 arm_func_end sub_037FD3B0 arm_func_start sub_037FD4DC @@ -6634,7 +6634,7 @@ _037FD5E4: ldr r0, [r5, #0x18] cmp r0, #0 ldreq r2, [r5, #0x14] - ldreq r1, _037FD644 ; =0x03807838 + ldreq r1, _037FD644 ; =_03807838 streq r2, [r1, #8] ldrne r1, [r5, #0x14] strne r1, [r0, #0x14] @@ -6642,7 +6642,7 @@ _037FD5E4: cmp r1, #0 strne r0, [r1, #0x18] bne _037FD624 - ldr r1, _037FD644 ; =0x03807838 + ldr r1, _037FD644 ; =_03807838 cmp r0, #0 str r0, [r1, #4] beq _037FD624 @@ -6658,7 +6658,7 @@ _037FD63C: ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_037FD644: .word 0x03807838 +_037FD644: .word _03807838 arm_func_end sub_037FD5C0 arm_func_start sub_037FD648 @@ -6682,7 +6682,7 @@ sub_037FD658: ; 0x037FD658 orr r0, r0, #0x10 str r0, [r1] bl sub_037FD21C - ldr r2, _037FD748 ; =0x03807838 + ldr r2, _037FD748 ; =_03807838 ldr r4, [r2, #4] cmp r4, #0 beq _037FD738 @@ -6725,7 +6725,7 @@ _037FD6FC: str r5, [r4] bl sub_037FD3B0 _037FD724: - ldr r0, _037FD748 ; =0x03807838 + ldr r0, _037FD748 ; =_03807838 ldr r0, [r0, #4] cmp r0, #0 beq _037FD738 @@ -6736,13 +6736,13 @@ _037FD738: .align 2, 0 _037FD740: .word 0x04000106 _037FD744: .word 0x0380FFF8 -_037FD748: .word 0x03807838 +_037FD748: .word _03807838 arm_func_end sub_037FD658 arm_func_start sub_037FD74C sub_037FD74C: ; 0x037FD74C stmdb sp!, {r3, lr} - ldr r1, _037FD794 ; =0x03807844 + ldr r1, _037FD794 ; =_03807844 ldrh r0, [r1] cmp r0, #0 bne _037FD78C @@ -6753,7 +6753,7 @@ sub_037FD74C: ; 0x037FD74C mov r0, #4 str r2, [r1, #0x10] bl sub_037FB928 - ldr r0, _037FD794 ; =0x03807844 + ldr r0, _037FD794 ; =_03807844 mov r1, #0 str r1, [r0, #8] str r1, [r0, #4] @@ -6761,22 +6761,22 @@ _037FD78C: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FD794: .word 0x03807844 +_037FD794: .word _03807844 arm_func_end sub_037FD74C arm_func_start sub_037FD798 sub_037FD798: ; 0x037FD798 - ldr r0, _037FD7A4 ; =0x03807844 + ldr r0, _037FD7A4 ; =_03807844 ldrh r0, [r0] bx lr .align 2, 0 -_037FD7A4: .word 0x03807844 +_037FD7A4: .word _03807844 arm_func_end sub_037FD798 arm_func_start sub_037FD7A8 sub_037FD7A8: ; 0x037FD7A8 stmdb sp!, {r3, lr} - ldr r1, _037FD848 ; =0x03807844 + ldr r1, _037FD848 ; =_03807844 ldr r3, [r1, #0xc] b _037FD80C _037FD7B8: @@ -6797,7 +6797,7 @@ _037FD7DC: cmp r1, #0 strne r0, [r1, #0x18] bne _037FD840 - ldr r1, _037FD848 ; =0x03807844 + ldr r1, _037FD848 ; =_03807844 str r0, [r1, #0xc] bl sub_037FD9B8 b _037FD840 @@ -6806,7 +6806,7 @@ _037FD808: _037FD80C: cmp r3, #0 bne _037FD7B8 - ldr r1, _037FD848 ; =0x03807844 + ldr r1, _037FD848 ; =_03807844 mov r2, #0 ldr r3, [r1, #0x10] str r3, [r0, #0x14] @@ -6821,7 +6821,7 @@ _037FD840: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FD848: .word 0x03807844 +_037FD848: .word _03807844 arm_func_end sub_037FD7A8 arm_func_start sub_037FD84C @@ -6831,16 +6831,16 @@ sub_037FD84C: ; 0x037FD84C ldr r2, [r0, #0x18] ldr r1, [r0, #0x14] cmp r2, #0 - ldreq r0, _037FD880 ; =0x03807844 + ldreq r0, _037FD880 ; =_03807844 strne r1, [r2, #0x14] streq r1, [r0, #0x10] cmp r1, #0 - ldreq r0, _037FD880 ; =0x03807844 + ldreq r0, _037FD880 ; =_03807844 strne r2, [r1, #0x18] streq r2, [r0, #0xc] bx lr .align 2, 0 -_037FD880: .word 0x03807844 +_037FD880: .word _03807844 arm_func_end sub_037FD84C arm_func_start sub_037FD884 @@ -6941,7 +6941,7 @@ _037FD9B4: .word 0x04000006 arm_func_start sub_037FD9B8 sub_037FD9B8: ; 0x037FD9B8 stmdb sp!, {r4, lr} - ldr r1, _037FDA0C ; =0x037FDAF8 + ldr r1, _037FDA0C ; =sub_037FDAF8 mov r4, r0 mov r0, #4 bl sub_037FB7BC @@ -6962,7 +6962,7 @@ sub_037FD9B8: ; 0x037FD9B8 ldmia sp!, {r4, lr} bx lr .align 2, 0 -_037FDA0C: .word 0x037FDAF8 +_037FDA0C: .word sub_037FDAF8 _037FDA10: .word 0x04000004 arm_func_end sub_037FD9B8 @@ -7015,7 +7015,7 @@ sub_037FDA84: ; 0x037FDA84 bne _037FDAA0 bl sub_037FDE70 _037FDAA0: - ldr r0, _037FDAF4 ; =0x03807844 + ldr r0, _037FDAF4 ; =_03807844 mov r4, #0 ldr r0, [r0, #0xc] cmp r0, #0 @@ -7040,7 +7040,7 @@ _037FDADC: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_037FDAF4: .word 0x03807844 +_037FDAF4: .word _03807844 arm_func_end sub_037FDA84 arm_func_start sub_037FDAF8 @@ -7066,7 +7066,7 @@ sub_037FDAF8: ; 0x037FDAF8 bl sub_037FDCA8 ldr sl, _037FDCA0 ; =0x04000006 mov r6, #0 - ldr r5, _037FDCA4 ; =0x03807844 + ldr r5, _037FDCA4 ; =_03807844 sub r7, sl, #2 mov fp, #1 mov r8, r6 @@ -7163,7 +7163,7 @@ _037FDC90: _037FDC98: .word 0x04000004 _037FDC9C: .word 0x0380FFF8 _037FDCA0: .word 0x04000006 -_037FDCA4: .word 0x03807844 +_037FDCA4: .word _03807844 arm_func_end sub_037FDAF8 arm_func_start sub_037FDCA8 @@ -7171,21 +7171,21 @@ sub_037FDCA8: ; 0x037FDCA8 stmdb sp!, {r4, lr} mov r4, r0 bl sub_037FDD00 - ldr r1, _037FDCE8 ; =0x03807844 + ldr r1, _037FDCE8 ; =_03807844 ldr r2, [r1, #4] cmp r4, r2 ldrlt r2, [r1, #8] addlt r2, r2, #1 strlt r2, [r1, #8] - ldr r1, _037FDCE8 ; =0x03807844 + ldr r1, _037FDCE8 ; =_03807844 str r4, [r1, #4] bl sub_037FDD14 - ldr r0, _037FDCE8 ; =0x03807844 + ldr r0, _037FDCE8 ; =_03807844 ldr r0, [r0, #8] ldmia sp!, {r4, lr} bx lr .align 2, 0 -_037FDCE8: .word 0x03807844 +_037FDCE8: .word _03807844 arm_func_end sub_037FDCA8 arm_func_start sub_037FDCEC @@ -7256,11 +7256,11 @@ _037FDD78: .word sub_038037B8 + 1 arm_func_start sub_037FDD7C sub_037FDD7C: ; 0x037FDD7C stmdb sp!, {r3, lr} - ldr r2, _037FDDAC ; =0x03807858 + ldr r2, _037FDDAC ; =_03807858 ldrh r0, [r2] cmp r0, #0 bne _037FDDA4 - ldr r1, _037FDDB0 ; =0x037FDDC4 + ldr r1, _037FDDB0 ; =sub_037FDDC4 mov r3, #1 mov r0, #0xc strh r3, [r2] @@ -7269,17 +7269,17 @@ _037FDDA4: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FDDAC: .word 0x03807858 -_037FDDB0: .word 0x037FDDC4 +_037FDDAC: .word _03807858 +_037FDDB0: .word sub_037FDDC4 arm_func_end sub_037FDD7C arm_func_start sub_037FDDB4 sub_037FDDB4: ; 0x037FDDB4 - ldr r0, _037FDDC0 ; =0x03807858 + ldr r0, _037FDDC0 ; =_03807858 ldrh r0, [r0, #2] bx lr .align 2, 0 -_037FDDC0: .word 0x03807858 +_037FDDC0: .word _03807858 arm_func_end sub_037FDDB4 arm_func_start sub_037FDDC4 @@ -7289,7 +7289,7 @@ sub_037FDDC4: ; 0x037FDDC4 mov r0, r0, lsl #8 mov r0, r0, lsr #0x10 cmp r0, #0x10 - ldreq r0, _037FDDF4 ; =0x03807858 + ldreq r0, _037FDDF4 ; =_03807858 moveq r1, #1 streqh r1, [r0, #2] beq _037FDDEC @@ -7298,7 +7298,7 @@ _037FDDEC: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FDDF4: .word 0x03807858 +_037FDDF4: .word _03807858 arm_func_end sub_037FDDC4 arm_func_start sub_037FDDF8 @@ -7737,7 +7737,7 @@ _037FE2BC: .word sub_037FE2C0 sub_037FE2C0: ; 0x037FE2C0 stmdb sp!, {r4, r5, r6, r7, r8, lr} bl sub_037FDD00 - ldr r1, _037FE380 ; =0x0380785C + ldr r1, _037FE380 ; =_0380785C mov r4, r0 ldrh r0, [r1] cmp r0, #0 @@ -7747,7 +7747,7 @@ sub_037FE2C0: ; 0x037FE2C0 strh r2, [r1] mov r2, #0 str r2, [r0, #0x38c] - ldr r0, _037FE388 ; =0x03807860 + ldr r0, _037FE388 ; =_03807860 mov r1, r2 _037FE2F8: str r1, [r0, r2, lsl #2] @@ -7759,7 +7759,7 @@ _037FE2F8: mov r0, #0x40000 strh r2, [r1] bl sub_037FB964 - ldr r1, _037FE394 ; =0x037FE4A8 + ldr r1, _037FE394 ; =sub_037FE4A8 mov r0, #0x40000 bl sub_037FB7BC mov r0, #0x40000 @@ -7788,12 +7788,12 @@ _037FE370: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_037FE380: .word 0x0380785C +_037FE380: .word _0380785C _037FE384: .word 0x027FFC00 -_037FE388: .word 0x03807860 +_037FE388: .word _03807860 _037FE38C: .word 0x0000C408 _037FE390: .word 0x04000184 -_037FE394: .word 0x037FE4A8 +_037FE394: .word sub_037FE4A8 _037FE398: .word 0x04000180 arm_func_end sub_037FE2C0 @@ -7803,7 +7803,7 @@ sub_037FE39C: ; 0x037FE39C mov r4, r0 mov r5, r1 bl sub_037FDD00 - ldr r1, _037FE3E4 ; =0x03807860 + ldr r1, _037FE3E4 ; =_03807860 ldr r3, _037FE3E8 ; =0x027FFC00 str r5, [r1, r4, lsl #2] cmp r5, #0 @@ -7818,7 +7818,7 @@ sub_037FE39C: ; 0x037FE39C ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_037FE3E4: .word 0x03807860 +_037FE3E4: .word _03807860 _037FE3E8: .word 0x027FFC00 arm_func_end sub_037FE39C @@ -7891,7 +7891,7 @@ sub_037FE4A8: ; 0x037FE4A8 sub sp, sp, #4 ldr r6, [sp] mvn r8, #3 - ldr r4, _037FE580 ; =0x03807860 + ldr r4, _037FE580 ; =_03807860 ldr sb, _037FE584 ; =0x04000184 add sl, r8, #1 mov r7, #0x4100000 @@ -7948,7 +7948,7 @@ _037FE574: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr} bx lr .align 2, 0 -_037FE580: .word 0x03807860 +_037FE580: .word _03807860 _037FE584: .word 0x04000184 arm_func_end sub_037FE4A8 @@ -7990,26 +7990,26 @@ _037FE5E0: mov r0, #0 b _037FE640 _037FE5E8: - ldr r0, _037FE64C ; =0x038078E0 + ldr r0, _037FE64C ; =_038078E0 ldr r0, [r0] cmp r0, #0 movne r0, #0 bne _037FE640 - ldr r0, _037FE650 ; =0x038078E4 + ldr r0, _037FE650 ; =_038078E4 bl sub_037FD3A0 bl sub_037FD21C - ldr r2, _037FE654 ; =0x037FE65C + ldr r2, _037FE654 ; =sub_037FE65C ldr r3, _037FE658 ; =0x0000082E str r2, [sp, #4] adds ip, r0, r3 mov lr, #0 str lr, [sp, #8] adc r2, r1, #0 - ldr r0, _037FE650 ; =0x038078E4 + ldr r0, _037FE650 ; =_038078E4 mov r1, ip str lr, [sp] bl sub_037FD54C - ldr r1, _037FE64C ; =0x038078E0 + ldr r1, _037FE64C ; =_038078E0 mov r0, #1 str r0, [r1] _037FE640: @@ -8017,9 +8017,9 @@ _037FE640: ldmia sp!, {lr} bx lr .align 2, 0 -_037FE64C: .word 0x038078E0 -_037FE650: .word 0x038078E4 -_037FE654: .word 0x037FE65C +_037FE64C: .word _038078E0 +_037FE650: .word _038078E4 +_037FE654: .word sub_037FE65C _037FE658: .word 0x0000082E arm_func_end sub_037FE5C0 @@ -8178,15 +8178,15 @@ _037FE800: .word 0x04000501 arm_func_start sub_037FE804 sub_037FE804: ; 0x037FE804 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r4, _037FE8BC ; =0x03807558 + ldr r4, _037FE8BC ; =_03807558 mov r8, r1 ldr lr, [r4] - ldr r1, _037FE8C0 ; =0x03807910 + ldr r1, _037FE8C0 ; =_03807910 mov r7, r2 ldr r5, [sp, #0x2c] - ldr r4, _037FE8C4 ; =0x03807914 + ldr r4, _037FE8C4 ; =_03807914 ldr ip, [sp, #0x20] - ldr r2, _037FE8C8 ; =0x03807924 + ldr r2, _037FE8C8 ; =_03807924 strb r5, [r4, r0] cmp lr, #0 ldr r1, [r1] @@ -8225,24 +8225,24 @@ _037FE870: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_037FE8BC: .word 0x03807558 -_037FE8C0: .word 0x03807910 -_037FE8C4: .word 0x03807914 -_037FE8C8: .word 0x03807924 +_037FE8BC: .word _03807558 +_037FE8C0: .word _03807910 +_037FE8C4: .word _03807914 +_037FE8C8: .word _03807924 _037FE8CC: .word 0x0000FFF5 arm_func_end sub_037FE804 arm_func_start sub_037FE8D0 sub_037FE8D0: ; 0x037FE8D0 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r4, _037FE968 ; =0x03807558 + ldr r4, _037FE968 ; =_03807558 mov r7, r1 ldr ip, [r4] - ldr r1, _037FE96C ; =0x03807910 + ldr r1, _037FE96C ; =_03807910 mov r6, r3 - ldr r3, _037FE970 ; =0x03807924 + ldr r3, _037FE970 ; =_03807924 ldr r5, [sp, #0x1c] - ldr r4, _037FE974 ; =0x03807914 + ldr r4, _037FE974 ; =_03807914 ldr r1, [r1] strb r5, [r4, r0] cmp ip, #0 @@ -8274,24 +8274,24 @@ _037FE934: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_037FE968: .word 0x03807558 -_037FE96C: .word 0x03807910 -_037FE970: .word 0x03807924 -_037FE974: .word 0x03807914 +_037FE968: .word _03807558 +_037FE96C: .word _03807910 +_037FE970: .word _03807924 +_037FE974: .word _03807914 _037FE978: .word 0x0000FFF5 arm_func_end sub_037FE8D0 arm_func_start sub_037FE97C sub_037FE97C: ; 0x037FE97C stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r4, _037FEA0C ; =0x03807558 + ldr r4, _037FEA0C ; =_03807558 mov r7, r2 ldr ip, [r4] - ldr r2, _037FEA10 ; =0x03807910 + ldr r2, _037FEA10 ; =_03807910 mov r6, r3 - ldr r3, _037FEA14 ; =0x03807924 + ldr r3, _037FEA14 ; =_03807924 ldr r5, [sp, #0x18] - ldr r4, _037FEA18 ; =0x03807914 + ldr r4, _037FEA18 ; =_03807914 ldr r2, [r2] strb r5, [r4, r0] cmp ip, #0 @@ -8321,10 +8321,10 @@ _037FE9E0: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_037FEA0C: .word 0x03807558 -_037FEA10: .word 0x03807910 -_037FEA14: .word 0x03807924 -_037FEA18: .word 0x03807914 +_037FEA0C: .word _03807558 +_037FEA10: .word _03807910 +_037FEA14: .word _03807924 +_037FEA18: .word _03807914 _037FEA1C: .word 0x0000FFF5 arm_func_end sub_037FE97C @@ -8345,8 +8345,8 @@ sub_037FEA20: ; 0x037FEA20 arm_func_start sub_037FEA48 sub_037FEA48: ; 0x037FEA48 stmdb sp!, {r3, r4, r5, lr} - ldr r3, _037FEAB4 ; =0x03807910 - ldr ip, _037FEAB8 ; =0x03807924 + ldr r3, _037FEAB4 ; =_03807910 + ldr ip, _037FEAB8 ; =_03807924 ldr r3, [r3] mov r5, r0 mov r4, r2 @@ -8373,8 +8373,8 @@ _037FEA98: ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_037FEAB4: .word 0x03807910 -_037FEAB8: .word 0x03807924 +_037FEAB4: .word _03807910 +_037FEAB8: .word _03807924 _037FEABC: .word 0x0000FFF5 arm_func_end sub_037FEA48 @@ -8391,12 +8391,12 @@ sub_037FEAC0: ; 0x037FEAC0 arm_func_start sub_037FEAD8 sub_037FEAD8: ; 0x037FEAD8 stmdb sp!, {r4, lr} - ldr r2, _037FEB3C ; =0x03807558 - ldr r3, _037FEB40 ; =0x03807914 + ldr r2, _037FEB3C ; =_03807558 + ldr r3, _037FEB40 ; =_03807914 ldr r2, [r2] strb r1, [r3, r0] cmp r2, #0 - ldr r3, _037FEB44 ; =0x03807910 + ldr r3, _037FEB44 ; =_03807910 mov r4, r0, lsl #4 movge r1, r2 add r2, r4, #0x4000000 @@ -8408,7 +8408,7 @@ sub_037FEAD8: ; 0x037FEAD8 mov r3, #1 tst r2, r3, lsl r0 beq _037FEB34 - ldr r2, _037FEB4C ; =0x03807924 + ldr r2, _037FEB4C ; =_03807924 ldrb r0, [r2, r0] bl sub_037FEC40 add r1, r4, #0x4000000 @@ -8417,11 +8417,11 @@ _037FEB34: ldmia sp!, {r4, lr} bx lr .align 2, 0 -_037FEB3C: .word 0x03807558 -_037FEB40: .word 0x03807914 -_037FEB44: .word 0x03807910 +_037FEB3C: .word _03807558 +_037FEB40: .word _03807914 +_037FEB44: .word _03807910 _037FEB48: .word 0x0000FFF5 -_037FEB4C: .word 0x03807924 +_037FEB4C: .word _03807924 arm_func_end sub_037FEAD8 arm_func_start sub_037FEB50 @@ -8437,7 +8437,7 @@ sub_037FEB50: ; 0x037FEB50 arm_func_start sub_037FEB6C sub_037FEB6C: ; 0x037FEB6C - ldr r1, _037FEBC8 ; =0x03807558 + ldr r1, _037FEBC8 ; =_03807558 cmp r0, #0 str r0, [r1] blt _037FEBA0 @@ -8452,7 +8452,7 @@ _037FEB84: blt _037FEB84 bx lr _037FEBA0: - ldr r2, _037FEBCC ; =0x03807914 + ldr r2, _037FEBCC ; =_03807914 mov r3, #0 _037FEBA8: ldrb r1, [r2, r3] @@ -8464,8 +8464,8 @@ _037FEBA8: blt _037FEBA8 bx lr .align 2, 0 -_037FEBC8: .word 0x03807558 -_037FEBCC: .word 0x03807914 +_037FEBC8: .word _03807558 +_037FEBCC: .word _03807914 arm_func_end sub_037FEB6C arm_func_start sub_037FEBD0 @@ -8479,8 +8479,8 @@ sub_037FEBD0: ; 0x037FEBD0 arm_func_start sub_037FEBE0 sub_037FEBE0: ; 0x037FEBE0 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r1, _037FEC34 ; =0x03807910 - ldr r5, _037FEC38 ; =0x03807924 + ldr r1, _037FEC34 ; =_03807910 + ldr r5, _037FEC38 ; =_03807924 ldr r4, _037FEC3C ; =0x0000FFF5 str r0, [r1] mov r7, #0 @@ -8502,8 +8502,8 @@ _037FEC20: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_037FEC34: .word 0x03807910 -_037FEC38: .word 0x03807924 +_037FEC34: .word _03807910 +_037FEC38: .word _03807924 _037FEC3C: .word 0x0000FFF5 arm_func_end sub_037FEBE0 @@ -8511,7 +8511,7 @@ _037FEC3C: .word 0x0000FFF5 sub_037FEC40: ; 0x037FEC40 cmp r1, #0x18 bge _037FEC70 - ldr r2, _037FECA4 ; =0x03807910 + ldr r2, _037FECA4 ; =_03807910 add r3, r1, #0x28 ldr ip, [r2] ldr r1, _037FECA8 ; =0x00007FFF @@ -8524,7 +8524,7 @@ sub_037FEC40: ; 0x037FEC40 _037FEC70: cmp r1, #0x68 bxle lr - ldr r2, _037FECA4 ; =0x03807910 + ldr r2, _037FECA4 ; =_03807910 sub r1, r1, #0x28 ldr ip, [r2] rsb r2, ip, #0 @@ -8536,7 +8536,7 @@ _037FEC70: mov r0, r1, asr #0x15 bx lr .align 2, 0 -_037FECA4: .word 0x03807910 +_037FECA4: .word _03807910 _037FECA8: .word 0x00007FFF arm_func_end sub_037FEC40 @@ -8681,17 +8681,17 @@ _037FEE54: .word sub_0380382C + 1 arm_func_start sub_037FEE58 sub_037FEE58: ; 0x037FEE58 cmp r0, #0x20 - ldrlt r1, _037FEEC0 ; =0x03806FB8 + ldrlt r1, _037FEEC0 ; =_03806FB8 ldrltsb r0, [r1, r0] bxlt lr cmp r0, #0x40 - ldrlt r1, _037FEEC0 ; =0x03806FB8 + ldrlt r1, _037FEEC0 ; =_03806FB8 rsblt r0, r0, #0x40 ldrltsb r0, [r1, r0] bxlt lr cmp r0, #0x60 bge _037FEEA0 - ldr r1, _037FEEC0 ; =0x03806FB8 + ldr r1, _037FEEC0 ; =_03806FB8 sub r0, r0, #0x40 ldrsb r0, [r1, r0] rsb r0, r0, #0 @@ -8699,7 +8699,7 @@ sub_037FEE58: ; 0x037FEE58 mov r0, r0, asr #0x18 bx lr _037FEEA0: - ldr r1, _037FEEC0 ; =0x03806FB8 + ldr r1, _037FEEC0 ; =_03806FB8 sub r0, r0, #0x60 rsb r0, r0, #0x20 ldrsb r0, [r1, r0] @@ -8708,12 +8708,12 @@ _037FEEA0: mov r0, r0, asr #0x18 bx lr .align 2, 0 -_037FEEC0: .word 0x03806FB8 +_037FEEC0: .word _03806FB8 arm_func_end sub_037FEE58 arm_func_start sub_037FEEC4 sub_037FEEC4: ; 0x037FEEC4 - ldr r2, _037FEEEC ; =0x0380755C + ldr r2, _037FEEEC ; =_0380755C ldr r0, _037FEEF0 ; =0x0019660D ldr r3, [r2] ldr r1, _037FEEF4 ; =0x3C6EF35F @@ -8724,7 +8724,7 @@ sub_037FEEC4: ; 0x037FEEC4 mov r0, r0, lsr #0x10 bx lr .align 2, 0 -_037FEEEC: .word 0x0380755C +_037FEEEC: .word _0380755C _037FEEF0: .word 0x0019660D _037FEEF4: .word 0x3C6EF35F arm_func_end sub_037FEEC4 @@ -8733,7 +8733,7 @@ _037FEEF4: .word 0x3C6EF35F sub_037FEEF8: ; 0x037FEEF8 stmdb sp!, {r4, lr} sub sp, sp, #8 - ldr r1, _037FEF54 ; =0x03807934 + ldr r1, _037FEF54 ; =_03807934 mov r4, r0 ldr r0, [r1] cmp r0, #0 @@ -8743,23 +8743,23 @@ sub_037FEEF8: ; 0x037FEEF8 bl sub_03801ED8 mov r0, #0x400 str r0, [sp] - ldr r0, _037FEF58 ; =0x038079A4 - ldr r1, _037FEF5C ; =0x037FF008 - ldr r3, _037FEF60 ; =0x03807E48 + ldr r0, _037FEF58 ; =_038079A4 + ldr r1, _037FEF5C ; =sub_037FF008 + ldr r3, _037FEF60 ; =_03807E48 mov r2, #0 str r4, [sp, #4] bl sub_037FC054 - ldr r0, _037FEF58 ; =0x038079A4 + ldr r0, _037FEF58 ; =_038079A4 bl sub_037FC36C _037FEF48: add sp, sp, #8 ldmia sp!, {r4, lr} bx lr .align 2, 0 -_037FEF54: .word 0x03807934 -_037FEF58: .word 0x038079A4 -_037FEF5C: .word 0x037FF008 -_037FEF60: .word 0x03807E48 +_037FEF54: .word _03807934 +_037FEF58: .word _038079A4 +_037FEF5C: .word sub_037FF008 +_037FEF60: .word _03807E48 arm_func_end sub_037FEEF8 arm_func_start sub_037FEF64 @@ -8767,14 +8767,14 @@ sub_037FEF64: ; 0x037FEF64 stmdb sp!, {lr} sub sp, sp, #0xc bl sub_037FD21C - ldr r3, _037FEFA8 ; =0x037FEFEC + ldr r3, _037FEFA8 ; =sub_037FEFEC adds ip, r0, #0x10000 str r3, [sp, #4] mov lr, #0 str lr, [sp, #8] adc r2, r1, #0 ldr r3, _037FEFAC ; =0x00000AA8 - ldr r0, _037FEFB0 ; =0x03807978 + ldr r0, _037FEFB0 ; =_03807978 mov r1, ip str lr, [sp] bl sub_037FD54C @@ -8782,31 +8782,31 @@ sub_037FEF64: ; 0x037FEF64 ldmia sp!, {lr} bx lr .align 2, 0 -_037FEFA8: .word 0x037FEFEC +_037FEFA8: .word sub_037FEFEC _037FEFAC: .word 0x00000AA8 -_037FEFB0: .word 0x03807978 +_037FEFB0: .word _03807978 arm_func_end sub_037FEF64 arm_func_start sub_037FEFB4 sub_037FEFB4: ; 0x037FEFB4 ldr ip, _037FEFC0 ; =sub_037FD5C0 - ldr r0, _037FEFC4 ; =0x03807978 + ldr r0, _037FEFC4 ; =_03807978 bx ip .align 2, 0 _037FEFC0: .word sub_037FD5C0 -_037FEFC4: .word 0x03807978 +_037FEFC4: .word _03807978 arm_func_end sub_037FEFB4 arm_func_start sub_037FEFC8 sub_037FEFC8: ; 0x037FEFC8 ldr ip, _037FEFDC ; =sub_037FC6D4 - ldr r0, _037FEFE0 ; =0x03807958 + ldr r0, _037FEFE0 ; =_03807958 mov r1, #2 mov r2, #0 bx ip .align 2, 0 _037FEFDC: .word sub_037FC6D4 -_037FEFE0: .word 0x03807958 +_037FEFE0: .word _03807958 arm_func_end sub_037FEFC8 arm_func_start sub_037FEFE4 @@ -8822,24 +8822,24 @@ sub_037FEFE8: ; 0x037FEFE8 arm_func_start sub_037FEFEC sub_037FEFEC: ; 0x037FEFEC ldr ip, _037FF000 ; =sub_037FC6D4 - ldr r0, _037FF004 ; =0x03807958 + ldr r0, _037FF004 ; =_03807958 mov r1, #1 mov r2, #0 bx ip .align 2, 0 _037FF000: .word sub_037FC6D4 -_037FF004: .word 0x03807958 +_037FF004: .word _03807958 arm_func_end sub_037FEFEC arm_func_start sub_037FF008 sub_037FF008: ; 0x037FF008 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0x10 - ldr r0, _037FF0E8 ; =0x03807958 - ldr r1, _037FF0EC ; =0x03807938 + ldr r0, _037FF0E8 ; =_03807958 + ldr r1, _037FF0EC ; =_03807938 mov r2, #8 bl sub_037FC6AC - ldr r0, _037FF0F0 ; =0x03807978 + ldr r0, _037FF0F0 ; =_03807978 bl sub_037FD3A0 bl sub_037FF164 bl sub_037FFEF0 @@ -8853,7 +8853,7 @@ sub_037FF008: ; 0x037FF008 mov r0, #0x7f bl sub_037FE7BC bl sub_037FD21C - ldr r2, _037FF0F4 ; =0x037FEFEC + ldr r2, _037FF0F4 ; =sub_037FEFEC adds r4, r0, #0x10000 str r2, [sp, #4] mov r0, #0 @@ -8861,10 +8861,10 @@ sub_037FF008: ; 0x037FF008 str r0, [sp] adc r2, r1, #0 ldr r3, _037FF0F8 ; =0x00000AA8 - ldr r0, _037FF0F0 ; =0x03807978 + ldr r0, _037FF0F0 ; =_03807978 mov r1, r4 bl sub_037FD54C - ldr r7, _037FF0E8 ; =0x03807958 + ldr r7, _037FF0E8 ; =_03807958 mov r4, #1 add r6, sp, #0xc mov r8, #0 @@ -8893,10 +8893,10 @@ _037FF0C4: bl sub_037FEEC4 b _037FF098 .align 2, 0 -_037FF0E8: .word 0x03807958 -_037FF0EC: .word 0x03807938 -_037FF0F0: .word 0x03807978 -_037FF0F4: .word 0x037FEFEC +_037FF0E8: .word _03807958 +_037FF0EC: .word _03807938 +_037FF0F0: .word _03807978 +_037FF0F4: .word sub_037FEFEC _037FF0F8: .word 0x00000AA8 arm_func_end sub_037FF008 @@ -8937,7 +8937,7 @@ sub_037FF14C: ; 0x037FF14C arm_func_start sub_037FF164 sub_037FF164: ; 0x037FF164 stmdb sp!, {r3, lr} - ldr r3, _037FF1B8 ; =0x03807E70 + ldr r3, _037FF1B8 ; =_03807E70 mov lr, #0 mov r0, #0x54 _037FF174: @@ -8952,22 +8952,22 @@ _037FF174: strb r1, [ip, #3] cmp lr, #0x10 blt _037FF174 - ldr r0, _037FF1BC ; =0x03807E48 + ldr r0, _037FF1BC ; =_03807E48 mov r1, #0 str r1, [r0, #4] str r1, [r0] ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FF1B8: .word 0x03807E70 -_037FF1BC: .word 0x03807E48 +_037FF1B8: .word _03807E70 +_037FF1BC: .word _03807E48 arm_func_end sub_037FF164 arm_func_start sub_037FF1C0 sub_037FF1C0: ; 0x037FF1C0 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x18 - ldr r7, _037FF3A8 ; =0x03807E70 + ldr r7, _037FF3A8 ; =_03807E70 mov sb, #0 mov r4, #2 mov r5, #1 @@ -9073,7 +9073,7 @@ _037FF340: add sb, sb, #1 cmp sb, #0x10 blt _037FF1E0 - ldr r3, _037FF3A8 ; =0x03807E70 + ldr r3, _037FF3A8 ; =_03807E70 mov r4, #0 mov r1, #0x54 _037FF358: @@ -9099,7 +9099,7 @@ _037FF390: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, lr} bx lr .align 2, 0 -_037FF3A8: .word 0x03807E70 +_037FF3A8: .word _03807E70 arm_func_end sub_037FF1C0 arm_func_start sub_037FF3AC @@ -9110,7 +9110,7 @@ sub_037FF3AC: ; 0x037FF3AC mov r5, #0 rsb fp, fp, #0 _037FF3C0: - ldr r0, _037FF750 ; =0x03807E70 + ldr r0, _037FF750 ; =_03807E70 mov r1, #0x54 mla r4, r5, r1, r0 ldrb r2, [r4, #3] @@ -9161,7 +9161,7 @@ _037FF474: ldrb r0, [r4, #9] ldrb r1, [r4, #8] mov r2, r0, lsl #1 - ldr r0, _037FF754 ; =0x03806FDC + ldr r0, _037FF754 ; =_03806FDC ldrsh r2, [r0, r2] ldrb r0, [r4, #5] add r6, r6, r2 @@ -9357,8 +9357,8 @@ _037FF73C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_037FF750: .word 0x03807E70 -_037FF754: .word 0x03806FDC +_037FF750: .word _03807E70 +_037FF754: .word _03806FDC _037FF758: .word 0xFFFFFD2D _037FF75C: .word 0x0000FFFC arm_func_end sub_037FF3AC @@ -9456,7 +9456,7 @@ _037FF854: b _037FF8C4 _037FF87C: ldrb r2, [r0, #0x1d] - ldr r1, _037FF8D0 ; =0x03806FDC + ldr r1, _037FF8D0 ; =_03806FDC mov r2, r2, lsl #1 ldrsh r3, [r1, r2] ldr r2, [r0, #0x10] @@ -9479,20 +9479,20 @@ _037FF8C4: mov r0, r0, asr #7 bx lr .align 2, 0 -_037FF8D0: .word 0x03806FDC +_037FF8D0: .word _03806FDC arm_func_end sub_037FF82C arm_func_start sub_037FF8D4 sub_037FF8D4: ; 0x037FF8D4 cmp r1, #0x6d - ldrge r2, _037FF8F0 ; =0x038071F0 + ldrge r2, _037FF8F0 ; =_038071F0 rsblt r1, r1, #0xff rsbge r1, r1, #0x7f ldrgeb r1, [r2, r1] strb r1, [r0, #0x1c] bx lr .align 2, 0 -_037FF8F0: .word 0x038071F0 +_037FF8F0: .word _038071F0 arm_func_end sub_037FF8D4 arm_func_start sub_037FF8F4 @@ -9541,7 +9541,7 @@ sub_037FF940: ; 0x037FF940 arm_func_start sub_037FF950 sub_037FF950: ; 0x037FF950 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r4, _037FFB08 ; =0x03807E48 + ldr r4, _037FFB08 ; =_03807E48 mov r6, r1 ldr r1, [r4, #4] mov r5, r3 @@ -9552,8 +9552,8 @@ sub_037FF950: ; 0x037FF950 mov r4, #0 mvneq r1, r1 andeq r0, r0, r1 - ldr r3, _037FFB0C ; =0x038071DC - ldr r8, _037FFB10 ; =0x038071E0 + ldr r3, _037FFB0C ; =_038071DC + ldr r8, _037FFB10 ; =_038071E0 mov sb, r4 mvn r1, #0 mov fp, #1 @@ -9561,7 +9561,7 @@ _037FF994: ldrb ip, [r8, sb] tst r0, fp, lsl ip beq _037FFA14 - ldr r2, _037FFB14 ; =0x03807E70 + ldr r2, _037FFB14 ; =_03807E70 mov r7, #0x54 mla sl, ip, r7, r2 cmp r4, #0 @@ -9658,10 +9658,10 @@ _037FFB00: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_037FFB08: .word 0x03807E48 -_037FFB0C: .word 0x038071DC -_037FFB10: .word 0x038071E0 -_037FFB14: .word 0x03807E70 +_037FFB08: .word _03807E48 +_037FFB0C: .word _038071DC +_037FFB10: .word _038071E0 +_037FFB14: .word _03807E70 _037FFB18: .word 0x0000FFFF arm_func_end sub_037FF950 @@ -9678,8 +9678,8 @@ sub_037FFB1C: ; 0x037FFB1C sub_037FFB30: ; 0x037FFB30 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sb, #0 - ldr r7, _037FFBD8 ; =0x03807E70 - ldr r4, _037FFBDC ; =0x03807E48 + ldr r7, _037FFBD8 ; =_03807E70 + ldr r4, _037FFBDC ; =_03807E48 mov sl, r0 mov r5, sb mov r6, #1 @@ -9724,8 +9724,8 @@ _037FFBD0: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_037FFBD8: .word 0x03807E70 -_037FFBDC: .word 0x03807E48 +_037FFBD8: .word _03807E70 +_037FFBDC: .word _03807E48 arm_func_end sub_037FFB30 arm_func_start sub_037FFBE0 @@ -9733,7 +9733,7 @@ sub_037FFBE0: ; 0x037FFBE0 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} mov sl, r0 mov r8, #0 - ldr r5, _037FFCB8 ; =0x03807E70 + ldr r5, _037FFCB8 ; =_03807E70 mov sb, r1 mov r7, sl mov fp, r8 @@ -9742,7 +9742,7 @@ sub_037FFBE0: ; 0x037FFBE0 _037FFC04: tst r7, #1 beq _037FFC74 - ldr r0, _037FFCBC ; =0x03807E48 + ldr r0, _037FFCBC ; =_03807E48 ldr r1, [r0, #4] mov r0, #0x54 mla r6, r8, r0, r5 @@ -9779,56 +9779,56 @@ _037FFC7C: bne _037FFC04 _037FFC8C: tst sb, #1 - ldrne r0, _037FFCBC ; =0x03807E48 + ldrne r0, _037FFCBC ; =_03807E48 ldrne r1, [r0] orrne r1, r1, sl strne r1, [r0] - ldreq r0, _037FFCBC ; =0x03807E48 + ldreq r0, _037FFCBC ; =_03807E48 ldreq r1, [r0, #4] orreq r1, r1, sl streq r1, [r0, #4] ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_037FFCB8: .word 0x03807E70 -_037FFCBC: .word 0x03807E48 +_037FFCB8: .word _03807E70 +_037FFCBC: .word _03807E48 arm_func_end sub_037FFBE0 arm_func_start sub_037FFCC0 sub_037FFCC0: ; 0x037FFCC0 tst r1, #1 - ldreq r1, _037FFCF4 ; =0x03807E48 + ldreq r1, _037FFCF4 ; =_03807E48 mvneq r0, r0 ldreq r2, [r1, #4] andeq r0, r2, r0 streq r0, [r1, #4] bxeq lr - ldr r1, _037FFCF4 ; =0x03807E48 + ldr r1, _037FFCF4 ; =_03807E48 mvn r0, r0 ldr r2, [r1] and r0, r2, r0 str r0, [r1] bx lr .align 2, 0 -_037FFCF4: .word 0x03807E48 +_037FFCF4: .word _03807E48 arm_func_end sub_037FFCC0 arm_func_start sub_037FFCF8 sub_037FFCF8: ; 0x037FFCF8 tst r0, #1 - ldrne r0, _037FFD10 ; =0x03807E48 + ldrne r0, _037FFD10 ; =_03807E48 ldrne r0, [r0] - ldreq r0, _037FFD10 ; =0x03807E48 + ldreq r0, _037FFD10 ; =_03807E48 ldreq r0, [r0, #4] bx lr .align 2, 0 -_037FFD10: .word 0x03807E48 +_037FFD10: .word _03807E48 arm_func_end sub_037FFCF8 arm_func_start sub_037FFD14 sub_037FFD14: ; 0x037FFD14 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr r5, _037FFD8C ; =0x03807E70 + ldr r5, _037FFD8C ; =_03807E70 mov r6, #0 mov r8, r0 mov r7, r1 @@ -9860,7 +9860,7 @@ _037FFD74: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, lr} bx lr .align 2, 0 -_037FFD8C: .word 0x03807E70 +_037FFD8C: .word _03807E70 arm_func_end sub_037FFD14 arm_func_start sub_037FFD90 @@ -9980,7 +9980,7 @@ _037FFEEC: .word 0xFFFE9680 arm_func_start sub_037FFEF0 sub_037FFEF0: ; 0x037FFEF0 stmdb sp!, {r3, lr} - ldr r3, _037FFF4C ; =0x038083B0 + ldr r3, _037FFF4C ; =_038083B0 mov lr, #0 mov r0, #0x24 _037FFF00: @@ -9993,7 +9993,7 @@ _037FFF00: add lr, lr, #1 cmp lr, #0x10 blt _037FFF00 - ldr r1, _037FFF50 ; =0x038085F0 + ldr r1, _037FFF50 ; =_038085F0 mov r2, #0 _037FFF2C: ldrb r0, [r1, r2, lsl #6] @@ -10005,8 +10005,8 @@ _037FFF2C: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_037FFF4C: .word 0x038083B0 -_037FFF50: .word 0x038085F0 +_037FFF4C: .word _038083B0 +_037FFF50: .word _038085F0 arm_func_end sub_037FFEF0 arm_func_start sub_037FFF54 @@ -10018,7 +10018,7 @@ sub_037FFF54: ; 0x037FFF54 _037FFF64: mov r0, #0x24 mul r0, r5, r0 - ldr r2, _038000AC ; =0x038083B0 + ldr r2, _038000AC ; =_038083B0 ldrb r1, [r2, r0] add r4, r2, r0 mov r0, r1, lsl #0x1f @@ -10061,7 +10061,7 @@ _037FFFF8: cmp r7, r8 blt _037FFFD4 _03800000: - ldr r0, _038000B0 ; =0x03807E6C + ldr r0, _038000B0 ; =_03807E6C ldr r2, [r0] cmp r2, #0 beq _03800028 @@ -10104,15 +10104,15 @@ _03800088: add r5, r5, #1 cmp r5, #0x10 blt _037FFF64 - ldr r0, _038000B0 ; =0x03807E6C + ldr r0, _038000B0 ; =_03807E6C ldr r0, [r0] cmp r0, #0 strne r6, [r0, #4] ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, lr} bx lr .align 2, 0 -_038000AC: .word 0x038083B0 -_038000B0: .word 0x03807E6C +_038000AC: .word _038083B0 +_038000B0: .word _03807E6C arm_func_end sub_037FFF54 arm_func_start sub_038000B4 @@ -10121,7 +10121,7 @@ sub_038000B4: ; 0x038000B4 mov sb, r0 mov r0, #0x24 mul r5, sb, r0 - ldr r6, _03800284 ; =0x038083B0 + ldr r6, _03800284 ; =_038083B0 mov r8, r1 ldrb r0, [r6, r5] mov r7, r2 @@ -10156,7 +10156,7 @@ _03800134: strb r1, [r0, #8] cmp r2, #0x10 blt _03800134 - ldr r1, _03800288 ; =0x03807E6C + ldr r1, _03800288 ; =_03807E6C ldr r3, [r1] cmp r3, #0 beq _03800194 @@ -10180,7 +10180,7 @@ _03800194: bl sub_03801884 movs r4, r0 bmi _0380027C - ldr r0, _0380028C ; =0x038085F0 + ldr r0, _0380028C ; =_038085F0 add r6, r0, r4, lsl #6 mov r0, r6 bl sub_038008F0 @@ -10204,7 +10204,7 @@ _03800194: bl sub_03800290 orr r0, r4, r0, lsl #8 mov r0, r0, lsl #0x10 - ldr r4, _0380028C ; =0x038085F0 + ldr r4, _0380028C ; =_038085F0 mov r8, r0, lsr #0x11 mov r7, #1 b _03800240 @@ -10227,7 +10227,7 @@ _03800240: bne _03800210 _03800248: ldrb r1, [r5] - ldr r0, _03800288 ; =0x03807E6C + ldr r0, _03800288 ; =_03807E6C bic r1, r1, #1 ldr r2, [r0] orr r1, r1, #1 @@ -10243,15 +10243,15 @@ _0380027C: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, lr} bx lr .align 2, 0 -_03800284: .word 0x038083B0 -_03800288: .word 0x03807E6C -_0380028C: .word 0x038085F0 +_03800284: .word _038083B0 +_03800288: .word _03807E6C +_0380028C: .word _038085F0 arm_func_end sub_038000B4 arm_func_start sub_03800290 sub_03800290: ; 0x03800290 stmdb sp!, {r3, r4, r5, lr} - ldr r1, _038002E8 ; =0x03807E50 + ldr r1, _038002E8 ; =_03807E50 mov r5, r0 ldr r4, [r5, #0x28] ldr r0, [r1, #4] @@ -10264,10 +10264,10 @@ _038002B8: mov r0, r4 bl sub_03800784 _038002C0: - ldr r0, _038002E8 ; =0x03807E50 + ldr r0, _038002E8 ; =_03807E50 ldr r1, [r5, #0x28] ldr r2, [r0, #4] - ldr r0, _038002EC ; =0x03807E5C + ldr r0, _038002EC ; =_03807E5C sub r2, r4, r2 ldrb r0, [r0, r2] add r1, r1, #1 @@ -10275,21 +10275,21 @@ _038002C0: ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_038002E8: .word 0x03807E50 -_038002EC: .word 0x03807E5C +_038002E8: .word _03807E50 +_038002EC: .word _03807E5C arm_func_end sub_03800290 arm_func_start sub_038002F0 sub_038002F0: ; 0x038002F0 mov r1, #0x24 mul r1, r0, r1 - ldr r2, _0380030C ; =0x038083B0 + ldr r2, _0380030C ; =_038083B0 ldrb r0, [r2, r1] orr r0, r0, #2 strb r0, [r2, r1] bx lr .align 2, 0 -_0380030C: .word 0x038083B0 +_0380030C: .word _038083B0 arm_func_end sub_038002F0 arm_func_start sub_03800310 @@ -10299,14 +10299,14 @@ sub_03800310: ; 0x03800310 bl sub_038000B4 mov r0, #0x24 mul r1, r4, r0 - ldr r2, _0380033C ; =0x038083B0 + ldr r2, _0380033C ; =_038083B0 ldrb r0, [r2, r1] orr r0, r0, #2 strb r0, [r2, r1] ldmia sp!, {r4, lr} bx lr .align 2, 0 -_0380033C: .word 0x038083B0 +_0380033C: .word _038083B0 arm_func_end sub_03800310 arm_func_start sub_03800340 @@ -10315,14 +10315,14 @@ sub_03800340: ; 0x03800340 mov r4, r0 mov r0, #0x24 mul r1, r4, r0 - ldr r2, _03800394 ; =0x038083B0 + ldr r2, _03800394 ; =_038083B0 ldrb r0, [r2, r1] mov r0, r0, lsl #0x1f movs r0, r0, lsr #0x1f beq _0380038C add r0, r2, r1 bl sub_03800B00 - ldr r0, _03800398 ; =0x03807E6C + ldr r0, _03800398 ; =_03807E6C ldr r2, [r0] cmp r2, #0 movne r0, #1 @@ -10334,8 +10334,8 @@ _0380038C: ldmia sp!, {r4, lr} bx lr .align 2, 0 -_03800394: .word 0x038083B0 -_03800398: .word 0x03807E6C +_03800394: .word _038083B0 +_03800398: .word _03807E6C arm_func_end sub_03800340 arm_func_start sub_0380039C @@ -10343,7 +10343,7 @@ sub_0380039C: ; 0x0380039C stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r2, #0x24 mul r4, r0, r2 - ldr r5, _03800410 ; =0x038083B0 + ldr r5, _03800410 ; =_038083B0 and r0, r1, #0xff ldrb r2, [r5, r4] mov r0, r0, lsl #0x1f @@ -10373,13 +10373,13 @@ _03800408: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_03800410: .word 0x038083B0 +_03800410: .word _038083B0 arm_func_end sub_0380039C arm_func_start sub_03800414 sub_03800414: ; 0x03800414 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r3, _038004D8 ; =0x038083B0 + ldr r3, _038004D8 ; =_038083B0 mov r2, #0x24 mla r6, r0, r2, r3 mov r8, r1 @@ -10420,7 +10420,7 @@ _03800498: blo _03800474 _038004A0: bl sub_037FEF64 - ldr r0, _038004DC ; =0x03807E6C + ldr r0, _038004DC ; =_03807E6C ldr r3, [r0] cmp r3, #0 beq _038004D0 @@ -10435,8 +10435,8 @@ _038004D0: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_038004D8: .word 0x038083B0 -_038004DC: .word 0x03807E6C +_038004D8: .word _038083B0 +_038004DC: .word _03807E6C arm_func_end sub_03800414 arm_func_start sub_038004E0 @@ -10444,7 +10444,7 @@ sub_038004E0: ; 0x038004E0 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r3, #0x24 mul r4, r0, r3 - ldr r5, _03800548 ; =0x038083B0 + ldr r5, _03800548 ; =_038083B0 mov r8, r1 mov r7, r2 mov r6, #0 @@ -10472,7 +10472,7 @@ _03800540: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_03800548: .word 0x038083B0 +_03800548: .word _038083B0 arm_func_end sub_038004E0 arm_func_start sub_0380054C @@ -10481,7 +10481,7 @@ sub_0380054C: ; 0x0380054C mov r3, #0x24 mul r4, r0, r3 mov r0, r2, lsl #0x10 - ldr r5, _038005B8 ; =0x038083B0 + ldr r5, _038005B8 ; =_038083B0 mov r7, r1 mov r6, #0 mov r8, r0, lsr #0x10 @@ -10509,13 +10509,13 @@ _038005B0: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_038005B8: .word 0x038083B0 +_038005B8: .word _038083B0 arm_func_end sub_0380054C arm_func_start sub_038005BC sub_038005BC: ; 0x038005BC stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} - ldr r6, _03800644 ; =0x038083B0 + ldr r6, _03800644 ; =_038083B0 mov r7, #0 mov sl, r0 mov sb, r1 @@ -10554,13 +10554,13 @@ _03800630: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_03800644: .word 0x038083B0 +_03800644: .word _038083B0 arm_func_end sub_038005BC arm_func_start sub_03800648 sub_03800648: ; 0x03800648 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r4, _038006A0 ; =0x038083B0 + ldr r4, _038006A0 ; =_038083B0 mov r7, r0 mov r6, r1 mov r5, #0 @@ -10584,13 +10584,13 @@ _0380068C: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_038006A0: .word 0x038083B0 +_038006A0: .word _038083B0 arm_func_end sub_03800648 arm_func_start sub_038006A4 sub_038006A4: ; 0x038006A4 stmdb sp!, {r3, lr} - ldr lr, _038006E4 ; =0x038083B0 + ldr lr, _038006E4 ; =_038083B0 mov ip, #0x24 mla ip, r0, ip, lr cmp r3, #1 @@ -10609,7 +10609,7 @@ _038006DC: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_038006E4: .word 0x038083B0 +_038006E4: .word _038083B0 arm_func_end sub_038006A4 arm_func_start sub_038006E8 @@ -10629,7 +10629,7 @@ sub_038006E8: ; 0x038006E8 _03800718: tst sl, #1 beq _03800760 - ldr r0, _03800780 ; =0x038083B0 + ldr r0, _03800780 ; =_038083B0 mov r1, r6 add r0, r0, r5 bl sub_03800A7C @@ -10659,12 +10659,12 @@ _03800778: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_03800780: .word 0x038083B0 +_03800780: .word _038083B0 arm_func_end sub_038006E8 arm_func_start sub_03800784 sub_03800784: ; 0x03800784 - ldr r1, _038007BC ; =0x03807E50 + ldr r1, _038007BC ; =_03807E50 bic r2, r0, #3 str r2, [r1, #4] add r0, r2, #0x10 @@ -10679,7 +10679,7 @@ sub_03800784: ; 0x03800784 str r0, [r1, #0x18] bx lr .align 2, 0 -_038007BC: .word 0x03807E50 +_038007BC: .word _03807E50 arm_func_end sub_03800784 arm_func_start sub_038007C0 @@ -10904,11 +10904,11 @@ sub_03800A7C: ; 0x03800A7C ldrb r1, [r0, #8] cmp r1, #0xff moveq r0, #0 - ldrne r0, _03800AA4 ; =0x038085F0 + ldrne r0, _03800AA4 ; =_038085F0 addne r0, r0, r1, lsl #6 bx lr .align 2, 0 -_03800AA4: .word 0x038085F0 +_03800AA4: .word _038085F0 arm_func_end sub_03800A7C arm_func_start sub_03800AA8 @@ -10926,7 +10926,7 @@ sub_03800AA8: ; 0x03800AA8 bl sub_03800A48 add ip, r6, #8 ldrb r2, [ip, r4] - ldr r3, _03800AFC ; =0x038085F0 + ldr r3, _03800AFC ; =_038085F0 mov r0, #0xff ldrb r1, [r3, r2, lsl #6] bic r1, r1, #1 @@ -10936,7 +10936,7 @@ _03800AF4: ldmia sp!, {r4, r5, r6, lr} bx lr .align 2, 0 -_03800AFC: .word 0x038085F0 +_03800AFC: .word _038085F0 arm_func_end sub_03800AA8 arm_func_start sub_03800B00 @@ -11003,7 +11003,7 @@ sub_03800B98: ; 0x03800B98 ldrb r4, [sl, #1] ldrsb r7, [sl, #6] mov sb, r6, lsl #1 - ldr r0, _03800CEC ; =0x03806FDC + ldr r0, _03800CEC ; =_03806FDC mul r6, r7, r5 mov r3, fp, lsl #1 ldrsh sb, [r0, sb] @@ -11082,7 +11082,7 @@ _03800CDC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_03800CEC: .word 0x03806FDC +_03800CEC: .word _03806FDC arm_func_end sub_03800B98 arm_func_start sub_03800CF0 @@ -11243,7 +11243,7 @@ _03800F1C: mov r1, #0xc000 _03800F20: ldrh r0, [r8, #0x1e] - ldr r3, _03801838 ; =0x03800B38 + ldr r3, _03801838 ; =sub_03800B38 str r8, [sp] ldrb r2, [r8] and r0, r1, r0 @@ -11630,7 +11630,7 @@ _03801460: strb r0, [r8, #8] b _038017D0 _03801470: - ldr r1, _0380183C ; =0x03807E50 + ldr r1, _0380183C ; =_03807E50 ldr r1, [r1] cmp r1, #0 beq _038017D0 @@ -11901,13 +11901,13 @@ _0380180C: bx lr .align 2, 0 _03801834: .word 0x0000FFFF -_03801838: .word 0x03800B38 -_0380183C: .word 0x03807E50 +_03801838: .word sub_03800B38 +_0380183C: .word _03807E50 arm_func_end sub_03800CF0 arm_func_start sub_03801840 sub_03801840: ; 0x03801840 - ldr r2, _03801880 ; =0x03807E6C + ldr r2, _03801880 ; =_03807E6C ldr r3, [r2] cmp r3, #0 moveq r0, #0 @@ -11924,12 +11924,12 @@ sub_03801840: ; 0x03801840 add r0, r0, r1, lsl #1 bx lr .align 2, 0 -_03801880: .word 0x03807E6C +_03801880: .word _03807E6C arm_func_end sub_03801840 arm_func_start sub_03801884 sub_03801884: ; 0x03801884 - ldr ip, _038018C4 ; =0x038085F0 + ldr ip, _038018C4 ; =_038085F0 mov r0, #0 b _038018B4 _03801890: @@ -11948,7 +11948,7 @@ _038018B4: mvn r0, #0 bx lr .align 2, 0 -_038018C4: .word 0x038085F0 +_038018C4: .word _038085F0 arm_func_end sub_03801884 arm_func_start sub_038018C8 @@ -12227,7 +12227,7 @@ _03801C48: arm_func_start sub_03801C50 sub_03801C50: ; 0x03801C50 - ldr ip, _03801C6C ; =0x03807E6C + ldr ip, _03801C6C ; =_03807E6C mov r3, #0x24 ldr ip, [ip] mla r3, r0, r3, ip @@ -12235,25 +12235,25 @@ sub_03801C50: ; 0x03801C50 strh r2, [r0, #0x20] bx lr .align 2, 0 -_03801C6C: .word 0x03807E6C +_03801C6C: .word _03807E6C arm_func_end sub_03801C50 arm_func_start sub_03801C70 sub_03801C70: ; 0x03801C70 - ldr r2, _03801C88 ; =0x03807E6C + ldr r2, _03801C88 ; =_03807E6C ldr r2, [r2] add r0, r2, r0, lsl #1 add r0, r0, #0x200 strh r1, [r0, #0x60] bx lr .align 2, 0 -_03801C88: .word 0x03807E6C +_03801C88: .word _03807E6C arm_func_end sub_03801C70 arm_func_start sub_03801C8C sub_03801C8C: ; 0x03801C8C stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r0, _03801D20 ; =0x03807E6C + ldr r0, _03801D20 ; =_03807E6C mov r4, #0 ldr r0, [r0] mov r5, r4 @@ -12283,7 +12283,7 @@ _03801CB0: orrne r0, r5, #2 movne r0, r0, lsl #0x10 movne r5, r0, lsr #0x10 - ldr r0, _03801D20 ; =0x03807E6C + ldr r0, _03801D20 ; =_03807E6C ldr r1, [r0] strh r4, [r1, #8] ldr r0, [r0] @@ -12292,12 +12292,12 @@ _03801D18: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_03801D20: .word 0x03807E6C +_03801D20: .word _03807E6C arm_func_end sub_03801C8C arm_func_start sub_03801D24 sub_03801D24: ; 0x03801D24 - ldr r1, _03801D4C ; =0x03807E70 + ldr r1, _03801D4C ; =_03807E70 mov r3, #0 mov r2, r3 _03801D30: @@ -12309,13 +12309,13 @@ _03801D30: blt _03801D30 bx lr .align 2, 0 -_03801D4C: .word 0x03807E70 +_03801D4C: .word _03807E70 arm_func_end sub_03801D24 arm_func_start sub_03801D50 sub_03801D50: ; 0x03801D50 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr lr, _03801DA8 ; =0x03808DF0 + ldr lr, _03801DA8 ; =_03808DF0 ldr r4, [sp, #0x18] ldrb ip, [lr, r0, lsl #6] mov r7, r1 @@ -12338,14 +12338,14 @@ _03801D88: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_03801DA8: .word 0x03808DF0 +_03801DA8: .word _03808DF0 arm_func_end sub_03801D50 arm_func_start sub_03801DAC sub_03801DAC: ; 0x03801DAC stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #0xc - ldr r1, _03801E60 ; =0x03808DF0 + ldr r1, _03801E60 ; =_03808DF0 mov sb, r0 ldrb r0, [r1, sb, lsl #6] add r8, r1, sb, lsl #6 @@ -12367,7 +12367,7 @@ _03801DDC: cmp r6, #0 cmpeq r7, #0 bne _03801E24 - ldr r3, _03801E64 ; =0x03801EA8 + ldr r3, _03801E64 ; =sub_03801EA8 mov r1, r5 mov r2, r4 add r0, r8, #0x14 @@ -12376,7 +12376,7 @@ _03801DDC: b _03801E4C _03801E24: bl sub_037FD21C - ldr r2, _03801E64 ; =0x03801EA8 + ldr r2, _03801E64 ; =sub_03801EA8 adds r0, r5, r0 stmib sp, {r2, sb} adc r2, r4, r1 @@ -12392,14 +12392,14 @@ _03801E4C: ldmia sp!, {r4, r5, r6, r7, r8, sb, lr} bx lr .align 2, 0 -_03801E60: .word 0x03808DF0 -_03801E64: .word 0x03801EA8 +_03801E60: .word _03808DF0 +_03801E64: .word sub_03801EA8 arm_func_end sub_03801DAC arm_func_start sub_03801E68 sub_03801E68: ; 0x03801E68 stmdb sp!, {r4, lr} - ldr r2, _03801EA4 ; =0x03808DF0 + ldr r2, _03801EA4 ; =_03808DF0 ldrb r1, [r2, r0, lsl #6] add r4, r2, r0, lsl #6 cmp r1, #0 @@ -12415,7 +12415,7 @@ _03801E9C: ldmia sp!, {r4, lr} bx lr .align 2, 0 -_03801EA4: .word 0x03808DF0 +_03801EA4: .word _03808DF0 arm_func_end sub_03801E68 arm_func_start sub_03801EA8 @@ -12438,23 +12438,23 @@ _03801EB8: arm_func_start sub_03801ED8 sub_03801ED8: ; 0x03801ED8 stmdb sp!, {r3, lr} - ldr r0, _03801F0C ; =0x03808FF0 - ldr r1, _03801F10 ; =0x03809010 + ldr r0, _03801F0C ; =_03808FF0 + ldr r1, _03801F10 ; =_03809010 mov r2, #8 bl sub_037FC6AC - ldr r1, _03801F14 ; =0x038025CC + ldr r1, _03801F14 ; =sub_038025CC mov r0, #7 bl sub_037FE39C - ldr r0, _03801F18 ; =0x03807E6C + ldr r0, _03801F18 ; =_03807E6C mov r1, #0 str r1, [r0] ldmia sp!, {r3, lr} bx lr .align 2, 0 -_03801F0C: .word 0x03808FF0 -_03801F10: .word 0x03809010 -_03801F14: .word 0x038025CC -_03801F18: .word 0x03807E6C +_03801F0C: .word _03808FF0 +_03801F10: .word _03809010 +_03801F14: .word sub_038025CC +_03801F18: .word _03807E6C arm_func_end sub_03801ED8 arm_func_start sub_03801F1C @@ -12903,16 +12903,16 @@ _03802500: b _03802574 _03802510: ldr r1, [sp, #0x24] - ldr r0, _038025C0 ; =0x03807E6C + ldr r0, _038025C0 ; =_03807E6C str r1, [r0] b _03802574 _03802520: ldr r5, [sp, #0x24] - ldr r0, _038025C4 ; =0x03807E70 + ldr r0, _038025C4 ; =_03807E70 mov r1, r5 mov r2, #0x1180 bl sub_037FDFEC - ldr r0, _038025C4 ; =0x03807E70 + ldr r0, _038025C4 ; =_03807E70 add r1, r5, #0x1000 str r0, [r1, #0x1c0] mov r6, #0 @@ -12934,13 +12934,13 @@ _03802574: _03802578: cmp r6, #0 bne _03801F38 - ldr r0, _038025C0 ; =0x03807E6C + ldr r0, _038025C0 ; =_03807E6C ldr r1, [r0] ldr r0, [r1] add r0, r0, #1 str r0, [r1] _03802594: - ldr r0, _038025C8 ; =0x03808FF0 + ldr r0, _038025C8 ; =_03808FF0 add r1, sp, #0x18 mov r2, #0 bl sub_037FC760 @@ -12952,9 +12952,9 @@ _03802594: .align 2, 0 _038025B8: .word 0x04000509 _038025BC: .word 0x003FFFFF -_038025C0: .word 0x03807E6C -_038025C4: .word 0x03807E70 -_038025C8: .word 0x03808FF0 +_038025C0: .word _03807E6C +_038025C4: .word _03807E70 +_038025C8: .word _03808FF0 arm_func_end sub_03801F1C arm_func_start sub_038025CC @@ -12965,7 +12965,7 @@ sub_038025CC: ; 0x038025CC mov r4, r0 cmp r5, #0x2000000 blo _038025F8 - ldr r0, _03802614 ; =0x03808FF0 + ldr r0, _03802614 ; =_03808FF0 mov r1, r5 mov r2, #0 bl sub_037FC6D4 @@ -12980,7 +12980,7 @@ _03802604: ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_03802614: .word 0x03808FF0 +_03802614: .word _03808FF0 arm_func_end sub_038025CC arm_func_start sub_03802618 @@ -12995,7 +12995,7 @@ _03802620: .word sub_03803168 sub_03802624: ; 0x03802624 stmdb sp!, {r4, lr} sub sp, sp, #8 - ldr r4, _038026C8 ; =0x03809060 + ldr r4, _038026C8 ; =_03809060 mov r2, #0 mvn r1, #2 str r1, [r4, #0xc] @@ -13012,14 +13012,14 @@ sub_03802624: ; 0x03802624 mov r0, #0x400 str r0, [sp] ldr ip, [r4, #0xf0] - ldr r1, _038026CC ; =0x038032B8 - ldr r3, _038026D0 ; =0x03809660 + ldr r1, _038026CC ; =sub_038032B8 + ldr r3, _038026D0 ; =_03809660 add r0, r4, #0x48 str ip, [sp, #4] bl sub_037FC054 add r0, r4, #0x48 bl sub_037FC36C - ldr r1, _038026D4 ; =0x038031D4 + ldr r1, _038026D4 ; =sub_038031D4 mov r0, #0xb bl sub_037FE39C ldr r0, _038026D8 ; =0x027FFC40 @@ -13028,25 +13028,25 @@ sub_03802624: ; 0x03802624 moveq r0, #1 movne r0, #0 cmp r0, #0 - ldreq r0, _038026DC ; =0x03809040 + ldreq r0, _038026DC ; =_03809040 moveq r1, #1 streq r1, [r0] add sp, sp, #8 ldmia sp!, {r4, lr} bx lr .align 2, 0 -_038026C8: .word 0x03809060 -_038026CC: .word 0x038032B8 -_038026D0: .word 0x03809660 -_038026D4: .word 0x038031D4 +_038026C8: .word _03809060 +_038026CC: .word sub_038032B8 +_038026D0: .word _03809660 +_038026D4: .word sub_038031D4 _038026D8: .word 0x027FFC40 -_038026DC: .word 0x03809040 +_038026DC: .word _03809040 arm_func_end sub_03802624 arm_func_start sub_038026E0 sub_038026E0: ; 0x038026E0 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r5, _0380271C ; =0x03809060 + ldr r5, _0380271C ; =_03809060 mov r7, r0 bl sub_037FDD00 ldr r6, [r5, #0xf0] @@ -13061,7 +13061,7 @@ sub_038026E0: ; 0x038026E0 ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_0380271C: .word 0x03809060 +_0380271C: .word _03809060 arm_func_end sub_038026E0 arm_func_start sub_03802720 @@ -13112,7 +13112,7 @@ _038027A0: moveq r0, #1 movne r0, #0 cmp r0, #0 - ldreq r0, _038027CC ; =0x03809060 + ldreq r0, _038027CC ; =_03809060 moveq r1, #4 ldreq r0, [r0] streq r1, [r0] @@ -13120,21 +13120,21 @@ _038027C4: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_038027CC: .word 0x03809060 +_038027CC: .word _03809060 arm_func_end sub_0380272C arm_func_start sub_038027D0 sub_038027D0: ; 0x038027D0 stmdb sp!, {r3, lr} - ldr ip, _03802814 ; =0x03809660 + ldr ip, _03802814 ; =_03809660 mov lr, #2 - ldr r0, _03802818 ; =0x0380720C - ldr r3, _0380281C ; =0x03802924 + ldr r0, _03802818 ; =_0380720C + ldr r3, _0380281C ; =sub_03802924 mov r1, #0 mov r2, #1 str lr, [ip, #4] bl sub_03802860 - ldr r3, _03802820 ; =0x038028E4 + ldr r3, _03802820 ; =sub_038028E4 add r1, sp, #0 mov r0, #0 mov r2, #1 @@ -13143,10 +13143,10 @@ sub_038027D0: ; 0x038027D0 ldmia sp!, {r3, lr} bx lr .align 2, 0 -_03802814: .word 0x03809660 -_03802818: .word 0x0380720C -_0380281C: .word 0x03802924 -_03802820: .word 0x038028E4 +_03802814: .word _03809660 +_03802818: .word _0380720C +_0380281C: .word sub_03802924 +_03802820: .word sub_038028E4 arm_func_end sub_038027D0 arm_func_start sub_03802824 @@ -13155,7 +13155,7 @@ sub_03802824: ; 0x03802824 mov r0, #0 mov r1, #0x32 bl sub_0380272C - ldr r0, _0380285C ; =0x03809060 + ldr r0, _0380285C ; =_03809060 ldr r1, [r0] ldr r0, [r1] cmp r0, #4 @@ -13166,13 +13166,13 @@ sub_03802824: ; 0x03802824 ldmia sp!, {r3, lr} bx lr .align 2, 0 -_0380285C: .word 0x03809060 +_0380285C: .word _03809060 arm_func_end sub_03802824 arm_func_start sub_03802860 sub_03802860: ; 0x03802860 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r5, _038028D8 ; =0x03809664 + ldr r5, _038028D8 ; =_03809664 ldr r8, _038028DC ; =0x0000A040 ldr r4, _038028E0 ; =0x040001A0 stmib r5, {r0, r1} @@ -13206,7 +13206,7 @@ _038028B4: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_038028D8: .word 0x03809664 +_038028D8: .word _03809664 _038028DC: .word 0x0000A040 _038028E0: .word 0x040001A0 arm_func_end sub_03802860 @@ -13294,25 +13294,25 @@ _038029D4: .word 0x040001A2 arm_func_start sub_038029D8 sub_038029D8: ; 0x038029D8 stmdb sp!, {r3, lr} - ldr ip, _03802A00 ; =0x03809660 + ldr ip, _03802A00 ; =_03809660 mov r2, #1 - ldr r0, _03802A04 ; =0x03807204 - ldr r3, _03802A08 ; =0x03802924 + ldr r0, _03802A04 ; =_03807204 + ldr r3, _03802A08 ; =sub_03802924 mov r1, #0 str r2, [ip, #4] bl sub_03802860 ldmia sp!, {r3, lr} bx lr .align 2, 0 -_03802A00: .word 0x03809660 -_03802A04: .word 0x03807204 -_03802A08: .word 0x03802924 +_03802A00: .word _03809660 +_03802A04: .word _03807204 +_03802A08: .word sub_03802924 arm_func_end sub_038029D8 arm_func_start sub_03802A0C sub_03802A0C: ; 0x03802A0C stmdb sp!, {r3, lr} - ldr r2, _03802AA4 ; =0x03809060 + ldr r2, _03802AA4 ; =_03809060 ldr r2, [r2] ldr r2, [r2, #0x28] cmp r2, #1 @@ -13346,7 +13346,7 @@ _03802A6C: orr r0, r1, r0, lsl #24 str r0, [sp] _03802A88: - ldr r3, _03802AA8 ; =0x03802924 + ldr r3, _03802AA8 ; =sub_03802924 add r0, sp, #0 add r2, r2, #1 mov r1, #0 @@ -13354,19 +13354,19 @@ _03802A88: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_03802AA4: .word 0x03809060 -_03802AA8: .word 0x03802924 +_03802AA4: .word _03809060 +_03802AA8: .word sub_03802924 arm_func_end sub_03802A0C arm_func_start sub_03802AAC sub_03802AAC: ; 0x03802AAC stmdb sp!, {r4, lr} - ldr r0, _03802AFC ; =0x03809060 + ldr r0, _03802AFC ; =_03809060 ldr r0, [r0] ldrb r4, [r0, #0x54] cmp r4, #0xff beq _03802AF4 - ldr r0, _03802B00 ; =0x03809660 + ldr r0, _03802B00 ; =_03809660 ldr r0, [r0] cmp r0, #0 bne _03802AF4 @@ -13376,15 +13376,15 @@ sub_03802AAC: ; 0x03802AAC mov r0, r4 bl sub_03802F04 _03802AE8: - ldr r0, _03802B00 ; =0x03809660 + ldr r0, _03802B00 ; =_03809660 mov r1, #1 str r1, [r0] _03802AF4: ldmia sp!, {r4, lr} bx lr .align 2, 0 -_03802AFC: .word 0x03809060 -_03802B00: .word 0x03809660 +_03802AFC: .word _03809060 +_03802B00: .word _03809660 arm_func_end sub_03802AAC arm_func_start sub_03802B04 @@ -13396,8 +13396,8 @@ sub_03802B04: ; 0x03802B04 bl sub_03802824 cmp r0, #0 beq _03802B5C - ldr r0, _03802B64 ; =0x03809060 - ldr r2, _03802B68 ; =0x03809660 + ldr r0, _03802B64 ; =_03809060 + ldr r2, _03802B68 ; =_03809660 ldr r1, [r0] mov r0, r6 ldr r3, [r1, #0x28] @@ -13406,7 +13406,7 @@ sub_03802B04: ; 0x03802B04 add r3, r3, r4 str r3, [r2, #4] bl sub_03802A0C - ldr r3, _03802B6C ; =0x038028E4 + ldr r3, _03802B6C ; =sub_038028E4 mov r1, r5 mov r2, r4 mov r0, #0 @@ -13415,9 +13415,9 @@ _03802B5C: ldmia sp!, {r4, r5, r6, lr} bx lr .align 2, 0 -_03802B64: .word 0x03809060 -_03802B68: .word 0x03809660 -_03802B6C: .word 0x038028E4 +_03802B64: .word _03809060 +_03802B68: .word _03809660 +_03802B6C: .word sub_038028E4 arm_func_end sub_03802B04 arm_func_start sub_03802B70 @@ -13429,8 +13429,8 @@ sub_03802B70: ; 0x03802B70 bl sub_03802824 cmp r0, #0 beq _03802C14 - ldr r0, _03802C1C ; =0x03809060 - ldr fp, _03802C20 ; =0x03809660 + ldr r0, _03802C1C ; =_03809060 + ldr fp, _03802C20 ; =_03809660 ldr r5, [r0] ldr r6, [r5, #0x24] sub r4, r6, #1 @@ -13448,7 +13448,7 @@ _03802BA4: str r1, [fp, #4] mov r1, #2 bl sub_03802A0C - ldr r3, _03802C24 ; =0x03802924 + ldr r3, _03802C24 ; =sub_03802924 mov r0, sb mov r1, #0 mov r2, r7 @@ -13469,9 +13469,9 @@ _03802C14: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_03802C1C: .word 0x03809060 -_03802C20: .word 0x03809660 -_03802C24: .word 0x03802924 +_03802C1C: .word _03809060 +_03802C20: .word _03809660 +_03802C24: .word sub_03802924 arm_func_end sub_03802B70 arm_func_start sub_03802C28 @@ -13483,8 +13483,8 @@ sub_03802C28: ; 0x03802C28 bl sub_03802824 cmp r0, #0 beq _03802CCC - ldr r0, _03802CD4 ; =0x03809060 - ldr fp, _03802CD8 ; =0x03809660 + ldr r0, _03802CD4 ; =_03809060 + ldr fp, _03802CD8 ; =_03809660 ldr r5, [r0] ldr r6, [r5, #0x24] sub r4, r6, #1 @@ -13502,7 +13502,7 @@ _03802C5C: str r1, [fp, #4] mov r1, #0xa bl sub_03802A0C - ldr r3, _03802CDC ; =0x03802924 + ldr r3, _03802CDC ; =sub_03802924 mov r0, sb mov r1, #0 mov r2, r7 @@ -13523,9 +13523,9 @@ _03802CCC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_03802CD4: .word 0x03809060 -_03802CD8: .word 0x03809660 -_03802CDC: .word 0x03802924 +_03802CD4: .word _03809060 +_03802CD8: .word _03809660 +_03802CDC: .word sub_03802924 arm_func_end sub_03802C28 arm_func_start sub_03802CE0 @@ -13537,8 +13537,8 @@ sub_03802CE0: ; 0x03802CE0 bl sub_03802824 cmp r0, #0 beq _03802D5C - ldr r0, _03802D64 ; =0x03809060 - ldr r2, _03802D68 ; =0x03809660 + ldr r0, _03802D64 ; =_03809060 + ldr r2, _03802D68 ; =_03809660 ldr r4, [r0] mov r0, #1 str r0, [r2, #0x10] @@ -13549,14 +13549,14 @@ sub_03802CE0: ; 0x03802CE0 mov r1, #3 str r3, [r2, #4] bl sub_03802A0C - ldr r3, _03802D6C ; =0x03802974 + ldr r3, _03802D6C ; =sub_03802974 mov r0, r6 mov r2, r5 mov r1, #0 bl sub_03802860 ldr r0, [r4] cmp r0, #0 - ldreq r0, _03802D68 ; =0x03809660 + ldreq r0, _03802D68 ; =_03809660 ldreq r0, [r0, #0x10] cmpeq r0, #0 moveq r0, #1 @@ -13565,15 +13565,15 @@ _03802D5C: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_03802D64: .word 0x03809060 -_03802D68: .word 0x03809660 -_03802D6C: .word 0x03802974 +_03802D64: .word _03809060 +_03802D68: .word _03809660 +_03802D6C: .word sub_03802974 arm_func_end sub_03802CE0 arm_func_start sub_03802D70 sub_03802D70: ; 0x03802D70 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr r2, _03802E04 ; =0x03809060 + ldr r2, _03802E04 ; =_03809060 mov r7, r0 ldr r4, [r2] mov r6, r1 @@ -13587,7 +13587,7 @@ sub_03802D70: ; 0x03802D70 bl sub_03802824 cmp r0, #0 beq _03802DFC - ldr r8, _03802E08 ; =0x03809660 + ldr r8, _03802E08 ; =_03809660 mov sb, #0xd8 b _03802DF4 _03802DB8: @@ -13613,14 +13613,14 @@ _03802DFC: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, lr} bx lr .align 2, 0 -_03802E04: .word 0x03809060 -_03802E08: .word 0x03809660 +_03802E04: .word _03809060 +_03802E08: .word _03809660 arm_func_end sub_03802D70 arm_func_start sub_03802E0C sub_03802E0C: ; 0x03802E0C stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} - ldr r2, _03802EA0 ; =0x03809060 + ldr r2, _03802EA0 ; =_03809060 mov r7, r0 ldr r4, [r2] mov r6, r1 @@ -13634,7 +13634,7 @@ sub_03802E0C: ; 0x03802E0C bl sub_03802824 cmp r0, #0 beq _03802E98 - ldr r8, _03802EA4 ; =0x03809660 + ldr r8, _03802EA4 ; =_03809660 mov sb, #0x20 b _03802E90 _03802E54: @@ -13660,8 +13660,8 @@ _03802E98: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, lr} bx lr .align 2, 0 -_03802EA0: .word 0x03809060 -_03802EA4: .word 0x03809660 +_03802EA0: .word _03809060 +_03802EA4: .word _03809660 arm_func_end sub_03802E0C arm_func_start sub_03802EA8 @@ -13670,13 +13670,13 @@ sub_03802EA8: ; 0x03802EA8 bl sub_03802824 cmp r0, #0 beq _03802EEC - ldr r0, _03802EF4 ; =0x03809060 + ldr r0, _03802EF4 ; =_03809060 ldr r4, [r0] bl sub_038029D8 - ldr r1, _03802EF8 ; =0x03809660 + ldr r1, _03802EF8 ; =_03809660 mov r2, #1 - ldr r0, _03802EFC ; =0x03807208 - ldr r3, _03802F00 ; =0x03802924 + ldr r0, _03802EFC ; =_03807208 + ldr r3, _03802F00 ; =sub_03802924 str r2, [r1, #4] mov r1, #0 bl sub_03802860 @@ -13687,10 +13687,10 @@ _03802EEC: ldmia sp!, {r4, lr} bx lr .align 2, 0 -_03802EF4: .word 0x03809060 -_03802EF8: .word 0x03809660 -_03802EFC: .word 0x03807208 -_03802F00: .word 0x03802924 +_03802EF4: .word _03809060 +_03802EF8: .word _03809660 +_03802EFC: .word _03807208 +_03802F00: .word sub_03802924 arm_func_end sub_03802EA8 arm_func_start sub_03802F04 @@ -13700,12 +13700,12 @@ sub_03802F04: ; 0x03802F04 bl sub_03802824 cmp r0, #0 beq _03802F88 - ldr r0, _03802F90 ; =0x03809060 + ldr r0, _03802F90 ; =_03809060 strb r4, [sp, #1] mov r1, #1 ldr sb, [r0] - ldr r5, _03802F94 ; =0x03802924 - ldr r4, _03802F98 ; =0x03809660 + ldr r5, _03802F94 ; =sub_03802924 + ldr r4, _03802F98 ; =_03809660 strb r1, [sp] mov sl, #0xa add r7, sp, #0 @@ -13733,9 +13733,9 @@ _03802F88: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_03802F90: .word 0x03809060 -_03802F94: .word 0x03802924 -_03802F98: .word 0x03809660 +_03802F90: .word _03809060 +_03802F94: .word sub_03802924 +_03802F98: .word _03809660 arm_func_end sub_03802F04 arm_func_start sub_03802F9C @@ -13771,7 +13771,7 @@ _03802FF8: .word 0x040001A1 arm_func_start sub_03802FFC sub_03802FFC: ; 0x03802FFC stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r4, _0380306C ; =0x03809060 + ldr r4, _0380306C ; =_03809060 mov r1, #0 ldr r0, [r4] str r1, [r0] @@ -13801,12 +13801,12 @@ _03803064: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_0380306C: .word 0x03809060 +_0380306C: .word _03809060 arm_func_end sub_03802FFC arm_func_start sub_03803070 sub_03803070: ; 0x03803070 - ldr r1, _0380308C ; =0x03807560 + ldr r1, _0380308C ; =_03807560 ldr r1, [r1] ldr r1, [r1, #0x60] bic r1, r1, #0x7000000 @@ -13814,7 +13814,7 @@ sub_03803070: ; 0x03803070 orr r0, r0, #0xa0000000 bx lr .align 2, 0 -_0380308C: .word 0x03807560 +_0380308C: .word _03807560 arm_func_end sub_03803070 arm_func_start sub_03803090 @@ -13851,7 +13851,7 @@ _038030E0: .word 0x04100010 arm_func_start sub_038030E4 sub_038030E4: ; 0x038030E4 stmdb sp!, {r4, lr} - ldr r0, _03803110 ; =0x03809060 + ldr r0, _03803110 ; =_03809060 mov r1, #0 mov r2, r1 bl sub_03803114 @@ -13862,7 +13862,7 @@ sub_038030E4: ; 0x038030E4 ldmia sp!, {r4, lr} bx lr .align 2, 0 -_03803110: .word 0x03809060 +_03803110: .word _03809060 arm_func_end sub_038030E4 arm_func_start sub_03803114 @@ -13895,11 +13895,11 @@ _03803138: arm_func_start sub_03803168 sub_03803168: ; 0x03803168 stmdb sp!, {r3, lr} - ldr ip, _038031C8 ; =0x03809060 + ldr ip, _038031C8 ; =_03809060 ldr r0, [ip, #0xfc] cmp r0, #0 bne _038031C0 - ldr r0, _038031CC ; =0x03809680 + ldr r0, _038031CC ; =_03809680 mov r2, #0 sub r1, r2, #1 mov r3, #1 @@ -13912,17 +13912,17 @@ sub_03803168: ; 0x03803168 str r2, [ip, #0x40] str r2, [r0] bl sub_03802624 - ldr r1, _038031D0 ; =0x03803090 - ldr r0, _038031CC ; =0x03809680 + ldr r1, _038031D0 ; =sub_03803090 + ldr r0, _038031CC ; =_03809680 str r1, [r0, #0x20] bl sub_038034EC _038031C0: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_038031C8: .word 0x03809060 -_038031CC: .word 0x03809680 -_038031D0: .word 0x03803090 +_038031C8: .word _03809060 +_038031CC: .word _03809680 +_038031D0: .word sub_03803090 arm_func_end sub_03803168 arm_func_start sub_038031D4 @@ -13932,7 +13932,7 @@ sub_038031D4: ; 0x038031D4 bne _038032AC cmp r2, #0 beq _038032AC - ldr r0, _038032B4 ; =0x03809060 + ldr r0, _038032B4 ; =_03809060 ldr r2, [r0, #8] cmp r2, #0 streq r1, [r0, #4] @@ -13989,13 +13989,13 @@ _038032AC: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_038032B4: .word 0x03809060 +_038032B4: .word _03809060 arm_func_end sub_038031D4 arm_func_start sub_038032B8 sub_038032B8: ; 0x038032B8 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r4, _038034E8 ; =0x03809060 + ldr r4, _038034E8 ; =_03809060 _038032C0: mov r5, #0 bl sub_037FDD00 @@ -14159,13 +14159,13 @@ _038034D4: _038034E4: b _038032C0 .align 2, 0 -_038034E8: .word 0x03809060 +_038034E8: .word _03809060 arm_func_end sub_038032B8 arm_func_start sub_038034EC sub_038034EC: ; 0x038034EC stmdb sp!, {r3, r4, r5, lr} - ldr r0, _0380353C ; =0x038098C0 + ldr r0, _0380353C ; =_038098C0 ldr r1, [r0, #8] cmp r1, #0 bne _03803534 @@ -14180,15 +14180,15 @@ _03803514: bl sub_037FE3EC cmp r0, #0 beq _03803514 - ldr r1, _03803540 ; =0x03803544 + ldr r1, _03803540 ; =sub_03803544 mov r0, #0xe bl sub_037FE39C _03803534: ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_0380353C: .word 0x038098C0 -_03803540: .word 0x03803544 +_0380353C: .word _038098C0 +_03803540: .word sub_03803544 arm_func_end sub_038034EC arm_func_start sub_03803544 @@ -14225,7 +14225,7 @@ _038035A0: arm_func_start sub_038035A8 sub_038035A8: ; 0x038035A8 stmdb sp!, {r3, lr} - ldr r0, _038035E8 ; =0x038098C0 + ldr r0, _038035E8 ; =_038098C0 ldr r0, [r0, #0xc] cmp r0, #0 bne _038035D8 @@ -14238,12 +14238,12 @@ sub_038035A8: ; 0x038035A8 _038035D4: bl sub_03803690 _038035D8: - ldr r0, _038035E8 ; =0x038098C0 + ldr r0, _038035E8 ; =_038098C0 ldr r0, [r0, #0xc] ldmia sp!, {r3, lr} bx lr .align 2, 0 -_038035E8: .word 0x038098C0 +_038035E8: .word _038098C0 _038035EC: .word 0x027FFE1F arm_func_end sub_038035A8 @@ -14281,7 +14281,7 @@ _0380365C: mov r0, r0, lsr #0x10 bl sub_037FBCA4 _03803668: - ldr r1, _0380368C ; =0x038098C0 + ldr r1, _0380368C ; =_038098C0 cmp r5, #0 moveq r2, #1 movne r2, #0 @@ -14291,7 +14291,7 @@ _03803668: bx lr .align 2, 0 _03803688: .word 0x027FFC10 -_0380368C: .word 0x038098C0 +_0380368C: .word _038098C0 arm_func_end sub_038035F0 arm_func_start sub_03803690 @@ -14301,19 +14301,19 @@ sub_03803690: ; 0x03803690 ldr r1, [r0] mov r0, r2 tst r1, #0x100000 - ldrne r1, _038036B8 ; =0x038098C0 + ldrne r1, _038036B8 ; =_038098C0 movne r0, #0 strne r2, [r1, #0xc] bx lr .align 2, 0 _038036B4: .word 0x04000214 -_038036B8: .word 0x038098C0 +_038036B8: .word _038098C0 arm_func_end sub_03803690 arm_func_start sub_038036BC sub_038036BC: ; 0x038036BC stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r0, _038037A8 ; =0x038098C0 + ldr r0, _038037A8 ; =_038098C0 ldr r0, [r0, #4] cmp r0, #0 bne _038037A0 @@ -14321,7 +14321,7 @@ sub_038036BC: ; 0x038036BC ldrh r0, [r2] cmp r0, #2 beq _038037A0 - ldr r1, _038037B0 ; =0x03807564 + ldr r1, _038037B0 ; =_03807564 mvn r0, #0 ldr r3, [r1] cmp r3, r0 @@ -14338,20 +14338,20 @@ sub_038036BC: ; 0x038036BC bl sub_038035A8 cmp r0, #0 beq _03803750 - ldr r0, _038037A8 ; =0x038098C0 + ldr r0, _038037A8 ; =_038098C0 mov r1, #1 str r1, [r0, #4] bl sub_03802720 ldr r0, [r0, #0xc] cmp r0, #0 bne _03803750 - ldr r0, _038037B0 ; =0x03807564 + ldr r0, _038037B0 ; =_03807564 ldr r0, [r0, #4] cmp r0, #0 bne _038037A0 _03803750: - ldr r0, _038037A8 ; =0x038098C0 - ldr r1, _038037B0 ; =0x03807564 + ldr r0, _038037A8 ; =_038098C0 + ldr r1, _038037B0 ; =_03807564 ldr r0, [r0, #4] mov r2, #0 str r2, [r1, #4] @@ -14376,9 +14376,9 @@ _038037A0: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_038037A8: .word 0x038098C0 +_038037A8: .word _038098C0 _038037AC: .word 0x027FFC40 -_038037B0: .word 0x03807564 +_038037B0: .word _03807564 arm_func_end sub_038036BC thumb_func_start sub_038037B4 @@ -14568,7 +14568,7 @@ _03803870: .word 0x0F0F0F0F sub_03803874: ; 0x03803874 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #8 - ldr r1, _03803970 ; =0x038098D0 + ldr r1, _03803970 ; =_038098D0 mov r4, r0 ldrh r0, [r1] cmp r0, #0 @@ -14584,25 +14584,25 @@ sub_03803874: ; 0x03803874 bl sub_03805360 bl sub_038048A4 bl sub_037FE2B4 - ldr r1, _03803974 ; =0x03803CE8 + ldr r1, _03803974 ; =sub_03803CE8 mov r0, #6 bl sub_037FE39C - ldr r1, _03803974 ; =0x03803CE8 + ldr r1, _03803974 ; =sub_03803CE8 mov r0, #9 bl sub_037FE39C - ldr r1, _03803974 ; =0x03803CE8 + ldr r1, _03803974 ; =sub_03803CE8 mov r0, #8 bl sub_037FE39C - ldr r1, _03803974 ; =0x03803CE8 + ldr r1, _03803974 ; =sub_03803CE8 mov r0, #4 bl sub_037FE39C - ldr r0, _03803978 ; =0x03809B80 - ldr r1, _0380397C ; =0x03809BA0 + ldr r0, _03803978 ; =_03809B80 + ldr r1, _0380397C ; =_03809BA0 mov r2, #0x10 bl sub_037FC6AC mov sb, #0 mov r6, #0x18 - ldr r8, _03803980 ; =0x03809BE0 + ldr r8, _03803980 ; =_03809BE0 mov r7, sb mov r5, r6 _03803910: @@ -14613,39 +14613,39 @@ _03803910: add sb, sb, #1 cmp sb, #0x10 blt _03803910 - ldr r0, _03803970 ; =0x038098D0 + ldr r0, _03803970 ; =_038098D0 mov r2, #0 str r2, [r0, #0x490] str r2, [r0, #0x498] str r2, [r0, #0x494] mov r0, #0x200 str r0, [sp] - ldr r0, _03803984 ; =0x038098DC - ldr r1, _03803988 ; =0x03803C7C - ldr r3, _03803978 ; =0x03809B80 + ldr r0, _03803984 ; =_038098DC + ldr r1, _03803988 ; =sub_03803C7C + ldr r3, _03803978 ; =_03809B80 str r4, [sp, #4] bl sub_037FC054 - ldr r0, _03803984 ; =0x038098DC + ldr r0, _03803984 ; =_038098DC bl sub_037FC36C _03803964: add sp, sp, #8 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, lr} bx lr .align 2, 0 -_03803970: .word 0x038098D0 -_03803974: .word 0x03803CE8 -_03803978: .word 0x03809B80 -_0380397C: .word 0x03809BA0 -_03803980: .word 0x03809BE0 -_03803984: .word 0x038098DC -_03803988: .word 0x03803C7C +_03803970: .word _038098D0 +_03803974: .word sub_03803CE8 +_03803978: .word _03809B80 +_0380397C: .word _03809BA0 +_03803980: .word _03809BE0 +_03803984: .word _038098DC +_03803988: .word sub_03803C7C arm_func_end sub_03803874 arm_func_start sub_0380398C sub_0380398C: ; 0x0380398C stmdb sp!, {r4, r5, r6, lr} - ldr r5, _038039E0 ; =0x03809D64 - ldr r4, _038039E4 ; =0x038098D0 + ldr r5, _038039E0 ; =_03809D64 + ldr r4, _038039E4 ; =_038098D0 mov r6, r0 _0380399C: bl sub_037FDD00 @@ -14657,7 +14657,7 @@ _0380399C: bl sub_037FC290 b _0380399C _038039BC: - ldr r1, _038039E4 ; =0x038098D0 + ldr r1, _038039E4 ; =_038098D0 mov r2, #1 str r2, [r1, #4] mov r2, #4 @@ -14667,14 +14667,14 @@ _038039BC: ldmia sp!, {r4, r5, r6, lr} bx lr .align 2, 0 -_038039E0: .word 0x03809D64 -_038039E4: .word 0x038098D0 +_038039E0: .word _03809D64 +_038039E4: .word _038098D0 arm_func_end sub_0380398C arm_func_start sub_038039E8 sub_038039E8: ; 0x038039E8 stmdb sp!, {r3, lr} - ldr r1, _03803A40 ; =0x038098D0 + ldr r1, _03803A40 ; =_038098D0 ldr r2, [r1, #4] cmp r2, #0 beq _03803A38 @@ -14684,21 +14684,21 @@ sub_038039E8: ; 0x038039E8 cmpeq r1, r0 bne _03803A38 bl sub_037FDD00 - ldr r1, _03803A40 ; =0x038098D0 + ldr r1, _03803A40 ; =_038098D0 mov r2, #5 str r2, [r1, #8] mov r2, #0 str r2, [r1, #4] str r2, [r1, #0x49c] bl sub_037FDD14 - ldr r0, _03803A44 ; =0x03809D64 + ldr r0, _03803A44 ; =_03809D64 bl sub_037FC2E4 _03803A38: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_03803A40: .word 0x038098D0 -_03803A44: .word 0x03809D64 +_03803A40: .word _038098D0 +_03803A44: .word _03809D64 arm_func_end sub_038039E8 arm_func_start sub_03803A48 @@ -14766,35 +14766,35 @@ _03803AEC: arm_func_start sub_03803B0C sub_03803B0C: ; 0x03803B0C - ldr r0, _03803B24 ; =0x038098D0 + ldr r0, _03803B24 ; =_038098D0 ldr r0, [r0, #4] cmp r0, #0 moveq r0, #1 movne r0, #0 bx lr .align 2, 0 -_03803B24: .word 0x038098D0 +_03803B24: .word _038098D0 arm_func_end sub_03803B0C arm_func_start sub_03803B28 sub_03803B28: ; 0x03803B28 - ldr r1, _03803B3C ; =0x038098D0 + ldr r1, _03803B3C ; =_038098D0 mov r2, #1 str r2, [r1, #4] str r0, [r1, #8] bx lr .align 2, 0 -_03803B3C: .word 0x038098D0 +_03803B3C: .word _038098D0 arm_func_end sub_03803B28 arm_func_start sub_03803B40 sub_03803B40: ; 0x03803B40 stmdb sp!, {r3, lr} - ldr r1, _03803B74 ; =0x038098D0 + ldr r1, _03803B74 ; =_038098D0 ldr r2, [r1, #8] cmp r2, r0 bne _03803B6C - ldr r0, _03803B78 ; =0x03809D64 + ldr r0, _03803B78 ; =_03809D64 mov r2, #5 str r2, [r1, #8] mov r2, #0 @@ -14804,8 +14804,8 @@ _03803B6C: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_03803B74: .word 0x038098D0 -_03803B78: .word 0x03809D64 +_03803B74: .word _038098D0 +_03803B78: .word _03809D64 arm_func_end sub_03803B40 arm_func_start sub_03803B7C @@ -14819,13 +14819,13 @@ sub_03803B7C: ; 0x03803B7C movhi r0, #0 bhi _03803C3C bl sub_037FDD00 - ldr r3, _03803C48 ; =0x038098D0 + ldr r3, _03803C48 ; =_038098D0 add r2, sp, #0x18 ldr ip, [r3, #0x490] mov r1, #0x18 mul r6, ip, r1 - ldr lr, _03803C4C ; =0x03809BE0 - ldr ip, _03803C50 ; =0x03809BE4 + ldr lr, _03803C4C ; =_03809BE0 + ldr ip, _03803C50 ; =_03809BE4 str r5, [lr, r6] ldr r5, [r3, #0x490] bic r2, r2, #3 @@ -14833,7 +14833,7 @@ sub_03803B7C: ; 0x03803B7C str r4, [ip, lr] add r6, r2, #4 ldrh r1, [sp, #0x18] - ldr r5, _03803C54 ; =0x038098D4 + ldr r5, _03803C54 ; =_038098D4 mov lr, #0 mov r2, #0x18 b _03803C04 @@ -14848,16 +14848,16 @@ _03803BE8: _03803C04: cmp lr, r1 blt _03803BE8 - ldr r1, _03803C48 ; =0x038098D0 + ldr r1, _03803C48 ; =_038098D0 ldr r4, [r1, #0x490] add r2, r4, #1 and r2, r2, #0xf str r2, [r1, #0x490] bl sub_037FDD14 - ldr r1, _03803C4C ; =0x03809BE0 + ldr r1, _03803C4C ; =_03809BE0 mov r0, #0x18 mla r1, r4, r0, r1 - ldr r0, _03803C58 ; =0x03809B80 + ldr r0, _03803C58 ; =_03809B80 mov r2, #0 bl sub_037FC6D4 _03803C3C: @@ -14865,31 +14865,31 @@ _03803C3C: add sp, sp, #0x10 bx lr .align 2, 0 -_03803C48: .word 0x038098D0 -_03803C4C: .word 0x03809BE0 -_03803C50: .word 0x03809BE4 -_03803C54: .word 0x038098D4 -_03803C58: .word 0x03809B80 +_03803C48: .word _038098D0 +_03803C4C: .word _03809BE0 +_03803C50: .word _03809BE4 +_03803C54: .word _038098D4 +_03803C58: .word _03809B80 arm_func_end sub_03803B7C arm_func_start sub_03803C5C sub_03803C5C: ; 0x03803C5C stmdb sp!, {r3, lr} - ldr r0, _03803C78 ; =0x03809B80 + ldr r0, _03803C78 ; =_03809B80 add r1, sp, #0 mov r2, #0 bl sub_037FC7FC ldmia sp!, {r3, lr} bx lr .align 2, 0 -_03803C78: .word 0x03809B80 +_03803C78: .word _03809B80 arm_func_end sub_03803C5C arm_func_start sub_03803C7C sub_03803C7C: ; 0x03803C7C stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #4 - ldr r6, _03803CE4 ; =0x03809B80 + ldr r6, _03803CE4 ; =_03809B80 add r5, sp, #0 mov r4, #1 _03803C90: @@ -14920,7 +14920,7 @@ _03803CDC: bl sub_027F517C b _03803C90 .align 2, 0 -_03803CE4: .word 0x03809B80 +_03803CE4: .word _03809B80 arm_func_end sub_03803C7C arm_func_start sub_03803CE8 @@ -14962,13 +14962,13 @@ _03803D48: arm_func_start sub_03803D50 sub_03803D50: ; 0x03803D50 stmdb sp!, {r4, r5, r6, r7, r8, lr} - ldr r0, _03803E1C ; =0x03809D70 + ldr r0, _03803E1C ; =_03809D70 mov r3, #0 str r3, [r0, #0x24] mov r1, #0x14 str r1, [r0, #0x28] str r1, [r0, #0x2c] - ldr r0, _03803E20 ; =0x03809D74 + ldr r0, _03803E20 ; =_03809D74 mov r2, r3 _03803D74: mov r1, r3, lsl #1 @@ -14981,7 +14981,7 @@ _03803D74: bne _03803D98 bl sub_037FD74C _03803D98: - ldr r7, _03803E24 ; =0x03809DA0 + ldr r7, _03803E24 ; =_03809DA0 ldr r5, _03803E28 ; =0x54505641 mov r8, #0 mov r4, #0x28 @@ -15018,9 +15018,9 @@ _03803DF4: ldmia sp!, {r4, r5, r6, r7, r8, lr} bx lr .align 2, 0 -_03803E1C: .word 0x03809D70 -_03803E20: .word 0x03809D74 -_03803E24: .word 0x03809DA0 +_03803E1C: .word _03809D70 +_03803E20: .word _03809D74 +_03803E24: .word _03809DA0 _03803E28: .word 0x54505641 _03803E2C: .word 0x040001C0 _03803E30: .word 0x00008A01 @@ -15049,7 +15049,7 @@ sub_03803E60: ; 0x03803E60 sub sp, sp, #4 tst r0, #0x2000000 beq _03803E90 - ldr r1, _0380403C ; =0x03809D74 + ldr r1, _0380403C ; =_03809D74 mov r4, #0 mov r3, r4 _03803E7C: @@ -15059,14 +15059,14 @@ _03803E7C: cmp r4, #0x10 blt _03803E7C _03803E90: - ldr r1, _0380403C ; =0x03809D74 + ldr r1, _0380403C ; =_03809D74 and r2, r0, #0xf0000 mov r2, r2, lsr #0x10 mov r2, r2, lsl #1 strh r0, [r1, r2] tst r0, #0x1000000 beq _03804030 - ldr r2, _03804040 ; =0x03809D70 + ldr r2, _03804040 ; =_03809D70 ldrh r1, [r2, #4] and r0, r1, #0xff00 mov r0, r0, lsl #8 @@ -15141,7 +15141,7 @@ _03803F9C: str ip, [sp] bl sub_03803B7C cmp r0, #0 - ldrne r0, _03804040 ; =0x03809D70 + ldrne r0, _03804040 ; =_03809D70 movne r1, #1 strne r1, [r0, #0x24] bne _03804030 @@ -15163,7 +15163,7 @@ _03803FF0: mov r2, r0 bl sub_03803B7C cmp r0, #0 - ldrne r0, _03804040 ; =0x03809D70 + ldrne r0, _03804040 ; =_03809D70 movne r1, #3 strne r1, [r0, #0x24] bne _03804030 @@ -15180,8 +15180,8 @@ _03804030: ldmia sp!, {r3, r4, lr} bx lr .align 2, 0 -_0380403C: .word 0x03809D74 -_03804040: .word 0x03809D70 +_0380403C: .word _03809D74 +_03804040: .word _03809D70 _03804044: .word 0x00000107 arm_func_end sub_03803E60 @@ -15203,7 +15203,7 @@ sub_03804048: ; 0x03804048 _0380407C: cmp r1, #0x10 bne _03804314 - ldr r0, _03804320 ; =0x03809D70 + ldr r0, _03804320 ; =_03809D70 ldr r0, [r0, #0x24] cmp r0, #2 bne _03804314 @@ -15227,7 +15227,7 @@ _038040CC: bl sub_03803B28 mov r0, r4 bl sub_037FDD14 - ldr r1, _03804320 ; =0x03809D70 + ldr r1, _03804320 ; =_03809D70 add r0, sp, #8 ldr r1, [r1, #0x28] add r2, sp, #4 @@ -15236,7 +15236,7 @@ _038040CC: ldrh r2, [sp, #4] mov r1, r0, lsl #7 movs r1, r1, lsr #0x1f - ldreq r0, _03804320 ; =0x03809D70 + ldreq r0, _03804320 ; =_03809D70 moveq r1, #0 streqb r1, [r0, #1] streqb r1, [r0] @@ -15244,7 +15244,7 @@ _038040CC: mov r0, r0, lsl #5 movs r0, r0, lsr #0x1e beq _0380415C - ldr r0, _03804320 ; =0x03809D70 + ldr r0, _03804320 ; =_03809D70 mov r3, #0 strb r3, [r0] ldrb r1, [r0, #1] @@ -15260,7 +15260,7 @@ _038040CC: strlt r1, [r0, #0x28] b _038041AC _0380415C: - ldr r0, _03804320 ; =0x03809D70 + ldr r0, _03804320 ; =_03809D70 mov r4, #0 strb r4, [r0, #1] ldr r3, [r0, #0x28] @@ -15305,13 +15305,13 @@ _038041F4: bl sub_03803B40 b _03804314 _03804200: - ldr r0, _03804320 ; =0x03809D70 + ldr r0, _03804320 ; =_03809D70 ldr r0, [r0, #0x24] cmp r0, #1 bne _038042B4 ldr r8, _03804328 ; =0x00000107 - ldr r6, _0380432C ; =0x03809D74 - ldr r5, _03804330 ; =0x03809DA0 + ldr r6, _0380432C ; =_03809D74 + ldr r5, _03804330 ; =_03809DA0 mov sb, #0 mov r7, #0xd7 mov fp, #0xa @@ -15336,7 +15336,7 @@ _03804260: str sb, [sp] mla r0, sb, r4, r5 ldrsh r1, [r1, #0xcc] - ldr r3, _03804334 ; =0x0380433C + ldr r3, _03804334 ; =sub_0380433C mov r2, fp bl sub_037FD928 add sb, sb, #1 @@ -15349,7 +15349,7 @@ _03804284: mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_03803A48 - ldr r0, _03804320 ; =0x03809D70 + ldr r0, _03804320 ; =_03809D70 mov r1, #2 str r1, [r0, #0x24] b _03804314 @@ -15360,7 +15360,7 @@ _038042B4: bl sub_03803A48 b _03804314 _038042C8: - ldr r0, _03804320 ; =0x03809D70 + ldr r0, _03804320 ; =_03809D70 ldr r0, [r0, #0x24] cmp r0, #3 bne _03804304 @@ -15371,7 +15371,7 @@ _038042C8: mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_03803A48 - ldr r0, _03804320 ; =0x03809D70 + ldr r0, _03804320 ; =_03809D70 mov r1, #0 str r1, [r0, #0x24] b _03804314 @@ -15385,12 +15385,12 @@ _03804314: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_03804320: .word 0x03809D70 +_03804320: .word _03809D70 _03804324: .word 0x027FFFAA _03804328: .word 0x00000107 -_0380432C: .word 0x03809D74 -_03804330: .word 0x03809DA0 -_03804334: .word 0x0380433C +_0380432C: .word _03809D74 +_03804330: .word _03809DA0 +_03804334: .word sub_0380433C _03804338: .word 0x54505641 arm_func_end sub_03804048 @@ -15451,7 +15451,7 @@ _038043D8: ldr r0, _03804480 ; =0x040001C0 strh r1, [r0] bl sub_03804498 - ldr r0, _03804490 ; =0x03809E48 + ldr r0, _03804490 ; =_03809E48 ldrh r0, [r0] cmp r0, #0 bne _03804420 @@ -15493,7 +15493,7 @@ _03804480: .word 0x040001C0 _03804484: .word 0x00008A01 _03804488: .word 0x040001C2 _0380448C: .word 0x00008201 -_03804490: .word 0x03809E48 +_03804490: .word _03809E48 _03804494: .word 0x04000136 arm_func_end sub_038043A4 @@ -15682,7 +15682,7 @@ sub_038046AC: ; 0x038046AC str r1, [r7] orr r1, r0, #0x6000000 str r1, [r7] - ldr r0, _03804894 ; =0x03809E48 + ldr r0, _03804894 ; =_03809E48 mov r1, #0 strh r1, [r0] b _03804884 @@ -15753,7 +15753,7 @@ _038047C0: cmp r0, #2 bne _03804880 ldr r1, [r7] - ldr r0, _03804894 ; =0x03809E48 + ldr r0, _03804894 ; =_03809E48 orr r2, r1, #0x1000000 bic r1, r2, #0x6000000 orr r1, r1, #0x6000000 @@ -15763,7 +15763,7 @@ _038047C0: b _03804884 _03804834: ldr r1, [r7] - ldr r0, _03804894 ; =0x03809E48 + ldr r0, _03804894 ; =_03809E48 orr r1, r1, #0x1000000 str r1, [r7] mov r2, #1 @@ -15776,7 +15776,7 @@ _03804834: b _03804884 _03804864: ldr r1, [r7] - ldr r0, _03804894 ; =0x03809E48 + ldr r0, _03804894 ; =_03809E48 bic r1, r1, #0x1000000 str r1, [r7] mov r1, #0 @@ -15790,7 +15790,7 @@ _03804884: bx lr .align 2, 0 _03804890: .word 0xFF000FFF -_03804894: .word 0x03809E48 +_03804894: .word _03809E48 _03804898: .word 0x00008A01 _0380489C: .word 0x040001C0 _038048A0: .word 0x00008201 @@ -15798,12 +15798,12 @@ _038048A0: .word 0x00008201 arm_func_start sub_038048A4 sub_038048A4: ; 0x038048A4 - ldr r0, _038048D8 ; =0x03809E4C + ldr r0, _038048D8 ; =_03809E4C mov r1, #1 str r1, [r0, #4] mov r3, #0 str r3, [r0, #0x28] - ldr r0, _038048DC ; =0x03809E54 + ldr r0, _038048DC ; =_03809E54 mov r2, r3 _038048C0: mov r1, r3, lsl #1 @@ -15813,8 +15813,8 @@ _038048C0: blt _038048C0 bx lr .align 2, 0 -_038048D8: .word 0x03809E4C -_038048DC: .word 0x03809E54 +_038048D8: .word _03809E4C +_038048DC: .word _03809E54 arm_func_end sub_038048A4 arm_func_start sub_038048E0 @@ -15823,7 +15823,7 @@ sub_038048E0: ; 0x038048E0 sub sp, sp, #4 tst r0, #0x2000000 beq _03804910 - ldr r1, _03804A94 ; =0x03809E54 + ldr r1, _03804A94 ; =_03809E54 mov r4, #0 mov r3, r4 _038048FC: @@ -15833,14 +15833,14 @@ _038048FC: cmp r4, #0x10 blt _038048FC _03804910: - ldr r1, _03804A94 ; =0x03809E54 + ldr r1, _03804A94 ; =_03809E54 and r2, r0, #0xf0000 mov r2, r2, lsr #0x10 mov r2, r2, lsl #1 strh r0, [r1, r2] tst r0, #0x1000000 beq _03804A88 - ldr r1, _03804A98 ; =0x03809E4C + ldr r1, _03804A98 ; =_03809E4C ldrh r2, [r1, #8] and r0, r2, #0xff00 mov r0, r0, lsl #8 @@ -15941,8 +15941,8 @@ _03804A88: ldmia sp!, {r3, r4, lr} bx lr .align 2, 0 -_03804A94: .word 0x03809E54 -_03804A98: .word 0x03809E4C +_03804A94: .word _03809E54 +_03804A98: .word _03809E4C arm_func_end sub_038048E0 arm_func_start sub_03804A9C @@ -15981,7 +15981,7 @@ _03804B00: ; jump table b _03804B78 ; case 4 b _03804BDC ; case 5 _03804B18: - ldr r0, _03804C08 ; =0x03809E4C + ldr r0, _03804C08 ; =_03809E4C mov r1, #1 str r1, [r0, #0x28] ldr r1, [r4, #8] @@ -15991,7 +15991,7 @@ _03804B18: bl sub_03804F1C b _03804BF8 _03804B3C: - ldr r2, _03804C08 ; =0x03809E4C + ldr r2, _03804C08 ; =_03809E4C mov r0, #4 str r0, [r2, #0x28] ldr r0, [r4, #8] @@ -16007,7 +16007,7 @@ _03804B3C: bl sub_03803A48 b _03804BF8 _03804B78: - ldr r1, _03804C08 ; =0x03809E4C + ldr r1, _03804C08 ; =_03809E4C mov r0, #3 str r0, [r1, #0x28] ldr r2, [r4, #8] @@ -16023,7 +16023,7 @@ _03804B78: bl sub_03803A48 b _03804BF8 _03804BB4: - ldr r1, _03804C08 ; =0x03809E4C + ldr r1, _03804C08 ; =_03809E4C mov r0, #2 str r0, [r1, #0x28] ldr r0, [r4, #8] @@ -16049,7 +16049,7 @@ _03804C00: ldmia sp!, {r3, r4, r5, lr} bx lr .align 2, 0 -_03804C08: .word 0x03809E4C +_03804C08: .word _03809E4C arm_func_end sub_03804A9C arm_func_start sub_03804C0C @@ -16303,12 +16303,12 @@ _03804EF0: _03804F04: bl sub_037FDE70 _03804F08: - ldr r0, _03804F18 ; =0x0380756C + ldr r0, _03804F18 ; =_0380756C str r4, [r0] ldmia sp!, {r4, lr} bx lr .align 2, 0 -_03804F18: .word 0x0380756C +_03804F18: .word _0380756C arm_func_end sub_03804EB4 arm_func_start sub_03804F1C @@ -16335,11 +16335,11 @@ sub_03804F1C: ; 0x03804F1C bl sub_037FE708 mov r0, #1 bl sub_03804D64 - ldr r0, _038050DC ; =0x03809E4E + ldr r0, _038050DC ; =_03809E4E ldrh r0, [r0] tst r0, #1 beq _03804FA0 - ldr r0, _038050E0 ; =0x03809E4C + ldr r0, _038050E0 ; =_03809E4C ldr r1, _038050E4 ; =0x04000132 ldrh r2, [r0] mov r0, #0x1000 @@ -16347,14 +16347,14 @@ sub_03804F1C: ; 0x03804F1C strh r2, [r1] bl sub_037FB8F0 _03804FA0: - ldr r0, _038050DC ; =0x03809E4E + ldr r0, _038050DC ; =_03809E4E ldrh r0, [r0] tst r0, #4 beq _03804FB8 mov r0, #0x400000 bl sub_037FB8F0 _03804FB8: - ldr r0, _038050DC ; =0x03809E4E + ldr r0, _038050DC ; =_03809E4E ldrh r0, [r0] tst r0, #2 beq _03804FFC @@ -16372,14 +16372,14 @@ _03804FB8: mov r0, #0x80 bl sub_037FB8F0 _03804FFC: - ldr r0, _038050DC ; =0x03809E4E + ldr r0, _038050DC ; =_03809E4E ldrh r0, [r0] tst r0, #8 beq _03805014 mov r0, #0x100000 bl sub_037FB8F0 _03805014: - ldr r0, _038050DC ; =0x03809E4E + ldr r0, _038050DC ; =_03809E4E ldrh r0, [r0] tst r0, #0x10 beq _0380502C @@ -16396,7 +16396,7 @@ _0380502C: mov r1, r6 mov r0, #0 bl sub_03804C50 - ldr r0, _038050DC ; =0x03809E4E + ldr r0, _038050DC ; =_03809E4E ldrh r1, [r0] tst r1, #0x20 movne r0, #6 @@ -16414,7 +16414,7 @@ _0380502C: bl sub_03804D40 bl sub_037FE760 mov r1, #0 - ldr r3, _038050EC ; =0x03809E54 + ldr r3, _038050EC ; =_03809E54 mov r2, r1 mov r0, #0x62 str r1, [r3, #0x20] @@ -16431,11 +16431,11 @@ _0380502C: bx lr .align 2, 0 _038050D8: .word 0x04000208 -_038050DC: .word 0x03809E4E -_038050E0: .word 0x03809E4C +_038050DC: .word _03809E4E +_038050E0: .word _03809E4C _038050E4: .word 0x04000132 _038050E8: .word 0x04000134 -_038050EC: .word 0x03809E54 +_038050EC: .word _03809E54 arm_func_end sub_03804F1C arm_func_start sub_038050F0 @@ -16449,7 +16449,7 @@ _038050F8: .word sub_038037D6 + 1 arm_func_start sub_038050FC sub_038050FC: ; 0x038050FC stmdb sp!, {r4, r5, r6, lr} - ldr r1, _03805210 ; =0x03809E80 + ldr r1, _03805210 ; =_03809E80 ldr r3, [r1, #4] cmp r3, #0 bne _03805138 @@ -16466,7 +16466,7 @@ sub_038050FC: ; 0x038050FC _03805138: cmp r3, #4 bge _03805164 - ldr r0, _03805214 ; =0x0380756C + ldr r0, _03805214 ; =_0380756C ldr r0, [r0] cmp r3, r0 beq _03805208 @@ -16479,7 +16479,7 @@ _03805164: sub r2, r3, #4 mov r0, #0xc mul r4, r2, r0 - ldr r5, _03805218 ; =0x03807570 + ldr r5, _03805218 ; =_03807570 ldr r0, [r1] add r6, r5, r4 ldrh r1, [r6, #0xa] @@ -16500,7 +16500,7 @@ _03805164: movne r3, #1 ldrh r2, [r6, #8] ldrh r1, [r6, #0xa] - ldr r0, _03805210 ; =0x03809E80 + ldr r0, _03805210 ; =_03809E80 mul r1, r2, r1 ldr r2, [r0] moveq r3, #2 @@ -16509,7 +16509,7 @@ _03805164: str r2, [r0] movhs r1, #0 strhs r1, [r0] - ldr r0, _03805214 ; =0x0380756C + ldr r0, _03805214 ; =_0380756C ldr r0, [r0] cmp r3, r0 beq _03805208 @@ -16521,52 +16521,52 @@ _03805208: ldmia sp!, {r4, r5, r6, lr} bx lr .align 2, 0 -_03805210: .word 0x03809E80 -_03805214: .word 0x0380756C -_03805218: .word 0x03807570 +_03805210: .word _03809E80 +_03805214: .word _0380756C +_03805218: .word _03807570 arm_func_end sub_038050FC arm_func_start sub_0380521C sub_0380521C: ; 0x0380521C cmp r0, #0xf - ldrle r1, _03805234 ; =0x03809E80 + ldrle r1, _03805234 ; =_03809E80 movle r2, #0 strle r0, [r1, #4] strle r2, [r1] bx lr .align 2, 0 -_03805234: .word 0x03809E80 +_03805234: .word _03809E80 arm_func_end sub_0380521C arm_func_start sub_03805238 sub_03805238: ; 0x03805238 - ldr r0, _03805244 ; =0x03809E80 + ldr r0, _03805244 ; =_03809E80 ldr r0, [r0, #4] bx lr .align 2, 0 -_03805244: .word 0x03809E80 +_03805244: .word _03809E80 arm_func_end sub_03805238 arm_func_start sub_03805248 sub_03805248: ; 0x03805248 stmdb sp!, {r4, lr} mov r4, r0 - ldr r3, _03805284 ; =0x03809E88 + ldr r3, _03805284 ; =_03809E88 mov r1, #0 - ldr r0, _03805288 ; =0x03809E98 + ldr r0, _03805288 ; =_03809E98 mov r2, #0xa4 stmib r3, {r1, r4} bl sub_037FE070 mov r0, r4 bl sub_038052BC - ldr r0, _03805284 ; =0x03809E88 + ldr r0, _03805284 ; =_03809E88 mov r1, #3 strb r1, [r0] ldmia sp!, {r4, lr} bx lr .align 2, 0 -_03805284: .word 0x03809E88 -_03805288: .word 0x03809E98 +_03805284: .word _03809E88 +_03805288: .word _03809E98 arm_func_end sub_03805248 arm_func_start sub_0380528C @@ -16591,12 +16591,12 @@ sub_038052BC: ; 0x038052BC stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} sub sp, sp, #0x50 str r0, [sp, #0x44] - ldr r0, _03805354 ; =0x0380AAFC + ldr r0, _03805354 ; =_0380AAFC mov sb, #4 mov r7, #8 mov r4, #3 - ldr r1, _03805358 ; =0x0380AAFC - ldr r6, _0380535C ; =0x03809F3C + ldr r1, _03805358 ; =_0380AAFC + ldr r6, _0380535C ; =_03809F3C mov sl, #0x600 mov r8, #0 mov r5, #0x1c0 @@ -16627,17 +16627,17 @@ sub_038052BC: ; 0x038052BC ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, lr} bx lr .align 2, 0 -_03805354: .word 0x0380AAFC -_03805358: .word 0x0380AAFC -_0380535C: .word 0x03809F3C +_03805354: .word _0380AAFC +_03805358: .word _0380AAFC +_0380535C: .word _03809F3C arm_func_end sub_038052BC arm_func_start sub_03805360 sub_03805360: ; 0x03805360 - ldr r0, _0380539C ; =0x0380B1FC + ldr r0, _0380539C ; =_0380B1FC mov r3, #0 str r3, [r0, #0x20] - ldr r0, _038053A0 ; =0x0380B1FC + ldr r0, _038053A0 ; =_0380B1FC mov r2, r3 _03805374: mov r1, r3, lsl #1 @@ -16651,8 +16651,8 @@ _03805374: strh r0, [r1] bx lr .align 2, 0 -_0380539C: .word 0x0380B1FC -_038053A0: .word 0x0380B1FC +_0380539C: .word _0380B1FC +_038053A0: .word _0380B1FC _038053A4: .word 0x0400010E arm_func_end sub_03805360 @@ -16661,7 +16661,7 @@ sub_038053A8: ; 0x038053A8 stmdb sp!, {r4, lr} tst r0, #0x2000000 beq _038053D4 - ldr r1, _03805660 ; =0x0380B1FC + ldr r1, _03805660 ; =_0380B1FC mov r4, #0 mov r3, r4 _038053C0: @@ -16671,14 +16671,14 @@ _038053C0: cmp r4, #0x10 blt _038053C0 _038053D4: - ldr r1, _03805660 ; =0x0380B1FC + ldr r1, _03805660 ; =_0380B1FC and r2, r0, #0xf0000 mov r2, r2, lsr #0x10 mov r2, r2, lsl #1 strh r0, [r1, r2] tst r0, #0x1000000 beq _03805658 - ldr r1, _03805664 ; =0x0380B1FC + ldr r1, _03805664 ; =_0380B1FC ldrh r2, [r1] and r0, r2, #0xff00 mov r0, r0, lsl #8 @@ -16757,7 +16757,7 @@ _038054DC: bl sub_03803A48 b _03805658 _03805508: - ldr r3, _03805664 ; =0x0380B1FC + ldr r3, _03805664 ; =_0380B1FC mov r2, #0 str r2, [r3, #0x2c] ldrh r0, [r3, #0x24] @@ -16776,7 +16776,7 @@ _03805544: ldr r1, _03805668 ; =0x027FFF94 mov r2, #0 strh r2, [r1] - ldr r0, _03805664 ; =0x0380B1FC + ldr r0, _03805664 ; =_0380B1FC str r2, [r1, #-4] mov r1, #1 str r1, [r0, #0x20] @@ -16801,7 +16801,7 @@ _03805580: bl sub_03803A48 b _03805658 _038055A8: - ldr r0, _03805664 ; =0x0380B1FC + ldr r0, _03805664 ; =_0380B1FC mov r2, #3 ldr r1, _0380566C ; =0x0400010E str r2, [r0, #0x20] @@ -16831,7 +16831,7 @@ _038055E4: _0380560C: bl sub_037FDD00 ldr r3, _0380566C ; =0x0400010E - ldr r1, _03805664 ; =0x0380B1FC + ldr r1, _03805664 ; =_0380B1FC ldrh r2, [r3] bic r2, r2, #0x80 strh r2, [r3] @@ -16853,8 +16853,8 @@ _03805658: ldmia sp!, {r4, lr} bx lr .align 2, 0 -_03805660: .word 0x0380B1FC -_03805664: .word 0x0380B1FC +_03805660: .word _0380B1FC +_03805664: .word _0380B1FC _03805668: .word 0x027FFF94 _0380566C: .word 0x0400010E arm_func_end sub_038053A8 @@ -16863,7 +16863,7 @@ _0380566C: .word 0x0400010E sub_03805670: ; 0x03805670 cmp r0, #0x10000 bhs _03805694 - ldr r1, _03805710 ; =0x0380B1FC + ldr r1, _03805710 ; =_0380B1FC mov r2, #0 strh r2, [r1, #0x36] rsb r0, r0, #0x10000 @@ -16873,7 +16873,7 @@ sub_03805670: ; 0x03805670 _03805694: cmp r0, #0x400000 bhs _038056BC - ldr r1, _03805710 ; =0x0380B1FC + ldr r1, _03805710 ; =_0380B1FC mov r3, #1 mov r0, r0, lsr #6 rsb r2, r0, #0x10000 @@ -16884,7 +16884,7 @@ _03805694: _038056BC: cmp r0, #0x1000000 bhs _038056E4 - ldr r1, _03805710 ; =0x0380B1FC + ldr r1, _03805710 ; =_0380B1FC mov r2, #2 mov r0, r0, lsr #8 strh r2, [r1, #0x36] @@ -16896,7 +16896,7 @@ _038056E4: cmp r0, #0x4000000 movhs r0, #0 bxhs lr - ldr r1, _03805710 ; =0x0380B1FC + ldr r1, _03805710 ; =_0380B1FC mov r2, #3 mov r0, r0, lsr #0xa strh r2, [r1, #0x36] @@ -16905,7 +16905,7 @@ _038056E4: mov r0, #1 bx lr .align 2, 0 -_03805710: .word 0x0380B1FC +_03805710: .word _0380B1FC arm_func_end sub_03805670 arm_func_start sub_03805714 @@ -16969,7 +16969,7 @@ _038057B8: bl sub_03803B40 b _03805920 _038057EC: - ldr r0, _0380592C ; =0x0380B1FC + ldr r0, _0380592C ; =_0380B1FC ldr r1, [r0, #0x20] cmp r1, #1 bne _03805870 @@ -16980,11 +16980,11 @@ _038057EC: mov r5, r0 mov r0, #0x40 bl sub_037FB8F0 - ldr r1, _03805930 ; =0x0380593C + ldr r1, _03805930 ; =sub_0380593C mov r0, #0x40 bl sub_03805D98 bl sub_03805DC0 - ldr r1, _0380592C ; =0x0380B1FC + ldr r1, _0380592C ; =_0380B1FC ldr r2, _03805934 ; =0x0400010C ldrh r3, [r1, #0x34] mov r0, r5 @@ -16998,7 +16998,7 @@ _038057EC: mov r0, r0, lsl #0x10 mov r0, r0, lsr #0x10 bl sub_03803A48 - ldr r0, _0380592C ; =0x0380B1FC + ldr r0, _0380592C ; =_0380B1FC mov r1, #2 str r1, [r0, #0x20] b _03805920 @@ -17009,7 +17009,7 @@ _03805870: bl sub_03803A48 b _03805920 _03805884: - ldr r0, _0380592C ; =0x0380B1FC + ldr r0, _0380592C ; =_0380B1FC ldr r1, [r0, #0x20] sub r0, r1, #3 cmp r0, #1 @@ -17026,7 +17026,7 @@ _03805884: bl sub_03805E20 mov r0, r4 bl sub_037FDD14 - ldr r0, _0380592C ; =0x0380B1FC + ldr r0, _0380592C ; =_0380B1FC mov r1, #0 ldr r0, [r0, #0x20] cmp r0, #3 @@ -17038,7 +17038,7 @@ _038058E8: mov r0, #0x51 bl sub_03803A48 _038058F0: - ldr r0, _0380592C ; =0x0380B1FC + ldr r0, _0380592C ; =_0380B1FC mov r1, #0 str r1, [r0, #0x20] b _03805920 @@ -17057,8 +17057,8 @@ _03805920: bx lr .align 2, 0 _03805928: .word 0x027FFF94 -_0380592C: .word 0x0380B1FC -_03805930: .word 0x0380593C +_0380592C: .word _0380B1FC +_03805930: .word sub_0380593C _03805934: .word 0x0400010C _03805938: .word 0x0400010E arm_func_end sub_03805714 @@ -17084,7 +17084,7 @@ _0380596C: .word 0x04000214 arm_func_start sub_03805970 sub_03805970: ; 0x03805970 stmdb sp!, {r4, r5, r6, r7, lr} - ldr r4, _03805B00 ; =0x0380B1FC + ldr r4, _03805B00 ; =_0380B1FC ldrh r5, [r4, #0x26] and r0, r5, #4 cmp r0, #4 @@ -17205,7 +17205,7 @@ _03805AF8: ldmia sp!, {r4, r5, r6, r7, lr} bx lr .align 2, 0 -_03805B00: .word 0x0380B1FC +_03805B00: .word _0380B1FC _03805B04: .word 0x0000FFFF _03805B08: .word 0x027FFC00 _03805B0C: .word 0x0400010E @@ -17235,7 +17235,7 @@ _03805B3C: mov r4, r0, lsl #0x18 strh r2, [r1] bl sub_03805C34 - ldr r2, _03805C2C ; =0x0380B238 + ldr r2, _03805C2C ; =_0380B238 ldr r1, _03805C30 ; =0x00007F80 orr r0, r0, r4, lsr #16 and r1, r0, r1 @@ -17262,17 +17262,17 @@ _03805B3C: bge _03805BDC mvn r0, #0xb cmp r4, r0 - ldrgt r0, _03805C2C ; =0x0380B238 + ldrgt r0, _03805C2C ; =_0380B238 ldrgtsb r2, [r0] subgt r2, r2, #1 strgtb r2, [r0] _03805BDC: - ldr r0, _03805C2C ; =0x0380B238 + ldr r0, _03805C2C ; =_0380B238 mov r2, #0 str r2, [r0, #0xc] str r2, [r0, #0x10] _03805BEC: - ldr r0, _03805C2C ; =0x0380B238 + ldr r0, _03805C2C ; =_0380B238 ldrsb r0, [r0] rsb r0, r0, r1, lsr #16 cmp r0, #0xff @@ -17290,7 +17290,7 @@ _03805C1C: .word 0x040001C0 _03805C20: .word 0x00008A01 _03805C24: .word 0x040001C2 _03805C28: .word 0x00008201 -_03805C2C: .word 0x0380B238 +_03805C2C: .word _0380B238 _03805C30: .word 0x00007F80 arm_func_end sub_03805B10 @@ -17336,7 +17336,7 @@ _03805C90: mov r4, r0, lsl #0x18 strh r2, [r1] bl sub_03805C34 - ldr r3, _03805D8C ; =0x0380B238 + ldr r3, _03805D8C ; =_0380B238 ldr r1, _03805D90 ; =0x00007FF8 orr r0, r0, r4, lsr #16 and r2, r0, r1 @@ -17365,17 +17365,17 @@ _03805C90: mov r0, #0xc00 rsb r0, r0, #0 cmp r4, r0 - ldrgt r0, _03805D8C ; =0x0380B238 + ldrgt r0, _03805D8C ; =_0380B238 ldrgtsh r1, [r0, #2] subgt r1, r1, #0x10 strgth r1, [r0, #2] _03805D38: - ldr r0, _03805D8C ; =0x0380B238 + ldr r0, _03805D8C ; =_0380B238 mov r1, #0 str r1, [r0, #8] str r1, [r0, #4] _03805D48: - ldr r1, _03805D8C ; =0x0380B238 + ldr r1, _03805D8C ; =_0380B238 ldr r0, _03805D94 ; =0x0000FFF0 ldrsh r1, [r1, #2] rsb r1, r1, r2, lsr #16 @@ -17394,14 +17394,14 @@ _03805D7C: .word 0x040001C0 _03805D80: .word 0x00008A01 _03805D84: .word 0x040001C2 _03805D88: .word 0x00008201 -_03805D8C: .word 0x0380B238 +_03805D8C: .word _0380B238 _03805D90: .word 0x00007FF8 _03805D94: .word 0x0000FFF0 arm_func_end sub_03805C64 arm_func_start sub_03805D98 sub_03805D98: ; 0x03805D98 - ldr r2, _03805DBC ; =0x038074F4 + ldr r2, _03805DBC ; =_038074F4 mov r3, #0 _03805DA0: tst r0, #1 @@ -17412,18 +17412,18 @@ _03805DA0: blt _03805DA0 bx lr .align 2, 0 -_03805DBC: .word 0x038074F4 +_03805DBC: .word _038074F4 arm_func_end sub_03805D98 arm_func_start sub_03805DC0 sub_03805DC0: ; 0x03805DC0 stmdb sp!, {r3, lr} ldr r3, _03805E14 ; =0x0380FFFC - ldr r0, _03805E18 ; =0x03805E64 + ldr r0, _03805E18 ; =sub_03805E64 ldr r2, [r3] cmp r2, r0 beq _03805E0C - ldr r0, _03805E1C ; =0x0380B24C + ldr r0, _03805E1C ; =_0380B24C mov r1, #0 str r1, [r0] sub r1, r3, #0x17c @@ -17432,7 +17432,7 @@ sub_03805DC0: ; 0x03805DC0 str r1, [r0, #8] str r2, [r0, #0xc] bl sub_037FDD00 - ldr r2, _03805E18 ; =0x03805E64 + ldr r2, _03805E18 ; =sub_03805E64 ldr r1, _03805E14 ; =0x0380FFFC str r2, [r1] bl sub_037FDD14 @@ -17441,20 +17441,20 @@ _03805E0C: bx lr .align 2, 0 _03805E14: .word 0x0380FFFC -_03805E18: .word 0x03805E64 -_03805E1C: .word 0x0380B24C +_03805E18: .word sub_03805E64 +_03805E1C: .word _0380B24C arm_func_end sub_03805DC0 arm_func_start sub_03805E20 sub_03805E20: ; 0x03805E20 stmdb sp!, {r3, lr} ldr r1, _03805E58 ; =0x0380FFFC - ldr r0, _03805E5C ; =0x03805E64 + ldr r0, _03805E5C ; =sub_03805E64 ldr r1, [r1] cmp r1, r0 bne _03805E50 bl sub_037FDD00 - ldr r1, _03805E60 ; =0x0380B24C + ldr r1, _03805E60 ; =_0380B24C ldr r2, _03805E58 ; =0x0380FFFC ldr r1, [r1, #0xc] str r1, [r2] @@ -17464,8 +17464,8 @@ _03805E50: bx lr .align 2, 0 _03805E58: .word 0x0380FFFC -_03805E5C: .word 0x03805E64 -_03805E60: .word 0x0380B24C +_03805E5C: .word sub_03805E64 +_03805E60: .word _0380B24C arm_func_end sub_03805E20 arm_func_start sub_03805E64 @@ -17506,11 +17506,11 @@ _03805EB8: sub sp, sp, #8 mov r0, #0x9f msr cpsr_c, r0 - ldr r1, _03806084 ; =0x038076A4 + ldr r1, _03806084 ; =_038076A4 ldrh r0, [r1, #2] add r0, r0, #1 strh r0, [r1, #2] - ldr r1, _03806088 ; =0x0380B24C + ldr r1, _03806088 ; =_0380B24C cmp r0, #1 beq _03805EF4 b _03805EF8 @@ -17528,7 +17528,7 @@ _03805F0C: str r0, [r1, #4] _03805F10: stmdb sp!, {r3} - ldr r1, _0380608C ; =0x03807210 + ldr r1, _0380608C ; =_03807210 ldr r0, [r1] tst r0, r2 bne _03805F28 @@ -17544,7 +17544,7 @@ _03805F38: bne _03805F40 b _03805F44 _03805F40: - ldr r3, _03806090 ; =0x038074F4 + ldr r3, _03806090 ; =_038074F4 _03805F44: bne _03805F4C b _03805F50 @@ -17565,9 +17565,9 @@ _03805F6C: str r0, [ip, #0x214] add r0, r1, r3, lsl #3 ldr r2, [r0, #4] - ldr r3, _03806090 ; =0x038074F4 + ldr r3, _03806090 ; =_038074F4 ldr r0, [r3, r2, lsl #2] - ldr r2, _03806084 ; =0x038076A4 + ldr r2, _03806084 ; =_038076A4 ldrh r3, [r2, #2] cmp r3, #1 beq _03805F98 @@ -17610,8 +17610,8 @@ sub_03805FD0: ; 0x03805FD0 orr r3, r3, r1 bic r3, r3, r0 str r3, [ip, #0x210] - ldr r2, _03806084 ; =0x038076A4 - ldr r3, _03806088 ; =0x0380B24C + ldr r2, _03806084 ; =_038076A4 + ldr r3, _03806088 ; =_0380B24C ldrh r0, [r2, #2] subs r1, r0, #1 strh r1, [r2, #2] @@ -17641,7 +17641,7 @@ _03806038: beq _03806060 b _03806064 _03806060: - ldr r0, _03806094 ; =0x037FB4F4 + ldr r0, _03806094 ; =sub_037FB4F4 _03806064: beq _0380606C b _03806070 @@ -17656,31 +17656,31 @@ _0380607C: ldmia sp!, {pc} .align 2, 0 _03806080: .word 0x01DF3FFF -_03806084: .word 0x038076A4 -_03806088: .word 0x0380B24C -_0380608C: .word 0x03807210 -_03806090: .word 0x038074F4 +_03806084: .word _038076A4 +_03806088: .word _0380B24C +_0380608C: .word _03807210 +_03806090: .word _038074F4 arm_func_end sub_03805FD0 -_03806094: .word 0x037FB4F4 +_03806094: .word sub_037FB4F4 arm_func_start sub_03806098 sub_03806098: ; 0x03806098 stmdb sp!, {r3, lr} - ldr r1, _038060C8 ; =0x0380B260 + ldr r1, _038060C8 ; =_0380B260 mov r3, #0 ldr r2, _038060CC ; =0x05000001 add r0, sp, #0 str r3, [sp] bl sub_038060D4 bl sub_037FBBFC - ldr r1, _038060D0 ; =0x0380B25C + ldr r1, _038060D0 ; =_0380B25C strh r0, [r1, #6] ldmia sp!, {r3, lr} bx lr .align 2, 0 -_038060C8: .word 0x0380B260 +_038060C8: .word _0380B260 _038060CC: .word 0x05000001 -_038060D0: .word 0x0380B25C +_038060D0: .word _0380B25C arm_func_end sub_03806098 arm_func_start sub_038060D4 @@ -17735,7 +17735,7 @@ sub_03806130: ; 0x03806130 cmp r0, #1 moveq r0, #0 beq _0380623C - ldr r0, _0380624C ; =0x0380B25C + ldr r0, _0380624C ; =_0380B25C add r1, sp, #8 ldrh r0, [r0, #6] bl sub_038062D0 @@ -17786,7 +17786,7 @@ _03806218: bl sub_03806298 ldr r0, [sp, #4] bl sub_038062B4 - ldr r0, _0380624C ; =0x0380B25C + ldr r0, _0380624C ; =_0380B25C add r1, sp, #8 ldrh r0, [r0, #6] bl sub_03806320 @@ -17797,7 +17797,7 @@ _0380623C: bx lr .align 2, 0 _03806248: .word 0x027FFC30 -_0380624C: .word 0x0380B25C +_0380624C: .word _0380B25C _03806250: .word 0x0801FFFE arm_func_end sub_03806130 @@ -17917,9 +17917,9 @@ sub_03806388: ; 0x03806388 stmdb sp!, {r3, lr} bl sub_037FD128 bl sub_037FD34C - ldr r0, _03806410 ; =0x0380B294 + ldr r0, _03806410 ; =_0380B294 bl sub_037FD3A0 - ldr r0, _03806414 ; =0x0380B264 + ldr r0, _03806414 ; =_0380B264 ldr r1, [r0, #0x14] cmp r1, #0 bne _03806408 @@ -17930,38 +17930,38 @@ sub_03806388: ; 0x03806388 mvn r1, #2 cmp r0, r1 beq _03806408 - ldr r1, _03806414 ; =0x0380B264 + ldr r1, _03806414 ; =_0380B264 strh r0, [r1] bl sub_037FE2B4 - ldr r1, _03806418 ; =0x0380659C + ldr r1, _03806418 ; =sub_0380659C mov r0, #0xd bl sub_037FE39C bl sub_03806428 - ldr r1, _0380641C ; =0x038065CC + ldr r1, _0380641C ; =sub_038065CC mov r0, #0xd bl sub_037FE39C - ldr r1, _03806420 ; =0x03806600 + ldr r1, _03806420 ; =sub_03806600 mov r0, #0x10 bl sub_037FE39C - ldr r1, _03806424 ; =0x03806944 + ldr r1, _03806424 ; =sub_03806944 mov r0, #0x11 bl sub_037FE39C _03806408: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_03806410: .word 0x0380B294 -_03806414: .word 0x0380B264 -_03806418: .word 0x0380659C -_0380641C: .word 0x038065CC -_03806420: .word 0x03806600 -_03806424: .word 0x03806944 +_03806410: .word _0380B294 +_03806414: .word _0380B264 +_03806418: .word sub_0380659C +_0380641C: .word sub_038065CC +_03806420: .word sub_03806600 +_03806424: .word sub_03806944 arm_func_end sub_03806388 arm_func_start sub_03806428 sub_03806428: ; 0x03806428 stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr} - ldr r0, _03806584 ; =0x0380B264 + ldr r0, _03806584 ; =_0380B264 ldr r1, [r0, #8] cmp r1, #0 bne _0380657C @@ -17976,7 +17976,7 @@ sub_03806428: ; 0x03806428 ldr r2, _0380658C ; =0x04000208 mov r1, #1 ldrh sb, [r2] - ldr r5, _03806584 ; =0x0380B264 + ldr r5, _03806584 ; =_0380B264 mov r4, r0 strh r1, [r2] mov r6, #0x100 @@ -17988,7 +17988,7 @@ _03806484: ldr r0, [r5, #0x28] cmp r0, #1 bne _0380647C - ldr r0, _03806584 ; =0x0380B264 + ldr r0, _03806584 ; =_0380B264 mov r1, #0x8000000 ldr r2, [r0, #0x18] ldr r0, _03806590 ; =0x01FFFFC0 @@ -18055,7 +18055,7 @@ _0380657C: ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, lr} bx lr .align 2, 0 -_03806584: .word 0x0380B264 +_03806584: .word _0380B264 _03806588: .word 0x04000300 _0380658C: .word 0x04000208 _03806590: .word 0x01FFFFC0 @@ -18068,7 +18068,7 @@ sub_0380659C: ; 0x0380659C stmdb sp!, {r3, lr} and r0, r1, #0x3f cmp r0, #1 - ldreq r0, _038065C8 ; =0x0380B264 + ldreq r0, _038065C8 ; =_0380B264 moveq r2, #1 streq r1, [r0, #0x18] streq r2, [r0, #0x28] @@ -18078,7 +18078,7 @@ _038065C0: ldmia sp!, {r3, lr} bx lr .align 2, 0 -_038065C8: .word 0x0380B264 +_038065C8: .word _0380B264 arm_func_end sub_0380659C arm_func_start sub_038065CC @@ -18132,7 +18132,7 @@ _0380664C: cmpne r0, #0 bne _038066F0 bl sub_037FDD00 - ldr r4, _0380682C ; =0x0380B264 + ldr r4, _0380682C ; =_0380B264 mov sb, r0 ldr r0, [r4, #4] cmp r0, #2 @@ -18168,7 +18168,7 @@ _038066D4: cmp sl, #0 beq _0380668C _038066DC: - ldr r0, _0380683C ; =0x0380B294 + ldr r0, _0380683C ; =_0380B294 bl sub_037FD5C0 mov r0, sb bl sub_037FDD14 @@ -18180,7 +18180,7 @@ _038066F0: bl sub_037FBBF4 ands r4, r0, #0x80 bne _0380671C - ldr r0, _0380682C ; =0x0380B264 + ldr r0, _0380682C ; =_0380B264 ldrh r0, [r0] bl sub_037FBB84 cmp r0, #0 @@ -18190,15 +18190,15 @@ _0380671C: ldr r0, [r5, #4] cmp r1, r0 bne _03806764 - ldr r0, _0380682C ; =0x0380B264 + ldr r0, _0380682C ; =_0380B264 mov r2, #0 ldr r1, _03806834 ; =0x08001000 str r2, [r0, #4] strh r2, [r1] str r5, [sp] ldr r1, [r5, #8] - ldr r0, _0380683C ; =0x0380B294 - ldr r3, _03806840 ; =0x03806610 + ldr r0, _0380683C ; =_0380B294 + ldr r3, _03806840 ; =sub_03806610 mov r2, #0 bl sub_037FD4DC mov r0, #0 @@ -18208,17 +18208,17 @@ _03806764: tst r1, #1 ldr r1, _03806834 ; =0x08001000 beq _038067B4 - ldr r0, _0380682C ; =0x0380B264 + ldr r0, _0380682C ; =_0380B264 mov r2, #0 str r2, [r0, #4] strh r2, [r1] str r5, [sp] ldr r1, [r5] - ldr r0, _0380683C ; =0x0380B294 + ldr r0, _0380683C ; =_0380B294 mov r1, r1, lsr #1 add r1, r5, r1, lsl #2 ldr r1, [r1, #0x24] - ldr r3, _03806840 ; =0x03806610 + ldr r3, _03806840 ; =sub_03806610 mov r2, #0 bl sub_037FD4DC ldr r0, [r5] @@ -18226,17 +18226,17 @@ _03806764: str r0, [r5] b _038067F4 _038067B4: - ldr r0, _0380682C ; =0x0380B264 + ldr r0, _0380682C ; =_0380B264 mov r2, #2 str r2, [r0, #4] strh r2, [r1] str r5, [sp] ldr r1, [r5] - ldr r0, _0380683C ; =0x0380B294 + ldr r0, _0380683C ; =_0380B294 mov r1, r1, lsr #1 add r1, r5, r1, lsl #2 ldr r1, [r1, #0xc] - ldr r3, _03806840 ; =0x03806610 + ldr r3, _03806840 ; =sub_03806610 mov r2, #0 bl sub_037FD4DC ldr r0, [r5] @@ -18245,14 +18245,14 @@ _038067B4: _038067F4: cmp r4, #0 bne _03806824 - ldr r0, _0380682C ; =0x0380B264 + ldr r0, _0380682C ; =_0380B264 ldrh r0, [r0] bl sub_037FBB58 b _03806824 _0380680C: - ldr r0, _0380683C ; =0x0380B294 + ldr r0, _0380683C ; =_0380B294 ldr r1, _03806844 ; =0x0000020B - ldr r3, _03806840 ; =0x03806610 + ldr r3, _03806840 ; =sub_03806610 mov r2, #0 str r5, [sp] bl sub_037FD4DC @@ -18260,19 +18260,19 @@ _03806824: ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} bx lr .align 2, 0 -_0380682C: .word 0x0380B264 +_0380682C: .word _0380B264 _03806830: .word 0x027FFFE8 _03806834: .word 0x08001000 _03806838: .word 0x000080E8 -_0380683C: .word 0x0380B294 -_03806840: .word 0x03806610 +_0380683C: .word _0380B294 +_03806840: .word sub_03806610 _03806844: .word 0x0000020B arm_func_end sub_03806610 arm_func_start sub_03806848 sub_03806848: ; 0x03806848 stmdb sp!, {r3, r4, r5, r6, r7, lr} - ldr r1, _03806938 ; =0x03807600 + ldr r1, _03806938 ; =_03807600 mvn r0, #0 ldr r3, [r1, #4] cmp r3, r0 @@ -18281,7 +18281,7 @@ sub_03806848: ; 0x03806848 addeq r0, r0, #0xa streq r0, [r1, #4] beq _03806930 - ldr r0, _03806940 ; =0x0380B264 + ldr r0, _03806940 ; =_0380B264 ldr r2, [r0, #0x10] cmp r2, #0 ldreq r0, [r0, #0xc] @@ -18295,23 +18295,23 @@ sub_03806848: ; 0x03806848 add r0, r0, #0xa str r0, [r1, #4] bl sub_038060E0 - ldr r1, _03806940 ; =0x0380B264 + ldr r1, _03806940 ; =_0380B264 str r0, [r1, #0xc] bl sub_03806130 cmp r0, #0 bne _038068E0 - ldr r0, _03806938 ; =0x03807600 + ldr r0, _03806938 ; =_03807600 mov r1, #1 ldr r0, [r0] cmp r0, #0 - ldrne r0, _03806940 ; =0x0380B264 + ldrne r0, _03806940 ; =_0380B264 strne r1, [r0, #0x10] bne _03806930 - ldr r0, _03806940 ; =0x0380B264 + ldr r0, _03806940 ; =_0380B264 str r1, [r0, #0xc] _038068E0: - ldr r0, _03806940 ; =0x0380B264 - ldr r1, _03806938 ; =0x03807600 + ldr r0, _03806940 ; =_0380B264 + ldr r1, _03806938 ; =_03807600 ldr r0, [r0, #0xc] mov r2, #0 str r2, [r1] @@ -18336,9 +18336,9 @@ _03806930: ldmia sp!, {r3, r4, r5, r6, r7, lr} bx lr .align 2, 0 -_03806938: .word 0x03807600 +_03806938: .word _03807600 _0380693C: .word 0x027FFC3C -_03806940: .word 0x0380B264 +_03806940: .word _0380B264 arm_func_end sub_03806848 arm_func_start sub_03806944 @@ -18813,7 +18813,10 @@ sub_03806DDC: ; 0x03806DDC _03806FB8: .byte 0x00, 0x06, 0x0C, 0x13, 0x19, 0x1F, 0x25, 0x2B, 0x31, 0x36, 0x3C, 0x41, 0x47, 0x4C, 0x51, 0x55 .byte 0x5A, 0x5E, 0x62, 0x66, 0x6A, 0x6D, 0x70, 0x73, 0x75, 0x78, 0x7A, 0x7B, 0x7D, 0x7E, 0x7E, 0x7F - .byte 0x7F, 0x00, 0x00, 0x00, 0x00, 0x80, 0x2E, 0xFD, 0x2F, 0xFD, 0x75, 0xFD, 0xA7, 0xFD, 0xCE, 0xFD + .byte 0x7F, 0x00, 0x00, 0x00 + .global _03806FDC +_03806FDC: + .byte 0x00, 0x80, 0x2E, 0xFD, 0x2F, 0xFD, 0x75, 0xFD, 0xA7, 0xFD, 0xCE, 0xFD .byte 0xEE, 0xFD, 0x09, 0xFE, 0x20, 0xFE, 0x34, 0xFE, 0x46, 0xFE, 0x57, 0xFE, 0x66, 0xFE, 0x74, 0xFE .byte 0x81, 0xFE, 0x8D, 0xFE, 0x98, 0xFE, 0xA3, 0xFE, 0xAD, 0xFE, 0xB6, 0xFE, 0xBF, 0xFE, 0xC7, 0xFE .byte 0xCF, 0xFE, 0xD7, 0xFE, 0xDF, 0xFE, 0xE6, 0xFE, 0xEC, 0xFE, 0xF3, 0xFE, 0xF9, 0xFE, 0xFF, 0xFE @@ -18845,10 +18848,30 @@ _03806FB8: .byte 0xED, 0xFF, 0xEE, 0xFF, 0xEF, 0xFF, 0xEF, 0xFF, 0xF0, 0xFF, 0xF1, 0xFF, 0xF2, 0xFF, 0xF3, 0xFF .byte 0xF4, 0xFF, 0xF4, 0xFF, 0xF5, 0xFF, 0xF6, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF8, 0xFF, 0xF9, 0xFF .byte 0xFA, 0xFF, 0xFA, 0xFF, 0xFB, 0xFF, 0xFC, 0xFF, 0xFD, 0xFF, 0xFD, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF - .byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x05, 0x06, 0x07, 0x02, 0x00, 0x03, 0x01 - .byte 0x08, 0x09, 0x0A, 0x0B, 0x0E, 0x0C, 0x0F, 0x0D, 0x00, 0x01, 0x05, 0x0E, 0x1A, 0x26, 0x33, 0x3F - .byte 0x49, 0x54, 0x5C, 0x64, 0x6D, 0x74, 0x7B, 0x7F, 0x84, 0x89, 0x8F, 0x00, 0x06, 0x00, 0x00, 0x00 - .byte 0xC7, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 + .byte 0xFF, 0xFF, 0x00, 0x00 + .global _038071DC +_038071DC: + .byte 0x00, 0x01, 0x02, 0x04 + .global _038071E0 +_038071E0: + .byte 0x04, 0x05, 0x06, 0x07, 0x02, 0x00, 0x03, 0x01 + .byte 0x08, 0x09, 0x0A, 0x0B, 0x0E, 0x0C, 0x0F, 0x0D + .global _038071F0 +_038071F0: + .byte 0x00, 0x01, 0x05, 0x0E, 0x1A, 0x26, 0x33, 0x3F + .byte 0x49, 0x54, 0x5C, 0x64, 0x6D, 0x74, 0x7B, 0x7F, 0x84, 0x89, 0x8F, 0x00 + .global _03807204 +_03807204: + .byte 0x06, 0x00, 0x00, 0x00 + .global _03807208 +_03807208: + .byte 0xC7, 0x00, 0x00, 0x00 + .global _0380720C +_0380720C: + .byte 0x05, 0x00, 0x00, 0x00 + .global _03807210 +_03807210: + .byte 0x40, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x01, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x13, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x12, 0x00, 0x00, 0x00 .byte 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 @@ -18896,7 +18919,7 @@ _03807328: .word 0x0380FFFC _0380732C: .word 0x04000180 _03807330: .word 0x027FFE00 arm_func_end sub_038072C0 - + arm_func_start sub_03807334 sub_03807334: ; 0x03807334 stmdb sp!, {r3, r4, r5, r6, r7, lr} @@ -19035,15 +19058,35 @@ _038074DC: .word 0x00001FFF arm_func_end sub_038073D4 _038074E0: .byte 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, 0x00 - .byte 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0xB7, 0x7F, 0x03 + .byte 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00 + .global _038074F4 +_038074F4: + .byte 0x48, 0xB7, 0x7F, 0x03 .byte 0x38, 0xB6, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03, 0x08, 0xB7, 0x7F, 0x03, 0x18, 0xB7, 0x7F, 0x03 .byte 0x28, 0xB7, 0x7F, 0x03, 0x38, 0xB7, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03, 0xC8, 0xB6, 0x7F, 0x03 .byte 0xD8, 0xB6, 0x7F, 0x03, 0xE8, 0xB6, 0x7F, 0x03, 0xF8, 0xB6, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03 .byte 0x38, 0xB6, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03 .byte 0x38, 0xB6, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03 .byte 0x38, 0xB6, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03, 0x38, 0xB6, 0x7F, 0x03 - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x78, 0x56, 0x34, 0x12, 0x00, 0xFE, 0x7F, 0x02, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA + .global _03807558 +_03807558: + .byte 0xFF, 0xFF, 0xFF, 0xFF + .global _0380755C +_0380755C: + .byte 0x78, 0x56, 0x34, 0x12 + .global _03807560 +_03807560: + .byte 0x00, 0xFE, 0x7F, 0x02 + .global _03807564 +_03807564: + .byte 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x01, 0x00, 0x00, 0x00 + .global _0380756C +_0380756C: + .byte 0x01, 0x00, 0x00, 0x00 + .global _03807570 +_03807570: + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA .byte 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x08, 0x00, 0x01, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xE3, 0x0C, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0xF0, 0xF0, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0xF8 @@ -19052,8 +19095,243 @@ _038074E0: .byte 0x00, 0x00, 0xC0, 0xFF, 0x14, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF .byte 0x20, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x20, 0x00, 0x01, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x20, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0xC3, 0x28, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0xC3, 0x28, 0x00, 0x02, 0x00 + .global _03807600 +_03807600: + .byte 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF .bss -wramBssFiller: - .space 0x3E80 + .global _03807608 +_03807608: + .space 0x8 + .global _03807610 +_03807610: + .space 0x4 + .global _03807614 +_03807614: + .space 0x4 + .global _03807618 +_03807618: + .space 0x28 + .global _03807640 +_03807640: + .space 0x4 + .global _03807644 +_03807644: + .space 0x4 + .global _03807648 +_03807648: + .space 0x28 + .global _03807670 +_03807670: + .space 0xC + .global _0380767C +_0380767C: + .space 0x4 + .global _03807680 +_03807680: + .space 0x24 + .global _038076A4 +_038076A4: + .space 0x4 + .global _038076A8 +_038076A8: + .space 0xC + .global _038076B4 +_038076B4: + .space 0xA4 + .global _03807758 +_03807758: + .space 0xA4 + .global _038077FC +_038077FC: + .space 0x4 + .global _03807800 +_03807800: + .space 0x24 + .global _03807824 +_03807824: + .space 0x4 + .global _03807828 +_03807828: + .space 0x10 + .global _03807838 +_03807838: + .space 0xC + .global _03807844 +_03807844: + .space 0x14 + .global _03807858 +_03807858: + .space 0x4 + .global _0380785C +_0380785C: + .space 0x4 + .global _03807860 +_03807860: + .space 0x80 + .global _038078E0 +_038078E0: + .space 0x4 + .global _038078E4 +_038078E4: + .space 0x2C + .global _03807910 +_03807910: + .space 0x4 + .global _03807914 +_03807914: + .space 0x10 + .global _03807924 +_03807924: + .space 0x10 + .global _03807934 +_03807934: + .space 0x4 + .global _03807938 +_03807938: + .space 0x20 + .global _03807958 +_03807958: + .space 0x20 + .global _03807978 +_03807978: + .space 0x2C + .global _038079A4 +_038079A4: + .space 0x4A4 + .global _03807E48 +_03807E48: + .space 0x8 + .global _03807E50 +_03807E50: + .space 0xC + .global _03807E5C +_03807E5C: + .space 0x10 + .global _03807E6C +_03807E6C: + .space 0x4 + .global _03807E70 +_03807E70: + .space 0x540 + .global _038083B0 +_038083B0: + .space 0x240 + .global _038085F0 +_038085F0: + .space 0x800 + .global _03808DF0 +_03808DF0: + .space 0x200 + .global _03808FF0 +_03808FF0: + .space 0x20 + .global _03809010 +_03809010: + .space 0x30 + .global _03809040 +_03809040: + .space 0x20 + .global _03809060 +_03809060: + .space 0x600 + .global _03809660 +_03809660: + .space 0x4 + .global _03809664 +_03809664: + .space 0x1C + .global _03809680 +_03809680: + .space 0x240 + .global _038098C0 +_038098C0: + .space 0x10 + .global _038098D0 +_038098D0: + .space 0x4 + .global _038098D4 +_038098D4: + .space 0x8 + .global _038098DC +_038098DC: + .space 0x2A4 + .global _03809B80 +_03809B80: + .space 0x20 + .global _03809BA0 +_03809BA0: + .space 0x40 + .global _03809BE0 +_03809BE0: + .space 0x4 + .global _03809BE4 +_03809BE4: + .space 0x180 + .global _03809D64 +_03809D64: + .space 0xC + .global _03809D70 +_03809D70: + .space 0x4 + .global _03809D74 +_03809D74: + .space 0x2C + .global _03809DA0 +_03809DA0: + .space 0xA8 + .global _03809E48 +_03809E48: + .space 0x4 + .global _03809E4C +_03809E4C: + .space 0x2 + .global _03809E4E +_03809E4E: + .space 0x2 + .global _03809E50 +_03809E50: + .space 0x4 + .global _03809E54 +_03809E54: + .space 0x2C + .global _03809E80 +_03809E80: + .space 0x8 + .global _03809E88 +_03809E88: + .space 0x10 + .global _03809E98 +_03809E98: + .space 0xA4 + .global _03809F3C +_03809F3C: + .space 0xBC0 + .global _0380AAFC +_0380AAFC: + .space 0x700 + .global _0380B1FC +_0380B1FC: + .space 0x3C + .global _0380B238 +_0380B238: + .space 0x14 + .global _0380B24C +_0380B24C: + .space 0x10 + .global _0380B25C +_0380B25C: + .space 0x4 + .global _0380B260 +_0380B260: + .space 0x4 + .global _0380B264 +_0380B264: + .space 0x30 + .global _0380B294 +_0380B294: + .space 0x1F4 + .global _0380B488 +_0380B488: + .space 0x0