Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-09-30 22:27:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synced from pmdsky-debug

Browse Source
This commit is contained in:
AnonymousRandomPerson
2024-08-14 18:22:47 -04:00
parent 7447a97302
commit 500de9947a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_29_0231513C.inc
View File

@@ -62,7 +62,6 @@
.public ov10_022C47B4
.public ov10_022C47BC
.public ov10_022C47C8
.public ov10_022C47D0
.public ov10_022C47D4
.public ov10_022C47D8
.public ov10_022C47FC
@@ -119,6 +118,7 @@
.public ov29_02304BAC
.public ov29_0234B09C
.public ov29_0234B0B4
.public PERISH_SONG_TURN_RANGE
.public SafeguardIsActive
.public ShouldDisplayEntityWrapper
.public ShowPpRestoreEffect

4
asm/overlay_10.s
View File

@@ -10059,8 +10059,8 @@ ov10_022C47C8:
.global ov10_022C47CC
ov10_022C47CC:
.byte 0x0A, 0x00, 0x0C, 0x00
.global ov10_022C47D0
ov10_022C47D0:
.global PERISH_SONG_TURN_RANGE
PERISH_SONG_TURN_RANGE:
.byte 0x03, 0x00, 0x03, 0x00
.global ov10_022C47D4
ov10_022C47D4:

4
asm/overlay_29_0231513C.s
View File

@@ -1683,7 +1683,7 @@ TryInflictPerishSongStatus: ; 0x0231662C
#endif
cmp r0, #0
bne _023166F4
ldr r1, _02316714 ; =ov10_022C47D0
ldr r1, _02316714 ; =PERISH_SONG_TURN_RANGE
mov r0, r5
mov r2, #0
bl CalcStatusDuration
@@ -1712,7 +1712,7 @@ _02316704:
mov r0, #1
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_02316714: .word ov10_022C47D0
_02316714: .word PERISH_SONG_TURN_RANGE
#ifdef JAPAN
_02316718: .word 0x00000A91
_0231671C: .word 0x00000A92