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

Merge pull request #110 from AnonymousRandomPerson/main
Some checks failed
build / build (push) Has been cancelled
Details

Browse Source 
Synced from pmdsky-debug
This commit is contained in:
AnonymousRandomPerson 2025-02-05 09:00:19 -06:00 committed by GitHub
commit 49360d916c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/include/overlay_22.inc
View File

@ -41,6 +41,8 @@
.public PreprocessString
.public RemoveEmptyItemsInBag
.public RemoveItem
.public RemoveItemFromKecleonShop1
.public RemoveItemFromKecleonShop2
.public RemoveItemNoHoleCheck
.public SetCollectionMenuVoidFn
.public SetCollectionMenuWidth
@ -55,11 +57,9 @@
.public sub_0200D65C
.public sub_0200D670
.public sub_02010830
.public sub_0201086C
.public sub_02010898
.public sub_020108B4
.public sub_02010B3C
.public sub_02010B78
.public sub_02010BA4
.public sub_02010BC0
.public sub_02017C74

2
asm/include/overlay_29_0230A9B8.inc
View File

@ -35,6 +35,7 @@
.public DEFENSIVE_STAT_STAGE_MULTIPLIERS
.public DivideFixedPoint64
.public DUNGEON_PTR
.public DungeonModeSetupAndShowNameKeyboard
.public DungeonRandInt
.public DungeonRandOutcome__022EAB20
.public EnableAllLearnableIqSkills
@ -152,7 +153,6 @@
.public ov29_0234D838
.public ov29_0234D8A0
.public ov29_0234EE10
.public ov29_0234F008
.public ov29_02352838
.public ov29_02352884
.public ov29_02352894

36
asm/main_0200ED1C.s
View File

@ -2285,8 +2285,8 @@ _02010848:
_02010868: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_02010830
arm_func_start sub_0201086C
sub_0201086C: ; 0x0201086C
arm_func_start RemoveItemFromKecleonShop1
RemoveItemFromKecleonShop1: ; 0x0201086C
ldr r1, _02010894 ; =BAG_ITEMS_PTR_MIRROR
mov r3, r0, lsl #2
ldr r1, [r1]
@ -2299,7 +2299,7 @@ sub_0201086C: ; 0x0201086C
bx lr
.align 2, 0
_02010894: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0201086C
arm_func_end RemoveItemFromKecleonShop1
arm_func_start sub_02010898
sub_02010898: ; 0x02010898
@ -2354,7 +2354,7 @@ _0201092C:
b _020108E8
_02010938:
and r0, r4, #0xff
bl sub_0201086C
bl RemoveItemFromKecleonShop1
add r4, r4, #1
_02010944:
cmp r4, #8
@ -2443,7 +2443,7 @@ GenerateKecleonItems1: ; 0x02010A4C
mov r4, #0
_02010A58:
and r0, r4, #0xff
bl sub_0201086C
bl RemoveItemFromKecleonShop1
add r4, r4, #1
cmp r4, #8
blt _02010A58
@ -2461,7 +2461,7 @@ _02010A7C:
mov r0, r6
mov r1, r4
bl GetItemIdFromList
bl sub_02010AC8
bl AddItemToKecleonShop1
add r7, r7, #1
cmp r7, #8
blt _02010A7C
@ -2474,8 +2474,8 @@ _02010AC0: .word KECLEON_SHOP_ITEM_TABLE_LISTS_1
_02010AC4: .word 0x0000270F
arm_func_end GenerateKecleonItems1
arm_func_start sub_02010AC8
sub_02010AC8: ; 0x02010AC8
arm_func_start AddItemToKecleonShop1
AddItemToKecleonShop1: ; 0x02010AC8
stmdb sp!, {r3, lr}
mov r1, r0
add r0, sp, #0
@ -2509,7 +2509,7 @@ _02010B28:
ldmia sp!, {r3, pc}
.align 2, 0
_02010B38: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_02010AC8
arm_func_end AddItemToKecleonShop1
arm_func_start sub_02010B3C
sub_02010B3C: ; 0x02010B3C
@ -2532,8 +2532,8 @@ _02010B54:
_02010B74: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_02010B3C
arm_func_start sub_02010B78
sub_02010B78: ; 0x02010B78
arm_func_start RemoveItemFromKecleonShop2
RemoveItemFromKecleonShop2: ; 0x02010B78
ldr r1, _02010BA0 ; =BAG_ITEMS_PTR_MIRROR
mov r3, r0, lsl #2
ldr r1, [r1]
@ -2546,7 +2546,7 @@ sub_02010B78: ; 0x02010B78
bx lr
.align 2, 0
_02010BA0: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_02010B78
arm_func_end RemoveItemFromKecleonShop2
arm_func_start sub_02010BA4
sub_02010BA4: ; 0x02010BA4
@ -2601,7 +2601,7 @@ _02010C38:
b _02010BF4
_02010C44:
and r0, r4, #0xff
bl sub_02010B78
bl RemoveItemFromKecleonShop2
add r4, r4, #1
_02010C50:
cmp r4, #4
@ -2690,7 +2690,7 @@ GenerateKecleonItems2: ; 0x02010D58
mov r4, #0
_02010D64:
and r0, r4, #0xff
bl sub_02010B78
bl RemoveItemFromKecleonShop2
add r4, r4, #1
cmp r4, #4
blt _02010D64
@ -2708,7 +2708,7 @@ _02010D88:
mov r0, r6
mov r1, r4
bl GetItemIdFromList
bl sub_02010DCC
bl AddItemToKecleonShop2
add r7, r7, #1
cmp r7, #4
blt _02010D88
@ -2719,8 +2719,8 @@ _02010DC4: .word KECLEON_SHOP_ITEM_TABLE_LISTS_2
_02010DC8: .word 0x0000270F
arm_func_end GenerateKecleonItems2
arm_func_start sub_02010DCC
sub_02010DCC: ; 0x02010DCC
arm_func_start AddItemToKecleonShop2
AddItemToKecleonShop2: ; 0x02010DCC
stmdb sp!, {r3, lr}
mov r1, r0
add r0, sp, #0
@ -2754,7 +2754,7 @@ _02010E2C:
ldmia sp!, {r3, pc}
.align 2, 0
_02010E3C: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_02010DCC
arm_func_end AddItemToKecleonShop2
arm_func_start GetExclusiveItemOffset
GetExclusiveItemOffset: ; 0x02010E40

8
asm/overlay_22.s
View File

@ -354,7 +354,7 @@ ov22_0238A588: ; 0x0238A588
bl sub_02010898
bl SpecialProcAddItemToBag
and r0, r4, #0xff
bl sub_0201086C
bl RemoveItemFromKecleonShop1
ldr r0, _0238A5C8 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC60
ldr r0, [r0, #4]
add r0, r0, r4, lsl #2
@ -388,7 +388,7 @@ _0238A5E0:
add r1, r1, r5, lsl #2
ldr r1, [r1, #0x370]
add r4, r4, r1
bl sub_0201086C
bl RemoveItemFromKecleonShop1
_0238A614:
add r5, r5, #1
_0238A618:
@ -859,7 +859,7 @@ ov22_0238ABD4: ; 0x0238ABD4
bl sub_02010BA4
bl SpecialProcAddItemToBag
and r0, r4, #0xff
bl sub_02010B78
bl RemoveItemFromKecleonShop2
ldr r0, _0238AC14 ; =OVERLAY22_UNKNOWN_POINTER__NA_238EC68
ldr r0, [r0, #4]
add r0, r0, r4, lsl #2
@ -893,7 +893,7 @@ _0238AC2C:
add r1, r1, r5, lsl #2
ldr r1, [r1, #0x210]
add r4, r4, r1
bl sub_02010B78
bl RemoveItemFromKecleonShop2
_0238AC60:
add r5, r5, #1
_0238AC64:

2
asm/overlay_29_0230A9B8.s
View File

@ -4165,7 +4165,7 @@ _0230E2BC:
mov r0, r6
add r1, sp, #0x98
mov r2, #0
bl ov29_0234F008
bl DungeonModeSetupAndShowNameKeyboard
cmp r0, #0
beq _0230E2BC
_0230E2D4:

6
asm/overlay_29_0234EC38.s
View File

@ -290,8 +290,8 @@ _0234EFD4:
_0234F004: .word ov29_023533B0
arm_func_end ov29_0234EF24
arm_func_start ov29_0234F008
ov29_0234F008: ; 0x0234F008
arm_func_start DungeonModeSetupAndShowNameKeyboard
DungeonModeSetupAndShowNameKeyboard: ; 0x0234F008
stmdb sp!, {r4, r5, r6, r7, r8, lr}
sub sp, sp, #0x40
mov r4, #0
@ -426,7 +426,7 @@ _0234F1CC:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_0234F1D8: .word ov29_0235352C
arm_func_end ov29_0234F008
arm_func_end DungeonModeSetupAndShowNameKeyboard
arm_func_start ov29_0234F1DC
ov29_0234F1DC: ; 0x0234F1DC