diff options
Diffstat (limited to 'data/maps/MauvilleCity_Gym/scripts.inc')
| -rw-r--r-- | data/maps/MauvilleCity_Gym/scripts.inc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 62f5303ec..f7af8e1d0 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 - map_script 1, MauvilleCity_Gym_MapScript1_156456 + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_MapScript1_156456 .byte 0 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 @@ -66,26 +66,26 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 end MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB - trainerbattle 1, TRAINER_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB + trainerbattle_single TRAINER_WATTSON, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB, NO_MUSIC goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 - msgbox MauvilleCity_Gym_Text_180EDB, 4 + msgbox MauvilleCity_Gym_Text_180EDB, MSGBOX_DEFAULT release end MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB message MauvilleCity_Gym_Text_180DAF waitmessage - call MauvilleCity_Gym_EventScript_1A02C5 - msgbox MauvilleCity_Gym_Text_180DDA, 4 + call Common_EventScript_PlayGymBadgeFanfare + msgbox MauvilleCity_Gym_Text_180DDA, MSGBOX_DEFAULT setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if_eq MauvilleCity_Gym_EventScript_1A00FB + call_if_eq Common_EventScript_ReadyPetalburgGymForBattle setvar VAR_0x8008, 3 - call MauvilleCity_Gym_EventScript_1A01C0 + call Common_EventScript_SetGymTrainers special MauvilleGymSpecial3 special DrawWholeMapView playse SE_KI_GASYAN @@ -93,16 +93,16 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB end MauvilleCity_Gym_EventScript_15661D:: @ 815661D - giveitem_std ITEM_TM34_SHOCK_WAVE + giveitem ITEM_TM34_SHOCK_WAVE compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_Gym_EventScript_1A029B - msgbox MauvilleCity_Gym_Text_180E76, 4 + goto_if_eq Common_EventScript_ShowBagIsFull + msgbox MauvilleCity_Gym_Text_180E76, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 release end MauvilleCity_Gym_EventScript_156641:: @ 8156641 - msgbox MauvilleCity_Gym_Text_180F1D, 4 + msgbox MauvilleCity_Gym_Text_180F1D, MSGBOX_DEFAULT release end @@ -161,35 +161,35 @@ MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 end MauvilleCity_Gym_EventScript_1566E6:: @ 81566E6 - trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 - msgbox MauvilleCity_Gym_Text_1809D1, 6 + trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 + msgbox MauvilleCity_Gym_Text_1809D1, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_1566FD:: @ 81566FD - trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 - msgbox MauvilleCity_Gym_Text_180A5E, 6 + trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 + msgbox MauvilleCity_Gym_Text_180A5E, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_156714:: @ 8156714 - trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 - msgbox MauvilleCity_Gym_Text_180B1D, 6 + trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 + msgbox MauvilleCity_Gym_Text_180B1D, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_15672B:: @ 815672B - trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 - msgbox MauvilleCity_Gym_Text_180BAE, 6 + trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 + msgbox MauvilleCity_Gym_Text_180BAE, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_156742:: @ 8156742 lock faceplayer goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_156757 - msgbox MauvilleCity_Gym_Text_180815, 4 + msgbox MauvilleCity_Gym_Text_180815, MSGBOX_DEFAULT release end MauvilleCity_Gym_EventScript_156757:: @ 8156757 - msgbox MauvilleCity_Gym_Text_18091D, 4 + msgbox MauvilleCity_Gym_Text_18091D, MSGBOX_DEFAULT release end @@ -206,11 +206,11 @@ MauvilleCity_Gym_EventScript_156771:: @ 8156771 end MauvilleCity_Gym_EventScript_156781:: @ 8156781 - msgbox MauvilleCity_Gym_Text_180F64, 4 + msgbox MauvilleCity_Gym_Text_180F64, MSGBOX_DEFAULT releaseall end MauvilleCity_Gym_EventScript_15678B:: @ 815678B - msgbox MauvilleCity_Gym_Text_180F4A, 4 + msgbox MauvilleCity_Gym_Text_180F4A, MSGBOX_DEFAULT releaseall end |