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/ViridianCity_Gym/scripts.inc
+14 -18
View File
@@ -3,9 +3,8 @@ ViridianCity_Gym_MapScripts:: @ 8169EC9
ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04
checkflag FLAG_GOT_TM26_FROM_GIOVANNI
goto_if FALSE, EventScript_169F2F
trainerbattle_single TRAINER_LEADER_GIOVANNI, Text_18F352, Text_18F43F, EventScript_169F04, NO_MUSIC
goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, EventScript_169F2F
msgbox gUnknown_818F4A2
closemessage
fadescreen 1
@@ -28,9 +27,8 @@ EventScript_169F2F:: @ 8169F2F
msgbox gUnknown_818F586
checkitemspace ITEM_TM26, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_169F70
additem ITEM_TM26, 1
giveitemfanfaremsg gUnknown_818F675, ITEM_TM26
goto_if_eq EventScript_169F70
giveitem_msg gUnknown_818F675, ITEM_TM26
setflag FLAG_GOT_TM26_FROM_GIOVANNI
msgbox gUnknown_818F695
release
@@ -42,50 +40,49 @@ EventScript_169F70:: @ 8169F70
end
ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_JASON, 0, Text_18F7F3, Text_18F824
trainerbattle_single TRAINER_TAMER_JASON, Text_18F7F3, Text_18F824
msgbox gUnknown_818F840, 6
end
ViridianCity_Gym_EventScript_169F91:: @ 8169F91
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TAMER_COLE, 0, Text_18F98A, Text_18F9BB
trainerbattle_single TRAINER_TAMER_COLE, Text_18F98A, Text_18F9BB
msgbox gUnknown_818F9CC, 6
end
ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_ATSUSHI, 0, Text_18F7AD, Text_18F7D6
trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, Text_18F7AD, Text_18F7D6
msgbox gUnknown_818F7DD, 6
end
ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_KIYO, 0, Text_18F86C, Text_18F899
trainerbattle_single TRAINER_BLACK_BELT_KIYO, Text_18F86C, Text_18F899
msgbox gUnknown_818F8A0, 6
end
ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BLACK_BELT_TAKASHI, 0, Text_18F92C, Text_18F95A
trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, Text_18F92C, Text_18F95A
msgbox gUnknown_818F960, 6
end
ViridianCity_Gym_EventScript_169FED:: @ 8169FED
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_SAMUEL, 0, Text_18F9E7, Text_18FA2D
trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, Text_18F9E7, Text_18FA2D
msgbox gUnknown_818FA3B, 6
end
ViridianCity_Gym_EventScript_16A004:: @ 816A004
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_YUJI, 0, Text_18F73B, Text_18F769
trainerbattle_single TRAINER_COOLTRAINER_YUJI, Text_18F73B, Text_18F769
msgbox gUnknown_818F77B, 6
end
ViridianCity_Gym_EventScript_16A01B:: @ 816A01B
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_COOLTRAINER_WARREN, 0, Text_18F8CB, Text_18F8EE
trainerbattle_single TRAINER_COOLTRAINER_WARREN, Text_18F8CB, Text_18F8EE
msgbox gUnknown_818F8FE, 6
end
ViridianCity_Gym_EventScript_16A032:: @ 816A032
lock
faceplayer
checkflag FLAG_DEFEATED_LEADER_GIOVANNI
goto_if TRUE, EventScript_16A047
goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, EventScript_16A047
msgbox gUnknown_818FA81
release
end
@@ -98,8 +95,7 @@ EventScript_16A047:: @ 816A047
ViridianCity_Gym_EventScript_16A05E:: @ 816A05E
lockall
checkflag FLAG_BADGE08_GET
goto_if TRUE, EventScript_16A072
goto_if_set FLAG_BADGE08_GET, EventScript_16A072
msgbox gUnknown_818FB8D
releaseall
end