summaryrefslogtreecommitdiff
path: root/src/pokemon
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-05 01:34:52 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-05 01:34:52 -0400
commit4cf701c5871a17f0bc580019e8d294bc1c84ebf3 (patch)
treee2d7246d97c18b1660156d345ee988212a039d84 /src/pokemon
parent8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff)
move ewram defines to ewram.h.
Diffstat (limited to 'src/pokemon')
-rw-r--r--src/pokemon/mail.c112
-rw-r--r--src/pokemon/pokeblock_feed.c15
-rw-r--r--src/pokemon/pokemon_storage_system.c8
3 files changed, 62 insertions, 73 deletions
diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c
index c5dd119e3..13129bf7f 100644
--- a/src/pokemon/mail.c
+++ b/src/pokemon/mail.c
@@ -15,6 +15,7 @@
#include "task.h"
#include "text.h"
#include "unknown_task.h"
+#include "ewram.h"
struct UnkMailStruct
{
@@ -66,9 +67,6 @@ struct MailGraphics
u16 color12;
};
-extern u8 ewram[];
-#define ewram0 (*(struct Unk2000000 *)(ewram))
-
extern struct MailGraphics gMailGraphicsTable[];
extern u16 gUnknown_083E562C[][2];
@@ -90,61 +88,61 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2)
u16 mailDesign;
u16 buffer[2];
- ewram0.varFF = GAME_LANGUAGE;
- ewram0.var100 = 1;
- ewram0.var104 = (MainCallback)EasyChat_GetWordText;
- ewram0.var108 = (MainCallback)ConvertEasyChatWordsToString;
+ ewram0_4.varFF = GAME_LANGUAGE;
+ ewram0_4.var100 = 1;
+ ewram0_4.var104 = (MainCallback)EasyChat_GetWordText;
+ ewram0_4.var108 = (MainCallback)ConvertEasyChatWordsToString;
mailDesign = arg0->itemId - ITEM_ORANGE_MAIL;
if (mailDesign <= 11)
{
- ewram0.varFA = arg0->itemId - ITEM_ORANGE_MAIL;
+ ewram0_4.varFA = arg0->itemId - ITEM_ORANGE_MAIL;
}
else
{
- ewram0.varFA = 0;
+ ewram0_4.varFA = 0;
arg2 = FALSE;
}
- switch (ewram0.var100)
+ switch (ewram0_4.var100)
{
case 0:
default:
- ewram0.var10C = &gUnknown_083E5730[ewram0.varFA];
+ ewram0_4.var10C = &gUnknown_083E5730[ewram0_4.varFA];
break;
case 1:
- ewram0.var10C = &gUnknown_083E57A4[ewram0.varFA];
+ ewram0_4.var10C = &gUnknown_083E57A4[ewram0_4.varFA];
break;
}
if (((MailSpeciesToSpecies(arg0->species, buffer) << 16) + 0xFFFF0000) <= (410 << 16))
{
- switch (ewram0.varFA)
+ switch (ewram0_4.varFA)
{
case 6:
- ewram0.varFB = 1;
+ ewram0_4.varFB = 1;
break;
case 9:
- ewram0.varFB = 2;
+ ewram0_4.varFB = 2;
break;
default:
- ewram0.varFB = 0;
+ ewram0_4.varFB = 0;
break;
}
}
else
{
- ewram0.varFB = 0;
+ ewram0_4.varFB = 0;
}
- ewram0.varF4 = arg0;
- ewram0.varEC = arg1;
- ewram0.varF8 = arg2;
+ ewram0_4.varF4 = arg0;
+ ewram0_4.varEC = arg1;
+ ewram0_4.varF8 = arg2;
SetMainCallback2(sub_80F8D50);
}
@@ -214,31 +212,31 @@ static u8 sub_80F8A28(void)
RETURN_UP_STATE;
case 11:
- LoadPalette(gMailGraphicsTable[ewram0.varFA].palette, 0, 16 * 2);
+ LoadPalette(gMailGraphicsTable[ewram0_4.varFA].palette, 0, 16 * 2);
RETURN_UP_STATE;
case 12:
- LZ77UnCompVram(gMailGraphicsTable[ewram0.varFA].tileMap, (void *)(VRAM + 0x4000));
+ LZ77UnCompVram(gMailGraphicsTable[ewram0_4.varFA].tileMap, (void *)(VRAM + 0x4000));
RETURN_UP_STATE;
case 13:
- LZ77UnCompVram(gMailGraphicsTable[ewram0.varFA].tiles, (void *)(VRAM));
+ LZ77UnCompVram(gMailGraphicsTable[ewram0_4.varFA].tiles, (void *)(VRAM));
- gPlttBufferUnfaded[241] = gMailGraphicsTable[ewram0.varFA].color10;
- gPlttBufferUnfaded[248] = gMailGraphicsTable[ewram0.varFA].color12;
+ gPlttBufferUnfaded[241] = gMailGraphicsTable[ewram0_4.varFA].color10;
+ gPlttBufferUnfaded[248] = gMailGraphicsTable[ewram0_4.varFA].color12;
gPlttBufferUnfaded[10] = gUnknown_083E562C[gSaveBlock2.playerGender][0];
gPlttBufferUnfaded[11] = gUnknown_083E562C[gSaveBlock2.playerGender][1];
RETURN_UP_STATE;
case 14:
- if (ewram0.varF8 != 0)
+ if (ewram0_4.varF8 != 0)
{
sub_80F8DA0();
}
RETURN_UP_STATE;
case 15:
- if (ewram0.varF8 != 0)
+ if (ewram0_4.varF8 != 0)
{
sub_80F8E80();
}
@@ -251,18 +249,18 @@ static u8 sub_80F8A28(void)
{
u16 local1;
- local1 = sub_809D4A8(ewram0.varF4->species);
+ local1 = sub_809D4A8(ewram0_4.varF4->species);
- switch (ewram0.varFB)
+ switch (ewram0_4.varFB)
{
case 1:
sub_809D580(local1);
- ewram0.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 96, 128, 0);
+ ewram0_4.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 96, 128, 0);
break;
case 2:
sub_809D580(local1);
- ewram0.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 40, 128, 0);
+ ewram0_4.varFC = sub_809D3A4(local1, SpriteCallbackDummy, 40, 128, 0);
break;
}
RETURN_UP_STATE;
@@ -283,7 +281,7 @@ static u8 sub_80F8A28(void)
REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON;
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
gPaletteFade.bufferTransferDisabled = 0;
- ewram0.varF0 = sub_80F8F58;
+ ewram0_4.varF0 = sub_80F8F58;
return TRUE;
default:
@@ -325,24 +323,24 @@ static void sub_80F8DA0(void)
u8 *ptr;
r6 = 0;
- for (i = 0; i < ewram0.var10C->var0; i++)
+ for (i = 0; i < ewram0_4.var10C->var0; i++)
{
- ConvertEasyChatWordsToString(ewram0.words[i], &ewram0.varF4->words[r6], ewram0.var10C->var4[i].unk_0_2, 1);
- r6 += ewram0.var10C->var4[i].unk_0_2;
+ ConvertEasyChatWordsToString(ewram0_4.words[i], &ewram0_4.varF4->words[r6], ewram0_4.var10C->var4[i].unk_0_2, 1);
+ r6 += ewram0_4.var10C->var4[i].unk_0_2;
}
- ptr = ewram0.varD8;
- if (ewram0.var100 == 0)
+ ptr = ewram0_4.varD8;
+ if (ewram0_4.var100 == 0)
{
- ptr = sub_80F8D7C(ptr, ewram0.varF4->playerName);
+ ptr = sub_80F8D7C(ptr, ewram0_4.varF4->playerName);
StringCopy(ptr, gOtherText_From);
- ewram0.varF9 = ewram0.var10C->var2 - StringLength(ewram0.varD8);
+ ewram0_4.varF9 = ewram0_4.var10C->var2 - StringLength(ewram0_4.varD8);
}
else
{
ptr = StringCopy(ptr, gOtherText_From);
- sub_80F8D7C(ptr, ewram0.varF4->playerName);
- ewram0.varF9 = ewram0.var10C->var2;
+ sub_80F8D7C(ptr, ewram0_4.varF4->playerName);
+ ewram0_4.varF9 = ewram0_4.var10C->var2;
}
}
@@ -352,25 +350,25 @@ static void sub_80F8E80(void)
u8 x;
u8 y = 0;
- for (pos = 0; pos < ewram0.var10C->var0; pos++)
+ for (pos = 0; pos < ewram0_4.var10C->var0; pos++)
{
- if (ewram0.words[pos][0] == 0xFF)
+ if (ewram0_4.words[pos][0] == 0xFF)
{
continue;
}
- if (ewram0.words[pos][0] == 0x00)
+ if (ewram0_4.words[pos][0] == 0x00)
{
continue;
}
- x = ewram0.var10C->var4[pos].unk_0_4;
- y += ewram0.var10C->var4[pos].unk_0_0;
- MenuPrint(ewram0.words[pos], ewram0.var10C->var3_4 + x, ewram0.var10C->var3_0 + y);
+ x = ewram0_4.var10C->var4[pos].unk_0_4;
+ y += ewram0_4.var10C->var4[pos].unk_0_0;
+ MenuPrint(ewram0_4.words[pos], ewram0_4.var10C->var3_4 + x, ewram0_4.var10C->var3_0 + y);
y += 2;
}
- MenuPrint(ewram0.varD8, ewram0.varF9, ewram0.var10C->var1);
+ MenuPrint(ewram0_4.varD8, ewram0_4.varF9, ewram0_4.var10C->var1);
}
static void sub_80F8F18(void)
@@ -382,13 +380,13 @@ static void sub_80F8F18(void)
static void sub_80F8F2C(void)
{
- if (ewram0.varFB != 0)
+ if (ewram0_4.varFB != 0)
{
AnimateSprites();
BuildOamBuffer();
}
- ewram0.varF0();
+ ewram0_4.varF0();
}
static void sub_80F8F58(void)
@@ -398,7 +396,7 @@ static void sub_80F8F58(void)
local0 = UpdatePaletteFade();
if (local0 == 0)
{
- ewram0.varF0 = sub_80F8F78;
+ ewram0_4.varF0 = sub_80F8F78;
}
}
@@ -407,7 +405,7 @@ static void sub_80F8F78(void)
if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
- ewram0.varF0 = sub_80F8FB4;
+ ewram0_4.varF0 = sub_80F8FB4;
}
}
@@ -420,18 +418,18 @@ static void sub_80F8FB4(void)
return;
}
- SetMainCallback2(ewram0.varEC);
- switch (ewram0.varFB)
+ SetMainCallback2(ewram0_4.varEC);
+ switch (ewram0_4.varFB)
{
case 2:
case 1:
- local1 = sub_809D4A8(ewram0.varF4->species);
+ local1 = sub_809D4A8(ewram0_4.varF4->species);
sub_809D608(local1);
- sub_809D510(&gSprites[ewram0.varFC]);
+ sub_809D510(&gSprites[ewram0_4.varFC]);
break;
}
- memset(&ewram0, 0, 0x110);
+ memset(&ewram0_4, 0, 0x110);
ResetPaletteFade();
}
diff --git a/src/pokemon/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c
index 5d6b215cd..b0b710803 100644
--- a/src/pokemon/pokeblock_feed.c
+++ b/src/pokemon/pokeblock_feed.c
@@ -19,8 +19,8 @@
#include "field_effect.h"
#include "sound.h"
#include "trig.h"
+#include "ewram.h"
-extern u8 ewram[];
extern struct MusicPlayerInfo gMPlay_BGM;
extern u8 gPokeblockMonID;
extern s16 gPokeblockGain;
@@ -928,14 +928,11 @@ static bool8 sub_8148540(void)
}
}
-#define ewram1D000 ((u16 *)(ewram + 0x1D000))
-#define ewram1D400 ((u16 *)(ewram + 0x1D400))
-
static bool8 sub_81485CC(void)
{
u16 var = gUnknown_03005FA0[12] - gUnknown_03005FA0[4];
- gPokeblockFeedPokeSprite->pos2.x = ewram1D000[var];
+ gPokeblockFeedPokeSprite->pos2.x = ewram1D000_2[var];
gPokeblockFeedPokeSprite->pos2.y = ewram1D400[var];
if (--gUnknown_03005FA0[4] == 0)
@@ -960,7 +957,7 @@ static void sub_814862C(void)
for (i = 0; i < r7 - 1; i++)
{
- s16* r3 = &ewram1D000[r8 + i];
+ s16* r3 = &ewram1D000_2[r8 + i];
s16 r1 = *r3 - (var3);
s16* r5 = &ewram1D400[r8 + i];
@@ -970,7 +967,7 @@ static void sub_814862C(void)
*r5 -= r4 * (i + 1) / r7;
}
- ewram1D000[(r8 + r7) - 1] = var3;
+ ewram1D000_2[(r8 + r7) - 1] = var3;
ewram1D400[(r8 + r7) - 1] = r9;
}
@@ -999,12 +996,12 @@ void sub_8148710(void)
if (!var_24)
{
- ewram1D000[r4] = Sin(gUnknown_03005FA0[0], gUnknown_03005FA0[2] + r5 / 256) + r8;
+ ewram1D000_2[r4] = Sin(gUnknown_03005FA0[0], gUnknown_03005FA0[2] + r5 / 256) + r8;
ewram1D400[r4] = Cos(gUnknown_03005FA0[0], gUnknown_03005FA0[3] + r5 / 256) + r7;
}
else
{
- ewram1D000[r4] = Sin(gUnknown_03005FA0[0], gUnknown_03005FA0[2] - r5 / 256) + r8;
+ ewram1D000_2[r4] = Sin(gUnknown_03005FA0[0], gUnknown_03005FA0[2] - r5 / 256) + r8;
ewram1D400[r4] = Cos(gUnknown_03005FA0[0], gUnknown_03005FA0[3] - r5 / 256) + r7;
}
diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c
index 5e97523e2..4a68b846a 100644
--- a/src/pokemon/pokemon_storage_system.c
+++ b/src/pokemon/pokemon_storage_system.c
@@ -2,6 +2,7 @@
#include "pokemon_storage_system.h"
#include "menu.h"
#include "string_util.h"
+#include "ewram.h"
struct StorageAction {
u8 *text;
@@ -10,15 +11,8 @@ struct StorageAction {
extern const struct StorageAction gUnknown_083B6DF4[];
-extern const u8 unk_2000000[];
-
EWRAM_DATA struct PokemonStorage gPokemonStorage = {0};
-#define gUnk2002694 (u8 *)(&unk_2000000[0x2694])
-#define gUnk20026A6 (u8 *)(&unk_2000000[0x26a6])
-#define gUnk20011fa (u8 *)(&unk_2000000[0x11fa])
-#define gUnk20026e4 (u8 *)(&unk_2000000[0x26e4])
-
void sub_8098898(u8 index) {
u8 *ptr;