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

Merge branch 'PlagueVonKarma:master' into master

Browse source
This commit is contained in:
Misty 2024-08-06 18:04:43 -04:00 • committed by GitHub
commit 12750cfc53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
40 changed files with 950 additions and 569 deletions
Download patch file Download diff file Expand all files Collapse all files

14
maps/DebugRoom.asm
View file

@ -19,12 +19,12 @@ DebugPokemon1Script:
DebugPokemon2Script:
opentext
getmonname STRING_BUFFER_3, MACHAMP
getmonname STRING_BUFFER_3, FOLAGE
writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke MACHAMP, 31, TM_ROCK_SMASH
givepoke FOLAGE, 31, RARE_CANDY
closetext
end
@ -39,11 +39,11 @@ DebugPokemon3Script:
faceplayer
opentext
writetext DebugTextA
cry LICKILORD
cry STROMEN
pause 15
closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY
loadwildmon LICKILORD, 60
loadwildmon STROMEN, 60
startbattle
reloadmapafterbattle
end
@ -57,11 +57,11 @@ DebugPokemon4Script:
faceplayer
opentext
writetext DebugTextB
cry LICKILORD
cry STROMEN
pause 15
closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SAFARI
loadwildmon LICKILORD, 60
loadwildmon STROMEN, 60
startbattle
reloadmapafterbattle
end
@ -398,7 +398,7 @@ DebugRoom_MapEvents:
warp_event 27, 5, PEWTER_CITY, 2
warp_event 15, 2, GOLDENROD_CITY, 1 ; city 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 5, 9, ONE_ISLAND, 1 ; right lab/league warp
warp_event 35, 17, OLD_CITY, 1 ; east warp
warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp
warp_event 19, 34, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; southern warp

5
maps/FiveIsland.asm
View file

@ -4,6 +4,11 @@ FiveIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, FiveIslandFlypointCallback
FiveIslandFlypointCallback:
setflag ENGINE_FLYPOINT_FIVE_ISLAND
endcallback
FiveIsland_MapEvents:
db 0, 0 ; filler

5
maps/FourIsland.asm
View file

@ -4,6 +4,11 @@ FourIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, FourIslandFlypointCallback
FourIslandFlypointCallback:
setflag ENGINE_FLYPOINT_FOUR_ISLAND
endcallback
FourIsland_MapEvents:
db 0, 0 ; filler

44
maps/OneIsland.asm
View file

@ -4,16 +4,54 @@ OneIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, OneIslandFlypointCallback
OneIslandFlypointCallback:
setflag ENGINE_FLYPOINT_ONE_ISLAND
endcallback
OneIslandSign1:
jumptext OneIslandSign1Text
OneIslandSign1Text:
text "Comment to be"
line "written."
done
OneIslandSign2:
jumptext OneIslandSign2Text
OneIslandSign2Text:
text "Comment to be"
line "written."
done
OneIslandSailorScript:
jumptextfaceplayer OneIslandSailorText
OneIslandSailorText:
text "Shove off! I'm"
line "workin', 'ere!"
para "Bolt south to"
line "TREASURE BEACH"
cont "or somethin'!"
done
OneIsland_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 14, 19, DEBUG_ROOM, 1
warp_event 15, 19, DEBUG_ROOM, 1
warp_event 14, 19, DEBUG_ROOM, 1 ; port
warp_event 15, 19, DEBUG_ROOM, 1 ; port
warp_event 17, 6, DEBUG_ROOM, 1 ; pokecenter
warp_event 11, 13, DEBUG_ROOM, 1 ; left house
warp_event 21, 11, DEBUG_ROOM, 1 ; right house
def_coord_events
def_bg_events
def_object_events
def_object_events
object_event 19, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OneIslandSailorScript, -1

2
maps/Route19.asm
View file

@ -19,7 +19,7 @@ Route19ClearRocksCallback:
changeblock 8, 6, $7a ; rock
changeblock 10, 6, $7a ; rock
changeblock 12, 8, $7a ; rock
changeblock 4, 8, $7a ; rock
changeblock 4, 6, $7a ; rock - changed to account for the surfin' dude's house
changeblock 10, 10, $7a ; rock
.Done:
endcallback

5
maps/SevenIsland.asm
View file

@ -4,6 +4,11 @@ SevenIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, SevenIslandFlypointCallback
SevenIslandFlypointCallback:
setflag ENGINE_FLYPOINT_SEVEN_ISLAND
endcallback
SevenIsland_MapEvents:
db 0, 0 ; filler

5
maps/SixIsland.asm
View file

@ -4,6 +4,11 @@ SixIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, SixIslandFlypointCallback
SixIslandFlypointCallback:
setflag ENGINE_FLYPOINT_SIX_ISLAND
endcallback
SixIsland_MapEvents:
db 0, 0 ; filler

31
maps/SummerBeachHouse.asm
View file

@ -34,12 +34,17 @@ SummerBeachHouseSurfinDudeScript:
cry PIKACHU
waitbutton
applymovement SUMMERBEACHHOUSE_PUKA, PukaMovement1
writetext SummerBeachHouseSurfinDudeTextICanDoIt2
waitbutton
special TeachPikachuSurf
; iffalse .StoppedLearning ; doesn't work because I'm stupid and thought simply teaching the electric rat to use a surfboard would work like yesorno. the ceiling is the floor.
writetext SummerBeachHouseSurfinDudeTextDone
applymovement SUMMERBEACHHOUSE_PUKA, PukaMovement2
waitbutton
closetext
; setevent EVENT_TAUGHT_PIKACHU_SURF
; setevent EVENT_TAUGHT_PIKACHU_SURF ; not yet in for testing purposes.
end
.NotPikachu:
@ -54,6 +59,12 @@ SummerBeachHouseSurfinDudeScript:
closetext
end
.StoppedLearning:
writetext SummerBeachHouseSurfinDudeStoppedLearning
waitbutton
closetext
end
PukaMovement1:
step LEFT
step UP
@ -92,6 +103,14 @@ SummerBeachHouseSurfinDudeTextNoHave:
line "one? Aww…"
done
SummerBeachHouseSurfinDudeStoppedLearning:
text "Not the right"
line "time? Alright."
para "Come back, though,"
line "ya hear?"
done
SummerBeachHouseSurfinDudeTextICanDoIt:
text "Yeah! This PIKACHU"
line "yearns for the"
@ -100,6 +119,14 @@ SummerBeachHouseSurfinDudeTextICanDoIt:
para "PUKA, come here!"
done
SummerBeachHouseSurfinDudeTextICanDoIt2:
text "This PIKACHU is"
line "as strong as you!"
para "Let's teach it to"
line "SURF!"
done
SummerBeachHouseSurfinDudeTextDone:
text "There! You can"
line "SURF wherever"
@ -130,7 +157,7 @@ SummerBeachHousePoster2Text:
done
SummerBeachHousePoster3Script:
jumptext SummerBeachHousePoster1Text
jumptext SummerBeachHousePoster3Text
SummerBeachHousePoster3Text:
text "It's an old pos-"

5
maps/ThreeIsland.asm
View file

@ -4,6 +4,11 @@ ThreeIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, ThreeIslandFlypointCallback
ThreeIslandFlypointCallback:
setflag ENGINE_FLYPOINT_THREE_ISLAND
endcallback
ThreeIsland_MapEvents:
db 0, 0 ; filler

5
maps/TwoIsland.asm
View file

@ -4,6 +4,11 @@ TwoIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, TwoIslandFlypointCallback
TwoIslandFlypointCallback:
setflag ENGINE_FLYPOINT_TWO_ISLAND
endcallback
TwoIsland_MapEvents:
db 0, 0 ; filler