diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-18 20:23:32 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-18 20:23:32 -0500 |
| commit | f7df299be8dea5fb536cfef6b8ddc30bb760426f (patch) | |
| tree | 70c0b766df1b8ce8817a710b61b60283fec7fec5 /include/graphics.h | |
| parent | 15a7b1bc08f89aebae9b52c2047c0d73dc0f0fb0 (diff) | |
| parent | b2ac3b6d6f06ed4a2d64af90e97796c66bcdeb5f (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_water
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/graphics.h b/include/graphics.h index a7ee286b8..48e4532ac 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4154,6 +4154,8 @@ extern const u32 gBattleAnimSpriteSheet_050[]; extern const u32 gBattleAnimSpriteSheet_051[]; extern const u32 gBattleAnimSpriteSheet_052[]; extern const u32 gBattleAnimSpriteSheet_053[]; +extern const u32 gUnknown_08C2EA50[]; +extern const u32 gUnknown_08C2EA9C[]; extern const u32 gBattleAnimSpriteSheet_054[]; extern const u32 gBattleAnimSpriteSheet_055[]; extern const u32 gBattleAnimSpriteSheet_056[]; @@ -4619,6 +4621,9 @@ extern const u32 gBattleAnimSpritePalette_241[]; extern const u32 gBattleAnimSpritePalette_242[]; extern const u32 gBattleAnimSpritePalette_243[]; extern const u32 gBattleAnimSpritePalette_244[]; +extern const u8 gUnknown_08C2DC68[]; +extern const u16 gUnknown_08C2DDA4[]; +extern const u8 gUnknown_08C2DDC4[]; extern const u32 gBattleAnimSpritePalette_245[]; extern const u32 gBattleAnimSpritePalette_248[]; extern const u32 gBattleAnimSpritePalette_249[]; @@ -4697,6 +4702,9 @@ extern const u32 gBattleAnimBackgroundTilemap_07[]; extern const u32 gBattleAnimBackgroundTilemap_08[]; extern const u32 gBattleAnimBackgroundTilemap_09[]; extern const u32 gBattleAnimBackgroundTilemap_10[]; +extern const u32 gUnknown_08C2A634[]; +extern const u32 gUnknown_08C2A6D4[]; +extern const u32 gUnknown_08C2A6EC[]; extern const u32 gBattleAnimBackgroundTilemap_11[]; extern const u32 gBattleAnimBackgroundTilemap_12[]; extern const u32 gBattleAnimBackgroundTilemap_13[]; @@ -4757,9 +4765,4 @@ extern const u32 gCableCarDoor_Gfx[]; extern const u32 gCableCarCord_Gfx[]; extern const u16 gCableCar_Pal[]; -// Battle Anim -extern const u32 gUnknown_08C2DDA4[]; -extern const u32 gUnknown_08C2EA50[]; -extern const u32 gUnknown_08C2EA9C[]; - #endif //GUARD_GRAPHICS_H |