thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Bill's House

Browse source 
Bill's House is now finished and fully functional, save for the PC. I've left some commented-out code to have the dex entries in case someone wants to do that.

I did some groundwork for a Blastyke starter but it's really difficult and unwieldy, so I've left it out of this commit and likely won't bother. Pikachu and Eevee mode is definitely in the cards though.
This commit is contained in:
May Evans 2023-03-25 10:43:58 +00:00
parent bd067fa5a4
commit f099436f8d
6 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/map_constants.asm
View file

@ -107,7 +107,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
mapconst DIGLETTS_CAVE_ROUTE_11, 4, 4 ; $55
mapconst ROUTE_11_GATE_2F, 4, 4 ; $56
mapconst ROUTE_12_GATE_1F, 4, 5 ; $57
mapconst BILLS_HOUSE, 4, 4 ; $58
mapconst BILLS_HOUSE, 4, 7 ; $58
mapconst VERMILION_POKECENTER, 4, 7 ; $59
mapconst POKEMON_FAN_CLUB, 4, 4 ; $5A
mapconst VERMILION_MART, 4, 4 ; $5B

2
data/events/hidden_objects.asm
View file

@ -552,7 +552,7 @@ VictoryRoad2HiddenObjects:
db -1 ; end
BillsHouseHiddenObjects:
hidden_object 1, 4, SPRITE_FACING_UP, BillsHousePC
hidden_object 3, 4, SPRITE_FACING_UP, BillsHousePC
db -1 ; end
ViridianCityHiddenObjects:

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

@ -2,16 +2,16 @@ BillsHouse_Object:
db $d ; border block
def_warp_events
warp_event 2, 9, LAST_MAP, 1
warp_event 3, 9, LAST_MAP, 1
warp_event 2, 7, LAST_MAP, 1
warp_event 3, 7, LAST_MAP, 1
warp_event 11, 0, BILLS_GARDEN, 1
def_bg_events
def_object_events
object_event 6, 5, SPRITE_MONSTER, STAY, NONE, 1 ; person
object_event 4, 4, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person
object_event 1, 4, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person
object_event 6, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
object_event 11, 1, SPRITE_MONSTER, STAY, NONE, 4 ; nidorino
object_event 11, 1, SPRITE_MONSTER, STAY, NONE, 5 ; nidorino
def_warps_to BILLS_HOUSE

15
engine/events/hidden_objects/bills_house_pc.asm
View file

@ -107,6 +107,16 @@ BillsHousePokemonList::
jr z, .displayPokedex
cp VAPOREON
jr z, .displayPokedex
;cp ESPEON
;jr z, .displayPokedex
;cp UMBREON
;jr z, .displayPokedex
;cp LEAFEON
;jr z, .displayPokedex
;cp GLACEON
;jr z, .displayPokedex
;cp SYLVEON
;jr z, .displayPokedex - these are weird and don't work well
jr .cancel
.displayPokedex
call DisplayPokedex
@ -127,6 +137,11 @@ BillsMonListText:
next "FLAREON"
next "JOLTEON"
next "VAPOREON"
;next "ESPEON" The menu needs to scroll - the first few work fine.
;next "UMBREON"
;next "LEAFEON"
;next "GLACEON"
;next "SYLVEON"
next "CANCEL@"
BillsHousePokemonListText2:

2
maps/BillsHouse.blk
View file

@ -1,2 +1,2 @@
!"
$8%+ 
$+ 

8
scripts/BillsHouse.asm
View file

@ -11,7 +11,6 @@ BillsHouse_ScriptPointers:
dw BillsHouseScript3
dw BillsHouseScript4
dw BillsHouseScript5
dw BillsHouseNidorino
BillsHouseScript0:
ret
@ -90,9 +89,9 @@ BillsHouseScript3:
MovementData_1e807:
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
;db NPC_MOVEMENT_RIGHT
;db NPC_MOVEMENT_RIGHT
;db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db -1 ; end
@ -121,6 +120,7 @@ BillsHouse_TextPointers:
dw BillsHouseText2
dw BillsHouseText3
dw BillsHouseText4
dw BillsHouseNidorino ; DO. NOT. TOUCH. PLEASE GOD.
BillsHouseText4:
script_bills_pc