Backporting Tower Jessie & James

This saves a HS constant to boot, which is handy.
This commit is contained in:
Llinos Evans 2023-05-06 08:16:20 +01:00
parent cc36099e92
commit 06d2e7786e
5 changed files with 282 additions and 274 deletions

View file

@ -361,10 +361,9 @@ PokemonTower6FHS:
db POKEMON_TOWER_6F, $04, SHOW ; HS_POKEMON_TOWER_6F_ITEM_1
db POKEMON_TOWER_6F, $05, SHOW ; HS_POKEMON_TOWER_6F_ITEM_2
PokemonTower7FHS:
db POKEMON_TOWER_7F, $01, SHOW ; HS_POKEMON_TOWER_7F_ROCKET_1
db POKEMON_TOWER_7F, $02, SHOW ; HS_POKEMON_TOWER_7F_ROCKET_2
db POKEMON_TOWER_7F, $03, SHOW ; HS_POKEMON_TOWER_7F_ROCKET_3
db POKEMON_TOWER_7F, $04, SHOW ; HS_POKEMON_TOWER_7F_MR_FUJI
db POKEMON_TOWER_7F, $01, HIDE ; jessie & james?
db POKEMON_TOWER_7F, $02, HIDE
db POKEMON_TOWER_7F, $03, SHOW
MrFujisHouseHS:
db MR_FUJIS_HOUSE, $05, HIDE ; HS_MR_FUJIS_HOUSE_MR_FUJI
CeladonMansionRoofHouseHS:

View file

@ -7,9 +7,8 @@ PokemonTower7F_Object:
def_bg_events
def_object_events
object_event 9, 11, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 19
object_event 12, 9, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 20
object_event 9, 7, SPRITE_ROCKET, STAY, RIGHT, 3, OPP_ROCKET, 21
object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 4 ; person
object_event 10, 8, SPRITE_JESSIE, STAY, DOWN, 1
object_event 11, 8, SPRITE_JAMES, STAY, DOWN, 2
object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 3
def_warps_to POKEMON_TOWER_7F