diff options
Diffstat (limited to 'data/maps/FiveIsland_Meadow/scripts.inc')
| -rw-r--r-- | data/maps/FiveIsland_Meadow/scripts.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 4b3b4d895..23f3e40f3 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -3,22 +3,22 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 .byte 0 FiveIsland_Meadow_MapScript1_168938:: @ 8168938 - checkflag FLAG_0x2D6 - call_if 1, EventScript_168983 + checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE + call_if TRUE, EventScript_168983 end FiveIsland_Meadow_EventScript_168942:: @ 8168942 lockall - checkflag FLAG_0x2D6 - goto_if_eq EventScript_168979 - checkflag FLAG_0x2D8 - goto_if_eq EventScript_16895F + checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE + goto_if TRUE, EventScript_168979 + checkflag FLAG_LEARNED_YES_NAH_CHANSEY + goto_if TRUE, EventScript_16895F msgbox gUnknown_818AB8E releaseall end EventScript_16895F:: @ 816895F - setflag FLAG_0x2D6 + setflag FLAG_UNLOCKED_ROCKET_WAREHOUSE message Text_18ABF4 waitmessage delay 60 @@ -39,16 +39,16 @@ EventScript_168983:: @ 8168983 return FiveIsland_Meadow_EventScript_16898D:: @ 816898D - trainerbattle 0, 567, 0, Text_18AC88, Text_18ACB3 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_49, 0, Text_18AC88, Text_18ACB3 msgbox gUnknown_818ACC5, 6 end FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 - trainerbattle 0, 568, 0, Text_18ACF0, Text_18AD39 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_50, 0, Text_18ACF0, Text_18AD39 msgbox gUnknown_818AD59, 6 end FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB - trainerbattle 0, 569, 0, Text_18ADC6, Text_18ADFB + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_51, 0, Text_18ADC6, Text_18ADFB msgbox gUnknown_818AE16, 6 end |