mirror of
https://github.com/pret/pokeheartgold.git
synced 2025-02-02 19:13:15 +00:00
bag_view.c, 2
This commit is contained in:
parent
5a25b42fbd
commit
1bec2a1fa0
@ -4,37 +4,12 @@
|
||||
.include "global.inc"
|
||||
.public sub_02077924
|
||||
.public sub_02077930
|
||||
.public sub_02077950
|
||||
.public sub_02077960
|
||||
.public sub_02077970
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_02077950
|
||||
sub_02077950: ; 0x02077950
|
||||
push {r3, lr}
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl sub_0202BACC
|
||||
pop {r3, pc}
|
||||
thumb_func_end sub_02077950
|
||||
|
||||
thumb_func_start sub_02077960
|
||||
sub_02077960: ; 0x02077960
|
||||
push {r3, lr}
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl sub_0202BAE8
|
||||
pop {r3, pc}
|
||||
thumb_func_end sub_02077960
|
||||
|
||||
thumb_func_start sub_02077970
|
||||
sub_02077970: ; 0x02077970
|
||||
push {r3, lr}
|
||||
bl sub_0202D918
|
||||
mov r1, #0
|
||||
add r2, r1, #0
|
||||
bl sub_0202D3F8
|
||||
pop {r3, pc}
|
||||
thumb_func_end sub_02077970
|
||||
|
||||
thumb_func_start TryFormatRegisteredKeyItemUseMessage
|
||||
TryFormatRegisteredKeyItemUseMessage: ; 0x02077980
|
||||
push {r4, r5, r6, r7, lr}
|
||||
|
@ -19365,10 +19365,10 @@ _021EECD2:
|
||||
bl NewString_ReadMsgData
|
||||
add r4, r0, #0
|
||||
ldr r0, [r5, #0xc]
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
mov r1, #0
|
||||
add r2, r1, #0
|
||||
bl sub_0202D3F8
|
||||
bl FrontierData_BattlePointAction
|
||||
add r2, r0, #0
|
||||
b _021EED04
|
||||
_021EECEE:
|
||||
|
@ -22230,8 +22230,8 @@ _0225030A:
|
||||
b _0225047E
|
||||
_02250314:
|
||||
ldr r0, [r4, #0xc]
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
add r7, r0, #0
|
||||
mov r0, #0x12
|
||||
lsl r0, r0, #4
|
||||
@ -28104,8 +28104,8 @@ _02253114:
|
||||
thumb_func_start ov02_02253134
|
||||
ov02_02253134: ; 0x02253134
|
||||
push {r3, r4, r5, r6, r7, lr}
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
ldr r6, _02253168 ; =0x02253D54
|
||||
add r5, r0, #0
|
||||
mov r4, #0
|
||||
@ -28149,8 +28149,8 @@ _02253184: .word 0x02253D54
|
||||
thumb_func_start ov02_02253188
|
||||
ov02_02253188: ; 0x02253188
|
||||
push {r3, r4, r5, lr}
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
add r4, r0, #0
|
||||
mov r5, #0
|
||||
_02253196:
|
||||
@ -28186,8 +28186,8 @@ _022531C0:
|
||||
lsr r1, r1, #0x18
|
||||
cmp r1, #0xe
|
||||
blo _022531C0
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
add r6, r0, #0
|
||||
mov r5, #0
|
||||
add r7, sp, #0
|
||||
|
@ -3806,7 +3806,7 @@ _0221DBF0:
|
||||
bl ov12_0223AA84
|
||||
add r1, r4, #0
|
||||
add r2, r6, #0
|
||||
bl BagCursor_SetLastUsedItemAndPoke
|
||||
bl BagCursor_SetLastUsedItem
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
thumb_func_end ov08_0221DBCC
|
||||
|
||||
@ -12758,7 +12758,7 @@ _02222614:
|
||||
ldr r1, [r4]
|
||||
strh r0, [r1, #0x20]
|
||||
add r0, r6, #0
|
||||
bl BagCursor_Battle_GetLastUsedOnPoke
|
||||
bl BagCursor_Battle_GetLastUsedPocket
|
||||
ldr r1, [r4]
|
||||
strb r0, [r1, #0x1f]
|
||||
add r0, r4, #0
|
||||
@ -14436,7 +14436,7 @@ ov08_02223390: ; 0x02223390
|
||||
bl ov12_0223AA84
|
||||
add r1, r5, #0
|
||||
add r2, r7, #0
|
||||
bl BagCursor_SetLastUsedItemAndPoke
|
||||
bl BagCursor_SetLastUsedItem
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
thumb_func_end ov08_02223390
|
||||
|
||||
|
@ -39380,7 +39380,7 @@ _0224ABC8:
|
||||
bl ov12_0223AA84
|
||||
ldrh r1, [r6]
|
||||
ldrb r2, [r6, #2]
|
||||
bl BagCursor_SetLastUsedItemAndPoke
|
||||
bl BagCursor_SetLastUsedItem
|
||||
_0224AC02:
|
||||
ldrh r1, [r6]
|
||||
mov r0, #0x4a
|
||||
|
@ -1274,7 +1274,7 @@ _0222C1AE:
|
||||
bne _0222C200
|
||||
add r1, #0x18
|
||||
ldr r0, [r5, r1]
|
||||
bl sub_0202C028
|
||||
bl Save_DressupData_get
|
||||
add r1, r4, #0
|
||||
bl sub_0202B9B8
|
||||
bl sub_0202BC10
|
||||
@ -16872,10 +16872,10 @@ _02233D72:
|
||||
mov r0, #0x83
|
||||
lsl r0, r0, #4
|
||||
ldr r0, [r4, r0]
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
mov r1, #0
|
||||
add r2, r1, #0
|
||||
bl sub_0202D3F8
|
||||
bl FrontierData_BattlePointAction
|
||||
add r1, r5, #0
|
||||
add r1, #0x90
|
||||
str r0, [r1]
|
||||
@ -17573,7 +17573,7 @@ _0223434A:
|
||||
mov r0, #0x83
|
||||
lsl r0, r0, #4
|
||||
ldr r0, [r5, r0]
|
||||
bl sub_0202C028
|
||||
bl Save_DressupData_get
|
||||
mov r1, #0
|
||||
bl sub_0202B9B8
|
||||
mov r1, #0x8b
|
||||
|
@ -33,7 +33,7 @@ ov67_021E5900: ; 0x021E5900
|
||||
bl sub_0203107C
|
||||
str r0, [r4, #0x1c]
|
||||
ldr r0, [r5]
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
str r0, [r4, #0x20]
|
||||
ldr r0, [r5]
|
||||
bl sub_0202D928
|
||||
|
@ -9411,7 +9411,7 @@ ov73_021EA290: ; 0x021EA290
|
||||
thumb_func_start ov73_021EA2A8
|
||||
ov73_021EA2A8: ; 0x021EA2A8
|
||||
push {r3, lr}
|
||||
bl sub_0202C028
|
||||
bl Save_DressupData_get
|
||||
bl sub_0202B994
|
||||
pop {r3, pc}
|
||||
thumb_func_end ov73_021EA2A8
|
||||
@ -9421,7 +9421,7 @@ ov73_021EA2B4: ; 0x021EA2B4
|
||||
push {r4, r5, r6, lr}
|
||||
add r4, r1, #0
|
||||
add r5, r2, #0
|
||||
bl sub_0202C028
|
||||
bl Save_DressupData_get
|
||||
add r6, r0, #0
|
||||
add r0, r4, #0
|
||||
add r1, r5, #0
|
||||
@ -9443,7 +9443,7 @@ ov73_021EA2E0: ; 0x021EA2E0
|
||||
push {r4, lr}
|
||||
add r4, r0, #0
|
||||
ldr r0, [r4, #4]
|
||||
bl sub_0202C028
|
||||
bl Save_DressupData_get
|
||||
add r2, r0, #0
|
||||
ldr r0, [r4, #8]
|
||||
ldr r1, [r4, #0xc]
|
||||
|
@ -6971,10 +6971,10 @@ ov80_0222D13C: ; 0x0222D13C
|
||||
bl ov80_0222BDF4
|
||||
add r5, r0, #0
|
||||
ldr r0, [r4, #8]
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
mov r1, #0
|
||||
add r2, r1, #0
|
||||
bl sub_0202D3F8
|
||||
bl FrontierData_BattlePointAction
|
||||
strh r0, [r5]
|
||||
mov r0, #0
|
||||
pop {r3, r4, r5, pc}
|
||||
@ -6998,10 +6998,10 @@ ov80_0222D168: ; 0x0222D168
|
||||
add r2, r5, #0
|
||||
bl GameStats_Add
|
||||
ldr r0, [r4, #8]
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
add r1, r5, #0
|
||||
mov r2, #5
|
||||
bl sub_0202D3F8
|
||||
bl FrontierData_BattlePointAction
|
||||
mov r0, #0
|
||||
pop {r3, r4, r5, pc}
|
||||
.balign 4, 0
|
||||
@ -7024,10 +7024,10 @@ ov80_0222D1A0: ; 0x0222D1A0
|
||||
add r2, r5, #0
|
||||
bl GameStats_Add
|
||||
ldr r0, [r4, #8]
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
add r1, r5, #0
|
||||
mov r2, #6
|
||||
bl sub_0202D3F8
|
||||
bl FrontierData_BattlePointAction
|
||||
mov r0, #0
|
||||
pop {r3, r4, r5, pc}
|
||||
.balign 4, 0
|
||||
@ -24972,7 +24972,7 @@ _02235D3E:
|
||||
cmp r0, #1
|
||||
bne _02235DA8
|
||||
ldr r0, [r4]
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
mov r1, #6
|
||||
mov r2, #2
|
||||
bl sub_0202D57C
|
||||
|
@ -2507,7 +2507,7 @@ ov86_021E6DD8: ; 0x021E6DD8
|
||||
mov r1, #0x89
|
||||
lsl r1, r1, #2
|
||||
ldr r0, [r0, r1]
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
cmp r4, #6
|
||||
bhi _021E6E1C
|
||||
add r1, r4, r4
|
||||
|
34
asm/scrcmd.s
34
asm/scrcmd.s
@ -4403,7 +4403,7 @@ sub_02042A30: ; 0x02042A30
|
||||
ldr r0, [r0, #0xc]
|
||||
add r5, r1, #0
|
||||
add r4, r2, #0
|
||||
bl sub_0202C028
|
||||
bl Save_DressupData_get
|
||||
cmp r5, #0
|
||||
bne _02042A4E
|
||||
add r1, r4, #0
|
||||
@ -4432,7 +4432,7 @@ sub_02042A60: ; 0x02042A60
|
||||
ldr r0, [r5, #0xc]
|
||||
add r4, r2, #0
|
||||
add r6, r3, #0
|
||||
bl sub_0202C028
|
||||
bl Save_DressupData_get
|
||||
add r7, r0, #0
|
||||
add r0, r5, #0
|
||||
add r1, r4, #0
|
||||
@ -4908,7 +4908,7 @@ ScrCmd_256: ; 0x02042DFC
|
||||
add r4, r0, #0
|
||||
ldr r0, [r5]
|
||||
ldr r0, [r0, #0xc]
|
||||
bl sub_0202C028
|
||||
bl Save_DressupData_get
|
||||
mov r1, #0
|
||||
bl sub_0202B9B8
|
||||
add r1, r4, #0
|
||||
@ -9068,8 +9068,8 @@ ScrCmd_403: ; 0x02044DFC
|
||||
add r6, r0, #0
|
||||
ldr r0, [r5]
|
||||
ldr r0, [r0, #0xc]
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
add r1, r4, #0
|
||||
add r2, r6, #0
|
||||
bl sub_0202BB08
|
||||
@ -9107,8 +9107,8 @@ ScrCmd_404: ; 0x02044E40
|
||||
add r4, r0, #0
|
||||
ldr r0, [r5]
|
||||
ldr r0, [r0, #0xc]
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
add r1, r6, #0
|
||||
add r2, r7, #0
|
||||
bl sub_0202BA2C
|
||||
@ -9148,8 +9148,8 @@ ScrCmd_405: ; 0x02044E9C
|
||||
add r4, r0, #0
|
||||
ldr r0, [r5]
|
||||
ldr r0, [r0, #0xc]
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
add r1, r7, #0
|
||||
bl sub_0202BA70
|
||||
cmp r6, r0
|
||||
@ -9179,8 +9179,8 @@ ScrCmd_406: ; 0x02044F00
|
||||
add r4, r0, #0
|
||||
ldr r0, [r5]
|
||||
ldr r0, [r0, #0xc]
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
add r1, r4, #0
|
||||
bl sub_0202BBD8
|
||||
mov r0, #0
|
||||
@ -9210,8 +9210,8 @@ ScrCmd_407: ; 0x02044F30
|
||||
add r4, r0, #0
|
||||
ldr r0, [r5]
|
||||
ldr r0, [r0, #0xc]
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
add r1, r6, #0
|
||||
bl sub_0202BA5C
|
||||
strh r0, [r4]
|
||||
@ -10807,8 +10807,8 @@ ScrCmd_526: ; 0x02045BCC
|
||||
str r0, [sp]
|
||||
ldr r0, [r4]
|
||||
ldr r0, [r0, #0xc]
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
mov r6, #0
|
||||
add r7, r0, #0
|
||||
add r4, r6, #0
|
||||
@ -10993,8 +10993,8 @@ ScrCmd_536: ; 0x02045D28
|
||||
add r6, r0, #0
|
||||
ldr r0, [r5]
|
||||
ldr r0, [r0, #0xc]
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
add r1, r4, #0
|
||||
add r2, r6, #0
|
||||
bl sub_0202BB7C
|
||||
|
@ -1063,16 +1063,16 @@ _0204C5A2:
|
||||
pop {r3, r4, r5, pc}
|
||||
_0204C5B2:
|
||||
ldr r0, [r5, #0xc]
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
add r1, r4, #0
|
||||
mov r2, #1
|
||||
bl sub_0202BB08
|
||||
pop {r3, r4, r5, pc}
|
||||
_0204C5C6:
|
||||
ldr r0, [r5, #0xc]
|
||||
bl sub_0202C028
|
||||
bl sub_0202B9E0
|
||||
bl Save_DressupData_get
|
||||
bl SaveDressupData_GetFashionCase
|
||||
add r1, r4, #0
|
||||
bl sub_0202BBD8
|
||||
pop {r3, r4, r5, pc}
|
||||
|
@ -889,10 +889,10 @@ ScrCmd_554: ; 0x0204A2EC
|
||||
bl GetVarPointer
|
||||
add r5, r0, #0
|
||||
add r0, r4, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
mov r1, #0
|
||||
add r2, r1, #0
|
||||
bl sub_0202D3F8
|
||||
bl FrontierData_BattlePointAction
|
||||
strh r0, [r5]
|
||||
mov r0, #0
|
||||
pop {r3, r4, r5, pc}
|
||||
@ -921,10 +921,10 @@ ScrCmd_555: ; 0x0204A31C
|
||||
add r2, r6, #0
|
||||
bl GameStats_Add
|
||||
add r0, r4, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
add r1, r6, #0
|
||||
mov r2, #5
|
||||
bl sub_0202D3F8
|
||||
bl FrontierData_BattlePointAction
|
||||
mov r0, #0
|
||||
pop {r4, r5, r6, pc}
|
||||
.balign 4, 0
|
||||
@ -953,10 +953,10 @@ ScrCmd_556: ; 0x0204A360
|
||||
add r2, r6, #0
|
||||
bl GameStats_Add
|
||||
add r0, r4, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
add r1, r6, #0
|
||||
mov r2, #6
|
||||
bl sub_0202D3F8
|
||||
bl FrontierData_BattlePointAction
|
||||
mov r0, #0
|
||||
pop {r4, r5, r6, pc}
|
||||
.balign 4, 0
|
||||
@ -985,10 +985,10 @@ ScrCmd_557: ; 0x0204A3A4
|
||||
bl GetVarPointer
|
||||
add r4, r0, #0
|
||||
add r0, r5, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
mov r1, #0
|
||||
add r2, r1, #0
|
||||
bl sub_0202D3F8
|
||||
bl FrontierData_BattlePointAction
|
||||
cmp r0, r6
|
||||
bhs _0204A3EA
|
||||
mov r0, #0
|
||||
@ -1470,7 +1470,7 @@ _0204A720:
|
||||
sub_0204A730: ; 0x0204A730
|
||||
push {r4, lr}
|
||||
add r4, r1, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
cmp r4, #0
|
||||
bne _0204A746
|
||||
mov r1, #5
|
||||
@ -1487,7 +1487,7 @@ _0204A746:
|
||||
thumb_func_start sub_0204A750
|
||||
sub_0204A750: ; 0x0204A750
|
||||
push {r3, lr}
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
mov r1, #5
|
||||
mov r2, #0
|
||||
bl sub_0202D5DC
|
||||
@ -1503,7 +1503,7 @@ sub_0204A764: ; 0x0204A764
|
||||
bl sub_0202D908
|
||||
add r4, r0, #0
|
||||
add r0, r5, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
mov r1, #0
|
||||
add r6, r0, #0
|
||||
add r0, r4, #0
|
||||
@ -1612,7 +1612,7 @@ sub_0204A824: ; 0x0204A824
|
||||
bl sub_0202D908
|
||||
str r0, [r4, #0x70]
|
||||
add r0, r6, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
str r0, [r4, #0x74]
|
||||
ldr r0, _0204AA20 ; =0x12345678
|
||||
mov r1, #0
|
||||
@ -2713,7 +2713,7 @@ _0204B0C6:
|
||||
ldr r0, [r4, #0x74]
|
||||
add r1, r5, #0
|
||||
mov r2, #5
|
||||
bl sub_0202D3F8
|
||||
bl FrontierData_BattlePointAction
|
||||
add r0, r5, #0
|
||||
pop {r3, r4, r5, pc}
|
||||
.balign 4, 0
|
||||
@ -2764,7 +2764,7 @@ sub_0204B120: ; 0x0204B120
|
||||
add r5, r0, #0
|
||||
add r0, r1, #0
|
||||
add r4, r2, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
add r6, r0, #0
|
||||
cmp r4, #0
|
||||
beq _0204B13C
|
||||
|
@ -556,14 +556,14 @@ _0202B9DA:
|
||||
.balign 4, 0
|
||||
thumb_func_end sub_0202B9B8
|
||||
|
||||
thumb_func_start sub_0202B9E0
|
||||
sub_0202B9E0: ; 0x0202B9E0
|
||||
thumb_func_start SaveDressupData_GetFashionCase
|
||||
SaveDressupData_GetFashionCase: ; 0x0202B9E0
|
||||
ldr r1, _0202B9E8 ; =0x000007F4
|
||||
add r0, r0, r1
|
||||
bx lr
|
||||
nop
|
||||
_0202B9E8: .word 0x000007F4
|
||||
thumb_func_end sub_0202B9E0
|
||||
thumb_func_end SaveDressupData_GetFashionCase
|
||||
|
||||
thumb_func_start sub_0202B9EC
|
||||
sub_0202B9EC: ; 0x0202B9EC
|
||||
@ -695,8 +695,8 @@ _0202BABE:
|
||||
pop {r3, r4, r5, pc}
|
||||
thumb_func_end sub_0202BAB0
|
||||
|
||||
thumb_func_start sub_0202BACC
|
||||
sub_0202BACC: ; 0x0202BACC
|
||||
thumb_func_start FashionCase_CountAccessories
|
||||
FashionCase_CountAccessories: ; 0x0202BACC
|
||||
push {r4, r5, r6, lr}
|
||||
mov r5, #0
|
||||
add r6, r0, #0
|
||||
@ -711,10 +711,10 @@ _0202BAD4:
|
||||
blt _0202BAD4
|
||||
add r0, r5, #0
|
||||
pop {r4, r5, r6, pc}
|
||||
thumb_func_end sub_0202BACC
|
||||
thumb_func_end FashionCase_CountAccessories
|
||||
|
||||
thumb_func_start sub_0202BAE8
|
||||
sub_0202BAE8: ; 0x0202BAE8
|
||||
thumb_func_start FashionCase_CountWallpapers
|
||||
FashionCase_CountWallpapers: ; 0x0202BAE8
|
||||
push {r4, r5, r6, lr}
|
||||
mov r5, #0
|
||||
add r6, r0, #0
|
||||
@ -732,7 +732,7 @@ _0202BAFE:
|
||||
blt _0202BAF0
|
||||
add r0, r5, #0
|
||||
pop {r4, r5, r6, pc}
|
||||
thumb_func_end sub_0202BAE8
|
||||
thumb_func_end FashionCase_CountWallpapers
|
||||
|
||||
thumb_func_start sub_0202BB08
|
||||
sub_0202BB08: ; 0x0202BB08
|
||||
@ -1477,11 +1477,11 @@ _0202C022:
|
||||
.balign 4, 0
|
||||
thumb_func_end sub_0202BF80
|
||||
|
||||
thumb_func_start sub_0202C028
|
||||
sub_0202C028: ; 0x0202C028
|
||||
thumb_func_start Save_DressupData_get
|
||||
Save_DressupData_get: ; 0x0202C028
|
||||
ldr r3, _0202C030 ; =SavArray_get
|
||||
mov r1, #0xc
|
||||
bx r3
|
||||
nop
|
||||
_0202C030: .word SavArray_get
|
||||
thumb_func_end sub_0202C028
|
||||
thumb_func_end Save_DressupData_get
|
||||
|
@ -304,8 +304,8 @@ sub_0202D3E4: ; 0x0202D3E4
|
||||
bx lr
|
||||
thumb_func_end sub_0202D3E4
|
||||
|
||||
thumb_func_start sub_0202D3F8
|
||||
sub_0202D3F8: ; 0x0202D3F8
|
||||
thumb_func_start FrontierData_BattlePointAction
|
||||
FrontierData_BattlePointAction: ; 0x0202D3F8
|
||||
cmp r2, #6
|
||||
bhi _0202D446
|
||||
add r2, r2, r2
|
||||
@ -357,7 +357,7 @@ _0202D446:
|
||||
bx lr
|
||||
nop
|
||||
_0202D44C: .word 0x0000270F
|
||||
thumb_func_end sub_0202D3F8
|
||||
thumb_func_end FrontierData_BattlePointAction
|
||||
|
||||
thumb_func_start sub_0202D450
|
||||
sub_0202D450: ; 0x0202D450
|
||||
@ -1081,8 +1081,8 @@ sub_0202D908: ; 0x0202D908
|
||||
.balign 4, 0
|
||||
thumb_func_end sub_0202D908
|
||||
|
||||
thumb_func_start sub_0202D918
|
||||
sub_0202D918: ; 0x0202D918
|
||||
thumb_func_start Save_FrontierData_get
|
||||
Save_FrontierData_get: ; 0x0202D918
|
||||
push {r3, lr}
|
||||
bl sub_0203107C
|
||||
ldr r1, _0202D924 ; =0x00000954
|
||||
@ -1090,7 +1090,7 @@ sub_0202D918: ; 0x0202D918
|
||||
pop {r3, pc}
|
||||
.balign 4, 0
|
||||
_0202D924: .word 0x00000954
|
||||
thumb_func_end sub_0202D918
|
||||
thumb_func_end Save_FrontierData_get
|
||||
|
||||
thumb_func_start sub_0202D928
|
||||
sub_0202D928: ; 0x0202D928
|
||||
|
@ -1933,13 +1933,13 @@ sub_0203F0D0: ; 0x0203F0D0
|
||||
bl GetPartyMonByIndex
|
||||
str r0, [r5]
|
||||
add r0, r6, #0
|
||||
bl sub_0202C028
|
||||
bl Save_DressupData_get
|
||||
str r0, [sp]
|
||||
mov r1, #0
|
||||
bl sub_0202B9B8
|
||||
add r4, r0, #0
|
||||
ldr r0, [sp]
|
||||
bl sub_0202B9E0
|
||||
bl SaveDressupData_GetFashionCase
|
||||
str r4, [r5, #4]
|
||||
str r0, [r5, #8]
|
||||
add r0, r6, #0
|
||||
@ -2953,7 +2953,7 @@ sub_0203F8EC: ; 0x0203F8EC
|
||||
bl AllocFromHeapAtEnd
|
||||
add r4, r0, #0
|
||||
ldr r0, [r5, #0xc]
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
str r0, [r4]
|
||||
ldr r0, [r5, #0xc]
|
||||
bl sub_0202D928
|
||||
|
@ -202,10 +202,10 @@ _0204F602:
|
||||
str r0, [sp, #8]
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, #0xc]
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
add r1, r6, #0
|
||||
mov r2, #5
|
||||
bl sub_0202D3F8
|
||||
bl FrontierData_BattlePointAction
|
||||
_0204F630:
|
||||
cmp r4, #0
|
||||
bne _0204F63C
|
||||
|
@ -24856,7 +24856,7 @@ sub_020672D8: ; 0x020672D8
|
||||
pop {r3, r4, r5, r6, r7, pc}
|
||||
_020672F2:
|
||||
add r0, r4, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
mov r1, #0xd
|
||||
mov r2, #0
|
||||
add r4, r0, #0
|
||||
@ -24953,7 +24953,7 @@ sub_02067398: ; 0x02067398
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
_020673B6:
|
||||
add r0, r4, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
mov r1, #0xd
|
||||
mov r2, #0
|
||||
add r7, r0, #0
|
||||
@ -25108,7 +25108,7 @@ sub_020674BC: ; 0x020674BC
|
||||
bl sub_020674B0
|
||||
add r4, r0, #0
|
||||
add r0, r5, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
add r1, r4, #0
|
||||
bl sub_0202D638
|
||||
add r0, r4, #0
|
||||
@ -25121,7 +25121,7 @@ sub_020674E0: ; 0x020674E0
|
||||
push {r3, r4, r5, r6, lr}
|
||||
sub sp, #4
|
||||
add r5, r0, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
add r6, r0, #0
|
||||
bl sub_0202D63C
|
||||
bl sub_020674B0
|
||||
@ -25148,7 +25148,7 @@ sub_0206751C: ; 0x0206751C
|
||||
push {r3, r4, r5, r6, lr}
|
||||
sub sp, #4
|
||||
add r6, r0, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
add r4, r0, #0
|
||||
add r0, r6, #0
|
||||
bl sub_0202D908
|
||||
|
@ -16,7 +16,7 @@ sub_02069528: ; 0x02069528
|
||||
bl sub_0202CA44
|
||||
add r5, r0, #0
|
||||
add r0, r6, #0
|
||||
bl sub_0202D918
|
||||
bl Save_FrontierData_get
|
||||
str r0, [sp, #4]
|
||||
add r0, r7, #0
|
||||
mov r1, #0
|
||||
|
16
global.inc
16
global.inc
@ -26199,15 +26199,15 @@
|
||||
.public sub_0202B994
|
||||
.public sub_0202B998
|
||||
.public sub_0202B9B8
|
||||
.public sub_0202B9E0
|
||||
.public SaveDressupData_GetFashionCase
|
||||
.public sub_0202B9EC
|
||||
.public sub_0202BA08
|
||||
.public sub_0202BA2C
|
||||
.public sub_0202BA5C
|
||||
.public sub_0202BA70
|
||||
.public sub_0202BAB0
|
||||
.public sub_0202BACC
|
||||
.public sub_0202BAE8
|
||||
.public FashionCase_CountAccessories
|
||||
.public FashionCase_CountWallpapers
|
||||
.public sub_0202BB08
|
||||
.public sub_0202BB7C
|
||||
.public sub_0202BBD8
|
||||
@ -26234,7 +26234,7 @@
|
||||
.public sub_0202BF04
|
||||
.public sub_0202BF08
|
||||
.public sub_0202BF80
|
||||
.public sub_0202C028
|
||||
.public Save_DressupData_get
|
||||
.public sub_0202C034
|
||||
.public sub_0202C03C
|
||||
.public sub_0202C08C
|
||||
@ -26328,7 +26328,7 @@
|
||||
.public sub_0202D3B0
|
||||
.public sub_0202D3DC
|
||||
.public sub_0202D3E4
|
||||
.public sub_0202D3F8
|
||||
.public FrontierData_BattlePointAction
|
||||
.public sub_0202D450
|
||||
.public sub_0202D488
|
||||
.public sub_0202D4B8
|
||||
@ -26354,7 +26354,7 @@
|
||||
.public sub_0202D8D0
|
||||
.public sub_0202D8E4
|
||||
.public sub_0202D908
|
||||
.public sub_0202D918
|
||||
.public Save_FrontierData_get
|
||||
.public sub_0202D928
|
||||
.public sub_0202D938
|
||||
.public sub_0202D93C
|
||||
@ -29130,11 +29130,11 @@
|
||||
.public BagCursor_Field_SetPocket
|
||||
.public BagCursor_Battle_PocketGetPosition
|
||||
.public BagCursor_Battle_GetLastUsedItem
|
||||
.public BagCursor_Battle_GetLastUsedOnPoke
|
||||
.public BagCursor_Battle_GetLastUsedPocket
|
||||
.public BagCursor_Battle_GetPocket
|
||||
.public BagCursor_Battle_PocketSetPosition
|
||||
.public BagCursor_Battle_Init
|
||||
.public BagCursor_SetLastUsedItemAndPoke
|
||||
.public BagCursor_SetLastUsedItem
|
||||
.public BagCursor_Battle_SetPocket
|
||||
.public sub_02078B58
|
||||
.public sub_02078B78
|
||||
|
@ -35,7 +35,7 @@ typedef struct BAG_CURSOR_BATTLE {
|
||||
u8 scroll[5];
|
||||
u8 position[5];
|
||||
u16 lastUsedItem;
|
||||
u16 lastUsedOnPoke;
|
||||
u16 lastUsedPocket;
|
||||
u16 pocket;
|
||||
} BAG_CURSOR_BATTLE;
|
||||
|
||||
@ -53,11 +53,11 @@ void BagCursor_Field_PocketSetPosition(BAG_CURSOR *cursor, int pocket, u8 positi
|
||||
void BagCursor_Field_SetPocket(BAG_CURSOR *cursor, u16 a1);
|
||||
void BagCursor_Battle_PocketGetPosition(BAG_CURSOR *cursor, int pocket, u8 *position_p, u8 *scroll_p);
|
||||
u16 BagCursor_Battle_GetLastUsedItem(BAG_CURSOR *cursor);
|
||||
u16 BagCursor_Battle_GetLastUsedOnPoke(BAG_CURSOR *cursor);
|
||||
u16 BagCursor_Battle_GetLastUsedPocket(BAG_CURSOR *cursor);
|
||||
u16 BagCursor_Battle_GetPocket(BAG_CURSOR *cursor);
|
||||
void BagCursor_Battle_PocketSetPosition(BAG_CURSOR *cursor, int pocket, u8 position, u8 scroll);
|
||||
void BagCursor_Battle_Init(BAG_CURSOR *cursor);
|
||||
void BagCursor_SetLastUsedItemAndPoke(BAG_CURSOR *cursor, u16 itemId, u16 usedOnPoke);
|
||||
void BagCursor_SetLastUsedItem(BAG_CURSOR *cursor, u16 itemId, u16 usedOnPoke);
|
||||
void BagCursor_Battle_SetPocket(BAG_CURSOR *cursor, u16 pocket);
|
||||
|
||||
#endif //POKEHEARTGOLD_BAG_H
|
||||
|
9
include/fashion_case.h
Normal file
9
include/fashion_case.h
Normal file
@ -0,0 +1,9 @@
|
||||
#ifndef POKEHEARTGOLD_FASHION_CASE_H
|
||||
#define POKEHEARTGOLD_FASHION_CASE_H
|
||||
|
||||
void *Save_DressupData_get(SAVEDATA *saveData);
|
||||
void *SaveDressupData_GetFashionCase(void *unk);
|
||||
u32 FashionCase_CountAccessories(void *unksub);
|
||||
u32 FashionCase_CountWallpapers(void *unksub);
|
||||
|
||||
#endif //POKEHEARTGOLD_FASHION_CASE_H
|
11
include/frontier_data.h
Normal file
11
include/frontier_data.h
Normal file
@ -0,0 +1,11 @@
|
||||
#ifndef POKEHEARTGOLD_FRONTIER_DATA_H
|
||||
#define POKEHEARTGOLD_FRONTIER_DATA_H
|
||||
|
||||
#include "save.h"
|
||||
|
||||
typedef struct FRONTIERDATA FRONTIERDATA;
|
||||
|
||||
FRONTIERDATA *Save_FrontierData_get(SAVEDATA *saveData);
|
||||
u32 FrontierData_BattlePointAction(FRONTIERDATA *frontierData, u32 param, u32 action);
|
||||
|
||||
#endif //POKEHEARTGOLD_FRONTIER_DATA_H
|
39
include/msgdata.h
Normal file
39
include/msgdata.h
Normal file
@ -0,0 +1,39 @@
|
||||
#ifndef POKEHEARTGOLD_MSGDATA_H
|
||||
#define POKEHEARTGOLD_MSGDATA_H
|
||||
|
||||
#include "sys/string.h"
|
||||
#include "filesystem.h"
|
||||
#include "msgdata/msg.naix"
|
||||
|
||||
typedef enum MsgDataLoadType {
|
||||
MSGDATA_LOAD_DIRECT,
|
||||
MSGDATA_LOAD_LAZY,
|
||||
} MsgDataLoadType;
|
||||
|
||||
typedef struct _MAT_ENTRY {
|
||||
u32 offset;
|
||||
u32 length;
|
||||
} MAT_ENTRY;
|
||||
|
||||
typedef struct _MAT {
|
||||
u16 count;
|
||||
u16 key;
|
||||
MAT_ENTRY alloc[1];
|
||||
} MAT;
|
||||
|
||||
typedef struct MSGDATA {
|
||||
u16 type;
|
||||
u16 heap_id;
|
||||
u16 narc_id;
|
||||
u16 file_id;
|
||||
union {
|
||||
MAT * direct;
|
||||
NARC * lazy;
|
||||
};
|
||||
} MSGDATA;
|
||||
|
||||
MSGDATA *NewMsgDataFromNarc(MsgDataLoadType type, NarcId narc, s32 fileId, u32 heap_id);
|
||||
void DestroyMsgData(MSGDATA *msgData);
|
||||
STRING *NewString_ReadMsgData(MSGDATA *msgData, s32 strno);
|
||||
|
||||
#endif //POKEHEARTGOLD_MSGDATA_H
|
13
include/msgfmt.h
Normal file
13
include/msgfmt.h
Normal file
@ -0,0 +1,13 @@
|
||||
#ifndef GUARD_MSGFMT_H
|
||||
#define GUARD_MSGFMT_H
|
||||
|
||||
#include "sys/string.h"
|
||||
|
||||
typedef struct MSGFMT MSGFMT;
|
||||
|
||||
MSGFMT *ScrStrBufs_new(u32 heap_id);
|
||||
void ScrStrBufs_delete(MSGFMT *msgFmt);
|
||||
void StringExpandPlaceholders(MSGFMT *msgFmt, STRING *dest, const STRING *src);
|
||||
void BufferIntegerAsString(MSGFMT *msgFmt, u32 idx, int num, u32 numDigits, int strconvmode, BOOL whichCharset);
|
||||
|
||||
#endif //GUARD_MSGFMT_H
|
@ -15,7 +15,7 @@
|
||||
#define SAVE_UNK_9 9
|
||||
#define SAVE_UNK_10 10
|
||||
#define SAVE_UNK_11 11
|
||||
#define SAVE_UNK_12 12
|
||||
#define SAVE_DRESSUP_DATA 12
|
||||
#define SAVE_MAILBOX 13
|
||||
#define SAVE_UNK_14 14
|
||||
#define SAVE_UNK_15 15
|
||||
|
14
include/sys/string.h
Normal file
14
include/sys/string.h
Normal file
@ -0,0 +1,14 @@
|
||||
#ifndef POKEHEARTGOLD_STRING_H
|
||||
#define POKEHEARTGOLD_STRING_H
|
||||
|
||||
typedef struct STRING {
|
||||
u16 maxsize;
|
||||
u16 size;
|
||||
u32 magic;
|
||||
u16 data[1];
|
||||
u8 padding[2];
|
||||
} STRING;
|
||||
|
||||
void String_dtor(STRING *string);
|
||||
|
||||
#endif //POKEHEARTGOLD_STRING_H
|
@ -428,8 +428,8 @@ u16 BagCursor_Battle_GetLastUsedItem(BAG_CURSOR *cursor) {
|
||||
return cursor->battle.lastUsedItem;
|
||||
}
|
||||
|
||||
u16 BagCursor_Battle_GetLastUsedOnPoke(BAG_CURSOR *cursor) {
|
||||
return cursor->battle.lastUsedOnPoke;
|
||||
u16 BagCursor_Battle_GetLastUsedPocket(BAG_CURSOR *cursor) {
|
||||
return cursor->battle.lastUsedPocket;
|
||||
}
|
||||
|
||||
u16 BagCursor_Battle_GetPocket(BAG_CURSOR *cursor) {
|
||||
@ -450,9 +450,9 @@ void BagCursor_Battle_Init(BAG_CURSOR *cursor) {
|
||||
BagCursor_Battle_SetPocket(cursor, 0);
|
||||
}
|
||||
|
||||
void BagCursor_SetLastUsedItemAndPoke(BAG_CURSOR *cursor, u16 itemId, u16 usedOnPoke) {
|
||||
void BagCursor_SetLastUsedItem(BAG_CURSOR *cursor, u16 itemId, u16 usedOnPoke) {
|
||||
cursor->battle.lastUsedItem = itemId;
|
||||
cursor->battle.lastUsedOnPoke = usedOnPoke;
|
||||
cursor->battle.lastUsedPocket = usedOnPoke;
|
||||
}
|
||||
|
||||
void BagCursor_Battle_SetPocket(BAG_CURSOR *cursor, u16 pocket) {
|
||||
|
@ -5,8 +5,11 @@
|
||||
#include "coins.h"
|
||||
#include "player_data.h"
|
||||
#include "capsule.h"
|
||||
|
||||
// Unknown object
|
||||
#include "fashion_case.h"
|
||||
#include "frontier_data.h"
|
||||
#include "msgdata.h"
|
||||
#include "msgfmt.h"
|
||||
#include "constants/items.h"
|
||||
|
||||
BAG_VIEW *BagView_New(u8 heap_id) {
|
||||
BAG_VIEW *ret = AllocFromHeap(heap_id, sizeof(BAG_VIEW));
|
||||
@ -84,3 +87,30 @@ u8 sub_0207791C(BAG_VIEW *bagView) {
|
||||
}
|
||||
return total;
|
||||
}
|
||||
|
||||
/*static*/ u32 sub_02077950(SAVEDATA *saveData) {
|
||||
return FashionCase_CountAccessories(SaveDressupData_GetFashionCase(Save_DressupData_get(saveData)));
|
||||
}
|
||||
|
||||
/*static*/ u32 sub_02077960(SAVEDATA *saveData) {
|
||||
return FashionCase_CountWallpapers(SaveDressupData_GetFashionCase(Save_DressupData_get(saveData)));
|
||||
}
|
||||
|
||||
/*static*/ u32 sub_02077970(SAVEDATA *saveData) {
|
||||
return FrontierData_BattlePointAction(Save_FrontierData_get(saveData), 0, 0);
|
||||
}
|
||||
/*
|
||||
|
||||
BOOL TryFormatRegisteredKeyItemUseMessage(SAVEDATA *saveData, STRING *dest, u16 itemId, u32 heap_id) {
|
||||
MSGDATA *msgData;
|
||||
STRING *fmtStr;
|
||||
MSGFMT *msgFmt;
|
||||
|
||||
msgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_msgdata_msg, NARC_msg_msg_00000010_bin, heap_id);
|
||||
msgFmt = ScrStrBufs_new(heap_id);
|
||||
|
||||
if (itemId == ITEM_NONE) {
|
||||
fmtStr = NewString_ReadMsgData(msgData, 102);
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
Loading…
x
Reference in New Issue
Block a user