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

Safari Zone Rest Houses now have PCs.

Browse source 
This uses some of the tech I made for the Day Care, since the House tileset had PCs in them. The Rest Houses now have slightly revamped maps to accommodate. Did you know these were unused?
This commit is contained in:
Llinos Evans 2025-01-13 06:25:56 +00:00
parent 0167176d3b
commit 602c63b03d
17 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

16
data/events/hidden_objects.asm
View file

@ -58,6 +58,7 @@ HiddenObjectMaps:
db VICTORY_ROAD_2F
db BILLS_HOUSE
db VIRIDIAN_CITY
db SAFARI_ZONE_CENTER_REST_HOUSE
db SAFARI_ZONE_WEST_REST_HOUSE
db SAFARI_ZONE_EAST_REST_HOUSE
db SAFARI_ZONE_NORTH_REST_HOUSE
@ -153,6 +154,7 @@ HiddenObjectPointers:
dw VictoryRoad2HiddenObjects
dw BillsHouseHiddenObjects
dw ViridianCityHiddenObjects
dw SafariZoneRestHouse1HiddenObjects
dw SafariZoneRestHouse2HiddenObjects
dw SafariZoneRestHouse3HiddenObjects
dw SafariZoneRestHouse4HiddenObjects
@ -535,19 +537,13 @@ ViridianCityHiddenObjects:
hidden_object 14, 4, POTION, HiddenItems
db -1 ; end
; Moved these to the same slot to save bytes.
SafariZoneRestHouse1HiddenObjects:
SafariZoneRestHouse2HiddenObjects:
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
SafariZoneRestHouse3HiddenObjects:
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
SafariZoneRestHouse4HiddenObjects:
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText ; still unused
hidden_object 4, 1, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end
Route15GateUpstairsHiddenObjects:

2
data/maps/headers/SafariZoneCenterRestHouse.asm
View file

@ -1,2 +1,2 @@
map_header SafariZoneCenterRestHouse, SAFARI_ZONE_CENTER_REST_HOUSE, GATE, 0
map_header SafariZoneCenterRestHouse, SAFARI_ZONE_CENTER_REST_HOUSE, HOUSE, 0
end_map_header

2
data/maps/headers/SafariZoneEastRestHouse.asm
View file

@ -1,2 +1,2 @@
map_header SafariZoneEastRestHouse, SAFARI_ZONE_EAST_REST_HOUSE, GATE, 0
map_header SafariZoneEastRestHouse, SAFARI_ZONE_EAST_REST_HOUSE, HOUSE, 0
end_map_header

2
data/maps/headers/SafariZoneNorthRestHouse.asm
View file

@ -1,2 +1,2 @@
map_header SafariZoneNorthRestHouse, SAFARI_ZONE_NORTH_REST_HOUSE, GATE, 0
map_header SafariZoneNorthRestHouse, SAFARI_ZONE_NORTH_REST_HOUSE, HOUSE, 0
end_map_header

2
data/maps/headers/SafariZoneWestRestHouse.asm
View file

@ -1,2 +1,2 @@
map_header SafariZoneWestRestHouse, SAFARI_ZONE_WEST_REST_HOUSE, GATE, 0
map_header SafariZoneWestRestHouse, SAFARI_ZONE_WEST_REST_HOUSE, HOUSE, 0
end_map_header

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

@ -8,7 +8,7 @@ SafariZoneCenterRestHouse_Object:
def_bg_events
def_object_events
object_event 3, 2, SPRITE_GIRL, STAY, DOWN, 1 ; person
object_event 1, 4, SPRITE_SCIENTIST, WALK, UP_DOWN, 2 ; person
object_event 3, 3, SPRITE_GIRL, STAY, LEFT, 1 ; person
object_event 5, 6, SPRITE_SCIENTIST, WALK, UP_DOWN, 2 ; person
def_warps_to SAFARI_ZONE_CENTER_REST_HOUSE

8
data/maps/objects/SafariZoneEastRestHouse.asm
View file

@ -8,9 +8,9 @@ SafariZoneEastRestHouse_Object:
def_bg_events
def_object_events
object_event 2, 3, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person
object_event 0, 2, SPRITE_ROCKER, STAY, NONE, 2 ; person
object_event 5, 2, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person
object_event 6, 2, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person
object_event 5, 5, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person
object_event 0, 4, SPRITE_ROCKER, STAY, RIGHT, 2 ; person
object_event 3, 3, SPRITE_SILPH_WORKER, STAY, LEFT, 3 ; person
object_event 3, 4, SPRITE_SILPH_WORKER, STAY, LEFT, 4 ; person
def_warps_to SAFARI_ZONE_EAST_REST_HOUSE

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

@ -9,7 +9,7 @@ SafariZoneNorthRestHouse_Object:
def_object_events
object_event 6, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person
object_event 3, 4, SPRITE_SAFARI_ZONE_WORKER, STAY, NONE, 2 ; person
object_event 3, 4, SPRITE_SAFARI_ZONE_WORKER, LEFT, NONE, 2 ; person
object_event 1, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 3 ; person
def_warps_to SAFARI_ZONE_NORTH_REST_HOUSE

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

@ -8,8 +8,8 @@ SafariZoneWestRestHouse_Object:
def_bg_events
def_object_events
object_event 4, 4, SPRITE_SCIENTIST, WALK, ANY_DIR, 1 ; person
object_event 0, 2, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2 ; person
object_event 6, 2, SPRITE_ERIKA, STAY, DOWN, 3 ; person
object_event 5, 3, SPRITE_SCIENTIST, WALK, ANY_DIR, 1 ; person
object_event 0, 3, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2 ; person
object_event 3, 4, SPRITE_ERIKA, STAY, LEFT, 3 ; person
def_warps_to SAFARI_ZONE_WEST_REST_HOUSE