From 4ebb3fdcc56abfcacf4a78aa10a2ea74b0d1b4d0 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 18 Dec 2017 15:47:05 -0600 Subject: Start decompiling water --- include/rom_8077ABC.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 2a2947968..703ae18a2 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -12,6 +12,12 @@ enum ANIM_BANK_DEF_PARTNER }; +struct Struct_sub_8078914 { + u8 *field_0; + u8 *field_4; + u8 field_8; +}; + u8 sub_8077ABC(u8, u8); u8 sub_8077E44(u8 slot, u16 species, u8 a3); u8 GetAnimBankSpriteId(u8 side); -- cgit v1.2.3 From e7a3951dafdf167f3e9d01a83320df701e81dda8 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 18 Dec 2017 20:46:26 -0600 Subject: Decompile battle_anim note_spin --- include/rom_8077ABC.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 703ae18a2..ee32c26d7 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -105,5 +105,6 @@ u8 sub_8077FC0(u8 slot); void move_anim_8074EE0(struct Sprite *sprite); bool8 sub_8078718(struct Sprite *sprite); bool8 sub_8078CE8(struct Sprite *sprite); +void oamt_add_pos2_onto_pos1(struct Sprite *sprite); #endif // GUARD_ROM_8077ABC_H -- cgit v1.2.3 From f17a25cdc3a944be2a8ea5d8ec97f75047e99e2c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 19 Dec 2017 15:44:14 -0600 Subject: Decompile battle_anim wisp_orb --- include/rom_8077ABC.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index ee32c26d7..70bd6fe5a 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -106,5 +106,6 @@ void move_anim_8074EE0(struct Sprite *sprite); 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); #endif // GUARD_ROM_8077ABC_H -- cgit v1.2.3 From ad33b833f35800ff2cfc13aaca09e2e57842703a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Dec 2017 11:25:54 -0600 Subject: Decompile battle_anim shock --- include/sprite.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include') diff --git a/include/sprite.h b/include/sprite.h index a87260ec0..29a0be562 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -222,6 +222,14 @@ struct Sprite /*0x43*/ u8 subpriority; }; +struct OamMatrix +{ + s16 a; + s16 b; + s16 c; + s16 d; +}; + extern const struct OamData gDummyOamData; extern const union AnimCmd *const gDummySpriteAnimTable[]; extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[]; -- cgit v1.2.3 From 754e911b4e95205bafa5dc93242da9cee3f2c5c6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 21 Dec 2017 11:40:26 -0600 Subject: Rename gScript* vars to gSpecialVar_* --- include/event_data.h | 6 +++--- include/item_use.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/event_data.h b/include/event_data.h index 80c6b9478..5656ab8dc 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -37,8 +37,8 @@ extern u16 gSpecialVar_0x8008; extern u16 gSpecialVar_0x8009; extern u16 gSpecialVar_0x800A; extern u16 gSpecialVar_0x800B; -extern u16 gScriptResult; -extern u16 gScriptLastTalked; -extern u16 gScriptFacing; +extern u16 gSpecialVar_Result; +extern u16 gSpecialVar_LastTalked; +extern u16 gSpecialVar_Facing; #endif // GUARD_EVENT_DATA_H diff --git a/include/item_use.h b/include/item_use.h index 227c0c9ee..ee7939824 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -1,7 +1,7 @@ #ifndef GUARD_ITEM_USE_H #define GUARD_ITEM_USE_H -extern u16 gScriptItemId; +extern u16 gSpecialVar_ItemId; void ItemUseOutOfBattle_Mail(u8); void ItemUseOutOfBattle_Bike(u8); -- cgit v1.2.3