diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-09 20:54:49 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-09 20:54:49 -0500 |
| commit | 0343a1bcd728d813a38fc3486535e962e681c094 (patch) | |
| tree | b451de240205ca20b9ce52bccb33d0d67adef3d8 /src/scene | |
| parent | 7ab0460e9c04100dcc0ebb824a870069348030df (diff) | |
remove shared_syms
Diffstat (limited to 'src/scene')
| -rw-r--r-- | src/scene/berry_blender.c | 4 | ||||
| -rw-r--r-- | src/scene/intro.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index b5d36ad1e..398f62833 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -3710,7 +3710,7 @@ static void sub_80527BC(void) gUnknown_020297E0 = 0; gUnknown_020297DC = 2; for (i = 0; i < 200; i++) - ewram[i] = 0; + gSharedMem[i] = 0; gUnknown_020297E8 = 0; } for (i = 0; i < 100; i++) @@ -3719,7 +3719,7 @@ static void sub_80527BC(void) gUnknown_020297E0++; else { - u16* ewramPtr = ((u16*)(ewram)); + u16* ewramPtr = ((u16*)(gSharedMem)); ewramPtr[gUnknown_020297E4] = gUnknown_020297E0; gUnknown_020297E4++; gUnknown_020297E0 = 0; diff --git a/src/scene/intro.c b/src/scene/intro.c index 04173b86a..c4bb1f9ea 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -1208,7 +1208,7 @@ static void Task_IntroWaitToSetupPart3DoubleFight(u8 taskId) } // TODO: use ewram define instead -extern u8 ewram[][32]; +extern u8 gSharedMem[][32]; static void Task_IntroLoadPart3Streaks(u8 taskId) { @@ -1218,12 +1218,12 @@ static void Task_IntroLoadPart3Streaks(u8 taskId) intro_reset_and_hide_bgs(); for (i = 0; i < 32; i++) { - ewram[0][i] = 0; - ewram[1][i] = 17; - ewram[2][i] = 34; + gSharedMem[0][i] = 0; + gSharedMem[1][i] = 17; + gSharedMem[2][i] = 34; } vram = (void *)VRAM; - DmaCopy16(3, ewram, vram, 0x60); + DmaCopy16(3, gSharedMem, vram, 0x60); for (i = 0; i < 0x280; i++) ((u16 *)(VRAM + 0x3000))[i] = 0xF001; for (i = 0; i < 0x80; i++) |