mirror of
https://github.com/thornAvery/jep-hack.git
synced 2025-09-16 18:20:50 +12:00
1b77f551f1
- Fixed various tile port issues and made various visual enhancements. Now generally closer to the Kanto styled Viridian Forest. - Added Lass Ikue, a trainer referencing Ikue Otani, to the area where the Yellow Lass was. Required updating the spriteset but it seems fine. - Added parties for all the trainers, which were missed on the initial import. - Fixed various inaccurate capitalisations. - Fixed gate warps. Considering adding a Honey girl here if we ever do that? - Restored various RBY NPCs in the Pewter and Viridian gates to the forest, saying largely the same stuff. Just keeps things move lively.
175 lines
4.1 KiB
NASM
175 lines
4.1 KiB
NASM
object_const_def
|
|
const ROUTE2_BUG_CATCHER1
|
|
const ROUTE2_BUG_CATCHER2
|
|
const ROUTE2_BUG_CATCHER3
|
|
const ROUTE2_POKE_BALL1
|
|
const ROUTE2_POKE_BALL3
|
|
const ROUTE2_POKE_BALL4
|
|
const ROUTE2_FRUIT_TREE
|
|
|
|
Route2_MapScripts:
|
|
def_scene_scripts
|
|
|
|
def_callbacks
|
|
|
|
TrainerBugCatcherRob:
|
|
trainer BUG_CATCHER, ROB, EVENT_BEAT_BUG_CATCHER_ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script
|
|
|
|
.Script:
|
|
endifjustbattled
|
|
opentext
|
|
writetext BugCatcherRobAfterBattleText
|
|
waitbutton
|
|
closetext
|
|
end
|
|
|
|
TrainerBugCatcherEd:
|
|
trainer BUG_CATCHER, ED, EVENT_BEAT_BUG_CATCHER_ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script
|
|
|
|
.Script:
|
|
endifjustbattled
|
|
opentext
|
|
writetext BugCatcherEdAfterBattleText
|
|
waitbutton
|
|
closetext
|
|
end
|
|
|
|
TrainerBugCatcherDoug:
|
|
trainer BUG_CATCHER, DOUG, EVENT_BEAT_BUG_CATCHER_DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script
|
|
|
|
.Script:
|
|
endifjustbattled
|
|
opentext
|
|
writetext BugCatcherDougAfterBattleText
|
|
waitbutton
|
|
closetext
|
|
end
|
|
|
|
Route2Sign:
|
|
jumptext Route2SignText
|
|
|
|
Route2DiglettsCaveSign:
|
|
jumptext Route2DiglettsCaveSignText
|
|
|
|
Route2DireHit:
|
|
itemball DIRE_HIT
|
|
|
|
Route2MaxPotion:
|
|
itemball MAX_POTION
|
|
|
|
Route2Carbos:
|
|
itemball CARBOS
|
|
|
|
Route2Elixer:
|
|
itemball ELIXER
|
|
|
|
Route2FruitTree:
|
|
fruittree FRUITTREE_ROUTE_2
|
|
|
|
Route2HiddenMaxEther:
|
|
hiddenitem MAX_ETHER, EVENT_ROUTE_2_HIDDEN_MAX_ETHER
|
|
|
|
Route2HiddenFullHeal:
|
|
hiddenitem FULL_HEAL, EVENT_ROUTE_2_HIDDEN_FULL_HEAL
|
|
|
|
Route2HiddenFullRestore:
|
|
hiddenitem FULL_RESTORE, EVENT_ROUTE_2_HIDDEN_FULL_RESTORE
|
|
|
|
Route2HiddenRevive:
|
|
hiddenitem REVIVE, EVENT_ROUTE_2_HIDDEN_REVIVE
|
|
|
|
BugCatcherRobSeenText:
|
|
text "My bug #MON are"
|
|
line "tough. Prepare to"
|
|
cont "lose!"
|
|
done
|
|
|
|
BugCatcherRobBeatenText:
|
|
text "I was whipped…"
|
|
done
|
|
|
|
BugCatcherRobAfterBattleText:
|
|
text "I'm going to look"
|
|
line "for stronger bug"
|
|
cont "#MON."
|
|
done
|
|
|
|
BugCatcherEdSeenText:
|
|
text "If you walk in"
|
|
line "tall grass wearing"
|
|
|
|
para "shorts, do you get"
|
|
line "nicks and cuts?"
|
|
done
|
|
|
|
BugCatcherEdBeatenText:
|
|
text "Ouch, ouch, ouch!"
|
|
done
|
|
|
|
BugCatcherEdAfterBattleText:
|
|
text "They'll really"
|
|
line "sting when you"
|
|
cont "take a bath."
|
|
done
|
|
|
|
BugCatcherDougSeenText:
|
|
text "Why don't girls"
|
|
line "like bug #MON?"
|
|
done
|
|
|
|
BugCatcherDougBeatenText:
|
|
text "No good!"
|
|
done
|
|
|
|
BugCatcherDougAfterBattleText:
|
|
text "Bug #MON squish"
|
|
line "like plush toys"
|
|
|
|
para "when you squeeze"
|
|
line "their bellies."
|
|
|
|
para "I love how they"
|
|
line "feel!"
|
|
done
|
|
|
|
Route2SignText:
|
|
text "ROUTE 2"
|
|
|
|
para "VIRIDIAN CITY -"
|
|
line "PEWTER CITY"
|
|
done
|
|
|
|
Route2DiglettsCaveSignText:
|
|
text "DIGLETT'S CAVE"
|
|
done
|
|
|
|
Route2_MapEvents:
|
|
db 0, 0 ; filler
|
|
|
|
def_warp_events
|
|
warp_event 15, 15, ROUTE_2_NUGGET_HOUSE, 1
|
|
warp_event 15, 31, ROUTE_2_GATE, 3
|
|
warp_event 16, 27, ROUTE_2_GATE, 1
|
|
warp_event 17, 27, ROUTE_2_GATE, 2
|
|
warp_event 12, 7, DIGLETTS_CAVE, 3
|
|
warp_event 5, 33, VIRIDIAN_FOREST_VIRIDIAN_GATE, 3
|
|
warp_event 2, 11, VIRIDIAN_FOREST_PEWTER_GATE, 3
|
|
warp_event 3, 11, VIRIDIAN_FOREST_PEWTER_GATE, 4
|
|
|
|
def_coord_events
|
|
|
|
def_bg_events
|
|
bg_event 7, 51, BGEVENT_READ, Route2Sign
|
|
bg_event 11, 9, BGEVENT_READ, Route2DiglettsCaveSign
|
|
bg_event 19, 32, BGEVENT_ITEM, Route2HiddenMaxEther
|
|
bg_event 8, 33, BGEVENT_ITEM, Route2HiddenRevive
|
|
|
|
def_object_events
|
|
object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1
|
|
object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1
|
|
object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1
|
|
object_event 14, 44, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT
|
|
object_event 11, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS
|
|
object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER
|
|
object_event 2, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route2FruitTree, -1
|