Decomped ShouldMonsterRunAway

asm/include/itcm.inc

@@ -123,6 +123,7 @@
 .public GetVisibilityRange
 .public GetWindow
 .public HasDropeyeStatus
+.public HasTactic
 .public InitMove
 .public IqSkillIsEnabled
 .public IsBagFull
@@ -142,7 +143,6 @@
 .public ov29_02300DCC
 .public ov29_02301498
 .public ov29_02301594
-.public ov29_02301F20
 .public ov29_02302200
 .public ov29_023082C4
 .public ov29_0231985C

asm/include/overlay_29_02300BF8.inc

@@ -1,77 +1,23 @@
 #pragma once
-.public _s32_div_f
-.public AllocateTemp1024ByteBufferFromPool
-.public CanLearnIqSkill
-.public CanSeeTarget
-.public CanThrowItems
 .public DIRECTIONS_XY
-.public DisableIqSkill
 .public DUNGEON_PTR
-.public DungeonGetSpriteIndex
 .public DungeonRandInt
-.public EnableIqSkill
-.public EntityIsValid__023000E4
-.public EntityIsValid__02302A38
-.public EvolveMonster
-.public EXCL_ITEM_EFFECTS_WEATHER_NO_STATUS
-.public EXCLUSIVE_ITEM_EXP_BOOST
-.public ExclusiveItemEffectFlagTest
-.public ExclusiveItemEffectIsActive__022FFF28
-.public EXP_ELITE_EXP_BOOST
-.public GetApparentWeather
-.public GetEntityNaturalGiftInfo
-.public GetEntityWeatherBallType
-.public GetEvolutions
-.public GetExclusiveItemWithEffectFromBag
-.public GetForcedLossReason
 .public GetMobilityTypeCheckSlipAndFloating
-.public GetMoveBasePower
-.public GetMoveType
-.public GetPerformanceFlagWithChecks
-.public GetSpeciesIqSkill
 .public GetTile
-.public GetUnlockedTacticFlags
-.public GravityIsActive
-.public HasHeldItem
-.public IqSkillFlagTest
-.public IsBlinded
+.public GetTreatmentBetweenMonsters
+.public IqSkillIsEnabled
 .public IsChargingAnyTwoTurnMove
 .public IsCurrentTilesetBackground
-.public IsExpEnabledInDungeon
 .public IsExperienceLocked
-.public IsOnMonsterSpawnList
-.public IsRegularAttackOrProjectile
 .public ItemIsActive__022FF898
-.public LevelUp
-.public LogMessageByIdWithPopup
-.public LogMessageByIdWithPopupCheckUserTarget
-.public MIN_IQ_EXCLUSIVE_MOVE_USER
-.public MIN_IQ_ITEM_MASTER
-.public MIRACLE_CHEST_EXP_BOOST
-.public MistIsActive
-.public MultiplyByFixedPoint
-.public ov29_022E2470
-.public ov29_022E62A8
-.public ov29_022FAFD4
-.public ov29_022FBDE0
-.public ov29_0230040C
+.public SECONDARY_TERRAIN_TYPES
+.public ShouldMonsterRunAway
 .public ov29_023008DC
-.public ov29_02302C04
-.public ov29_02302CC8
-.public ov29_02314DC4
-.public ov29_02324BE8
-.public ov29_02344B44
-.public ov29_0234B034
-.public ov29_0234B09C
+.public HasTactic
 .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_023527F8
-.public SECONDARY_TERRAIN_TYPES
-.public SubstitutePlaceholderStringTags
-.public WONDER_CHEST_EXP_BOOST

asm/include/overlay_29_023016A8.inc

@@ -0,0 +1,64 @@
+#pragma once
+.public AllocateTemp1024ByteBufferFromPool
+.public CanLearnIqSkill
+.public CanSeeTarget
+.public CanThrowItems
+.public DUNGEON_PTR
+.public DisableIqSkill
+.public DungeonGetSpriteIndex
+.public DungeonRandInt
+.public EXCLUSIVE_ITEM_EXP_BOOST
+.public EXCL_ITEM_EFFECTS_WEATHER_NO_STATUS
+.public EXP_ELITE_EXP_BOOST
+.public EnableIqSkill
+.public EntityIsValid__023000E4
+.public EntityIsValid__02302A38
+.public EvolveMonster
+.public ExclusiveItemEffectFlagTest
+.public ExclusiveItemEffectIsActive__022FFF28
+.public GetApparentWeather
+.public GetEntityNaturalGiftInfo
+.public GetEntityWeatherBallType
+.public GetEvolutions
+.public GetExclusiveItemWithEffectFromBag
+.public GetForcedLossReason
+.public GetMoveBasePower
+.public GetMoveType
+.public GetPerformanceFlagWithChecks
+.public GetSpeciesIqSkill
+.public GetUnlockedTacticFlags
+.public GravityIsActive
+.public HasHeldItem
+.public IqSkillFlagTest
+.public IsBlinded
+.public IsExpEnabledInDungeon
+.public IsExperienceLocked
+.public IsOnMonsterSpawnList
+.public IsRegularAttackOrProjectile
+.public ItemIsActive__022FF898
+.public LevelUp
+.public LogMessageByIdWithPopup
+.public LogMessageByIdWithPopupCheckUserTarget
+.public MIN_IQ_EXCLUSIVE_MOVE_USER
+.public MIN_IQ_ITEM_MASTER
+.public MIRACLE_CHEST_EXP_BOOST
+.public MistIsActive
+.public MultiplyByFixedPoint
+.public ShouldMonsterRunAway
+.public SubstitutePlaceholderStringTags
+.public WONDER_CHEST_EXP_BOOST
+.public _s32_div_f
+.public ov29_022E2470
+.public ov29_022E62A8
+.public ov29_022FAFD4
+.public ov29_022FBDE0
+.public ov29_0230040C
+.public ov29_02302C04
+.public ov29_02302CC8
+.public ov29_02314DC4
+.public ov29_02324BE8
+.public ov29_02344B44
+.public ov29_0234B034
+.public ov29_0234B09C
+.public ov29_023527A0
+.public ov29_023527F8

asm/itcm.s

@@ -2829,7 +2829,7 @@ AiMovement: ; 0x01FFA3C4
 	strb r2, [r8, #0x7e]
 	mov r1, #7
 	strb r2, [r8, #0x7f]
-	bl ov29_02301F20
+	bl HasTactic
 	cmp r0, #0
 	beq _01FFA428
 	ldrsh r2, [r8, #0x12]
@@ -2847,7 +2847,7 @@ AiMovement: ; 0x01FFA3C4
 _01FFA428:
 	mov r0, r4
 	mov r1, #9
-	bl ov29_02301F20
+	bl HasTactic
 	cmp r0, #0
 	bne _01FFA44C
 	mov r0, r4
@@ -3439,7 +3439,7 @@ _01FFAC6C:
 	strh r5, [sl, #0x80]
 	strb r2, [sl, #0x7e]
 	str r3, [sl, #0x120 + AI_MOVEMENT_OFFSET]
-	bl ov29_02301F20
+	bl HasTactic
 	cmp r0, #0
 	beq _01FFAD0C
 	mov r0, r4
@@ -3466,7 +3466,7 @@ _01FFAD0C:
 _01FFAD14:
 	mov r0, r4
 	mov r1, #1
-	bl ov29_02301F20
+	bl HasTactic
 	cmp r0, #0
 	bne _01FFAD7C
 	ldrb r0, [sl, #6]
@@ -4179,7 +4179,7 @@ ChooseAiMove: ; 0x01FFB658
 _01FFB6CC:
 	mov r0, sl
 	mov r1, #8
-	bl ov29_02301F20
+	bl HasTactic
 	cmp r0, #0
 	bne _01FFBD0C
 	ldrb r0, [r7, #0xd0]