ref: 391bbad29e4c7af8ea26f39e78ed03167ff52df9
parent: f8452ebeb8335387851721d624456c69fea797a0
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Sun Apr 6 05:12:05 EDT 2014
A little more map name consistency
--- a/constants/map_dimensions.asm
+++ b/constants/map_dimensions.asm
@@ -644,7 +644,7 @@
COPYCATS_HOUSE_1F_HEIGHT EQU $04
COPYCATS_HOUSE_1F_WIDTH EQU $04
-; CopycatsHouse1F_h map_id=176
+; CopycatsHouse2F_h map_id=176
COPYCATS_HOUSE_2F_HEIGHT EQU $04
COPYCATS_HOUSE_2F_WIDTH EQU $04
--- a/main.asm
+++ b/main.asm
@@ -34507,7 +34507,7 @@
PewterCityScript0: ; 19251 (6:5251)
xor a
- ld [W_MUSEUMF1CURSCRIPT], a
+ ld [W_MUSEUM1FCURSCRIPT], a
ld hl, $d754
res 0, [hl]
call PewterCityScript_1925e
@@ -76253,7 +76253,7 @@
EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $c, $6 ; ROUTE_16_GATE_2F
Route16GateBlocks: ; 497e3 (12:57e3)
- INCBIN "maps/route16Gate.blk"
+ INCBIN "maps/route16gate.blk"
Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
db $0c ; tileset
@@ -90313,7 +90313,7 @@
xor a
ld [$cc3c], a
ld hl, Museum1FScriptPointers
- ld a, [W_MUSEUMF1CURSCRIPT]
+ ld a, [W_MUSEUM1FCURSCRIPT]
jp CallFunctionInTable
Museum1FScriptPointers: ; 5c109 (17:4109)
@@ -90433,7 +90433,7 @@
jr asm_d1145 ; 0x5c1f0 $25
asm_0b094: ; 5c1f2 (17:41f2)
ld a, $1
- ld [W_MUSEUMF1CURSCRIPT], a
+ ld [W_MUSEUM1FCURSCRIPT], a
jr asm_d1145 ; 0x5c1f7 $1e
Func_5c1f9: ; 5c1f9 (17:41f9)
@@ -91064,8 +91064,8 @@
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3
- EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $4
+ EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $4
CeruleanPokecenterBlocks: ; 5c68b (17:468b)
INCBIN "maps/ceruleanpokecenter.blk"
--- a/wram.asm
+++ b/wram.asm
@@ -1142,7 +1142,7 @@
ds 1
W_VIRIDIANFORESTCURSCRIPT:: ; d618
ds 1
-W_MUSEUMF1CURSCRIPT:: ; d619
+W_MUSEUM1FCURSCRIPT:: ; d619
ds 1
W_ROUTE13CURSCRIPT:: ; d61a
ds 1