mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-20 22:28:41 +13:00
More bug fixes!
- The Zapdos in Brunswick Glade now vanish correctly, due to fixing a desync in the hide/show data - Brunswick Glade's palette displays correctly - Improved Citrine City's theme a little - Changed palettes for Cryithan's line to reflect their upcoming redesign - Updated Cryithan's sprite
This commit is contained in:
Martha Schilling
parent
6e3a81a163
commit
21b3f0f5a7
13 changed files with 207 additions and 296 deletions
|
|
@ -286,7 +286,7 @@ CeruleanCityHS:
|
|||
db CERULEAN_CITY, $0A, SHOW ; HS_CERULEAN_CAVE_GUY
|
||||
db CERULEAN_CITY, $0B, SHOW ; HS_CERULEAN_GUARD_2
|
||||
VermilionCityHS:
|
||||
db VERMILION_CITY, $07, HIDE ; HS_VERMILION_JENNY
|
||||
db VERMILION_CITY, $07, HIDE ; HS_VERMILION_JENNY
|
||||
SaffronCityHS:
|
||||
db SAFFRON_CITY, $01, SHOW ; HS_SAFFRON_CITY_1
|
||||
db SAFFRON_CITY, $02, SHOW ; HS_SAFFRON_CITY_2
|
||||
|
|
@ -304,6 +304,8 @@ SaffronCityHS:
|
|||
db SAFFRON_CITY, $0E, SHOW ; HS_SAFFRON_CITY_E
|
||||
db SAFFRON_CITY, $0F, HIDE ; HS_SAFFRON_CITY_F
|
||||
db SAFFRON_CITY, $1A, HIDE ; HS_SAFFRON_CITY_UP_GRADE
|
||||
Route1HS:
|
||||
db ROUTE_1, $03, HIDE ; HS_ROUTE_1_OAK
|
||||
Route2HS:
|
||||
db ROUTE_2, $01, SHOW ; HS_ROUTE_2_ITEM_1
|
||||
db ROUTE_2, $02, SHOW ; HS_ROUTE_2_ITEM_2
|
||||
|
|
@ -325,7 +327,7 @@ Route22HS:
|
|||
Route24HS:
|
||||
db ROUTE_24, $01, SHOW ; HS_NUGGET_BRIDGE_GUY
|
||||
db ROUTE_24, $08, SHOW ; HS_ROUTE_24_ITEM
|
||||
db ROUTE_24, $09, HIDE ; HS_DAMIEN
|
||||
db ROUTE_24, $09, HIDE ; HS_DAMIEN
|
||||
Route25HS:
|
||||
db ROUTE_25, $0A, SHOW ; HS_ROUTE_25_ITEM
|
||||
BrunswickTrailHS:
|
||||
|
|
@ -474,7 +476,7 @@ RocketHideoutB4FHS:
|
|||
db ROCKET_HIDEOUT_B4F, $08, HIDE ; HS_ROCKET_HIDEOUT_B4F_ITEM_4
|
||||
db ROCKET_HIDEOUT_B4F, $09, HIDE ; HS_ROCKET_HIDEOUT_B4F_ITEM_5
|
||||
GarnetCavernB1FHS:
|
||||
db GARNET_CAVERN_B1F, $01, SHOW ; HS_GARNET_ARTICUNO_G, SHOW for testing reasons
|
||||
db GARNET_CAVERN_B1F, $01, SHOW ; HS_GARNET_ARTICUNO_G
|
||||
db GARNET_CAVERN_B1F, $02, SHOW ; HS_GARNET_ITEM_1
|
||||
db GARNET_CAVERN_B1F, $03, SHOW ; HS_GARNET_ITEM_2
|
||||
db GARNET_CAVERN_B1F, $04, SHOW ; HS_ARTICUNO_G_COPY_1
|
||||
|
|
@ -512,10 +514,6 @@ SilphCo7FHS:
|
|||
db SILPH_CO_7F, $09, SHOW ; HS_SILPH_CO_7F_RIVAL
|
||||
db SILPH_CO_7F, $0A, SHOW ; HS_SILPH_CO_7F_ITEM_1
|
||||
db SILPH_CO_7F, $0B, SHOW ; HS_SILPH_CO_7F_ITEM_2
|
||||
;SilphCo8FHS:
|
||||
; db SILPH_CO_8F, $02, SHOW ; HS_SILPH_CO_8F_1
|
||||
; db SILPH_CO_8F, $03, SHOW ; HS_SILPH_CO_8F_2
|
||||
; db SILPH_CO_8F, $04, SHOW ; HS_SILPH_CO_8F_3
|
||||
SilphCo10FHS:
|
||||
db SILPH_CO_10F, $01, SHOW ; HS_SILPH_CO_10F_1
|
||||
db SILPH_CO_10F, $02, SHOW ; HS_SILPH_CO_10F_2
|
||||
|
|
@ -596,27 +594,24 @@ FarawayIslandInsideHS:
|
|||
PokemonMansionB2FHS:
|
||||
db POKEMON_MANSION_B2F, $03, SHOW ; HS_POKEMON_MANSION_B2F_ITEM_1
|
||||
db POKEMON_MANSION_B2F, $04, SHOW ; HS_POKEMON_MANSION_B2F_ITEM_2
|
||||
Route1HS:
|
||||
db ROUTE_1, $03, HIDE ; HS_ROUTE_1_OAK
|
||||
MtMoonCraterHS:
|
||||
db MT_MOON_CRATER, $01, SHOW ; HS_MT_MOON_CRATER_ITEM_1
|
||||
db MT_MOON_CRATER, $02, SHOW ; HS_MT_MOON_CRATER_ITEM_2
|
||||
db MT_MOON_CRATER, $03, SHOW ; HS_MT_MOON_CRATER_ITEM_3
|
||||
db MT_MOON_CRATER, $04, SHOW ; HS_MT_MOON_CRATER_ITEM_4
|
||||
GiovannisRoomHS:
|
||||
db GIOVANNIS_ROOM, $05, SHOW ; HS_GIOVANNIS_ROOM_ITEM_1
|
||||
db GIOVANNIS_ROOM, $06, SHOW ; HS_GIOVANNIS_ROOM_ITEM_2
|
||||
RockTunnelB1FHS:
|
||||
db ROCK_TUNNEL_B1F, $0A, SHOW ; HS_ROCK_TUNNEL_B1F_DOME
|
||||
db ROCK_TUNNEL_B1F, $0B, SHOW ; HS_ROCK_TUNNEL_B1F_HELIX
|
||||
db ROCK_TUNNEL_B1F, $0C, SHOW ; HS_ROCK_TUNNEL_B1F_AMBER
|
||||
db ROCK_TUNNEL_B1F, $0D, SHOW ; HS_ROCK_TUNNEL_B1F_WING
|
||||
db ROCK_TUNNEL_B1F, $0A, SHOW ; HS_ROCK_TUNNEL_B1F_DOME
|
||||
db ROCK_TUNNEL_B1F, $0B, SHOW ; HS_ROCK_TUNNEL_B1F_HELIX
|
||||
db ROCK_TUNNEL_B1F, $0C, SHOW ; HS_ROCK_TUNNEL_B1F_AMBER
|
||||
db ROCK_TUNNEL_B1F, $0D, SHOW ; HS_ROCK_TUNNEL_B1F_WING
|
||||
MtMoonSquareHS:
|
||||
db MT_MOON_SQUARE, $04, SHOW ; HS_MT_MOON_CRATER_GUARD
|
||||
DaycareHS:
|
||||
db DAYCARE, $03, SHOW ; HS_DAYCARE_BULBASAUR
|
||||
db DAYCARE, $03, SHOW ; HS_DAYCARE_BULBASAUR
|
||||
BrunswickGladeHS:
|
||||
db BRUNSWICK_GLADE, $01, HIDE ; HS_GLADE_GZAP_1
|
||||
db BRUNSWICK_GLADE, $02, HIDE ; HS_GLADE_GZAP_2
|
||||
db BRUNSWICK_GLADE, $03, HIDE ; HS_GLADE_GZAP_3
|
||||
assert_table_length NUM_HS_OBJECTS + 1
|
||||
assert_table_length NUM_HS_OBJECTS
|
||||
|
|
|
|||
|
|
@ -57,6 +57,6 @@ PowerPlantName: db "POWER PLANT@"
|
|||
FarawayIslandName: db "FARAWAY ISLAND@"
|
||||
UnderwaterTunnelName: db "UNDERWATER TUNNEL@"
|
||||
BrunswickTrailName: db "BRUNSWICK TRAIL@"
|
||||
BrunswickGrottoName: db "BRUNSWICK GROTTO@"
|
||||
BrunswickGladeName: db "BRUNSWICK GLADE@"
|
||||
GarnetCavernName: db "GARNET CAVERN@"
|
||||
CelesteHillName: db "CELESTE HILL@"
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
BrunswickGlade_Object:
|
||||
db $3 ; border block
|
||||
db $2 ; border block
|
||||
|
||||
def_warp_events
|
||||
warp_event 19, 39, BRUNSWICK_TRAIL, 2
|
||||
warp_event 18, 39, BRUNSWICK_TRAIL, 2
|
||||
warp_event 9, 0, BRUNSWICK_GROTTO, 2
|
||||
warp_event 19, 39, BRUNSWICK_TRAIL, 2
|
||||
warp_event 8, 0, BRUNSWICK_GROTTO, 1
|
||||
warp_event 9, 0, BRUNSWICK_GROTTO, 2
|
||||
|
||||
def_bg_events
|
||||
bg_event 14, 24, 4
|
||||
|
||||
def_object_events
|
||||
object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1
|
||||
object_event 15, 8, SPRITE_BIRD, STAY, RIGHT, 2
|
||||
object_event 19, 18, SPRITE_BIRD, STAY, RIGHT, 3
|
||||
object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2
|
||||
object_event 14, 8, SPRITE_BIRD, STAY, RIGHT, 3
|
||||
|
||||
def_warps_to BRUNSWICK_GLADE
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
BrunswickGrotto_Object:
|
||||
db $3 ; border block
|
||||
db $2 ; border block
|
||||
|
||||
def_warp_events
|
||||
warp_event 24, 23, BRUNSWICK_GLADE, 3
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
CelesteHill_Object:
|
||||
db $0 ; border block
|
||||
db $2 ; border block
|
||||
|
||||
def_warp_events
|
||||
warp_event 10, 21, CELESTE_HILL_OUTSIDE, 7
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
CelesteHillOutside_Object:
|
||||
db $3 ; border block
|
||||
db $2 ; border block
|
||||
|
||||
def_warp_events
|
||||
warp_event 18, 35, CITRINE_CITY, 5
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ InternalMapEntries:
|
|||
internal_map CELADON_HOTEL, 7, 5, CeladonCityName
|
||||
internal_map LAVENDER_POKECENTER, 14, 5, LavenderTownName
|
||||
internal_map POKEMON_TOWER_2F, 15, 5, PokemonTowerName
|
||||
internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGrottoName
|
||||
internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGladeName
|
||||
internal_map POKEMON_TOWER_7F, 15, 5, PokemonTowerName
|
||||
internal_map LAVENDER_CUBONE_HOUSE, 14, 5, LavenderTownName
|
||||
internal_map WARDENS_HOUSE, 8, 13, FuchsiaCityName
|
||||
|
|
@ -138,4 +138,5 @@ InternalMapEntries:
|
|||
internal_map BATTLE_TENT, 7, 9, CitrineCityName
|
||||
internal_map MT_MOON_SQUARE_HOUSE, 6, 1, MountMoonName
|
||||
internal_map CELESTE_HILL_OUTSIDE, 7, 9, CelesteHillName
|
||||
internal_map BRUNSWICK_GLADE, 6, 10, BrunswickGladeName
|
||||
db -1 ; end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue