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

Safari Game battle type & bug fix

Browse source 
This adds the restoration of the Safari Zone from Pokemon October. There isn't a proper place for this yet, but there will be soon!

It seems to have issues with tiles, which I am assuming to either be the tilemap clearing or something relating to Zeta's custom ball palettes, since I had to add the Safari Ball. Can you get to that, @ZetaNull?

2ff835730b

also fixed the unnumbered route errors.
This commit is contained in:
Llinos Evans 2024-07-21 23:36:56 +01:00
parent 74506bd7b0
commit d3fbd1f846
13 changed files with 197 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
maps/DebugRoom.asm
View file

@ -60,7 +60,7 @@ DebugPokemon4Script:
cry NIDORAN_M
pause 15
closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_NORMAL
loadvar VAR_BATTLETYPE, BATTLETYPE_SAFARI
loadwildmon BIPULLA, 60
startbattle
reloadmapafterbattle

22
maps/Route66.asm
View file

@ -1,15 +1,15 @@
object_const_def
UnnumberedRoute_MapScripts:
Route66_MapScripts:
def_scene_scripts
def_callbacks
UnnumberedRouteSign1Script:
jumptext UnnumberedRouteSign1Text
Route66Sign1Script:
jumptext Route66Sign1Text
UnnumberedRouteSign1Text:
text "Route XX"
Route66Sign1Text:
text "ROUTE 66"
line "WEST: SILENT"
cont "HILLS"
@ -17,10 +17,10 @@ UnnumberedRouteSign1Text:
line "PATH"
done
UnnumberedRouteSign2Script:
jumptext UnnumberedRouteSign2Text
Route66Sign2Script:
jumptext Route66Sign2Text
UnnumberedRouteSign2Text:
Route66Sign2Text:
text "TRAINER TIPS"
para "If you use DEF-"
@ -119,7 +119,7 @@ FisherBranAfterBattleText:
line "incredible?"
done
UnnumberedRoute_MapEvents:
Route66_MapEvents:
db 0, 0 ; filler
def_warp_events
@ -128,8 +128,8 @@ UnnumberedRoute_MapEvents:
def_coord_events
def_bg_events
bg_event 2, 4, BGEVENT_READ, UnnumberedRouteSign1Script
bg_event 30, 6, BGEVENT_READ, UnnumberedRouteSign2Script
bg_event 2, 4, BGEVENT_READ, Route66Sign1Script
bg_event 30, 6, BGEVENT_READ, Route66Sign2Script
def_object_events
object_event 47, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPainterDali, -1