From 901a83d249a511e45a79d3358bdbdf1a594013ab Mon Sep 17 00:00:00 2001 From: Fontbane Date: Mon, 22 Apr 2019 16:31:51 -0400 Subject: Fix some labels and include decorations.h Include decorations.h in shop.c Include decorations.h in event_scripts.s --- data/scripts/cable_club.inc | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 816fa9e6e..fe3fa9fae 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1,24 +1,8 @@ -BattleFrontier_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -DewfordTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -EverGrandeCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -EverGrandeCity_PokemonLeague_2F_MapScript1_OnTransition: @ 8276ACF -FallarborTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -FortreeCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -LavaridgeTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -LilycoveCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -MauvilleCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -MossdeepCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -OldaleTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -PacifidlogTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -PetalburgCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -RustboroCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -SlateportCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -SootopolisCity_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF -VerdanturfTown_PokemonCenter_2F_MapScript1_OnTransition: @ 8276ACF - call OldaleTown_PokemonCenter_2F_EventScript_276AD5 - end - -OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5 +PokemonCenter_2F_OnTransition: @ 8276ACF + call OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift + end + +OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift:: @ 8276AD5 specialvar VAR_RESULT, sub_813B514 compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB -- cgit v1.2.3