diff options
Diffstat (limited to 'maps/NationalPark.asm')
| -rw-r--r-- | maps/NationalPark.asm | 50 |
1 files changed, 33 insertions, 17 deletions
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index a689fbca5..12dc44c27 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -1,3 +1,19 @@ +const_value set 2 + const NATIONALPARK_LASS1 + const NATIONALPARK_POKEFAN_F1 + const NATIONALPARK_TEACHER1 + const NATIONALPARK_YOUNGSTER1 + const NATIONALPARK_YOUNGSTER2 + const NATIONALPARK_TEACHER2 + const NATIONALPARK_GROWLITHE + const NATIONALPARK_YOUNGSTER3 + const NATIONALPARK_POKEFAN_F2 + const NATIONALPARK_POKEFAN_M + const NATIONALPARK_LASS2 + const NATIONALPARK_POKE_BALL1 + const NATIONALPARK_GAMEBOY_KID + const NATIONALPARK_POKE_BALL2 + NationalPark_MapScriptHeader: .MapTriggers: db 0 @@ -23,9 +39,9 @@ TeacherScript_0x5c008: setevent EVENT_GOT_QUICK_CLAW UnknownScript_0x5c01d: writetext UnknownText_0x5c30d - closetext + waitbutton UnknownScript_0x5c021: - loadmovesprites + closetext end YoungsterScript_0x5c023: @@ -42,17 +58,17 @@ GrowlitheScript_0x5c02c: loadfont writetext UnknownText_0x5c416 cry PERSIAN + waitbutton closetext - loadmovesprites end GameboyKidScript_0x5c037: faceplayer loadfont writetext UnknownText_0x5c42a + waitbutton closetext - loadmovesprites - spriteface $e, DOWN + spriteface NATIONALPARK_GAMEBOY_KID, DOWN end TrainerSchoolboyJack1: @@ -60,7 +76,7 @@ TrainerSchoolboyJack1: SchoolboyJack1Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_JACK iftrue UnknownScript_0x5c088 @@ -106,7 +122,7 @@ UnknownScript_0x5c088: checkflag ENGINE_FLYPOINT_OLIVINE iftrue .LoadFight1 .LoadFight0 - loadtrainer SCHOOLBOY, JACK1 + scriptedtrainerdata SCHOOLBOY, JACK1 startbattle returnafterbattle loadvar wJackFightCount, 1 @@ -114,7 +130,7 @@ UnknownScript_0x5c088: end .LoadFight1 - loadtrainer SCHOOLBOY, JACK2 + scriptedtrainerdata SCHOOLBOY, JACK2 startbattle returnafterbattle loadvar wJackFightCount, 2 @@ -122,7 +138,7 @@ UnknownScript_0x5c088: end .LoadFight2 - loadtrainer SCHOOLBOY, JACK3 + scriptedtrainerdata SCHOOLBOY, JACK3 startbattle returnafterbattle loadvar wJackFightCount, 3 @@ -130,7 +146,7 @@ UnknownScript_0x5c088: end .LoadFight3 - loadtrainer SCHOOLBOY, JACK4 + scriptedtrainerdata SCHOOLBOY, JACK4 startbattle returnafterbattle loadvar wJackFightCount, 4 @@ -138,7 +154,7 @@ UnknownScript_0x5c088: end .LoadFight4 - loadtrainer SCHOOLBOY, JACK5 + scriptedtrainerdata SCHOOLBOY, JACK5 startbattle returnafterbattle clearflag ENGINE_JACK @@ -176,11 +192,11 @@ TrainerPokefanmWilliam: trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, PokefanmWilliamScript PokefanmWilliamScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5c645 + waitbutton closetext - loadmovesprites end TrainerPokefanfBeverly1: @@ -188,7 +204,7 @@ TrainerPokefanfBeverly1: PokefanfBeverly1Script: writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue UnknownScript_0x5c177 @@ -226,8 +242,8 @@ UnknownScript_0x5c186: UnknownScript_0x5c189: writetext UnknownText_0x5c68a + waitbutton closetext - loadmovesprites end UnknownScript_0x5c18f: @@ -266,11 +282,11 @@ TrainerLassKrise: trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, LassKriseScript LassKriseScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5c71d + waitbutton closetext - loadmovesprites end MapNationalParkSignpost0Script: |