atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #457 from golemgalvanize/decompile_water

Browse source 
Decompile water
This commit is contained in:
Diegoisawesome 2018-12-19 19:16:40 -06:00 committed by GitHub
commit 5b73fe138c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 2196 additions and 3608 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3607
asm/water.s
View file

File diff suppressed because it is too large Load diff

3
include/battle_anim.h
View file

@ -183,6 +183,9 @@ u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
#define STAT_ANIM_MULTIPLE_MINUS2 58 #define STAT_ANIM_MULTIPLE_MINUS2 58
void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId); void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId);
// ground.c
void sub_81152DC(u8 taskId);
// battle_anim_8170478.s // battle_anim_8170478.s
u8 ItemIdToBallId(u16 itemId); u8 ItemIdToBallId(u16 itemId);
u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId); u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId);

7
include/graphics.h
View file

@ -4736,6 +4736,13 @@ extern const u32 gUnknown_08C16FA8[];
extern const u32 gUnknown_08C16E90[]; extern const u32 gUnknown_08C16E90[];
extern const u32 gUnknown_08C17170[]; extern const u32 gUnknown_08C17170[];
extern const u32 gUnknown_08D95E00[];
extern const u32 gUnknown_08D960D0[];
extern const u32 gUnknown_08D963A4[];
extern const u32 gBattleAnimBackgroundImage_Surf[];
extern const u32 gBattleAnimBackgroundPalette_Surf[];
extern const u32 gBattleAnimBackgroundImageMuddyWater_Pal[];
// Berry blender // Berry blender
extern const u32 gBerryBlenderArrowTiles[]; extern const u32 gBerryBlenderArrowTiles[];
extern const u32 gBerryBlenderStartTiles[]; extern const u32 gBerryBlenderStartTiles[];

2
ld_script.txt
View file

@ -159,7 +159,7 @@ SECTIONS {
src/item_use.o(.text); src/item_use.o(.text);
src/battle_anim_effects_1.o(.text); src/battle_anim_effects_1.o(.text);
src/battle_anim_effects_2.o(.text); src/battle_anim_effects_2.o(.text);
asm/water.o(.text); src/water.o(.text);
src/fire.o(.text); src/fire.o(.text);
src/electric.o(.text); src/electric.o(.text);
asm/ice.o(.text); asm/ice.o(.text);

2185
src/water.c
View file

File diff suppressed because it is too large Load diff