diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-04 15:16:20 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-04 19:44:31 -0500 |
| commit | aae999f72bd81a3156c7e00da4ebf499f52da5a6 (patch) | |
| tree | 32fef70a31af3a0b5ad2b0d34042c312574fb42d /data/pikachu | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| download | pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.gz pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.xz pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.zip | |
Start reorganizing pokeyellow
Diffstat (limited to '')
| -rwxr-xr-x | data/pikachu/pikachu_emotions.asm (renamed from data/pikachu_emotions.asm) | 0 | ||||
| -rwxr-xr-x | data/pikachu/pikachu_pic_animation.asm (renamed from data/pikachu_pic_animation.asm) | 13 | ||||
| -rwxr-xr-x | data/pikachu/pikachu_pic_objects.asm (renamed from data/pikachu_pic_objects.asm) | 16 | ||||
| -rwxr-xr-x | data/pikachu/pikachu_pic_tilemaps.asm (renamed from data/pikachu_pic_tilemaps.asm) | 13 |
4 files changed, 27 insertions, 15 deletions
diff --git a/data/pikachu_emotions.asm b/data/pikachu/pikachu_emotions.asm index f72beaa4..f72beaa4 100755 --- a/data/pikachu_emotions.asm +++ b/data/pikachu/pikachu_emotions.asm diff --git a/data/pikachu_pic_animation.asm b/data/pikachu/pikachu_pic_animation.asm index d10f65dd..a9e3c5e7 100755 --- a/data/pikachu_pic_animation.asm +++ b/data/pikachu/pikachu_pic_animation.asm @@ -19,7 +19,7 @@ PikaPicAnimThunderboltPals: db 4, %11100100 db 4, %11000000 db 4, %11100100 - db $ff + db -1 ; end Data_fe26b: pikapic_loadgfx Pic_e4000 @@ -326,15 +326,18 @@ PikaPicAnimScript28: pikapic_cry pikapic_looptofinish -PikaPicAnimGFXHeaders: pikapicanimgfx: MACRO +IF _NARG == 2 \2_id:: db \1 ; size (-1 if compressed) dba \2 ; pointer - endm +ELSE + dbbw \1, \2, \3 ; size, bank, address +ENDC +ENDM -PikaPicAnimGFX_Null_id:: - dbbw 1, $39,$0000 ; 00 +PikaPicAnimGFXHeaders: + pikapicanimgfx 1, $39, NULL ; 00 pikapicanimgfx -1, Pic_e4000 ; 01 pikapicanimgfx 5, GFX_e40cc ; 02 pikapicanimgfx -1, Pic_e411c ; 03 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 diff --git a/data/pikachu_pic_tilemaps.asm b/data/pikachu/pikachu_pic_tilemaps.asm index 95882711..d11ba04e 100755 --- a/data/pikachu_pic_tilemaps.asm +++ b/data/pikachu/pikachu_pic_tilemaps.asm @@ -1,8 +1,9 @@ -PikaPicTilemapPointers: -pikatilemap_def: macro -\1_id: dw \1 - endm +pikatilemap_def: MACRO +\1_id: + dw \1 +ENDM +PikaPicTilemapPointers: pikatilemap_def PikaAnimTilemap_0 pikatilemap_def PikaAnimTilemap_1 pikatilemap_def PikaAnimTilemap_2 @@ -48,10 +49,10 @@ pikatilemap_def: macro pikatilemap_def PikaAnimTilemap_42 PikaAnimTilemap_0: - db $ff ; unused + db -1 ; unused +; $ff inhibits overwriting that tile - ; $ff inhibits overwriting that tile PikaAnimTilemap_1: PikaAnimTilemap_42: db 5, 5 |