diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/music_constants.asm | 4 | ||||
| -rw-r--r-- | constants/pikachu_emotion_constants.asm | 22 | ||||
| -rwxr-xr-x | constants/type_constants.asm | 2 |
3 files changed, 20 insertions, 8 deletions
diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 71ff1aba..955a3899 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -247,13 +247,13 @@ ENDM music_const SFX_BATTLE_26, SFX_Battle_26 music_const SFX_BATTLE_27, SFX_Battle_27 music_const SFX_BATTLE_28, SFX_Battle_28 - music_const SFX_BATTLE_29, SFX_Battle_29 + music_const SFX_EARTHQUAKE, SFX_Earthquake music_const SFX_BATTLE_2A, SFX_Battle_2A music_const SFX_BATTLE_2B, SFX_Battle_2B music_const SFX_BATTLE_2C, SFX_Battle_2C music_const SFX_PSYBEAM, SFX_Psybeam music_const SFX_BATTLE_2E, SFX_Battle_2E - music_const SFX_BATTLE_2F, SFX_Battle_2F + music_const SFX_THUNDERBOLT, SFX_Thunderbolt music_const SFX_PSYCHIC_M, SFX_Psychic_M music_const SFX_BATTLE_31, SFX_Battle_31 music_const SFX_BATTLE_32, SFX_Battle_32 diff --git a/constants/pikachu_emotion_constants.asm b/constants/pikachu_emotion_constants.asm index e8877026..25d9a7aa 100644 --- a/constants/pikachu_emotion_constants.asm +++ b/constants/pikachu_emotion_constants.asm @@ -14,6 +14,17 @@ ldpikaemotion: macro ld \1, (\2_id - PikachuEmotionTable) / 2 endm +dpikaanim: macro + db (\1_id - PikaPicAnimBGFramesPointers) / 2 + endm + +pikaframeend EQUS "db $e0" +pikaframe: macro + db (\1_id - PikaPicTilemapPointers) / 2, \2 + endm + +pikaframedelay EQUS "db 0," + ; Starter Pikachu emotion commands constants const_def @@ -138,11 +149,12 @@ pikapic_loadgfx: macro db pikapic_loadgfx_command, (\1_id - PikaPicAnimGFXHeaders) / 4 endm - enum pikapic_object_command -pikapic_object: macro - db pikapic_object_command - dw \1 - db \2, \3, \4 + enum pikapic_animation_command +pikapic_animation: macro + ; frameset pointer, starting vtile, y offset, x offset + db pikapic_animation_command + dpikaanim \1 + db 0, \2, \3, \4 endm enum pikapic_nop4_command diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 66085f8d..b36dc179 100755 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -13,4 +13,4 @@ GRASS EQU $16 ELECTRIC EQU $17 PSYCHIC EQU $18 ICE EQU $19 -DRAGON EQU $1A
\ No newline at end of file +DRAGON EQU $1A |