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
+12 -16
View File
@@ -3,8 +3,7 @@ MtMoon_B2F_MapScripts:: @ 8160699
.byte 0
MtMoon_B2F_OnTransition:: @ 816069F
checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON
call_if FALSE, EventScript_1606A9
call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_1606A9
end
EventScript_1606A9:: @ 81606A9
@@ -23,10 +22,9 @@ MtMoon_B2F_EventScript_1606B0:: @ 81606B0
MtMoon_B2F_EventScript_1606C2:: @ 81606C2
lock
faceplayer
checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON
goto_if TRUE, EventScript_160707
goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707
checktrainerflag TRAINER_SUPER_NERD_MIGUEL
goto_if eq, EventScript_160711
goto_if_eq EventScript_160711
call EventScript_1606DD
release
end
@@ -38,7 +36,7 @@ EventScript_1606DD:: @ 81606DD
playbgm MUS_EXEYE, 0
waitbuttonpress
setvar VAR_LAST_TALKED, 3
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_SUPER_NERD_MIGUEL, 0, Text_172B99
trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, Text_172B99
setvar VAR_MAP_SCENE_MT_MOON_B2F, 1
msgbox gUnknown_8172BAB
return
@@ -58,10 +56,9 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B
faceplayer
msgbox gUnknown_8172E77, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_1607DE
goto_if_eq EventScript_1607DE
removeobject 1
additem ITEM_DOME_FOSSIL, 1
giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5
giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5
closemessage
special sub_8112364
delay 10
@@ -91,10 +88,9 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F
faceplayer
msgbox gUnknown_8172E94, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_1607DE
goto_if_eq EventScript_1607DE
removeobject 2
additem ITEM_HELIX_FOSSIL, 1
giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
closemessage
special sub_8112364
delay 10
@@ -123,21 +119,21 @@ Movement_1607E0:: @ 81607E0
step_end
MtMoon_B2F_EventScript_1607E4:: @ 81607E4
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT, 0, Text_172C5A, Text_172CB8
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8
msgbox gUnknown_8172CCB, 6
end
MtMoon_B2F_EventScript_1607FB:: @ 81607FB
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_2, 0, Text_172CFC, Text_172D46
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46
msgbox gUnknown_8172D51, 6
end
MtMoon_B2F_EventScript_160812:: @ 8160812
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_3, 0, Text_172D82, Text_172DAF
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF
msgbox gUnknown_8172DC1, 6
end
MtMoon_B2F_EventScript_160829:: @ 8160829
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_4, 0, Text_172DF0, Text_172E3E
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E
msgbox gUnknown_8172E4B, 6
end