Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synced from pmdsky-debug #67

Merged
merged 2 commits into from
Aug 14, 2024
Merged

Synced from pmdsky-debug #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7447a97
Fixed libpng link
AnonymousRandomPerson Aug 14, 2024
500de99
Synced from pmdsky-debug
AnonymousRandomPerson Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ You will still require the following packages:

Install them using either the Cygwin package manager or using pacman on Msys2.

**NOTE FOR MSYS2:** You will need to compile and install [libpng](https://www.libpng.org/pub/png/libpng.html) from source.
**NOTE FOR MSYS2:** You will need to compile and install [libpng](http://www.libpng.org/pub/png/libpng.html) from source.

### macOS

Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0231513C.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -119,6 +118,7 @@
.public ov29_02304BAC
.public ov29_0234B09C
.public ov29_0234B0B4
.public PERISH_SONG_TURN_RANGE
.public SafeguardIsActive
.public ShouldDisplayEntityWrapper
.public ShowPpRestoreEffect
Expand Down
4 changes: 2 additions & 2 deletions asm/overlay_10.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions asm/overlay_29_0231513C.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading