shithub: pokered

Download patch

ref: 681380fb13a7f7ae9919562c96dac01b371fa900
parent: 2cede80735eae29cc0185d3c44557313624181b0
author: IIMarckus <iimarckus@gmail.com>
date: Mon Jan 2 19:01:04 EST 2012

Fix an incorrect label, and use labels in MapHeaderBanks.

hg-commit-id: 4a9db3764c20


--- a/pokered.asm
+++ b/pokered.asm
@@ -120,7 +120,7 @@
 	dw PewterCity_h ; PEWTER_CITY
 	dw CeruleanCity_h ; CERULEAN_CITY
 	dw $4000 ; LAVENDER_TOWN
-	dw $4998 ; VERMILION_CITY
+	dw VermilionCity_h ; VERMILION_CITY
 	dw CeladonCity_h ; CELADON_CITY
 	dw FuchsiaCity_h ; FUCHSIA_CITY
 	dw $4000 ; CINNABAR_ISLAND
@@ -2141,13 +2141,13 @@
 ; see also MapHeaderPointers
 MapHeaderBanks: ; 423D
 	db BANK(PalletTown_h)
-	db $06 ; VIRIDIAN_CITY
-	db $06 ; PEWTER_CITY
-	db $06 ; CERULEAN_CITY
+	db BANK(ViridianCity_h) ; VIRIDIAN_CITY
+	db BANK(PewterCity_h) ; PEWTER_CITY
+	db BANK(CeruleanCity_h) ; CERULEAN_CITY
 	db $11 ; LAVENDER_TOWN
-	db $06 ; VERMILION_CITY
-	db $06 ; CELADON_CITY
-	db $06 ; FUCHSIA_CITY
+	db BANK(VermilionCity_h) ; VERMILION_CITY
+	db BANK(CeladonCity_h) ; CELADON_CITY
+	db BANK(FuchsiaCity_h) ; FUCHSIA_CITY
 	db $07 ; CINNABAR_ISLAND
 	db $14 ; INDIGO_PLATEAU
 	db $14 ; SAFFRON_CITY
@@ -5041,7 +5041,7 @@
 
 INCBIN "baserom.gbc",$18786,$18998-$18786
 
-LavenderTown_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5)
+VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5)
     db $00 ; tileset
     db $12, $14 ; dimensions (y, x)
     dw $4a3f, $586f, $57a1 ; blocks, texts, scripts