mirror of
https://github.com/pret/pmd-sky.git
synced 2026-04-25 07:24:42 -05:00
Merge pull request #124 from AnonymousRandomPerson/main
Some checks failed
build / build (push) Has been cancelled
Some checks failed
build / build (push) Has been cancelled
Synced from pmdsky-debug
This commit is contained in:
commit
7b641573b4
|
|
@ -6,6 +6,7 @@
|
|||
.public AreEntitiesAdjacent
|
||||
.public AreLateGameTrapsEnabledWrapper
|
||||
.public BoostSpeedOneStage
|
||||
.public BuildMoveTargetList
|
||||
.public CalcStatusDuration
|
||||
.public CanMonsterUseMove
|
||||
.public DungeonRandInt
|
||||
|
|
@ -54,7 +55,6 @@
|
|||
.public ov29_02321288
|
||||
.public ov29_02322DDC
|
||||
.public ov29_023230FC
|
||||
.public ov29_02324030
|
||||
.public ov29_02324514
|
||||
.public ov29_02324698
|
||||
.public ov29_02324BE8
|
||||
|
|
|
|||
|
|
@ -1528,7 +1528,7 @@ _023228CC:
|
|||
add r0, sp, #0x38
|
||||
mov r1, r6
|
||||
mov r2, r8
|
||||
bl ov29_02324030
|
||||
bl BuildMoveTargetList
|
||||
add r0, sp, #0x38
|
||||
mov r1, r6
|
||||
bl ov29_02324C9C
|
||||
|
|
|
|||
|
|
@ -1320,8 +1320,8 @@ _02324028: .word MALE_ACCURACY_STAGE_MULTIPLIERS
|
|||
_0232402C: .word MALE_EVASION_STAGE_MULTIPLIERS
|
||||
arm_func_end MoveHitCheck
|
||||
|
||||
arm_func_start ov29_02324030
|
||||
ov29_02324030: ; 0x02324030
|
||||
arm_func_start BuildMoveTargetList
|
||||
BuildMoveTargetList: ; 0x02324030
|
||||
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
|
||||
sub sp, sp, #0x18
|
||||
mov sb, r1
|
||||
|
|
@ -1574,7 +1574,7 @@ _0232439C:
|
|||
.align 2, 0
|
||||
_023243AC: .word DIRECTIONS_XY
|
||||
_023243B0: .word DUNGEON_PTR
|
||||
arm_func_end ov29_02324030
|
||||
arm_func_end BuildMoveTargetList
|
||||
|
||||
arm_func_start ov29_023243B4
|
||||
ov29_023243B4: ; 0x023243B4
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user