From c9722602cb47eb5b6ecbccddf13df5f286a8ef7b Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:13:04 +0100 Subject: Sort includes --- src/link.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/link.c') diff --git a/src/link.c b/src/link.c index 7b4625bfd..2b463f6b4 100644 --- a/src/link.c +++ b/src/link.c @@ -1,17 +1,17 @@ #include "global.h" #include "link.h" #include "asm.h" +#include "battle.h" #include "main.h" -#include "task.h" -#include "text.h" -#include "sprite.h" -#include "songs.h" +#include "menu.h" #include "palette.h" #include "rng.h" -#include "menu.h" -#include "sound.h" #include "save.h" -#include "battle.h" +#include "songs.h" +#include "sound.h" +#include "sprite.h" +#include "task.h" +#include "text.h" #define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT) -- cgit v1.2.3 From 535ed69d33072543b543829b86409758cc7f6318 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 22 Jan 2017 21:55:01 -0800 Subject: change preproc syntax for C strings --- src/link.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/link.c') 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) { -- cgit v1.2.3 From c8542506580c0fa247bbb44c169a2cb1244577e4 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 23 Jan 2017 16:34:20 -0800 Subject: preproc incbins --- src/link.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/link.c') diff --git a/src/link.c b/src/link.c index 5c33fe986..dc6559fa2 100644 --- a/src/link.c +++ b/src/link.c @@ -155,8 +155,8 @@ EWRAM_DATA u32 gFiller_20238B8 = {0}; EWRAM_DATA u32 dword_20238BC = {0}; EWRAM_DATA bool8 gLinkOpen = {0}; -#include "link/digit_palette.h" -#include "link/digit_tiles.h" +static const u16 sLinkTestDigitPalette[] = INCBIN_U16("graphics/interface/link_test_digits.gbapal"); +static const u32 sLinkTestDigitTiles[] = INCBIN_U32("graphics/interface/link_test_digits.4bpp"); static const u8 sDebugMessages[7][12] = { -- cgit v1.2.3 From f21587ea9eb1190ac2136d72deb7929c1e1169eb Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 11 Feb 2017 00:38:59 -0500 Subject: misc labels and memcpy/set cleanups (#232) * some labels and enumerate player speeds * clear up speed enums * GetPlayerSpeed * oops * start decompiling mauville_old_man.c * formatting * decompile more of mauville_old_man.c * someone fix this please * formatting * make ROM build again * formatting again * make ROM match again * label, document, reorganize, and clean up battle_ai.c * move stuff to battle.h and get rid of battle_2000000 * various changes * labeling * minor labels and formatting * contest ai labels and misc stuff --- src/link.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/link.c') diff --git a/src/link.c b/src/link.c index dc6559fa2..3a3e9eebf 100644 --- a/src/link.c +++ b/src/link.c @@ -475,8 +475,8 @@ static void ProcessRecvCmds(u8 unusedParam) case 0x2222: InitLocalLinkPlayer(); localLinkPlayerBlock.linkPlayer = localLinkPlayer; - memcpy(localLinkPlayerBlock.magic1, sMagic, 15); - memcpy(localLinkPlayerBlock.magic2, sMagic, 15); + memcpy(localLinkPlayerBlock.magic1, sMagic, sizeof(localLinkPlayerBlock.magic1) - 1); + memcpy(localLinkPlayerBlock.magic2, sMagic, sizeof(localLinkPlayerBlock.magic2) - 1); InitBlockSend(&localLinkPlayerBlock, sizeof(localLinkPlayerBlock)); break; case 0x5555: -- cgit v1.2.3 From 6035511c139549a0291b6b3d43b9b080f792b2b6 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 18 Mar 2017 04:00:15 +0100 Subject: reorganize and add new headers for many files --- src/link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/link.c') diff --git a/src/link.c b/src/link.c index 3a3e9eebf..783f6aecd 100644 --- a/src/link.c +++ b/src/link.c @@ -402,7 +402,7 @@ static void LinkTestProcessKeyInput(void) if (gMain.newKeys & START_BUTTON) SetSuppressLinkErrorMessage(TRUE); if (gMain.newKeys & R_BUTTON) - sub_8125D44(1); + TrySavingData(LINK_SAVE); if (gMain.newKeys & SELECT_BUTTON) sub_800832C(); if (gLinkTestDebugValuesEnabled) -- cgit v1.2.3