From 71094356313801bf20191f3db1efa0decd3c3dcb Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 23 Apr 2020 17:20:34 -0400 Subject: Sync event macros --- data/event_scripts.s | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index ac5507d51..361173f75 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -13,6 +13,7 @@ #include "constants/heal_locations.h" #include "constants/vars.h" #include "constants/metatile_labels.h" +#include "constants/battle_setup.h" .include "include/macros.inc" .include "include/macros/event.inc" .include "constants/constants.inc" @@ -1490,7 +1491,7 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 end_movement Std_ObtainItem: @ 819FDF7 - giveitem VAR_0x8000, VAR_0x8001 + additem VAR_0x8000, VAR_0x8001 copyvar VAR_0x8007, VAR_RESULT call Std_ObtainItem_ return @@ -1565,7 +1566,7 @@ PlayGetTMHMFanfare: return Std_ObtainDecoration: @ 819FEDA - givedecoration VAR_0x8000 + adddecoration VAR_0x8000 copyvar VAR_0x8007, VAR_RESULT call Std_ObtainDecoration_ return @@ -1595,7 +1596,7 @@ Std_FindItem: @ 819FF21 lock faceplayer waitse - giveitem VAR_0x8000, VAR_0x8001 + additem VAR_0x8000, VAR_0x8001 copyvar VAR_0x8007, VAR_RESULT bufferitemname 1, VAR_0x8000 checkitemtype VAR_0x8000 @@ -1624,7 +1625,7 @@ Std_FindItem_Fail: @ 819FF65 HiddenItemScript:: @ 819FF7B lockall waitse - giveitem VAR_0x8005, 1 + additem VAR_0x8005 copyvar VAR_0x8007, VAR_RESULT bufferitemname 0x1, VAR_0x8005 checkitemtype VAR_0x8005 @@ -1795,7 +1796,7 @@ RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 - dodailyevents + dotimebasedevents setvar VAR_0x8004, 0 special BufferTrendyPhraseString return @@ -2539,7 +2540,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare - takeitem VAR_0x8004, 1 + removeitem VAR_0x8004, 1 return EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 -- cgit v1.2.3