diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-23 15:39:40 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-23 15:47:39 -0500 |
| commit | 65b5fe5f00a8d7381c1e3c5d7c3f4537459988c2 (patch) | |
| tree | 6dab4a5781eac130d3695a79fb9a849f67f690f4 /include | |
| parent | ac636ec14e896214b549025e671fc6ae7f6fd045 (diff) | |
Decompile more of battle_anim_812C144
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/ewram.h | 2 | ||||
| -rw-r--r-- | include/gba/types.h | 4 | ||||
| -rw-r--r-- | include/rom_8077ABC.h | 7 |
4 files changed, 13 insertions, 2 deletions
diff --git a/include/battle.h b/include/battle.h index 7527247fe..346423e65 100644 --- a/include/battle.h +++ b/include/battle.h @@ -823,6 +823,8 @@ void sub_8032638(); void sub_8032AA8(u8, u8); void SetBankFuncToOpponentBufferRunCommand(void); void BattleStopLowHpSound(void); +void sub_8031FC4(u8, u8, bool8); +void sub_8032984(u8, u16); void SetBankFuncToLinkOpponentBufferRunCommand(void); diff --git a/include/ewram.h b/include/ewram.h index f8a0d69f9..baa64f42f 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -232,7 +232,7 @@ extern u8 gSharedMem[]; #define eRoulette ((struct Roulette *)(gSharedMem + 0x19000)) #define shared192D0 (*(struct UnknownContestStruct7 *)(gSharedMem + 0x192D0)) #define eContestAI ((struct ContestAIInfo *)(gSharedMem + 0x192E4)) -#define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348)) +#define EWRAM_19348 ((u16 *)(gSharedMem + 0x19348)) #define ewram19800 (&gSharedMem[0x19800]) #define ePokedexView4 (struct PokedexView *)(gSharedMem + 0x19800) #define ewram1A000 (&gSharedMem[0x1A000]) diff --git a/include/gba/types.h b/include/gba/types.h index 33ae7df9a..4d6c24a6c 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -32,7 +32,9 @@ struct BgCnt { u16 priority:2; u16 charBaseBlock:2; - u16 dummy:4; + u16 dummy:2; + u16 mosaic:1; + u16 palettes:1; u16 screenBaseBlock:5; u16 areaOverflowMode:1; u16 screenSize:2; diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 9ce2d5f3e..3942397eb 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -10,6 +10,12 @@ struct Struct_sub_8078914 { u8 field_8; }; +struct TransformStatus +{ + u16 unknown; + u16 species; +}; + u8 GetBattlerSpriteCoord(u8, u8); u8 sub_8077E44(u8 slot, u16 species, u8 a3); u8 GetAnimBattlerSpriteId(u8 bank); @@ -108,5 +114,6 @@ void sub_8079AB8(u8 sprite, u8 sprite2); u8 sub_807A4A0(int bank, u8 sprite, int species); void sub_80794A8(struct Sprite *sprite); void sub_807A9BC(struct Sprite *sprite); +void sub_8078954(struct Struct_sub_8078914*, u8); #endif // GUARD_ROM_8077ABC_H |