Minor comment/label improvements in Cinnabar Lab.

This commit is contained in:
IIMarckus 2014-10-16 00:12:44 -06:00
parent bf6a1bab61
commit 008cface52
2 changed files with 11 additions and 7 deletions

View file

@ -80,7 +80,7 @@ PredefPointers:: ; 4fe79 (13:7e79)
add_predef LoadTilesetHeader add_predef LoadTilesetHeader
add_predef LearnMoveFromLevelUp add_predef LearnMoveFromLevelUp
add_predef LearnMove add_predef LearnMove
add_predef IsItemInBag_ ; 1C, used in Pokémon Tower add_predef IsItemInBag_
dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the bank number is actually 0 dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the bank number is actually 0
dbw $03,GiveItem dbw $03,GiveItem
add_predef ChangeBGPalColor0_4Frames add_predef ChangeBGPalColor0_4Frames

View file

@ -6,14 +6,16 @@ Lab4TextPointers: ; 75d34 (1d:5d34)
dw Lab4Text2 dw Lab4Text2
Lab4Script_75d38: ; 75d38 (1d:5d38) Lab4Script_75d38: ; 75d38 (1d:5d38)
; construct a list of all fossils in the player's bag
xor a xor a
ld [wcd37], a ld [wcd37], a
ld de, wcc5b ld de, wcc5b
ld hl, FossilsList ld hl, FossilsList
.asm_75d42 .loop
ld a, [hli] ld a, [hli]
and a and a
jr z, .asm_75d64 jr z, .done
push hl push hl
push de push de
ld [wd11e], a ld [wd11e], a
@ -23,7 +25,9 @@ Lab4Script_75d38: ; 75d38 (1d:5d38)
pop hl pop hl
ld a, b ld a, b
and a and a
jr z, .asm_75d42 jr z, .loop
; A fossil's in the bag
ld a, [wd11e] ld a, [wd11e]
ld [de], a ld [de], a
inc de inc de
@ -31,8 +35,8 @@ Lab4Script_75d38: ; 75d38 (1d:5d38)
ld hl, wcd37 ld hl, wcd37
inc [hl] inc [hl]
pop hl pop hl
jr .asm_75d42 jr .loop
.asm_75d64 .done
ld a, $ff ld a, $ff
ld [de], a ld [de], a
ret ret
@ -75,7 +79,7 @@ Lab4Text1: ; 75d6c (1d:5d6c)
set 2, [hl] set 2, [hl]
ld a, [W_FOSSILMON] ld a, [W_FOSSILMON]
ld b, a ld b, a
ld c, $1e ld c, 30
call GivePokemon call GivePokemon
jr nc, .asm_75d93 ; 0x75db9 $d8 jr nc, .asm_75d93 ; 0x75db9 $d8
ld hl, wd7a3 ld hl, wd7a3