diff options
Diffstat (limited to 'data/maps/DewfordTown_Gym/scripts.inc')
| -rw-r--r-- | data/maps/DewfordTown_Gym/scripts.inc | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 476880f68..30f7b2b6d 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -1,5 +1,5 @@ DewfordTown_Gym_MapScripts:: @ 8153065 - map_script 3, DewfordTown_Gym_MapScript1_15306B + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_15306B .byte 0 DewfordTown_Gym_MapScript1_15306B:: @ 815306B @@ -7,7 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B end DewfordTown_Gym_EventScript_153071:: @ 8153071 - goto_if_trainer_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA + goto_if_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar VAR_0x8001, VAR_0x8000 compare VAR_0x8000, 0 @@ -80,24 +80,24 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_0x8000, 0 - goto_if_trainer_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135 + goto_if_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 - goto_if_trainer_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143 + goto_if_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 - goto_if_trainer_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151 + goto_if_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return DewfordTown_Gym_EventScript_153152:: @ 8153152 - trainerbattle 1, TRAINER_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 + trainerbattle_single TRAINER_BRAWLY, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177, NO_MUSIC goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5 - msgbox DewfordTown_Gym_Text_175412, 4 + msgbox DewfordTown_Gym_Text_175412, MSGBOX_DEFAULT release end @@ -105,30 +105,30 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 call DewfordTown_Gym_EventScript_153117 message DewfordTown_Gym_Text_1752BB waitmessage - call DewfordTown_Gym_EventScript_1A02C5 - msgbox DewfordTown_Gym_Text_1752E6, 4 + call Common_EventScript_PlayGymBadgeFanfare + msgbox DewfordTown_Gym_Text_1752E6, MSGBOX_DEFAULT setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if_eq DewfordTown_Gym_EventScript_1A00FB + call_if_eq Common_EventScript_ReadyPetalburgGymForBattle setvar VAR_0x8008, 2 - call DewfordTown_Gym_EventScript_1A01C0 + call Common_EventScript_SetGymTrainers goto DewfordTown_Gym_EventScript_1531B5 end DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 - giveitem_std ITEM_TM08_BULK_UP + giveitem ITEM_TM08_BULK_UP compare VAR_RESULT, 0 - goto_if_eq DewfordTown_Gym_EventScript_1A029B - msgbox DewfordTown_Gym_Text_1753BF, 4 + goto_if_eq Common_EventScript_ShowBagIsFull + msgbox DewfordTown_Gym_Text_1753BF, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 release end DewfordTown_Gym_EventScript_1531D9:: @ 81531D9 - trainerbattle 2, TRAINER_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 - msgbox DewfordTown_Gym_Text_174F8E, 6 + trainerbattle_single TRAINER_HIDEKI, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 + msgbox DewfordTown_Gym_Text_174F8E, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1531F4:: @ 81531F4 @@ -137,8 +137,8 @@ DewfordTown_Gym_EventScript_1531F4:: @ 81531F4 end DewfordTown_Gym_EventScript_1531FB:: @ 81531FB - trainerbattle 2, TRAINER_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 - msgbox DewfordTown_Gym_Text_175031, 6 + trainerbattle_single TRAINER_TESSA, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 + msgbox DewfordTown_Gym_Text_175031, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_153216:: @ 8153216 @@ -147,8 +147,8 @@ DewfordTown_Gym_EventScript_153216:: @ 8153216 end DewfordTown_Gym_EventScript_15321D:: @ 815321D - trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 - msgbox DewfordTown_Gym_Text_175117, 6 + trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 + msgbox DewfordTown_Gym_Text_175117, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_153238:: @ 8153238 @@ -160,12 +160,12 @@ DewfordTown_Gym_EventScript_15323F:: @ 815323F lock faceplayer goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_153254 - msgbox DewfordTown_Gym_Text_174D98, 4 + msgbox DewfordTown_Gym_Text_174D98, MSGBOX_DEFAULT release end DewfordTown_Gym_EventScript_153254:: @ 8153254 - msgbox DewfordTown_Gym_Text_174F1E, 4 + msgbox DewfordTown_Gym_Text_174F1E, MSGBOX_DEFAULT release end @@ -182,11 +182,11 @@ DewfordTown_Gym_EventScript_15326E:: @ 815326E end DewfordTown_Gym_EventScript_15327E:: @ 815327E - msgbox DewfordTown_Gym_Text_175490, 4 + msgbox DewfordTown_Gym_Text_175490, MSGBOX_DEFAULT releaseall end DewfordTown_Gym_EventScript_153288:: @ 8153288 - msgbox DewfordTown_Gym_Text_175477, 4 + msgbox DewfordTown_Gym_Text_175477, MSGBOX_DEFAULT releaseall end |