summaryrefslogtreecommitdiff
path: root/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc')
-rw-r--r--data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc17
1 files changed, 7 insertions, 10 deletions
diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
index d82308203..feda220fd 100644
--- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
+++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
@@ -4,15 +4,13 @@ LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149
LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A
lock
faceplayer
- checkflag FLAG_GOT_POKE_FLUTE
- goto_if TRUE, EventScript_16B196
+ goto_if_set FLAG_GOT_POKE_FLUTE, EventScript_16B196
msgbox gUnknown_81936FF
checkitemspace ITEM_POKE_FLUTE, 1
- compare_var_to_value VAR_RESULT, 0
- goto_if eq, EventScript_16B1A0
+ compare VAR_RESULT, FALSE
+ goto_if_eq EventScript_16B1A0
setflag FLAG_GOT_POKE_FLUTE
- additem ITEM_POKE_FLUTE, 1
- giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5
+ giveitem_msg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5
msgbox gUnknown_81937E5
release
end
@@ -36,14 +34,13 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA
end
LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3
- msgbox gUnknown_81936B4, 2
+ msgbox gUnknown_81936B4, MSGBOX_NPC
end
LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC
lock
faceplayer
- checkflag FLAG_RESCUED_MR_FUJI
- goto_if TRUE, EventScript_16B1E1
+ goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_16B1E1
msgbox gUnknown_81935ED
release
end
@@ -81,5 +78,5 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211
end
LavenderTown_VolunteerPokemonHouse_EventScript_16B229:: @ 816B229
- msgbox gUnknown_819392B, 3
+ msgbox gUnknown_819392B, MSGBOX_SIGN
end