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

Refactor Giovanni's Room, restore Rocket Hideout B1F

Browse source 
With the way KEP is shaping up, the Rocket Hideout can easily stay with little issue. I don't expect it to be a problem at all. Therefore, in the interest of keeping Lavender Tower's progression the same, it's being restored. I do expect some Lavender Tower floors to be nommed, though.

I expect Silph to also be salvageable but I also really hate Silph.

Oh, also, the Game Corner guard has been buffed. He sucks. They call that a guard??
This commit is contained in:
Llinos Evans 2023-05-02 02:48:41 +01:00
parent d176c80055
commit abaff60797
22 changed files with 523 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/headers/GiovannisRoom.asm Normal file
View file

@ -0,0 +1,2 @@
map_header GiovannisRoom, GIOVANNIS_ROOM, FACILITY, 0
end_map_header

9
data/maps/hide_show_data.asm
View file

@ -252,6 +252,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw NoHS
dw GiovannisRoomHS
assert_table_length NUM_MAPS
dw -1 ; end
@ -442,8 +443,8 @@ VictoryRoad3FHS:
db VICTORY_ROAD_3F, $06, SHOW ; HS_VICTORY_ROAD_3F_ITEM_2
db VICTORY_ROAD_3F, $0A, SHOW ; HS_VICTORY_ROAD_3F_BOULDER
RocketHideoutB1FHS:
db ROCKET_HIDEOUT_B1F, $05, SHOW ; HS_ROCKET_HIDEOUT_B1F_ITEM_1
db ROCKET_HIDEOUT_B1F, $06, SHOW ; HS_ROCKET_HIDEOUT_B1F_ITEM_2
db ROCKET_HIDEOUT_B1F, $06, SHOW
db ROCKET_HIDEOUT_B1F, $07, SHOW
RocketHideoutB2FHS:
db ROCKET_HIDEOUT_B2F, $02, SHOW ; HS_ROCKET_HIDEOUT_B2F_ITEM_1
db ROCKET_HIDEOUT_B2F, $03, SHOW ; HS_ROCKET_HIDEOUT_B2F_ITEM_2
@ -600,7 +601,9 @@ MtMoonCraterHS:
db MT_MOON_CRATER, $09, SHOW ; HS_MT_MOON_CRATER_ITEM_9
db MT_MOON_CRATER, $0A, SHOW ; HS_MT_MOON_CRATER_ITEM_10
db MT_MOON_CRATER, $0B, SHOW ; HS_MT_MOON_CRATER_ITEM_11
GiovannisRoomHS:
db GIOVANNIS_ROOM, $05, SHOW ; HS_GIOVANNIS_ROOM_ITEM_1
db GIOVANNIS_ROOM, $06, SHOW ; HS_GIOVANNIS_ROOM_ITEM_2
db $FF, $01, SHOW ; end
assert_table_length NUM_HS_OBJECTS + 1

1
data/maps/map_header_banks.asm
View file

@ -250,4 +250,5 @@ MapHeaderBanks::
db BANK(BrunosRoom_h)
db BANK(AgathasRoom_h)
db BANK(CinnabarVolcanoFloors_h)
db BANK(GiovannisRoom_h)
assert_table_length NUM_MAPS

1
data/maps/map_header_pointers.asm
View file

@ -250,4 +250,5 @@ MapHeaderPointers::
dw BrunosRoom_h
dw AgathasRoom_h
dw CinnabarVolcanoFloors_h
dw GiovannisRoom_h
assert_table_length NUM_MAPS

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

@ -4,10 +4,10 @@ GameCorner_Object:
def_warp_events
warp_event 15, 17, LAST_MAP, 8
warp_event 16, 17, LAST_MAP, 8
; warp_event 17, 4, ROCKET_HIDEOUT_B1F, 2
warp_event 17, 4, ROCKET_HIDEOUT_B1F, 2
def_bg_events
; bg_event 9, 4, 12 ; CeladonGameCornerText12
bg_event 9, 4, 12 ; CeladonGameCornerText12
def_object_events
object_event 2, 6, SPRITE_BEAUTY, STAY, DOWN, 1 ; person
@ -20,6 +20,6 @@ GameCorner_Object:
object_event 11, 15, SPRITE_GAMBLER, STAY, RIGHT, 8 ; person
object_event 14, 11, SPRITE_CLERK, STAY, LEFT, 9 ; person
object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, 10 ; person
; object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7
object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7
def_warps_to GAME_CORNER

19
data/maps/objects/GiovannisRoom.asm Normal file
View file

@ -0,0 +1,19 @@
GiovannisRoom_Object:
db $2e ; border block
def_warp_events
warp_event 5, 4, VIRIDIAN_GYM, 3
warp_event 17, 4, VIRIDIAN_CITY, 6
def_bg_events
def_object_events
object_event 4, 22, SPRITE_PAPER, STAY, DOWN, 1
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, 22, SPRITE_POKE_BALL, STAY, NONE, 5, TM_EARTHQUAKE
object_event 5, 22, SPRITE_POKE_BALL, STAY, NONE, 6, PROTECTOR
object_event 6, 17, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 8
def_warps_to GIOVANNIS_ROOM

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

@ -2,18 +2,21 @@ RocketHideoutB1F_Object:
db $2e ; border block
def_warp_events
warp_event 5, 4, VIRIDIAN_GYM, 3
warp_event 17, 4, VIRIDIAN_CITY, 6
warp_event 23, 2, ROCKET_HIDEOUT_B2F, 1
warp_event 21, 2, GAME_CORNER, 3
warp_event 24, 19, ROCKET_HIDEOUT_ELEVATOR, 1
warp_event 21, 24, ROCKET_HIDEOUT_B2F, 4
warp_event 25, 19, ROCKET_HIDEOUT_ELEVATOR, 2
def_bg_events
def_object_events
object_event 4, 22, SPRITE_PAPER, STAY, DOWN, 1
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, 22, SPRITE_POKE_BALL, STAY, NONE, 5, TM_EARTHQUAKE
object_event 7, 22, SPRITE_POKE_BALL, STAY, NONE, 6, PROTECTOR
object_event 6, 17, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 8
object_event 26, 8, SPRITE_ROCKET, STAY, LEFT, 1, OPP_ROCKET, 8
object_event 12, 6, SPRITE_ROCKET, STAY, RIGHT, 2, OPP_ROCKET, 9
object_event 18, 17, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 10
object_event 15, 25, SPRITE_ROCKET, STAY, RIGHT, 4, OPP_ROCKET, 11
object_event 28, 18, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 12
object_event 11, 14, SPRITE_POKE_BALL, STAY, NONE, 6, ESCAPE_ROPE
object_event 9, 17, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION
def_warps_to ROCKET_HIDEOUT_B1F

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

@ -4,7 +4,7 @@ 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 4, 2, ROCKET_HIDEOUT_B1F, 1 ; stairs
warp_event 4, 2, GIOVANNIS_ROOM, 1 ; stairs
def_bg_events

1
data/maps/songs.asm
View file

@ -249,4 +249,5 @@ MapSongBanks::
db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM
db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM
db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS
db MUSIC_DUNGEON2, 0 ; GIOVANNIS_ROOM
assert_table_length NUM_MAPS