Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-09-29 13:47:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed calls to overlay 31

Browse Source
This commit is contained in:
AnonymousRandomPerson
2023-09-29 23:28:34 -04:00
parent 3179b1104c
commit 369f5959eb
6 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asm/include/overlay_29_0231CBEC.inc
View File

@@ -110,9 +110,9 @@
.public ov29_023529B0
.public ov29_02353324
.public ov29_02353538
.public ov30_023853BC
.public ov30_023853E0
.public ov30_02385FE0
.public ov31_023853BC
.public ov31_023853E0
.public ov31_02385FE0
.public ov31_023860A4
.public ov31_0238619C
.public ov31_02386204

16
asm/include/overlay_29_0234DDF4.inc
View File

@@ -4,6 +4,7 @@
.public DrawTileGrid
.public EntityIsValid__0234DDD0
.public EntityIsValid__0234EC14
.public EntryOverlay31
.public GetActiveTeamMember
.public GetItemMoveId16
.public GetItemToUse
@@ -14,6 +15,7 @@
.public HideTileGrid
.public InitMove
.public LoadOverlay
.public MovesMenu
.public OthersMenu
.public ov29_022E0B44
.public ov29_022E2A78
@@ -39,14 +41,12 @@
.public ov29_0235352C
.public ov29_02353538
.public ov29_02382804
.public ov30_02382820
.public ov30_02382E08
.public ov30_02382E18
.public ov30_0238367C
.public ov30_023838E4
.public ov30_023851C0
.public ov30_023853BC
.public ov30_02385FE0
.public ov31_02382E08
.public ov31_02382E18
.public ov31_0238367C
.public ov31_023838E4
.public ov31_023853BC
.public ov31_02385FE0
.public ov31_023860A4
.public ov31_0238619C
.public ov31_02386C6C

6
asm/include/overlay_29_0234EC38.inc
View File

@@ -7,6 +7,7 @@
.public DungeonGoesUp
.public DungeonRequestsDoneWrapper
.public EntityIsValid__0234EC14
.public EntryOverlay31
.public GetAcceptedMission
.public GetActiveTeamMember
.public GetDungeonMode
@@ -69,9 +70,8 @@
.public ov29_0234EB28
.public ov29_0234EBAC
.public ov29_0234EBCC
.public ov30_02382820
.public ov30_023833D8
.public ov30_02383434
.public ov31_023833D8
.public ov31_02383434
.public ov31_0238647C
.public ov31_02388114
.public ov31_02388444

6
asm/overlay_29_0231CBEC.s
View File

@@ -1369,14 +1369,14 @@ _0231DE6C:
mov r1, r8
mov r3, r2
str r8, [sp]
bl ov30_023853BC
bl ov31_023853BC
b _0231DEB0
_0231DE9C:
mov r0, r7
mov r1, fp
mov r3, r2
str fp, [sp]
bl ov30_023853E0
bl ov31_023853E0
_0231DEB0:
cmp r0, #0
beq _0231DF1C
@@ -1411,7 +1411,7 @@ _0231DF1C:
cmp r0, #0x1d
bne _0231DF34
add r0, r4, #0x4a
bl ov30_02385FE0
bl ov31_02385FE0
b _0231DE6C
_0231DF34:
cmp r0, #0x20

28
asm/overlay_29_0234DDF4.s
View File

@@ -60,12 +60,12 @@ _0234DE78:
cmp sl, #0
mvnne r4, #0
bne _0234DEE8
bl ov30_02382820
bl EntryOverlay31
mov r5, #0x1d
_0234DED0:
mov r0, r5
bl AdvanceFrame
bl ov30_02382E08
bl ov31_02382E08
mov r4, r0
cmp r4, #0xa
beq _0234DED0
@@ -86,7 +86,7 @@ _0234DEF8:
str r8, [sp, #0x18]
bl GetLeader
add r1, sp, #0x14
bl ov30_023838E4
bl ov31_023838E4
cmp r0, #0
add r0, sp, #0x14
movne r5, r7
@@ -95,7 +95,7 @@ _0234DEF8:
beq _0234DF5C
bl GetLeader
add r1, sp, #0x14
bl ov30_023838E4
bl ov31_023838E4
cmp r0, #0
beq _0234DF5C
mov r0, #1
@@ -112,7 +112,7 @@ _0234DF5C:
orr r1, r1, #4
strb r1, [r0]
bl GetLeaderAction
bl ov30_0238367C
bl ov31_0238367C
mov r0, #1
bl ov29_022EB398
mov r4, #1
@@ -289,7 +289,7 @@ _0234E1F0:
b _0234E28C
_0234E200:
bl GetLeaderAction
bl ov30_023851C0
bl MovesMenu
mov r7, #0
mov r8, r7
b _0234E27C
@@ -425,14 +425,14 @@ _0234E3CC:
mov r1, #0
mov r2, #1
str r7, [sp]
bl ov30_023853BC
bl ov31_023853BC
cmp r0, #0
movne r5, r8
bl ov29_022F0B9C
cmp r0, #0x1d
bne _0234E40C
bl GetLeaderAction
bl ov30_02385FE0
bl ov31_02385FE0
b _0234E3CC
_0234E40C:
bl ov29_022F0B9C
@@ -529,7 +529,7 @@ _0234E4F0:
str r0, [sp, #0x2c]
bl GetLeader
add r1, sp, #0x28
bl ov30_023838E4
bl ov31_023838E4
cmp r0, #0
add r0, sp, #0x28
movne r5, r7
@@ -538,7 +538,7 @@ _0234E4F0:
beq _0234E5A4
bl GetLeader
add r1, sp, #0x28
bl ov30_023838E4
bl ov31_023838E4
cmp r0, #0
beq _0234E5A4
mov r0, #1
@@ -555,7 +555,7 @@ _0234E5A4:
orr r1, r1, #4
strb r1, [r0]
bl GetLeaderAction
bl ov30_0238367C
bl ov31_0238367C
mov r0, #1
bl ov29_022EB398
mov r4, #4
@@ -668,7 +668,7 @@ _0234E75C:
bl ov29_022EB398
bl GetLeader
mov r1, #1
bl ov30_02382E18
bl ov31_02382E18
bl ov29_022F0B9C
cmp r0, #0
beq _0234E7F8
@@ -682,7 +682,7 @@ _0234E78C:
bl ov29_022EB398
bl GetLeader
mov r1, #1
bl ov30_02382E18
bl ov31_02382E18
bl ov29_022F0B9C
cmp r0, #0
beq _0234E7F8
@@ -787,7 +787,7 @@ ov29_0234E8F8: ; 0x0234E8F8
bl LoadOverlay
mov r0, r5
mov r1, r4
bl ov30_02382E18
bl ov31_02382E18
mov r0, #0x22
bl OverlayIsLoaded
cmp r0, #0

6
asm/overlay_29_0234EC38.s
View File

@@ -978,11 +978,11 @@ _0234F910: ; jump table
b _0234F9A4 ; case 8
_0234F934:
ldr r0, _0234F9E0 ; =ov29_0234F77C
bl ov30_023833D8
bl ov31_023833D8
b _0234F9B4
_0234F940:
ldr r0, _0234F9E0 ; =ov29_0234F77C
bl ov30_02383434
bl ov31_02383434
b _0234F9B4
_0234F94C:
mov r0, #2
@@ -1013,7 +1013,7 @@ _0234F998:
str r0, [r1]
b _0234F9B4
_0234F9A4:
bl ov30_02382820
bl EntryOverlay31
ldr r0, _0234F9C8 ; =ov29_0235383C
mov r1, #8
str r1, [r0]