diff options
| -rw-r--r-- | constants.asm | 6 | ||||
| -rw-r--r-- | pokered.asm | 24 |
2 files changed, 18 insertions, 12 deletions
diff --git a/constants.asm b/constants.asm index 0e5f4061..d205f46f 100644 --- a/constants.asm +++ b/constants.asm @@ -160,6 +160,12 @@ W_CURMAP EQU $D35E W_YCOORD EQU $D361 ; player’s position on the current map W_XCOORD EQU $D362 +W_MAPDATAPTR EQU $D36A +W_MAPTEXTPTR EQU $D36C +W_MAPSCRIPTPTR EQU $D36E + +W_MAPTEXTPTRLIST EQU $D4E4 + W_PLAYERCOINS1 EQU $D5A4 W_PLAYERCOINS2 EQU $D5A5 diff --git a/pokered.asm b/pokered.asm index f60b37a0..14a58e8e 100644 --- a/pokered.asm +++ b/pokered.asm @@ -1826,10 +1826,10 @@ GiveItem: ; 0x3e2e ld [$cf91], a ld a, c ld [$cf96], a - ld hl, $d31d + ld hl,W_NUMBAGITEMS call $2bcf ret nc - call $2fcf + call GetItemName ; $2fcf call $3826 scf ret @@ -11133,7 +11133,7 @@ OaksLabText5: ; 0x1d248 call Predef jp $52ed .asm_b28b0 ; 0x1d279 - ld b,POKE_BALL + ld b,POKE_BALL call $3493 jr nz, .asm_17c30 ; 0x1d27e ld a, [$d7eb] @@ -11155,7 +11155,7 @@ OaksLabText5: ; 0x1d248 call PrintText jr .asm_0f042 ; 0x1d2a7 .asm_76269 ; 0x1d2a9 - ld b,OAKS_PARCEL + ld b,OAKS_PARCEL call $3493 jr nz, .asm_a8fcf ; 0x1d2ae ld hl, $52fa @@ -21230,7 +21230,7 @@ RocketHideoutElevatorTexts: ; 0x4576b RocketHideoutElevatorText1: ; 0x4576d db $08 ; asm - ld b,LIFT_KEY + ld b,LIFT_KEY call $3493 jr z, .asm_8d8f0 ; 0x45773 call $5741 @@ -23306,7 +23306,7 @@ CeladonGameCornerText2: ; 0x48ca9 ld a, [$cc26] and a jr nz, .asm_c650b ; 0x48cba - ld b,COIN_CASE + ld b,COIN_CASE call $3493 jr z, .asm_ed086 ; 0x48cc1 call $4f95 @@ -23373,7 +23373,7 @@ CeladonGameCornerText5: ; 0x48d4a jr nz, .asm_d0957 ; 0x48d50 ld hl, $4d9c call PrintText - ld b,COIN_CASE + ld b,COIN_CASE call $3493 jr z, .asm_5aef9 ; 0x48d5d call $4f95 @@ -23436,7 +23436,7 @@ CeladonGameCornerText9: ; 0x48dd9 jr nz, .asm_ed8bc ; 0x48ddf ld hl, $4e26 call PrintText - ld b,COIN_CASE + ld b,COIN_CASE call $3493 jr z, .asm_df794 ; 0x48dec call $4f95 @@ -23476,7 +23476,7 @@ CeladonGameCornerText10: ; 0x48e3b jr nz, .asm_ff080 ; 0x48e41 ld hl, $4e88 call PrintText - ld b,COIN_CASE + ld b,COIN_CASE call $3493 jr z, .asm_4fb0c ; 0x48e4e call $4f95 @@ -31859,7 +31859,7 @@ CopycatsHouseF2Text1: ; 0x5cc82 ld [$cc3c], a ld hl, $4cd4 call PrintText - ld b,POKE_DOLL + ld b,POKE_DOLL call $3493 jr z, .asm_62ecd ; 0x5cc9a ld hl, $4cd9 @@ -32557,7 +32557,7 @@ Route2GateText1: ; 0x5d5db ld a, $c8 ldh [$dc], a ld [$d11e], a - call $2fcf + call GetItemName ; $2fcf ld hl, $cd6d ld de, $cc5b ld bc, $000d @@ -36497,7 +36497,7 @@ FuchsiaHouse2Text1: ; 0x750c2 ld a, [$d78e] bit 0, a jr nz, .asm_58feb ; 0x750c8 - ld b,GOLD_TEETH + ld b,GOLD_TEETH call $3493 jr nz, .asm_3f30f ; 0x750cf ld a, [$d78e] |