Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-09-08 03:15:47 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Defined more overlay 29 pointers

Browse Source
This commit is contained in:
AnonymousRandomPerson
2023-09-21 22:54:13 -04:00
parent 5ae885572e
commit a7deff2aa0
33 changed files with 2625 additions and 1656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
asm/include/overlay_29_02300108.inc
View File

@@ -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

32
asm/include/overlay_29_023047DC.inc
View File

@@ -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

54
asm/include/overlay_29_023055B0.inc
View File

@@ -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

34
asm/include/overlay_29_023082A0.inc
View File

@@ -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

32
asm/include/overlay_29_02311034.inc
View File

@@ -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

38
asm/include/overlay_29_023118D8.inc
View File

@@ -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

83
asm/include/overlay_29_0231513C.inc
View File

@@ -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

24
asm/include/overlay_29_023201A0.inc
View File

@@ -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

36
asm/include/overlay_29_02320788.inc
View File

@@ -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

94
asm/include/overlay_29_0232145C.inc
View File

@@ -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

118
asm/include/overlay_29_02325644.inc
View File

@@ -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

98
asm/include/overlay_29_02328030.inc
View File

@@ -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

54
asm/include/overlay_29_023350FC.inc
View File

@@ -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

63
asm/include/overlay_29_023456BC.inc
View File

@@ -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

105
asm/include/overlay_29_023498A0.inc
View File

@@ -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

7
asm/main_0200C4CC.s
View File

@@ -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:

530
asm/overlay_10.s
View File

@@ -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:

134
asm/overlay_29_02300108.s
View File

@@ -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

72
asm/overlay_29_023047DC.s
View File

@@ -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

14
asm/overlay_29_023055B0.s
View File

@@ -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

72
asm/overlay_29_023082A0.s
View File

@@ -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

26
asm/overlay_29_02311034.s
View File

@@ -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

104
asm/overlay_29_023118D8.s
View File

@@ -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

172
asm/overlay_29_0231513C.s
View File

@@ -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

18
asm/overlay_29_023201A0.s
View File

@@ -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

34
asm/overlay_29_02320788.s
View File

@@ -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

194
asm/overlay_29_0232145C.s
View File

@@ -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

282
asm/overlay_29_02325644.s
View File

File diff suppressed because it is too large Load Diff

218
asm/overlay_29_02328030.s
View File

@@ -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

354
asm/overlay_29_023350FC.s
View File

File diff suppressed because it is too large Load Diff

154
asm/overlay_29_023456BC.s
View File

@@ -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

596
asm/overlay_29_023498A0.s
View File

File diff suppressed because it is too large Load Diff

382
asm/overlay_29_0234EC38.s
View File

@@ -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