diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-22 12:38:19 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-22 12:38:19 -0500 |
| commit | 2d4be89ee590792bcbcfdcfac17bc2827ca17151 (patch) | |
| tree | 592b831e50d1d98f3842751335278e782f9274c7 /data/maps/Route12/scripts.inc | |
| parent | 0495cce90418b84dc53b5d5c9f3b2bfe46f0ed62 (diff) | |
| parent | e97d3532d4d72a1fe9aec755cd2a3c6527484e27 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into union_room
Diffstat (limited to 'data/maps/Route12/scripts.inc')
| -rw-r--r-- | data/maps/Route12/scripts.inc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 8b80dccee..9fe6d2e39 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -3,22 +3,22 @@ Route12_MapScripts:: @ 8168000 .byte 0 Route12_OnResume:: @ 8168006 - call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, EventScript_168010 + call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, Route12_EventScript_TryRemoveSnorlax end -EventScript_168010:: @ 8168010 +Route12_EventScript_TryRemoveSnorlax:: @ 8168010 removeobject VAR_LAST_TALKED return -Route12_EventScript_168014:: @ 8168014 +Route12_EventScript_Snorlax:: @ 8168014 lock faceplayer - goto_if_unset FLAG_GOT_POKE_FLUTE, EventScript_168099 + goto_if_unset FLAG_GOT_POKE_FLUTE, Route12_EventScript_SnorlaxNoPokeFlute goto_if_questlog EventScript_ReleaseEnd special sub_8112364 - msgbox gUnknown_81853CC, MSGBOX_YESNO + msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16808D + goto_if_eq Route12_EventScript_DontUsePokeFlute call EventScript_AwakenSnorlax setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse @@ -32,32 +32,32 @@ Route12_EventScript_168014:: @ 8168014 clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq EventScript_16808F + goto_if_eq Route12_EventScript_FoughtSnorlax compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq EventScript_16808F + goto_if_eq Route12_EventScript_FoughtSnorlax compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq EventScript_16808F + goto_if_eq Route12_EventScript_FoughtSnorlax release end -EventScript_16808D:: @ 816808D +Route12_EventScript_DontUsePokeFlute:: @ 816808D release end -EventScript_16808F:: @ 816808F - msgbox gUnknown_8185383 +Route12_EventScript_FoughtSnorlax:: @ 816808F + msgbox Text_SnorlaxReturnedToMountains release end -EventScript_168099:: @ 8168099 - msgbox gUnknown_8185317 +Route12_EventScript_SnorlaxNoPokeFlute:: @ 8168099 + msgbox Route12_Text_MonSprawledOutInSlumber release end -Route12_EventScript_1680A3:: @ 81680A3 - msgbox gUnknown_8185797, MSGBOX_SIGN +Route12_EventScript_RouteSign:: @ 81680A3 + msgbox Route12_Text_RouteSign, MSGBOX_SIGN end -Route12_EventScript_1680AC:: @ 81680AC - msgbox gUnknown_81857B3, MSGBOX_SIGN +Route12_EventScript_FishingSign:: @ 81680AC + msgbox Route12_Text_SportfishingArea, MSGBOX_SIGN end |