diff options
| -rw-r--r-- | data/maps/PetalburgCity_Gym/map.json | 2 | ||||
| -rw-r--r-- | data/maps/SlateportCity_House1/scripts.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 | ||||
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | src/tv.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 297c58a30..ff317c943 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -25,7 +25,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "PetalburgCity_Gym_EventScript_2049F1", - "flag": "FLAG_HIDE_PETALYBURG_GYM_NORMAN" + "flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN" }, { "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 155081a1b..0a5808820 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -58,7 +58,7 @@ SlateportCity_House1_EventScript_209B50:: @ 8209B50 SlateportCity_House1_EventScript_209B5A:: @ 8209B5A msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT call Common_EventScript_NameReceivedPokemon - specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged + specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicknameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_209B84 diff --git a/data/specials.inc b/data/specials.inc index 7a2b0f975..78a949df5 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -134,7 +134,7 @@ gSpecials:: @ 81DBA64 def_special CompareSeedotSize def_special GetLotadSizeRecordInfo def_special CompareLotadSize - def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged + def_special TV_PutNameRaterShowOnTheAirIfNicknameChanged def_special TV_CopyNicknameToStringVar1AndEnsureTerminated def_special TV_CheckMonOTIDEqualsPlayerID def_special BufferTrendyPhraseString diff --git a/include/constants/flags.h b/include/constants/flags.h index 732c68764..7aa5c3ed3 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -725,7 +725,7 @@ #define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE 0x301 #define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE 0x302 #define FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE 0x303 -#define FLAG_HIDE_PETALYBURG_GYM_NORMAN 0x304 +#define FLAG_HIDE_PETALBURG_GYM_NORMAN 0x304 #define FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 0x305 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 0x306 #define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR 0x307 @@ -3434,7 +3434,7 @@ bool8 TV_IsScriptShowKindAlreadyInQueue(void) return FALSE; } -bool8 TV_PutNameRaterShowOnTheAirIfNicnkameChanged(void) +bool8 TV_PutNameRaterShowOnTheAirIfNicknameChanged(void) { GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1); if (!StringCompare(gStringVar3, gStringVar1)) |