Synced from pmdsky-debug

pret · Mar 24, 2024 · b53126d · b53126d
1 parent 37ddf03
commit b53126d
Show file tree

Hide file tree

Showing 38 changed files with 91 additions and 91 deletions.
diff --git a/asm/include/main_02075600.inc b/asm/include/main_02075600.inc
@@ -1770,6 +1770,7 @@
 .public DseTrackEvent_WaitDelta
 .public DseTrackEvent_WaitSame
 .public DseTrackEvent_WaitUntilFadeout
+.public DseUtil_GetRandomNumber
 .public DTCM_BSS
 .public FX_AtanIdxTable_
 .public GetKeyM2N
@@ -1814,7 +1815,6 @@
 .public SoundLfoWave_InvalidFunc
 .public SoundLfoWave_ReverseSawFunc
 .public SoundLfoWave_SawFunc
-.public DseUtil_GetRandomNumber
 .public sSubBGExtPltt
 .public sTexPlttStartAddrTable
 .public sTexStartAddrTable

diff --git a/asm/include/overlay_29_022E1A40.inc b/asm/include/overlay_29_022E1A40.inc
@@ -8,9 +8,9 @@
 .public EntityIsValid__022E1A1C
 .public EntityIsValid__022E32E8
 .public GetForcedLossReason
+.public GetIdleAnimationId
 .public GetMonsterApparentId
 .public GetMonsterName
-.public GetSleepAnimationId
 .public GetSpriteSize
 .public GetTileSafe
 .public HasDropeyeStatus

diff --git a/asm/include/overlay_29_022E37DC.inc b/asm/include/overlay_29_022E37DC.inc
@@ -5,6 +5,7 @@
 .public AnimationHasMoreFrames
 .public CanMonsterSpawn
 .public ChangeDungeonMusic
+.public ChangeMonsterAnimation
 .public CheckActiveChallengeRequest
 .public CheckSpawnThreshold
 .public CloseTextBox2
@@ -25,6 +26,7 @@
 .public FloorNumberIsEven
 .public GetEffectAnimationField0x19
 .public GetFloorType
+.public GetIdleAnimationId
 .public GetItemCategoryVeneer
 .public GetKecleonIdToSpawnByFloor
 .public GetMonsterGenderVeneer
@@ -34,7 +36,6 @@
 .public GetNbPrecedingFloors
 .public GetNbRecruited
 .public GetSecondFormIfValid
-.public GetSleepAnimationId
 .public GetSpriteFileSize
 .public GetSpriteSize
 .public GetTile
@@ -94,7 +95,6 @@
 .public ov29_022ED0F4
 .public ov29_022F42D8
 .public ov29_0230027C
-.public ov29_023049A8
 .public ov29_0230D618
 .public ov29_02339138
 .public ov29_02339148

diff --git a/asm/include/overlay_29_022EE36C.inc b/asm/include/overlay_29_022EE36C.inc
@@ -6,6 +6,7 @@
 .public ATK_STAT_IDX
 .public BAG_ITEMS_PTR_MIRROR
 .public CalcStatusDuration
+.public ChangeMonsterAnimation
 .public DIRECTIONS_XY
 .public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST
 .public DrawMinimapTile
@@ -55,7 +56,6 @@
 .public ov29_022FA574
 .public ov29_022FB920
 .public ov29_022FBD80
-.public ov29_023049A8
 .public ov29_02304A48
 .public ov29_02344B44
 .public ov29_02346344

diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc
@@ -12,6 +12,7 @@
 .public CanMonsterMoveInDirection
 .public CanSeeTarget
 .public CeilFixedPoint
+.public ChangeMonsterAnimation
 .public CheckTeamItemsFlags
 .public CheckTouchscreenArea
 .public CloseTextBox
@@ -28,6 +29,7 @@
 .public GetEntityMoveTargetAndRange
 .public GetEquippedThrowableItem
 .public GetHero
+.public GetIdleAnimationId
 .public GetItemCategoryVeneer
 .public GetItemIndex
 .public GetItemInfo
@@ -37,7 +39,6 @@
 .public GetMoneyCarried
 .public GetMonsterGenderVeneer
 .public GetPressedButtons
-.public GetSleepAnimationId
 .public GetTeamMemberIndex
 .public GetTile
 .public GetTileAtEntity
@@ -113,7 +114,6 @@
 .public ov29_0230105C
 .public ov29_02301158
 .public ov29_0230175C
-.public ov29_023049A8
 .public ov29_023055B0
 .public ov29_02321164
 .public ov29_02322DDC

diff --git a/asm/include/overlay_29_022F52B0.inc b/asm/include/overlay_29_022F52B0.inc
@@ -4,6 +4,7 @@
 .public ApplyItemEffect
 .public AreMovesEnabled
 .public CanMonsterUseItem
+.public ChangeMonsterAnimation
 .public CheckTeamMemberIdxVeneer
 .public DecrementStackItem
 .public DIRECTIONS_XY
@@ -55,7 +56,6 @@
 .public ov29_02300818
 .public ov29_023009CC
 .public ov29_0230175C
-.public ov29_023049A8
 .public ov29_02304A48
 .public ov29_02304AFC
 .public ov29_02307BDC

diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc
@@ -14,6 +14,7 @@
 .public CanSeeTarget
 .public CASTFORM_WEATHER_ATTRIBUTE_TABLE
 .public CeilFixedPoint
+.public ChangeMonsterAnimation
 .public CheckTeamMemberIdx
 .public Conversion2IsActive
 .public DeleteWanTableEntryVeneer
@@ -53,6 +54,7 @@
 .public GetExplorerMazeMonster
 .public GetFloorType
 .public GetForcedLossReason
+.public GetIdleAnimationId
 .public GetLeader
 .public GetLearnableIqSkills
 .public GetLvlUpEntry
@@ -77,7 +79,6 @@
 .public GetOutlawSpawnData
 .public GetScenarioBalance
 .public GetScenarioBalanceVeneer
-.public GetSleepAnimationId
 .public GetSpawnThreshold
 .public GetSpriteFileSize
 .public GetSpriteIndex__020526EC
@@ -162,7 +163,6 @@
 .public ov29_023018AC
 .public ov29_023021F0
 .public ov29_02304830
-.public ov29_023049A8
 .public ov29_02304A48
 .public ov29_02304BAC
 .public ov29_02307CE0

diff --git a/asm/include/overlay_29_02302A5C.inc b/asm/include/overlay_29_02302A5C.inc
@@ -1,5 +1,6 @@
 #pragma once
 .public _020AFC4C
+.public ChangeMonsterAnimation
 .public DIRECTIONS_XY
 .public DisplayMessage
 .public DisplayMessage2
@@ -10,13 +11,13 @@
 .public EntityIsValid__023047B8
 .public FormatMoveString
 .public GetEncodedHalfword
+.public GetIdleAnimationId
 .public GetLeader
 .public GetLoadedAttackSpriteId
 .public GetLvlUpEntry
 .public GetMonsterName
 .public GetMovesetLevelUpPtr
 .public GetPersonalityIndex
-.public GetSleepAnimationId
 .public GetStringFromFileVeneer
 .public GetTalkLine
 .public GetTile
@@ -48,7 +49,6 @@
 .public ov29_023009CC
 .public ov29_023021F0
 .public ov29_02304830
-.public ov29_023049A8
 .public ov29_02318D58
 .public ov29_0231EA04
 .public ov29_02338988

diff --git a/asm/include/overlay_29_023055B0.inc b/asm/include/overlay_29_023055B0.inc
@@ -1,6 +1,7 @@
 #pragma once
 .public AbilityIsActiveVeneer
 .public CalcSpeedStageWrapper
+.public ChangeMonsterAnimation
 .public DUNGEON_PTR
 .public EndBlinkerClassStatus
 .public EndBurnClassStatus
@@ -15,8 +16,8 @@
 .public EntityIsValid__0230558C
 .public EntityIsValid__02305C04
 .public GetDirectionTowardsPosition
+.public GetIdleAnimationId
 .public GetLeader
-.public GetSleepAnimationId
 .public GetTileAtEntity
 .public GetTrapInfo
 .public HasHeldItem
@@ -41,7 +42,6 @@
 .public ov29_022EA370
 .public ov29_022FBE04
 .public ov29_02300818
-.public ov29_023049A8
 .public ov29_02337D68
 .public ov29_02353318
 .public SubstitutePlaceholderStringTags

diff --git a/asm/include/overlay_29_02305C28.inc b/asm/include/overlay_29_02305C28.inc
@@ -11,8 +11,8 @@
 .public EntityIsValid__02305C04
 .public EntityIsValid__02307EF8
 .public FreeOtherWrappedMonsters
+.public GetIdleAnimationId
 .public GetMonsterApparentId
-.public GetSleepAnimationId
 .public GetType
 .public IsProtectedFromNegativeStatus
 .public ItemIsActive__02307F1C

diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc
@@ -17,6 +17,7 @@
 .public CanSeeTarget
 .public CeilFixedPoint
 .public ChangeDungeonMusic
+.public ChangeMonsterAnimation
 .public ClampedLn
 .public CLOUDY_DAMAGE_MULTIPLIER
 .public DAMAGE_FORMULA_AT_PREFACTOR
@@ -67,6 +68,7 @@
 .public GetEquivItemIndex
 .public GetExp
 .public GetFirstEmptyMemberIdx
+.public GetIdleAnimationId
 .public GetItemAtIdx
 .public GetKecleonIdToSpawnByFloor
 .public GetMonsterGenderVeneer
@@ -77,7 +79,6 @@
 .public GetRandomMovementChance
 .public GetRecruitRate1
 .public GetRecruitRate2
-.public GetSleepAnimationId
 .public GetTile
 .public GetTileAtEntity
 .public GravityIsActive
@@ -183,7 +184,6 @@
 .public ov29_0230040C
 .public ov29_02303E0C
 .public ov29_02304830
-.public ov29_023049A8
 .public ov29_02304A48
 .public ov29_02305F60
 .public ov29_02307BDC

diff --git a/asm/include/overlay_29_0231513C.inc b/asm/include/overlay_29_0231513C.inc
@@ -19,13 +19,13 @@
 .public EntityIsValid__02318D34
 .public ExclusiveItemEffectIsActiveWithLogging
 .public GetFloorType
+.public GetIdleAnimationId
 .public GetMaxPp
 .public GetMaxPpWrapper
 .public GetMobilityType
 .public GetMonsterApparentId
 .public GetMonsterIdFromSpawnEntry
 .public GetNameWithGender
-.public GetSleepAnimationId
 .public GravityIsActive
 .public HasHeldItem
 .public HasTypeAffectedByGravity

diff --git a/asm/include/overlay_29_0231B1B8.inc b/asm/include/overlay_29_0231B1B8.inc
@@ -43,8 +43,8 @@
 .public FemaleToMaleForm
 .public GEO_PEBBLE_DAMAGE
 .public GetActiveTeamMember
+.public GetIdleAnimationId
 .public GetItemCategoryVeneer
-.public GetSleepAnimationId
 .public GOLD_FANG_POWER
 .public GOLD_THORN_POWER
 .public GRAVELEROCK_DAMAGE

diff --git a/asm/include/overlay_29_0231EDFC.inc b/asm/include/overlay_29_0231EDFC.inc
@@ -4,6 +4,7 @@
 .public AdvanceFrame
 .public CalcDamageFixedNoCategory
 .public CanSeeTarget
+.public ChangeMonsterAnimation
 .public DIRECTIONS_XY
 .public DUNGEON_PTR
 .public DungeonRandInt
@@ -21,7 +22,6 @@
 .public ov29_022EACCC
 .public ov29_022FF764
 .public ov29_0230175C
-.public ov29_023049A8
 .public ov29_02304A48
 .public ov29_0232033C
 .public ov29_02321238

diff --git a/asm/include/overlay_29_0231FC20.inc b/asm/include/overlay_29_0231FC20.inc
@@ -3,6 +3,7 @@
 .public AdvanceFrame
 .public AreTileJumpsAllowed
 .public CalcDamageFixedNoCategory
+.public ChangeMonsterAnimation
 .public DIRECTIONS_XY
 .public DUNGEON_PTR
 .public EnsureCanStandCurrentTile
@@ -17,7 +18,6 @@
 .public ov29_022E56A0
 .public ov29_022F9C74
 .public ov29_022FFB90
-.public ov29_023049A8
 .public ov29_02307BDC
 .public ov29_0232033C
 .public ov29_02321238

diff --git a/asm/include/overlay_29_0232145C.inc b/asm/include/overlay_29_0232145C.inc
@@ -8,6 +8,7 @@
 .public AreEntitiesAdjacent
 .public BoostSpeedOneStage
 .public CalcStatusDuration
+.public ChangeMonsterAnimation
 .public DETECT_BAND_MOVE_ACCURACY_DROP
 .public DIRECTIONS_XY
 .public DUNGEON_PTR
@@ -104,7 +105,6 @@
 .public ov29_02300DCC
 .public ov29_0230175C
 .public ov29_023024E0
-.public ov29_023049A8
 .public ov29_02304A48
 .public ov29_02304B14
 .public ov29_02318D58

diff --git a/asm/include/overlay_29_02328030.inc b/asm/include/overlay_29_02328030.inc
@@ -13,6 +13,7 @@
 .public CalcDamage
 .public CalcDamageFixedWrapper
 .public CalcRecoilDamageFixed
+.public ChangeMonsterAnimation
 .public DealDamage
 .public DIVE_DAMAGE_MULTIPLIER
 .public DoMoveTakeaway
@@ -57,7 +58,6 @@
 .public ov29_022ECAFC
 .public ov29_022F9EA0
 .public ov29_0230040C
-.public ov29_023049A8
 .public ov29_0230D4A4
 .public ov29_02318A90
 .public ov29_02318AD4

diff --git a/asm/include/overlay_29_0232A3FC.inc b/asm/include/overlay_29_0232A3FC.inc
@@ -14,6 +14,7 @@
 .public CalcDamageFixedWrapper
 .public CalcStatusDuration
 .public CeilFixedPoint
+.public ChangeMonsterAnimation
 .public CRUSH_CLAW_LOWER_DEFENSE_CHANCE
 .public DealDamage
 .public DefenderAbilityIsActiveMoveEffects__02329F14
@@ -69,7 +70,6 @@
 .public ov29_022F9EA0
 .public ov29_022FFB90
 .public ov29_0230175C
-.public ov29_023049A8
 .public ov29_02318BBC
 .public ov29_02318D58
 .public ov29_02321164

diff --git a/asm/include/overlay_29_023350FC.inc b/asm/include/overlay_29_023350FC.inc
@@ -19,10 +19,10 @@
 .public EntityIsValid__02337CA8
 .public GetApparentWeather
 .public GetBgRegionArea
+.public GetIdleAnimationId
 .public GetLanguage
 .public GetLeader
 .public GetMonsterApparentId
-.public GetSleepAnimationId
 .public GetType
 .public GetVisibilityRange
 .public GetWeatherColorTable

diff --git a/asm/overlay_29_022E1A40.s b/asm/overlay_29_022E1A40.s
@@ -134,7 +134,7 @@ _022E1BB4:
 	cmp r8, #0
 	beq _022E1BD8
 	mov r0, r7
-	bl GetSleepAnimationId
+	bl GetIdleAnimationId
 	mov r1, r0
 	mov r0, r7
 	bl ov29_02304830
@@ -445,7 +445,7 @@ _022E1FC0:
 	cmp r8, #0
 	beq _022E1FE4
 	mov r0, r7
-	bl GetSleepAnimationId
+	bl GetIdleAnimationId
 	mov r1, r0
 	mov r0, r7
 	bl ov29_02304830