summaryrefslogtreecommitdiff
path: root/src/field
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-09 20:54:49 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-09 20:54:49 -0500
commit0343a1bcd728d813a38fc3486535e962e681c094 (patch)
treeb451de240205ca20b9ce52bccb33d0d67adef3d8 /src/field
parent7ab0460e9c04100dcc0ebb824a870069348030df (diff)
remove shared_syms
Diffstat (limited to 'src/field')
-rw-r--r--src/field/berry_tag_screen.c22
-rw-r--r--src/field/decoration.c2
-rw-r--r--src/field/region_map.c2
-rw-r--r--src/field/slot_machine.c4
4 files changed, 15 insertions, 15 deletions
diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index 8241fe657..55405138d 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -28,7 +28,7 @@ struct Struct2000000
/*0x1FFFF*/ u8 var_1FFFF;
};
-extern struct Struct2000000 ewram;
+extern struct Struct2000000 gSharedMem;
extern u16 gUnknown_030041B4;
static EWRAM_DATA u8 gUnknown_0203932C = 0;
@@ -119,13 +119,13 @@ static bool8 sub_8146058(void)
case 5:
if (!MultistepInitMenuWindowContinue())
break;
- ewram.var_1FFFF = 0;
+ gSharedMem.var_1FFFF = 0;
gMain.state += 1;
break;
case 6:
if (!sub_81462B8())
break;
- ewram.var_1FFFF = 0;
+ gSharedMem.var_1FFFF = 0;
gMain.state += 1;
break;
case 7:
@@ -191,19 +191,19 @@ bool8 sub_81462B8(void)
u16 i;
void *addr;
- switch (ewram.var_1FFFF)
+ switch (gSharedMem.var_1FFFF)
{
case 0:
LZDecompressVram(gBerryCheck_Gfx, (void *)VRAM);
- ewram.var_1FFFF += 1;
+ gSharedMem.var_1FFFF += 1;
break;
case 1:
LZDecompressVram(gUnknown_08E788E4, (void *)VRAM + 0x2800);
- ewram.var_1FFFF += 1;
+ gSharedMem.var_1FFFF += 1;
break;
case 2:
LZDecompressVram(gUnknown_08E78A84, (void *)VRAM + 0x3000);
- ewram.var_1FFFF += 1;
+ gSharedMem.var_1FFFF += 1;
break;
case 3:
for (i = 0; i < 0x400; i++)
@@ -215,19 +215,19 @@ bool8 sub_81462B8(void)
}
addr = (void *)(VRAM + 0x3800);
DmaCopy16(3, gBGTilemapBuffers[2], addr, 0x800);
- ewram.var_1FFFF += 1;
+ gSharedMem.var_1FFFF += 1;
break;
case 4:
LoadCompressedPalette(gBerryCheck_Pal, 0, 96 * 2);
- ewram.var_1FFFF += 1;
+ gSharedMem.var_1FFFF += 1;
break;
case 5:
LoadCompressedObjectPic(&gUnknown_083C1F74);
- ewram.var_1FFFF += 1;
+ gSharedMem.var_1FFFF += 1;
break;
case 6:
LoadCompressedObjectPalette(&gUnknown_083C1F7C);
- ewram.var_1FFFF = 0;
+ gSharedMem.var_1FFFF = 0;
return TRUE;
}
diff --git a/src/field/decoration.c b/src/field/decoration.c
index 924c94b59..bdeaaf91d 100644
--- a/src/field/decoration.c
+++ b/src/field/decoration.c
@@ -1556,7 +1556,7 @@ const struct SpriteTemplate gSpriteTemplate_83ECA88 = {
const struct YesNoFuncTable gUnknown_083ECAA0 = {.yesFunc = sub_8101848, .noFunc = sub_80FED3C};
-u8 *const unref_label_083ECAA8[] = {ewram};
+u8 *const unref_label_083ECAA8[] = {gSharedMem};
// text
diff --git a/src/field/region_map.c b/src/field/region_map.c
index b5a3de563..d643c373d 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -1426,7 +1426,7 @@ static const struct UnknownStruct4 sUnknown_083E79C0[1] =
};
// XXX: what is this?
-static u8 *const ewram_ = ewram;
+static u8 *const ewram_ = gSharedMem;
static const struct SpritePalette sFlyTargetIconSpritePalette = {sFlyTargetIcons_Pal, 2};
diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 4d97ccb51..d6b20feaa 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -15,7 +15,7 @@ struct UnkStruct1 {
/*0x02*/ s16 unk02;
};
-extern struct UnkStruct2000000 ewram;
+extern struct UnkStruct2000000 gSharedMem;
extern struct UnkStruct1 *gUnknown_083ED048[];
extern const u16 gPalette_83EDE24[];
@@ -40,7 +40,7 @@ void sub_8104CAC(u8 arg0) {
sub_8104DA4();
- task = &gTasks[ewram.unk3D];
+ task = &gTasks[gSharedMem.unk3D];
task->data[1] = arg0;
i = 0;