ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Decompile most of battle_anim_effects_3.c

Browse Source
This commit is contained in:
Marcus Huderle 2018-12-18 19:03:26 -06:00
parent d2b5a0e83f
commit b2ac3b6d6f
10 changed files with 6543 additions and 13592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12488
asm/battle_anim_815A0D4.s
View File

File diff suppressed because it is too large Load Diff

1632
asm/battle_anim_effects_3.s Normal file
View File

File diff suppressed because it is too large Load Diff

6
include/battle_anim.h
View File

@ -144,6 +144,11 @@ void SetGreyscaleOrOriginalPalette(u16 a1, bool8 a2);
void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds); void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds);
bool8 RunAffineAnimFromTaskData(struct Task *task); bool8 RunAffineAnimFromTaskData(struct Task *task);
void sub_80A78AC(struct Sprite *sprite); void sub_80A78AC(struct Sprite *sprite);
void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused);
u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10);
void sub_80A749C(struct Sprite *sprite);
void sub_80A6814(u8 taskId);
void sub_80A8610(struct Sprite *sprite);
enum enum
{ {
@ -185,6 +190,7 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes,
// battle_anim_utility_funcs.s // battle_anim_utility_funcs.s
void sub_8116EB4(u8); void sub_8116EB4(u8);
void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u8 *arg8, const u8 *arg9, const u16 *palette);
u32 UnpackSelectedBattleAnimPalettes(s16); u32 UnpackSelectedBattleAnimPalettes(s16);

13
include/graphics.h
View File

@ -4154,6 +4154,8 @@ extern const u32 gBattleAnimSpriteSheet_050[];
extern const u32 gBattleAnimSpriteSheet_051[]; extern const u32 gBattleAnimSpriteSheet_051[];
extern const u32 gBattleAnimSpriteSheet_052[]; extern const u32 gBattleAnimSpriteSheet_052[];
extern const u32 gBattleAnimSpriteSheet_053[]; extern const u32 gBattleAnimSpriteSheet_053[];
extern const u32 gUnknown_08C2EA50[];
extern const u32 gUnknown_08C2EA9C[];
extern const u32 gBattleAnimSpriteSheet_054[]; extern const u32 gBattleAnimSpriteSheet_054[];
extern const u32 gBattleAnimSpriteSheet_055[]; extern const u32 gBattleAnimSpriteSheet_055[];
extern const u32 gBattleAnimSpriteSheet_056[]; extern const u32 gBattleAnimSpriteSheet_056[];
@ -4619,6 +4621,9 @@ extern const u32 gBattleAnimSpritePalette_241[];
extern const u32 gBattleAnimSpritePalette_242[]; extern const u32 gBattleAnimSpritePalette_242[];
extern const u32 gBattleAnimSpritePalette_243[]; extern const u32 gBattleAnimSpritePalette_243[];
extern const u32 gBattleAnimSpritePalette_244[]; 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_245[];
extern const u32 gBattleAnimSpritePalette_248[]; extern const u32 gBattleAnimSpritePalette_248[];
extern const u32 gBattleAnimSpritePalette_249[]; extern const u32 gBattleAnimSpritePalette_249[];
@ -4697,6 +4702,9 @@ extern const u32 gBattleAnimBackgroundTilemap_07[];
extern const u32 gBattleAnimBackgroundTilemap_08[]; extern const u32 gBattleAnimBackgroundTilemap_08[];
extern const u32 gBattleAnimBackgroundTilemap_09[]; extern const u32 gBattleAnimBackgroundTilemap_09[];
extern const u32 gBattleAnimBackgroundTilemap_10[]; 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_11[];
extern const u32 gBattleAnimBackgroundTilemap_12[]; extern const u32 gBattleAnimBackgroundTilemap_12[];
extern const u32 gBattleAnimBackgroundTilemap_13[]; extern const u32 gBattleAnimBackgroundTilemap_13[];
@ -4757,9 +4765,4 @@ extern const u32 gCableCarDoor_Gfx[];
extern const u32 gCableCarCord_Gfx[]; extern const u32 gCableCarCord_Gfx[];
extern const u16 gCableCar_Pal[]; 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 #endif //GUARD_GRAPHICS_H

1
include/scanline_effect.h
View File

@ -3,6 +3,7 @@
// DMA control value to transfer a single 16-bit value at HBlank // DMA control value to transfer a single 16-bit value at HBlank
#define SCANLINE_EFFECT_DMACNT_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_16BIT | DMA_DEST_RELOAD) << 16) | 1) #define SCANLINE_EFFECT_DMACNT_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_16BIT | DMA_DEST_RELOAD) << 16) | 1)
#define SCANLINE_EFFECT_DMACNT_32BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_32BIT | DMA_DEST_RELOAD) << 16) | 1)
#define SCANLINE_EFFECT_REG_BG0HOFS (REG_ADDR_BG0HOFS - REG_ADDR_BG0HOFS) #define SCANLINE_EFFECT_REG_BG0HOFS (REG_ADDR_BG0HOFS - REG_ADDR_BG0HOFS)
#define SCANLINE_EFFECT_REG_BG0VOFS (REG_ADDR_BG0VOFS - REG_ADDR_BG0HOFS) #define SCANLINE_EFFECT_REG_BG0VOFS (REG_ADDR_BG0VOFS - REG_ADDR_BG0HOFS)

6
ld_script.txt
View File

@ -224,8 +224,8 @@ SECTIONS {
src/battle_anim_sound_tasks.o(.text); src/battle_anim_sound_tasks.o(.text);
src/battle_controller_safari.o(.text); src/battle_controller_safari.o(.text);
src/fldeff_sweetscent.o(.text); src/fldeff_sweetscent.o(.text);
src/battle_anim_815A0D4.o(.text); src/battle_anim_effects_3.o(.text);
asm/battle_anim_815A0D4.o(.text); asm/battle_anim_effects_3.o(.text);
src/learn_move.o(.text); src/learn_move.o(.text);
src/fldeff_softboiled.o(.text); src/fldeff_softboiled.o(.text);
src/decoration_inventory.o(.text); src/decoration_inventory.o(.text);
@ -539,7 +539,7 @@ SECTIONS {
data/field_effect_helpers.o(.rodata); data/field_effect_helpers.o(.rodata);
src/contest_ai.o(.rodata); src/contest_ai.o(.rodata);
src/battle_controller_safari.o(.rodata); src/battle_controller_safari.o(.rodata);
src/battle_anim_815A0D4.o(.rodata); src/battle_anim_effects_3.o(.rodata);
src/learn_move.o(.rodata); src/learn_move.o(.rodata);
src/roamer.o(.rodata); src/roamer.o(.rodata);
src/battle_tower.o(.rodata); src/battle_tower.o(.rodata);

2
src/battle_anim_80A5C6C.c
View File

@ -906,7 +906,7 @@ void sub_80A6B90(struct UnknownAnimStruct2 *unk, u32 arg1)
} }
} }
void sub_80A6BFC(struct UnknownAnimStruct2 *unk) void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused)
{ {
unk->bgTiles = gUnknown_0202305C; unk->bgTiles = gUnknown_0202305C;
unk->unk4 = (u16 *)gUnknown_02023060; unk->unk4 = (u16 *)gUnknown_02023060;

1092
src/battle_anim_815A0D4.c
View File

File diff suppressed because it is too large Load Diff

4889
src/battle_anim_effects_3.c Executable file
View File

File diff suppressed because it is too large Load Diff

6
src/graphics.c
View File

@ -897,9 +897,9 @@ const u32 gBattleStatMask6_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat6
const u32 gBattleStatMask7_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat7.gbapal.lz"); const u32 gBattleStatMask7_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat7.gbapal.lz");
const u32 gBattleStatMask8_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat8.gbapal.lz"); const u32 gBattleStatMask8_Pal[] = INCBIN_U32("graphics/battle_anims/masks/stat8.gbapal.lz");
const u32 gUnknown_08C2DC68[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.4bpp.lz"); const u8 gUnknown_08C2DC68[] = INCBIN_U8("graphics/battle_anims/masks/cure_bubbles.4bpp.lz");
const u32 gUnknown_08C2DDA4[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.gbapal.lz"); const u16 gUnknown_08C2DDA4[] = INCBIN_U16("graphics/battle_anims/masks/cure_bubbles.gbapal.lz");
const u32 gUnknown_08C2DDC4[] = INCBIN_U32("graphics/battle_anims/masks/cure_bubbles.bin.lz"); const u8 gUnknown_08C2DDC4[] = INCBIN_U8("graphics/battle_anims/masks/cure_bubbles.bin.lz");
const u32 gBattleAnimSpritePalette_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.gbapal.lz"); const u32 gBattleAnimSpritePalette_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.gbapal.lz");
const u32 gBattleAnimSpriteSheet_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.4bpp.lz"); const u32 gBattleAnimSpriteSheet_245[] = INCBIN_U32("graphics/battle_anims/sprites/245.4bpp.lz");