From f4160ded9897f65e5ee7fa7050d195dfaa5bf5b2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 16 Sep 2019 00:29:59 -0400 Subject: [PATCH] Fix misnamed function --- data/scripts/pkmn_center_nurse.inc | 2 +- data/specials.inc | 2 +- src/field_specials.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index 9b1b576b4..bfeba79e3 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -48,7 +48,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993 return EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom:: @ 82719B1 - specialvar VAR_RESULT, PlayerAtTrainerHillEntrance + specialvar VAR_RESULT, PlayerNotAtTrainerHillEntrance compare VAR_RESULT, 0 goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn specialvar VAR_RESULT, BufferUnionRoomPlayerName diff --git a/data/specials.inc b/data/specials.inc index 1b9336e4e..cd6f128e1 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -523,7 +523,7 @@ gSpecials:: @ 81DBA64 def_special TryBufferWaldaPhrase def_special DoWaldaNamingScreen def_special TryGetWallpaperWithWaldaPhrase - def_special PlayerAtTrainerHillEntrance + def_special PlayerNotAtTrainerHillEntrance def_special sub_813B968 def_special sub_80F8B94 def_special ShowTrainerHillRecords diff --git a/src/field_specials.c b/src/field_specials.c index cb02f1f96..e56d8f52c 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -2009,7 +2009,7 @@ bool8 warp0_in_pokecenter(void) return FALSE; } -bool32 PlayerAtTrainerHillEntrance(void) +bool32 PlayerNotAtTrainerHillEntrance(void) { if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_HILL_ENTRANCE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_HILL_ENTRANCE)) {