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
+16 -20
View File
@@ -4,11 +4,10 @@ Route12_FishingHouse_MapScripts:: @ 816FF0B
Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C
lock
faceplayer
checkflag FLAG_GOT_SUPER_ROD
goto_if TRUE, EventScript_16FF7F
goto_if_set FLAG_GOT_SUPER_ROD, EventScript_16FF7F
msgbox gUnknown_819EFE0, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_16FF34
goto_if_eq EventScript_16FF34
msgbox gUnknown_819F1FA
release
end
@@ -16,10 +15,10 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C
EventScript_16FF34:: @ 816FF34
checkitemspace ITEM_SUPER_ROD, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16FF75
additem ITEM_SUPER_ROD, 1
goto_if_eq EventScript_16FF75
additem ITEM_SUPER_ROD
msgbox gUnknown_819F05B
giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD
msgreceiveditem gUnknown_819F0B2, ITEM_SUPER_ROD
setflag FLAG_GOT_SUPER_ROD
msgbox gUnknown_819F0EB
release
@@ -33,28 +32,28 @@ EventScript_16FF75:: @ 816FF75
EventScript_16FF7F:: @ 816FF7F
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
compare VAR_RESULT, 0
goto_if eq, EventScript_16FFF5
goto_if_eq EventScript_16FFF5
special GetMagikarpSizeRecordInfo
msgbox gUnknown_819F2DB
special Special_ChooseMonFromParty
waitstate
copyvar VAR_RESULT, VAR_0x8004
compare VAR_RESULT, 6
goto_if ge, EventScript_16FFFF
goto_if_ge EventScript_16FFFF
special CompareMagikarpSize
compare VAR_RESULT, 1
goto_if eq, EventScript_170001
goto_if_eq EventScript_170001
compare VAR_RESULT, 2
goto_if eq, EventScript_17000B
goto_if_eq EventScript_17000B
compare VAR_RESULT, 3
goto_if eq, EventScript_170031
goto_if_eq EventScript_170031
compare VAR_RESULT, 4
goto_if eq, EventScript_17001E
goto_if_eq EventScript_17001E
release
end
@@ -73,15 +72,13 @@ EventScript_170001:: @ 8170001
end
EventScript_17000B:: @ 817000B
checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP
goto_if FALSE, EventScript_170031
goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031
msgbox gUnknown_819F40A
release
end
EventScript_17001E:: @ 817001E
checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP
goto_if FALSE, EventScript_170031
goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_170031
msgbox gUnknown_819F3CB
release
end
@@ -91,7 +88,7 @@ EventScript_170031:: @ 8170031
msgbox gUnknown_819F31B
giveitem ITEM_NET_BALL
compare VAR_RESULT, 0
goto_if eq, EventScript_17005D
goto_if_eq EventScript_17005D
msgbox gUnknown_819F395
release
end
@@ -103,8 +100,7 @@ EventScript_17005D:: @ 817005D
Route12_FishingHouse_EventScript_170067:: @ 8170067
lockall
checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP
goto_if TRUE, EventScript_17007B
goto_if_set FLAG_GOT_RECORD_SETTING_MAGIKARP, EventScript_17007B
msgbox gUnknown_819F50C
releaseall
end