diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-05 01:34:52 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-05 01:34:52 -0400 |
| commit | 4cf701c5871a17f0bc580019e8d294bc1c84ebf3 (patch) | |
| tree | e2d7246d97c18b1660156d345ee988212a039d84 /src/scene | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
move ewram defines to ewram.h.
Diffstat (limited to 'src/scene')
| -rw-r--r-- | src/scene/credits.c | 9 | ||||
| -rw-r--r-- | src/scene/evolution_scene.c | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/scene/credits.c b/src/scene/credits.c index cf10137c1..882dc557f 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -16,6 +16,7 @@ #include "starter_choose.h" #include "task.h" #include "trig.h" +#include "ewram.h" asm(".set REG_BASE, 0x4000000"); asm(".set OFFSET_REG_BLDCNT, 0x50"); @@ -162,14 +163,6 @@ struct CreditsEntry u8 *text; }; -extern u8 ewram[]; - -#define EWRAM_1F800 ((u16 *)(ewram + 0x1F800)) -#define HALL_OF_FAME_SHEET_0 ((u8 *)(ewram + 0x1E000)) -#define HALL_OF_FAME_SHEET_1 ((u8 *)(ewram + 0x1E800)) -#define HALL_OF_FAME_SHEET_2 ((u8 *)(ewram + 0x1F000)) -#define ewram1c000 (*(struct Unk201C000 *)(ewram + 0x1C000)) - extern struct HallOfFame gHallOfFame; extern u8 unk_201e800[0x800]; extern u8 unk_201f000[0x800]; diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 24168dc56..73cb7e5e7 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -24,6 +24,7 @@ #include "pokemon_summary_screen.h" #include "menu_cursor.h" #include "strings2.h" +#include "ewram.h" struct EvoInfo { @@ -55,8 +56,6 @@ struct EvoInfo u8 unkA0C4; // 0x201E8C4 }; -#define sEvoInfo ((*(struct EvoInfo*)(ewram + 0x14800))) - void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies); void sub_8024CEC(void); void sub_8023A80(void); |