thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 14:48:43 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

mini update

Browse source 
- Tiles now animate correctly while still being sped up (credit to jojobear13!)

- Fixed issues with certain cave maps being glitched after importing the new tileset for Seafoam

- Gave Celeste Hill Cave the same palette as the exterior areas

- Fixed an inconsistency in Koga's pre-fight script
This commit is contained in:
Martha Schilling 2023-11-22 12:25:46 +00:00
parent 31c17f04cd
commit 7c5c2a3047
18 changed files with 108 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

12
data/maps/hide_show_data.asm
View file

@ -358,12 +358,6 @@ PokemonTower2FHS:
db POKEMON_TOWER_2F, $01, SHOW ; HS_POKEMON_TOWER_2F_RIVAL
BrunswickGrottoHS:
db BRUNSWICK_GROTTO, $01, HIDE ; HS_BRUNSWICK_ZAPDOS_G_2
;PokemonTower3FHS:
; db POKEMON_TOWER_3F, $04, SHOW ; HS_POKEMON_TOWER_3F_ITEM
;PokemonTower4FHS:
; db POKEMON_TOWER_4F, $04, SHOW ; HS_POKEMON_TOWER_4F_ITEM_1
; db POKEMON_TOWER_4F, $05, SHOW ; HS_POKEMON_TOWER_4F_ITEM_2
; db POKEMON_TOWER_4F, $06, SHOW ; HS_POKEMON_TOWER_4F_ITEM_3
PokemonTower5FHS:
db POKEMON_TOWER_5F, $06, SHOW ; HS_POKEMON_TOWER_5F_ITEM
PokemonTower6FHS:
@ -499,9 +493,9 @@ SilphCo7FHS:
SilphCo10FHS:
db SILPH_CO_10F, $01, SHOW ; HS_SILPH_CO_10F_1
db SILPH_CO_10F, $02, SHOW ; HS_SILPH_CO_10F_2
db SILPH_CO_10F, $03, SHOW ; HS_SILPH_CO_10F_3
db SILPH_CO_10F, $04, SHOW ; HS_SILPH_CO_10F_ITEM_1
db SILPH_CO_10F, $05, SHOW ; HS_SILPH_CO_10F_ITEM_2
db SILPH_CO_10F, $03, SHOW ; HS_SILPH_CO_10F_ITEM_1
db SILPH_CO_10F, $04, SHOW ; HS_SILPH_CO_10F_ITEM_2
db SILPH_CO_10F, $05, SHOW ; HS_SILPH_CO_10F_ITEM_3
SilphCo11FHS:
db SILPH_CO_11F, $03, SHOW ; Giovanni
db SILPH_CO_11F, $04, SHOW ; James

4
data/maps/objects/CinnabarVolcano.asm
View file

@ -2,11 +2,11 @@ CinnabarVolcano_Object:
db $7d ; border block
def_warp_events
warp_event 13, 21, CINNABAR_VOLCANO_FLOORS, 9
warp_event 15, 21, CINNABAR_VOLCANO_FLOORS, 9
def_bg_events
def_object_events
object_event 14, 8, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON
object_event 15, 7, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON
def_warps_to CINNABAR_VOLCANO

2
data/maps/objects/CinnabarVolcanoFloors.asm
View file

@ -10,7 +10,7 @@ CinnabarVolcanoFloors_Object:
warp_event 5, 13, CINNABAR_VOLCANO_FLOORS, 5
warp_event 5, 3, CINNABAR_VOLCANO_FLOORS, 8
warp_event 5, 25, CINNABAR_VOLCANO_FLOORS, 7
warp_event 13, 25, CINNABAR_VOLCANO, 1
warp_event 12, 24, CINNABAR_VOLCANO, 1
def_bg_events

6
data/maps/objects/CitrineCity.asm
View file

@ -2,17 +2,17 @@ CitrineCity_Object:
db $43 ; border block
def_warp_events
warp_event 9, 27, CITRINE_ROCKET_HOUSE, 1
warp_event 9, 25, CITRINE_ROCKET_HOUSE, 1
warp_event 9, 17, CITRINE_TRADEBACK_HOUSE, 1
warp_event 15, 17, CITRINE_POKECENTER, 1
warp_event 15, 27, CITRINE_MART, 1
warp_event 15, 25, CITRINE_MART, 1
warp_event 23, 5, CELESTE_HILL_GATE, 4
warp_event 11, 7, BATTLE_TENT, 1
warp_event 26, 31, CITRINE_FERRY_DOCK, 1
warp_event 27, 31, CITRINE_FERRY_DOCK, 1
def_bg_events
bg_event 16, 27, 5 ; Citrine Shop
bg_event 16, 25, 5 ; Citrine Shop
bg_event 16, 17, 6 ; Pokecenter
bg_event 20, 22, 7 ; Billboard 1
bg_event 5, 18, 8 ; Billboard 2

16
data/tilesets/spinner_tiles.asm
View file

@ -13,17 +13,17 @@ FacilitySpinnerArrows:
spinner SpinnerArrowAnimTiles, 1, $21
spinner SpinnerArrowAnimTiles, 2, $30
spinner SpinnerArrowAnimTiles, 3, $31
spinner Facility_GFX, $20, $20
spinner Facility_GFX, $21, $21
spinner Facility_GFX, $30, $30
spinner Facility_GFX, $31, $31
spinner SpinnerArrowAnimTiles, 4, $20
spinner SpinnerArrowAnimTiles, 5, $21
spinner SpinnerArrowAnimTiles, 6, $30
spinner SpinnerArrowAnimTiles, 7, $31
GymSpinnerArrows:
spinner SpinnerArrowAnimTiles, 1, $3c
spinner SpinnerArrowAnimTiles, 3, $3d
spinner SpinnerArrowAnimTiles, 0, $4c
spinner SpinnerArrowAnimTiles, 2, $4d
spinner Gym_GFX, $3c, $3c
spinner Gym_GFX, $3d, $3d
spinner Gym_GFX, $4c, $4c
spinner Gym_GFX, $4d, $4d
spinner SpinnerArrowAnimTiles, 5, $3c
spinner SpinnerArrowAnimTiles, 7, $3d
spinner SpinnerArrowAnimTiles, 4, $4c
spinner SpinnerArrowAnimTiles, 6, $4d