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
@@ -72,9 +72,9 @@ Movement_16F13E:: @ 816F13E
SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1
goto_if eq, EventScript_16F267
goto_if_eq EventScript_16F267
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
goto_if eq, EventScript_16F15B
goto_if_eq EventScript_16F15B
end
EventScript_16F15B:: @ 816F15B
@@ -82,35 +82,35 @@ EventScript_16F15B:: @ 816F15B
setvar VAR_0x8004, 0
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
call_if eq, EventScript_16F207
call_if_eq EventScript_16F207
setvar VAR_0x8004, 1
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
call_if eq, EventScript_16F213
call_if_eq EventScript_16F213
setvar VAR_0x8004, 2
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
call_if eq, EventScript_16F21F
call_if_eq EventScript_16F21F
setvar VAR_0x8004, 3
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
call_if eq, EventScript_16F22B
call_if_eq EventScript_16F22B
setvar VAR_0x8004, 4
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
call_if eq, EventScript_16F237
call_if_eq EventScript_16F237
setvar VAR_0x8004, 5
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
call_if eq, EventScript_16F243
call_if_eq EventScript_16F243
setvar VAR_0x8004, 6
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
call_if eq, EventScript_16F24F
call_if_eq EventScript_16F24F
setvar VAR_0x8004, 7
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 0
call_if eq, EventScript_16F25B
call_if_eq EventScript_16F25B
end
EventScript_16F207:: @ 816F207
@@ -167,13 +167,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
setvar VAR_0x8004, 0
special BufferStreakTrainerText
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F2EE
goto_if_eq EventScript_16F2EE
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
goto_if eq, EventScript_16F2C0
goto_if_eq EventScript_16F2C0
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
goto_if eq, EventScript_16F2E4
goto_if_eq EventScript_16F2E4
msgbox gUnknown_819C420
release
end
@@ -181,7 +181,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
EventScript_16F2C0:: @ 816F2C0
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 1
goto_if eq, EventScript_16F2DA
goto_if_eq EventScript_16F2DA
msgbox gUnknown_819C390
release
end
@@ -207,13 +207,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
setvar VAR_0x8004, 3
special BufferStreakTrainerText
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F365
goto_if_eq EventScript_16F365
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
goto_if eq, EventScript_16F337
goto_if_eq EventScript_16F337
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
goto_if eq, EventScript_16F35B
goto_if_eq EventScript_16F35B
msgbox gUnknown_819CBD3
release
end
@@ -221,7 +221,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
EventScript_16F337:: @ 816F337
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 1
goto_if eq, EventScript_16F351
goto_if_eq EventScript_16F351
msgbox gUnknown_819CB32
release
end
@@ -247,13 +247,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
setvar VAR_0x8004, 1
special BufferStreakTrainerText
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F3DC
goto_if_eq EventScript_16F3DC
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
goto_if eq, EventScript_16F3AE
goto_if_eq EventScript_16F3AE
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
goto_if eq, EventScript_16F3D2
goto_if_eq EventScript_16F3D2
msgbox gUnknown_819C6BA
release
end
@@ -261,7 +261,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
EventScript_16F3AE:: @ 816F3AE
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 1
goto_if eq, EventScript_16F3C8
goto_if_eq EventScript_16F3C8
msgbox gUnknown_819C5A9
release
end
@@ -287,13 +287,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
setvar VAR_0x8004, 2
special BufferStreakTrainerText
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if eq, EventScript_16F453
goto_if_eq EventScript_16F453
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
goto_if eq, EventScript_16F425
goto_if_eq EventScript_16F425
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
goto_if eq, EventScript_16F449
goto_if_eq EventScript_16F449
msgbox gUnknown_819C986
release
end
@@ -301,7 +301,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
EventScript_16F425:: @ 816F425
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 1
goto_if eq, EventScript_16F43F
goto_if_eq EventScript_16F43F
msgbox gUnknown_819C81E
release
end
@@ -328,10 +328,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
goto_if eq, EventScript_16F491
goto_if_eq EventScript_16F491
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
goto_if eq, EventScript_16F4B5
goto_if_eq EventScript_16F4B5
msgbox gUnknown_819D01F
release
end
@@ -339,7 +339,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
EventScript_16F491:: @ 816F491
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 1
goto_if eq, EventScript_16F4AB
goto_if_eq EventScript_16F4AB
msgbox gUnknown_819CEDF
release
end
@@ -361,10 +361,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
goto_if eq, EventScript_16F4F3
goto_if_eq EventScript_16F4F3
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
goto_if eq, EventScript_16F517
goto_if_eq EventScript_16F517
msgbox gUnknown_819CDDA
release
end
@@ -372,7 +372,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
EventScript_16F4F3:: @ 816F4F3
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 1
goto_if eq, EventScript_16F50D
goto_if_eq EventScript_16F50D
msgbox gUnknown_819CCF3
release
end
@@ -394,10 +394,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
goto_if eq, EventScript_16F555
goto_if_eq EventScript_16F555
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
goto_if eq, EventScript_16F579
goto_if_eq EventScript_16F579
msgbox gUnknown_819D1AE
release
end
@@ -405,7 +405,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
EventScript_16F555:: @ 816F555
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 1
goto_if eq, EventScript_16F56F
goto_if_eq EventScript_16F56F
msgbox gUnknown_819D0E3
release
end
@@ -427,10 +427,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveSaffronFanClubMember
compare VAR_RESULT, 1
goto_if eq, EventScript_16F5B7
goto_if_eq EventScript_16F5B7
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 7
goto_if eq, EventScript_16F5DB
goto_if_eq EventScript_16F5DB
msgbox gUnknown_819D3D2
release
end
@@ -438,7 +438,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
EventScript_16F5B7:: @ 816F5B7
specialvar VAR_RESULT, GetNumMovedSaffronFanClubMembers
compare VAR_RESULT, 1
goto_if eq, EventScript_16F5D1
goto_if_eq EventScript_16F5D1
msgbox gUnknown_819D2B4
release
end