Merge pull request #106 from AnonymousRandomPerson/main

Decomped IsChargingAnyTwoTurnMove

asm/include/main_02054C24.inc

@@ -202,6 +202,7 @@
 .public CloseCollectionMenu
 .public ClosePortraitBox
 .public Copy16BitsFrom
+.public CopyAndInterleaveWrapper
 .public CopyBitsFrom
 .public CopyBitsTo
 .public CopyMovesetFrom
@@ -466,7 +467,6 @@
 .public sub_0201B43C
 .public sub_0201B9F8
 .public sub_0201BB3C
-.public sub_0201BFF0
 .public sub_0201CF5C
 .public sub_0201D12C
 .public sub_0201D7A8

asm/include/overlay_29_022DEADC.inc

@@ -50,6 +50,7 @@
 .public LEADER_PTR
 .public LoadMappaFileAttributes
 .public LoadScriptVariableValue
+.public LoadWeather3DFiles
 .public MemZero
 .public OpenFixedBin
 .public ov10_022BDAB0
@@ -154,7 +155,6 @@
 .public ov29_0233785C
 .public ov29_0233845C
 .public ov29_0233873C
-.public ov29_023388B0
 .public ov29_023389C4
 .public ov29_02338A4C
 .public ov29_02338D30

asm/include/overlay_29_022E0378.inc

@@ -4,6 +4,7 @@
 .public _020AFC70
 .public AnimationDelayOrSomething
 .public CalcSpeedStageWrapper
+.public CopyAndInterleaveWrapper
 .public DirectoryFileMngr_OpenDirectoryFile
 .public DisplayMessage2
 .public DUNGEON_PTR
@@ -84,7 +85,6 @@
 .public sub_02009454
 .public sub_020094C4
 .public sub_0201B43C
-.public sub_0201BFF0
 .public sub_0201E380
 .public sub_0201F598
 .public sub_0204AE80

asm/include/overlay_29_022E9618.inc

@@ -12,6 +12,7 @@
 .public DUNGEON_PTR
 .public DungeonRandInt
 .public EntityIsValid__022E95F4
+.public FlashLeaderIcon
 .public GetLeader
 .public GetTile
 .public GetTreatmentBetweenMonsters
@@ -30,8 +31,6 @@
 .public ov29_022ED800
 .public ov29_0230473C
 .public ov29_02335F40
-.public ov29_02338AC4
-.public ov29_02339A24
 .public ov29_02339FF4
 .public ov29_0233A248
 .public ov29_0234B1A4
@@ -48,6 +47,7 @@
 .public ov29_0237C694
 .public ov29_0237C850
 .public ov29_0237C888
+.public RenderWeather3D
 .public sub_0201BAC8
 .public sub_0204AEA0
 .public sub_0204AEC0

asm/include/overlay_29_02322DDC.inc

@@ -3,108 +3,68 @@
 .public AbilityIsActiveVeneer
 .public AdvanceFrame
 .public AnimationDelayOrSomething
-.public AnimationHasMoreFrames
-.public ChangeMonsterAnimation
 .public DefenderAbilityIsActive__02322D64
 .public DETECT_BAND_MOVE_ACCURACY_DROP
 .public DIRECTIONS_XY
 .public DUNGEON_PTR
 .public DungeonRandInt
-.public DungeonRandOutcome__022EAB50
 .public DungeonRandRange
 .public EntityIsValid__02321438
-.public EntityIsValid__02325620
 .public EXCL_ITEM_EFFECTS_EVASION_BOOST
 .public ExclusiveItemEffectFlagTest
 .public ExecuteMoveEffect
 .public FormatMoveStringMore
 .public GetApparentWeather
 .public GetBodySize
-.public GetDamageSource
 .public GetEntityMoveTargetAndRange
 .public GetMonsterGenderVeneer
 .public GetMoveAccuracyOrAiChance
 .public GetMoveAnimation
 .public GetMoveAnimationId
 .public GetMoveAnimationSpeed
-.public GetMoveMaxGinsengBoost
 .public GetMoveNbStrikes
-.public GetNaturePowerVariant
-.public GetSpriteIndex__02052708
 .public GetTile
 .public GetTreatmentBetweenMonsters
 .public HasHeldItem
 .public IqSkillIsEnabled
-.public Is2TurnsMove
-.public IsAffectedByTaunt
-.public IsCopyingMove
-.public IsFloorOver
-.public LogMessageByIdWithPopupCheckUser
 .public LogMessageQuiet
 .public LogMessageWithPopup
 .public MALE_ACCURACY_STAGE_MULTIPLIERS
 .public MALE_EVASION_STAGE_MULTIPLIERS
 .public MoveIsNotPhysical
-.public NATURE_POWER_TABLE
 .public ov10_022BDE50
 .public ov10_022BE9E8
 .public ov10_022BEB2C
 .public ov10_022BF01C
-.public ov10_022BF0F4
-.public ov10_022BF1FC
-.public ov10_022BFA3C
-.public ov10_022BFAA8
-.public ov10_022BFD58
-.public ov10_022BFD8C
 .public ov10_022BFDAC
-.public ov10_022BFDCC
-.public ov10_022BFDEC
-.public ov29_022DE5D8
-.public ov29_022DE5F0
 .public ov29_022E28D4
 .public ov29_022E2CA0
-.public ov29_022E3560
-.public ov29_022E56A0
-.public ov29_022E65A8
-.public ov29_022E6D68
 .public ov29_022EA370
-.public ov29_022EACCC
-.public ov29_022ED0C4
-.public ov29_022ED0D4
 .public ov29_022F87C0
 .public ov29_022F8830
 .public ov29_022F88C0
 .public ov29_022FAFD4
 .public ov29_0230040C
 .public ov29_023024E0
 .public ov29_02304A48
-.public ov29_02325644
-.public ov29_02325D20
-.public ov29_02325D7C
+.public ov29_02324D60
+.public ov29_02324E78
+.public ov29_023250D4
 .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_02352AD8
-.public ov29_02352B1C
 .public ov29_0235370C
-.public ov29_0237CA84
 .public PlayMoveAnimation
 .public PositionHasMonster
 .public QUICK_DODGER_MOVE_ACCURACY_DROP
-.public SetAndLoadCurrentAttackAnimation
-.public ShouldDisplayEntityAdvanced
 .public ShouldDisplayEntityWrapper
-.public ShouldMovePlayAlternativeAnimation
 .public sub_020018D0
 .public sub_02001980
 .public sub_0201CF90
-.public sub_0201D1D4
 .public TWO_TURN_MOVES_AND_STATUSES
-.public WanTableSpriteHasAnimationGroup
+.public TwoTurnMoveForcedMiss

asm/include/overlay_29_02324698.inc

@@ -0,0 +1,58 @@
+#pragma once
+.public AbilityIsActiveVeneer
+.public AdvanceFrame
+.public AnimationDelayOrSomething
+.public AnimationHasMoreFrames
+.public ChangeMonsterAnimation
+.public DefenderAbilityIsActive__02322D64
+.public DUNGEON_PTR
+.public DungeonRandInt
+.public DungeonRandOutcome__022EAB50
+.public EntityIsValid__02321438
+.public EntityIsValid__02325620
+.public GetApparentWeather
+.public GetDamageSource
+.public GetMoveAnimation
+.public GetMoveAnimationId
+.public GetMoveMaxGinsengBoost
+.public GetNaturePowerVariant
+.public GetSpriteIndex__02052708
+.public Is2TurnsMove
+.public IsAffectedByTaunt
+.public IsCopyingMove
+.public IsFloorOver
+.public LogMessageByIdWithPopupCheckUser
+.public NATURE_POWER_TABLE
+.public ov10_022BF01C
+.public ov10_022BF0F4
+.public ov10_022BF1FC
+.public ov10_022BFA3C
+.public ov10_022BFAA8
+.public ov10_022BFD58
+.public ov10_022BFD8C
+.public ov10_022BFDCC
+.public ov10_022BFDEC
+.public ov29_022DE5D8
+.public ov29_022DE5F0
+.public ov29_022E3560
+.public ov29_022E56A0
+.public ov29_022E65A8
+.public ov29_022E6D68
+.public ov29_022EA370
+.public ov29_022EACCC
+.public ov29_022ED0C4
+.public ov29_022ED0D4
+.public ov29_02304A48
+.public ov29_02325644
+.public ov29_02325D20
+.public ov29_02325D7C
+.public ov29_0234B09C
+.public ov29_02352AD8
+.public ov29_02352B1C
+.public ov29_0237CA84
+.public SetAndLoadCurrentAttackAnimation
+.public ShouldDisplayEntityAdvanced
+.public ShouldMovePlayAlternativeAnimation
+.public sub_0201CF90
+.public sub_0201D1D4
+.public WanTableSpriteHasAnimationGroup

asm/include/overlay_29_0234EC38.inc

@@ -12,6 +12,7 @@
 .public CreateTextBox
 .public DisplayMessage
 .public DrawTextInWindow
+.public DUNGEON_PTR
 .public DungeonGoesUp
 .public DungeonRequestsDoneWrapper
 .public EntityIsValid__0234EC14
@@ -31,30 +32,6 @@
 .public MemFree
 .public MemZero
 .public OpenMessageLog
-.public OthersMenuLoop
-.public ov10_022C4760
-.public ov10_022C4814
-.public ov10_022C48C4
-.public ov10_022C48CC
-.public ov10_022C48D4
-.public ov10_022C48F4
-.public ov10_022C490C
-.public ov10_022C4918
-.public ov10_022C4934
-.public ov10_022C49E4
-.public ov10_022C49F8
-.public ov10_022C4A0C
-.public ov10_022C4A20
-.public ov10_022C4A34
-.public ov10_022C4A48
-.public ov10_022C4A70
-.public ov10_022C4A88
-.public ov10_022C4AA0
-.public ov10_022C4AB8
-.public ov10_022C4AD0
-.public ov10_022C4AE8
-.public ov10_022C4B00
-.public ov10_022C4B98
 .public ov29_022E8708
 .public ov29_022E8768
 .public ov29_022E87DC
@@ -66,10 +43,6 @@
 .public ov29_022EA428
 .public ov29_022F0C98
 .public ov29_022F9C34
-.public ov29_0230D704
-.public ov29_0230D70C
-.public ov29_0230D738
-.public ov29_0230D76C
 .public ov29_02347100
 .public ov29_0234DD90
 .public ov29_0234DDA0
@@ -79,6 +52,25 @@
 .public ov29_0234EB28
 .public ov29_0234EBAC
 .public ov29_0234EBCC
+.public ov29_023533B0
+.public ov29_023533C0
+.public ov29_023533D0
+.public ov29_023533E0
+.public ov29_023533F0
+.public ov29_023533F8
+.public ov29_02353404
+.public ov29_0235340C
+.public ov29_0235341C
+.public ov29_0235342C
+.public ov29_0235343C
+.public ov29_02353474
+.public ov29_023534B4
+.public ov29_0235352C
+.public ov29_02353834
+.public ov29_02353838
+.public ov29_0235383C
+.public ov29_02353848
+.public ov29_0238280C
 .public ov31_023833D8
 .public ov31_02383434
 .public ov31_0238647C