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/CeladonCity_DepartmentStore_Roof/scripts.inc
+20 -23
View File
@@ -4,13 +4,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
call EventScript_16BCF6
compare VAR_TEMP_1, 0
goto_if eq, EventScript_16C00E
goto_if_eq EventScript_16C00E
goto EventScript_16BD3E
end
@@ -18,13 +18,13 @@ EventScript_16BCF6:: @ 816BCF6
setvar VAR_TEMP_1, 0
checkitem ITEM_FRESH_WATER, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16BD2C
call_if_eq EventScript_16BD2C
checkitem ITEM_SODA_POP, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16BD32
call_if_eq EventScript_16BD32
checkitem ITEM_LEMONADE, 1
compare VAR_RESULT, 1
call_if eq, EventScript_16BD38
call_if_eq EventScript_16BD38
return
EventScript_16BD2C:: @ 816BD2C
@@ -42,7 +42,7 @@ EventScript_16BD38:: @ 816BD38
EventScript_16BD3E:: @ 816BD3E
msgbox gUnknown_8195D22, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_16C00C
goto_if_eq EventScript_16C00C
textcolor 3
message Text_195D5F
waitmessage
@@ -121,8 +121,7 @@ EventScript_16BED7:: @ 816BED7
EventScript_16BF19:: @ 816BF19
setvar VAR_0x8008, ITEM_FRESH_WATER
setvar VAR_0x8009, ITEM_TM16
checkflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL
goto_if TRUE, EventScript_16C018
goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018
msgbox gUnknown_8195D75
goto EventScript_16BF7C
end
@@ -130,8 +129,7 @@ EventScript_16BF19:: @ 816BF19
EventScript_16BF3A:: @ 816BF3A
setvar VAR_0x8008, ITEM_SODA_POP
setvar VAR_0x8009, ITEM_TM20
checkflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL
goto_if TRUE, EventScript_16C018
goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018
msgbox gUnknown_8195E33
goto EventScript_16BF7C
end
@@ -139,8 +137,7 @@ EventScript_16BF3A:: @ 816BF3A
EventScript_16BF5B:: @ 816BF5B
setvar VAR_0x8008, ITEM_LEMONADE
setvar VAR_0x8009, ITEM_TM33
checkflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL
goto_if TRUE, EventScript_16C018
goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018
msgbox gUnknown_8195EBF
goto EventScript_16BF7C
end
@@ -151,8 +148,8 @@ EventScript_16BF7C:: @ 816BF7C
removeitem VAR_0x8008, 1
checkitemspace VAR_0x8009, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16C002
additem VAR_0x8009, 1
goto_if_eq EventScript_16C002
additem VAR_0x8009
textcolor 3
playfanfare MUS_FANFA1
message Text_ReceivedItemFromLittleGirl
@@ -161,11 +158,11 @@ EventScript_16BF7C:: @ 816BF7C
putitemaway VAR_0x8009
call EventScript_1A6675
compare VAR_0x8008, ITEM_FRESH_WATER
call_if eq, EventScript_16BFDE
call_if_eq EventScript_16BFDE
compare VAR_0x8008, ITEM_SODA_POP
call_if eq, EventScript_16BFEA
call_if_eq EventScript_16BFEA
compare VAR_0x8008, ITEM_LEMONADE
call_if eq, EventScript_16BFF6
call_if_eq EventScript_16BFF6
release
end
@@ -262,21 +259,21 @@ EventScript_16C0C4:: @ 816C0C4
EventScript_16C0CB:: @ 816C0CB
compare VAR_RESULT, 0
goto_if eq, EventScript_16C131
goto_if_eq EventScript_16C131
checkitemspace VAR_TEMP_0, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_16C13F
goto_if_eq EventScript_16C13F
compare VAR_TEMP_1, 0
call_if eq, EventScript_16C0B6
call_if_eq EventScript_16C0B6
compare VAR_TEMP_1, 1
call_if eq, EventScript_16C0BD
call_if_eq EventScript_16C0BD
compare VAR_TEMP_1, 2
call_if eq, EventScript_16C0C4
call_if_eq EventScript_16C0C4
updatemoneybox 0, 0, 0
getitemname 0, VAR_TEMP_0
playse SE_JIHANKI
msgbox gUnknown_8196076
additem VAR_TEMP_0, 1
additem VAR_TEMP_0
goto EventScript_16C125
end