diff options
| -rw-r--r-- | asm/rom6.s | 12 | ||||
| -rw-r--r-- | asm/rom_81258BC.s | 8 | ||||
| -rw-r--r-- | data/data2.s | 6 | ||||
| -rw-r--r-- | src/new_game.c | 2 | ||||
| -rw-r--r-- | src/scrcmd.c | 8 |
5 files changed, 19 insertions, 17 deletions
diff --git a/asm/rom6.s b/asm/rom6.s index 8f00a3732..896a2a03a 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -30800,8 +30800,8 @@ _0811A838: .4byte gSaveBlock1 _0811A83C: .4byte 0x00000494 thumb_func_end GetCoins - thumb_func_start sub_811A840 -sub_811A840: @ 811A840 + thumb_func_start GiveCoins +GiveCoins: @ 811A840 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -30845,10 +30845,10 @@ _0811A88C: bx r1 .align 2, 0 _0811A894: .4byte 0x0000270f - thumb_func_end sub_811A840 + thumb_func_end GiveCoins - thumb_func_start sub_811A898 -sub_811A898: @ 811A898 + thumb_func_start TakeCoins +TakeCoins: @ 811A898 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -30874,7 +30874,7 @@ _0811A8BC: .align 2, 0 _0811A8C4: .4byte gSaveBlock1 _0811A8C8: .4byte 0x00000494 - thumb_func_end sub_811A898 + thumb_func_end TakeCoins thumb_func_start sub_811A8CC sub_811A8CC: @ 811A8CC diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s index 67ecdf95f..cab1f7890 100644 --- a/asm/rom_81258BC.s +++ b/asm/rom_81258BC.s @@ -30201,8 +30201,8 @@ nullsub_80: @ 8139C14 bx lr thumb_func_end nullsub_80 - thumb_func_start sub_8139C18 -sub_8139C18: @ 8139C18 + thumb_func_start NewGameInitPCItems +NewGameInitPCItems: @ 8139C18 push {r4-r6,lr} movs r4, 0 ldr r0, _08139C6C @@ -30246,8 +30246,8 @@ _08139C64: bx r0 .align 2, 0 _08139C6C: .4byte gSaveBlock1 + 0x498 -_08139C70: .4byte gUnknown_084062F0 - thumb_func_end sub_8139C18 +_08139C70: .4byte gNewGamePCItems + thumb_func_end NewGameInitPCItems thumb_func_start sub_8139C74 sub_8139C74: @ 8139C74 diff --git a/data/data2.s b/data/data2.s index e56ca1365..e9e48e8d7 100644 --- a/data/data2.s +++ b/data/data2.s @@ -27066,8 +27066,10 @@ gUnknown_084062E8:: @ 84062E8 .4byte sub_813B578 .4byte sub_813B610 -gUnknown_084062F0:: @ 84062F0 - .incbin "baserom.gba", 0x004062f0, 0x8 + .align 2 +gNewGamePCItems:: @ 84062F0 + .2byte ITEM_POTION, 1 + .2byte 0, 0 .align 2 gUnknown_084062F8:: @ 84062F8 diff --git a/src/new_game.c b/src/new_game.c index 0dab6116c..92810615e 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -119,7 +119,7 @@ void NewGameInitData(void) sub_813420C(); gSaveBlock1.registeredItem = 0; sub_80A3714(); - sub_8139C18(); + NewGameInitPCItems(); sub_810C994(); sub_8133F80(); sub_80E6764(); diff --git a/src/scrcmd.c b/src/scrcmd.c index d613e2c79..8e6bb987b 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -132,8 +132,8 @@ extern void sub_80586E0(u32, u32); extern void sub_810E7AC(u8, u8, u8, u8); extern void sub_810E824(void); extern u16 GetCoins(void); -extern bool8 sub_811A840(u16); -extern bool8 sub_811A898(u16); +extern bool8 GiveCoins(u16); +extern bool8 TakeCoins(u16); extern u8 sub_80C5374(u16, u8, u16, u32, u32, u8); extern u8 sub_80C53F8(u16); extern void sub_80C5530(u8, u16, u8); @@ -1956,7 +1956,7 @@ bool8 ScrCmd_checkcoins(struct ScriptContext *ctx) bool8 ScrCmd_givecoins(struct ScriptContext *ctx) { u16 v2 = VarGet(ScriptReadHalfword(ctx)); - if (sub_811A840(v2) == TRUE) + if (GiveCoins(v2) == TRUE) gScriptResult = 0; else gScriptResult = 1; @@ -1967,7 +1967,7 @@ bool8 ScrCmd_givecoins(struct ScriptContext *ctx) bool8 ScrCmd_removecoins(struct ScriptContext *ctx) { u16 v2 = VarGet(ScriptReadHalfword(ctx)); - if (sub_811A898(v2) == TRUE) + if (TakeCoins(v2) == TRUE) gScriptResult = 0; else gScriptResult = 1; |