Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-07-25 04:50:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #64 from AnonymousRandomPerson/main

Browse Source 
Synced from pmdsky-debug
This commit is contained in:
AnonymousRandomPerson 2024-04-17 23:51:39 -04:00 committed by GitHub
commit 79d3cb2b8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 394 additions and 394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_29_022DC2B8.inc
View File

@ -13,6 +13,7 @@
.public DIRECTIONS_XY
.public DirectoryFileMngr_OpenDirectoryFile
.public DisplayFloorCard
.public DisplayFloorTip
.public DisplayMessage
.public DisplayMessage2
.public DrawTeamStats
@ -225,7 +226,6 @@
.public ov29_0234CA84
.public ov29_0234CB34
.public ov29_0234CB54
.public ov29_0234CB88
.public ov29_0234FD04
.public ov29_0234FD14
.public ov29_0234FD48

2
asm/include/overlay_29_02344B1C.inc
View File

@ -3,6 +3,7 @@
.public AddItemToBagNoHeld
.public AddMoneyCarried
.public AdvanceFrame
.public DisplayItemTip
.public DUNGEON_PTR
.public DungeonRand16Bit
.public DungeonRandInt
@ -35,7 +36,6 @@
.public ov29_02348DD8
.public ov29_02348ECC
.public ov29_0234B084
.public ov29_0234CCB4
.public ov29_023531A0
.public ov29_023531A4
.public ov29_023531BC

764
asm/overlay_11.s
View File

File diff suppressed because it is too large Load Diff

2
asm/overlay_29_022DC2B8.s
View File

@ -4043,7 +4043,7 @@ _022DF8E4:
bl ov29_022F62CC
b _022DF9B0
_022DF90C:
bl ov29_0234CB88
bl DisplayFloorTip
bl ov29_022EF9B8
ldr r0, _022DFF40 ; =DUNGEON_PTR
ldr r1, [r0]

6
asm/overlay_29_02344B1C.s
View File

@ -519,7 +519,7 @@ _0234515C:
mov r0, r4
bl LogMessageByIdWithPopupCheckUser
ldrsh r0, [r5, #4]
bl ov29_0234CCB4
bl DisplayItemTip
b _02345508
_023451EC:
ldr r0, _02345524 ; =DUNGEON_PTR
@ -627,7 +627,7 @@ _02345360:
bl LogMessageByIdWithPopupCheckUser
_0234536C:
ldrsh r0, [r5, #4]
bl ov29_0234CCB4
bl DisplayItemTip
b _02345508
_02345378:
mov r8, #0
@ -736,7 +736,7 @@ _023454BC:
bne _02345508
_02345500:
ldrsh r0, [r5, #4]
bl ov29_0234CCB4
bl DisplayItemTip
_02345508:
add sp, sp, #0x198
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}

12
asm/overlay_29_023498A0.s
View File

@ -3913,8 +3913,8 @@ _0234CB70:
_0234CB84: .word ov29_023537E4
arm_func_end ov29_0234CB54
arm_func_start ov29_0234CB88
ov29_0234CB88: ; 0x0234CB88
arm_func_start DisplayFloorTip
DisplayFloorTip: ; 0x0234CB88
stmdb sp!, {r3, lr}
bl GetLeader
ldr r2, _0234CC88 ; =DUNGEON_PTR
@ -3991,10 +3991,10 @@ _0234CCA4: .word ov29_02353290
_0234CCA8: .word ov29_02353278
_0234CCAC: .word ov29_02353238
_0234CCB0: .word ov29_023532E0
arm_func_end ov29_0234CB88
arm_func_end DisplayFloorTip
arm_func_start ov29_0234CCB4
ov29_0234CCB4: ; 0x0234CCB4
arm_func_start DisplayItemTip
DisplayItemTip: ; 0x0234CCB4
stmdb sp!, {r4, lr}
ldr r2, _0234CEA4 ; =DUNGEON_PTR
mvn r3, #0
@ -4155,7 +4155,7 @@ _0234CEE0: .word ov29_02353260
_0234CEE4: .word ov29_02353308
_0234CEE8: .word 0xFFFFFED2
_0234CEEC: .word ov29_02353310
arm_func_end ov29_0234CCB4
arm_func_end DisplayItemTip
arm_func_start DisplayDungeonTip
DisplayDungeonTip: ; 0x0234CEF0