diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 25 | ||||
| -rw-r--r-- | include/contest.h | 11 | ||||
| -rw-r--r-- | include/ewram.h | 9 |
3 files changed, 9 insertions, 36 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 71a61f175..aee761a1f 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -31,11 +31,6 @@ enum BATTLER_COORD_ATTR_RAW_BOTTOM, }; -struct UnknownStruct1 -{ - u8 unk0; -}; - struct UnknownStruct2 { void *unk0; @@ -43,19 +38,15 @@ struct UnknownStruct2 u8 unk8; }; -struct UnknownStruct3 -{ - u8 unk0; - u8 filler1[0xB]; -}; - -struct EWRAM_19348_Struct +struct ContestMoveAnim { - /*0x00*/ u16 species2; - /*0x02*/ u16 species; - /*0x04*/ u8 filler4[0x8]; - /*0x0C*/ u32 otId; - /*0x10*/ u32 personality; + u16 species; + u16 targetSpecies; + bool8 hasTargetAnim:1; + u8 contestant; + u32 personality; + u32 otId; + u32 personality2; }; extern void (*gAnimScriptCallback)(void); diff --git a/include/contest.h b/include/contest.h index ff1492e81..87e75007a 100644 --- a/include/contest.h +++ b/include/contest.h @@ -425,17 +425,6 @@ struct ContestAppealMoveResults u8 contestant; }; -struct ContestMoveAnim -{ - u16 species; - u16 targetSpecies; - bool8 hasTargetAnim :1; - u8 contestant; - u32 personality; - u32 otId; - u32 unk10; -}; - struct ContestFinalStandings { s32 totalPoints; diff --git a/include/ewram.h b/include/ewram.h index e3ae79b7f..24d7d9033 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -64,7 +64,6 @@ extern u8 gSharedMem[]; #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)) @@ -157,7 +156,7 @@ extern u8 gSharedMem[]; // roulette_gfx.c #define ewram17000 (&gSharedMem[0x17000]) #define ewram17E00 ((u16 *)(gSharedMem + 0x17E00)) -#define ewram18000 ((u16 *)(gSharedMem + 0x18000)) +#define ewram18000 ((u16 *)(gSharedMem + 0x18000)) // also: shop.c, battle_anim.c #define eMoveTutorMenu (struct MoveTutorMenu *)(gSharedMem + 0x17000) #define eCableCar1 ((struct CableCarEwramStruct1 *)(gSharedMem + 0x17000)) @@ -165,13 +164,9 @@ extern u8 gSharedMem[]; #define ewram17810 ((struct Struct2017810 *) (gSharedMem + 0x17810)) #define ewram17840 (*(struct Struct2017840 *) (gSharedMem + 0x17840)) #define ewram17850 ((struct UnknownStruct5 *)(gSharedMem + 0x17850)) -#define EWRAM_18000 ((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 pssData (*(struct PokemonSummaryScreenStruct *)(gSharedMem + 0x18000)) -#define ewram18300 ((u16 *)(gSharedMem + 0x18300)) #define ewram18800 (&gSharedMem[0x18800]) #define ewram189a0 ((u16 *)(gSharedMem + 0x189A0)) #define ewram18a20 ((u16 *)(gSharedMem + 0x18A20)) @@ -179,8 +174,6 @@ extern u8 gSharedMem[]; #define ewram18a80 ((u16 *)(gSharedMem + 0x18a80)) #define eCableCar2 ((struct CableCarEwramStruct2 *)(gSharedMem + 0x19000)) #define eRoulette ((struct Roulette *)(gSharedMem + 0x19000)) -#define EWRAM_19348 ((u16 *)(gSharedMem + 0x19348)) -#define eWRAM_19348Struct ((struct EWRAM_19348_Struct *)(gSharedMem + 0x19348)) #define ewram1A000 (&gSharedMem[0x1A000]) #define ePartyMenu2 (*(struct Unk201B000 *)(gSharedMem + 0x1B000)) #define gPartyMenu (*(struct PartyMenu *)(gSharedMem + 0x1C000)) |