diff options
Diffstat (limited to 'data/maps/SaffronCity_Dojo/scripts.inc')
| -rw-r--r-- | data/maps/SaffronCity_Dojo/scripts.inc | 81 |
1 files changed, 39 insertions, 42 deletions
diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 8481db66c..2994fabdd 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -4,7 +4,7 @@ SaffronCity_Dojo_MapScripts:: @ 816EBDB SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_1A75E7 + applymovement 5, Movement_WalkInPlaceFastestLeft waitmovement 0 releaseall end @@ -12,7 +12,7 @@ SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 - applymovement 5, Movement_1A75EB + applymovement 5, Movement_WalkInPlaceFastestRight waitmovement 0 releaseall end @@ -20,17 +20,16 @@ SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 lock faceplayer - checkflag FLAG_GOT_HITMON_FROM_DOJO - goto_if TRUE, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 - setvar VAR_0x4001, SPECIES_HITMONLEE - applymovement 5, Movement_1A75E9 + setvar VAR_TEMP_1, SPECIES_HITMONLEE + applymovement 5, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16EC82 + compare VAR_RESULT, YES + goto_if_eq EventScript_16EC82 erasemonpic release end @@ -43,44 +42,43 @@ EventScript_16EC3C:: @ 816EC3C SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 lock faceplayer - checkflag FLAG_GOT_HITMON_FROM_DOJO - goto_if TRUE, EventScript_16EC3C + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 - setvar VAR_0x4001, SPECIES_HITMONCHAN - applymovement 5, Movement_1A75E9 + setvar VAR_TEMP_1, SPECIES_HITMONCHAN + applymovement 5, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 0 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16EC82 + compare VAR_RESULT, YES + goto_if_eq EventScript_16EC82 erasemonpic release end 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 - compare_var_to_value VAR_RESULT, 1 - goto_if eq, EventScript_16ECEC - compare_var_to_value VAR_RESULT, 2 - goto_if eq, EventScript_1A927C + givemon VAR_TEMP_1, 25, ITEM_NONE + compare VAR_RESULT, 0 + goto_if_eq EventScript_16ECB5 + compare VAR_RESULT, 1 + goto_if_eq EventScript_16ECEC + compare VAR_RESULT, 2 + goto_if_eq EventScript_1A927C release end EventScript_16ECB5:: @ 816ECB5 removeobject VAR_LAST_TALKED - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_19B473 waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16ED29 + compare VAR_RESULT, NO + goto_if_eq EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16ED29 @@ -88,15 +86,15 @@ EventScript_16ECB5:: @ 816ECB5 EventScript_16ECEC:: @ 816ECEC removeobject VAR_LAST_TALKED - getspeciesname 0, VAR_0x4001 + getspeciesname 0, VAR_TEMP_1 playfanfare MUS_FANFA1 message Text_19B473 waitmessage waitfanfare setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_16ED1E + compare VAR_RESULT, NO + goto_if_eq EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E end @@ -111,42 +109,41 @@ EventScript_16ED29:: @ 816ED29 end SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B - msgbox gUnknown_819B52E, 3 + msgbox gUnknown_819B52E, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34 - msgbox gUnknown_819B4F8, 3 + msgbox gUnknown_819B4F8, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D - msgbox gUnknown_819B50F, 3 + msgbox gUnknown_819B50F, MSGBOX_SIGN end SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HITOSHI, 0, Text_19B3DF, Text_19B40F - msgbox gUnknown_819B41F, 6 + trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F + msgbox gUnknown_819B41F, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_HIDEKI, 0, Text_19B2E0, Text_19B2FD - msgbox gUnknown_819B30F, 6 + trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD + msgbox gUnknown_819B30F, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_AARON, 0, Text_19B341, Text_19B396 - msgbox gUnknown_819B3AC, 6 + trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396 + msgbox gUnknown_819B3AC, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B - trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_MIKE, 0, Text_19B275, Text_19B292 - msgbox gUnknown_819B29D, 6 + trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292 + msgbox gUnknown_819B29D, MSGBOX_AUTOCLOSE end SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, 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 + trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0 + goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6 + msgbox gUnknown_819B1A7, MSGBOX_AUTOCLOSE end EventScript_16EDC6:: @ 816EDC6 |