Sync event macros

This commit is contained in:
GriffinR
2020-01-10 00:44:57 -05:00
parent 94fbc3ac48
commit 4a6f15ba24
220 changed files with 3209 additions and 3580 deletions
+21 -21
View File
@@ -32,29 +32,29 @@ EventScript_1682BE:: @ 81682BE
playbgm MUS_RIVAL1, 0
addobject 1
compare VAR_TEMP_1, 0
call_if eq, EventScript_168350
call_if_eq EventScript_168350
compare VAR_TEMP_1, 1
call_if eq, EventScript_168350
call_if_eq EventScript_168350
compare VAR_TEMP_1, 2
call_if eq, EventScript_16835B
call_if_eq EventScript_16835B
delay 6
msgbox gUnknown_8188890
compare VAR_STARTER_MON, 2
call_if eq, EventScript_16836D
call_if_eq EventScript_16836D
compare VAR_STARTER_MON, 1
call_if eq, EventScript_16837C
call_if_eq EventScript_16837C
compare VAR_STARTER_MON, 0
call_if eq, EventScript_16838B
call_if_eq EventScript_16838B
msgbox gUnknown_8188974
closemessage
delay 10
playbgm MUS_RIVAL2, 0
compare VAR_TEMP_1, 0
call_if eq, EventScript_16839A
call_if_eq EventScript_16839A
compare VAR_TEMP_1, 1
call_if eq, EventScript_16839A
call_if_eq EventScript_16839A
compare VAR_TEMP_1, 2
call_if eq, EventScript_1683A5
call_if_eq EventScript_1683A5
fadedefaultbgm
removeobject 1
setvar VAR_MAP_SCENE_ROUTE22, 2
@@ -73,15 +73,15 @@ EventScript_16835B:: @ 816835B
return
EventScript_16836D:: @ 816836D
trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A
trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A
return
EventScript_16837C:: @ 816837C
trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A
trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A
return
EventScript_16838B:: @ 816838B
trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A
trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A
return
EventScript_16839A:: @ 816839A
@@ -198,19 +198,19 @@ EventScript_16841F:: @ 816841F
playbgm MUS_RIVAL1, 0
addobject 1
compare VAR_TEMP_1, 0
call_if eq, EventScript_16849C
call_if_eq EventScript_16849C
compare VAR_TEMP_1, 1
call_if eq, EventScript_16849C
call_if_eq EventScript_16849C
compare VAR_TEMP_1, 2
call_if eq, EventScript_1684A7
call_if_eq EventScript_1684A7
msgbox gUnknown_8188A3C
setvar VAR_LAST_TALKED, 1
compare VAR_STARTER_MON, 2
call_if eq, EventScript_1684B9
call_if_eq EventScript_1684B9
compare VAR_STARTER_MON, 1
call_if eq, EventScript_1684C4
call_if_eq EventScript_1684C4
compare VAR_STARTER_MON, 0
call_if eq, EventScript_1684CF
call_if_eq EventScript_1684CF
msgbox gUnknown_8188B29
closemessage
delay 10
@@ -235,15 +235,15 @@ EventScript_1684A7:: @ 81684A7
return
EventScript_1684B9:: @ 81684B9
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, 0, Text_188B08
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Text_188B08
return
EventScript_1684C4:: @ 81684C4
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, 0, Text_188B08
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Text_188B08
return
EventScript_1684CF:: @ 81684CF
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, 0, Text_188B08
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Text_188B08
return
Movement_1684DA:: @ 81684DA