diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-02 21:49:09 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-02 21:49:09 -0500 |
| commit | df128cbfedcaf8a0da698ba9a9e62bed21721e1c (patch) | |
| tree | 6f12e1991e59856f83711d469020072a5321da3e /data/scripts | |
| parent | e3b078d08fb7208065cb6bda96879fbb6e97c5db (diff) | |
| parent | 0a9f0d80f5f3d1cf02ae26a7bad1d771f8dedc52 (diff) | |
Merge branch 'master' into pokenav_match_call
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/maps/MauvilleCity.inc | 18 | ||||
| -rw-r--r-- | data/scripts/maps/PetalburgCity_Gym.inc | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 1c48e9710..40578a907 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -5,18 +5,18 @@ MauvilleCity_MapScripts:: @ 81DF385 MauvilleCity_MapScript1_1DF38B: @ 81DF38B setflag FLAG_VISITED_MAUVILLE_CITY clearflag FLAG_0x09D - clearflag FLAG_0x3C1 + clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION setflag FLAG_SYS_TV_START clearflag FLAG_0x063 setvar VAR_0x4093, 0 - checkflag FLAG_0x0D1 + checkflag FLAG_GOT_TM24_FROM_WATTSON call_if 1, MauvilleCity_EventScript_1DF3A9 end MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 - clearflag FLAG_0x391 - setflag FLAG_0x390 - setflag FLAG_0x05B + clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON + setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON + setflag FLAG_WATTSON_REMATCH_AVAILABLE return MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3 @@ -424,15 +424,15 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F MauvilleCity_EventScript_1DF73A:: @ 81DF73A lock faceplayer - checkflag FLAG_0x0D1 + checkflag FLAG_GOT_TM24_FROM_WATTSON goto_eq MauvilleCity_EventScript_1DF7B0 compare VAR_0x40BA, 2 goto_eq MauvilleCity_EventScript_1DF784 - checkflag FLAG_0x0D0 + checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON goto_eq MauvilleCity_EventScript_1DF77A msgbox MauvilleCity_Text_1DFFE4, 4 giveitem_std ITEM_BASEMENT_KEY - setflag FLAG_0x0D0 + setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON msgbox MauvilleCity_Text_1E0154, 4 release end @@ -447,7 +447,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784 giveitem_std ITEM_TM24 compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_272054 - setflag FLAG_0x0D1 + setflag FLAG_GOT_TM24_FROM_WATTSON msgbox MauvilleCity_Text_1E02AA, 4 release end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 627ae904c..2751e345e 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -423,8 +423,8 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B setflag FLAG_BADGE05_GET special sub_813B9A0 call PetalburgCity_Gym_EventScript_2721F8 - setflag FLAG_0x391 - clearflag FLAG_0x390 + setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON + clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON setvar VAR_0x8008, 5 call PetalburgCity_Gym_EventScript_271F43 clearflag FLAG_0x3AC |