From 66be373dbc955a230657e04030dfd00c5a239b79 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Thu, 10 Dec 2020 23:47:23 +0700 Subject: Create sprite_anim_constants.asm --- constants/sprite_anim_constants.asm | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100755 constants/sprite_anim_constants.asm (limited to 'constants') diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm new file mode 100755 index 0000000..b9ade3a --- /dev/null +++ b/constants/sprite_anim_constants.asm @@ -0,0 +1,40 @@ +; wSpriteAnimDict keys + const_def + const SPRITE_ANIM_DICT_DEFAULT ; 0 + const SPRITE_ANIM_DICT_GS_INTRO ; 1 + const SPRITE_ANIM_DICT_GS_INTRO_2 ; 2 + const_skip 2 ; unused + const SPRITE_ANIM_DICT_TEXT_CURSOR ; 5 + const SPRITE_ANIM_DICT_GS_SPLASH ; 6 + const SPRITE_ANIM_DICT_SLOTS ; 7 + const SPRITE_ANIM_DICT_ARROW_CURSOR ; 8 +; wSpriteAnimDict size (see ram/wram.asm) +NUM_SPRITEANIMDICT_ENTRIES EQU 10 + +; SpriteAnimSeqData indexes +SPRITE_ANIM_INDEX_08 EQU $08 + +SPRITE_ANIM_INDEX_GS_INTRO_BUBBLE EQU $21 +SPRITE_ANIM_INDEX_GS_INTRO_OMANYTE EQU $22 +SPRITE_ANIM_INDEX_GS_INTRO_MAGIKARP EQU $23 +SPRITE_ANIM_INDEX_UNUSED_INTRO_AERODACTYL EQU $24 +SPRITE_ANIM_INDEX_GS_INTRO_LAPRAS EQU $25 +SPRITE_ANIM_INDEX_GS_INTRO_NOTE EQU $26 +SPRITE_ANIM_INDEX_GS_INTRO_SMALLER_NOTE EQU $27 +SPRITE_ANIM_INDEX_GS_INTRO_JIGGLYPUFF EQU $28 +SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU EQU $29 +SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU_TAIL EQU $2a +SPRITE_ANIM_INDEX_GS_INTRO_FIREBALL EQU $2b +SPRITE_ANIM_INDEX_GS_INTRO_BLASTOISE EQU $2c +SPRITE_ANIM_INDEX_GS_INTRO_VENUSAUR EQU $2d + +SPRITE_ANIM_INDEX_GS_TITLE_FLAME_NOTE EQU $2e + +SPRITE_ANIM_INDEX_39 EQU $39 +SPRITE_ANIM_INDEX_GAMEFREAK_LOGO EQU $3a +SPRITE_ANIM_INDEX_GS_INTRO_STAR EQU $3b +SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE EQU $3c +SPRITE_ANIM_INDEX_40 EQU $40 +SPRITE_ANIM_INDEX_41 EQU $41 +SPRITE_ANIM_INDEX_44 EQU $44 +SPRITE_ANIM_INDEX_4B EQU $4b -- cgit v1.2.3 From 87ae0e358884f4156f9e5afd2e836c9b19041364 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Fri, 11 Dec 2020 17:05:58 +0700 Subject: Start labelling Pikachu minigame --- constants/sprite_anim_constants.asm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'constants') diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index b9ade3a..53ad260 100755 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -30,6 +30,9 @@ SPRITE_ANIM_INDEX_GS_INTRO_VENUSAUR EQU $2d SPRITE_ANIM_INDEX_GS_TITLE_FLAME_NOTE EQU $2e +SPRITE_ANIM_INDEX_2F EQU $2f +SPRITE_ANIM_INDEX_30 EQU $30 + SPRITE_ANIM_INDEX_39 EQU $39 SPRITE_ANIM_INDEX_GAMEFREAK_LOGO EQU $3a SPRITE_ANIM_INDEX_GS_INTRO_STAR EQU $3b -- cgit v1.2.3 From 7ce11f0e85198bb2a8458181370b5e631ec393f6 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Fri, 11 Dec 2020 20:26:49 +0700 Subject: More progress on disassembling Pikachu minigame --- constants/sprite_anim_constants.asm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'constants') diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 53ad260..1b20a60 100755 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -1,3 +1,23 @@ +; sprite_anim_struct members (see macros/wram.asm) + const_def + const SPRITEANIMSTRUCT_INDEX ; 0 + const SPRITEANIMSTRUCT_FRAMESET_ID ; 1 + const SPRITEANIMSTRUCT_ANIM_SEQ_ID ; 2 + const SPRITEANIMSTRUCT_TILE_ID ; 3 + const SPRITEANIMSTRUCT_XCOORD ; 4 + const SPRITEANIMSTRUCT_YCOORD ; 5 + const SPRITEANIMSTRUCT_XOFFSET ; 6 + const SPRITEANIMSTRUCT_YOFFSET ; 7 + const SPRITEANIMSTRUCT_DURATION ; 8 + const SPRITEANIMSTRUCT_DURATIONOFFSET ; 9 + const SPRITEANIMSTRUCT_FRAME ; a + const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; b + const SPRITEANIMSTRUCT_0C ; c + const SPRITEANIMSTRUCT_0D ; d + const SPRITEANIMSTRUCT_0E ; e + const SPRITEANIMSTRUCT_0F ; f +SPRITEANIMSTRUCT_LENGTH EQU const_value + ; wSpriteAnimDict keys const_def const SPRITE_ANIM_DICT_DEFAULT ; 0 @@ -30,8 +50,8 @@ SPRITE_ANIM_INDEX_GS_INTRO_VENUSAUR EQU $2d SPRITE_ANIM_INDEX_GS_TITLE_FLAME_NOTE EQU $2e -SPRITE_ANIM_INDEX_2F EQU $2f -SPRITE_ANIM_INDEX_30 EQU $30 +SPRITE_ANIM_INDEX_MINIGAME_PIKACHU EQU $2f +SPRITE_ANIM_INDEX_MINIGAME_PIKACHU_TAIL EQU $30 SPRITE_ANIM_INDEX_39 EQU $39 SPRITE_ANIM_INDEX_GAMEFREAK_LOGO EQU $3a -- cgit v1.2.3 From 1a131d1ce01bfd12cdb3cf61719e41bff7b699db Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Sat, 12 Dec 2020 14:37:11 +0700 Subject: Some adjustments --- constants/sprite_anim_constants.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'constants') diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 1b20a60..928b601 100755 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -52,6 +52,8 @@ SPRITE_ANIM_INDEX_GS_TITLE_FLAME_NOTE EQU $2e SPRITE_ANIM_INDEX_MINIGAME_PIKACHU EQU $2f SPRITE_ANIM_INDEX_MINIGAME_PIKACHU_TAIL EQU $30 +SPRITE_ANIM_INDEX_MINIGAME_NOTE EQU $31 +SPRITE_ANIM_INDEX_MINIGAME_JIGGLYPUFF EQU $32 SPRITE_ANIM_INDEX_39 EQU $39 SPRITE_ANIM_INDEX_GAMEFREAK_LOGO EQU $3a -- cgit v1.2.3 From 039a2bd71576f96e0819f4657fc3ef44fd8ae4d2 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Thu, 17 Dec 2020 23:41:14 +0700 Subject: Suggested changes to #83 --- constants/sfx_constants.asm | 4 ++++ constants/sprite_anim_constants.asm | 12 +++--------- 2 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 constants/sfx_constants.asm (limited to 'constants') diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm new file mode 100644 index 0000000..9000814 --- /dev/null +++ b/constants/sfx_constants.asm @@ -0,0 +1,4 @@ +; TODO + +SFX_GAME_FREAK_LOGO_RG EQU $31 + diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 928b601..af60e02 100755 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -19,15 +19,9 @@ SPRITEANIMSTRUCT_LENGTH EQU const_value ; wSpriteAnimDict keys - const_def - const SPRITE_ANIM_DICT_DEFAULT ; 0 - const SPRITE_ANIM_DICT_GS_INTRO ; 1 - const SPRITE_ANIM_DICT_GS_INTRO_2 ; 2 - const_skip 2 ; unused - const SPRITE_ANIM_DICT_TEXT_CURSOR ; 5 - const SPRITE_ANIM_DICT_GS_SPLASH ; 6 - const SPRITE_ANIM_DICT_SLOTS ; 7 - const SPRITE_ANIM_DICT_ARROW_CURSOR ; 8 +SPRITE_ANIM_DICT_DEFAULT EQU $00 +SPRITE_ANIM_DICT_GS_SPLASH EQU $27 + ; wSpriteAnimDict size (see ram/wram.asm) NUM_SPRITEANIMDICT_ENTRIES EQU 10 -- cgit v1.2.3 From 7850d38cc01b5a025f7117587c485932b3fc95c7 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Thu, 17 Dec 2020 23:53:01 +0700 Subject: Suggested changes to #84 --- constants/sfx_constants.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'constants') diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm index 9000814..881ff52 100644 --- a/constants/sfx_constants.asm +++ b/constants/sfx_constants.asm @@ -1,4 +1,5 @@ ; TODO +SFX_PAY_DAY EQU $30 SFX_GAME_FREAK_LOGO_RG EQU $31 -- cgit v1.2.3 From 37e60a9457643720dae714f8d2df0cf5ad31d919 Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Thu, 17 Dec 2020 14:56:00 -0500 Subject: Define NUM_SPRITE_ANIM_STRUCTS --- constants/sprite_anim_constants.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'constants') diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index af60e02..08f6d69 100755 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -17,6 +17,7 @@ const SPRITEANIMSTRUCT_0E ; e const SPRITEANIMSTRUCT_0F ; f SPRITEANIMSTRUCT_LENGTH EQU const_value +NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs ; wSpriteAnimDict keys SPRITE_ANIM_DICT_DEFAULT EQU $00 -- cgit v1.2.3