summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle.h13
-rw-r--r--include/battle_anim.h2
-rw-r--r--include/battle_party_menu.h2
-rw-r--r--include/decoration.h2
-rw-r--r--include/dewford_trend.h2
-rwxr-xr-xinclude/ewram.h16
-rw-r--r--include/party_menu.h2
-rw-r--r--include/script_pokemon_80F9.h2
8 files changed, 17 insertions, 24 deletions
diff --git a/include/battle.h b/include/battle.h
index 692e1a981..c2e1063d3 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -234,7 +234,11 @@ struct AI_ThinkingStruct /* 0x2016800 */
struct BattleStruct /* 0x2000000 */
{
- u8 filler0[0x15DDE];
+ /*0x00000*/ u8 unk0;
+ /*0x00001*/ bool8 unk1;
+ /*0x00002*/ u8 unk2;
+ /*0x00003*/ bool8 unk3;
+ u8 filler4[0x15DDA];
/*0x15DDE*/ u8 unk15DDE;
/*0x15DDF*/ u8 unk15DDF;
/*0x15DE0*/ u8 filler15DE0[0x220];
@@ -530,6 +534,11 @@ struct BattleResults
u8 unk36[10]; // usedBalls?
};
+struct Struct2017100
+{
+ u32 arr[4];
+};
+
struct Struct2017800
{
u8 invisible:1;
@@ -668,8 +677,6 @@ extern struct WishFutureKnock gWishFutureKnock;
extern struct AI_ThinkingStruct gAIThinkingSpace;
extern struct Struct20238C8 gUnknown_020238C8;
-#include "ewram.h"
-
// used in many battle files, it seems as though Hisashi Sogabe wrote
// some sort of macro to replace the use of actually calling memset.
// Perhaps it was thought calling memset was much slower?
diff --git a/include/battle_anim.h b/include/battle_anim.h
index 27683e866..d807a582a 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -7,8 +7,6 @@
#define REG_BG1CNT_BITFIELD REG_BGnCNT_BITFIELD(1)
#define REG_BG2CNT_BITFIELD REG_BGnCNT_BITFIELD(2)
-#include "ewram.h"
-
struct BGCntrlBitfield
{
volatile u16 priority:2;
diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h
index d08c1e9ae..d7ad53eed 100644
--- a/include/battle_party_menu.h
+++ b/include/battle_party_menu.h
@@ -1,8 +1,6 @@
#ifndef GUARD_BATTLE_PARTY_MENU_H
#define GUARD_BATTLE_PARTY_MENU_H
-#include "ewram.h"
-
void HandleBattlePartyMenu(u8);
bool8 SetUpBattlePartyMenu(void);
diff --git a/include/decoration.h b/include/decoration.h
index 414c02dad..8c651f967 100644
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -204,8 +204,6 @@ struct UnkStruct_803EC860
extern const struct UnkStruct_803EC860 gUnknown_083EC860[];
-#include "ewram.h"
-
struct UnkStruct_02038900
{
/*0x000; 0x02038900*/ const struct Decoration *decoration;
diff --git a/include/dewford_trend.h b/include/dewford_trend.h
index c4a1a142d..c12d0d740 100644
--- a/include/dewford_trend.h
+++ b/include/dewford_trend.h
@@ -1,8 +1,6 @@
#ifndef GUARD_DEWFORDTREND_H
#define GUARD_DEWFORDTREND_H
-#include "ewram.h"
-
void InitDewfordTrend(void);
void sub_80FA4E4(void *, u32, u8);
void UpdateDewfordTrendPerDay(u16);
diff --git a/include/ewram.h b/include/ewram.h
index 1b54a1ebc..2acf8d203 100755
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -4,13 +4,12 @@
extern u8 ewram[];
#define BATTLE_STRUCT ((struct BattleStruct *) (ewram + 0x0))
-#define ewram0 (*(struct UnknownStruct7 *)(ewram + 0x0))
#define ewram0_2 (*(struct Struct2000000 *)(ewram + 0x0))
#define namingScreenData (*(struct NamingScreenData *)(ewram + 0x0))
-#define unk_2000000 (*(struct UnkStruct *)(ewram + 0x0))
#define ewramBerryPic (ewram + 0x0)
#define ewram0_3 (*(struct UnknownStruct3 *)(ewram + 0x0))
#define ewram0_4 (*(struct Unk2000000 *)(ewram + 0x0))
+#define ewram0_5 (*(struct UnkStruct *)(ewram + 0x0))
#define ewram4 (*(struct UnknownStruct8 *)(ewram + 0x4))
#define ewram520 ((struct UnknownStruct7 *)(ewram + 0x00520))
#define ewram888 (ewram + 0x888)
@@ -79,19 +78,18 @@ extern u8 ewram[];
#define UNK_2016A00_STRUCT ((struct UnkBattleStruct1 *) (ewram + 0x16A00))
#define AI_STACK ((struct AI_Stack *) (ewram + 0x16C00))
#define AI_ARRAY_160CC ((struct SmallItemStruct *) (ewram + 0x160CC))
-#define ewram17100_2 (*(struct Struct2017100 *)(ewram + 0x17100))
+#define ewram17000 ((u32 *) (ewram + 0x17100)) // this label is incorrect.
+#define ewram17100 (*(struct Struct2017100 *)(ewram + 0x17100))
#define B_BATTLESCRIPTS_STACK ((struct scriptsStack *) (ewram + 0x17110))
+#define ewram17130 (ewram[0x17130])
#define B_FUNCTION_STACK ((struct funcStack *) (ewram + 0x17140))
+#define ewram17160 (ewram[0x17160])
#define ewram17800 ((struct Struct2017800 *) (ewram + 0x17800))
+#define EWRAM_17800 ((struct UnknownStruct1 *)(ewram + 0x17800))
#define ewram17810 ((struct Struct2017810 *) (ewram + 0x17810))
+#define EWRAM_17810 ((struct UnknownStruct3 *)(ewram + 0x17810))
#define ewram17840 (*(struct Struct2017840 *) (ewram + 0x17840))
#define ewram17850 ((struct UnknownStruct5 *)(ewram + 0x17850))
-#define ewram17000 ((u32 *) (ewram + 0x17100)) // this label is incorrect.
-#define ewram17100 ((u32 *)(ewram + 0x17100))
-#define ewram17130 (ewram[0x17130])
-#define ewram17160 (ewram[0x17160])
-#define EWRAM_17800 ((struct UnknownStruct1 *)(ewram + 0x17800))
-#define EWRAM_17810 ((struct UnknownStruct3 *)(ewram + 0x17810))
#define unk_2018000 (*(struct PlayerRecords *)(ewram + 0x18000))
#define EWRAM_18000 ((u16 *)(ewram + 0x18000))
#define ewram18000 ((u16 *)(ewram + 0x18000))
diff --git a/include/party_menu.h b/include/party_menu.h
index a60b90469..304389e78 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -101,8 +101,6 @@ struct UnknownPokemonStruct2
/*0x1D*/ u8 language;
};
-#include "ewram.h"
-
void CB2_PartyMenuMain(void);
void ChangeBattleTowerPartyMenuSelection(u8 taskId, s8 directionPressed);
void SetPartyMenuSettings(u8 menuType, u8 battleTypeFlags, TaskFunc menuHandlerFunc, u8 textId);
diff --git a/include/script_pokemon_80F9.h b/include/script_pokemon_80F9.h
index 5e2b11f3c..eed32f5cf 100644
--- a/include/script_pokemon_80F9.h
+++ b/include/script_pokemon_80F9.h
@@ -7,8 +7,6 @@ struct UnknownStruct2018000
u8 unk8;
};
-#include "ewram.h" // UNK_2018000_STRUCT requires this include. TODO: fix?
-
void OpenPartyMenuFromScriptContext(u8 taskId);
void sub_80F9C00(void);
void sub_80F9E1C(void);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 22:09:20 +0000