mirror of
https://github.com/thornAvery/jep-hack.git
synced 2026-02-07 00:25:24 +13:00
Summer Beach House (buggy!)
This adds the Summer Beach House from Pokemon Yellow to Route 19, in an effort to make Kanto a bit more interesting. The code for teaching Pikachu is very buggy right now and someone should check it out. I usually throw code out if it isn't functional but this seems extremely close to working.
This commit is contained in:
Llinos Evans
parent
88390e8282
commit
0dd22ececa
20 changed files with 301 additions and 6 deletions
|
|
@ -8,12 +8,12 @@ DebugRoom_MapScripts:
|
|||
|
||||
DebugPokemon1Script:
|
||||
opentext
|
||||
getmonname STRING_BUFFER_3, LUXWAN
|
||||
getmonname STRING_BUFFER_3, PIKACHU
|
||||
writetext ReceivedDebugPokemonText
|
||||
playsound SFX_CAUGHT_MON
|
||||
waitsfx
|
||||
promptbutton
|
||||
givepoke LUXWAN, 24, POISON_STONE
|
||||
givepoke PIKACHU, 24, POISON_STONE
|
||||
closetext
|
||||
end
|
||||
|
||||
|
|
@ -397,7 +397,7 @@ DebugRoom_MapEvents:
|
|||
warp_event 11, 15, LAKE_OF_RAGE, 3
|
||||
warp_event 27, 5, PEWTER_CITY, 2
|
||||
warp_event 15, 2, GOLDENROD_CITY, 1 ; city warp
|
||||
warp_event 4, 9, PALLET_TOWN, 1 ; left lab/league warp
|
||||
warp_event 4, 9, SUMMER_BEACH_HOUSE, 1 ; left lab/league warp
|
||||
warp_event 5, 9, PALLET_TOWN, 1 ; right lab/league warp
|
||||
warp_event 35, 17, OLD_CITY, 1 ; east warp
|
||||
warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp
|
||||
|
|
@ -421,4 +421,4 @@ DebugRoom_MapEvents:
|
|||
object_event 18, 13, SPRITE_SAFARI_ZONE_WORKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerTestScript, -1
|
||||
object_event 20, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugDollShopScript, -1
|
||||
object_event 25, 15, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MemoryGameScript, -1
|
||||
object_event 27, 16, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugGligarScript, -1
|
||||
object_event 8, 16, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugGligarScript, -1
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
(,) !Vw(,)(,)|~11$W%$W%111CCCCCCCCCCC辧1111棘剩CCCCCCCC又CCCCCCCC抹CCCCCCCC砲CCCCCCCC砲CCCCCCCC砲CCCCCCCC砲CCCCCCCC砲CCCCCCCC砲CCCCCCCC砲CCCCCCCC侭劔劔劔劔<EFBFBD>
|
||||
(,) !Vw(,)(,)|~11$W%$W%111CCCCCCCCC<1A>CC<43><43>1111<><31><EFBFBD><EFBFBD>CCCCCCCC<43><43>CCCCCCCC<43><43>CCCCCCCC<43>CCCCCCCCC<43>CCCCCCCCC<43>CCCCCCCCC<43>CCCCCCCCC<43>CCCCCCCCC<43>CCCCCCCCC<43>CCCCCCCCC<43><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
|
|
@ -232,17 +232,27 @@ CarefulSwimmingSignText:
|
|||
para "FUCHSIA POLICE"
|
||||
done
|
||||
|
||||
BeachHouseSignScript:
|
||||
jumptext BeachHouseSignText
|
||||
|
||||
BeachHouseSignText:
|
||||
text "SUMMER BEACH HOUSE"
|
||||
line "#MON welcome!"
|
||||
done
|
||||
|
||||
Route19_MapEvents:
|
||||
db 0, 0 ; filler
|
||||
|
||||
def_warp_events
|
||||
warp_event 7, 3, ROUTE_19_FUCHSIA_GATE, 3
|
||||
warp_event 5, 9, SUMMER_BEACH_HOUSE, 1
|
||||
|
||||
def_coord_events
|
||||
|
||||
def_bg_events
|
||||
bg_event 11, 13, BGEVENT_READ, Route19Sign
|
||||
bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign
|
||||
bg_event 7, 11, BGEVENT_READ, BeachHouseSignScript
|
||||
|
||||
def_object_events
|
||||
object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1
|
||||
|
|
|
|||
1
maps/SummerBeachHouse.ablk
Normal file
1
maps/SummerBeachHouse.ablk
Normal file
|
|
@ -0,0 +1 @@
|
|||
GEGDFDHCBBAIJABBBAIJACKBAAAA
|
||||
189
maps/SummerBeachHouse.asm
Normal file
189
maps/SummerBeachHouse.asm
Normal file
|
|
@ -0,0 +1,189 @@
|
|||
object_const_def
|
||||
const SUMMERBEACHHOUSE_VICTOR
|
||||
const SUMMERBEACHHOUSE_PUKA
|
||||
|
||||
SummerBeachHouse_MapScripts:
|
||||
def_scene_scripts
|
||||
|
||||
def_callbacks
|
||||
|
||||
; WIP
|
||||
; I want the Surfin' Dude to teach a high-DV Pikachu Surf.
|
||||
; Everything here is as I want it, really, it's pretty neat.
|
||||
; Check engine/events/specials.asm for the funny buggy code.
|
||||
SummerBeachHouseSurfinDudeScript:
|
||||
faceplayer
|
||||
opentext
|
||||
writetext SummerBeachHouseSurfinDudeText1
|
||||
yesorno
|
||||
iffalse .NotPikachu
|
||||
loadmonindex 1, PIKACHU
|
||||
special FindPartyMonThatSpecies ; currently just works with Pikachu
|
||||
writetext SummerBeachHouseSurfinDudeText2
|
||||
waitbutton
|
||||
special CheckPikachu
|
||||
ifequal 0, .NotPikachu
|
||||
ifequal 1, .GetReward
|
||||
sjump .GetReward
|
||||
|
||||
.GetReward:
|
||||
writetext SummerBeachHouseSurfinDudeTextICanDoIt
|
||||
turnobject SUMMERBEACHHOUSE_PUKA, LEFT
|
||||
showemote EMOTE_SHOCK, SUMMERBEACHHOUSE_PUKA, 15
|
||||
writetext SummerBeachHousePukaTeach
|
||||
cry PIKACHU
|
||||
waitbutton
|
||||
applymovement SUMMERBEACHHOUSE_PUKA, PukaMovement1
|
||||
special TeachPikachuSurf
|
||||
writetext SummerBeachHouseSurfinDudeTextDone
|
||||
applymovement SUMMERBEACHHOUSE_PUKA, PukaMovement2
|
||||
waitbutton
|
||||
closetext
|
||||
; setevent EVENT_TAUGHT_PIKACHU_SURF
|
||||
end
|
||||
|
||||
.NotPikachu:
|
||||
writetext SummerBeachHouseSurfinDudeTextNoHave
|
||||
waitbutton
|
||||
closetext
|
||||
end
|
||||
|
||||
.TaughtPikachu:
|
||||
writetext SummerBeachHouseSurfinDudeText4
|
||||
waitbutton
|
||||
closetext
|
||||
end
|
||||
|
||||
PukaMovement1:
|
||||
step LEFT
|
||||
step UP
|
||||
step UP
|
||||
step LEFT
|
||||
step LEFT
|
||||
step LEFT
|
||||
turn_head DOWN
|
||||
step_end
|
||||
|
||||
PukaMovement2:
|
||||
step RIGHT
|
||||
step RIGHT
|
||||
step RIGHT
|
||||
step DOWN
|
||||
step DOWN
|
||||
step RIGHT
|
||||
step_end
|
||||
|
||||
SummerBeachHouseSurfinDudeText1: ; aka Victor
|
||||
text "Yo! For many years"
|
||||
line "I have wanted to"
|
||||
cont "teach a worthy"
|
||||
cont "PIKACHU to SURF!"
|
||||
|
||||
para "Do you have one?"
|
||||
done
|
||||
|
||||
SummerBeachHouseSurfinDudeText2:
|
||||
text "Ah! A PIKACHU!"
|
||||
line "Let's see…"
|
||||
done
|
||||
|
||||
SummerBeachHouseSurfinDudeTextNoHave:
|
||||
text "You don't have"
|
||||
line "one? Aww…"
|
||||
done
|
||||
|
||||
SummerBeachHouseSurfinDudeTextICanDoIt:
|
||||
text "Yeah! This PIKACHU"
|
||||
line "yearns for the"
|
||||
cont "waves!"
|
||||
|
||||
para "PUKA, come here!"
|
||||
done
|
||||
|
||||
SummerBeachHouseSurfinDudeTextDone:
|
||||
text "There! You can"
|
||||
line "SURF wherever"
|
||||
cont "you want with"
|
||||
cont "this PIKACHU now!"
|
||||
|
||||
para "Come again!"
|
||||
done
|
||||
|
||||
SummerBeachHousePoster1Script:
|
||||
jumptext SummerBeachHousePoster1Text
|
||||
|
||||
SummerBeachHousePoster1Text:
|
||||
text "SURFIN' DUDE's"
|
||||
line "scribbles…"
|
||||
|
||||
para "When I shoot the"
|
||||
line "tube, the tunes"
|
||||
cont "hit the groove!"
|
||||
done
|
||||
|
||||
SummerBeachHousePoster2Script:
|
||||
jumptext SummerBeachHousePoster2Text
|
||||
|
||||
SummerBeachHousePoster2Text:
|
||||
text "30 years of waves!"
|
||||
line "SURFIN' DUDE"
|
||||
done
|
||||
|
||||
SummerBeachHousePoster3Script:
|
||||
jumptext SummerBeachHousePoster1Text
|
||||
|
||||
SummerBeachHousePoster3Text:
|
||||
text "It's an old pos-"
|
||||
line "ter of the SURF-"
|
||||
cont "IN' DUDE with"
|
||||
cont "PUKA!"
|
||||
done
|
||||
|
||||
SummerBeachHousePrinterScript:
|
||||
jumptext SummerBeachHousePrinterText1
|
||||
|
||||
SummerBeachHousePrinterText1:
|
||||
text "It's some sort of"
|
||||
line "a machine…"
|
||||
done
|
||||
|
||||
SummerBeachHouseSurfinDudeText4:
|
||||
text "Dogs and burgers"
|
||||
line "on special today!"
|
||||
done
|
||||
|
||||
SummerBeachHousePukaScript:
|
||||
faceplayer
|
||||
opentext
|
||||
writetext SummerBeachHousePuka
|
||||
cry PIKACHU
|
||||
waitbutton
|
||||
closetext
|
||||
end
|
||||
|
||||
SummerBeachHousePuka:
|
||||
text "PUKA: Pikaaaa…"
|
||||
done
|
||||
|
||||
SummerBeachHousePukaTeach:
|
||||
text "PUKA: Pikapika!?"
|
||||
done
|
||||
|
||||
SummerBeachHouse_MapEvents:
|
||||
db 0, 0 ; filler
|
||||
|
||||
def_warp_events
|
||||
warp_event 3, 7, ROUTE_19, 2
|
||||
warp_event 2, 7, ROUTE_19, 2
|
||||
|
||||
def_coord_events
|
||||
|
||||
def_bg_events
|
||||
bg_event 3, 0, BGEVENT_READ, SummerBeachHousePoster1Script
|
||||
bg_event 7, 0, BGEVENT_READ, SummerBeachHousePoster2Script
|
||||
bg_event 13, 1, BGEVENT_READ, SummerBeachHousePrinterScript
|
||||
bg_event 11, 0, BGEVENT_READ, SummerBeachHousePoster3Script
|
||||
|
||||
def_object_events
|
||||
object_event 3, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SummerBeachHouseSurfinDudeScript, -1
|
||||
object_event 8, 5, SPRITE_OVERWORLD_PIKACHU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SummerBeachHousePukaScript, -1
|
||||
Loading…
Add table
Add a link
Reference in a new issue