From 4cf701c5871a17f0bc580019e8d294bc1c84ebf3 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 5 Nov 2017 01:34:52 -0400 Subject: move ewram defines to ewram.h. --- include/battle.h | 18 +----- include/battle_anim.h | 6 +- include/battle_party_menu.h | 3 +- include/decoration.h | 3 +- include/dewford_trend.h | 3 +- include/ewram.h | 124 ++++++++++++++++++++++++++++++++++++++++++ include/party_menu.h | 6 +- include/player_pc.h | 1 + include/script_pokemon_80F9.h | 2 +- 9 files changed, 132 insertions(+), 34 deletions(-) create mode 100755 include/ewram.h (limited to 'include') diff --git a/include/battle.h b/include/battle.h index dc9ac93cc..692e1a981 100644 --- a/include/battle.h +++ b/include/battle.h @@ -189,9 +189,6 @@ enum BATTLE_TERRAIN_PLAIN, }; -// needed to match the hack that is get_item, thanks cam, someone else clean this up later. -extern u8 unk_2000000[]; - struct Trainer { /*0x00*/ u8 partyFlags; @@ -671,20 +668,7 @@ extern struct WishFutureKnock gWishFutureKnock; extern struct AI_ThinkingStruct gAIThinkingSpace; extern struct Struct20238C8 gUnknown_020238C8; -// TODO: move ewram to global.h -extern u8 ewram[]; - -#define BATTLE_STRUCT ((struct BattleStruct *) (ewram + 0x00000)) -#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(ewram + 0x16800)) -#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 B_BATTLESCRIPTS_STACK ((struct scriptsStack *) (ewram + 0x17110)) -#define B_FUNCTION_STACK ((struct funcStack *) (ewram + 0x17140)) -#define ewram17800 ((struct Struct2017800 *) (ewram + 0x17800)) -#define ewram17810 ((struct Struct2017810 *) (ewram + 0x17810)) -#define ewram17840 (*(struct Struct2017840 *) (ewram + 0x17840)) -#define ewram17000 ((u32 *) (ewram + 0x17100)) +#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. diff --git a/include/battle_anim.h b/include/battle_anim.h index 3db5ae967..27683e866 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -7,11 +7,7 @@ #define REG_BG1CNT_BITFIELD REG_BGnCNT_BITFIELD(1) #define REG_BG2CNT_BITFIELD REG_BGnCNT_BITFIELD(2) -#define EWRAM_14800 ((u16 *)(unk_2000000 + 0x14800)) -#define EWRAM_17800 ((struct UnknownStruct1 *)(unk_2000000 + 0x17800)) -#define EWRAM_17810 ((struct UnknownStruct3 *)(unk_2000000 + 0x17810)) -#define EWRAM_18000 ((u16 *)(unk_2000000 + 0x18000)) -#define EWRAM_19348 (*(u16 *)(unk_2000000 + 0x19348)) +#include "ewram.h" struct BGCntrlBitfield { diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index 200b0c653..d08c1e9ae 100644 --- a/include/battle_party_menu.h +++ b/include/battle_party_menu.h @@ -1,8 +1,7 @@ #ifndef GUARD_BATTLE_PARTY_MENU_H #define GUARD_BATTLE_PARTY_MENU_H -extern u8 unk_2000000[]; -#define EWRAM_1609D unk_2000000[0x1609D] +#include "ewram.h" void HandleBattlePartyMenu(u8); bool8 SetUpBattlePartyMenu(void); diff --git a/include/decoration.h b/include/decoration.h index 70abc29bf..414c02dad 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -204,8 +204,7 @@ struct UnkStruct_803EC860 extern const struct UnkStruct_803EC860 gUnknown_083EC860[]; -extern u8 ewram[]; -#define ewram_1f000 (*(struct DecoPCPointers *)(ewram + 0x1f000)) +#include "ewram.h" struct UnkStruct_02038900 { diff --git a/include/dewford_trend.h b/include/dewford_trend.h index 26075d633..c4a1a142d 100644 --- a/include/dewford_trend.h +++ b/include/dewford_trend.h @@ -1,8 +1,7 @@ #ifndef GUARD_DEWFORDTREND_H #define GUARD_DEWFORDTREND_H -#define ARRAY_2007800 ((struct EasyChatPair *)(unk_2000000 + 0x7800)) -#define ARRAY_2007900 ((struct EasyChatPair *)(unk_2000000 + 0x7900)) +#include "ewram.h" void InitDewfordTrend(void); void sub_80FA4E4(void *, u32, u8); diff --git a/include/ewram.h b/include/ewram.h new file mode 100755 index 000000000..1b54a1ebc --- /dev/null +++ b/include/ewram.h @@ -0,0 +1,124 @@ +#ifndef GUARD_EWRAM_H +#define GUARD_EWRAM_H + +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 ewram4 (*(struct UnknownStruct8 *)(ewram + 0x4)) +#define ewram520 ((struct UnknownStruct7 *)(ewram + 0x00520)) +#define ewram888 (ewram + 0x888) +#define ewramBlankMapName (ewram + 0xA48) +#define ewramA6E (ewram[0xA6E]) +#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x1000)) +#define ewramBerryPicTemp (ewram + 0x1000) +#define EWRAM_1000 (*(struct Struct2001000 *)(ewram + 0x1000)) +#define gUnk20011fa (u8 *)(&ewram[0x11FA]) +#define gUnk2002694 (u8 *)(&ewram[0x2694]) +#define gUnk20026A6 (u8 *)(&ewram[0x26A6]) +#define gUnk20026e4 (u8 *)(&ewram[0x26E4]) +#define gUnknown_02007000 (*(ewramStruct_02007000 *)(ewram + 0x7000)) +#define ARRAY_2007800 ((struct EasyChatPair *)(ewram + 0x7800)) +#define ARRAY_2007900 ((struct EasyChatPair *)(ewram + 0x7900)) +#define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000)) +#define TRANSITION_STRUCT (*(struct TransitionData *) (ewram + 0xC000)) +#define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000)) +#define EWRAM_14000 ((u8 *)(ewram + 0x14000)) +#define EWRAM_14800 ((u16 *)(ewram + 0x14800)) +#define sEvoInfo ((*(struct EvoInfo*)(ewram + 0x14800))) +#define EWRAM_15000 ((u8 *)(ewram + 0x15000)) +#define ewram16000 (ewram[0x16000]) +#define ewram16001 (ewram[0x16001]) +#define ewram16002 (ewram[0x16002]) +#define ewram16003 (ewram[0x16003]) +#define ewram1600C (ewram[0x1600C]) +#define ewram1600E (ewram[0x1600E]) +#define ewram1601B (ewram[0x1601B]) +#define ewram16020 ((u8 *)(ewram + 0x16020)) +#define ewram16056 (ewram[0x16056]) +#define ewram16058 (ewram[0x16058]) +#define ewram16059 (ewram[0x16059]) +#define UNK_201606C_ARRAY (ewram + 0x1606C) // lazy define but whatever. +#define ewram16078 (ewram[0x16078]) +#define ewram16084 (ewram[0x16084]) +#define ewram16086 (ewram[0x16086]) +#define ewram16087 (ewram[0x16087]) +#define ewram16088 (ewram[0x16088]) +#define ewram16088_2 (*(u8 *)(ewram + 0x16088)) +#define ewram16089 (ewram[0x16089]) +#define ewram16089_2 (*(u8 *)(ewram + 0x16089)) +#define EWRAM_1609D (ewram[0x1609D]) +#define ewram160A1 (ewram[0x160A1]) +#define ewram160A6 (ewram[0x160A6]) +#define ewram160AC ((u8 *)(ewram + 0x160AC)) +#define ewram160BC ((u16 *)(ewram + 0x160BC)) // hp +#define ewram160C8 (ewram[0x160C8]) +#define ewram160C9 (ewram[0x160C9]) +#define ewram160CB (ewram[0x160CB]) +#define ewram160CC ((u8 *)(ewram + 0x160CC)) +#define USED_HELD_ITEM(bank) ((((u16*)(&ewram[0x160CC + bank * 2])))) +#define USED_HELD_ITEMS(bank) (*(u16 *)&ewram[0x160CC + 2 * (bank)]) +#define ewram160E6 (ewram[0x160E6]) +#define CHOICED_MOVE(bank) (((u16*)(&ewram[0x160E8 + bank * 2]))) +#define ewram160E8 ((u8 *)(ewram + 0x160E8)) +#define ewram160F0 ((u8 *)(ewram + 0x160F0)) +#define ewram160F9 (ewram[0x160F9]) +#define ewram160FB (ewram[0x160FB]) +#define ewram16100 ((u8 *)(ewram + 0x16100)) +#define ewram16108 ((u8 *)(ewram + 0x16108)) +#define ewram16110 (ewram[0x16110]) +#define ewram16111 (ewram[0x16111]) +#define ewram16113 (ewram[0x16113]) +#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(ewram + 0x16800)) +#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 B_BATTLESCRIPTS_STACK ((struct scriptsStack *) (ewram + 0x17110)) +#define B_FUNCTION_STACK ((struct funcStack *) (ewram + 0x17140)) +#define ewram17800 ((struct Struct2017800 *) (ewram + 0x17800)) +#define ewram17810 ((struct Struct2017810 *) (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)) +#define UNK_2018000_STRUCT (*(struct UnknownStruct2018000 *)(ewram + 0x18000)) +#define ewram18300 ((u16 *)(ewram + 0x18300)) +#define EWRAM_19348 (*(u16 *)(ewram + 0x19348)) +#define ewram19348 (*(struct Struct2019348 *)(ewram + 0x19348)) +#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000)) +#define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000)) +#define EWRAM_1B000 ewram1B000_alt // FIXME +#define EWRAM_1B000_2 (*(struct Struct201B000 *)(ewram + 0x1B000)) +#define EWRAM_1C000 (*(struct Struct201C000 *)(ewram + 0x1C000)) +#define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000)) +#define ewram1c000 (*(struct Unk201C000 *)(ewram + 0x1C000)) // FIXME, names too similar +#define ewram1D000 ((struct Pokemon *)(ewram + 0x1D000)) +#define ewram1D000_2 ((u16 *)(ewram + 0x1D000)) +#define ewram1D400 ((u16 *)(ewram + 0x1D400)) +#define ewramSavedItemsPocket ((struct ItemSlot *)(ewram + 0x1E000)) // saved items pocket (for Wally battle) +#define HALL_OF_FAME_SHEET_0 ((u8 *)(ewram + 0x1E000)) +#define HALL_OF_FAME_SHEET_1 ((u8 *)(ewram + 0x1E800)) +#define ewram_1f000 (*(struct DecoPCPointers *)(ewram + 0x1f000)) +#define ewramSavedPokeballsPocket ((struct ItemSlot *)(ewram + 0x1F000)) // saved Pokeballs pocket (for Wally battle) +#define HALL_OF_FAME_SHEET_2 ((u8 *)(ewram + 0x1F000)) +#define EWRAM_1F800 ((u16 *)(ewram + 0x1F800)) +#define ewram1FE00 (*(struct Unk201FE00 *)(ewram + 0x1FE00)) +#define gHelperState (ewram[0x1FFFE]) +#define gReshowState (ewram[0x1FFFF]) +#define ewramBagSetupStep (ewram[0x1FFFF]) + +#endif diff --git a/include/party_menu.h b/include/party_menu.h index f13c2c2df..a60b90469 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -101,11 +101,7 @@ struct UnknownPokemonStruct2 /*0x1D*/ u8 language; }; -extern u8 ewram[]; -#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x01000)) -#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000)) -#define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000)) -#define EWRAM_1B000 ewram1B000_alt +#include "ewram.h" void CB2_PartyMenuMain(void); void ChangeBattleTowerPartyMenuSelection(u8 taskId, s8 directionPressed); diff --git a/include/player_pc.h b/include/player_pc.h index 8debeda88..3302ec634 100644 --- a/include/player_pc.h +++ b/include/player_pc.h @@ -13,6 +13,7 @@ #define SWAP_ITEM_INDEX data[8] #define SWITCH_MODE_ACTIVE data[9] +// this is potentially an ewram access occuring in high ewram. TODO: investigate this further. #define NEW_GAME_PC_ITEMS(i, type) ((u16)((u16 *)gNewGamePCItems + type)[i * 2]) // defined and used in the above macro diff --git a/include/script_pokemon_80F9.h b/include/script_pokemon_80F9.h index fa5d57f0e..5e2b11f3c 100644 --- a/include/script_pokemon_80F9.h +++ b/include/script_pokemon_80F9.h @@ -7,7 +7,7 @@ struct UnknownStruct2018000 u8 unk8; }; -extern struct UnknownStruct2018000 unk_2018000; +#include "ewram.h" // UNK_2018000_STRUCT requires this include. TODO: fix? void OpenPartyMenuFromScriptContext(u8 taskId); void sub_80F9C00(void); -- cgit v1.2.3 From 5fc9a151463ade7d260ce5f105674908d6e4449d Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 5 Nov 2017 12:55:45 -0500 Subject: move ewram.h includes in include/ to src files. --- include/battle.h | 13 ++++++++++--- include/battle_anim.h | 2 -- include/battle_party_menu.h | 2 -- include/decoration.h | 2 -- include/dewford_trend.h | 2 -- include/ewram.h | 16 +++++++--------- include/party_menu.h | 2 -- include/script_pokemon_80F9.h | 2 -- 8 files changed, 17 insertions(+), 24 deletions(-) (limited to 'include') 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); -- cgit v1.2.3 From ce1d3a195f1ccce4d49cb37bb6b7c4679698c538 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 5 Nov 2017 13:20:07 -0500 Subject: ewram align --- include/ewram.h | 228 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 114 insertions(+), 114 deletions(-) (limited to 'include') diff --git a/include/ewram.h b/include/ewram.h index 2acf8d203..83fc5dac6 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -3,120 +3,120 @@ extern u8 ewram[]; -#define BATTLE_STRUCT ((struct BattleStruct *) (ewram + 0x0)) -#define ewram0_2 (*(struct Struct2000000 *)(ewram + 0x0)) -#define namingScreenData (*(struct NamingScreenData *)(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) -#define ewramBlankMapName (ewram + 0xA48) -#define ewramA6E (ewram[0xA6E]) -#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x1000)) -#define ewramBerryPicTemp (ewram + 0x1000) -#define EWRAM_1000 (*(struct Struct2001000 *)(ewram + 0x1000)) -#define gUnk20011fa (u8 *)(&ewram[0x11FA]) -#define gUnk2002694 (u8 *)(&ewram[0x2694]) -#define gUnk20026A6 (u8 *)(&ewram[0x26A6]) -#define gUnk20026e4 (u8 *)(&ewram[0x26E4]) +#define BATTLE_STRUCT ((struct BattleStruct *) (ewram + 0x0)) +#define ewram0_2 (*(struct Struct2000000 *)(ewram + 0x0)) +#define namingScreenData (*(struct NamingScreenData *)(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) +#define ewramBlankMapName (ewram + 0xA48) +#define ewramA6E (ewram[0xA6E]) +#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x1000)) +#define ewramBerryPicTemp (ewram + 0x1000) +#define EWRAM_1000 (*(struct Struct2001000 *)(ewram + 0x1000)) +#define gUnk20011fa (u8 *)(&ewram[0x11FA]) +#define gUnk2002694 (u8 *)(&ewram[0x2694]) +#define gUnk20026A6 (u8 *)(&ewram[0x26A6]) +#define gUnk20026e4 (u8 *)(&ewram[0x26E4]) #define gUnknown_02007000 (*(ewramStruct_02007000 *)(ewram + 0x7000)) -#define ARRAY_2007800 ((struct EasyChatPair *)(ewram + 0x7800)) -#define ARRAY_2007900 ((struct EasyChatPair *)(ewram + 0x7900)) -#define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000)) -#define TRANSITION_STRUCT (*(struct TransitionData *) (ewram + 0xC000)) -#define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000)) -#define EWRAM_14000 ((u8 *)(ewram + 0x14000)) -#define EWRAM_14800 ((u16 *)(ewram + 0x14800)) -#define sEvoInfo ((*(struct EvoInfo*)(ewram + 0x14800))) -#define EWRAM_15000 ((u8 *)(ewram + 0x15000)) -#define ewram16000 (ewram[0x16000]) -#define ewram16001 (ewram[0x16001]) -#define ewram16002 (ewram[0x16002]) -#define ewram16003 (ewram[0x16003]) -#define ewram1600C (ewram[0x1600C]) -#define ewram1600E (ewram[0x1600E]) -#define ewram1601B (ewram[0x1601B]) -#define ewram16020 ((u8 *)(ewram + 0x16020)) -#define ewram16056 (ewram[0x16056]) -#define ewram16058 (ewram[0x16058]) -#define ewram16059 (ewram[0x16059]) -#define UNK_201606C_ARRAY (ewram + 0x1606C) // lazy define but whatever. -#define ewram16078 (ewram[0x16078]) -#define ewram16084 (ewram[0x16084]) -#define ewram16086 (ewram[0x16086]) -#define ewram16087 (ewram[0x16087]) -#define ewram16088 (ewram[0x16088]) -#define ewram16088_2 (*(u8 *)(ewram + 0x16088)) -#define ewram16089 (ewram[0x16089]) -#define ewram16089_2 (*(u8 *)(ewram + 0x16089)) -#define EWRAM_1609D (ewram[0x1609D]) -#define ewram160A1 (ewram[0x160A1]) -#define ewram160A6 (ewram[0x160A6]) -#define ewram160AC ((u8 *)(ewram + 0x160AC)) -#define ewram160BC ((u16 *)(ewram + 0x160BC)) // hp -#define ewram160C8 (ewram[0x160C8]) -#define ewram160C9 (ewram[0x160C9]) -#define ewram160CB (ewram[0x160CB]) -#define ewram160CC ((u8 *)(ewram + 0x160CC)) -#define USED_HELD_ITEM(bank) ((((u16*)(&ewram[0x160CC + bank * 2])))) -#define USED_HELD_ITEMS(bank) (*(u16 *)&ewram[0x160CC + 2 * (bank)]) -#define ewram160E6 (ewram[0x160E6]) -#define CHOICED_MOVE(bank) (((u16*)(&ewram[0x160E8 + bank * 2]))) -#define ewram160E8 ((u8 *)(ewram + 0x160E8)) -#define ewram160F0 ((u8 *)(ewram + 0x160F0)) -#define ewram160F9 (ewram[0x160F9]) -#define ewram160FB (ewram[0x160FB]) -#define ewram16100 ((u8 *)(ewram + 0x16100)) -#define ewram16108 ((u8 *)(ewram + 0x16108)) -#define ewram16110 (ewram[0x16110]) -#define ewram16111 (ewram[0x16111]) -#define ewram16113 (ewram[0x16113]) -#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(ewram + 0x16800)) -#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 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 unk_2018000 (*(struct PlayerRecords *)(ewram + 0x18000)) -#define EWRAM_18000 ((u16 *)(ewram + 0x18000)) -#define ewram18000 ((u16 *)(ewram + 0x18000)) -#define UNK_2018000_STRUCT (*(struct UnknownStruct2018000 *)(ewram + 0x18000)) -#define ewram18300 ((u16 *)(ewram + 0x18300)) -#define EWRAM_19348 (*(u16 *)(ewram + 0x19348)) -#define ewram19348 (*(struct Struct2019348 *)(ewram + 0x19348)) -#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000)) -#define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000)) -#define EWRAM_1B000 ewram1B000_alt // FIXME -#define EWRAM_1B000_2 (*(struct Struct201B000 *)(ewram + 0x1B000)) -#define EWRAM_1C000 (*(struct Struct201C000 *)(ewram + 0x1C000)) -#define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000)) -#define ewram1c000 (*(struct Unk201C000 *)(ewram + 0x1C000)) // FIXME, names too similar -#define ewram1D000 ((struct Pokemon *)(ewram + 0x1D000)) -#define ewram1D000_2 ((u16 *)(ewram + 0x1D000)) -#define ewram1D400 ((u16 *)(ewram + 0x1D400)) -#define ewramSavedItemsPocket ((struct ItemSlot *)(ewram + 0x1E000)) // saved items pocket (for Wally battle) -#define HALL_OF_FAME_SHEET_0 ((u8 *)(ewram + 0x1E000)) -#define HALL_OF_FAME_SHEET_1 ((u8 *)(ewram + 0x1E800)) -#define ewram_1f000 (*(struct DecoPCPointers *)(ewram + 0x1f000)) -#define ewramSavedPokeballsPocket ((struct ItemSlot *)(ewram + 0x1F000)) // saved Pokeballs pocket (for Wally battle) -#define HALL_OF_FAME_SHEET_2 ((u8 *)(ewram + 0x1F000)) -#define EWRAM_1F800 ((u16 *)(ewram + 0x1F800)) -#define ewram1FE00 (*(struct Unk201FE00 *)(ewram + 0x1FE00)) -#define gHelperState (ewram[0x1FFFE]) -#define gReshowState (ewram[0x1FFFF]) -#define ewramBagSetupStep (ewram[0x1FFFF]) +#define ARRAY_2007800 ((struct EasyChatPair *)(ewram + 0x7800)) +#define ARRAY_2007900 ((struct EasyChatPair *)(ewram + 0x7900)) +#define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000)) +#define TRANSITION_STRUCT (*(struct TransitionData *) (ewram + 0xC000)) +#define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000)) +#define EWRAM_14000 ((u8 *)(ewram + 0x14000)) +#define EWRAM_14800 ((u16 *)(ewram + 0x14800)) +#define sEvoInfo ((*(struct EvoInfo*)(ewram + 0x14800))) +#define EWRAM_15000 ((u8 *)(ewram + 0x15000)) +#define ewram16000 (ewram[0x16000]) +#define ewram16001 (ewram[0x16001]) +#define ewram16002 (ewram[0x16002]) +#define ewram16003 (ewram[0x16003]) +#define ewram1600C (ewram[0x1600C]) +#define ewram1600E (ewram[0x1600E]) +#define ewram1601B (ewram[0x1601B]) +#define ewram16020 ((u8 *)(ewram + 0x16020)) +#define ewram16056 (ewram[0x16056]) +#define ewram16058 (ewram[0x16058]) +#define ewram16059 (ewram[0x16059]) +#define UNK_201606C_ARRAY (ewram + 0x1606C) // lazy define but whatever. +#define ewram16078 (ewram[0x16078]) +#define ewram16084 (ewram[0x16084]) +#define ewram16086 (ewram[0x16086]) +#define ewram16087 (ewram[0x16087]) +#define ewram16088 (ewram[0x16088]) +#define ewram16088_2 (*(u8 *)(ewram + 0x16088)) +#define ewram16089 (ewram[0x16089]) +#define ewram16089_2 (*(u8 *)(ewram + 0x16089)) +#define EWRAM_1609D (ewram[0x1609D]) +#define ewram160A1 (ewram[0x160A1]) +#define ewram160A6 (ewram[0x160A6]) +#define ewram160AC ((u8 *)(ewram + 0x160AC)) +#define ewram160BC ((u16 *)(ewram + 0x160BC)) // hp +#define ewram160C8 (ewram[0x160C8]) +#define ewram160C9 (ewram[0x160C9]) +#define ewram160CB (ewram[0x160CB]) +#define ewram160CC ((u8 *)(ewram + 0x160CC)) +#define USED_HELD_ITEM(bank) ((((u16*)(&ewram[0x160CC + bank * 2])))) +#define USED_HELD_ITEMS(bank) (*(u16 *)&ewram[0x160CC + 2 * (bank)]) +#define ewram160E6 (ewram[0x160E6]) +#define CHOICED_MOVE(bank) (((u16*)(&ewram[0x160E8 + bank * 2]))) +#define ewram160E8 ((u8 *)(ewram + 0x160E8)) +#define ewram160F0 ((u8 *)(ewram + 0x160F0)) +#define ewram160F9 (ewram[0x160F9]) +#define ewram160FB (ewram[0x160FB]) +#define ewram16100 ((u8 *)(ewram + 0x16100)) +#define ewram16108 ((u8 *)(ewram + 0x16108)) +#define ewram16110 (ewram[0x16110]) +#define ewram16111 (ewram[0x16111]) +#define ewram16113 (ewram[0x16113]) +#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(ewram + 0x16800)) +#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 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 unk_2018000 (*(struct PlayerRecords *)(ewram + 0x18000)) +#define EWRAM_18000 ((u16 *)(ewram + 0x18000)) +#define ewram18000 ((u16 *)(ewram + 0x18000)) +#define UNK_2018000_STRUCT (*(struct UnknownStruct2018000 *)(ewram + 0x18000)) +#define ewram18300 ((u16 *)(ewram + 0x18300)) +#define EWRAM_19348 (*(u16 *)(ewram + 0x19348)) +#define ewram19348 (*(struct Struct2019348 *)(ewram + 0x19348)) +#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000)) +#define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000)) +#define EWRAM_1B000 ewram1B000_alt // FIXME +#define EWRAM_1B000_2 (*(struct Struct201B000 *)(ewram + 0x1B000)) +#define EWRAM_1C000 (*(struct Struct201C000 *)(ewram + 0x1C000)) +#define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000)) +#define ewram1c000 (*(struct Unk201C000 *)(ewram + 0x1C000)) // FIXME, names too similar +#define ewram1D000 ((struct Pokemon *)(ewram + 0x1D000)) +#define ewram1D000_2 ((u16 *)(ewram + 0x1D000)) +#define ewram1D400 ((u16 *)(ewram + 0x1D400)) +#define ewramSavedItemsPocket ((struct ItemSlot *)(ewram + 0x1E000)) // saved items pocket (for Wally battle) +#define HALL_OF_FAME_SHEET_0 ((u8 *)(ewram + 0x1E000)) +#define HALL_OF_FAME_SHEET_1 ((u8 *)(ewram + 0x1E800)) +#define ewram_1f000 (*(struct DecoPCPointers *)(ewram + 0x1f000)) +#define ewramSavedPokeballsPocket ((struct ItemSlot *)(ewram + 0x1F000)) // saved Pokeballs pocket (for Wally battle) +#define HALL_OF_FAME_SHEET_2 ((u8 *)(ewram + 0x1F000)) +#define EWRAM_1F800 ((u16 *)(ewram + 0x1F800)) +#define ewram1FE00 (*(struct Unk201FE00 *)(ewram + 0x1FE00)) +#define gHelperState (ewram[0x1FFFE]) +#define gReshowState (ewram[0x1FFFF]) +#define ewramBagSetupStep (ewram[0x1FFFF]) #endif -- cgit v1.2.3 From 618240c62639bc4da73d400965b6df67b2c3619e Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 5 Nov 2017 23:07:39 -0500 Subject: move src/engine/ direct ewram calls to ewram.h. --- include/ewram.h | 266 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 151 insertions(+), 115 deletions(-) (limited to 'include') diff --git a/include/ewram.h b/include/ewram.h index 83fc5dac6..fa405e59c 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -3,120 +3,156 @@ extern u8 ewram[]; -#define BATTLE_STRUCT ((struct BattleStruct *) (ewram + 0x0)) -#define ewram0_2 (*(struct Struct2000000 *)(ewram + 0x0)) -#define namingScreenData (*(struct NamingScreenData *)(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) -#define ewramBlankMapName (ewram + 0xA48) -#define ewramA6E (ewram[0xA6E]) -#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x1000)) -#define ewramBerryPicTemp (ewram + 0x1000) -#define EWRAM_1000 (*(struct Struct2001000 *)(ewram + 0x1000)) -#define gUnk20011fa (u8 *)(&ewram[0x11FA]) -#define gUnk2002694 (u8 *)(&ewram[0x2694]) -#define gUnk20026A6 (u8 *)(&ewram[0x26A6]) -#define gUnk20026e4 (u8 *)(&ewram[0x26E4]) -#define gUnknown_02007000 (*(ewramStruct_02007000 *)(ewram + 0x7000)) -#define ARRAY_2007800 ((struct EasyChatPair *)(ewram + 0x7800)) -#define ARRAY_2007900 ((struct EasyChatPair *)(ewram + 0x7900)) -#define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000)) -#define TRANSITION_STRUCT (*(struct TransitionData *) (ewram + 0xC000)) -#define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000)) -#define EWRAM_14000 ((u8 *)(ewram + 0x14000)) -#define EWRAM_14800 ((u16 *)(ewram + 0x14800)) -#define sEvoInfo ((*(struct EvoInfo*)(ewram + 0x14800))) -#define EWRAM_15000 ((u8 *)(ewram + 0x15000)) -#define ewram16000 (ewram[0x16000]) -#define ewram16001 (ewram[0x16001]) -#define ewram16002 (ewram[0x16002]) -#define ewram16003 (ewram[0x16003]) -#define ewram1600C (ewram[0x1600C]) -#define ewram1600E (ewram[0x1600E]) -#define ewram1601B (ewram[0x1601B]) -#define ewram16020 ((u8 *)(ewram + 0x16020)) -#define ewram16056 (ewram[0x16056]) -#define ewram16058 (ewram[0x16058]) -#define ewram16059 (ewram[0x16059]) -#define UNK_201606C_ARRAY (ewram + 0x1606C) // lazy define but whatever. -#define ewram16078 (ewram[0x16078]) -#define ewram16084 (ewram[0x16084]) -#define ewram16086 (ewram[0x16086]) -#define ewram16087 (ewram[0x16087]) -#define ewram16088 (ewram[0x16088]) -#define ewram16088_2 (*(u8 *)(ewram + 0x16088)) -#define ewram16089 (ewram[0x16089]) -#define ewram16089_2 (*(u8 *)(ewram + 0x16089)) -#define EWRAM_1609D (ewram[0x1609D]) -#define ewram160A1 (ewram[0x160A1]) -#define ewram160A6 (ewram[0x160A6]) -#define ewram160AC ((u8 *)(ewram + 0x160AC)) -#define ewram160BC ((u16 *)(ewram + 0x160BC)) // hp -#define ewram160C8 (ewram[0x160C8]) -#define ewram160C9 (ewram[0x160C9]) -#define ewram160CB (ewram[0x160CB]) -#define ewram160CC ((u8 *)(ewram + 0x160CC)) -#define USED_HELD_ITEM(bank) ((((u16*)(&ewram[0x160CC + bank * 2])))) -#define USED_HELD_ITEMS(bank) (*(u16 *)&ewram[0x160CC + 2 * (bank)]) -#define ewram160E6 (ewram[0x160E6]) -#define CHOICED_MOVE(bank) (((u16*)(&ewram[0x160E8 + bank * 2]))) -#define ewram160E8 ((u8 *)(ewram + 0x160E8)) -#define ewram160F0 ((u8 *)(ewram + 0x160F0)) -#define ewram160F9 (ewram[0x160F9]) -#define ewram160FB (ewram[0x160FB]) -#define ewram16100 ((u8 *)(ewram + 0x16100)) -#define ewram16108 ((u8 *)(ewram + 0x16108)) -#define ewram16110 (ewram[0x16110]) -#define ewram16111 (ewram[0x16111]) -#define ewram16113 (ewram[0x16113]) -#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(ewram + 0x16800)) -#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 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 unk_2018000 (*(struct PlayerRecords *)(ewram + 0x18000)) -#define EWRAM_18000 ((u16 *)(ewram + 0x18000)) -#define ewram18000 ((u16 *)(ewram + 0x18000)) -#define UNK_2018000_STRUCT (*(struct UnknownStruct2018000 *)(ewram + 0x18000)) -#define ewram18300 ((u16 *)(ewram + 0x18300)) -#define EWRAM_19348 (*(u16 *)(ewram + 0x19348)) -#define ewram19348 (*(struct Struct2019348 *)(ewram + 0x19348)) -#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000)) -#define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000)) -#define EWRAM_1B000 ewram1B000_alt // FIXME -#define EWRAM_1B000_2 (*(struct Struct201B000 *)(ewram + 0x1B000)) -#define EWRAM_1C000 (*(struct Struct201C000 *)(ewram + 0x1C000)) -#define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000)) -#define ewram1c000 (*(struct Unk201C000 *)(ewram + 0x1C000)) // FIXME, names too similar -#define ewram1D000 ((struct Pokemon *)(ewram + 0x1D000)) -#define ewram1D000_2 ((u16 *)(ewram + 0x1D000)) -#define ewram1D400 ((u16 *)(ewram + 0x1D400)) -#define ewramSavedItemsPocket ((struct ItemSlot *)(ewram + 0x1E000)) // saved items pocket (for Wally battle) -#define HALL_OF_FAME_SHEET_0 ((u8 *)(ewram + 0x1E000)) -#define HALL_OF_FAME_SHEET_1 ((u8 *)(ewram + 0x1E800)) -#define ewram_1f000 (*(struct DecoPCPointers *)(ewram + 0x1f000)) -#define ewramSavedPokeballsPocket ((struct ItemSlot *)(ewram + 0x1F000)) // saved Pokeballs pocket (for Wally battle) -#define HALL_OF_FAME_SHEET_2 ((u8 *)(ewram + 0x1F000)) -#define EWRAM_1F800 ((u16 *)(ewram + 0x1F800)) -#define ewram1FE00 (*(struct Unk201FE00 *)(ewram + 0x1FE00)) -#define gHelperState (ewram[0x1FFFE]) -#define gReshowState (ewram[0x1FFFF]) -#define ewramBagSetupStep (ewram[0x1FFFF]) +#define BATTLE_STRUCT ((struct BattleStruct *) (ewram + 0x0)) +#define ewram0_2 (*(struct Struct2000000 *)(ewram + 0x0)) +#define namingScreenData (*(struct NamingScreenData *)(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) +#define ewramBlankMapName (ewram + 0xA48) +#define ewramA6E (ewram[0xA6E]) +#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x1000)) +#define ewramBerryPicTemp (ewram + 0x1000) +#define EWRAM_1000 (*(struct Struct2001000 *)(ewram + 0x1000)) +#define gUnk20011fa (u8 *)(&ewram[0x11FA]) +#define gUnk2002694 (u8 *)(&ewram[0x2694]) +#define gUnk20026A6 (u8 *)(&ewram[0x26A6]) +#define gUnk20026e4 (u8 *)(&ewram[0x26E4]) +#define gUnknown_02007000 (*(ewramStruct_02007000 *)(ewram + 0x7000)) +#define ARRAY_2007800 ((struct EasyChatPair *)(ewram + 0x7800)) +#define ARRAY_2007900 ((struct EasyChatPair *)(ewram + 0x7900)) +#define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000)) +#define TRANSITION_STRUCT (*(struct TransitionData *) (ewram + 0xC000)) +#define ewramC03C (&ewram[0xC03C]) +#define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000)) +#define EWRAM_14000 ((u8 *)(ewram + 0x14000)) +#define EWRAM_14800 ((u16 *)(ewram + 0x14800)) +#define sEvoInfo ((*(struct EvoInfo*)(ewram + 0x14800))) +#define EWRAM_15000 ((u8 *)(ewram + 0x15000)) +#define ewram16000 (ewram[0x16000]) +#define ewram16001 (ewram[0x16001]) +#define ewram16002 (ewram[0x16002]) +#define ewram16003 (ewram[0x16003]) +#define ewram16004arr(i, bank) (ewram[0x16004 + i + bank * 2]) +#define ewram1600C (ewram[0x1600C]) +#define ewram1600E (ewram[0x1600E]) +#define ewram16010arr(bank) (ewram[0x16010 + bank]) +#define ewram1601B (ewram[0x1601B]) +#define eDynamicMoveType (ewram[0x1601C]) +#define eDmgMultiplier (ewram[0x1601F]) +#define ewram16020 ((u8 *)(ewram + 0x16020)) +#define ewram16020arr(i) (ewram[0x16020 + i]) +#define ewram16054 (ewram[0x16054]) +#define ewram16056 (ewram[0x16056]) +#define ewram16058 (ewram[0x16058]) +#define ewram16059 (ewram[0x16059]) +#define ewram16060(bank) (ewram[0x16060 + bank]) +#define BATTLE_PARTY_ID(bank) (ewram[0x16064 + bank]) +#define ewram16064 (&ewram[0x16064]) +#define ewram16064arr(bank) (ewram[0x16064 + bank]) +#define ewram16068arr(i) (ewram[0x16068 + i]) +#define UNK_201606C_ARRAY (ewram + 0x1606C) // lazy define but whatever. +#define ewram1606Carr(i, a, mul) (ewram[0x1606C + i + a * mul]) +#define ewram16078 (ewram[0x16078]) +#define ewram16084 (ewram[0x16084]) +#define ewram16086 (ewram[0x16086]) +#define ewram16087 (ewram[0x16087]) +#define ewram16088 (ewram[0x16088]) +#define ewram16088_2 (*(u8 *)(ewram + 0x16088)) +#define ewram16089 (ewram[0x16089]) +#define ewram16089_2 (*(u8 *)(ewram + 0x16089)) +#define ewram1608Carr(bank) (ewram[0x1608C + bank]) +#define EWRAM_1609D (ewram[0x1609D]) +#define ewram160A1 (ewram[0x160A1]) +#define ewram160A6 (ewram[0x160A6]) +#define ewram160A8 (ewram[0x160A8]) +#define ewram160A9 (ewram[0x160A9]) +#define ewram160AA (ewram[0x160AA]) +#define ewram160AB (ewram[0x160AB]) +#define ewram160AC ((u8 *)(ewram + 0x160AC)) +#define ewram160ACarr(i) (ewram[0x160AC + i]) +#define ewram160ACarr2(i, bank) (ewram[0x160AC + i + bank * 2]) +#define ewram160BC ((u16 *)(ewram + 0x160BC)) // hp +#define ewram160BCarr(bank) (ewram[0x160BC + bank * 2]) +#define ewram160C0 (ewram[0x160C0]) +#define ewram160C2_Flags ((u16 *)(ewram + 0x160C2)) +#define ewram160C4_Callback ((MainCallback *)(ewram + 0x160C4)) +#define ewram160C8 (ewram[0x160C8]) +#define ewram160C8arr(bank) (ewram[0x160C8 + (bank / 2)]) +#define ewram160C9 (ewram[0x160C9]) +#define ewram160CB (ewram[0x160CB]) +#define ewram160CC ((u8 *)(ewram + 0x160CC)) +#define ewram160CCarr(i) (ewram[0x160CC + i]) +#define USED_HELD_ITEM(bank) ((((u16*)(&ewram[0x160CC + bank * 2])))) +#define USED_HELD_ITEMS(bank) (*(u16 *)&ewram[0x160CC + 2 * (bank)]) +#define ewram160D4(bank) (ewram[0x160D4 + (bank / 2) * 2]) +#define ewram160DD (ewram[0x160DD]) +#define ewram160E0(i) (ewram[0x160E0 + i]) +#define ewram160E6 (ewram[0x160E6]) +#define CHOICED_MOVE(bank) (((u16*)(&ewram[0x160E8 + bank * 2]))) +#define ewram160E8 ((u8 *)(ewram + 0x160E8)) +#define ewram160E8arr(i) (ewram[0x160E8 + i]) +#define ewram160E8arr2(i, bank) (ewram[0x160E8 + i + bank * 2]) +#define ewram160F0 ((u8 *)(ewram + 0x160F0)) +#define ewram160F0arr(i) (ewram[0x160F0 + i]) +#define ewram160F8 (ewram[0x160F8]) +#define ewram160F9 (ewram[0x160F9]) +#define ewram160FB (ewram[0x160FB]) +#define ewram16100 ((u8 *)(ewram + 0x16100)) +#define ewram16100arr(i) (ewram[0x16100 + i]) +#define ewram16100arr2(i, bank) (ewram[0x16100 + i + bank * 4]) +#define ewram16108 ((u8 *)(ewram + 0x16108)) +#define ewram16108arr(i) (ewram[0x16108 + i]) +#define ewram16110 (ewram[0x16110]) +#define ewram16111 (ewram[0x16111]) +#define ewram16113 (ewram[0x16113]) +#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(ewram + 0x16800)) +#define UNK_2016A00_STRUCT ((struct UnkBattleStruct1 *) (ewram + 0x16A00)) +#define AI_STACK ((struct AI_Stack *) (ewram + 0x16C00)) +#define AI_ARRAY_160CC(i) (ewram[0x160CC + i * 2]) +#define ewram17002 (&ewram[0x17002]) +#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 unk_2018000 (*(struct PlayerRecords *)(ewram + 0x18000)) +#define EWRAM_18000 ((u16 *)(ewram + 0x18000)) +#define ewram18000 ((u16 *)(ewram + 0x18000)) +#define UNK_2018000_STRUCT (*(struct UnknownStruct2018000 *)(ewram + 0x18000)) +#define ewram18300 ((u16 *)(ewram + 0x18300)) +#define EWRAM_19348 (*(u16 *)(ewram + 0x19348)) +#define ewram19348 (*(struct Struct2019348 *)(ewram + 0x19348)) +#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000)) +#define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000)) +#define EWRAM_1B000 ewram1B000_alt // FIXME +#define EWRAM_1B000_2 (*(struct Struct201B000 *)(ewram + 0x1B000)) +#define EWRAM_1C000 (*(struct Struct201C000 *)(ewram + 0x1C000)) +#define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000)) +#define ewram1c000 (*(struct Unk201C000 *)(ewram + 0x1C000)) // FIXME, names too similar +#define ewram1D000 ((struct Pokemon *)(ewram + 0x1D000)) +#define ewram1D000_2 ((u16 *)(ewram + 0x1D000)) +#define ewram1D400 ((u16 *)(ewram + 0x1D400)) +#define ewramSavedItemsPocket ((struct ItemSlot *)(ewram + 0x1E000)) // saved items pocket (for Wally battle) +#define HALL_OF_FAME_SHEET_0 ((u8 *)(ewram + 0x1E000)) +#define HALL_OF_FAME_SHEET_1 ((u8 *)(ewram + 0x1E800)) +#define ewram_1f000 (*(struct DecoPCPointers *)(ewram + 0x1f000)) +#define ewramSavedPokeballsPocket ((struct ItemSlot *)(ewram + 0x1F000)) // saved Pokeballs pocket (for Wally battle) +#define HALL_OF_FAME_SHEET_2 ((u8 *)(ewram + 0x1F000)) +#define EWRAM_1F800 ((u16 *)(ewram + 0x1F800)) +#define ewram1FE00 (*(struct Unk201FE00 *)(ewram + 0x1FE00)) +#define gHelperState (ewram[0x1FFFE]) +#define gReshowState (ewram[0x1FFFF]) +#define ewramBagSetupStep (ewram[0x1FFFF]) #endif -- cgit v1.2.3 From 5711615c6067e49c3254f9568be55dc6ed3d5c2f Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 6 Nov 2017 03:46:09 -0500 Subject: finish refactoring ewram defines into ewram.h. --- include/ewram.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/ewram.h b/include/ewram.h index fa405e59c..341f23432 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -3,6 +3,10 @@ extern u8 ewram[]; +// Note: we have duplicate ewram labels because its clear some memory +// regions overlap others but have different definitions. Until some +// dupes can be determined to be the same, they will be deliberate +// seperated. #define BATTLE_STRUCT ((struct BattleStruct *) (ewram + 0x0)) #define ewram0_2 (*(struct Struct2000000 *)(ewram + 0x0)) #define namingScreenData (*(struct NamingScreenData *)(ewram + 0x0)) @@ -10,8 +14,13 @@ extern u8 ewram[]; #define ewram0_3 (*(struct UnknownStruct3 *)(ewram + 0x0)) #define ewram0_4 (*(struct Unk2000000 *)(ewram + 0x0)) #define ewram0_5 (*(struct UnkStruct *)(ewram + 0x0)) +#define eMatsudaDebugVar (ewram[0x0]) +#define eBrendanSprite (ewram + 0x0) +#define ewram0_6 (u32)(&ewram[0]) +#define ewram0_7 (&ewram[0]) #define ewram4 (*(struct UnknownStruct8 *)(ewram + 0x4)) #define ewram520 ((struct UnknownStruct7 *)(ewram + 0x00520)) +#define eMaySprite (ewram + 0x800) #define ewram888 (ewram + 0x888) #define ewramBlankMapName (ewram + 0xA48) #define ewramA6E (ewram[0xA6E]) @@ -26,13 +35,44 @@ extern u8 ewram[]; #define ARRAY_2007800 ((struct EasyChatPair *)(ewram + 0x7800)) #define ARRAY_2007900 ((struct EasyChatPair *)(ewram + 0x7900)) #define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000)) +#define ewram8000 (&ewram[0x8000]) +#define ewram8800 (&ewram[0x8800]) +#define ewram9000 (&ewram[0x9000]) +#define ewram9800 (&ewram[0x9800]) +#define ewramA000 (&ewram[0xA000]) +#define ewramA800 (&ewram[0xA800]) +#define ewramB000 (&ewram[0xB000]) +#define ewramB800 (&ewram[0xB800]) #define TRANSITION_STRUCT (*(struct TransitionData *) (ewram + 0xC000)) +#define ewramC000 (&ewram[0xC000]) #define ewramC03C (&ewram[0xC03C]) +#define ewramC800 (&ewram[0xC800]) +#define ewramD000 (&ewram[0xD000]) +#define ewramD800 (&ewram[0xD800]) +#define ewramE000 (&ewram[0xE000]) +#define ewramE800 (&ewram[0xE800]) +#define ewramF000 (&ewram[0xF000]) +#define ewramF800 (&ewram[0xF800]) #define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000)) +#define ewram10000 (&ewram[0x10000]) +#define ewram10800 (&ewram[0x10800]) +#define ewram11000 (&ewram[0x11000]) +#define ewram11800 (&ewram[0x11800]) +#define ewram13000 (&ewram[0x13000]) #define EWRAM_14000 ((u8 *)(ewram + 0x14000)) +#define ewram14000 (&ewram[0x14000]) +#define ewram14000arr(i, data) (ewram[0x14000 + i + data]) +#define ewram14004arr(i, data) (ewram[0x14004 + i + data]) +#define ewram14008arr(i, data) (ewram[0x14008 + data + i]) +#define ewram14800 (&ewram[0x14800]) #define EWRAM_14800 ((u16 *)(ewram + 0x14800)) #define sEvoInfo ((*(struct EvoInfo*)(ewram + 0x14800))) #define EWRAM_15000 ((u8 *)(ewram + 0x15000)) +#define ewram15000 (&ewram[0x15000]) +#define ewram15000arr(i, data) (ewram[0x15000 + data + i]) +#define ewram15800 (&ewram[0x15800]) +#define ewram15DDE (ewram[0x15DDE]) +#define ewram15DDF (ewram[0x15DDF]) #define ewram16000 (ewram[0x16000]) #define ewram16001 (ewram[0x16001]) #define ewram16002 (ewram[0x16002]) @@ -56,7 +96,7 @@ extern u8 ewram[]; #define ewram16064arr(bank) (ewram[0x16064 + bank]) #define ewram16068arr(i) (ewram[0x16068 + i]) #define UNK_201606C_ARRAY (ewram + 0x1606C) // lazy define but whatever. -#define ewram1606Carr(i, a, mul) (ewram[0x1606C + i + a * mul]) +#define ewram1606Carr(i, a) (ewram[0x1606C + i + a * 3]) #define ewram16078 (ewram[0x16078]) #define ewram16084 (ewram[0x16084]) #define ewram16086 (ewram[0x16086]) @@ -101,6 +141,7 @@ extern u8 ewram[]; #define ewram160F0arr(i) (ewram[0x160F0 + i]) #define ewram160F8 (ewram[0x160F8]) #define ewram160F9 (ewram[0x160F9]) +#define eStatHp (ewram[0x160FA]) #define ewram160FB (ewram[0x160FB]) #define ewram16100 ((u8 *)(ewram + 0x16100)) #define ewram16100arr(i) (ewram[0x16100 + i]) @@ -110,10 +151,12 @@ extern u8 ewram[]; #define ewram16110 (ewram[0x16110]) #define ewram16111 (ewram[0x16111]) #define ewram16113 (ewram[0x16113]) +#define ewram16400 (ewram + 0x16400) #define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(ewram + 0x16800)) #define UNK_2016A00_STRUCT ((struct UnkBattleStruct1 *) (ewram + 0x16A00)) #define AI_STACK ((struct AI_Stack *) (ewram + 0x16C00)) #define AI_ARRAY_160CC(i) (ewram[0x160CC + i * 2]) +#define eLearnMoveStruct (struct LearnMoveStruct *)(ewram + 0x17000) #define ewram17002 (&ewram[0x17002]) #define ewram17100 (*(struct Struct2017100 *)(ewram + 0x17100)) #define B_BATTLESCRIPTS_STACK ((struct scriptsStack *) (ewram + 0x17110)) @@ -129,10 +172,16 @@ extern u8 ewram[]; #define unk_2018000 (*(struct PlayerRecords *)(ewram + 0x18000)) #define EWRAM_18000 ((u16 *)(ewram + 0x18000)) #define ewram18000 ((u16 *)(ewram + 0x18000)) +#define ewram18000_2 (&ewram[0x18000]) +#define eBerryBlenderData (struct BerryBlenderData*)(&ewram[0x18000]) +#define eEggHatchData (struct EggHatchData*)(&ewram[0x18000]) #define UNK_2018000_STRUCT (*(struct UnknownStruct2018000 *)(ewram + 0x18000)) #define ewram18300 ((u16 *)(ewram + 0x18300)) +#define ewram18800 (&ewram[0x18800]) +#define ewram19000 (&ewram[0x19000]) #define EWRAM_19348 (*(u16 *)(ewram + 0x19348)) #define ewram19348 (*(struct Struct2019348 *)(ewram + 0x19348)) +#define ewram19800 (&ewram[0x19800]) #define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000)) #define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000)) #define EWRAM_1B000 ewram1B000_alt // FIXME @@ -140,10 +189,13 @@ extern u8 ewram[]; #define EWRAM_1C000 (*(struct Struct201C000 *)(ewram + 0x1C000)) #define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000)) #define ewram1c000 (*(struct Unk201C000 *)(ewram + 0x1C000)) // FIXME, names too similar +#define eHallOfFameMons1 (struct HallofFameMons*)(&ewram[0x1C000]) #define ewram1D000 ((struct Pokemon *)(ewram + 0x1D000)) #define ewram1D000_2 ((u16 *)(ewram + 0x1D000)) #define ewram1D400 ((u16 *)(ewram + 0x1D400)) #define ewramSavedItemsPocket ((struct ItemSlot *)(ewram + 0x1E000)) // saved items pocket (for Wally battle) +#define ewram1E000(i) (ewram[0x1E000 + i]) +#define eHallOfFameMons2 (struct HallofFameMons*)(&ewram[0x1E000]) #define HALL_OF_FAME_SHEET_0 ((u8 *)(ewram + 0x1E000)) #define HALL_OF_FAME_SHEET_1 ((u8 *)(ewram + 0x1E800)) #define ewram_1f000 (*(struct DecoPCPointers *)(ewram + 0x1f000)) @@ -151,8 +203,12 @@ extern u8 ewram[]; #define HALL_OF_FAME_SHEET_2 ((u8 *)(ewram + 0x1F000)) #define EWRAM_1F800 ((u16 *)(ewram + 0x1F800)) #define ewram1FE00 (*(struct Unk201FE00 *)(ewram + 0x1FE00)) +#define ewram1FFFC (ewram[0x1FFFC]) +#define ewram1FFFD (ewram[0x1FFFD]) #define gHelperState (ewram[0x1FFFE]) +#define ewram1FFFE (ewram[0x1FFFE]) #define gReshowState (ewram[0x1FFFF]) #define ewramBagSetupStep (ewram[0x1FFFF]) +#define ewram1FFFF (ewram[0x1FFFF]) #endif -- cgit v1.2.3 From eecafbaec17ba0721d091d1a12ac20fa71da352a Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 9 Nov 2017 03:13:09 -0500 Subject: depreciate use of shared_syms --- include/battle.h | 48 +++++++++++++++++++++++++++++------------------- include/ewram.h | 21 ++++++++++++++++++--- 2 files changed, 47 insertions(+), 22 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index c2e1063d3..d576e92f4 100644 --- a/include/battle.h +++ b/include/battle.h @@ -539,6 +539,16 @@ struct Struct2017100 u32 arr[4]; }; +struct Struct2019348 +{ + u16 unk0; + u16 unk2; + u8 unk4; + u32 unk8; + u32 unkC; + u32 unk10; +}; + struct Struct2017800 { u8 invisible:1; @@ -551,25 +561,25 @@ struct Struct2017800 struct Struct2017810 { - u8 unk0_0:1; - u8 unk0_1:1; - u8 unk0_2:1; - u8 unk0_3:1; - u8 unk0_4:1; - u8 unk0_5:1; - u8 unk0_6:1; - u8 unk0_7:1; - u8 unk1_0:1; - u8 unk1_1:5; - u8 unk2; - u8 unk3; - u8 unk4; - u8 unk5; - u8 unk6; - u8 unk7; - u8 unk8; - u8 unk9; - u8 fillerA[2]; + /*0x00*/ u8 unk0_0:1; + /*0x00*/ u8 unk0_1:1; + /*0x00*/ u8 unk0_2:1; + /*0x00*/ u8 unk0_3:1; + /*0x00*/ u8 unk0_4:1; + /*0x00*/ u8 unk0_5:1; + /*0x00*/ u8 unk0_6:1; + /*0x00*/ u8 unk0_7:1; + /*0x01*/ u8 unk1_0:1; + /*0x01*/ u8 unk1_1:5; + /*0x02*/ u8 unk2; + /*0x03*/ u8 unk3; + /*0x04*/ u8 unk4; + /*0x05*/ u8 unk5; + /*0x06*/ u8 unk6; + /*0x07*/ u8 unk7; + /*0x08*/ u8 unk8; + /*0x09*/ u8 unk9; + /*0x0A*/ u8 fillerA[2]; }; struct Struct2017840 diff --git a/include/ewram.h b/include/ewram.h index 341f23432..051b9eac1 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -2,6 +2,7 @@ #define GUARD_EWRAM_H extern u8 ewram[]; +#define ewram_addr 0x02000000 // used in ewram addr hacks // Note: we have duplicate ewram labels because its clear some memory // regions overlap others but have different definitions. Until some @@ -18,6 +19,7 @@ extern u8 ewram[]; #define eBrendanSprite (ewram + 0x0) #define ewram0_6 (u32)(&ewram[0]) #define ewram0_7 (&ewram[0]) +#define eSaveSection (struct SaveSection *)(ewram + 0x0) #define ewram4 (*(struct UnknownStruct8 *)(ewram + 0x4)) #define ewram520 ((struct UnknownStruct7 *)(ewram + 0x00520)) #define eMaySprite (ewram + 0x800) @@ -31,13 +33,15 @@ extern u8 ewram[]; #define gUnk2002694 (u8 *)(&ewram[0x2694]) #define gUnk20026A6 (u8 *)(&ewram[0x26A6]) #define gUnk20026e4 (u8 *)(&ewram[0x26E4]) +#define ewram4000 (ewram + 0x4000) #define gUnknown_02007000 (*(ewramStruct_02007000 *)(ewram + 0x7000)) #define ARRAY_2007800 ((struct EasyChatPair *)(ewram + 0x7800)) #define ARRAY_2007900 ((struct EasyChatPair *)(ewram + 0x7900)) -#define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000)) +#define ewram_2008000 (*(struct PlayerRecords *)(ewram + 0x08000)) #define ewram8000 (&ewram[0x8000]) #define ewram8800 (&ewram[0x8800]) #define ewram9000 (&ewram[0x9000]) +#define ewram9000_hack (void *)(ewram_addr + 0x9000) // TODO: Fix this. #define ewram9800 (&ewram[0x9800]) #define ewramA000 (&ewram[0xA000]) #define ewramA800 (&ewram[0xA800]) @@ -73,6 +77,8 @@ extern u8 ewram[]; #define ewram15800 (&ewram[0x15800]) #define ewram15DDE (ewram[0x15DDE]) #define ewram15DDF (ewram[0x15DDF]) +#define ewram15DE0 ((*(struct ContestEntry*)(ewram + 0x15DE0))) +#define ewram15E00 ((*(struct Unk2015E00*)(ewram + 0x15E00))) #define ewram16000 (ewram[0x16000]) #define ewram16001 (ewram[0x16001]) #define ewram16002 (ewram[0x16002]) @@ -157,22 +163,26 @@ extern u8 ewram[]; #define AI_STACK ((struct AI_Stack *) (ewram + 0x16C00)) #define AI_ARRAY_160CC(i) (ewram[0x160CC + i * 2]) #define eLearnMoveStruct (struct LearnMoveStruct *)(ewram + 0x17000) +#define eSecretBaseRecord ((struct SecretBaseRecord *)(ewram + 0x17000)) #define ewram17002 (&ewram[0x17002]) -#define ewram17100 (*(struct Struct2017100 *)(ewram + 0x17100)) +#define eFlashFireArr (*(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 eTransformStatuses ((struct TransformStatus *)(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 unk_2018000 (*(struct PlayerRecords *)(ewram + 0x18000)) +#define ewram_2018000 (*(struct PlayerRecords *)(ewram + 0x18000)) #define EWRAM_18000 ((u16 *)(ewram + 0x18000)) #define ewram18000 ((u16 *)(ewram + 0x18000)) #define ewram18000_2 (&ewram[0x18000]) +// extern struct Pokemon *unk_2018000; +#define ewram18000_3 *(struct Pokemon **)(ewram + 0x18000) #define eBerryBlenderData (struct BerryBlenderData*)(&ewram[0x18000]) #define eEggHatchData (struct EggHatchData*)(&ewram[0x18000]) #define UNK_2018000_STRUCT (*(struct UnknownStruct2018000 *)(ewram + 0x18000)) @@ -190,12 +200,15 @@ extern u8 ewram[]; #define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000)) #define ewram1c000 (*(struct Unk201C000 *)(ewram + 0x1C000)) // FIXME, names too similar #define eHallOfFameMons1 (struct HallofFameMons*)(&ewram[0x1C000]) +#define EWRAM_1C800 (*(struct Unk201C800 *)(ewram + 0x1C800)) #define ewram1D000 ((struct Pokemon *)(ewram + 0x1D000)) #define ewram1D000_2 ((u16 *)(ewram + 0x1D000)) #define ewram1D400 ((u16 *)(ewram + 0x1D400)) #define ewramSavedItemsPocket ((struct ItemSlot *)(ewram + 0x1E000)) // saved items pocket (for Wally battle) #define ewram1E000(i) (ewram[0x1E000 + i]) #define eHallOfFameMons2 (struct HallofFameMons*)(&ewram[0x1E000]) +// extern struct HallOfFame gHallOfFame; +#define eHallOfFame (struct HallOfFame *)(ewram + 0x1E000) #define HALL_OF_FAME_SHEET_0 ((u8 *)(ewram + 0x1E000)) #define HALL_OF_FAME_SHEET_1 ((u8 *)(ewram + 0x1E800)) #define ewram_1f000 (*(struct DecoPCPointers *)(ewram + 0x1f000)) @@ -203,6 +216,8 @@ extern u8 ewram[]; #define HALL_OF_FAME_SHEET_2 ((u8 *)(ewram + 0x1F000)) #define EWRAM_1F800 ((u16 *)(ewram + 0x1F800)) #define ewram1FE00 (*(struct Unk201FE00 *)(ewram + 0x1FE00)) +#define eMailboxInfo (*(struct MailboxStruct *)(ewram + 0x1FE00)) +#define eCutGrassSpriteArray (ewram + 0x1FFF0) // 8 sprite IDs #define ewram1FFFC (ewram[0x1FFFC]) #define ewram1FFFD (ewram[0x1FFFD]) #define gHelperState (ewram[0x1FFFE]) -- cgit v1.2.3 From 7ab0460e9c04100dcc0ebb824a870069348030df Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 9 Nov 2017 03:29:54 -0500 Subject: formatting --- include/ewram.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/ewram.h b/include/ewram.h index 051b9eac1..b5acbc8ed 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -181,7 +181,6 @@ extern u8 ewram[]; #define EWRAM_18000 ((u16 *)(ewram + 0x18000)) #define ewram18000 ((u16 *)(ewram + 0x18000)) #define ewram18000_2 (&ewram[0x18000]) -// extern struct Pokemon *unk_2018000; #define ewram18000_3 *(struct Pokemon **)(ewram + 0x18000) #define eBerryBlenderData (struct BerryBlenderData*)(&ewram[0x18000]) #define eEggHatchData (struct EggHatchData*)(&ewram[0x18000]) @@ -207,7 +206,6 @@ extern u8 ewram[]; #define ewramSavedItemsPocket ((struct ItemSlot *)(ewram + 0x1E000)) // saved items pocket (for Wally battle) #define ewram1E000(i) (ewram[0x1E000 + i]) #define eHallOfFameMons2 (struct HallofFameMons*)(&ewram[0x1E000]) -// extern struct HallOfFame gHallOfFame; #define eHallOfFame (struct HallOfFame *)(ewram + 0x1E000) #define HALL_OF_FAME_SHEET_0 ((u8 *)(ewram + 0x1E000)) #define HALL_OF_FAME_SHEET_1 ((u8 *)(ewram + 0x1E800)) -- cgit v1.2.3 From 0343a1bcd728d813a38fc3486535e962e681c094 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 9 Nov 2017 20:54:49 -0500 Subject: remove shared_syms --- include/ewram.h | 430 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 215 insertions(+), 215 deletions(-) (limited to 'include') diff --git a/include/ewram.h b/include/ewram.h index b5acbc8ed..93fba80f8 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -1,227 +1,227 @@ #ifndef GUARD_EWRAM_H #define GUARD_EWRAM_H -extern u8 ewram[]; -#define ewram_addr 0x02000000 // used in ewram addr hacks +extern u8 gSharedMem[]; +#define ewram_addr 0x02000000 // used in gSharedMem addr hacks // Note: we have duplicate ewram labels because its clear some memory // regions overlap others but have different definitions. Until some // dupes can be determined to be the same, they will be deliberate // seperated. -#define BATTLE_STRUCT ((struct BattleStruct *) (ewram + 0x0)) -#define ewram0_2 (*(struct Struct2000000 *)(ewram + 0x0)) -#define namingScreenData (*(struct NamingScreenData *)(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 eMatsudaDebugVar (ewram[0x0]) -#define eBrendanSprite (ewram + 0x0) -#define ewram0_6 (u32)(&ewram[0]) -#define ewram0_7 (&ewram[0]) -#define eSaveSection (struct SaveSection *)(ewram + 0x0) -#define ewram4 (*(struct UnknownStruct8 *)(ewram + 0x4)) -#define ewram520 ((struct UnknownStruct7 *)(ewram + 0x00520)) -#define eMaySprite (ewram + 0x800) -#define ewram888 (ewram + 0x888) -#define ewramBlankMapName (ewram + 0xA48) -#define ewramA6E (ewram[0xA6E]) -#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x1000)) -#define ewramBerryPicTemp (ewram + 0x1000) -#define EWRAM_1000 (*(struct Struct2001000 *)(ewram + 0x1000)) -#define gUnk20011fa (u8 *)(&ewram[0x11FA]) -#define gUnk2002694 (u8 *)(&ewram[0x2694]) -#define gUnk20026A6 (u8 *)(&ewram[0x26A6]) -#define gUnk20026e4 (u8 *)(&ewram[0x26E4]) -#define ewram4000 (ewram + 0x4000) -#define gUnknown_02007000 (*(ewramStruct_02007000 *)(ewram + 0x7000)) -#define ARRAY_2007800 ((struct EasyChatPair *)(ewram + 0x7800)) -#define ARRAY_2007900 ((struct EasyChatPair *)(ewram + 0x7900)) -#define ewram_2008000 (*(struct PlayerRecords *)(ewram + 0x08000)) -#define ewram8000 (&ewram[0x8000]) -#define ewram8800 (&ewram[0x8800]) -#define ewram9000 (&ewram[0x9000]) +#define BATTLE_STRUCT ((struct BattleStruct *) (gSharedMem + 0x0)) +#define ewram0_2 (*(struct Struct2000000 *)(gSharedMem + 0x0)) +#define namingScreenData (*(struct NamingScreenData *)(gSharedMem + 0x0)) +#define ewramBerryPic (gSharedMem + 0x0) +#define ewram0_3 (*(struct UnknownStruct3 *)(gSharedMem + 0x0)) +#define ewram0_4 (*(struct Unk2000000 *)(gSharedMem + 0x0)) +#define ewram0_5 (*(struct UnkStruct *)(gSharedMem + 0x0)) +#define eMatsudaDebugVar (gSharedMem[0x0]) +#define eBrendanSprite (gSharedMem + 0x0) +#define ewram0_6 (u32)(&gSharedMem[0]) +#define ewram0_7 (&gSharedMem[0]) +#define eSaveSection (struct SaveSection *)(gSharedMem + 0x0) +#define ewram4 (*(struct UnknownStruct8 *)(gSharedMem + 0x4)) +#define ewram520 ((struct UnknownStruct7 *)(gSharedMem + 0x00520)) +#define eMaySprite (gSharedMem + 0x800) +#define ewram888 (gSharedMem + 0x888) +#define ewramBlankMapName (gSharedMem + 0xA48) +#define ewramA6E (gSharedMem[0xA6E]) +#define ewram01000 (*(struct Unk2001000 *)(gSharedMem + 0x1000)) +#define ewramBerryPicTemp (gSharedMem + 0x1000) +#define EWRAM_1000 (*(struct Struct2001000 *)(gSharedMem + 0x1000)) +#define gUnk20011fa (u8 *)(&gSharedMem[0x11FA]) +#define gUnk2002694 (u8 *)(&gSharedMem[0x2694]) +#define gUnk20026A6 (u8 *)(&gSharedMem[0x26A6]) +#define gUnk20026e4 (u8 *)(&gSharedMem[0x26E4]) +#define ewram4000 (gSharedMem + 0x4000) +#define gUnknown_02007000 (*(ewramStruct_02007000 *)(gSharedMem + 0x7000)) +#define ARRAY_2007800 ((struct EasyChatPair *)(gSharedMem + 0x7800)) +#define ARRAY_2007900 ((struct EasyChatPair *)(gSharedMem + 0x7900)) +#define ewram_2008000 (*(struct PlayerRecords *)(gSharedMem + 0x08000)) +#define ewram8000 (&gSharedMem[0x8000]) +#define ewram8800 (&gSharedMem[0x8800]) +#define ewram9000 (&gSharedMem[0x9000]) #define ewram9000_hack (void *)(ewram_addr + 0x9000) // TODO: Fix this. -#define ewram9800 (&ewram[0x9800]) -#define ewramA000 (&ewram[0xA000]) -#define ewramA800 (&ewram[0xA800]) -#define ewramB000 (&ewram[0xB000]) -#define ewramB800 (&ewram[0xB800]) -#define TRANSITION_STRUCT (*(struct TransitionData *) (ewram + 0xC000)) -#define ewramC000 (&ewram[0xC000]) -#define ewramC03C (&ewram[0xC03C]) -#define ewramC800 (&ewram[0xC800]) -#define ewramD000 (&ewram[0xD000]) -#define ewramD800 (&ewram[0xD800]) -#define ewramE000 (&ewram[0xE000]) -#define ewramE800 (&ewram[0xE800]) -#define ewramF000 (&ewram[0xF000]) -#define ewramF800 (&ewram[0xF800]) -#define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000)) -#define ewram10000 (&ewram[0x10000]) -#define ewram10800 (&ewram[0x10800]) -#define ewram11000 (&ewram[0x11000]) -#define ewram11800 (&ewram[0x11800]) -#define ewram13000 (&ewram[0x13000]) -#define EWRAM_14000 ((u8 *)(ewram + 0x14000)) -#define ewram14000 (&ewram[0x14000]) -#define ewram14000arr(i, data) (ewram[0x14000 + i + data]) -#define ewram14004arr(i, data) (ewram[0x14004 + i + data]) -#define ewram14008arr(i, data) (ewram[0x14008 + data + i]) -#define ewram14800 (&ewram[0x14800]) -#define EWRAM_14800 ((u16 *)(ewram + 0x14800)) -#define sEvoInfo ((*(struct EvoInfo*)(ewram + 0x14800))) -#define EWRAM_15000 ((u8 *)(ewram + 0x15000)) -#define ewram15000 (&ewram[0x15000]) -#define ewram15000arr(i, data) (ewram[0x15000 + data + i]) -#define ewram15800 (&ewram[0x15800]) -#define ewram15DDE (ewram[0x15DDE]) -#define ewram15DDF (ewram[0x15DDF]) -#define ewram15DE0 ((*(struct ContestEntry*)(ewram + 0x15DE0))) -#define ewram15E00 ((*(struct Unk2015E00*)(ewram + 0x15E00))) -#define ewram16000 (ewram[0x16000]) -#define ewram16001 (ewram[0x16001]) -#define ewram16002 (ewram[0x16002]) -#define ewram16003 (ewram[0x16003]) -#define ewram16004arr(i, bank) (ewram[0x16004 + i + bank * 2]) -#define ewram1600C (ewram[0x1600C]) -#define ewram1600E (ewram[0x1600E]) -#define ewram16010arr(bank) (ewram[0x16010 + bank]) -#define ewram1601B (ewram[0x1601B]) -#define eDynamicMoveType (ewram[0x1601C]) -#define eDmgMultiplier (ewram[0x1601F]) -#define ewram16020 ((u8 *)(ewram + 0x16020)) -#define ewram16020arr(i) (ewram[0x16020 + i]) -#define ewram16054 (ewram[0x16054]) -#define ewram16056 (ewram[0x16056]) -#define ewram16058 (ewram[0x16058]) -#define ewram16059 (ewram[0x16059]) -#define ewram16060(bank) (ewram[0x16060 + bank]) -#define BATTLE_PARTY_ID(bank) (ewram[0x16064 + bank]) -#define ewram16064 (&ewram[0x16064]) -#define ewram16064arr(bank) (ewram[0x16064 + bank]) -#define ewram16068arr(i) (ewram[0x16068 + i]) -#define UNK_201606C_ARRAY (ewram + 0x1606C) // lazy define but whatever. -#define ewram1606Carr(i, a) (ewram[0x1606C + i + a * 3]) -#define ewram16078 (ewram[0x16078]) -#define ewram16084 (ewram[0x16084]) -#define ewram16086 (ewram[0x16086]) -#define ewram16087 (ewram[0x16087]) -#define ewram16088 (ewram[0x16088]) -#define ewram16088_2 (*(u8 *)(ewram + 0x16088)) -#define ewram16089 (ewram[0x16089]) -#define ewram16089_2 (*(u8 *)(ewram + 0x16089)) -#define ewram1608Carr(bank) (ewram[0x1608C + bank]) -#define EWRAM_1609D (ewram[0x1609D]) -#define ewram160A1 (ewram[0x160A1]) -#define ewram160A6 (ewram[0x160A6]) -#define ewram160A8 (ewram[0x160A8]) -#define ewram160A9 (ewram[0x160A9]) -#define ewram160AA (ewram[0x160AA]) -#define ewram160AB (ewram[0x160AB]) -#define ewram160AC ((u8 *)(ewram + 0x160AC)) -#define ewram160ACarr(i) (ewram[0x160AC + i]) -#define ewram160ACarr2(i, bank) (ewram[0x160AC + i + bank * 2]) -#define ewram160BC ((u16 *)(ewram + 0x160BC)) // hp -#define ewram160BCarr(bank) (ewram[0x160BC + bank * 2]) -#define ewram160C0 (ewram[0x160C0]) -#define ewram160C2_Flags ((u16 *)(ewram + 0x160C2)) -#define ewram160C4_Callback ((MainCallback *)(ewram + 0x160C4)) -#define ewram160C8 (ewram[0x160C8]) -#define ewram160C8arr(bank) (ewram[0x160C8 + (bank / 2)]) -#define ewram160C9 (ewram[0x160C9]) -#define ewram160CB (ewram[0x160CB]) -#define ewram160CC ((u8 *)(ewram + 0x160CC)) -#define ewram160CCarr(i) (ewram[0x160CC + i]) -#define USED_HELD_ITEM(bank) ((((u16*)(&ewram[0x160CC + bank * 2])))) -#define USED_HELD_ITEMS(bank) (*(u16 *)&ewram[0x160CC + 2 * (bank)]) -#define ewram160D4(bank) (ewram[0x160D4 + (bank / 2) * 2]) -#define ewram160DD (ewram[0x160DD]) -#define ewram160E0(i) (ewram[0x160E0 + i]) -#define ewram160E6 (ewram[0x160E6]) -#define CHOICED_MOVE(bank) (((u16*)(&ewram[0x160E8 + bank * 2]))) -#define ewram160E8 ((u8 *)(ewram + 0x160E8)) -#define ewram160E8arr(i) (ewram[0x160E8 + i]) -#define ewram160E8arr2(i, bank) (ewram[0x160E8 + i + bank * 2]) -#define ewram160F0 ((u8 *)(ewram + 0x160F0)) -#define ewram160F0arr(i) (ewram[0x160F0 + i]) -#define ewram160F8 (ewram[0x160F8]) -#define ewram160F9 (ewram[0x160F9]) -#define eStatHp (ewram[0x160FA]) -#define ewram160FB (ewram[0x160FB]) -#define ewram16100 ((u8 *)(ewram + 0x16100)) -#define ewram16100arr(i) (ewram[0x16100 + i]) -#define ewram16100arr2(i, bank) (ewram[0x16100 + i + bank * 4]) -#define ewram16108 ((u8 *)(ewram + 0x16108)) -#define ewram16108arr(i) (ewram[0x16108 + i]) -#define ewram16110 (ewram[0x16110]) -#define ewram16111 (ewram[0x16111]) -#define ewram16113 (ewram[0x16113]) -#define ewram16400 (ewram + 0x16400) -#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(ewram + 0x16800)) -#define UNK_2016A00_STRUCT ((struct UnkBattleStruct1 *) (ewram + 0x16A00)) -#define AI_STACK ((struct AI_Stack *) (ewram + 0x16C00)) -#define AI_ARRAY_160CC(i) (ewram[0x160CC + i * 2]) -#define eLearnMoveStruct (struct LearnMoveStruct *)(ewram + 0x17000) -#define eSecretBaseRecord ((struct SecretBaseRecord *)(ewram + 0x17000)) -#define ewram17002 (&ewram[0x17002]) -#define eFlashFireArr (*(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 eTransformStatuses ((struct TransformStatus *)(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 ewram_2018000 (*(struct PlayerRecords *)(ewram + 0x18000)) -#define EWRAM_18000 ((u16 *)(ewram + 0x18000)) -#define ewram18000 ((u16 *)(ewram + 0x18000)) -#define ewram18000_2 (&ewram[0x18000]) -#define ewram18000_3 *(struct Pokemon **)(ewram + 0x18000) -#define eBerryBlenderData (struct BerryBlenderData*)(&ewram[0x18000]) -#define eEggHatchData (struct EggHatchData*)(&ewram[0x18000]) -#define UNK_2018000_STRUCT (*(struct UnknownStruct2018000 *)(ewram + 0x18000)) -#define ewram18300 ((u16 *)(ewram + 0x18300)) -#define ewram18800 (&ewram[0x18800]) -#define ewram19000 (&ewram[0x19000]) -#define EWRAM_19348 (*(u16 *)(ewram + 0x19348)) -#define ewram19348 (*(struct Struct2019348 *)(ewram + 0x19348)) -#define ewram19800 (&ewram[0x19800]) -#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000)) -#define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000)) +#define ewram9800 (&gSharedMem[0x9800]) +#define ewramA000 (&gSharedMem[0xA000]) +#define ewramA800 (&gSharedMem[0xA800]) +#define ewramB000 (&gSharedMem[0xB000]) +#define ewramB800 (&gSharedMem[0xB800]) +#define TRANSITION_STRUCT (*(struct TransitionData *) (gSharedMem + 0xC000)) +#define ewramC000 (&gSharedMem[0xC000]) +#define ewramC03C (&gSharedMem[0xC03C]) +#define ewramC800 (&gSharedMem[0xC800]) +#define ewramD000 (&gSharedMem[0xD000]) +#define ewramD800 (&gSharedMem[0xD800]) +#define ewramE000 (&gSharedMem[0xE000]) +#define ewramE800 (&gSharedMem[0xE800]) +#define ewramF000 (&gSharedMem[0xF000]) +#define ewramF800 (&gSharedMem[0xF800]) +#define ewram_2010000 (*(struct TradeEwramStruct *)(gSharedMem + 0x10000)) +#define ewram10000 (&gSharedMem[0x10000]) +#define ewram10800 (&gSharedMem[0x10800]) +#define ewram11000 (&gSharedMem[0x11000]) +#define ewram11800 (&gSharedMem[0x11800]) +#define ewram13000 (&gSharedMem[0x13000]) +#define EWRAM_14000 ((u8 *)(gSharedMem + 0x14000)) +#define ewram14000 (&gSharedMem[0x14000]) +#define ewram14000arr(i, data) (gSharedMem[0x14000 + i + data]) +#define ewram14004arr(i, data) (gSharedMem[0x14004 + i + data]) +#define ewram14008arr(i, data) (gSharedMem[0x14008 + data + i]) +#define ewram14800 (&gSharedMem[0x14800]) +#define EWRAM_14800 ((u16 *)(gSharedMem + 0x14800)) +#define sEvoInfo ((*(struct EvoInfo*)(gSharedMem + 0x14800))) +#define EWRAM_15000 ((u8 *)(gSharedMem + 0x15000)) +#define ewram15000 (&gSharedMem[0x15000]) +#define ewram15000arr(i, data) (gSharedMem[0x15000 + data + i]) +#define ewram15800 (&gSharedMem[0x15800]) +#define ewram15DDE (gSharedMem[0x15DDE]) +#define ewram15DDF (gSharedMem[0x15DDF]) +#define ewram15DE0 ((*(struct ContestEntry*)(gSharedMem + 0x15DE0))) +#define ewram15E00 ((*(struct Unk2015E00*)(gSharedMem + 0x15E00))) +#define ewram16000 (gSharedMem[0x16000]) +#define ewram16001 (gSharedMem[0x16001]) +#define ewram16002 (gSharedMem[0x16002]) +#define ewram16003 (gSharedMem[0x16003]) +#define ewram16004arr(i, bank) (gSharedMem[0x16004 + i + bank * 2]) +#define ewram1600C (gSharedMem[0x1600C]) +#define ewram1600E (gSharedMem[0x1600E]) +#define ewram16010arr(bank) (gSharedMem[0x16010 + bank]) +#define ewram1601B (gSharedMem[0x1601B]) +#define eDynamicMoveType (gSharedMem[0x1601C]) +#define eDmgMultiplier (gSharedMem[0x1601F]) +#define ewram16020 ((u8 *)(gSharedMem + 0x16020)) +#define ewram16020arr(i) (gSharedMem[0x16020 + i]) +#define ewram16054 (gSharedMem[0x16054]) +#define ewram16056 (gSharedMem[0x16056]) +#define ewram16058 (gSharedMem[0x16058]) +#define ewram16059 (gSharedMem[0x16059]) +#define ewram16060(bank) (gSharedMem[0x16060 + bank]) +#define BATTLE_PARTY_ID(bank) (gSharedMem[0x16064 + bank]) +#define ewram16064 (&gSharedMem[0x16064]) +#define ewram16064arr(bank) (gSharedMem[0x16064 + bank]) +#define ewram16068arr(i) (gSharedMem[0x16068 + i]) +#define UNK_201606C_ARRAY (gSharedMem + 0x1606C) // lazy define but whatever. +#define ewram1606Carr(i, a) (gSharedMem[0x1606C + i + a * 3]) +#define ewram16078 (gSharedMem[0x16078]) +#define ewram16084 (gSharedMem[0x16084]) +#define ewram16086 (gSharedMem[0x16086]) +#define ewram16087 (gSharedMem[0x16087]) +#define ewram16088 (gSharedMem[0x16088]) +#define ewram16088_2 (*(u8 *)(gSharedMem + 0x16088)) +#define ewram16089 (gSharedMem[0x16089]) +#define ewram16089_2 (*(u8 *)(gSharedMem + 0x16089)) +#define ewram1608Carr(bank) (gSharedMem[0x1608C + bank]) +#define EWRAM_1609D (gSharedMem[0x1609D]) +#define ewram160A1 (gSharedMem[0x160A1]) +#define ewram160A6 (gSharedMem[0x160A6]) +#define ewram160A8 (gSharedMem[0x160A8]) +#define ewram160A9 (gSharedMem[0x160A9]) +#define ewram160AA (gSharedMem[0x160AA]) +#define ewram160AB (gSharedMem[0x160AB]) +#define ewram160AC ((u8 *)(gSharedMem + 0x160AC)) +#define ewram160ACarr(i) (gSharedMem[0x160AC + i]) +#define ewram160ACarr2(i, bank) (gSharedMem[0x160AC + i + bank * 2]) +#define ewram160BC ((u16 *)(gSharedMem + 0x160BC)) // hp +#define ewram160BCarr(bank) (gSharedMem[0x160BC + bank * 2]) +#define ewram160C0 (gSharedMem[0x160C0]) +#define ewram160C2_Flags ((u16 *)(gSharedMem + 0x160C2)) +#define ewram160C4_Callback ((MainCallback *)(gSharedMem + 0x160C4)) +#define ewram160C8 (gSharedMem[0x160C8]) +#define ewram160C8arr(bank) (gSharedMem[0x160C8 + (bank / 2)]) +#define ewram160C9 (gSharedMem[0x160C9]) +#define ewram160CB (gSharedMem[0x160CB]) +#define ewram160CC ((u8 *)(gSharedMem + 0x160CC)) +#define ewram160CCarr(i) (gSharedMem[0x160CC + i]) +#define USED_HELD_ITEM(bank) ((((u16*)(&gSharedMem[0x160CC + bank * 2])))) +#define USED_HELD_ITEMS(bank) (*(u16 *)&gSharedMem[0x160CC + 2 * (bank)]) +#define ewram160D4(bank) (gSharedMem[0x160D4 + (bank / 2) * 2]) +#define ewram160DD (gSharedMem[0x160DD]) +#define ewram160E0(i) (gSharedMem[0x160E0 + i]) +#define ewram160E6 (gSharedMem[0x160E6]) +#define CHOICED_MOVE(bank) (((u16*)(&gSharedMem[0x160E8 + bank * 2]))) +#define ewram160E8 ((u8 *)(gSharedMem + 0x160E8)) +#define ewram160E8arr(i) (gSharedMem[0x160E8 + i]) +#define ewram160E8arr2(i, bank) (gSharedMem[0x160E8 + i + bank * 2]) +#define ewram160F0 ((u8 *)(gSharedMem + 0x160F0)) +#define ewram160F0arr(i) (gSharedMem[0x160F0 + i]) +#define ewram160F8 (gSharedMem[0x160F8]) +#define ewram160F9 (gSharedMem[0x160F9]) +#define eStatHp (gSharedMem[0x160FA]) +#define ewram160FB (gSharedMem[0x160FB]) +#define ewram16100 ((u8 *)(gSharedMem + 0x16100)) +#define ewram16100arr(i) (gSharedMem[0x16100 + i]) +#define ewram16100arr2(i, bank) (gSharedMem[0x16100 + i + bank * 4]) +#define ewram16108 ((u8 *)(gSharedMem + 0x16108)) +#define ewram16108arr(i) (gSharedMem[0x16108 + i]) +#define ewram16110 (gSharedMem[0x16110]) +#define ewram16111 (gSharedMem[0x16111]) +#define ewram16113 (gSharedMem[0x16113]) +#define ewram16400 (gSharedMem + 0x16400) +#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(gSharedMem + 0x16800)) +#define UNK_2016A00_STRUCT ((struct UnkBattleStruct1 *) (gSharedMem + 0x16A00)) +#define AI_STACK ((struct AI_Stack *) (gSharedMem + 0x16C00)) +#define AI_ARRAY_160CC(i) (gSharedMem[0x160CC + i * 2]) +#define eLearnMoveStruct (struct LearnMoveStruct *)(gSharedMem + 0x17000) +#define eSecretBaseRecord ((struct SecretBaseRecord *)(gSharedMem + 0x17000)) +#define ewram17002 (&gSharedMem[0x17002]) +#define eFlashFireArr (*(struct Struct2017100 *)(gSharedMem + 0x17100)) +#define B_BATTLESCRIPTS_STACK ((struct scriptsStack *) (gSharedMem + 0x17110)) +#define ewram17130 (gSharedMem[0x17130]) +#define B_FUNCTION_STACK ((struct funcStack *) (gSharedMem + 0x17140)) +#define ewram17160 (gSharedMem[0x17160]) +#define ewram17800 ((struct Struct2017800 *) (gSharedMem + 0x17800)) +#define EWRAM_17800 ((struct UnknownStruct1 *)(gSharedMem + 0x17800)) +#define eTransformStatuses ((struct TransformStatus *)(gSharedMem + 0x17800)) +#define ewram17810 ((struct Struct2017810 *) (gSharedMem + 0x17810)) +#define EWRAM_17810 ((struct UnknownStruct3 *)(gSharedMem + 0x17810)) +#define ewram17840 (*(struct Struct2017840 *) (gSharedMem + 0x17840)) +#define ewram17850 ((struct UnknownStruct5 *)(gSharedMem + 0x17850)) +#define ewram_2018000 (*(struct PlayerRecords *)(gSharedMem + 0x18000)) +#define EWRAM_18000 ((u16 *)(gSharedMem + 0x18000)) +#define ewram18000 ((u16 *)(gSharedMem + 0x18000)) +#define ewram18000_2 (&gSharedMem[0x18000]) +#define ewram18000_3 *(struct Pokemon **)(gSharedMem + 0x18000) +#define eBerryBlenderData (struct BerryBlenderData*)(&gSharedMem[0x18000]) +#define eEggHatchData (struct EggHatchData*)(&gSharedMem[0x18000]) +#define UNK_2018000_STRUCT (*(struct UnknownStruct2018000 *)(gSharedMem + 0x18000)) +#define ewram18300 ((u16 *)(gSharedMem + 0x18300)) +#define ewram18800 (&gSharedMem[0x18800]) +#define ewram19000 (&gSharedMem[0x19000]) +#define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348)) +#define ewram19348 (*(struct Struct2019348 *)(gSharedMem + 0x19348)) +#define ewram19800 (&gSharedMem[0x19800]) +#define ewram1B000 (*(struct Unk201B000 *)(gSharedMem + 0x1B000)) +#define ewram1B000_alt (*(struct Struct201B000 *)(gSharedMem + 0x1B000)) #define EWRAM_1B000 ewram1B000_alt // FIXME -#define EWRAM_1B000_2 (*(struct Struct201B000 *)(ewram + 0x1B000)) -#define EWRAM_1C000 (*(struct Struct201C000 *)(ewram + 0x1C000)) -#define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000)) -#define ewram1c000 (*(struct Unk201C000 *)(ewram + 0x1C000)) // FIXME, names too similar -#define eHallOfFameMons1 (struct HallofFameMons*)(&ewram[0x1C000]) -#define EWRAM_1C800 (*(struct Unk201C800 *)(ewram + 0x1C800)) -#define ewram1D000 ((struct Pokemon *)(ewram + 0x1D000)) -#define ewram1D000_2 ((u16 *)(ewram + 0x1D000)) -#define ewram1D400 ((u16 *)(ewram + 0x1D400)) -#define ewramSavedItemsPocket ((struct ItemSlot *)(ewram + 0x1E000)) // saved items pocket (for Wally battle) -#define ewram1E000(i) (ewram[0x1E000 + i]) -#define eHallOfFameMons2 (struct HallofFameMons*)(&ewram[0x1E000]) -#define eHallOfFame (struct HallOfFame *)(ewram + 0x1E000) -#define HALL_OF_FAME_SHEET_0 ((u8 *)(ewram + 0x1E000)) -#define HALL_OF_FAME_SHEET_1 ((u8 *)(ewram + 0x1E800)) -#define ewram_1f000 (*(struct DecoPCPointers *)(ewram + 0x1f000)) -#define ewramSavedPokeballsPocket ((struct ItemSlot *)(ewram + 0x1F000)) // saved Pokeballs pocket (for Wally battle) -#define HALL_OF_FAME_SHEET_2 ((u8 *)(ewram + 0x1F000)) -#define EWRAM_1F800 ((u16 *)(ewram + 0x1F800)) -#define ewram1FE00 (*(struct Unk201FE00 *)(ewram + 0x1FE00)) -#define eMailboxInfo (*(struct MailboxStruct *)(ewram + 0x1FE00)) -#define eCutGrassSpriteArray (ewram + 0x1FFF0) // 8 sprite IDs -#define ewram1FFFC (ewram[0x1FFFC]) -#define ewram1FFFD (ewram[0x1FFFD]) -#define gHelperState (ewram[0x1FFFE]) -#define ewram1FFFE (ewram[0x1FFFE]) -#define gReshowState (ewram[0x1FFFF]) -#define ewramBagSetupStep (ewram[0x1FFFF]) -#define ewram1FFFF (ewram[0x1FFFF]) +#define EWRAM_1B000_2 (*(struct Struct201B000 *)(gSharedMem + 0x1B000)) +#define EWRAM_1C000 (*(struct Struct201C000 *)(gSharedMem + 0x1C000)) +#define ewram1C000 (*(struct Unk201C000 *)(gSharedMem + 0x1C000)) +#define ewram1c000 (*(struct Unk201C000 *)(gSharedMem + 0x1C000)) // FIXME, names too similar +#define eHallOfFameMons1 (struct HallofFameMons*)(&gSharedMem[0x1C000]) +#define EWRAM_1C800 (*(struct Unk201C800 *)(gSharedMem + 0x1C800)) +#define ewram1D000 ((struct Pokemon *)(gSharedMem + 0x1D000)) +#define ewram1D000_2 ((u16 *)(gSharedMem + 0x1D000)) +#define ewram1D400 ((u16 *)(gSharedMem + 0x1D400)) +#define ewramSavedItemsPocket ((struct ItemSlot *)(gSharedMem + 0x1E000)) // saved items pocket (for Wally battle) +#define ewram1E000(i) (gSharedMem[0x1E000 + i]) +#define eHallOfFameMons2 (struct HallofFameMons*)(&gSharedMem[0x1E000]) +#define eHallOfFame (struct HallOfFame *)(gSharedMem + 0x1E000) +#define HALL_OF_FAME_SHEET_0 ((u8 *)(gSharedMem + 0x1E000)) +#define HALL_OF_FAME_SHEET_1 ((u8 *)(gSharedMem + 0x1E800)) +#define ewram_1f000 (*(struct DecoPCPointers *)(gSharedMem + 0x1f000)) +#define ewramSavedPokeballsPocket ((struct ItemSlot *)(gSharedMem + 0x1F000)) // saved Pokeballs pocket (for Wally battle) +#define HALL_OF_FAME_SHEET_2 ((u8 *)(gSharedMem + 0x1F000)) +#define EWRAM_1F800 ((u16 *)(gSharedMem + 0x1F800)) +#define ewram1FE00 (*(struct Unk201FE00 *)(gSharedMem + 0x1FE00)) +#define eMailboxInfo (*(struct MailboxStruct *)(gSharedMem + 0x1FE00)) +#define eCutGrassSpriteArray (gSharedMem + 0x1FFF0) // 8 sprite IDs +#define ewram1FFFC (gSharedMem[0x1FFFC]) +#define ewram1FFFD (gSharedMem[0x1FFFD]) +#define gHelperState (gSharedMem[0x1FFFE]) +#define ewram1FFFE (gSharedMem[0x1FFFE]) +#define gReshowState (gSharedMem[0x1FFFF]) +#define ewramBagSetupStep (gSharedMem[0x1FFFF]) +#define ewram1FFFF (gSharedMem[0x1FFFF]) #endif -- cgit v1.2.3