dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

electric

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-11-09 04:20:43 +08:00
parent 94c1924ed8
commit ab9ce0e641
6 changed files with 1318 additions and 2826 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/electric.s
-2770
View File
File diff suppressed because it is too large Load Diff
data/battle_anim_effects_misc.s
+1 -22
View File
@@ -166,25 +166,4 @@ gUnknown_83E5EFC:: @ 83E5EFC
.incbin "baserom.gba", 0x3E5EFC, 0x10 .incbin "baserom.gba", 0x3E5EFC, 0x10
gUnknown_83E5F0C:: @ 83E5F0C gUnknown_83E5F0C:: @ 83E5F0C
.incbin "baserom.gba", 0x3E5F0C, 0x2C .incbin "baserom.gba", 0x3E5F0C, 0x10
gUnknown_83E5F38:: @ 83E5F38
.incbin "baserom.gba", 0x3E5F38, 0x168
gUnknown_83E60A0:: @ 83E60A0
.incbin "baserom.gba", 0x3E60A0, 0x18
gUnknown_83E60B8:: @ 83E60B8
.incbin "baserom.gba", 0x3E60B8, 0x18
gUnknown_83E60D0:: @ 83E60D0
.incbin "baserom.gba", 0x3E60D0, 0x50
gUnknown_83E6120:: @ 83E6120
.incbin "baserom.gba", 0x3E6120, 0x158
gUnknown_83E6278:: @ 83E6278
.incbin "baserom.gba", 0x3E6278, 0x30
gUnknown_83E62A8:: @ 83E62A8
.incbin "baserom.gba", 0x3E62A8, 0x18
include/battle_anim.h
+41 -32
View File
@@ -57,38 +57,39 @@ extern s32 gAnimMoveDmg;
extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT]; extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT];
extern u8 gUnknown_2037F24; extern u8 gUnknown_2037F24;
extern struct OamData gOamData_83ACA40; extern const struct OamData gOamData_83ACA40;
extern struct OamData gOamData_83AC9C8; extern const struct OamData gOamData_83AC9C8;
extern struct OamData gOamData_83ACA38; extern const struct OamData gOamData_83ACA38;
extern struct OamData gOamData_83AC9D0; extern const struct OamData gOamData_83AC9D0;
extern struct OamData gOamData_83AC9F8; extern const struct OamData gOamData_83AC9F8;
extern struct OamData gOamData_83AC9D8; extern const struct OamData gOamData_83AC9D8;
extern struct OamData gOamData_83ACB58; extern const struct OamData gOamData_83ACB58;
extern struct OamData gOamData_83ACAF8; extern const struct OamData gOamData_83ACAF8;
extern struct OamData gOamData_83ACB60; extern const struct OamData gOamData_83ACB60;
extern struct OamData gOamData_83ACA30; extern const struct OamData gOamData_83ACA30;
extern struct OamData gOamData_83ACA98; extern const struct OamData gOamData_83ACA98;
extern struct OamData gOamData_83ACA90; extern const struct OamData gOamData_83ACA90;
extern struct OamData gOamData_83ACAF0; extern const struct OamData gOamData_83ACAF0;
extern struct OamData gOamData_83ACB10; extern const struct OamData gOamData_83ACB10;
extern struct OamData gOamData_83ACB18; extern const struct OamData gOamData_83ACB18;
extern struct OamData gOamData_83ACB38; extern const struct OamData gOamData_83ACB38;
extern struct OamData gOamData_83ACA18; extern const struct OamData gOamData_83ACA18;
extern struct OamData gOamData_83ACB20; extern const struct OamData gOamData_83ACB20;
extern struct OamData gOamData_83ACB50; extern const struct OamData gOamData_83ACB50;
extern struct OamData gOamData_83ACAB8; extern const struct OamData gOamData_83ACAB8;
extern struct OamData gOamData_83ACA00; extern const struct OamData gOamData_83ACA00;
extern struct OamData gOamData_83ACBC0; extern const struct OamData gOamData_83ACBC0;
extern struct OamData gOamData_83ACB00; extern const struct OamData gOamData_83ACB00;
extern struct OamData gOamData_83AC9E0; extern const struct OamData gOamData_83AC9E0;
extern struct OamData gOamData_83ACA20; extern const struct OamData gOamData_83ACA20;
extern struct OamData gOamData_83ACA80; extern const struct OamData gOamData_83ACA80;
extern struct OamData gOamData_83ACAA0; extern const struct OamData gOamData_83ACAA0;
extern struct OamData gOamData_83ACBE8; extern const struct OamData gOamData_83ACBE8;
extern struct OamData gOamData_83ACAE8; extern const struct OamData gOamData_83ACAE8;
extern struct OamData gOamData_83ACB88; extern const struct OamData gOamData_83ACB88;
extern struct OamData gOamData_83ACB48; extern const struct OamData gOamData_83ACB48;
extern struct OamData gOamData_83ACB28; extern const struct OamData gOamData_83ACB28;
extern const struct OamData gOamData_83ACAC8;
void ClearBattleAnimationVars(void); void ClearBattleAnimationVars(void);
void DoMoveAnim(u16 move); void DoMoveAnim(u16 move);
@@ -368,6 +369,14 @@ void AnimTask_LoadMistTiles(u8 taskId);
void AnimTask_Hail1(u8 taskId); void AnimTask_Hail1(u8 taskId);
void AnimTask_GetRolloutCounter(u8 taskId); void AnimTask_GetRolloutCounter(u8 taskId);
// electric.c
void sub_80AE220(u8 taskId);
void sub_80AE540(u8 taskId);
void sub_80AE8A0(u8 taskId);
void sub_80AEA10(u8 taskId);
void sub_80AECE0(u8 taskId);
void sub_80AEFA0(u8 taskId);
// water.s // water.s
extern const union AnimCmd *const gUnknown_83E5958[]; extern const union AnimCmd *const gUnknown_83E5958[];
extern const union AnimCmd *const gUnknown_83E5A78[]; extern const union AnimCmd *const gUnknown_83E5A78[];
ld_script.txt
+2 -1
View File
@@ -158,7 +158,7 @@ SECTIONS {
asm/battle_anim_effects_2.o(.text); asm/battle_anim_effects_2.o(.text);
asm/water.o(.text); asm/water.o(.text);
asm/fire.o(.text); asm/fire.o(.text);
asm/electric.o(.text); src/electric.o(.text);
src/ice.o(.text); src/ice.o(.text);
src/fighting.o(.text); src/fighting.o(.text);
src/poison.o(.text); src/poison.o(.text);
@@ -450,6 +450,7 @@ SECTIONS {
src/pokemon_size_record.o(.rodata); src/pokemon_size_record.o(.rodata);
data/item_use.o(.rodata); data/item_use.o(.rodata);
data/battle_anim_effects_misc.o(.rodata); data/battle_anim_effects_misc.o(.rodata);
src/electric.o(.rodata);
src/ice.o(.rodata); src/ice.o(.rodata);
src/fighting.o(.rodata); src/fighting.o(.rodata);
src/poison.o(.rodata); src/poison.o(.rodata);
src/electric.c
+1273
View File
File diff suppressed because it is too large Load Diff
src/ice.c
+1 -1
View File
@@ -61,7 +61,7 @@ static const union AnimCmd *const gUnknown_83E62CC[] =
gUnknown_83E62C0, gUnknown_83E62C0,
}; };
// unused // not used
static const struct SpriteTemplate gUnknown_83E62D0 = static const struct SpriteTemplate gUnknown_83E62D0 =
{ {
.tileTag = ANIM_TAG_ICE_CRYSTALS, .tileTag = ANIM_TAG_ICE_CRYSTALS,