summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--constants/map_constants.asm10
-rw-r--r--constants/map_dimensions.asm44
-rw-r--r--main.asm1984
-rw-r--r--maps/copycatshouse1f.blk (renamed from maps/copycatshousef1.blk)0
-rw-r--r--maps/copycatshouse2f.blk (renamed from maps/copycatshousef2.blk)0
-rw-r--r--maps/museum1f.blk (renamed from maps/museumf1.blk)bin40 -> 40 bytes
-rw-r--r--maps/museum2f.blk (renamed from maps/museumf2.blk)bin28 -> 28 bytes
-rw-r--r--maps/route16gate.blk (renamed from maps/route16gatemap.blk)bin28 -> 28 bytes
-rw-r--r--text/maps/cerulean_trade_house.asm2
-rw-r--r--text/maps/copycats_house_1f.asm6
-rw-r--r--text/maps/copycats_house_2f.asm6
-rw-r--r--text/maps/museum_2f.asm14
-rw-r--r--text/maps/route_16_gate.asm2
-rw-r--r--text/maps/viridian_forest_exit.asm4
14 files changed, 1038 insertions, 1034 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index b1d36a4d..4e4e314f 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -85,7 +85,7 @@ POWER_PLANT EQU $53
ROUTE_11_GATE_1F EQU $54
DIGLETTS_CAVE_ENTRANCE EQU $55
ROUTE_11_GATE_2F EQU $56
-ROUTE_12_GATE EQU $57
+ROUTE_12_GATE_1F EQU $57
BILLS_HOUSE EQU $58
VERMILION_POKECENTER EQU $59
POKEMON_FAN_CLUB EQU $5A
@@ -135,7 +135,7 @@ CELADON_POKECENTER EQU $85
CELADON_GYM EQU $86
GAME_CORNER EQU $87
CELADON_MART_5 EQU $88
-CELADONPRIZE_ROOM EQU $89
+CELADON_PRIZE_ROOM EQU $89
CELADON_DINER EQU $8A
CELADON_HOUSE EQU $8B
CELADON_HOTEL EQU $8C
@@ -154,9 +154,9 @@ FUCHSIA_MART EQU $98
FUCHSIA_HOUSE_1 EQU $99
FUCHSIA_POKECENTER EQU $9A
FUCHSIA_HOUSE_2 EQU $9B
-SAFARIZONEENTRANCE EQU $9C
+SAFARI_ZONE_ENTRANCE EQU $9C
FUCHSIA_GYM EQU $9D
-FUCHSIAMEETINGROOM EQU $9E
+FUCHSIA_MEETING_ROOM EQU $9E
SEAFOAM_ISLANDS_2 EQU $9F
SEAFOAM_ISLANDS_3 EQU $A0
SEAFOAM_ISLANDS_4 EQU $A1
@@ -175,7 +175,7 @@ CINNABAR_MART EQU $AC
INDIGO_PLATEAU_LOBBY EQU $AE
COPYCATS_HOUSE_1F EQU $AF
COPYCATS_HOUSE_2F EQU $B0
-FIGHTINGDOJO EQU $B1
+FIGHTING_DOJO EQU $B1
SAFFRON_GYM EQU $B2
SAFFRON_HOUSE_1 EQU $B3
SAFFRON_MART EQU $B4
diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm
index 8bb41a25..33c457dc 100644
--- a/constants/map_dimensions.asm
+++ b/constants/map_dimensions.asm
@@ -184,7 +184,7 @@ VIRIDIAN_GYM_WIDTH EQU $0a
DIGLETTS_CAVE_EXIT_HEIGHT EQU $04
DIGLETTS_CAVE_EXIT_WIDTH EQU $04
-; ViridianForestexit_h map_id=47
+; ViridianForestExit_h map_id=47
VIRIDIAN_FOREST_EXIT_HEIGHT EQU $04
VIRIDIAN_FOREST_EXIT_WIDTH EQU $05
@@ -248,9 +248,9 @@ MT_MOON_3_WIDTH EQU $14
TRASHED_HOUSE_HEIGHT EQU $04
TRASHED_HOUSE_WIDTH EQU $04
-; CeruleanHouse_h map_id=63
-CERULEAN_HOUSE_HEIGHT EQU $04
-CERULEAN_HOUSE_WIDTH EQU $04
+; CeruleanHouse1_h map_id=63
+CERULEAN_HOUSE_1_HEIGHT EQU $04
+CERULEAN_HOUSE_1_WIDTH EQU $04
; CeruleanPokecenter_h map_id=64
CERULEAN_POKECENTER_HEIGHT EQU $04
@@ -300,6 +300,10 @@ ROUTE_7_GATE_WIDTH EQU $03
PATH_ENTRANCE_ROUTE_7_HEIGHT EQU $04
PATH_ENTRANCE_ROUTE_7_WIDTH EQU $04
+; UndergroundPathEntranceRoute7Copy_h map_id=78
+PATH_ENTRANCE_ROUTE_7_COPY_HEIGHT EQU $04
+PATH_ENTRANCE_ROUTE_7_COPY_WIDTH EQU $04
+
; Route8Gate_h map_id=79
ROUTE_8_GATE_HEIGHT EQU $04
ROUTE_8_GATE_WIDTH EQU $03
@@ -333,8 +337,8 @@ ROUTE_11_GATE_2F_HEIGHT EQU $04
ROUTE_11_GATE_2F_WIDTH EQU $04
; Route12Gate_h map_id=87
-ROUTE_12_GATE_HEIGHT EQU $04
-ROUTE_12_GATE_WIDTH EQU $05
+ROUTE_12_GATE_1F_HEIGHT EQU $04
+ROUTE_12_GATE_1F_WIDTH EQU $05
; BillsHouse_h map_id=88
BILLS_HOUSE_HEIGHT EQU $04
@@ -489,8 +493,8 @@ CELADON_MART_5_HEIGHT EQU $04
CELADON_MART_5_WIDTH EQU $0a
; CeladonPrizeRoom_h map_id=137
-CELADONPRIZE_ROOM_HEIGHT EQU $04
-CELADONPRIZE_ROOM_WIDTH EQU $05
+CELADON_PRIZE_ROOM_HEIGHT EQU $04
+CELADON_PRIZE_ROOM_WIDTH EQU $05
; CeladonDiner_h map_id=138
CELADON_DINER_HEIGHT EQU $04
@@ -501,8 +505,8 @@ CELADON_HOUSE_HEIGHT EQU $04
CELADON_HOUSE_WIDTH EQU $04
; CeladonHotel_h map_id=140
-CELADONHOTEL_HEIGHT EQU $04
-CELADONHOTEL_WIDTH EQU $07
+CELADON_HOTEL_HEIGHT EQU $04
+CELADON_HOTEL_WIDTH EQU $07
; LavenderPokecenter_h map_id=141
LAVENDER_POKECENTER_HEIGHT EQU $04
@@ -565,16 +569,16 @@ FUCHSIA_HOUSE_2_HEIGHT EQU $04
FUCHSIA_HOUSE_2_WIDTH EQU $05
; SafariZoneEntrance_h map_id=156
-SAFARIZONEENTRANCE_HEIGHT EQU $03
-SAFARIZONEENTRANCE_WIDTH EQU $04
+SAFARI_ZONE_ENTRANCE_HEIGHT EQU $03
+SAFARI_ZONE_ENTRANCE_WIDTH EQU $04
; FuchsiaGym_h map_id=157
FUCHSIA_GYM_HEIGHT EQU $09
FUCHSIA_GYM_WIDTH EQU $05
; FuchsiaMeetingRoom_h map_id=158
-FUCHSIAMEETINGROOM_HEIGHT EQU $04
-FUCHSIAMEETINGROOM_WIDTH EQU $07
+FUCHSIA_MEETING_ROOM_HEIGHT EQU $04
+FUCHSIA_MEETING_ROOM_WIDTH EQU $07
; SeafoamIslands2_h map_id=159
SEAFOAM_ISLANDS_2_HEIGHT EQU $09
@@ -636,17 +640,17 @@ CINNABAR_MART_WIDTH EQU $04
INDIGO_PLATEAU_LOBBY_HEIGHT EQU $06
INDIGO_PLATEAU_LOBBY_WIDTH EQU $08
-; CopycatsHouseF1_h map_id=175
+; CopycatsHouse1F_h map_id=175
COPYCATS_HOUSE_1F_HEIGHT EQU $04
COPYCATS_HOUSE_1F_WIDTH EQU $04
-; CopycatsHouseF2_h map_id=176
+; CopycatsHouse1F_h map_id=176
COPYCATS_HOUSE_2F_HEIGHT EQU $04
COPYCATS_HOUSE_2F_WIDTH EQU $04
; FightingDojo_h map_id=177
-FIGHTINGDOJO_HEIGHT EQU $06
-FIGHTINGDOJO_WIDTH EQU $05
+FIGHTING_DOJO_HEIGHT EQU $06
+FIGHTING_DOJO_WIDTH EQU $05
; SaffronGym_h map_id=178
SAFFRON_GYM_HEIGHT EQU $09
@@ -677,8 +681,8 @@ ROUTE_15_GATE_1F_HEIGHT EQU $05
ROUTE_15_GATE_1F_WIDTH EQU $04
; Route15GateUpstairs_h map_id=185
-ROUTE_15_GATE_2F_HEIGHT EQU 4
-ROUTE_15_GATE_2F_WIDTH EQU 4
+ROUTE_15_GATE_2F_HEIGHT EQU $04
+ROUTE_15_GATE_2F_WIDTH EQU $04
; Route16GateMap_h map_id=186
ROUTE_16_GATE_1F_HEIGHT EQU $07
diff --git a/main.asm b/main.asm
index 655bf48e..cce17433 100644
--- a/main.asm
+++ b/main.asm
@@ -230,13 +230,13 @@ MapHeaderPointers:: ; 01ae (0:01ae)
dw ViridianHouse_h
dw ViridianGym_h
dw DiglettsCaveRoute2_h
- dw ViridianForestexit_h
+ dw ViridianForestExit_h
dw Route2House_h
dw Route2Gate_h
dw ViridianForestEntrance_h ;id=50
dw ViridianForest_h
- dw MuseumF1_h
- dw MuseumF2_h
+ dw Museum1F_h
+ dw Museum2F_h
dw PewterGym_h
dw PewterHouse1_h
dw PewterMart_h
@@ -246,7 +246,7 @@ MapHeaderPointers:: ; 01ae (0:01ae)
dw MtMoon2_h ;id=60
dw MtMoon3_h
dw CeruleanHouseTrashed_h
- dw CeruleanHouse_h
+ dw CeruleanHouse1_h
dw CeruleanPokecenter_h
dw CeruleanGym_h
dw BikeShop_h
@@ -358,8 +358,8 @@ MapHeaderPointers:: ; 01ae (0:01ae)
dw CinnabarMart_h
dw CinnabarMart_h ; unused
dw IndigoPlateauLobby_h
- dw CopycatsHouseF1_h
- dw CopycatsHouseF2_h
+ dw CopycatsHouse1F_h
+ dw CopycatsHouse2F_h
dw FightingDojo_h
dw SaffronGym_h
dw SaffronHouse1_h
@@ -369,7 +369,7 @@ MapHeaderPointers:: ; 01ae (0:01ae)
dw SaffronHouse2_h
dw Route15Gate_h
dw Route15GateUpstairs_h
- dw Route16GateMap_h
+ dw Route16Gate_h
dw Route16GateUpstairs_h
dw Route16House_h
dw Route12House_h
@@ -414,7 +414,7 @@ MapHeaderPointers:: ; 01ae (0:01ae)
dw UnknownDungeon1_h
dw NameRater_h
dw CeruleanHouse2_h
- dw Route16GateMap_h ; unused
+ dw Route16Gate_h ; unused
dw RockTunnel2_h
dw SilphCo9_h
dw SilphCo10_h
@@ -18408,13 +18408,13 @@ MapSongBanks: ; c04d (3:404d)
db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianHouse
db MUSIC_GYM, BANK(Music_Gym) ; ViridianGym
db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveRoute2
- db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestexit
+ db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestExit
db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2House
db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2Gate
db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestEntrance
db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ViridianForest
- db MUSIC_CITIES1, BANK(Music_Cities1) ; MuseumF1
- db MUSIC_CITIES1, BANK(Music_Cities1) ; MuseumF2
+ db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum1F
+ db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum2F
db MUSIC_GYM, BANK(Music_Gym) ; PewterGym
db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse1
db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterMart
@@ -18424,7 +18424,7 @@ MapSongBanks: ; c04d (3:404d)
db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon2
db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon3
db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouseTrashed
- db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouse
+ db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouse1
db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanPokecenter
db MUSIC_GYM, BANK(Music_Gym) ; CeruleanGym
db MUSIC_CITIES2, BANK(Music_Cities2) ; BikeShop
@@ -18536,8 +18536,8 @@ MapSongBanks: ; c04d (3:404d)
db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarMart
db MUSIC_CINNABAR, BANK(Music_Cinnabar)
db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; IndigoPlateauLobby
- db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouseF1
- db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouseF2
+ db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse1F
+ db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse2F
db MUSIC_CITIES1, BANK(Music_Cities1) ; FightingDojo
db MUSIC_GYM, BANK(Music_Gym) ; SaffronGym
db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse1
@@ -18547,7 +18547,7 @@ MapSongBanks: ; c04d (3:404d)
db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse2
db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15Gate
db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15GateUpstairs
- db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16GateMap
+ db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16Gate
db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16GateUpstairs
db MUSIC_CELADON, BANK(Music_Celadon) ; Route16House
db MUSIC_CELADON, BANK(Music_Celadon) ; Route12House
@@ -18659,13 +18659,13 @@ MapHeaderBanks: ; c23d (3:423d)
db BANK(ViridianHouse_h)
db BANK(ViridianGym_h)
db BANK(DiglettsCaveRoute2_h)
- db BANK(ViridianForestexit_h)
+ db BANK(ViridianForestExit_h)
db BANK(Route2House_h)
db BANK(Route2Gate_h)
db BANK(ViridianForestEntrance_h)
db BANK(ViridianForest_h)
- db BANK(MuseumF1_h)
- db BANK(MuseumF2_h)
+ db BANK(Museum1F_h)
+ db BANK(Museum2F_h)
db BANK(PewterGym_h)
db BANK(PewterHouse1_h)
db BANK(PewterMart_h)
@@ -18675,7 +18675,7 @@ MapHeaderBanks: ; c23d (3:423d)
db BANK(MtMoon2_h)
db BANK(MtMoon3_h)
db BANK(CeruleanHouseTrashed_h)
- db BANK(CeruleanHouse_h)
+ db BANK(CeruleanHouse1_h)
db BANK(CeruleanPokecenter_h)
db BANK(CeruleanGym_h)
db BANK(BikeShop_h)
@@ -18787,8 +18787,8 @@ MapHeaderBanks: ; c23d (3:423d)
db BANK(CinnabarMart_h)
db BANK(CinnabarMart_h)
db BANK(IndigoPlateauLobby_h)
- db BANK(CopycatsHouseF1_h)
- db BANK(CopycatsHouseF2_h)
+ db BANK(CopycatsHouse1F_h)
+ db BANK(CopycatsHouse2F_h)
db BANK(FightingDojo_h)
db BANK(SaffronGym_h)
db BANK(SaffronHouse1_h)
@@ -18798,7 +18798,7 @@ MapHeaderBanks: ; c23d (3:423d)
db BANK(SaffronHouse2_h)
db BANK(Route15Gate_h)
db BANK(Route15GateUpstairs_h)
- db BANK(Route16GateMap_h)
+ db BANK(Route16Gate_h)
db BANK(Route16GateUpstairs_h)
db BANK(Route16House_h)
db BANK(Route12House_h)
@@ -20039,8 +20039,8 @@ MapHSA5: ; cbc2 (3:4bc2)
db MANSION_1,$02,Show
db MANSION_1,$03,Show
MapHSB1: ; cbc8 (3:4bc8)
- db FIGHTINGDOJO,$06,Show
- db FIGHTINGDOJO,$07,Show
+ db FIGHTING_DOJO,$06,Show
+ db FIGHTING_DOJO,$07,Show
MapHSB5: ; cbce (3:4bce)
db SILPH_CO_1F,$01,Hide
MapHS53: ; cbd1 (3:4bd1)
@@ -33504,7 +33504,7 @@ CeladonCityObject: ; 0x18022 (size=189)
db $1b, $c, $0, CELADON_GYM
db $13, $1c, $0, GAME_CORNER
db $13, $27, $0, CELADON_MART_5 ; beta warp! no longer used
- db $13, $21, $0, CELADONPRIZE_ROOM
+ db $13, $21, $0, CELADON_PRIZE_ROOM
db $1b, $1f, $0, CELADON_DINER
db $1b, $23, $0, CELADON_HOUSE
db $1b, $2b, $0, CELADON_HOTEL
@@ -33532,19 +33532,19 @@ CeladonCityObject: ; 0x18022 (size=189)
db SPRITE_ROCKET, $e + 4, $2a + 4, $fe, $2, $9 ; person
; warp-to
- EVENT_DISP $19, $d, $8 ; CELADON_MART_1
- EVENT_DISP $19, $d, $a ; CELADON_MART_1
- EVENT_DISP $19, $9, $18 ; CELADON_MANSION_1
- EVENT_DISP $19, $3, $18 ; CELADON_MANSION_1
- EVENT_DISP $19, $3, $19 ; CELADON_MANSION_1
- EVENT_DISP $19, $9, $29 ; CELADON_POKECENTER
- EVENT_DISP $19, $1b, $c ; CELADON_GYM
- EVENT_DISP $19, $13, $1c ; GAME_CORNER
- EVENT_DISP $19, $13, $27 ; CELADON_MART_5
- EVENT_DISP $19, $13, $21 ; CELADONPRIZE_ROOM
- EVENT_DISP $19, $1b, $1f ; CELADON_DINER
- EVENT_DISP $19, $1b, $23 ; CELADON_HOUSE
- EVENT_DISP $19, $1b, $2b ; CELADON_HOTEL
+ EVENT_DISP CELADON_CITY_WIDTH, $d, $8 ; CELADON_MART_1
+ EVENT_DISP CELADON_CITY_WIDTH, $d, $a ; CELADON_MART_1
+ EVENT_DISP CELADON_CITY_WIDTH, $9, $18 ; CELADON_MANSION_1
+ EVENT_DISP CELADON_CITY_WIDTH, $3, $18 ; CELADON_MANSION_1
+ EVENT_DISP CELADON_CITY_WIDTH, $3, $19 ; CELADON_MANSION_1
+ EVENT_DISP CELADON_CITY_WIDTH, $9, $29 ; CELADON_POKECENTER
+ EVENT_DISP CELADON_CITY_WIDTH, $1b, $c ; CELADON_GYM
+ EVENT_DISP CELADON_CITY_WIDTH, $13, $1c ; GAME_CORNER
+ EVENT_DISP CELADON_CITY_WIDTH, $13, $27 ; CELADON_MART_5
+ EVENT_DISP CELADON_CITY_WIDTH, $13, $21 ; CELADON_PRIZE_ROOM
+ EVENT_DISP CELADON_CITY_WIDTH, $1b, $1f ; CELADON_DINER
+ EVENT_DISP CELADON_CITY_WIDTH, $1b, $23 ; CELADON_HOUSE
+ EVENT_DISP CELADON_CITY_WIDTH, $1b, $2b ; CELADON_HOTEL
CeladonCityBlocks: ; 180df (6:40df)
INCBIN "maps/celadoncity.blk"
@@ -33578,9 +33578,9 @@ PalletTownObject: ; 0x182c3 (size=58)
db SPRITE_FISHER2, $e + 4, $b + 4, $fe, $0, $3 ; person
; warp-to
- EVENT_DISP $a, $5, $5 ; REDS_HOUSE_1F
- EVENT_DISP $a, $5, $d ; BLUES_HOUSE
- EVENT_DISP $a, $b, $c ; OAKS_LAB
+ EVENT_DISP PALLET_TOWN_WIDTH, $5, $5 ; REDS_HOUSE_1F
+ EVENT_DISP PALLET_TOWN_WIDTH, $5, $d ; BLUES_HOUSE
+ EVENT_DISP PALLET_TOWN_WIDTH, $b, $c ; OAKS_LAB
PalletTownBlocks: ; 182fd (6:42fd)
INCBIN "maps/pallettown.blk"
@@ -33623,11 +33623,11 @@ ViridianCityObject: ; 0x18384 (size=104)
db SPRITE_GAMBLER, $5 + 4, $11 + 4, $fe, $2, $7 ; person
; warp-to
- EVENT_DISP $14, $19, $17 ; VIRIDIAN_POKECENTER
- EVENT_DISP $14, $13, $1d ; VIRIDIAN_MART
- EVENT_DISP $14, $f, $15 ; VIRIDIAN_SCHOOL
- EVENT_DISP $14, $9, $15 ; VIRIDIAN_HOUSE
- EVENT_DISP $14, $7, $20 ; VIRIDIAN_GYM
+ EVENT_DISP VIRIDIAN_CITY_WIDTH, $19, $17 ; VIRIDIAN_POKECENTER
+ EVENT_DISP VIRIDIAN_CITY_WIDTH, $13, $1d ; VIRIDIAN_MART
+ EVENT_DISP VIRIDIAN_CITY_WIDTH, $f, $15 ; VIRIDIAN_SCHOOL
+ EVENT_DISP VIRIDIAN_CITY_WIDTH, $9, $15 ; VIRIDIAN_HOUSE
+ EVENT_DISP VIRIDIAN_CITY_WIDTH, $7, $20 ; VIRIDIAN_GYM
ViridianCityBlocks: ; 183ec (6:43ec)
INCBIN "maps/viridiancity.blk"
@@ -33672,13 +33672,13 @@ PewterCityObject: ; 0x18577 (size=111)
db SPRITE_BUG_CATCHER, $10 + 4, $23 + 4, $ff, $d0, $5 ; person
; warp-to
- EVENT_DISP $14, $7, $e ; MUSEUM_1F
- EVENT_DISP $14, $5, $13 ; MUSEUM_1F
- EVENT_DISP $14, $11, $10 ; PEWTER_GYM
- EVENT_DISP $14, $d, $1d ; PEWTER_HOUSE_1
- EVENT_DISP $14, $11, $17 ; PEWTER_MART
- EVENT_DISP $14, $1d, $7 ; PEWTER_HOUSE_2
- EVENT_DISP $14, $19, $d ; PEWTER_POKECENTER
+ EVENT_DISP PEWTER_CITY_WIDTH, $7, $e ; MUSEUM_1F
+ EVENT_DISP PEWTER_CITY_WIDTH, $5, $13 ; MUSEUM_1F
+ EVENT_DISP PEWTER_CITY_WIDTH, $11, $10 ; PEWTER_GYM
+ EVENT_DISP PEWTER_CITY_WIDTH, $d, $1d ; PEWTER_HOUSE_1
+ EVENT_DISP PEWTER_CITY_WIDTH, $11, $17 ; PEWTER_MART
+ EVENT_DISP PEWTER_CITY_WIDTH, $1d, $7 ; PEWTER_HOUSE_2
+ EVENT_DISP PEWTER_CITY_WIDTH, $19, $d ; PEWTER_POKECENTER
PewterCityBlocks: ; 185e6 (6:45e6)
INCBIN "maps/pewtercity.blk"
@@ -33731,16 +33731,16 @@ CeruleanCityObject: ; 0x18786 (size=170)
db SPRITE_GUARD, $c + 4, $1b + 4, $ff, $d0, $b ; person
; warp-to
- EVENT_DISP $14, $b, $1b ; TRASHED_HOUSE
- EVENT_DISP $14, $f, $d ; CERULEAN_HOUSE
- EVENT_DISP $14, $11, $13 ; CERULEAN_POKECENTER
- EVENT_DISP $14, $13, $1e ; CERULEAN_GYM
- EVENT_DISP $14, $19, $d ; BIKE_SHOP
- EVENT_DISP $14, $19, $19 ; CERULEAN_MART
- EVENT_DISP $14, $b, $4 ; UNKNOWN_DUNGEON_1
- EVENT_DISP $14, $9, $1b ; TRASHED_HOUSE
- EVENT_DISP $14, $b, $9 ; CERULEAN_HOUSE_3
- EVENT_DISP $14, $9, $9 ; CERULEAN_HOUSE_3
+ EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE
+ EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE
+ EVENT_DISP CERULEAN_CITY_WIDTH, $11, $13 ; CERULEAN_POKECENTER
+ EVENT_DISP CERULEAN_CITY_WIDTH, $13, $1e ; CERULEAN_GYM
+ EVENT_DISP CERULEAN_CITY_WIDTH, $19, $d ; BIKE_SHOP
+ EVENT_DISP CERULEAN_CITY_WIDTH, $19, $19 ; CERULEAN_MART
+ EVENT_DISP CERULEAN_CITY_WIDTH, $b, $4 ; UNKNOWN_DUNGEON_1
+ EVENT_DISP CERULEAN_CITY_WIDTH, $9, $1b ; TRASHED_HOUSE
+ EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_3
+ EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_3
CeruleanCityBlocks: ; 18830 (6:4830)
INCBIN "maps/ceruleancity.blk"
@@ -33786,15 +33786,15 @@ VermilionCityObject: ; 0x189ba (size=133)
db SPRITE_SAILOR, $1b + 4, $19 + 4, $fe, $2, $6 ; person
; warp-to
- EVENT_DISP $14, $3, $b ; VERMILION_POKECENTER
- EVENT_DISP $14, $d, $9 ; POKEMON_FAN_CLUB
- EVENT_DISP $14, $d, $17 ; VERMILION_MART
- EVENT_DISP $14, $13, $c ; VERMILION_GYM
- EVENT_DISP $14, $13, $17 ; VERMILION_HOUSE_1
- EVENT_DISP $14, $1f, $12 ; VERMILION_DOCK
- EVENT_DISP $14, $1f, $13 ; VERMILION_DOCK
- EVENT_DISP $14, $d, $f ; VERMILION_HOUSE_3
- EVENT_DISP $14, $3, $7 ; VERMILION_HOUSE_2
+ EVENT_DISP VERMILION_CITY_WIDTH, $3, $b ; VERMILION_POKECENTER
+ EVENT_DISP VERMILION_CITY_WIDTH, $d, $9 ; POKEMON_FAN_CLUB
+ EVENT_DISP VERMILION_CITY_WIDTH, $d, $17 ; VERMILION_MART
+ EVENT_DISP VERMILION_CITY_WIDTH, $13, $c ; VERMILION_GYM
+ EVENT_DISP VERMILION_CITY_WIDTH, $13, $17 ; VERMILION_HOUSE_1
+ EVENT_DISP VERMILION_CITY_WIDTH, $1f, $12 ; VERMILION_DOCK
+ EVENT_DISP VERMILION_CITY_WIDTH, $1f, $13 ; VERMILION_DOCK
+ EVENT_DISP VERMILION_CITY_WIDTH, $d, $f ; VERMILION_HOUSE_3
+ EVENT_DISP VERMILION_CITY_WIDTH, $3, $7 ; VERMILION_HOUSE_2
VermilionCityBlocks: ; 18a3f (6:4a3f)
INCBIN "maps/vermilioncity.blk"
@@ -33817,9 +33817,9 @@ FuchsiaCityObject: ; 0x18bd4 (size=178)
db $1b, $b, $0, FUCHSIA_HOUSE_1
db $1b, $13, $0, FUCHSIA_POKECENTER
db $1b, $1b, $0, FUCHSIA_HOUSE_2
- db $3, $12, $0, SAFARIZONEENTRANCE
+ db $3, $12, $0, SAFARI_ZONE_ENTRANCE
db $1b, $5, $0, FUCHSIA_GYM
- db $d, $16, $0, FUCHSIAMEETINGROOM
+ db $d, $16, $0, FUCHSIA_MEETING_ROOM
db $1b, $1f, $1, FUCHSIA_HOUSE_3
db $18, $1f, $0, FUCHSIA_HOUSE_3
@@ -33852,15 +33852,15 @@ FuchsiaCityObject: ; 0x18bd4 (size=178)
db SPRITE_OMANYTE, $5 + 4, $6 + 4, $ff, $ff, $a ; person
; warp-to
- EVENT_DISP $14, $d, $5 ; FUCHSIA_MART
- EVENT_DISP $14, $1b, $b ; FUCHSIA_HOUSE_1
- EVENT_DISP $14, $1b, $13 ; FUCHSIA_POKECENTER
- EVENT_DISP $14, $1b, $1b ; FUCHSIA_HOUSE_2
- EVENT_DISP $14, $3, $12 ; SAFARIZONEENTRANCE
- EVENT_DISP $14, $1b, $5 ; FUCHSIA_GYM
- EVENT_DISP $14, $d, $16 ; FUCHSIAMEETINGROOM
- EVENT_DISP $14, $1b, $1f ; FUCHSIA_HOUSE_3
- EVENT_DISP $14, $18, $1f ; FUCHSIA_HOUSE_3
+ EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $5 ; FUCHSIA_MART
+ EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $b ; FUCHSIA_HOUSE_1
+ EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $13 ; FUCHSIA_POKECENTER
+ EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1b ; FUCHSIA_HOUSE_2
+ EVENT_DISP FUCHSIA_CITY_WIDTH, $3, $12 ; SAFARI_ZONE_ENTRANCE
+ EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $5 ; FUCHSIA_GYM
+ EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $16 ; FUCHSIA_MEETING_ROOM
+ EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1f ; FUCHSIA_HOUSE_3
+ EVENT_DISP FUCHSIA_CITY_WIDTH, $18, $1f ; FUCHSIA_HOUSE_3
FuchsiaCityBlocks: ; 18c86 (6:4c86)
INCBIN "maps/fuchsiacity.blk"
@@ -36059,9 +36059,9 @@ IndigoPlateauLobbyObject: ; 0x19c95 (size=58)
db SPRITE_CABLE_CLUB_WOMAN, $6 + 4, $d + 4, $ff, $d0, $5 ; person
; warp-to
- EVENT_DISP $8, $b, $7
- EVENT_DISP $8, $b, $8
- EVENT_DISP $8, $0, $8 ; LORELEIS_ROOM
+ EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7
+ EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $8
+ EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $0, $8 ; LORELEIS_ROOM
IndigoPlateauLobbyBlocks: ; 19ccf (6:5ccf)
INCBIN "maps/indigoplateaulobby.blk"
@@ -36299,13 +36299,13 @@ SilphCo4Object: ; 0x19e35 (size=111)
db SPRITE_BALL, $8 + 4, $5 + 4, $ff, $ff, $87, ESCAPE_ROPE ; item
; warp-to
- EVENT_DISP $f, $0, $18 ; SILPH_CO_3F
- EVENT_DISP $f, $0, $1a ; SILPH_CO_5F
- EVENT_DISP $f, $0, $14 ; SILPH_CO_ELEVATOR
- EVENT_DISP $f, $7, $b ; SILPH_CO_10F
- EVENT_DISP $f, $3, $11 ; SILPH_CO_6F
- EVENT_DISP $f, $f, $3 ; SILPH_CO_10F
- EVENT_DISP $f, $b, $11 ; SILPH_CO_10F
+ EVENT_DISP SILPH_CO_4F_WIDTH, $0, $18 ; SILPH_CO_3F
+ EVENT_DISP SILPH_CO_4F_WIDTH, $0, $1a ; SILPH_CO_5F
+ EVENT_DISP SILPH_CO_4F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
+ EVENT_DISP SILPH_CO_4F_WIDTH, $7, $b ; SILPH_CO_10F
+ EVENT_DISP SILPH_CO_4F_WIDTH, $3, $11 ; SILPH_CO_6F
+ EVENT_DISP SILPH_CO_4F_WIDTH, $f, $3 ; SILPH_CO_10F
+ EVENT_DISP SILPH_CO_4F_WIDTH, $b, $11 ; SILPH_CO_10F
SilphCo4Blocks: ; 19ea4 (6:5ea4)
INCBIN "maps/silphco4.blk"
@@ -36569,13 +36569,13 @@ SilphCo5Object: ; 0x1a08d (size=137)
db SPRITE_CLIPBOARD, $6 + 4, $18 + 4, $ff, $ff, $b ; person
; warp-to
- EVENT_DISP $f, $0, $18 ; SILPH_CO_6F
- EVENT_DISP $f, $0, $1a ; SILPH_CO_4F
- EVENT_DISP $f, $0, $14 ; SILPH_CO_ELEVATOR
- EVENT_DISP $f, $3, $1b ; SILPH_CO_7F
- EVENT_DISP $f, $f, $9 ; SILPH_CO_9F
- EVENT_DISP $f, $5, $b ; SILPH_CO_3F
- EVENT_DISP $f, $f, $3 ; SILPH_CO_3F
+ EVENT_DISP SILPH_CO_5F_WIDTH, $0, $18 ; SILPH_CO_6F
+ EVENT_DISP SILPH_CO_5F_WIDTH, $0, $1a ; SILPH_CO_4F
+ EVENT_DISP SILPH_CO_5F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
+ EVENT_DISP SILPH_CO_5F_WIDTH, $3, $1b ; SILPH_CO_7F
+ EVENT_DISP SILPH_CO_5F_WIDTH, $f, $9 ; SILPH_CO_9F
+ EVENT_DISP SILPH_CO_5F_WIDTH, $5, $b ; SILPH_CO_3F
+ EVENT_DISP SILPH_CO_5F_WIDTH, $f, $3 ; SILPH_CO_3F
SilphCo5Blocks: ; 1a116 (6:6116)
INCBIN "maps/silphco5.blk"
@@ -36838,11 +36838,11 @@ SilphCo6Object: ; 0x1a2fb (size=112)
db SPRITE_BALL, $f + 4, $2 + 4, $ff, $ff, $8a, X_ACCURACY ; item
; warp-to
- EVENT_DISP $d, $0, $10 ; SILPH_CO_7F
- EVENT_DISP $d, $0, $e ; SILPH_CO_5F
- EVENT_DISP $d, $0, $12 ; SILPH_CO_ELEVATOR
- EVENT_DISP $d, $3, $3 ; SILPH_CO_4F
- EVENT_DISP $d, $3, $17 ; SILPH_CO_2F
+ EVENT_DISP SILPH_CO_6F_WIDTH, $0, $10 ; SILPH_CO_7F
+ EVENT_DISP SILPH_CO_6F_WIDTH, $0, $e ; SILPH_CO_5F
+ EVENT_DISP SILPH_CO_6F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR
+ EVENT_DISP SILPH_CO_6F_WIDTH, $3, $3 ; SILPH_CO_4F
+ EVENT_DISP SILPH_CO_6F_WIDTH, $3, $17 ; SILPH_CO_2F
SilphCo6Blocks: ; 1a36b (6:636b)
INCBIN "maps/silphco6.blk"
@@ -37349,11 +37349,11 @@ CinnabarIslandObject: ; 0x1c022 (size=71)
db SPRITE_GAMBLER, $6 + 4, $e + 4, $ff, $ff, $2 ; person
; warp-to
- EVENT_DISP $a, $3, $6 ; MANSION_1
- EVENT_DISP $a, $3, $12 ; CINNABAR_GYM
- EVENT_DISP $a, $9, $6 ; CINNABAR_LAB_1
- EVENT_DISP $a, $b, $b ; CINNABAR_POKECENTER
- EVENT_DISP $a, $b, $f ; CINNABAR_MART
+ EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $6 ; MANSION_1
+ EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $12 ; CINNABAR_GYM
+ EVENT_DISP CINNABAR_ISLAND_WIDTH, $9, $6 ; CINNABAR_LAB_1
+ EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $b ; CINNABAR_POKECENTER
+ EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $f ; CINNABAR_MART
CinnabarIslandBlocks: ; 1c069 (7:4069)
INCBIN "maps/cinnabarisland.blk"
@@ -37399,7 +37399,7 @@ VermilionHouse1Blocks: ; 1c1de (7:41de)
NameRaterBlocks: ; 1c1de (7:41de)
LavenderHouse1Blocks: ; 1c1de (7:41de)
LavenderHouse2Blocks: ; 1c1de (7:41de)
-CeruleanHouseBlocks: ; 1c1de (7:41de)
+CeruleanHouse1Blocks: ; 1c1de (7:41de)
PewterHouse1Blocks: ; 1c1de (7:41de)
PewterHouse2Blocks: ; 1c1de (7:41de)
ViridianHouseBlocks: ; 0x1c1de 41DE size=16
@@ -39101,8 +39101,8 @@ OaksLabObject: ; 0x1d40a (size=88)
db SPRITE_OAK_AIDE, $a + 4, $8 + 4, $ff, $ff, $b ; person
; warp-to
- EVENT_DISP $5, $b, $4
- EVENT_DISP $5, $b, $5
+ EVENT_DISP OAKS_LAB_WIDTH, $b, $4
+ EVENT_DISP OAKS_LAB_WIDTH, $b, $5
ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42)
db $02 ; tileset
@@ -39222,8 +39222,8 @@ ViridianMartObject: ; 0x1d50a (size=38)
db SPRITE_BLACK_HAIR_BOY_1, $3 + 4, $3 + 4, $ff, $ff, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
+ EVENT_DISP VIRIDIAN_MART_WIDTH, $7, $3
+ EVENT_DISP VIRIDIAN_MART_WIDTH, $7, $4
ViridianMartBlocks: ; 1d530 (7:5530)
INCBIN "maps/viridianmart.blk"
@@ -39264,8 +39264,8 @@ SchoolObject: ; 0x1d55d (size=32)
db SPRITE_LASS, $1 + 4, $4 + 4, $ff, $d0, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2
+ EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $3
ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
db $08 ; tileset
@@ -39326,8 +39326,8 @@ ViridianHouseObject: ; 0x1d5bb (size=44)
db SPRITE_CLIPBOARD, $0 + 4, $4 + 4, $ff, $ff, $4 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $2
+ EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $3
PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
db $08 ; tileset
@@ -39375,8 +39375,8 @@ PewterHouse1Object: ; 0x1d616 (size=38)
db SPRITE_FAT_BALD_GUY, $2 + 4, $1 + 4, $ff, $ff, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $2
+ EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $3
PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
db $08 ; tileset
@@ -39414,8 +39414,8 @@ PewterHouse2Object: ; 0x1d659 (size=32)
db SPRITE_BUG_CATCHER, $5 + 4, $4 + 4, $ff, $ff, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $2
+ EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $3
CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62)
db $08 ; tileset
@@ -39481,29 +39481,29 @@ CeruleanHouseTrashedObject: ; 0x1d6bf (size=43)
db SPRITE_GIRL, $6 + 4, $5 + 4, $fe, $2, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $0, $3
+ EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $2
+ EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $3
+ EVENT_DISP TRASHED_HOUSE_WIDTH, $0, $3
-CeruleanHouse_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
+CeruleanHouse1_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
db $08 ; tileset
- db CERULEAN_HOUSE_HEIGHT, CERULEAN_HOUSE_WIDTH ; dimensions (y, x)
- dw CeruleanHouseBlocks, CeruleanHouseTextPointers, CeruleanHouseScript ; blocks, texts, scripts
+ db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x)
+ dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts
db $00 ; connections
- dw CeruleanHouseObject ; objects
+ dw CeruleanHouse1Object ; objects
-CeruleanHouseScript: ; 1d6f6 (7:56f6)
+CeruleanHouse1Script: ; 1d6f6 (7:56f6)
jp EnableAutoTextBoxDrawing
-CeruleanHouseTextPointers: ; 1d6f9 (7:56f9)
- dw CeruleanHouseText1
- dw CeruleanHouseText2
+CeruleanHouse1TextPointers: ; 1d6f9 (7:56f9)
+ dw CeruleanHouse1Text1
+ dw CeruleanHouse1Text2
-CeruleanHouseText1: ; 1d6fd (7:56fd)
- TX_FAR _CeruleanHouseText1
+CeruleanHouse1Text1: ; 1d6fd (7:56fd)
+ TX_FAR _CeruleanHouse1Text1
db "@"
-CeruleanHouseText2: ; 1d702 (7:5702)
+CeruleanHouse1Text2: ; 1d702 (7:5702)
db $08 ; asm
ld a, $6
ld [wWhichTrade], a
@@ -39511,7 +39511,7 @@ CeruleanHouseText2: ; 1d702 (7:5702)
call Predef
jp TextScriptEnd
-CeruleanHouseObject: ; 0x1d710 (size=32)
+CeruleanHouse1Object: ; 0x1d710 (size=32)
db $a ; border tile
db $2 ; warps
@@ -39525,8 +39525,8 @@ CeruleanHouseObject: ; 0x1d710 (size=32)
db SPRITE_GAMBLER, $2 + 4, $1 + 4, $ff, $ff, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2
+ EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $3
BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
db $15 ; tileset
@@ -39704,8 +39704,8 @@ BikeShopObject: ; 0x1d866 (size=38)
db SPRITE_BUG_CATCHER, $3 + 4, $1 + 4, $ff, $d1, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP BIKE_SHOP_WIDTH, $7, $2
+ EVENT_DISP BIKE_SHOP_WIDTH, $7, $3
BikeShopBlocks: ; 1d88c (7:588c)
INCBIN "maps/bikeshop.blk"
@@ -39852,8 +39852,8 @@ LavenderHouse1Object: ; 0x1d96a (size=56)
db SPRITE_BOOK_MAP_DEX, $3 + 4, $3 + 4, $ff, $ff, $6 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $2
+ EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $3
LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
db $08 ; tileset
@@ -39913,8 +39913,8 @@ LavenderHouse2Object: ; 0x1d9e6 (size=32)
db SPRITE_BRUNETTE_GIRL, $4 + 4, $2 + 4, $ff, $d3, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $2
+ EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $3
NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
db $08 ; tileset
@@ -40046,8 +40046,8 @@ NameRaterObject: ; 0x1dad6 (size=26)
db SPRITE_MR_MASTERBALL, $3 + 4, $5 + 4, $ff, $d2, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $2
+ EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $3
VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
db $08 ; tileset
@@ -40096,8 +40096,8 @@ VermilionHouse1Object: ; 0x1db20 (size=38)
db SPRITE_PAPER_SHEET, $3 + 4, $4 + 4, $ff, $ff, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $2
+ EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $3
VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94)
db $0e ; tileset
@@ -40329,8 +40329,8 @@ VermilionDockObject: ; 0x1dcc6 (size=20)
db $0 ; people
; warp-to
- EVENT_DISP $e, $0, $e
- EVENT_DISP $e, $2, $e ; SS_ANNE_1
+ EVENT_DISP VERMILION_DOCK_WIDTH, $0, $e
+ EVENT_DISP VERMILION_DOCK_WIDTH, $2, $e ; SS_ANNE_1
VermilionDockBlocks: ; 1dcda (7:5cda)
INCBIN "maps/vermiliondock.blk"
@@ -40379,8 +40379,8 @@ CeladonMansion5Object: ; 0x1dd5c (size=32)
db SPRITE_BALL, $3 + 4, $4 + 4, $ff, $ff, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $2 ; CELADON_MANSION_4
- EVENT_DISP $4, $7, $3 ; CELADON_MANSION_4
+ EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $2 ; CELADON_MANSION_4
+ EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $3 ; CELADON_MANSION_4
FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
db $02 ; tileset
@@ -40420,8 +40420,8 @@ FuchsiaMartObject: ; 0x1dd9b (size=38)
db SPRITE_LASS, $5 + 4, $6 + 4, $fe, $1, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
+ EVENT_DISP FUCHSIA_MART_WIDTH, $7, $3
+ EVENT_DISP FUCHSIA_MART_WIDTH, $7, $4
FuchsiaMartBlocks: ; 1ddc1 (7:5dc1)
INCBIN "maps/fuchsiamart.blk"
@@ -40477,8 +40477,8 @@ SaffronHouse1Object: ; 0x1de04 (size=44)
db SPRITE_PAPER_SHEET, $3 + 4, $3 + 4, $ff, $ff, $4 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $2
+ EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $3
SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
db $08 ; tileset
@@ -40547,8 +40547,8 @@ SaffronHouse2Object: ; 0x1de8a (size=26)
db SPRITE_FISHER, $3 + 4, $5 + 4, $ff, $d2, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $2
+ EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $3
DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46)
db $11 ; tileset
@@ -40583,9 +40583,9 @@ DiglettsCaveRoute2Object: ; 0x1debf (size=34)
db SPRITE_FISHER, $3 + 4, $3 + 4, $ff, $ff, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $4, $4 ; DIGLETTS_CAVE
+ EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $2
+ EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $3
+ EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $4, $4 ; DIGLETTS_CAVE
Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
db $08 ; tileset
@@ -40627,8 +40627,8 @@ Route2HouseObject: ; 0x1df07 (size=32)
db SPRITE_GAMEBOY_KID_COPY, $1 + 4, $4 + 4, $ff, $d0, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $2
+ EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $3
Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
db $0c ; tileset
@@ -40774,10 +40774,10 @@ Route5GateObject: ; 0x1dffb (size=42)
db SPRITE_GUARD, $3 + 4, $1 + 4, $ff, $d3, $1 ; person
; warp-to
- EVENT_DISP $4, $5, $3
- EVENT_DISP $4, $5, $4
- EVENT_DISP $4, $0, $3
- EVENT_DISP $4, $0, $4
+ EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $3
+ EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $4
+ EVENT_DISP ROUTE_5_GATE_WIDTH, $0, $3
+ EVENT_DISP ROUTE_5_GATE_WIDTH, $0, $4
Route5GateBlocks: ; 1e025 (7:6025)
INCBIN "maps/route5gate.blk"
@@ -40877,10 +40877,10 @@ Route6GateObject: ; 0x1e0be (size=42)
db SPRITE_GUARD, $2 + 4, $6 + 4, $ff, $d2, $1 ; person
; warp-to
- EVENT_DISP $4, $5, $3
- EVENT_DISP $4, $5, $4
- EVENT_DISP $4, $0, $3
- EVENT_DISP $4, $0, $4
+ EVENT_DISP ROUTE_6_GATE_WIDTH, $5, $3
+ EVENT_DISP ROUTE_6_GATE_WIDTH, $5, $4
+ EVENT_DISP ROUTE_6_GATE_WIDTH, $0, $3
+ EVENT_DISP ROUTE_6_GATE_WIDTH, $0, $4
Route6GateBlocks: ; 1e0e8 (7:60e8)
INCBIN "maps/route6gate.blk"
@@ -40983,10 +40983,10 @@ Route7GateObject: ; 0x1e185 (size=42)
db SPRITE_GUARD, $1 + 4, $3 + 4, $ff, $d0, $1 ; person
; warp-to
- EVENT_DISP $3, $3, $0
- EVENT_DISP $3, $4, $0
- EVENT_DISP $3, $3, $5
- EVENT_DISP $3, $4, $5
+ EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $0
+ EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $0
+ EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $5
+ EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $5
Route7GateBlocks: ; 1e1af (7:61af)
INCBIN "maps/route7gate.blk"
@@ -41086,10 +41086,10 @@ Route8GateObject: ; 0x1e247 (size=42)
db SPRITE_GUARD, $1 + 4, $2 + 4, $ff, $d0, $1 ; person
; warp-to
- EVENT_DISP $3, $3, $0
- EVENT_DISP $3, $4, $0
- EVENT_DISP $3, $3, $5
- EVENT_DISP $3, $4, $5
+ EVENT_DISP ROUTE_8_GATE_WIDTH, $3, $0
+ EVENT_DISP ROUTE_8_GATE_WIDTH, $4, $0
+ EVENT_DISP ROUTE_8_GATE_WIDTH, $3, $5
+ EVENT_DISP ROUTE_8_GATE_WIDTH, $4, $5
Route8GateBlocks: ; 1e271 (7:6271)
INCBIN "maps/route8gate.blk"
@@ -41127,9 +41127,9 @@ UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34)
db SPRITE_GIRL, $4 + 4, $3 + 4, $ff, $ff, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
- EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_WE
+ EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $7, $3
+ EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $7, $4
+ EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE
PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83)
db $16 ; tileset
@@ -41342,9 +41342,9 @@ PowerPlantObject: ; 0x1e3bf (size=135)
db SPRITE_BALL, $20 + 4, $14 + 4, $ff, $ff, $8e, TM_33 ; item
; warp-to
- EVENT_DISP $14, $23, $4
- EVENT_DISP $14, $23, $5
- EVENT_DISP $14, $b, $0
+ EVENT_DISP POWER_PLANT_WIDTH, $23, $4
+ EVENT_DISP POWER_PLANT_WIDTH, $23, $5
+ EVENT_DISP POWER_PLANT_WIDTH, $b, $0
PowerPlantBlocks: ; 1e446 (7:6446)
INCBIN "maps/powerplant.blk"
@@ -41383,9 +41383,9 @@ DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34)
db SPRITE_GAMBLER, $3 + 4, $2 + 4, $ff, $ff, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $4, $4 ; DIGLETTS_CAVE
+ EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $2
+ EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $3
+ EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $4, $4 ; DIGLETTS_CAVE
Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
db $08 ; tileset
@@ -41465,8 +41465,8 @@ Route16HouseObject: ; 0x1e657 (size=32)
db SPRITE_BIRD, $4 + 4, $6 + 4, $fe, $0, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP ROUTE_16_HOUSE_WIDTH, $7, $2
+ EVENT_DISP ROUTE_16_HOUSE_WIDTH, $7, $3
Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193)
db $0c ; tileset
@@ -41583,10 +41583,10 @@ Route22GateObject: ; 0x1e720 (size=42)
db SPRITE_GUARD, $2 + 4, $6 + 4, $ff, $d2, $1 ; person
; warp-to
- EVENT_DISP $5, $7, $4
- EVENT_DISP $5, $7, $5
- EVENT_DISP $5, $0, $4
- EVENT_DISP $5, $0, $5
+ EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $4
+ EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $5
+ EVENT_DISP ROUTE_22_GATE_WIDTH, $0, $4
+ EVENT_DISP ROUTE_22_GATE_WIDTH, $0, $5
Route22GateBlocks: ; 1e74a (7:674a)
INCBIN "maps/route22gate.blk"
@@ -41822,8 +41822,8 @@ BillsHouseObject: ; 0x1e8df (size=38)
db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $6 + 4, $ff, $ff, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP BILLS_HOUSE_WIDTH, $7, $2
+ EVENT_DISP BILLS_HOUSE_WIDTH, $7, $3
BillsHouseBlocks: ; 1e905 (7:6905)
INCBIN "maps/billshouse.blk"
@@ -68268,12 +68268,12 @@ LavenderTownObject: ; 0x4402d (size=88)
db SPRITE_BLACK_HAIR_BOY_2, $7 + 4, $8 + 4, $fe, $2, $3 ; person
; warp-to
- EVENT_DISP $a, $5, $3 ; LAVENDER_POKECENTER
- EVENT_DISP $a, $5, $e ; POKEMONTOWER_1
- EVENT_DISP $a, $9, $7 ; LAVENDER_HOUSE_1
- EVENT_DISP $a, $d, $f ; LAVENDER_MART
- EVENT_DISP $a, $d, $3 ; LAVENDER_HOUSE_2
- EVENT_DISP $a, $d, $7 ; NAME_RATERS_HOUSE
+ EVENT_DISP LAVENDER_TOWN_WIDTH, $5, $3 ; LAVENDER_POKECENTER
+ EVENT_DISP LAVENDER_TOWN_WIDTH, $5, $e ; POKEMONTOWER_1
+ EVENT_DISP LAVENDER_TOWN_WIDTH, $9, $7 ; LAVENDER_HOUSE_1
+ EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $f ; LAVENDER_MART
+ EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $3 ; LAVENDER_HOUSE_2
+ EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $7 ; NAME_RATERS_HOUSE
LavenderTownBlocks: ; 44085 (11:4085)
INCBIN "maps/lavendertown.blk"
@@ -68558,8 +68558,8 @@ ViridianPokecenterObject: ; 0x44277 (size=44)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $4
Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165)
db $16 ; tileset
@@ -68729,14 +68729,14 @@ Mansion1Object: ; 0x443a4 (size=90)
db SPRITE_BALL, $15 + 4, $12 + 4, $ff, $ff, $83, CARBOS ; item
; warp-to
- EVENT_DISP $f, $1b, $4
- EVENT_DISP $f, $1b, $5
- EVENT_DISP $f, $1b, $6
- EVENT_DISP $f, $1b, $7
- EVENT_DISP $f, $a, $5 ; MANSION_2
- EVENT_DISP $f, $17, $15 ; MANSION_4
- EVENT_DISP $f, $1b, $1a
- EVENT_DISP $f, $1b, $1b
+ EVENT_DISP MANSION_1_WIDTH, $1b, $4
+ EVENT_DISP MANSION_1_WIDTH, $1b, $5
+ EVENT_DISP MANSION_1_WIDTH, $1b, $6
+ EVENT_DISP MANSION_1_WIDTH, $1b, $7
+ EVENT_DISP MANSION_1_WIDTH, $a, $5 ; MANSION_2
+ EVENT_DISP MANSION_1_WIDTH, $17, $15 ; MANSION_4
+ EVENT_DISP MANSION_1_WIDTH, $1b, $1a
+ EVENT_DISP MANSION_1_WIDTH, $1b, $1b
Mansion1Blocks: ; 443fe (11:43fe)
INCBIN "maps/mansion1.blk"
@@ -68989,14 +68989,14 @@ RockTunnel1Object: ; 0x445f6 (size=127)
db SPRITE_LASS, $18 + 4, $20 + 4, $ff, $d3, $47, JR__TRAINER_F + $C8, $13 ; trainer
; warp-to
- EVENT_DISP $14, $3, $f
- EVENT_DISP $14, $0, $f
- EVENT_DISP $14, $21, $f
- EVENT_DISP $14, $23, $f
- EVENT_DISP $14, $3, $25 ; ROCK_TUNNEL_2
- EVENT_DISP $14, $3, $5 ; ROCK_TUNNEL_2
- EVENT_DISP $14, $b, $11 ; ROCK_TUNNEL_2
- EVENT_DISP $14, $11, $25 ; ROCK_TUNNEL_2
+ EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f
+ EVENT_DISP ROCK_TUNNEL_1_WIDTH, $0, $f
+ EVENT_DISP ROCK_TUNNEL_1_WIDTH, $21, $f
+ EVENT_DISP ROCK_TUNNEL_1_WIDTH, $23, $f
+ EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $25 ; ROCK_TUNNEL_2
+ EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $5 ; ROCK_TUNNEL_2
+ EVENT_DISP ROCK_TUNNEL_1_WIDTH, $b, $11 ; ROCK_TUNNEL_2
+ EVENT_DISP ROCK_TUNNEL_1_WIDTH, $11, $25 ; ROCK_TUNNEL_2
RockTunnel1Blocks: ; 44675 (11:4675)
INCBIN "maps/rocktunnel1.blk"
@@ -69078,17 +69078,17 @@ SeafoamIslands1Object: ; 0x4484f (size=72)
db SPRITE_BOULDER, $7 + 4, $1a + 4, $ff, $10, $2 ; person
; warp-to
- EVENT_DISP $f, $11, $4
- EVENT_DISP $f, $11, $5
- EVENT_DISP $f, $11, $1a
- EVENT_DISP $f, $11, $1b
- EVENT_DISP $f, $5, $7 ; SEAFOAM_ISLANDS_2
- EVENT_DISP $f, $3, $19 ; SEAFOAM_ISLANDS_2
- EVENT_DISP $f, $f, $17 ; SEAFOAM_ISLANDS_2
+ EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $4
+ EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $5
+ EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $1a
+ EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $1b
+ EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_2
+ EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_2
+ EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_2
; holes
- EVENT_DISP $f, $6, $11
- EVENT_DISP $f, $6, $18
+ EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $11
+ EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $18
SeafoamIslands1Blocks: ; 4489f (11:489f)
INCBIN "maps/seafoamislands1.blk"
@@ -69123,8 +69123,8 @@ SSAnne3Object: ; 0x4493c (size=26)
db SPRITE_SAILOR, $3 + 4, $9 + 4, $fe, $2, $1 ; person
; warp-to
- EVENT_DISP $a, $3, $0 ; SS_ANNE_5
- EVENT_DISP $a, $3, $13 ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_3_WIDTH, $3, $0 ; SS_ANNE_5
+ EVENT_DISP SS_ANNE_3_WIDTH, $3, $13 ; SS_ANNE_2
SSAnne3Blocks: ; 44956 (11:4956)
INCBIN "maps/ssanne3.blk"
@@ -69366,10 +69366,10 @@ VictoryRoad3Object: ; 0x44acd (size=106)
db SPRITE_BOULDER, $f + 4, $16 + 4, $ff, $10, $a ; person
; warp-to
- EVENT_DISP $f, $7, $17 ; VICTORY_ROAD_2
- EVENT_DISP $f, $8, $1a ; VICTORY_ROAD_2
- EVENT_DISP $f, $f, $1b ; VICTORY_ROAD_2
- EVENT_DISP $f, $0, $2 ; VICTORY_ROAD_2
+ EVENT_DISP VICTORY_ROAD_3_WIDTH, $7, $17 ; VICTORY_ROAD_2
+ EVENT_DISP VICTORY_ROAD_3_WIDTH, $8, $1a ; VICTORY_ROAD_2
+ EVENT_DISP VICTORY_ROAD_3_WIDTH, $f, $1b ; VICTORY_ROAD_2
+ EVENT_DISP VICTORY_ROAD_3_WIDTH, $0, $2 ; VICTORY_ROAD_2
VictoryRoad3Blocks: ; 44b37 (11:4b37)
INCBIN "maps/victoryroad3.blk"
@@ -69597,11 +69597,11 @@ RocketHideout1Object: ; 0x44ce7 (size=98)
db SPRITE_BALL, $11 + 4, $9 + 4, $ff, $ff, $87, HYPER_POTION ; item
; warp-to
- EVENT_DISP $f, $2, $17 ; ROCKET_HIDEOUT_2
- EVENT_DISP $f, $2, $15 ; GAME_CORNER
- EVENT_DISP $f, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR
- EVENT_DISP $f, $18, $15 ; ROCKET_HIDEOUT_2
- EVENT_DISP $f, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR
+ EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $17 ; ROCKET_HIDEOUT_2
+ EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $15 ; GAME_CORNER
+ EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR
+ EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $18, $15 ; ROCKET_HIDEOUT_2
+ EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR
RocketHideout1Blocks: ; 44d49 (11:4d49)
INCBIN "maps/rockethideout1.blk"
@@ -70135,11 +70135,11 @@ RocketHideout2Object: ; 0x450f7 (size=80)
db SPRITE_BALL, $15 + 4, $3 + 4, $ff, $ff, $85, SUPER_POTION ; item
; warp-to
- EVENT_DISP $f, $8, $1b ; ROCKET_HIDEOUT_1
- EVENT_DISP $f, $8, $15 ; ROCKET_HIDEOUT_3
- EVENT_DISP $f, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR
- EVENT_DISP $f, $16, $15 ; ROCKET_HIDEOUT_1
- EVENT_DISP $f, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR
+ EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1
+ EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $15 ; ROCKET_HIDEOUT_3
+ EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR
+ EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $16, $15 ; ROCKET_HIDEOUT_1
+ EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR
RocketHideout2Blocks: ; 45147 (11:5147)
INCBIN "maps/rockethideout2.blk"
@@ -70379,8 +70379,8 @@ RocketHideout3Object: ; 0x4534d (size=50)
db SPRITE_BALL, $e + 4, $14 + 4, $ff, $ff, $84, RARE_CANDY ; item
; warp-to
- EVENT_DISP $f, $6, $19 ; ROCKET_HIDEOUT_2
- EVENT_DISP $f, $12, $13 ; ROCKET_HIDEOUT_4
+ EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $6, $19 ; ROCKET_HIDEOUT_2
+ EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $12, $13 ; ROCKET_HIDEOUT_4
RocketHideout3Blocks: ; 4537f (11:537f)
INCBIN "maps/rockethideout3.blk"
@@ -70647,9 +70647,9 @@ RocketHideout4Object: ; 0x455f1 (size=95)
db SPRITE_BALL, $2 + 4, $a + 4, $ff, $ff, $89, LIFT_KEY ; item
; warp-to
- EVENT_DISP $f, $a, $13 ; ROCKET_HIDEOUT_3
- EVENT_DISP $f, $f, $18 ; ROCKET_HIDEOUT_ELEVATOR
- EVENT_DISP $f, $f, $19 ; ROCKET_HIDEOUT_ELEVATOR
+ EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $a, $13 ; ROCKET_HIDEOUT_3
+ EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $18 ; ROCKET_HIDEOUT_ELEVATOR
+ EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $19 ; ROCKET_HIDEOUT_ELEVATOR
RocketHideout4Blocks: ; 45650 (11:5650)
INCBIN "maps/rockethideout4.blk"
@@ -70759,8 +70759,8 @@ RocketHideoutElevatorObject: ; 0x45791 (size=23)
db $0 ; people
; warp-to
- EVENT_DISP $3, $1, $2 ; ROCKET_HIDEOUT_1
- EVENT_DISP $3, $1, $3 ; ROCKET_HIDEOUT_1
+ EVENT_DISP ROCKET_HIDEOUT_ELEVATOR_WIDTH, $1, $2 ; ROCKET_HIDEOUT_1
+ EVENT_DISP ROCKET_HIDEOUT_ELEVATOR_WIDTH, $1, $3 ; ROCKET_HIDEOUT_1
RocketHideoutElevatorBlocks: ; 457a8 (11:57a8)
INCBIN "maps/rockethideoutelevator.blk"
@@ -70866,8 +70866,8 @@ SilphCoElevatorObject: ; 0x45844 (size=23)
db $0 ; people
; warp-to
- EVENT_DISP $2, $3, $1
- EVENT_DISP $2, $3, $2
+ EVENT_DISP SILPH_CO_ELEVATOR_WIDTH, $3, $1
+ EVENT_DISP SILPH_CO_ELEVATOR_WIDTH, $3, $2
SilphCoElevatorBlocks: ; 4585b (11:585b)
INCBIN "maps/silphcoelevator.blk"
@@ -70925,11 +70925,11 @@ SafariZoneEastObject: ; 0x4588b (size=81)
db SPRITE_BALL, $c + 4, $f + 4, $ff, $ff, $84, TM_37 ; item
; warp-to
- EVENT_DISP $f, $4, $0 ; SAFARI_ZONE_NORTH
- EVENT_DISP $f, $5, $0 ; SAFARI_ZONE_NORTH
- EVENT_DISP $f, $16, $0 ; SAFARI_ZONE_CENTER
- EVENT_DISP $f, $17, $0 ; SAFARI_ZONE_CENTER
- EVENT_DISP $f, $9, $19 ; SAFARI_ZONE_REST_HOUSE_3
+ EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $4, $0 ; SAFARI_ZONE_NORTH
+ EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $5, $0 ; SAFARI_ZONE_NORTH
+ EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $16, $0 ; SAFARI_ZONE_CENTER
+ EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $17, $0 ; SAFARI_ZONE_CENTER
+ EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $9, $19 ; SAFARI_ZONE_REST_HOUSE_3
SafariZoneEastBlocks: ; 458dc (11:58dc)
INCBIN "maps/safarizoneeast.blk"
@@ -70999,15 +70999,15 @@ SafariZoneNorthObject: ; 0x459d5 (size=105)
db SPRITE_BALL, $7 + 4, $13 + 4, $ff, $ff, $82, TM_40 ; item
; warp-to
- EVENT_DISP $14, $23, $2 ; SAFARI_ZONE_WEST
- EVENT_DISP $14, $23, $3 ; SAFARI_ZONE_WEST
- EVENT_DISP $14, $23, $8 ; SAFARI_ZONE_WEST
- EVENT_DISP $14, $23, $9 ; SAFARI_ZONE_WEST
- EVENT_DISP $14, $23, $14 ; SAFARI_ZONE_CENTER
- EVENT_DISP $14, $23, $15 ; SAFARI_ZONE_CENTER
- EVENT_DISP $14, $1e, $27 ; SAFARI_ZONE_EAST
- EVENT_DISP $14, $1f, $27 ; SAFARI_ZONE_EAST
- EVENT_DISP $14, $3, $23 ; SAFARI_ZONE_REST_HOUSE_4
+ EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $2 ; SAFARI_ZONE_WEST
+ EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $3 ; SAFARI_ZONE_WEST
+ EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $8 ; SAFARI_ZONE_WEST
+ EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $9 ; SAFARI_ZONE_WEST
+ EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $14 ; SAFARI_ZONE_CENTER
+ EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $15 ; SAFARI_ZONE_CENTER
+ EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1e, $27 ; SAFARI_ZONE_EAST
+ EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1f, $27 ; SAFARI_ZONE_EAST
+ EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $3, $23 ; SAFARI_ZONE_REST_HOUSE_4
SafariZoneNorthBlocks: ; 45a3e (11:5a3e)
INCBIN "maps/safarizonenorth.blk"
@@ -71039,8 +71039,8 @@ SafariZoneCenterObject: ; 0x45bc5 (size=89)
db $0 ; border tile
db $9 ; warps
- db $19, $e, $2, SAFARIZONEENTRANCE
- db $19, $f, $3, SAFARIZONEENTRANCE
+ db $19, $e, $2, SAFARI_ZONE_ENTRANCE
+ db $19, $f, $3, SAFARI_ZONE_ENTRANCE
db $a, $0, $4, SAFARI_ZONE_WEST
db $b, $0, $5, SAFARI_ZONE_WEST
db $0, $e, $4, SAFARI_ZONE_NORTH
@@ -71057,15 +71057,15 @@ SafariZoneCenterObject: ; 0x45bc5 (size=89)
db SPRITE_BALL, $a + 4, $e + 4, $ff, $ff, $81, NUGGET ; item
; warp-to
- EVENT_DISP $f, $19, $e ; SAFARIZONEENTRANCE
- EVENT_DISP $f, $19, $f ; SAFARIZONEENTRANCE
- EVENT_DISP $f, $a, $0 ; SAFARI_ZONE_WEST
- EVENT_DISP $f, $b, $0 ; SAFARI_ZONE_WEST
- EVENT_DISP $f, $0, $e ; SAFARI_ZONE_NORTH
- EVENT_DISP $f, $0, $f ; SAFARI_ZONE_NORTH
- EVENT_DISP $f, $a, $1d ; SAFARI_ZONE_EAST
- EVENT_DISP $f, $b, $1d ; SAFARI_ZONE_EAST
- EVENT_DISP $f, $13, $11 ; SAFARI_ZONE_REST_HOUSE_1
+ EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $e ; SAFARI_ZONE_ENTRANCE
+ EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $f ; SAFARI_ZONE_ENTRANCE
+ EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $0 ; SAFARI_ZONE_WEST
+ EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $0 ; SAFARI_ZONE_WEST
+ EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $e ; SAFARI_ZONE_NORTH
+ EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $f ; SAFARI_ZONE_NORTH
+ EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $1d ; SAFARI_ZONE_EAST
+ EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $1d ; SAFARI_ZONE_EAST
+ EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $13, $11 ; SAFARI_ZONE_REST_HOUSE_1
SafariZoneCenterBlocks: ; 45c1e (11:5c1e)
INCBIN "maps/safarizonecenter.blk"
@@ -71106,8 +71106,8 @@ SafariZoneRestHouse1Object: ; 0x45cfe (size=32)
db SPRITE_OAK_AIDE, $4 + 4, $1 + 4, $fe, $1, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $2 ; SAFARI_ZONE_CENTER
- EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_CENTER
+ EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $2 ; SAFARI_ZONE_CENTER
+ EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $3 ; SAFARI_ZONE_CENTER
SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223)
db $0c ; tileset
@@ -71152,8 +71152,8 @@ SafariZoneRestHouse2Object: ; 0x45d43 (size=38)
db SPRITE_ERIKA, $2 + 4, $6 + 4, $ff, $d0, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $2 ; SAFARI_ZONE_WEST
- EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_WEST
+ EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $2 ; SAFARI_ZONE_WEST
+ EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $3 ; SAFARI_ZONE_WEST
SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224)
db $0c ; tileset
@@ -71198,8 +71198,8 @@ SafariZoneRestHouse3Object: ; 0x45d8e (size=38)
db SPRITE_LAPRAS_GIVER, $2 + 4, $5 + 4, $ff, $ff, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $2 ; SAFARI_ZONE_EAST
- EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_EAST
+ EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $2 ; SAFARI_ZONE_EAST
+ EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $3 ; SAFARI_ZONE_EAST
SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225)
db $0c ; tileset
@@ -71244,8 +71244,8 @@ SafariZoneRestHouse4Object: ; 0x45dd9 (size=38)
db SPRITE_GENTLEMAN, $5 + 4, $1 + 4, $fe, $1, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $2 ; SAFARI_ZONE_NORTH
- EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_NORTH
+ EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $2 ; SAFARI_ZONE_NORTH
+ EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $3 ; SAFARI_ZONE_NORTH
UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
db $11 ; tileset
@@ -71281,12 +71281,12 @@ UnknownDungeon2Object: ; 0x45e14 (size=73)
db SPRITE_BALL, $6 + 4, $d + 4, $ff, $ff, $83, FULL_RESTORE ; item
; warp-to
- EVENT_DISP $f, $1, $1d ; UNKNOWN_DUNGEON_1
- EVENT_DISP $f, $6, $16 ; UNKNOWN_DUNGEON_1
- EVENT_DISP $f, $7, $13 ; UNKNOWN_DUNGEON_1
- EVENT_DISP $f, $1, $9 ; UNKNOWN_DUNGEON_1
- EVENT_DISP $f, $3, $1 ; UNKNOWN_DUNGEON_1
- EVENT_DISP $f, $b, $3 ; UNKNOWN_DUNGEON_1
+ EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1
+ EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $6, $16 ; UNKNOWN_DUNGEON_1
+ EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $7, $13 ; UNKNOWN_DUNGEON_1
+ EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $9 ; UNKNOWN_DUNGEON_1
+ EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $3, $1 ; UNKNOWN_DUNGEON_1
+ EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $b, $3 ; UNKNOWN_DUNGEON_1
UnknownDungeon2Blocks: ; 45e5d (11:5e5d)
INCBIN "maps/unknowndungeon2.blk"
@@ -71357,7 +71357,7 @@ UnknownDungeon3Object: ; 0x45f36 (size=34)
db SPRITE_BALL, $1 + 4, $12 + 4, $ff, $ff, $83, MAX_REVIVE ; item
; warp-to
- EVENT_DISP $f, $6, $3 ; UNKNOWN_DUNGEON_1
+ EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1
UnknownDungeon3Blocks: ; 45f58 (11:5f58)
INCBIN "maps/unknowndungeon3.blk"
@@ -71634,10 +71634,10 @@ RockTunnel2Object: ; 0x4613d (size=100)
db SPRITE_BLACK_HAIR_BOY_2, $1e + 4, $1a + 4, $ff, $d0, $48, POKEMANIAC + $C8, $5 ; trainer
; warp-to
- EVENT_DISP $14, $19, $21 ; ROCK_TUNNEL_1
- EVENT_DISP $14, $3, $1b ; ROCK_TUNNEL_1
- EVENT_DISP $14, $b, $17 ; ROCK_TUNNEL_1
- EVENT_DISP $14, $3, $3 ; ROCK_TUNNEL_1
+ EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1
+ EVENT_DISP ROCK_TUNNEL_2_WIDTH, $3, $1b ; ROCK_TUNNEL_1
+ EVENT_DISP ROCK_TUNNEL_2_WIDTH, $b, $17 ; ROCK_TUNNEL_1
+ EVENT_DISP ROCK_TUNNEL_2_WIDTH, $3, $3 ; ROCK_TUNNEL_1
RockTunnel2Blocks: ; 461a1 (11:61a1)
INCBIN "maps/rocktunnel2.blk"
@@ -71717,13 +71717,13 @@ SeafoamIslands2Object: ; 0x46376 (size=72)
db SPRITE_BOULDER, $6 + 4, $16 + 4, $ff, $10, $2 ; person
; warp-to
- EVENT_DISP $f, $2, $4 ; SEAFOAM_ISLANDS_3
- EVENT_DISP $f, $5, $7 ; SEAFOAM_ISLANDS_1
- EVENT_DISP $f, $7, $d ; SEAFOAM_ISLANDS_3
- EVENT_DISP $f, $f, $13 ; SEAFOAM_ISLANDS_3
- EVENT_DISP $f, $f, $17 ; SEAFOAM_ISLANDS_1
- EVENT_DISP $f, $b, $19 ; SEAFOAM_ISLANDS_3
- EVENT_DISP $f, $3, $19 ; SEAFOAM_ISLANDS_1
+ EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $2, $4 ; SEAFOAM_ISLANDS_3
+ EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_1
+ EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $7, $d ; SEAFOAM_ISLANDS_3
+ EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $f, $13 ; SEAFOAM_ISLANDS_3
+ EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_1
+ EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $b, $19 ; SEAFOAM_ISLANDS_3
+ EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_1
SeafoamIslands2Blocks: ; 463be (11:63be)
INCBIN "maps/seafoamislands2.blk"
@@ -71803,13 +71803,13 @@ SeafoamIslands3Object: ; 0x464b2 (size=72)
db SPRITE_BOULDER, $6 + 4, $17 + 4, $ff, $10, $2 ; person
; warp-to
- EVENT_DISP $f, $3, $5 ; SEAFOAM_ISLANDS_2
- EVENT_DISP $f, $d, $5 ; SEAFOAM_ISLANDS_4
- EVENT_DISP $f, $7, $d ; SEAFOAM_ISLANDS_2
- EVENT_DISP $f, $f, $13 ; SEAFOAM_ISLANDS_2
- EVENT_DISP $f, $3, $19 ; SEAFOAM_ISLANDS_4
- EVENT_DISP $f, $b, $19 ; SEAFOAM_ISLANDS_2
- EVENT_DISP $f, $e, $19 ; SEAFOAM_ISLANDS_4
+ EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $5 ; SEAFOAM_ISLANDS_2
+ EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $d, $5 ; SEAFOAM_ISLANDS_4
+ EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $7, $d ; SEAFOAM_ISLANDS_2
+ EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $f, $13 ; SEAFOAM_ISLANDS_2
+ EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_4
+ EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $b, $19 ; SEAFOAM_ISLANDS_2
+ EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $e, $19 ; SEAFOAM_ISLANDS_4
SeafoamIslands3Blocks: ; 464fa (11:64fa)
INCBIN "maps/seafoamislands3.blk"
@@ -71993,13 +71993,13 @@ SeafoamIslands4Object: ; 0x466a6 (size=96)
db SPRITE_BOULDER, $6 + 4, $13 + 4, $ff, $ff, $6 ; person
; warp-to
- EVENT_DISP $f, $c, $5 ; SEAFOAM_ISLANDS_3
- EVENT_DISP $f, $6, $8 ; SEAFOAM_ISLANDS_5
- EVENT_DISP $f, $4, $19 ; SEAFOAM_ISLANDS_5
- EVENT_DISP $f, $3, $19 ; SEAFOAM_ISLANDS_3
- EVENT_DISP $f, $e, $19 ; SEAFOAM_ISLANDS_3
- EVENT_DISP $f, $11, $14 ; SEAFOAM_ISLANDS_5
- EVENT_DISP $f, $11, $15 ; SEAFOAM_ISLANDS_5
+ EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $c, $5 ; SEAFOAM_ISLANDS_3
+ EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $6, $8 ; SEAFOAM_ISLANDS_5
+ EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $4, $19 ; SEAFOAM_ISLANDS_5
+ EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_3
+ EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $e, $19 ; SEAFOAM_ISLANDS_3
+ EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_5
+ EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $11, $15 ; SEAFOAM_ISLANDS_5
SeafoamIslands4Blocks: ; 46706 (11:6706)
INCBIN "maps/seafoamislands4.blk"
@@ -72209,10 +72209,10 @@ SeafoamIslands5Object: ; 0x468bc (size=62)
db SPRITE_BIRD, $1 + 4, $6 + 4, $ff, $d0, $43, ARTICUNO, 50 ; trainer
; warp-to
- EVENT_DISP $f, $11, $14 ; SEAFOAM_ISLANDS_4
- EVENT_DISP $f, $11, $15 ; SEAFOAM_ISLANDS_4
- EVENT_DISP $f, $7, $b ; SEAFOAM_ISLANDS_4
- EVENT_DISP $f, $4, $19 ; SEAFOAM_ISLANDS_4
+ EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_4
+ EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $15 ; SEAFOAM_ISLANDS_4
+ EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $7, $b ; SEAFOAM_ISLANDS_4
+ EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $4, $19 ; SEAFOAM_ISLANDS_4
SeafoamIslands5Blocks: ; 468fa (11:68fa)
INCBIN "maps/seafoamislands5.blk"
@@ -72390,7 +72390,7 @@ HiddenObjectMaps: ; 46a40 (11:6a40)
db SAFFRON_POKECENTER
db POKEMONTOWER_5
db ROUTE_13
- db SAFARIZONEENTRANCE
+ db SAFARI_ZONE_ENTRANCE
db SAFARI_ZONE_WEST
db SILPH_CO_5F
db SILPH_CO_9F
@@ -72413,7 +72413,7 @@ HiddenObjectMaps: ; 46a40 (11:6a40)
db $B9
db LAVENDER_HOUSE_1
db CELADON_MANSION_5
- db FIGHTINGDOJO
+ db FIGHTING_DOJO
db ROUTE_10
db INDIGO_PLATEAU_LOBBY
db CINNABAR_LAB_4
@@ -73153,11 +73153,11 @@ Route7Object: ; 0x48022 (size=47)
db $0 ; people
; warp-to
- EVENT_DISP $a, $9, $12 ; ROUTE_7_GATE
- EVENT_DISP $a, $a, $12 ; ROUTE_7_GATE
- EVENT_DISP $a, $9, $b ; ROUTE_7_GATE
- EVENT_DISP $a, $a, $b ; ROUTE_7_GATE
- EVENT_DISP $a, $d, $5 ; PATH_ENTRANCE_ROUTE_7
+ EVENT_DISP ROUTE_7_WIDTH, $9, $12 ; ROUTE_7_GATE
+ EVENT_DISP ROUTE_7_WIDTH, $a, $12 ; ROUTE_7_GATE
+ EVENT_DISP ROUTE_7_WIDTH, $9, $b ; ROUTE_7_GATE
+ EVENT_DISP ROUTE_7_WIDTH, $a, $b ; ROUTE_7_GATE
+ EVENT_DISP ROUTE_7_WIDTH, $d, $5 ; PATH_ENTRANCE_ROUTE_7
Route7Blocks: ; 48051 (12:4051)
INCBIN "maps/route7.blk"
@@ -73500,9 +73500,9 @@ CeladonMart3Object: ; 0x482c4 (size=94)
db SPRITE_YOUNG_BOY, $5 + 4, $2 + 4, $ff, $d1, $5 ; person
; warp-to
- EVENT_DISP $a, $1, $c ; CELADON_MART_4
- EVENT_DISP $a, $1, $10 ; CELADON_MART_2
- EVENT_DISP $a, $1, $1 ; CELADON_MART_ELEVATOR
+ EVENT_DISP CELADON_MART_3_WIDTH, $1, $c ; CELADON_MART_4
+ EVENT_DISP CELADON_MART_3_WIDTH, $1, $10 ; CELADON_MART_2
+ EVENT_DISP CELADON_MART_3_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
CeladonMart3Blocks: ; 48322 (12:4322)
INCBIN "maps/celadonmart3.blk"
@@ -73552,9 +73552,9 @@ CeladonMart4Object: ; 0x48370 (size=49)
db SPRITE_BUG_CATCHER, $2 + 4, $5 + 4, $fe, $2, $3 ; person
; warp-to
- EVENT_DISP $a, $1, $c ; CELADON_MART_3
- EVENT_DISP $a, $1, $10 ; CELADON_MART_5
- EVENT_DISP $a, $1, $1 ; CELADON_MART_ELEVATOR
+ EVENT_DISP CELADON_MART_4_WIDTH, $1, $c ; CELADON_MART_3
+ EVENT_DISP CELADON_MART_4_WIDTH, $1, $10 ; CELADON_MART_5
+ EVENT_DISP CELADON_MART_4_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
CeladonMart4Blocks: ; 483a1 (12:43a1)
INCBIN "maps/celadonmart4.blk"
@@ -73847,7 +73847,7 @@ CeladonMartRoofObject: ; 0x485a8 (size=36)
db SPRITE_LITTLE_GIRL, $5 + 4, $5 + 4, $fe, $0, $2 ; person
; warp-to
- EVENT_DISP $a, $2, $f ; CELADON_MART_5
+ EVENT_DISP CELADON_MART_ROOF_WIDTH, $2, $f ; CELADON_MART_5
CeladonMartRoofBlocks: ; 485cc (12:45cc)
INCBIN "maps/celadonmartroof.blk"
@@ -73944,8 +73944,8 @@ CeladonMartElevatorObject: ; 0x4866d (size=23)
db $0 ; people
; warp-to
- EVENT_DISP $2, $3, $1 ; CELADON_MART_1
- EVENT_DISP $2, $3, $2 ; CELADON_MART_1
+ EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $1 ; CELADON_MART_1
+ EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $2 ; CELADON_MART_1
CeladonMartElevatorBlocks: ; 48684 (12:4684)
INCBIN "maps/celadonmartelevator.blk"
@@ -74017,11 +74017,11 @@ CeladonMansion1Object: ; 0x486cf (size=71)
db SPRITE_SLOWBRO, $4 + 4, $4 + 4, $fe, $1, $4 ; person
; warp-to
- EVENT_DISP $4, $b, $4
- EVENT_DISP $4, $b, $5
- EVENT_DISP $4, $0, $4
- EVENT_DISP $4, $1, $7 ; CELADON_MANSION_2
- EVENT_DISP $4, $1, $2 ; CELADON_MANSION_2
+ EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $4
+ EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $5
+ EVENT_DISP CELADON_MANSION_1_WIDTH, $0, $4
+ EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $7 ; CELADON_MANSION_2
+ EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $2 ; CELADON_MANSION_2
CeladonMansion1Blocks: ; 48716 (12:4716)
INCBIN "maps/celadonmansion1.blk"
@@ -74059,10 +74059,10 @@ CeladonMansion2Object: ; 0x48745 (size=39)
db $0 ; people
; warp-to
- EVENT_DISP $4, $1, $6 ; CELADON_MANSION_3
- EVENT_DISP $4, $1, $7 ; CELADON_MANSION_1
- EVENT_DISP $4, $1, $2 ; CELADON_MANSION_1
- EVENT_DISP $4, $1, $4 ; CELADON_MANSION_3
+ EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $6 ; CELADON_MANSION_3
+ EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $7 ; CELADON_MANSION_1
+ EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $2 ; CELADON_MANSION_1
+ EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $4 ; CELADON_MANSION_3
CeladonMansion2Blocks: ; 4876c (12:476c)
INCBIN "maps/celadonmansion2.blk"
@@ -74170,10 +74170,10 @@ CeladonMansion3Object: ; 0x487ff (size=72)
db SPRITE_LAPRAS_GIVER, $3 + 4, $2 + 4, $ff, $ff, $4 ; person
; warp-to
- EVENT_DISP $4, $1, $6 ; CELADON_MANSION_2
- EVENT_DISP $4, $1, $7 ; CELADON_MANSION_4
- EVENT_DISP $4, $1, $2 ; CELADON_MANSION_4
- EVENT_DISP $4, $1, $4 ; CELADON_MANSION_2
+ EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $6 ; CELADON_MANSION_2
+ EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $7 ; CELADON_MANSION_4
+ EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $2 ; CELADON_MANSION_4
+ EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $4 ; CELADON_MANSION_2
CeladonMansion3Blocks: ; 48847 (12:4847)
INCBIN "maps/celadonmansion3.blk"
@@ -74209,9 +74209,9 @@ CeladonMansion4Object: ; 0x48875 (size=31)
db $0 ; people
; warp-to
- EVENT_DISP $4, $1, $6 ; CELADON_MANSION_3
- EVENT_DISP $4, $1, $2 ; CELADON_MANSION_3
- EVENT_DISP $4, $7, $2 ; CELADON_MANSION_5
+ EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $6 ; CELADON_MANSION_3
+ EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $2 ; CELADON_MANSION_3
+ EVENT_DISP CELADON_MANSION_4_WIDTH, $7, $2 ; CELADON_MANSION_5
CeladonMansion4Blocks: ; 48894 (12:4894)
INCBIN "maps/celadonmansion4.blk"
@@ -74263,8 +74263,8 @@ CeladonPokecenterObject: ; 0x488d2 (size=44)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $4
CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
db $07 ; tileset
@@ -74635,8 +74635,8 @@ CeladonGymObject: ; 0x48b30 (size=84)
db SPRITE_LASS, $3 + 4, $5 + 4, $ff, $d0, $48, COOLTRAINER_F + $C8, $1 ; trainer
; warp-to
- EVENT_DISP $5, $11, $4
- EVENT_DISP $5, $11, $5
+ EVENT_DISP CELADON_GYM_WIDTH, $11, $4
+ EVENT_DISP CELADON_GYM_WIDTH, $11, $5
CeladonGymBlocks: ; 48b84 (12:4b84)
INCBIN "maps/celadongym.blk"
@@ -75210,9 +75210,9 @@ CeladonGameCornerObject: ; 0x48fa0 (size=99)
db SPRITE_ROCKET, $5 + 4, $9 + 4, $ff, $d1, $4b, ROCKET + $C8, $7 ; trainer
; warp-to
- EVENT_DISP $a, $11, $f
- EVENT_DISP $a, $11, $10
- EVENT_DISP $a, $4, $11 ; ROCKET_HIDEOUT_1
+ EVENT_DISP GAME_CORNER_WIDTH, $11, $f
+ EVENT_DISP GAME_CORNER_WIDTH, $11, $10
+ EVENT_DISP GAME_CORNER_WIDTH, $4, $11 ; ROCKET_HIDEOUT_1
CeladonGameCornerBlocks: ; 49003 (12:5003)
INCBIN "maps/celadongamecorner.blk"
@@ -75264,16 +75264,16 @@ CeladonMart5Object: ; 0x49085 (size=55)
db SPRITE_MART_GUY, $3 + 4, $6 + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $a, $1, $c ; CELADON_MART_ROOF
- EVENT_DISP $a, $1, $10 ; CELADON_MART_4
- EVENT_DISP $a, $1, $1 ; CELADON_MART_ELEVATOR
+ EVENT_DISP CELADON_MART_5_WIDTH, $1, $c ; CELADON_MART_ROOF
+ EVENT_DISP CELADON_MART_5_WIDTH, $1, $10 ; CELADON_MART_4
+ EVENT_DISP CELADON_MART_5_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
CeladonMart5Blocks: ; 490bc (12:50bc)
INCBIN "maps/celadonmart5.blk"
CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137)
db $12 ; tileset
- db CELADONPRIZE_ROOM_HEIGHT, CELADONPRIZE_ROOM_WIDTH ; dimensions (y, x)
+ db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x)
dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts
db $00 ; connections
dw CeladonPrizeRoomObject ; objects
@@ -75316,8 +75316,8 @@ CeladonPrizeRoomObject: ; 0x49108 (size=41)
db SPRITE_GAMBLER, $3 + 4, $7 + 4, $fe, $2, $2 ; person
; warp-to
- EVENT_DISP $5, $7, $4
- EVENT_DISP $5, $7, $5
+ EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $4
+ EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $5
CeladonPrizeRoomBlocks: ; 49131 (12:5131)
INCBIN "maps/celadonprizeroom.blk"
@@ -75414,8 +75414,8 @@ CeladonDinerObject: ; 0x491bc (size=50)
db SPRITE_GYM_HELPER, $1 + 4, $0 + 4, $ff, $d0, $5 ; person
; warp-to
- EVENT_DISP $5, $7, $3
- EVENT_DISP $5, $7, $4
+ EVENT_DISP CELADON_DINER_WIDTH, $7, $3
+ EVENT_DISP CELADON_DINER_WIDTH, $7, $4
CeladonDinerBlocks: ; 491ee (12:51ee)
INCBIN "maps/celadondiner.blk"
@@ -75463,15 +75463,15 @@ CeladonHouseObject: ; 0x49227 (size=38)
db SPRITE_SAILOR, $6 + 4, $5 + 4, $ff, $d2, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP CELADON_HOUSE_WIDTH, $7, $2
+ EVENT_DISP CELADON_HOUSE_WIDTH, $7, $3
CeladonHouseBlocks: ; 4924d (12:524d)
INCBIN "maps/celadonhouse.blk"
CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
db $06 ; tileset
- db CELADONHOTEL_HEIGHT, CELADONHOTEL_WIDTH ; dimensions (y, x)
+ db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x)
dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts
db $00 ; connections
dw CeladonHotelObject ; objects
@@ -75511,8 +75511,8 @@ CeladonHotelObject: ; 0x49281 (size=38)
db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $8 + 4, $fe, $2, $3 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP CELADON_HOTEL_WIDTH, $7, $3
+ EVENT_DISP CELADON_HOTEL_WIDTH, $7, $4
CeladonHotelBlocks: ; 492a7 (12:52a7)
INCBIN "maps/celadonhotel.blk"
@@ -75640,8 +75640,8 @@ MtMoonPokecenterObject: ; 0x49376 (size=56)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $6 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $4
RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81)
db $06 ; tileset
@@ -75690,8 +75690,8 @@ RockTunnelPokecenterObject: ; 0x493d4 (size=44)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $4
Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
db $0c ; tileset
@@ -75726,11 +75726,11 @@ Route11GateObject: ; 0x49416 (size=50)
db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $ff, $1 ; person
; warp-to
- EVENT_DISP $4, $4, $0
- EVENT_DISP $4, $5, $0
- EVENT_DISP $4, $4, $7
- EVENT_DISP $4, $5, $7
- EVENT_DISP $4, $8, $6 ; ROUTE_11_GATE_2F
+ EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $0
+ EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $5, $0
+ EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $7
+ EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $5, $7
+ EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $8, $6 ; ROUTE_11_GATE_2F
Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
db $0c ; tileset
@@ -75836,11 +75836,11 @@ Route11GateUpstairsObject: ; 0x494da (size=30)
db SPRITE_OAK_AIDE, $6 + 4, $2 + 4, $ff, $ff, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $7 ; ROUTE_11_GATE_1F
+ EVENT_DISP ROUTE_11_GATE_2F_WIDTH, $7, $7 ; ROUTE_11_GATE_1F
Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
db $0c ; tileset
- db ROUTE_12_GATE_HEIGHT, ROUTE_12_GATE_WIDTH ; dimensions (y, x)
+ db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x)
dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts
db $00 ; connections
dw Route12GateObject ; objects
@@ -75871,11 +75871,11 @@ Route12GateObject: ; 0x4950e (size=50)
db SPRITE_GUARD, $3 + 4, $1 + 4, $ff, $ff, $1 ; person
; warp-to
- EVENT_DISP $5, $0, $4
- EVENT_DISP $5, $0, $5
- EVENT_DISP $5, $7, $4
- EVENT_DISP $5, $7, $5
- EVENT_DISP $5, $6, $8 ; ROUTE_12_GATE_2F
+ EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $4
+ EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $5
+ EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $7, $4
+ EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $7, $5
+ EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $6, $8 ; ROUTE_12_GATE_2F
Route12GateBlocks: ; 49540 (12:5540)
INCBIN "maps/route12gate.blk"
@@ -75971,7 +75971,7 @@ Route12GateUpstairsObject: ; 0x495de (size=24)
db $a ; border tile
db $1 ; warps
- db $7, $7, $4, ROUTE_12_GATE
+ db $7, $7, $4, ROUTE_12_GATE_1F
db $2 ; signs
db $2, $1, $2 ; Route12GateUpstairsText2
@@ -75981,7 +75981,7 @@ Route12GateUpstairsObject: ; 0x495de (size=24)
db SPRITE_BRUNETTE_GIRL, $4 + 4, $3 + 4, $fe, $1, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $7 ; ROUTE_12_GATE
+ EVENT_DISP ROUTE_12_GATE_2F_WIDTH, $7, $7 ; ROUTE_12_GATE_1F
Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184)
db $0c ; tileset
@@ -76016,11 +76016,11 @@ Route15GateObject: ; 0x4960c (size=50)
db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $ff, $1 ; person
; warp-to
- EVENT_DISP $4, $4, $0
- EVENT_DISP $4, $5, $0
- EVENT_DISP $4, $4, $7
- EVENT_DISP $4, $5, $7
- EVENT_DISP $4, $8, $6
+ EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $0
+ EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $5, $0
+ EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $7
+ EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $5, $7
+ EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $8, $6 ; ROUTE_15_GATE_2F
Route15GateUpstairs_h: ; 4963e (12:563e)
db $0c ; tileset
@@ -76090,30 +76090,30 @@ Route15GateUpstairsObject: ; 4969d (12:569d)
db SPRITE_OAK_AIDE, $2 + 4, $4 + 4, $ff, $d0, $1
; warp-to
- EVENT_DISP $4, $7, $7 ; ROUTE_15_GATE_1F
+ EVENT_DISP ROUTE_15_GATE_2F_WIDTH, $7, $7 ; ROUTE_15_GATE_1F
-Route16GateMap_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
+Route16Gate_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
db $0c ; tileset
db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x)
- dw Route16GateMapBlocks, Route16GateMapTextPointers, Route16GateMapScript ; blocks, texts, scripts
+ dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts
db $00 ; connections
- dw Route16GateMapObject ; objects
+ dw Route16GateObject ; objects
-Route16GateMapScript: ; 496be (12:56be)
+Route16GateScript: ; 496be (12:56be)
ld hl, $d732
res 5, [hl]
call EnableAutoTextBoxDrawing
ld a, [W_ROUTE16GATECURSCRIPT]
- ld hl, Route16GateMapScriptPointers
+ ld hl, Route16GateScriptPointers
jp CallFunctionInTable
-Route16GateMapScriptPointers: ; 496cf (12:56cf)
- dw Route16GateMapScript0
- dw Route16GateMapScript1
- dw Route16GateMapScript2
- dw Route16GateMapScript3
+Route16GateScriptPointers: ; 496cf (12:56cf)
+ dw Route16GateScript0
+ dw Route16GateScript1
+ dw Route16GateScript2
+ dw Route16GateScript3
-Route16GateMapScript0: ; 496d7 (12:56d7)
+Route16GateScript0: ; 496d7 (12:56d7)
call Func_49755
ret nz
ld hl, CoordsData_49714
@@ -76151,14 +76151,14 @@ CoordsData_49714: ; 49714 (12:5714)
db $0A,$04
db $FF
-Route16GateMapScript1: ; 4971d (12:571d)
+Route16GateScript1: ; 4971d (12:571d)
ld a, [$cd38]
and a
ret nz
ld a, $f0
ld [wJoypadForbiddenButtonsMask], a
-Route16GateMapScript2: ; 49727 (12:5727)
+Route16GateScript2: ; 49727 (12:5727)
ld a, $1
ld [H_SPRITEHEIGHT], a
call DisplayTextID
@@ -76171,7 +76171,7 @@ Route16GateMapScript2: ; 49727 (12:5727)
ld [W_ROUTE16GATECURSCRIPT], a
ret
-Route16GateMapScript3: ; 49741 (12:5741)
+Route16GateScript3: ; 49741 (12:5741)
ld a, [$cd38]
and a
ret nz
@@ -76187,12 +76187,12 @@ Func_49755: ; 49755 (12:5755)
ld b, $6
jp IsItemInBag
-Route16GateMapTextPointers: ; 4975a (12:575a)
- dw Route16GateMapText1
- dw Route16GateMapText2
- dw Route16GateMapText3
+Route16GateTextPointers: ; 4975a (12:575a)
+ dw Route16GateText1
+ dw Route16GateText2
+ dw Route16GateText3
-Route16GateMapText1: ; 49760 (12:5760)
+Route16GateText1: ; 49760 (12:5760)
db $08 ; asm
call Func_49755
jr z, .asm_0bdf3 ; 0x49764
@@ -76213,15 +76213,15 @@ UnnamedText_4977c: ; 4977c (12:577c)
TX_FAR _UnnamedText_4977c
db "@"
-Route16GateMapText3: ; 49781 (12:5781)
+Route16GateText3: ; 49781 (12:5781)
TX_FAR _UnnamedText_49781
db "@"
-Route16GateMapText2: ; 49786 (12:5786)
- TX_FAR _Route16GateMapText2
+Route16GateText2: ; 49786 (12:5786)
+ TX_FAR _Route16GateText2
db "@"
-Route16GateMapObject: ; 0x4978b (size=88)
+Route16GateObject: ; 0x4978b (size=88)
db $a ; border tile
db $9 ; warps
@@ -76242,18 +76242,18 @@ Route16GateMapObject: ; 0x4978b (size=88)
db SPRITE_GAMBLER, $3 + 4, $4 + 4, $ff, $ff, $2 ; person
; warp-to
- EVENT_DISP $4, $8, $0
- EVENT_DISP $4, $9, $0
- EVENT_DISP $4, $8, $7
- EVENT_DISP $4, $9, $7
- EVENT_DISP $4, $2, $0
- EVENT_DISP $4, $3, $0
- EVENT_DISP $4, $2, $7
- EVENT_DISP $4, $3, $7
- EVENT_DISP $4, $c, $6 ; ROUTE_16_GATE_2F
-
-Route16GateMapBlocks: ; 497e3 (12:57e3)
- INCBIN "maps/route16gatemap.blk"
+ EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $8, $0
+ EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $9, $0
+ EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $8, $7
+ EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $9, $7
+ EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $2, $0
+ EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $3, $0
+ EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $2, $7
+ EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $3, $7
+ EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $c, $6 ; ROUTE_16_GATE_2F
+
+Route16GateBlocks: ; 497e3 (12:57e3)
+ INCBIN "maps/route16Gate.blk"
Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
db $0c ; tileset
@@ -76324,7 +76324,7 @@ Route16GateUpstairsObject: ; 0x4984c (size=30)
db SPRITE_LITTLE_GIRL, $5 + 4, $2 + 4, $fe, $2, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $7 ; ROUTE_16_GATE_1F
+ EVENT_DISP ROUTE_16_GATE_2F_WIDTH, $7, $7 ; ROUTE_16_GATE_1F
Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190)
db $0c ; tileset
@@ -76462,11 +76462,11 @@ Route18GateObject: ; 0x49937 (size=50)
db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $d0, $1 ; person
; warp-to
- EVENT_DISP $4, $4, $0
- EVENT_DISP $4, $5, $0
- EVENT_DISP $4, $4, $7
- EVENT_DISP $4, $5, $7
- EVENT_DISP $4, $8, $6 ; ROUTE_18_GATE_2F
+ EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $4, $0
+ EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $5, $0
+ EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $4, $7
+ EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $5, $7
+ EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $8, $6 ; ROUTE_18_GATE_2F
Route18GateUpstairs_h: ; 0x49969 to 0x49975 (12 bytes) (id=191)
db $0c ; tileset
@@ -76523,7 +76523,7 @@ Route18GateUpstairsObject: ; 0x499a4 (size=24)
db SPRITE_BUG_CATCHER, $2 + 4, $4 + 4, $fe, $2, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $7 ; ROUTE_18_GATE_1F
+ EVENT_DISP ROUTE_18_GATE_2F_WIDTH, $7, $7 ; ROUTE_18_GATE_1F
MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59)
db $11 ; tileset
@@ -76787,11 +76787,11 @@ MtMoon1Object: ; 0x49b06 (size=145)
db SPRITE_BALL, $20 + 4, $5 + 4, $ff, $ff, $8d, TM_12 ; item
; warp-to
- EVENT_DISP $14, $23, $e
- EVENT_DISP $14, $23, $f
- EVENT_DISP $14, $5, $5 ; MT_MOON_2
- EVENT_DISP $14, $b, $11 ; MT_MOON_2
- EVENT_DISP $14, $f, $19 ; MT_MOON_2
+ EVENT_DISP MT_MOON_1_WIDTH, $23, $e
+ EVENT_DISP MT_MOON_1_WIDTH, $23, $f
+ EVENT_DISP MT_MOON_1_WIDTH, $5, $5 ; MT_MOON_2
+ EVENT_DISP MT_MOON_1_WIDTH, $b, $11 ; MT_MOON_2
+ EVENT_DISP MT_MOON_1_WIDTH, $f, $19 ; MT_MOON_2
MtMoon1Blocks: ; 49b97 (12:5b97)
INCBIN "maps/mtmoon1.blk"
@@ -77241,10 +77241,10 @@ MtMoon3Object: ; 0x49fdb (size=102)
db SPRITE_BALL, $5 + 4, $1d + 4, $ff, $ff, $89, TM_01 ; item
; warp-to
- EVENT_DISP $14, $9, $19 ; MT_MOON_2
- EVENT_DISP $14, $11, $15 ; MT_MOON_2
- EVENT_DISP $14, $1b, $f ; MT_MOON_2
- EVENT_DISP $14, $7, $5 ; MT_MOON_2
+ EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2
+ EVENT_DISP MT_MOON_3_WIDTH, $11, $15 ; MT_MOON_2
+ EVENT_DISP MT_MOON_3_WIDTH, $1b, $f ; MT_MOON_2
+ EVENT_DISP MT_MOON_3_WIDTH, $7, $5 ; MT_MOON_2
MtMoon3Blocks: ; 4a041 (12:6041)
INCBIN "maps/mtmoon3.blk"
@@ -77311,14 +77311,14 @@ SafariZoneWestObject: ; 0x4a1dc (size=108)
db SPRITE_BALL, $7 + 4, $13 + 4, $ff, $ff, $84, GOLD_TEETH ; item
; warp-to
- EVENT_DISP $f, $0, $14 ; SAFARI_ZONE_NORTH
- EVENT_DISP $f, $0, $15 ; SAFARI_ZONE_NORTH
- EVENT_DISP $f, $0, $1a ; SAFARI_ZONE_NORTH
- EVENT_DISP $f, $0, $1b ; SAFARI_ZONE_NORTH
- EVENT_DISP $f, $16, $1d ; SAFARI_ZONE_CENTER
- EVENT_DISP $f, $17, $1d ; SAFARI_ZONE_CENTER
- EVENT_DISP $f, $3, $3 ; SAFARI_ZONE_SECRET_HOUSE
- EVENT_DISP $f, $b, $b ; SAFARI_ZONE_REST_HOUSE_2
+ EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $14 ; SAFARI_ZONE_NORTH
+ EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $15 ; SAFARI_ZONE_NORTH
+ EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $1a ; SAFARI_ZONE_NORTH
+ EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $1b ; SAFARI_ZONE_NORTH
+ EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $16, $1d ; SAFARI_ZONE_CENTER
+ EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $17, $1d ; SAFARI_ZONE_CENTER
+ EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $3, $3 ; SAFARI_ZONE_SECRET_HOUSE
+ EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $b, $b ; SAFARI_ZONE_REST_HOUSE_2
SafariZoneWestBlocks: ; 4a248 (12:6248)
INCBIN "maps/safarizonewest.blk"
@@ -77390,8 +77390,8 @@ SafariZoneSecretHouseObject: ; 0x4a365 (size=26)
db SPRITE_FISHER, $3 + 4, $3 + 4, $ff, $d0, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $2 ; SAFARI_ZONE_WEST
- EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_WEST
+ EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $2 ; SAFARI_ZONE_WEST
+ EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $3 ; SAFARI_ZONE_WEST
SafariZoneSecretHouseBlocks: ; 4a37f (12:637f)
INCBIN "maps/safarizonesecrethouse.blk"
@@ -77870,7 +77870,7 @@ Route22Object: ; 0x50022 (size=27)
db SPRITE_BLUE, $5 + 4, $19 + 4, $ff, $ff, $2 ; person
; warp-to
- EVENT_DISP $14, $5, $8 ; ROUTE_22_GATE
+ EVENT_DISP ROUTE_22_WIDTH, $5, $8 ; ROUTE_22_GATE
Route22Blocks: ; 5003d (14:403d)
INCBIN "maps/route22.blk"
@@ -77908,8 +77908,8 @@ Route20Object: ; 0x50113 (size=106)
db SPRITE_SWIMMER, $8 + 4, $f + 4, $ff, $d1, $4a, BEAUTY + $C8, $8 ; trainer
; warp-to
- EVENT_DISP $32, $5, $30 ; SEAFOAM_ISLANDS_1
- EVENT_DISP $32, $9, $3a ; SEAFOAM_ISLANDS_1
+ EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1
+ EVENT_DISP ROUTE_20_WIDTH, $9, $3a ; SEAFOAM_ISLANDS_1
Route20Blocks: ; 5017d (14:417d)
INCBIN "maps/route20.blk"
@@ -77945,10 +77945,10 @@ Route23Object: ; 0x50361 (size=81)
db SPRITE_GUARD, $88 + 4, $8 + 4, $ff, $d0, $7 ; person
; warp-to
- EVENT_DISP $a, $8b, $7 ; ROUTE_22_GATE
- EVENT_DISP $a, $8b, $8 ; ROUTE_22_GATE
- EVENT_DISP $a, $1f, $4 ; VICTORY_ROAD_1
- EVENT_DISP $a, $1f, $e ; VICTORY_ROAD_2
+ EVENT_DISP ROUTE_23_WIDTH, $8b, $7 ; ROUTE_22_GATE
+ EVENT_DISP ROUTE_23_WIDTH, $8b, $8 ; ROUTE_22_GATE
+ EVENT_DISP ROUTE_23_WIDTH, $1f, $4 ; VICTORY_ROAD_1
+ EVENT_DISP ROUTE_23_WIDTH, $1f, $e ; VICTORY_ROAD_2
Route23Blocks: ; 503b2 (14:43b2)
INCBIN "maps/route23.blk"
@@ -78012,7 +78012,7 @@ Route25Object: ; 0x507b2 (size=94)
db SPRITE_BALL, $2 + 4, $16 + 4, $ff, $ff, $8a, TM_19 ; item
; warp-to
- EVENT_DISP $1e, $3, $2d ; BILLS_HOUSE
+ EVENT_DISP ROUTE_25_WIDTH, $3, $2d ; BILLS_HOUSE
Route25Blocks: ; 50810 (14:4810)
INCBIN "maps/route25.blk"
@@ -78041,8 +78041,8 @@ IndigoPlateauObject: ; 0x50936 (size=20)
db $0 ; people
; warp-to
- EVENT_DISP $a, $5, $9 ; INDIGO_PLATEAU_LOBBY
- EVENT_DISP $a, $5, $a ; INDIGO_PLATEAU_LOBBY
+ EVENT_DISP INDIGO_PLATEAU_WIDTH, $5, $9 ; INDIGO_PLATEAU_LOBBY
+ EVENT_DISP INDIGO_PLATEAU_WIDTH, $5, $a ; INDIGO_PLATEAU_LOBBY
IndigoPlateauBlocks: ; 5094a (14:494a)
INCBIN "maps/indigoplateau.blk"
@@ -78063,7 +78063,7 @@ SaffronCityObject: ; 0x509dc (size=188)
db $8 ; warps
db $5, $7, $0, COPYCATS_HOUSE_1F
- db $3, $1a, $0, FIGHTINGDOJO
+ db $3, $1a, $0, FIGHTING_DOJO
db $3, $22, $0, SAFFRON_GYM
db $b, $d, $0, SAFFRON_HOUSE_1
db $b, $19, $0, SAFFRON_MART
@@ -78101,14 +78101,14 @@ SaffronCityObject: ; 0x509dc (size=188)
db SPRITE_ROCKET, $16 + 4, $13 + 4, $ff, $d0, $f ; person
; warp-to
- EVENT_DISP $14, $5, $7 ; COPYCATS_HOUSE_1F
- EVENT_DISP $14, $3, $1a ; FIGHTINGDOJO
- EVENT_DISP $14, $3, $22 ; SAFFRON_GYM
- EVENT_DISP $14, $b, $d ; SAFFRON_HOUSE_1
- EVENT_DISP $14, $b, $19 ; SAFFRON_MART
- EVENT_DISP $14, $15, $12 ; SILPH_CO_1F
- EVENT_DISP $14, $1d, $9 ; SAFFRON_POKECENTER
- EVENT_DISP $14, $1d, $1d ; SAFFRON_HOUSE_2
+ EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F
+ EVENT_DISP SAFFRON_CITY_WIDTH, $3, $1a ; FIGHTING_DOJO
+ EVENT_DISP SAFFRON_CITY_WIDTH, $3, $22 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_CITY_WIDTH, $b, $d ; SAFFRON_HOUSE_1
+ EVENT_DISP SAFFRON_CITY_WIDTH, $b, $19 ; SAFFRON_MART
+ EVENT_DISP SAFFRON_CITY_WIDTH, $15, $12 ; SILPH_CO_1F
+ EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $9 ; SAFFRON_POKECENTER
+ EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $1d ; SAFFRON_HOUSE_2
SaffronCityBlocks: ; 50a98 (14:4a98)
INCBIN "maps/saffroncity.blk"
@@ -80202,13 +80202,13 @@ VictoryRoad2Object: ; 0x51915 (size=154)
db SPRITE_BOULDER, $10 + 4, $17 + 4, $ff, $10, $d ; person
; warp-to
- EVENT_DISP $f, $8, $0 ; VICTORY_ROAD_1
- EVENT_DISP $f, $7, $1d
- EVENT_DISP $f, $8, $1d
- EVENT_DISP $f, $7, $17 ; VICTORY_ROAD_3
- EVENT_DISP $f, $e, $19 ; VICTORY_ROAD_3
- EVENT_DISP $f, $7, $1b ; VICTORY_ROAD_3
- EVENT_DISP $f, $1, $1 ; VICTORY_ROAD_3
+ EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $0 ; VICTORY_ROAD_1
+ EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $1d
+ EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $1d
+ EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $17 ; VICTORY_ROAD_3
+ EVENT_DISP VICTORY_ROAD_2_WIDTH, $e, $19 ; VICTORY_ROAD_3
+ EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $1b ; VICTORY_ROAD_3
+ EVENT_DISP VICTORY_ROAD_2_WIDTH, $1, $1 ; VICTORY_ROAD_3
VictoryRoad2Blocks: ; 519af (14:59af)
INCBIN "maps/victoryroad2.blk"
@@ -80249,14 +80249,14 @@ MtMoon2Object: ; 0x51a4d (size=68)
db $0 ; people
; warp-to
- EVENT_DISP $e, $5, $5 ; MT_MOON_1
- EVENT_DISP $e, $b, $11 ; MT_MOON_3
- EVENT_DISP $e, $9, $19 ; MT_MOON_1
- EVENT_DISP $e, $f, $19 ; MT_MOON_1
- EVENT_DISP $e, $11, $15 ; MT_MOON_3
- EVENT_DISP $e, $1b, $d ; MT_MOON_3
- EVENT_DISP $e, $3, $17 ; MT_MOON_3
- EVENT_DISP $e, $3, $1b
+ EVENT_DISP MT_MOON_2_WIDTH, $5, $5 ; MT_MOON_1
+ EVENT_DISP MT_MOON_2_WIDTH, $b, $11 ; MT_MOON_3
+ EVENT_DISP MT_MOON_2_WIDTH, $9, $19 ; MT_MOON_1
+ EVENT_DISP MT_MOON_2_WIDTH, $f, $19 ; MT_MOON_1
+ EVENT_DISP MT_MOON_2_WIDTH, $11, $15 ; MT_MOON_3
+ EVENT_DISP MT_MOON_2_WIDTH, $1b, $d ; MT_MOON_3
+ EVENT_DISP MT_MOON_2_WIDTH, $3, $17 ; MT_MOON_3
+ EVENT_DISP MT_MOON_2_WIDTH, $3, $1b
MtMoon2Blocks: ; 51a91 (14:5a91)
INCBIN "maps/mtmoon2.blk"
@@ -80820,12 +80820,12 @@ SilphCo7Object: ; 0x51ed7 (size=128)
db SPRITE_BALL, $b + 4, $18 + 4, $ff, $ff, $8b, TM_03 ; item
; warp-to
- EVENT_DISP $d, $0, $10 ; SILPH_CO_8F
- EVENT_DISP $d, $0, $16 ; SILPH_CO_6F
- EVENT_DISP $d, $0, $12 ; SILPH_CO_ELEVATOR
- EVENT_DISP $d, $7, $5 ; SILPH_CO_11F
- EVENT_DISP $d, $3, $5 ; SILPH_CO_3F
- EVENT_DISP $d, $f, $15 ; SILPH_CO_5F
+ EVENT_DISP SILPH_CO_7F_WIDTH, $0, $10 ; SILPH_CO_8F
+ EVENT_DISP SILPH_CO_7F_WIDTH, $0, $16 ; SILPH_CO_6F
+ EVENT_DISP SILPH_CO_7F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR
+ EVENT_DISP SILPH_CO_7F_WIDTH, $7, $5 ; SILPH_CO_11F
+ EVENT_DISP SILPH_CO_7F_WIDTH, $3, $5 ; SILPH_CO_3F
+ EVENT_DISP SILPH_CO_7F_WIDTH, $f, $15 ; SILPH_CO_5F
SilphCo7Blocks: ; 51f57 (14:5f57)
INCBIN "maps/silphco7.blk"
@@ -81001,10 +81001,10 @@ Mansion2Object: ; 0x520d1 (size=63)
db SPRITE_BOOK_MAP_DEX, $16 + 4, $3 + 4, $ff, $ff, $4 ; person
; warp-to
- EVENT_DISP $f, $a, $5 ; MANSION_1
- EVENT_DISP $f, $a, $7 ; MANSION_3
- EVENT_DISP $f, $e, $19 ; MANSION_3
- EVENT_DISP $f, $1, $6 ; MANSION_3
+ EVENT_DISP MANSION_2_WIDTH, $a, $5 ; MANSION_1
+ EVENT_DISP MANSION_2_WIDTH, $a, $7 ; MANSION_3
+ EVENT_DISP MANSION_2_WIDTH, $e, $19 ; MANSION_3
+ EVENT_DISP MANSION_2_WIDTH, $1, $6 ; MANSION_3
Mansion2Blocks: ; 52110 (14:6110)
INCBIN "maps/mansion2.blk"
@@ -81188,9 +81188,9 @@ Mansion3Object: ; 0x522e6 (size=64)
db SPRITE_BOOK_MAP_DEX, $c + 4, $6 + 4, $ff, $ff, $5 ; person
; warp-to
- EVENT_DISP $f, $a, $7 ; MANSION_2
- EVENT_DISP $f, $1, $6 ; MANSION_2
- EVENT_DISP $f, $e, $19 ; MANSION_2
+ EVENT_DISP MANSION_3_WIDTH, $a, $7 ; MANSION_2
+ EVENT_DISP MANSION_3_WIDTH, $1, $6 ; MANSION_2
+ EVENT_DISP MANSION_3_WIDTH, $e, $19 ; MANSION_2
Mansion3Blocks: ; 52326 (14:6326)
INCBIN "maps/mansion3.blk"
@@ -81354,7 +81354,7 @@ Mansion4Object: ; 0x52498 (size=69)
db SPRITE_BALL, $d + 4, $5 + 4, $ff, $ff, $88, SECRET_KEY ; item
; warp-to
- EVENT_DISP $f, $16, $17 ; MANSION_1
+ EVENT_DISP MANSION_4_WIDTH, $16, $17 ; MANSION_1
Mansion4Blocks: ; 524dd (14:64dd)
INCBIN "maps/mansion4.blk"
@@ -82108,12 +82108,12 @@ Route2Object: ; 0x54022 (size=72)
db SPRITE_BALL, $2d + 4, $d + 4, $ff, $ff, $82, HP_UP ; item
; warp-to
- EVENT_DISP $a, $9, $c ; DIGLETTS_CAVE_EXIT
- EVENT_DISP $a, $b, $3 ; VIRIDIAN_FOREST_EXIT
- EVENT_DISP $a, $13, $f ; ROUTE_2_HOUSE
- EVENT_DISP $a, $23, $10 ; ROUTE_2_GATE
- EVENT_DISP $a, $27, $f ; ROUTE_2_GATE
- EVENT_DISP $a, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE
+ EVENT_DISP ROUTE_2_WIDTH, $9, $c ; DIGLETTS_CAVE_EXIT
+ EVENT_DISP ROUTE_2_WIDTH, $b, $3 ; VIRIDIAN_FOREST_EXIT
+ EVENT_DISP ROUTE_2_WIDTH, $13, $f ; ROUTE_2_HOUSE
+ EVENT_DISP ROUTE_2_WIDTH, $23, $10 ; ROUTE_2_GATE
+ EVENT_DISP ROUTE_2_WIDTH, $27, $f ; ROUTE_2_GATE
+ EVENT_DISP ROUTE_2_WIDTH, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE
; unused
EVENT_DISP $4, $7, $2
@@ -82184,9 +82184,9 @@ Route4Object: ; 0x543b2 (size=58)
db SPRITE_BALL, $3 + 4, $39 + 4, $ff, $ff, $83, TM_04 ; item
; warp-to
- EVENT_DISP $2d, $5, $b ; MT_MOON_POKECENTER
- EVENT_DISP $2d, $5, $12 ; MT_MOON_1
- EVENT_DISP $2d, $5, $18 ; MT_MOON_2
+ EVENT_DISP ROUTE_4_WIDTH, $5, $b ; MT_MOON_POKECENTER
+ EVENT_DISP ROUTE_4_WIDTH, $5, $12 ; MT_MOON_1
+ EVENT_DISP ROUTE_4_WIDTH, $5, $18 ; MT_MOON_2
Route4Blocks: ; 543ec (15:43ec)
INCBIN "maps/route4.blk"
@@ -82216,11 +82216,11 @@ Route5Object: ; 0x545a3 (size=47)
db $0 ; people
; warp-to
- EVENT_DISP $a, $1d, $a ; ROUTE_5_GATE
- EVENT_DISP $a, $1d, $9 ; ROUTE_5_GATE
- EVENT_DISP $a, $21, $a ; ROUTE_5_GATE
- EVENT_DISP $a, $1b, $11 ; PATH_ENTRANCE_ROUTE_5
- EVENT_DISP $a, $15, $a ; DAYCAREM
+ EVENT_DISP ROUTE_5_WIDTH, $1d, $a ; ROUTE_5_GATE
+ EVENT_DISP ROUTE_5_WIDTH, $1d, $9 ; ROUTE_5_GATE
+ EVENT_DISP ROUTE_5_WIDTH, $21, $a ; ROUTE_5_GATE
+ EVENT_DISP ROUTE_5_WIDTH, $1b, $11 ; PATH_ENTRANCE_ROUTE_5
+ EVENT_DISP ROUTE_5_WIDTH, $15, $a ; DAYCAREM
Route5Blocks: ; 545d2 (15:45d2)
INCBIN "maps/route5.blk"
@@ -85027,8 +85027,8 @@ VermilionHouse2Object: ; 0x560cf (size=26)
db SPRITE_FISHER, $4 + 4, $2 + 4, $ff, $d3, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP VERMILION_HOUSE_2_WIDTH, $7, $2
+ EVENT_DISP VERMILION_HOUSE_2_WIDTH, $7, $3
CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
db $12 ; tileset
@@ -85077,9 +85077,9 @@ CeladonMart2Object: ; 0x56111 (size=55)
db SPRITE_GIRL, $4 + 4, $e + 4, $fe, $1, $4 ; person
; warp-to
- EVENT_DISP $a, $1, $c ; CELADON_MART_1
- EVENT_DISP $a, $1, $10 ; CELADON_MART_3
- EVENT_DISP $a, $1, $1 ; CELADON_MART_ELEVATOR
+ EVENT_DISP CELADON_MART_2_WIDTH, $1, $c ; CELADON_MART_1
+ EVENT_DISP CELADON_MART_2_WIDTH, $1, $10 ; CELADON_MART_3
+ EVENT_DISP CELADON_MART_2_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
CeladonMart2Blocks: ; 56148 (15:6148)
INCBIN "maps/celadonmart2.blk"
@@ -85181,9 +85181,9 @@ FuchsiaHouse3Object: ; 0x56221 (size=34)
db SPRITE_FISHER, $3 + 4, $5 + 4, $ff, $d3, $1 ; person
; warp-to
- EVENT_DISP $4, $0, $2
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $0, $2
+ EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $7, $2
+ EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $7, $3
DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
db $08 ; tileset
@@ -85480,8 +85480,8 @@ DayCareMObject: ; 0x56459 (size=26)
db SPRITE_GENTLEMAN, $3 + 4, $2 + 4, $ff, $d3, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP DAYCAREM_WIDTH, $7, $2
+ EVENT_DISP DAYCAREM_WIDTH, $7, $3
Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189)
db $08 ; tileset
@@ -85561,8 +85561,8 @@ Route12HouseObject: ; 0x564de (size=26)
db SPRITE_FISHER, $4 + 4, $2 + 4, $ff, $d3, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP ROUTE_12_HOUSE_WIDTH, $7, $2
+ EVENT_DISP ROUTE_12_HOUSE_WIDTH, $7, $3
SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213)
db $16 ; tileset
@@ -85780,13 +85780,13 @@ SilphCo8Object: ; 0x56613 (size=90)
db SPRITE_ROCKET, $f + 4, $c + 4, $ff, $d3, $44, ROCKET + $C8, $24 ; trainer
; warp-to
- EVENT_DISP $d, $0, $10 ; SILPH_CO_9F
- EVENT_DISP $d, $0, $e ; SILPH_CO_7F
- EVENT_DISP $d, $0, $12 ; SILPH_CO_ELEVATOR
- EVENT_DISP $d, $b, $3 ; SILPH_CO_8F
- EVENT_DISP $d, $f, $3 ; SILPH_CO_2F
- EVENT_DISP $d, $5, $b ; SILPH_CO_2F
- EVENT_DISP $d, $9, $b ; SILPH_CO_8F
+ EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F
+ EVENT_DISP SILPH_CO_8F_WIDTH, $0, $e ; SILPH_CO_7F
+ EVENT_DISP SILPH_CO_8F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR
+ EVENT_DISP SILPH_CO_8F_WIDTH, $b, $3 ; SILPH_CO_8F
+ EVENT_DISP SILPH_CO_8F_WIDTH, $f, $3 ; SILPH_CO_2F
+ EVENT_DISP SILPH_CO_8F_WIDTH, $5, $b ; SILPH_CO_2F
+ EVENT_DISP SILPH_CO_8F_WIDTH, $9, $b ; SILPH_CO_8F
SilphCo8Blocks: ; 5666d (15:666d)
INCBIN "maps/silphco8.blk"
@@ -86285,10 +86285,10 @@ Route6Object: ; 0x58022 (size=87)
db SPRITE_BUG_CATCHER, $1a + 4, $13 + 4, $ff, $d2, $46, BUG_CATCHER + $C8, $b ; trainer
; warp-to
- EVENT_DISP $a, $1, $9 ; ROUTE_6_GATE
- EVENT_DISP $a, $1, $a ; ROUTE_6_GATE
- EVENT_DISP $a, $7, $a ; ROUTE_6_GATE
- EVENT_DISP $a, $d, $11 ; PATH_ENTRANCE_ROUTE_6
+ EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE
+ EVENT_DISP ROUTE_6_WIDTH, $1, $a ; ROUTE_6_GATE
+ EVENT_DISP ROUTE_6_WIDTH, $7, $a ; ROUTE_6_GATE
+ EVENT_DISP ROUTE_6_WIDTH, $d, $11 ; PATH_ENTRANCE_ROUTE_6
Route6Blocks: ; 58079 (16:4079)
INCBIN "maps/route6.blk"
@@ -86327,11 +86327,11 @@ Route8Object: ; 0x5814f (size=119)
db SPRITE_LASS, $c + 4, $33 + 4, $ff, $d2, $49, LASS + $C8, $10 ; trainer
; warp-to
- EVENT_DISP $1e, $9, $1 ; ROUTE_8_GATE
- EVENT_DISP $1e, $a, $1 ; ROUTE_8_GATE
- EVENT_DISP $1e, $9, $8 ; ROUTE_8_GATE
- EVENT_DISP $1e, $a, $8 ; ROUTE_8_GATE
- EVENT_DISP $1e, $3, $d ; PATH_ENTRANCE_ROUTE_8
+ EVENT_DISP ROUTE_8_WIDTH, $9, $1 ; ROUTE_8_GATE
+ EVENT_DISP ROUTE_8_WIDTH, $a, $1 ; ROUTE_8_GATE
+ EVENT_DISP ROUTE_8_WIDTH, $9, $8 ; ROUTE_8_GATE
+ EVENT_DISP ROUTE_8_WIDTH, $a, $8 ; ROUTE_8_GATE
+ EVENT_DISP ROUTE_8_WIDTH, $3, $d ; PATH_ENTRANCE_ROUTE_8
Route8Blocks: ; 581c6 (16:41c6)
INCBIN "maps/route8.blk"
@@ -86369,10 +86369,10 @@ Route10Object: ; 0x582f6 (size=96)
db SPRITE_LASS, $36 + 4, $7 + 4, $ff, $d0, $46, JR__TRAINER_F + $C8, $8 ; trainer
; warp-to
- EVENT_DISP $a, $13, $b ; ROCK_TUNNEL_POKECENTER
- EVENT_DISP $a, $11, $8 ; ROCK_TUNNEL_1
- EVENT_DISP $a, $35, $8 ; ROCK_TUNNEL_1
- EVENT_DISP $a, $27, $6 ; POWER_PLANT
+ EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER
+ EVENT_DISP ROUTE_10_WIDTH, $11, $8 ; ROCK_TUNNEL_1
+ EVENT_DISP ROUTE_10_WIDTH, $35, $8 ; ROCK_TUNNEL_1
+ EVENT_DISP ROUTE_10_WIDTH, $27, $6 ; POWER_PLANT
Route10Blocks: ; 58356 (16:4356)
INCBIN "maps/route10.blk"
@@ -86412,11 +86412,11 @@ Route11Object: ; 0x584e0 (size=127)
db SPRITE_BUG_CATCHER, $c + 4, $16 + 4, $ff, $d1, $4a, YOUNGSTER + $C8, $c ; trainer
; warp-to
- EVENT_DISP $1e, $8, $31 ; ROUTE_11_GATE_1F
- EVENT_DISP $1e, $9, $31 ; ROUTE_11_GATE_1F
- EVENT_DISP $1e, $8, $3a ; ROUTE_11_GATE_1F
- EVENT_DISP $1e, $9, $3a ; ROUTE_11_GATE_1F
- EVENT_DISP $1e, $5, $4 ; DIGLETTS_CAVE_ENTRANCE
+ EVENT_DISP ROUTE_11_WIDTH, $8, $31 ; ROUTE_11_GATE_1F
+ EVENT_DISP ROUTE_11_WIDTH, $9, $31 ; ROUTE_11_GATE_1F
+ EVENT_DISP ROUTE_11_WIDTH, $8, $3a ; ROUTE_11_GATE_1F
+ EVENT_DISP ROUTE_11_WIDTH, $9, $3a ; ROUTE_11_GATE_1F
+ EVENT_DISP ROUTE_11_WIDTH, $5, $4 ; DIGLETTS_CAVE_ENTRANCE
Route11Blocks: ; 5855f (16:455f)
INCBIN "maps/route11.blk"
@@ -86435,9 +86435,9 @@ Route12Object: ; 0x5869a (size=118)
db $43 ; border tile
db $4 ; warps
- db $f, $a, $0, ROUTE_12_GATE
- db $f, $b, $1, ROUTE_12_GATE
- db $15, $a, $2, ROUTE_12_GATE
+ db $f, $a, $0, ROUTE_12_GATE_1F
+ db $f, $b, $1, ROUTE_12_GATE_1F
+ db $15, $a, $2, ROUTE_12_GATE_1F
db $4d, $b, $0, ROUTE_12_HOUSE
db $2 ; signs
@@ -86457,10 +86457,10 @@ Route12Object: ; 0x5869a (size=118)
db SPRITE_BALL, $59 + 4, $5 + 4, $ff, $ff, $8a, IRON ; item
; warp-to
- EVENT_DISP $a, $f, $a ; ROUTE_12_GATE
- EVENT_DISP $a, $f, $b ; ROUTE_12_GATE
- EVENT_DISP $a, $15, $a ; ROUTE_12_GATE
- EVENT_DISP $a, $4d, $b ; ROUTE_12_HOUSE
+ EVENT_DISP ROUTE_12_WIDTH, $f, $a ; ROUTE_12_GATE_1F
+ EVENT_DISP ROUTE_12_WIDTH, $f, $b ; ROUTE_12_GATE_1F
+ EVENT_DISP ROUTE_12_WIDTH, $15, $a ; ROUTE_12_GATE_1F
+ EVENT_DISP ROUTE_12_WIDTH, $4d, $b ; ROUTE_12_HOUSE
Route12Blocks: ; 58710 (16:4710)
INCBIN "maps/route12.blk"
@@ -86500,10 +86500,10 @@ Route15Object: ; 0x5894e (size=126)
db SPRITE_BALL, $5 + 4, $12 + 4, $ff, $ff, $8b, TM_20 ; item
; warp-to
- EVENT_DISP $1e, $8, $7 ; ROUTE_15_GATE_1F
- EVENT_DISP $1e, $9, $7 ; ROUTE_15_GATE_1F
- EVENT_DISP $1e, $8, $e ; ROUTE_15_GATE_1F
- EVENT_DISP $1e, $9, $e ; ROUTE_15_GATE_1F
+ EVENT_DISP ROUTE_15_WIDTH, $8, $7 ; ROUTE_15_GATE_1F
+ EVENT_DISP ROUTE_15_WIDTH, $9, $7 ; ROUTE_15_GATE_1F
+ EVENT_DISP ROUTE_15_WIDTH, $8, $e ; ROUTE_15_GATE_1F
+ EVENT_DISP ROUTE_15_WIDTH, $9, $e ; ROUTE_15_GATE_1F
Route15Blocks: ; 589cc (16:49cc)
INCBIN "maps/route15.blk"
@@ -86545,15 +86545,15 @@ Route16Object: ; 0x58afc (size=136)
db SPRITE_SNORLAX, $a + 4, $1a + 4, $ff, $d0, $7 ; person
; warp-to
- EVENT_DISP $14, $a, $11 ; ROUTE_16_GATE_1F
- EVENT_DISP $14, $b, $11 ; ROUTE_16_GATE_1F
- EVENT_DISP $14, $a, $18 ; ROUTE_16_GATE_1F
- EVENT_DISP $14, $b, $18 ; ROUTE_16_GATE_1F
- EVENT_DISP $14, $4, $11 ; ROUTE_16_GATE_1F
- EVENT_DISP $14, $5, $11 ; ROUTE_16_GATE_1F
- EVENT_DISP $14, $4, $18 ; ROUTE_16_GATE_1F
- EVENT_DISP $14, $5, $18 ; ROUTE_16_GATE_1F
- EVENT_DISP $14, $5, $7 ; ROUTE_16_HOUSE
+ EVENT_DISP ROUTE_16_WIDTH, $a, $11 ; ROUTE_16_GATE_1F
+ EVENT_DISP ROUTE_16_WIDTH, $b, $11 ; ROUTE_16_GATE_1F
+ EVENT_DISP ROUTE_16_WIDTH, $a, $18 ; ROUTE_16_GATE_1F
+ EVENT_DISP ROUTE_16_WIDTH, $b, $18 ; ROUTE_16_GATE_1F
+ EVENT_DISP ROUTE_16_WIDTH, $4, $11 ; ROUTE_16_GATE_1F
+ EVENT_DISP ROUTE_16_WIDTH, $5, $11 ; ROUTE_16_GATE_1F
+ EVENT_DISP ROUTE_16_WIDTH, $4, $18 ; ROUTE_16_GATE_1F
+ EVENT_DISP ROUTE_16_WIDTH, $5, $18 ; ROUTE_16_GATE_1F
+ EVENT_DISP ROUTE_16_WIDTH, $5, $7 ; ROUTE_16_HOUSE
Route16Blocks: ; 58b84 (16:4b84)
INCBIN "maps/route16.blk"
@@ -86586,10 +86586,10 @@ Route18Object: ; 0x58c5a (size=66)
db SPRITE_BLACK_HAIR_BOY_1, $d + 4, $2a + 4, $ff, $d2, $43, BIRD_KEEPER + $C8, $a ; trainer
; warp-to
- EVENT_DISP $19, $8, $21 ; ROUTE_18_GATE_1F
- EVENT_DISP $19, $9, $21 ; ROUTE_18_GATE_1F
- EVENT_DISP $19, $8, $28 ; ROUTE_18_GATE_1F
- EVENT_DISP $19, $9, $28 ; ROUTE_18_GATE_1F
+ EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F
+ EVENT_DISP ROUTE_18_WIDTH, $9, $21 ; ROUTE_18_GATE_1F
+ EVENT_DISP ROUTE_18_WIDTH, $8, $28 ; ROUTE_18_GATE_1F
+ EVENT_DISP ROUTE_18_WIDTH, $9, $28 ; ROUTE_18_GATE_1F
Route18Blocks: ; 58c9c (16:4c9c)
INCBIN "maps/route18.blk"
@@ -89207,8 +89207,8 @@ FanClubObject: ; 0x59c97 (size=62)
db SPRITE_CABLE_CLUB_WOMAN, $1 + 4, $5 + 4, $ff, $d0, $6 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $2
+ EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $3
FanClubBlocks: ; 59cd5 (16:5cd5)
INCBIN "maps/fanclub.blk"
@@ -89491,13 +89491,13 @@ SilphCo2Object: ; 0x59e66 (size=98)
db SPRITE_ROCKET, $7 + 4, $18 + 4, $ff, $d1, $45, ROCKET + $C8, $18 ; trainer
; warp-to
- EVENT_DISP $f, $0, $18 ; SILPH_CO_1F
- EVENT_DISP $f, $0, $1a ; SILPH_CO_3F
- EVENT_DISP $f, $0, $14 ; SILPH_CO_ELEVATOR
- EVENT_DISP $f, $3, $3 ; SILPH_CO_3F
- EVENT_DISP $f, $3, $d ; SILPH_CO_8F
- EVENT_DISP $f, $f, $1b ; SILPH_CO_8F
- EVENT_DISP $f, $f, $9 ; SILPH_CO_6F
+ EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F
+ EVENT_DISP SILPH_CO_2F_WIDTH, $0, $1a ; SILPH_CO_3F
+ EVENT_DISP SILPH_CO_2F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
+ EVENT_DISP SILPH_CO_2F_WIDTH, $3, $3 ; SILPH_CO_3F
+ EVENT_DISP SILPH_CO_2F_WIDTH, $3, $d ; SILPH_CO_8F
+ EVENT_DISP SILPH_CO_2F_WIDTH, $f, $1b ; SILPH_CO_8F
+ EVENT_DISP SILPH_CO_2F_WIDTH, $f, $9 ; SILPH_CO_6F
SilphCo2Blocks: ; 59ec8 (16:5ec8)
INCBIN "maps/silphco2.blk"
@@ -89673,16 +89673,16 @@ SilphCo3Object: ; 0x5a035 (size=113)
db SPRITE_BALL, $5 + 4, $8 + 4, $ff, $ff, $84, HYPER_POTION ; item
; warp-to
- EVENT_DISP $f, $0, $1a ; SILPH_CO_2F
- EVENT_DISP $f, $0, $18 ; SILPH_CO_4F
- EVENT_DISP $f, $0, $14 ; SILPH_CO_ELEVATOR
- EVENT_DISP $f, $b, $17 ; SILPH_CO_3F
- EVENT_DISP $f, $3, $3 ; SILPH_CO_5F
- EVENT_DISP $f, $f, $3 ; SILPH_CO_5F
- EVENT_DISP $f, $3, $1b ; SILPH_CO_2F
- EVENT_DISP $f, $b, $3 ; SILPH_CO_9F
- EVENT_DISP $f, $b, $b ; SILPH_CO_7F
- EVENT_DISP $f, $f, $1b ; SILPH_CO_3F
+ EVENT_DISP SILPH_CO_3F_WIDTH, $0, $1a ; SILPH_CO_2F
+ EVENT_DISP SILPH_CO_3F_WIDTH, $0, $18 ; SILPH_CO_4F
+ EVENT_DISP SILPH_CO_3F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
+ EVENT_DISP SILPH_CO_3F_WIDTH, $b, $17 ; SILPH_CO_3F
+ EVENT_DISP SILPH_CO_3F_WIDTH, $3, $3 ; SILPH_CO_5F
+ EVENT_DISP SILPH_CO_3F_WIDTH, $f, $3 ; SILPH_CO_5F
+ EVENT_DISP SILPH_CO_3F_WIDTH, $3, $1b ; SILPH_CO_2F
+ EVENT_DISP SILPH_CO_3F_WIDTH, $b, $3 ; SILPH_CO_9F
+ EVENT_DISP SILPH_CO_3F_WIDTH, $b, $b ; SILPH_CO_7F
+ EVENT_DISP SILPH_CO_3F_WIDTH, $f, $1b ; SILPH_CO_3F
SilphCo3Blocks: ; 5a0a6 (16:60a6)
INCBIN "maps/silphco3.blk"
@@ -89843,12 +89843,12 @@ SilphCo10Object: ; 0x5a1fb (size=95)
db SPRITE_BALL, $b + 4, $5 + 4, $ff, $ff, $86, CARBOS ; item
; warp-to
- EVENT_DISP $8, $0, $8 ; SILPH_CO_9F
- EVENT_DISP $8, $0, $a ; SILPH_CO_11F
- EVENT_DISP $8, $0, $c ; SILPH_CO_ELEVATOR
- EVENT_DISP $8, $b, $9 ; SILPH_CO_4F
- EVENT_DISP $8, $f, $d ; SILPH_CO_4F
- EVENT_DISP $8, $7, $d ; SILPH_CO_4F
+ EVENT_DISP SILPH_CO_10F_WIDTH, $0, $8 ; SILPH_CO_9F
+ EVENT_DISP SILPH_CO_10F_WIDTH, $0, $a ; SILPH_CO_11F
+ EVENT_DISP SILPH_CO_10F_WIDTH, $0, $c ; SILPH_CO_ELEVATOR
+ EVENT_DISP SILPH_CO_10F_WIDTH, $b, $9 ; SILPH_CO_4F
+ EVENT_DISP SILPH_CO_10F_WIDTH, $f, $d ; SILPH_CO_4F
+ EVENT_DISP SILPH_CO_10F_WIDTH, $7, $d ; SILPH_CO_4F
SilphCo10Blocks: ; 5a25a (16:625a)
INCBIN "maps/silphco10.blk"
@@ -90041,9 +90041,9 @@ LanceObject: ; 0x5a3c5 (size=36)
db SPRITE_LANCE, $1 + 4, $6 + 4, $ff, $d0, $41, LANCE + $C8, $1 ; trainer
; warp-to
- EVENT_DISP $d, $10, $18 ; AGATHAS_ROOM
- EVENT_DISP $d, $0, $5 ; CHAMPIONS_ROOM
- EVENT_DISP $d, $0, $6 ; CHAMPIONS_ROOM
+ EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM
+ EVENT_DISP LANCES_ROOM_WIDTH, $0, $5 ; CHAMPIONS_ROOM
+ EVENT_DISP LANCES_ROOM_WIDTH, $0, $6 ; CHAMPIONS_ROOM
LanceBlocks: ; 5a3e9 (16:63e9)
INCBIN "maps/lance.blk"
@@ -90186,8 +90186,8 @@ HallofFameRoomObject: ; 0x5a571 (size=26)
db SPRITE_OAK, $2 + 4, $5 + 4, $ff, $d0, $1 ; person
; warp-to
- EVENT_DISP $5, $7, $4 ; CHAMPIONS_ROOM
- EVENT_DISP $5, $7, $5 ; CHAMPIONS_ROOM
+ EVENT_DISP HALL_OF_FAME_WIDTH, $7, $4 ; CHAMPIONS_ROOM
+ EVENT_DISP HALL_OF_FAME_WIDTH, $7, $5 ; CHAMPIONS_ROOM
HallofFameRoomBlocks: ; 5a58b (16:658b)
INCBIN "maps/halloffameroom.blk"
@@ -90219,15 +90219,15 @@ CeruleanMartBlocks: ; 5c000 (17:4000)
VermilionMartBlocks: ; 5c000 (17:4000)
INCBIN "maps/vermilionmart.blk"
-CopycatsHouseF2Blocks: ; 5c010 (17:4010)
+CopycatsHouse2FBlocks: ; 5c010 (17:4010)
RedsHouse2FBlocks: ; 0x5c010 16?
INCBIN "maps/redshouse2f.blk"
-MuseumF1Blocks: ; 5c020 (17:4020)
- INCBIN "maps/museumf1.blk"
+Museum1FBlocks: ; 5c020 (17:4020)
+ INCBIN "maps/museum1f.blk"
-MuseumF2Blocks: ; 5c048 (17:4048)
- INCBIN "maps/museumf2.blk"
+Museum2FBlocks: ; 5c048 (17:4048)
+ INCBIN "maps/museum2f.blk"
SaffronPokecenterBlocks: ; 5c064 (17:4064)
VermilionPokecenterBlocks: ; 5c064 (17:4064)
@@ -90243,7 +90243,7 @@ UndergroundTunnelEntranceRoute5Blocks: ; 5c080 (17:4080)
Route2GateBlocks: ; 5c090 (17:4090)
ViridianForestEntranceBlocks: ; 5c090 (17:4090)
-ViridianForestexitBlocks: ; 5c090 (17:4090)
+ViridianForestExitBlocks: ; 5c090 (17:4090)
INCBIN "maps/viridianforestexit.blk"
RedsHouse2F_h: ; 5c0a4 (17:40a4)
@@ -90300,27 +90300,27 @@ Func_5c0dc: ; 5c0dc (17:40dc)
ld [wPokedexOwned], a ; $d2f7
ret
-MuseumF1_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
+Museum1F_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
db $0a ; tileset
db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x)
- dw MuseumF1Blocks, MuseumF1TextPointers, MuseumF1Script ; blocks, texts, scripts
+ dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts
db $00 ; connections
- dw MuseumF1Object ; objects
+ dw Museum1FObject ; objects
-MuseumF1Script: ; 5c0f7 (17:40f7)
+Museum1FScript: ; 5c0f7 (17:40f7)
ld a, $1
ld [$cf0c], a
xor a
ld [$cc3c], a
- ld hl, MuseumF1ScriptPointers
+ ld hl, Museum1FScriptPointers
ld a, [W_MUSEUMF1CURSCRIPT]
jp CallFunctionInTable
-MuseumF1ScriptPointers: ; 5c109 (17:4109)
- dw MuseumF1Script0
- dw MuseumF1Script1
+Museum1FScriptPointers: ; 5c109 (17:4109)
+ dw Museum1FScript0
+ dw Museum1FScript1
-MuseumF1Script0: ; 5c10d (17:410d)
+Museum1FScript0: ; 5c10d (17:410d)
ld a, [$d361]
cp $4
ret nz
@@ -90337,17 +90337,17 @@ MuseumF1Script0: ; 5c10d (17:410d)
ld [$ff8c], a
jp DisplayTextID
-MuseumF1Script1: ; 5c12a (17:412a)
+Museum1FScript1: ; 5c12a (17:412a)
ret
-MuseumF1TextPointers: ; 5c12b (17:412b)
- dw MuseumF1Text1
- dw MuseumF1Text2
- dw MuseumF1Text3
- dw MuseumF1Text4
- dw MuseumF1Text5
+Museum1FTextPointers: ; 5c12b (17:412b)
+ dw Museum1FText1
+ dw Museum1FText2
+ dw Museum1FText3
+ dw Museum1FText4
+ dw Museum1FText5
-MuseumF1Text1: ; 5c135 (17:4135)
+Museum1FText1: ; 5c135 (17:4135)
db $8
ld a, [$d361]
cp $4
@@ -90488,7 +90488,7 @@ UnnamedText_5c242: ; 5c242 (17:4242)
TX_FAR _UnnamedText_5c242
db "@"
-MuseumF1Text2: ; 5c247 (17:4247)
+Museum1FText2: ; 5c247 (17:4247)
db $08 ; asm
ld hl, UnnamedText_5c251
call PrintText
@@ -90498,7 +90498,7 @@ UnnamedText_5c251: ; 5c251 (17:4251)
TX_FAR _UnnamedText_5c251
db "@"
-MuseumF1Text3: ; 5c256 (17:4256)
+Museum1FText3: ; 5c256 (17:4256)
db $08 ; asm
ld a, [$d754]
bit 1, a
@@ -90541,7 +90541,7 @@ UnnamedText_5c29e: ; 5c29e (17:429e)
TX_FAR _UnnamedText_5c29e
db "@"
-MuseumF1Text4: ; 5c2a3 (17:42a3)
+Museum1FText4: ; 5c2a3 (17:42a3)
db $08 ; asm
ld hl, UnnamedText_5c2ad
call PrintText
@@ -90551,7 +90551,7 @@ UnnamedText_5c2ad: ; 5c2ad (17:42ad)
TX_FAR _UnnamedText_5c2ad
db "@"
-MuseumF1Text5: ; 5c2b2 (17:42b2)
+Museum1FText5: ; 5c2b2 (17:42b2)
db $08 ; asm
ld hl, UnnamedText_5c2bc
call PrintText
@@ -90561,7 +90561,7 @@ UnnamedText_5c2bc: ; 5c2bc (17:42bc)
TX_FAR _UnnamedText_5c2bc
db "@"
-MuseumF1Object: ; 0x5c2c1 (size=74)
+Museum1FObject: ; 0x5c2c1 (size=74)
db $a ; border tile
db $5 ; warps
@@ -90581,68 +90581,68 @@ MuseumF1Object: ; 0x5c2c1 (size=74)
db SPRITE_OLD_AMBER, $2 + 4, $10 + 4, $ff, $ff, $5 ; person
; warp-to
- EVENT_DISP $a, $7, $a
- EVENT_DISP $a, $7, $b
- EVENT_DISP $a, $7, $10
- EVENT_DISP $a, $7, $11
- EVENT_DISP $a, $7, $7 ; MUSEUM_2F
+ EVENT_DISP MUSEUM_1F_WIDTH, $7, $a
+ EVENT_DISP MUSEUM_1F_WIDTH, $7, $b
+ EVENT_DISP MUSEUM_1F_WIDTH, $7, $10
+ EVENT_DISP MUSEUM_1F_WIDTH, $7, $11
+ EVENT_DISP MUSEUM_1F_WIDTH, $7, $7 ; MUSEUM_2F
-MuseumF2_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
+Museum2F_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
db $0a ; tileset
db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x)
- dw MuseumF2Blocks, MuseumF2TextPointers, MuseumF2Script ; blocks, texts, scripts
+ dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts
db $00 ; connections
- dw MuseumF2Object ; objects
+ dw Museum2FObject ; objects
-MuseumF2Script: ; 5c317 (17:4317)
+Museum2FScript: ; 5c317 (17:4317)
jp EnableAutoTextBoxDrawing
-MuseumF2TextPointers: ; 5c31a (17:431a)
- dw MuseumF2Text1
- dw MuseumF2Text2
- dw MuseumF2Text3
- dw MuseumF2Text4
- dw MuseumF2Text5
- dw MuseumF2Text6
- dw MuseumF2Text7
+Museum2FTextPointers: ; 5c31a (17:431a)
+ dw Museum2FText1
+ dw Museum2FText2
+ dw Museum2FText3
+ dw Museum2FText4
+ dw Museum2FText5
+ dw Museum2FText6
+ dw Museum2FText7
-MuseumF2Text1: ; 5c328 (17:4328)
- TX_FAR _MuseumF2Text1
+Museum2FText1: ; 5c328 (17:4328)
+ TX_FAR _Museum2FText1
db "@"
-MuseumF2Text2: ; 5c32d (17:432d)
- TX_FAR _MuseumF2Text2
+Museum2FText2: ; 5c32d (17:432d)
+ TX_FAR _Museum2FText2
db "@"
-MuseumF2Text3: ; 5c332 (17:4332)
- TX_FAR _MuseumF2Text3
+Museum2FText3: ; 5c332 (17:4332)
+ TX_FAR _Museum2FText3
db "@"
-MuseumF2Text4: ; 5c337 (17:4337)
- TX_FAR _MuseumF2Text4
+Museum2FText4: ; 5c337 (17:4337)
+ TX_FAR _Museum2FText4
db "@"
-MuseumF2Text5: ; 5c33c (17:433c)
- TX_FAR _MuseumF2Text5
+Museum2FText5: ; 5c33c (17:433c)
+ TX_FAR _Museum2FText5
db "@"
-MuseumF2Text6: ; 5c341 (17:4341)
- TX_FAR _MuseumF2Text6
+Museum2FText6: ; 5c341 (17:4341)
+ TX_FAR _Museum2FText6
db "@"
-MuseumF2Text7: ; 5c346 (17:4346)
- TX_FAR _MuseumF2Text7
+Museum2FText7: ; 5c346 (17:4346)
+ TX_FAR _Museum2FText7
db "@"
-MuseumF2Object: ; 0x5c34b (size=48)
+Museum2FObject: ; 0x5c34b (size=48)
db $a ; border tile
db $1 ; warps
db $7, $7, $4, MUSEUM_1F
db $2 ; signs
- db $2, $b, $6 ; MuseumF2Text6
- db $5, $2, $7 ; MuseumF2Text7
+ db $2, $b, $6 ; Museum2FText6
+ db $5, $2, $7 ; Museum2FText7
db $5 ; people
db SPRITE_BUG_CATCHER, $7 + 4, $1 + 4, $fe, $2, $1 ; person
@@ -90652,7 +90652,7 @@ MuseumF2Object: ; 0x5c34b (size=48)
db SPRITE_HIKER, $5 + 4, $c + 4, $ff, $d0, $5 ; person
; warp-to
- EVENT_DISP $7, $7, $7 ; MUSEUM_1F
+ EVENT_DISP MUSEUM_2F_WIDTH, $7, $7 ; MUSEUM_1F
PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
db $07 ; tileset
@@ -90909,8 +90909,8 @@ PewterGymObject: ; 0x5c52e (size=42)
db SPRITE_GYM_HELPER, $a + 4, $7 + 4, $ff, $d0, $3 ; person
; warp-to
- EVENT_DISP $5, $d, $4
- EVENT_DISP $5, $d, $5
+ EVENT_DISP PEWTER_GYM_WIDTH, $d, $4
+ EVENT_DISP PEWTER_GYM_WIDTH, $d, $5
PewterGymBlocks: ; 5c558 (17:4558)
INCBIN "maps/pewtergym.blk"
@@ -91014,8 +91014,8 @@ PewterPokecenterObject: ; 0x5c60d (size=44)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $4
CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
db $06 ; tileset
@@ -91064,8 +91064,8 @@ CeruleanPokecenterObject: ; 0x5c65f (size=44)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $4
CeruleanPokecenterBlocks: ; 5c68b (17:468b)
INCBIN "maps/ceruleanpokecenter.blk"
@@ -91315,8 +91315,8 @@ CeruleanGymObject: ; 0x5c834 (size=50)
db SPRITE_GYM_HELPER, $a + 4, $7 + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $5, $d, $4
- EVENT_DISP $5, $d, $5
+ EVENT_DISP CERULEAN_GYM_WIDTH, $d, $4
+ EVENT_DISP CERULEAN_GYM_WIDTH, $d, $5
CeruleanGymBlocks: ; 5c866 (17:4866)
INCBIN "maps/ceruleangym.blk"
@@ -91359,8 +91359,8 @@ CeruleanMartObject: ; 0x5c8a8 (size=38)
db SPRITE_LASS, $2 + 4, $6 + 4, $fe, $2, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
+ EVENT_DISP CERULEAN_MART_WIDTH, $7, $3
+ EVENT_DISP CERULEAN_MART_WIDTH, $7, $4
LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141)
db $06 ; tileset
@@ -91409,8 +91409,8 @@ LavenderPokecenterObject: ; 0x5c8f4 (size=44)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $4
LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150)
db $02 ; tileset
@@ -91468,8 +91468,8 @@ LavenderMartObject: ; 0x5c95d (size=38)
db SPRITE_BLACK_HAIR_BOY_1, $2 + 4, $7 + 4, $ff, $ff, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
+ EVENT_DISP LAVENDER_MART_WIDTH, $7, $3
+ EVENT_DISP LAVENDER_MART_WIDTH, $7, $4
VermilionPokecenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89)
db $06 ; tileset
@@ -91518,8 +91518,8 @@ VermilionPokecenterObject: ; 0x5c9a9 (size=44)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $4
VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
db $02 ; tileset
@@ -91559,8 +91559,8 @@ VermilionMartObject: ; 0x5c9f4 (size=38)
db SPRITE_LASS, $3 + 4, $3 + 4, $fe, $2, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
+ EVENT_DISP VERMILION_MART_WIDTH, $7, $3
+ EVENT_DISP VERMILION_MART_WIDTH, $7, $4
VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
db $07 ; tileset
@@ -91859,32 +91859,32 @@ VermilionGymObject: ; 0x5cbfe (size=58)
db SPRITE_GYM_HELPER, $e + 4, $4 + 4, $ff, $d0, $5 ; person
; warp-to
- EVENT_DISP $5, $11, $4
- EVENT_DISP $5, $11, $5
+ EVENT_DISP VERMILION_GYM_WIDTH, $11, $4
+ EVENT_DISP VERMILION_GYM_WIDTH, $11, $5
VermilionGymBlocks: ; 5cc38 (17:4c38)
INCBIN "maps/vermiliongym.blk"
-CopycatsHouseF2_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
+CopycatsHouse2F_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
db $04 ; tileset
db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x)
- dw CopycatsHouseF2Blocks, CopycatsHouseF2TextPointers, CopycatsHouseF2Script ; blocks, texts, scripts
+ dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts
db $00 ; connections
- dw CopycatsHouseF2Object ; objects
+ dw CopycatsHouse2FObject ; objects
-CopycatsHouseF2Script: ; 5cc71 (17:4c71)
+CopycatsHouse2FScript: ; 5cc71 (17:4c71)
jp EnableAutoTextBoxDrawing
-CopycatsHouseF2TextPointers: ; 5cc74 (17:4c74)
- dw CopycatsHouseF2Text1
- dw CopycatsHouseF2Text2
- dw CopycatsHouseF2Text3
- dw CopycatsHouseF2Text4
- dw CopycatsHouseF2Text5
- dw CopycatsHouseF2Text6
- dw CopycatsHouseF2Text7
+CopycatsHouse2FTextPointers: ; 5cc74 (17:4c74)
+ dw CopycatsHouse2FText1
+ dw CopycatsHouse2FText2
+ dw CopycatsHouse2FText3
+ dw CopycatsHouse2FText4
+ dw CopycatsHouse2FText5
+ dw CopycatsHouse2FText6
+ dw CopycatsHouse2FText7
-CopycatsHouseF2Text1: ; 5cc82 (17:4c82)
+CopycatsHouse2FText1: ; 5cc82 (17:4c82)
db $08 ; asm
ld a, [$d7af]
bit 0, a
@@ -91944,21 +91944,21 @@ TM31NoRoomText: ; 5ccee (17:4cee)
TX_FAR _TM31NoRoomText ; 0xa1733
db $d, "@"
-CopycatsHouseF2Text2: ; 5ccf4 (17:4cf4)
- TX_FAR _CopycatsHouseF2Text2
+CopycatsHouse2FText2: ; 5ccf4 (17:4cf4)
+ TX_FAR _CopycatsHouse2FText2
db "@"
-CopycatsHouseF2Text5: ; 5ccf9 (17:4cf9)
-CopycatsHouseF2Text4: ; 5ccf9 (17:4cf9)
-CopycatsHouseF2Text3: ; 5ccf9 (17:4cf9)
- TX_FAR _CopycatsHouseF2Text3
+CopycatsHouse2FText5: ; 5ccf9 (17:4cf9)
+CopycatsHouse2FText4: ; 5ccf9 (17:4cf9)
+CopycatsHouse2FText3: ; 5ccf9 (17:4cf9)
+ TX_FAR _CopycatsHouse2FText3
db "@"
-CopycatsHouseF2Text6: ; 5ccfe (17:4cfe)
- TX_FAR _CopycatsHouseF2Text6
+CopycatsHouse2FText6: ; 5ccfe (17:4cfe)
+ TX_FAR _CopycatsHouse2FText6
db "@"
-CopycatsHouseF2Text7: ; 5cd03 (17:4d03)
+CopycatsHouse2FText7: ; 5cd03 (17:4d03)
db $08 ; asm
ld a, [$c109]
cp $4
@@ -91977,15 +91977,15 @@ UnnamedText_5cd1c: ; 5cd1c (17:4d1c)
TX_FAR _UnnamedText_5cd1c
db "@"
-CopycatsHouseF2Object: ; 0x5cd21 (size=48)
+CopycatsHouse2FObject: ; 0x5cd21 (size=48)
db $a ; border tile
db $1 ; warps
db $1, $7, $2, COPYCATS_HOUSE_1F
db $2 ; signs
- db $5, $3, $6 ; CopycatsHouseF2Text6
- db $1, $0, $7 ; CopycatsHouseF2Text7
+ db $5, $3, $6 ; CopycatsHouse2FText6
+ db $1, $0, $7 ; CopycatsHouse2FText7
db $5 ; people
db SPRITE_BRUNETTE_GIRL, $3 + 4, $4 + 4, $fe, $0, $1 ; person
@@ -91995,11 +91995,11 @@ CopycatsHouseF2Object: ; 0x5cd21 (size=48)
db SPRITE_CLEFAIRY, $6 + 4, $1 + 4, $ff, $d3, $5 ; person
; warp-to
- EVENT_DISP $4, $1, $7 ; COPYCATS_HOUSE_1F
+ EVENT_DISP COPYCATS_HOUSE_2F_WIDTH, $1, $7 ; COPYCATS_HOUSE_1F
FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
db $05 ; tileset
- db FIGHTINGDOJO_HEIGHT, FIGHTINGDOJO_WIDTH ; dimensions (y, x)
+ db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x)
dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts
db $00 ; connections
dw FightingDojoObject ; objects
@@ -92361,8 +92361,8 @@ FightingDojoObject: ; 0x5cf9b (size=72)
db SPRITE_BALL, $1 + 4, $5 + 4, $ff, $ff, $7 ; person
; warp-to
- EVENT_DISP $5, $b, $4
- EVENT_DISP $5, $b, $5
+ EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $4
+ EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $5
FightingDojoBlocks: ; 5cfe3 (17:4fe3)
INCBIN "maps/fightingdojo.blk"
@@ -92790,38 +92790,38 @@ SaffronGymObject: ; 0x5d259 (size=330)
db SPRITE_GYM_HELPER, $f + 4, $a + 4, $ff, $d0, $9 ; person
; warp-to
- EVENT_DISP $a, $11, $8
- EVENT_DISP $a, $11, $9
- EVENT_DISP $a, $3, $1 ; SAFFRON_GYM
- EVENT_DISP $a, $3, $5 ; SAFFRON_GYM
- EVENT_DISP $a, $5, $1 ; SAFFRON_GYM
- EVENT_DISP $a, $5, $5 ; SAFFRON_GYM
- EVENT_DISP $a, $9, $1 ; SAFFRON_GYM
- EVENT_DISP $a, $9, $5 ; SAFFRON_GYM
- EVENT_DISP $a, $b, $1 ; SAFFRON_GYM
- EVENT_DISP $a, $b, $5 ; SAFFRON_GYM
- EVENT_DISP $a, $f, $1 ; SAFFRON_GYM
- EVENT_DISP $a, $f, $5 ; SAFFRON_GYM
- EVENT_DISP $a, $11, $1 ; SAFFRON_GYM
- EVENT_DISP $a, $11, $5 ; SAFFRON_GYM
- EVENT_DISP $a, $3, $9 ; SAFFRON_GYM
- EVENT_DISP $a, $3, $b ; SAFFRON_GYM
- EVENT_DISP $a, $5, $9 ; SAFFRON_GYM
- EVENT_DISP $a, $5, $b ; SAFFRON_GYM
- EVENT_DISP $a, $b, $b ; SAFFRON_GYM
- EVENT_DISP $a, $f, $b ; SAFFRON_GYM
- EVENT_DISP $a, $3, $f ; SAFFRON_GYM
- EVENT_DISP $a, $3, $13 ; SAFFRON_GYM
- EVENT_DISP $a, $5, $f ; SAFFRON_GYM
- EVENT_DISP $a, $5, $13 ; SAFFRON_GYM
- EVENT_DISP $a, $9, $f ; SAFFRON_GYM
- EVENT_DISP $a, $9, $13 ; SAFFRON_GYM
- EVENT_DISP $a, $b, $f ; SAFFRON_GYM
- EVENT_DISP $a, $b, $13 ; SAFFRON_GYM
- EVENT_DISP $a, $f, $f ; SAFFRON_GYM
- EVENT_DISP $a, $f, $13 ; SAFFRON_GYM
- EVENT_DISP $a, $11, $f ; SAFFRON_GYM
- EVENT_DISP $a, $11, $13 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $11, $8
+ EVENT_DISP SAFFRON_GYM_WIDTH, $11, $9
+ EVENT_DISP SAFFRON_GYM_WIDTH, $3, $1 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $3, $5 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $5, $1 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $5, $5 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $9, $1 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $9, $5 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $b, $1 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $b, $5 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $f, $1 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $f, $5 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $11, $1 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $11, $5 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $3, $9 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $3, $b ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $5, $9 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $5, $b ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $b, $b ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $f, $b ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $3, $f ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $3, $13 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $5, $f ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $5, $13 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $9, $f ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $9, $13 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $b, $f ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $b, $13 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $f, $f ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $f, $13 ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $11, $f ; SAFFRON_GYM
+ EVENT_DISP SAFFRON_GYM_WIDTH, $11, $13 ; SAFFRON_GYM
SaffronGymBlocks: ; 5d3a3 (17:53a3)
INCBIN "maps/saffrongym.blk"
@@ -92864,8 +92864,8 @@ SaffronMartObject: ; 0x5d41c (size=38)
db SPRITE_LASS, $5 + 4, $6 + 4, $fe, $0, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
+ EVENT_DISP SAFFRON_MART_WIDTH, $7, $3
+ EVENT_DISP SAFFRON_MART_WIDTH, $7, $4
SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181)
db $16 ; tileset
@@ -92911,11 +92911,11 @@ SilphCo1Object: ; 0x5d470 (size=50)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $4 + 4, $ff, $d0, $1 ; person
; warp-to
- EVENT_DISP $f, $11, $a
- EVENT_DISP $f, $11, $b
- EVENT_DISP $f, $0, $1a ; SILPH_CO_2F
- EVENT_DISP $f, $0, $14 ; SILPH_CO_ELEVATOR
- EVENT_DISP $f, $a, $10 ; SILPH_CO_3F
+ EVENT_DISP SILPH_CO_1F_WIDTH, $11, $a
+ EVENT_DISP SILPH_CO_1F_WIDTH, $11, $b
+ EVENT_DISP SILPH_CO_1F_WIDTH, $0, $1a ; SILPH_CO_2F
+ EVENT_DISP SILPH_CO_1F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
+ EVENT_DISP SILPH_CO_1F_WIDTH, $a, $10 ; SILPH_CO_3F
SilphCo1Blocks: ; 5d4a2 (17:54a2)
INCBIN "maps/silphco1.blk"
@@ -92967,32 +92967,32 @@ SaffronPokecenterObject: ; 0x5d54f (size=44)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $4
-ViridianForestexit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
+ViridianForestExit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
db $09 ; tileset
db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x)
- dw ViridianForestexitBlocks, ViridianForestexitTextPointers, ViridianForestexitScript ; blocks, texts, scripts
+ dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts
db $00 ; connections
- dw ViridianForestexitObject ; objects
+ dw ViridianForestExitObject ; objects
-ViridianForestexitScript: ; 5d587 (17:5587)
+ViridianForestExitScript: ; 5d587 (17:5587)
jp EnableAutoTextBoxDrawing
-ViridianForestexitTextPointers: ; 5d58a (17:558a)
- dw ViridianForestexitText1
- dw ViridianForestexitText2
+ViridianForestExitTextPointers: ; 5d58a (17:558a)
+ dw ViridianForestExitText1
+ dw ViridianForestExitText2
-ViridianForestexitText1: ; 5d58e (17:558e)
- TX_FAR _ViridianForestexitText1
+ViridianForestExitText1: ; 5d58e (17:558e)
+ TX_FAR _ViridianForestExitText1
db "@"
-ViridianForestexitText2: ; 5d593 (17:5593)
- TX_FAR _ViridianForestexitText2
+ViridianForestExitText2: ; 5d593 (17:5593)
+ TX_FAR _ViridianForestExitText2
db "@"
-ViridianForestexitObject: ; 0x5d598 (size=48)
+ViridianForestExitObject: ; 0x5d598 (size=48)
db $a ; border tile
db $4 ; warps
@@ -93008,10 +93008,10 @@ ViridianForestexitObject: ; 0x5d598 (size=48)
db SPRITE_OLD_PERSON, $5 + 4, $2 + 4, $ff, $ff, $2 ; person
; warp-to
- EVENT_DISP $5, $0, $4
- EVENT_DISP $5, $0, $5
- EVENT_DISP $5, $7, $4 ; VIRIDIAN_FOREST
- EVENT_DISP $5, $7, $5 ; VIRIDIAN_FOREST
+ EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $4
+ EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $5
+ EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $7, $4 ; VIRIDIAN_FOREST
+ EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $7, $5 ; VIRIDIAN_FOREST
Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49)
db $0c ; tileset
@@ -93079,10 +93079,10 @@ Route2GateObject: ; 0x5d620 (size=48)
db SPRITE_BUG_CATCHER, $4 + 4, $5 + 4, $fe, $2, $2 ; person
; warp-to
- EVENT_DISP $5, $0, $4
- EVENT_DISP $5, $0, $5
- EVENT_DISP $5, $7, $4
- EVENT_DISP $5, $7, $5
+ EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $4
+ EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $5
+ EVENT_DISP ROUTE_2_GATE_WIDTH, $7, $4
+ EVENT_DISP ROUTE_2_GATE_WIDTH, $7, $5
ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50)
db $09 ; tileset
@@ -93122,10 +93122,10 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48)
db SPRITE_LITTLE_GIRL, $4 + 4, $2 + 4, $fe, $1, $2 ; person
; warp-to
- EVENT_DISP $5, $0, $4 ; VIRIDIAN_FOREST
- EVENT_DISP $5, $0, $5 ; VIRIDIAN_FOREST
- EVENT_DISP $5, $7, $4
- EVENT_DISP $5, $7, $5
+ EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $4 ; VIRIDIAN_FOREST
+ EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $5 ; VIRIDIAN_FOREST
+ EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $4
+ EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $5
UndergroundTunnelEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71)
db $0c ; tileset
@@ -93168,9 +93168,9 @@ UndergroundTunnelEntranceRoute5Object: ; 0x5d6c1 (size=34)
db SPRITE_LITTLE_GIRL, $3 + 4, $2 + 4, $ff, $ff, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
- EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_NS
+ EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $3
+ EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $4
+ EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $4, $4 ; UNDERGROUND_PATH_NS
UndergroundTunnelEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74)
db $0c ; tileset
@@ -93205,9 +93205,9 @@ UndergroundTunnelEntranceRoute6Object: ; 0x5d6fe (size=34)
db SPRITE_GIRL, $3 + 4, $2 + 4, $ff, $ff, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
- EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_NS
+ EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $7, $3
+ EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $7, $4
+ EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $4, $4 ; UNDERGROUND_PATH_NS
UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77)
db $0c ; tileset
@@ -93242,9 +93242,9 @@ UndergroundPathEntranceRoute7Object: ; 0x5d73b (size=34)
db SPRITE_FAT_BALD_GUY, $4 + 4, $2 + 4, $ff, $ff, $1 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
- EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_WE
+ EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $7, $3
+ EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $7, $4
+ EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE
UndergroundPathEntranceRoute7Copy_h: ; 5d75d (17:575d)
db $0c ; tileset
@@ -93293,9 +93293,9 @@ UndergroundPathEntranceRoute7CopyObject: ; 5d787 (17:5787)
db SPRITE_FAT_BALD_GUY, $4 + 4, $2 + 4, $ff, $ff, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
- EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_WE
+ EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $7, $3
+ EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $7, $4
+ EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE
SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233)
db $16 ; tileset
@@ -93572,11 +93572,11 @@ SilphCo9Object: ; 0x5d93f (size=74)
db SPRITE_ROCKET, $10 + 4, $d + 4, $ff, $d1, $44, ROCKET + $C8, $26 ; trainer
; warp-to
- EVENT_DISP $d, $0, $e ; SILPH_CO_10F
- EVENT_DISP $d, $0, $10 ; SILPH_CO_8F
- EVENT_DISP $d, $0, $12 ; SILPH_CO_ELEVATOR
- EVENT_DISP $d, $3, $9 ; SILPH_CO_3F
- EVENT_DISP $d, $f, $11 ; SILPH_CO_5F
+ EVENT_DISP SILPH_CO_9F_WIDTH, $0, $e ; SILPH_CO_10F
+ EVENT_DISP SILPH_CO_9F_WIDTH, $0, $10 ; SILPH_CO_8F
+ EVENT_DISP SILPH_CO_9F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR
+ EVENT_DISP SILPH_CO_9F_WIDTH, $3, $9 ; SILPH_CO_3F
+ EVENT_DISP SILPH_CO_9F_WIDTH, $f, $11 ; SILPH_CO_5F
SilphCo9Blocks: ; 5d989 (17:5989)
INCBIN "maps/silphco9.blk"
@@ -93717,9 +93717,9 @@ VictoryRoad1Object: ; 0x5dab8 (size=76)
db SPRITE_BOULDER, $a + 4, $2 + 4, $ff, $10, $7 ; person
; warp-to
- EVENT_DISP $a, $11, $8
- EVENT_DISP $a, $11, $9
- EVENT_DISP $a, $1, $1 ; VICTORY_ROAD_2
+ EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $8
+ EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $9
+ EVENT_DISP VICTORY_ROAD_1_WIDTH, $1, $1 ; VICTORY_ROAD_2
VictoryRoad1Blocks: ; 5db04 (17:5b04)
INCBIN "maps/victoryroad1.blk"
@@ -94280,9 +94280,9 @@ PokemonTower1Object: ; 0x60452 (size=58)
db SPRITE_MEDIUM, $7 + 4, $11 + 4, $ff, $d2, $5 ; person
; warp-to
- EVENT_DISP $a, $11, $a
- EVENT_DISP $a, $11, $b
- EVENT_DISP $a, $9, $12 ; POKEMONTOWER_2
+ EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $a
+ EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $b
+ EVENT_DISP POKEMONTOWER_1_WIDTH, $9, $12 ; POKEMONTOWER_2
PokemonTower1Blocks: ; 6048c (18:448c)
INCBIN "maps/pokemontower1.blk"
@@ -94489,8 +94489,8 @@ PokemonTower2Object: ; 0x60646 (size=32)
db SPRITE_MEDIUM, $7 + 4, $3 + 4, $ff, $d3, $2 ; person
; warp-to
- EVENT_DISP $a, $9, $3 ; POKEMONTOWER_3
- EVENT_DISP $a, $9, $12 ; POKEMONTOWER_1
+ EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $3 ; POKEMONTOWER_3
+ EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $12 ; POKEMONTOWER_1
PokemonTower2Blocks: ; 60666 (18:4666)
INCBIN "maps/pokemontower2.blk"
@@ -94621,8 +94621,8 @@ PokemonTower3Object: ; 0x6075d (size=51)
db SPRITE_BALL, $1 + 4, $c + 4, $ff, $ff, $84, ESCAPE_ROPE ; item
; warp-to
- EVENT_DISP $a, $9, $3 ; POKEMONTOWER_2
- EVENT_DISP $a, $9, $12 ; POKEMONTOWER_4
+ EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $3 ; POKEMONTOWER_2
+ EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $12 ; POKEMONTOWER_4
PokemonTower3Blocks: ; 60790 (18:4790)
INCBIN "maps/pokemontower3.blk"
@@ -94758,8 +94758,8 @@ PokemonTower4Object: ; 0x6088b (size=65)
db SPRITE_BALL, $10 + 4, $c + 4, $ff, $ff, $86, HP_UP ; item
; warp-to
- EVENT_DISP $a, $9, $3 ; POKEMONTOWER_5
- EVENT_DISP $a, $9, $12 ; POKEMONTOWER_3
+ EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $3 ; POKEMONTOWER_5
+ EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $12 ; POKEMONTOWER_3
PokemonTower4Blocks: ; 608cc (18:48cc)
INCBIN "maps/pokemontower4.blk"
@@ -94971,8 +94971,8 @@ PokemonTower5Object: ; 0x60a48 (size=65)
db SPRITE_BALL, $e + 4, $6 + 4, $ff, $ff, $86, NUGGET ; item
; warp-to
- EVENT_DISP $a, $9, $3 ; POKEMONTOWER_4
- EVENT_DISP $a, $9, $12 ; POKEMONTOWER_6
+ EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $3 ; POKEMONTOWER_4
+ EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $12 ; POKEMONTOWER_6
PokemonTower5Blocks: ; 60a89 (18:4a89)
INCBIN "maps/pokemontower5.blk"
@@ -95217,8 +95217,8 @@ PokemonTower6Object: ; 0x60c5b (size=58)
db SPRITE_BALL, $e + 4, $e + 4, $ff, $ff, $85, X_ACCURACY ; item
; warp-to
- EVENT_DISP $a, $9, $12 ; POKEMONTOWER_5
- EVENT_DISP $a, $10, $9 ; POKEMONTOWER_7
+ EVENT_DISP POKEMONTOWER_6_WIDTH, $9, $12 ; POKEMONTOWER_5
+ EVENT_DISP POKEMONTOWER_6_WIDTH, $10, $9 ; POKEMONTOWER_7
PokemonTower6Blocks: ; 60c95 (18:4c95)
INCBIN "maps/pokemontower6.blk"
@@ -95530,7 +95530,7 @@ PokemonTower7Object: ; 0x60ef6 (size=42)
db SPRITE_MR_FUJI, $3 + 4, $a + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $a, $10, $9 ; POKEMONTOWER_6
+ EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6
PokemonTower7Blocks: ; 60f20 (18:4f20)
INCBIN "maps/pokemontower7.blk"
@@ -95581,12 +95581,12 @@ CeladonMart1Object: ; 0x60f9e (size=64)
db SPRITE_CABLE_CLUB_WOMAN, $3 + 4, $8 + 4, $ff, $d0, $1 ; person
; warp-to
- EVENT_DISP $a, $7, $2
- EVENT_DISP $a, $7, $3
- EVENT_DISP $a, $7, $10
- EVENT_DISP $a, $7, $11
- EVENT_DISP $a, $1, $c ; CELADON_MART_2
- EVENT_DISP $a, $1, $1 ; CELADON_MART_ELEVATOR
+ EVENT_DISP CELADON_MART_1_WIDTH, $7, $2
+ EVENT_DISP CELADON_MART_1_WIDTH, $7, $3
+ EVENT_DISP CELADON_MART_1_WIDTH, $7, $10
+ EVENT_DISP CELADON_MART_1_WIDTH, $7, $11
+ EVENT_DISP CELADON_MART_1_WIDTH, $1, $c ; CELADON_MART_2
+ EVENT_DISP CELADON_MART_1_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
CeladonMart1Blocks: ; 60fde (18:4fde)
INCBIN "maps/celadonmart1.blk"
@@ -95902,12 +95902,12 @@ ViridianForestObject: ; 0x611da (size=127)
db SPRITE_BUG_CATCHER, $28 + 4, $1b + 4, $ff, $ff, $8 ; person
; warp-to
- EVENT_DISP $11, $0, $1 ; VIRIDIAN_FOREST_EXIT
- EVENT_DISP $11, $0, $2 ; VIRIDIAN_FOREST_EXIT
- EVENT_DISP $11, $2f, $f ; VIRIDIAN_FOREST_ENTRANCE
- EVENT_DISP $11, $2f, $10 ; VIRIDIAN_FOREST_ENTRANCE
- EVENT_DISP $11, $2f, $11 ; VIRIDIAN_FOREST_ENTRANCE
- EVENT_DISP $11, $2f, $12 ; VIRIDIAN_FOREST_ENTRANCE
+ EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $1 ; VIRIDIAN_FOREST_EXIT
+ EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $2 ; VIRIDIAN_FOREST_EXIT
+ EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $f ; VIRIDIAN_FOREST_ENTRANCE
+ EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $10 ; VIRIDIAN_FOREST_ENTRANCE
+ EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $11 ; VIRIDIAN_FOREST_ENTRANCE
+ EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $12 ; VIRIDIAN_FOREST_ENTRANCE
SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95)
db $0d ; tileset
@@ -95955,17 +95955,17 @@ SSAnne1Object: ; 0x61277 (size=104)
db SPRITE_SAILOR, $5 + 4, $1b + 4, $ff, $ff, $2 ; person
; warp-to
- EVENT_DISP $14, $0, $1a ; VERMILION_DOCK
- EVENT_DISP $14, $0, $1b ; VERMILION_DOCK
- EVENT_DISP $14, $8, $1f ; SS_ANNE_8
- EVENT_DISP $14, $8, $17 ; SS_ANNE_8
- EVENT_DISP $14, $8, $13 ; SS_ANNE_8
- EVENT_DISP $14, $8, $f ; SS_ANNE_8
- EVENT_DISP $14, $8, $b ; SS_ANNE_8
- EVENT_DISP $14, $8, $7 ; SS_ANNE_8
- EVENT_DISP $14, $6, $2 ; SS_ANNE_2
- EVENT_DISP $14, $f, $25 ; SS_ANNE_4
- EVENT_DISP $14, $10, $3 ; SS_ANNE_6
+ EVENT_DISP SS_ANNE_1_WIDTH, $0, $1a ; VERMILION_DOCK
+ EVENT_DISP SS_ANNE_1_WIDTH, $0, $1b ; VERMILION_DOCK
+ EVENT_DISP SS_ANNE_1_WIDTH, $8, $1f ; SS_ANNE_8
+ EVENT_DISP SS_ANNE_1_WIDTH, $8, $17 ; SS_ANNE_8
+ EVENT_DISP SS_ANNE_1_WIDTH, $8, $13 ; SS_ANNE_8
+ EVENT_DISP SS_ANNE_1_WIDTH, $8, $f ; SS_ANNE_8
+ EVENT_DISP SS_ANNE_1_WIDTH, $8, $b ; SS_ANNE_8
+ EVENT_DISP SS_ANNE_1_WIDTH, $8, $7 ; SS_ANNE_8
+ EVENT_DISP SS_ANNE_1_WIDTH, $6, $2 ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_1_WIDTH, $f, $25 ; SS_ANNE_4
+ EVENT_DISP SS_ANNE_1_WIDTH, $10, $3 ; SS_ANNE_6
SSAnne1Blocks: ; 612df (18:52df)
INCBIN "maps/ssanne1.blk"
@@ -96209,15 +96209,15 @@ SSAnne2Object: ; 0x61514 (size=90)
db SPRITE_BLUE, $4 + 4, $24 + 4, $ff, $d0, $42, SONY1 + $C8, $1 ; trainer
; warp-to
- EVENT_DISP $14, $b, $9 ; SS_ANNE_9
- EVENT_DISP $14, $b, $d ; SS_ANNE_9
- EVENT_DISP $14, $b, $11 ; SS_ANNE_9
- EVENT_DISP $14, $b, $15 ; SS_ANNE_9
- EVENT_DISP $14, $b, $19 ; SS_ANNE_9
- EVENT_DISP $14, $b, $1d ; SS_ANNE_9
- EVENT_DISP $14, $4, $2 ; SS_ANNE_1
- EVENT_DISP $14, $c, $2 ; SS_ANNE_3
- EVENT_DISP $14, $4, $24 ; SS_ANNE_7
+ EVENT_DISP SS_ANNE_2_WIDTH, $b, $9 ; SS_ANNE_9
+ EVENT_DISP SS_ANNE_2_WIDTH, $b, $d ; SS_ANNE_9
+ EVENT_DISP SS_ANNE_2_WIDTH, $b, $11 ; SS_ANNE_9
+ EVENT_DISP SS_ANNE_2_WIDTH, $b, $15 ; SS_ANNE_9
+ EVENT_DISP SS_ANNE_2_WIDTH, $b, $19 ; SS_ANNE_9
+ EVENT_DISP SS_ANNE_2_WIDTH, $b, $1d ; SS_ANNE_9
+ EVENT_DISP SS_ANNE_2_WIDTH, $4, $2 ; SS_ANNE_1
+ EVENT_DISP SS_ANNE_2_WIDTH, $c, $2 ; SS_ANNE_3
+ EVENT_DISP SS_ANNE_2_WIDTH, $4, $24 ; SS_ANNE_7
SSAnne2Blocks: ; 6156e (18:556e)
INCBIN "maps/ssanne2.blk"
@@ -96251,12 +96251,12 @@ SSAnne4Object: ; 0x61632 (size=52)
db $0 ; people
; warp-to
- EVENT_DISP $f, $3, $17 ; SS_ANNE_10
- EVENT_DISP $f, $3, $13 ; SS_ANNE_10
- EVENT_DISP $f, $3, $f ; SS_ANNE_10
- EVENT_DISP $f, $3, $b ; SS_ANNE_10
- EVENT_DISP $f, $3, $7 ; SS_ANNE_10
- EVENT_DISP $f, $5, $1b ; SS_ANNE_1
+ EVENT_DISP SS_ANNE_4_WIDTH, $3, $17 ; SS_ANNE_10
+ EVENT_DISP SS_ANNE_4_WIDTH, $3, $13 ; SS_ANNE_10
+ EVENT_DISP SS_ANNE_4_WIDTH, $3, $f ; SS_ANNE_10
+ EVENT_DISP SS_ANNE_4_WIDTH, $3, $b ; SS_ANNE_10
+ EVENT_DISP SS_ANNE_4_WIDTH, $3, $7 ; SS_ANNE_10
+ EVENT_DISP SS_ANNE_4_WIDTH, $5, $1b ; SS_ANNE_1
SSAnne4Blocks: ; 61666 (18:5666)
INCBIN "maps/ssanne4.blk"
@@ -96375,8 +96375,8 @@ SSAnne5Object: ; 0x6172b (size=54)
db SPRITE_SAILOR, $8 + 4, $a + 4, $ff, $d1, $45, SAILOR + $C8, $2 ; trainer
; warp-to
- EVENT_DISP $a, $6, $d ; SS_ANNE_3
- EVENT_DISP $a, $7, $d ; SS_ANNE_3
+ EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3
+ EVENT_DISP SS_ANNE_5_WIDTH, $7, $d ; SS_ANNE_3
SSAnne5Blocks: ; 61761 (18:5761)
INCBIN "maps/ssanne5.blk"
@@ -96479,7 +96479,7 @@ SSAnne6Object: ; 0x6181b (size=54)
db SPRITE_COOK, $d + 4, $b + 4, $ff, $d1, $7 ; person
; warp-to
- EVENT_DISP $7, $0, $6 ; SS_ANNE_1
+ EVENT_DISP SS_ANNE_6_WIDTH, $0, $6 ; SS_ANNE_1
SSAnne6Blocks: ; 61851 (18:5851)
INCBIN "maps/ssanne6.blk"
@@ -96602,7 +96602,7 @@ SSAnne7Object: ; 0x61946 (size=24)
db SPRITE_SS_CAPTAIN, $2 + 4, $4 + 4, $ff, $d1, $1 ; person
; warp-to
- EVENT_DISP $3, $7, $0 ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_7_WIDTH, $7, $0 ; SS_ANNE_2
SSAnne7Blocks: ; 6195e (18:595e)
INCBIN "maps/ssanne7.blk"
@@ -96806,12 +96806,12 @@ SSAnne8Object: ; 0x61a60 (size=127)
db SPRITE_GENTLEMAN, $d + 4, $15 + 4, $fe, $2, $b ; person
; warp-to
- EVENT_DISP $c, $0, $0 ; SS_ANNE_1
- EVENT_DISP $c, $0, $a ; SS_ANNE_1
- EVENT_DISP $c, $0, $14 ; SS_ANNE_1
- EVENT_DISP $c, $a, $0 ; SS_ANNE_1
- EVENT_DISP $c, $a, $a ; SS_ANNE_1
- EVENT_DISP $c, $a, $14 ; SS_ANNE_1
+ EVENT_DISP SS_ANNE_8_WIDTH, $0, $0 ; SS_ANNE_1
+ EVENT_DISP SS_ANNE_8_WIDTH, $0, $a ; SS_ANNE_1
+ EVENT_DISP SS_ANNE_8_WIDTH, $0, $14 ; SS_ANNE_1
+ EVENT_DISP SS_ANNE_8_WIDTH, $a, $0 ; SS_ANNE_1
+ EVENT_DISP SS_ANNE_8_WIDTH, $a, $a ; SS_ANNE_1
+ EVENT_DISP SS_ANNE_8_WIDTH, $a, $14 ; SS_ANNE_1
SSAnne8Blocks: ; 61adf (18:5adf)
INCBIN "maps/ssanne8.blk"
@@ -97075,18 +97075,18 @@ SSAnne9Object: ; 0x61c8d (size=188)
db SPRITE_FOULARD_WOMAN, $c + 4, $14 + 4, $ff, $d3, $d ; person
; warp-to
- EVENT_DISP $c, $5, $2 ; SS_ANNE_2
- EVENT_DISP $c, $5, $3 ; SS_ANNE_2
- EVENT_DISP $c, $5, $c ; SS_ANNE_2
- EVENT_DISP $c, $5, $d ; SS_ANNE_2
- EVENT_DISP $c, $5, $16 ; SS_ANNE_2
- EVENT_DISP $c, $5, $17 ; SS_ANNE_2
- EVENT_DISP $c, $f, $2 ; SS_ANNE_2
- EVENT_DISP $c, $f, $3 ; SS_ANNE_2
- EVENT_DISP $c, $f, $c ; SS_ANNE_2
- EVENT_DISP $c, $f, $d ; SS_ANNE_2
- EVENT_DISP $c, $f, $16 ; SS_ANNE_2
- EVENT_DISP $c, $f, $17 ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $5, $2 ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $5, $3 ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $5, $c ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $5, $d ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $5, $16 ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $5, $17 ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $f, $2 ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $f, $3 ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $f, $c ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $f, $d ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $f, $16 ; SS_ANNE_2
+ EVENT_DISP SS_ANNE_9_WIDTH, $f, $17 ; SS_ANNE_2
SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104)
db $0d ; tileset
@@ -97329,16 +97329,16 @@ SSAnne10Object: ; 0x61e75 (size=165)
db SPRITE_BALL, $b + 4, $c + 4, $ff, $ff, $8b, MAX_POTION ; item
; warp-to
- EVENT_DISP $c, $5, $2 ; SS_ANNE_4
- EVENT_DISP $c, $5, $3 ; SS_ANNE_4
- EVENT_DISP $c, $5, $c ; SS_ANNE_4
- EVENT_DISP $c, $5, $d ; SS_ANNE_4
- EVENT_DISP $c, $5, $16 ; SS_ANNE_4
- EVENT_DISP $c, $5, $17 ; SS_ANNE_4
- EVENT_DISP $c, $f, $2 ; SS_ANNE_4
- EVENT_DISP $c, $f, $3 ; SS_ANNE_4
- EVENT_DISP $c, $f, $c ; SS_ANNE_4
- EVENT_DISP $c, $f, $d ; SS_ANNE_4
+ EVENT_DISP SS_ANNE_10_WIDTH, $5, $2 ; SS_ANNE_4
+ EVENT_DISP SS_ANNE_10_WIDTH, $5, $3 ; SS_ANNE_4
+ EVENT_DISP SS_ANNE_10_WIDTH, $5, $c ; SS_ANNE_4
+ EVENT_DISP SS_ANNE_10_WIDTH, $5, $d ; SS_ANNE_4
+ EVENT_DISP SS_ANNE_10_WIDTH, $5, $16 ; SS_ANNE_4
+ EVENT_DISP SS_ANNE_10_WIDTH, $5, $17 ; SS_ANNE_4
+ EVENT_DISP SS_ANNE_10_WIDTH, $f, $2 ; SS_ANNE_4
+ EVENT_DISP SS_ANNE_10_WIDTH, $f, $3 ; SS_ANNE_4
+ EVENT_DISP SS_ANNE_10_WIDTH, $f, $c ; SS_ANNE_4
+ EVENT_DISP SS_ANNE_10_WIDTH, $f, $d ; SS_ANNE_4
UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
db $0b ; tileset
@@ -97365,8 +97365,8 @@ UndergroundPathNSObject: ; 0x61f2a (size=20)
db $0 ; people
; warp-to
- EVENT_DISP $4, $4, $5 ; PATH_ENTRANCE_ROUTE_5
- EVENT_DISP $4, $29, $2 ; PATH_ENTRANCE_ROUTE_6
+ EVENT_DISP UNDERGROUND_PATH_NS_WIDTH, $4, $5 ; PATH_ENTRANCE_ROUTE_5
+ EVENT_DISP UNDERGROUND_PATH_NS_WIDTH, $29, $2 ; PATH_ENTRANCE_ROUTE_6
UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121)
db $0b ; tileset
@@ -97393,8 +97393,8 @@ UndergroundPathWEObject: ; 0x61f4e (size=20)
db $0 ; people
; warp-to
- EVENT_DISP $19, $5, $2 ; PATH_ENTRANCE_ROUTE_7
- EVENT_DISP $19, $2, $2f ; PATH_ENTRANCE_ROUTE_8
+ EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $5, $2 ; PATH_ENTRANCE_ROUTE_7
+ EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $2, $2f ; PATH_ENTRANCE_ROUTE_8
DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197)
db $11 ; tileset
@@ -97421,8 +97421,8 @@ DiglettsCaveObject: ; 0x61f72 (size=20)
db $0 ; people
; warp-to
- EVENT_DISP $14, $5, $5 ; DIGLETTS_CAVE_EXIT
- EVENT_DISP $14, $1f, $25 ; DIGLETTS_CAVE_ENTRANCE
+ EVENT_DISP DIGLETTS_CAVE_WIDTH, $5, $5 ; DIGLETTS_CAVE_EXIT
+ EVENT_DISP DIGLETTS_CAVE_WIDTH, $1f, $25 ; DIGLETTS_CAVE_ENTRANCE
DiglettsCaveBlocks: ; 61f86 (18:5f86)
INCBIN "maps/diglettscave.blk"
@@ -97823,10 +97823,10 @@ SilphCo11Object: ; 0x62380 (size=72)
db SPRITE_ROCKET, $9 + 4, $f + 4, $ff, $d1, $45, ROCKET + $C8, $28 ; trainer
; warp-to
- EVENT_DISP $9, $0, $9 ; SILPH_CO_10F
- EVENT_DISP $9, $0, $d ; SILPH_CO_ELEVATOR
- EVENT_DISP $9, $5, $5
- EVENT_DISP $9, $2, $3 ; SILPH_CO_7F
+ EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F
+ EVENT_DISP SILPH_CO_11F_WIDTH, $0, $d ; SILPH_CO_ELEVATOR
+ EVENT_DISP SILPH_CO_11F_WIDTH, $5, $5
+ EVENT_DISP SILPH_CO_11F_WIDTH, $2, $3 ; SILPH_CO_7F
SilphCo11Blocks: ; 623c8 (18:63c8)
INCBIN "maps/silphco11.blk"
@@ -103755,8 +103755,8 @@ PadSRAM_FF: ; 73b8f (1c:7b8f)
SECTION "bank1D",ROMX,BANK[$1D]
-CopycatsHouseF1Blocks: ; 74000 (1d:4000)
- INCBIN "maps/copycatshousef1.blk"
+CopycatsHouse1FBlocks: ; 74000 (1d:4000)
+ INCBIN "maps/copycatshouse1f.blk"
CinnabarMartBlocks: ; 74010 (1d:4010)
PewterMartBlocks: ; 74010 (1d:4010)
@@ -104953,8 +104953,8 @@ ViridianGymObject: ; 0x74bde (size=105)
db SPRITE_BALL, $9 + 4, $10 + 4, $ff, $ff, $8b, REVIVE ; item
; warp-to
- EVENT_DISP $a, $11, $10
- EVENT_DISP $a, $11, $11
+ EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $10
+ EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $11
ViridianGymBlocks: ; 74c47 (1d:4c47)
INCBIN "maps/viridiangym.blk"
@@ -105012,8 +105012,8 @@ PewterMartObject: ; 0x74cda (size=38)
db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $5 + 4, $ff, $ff, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
+ EVENT_DISP PEWTER_MART_WIDTH, $7, $3
+ EVENT_DISP PEWTER_MART_WIDTH, $7, $4
UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228)
db $11 ; tileset
@@ -105052,15 +105052,15 @@ UnknownDungeon1Object: ; 0x74d15 (size=97)
db SPRITE_BALL, $0 + 4, $5 + 4, $ff, $ff, $83, NUGGET ; item
; warp-to
- EVENT_DISP $f, $11, $18
- EVENT_DISP $f, $11, $19
- EVENT_DISP $f, $1, $1b ; UNKNOWN_DUNGEON_2
- EVENT_DISP $f, $7, $17 ; UNKNOWN_DUNGEON_2
- EVENT_DISP $f, $9, $12 ; UNKNOWN_DUNGEON_2
- EVENT_DISP $f, $1, $7 ; UNKNOWN_DUNGEON_2
- EVENT_DISP $f, $3, $1 ; UNKNOWN_DUNGEON_2
- EVENT_DISP $f, $b, $3 ; UNKNOWN_DUNGEON_2
- EVENT_DISP $f, $6, $0 ; UNKNOWN_DUNGEON_3
+ EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18
+ EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $19
+ EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $1, $1b ; UNKNOWN_DUNGEON_2
+ EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $7, $17 ; UNKNOWN_DUNGEON_2
+ EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $9, $12 ; UNKNOWN_DUNGEON_2
+ EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $1, $7 ; UNKNOWN_DUNGEON_2
+ EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $3, $1 ; UNKNOWN_DUNGEON_2
+ EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $b, $3 ; UNKNOWN_DUNGEON_2
+ EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $6, $0 ; UNKNOWN_DUNGEON_3
UnknownDungeon1Blocks: ; 74d76 (1d:4d76)
INCBIN "maps/unknowndungeon1.blk"
@@ -105196,9 +105196,9 @@ CeruleanHouse2Object: ; 0x74ebe (size=34)
db SPRITE_FAT_BALD_GUY, $3 + 4, $5 + 4, $ff, $d3, $1 ; person
; warp-to
- EVENT_DISP $4, $0, $2
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $0, $2
+ EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $2
+ EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $3
VendingMachineMenu: ; 74ee0 (1d:4ee0)
ld hl, VendingMachineText1
@@ -105382,8 +105382,8 @@ FuchsiaHouse1Object: ; 0x75031 (size=38)
db SPRITE_BUG_CATCHER, $5 + 4, $5 + 4, $ff, $ff, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
+ EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $2
+ EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $3
FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154)
db $06 ; tileset
@@ -105432,8 +105432,8 @@ FuchsiaPokecenterObject: ; 0x7507d (size=44)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $4
FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155)
db $14 ; tileset
@@ -105578,15 +105578,15 @@ FuchsiaHouse2Object: ; 0x75180 (size=45)
db SPRITE_BOULDER, $4 + 4, $8 + 4, $ff, $10, $3 ; person
; warp-to
- EVENT_DISP $5, $7, $4
- EVENT_DISP $5, $7, $5
+ EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4
+ EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $5
FuchsiaHouse2Blocks: ; 751ad (1d:51ad)
INCBIN "maps/fuchsiahouse2.blk"
SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156)
db $0c ; tileset
- db SAFARIZONEENTRANCE_HEIGHT, SAFARIZONEENTRANCE_WIDTH ; dimensions (y, x)
+ db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x)
dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts
db $00 ; connections
dw SafariZoneEntranceObject ; objects
@@ -105908,10 +105908,10 @@ SafariZoneEntranceObject: ; 0x753f5 (size=48)
db SPRITE_WHITE_PLAYER, $4 + 4, $1 + 4, $ff, $d3, $2 ; person
; warp-to
- EVENT_DISP $4, $5, $3
- EVENT_DISP $4, $5, $4
- EVENT_DISP $4, $0, $3 ; SAFARI_ZONE_CENTER
- EVENT_DISP $4, $0, $4 ; SAFARI_ZONE_CENTER
+ EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $3
+ EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $4
+ EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $0, $3 ; SAFARI_ZONE_CENTER
+ EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $0, $4 ; SAFARI_ZONE_CENTER
SafariZoneEntranceBlocks: ; 75425 (1d:5425)
INCBIN "maps/safarizoneentrance.blk"
@@ -106277,15 +106277,15 @@ FuchsiaGymObject: ; 0x75658 (size=82)
db SPRITE_GYM_HELPER, $f + 4, $7 + 4, $ff, $d0, $8 ; person
; warp-to
- EVENT_DISP $5, $11, $4
- EVENT_DISP $5, $11, $5
+ EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $4
+ EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $5
FuchsiaGymBlocks: ; 756aa (1d:56aa)
INCBIN "maps/fuchsiagym.blk"
FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158)
db $14 ; tileset
- db FUCHSIAMEETINGROOM_HEIGHT, FUCHSIAMEETINGROOM_WIDTH ; dimensions (y, x)
+ db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x)
dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts
db $00 ; connections
dw FuchsiaMeetingRoomObject ; objects
@@ -106326,8 +106326,8 @@ FuchsiaMeetingRoomObject: ; 0x756fc (size=38)
db SPRITE_WHITE_PLAYER, $1 + 4, $a + 4, $ff, $d0, $3 ; person
; warp-to
- EVENT_DISP $7, $7, $4
- EVENT_DISP $7, $7, $5
+ EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $4
+ EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $5
FuchsiaMeetingRoomBlocks: ; 75722 (1d:5722)
INCBIN "maps/fuchsiameetingroom.blk"
@@ -106840,8 +106840,8 @@ CinnabarGymObject: ; 0x75acc (size=90)
db SPRITE_GYM_HELPER, $d + 4, $10 + 4, $ff, $d0, $9 ; person
; warp-to
- EVENT_DISP $a, $11, $10
- EVENT_DISP $a, $11, $11
+ EVENT_DISP CINNABAR_GYM_WIDTH, $11, $10
+ EVENT_DISP CINNABAR_GYM_WIDTH, $11, $11
CinnabarGymBlocks: ; 75b26 (1d:5b26)
INCBIN "maps/cinnabargym.blk"
@@ -106904,11 +106904,11 @@ Lab1Object: ; 0x75bb3 (size=62)
db SPRITE_FISHER, $3 + 4, $1 + 4, $ff, $ff, $1 ; person
; warp-to
- EVENT_DISP $9, $7, $2
- EVENT_DISP $9, $7, $3
- EVENT_DISP $9, $4, $8 ; CINNABAR_LAB_2
- EVENT_DISP $9, $4, $c ; CINNABAR_LAB_3
- EVENT_DISP $9, $4, $10 ; CINNABAR_LAB_4
+ EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $2
+ EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $3
+ EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $8 ; CINNABAR_LAB_2
+ EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $c ; CINNABAR_LAB_3
+ EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $10 ; CINNABAR_LAB_4
Lab1Blocks: ; 75bf1 (1d:5bf1)
INCBIN "maps/lab1.blk"
@@ -106962,8 +106962,8 @@ Lab2Object: ; 0x75c45 (size=38)
db SPRITE_FOULARD_WOMAN, $5 + 4, $5 + 4, $ff, $d1, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $2 ; CINNABAR_LAB_1
- EVENT_DISP $4, $7, $3 ; CINNABAR_LAB_1
+ EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $2 ; CINNABAR_LAB_1
+ EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $3 ; CINNABAR_LAB_1
Lab2Blocks: ; 75c6b (1d:5c6b)
INCBIN "maps/lab2.blk"
@@ -107056,8 +107056,8 @@ Lab3Object: ; 0x75cec (size=41)
db SPRITE_OAK_AIDE, $3 + 4, $2 + 4, $fe, $2, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $2 ; CINNABAR_LAB_1
- EVENT_DISP $4, $7, $3 ; CINNABAR_LAB_1
+ EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $2 ; CINNABAR_LAB_1
+ EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $3 ; CINNABAR_LAB_1
Lab3Blocks: ; 75d15 (1d:5d15)
INCBIN "maps/lab3.blk"
@@ -107201,8 +107201,8 @@ Lab4Object: ; 0x75df0 (size=32)
db SPRITE_OAK_AIDE, $6 + 4, $7 + 4, $ff, $d1, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $2 ; CINNABAR_LAB_1
- EVENT_DISP $4, $7, $3 ; CINNABAR_LAB_1
+ EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $2 ; CINNABAR_LAB_1
+ EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $3 ; CINNABAR_LAB_1
Lab4Blocks: ; 75e10 (1d:5e10)
INCBIN "maps/lab4.blk"
@@ -107254,8 +107254,8 @@ CinnabarPokecenterObject: ; 0x75e46 (size=44)
db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
; warp-to
- EVENT_DISP $7, $7, $3
- EVENT_DISP $7, $7, $4
+ EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $3
+ EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $4
CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172)
db $02 ; tileset
@@ -107295,40 +107295,40 @@ CinnabarMartObject: ; 0x75e91 (size=38)
db SPRITE_OAK_AIDE, $4 + 4, $3 + 4, $ff, $ff, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $7, $4
+ EVENT_DISP CINNABAR_MART_WIDTH, $7, $3
+ EVENT_DISP CINNABAR_MART_WIDTH, $7, $4
-CopycatsHouseF1_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
+CopycatsHouse1F_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
db $01 ; tileset
db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x)
- dw CopycatsHouseF1Blocks, CopycatsHouseF1TextPointers, CopycatsHouseF1Script ; blocks, texts, scripts
+ dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts
db $00 ; connections
- dw CopycatsHouseF1Object ; objects
+ dw CopycatsHouse1FObject ; objects
-CopycatsHouseF1Script: ; 75ec3 (1d:5ec3)
+CopycatsHouse1FScript: ; 75ec3 (1d:5ec3)
jp EnableAutoTextBoxDrawing
-CopycatsHouseF1TextPointers: ; 75ec6 (1d:5ec6)
- dw CopycatsHouseF1Text1
- dw CopycatsHouseF1Text2
- dw CopycatsHouseF1Text3
+CopycatsHouse1FTextPointers: ; 75ec6 (1d:5ec6)
+ dw CopycatsHouse1FText1
+ dw CopycatsHouse1FText2
+ dw CopycatsHouse1FText3
-CopycatsHouseF1Text1: ; 75ecc (1d:5ecc)
- TX_FAR _CopycatsHouseF1Text1
+CopycatsHouse1FText1: ; 75ecc (1d:5ecc)
+ TX_FAR _CopycatsHouse1FText1
db "@"
-CopycatsHouseF1Text2: ; 75ed1 (1d:5ed1)
- TX_FAR _CopycatsHouseF1Text2
+CopycatsHouse1FText2: ; 75ed1 (1d:5ed1)
+ TX_FAR _CopycatsHouse1FText2
db "@"
-CopycatsHouseF1Text3: ; 75ed6 (1d:5ed6)
- TX_FAR _CopycatsHouseF1Text3
+CopycatsHouse1FText3: ; 75ed6 (1d:5ed6)
+ TX_FAR _CopycatsHouse1FText3
db $8
ld a, CHANSEY
call PlayCry
jp TextScriptEnd
-CopycatsHouseF1Object: ; 0x75ee3 (size=46)
+CopycatsHouse1FObject: ; 0x75ee3 (size=46)
db $a ; border tile
db $3 ; warps
@@ -107344,9 +107344,9 @@ CopycatsHouseF1Object: ; 0x75ee3 (size=46)
db SPRITE_CLEFAIRY, $4 + 4, $1 + 4, $fe, $1, $3 ; person
; warp-to
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $3
- EVENT_DISP $4, $1, $7 ; COPYCATS_HOUSE_2F
+ EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $2
+ EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $3
+ EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $1, $7 ; COPYCATS_HOUSE_2F
Gary_h: ; 75f11 (1d:5f11)
db $7 ;tileset
@@ -107669,10 +107669,10 @@ GaryObject: ; 0x7612f (size=48)
db SPRITE_OAK, $7 + 4, $3 + 4, $ff, $d1, $2 ; person
; warp-to
- EVENT_DISP $4, $7, $3 ; LANCES_ROOM
- EVENT_DISP $4, $7, $4 ; LANCES_ROOM
- EVENT_DISP $4, $0, $3 ; HALL_OF_FAME
- EVENT_DISP $4, $0, $4 ; HALL_OF_FAME
+ EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $3 ; LANCES_ROOM
+ EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $4 ; LANCES_ROOM
+ EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $3 ; HALL_OF_FAME
+ EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $4 ; HALL_OF_FAME
GaryBlocks: ; 7615f (1d:615f)
INCBIN "maps/gary.blk"
@@ -107853,10 +107853,10 @@ LoreleiObject: ; 0x76280 (size=44)
db SPRITE_LORELEI, $2 + 4, $5 + 4, $ff, $d0, $41, LORELEI + $C8, $1 ; trainer
; warp-to
- EVENT_DISP $5, $b, $4 ; INDIGO_PLATEAU_LOBBY
- EVENT_DISP $5, $b, $5 ; INDIGO_PLATEAU_LOBBY
- EVENT_DISP $5, $0, $4 ; BRUNOS_ROOM
- EVENT_DISP $5, $0, $5 ; BRUNOS_ROOM
+ EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY
+ EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $5 ; INDIGO_PLATEAU_LOBBY
+ EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $4 ; BRUNOS_ROOM
+ EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $5 ; BRUNOS_ROOM
LoreleiBlocks: ; 762ac (1d:62ac)
INCBIN "maps/lorelei.blk"
@@ -108038,10 +108038,10 @@ BrunoObject: ; 0x763d7 (size=44)
db SPRITE_BRUNO, $2 + 4, $5 + 4, $ff, $d0, $41, BRUNO + $C8, $1 ; trainer
; warp-to
- EVENT_DISP $5, $b, $4 ; LORELEIS_ROOM
- EVENT_DISP $5, $b, $5 ; LORELEIS_ROOM
- EVENT_DISP $5, $0, $4 ; AGATHAS_ROOM
- EVENT_DISP $5, $0, $5 ; AGATHAS_ROOM
+ EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM
+ EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $5 ; LORELEIS_ROOM
+ EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $4 ; AGATHAS_ROOM
+ EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $5 ; AGATHAS_ROOM
BrunoBlocks: ; 76403 (1d:6403)
INCBIN "maps/bruno.blk"
@@ -108226,10 +108226,10 @@ AgathaObject: ; 0x76534 (size=44)
db SPRITE_AGATHA, $2 + 4, $5 + 4, $ff, $d0, $41, AGATHA + $C8, $1 ; trainer
; warp-to
- EVENT_DISP $5, $b, $4 ; BRUNOS_ROOM
- EVENT_DISP $5, $b, $5 ; BRUNOS_ROOM
- EVENT_DISP $5, $0, $4 ; LANCES_ROOM
- EVENT_DISP $5, $0, $5 ; LANCES_ROOM
+ EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $4 ; BRUNOS_ROOM
+ EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $5 ; BRUNOS_ROOM
+ EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $4 ; LANCES_ROOM
+ EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $5 ; LANCES_ROOM
AgathaBlocks: ; 76560 (1d:6560)
INCBIN "maps/agatha.blk"
@@ -108401,7 +108401,7 @@ HiddenItemCoords: ; 766b8 (1d:66b8)
db ROUTE_13,$0e,$01
db ROUTE_13,$0d,$10
db MANSION_4,$09,$01
- db SAFARIZONEENTRANCE,$01,$0a
+ db SAFARI_ZONE_ENTRANCE,$01,$0a
db SAFARI_ZONE_WEST,$05,$06
db SILPH_CO_5F,$03,$0c
db SILPH_CO_9F,$0f,$02
diff --git a/maps/copycatshousef1.blk b/maps/copycatshouse1f.blk
index 1b7d4f07..1b7d4f07 100644
--- a/maps/copycatshousef1.blk
+++ b/maps/copycatshouse1f.blk
diff --git a/maps/copycatshousef2.blk b/maps/copycatshouse2f.blk
index dd9d1ea4..dd9d1ea4 100644
--- a/maps/copycatshousef2.blk
+++ b/maps/copycatshouse2f.blk
diff --git a/maps/museumf1.blk b/maps/museum1f.blk
index a96771ba..a96771ba 100644
--- a/maps/museumf1.blk
+++ b/maps/museum1f.blk
Binary files differ
diff --git a/maps/museumf2.blk b/maps/museum2f.blk
index 355e5d80..355e5d80 100644
--- a/maps/museumf2.blk
+++ b/maps/museum2f.blk
Binary files differ
diff --git a/maps/route16gatemap.blk b/maps/route16gate.blk
index 9cd90e33..9cd90e33 100644
--- a/maps/route16gatemap.blk
+++ b/maps/route16gate.blk
Binary files differ
diff --git a/text/maps/cerulean_trade_house.asm b/text/maps/cerulean_trade_house.asm
index 7ed628fa..78c9f76a 100644
--- a/text/maps/cerulean_trade_house.asm
+++ b/text/maps/cerulean_trade_house.asm
@@ -1,4 +1,4 @@
-_CeruleanHouseText1:: ; 9888c (26:488c)
+_CeruleanHouse1Text1:: ; 9888c (26:488c)
text "My husband likes"
line "trading #MON."
diff --git a/text/maps/copycats_house_1f.asm b/text/maps/copycats_house_1f.asm
index 872d52fc..0af104a4 100644
--- a/text/maps/copycats_house_1f.asm
+++ b/text/maps/copycats_house_1f.asm
@@ -1,11 +1,11 @@
-_CopycatsHouseF1Text1:: ; a14f7 (28:54f7)
+_CopycatsHouse1FText1:: ; a14f7 (28:54f7)
text "My daughter is so"
line "self-centered."
cont "She only has a"
cont "few friends."
done
-_CopycatsHouseF1Text2:: ; a1535 (28:5535)
+_CopycatsHouse1FText2:: ; a1535 (28:5535)
text "My daughter likes"
line "to mimic people."
@@ -15,7 +15,7 @@ _CopycatsHouseF1Text2:: ; a1535 (28:5535)
cont "around here!"
done
-_CopycatsHouseF1Text3:: ; a1596 (28:5596)
+_CopycatsHouse1FText3:: ; a1596 (28:5596)
text "CHANSEY: Chaan!"
line "Sii!@@"
diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm
index 0f429f57..c818f034 100644
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/copycats_house_2f.asm
@@ -58,7 +58,7 @@ _TM31NoRoomText:: ; a1733 (28:5733)
text "Don't you want"
line "this?@@"
-_CopycatsHouseF2Text2:: ; a1749 (28:5749)
+_CopycatsHouse2FText2:: ; a1749 (28:5749)
text "DODUO: Giiih!"
para "MIRROR MIRROR ON"
@@ -67,13 +67,13 @@ _CopycatsHouseF2Text2:: ; a1749 (28:5749)
cont "OF ALL?"
done
-_CopycatsHouseF2Text3:: ; a1792 (28:5792)
+_CopycatsHouse2FText3:: ; a1792 (28:5792)
text "This is a rare"
line "#MON! Huh?"
cont "It's only a doll!"
done
-_CopycatsHouseF2Text6:: ; a17be (28:57be)
+_CopycatsHouse2FText6:: ; a17be (28:57be)
text "A game with MARIO"
line "wearing a bucket"
cont "on his head!"
diff --git a/text/maps/museum_2f.asm b/text/maps/museum_2f.asm
index b986d823..7594c797 100644
--- a/text/maps/museum_2f.asm
+++ b/text/maps/museum_2f.asm
@@ -1,11 +1,11 @@
-_MuseumF2Text1:: ; 96841 (25:6841)
+_Museum2FText1:: ; 96841 (25:6841)
text "MOON STONE?"
para "What's so special"
line "about it?"
done
-_MuseumF2Text2:: ; 96869 (25:6869)
+_Museum2FText2:: ; 96869 (25:6869)
text "July 20, 1969!"
para "The 1st lunar"
@@ -15,12 +15,12 @@ _MuseumF2Text2:: ; 96869 (25:6869)
line "TV to watch it!"
done
-_MuseumF2Text3:: ; 968b1 (25:68b1)
+_Museum2FText3:: ; 968b1 (25:68b1)
text "We have a space"
line "exhibit now."
done
-_MuseumF2Text4:: ; 968cf (25:68cf)
+_Museum2FText4:: ; 968cf (25:68cf)
text "I want a PIKACHU!"
line "It's so cute!"
@@ -28,17 +28,17 @@ _MuseumF2Text4:: ; 968cf (25:68cf)
line "to catch me one!"
done
-_MuseumF2Text5:: ; 96911 (25:6911)
+_Museum2FText5:: ; 96911 (25:6911)
text "Yeah, a PIKACHU"
line "soon, I promise!"
done
-_MuseumF2Text6:: ; 96933 (25:6933)
+_Museum2FText6:: ; 96933 (25:6933)
text "SPACE SHUTTLE"
line "COLUMBIA"
done
-_MuseumF2Text7:: ; 9694b (25:694b)
+_Museum2FText7:: ; 9694b (25:694b)
text "Meteorite that"
line "fell on MT.MOON."
cont "(MOON STONE?)"
diff --git a/text/maps/route_16_gate.asm b/text/maps/route_16_gate.asm
index b83bbf50..22ac6788 100644
--- a/text/maps/route_16_gate.asm
+++ b/text/maps/route_16_gate.asm
@@ -16,7 +16,7 @@ _UnnamedText_49781:: ; 8cd0e (23:4d0e)
line "up please!"
done
-_Route16GateMapText2:: ; 8cd2a (23:4d2a)
+_Route16GateText2:: ; 8cd2a (23:4d2a)
text "How'd you get in?"
line "Good effort!"
done
diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/viridian_forest_exit.asm
index 6cfb5ee0..e74474e9 100644
--- a/text/maps/viridian_forest_exit.asm
+++ b/text/maps/viridian_forest_exit.asm
@@ -1,4 +1,4 @@
-_ViridianForestexitText1:: ; 8a6fd (22:66fd)
+_ViridianForestExitText1:: ; 8a6fd (22:66fd)
text "Many #MON live"
line "only in forests "
cont "and caves."
@@ -8,7 +8,7 @@ _ViridianForestexitText1:: ; 8a6fd (22:66fd)
cont "different kinds!"
done
-_ViridianForestexitText2:: ; 8a75d (22:675d)
+_ViridianForestExitText2:: ; 8a75d (22:675d)
text "Have you noticed"
line "the bushes on the"
cont "roadside?"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-05 23:02:32 +0000