aboutsummaryrefslogtreecommitdiffstats
path: root/data/pikachu_pic_objects.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-11-04 15:16:20 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2020-11-04 19:44:31 -0500
commitaae999f72bd81a3156c7e00da4ebf499f52da5a6 (patch)
tree32fef70a31af3a0b5ad2b0d34042c312574fb42d /data/pikachu_pic_objects.asm
parentMerge branch 'master' of https://github.com/pret/pokered (diff)
downloadpokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.gz
pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.xz
pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.zip
Start reorganizing pokeyellow
Diffstat (limited to '')
-rwxr-xr-xdata/pikachu/pikachu_pic_objects.asm (renamed from data/pikachu_pic_objects.asm)16
1 files changed, 12 insertions, 4 deletions
diff --git a/data/pikachu_pic_objects.asm b/data/pikachu/pikachu_pic_objects.asm
index 940c1141..c3a44bc9 100755
--- a/data/pikachu_pic_objects.asm
+++ b/data/pikachu/pikachu_pic_objects.asm
@@ -1,8 +1,9 @@
-PikaPicAnimBGFramesPointers:
-pikaanim_def: macro
-\1_id: dw \1
- endm
+pikaanim_def: MACRO
+\1_id:
+ dw \1
+ENDM
+PikaPicAnimBGFramesPointers:
pikaanim_def PikaPicAnimBGFrames_0 ; 00
pikaanim_def PikaPicAnimBGFrames_1 ; 01
pikaanim_def PikaPicAnimBGFrames_2 ; 02
@@ -40,6 +41,13 @@ pikaanim_def: macro
pikaanim_def PikaPicAnimBGFrames_34 ; 22
pikaanim_def PikaPicAnimBGFrames_35 ; 23
+pikaframe: MACRO
+ db (\1_id - PikaPicTilemapPointers) / 2, \2
+ENDM
+
+pikaframedelay EQUS "db 0,"
+pikaframeend EQUS "db $e0"
+
PikaPicAnimBGFrames_0:
PikaPicAnimBGFrames_1:
; Tilemap idx, duration