Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2025-03-03 18:37:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #344 from camthesaxman/decompile_battle_10

Browse Source 
decompile battle_10
This commit is contained in:
yenatch 2017-07-04 21:06:42 -04:00 committed by GitHub
commit 813c1846c9
6 changed files with 1339 additions and 4680 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4675
asm/battle_10.s
View File

File diff suppressed because it is too large Load Diff

1
include/battle.h
View File

@ -183,6 +183,7 @@ struct Struct2017810
u8 unk0_6:1; u8 unk0_6:1;
u8 unk0_7:1; u8 unk0_7:1;
u8 unk1_0:1; u8 unk1_0:1;
u8 unk1_1:5;
u8 unk2; u8 unk2;
u8 unk3; u8 unk3;
u8 unk4; u8 unk4;

10
include/data2.h
View File

@ -53,4 +53,14 @@ extern const struct SpriteTemplate gSpriteTemplate_81FAF0C;
extern void *const gUnknown_081FAF4C[]; extern void *const gUnknown_081FAF4C[];
extern struct BattleMove gBattleMoves[]; extern struct BattleMove gBattleMoves[];
// data/graphics/trainers/front_pic_coords.inc
extern const struct MonCoords gTrainerFrontPicCoords[];
// data/graphics/trainers/front_pic_table.inc
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
// data/graphics/trainers/front_pic_palette_table.inc
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
#endif // GUARD_DATA2_H #endif // GUARD_DATA2_H

2
ld_script.txt
View File

@ -60,7 +60,7 @@ SECTIONS {
src/battle_7.o(.text); src/battle_7.o(.text);
asm/battle_8.o(.text); asm/battle_8.o(.text);
asm/battle_9.o(.text); asm/battle_9.o(.text);
asm/battle_10.o(.text); src/battle_10.o(.text);
src/pokemon_1.o(.text); src/pokemon_1.o(.text);
src/calculate_base_damage.o(.text); src/calculate_base_damage.o(.text);
src/pokemon_2.o(.text); src/pokemon_2.o(.text);

1322
src/battle_10.c Normal file
View File

File diff suppressed because it is too large Load Diff

9
src/battle_811DA74.c
View File

@ -1163,7 +1163,7 @@ void sub_811FDF0(void)
void sub_811FDFC(void) void sub_811FDFC(void)
{ {
if (mplay_80342A4(gActiveBank) == 0) if (!mplay_80342A4(gActiveBank))
{ {
u32 r0 = gBattleBufferA[gActiveBank][1] u32 r0 = gBattleBufferA[gActiveBank][1]
| (gBattleBufferA[gActiveBank][2] << 8); | (gBattleBufferA[gActiveBank][2] << 8);
@ -1409,10 +1409,12 @@ void sub_81203FC(void)
void LinkPartnerHandleHitAnimation(void) void LinkPartnerHandleHitAnimation(void)
{ {
if (gSprites[gObjectBankIDs[gActiveBank]].invisible == TRUE) if (gSprites[gObjectBankIDs[gActiveBank]].invisible == TRUE)
{
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
}
else else
{ {
gDoingBattleAnim = 1; gDoingBattleAnim = TRUE;
gSprites[gObjectBankIDs[gActiveBank]].data1 = 0; gSprites[gObjectBankIDs[gActiveBank]].data1 = 0;
sub_8047858(gActiveBank); sub_8047858(gActiveBank);
gBattleBankFunc[gActiveBank] = bx_blink_t3; gBattleBankFunc[gActiveBank] = bx_blink_t3;
@ -1572,9 +1574,8 @@ void sub_81209D8(void)
{ {
u8 r3 = gBattleBufferA[gActiveBank][1]; u8 r3 = gBattleBufferA[gActiveBank][1];
u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8); u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
u8 var = gActiveBank;
if (move_anim_start_t3(var, var, var, r3, r4) != 0) if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, r3, r4) != 0)
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
else else
gBattleBankFunc[gActiveBank] = sub_811E3B8; gBattleBankFunc[gActiveBank] = sub_811E3B8;