ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix typos (#713)

Browse Source 
* fix typos
This commit is contained in:
Flametix 2019-05-18 22:56:19 -04:00 committed by huderlem
parent ab421f1089
commit dbdb827e54
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/PetalburgCity_Gym/map.json
View File

@ -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",

2
data/maps/SlateportCity_House1/scripts.inc
View File

@ -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

2
data/specials.inc
View File

@ -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

2
include/constants/flags.h
View File

@ -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

2
src/tv.c
View File

@ -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))