From 2df648dc4b9dee51503d319c677456c008b438fb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 30 Jan 2018 19:56:12 -0800 Subject: Finish decompiling rock.s --- include/rom_8077ABC.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/rom_8077ABC.h') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 21ec88a90..81a11ba04 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -103,5 +103,7 @@ bool8 sub_8078718(struct Sprite *sprite); bool8 sub_8078CE8(struct Sprite *sprite); void oamt_add_pos2_onto_pos1(struct Sprite *sprite); void sub_8078BD4(struct Sprite *sprite); +void sub_807941C(struct Sprite *sprite); +void sub_80789D4(bool8 a1); #endif // GUARD_ROM_8077ABC_H -- cgit v1.2.3 From c410df510012f7a6ccfc342b398cd5d407fb0bf6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 31 Jan 2018 18:33:01 -0800 Subject: Start decompiling psychic.s --- include/rom_8077ABC.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/rom_8077ABC.h') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 81a11ba04..756c5fa03 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -85,7 +85,7 @@ void sub_8078174(struct Sprite *sprite); void sub_80793C4(struct Sprite *sprite); void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4); u8 sub_8079ED4(u8 slot); -int sub_807A100(u8 slot, u8 a2); +s16 sub_807A100(u8 slot, u8 a2); u16 sub_80790F0(s16 a, s16 b); void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation); void sub_807867C(struct Sprite *sprite, s16 a2); -- cgit v1.2.3 From 513d85e2df9cdb288df6345107130c4bd144148d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 1 Feb 2018 12:20:37 -0800 Subject: Finish decompiling psychic.s --- include/rom_8077ABC.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/rom_8077ABC.h') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 756c5fa03..f7b75fb04 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -105,5 +105,6 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite); void sub_8078BD4(struct Sprite *sprite); void sub_807941C(struct Sprite *sprite); void sub_80789D4(bool8 a1); +void sub_8079AB8(u8 sprite, u8 sprite2); #endif // GUARD_ROM_8077ABC_H -- cgit v1.2.3 From 338d2b0b1897899a6fa787f8baa4cf392f81b718 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 4 Feb 2018 12:34:18 -0800 Subject: Finish decompiling dark.s except one function --- include/rom_8077ABC.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/rom_8077ABC.h') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index f7b75fb04..ff737135b 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -106,5 +106,6 @@ void sub_8078BD4(struct Sprite *sprite); void sub_807941C(struct Sprite *sprite); void sub_80789D4(bool8 a1); void sub_8079AB8(u8 sprite, u8 sprite2); +u8 sub_807A4A0(int bank, u8 sprite, int species); #endif // GUARD_ROM_8077ABC_H -- cgit v1.2.3 From 4fe6a8bd80ff947661aea391060207a53895338e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 10 Feb 2018 23:49:54 -0800 Subject: Document battle anim things related to SWIFT and TWISTER --- include/rom_8077ABC.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/rom_8077ABC.h') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index ff737135b..97e001635 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -36,8 +36,8 @@ void sub_8078914(); u8 sub_80789BC(); void sub_8078A5C(struct Sprite *sprite); void sub_8078A5C(struct Sprite *sprite); -void obj_translate_based_on_private_1_2_3_4(struct Sprite *sprite); -bool8 sub_8078B5C(struct Sprite *sprite); +void InitAnimSpriteTranslationDeltas(struct Sprite *sprite); +bool8 TranslateAnimSpriteByDeltas(struct Sprite *sprite); void sub_8078BB8(struct Sprite *sprite); void sub_8078D44(struct Sprite *sprite); void obj_id_set_rotscale(u8 sprite, s16, s16, u16); @@ -65,7 +65,7 @@ void sub_807A850(struct Task *task, u8 taskId); void sub_807A8D4(struct Sprite *sprite); void sub_807A960(struct Sprite *sprite); void sub_8078A34(struct Sprite *sprite); -void sub_80787B0(struct Sprite *sprite, u8); +void InitAnimSpritePos(struct Sprite *sprite, u8); void sub_8078764(struct Sprite *sprite, u8); void sub_8078B34(struct Sprite *sprite); void sub_8078D60(struct Sprite *sprite); @@ -83,7 +83,7 @@ void sub_8078C00(struct Sprite *sprite); void sub_8078114(struct Sprite *sprite); void sub_8078174(struct Sprite *sprite); void sub_80793C4(struct Sprite *sprite); -void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4); +void SetAverageBattlerPositions(u8 slot, u8 a2, s16 *a3, s16 *a4); u8 sub_8079ED4(u8 slot); s16 sub_807A100(u8 slot, u8 a2); u16 sub_80790F0(s16 a, s16 b); @@ -99,7 +99,7 @@ void sub_80798F4(struct Task *task, u8 a2, const void *a3); bool8 sub_807992C(struct Task *task); u8 sub_8077FC0(u8 slot); void move_anim_8074EE0(struct Sprite *sprite); -bool8 sub_8078718(struct Sprite *sprite); +bool8 TranslateAnimSpriteLinearAndSine(struct Sprite *sprite); bool8 sub_8078CE8(struct Sprite *sprite); void oamt_add_pos2_onto_pos1(struct Sprite *sprite); void sub_8078BD4(struct Sprite *sprite); -- cgit v1.2.3 From c775680d716299ae74cbcfb7eeb41c8982010021 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 11 Feb 2018 12:43:48 -0800 Subject: Document battle anim things related to STRENGTH, TACKLE, BODY_SLAM, and SUPERSONIC --- include/rom_8077ABC.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'include/rom_8077ABC.h') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 97e001635..ed42871a6 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -16,8 +16,8 @@ u8 GetAnimBankSpriteId(u8 side); void StoreSpriteCallbackInData(struct Sprite *sprite, void(*callback)(struct Sprite *)); void sub_8078314(struct Sprite *sprite); void sub_8078364(struct Sprite *sprite); -void sub_8078458(struct Sprite *sprite); -void sub_80784A8(struct Sprite *sprite); +void TranslateMonBGUntil(struct Sprite *sprite); +void TranslateMonBGSubPixelUntil(struct Sprite *sprite); u8 GetBankSide(u8); u8 GetBankSide(u8); u8 GetBankSide(u8 side); @@ -34,11 +34,10 @@ u8 IsDoubleBattle(void); bool8 IsDoubleBattle(void); void sub_8078914(); u8 sub_80789BC(); -void sub_8078A5C(struct Sprite *sprite); -void sub_8078A5C(struct Sprite *sprite); +void InitSpriteDataForLinearTranslation(struct Sprite *sprite); void InitAnimSpriteTranslationDeltas(struct Sprite *sprite); bool8 TranslateAnimSpriteByDeltas(struct Sprite *sprite); -void sub_8078BB8(struct Sprite *sprite); +void TranslateAnimSpriteByDeltasUntil(struct Sprite *sprite); void sub_8078D44(struct Sprite *sprite); void obj_id_set_rotscale(u8 sprite, s16, s16, u16); bool8 sub_8078E38(); @@ -67,7 +66,7 @@ void sub_807A960(struct Sprite *sprite); void sub_8078A34(struct Sprite *sprite); void InitAnimSpritePos(struct Sprite *sprite, u8); void sub_8078764(struct Sprite *sprite, u8); -void sub_8078B34(struct Sprite *sprite); +void StartTranslateAnimSpriteByDeltas(struct Sprite *sprite); void sub_8078D60(struct Sprite *sprite); void sub_80786EC(struct Sprite *sprite); void sub_80782D8(struct Sprite *sprite); @@ -103,7 +102,7 @@ bool8 TranslateAnimSpriteLinearAndSine(struct Sprite *sprite); bool8 sub_8078CE8(struct Sprite *sprite); void oamt_add_pos2_onto_pos1(struct Sprite *sprite); void sub_8078BD4(struct Sprite *sprite); -void sub_807941C(struct Sprite *sprite); +void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite); void sub_80789D4(bool8 a1); void sub_8079AB8(u8 sprite, u8 sprite2); u8 sub_807A4A0(int bank, u8 sprite, int species); -- cgit v1.2.3 From 570d547ee7d3a57da026d2fac007036beaf80233 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 15 Mar 2018 08:12:14 -0700 Subject: Document PIN_MISSILE and ICICLE_SPEAR anims --- include/rom_8077ABC.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/rom_8077ABC.h') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index ed42871a6..5e48cc3d2 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -68,7 +68,7 @@ void InitAnimSpritePos(struct Sprite *sprite, u8); void sub_8078764(struct Sprite *sprite, u8); void StartTranslateAnimSpriteByDeltas(struct Sprite *sprite); void sub_8078D60(struct Sprite *sprite); -void sub_80786EC(struct Sprite *sprite); +void InitAnimSpriteTranslationOverDuration(struct Sprite *sprite); void sub_80782D8(struct Sprite *sprite); void sub_8078CC0(struct Sprite *sprite); void sub_8078600(struct Sprite *sprite); @@ -85,7 +85,7 @@ void sub_80793C4(struct Sprite *sprite); void SetAverageBattlerPositions(u8 slot, u8 a2, s16 *a3, s16 *a4); u8 sub_8079ED4(u8 slot); s16 sub_807A100(u8 slot, u8 a2); -u16 sub_80790F0(s16 a, s16 b); +u16 ArcTan2Neg(s16 a, s16 b); void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation); void sub_807867C(struct Sprite *sprite, s16 a2); u8 sub_8077EE4(u8 slot, u8 a2); -- cgit v1.2.3 From 3c9552befdbd295b94a06fca31a4c03c667465b3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 17 Mar 2018 11:44:32 -0700 Subject: More battle anim documentation --- include/rom_8077ABC.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/rom_8077ABC.h') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 5e48cc3d2..1910b7cb2 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -12,10 +12,10 @@ struct Struct_sub_8078914 { u8 GetBankPosition(u8, u8); u8 sub_8077E44(u8 slot, u16 species, u8 a3); -u8 GetAnimBankSpriteId(u8 side); +u8 GetAnimBankSpriteId(u8 bank); void StoreSpriteCallbackInData(struct Sprite *sprite, void(*callback)(struct Sprite *)); void sub_8078314(struct Sprite *sprite); -void sub_8078364(struct Sprite *sprite); +void TranslateSpriteOverDuration(struct Sprite *sprite); void TranslateMonBGUntil(struct Sprite *sprite); void TranslateMonBGSubPixelUntil(struct Sprite *sprite); u8 GetBankSide(u8); @@ -47,8 +47,8 @@ void sub_8078F9C(u8 sprite); void sub_8079518(struct Sprite *sprite); void sub_8079534(struct Sprite *sprite); void sub_80796F8(u8 task); -void sub_80797EC(struct Task *task); -void sub_8079814(u8 taskId); +void AnimTask_BlendMonInAndOutSetup(struct Task *task); +void AnimTask_BlendMonInAndOutStep(u8 taskId); void sub_8079A64(u8 sprite); u16 sub_8079B10(u8 sprite); void sub_8079BF4(s16 *bottom, s16 *top, const void *ptr); @@ -69,7 +69,7 @@ void sub_8078764(struct Sprite *sprite, u8); void StartTranslateAnimSpriteByDeltas(struct Sprite *sprite); void sub_8078D60(struct Sprite *sprite); void InitAnimSpriteTranslationOverDuration(struct Sprite *sprite); -void sub_80782D8(struct Sprite *sprite); +void WaitAnimForDuration(struct Sprite *sprite); void sub_8078CC0(struct Sprite *sprite); void sub_8078600(struct Sprite *sprite); void sub_8078504(struct Sprite *sprite); -- cgit v1.2.3