diff options
author | YamaArashi <shadow962@live.com> | 2016-10-24 03:07:53 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-10-24 03:07:53 -0700 |
commit | e9e147fe7d075ddfb1467dc91f3f1a0dd4adf99b (patch) | |
tree | ce510a42d54927dc58c735f35e7d70543ec0ea31 /src | |
parent | 92e63e2577ecf03539f486f40d7f6d563c607d11 (diff) |
rename more functions
Diffstat (limited to 'src')
-rw-r--r-- | src/link.c | 2 | ||||
-rw-r--r-- | src/main_menu.c | 2 | ||||
-rw-r--r-- | src/menu.c | 2 | ||||
-rw-r--r-- | src/option_menu.c | 2 | ||||
-rw-r--r-- | src/pokedex.c | 4 | ||||
-rw-r--r-- | src/pokemon_1.c | 2 | ||||
-rw-r--r-- | src/text.c | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/link.c b/src/link.c index 0e88ac91a..3f4ffe97d 100644 --- a/src/link.c +++ b/src/link.c @@ -1241,7 +1241,7 @@ static void CB2_PrintErrorMessage(void) switch (gMain.state) { case 0: - sub_80729D8(gMultiText_LinkError, 20, 56, 1); + MenuPrint_PixelCoords(gMultiText_LinkError, 20, 56, 1); break; case 30: case 60: diff --git a/src/main_menu.c b/src/main_menu.c index 550072099..9a5326ea1 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -626,7 +626,7 @@ void PrintBadgeCount(void) MenuPrint(gMainMenuString_Badges, 16, 5); ConvertIntToDecimalString(buffer, GetBadgeCount()); - sub_80729D8(buffer, 205, 40, 1); + MenuPrint_PixelCoords(buffer, 205, 40, 1); } //Text Strings diff --git a/src/menu.c b/src/menu.c index 4f194c0e8..4bdaa8caf 100644 --- a/src/menu.c +++ b/src/menu.c @@ -579,7 +579,7 @@ s8 ProcessMenuInputNoWrap_(void) return ProcessMenuInputNoWrap(); } -u8 sub_80729D8(u8 *text, u8 left, u16 top, u8 a4) +u8 MenuPrint_PixelCoords(u8 *text, u8 left, u16 top, u8 a4) { return sub_8004D04(gMenuWindowPtr, text, gMenuTextTileOffset, left, top, a4); } diff --git a/src/option_menu.c b/src/option_menu.c index 67a715988..abd295007 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -332,7 +332,7 @@ static void DrawOptionMenuChoice(u8 *text, u8 x, u8 y, u8 style) dst[2] = style; dst[i] = EOS; - sub_80729D8(dst, x, y, 1); + MenuPrint_PixelCoords(dst, x, y, 1); } static u8 TextSpeed_ProcessInput(u8 selection) diff --git a/src/pokedex.c b/src/pokedex.c index ded629987..ae4aafbf2 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1139,7 +1139,7 @@ u8 sub_808DFE4(u16 a, u8 b, u8 c) for(i = 0; i < 10; i++) text[i] = 0xAE; } - sub_80729D8(text, (b - 0x11) * 8 + 0xFC, c * 8, 0); + MenuPrint_PixelCoords(text, (b - 0x11) * 8 + 0xFC, c * 8, 0); } #else __attribute__((naked)) @@ -1228,7 +1228,7 @@ _0808E070:\n\ lsrs r2, r6, 16\n\ mov r0, sp\n\ movs r3, 0\n\ - bl sub_80729D8\n\ + bl MenuPrint_PixelCoords\n\ adds r0, r4, 0\n\ add sp, 0xC\n\ pop {r4-r6}\n\ diff --git a/src/pokemon_1.c b/src/pokemon_1.c index eb344946a..0c34279f7 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -307,7 +307,7 @@ void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src) language = 2; SetMonData(mon, MON_DATA_LANGUAGE, &language); - SkipExtCtrlCodes(nickname); + StripExtCtrlCodes(nickname); SetMonData(mon, MON_DATA_NICKNAME, nickname); SetMonData(mon, MON_DATA_FRIENDSHIP, (u8 *)&src->friendship); SetMonData(mon, MON_DATA_HP_EV, (u8 *)&src->hpEV); diff --git a/src/text.c b/src/text.c index fe284328f..4f2581af6 100644 --- a/src/text.c +++ b/src/text.c @@ -3667,7 +3667,7 @@ void ConvertInternationalString(u8 *s, u8 language) u8 i; u8 length; - SkipExtCtrlCodes(s); + StripExtCtrlCodes(s); i = StringLength(s); s[i++] = 0xFC; s[i++] = 22; @@ -3686,7 +3686,7 @@ void ConvertInternationalString(u8 *s, u8 language) } } -void SkipExtCtrlCodes(u8 *str) +void StripExtCtrlCodes(u8 *str) { u16 srcIndex = 0; u16 destIndex = 0; |