diff options
author | YamaArashi <shadow962@live.com> | 2017-01-22 21:55:01 -0800 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2017-01-22 22:08:38 -0800 |
commit | 535ed69d33072543b543829b86409758cc7f6318 (patch) | |
tree | e7be4a872994d59fcba07a944f0bd1ace185941f /src | |
parent | a14cd89b9ca175af2fba4faadd8989e24d1275ce (diff) |
change preproc syntax for C strings
Diffstat (limited to 'src')
-rw-r--r-- | src/field_player_avatar.c | 2 | ||||
-rw-r--r-- | src/link.c | 20 | ||||
-rw-r--r-- | src/pokemon_size_record.c | 2 | ||||
-rw-r--r-- | src/sprite.c | 10 | ||||
-rw-r--r-- | src/string_util.c | 6 |
5 files changed, 21 insertions, 19 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 0a506bbac..08d9c13d6 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1562,7 +1562,7 @@ u8 Fishing4(struct Task *task) u8 Fishing5(struct Task *task) { - const u8 dot[] = _"·"; + const u8 dot[] = _("·"); sub_805A954(); task->data[1]++; diff --git a/src/link.c b/src/link.c index 2b463f6b4..5c33fe986 100644 --- a/src/link.c +++ b/src/link.c @@ -160,16 +160,16 @@ EWRAM_DATA bool8 gLinkOpen = {0}; static const u8 sDebugMessages[7][12] = { - _"せつぞく ちゅうです", - _"せつぞく できません", - _"かくにん ちゅうです", - _"かくにん できました", - _"かくにん できません", - _"かくにん を かくにん", - _"かくにん は しっぱい", + _("せつぞく ちゅうです"), + _("せつぞく できません"), + _("かくにん ちゅうです"), + _("かくにん できました"), + _("かくにん できません"), + _("かくにん を かくにん"), + _("かくにん は しっぱい"), }; -static const u8 sColorCodes[] = _"{HIGHLIGHT TRANSPARENT}{COLOR WHITE2}"; +static const u8 sColorCodes[] = _("{HIGHLIGHT TRANSPARENT}{COLOR WHITE2}"); static const u32 sBlockRequestLookupTable[5 * 2] = { @@ -180,11 +180,11 @@ static const u32 sBlockRequestLookupTable[5 * 2] = (u32)gBlockSendBuffer, 40, }; -static const u8 sTestString[] = _"テストな"; +static const u8 sTestString[] = _("テストな"); ALIGNED(4) static const u8 sMagic[] = "GameFreak inc."; -ALIGNED(4) static const u8 sEmptyString[] = _""; +ALIGNED(4) static const u8 sEmptyString[] = _(""); void Task_DestroySelf(u8 taskId) { diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index 92743b729..6540858c1 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -88,7 +88,7 @@ static u32 GetMonSize(u16 species, u16 b) static void FormatMonSizeRecord(u8 *string, u32 size) { - u8 decimalPoint[] = _"."; + u8 decimalPoint[] = _("."); //Convert size from centimeters to inches size = (double)(size * 10) / (CM_PER_INCH * 10); diff --git a/src/sprite.c b/src/sprite.c index f20ea2927..0f5b0caf1 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -129,10 +129,12 @@ const struct SpriteTemplate gDummySpriteTemplate; // Unreferenced error message. // It means "The DMA transfer request table has exceeded its limit." static const u8 sDmaOverErrorMsg[] = - _"DMA OVER\n" - "DMAてんそう\n" - "リクエストテーブルが\n" - "オーバーしました"; + _( + "DMA OVER\n" + "DMAてんそう\n" + "リクエストテーブルが\n" + "オーバーしました" + ); // Unreferenced data. static const u8 sUnknownData[24] = diff --git a/src/string_util.c b/src/string_util.c index 258077c9f..e537cff3a 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -4,10 +4,10 @@ u8 gUnknownStringVar[16]; -const u8 gEmptyString_81E72B0[] = _""; -const u8 gRightPointingTriangleString[] = _"▶"; +const u8 gEmptyString_81E72B0[] = _(""); +const u8 gRightPointingTriangleString[] = _("▶"); -static const u8 sDigits[] = @"0123456789ABCDEF"; +static const u8 sDigits[] = __("0123456789ABCDEF"); static const s32 sPowersOfTen[] = { |