thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rocket hideout improvements/changes

Browse source
This commit is contained in:
MementoMartha 2022-10-01 11:38:00 +01:00
parent 74c0622040
commit 91344e05e8
13 changed files with 182 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/hide_show_data.asm
View file

@ -431,8 +431,8 @@ VictoryRoad3FHS:
db VICTORY_ROAD_3F, $06, SHOW
db VICTORY_ROAD_3F, $0A, SHOW
RocketHideoutB1FHS:
db ROCKET_HIDEOUT_B1F, $05, SHOW
db ROCKET_HIDEOUT_B1F, $06, SHOW
db ROCKET_HIDEOUT_B1F, $07, SHOW
RocketHideoutB2FHS:
db ROCKET_HIDEOUT_B2F, $02, SHOW
db ROCKET_HIDEOUT_B2F, $03, SHOW

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

@ -2,7 +2,7 @@ RocketHideoutB1F_Object:
db $2e ; border block
def_warp_events
warp_event 5, 4, VIRIDIAN_GYM, 5
warp_event 5, 4, VIRIDIAN_GYM, 4
def_bg_events
@ -11,7 +11,7 @@ RocketHideoutB1F_Object:
object_event 17, 8, SPRITE_PAPER, STAY, RIGHT, 2
object_event 17, 15, SPRITE_PAPER, STAY, DOWN, 3
object_event 8, 16, SPRITE_PAPER, STAY, RIGHT, 4
object_event 17, 9, SPRITE_POKE_BALL, STAY, NONE, 6, TM_EARTHQUAKE ; FIXME: doesn't work for some reason
; object_event 5, 22, SPRITE_POKE_BALL, STAY, NONE, 7, PROTECTOR needs implementing
object_event 17, 22, SPRITE_POKE_BALL, STAY, NONE, 5, TM_EARTHQUAKE
object_event 7, 22, SPRITE_POKE_BALL, STAY, NONE, 6, PROTECTOR
def_warps_to ROCKET_HIDEOUT_B1F

1
data/maps/objects/ViridianCity.asm
View file

@ -7,6 +7,7 @@ ViridianCity_Object:
warp_event 21, 15, VIRIDIAN_SCHOOL_HOUSE, 1
warp_event 21, 9, VIRIDIAN_NICKNAME_HOUSE, 1
warp_event 32, 7, VIRIDIAN_GYM, 1
warp_event 29, 3, VIRIDIAN_GYM, 3
def_bg_events
bg_event 17, 17, 8 ; ViridianCityText8

13
data/maps/objects/ViridianGym.asm
View file

@ -4,23 +4,22 @@ ViridianGym_Object:
def_warp_events
warp_event 16, 17, LAST_MAP, 5 ; front door
warp_event 17, 17, LAST_MAP, 5 ; front door
warp_event 0, 0, LAST_MAP, 5 ; back door
warp_event 1, 0, LAST_MAP, 5 ; back door
warp_event 2, 0, ROCKET_HIDEOUT_B1F, 1 ; stairs
warp_event 1, 0, LAST_MAP, 6 ; back door
warp_event 4, 2, ROCKET_HIDEOUT_B1F, 1 ; stairs
def_bg_events
def_object_events
object_event 2, 1, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3
object_event 4, 3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3
object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 6
object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3
object_event 3, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 7
object_event 7, 10, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 7
object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
object_event 10, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 8
object_event 9, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 8
object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, 8, OPP_TAMER, 4
object_event 6, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
object_event 4, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
object_event 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 10 ; person
object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 11, REVIVE