From 67ea254871134d850e013ee72bd4275b40e8091b Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 3 Nov 2017 19:09:40 -0400 Subject: BG_CHAR_ADDR and BG_SCREEN_ADDR recast fixes --- src/engine/link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/engine/link.c') diff --git a/src/engine/link.c b/src/engine/link.c index 850201ccb..7f7e48083 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -954,7 +954,7 @@ static u16 LinkTestCalcBlockChecksum(void *data, u16 size) static void PrintHexDigit(u8 tileNum, u8 x, u8 y) { - u16 *tilemap = (u16 *)BG_SCREEN_ADDR(gLinkTestBGInfo.screenBaseBlock); + u16 *tilemap = BG_SCREEN_ADDR(gLinkTestBGInfo.screenBaseBlock); tilemap[(32 * y) + x] = (gLinkTestBGInfo.paletteNum << 12) | (tileNum + 1); } -- cgit v1.2.3 From 4cf701c5871a17f0bc580019e8d294bc1c84ebf3 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 5 Nov 2017 01:34:52 -0400 Subject: move ewram defines to ewram.h. --- src/engine/link.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/engine/link.c') diff --git a/src/engine/link.c b/src/engine/link.c index 7f7e48083..86413cfbf 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -35,7 +35,6 @@ struct LinkTestBGInfo u32 dummy_C; }; -extern u8 unk_2000000[]; extern u8 unk_2004000[]; extern u16 gBattleTypeFlags; @@ -507,7 +506,7 @@ static void ProcessRecvCmds(u8 unusedParam) case 0x8888: if (sBlockRecv[i].size > BLOCK_BUFFER_SIZE) { - u16 *buffer = (u16 *)unk_2000000; + u16 *buffer = (u16 *)ewram; u16 j; for (j = 0; j < CMD_LENGTH - 1; j++) buffer[(sBlockRecv[i].pos / 2) + j] = gRecvCmds[j + 1][i]; -- cgit v1.2.3 From 5fc9a151463ade7d260ce5f105674908d6e4449d Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 5 Nov 2017 12:55:45 -0500 Subject: move ewram.h includes in include/ to src files. --- src/engine/link.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/engine/link.c') diff --git a/src/engine/link.c b/src/engine/link.c index 86413cfbf..504b828a1 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -15,6 +15,7 @@ #include "strings2.h" #include "task.h" #include "text.h" +#include "ewram.h" #define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT) -- cgit v1.2.3 From eecafbaec17ba0721d091d1a12ac20fa71da352a Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 9 Nov 2017 03:13:09 -0500 Subject: depreciate use of shared_syms --- src/engine/link.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/engine/link.c') diff --git a/src/engine/link.c b/src/engine/link.c index 504b828a1..c526baec7 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -36,7 +36,6 @@ struct LinkTestBGInfo u32 dummy_C; }; -extern u8 unk_2004000[]; extern u16 gBattleTypeFlags; extern u16 word_3004858; @@ -404,7 +403,7 @@ static void LinkTestProcessKeyInput(void) if (gMain.newKeys & A_BUTTON) gShouldAdvanceLinkState = 1; if (gMain.heldKeys & B_BUTTON) - InitBlockSend(unk_2004000, 0x2004); + InitBlockSend(ewram4000, 0x2004); if (gMain.newKeys & L_BUTTON) BeginNormalPaletteFade(-1, 0, 0x10, 0, 2); if (gMain.newKeys & START_BUTTON) -- cgit v1.2.3 From 0343a1bcd728d813a38fc3486535e962e681c094 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 9 Nov 2017 20:54:49 -0500 Subject: remove shared_syms --- src/engine/link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/engine/link.c') diff --git a/src/engine/link.c b/src/engine/link.c index c526baec7..002d397d2 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -506,7 +506,7 @@ static void ProcessRecvCmds(u8 unusedParam) case 0x8888: if (sBlockRecv[i].size > BLOCK_BUFFER_SIZE) { - u16 *buffer = (u16 *)ewram; + u16 *buffer = (u16 *)gSharedMem; u16 j; for (j = 0; j < CMD_LENGTH - 1; j++) buffer[(sBlockRecv[i].pos / 2) + j] = gRecvCmds[j + 1][i]; -- cgit v1.2.3 From d373f41c2cbd2dc71ca2287b179c7c8777b9eb02 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 26 Nov 2017 02:01:36 -0600 Subject: rename rng.c to random.c --- src/engine/link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/engine/link.c') diff --git a/src/engine/link.c b/src/engine/link.c index 002d397d2..441f3707b 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -7,7 +7,7 @@ #include "main.h" #include "menu.h" #include "palette.h" -#include "rng.h" +#include "random.h" #include "save.h" #include "songs.h" #include "sound.h" -- cgit v1.2.3 From 5f242ae6cee377d219defa8290ef1c164b003f52 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 26 Nov 2017 13:00:26 -0600 Subject: abilities, songs, species constants --- src/engine/link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/engine/link.c') diff --git a/src/engine/link.c b/src/engine/link.c index 441f3707b..27afef937 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -9,7 +9,7 @@ #include "palette.h" #include "random.h" #include "save.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "strings2.h" -- cgit v1.2.3 From 754e911b4e95205bafa5dc93242da9cee3f2c5c6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 21 Dec 2017 11:40:26 -0600 Subject: Rename gScript* vars to gSpecialVar_* --- src/engine/link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/engine/link.c') diff --git a/src/engine/link.c b/src/engine/link.c index 27afef937..28323207c 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -635,7 +635,7 @@ static void BuildSendCmd(u16 code) break; case 0xAAAB: gSendCmd[0] = 0xAAAB; - gSendCmd[1] = gScriptItemId; + gSendCmd[1] = gSpecialVar_ItemId; break; case 0xCCCC: gSendCmd[0] = 0xCCCC; -- cgit v1.2.3