dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync event macros

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SaffronCity_Gym/scripts.inc
+13 -17
View File
@@ -3,9 +3,8 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7
SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8
famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A
checkflag FLAG_GOT_TM04_FROM_SABRINA
goto_if FALSE, EventScript_16EE3D
trainerbattle_single TRAINER_LEADER_SABRINA, Text_19B53C, Text_19B602, EventScript_16EE0A, NO_MUSIC
goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, EventScript_16EE3D
msgbox gUnknown_819B7F2
release
end
@@ -24,9 +23,8 @@ EventScript_16EE3D:: @ 816EE3D
msgbox gUnknown_819B6FA
checkitemspace ITEM_TM04, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16EE7E
additem ITEM_TM04, 1
giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04
goto_if_eq EventScript_16EE7E
giveitem_msg gUnknown_819B7D3, ITEM_TM04
setflag FLAG_GOT_TM04_FROM_SABRINA
msgbox gUnknown_819B685
release
@@ -38,46 +36,45 @@ EventScript_16EE7E:: @ 816EE7E
end
SaffronCity_Gym_EventScript_16EE88:: @ 816EE88
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_JOHAN, 0, Text_19B936, Text_19B957
trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957
msgbox gUnknown_819B96D, 6
end
SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_TYRON, 0, Text_19BA45, Text_19BA9E
trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E
famechecker FAMECHECKER_SABRINA, 5
msgbox gUnknown_819BAB4, 6
end
SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_CAMERON, 0, Text_19BB49, Text_19BBA1
trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1
msgbox gUnknown_819BBB3, 6
end
SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_PSYCHIC_PRESTON, 0, Text_19BC57, Text_19BCBC
trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC
msgbox gUnknown_819BCC4, 6
end
SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_AMANDA, 0, Text_19B86A, Text_19B8A8
trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8
msgbox gUnknown_819B8B9, 6
end
SaffronCity_Gym_EventScript_16EF08:: @ 816EF08
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_STACY, 0, Text_19B998, Text_19B9EC
trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC
msgbox gUnknown_819B9F7, 6
end
SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CHANNELER_TASHA, 0, Text_19BAE8, Text_19BB0D
trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D
msgbox gUnknown_819BB1F, 6
end
SaffronCity_Gym_EventScript_16EF36:: @ 816EF36
lock
faceplayer
checkflag FLAG_DEFEATED_SABRINA
goto_if TRUE, EventScript_16EF4B
goto_if_set FLAG_DEFEATED_SABRINA, EventScript_16EF4B
msgbox gUnknown_819BCF6
release
end
@@ -89,8 +86,7 @@ EventScript_16EF4B:: @ 816EF4B
SaffronCity_Gym_EventScript_16EF55:: @ 816EF55
lockall
checkflag FLAG_BADGE06_GET
goto_if TRUE, EventScript_16EF69
goto_if_set FLAG_BADGE06_GET, EventScript_16EF69
msgbox gUnknown_819BDFE
releaseall
end