diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-20 20:20:45 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-20 20:20:45 -0400 |
| commit | 2aeefdc5de73c630a79b183e7bc2a66ad48ed424 (patch) | |
| tree | 3833a23f869ab66a7c58cb9c43d8628ece27fc46 /data/maps/PalletTown_ProfessorOaksLab/scripts.inc | |
| parent | b3951b48ecf169463d917c3fca9c218e16fe961e (diff) | |
update famechecker macro
Diffstat (limited to 'data/maps/PalletTown_ProfessorOaksLab/scripts.inc')
| -rw-r--r-- | data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 78e2bb404..ba871583c 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -12,12 +12,12 @@ PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E call_if 1, EventScript_168FD5 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 call_if 1, EventScript_168FC0 - checkflag FLAG_0x247 + checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL call_if 1, EventScript_168FBC end EventScript_168FBC:: @ 8168FBC - setflag FLAG_0x24F + setflag FLAG_OAK_SKIP_22_RIVAL_CHECK return EventScript_168FC0:: @ 8168FC0 @@ -988,9 +988,9 @@ EventScript_1699FB:: @ 81699FB compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 - checkflag FLAG_0x24F + checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK goto_if_eq EventScript_169A6E - checkflag FLAG_0x247 + checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL goto_if_eq EventScript_169A78 checkitem ITEM_POKE_BALL, 1 compare_var_to_value VAR_RESULT, 0 @@ -1008,7 +1008,7 @@ EventScript_169A45:: @ 8169A45 msgbox gUnknown_818E89C additem ITEM_POKE_BALL, 5 giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 - setflag FLAG_0x247 + setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL release end |