ref: 6c64fa8acc80b1fe78e8c63bece0db4cf21ea2a4
parent: 64c09f8c326a1f6b00d4f2ff2241c281c1be9842
author: Sawakita <sawakitanoodles@gmail.com>
date: Sat Jan 14 14:12:52 EST 2012
Replace some hex values with labels. Remove some weird extra-indentation. hg-commit-id: eab17e7f37f4
--- a/pokered.asm
+++ b/pokered.asm
@@ -1794,10 +1794,10 @@
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
@@ -7708,7 +7708,7 @@
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]
@@ -7730,7 +7730,7 @@
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
@@ -16931,7 +16931,7 @@
INCBIN "baserom.gbc",$45710,$4576d - $45710
RocketHideoutElevatorText1: ; 0x4576d
db $08 ; asm
- ld b,LIFT_KEY
+ ld b,LIFT_KEY
call $3493
jr z, .asm_8d8f0 ; 0x45773
call $5741
@@ -18535,7 +18535,7 @@
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
@@ -18602,7 +18602,7 @@
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
@@ -18665,7 +18665,7 @@
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
@@ -18704,7 +18704,7 @@
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
@@ -25583,7 +25583,7 @@
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
@@ -26185,7 +26185,7 @@
ld a, $c8
ldh [$dc], a
ld [$d11e], a
- call $2fcf
+ call GetItemName ; $2fcf
ld hl, $cd6d
ld de, $cc5b
ld bc, $000d
@@ -29430,7 +29430,7 @@
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]