diff options
Diffstat (limited to 'data/maps/SaffronCity_Dojo/scripts.inc')
| -rw-r--r-- | data/maps/SaffronCity_Dojo/scripts.inc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 8be7e27a6..9c0f5cba8 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -3,7 +3,7 @@ SaffronCity_Dojo_MapScripts:: @ 816EBDB SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC lockall - setvar VAR_0x4081, 1 + setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 applymovement 5, Movement_1A75E7 waitmovement 0 releaseall @@ -11,7 +11,7 @@ SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE lockall - setvar VAR_0x4081, 1 + setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 applymovement 5, Movement_1A75EB waitmovement 0 releaseall @@ -20,8 +20,8 @@ SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 lock faceplayer - checkflag FLAG_0x278 - goto_if_eq EventScript_16EC3C + checkflag FLAG_GOT_HITMON_FROM_DOJO + goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_0x4001, SPECIES_HITMONLEE applymovement 5, Movement_1A75E9 @@ -30,7 +30,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16EC82 + goto_if eq, EventScript_16EC82 erasemonpic release end @@ -43,8 +43,8 @@ EventScript_16EC3C:: @ 816EC3C SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 lock faceplayer - checkflag FLAG_0x278 - goto_if_eq EventScript_16EC3C + checkflag FLAG_GOT_HITMON_FROM_DOJO + goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_0x4001, SPECIES_HITMONCHAN applymovement 5, Movement_1A75E9 @@ -53,7 +53,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16EC82 + goto_if eq, EventScript_16EC82 erasemonpic release end @@ -62,11 +62,11 @@ EventScript_16EC82:: @ 816EC82 erasemonpic givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16ECB5 + goto_if eq, EventScript_16ECB5 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16ECEC + goto_if eq, EventScript_16ECEC compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if eq, EventScript_1A927C release end @@ -77,10 +77,10 @@ EventScript_16ECB5:: @ 816ECB5 message Text_19B473 waitmessage waitfanfare - setflag FLAG_0x278 + setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16ED29 + goto_if eq, EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16ED29 @@ -93,10 +93,10 @@ EventScript_16ECEC:: @ 816ECEC message Text_19B473 waitmessage waitfanfare - setflag FLAG_0x278 + setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16ED1E + goto_if eq, EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E end @@ -123,29 +123,29 @@ SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D end SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 - trainerbattle 0, 321, 0, Text_19B3DF, Text_19B40F + trainerbattle 0, TRAINER_BLACK_BELT_HITOSHI, 0, Text_19B3DF, Text_19B40F msgbox gUnknown_819B41F, 6 end SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D - trainerbattle 0, 319, 0, Text_19B2E0, Text_19B2FD + trainerbattle 0, TRAINER_BLACK_BELT_HIDEKI, 0, Text_19B2E0, Text_19B2FD msgbox gUnknown_819B30F, 6 end SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 - trainerbattle 0, 320, 0, Text_19B341, Text_19B396 + trainerbattle 0, TRAINER_BLACK_BELT_AARON, 0, Text_19B341, Text_19B396 msgbox gUnknown_819B3AC, 6 end SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B - trainerbattle 0, 318, 0, Text_19B275, Text_19B292 + trainerbattle 0, TRAINER_BLACK_BELT_MIKE, 0, Text_19B275, Text_19B292 msgbox gUnknown_819B29D, 6 end SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 - trainerbattle 2, 317, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 - checkflag FLAG_0x278 - goto_if_eq EventScript_16EDC6 + trainerbattle 2, TRAINER_BLACK_BELT_KOICHI, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 + checkflag FLAG_GOT_HITMON_FROM_DOJO + goto_if TRUE, EventScript_16EDC6 msgbox gUnknown_819B1A7, 6 end @@ -155,6 +155,6 @@ EventScript_16EDC6:: @ 816EDC6 end EventScript_16EDD0:: @ 816EDD0 - setvar VAR_0x4081, 1 + setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 release end |