diff options
| author | vulcandth <vulcandth@gmail.com> | 2022-06-06 16:25:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-06 17:25:34 -0400 |
| commit | c1ef7b75972fa4fbdf125bc85cc1a66f358151cd (patch) | |
| tree | bcf71939ec5573ed5001c4a4b4342d26e5d8f9b1 /data/pikachu | |
| parent | Improved Virtual Console patch identifiers (#85) (diff) | |
| download | pokeyellow-c1ef7b75972fa4fbdf125bc85cc1a66f358151cd.tar.gz pokeyellow-c1ef7b75972fa4fbdf125bc85cc1a66f358151cd.tar.xz pokeyellow-c1ef7b75972fa4fbdf125bc85cc1a66f358151cd.zip | |
RGBDS syntax updates (#86)
New MACRO and DEF syntax
Diffstat (limited to 'data/pikachu')
| -rw-r--r-- | data/pikachu/pikachu_pic_animation.asm | 18 | ||||
| -rw-r--r-- | data/pikachu/pikachu_pic_objects.asm | 8 | ||||
| -rw-r--r-- | data/pikachu/pikachu_pic_tilemaps.asm | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/data/pikachu/pikachu_pic_animation.asm b/data/pikachu/pikachu_pic_animation.asm index 89eedc8d..746db750 100644 --- a/data/pikachu/pikachu_pic_animation.asm +++ b/data/pikachu/pikachu_pic_animation.asm @@ -326,15 +326,15 @@ PikaPicAnimScript28: pikapic_cry pikapic_looptofinish -pikapicanimgfx: MACRO -IF _NARG == 2 -\2_id:: - db \1 ; size (-1 if compressed) - dba \2 ; pointer -ELSE - db \1 ; size - dbw \2, \3 ; bank, address -ENDC +MACRO pikapicanimgfx + IF _NARG == 2 + \2_id:: + db \1 ; size (-1 if compressed) + dba \2 ; pointer + ELSE + db \1 ; size + dbw \2, \3 ; bank, address + ENDC ENDM PikaPicAnimGFXHeaders: diff --git a/data/pikachu/pikachu_pic_objects.asm b/data/pikachu/pikachu_pic_objects.asm index 7a1f2746..ac866345 100644 --- a/data/pikachu/pikachu_pic_objects.asm +++ b/data/pikachu/pikachu_pic_objects.asm @@ -1,4 +1,4 @@ -pikaanim_def: MACRO +MACRO pikaanim_def \1_id: dw \1 ENDM @@ -41,12 +41,12 @@ PikaPicAnimBGFramesPointers: pikaanim_def PikaPicAnimBGFrames_34 ; 22 pikaanim_def PikaPicAnimBGFrames_35 ; 23 -pikaframe: MACRO +MACRO pikaframe db (\1_id - PikaPicTilemapPointers) / 2, \2 ENDM -pikaframedelay EQUS "db 0," -pikaframeend EQUS "db $e0" +DEF pikaframedelay EQUS "db 0," +DEF pikaframeend EQUS "db $e0" PikaPicAnimBGFrames_0: PikaPicAnimBGFrames_1: diff --git a/data/pikachu/pikachu_pic_tilemaps.asm b/data/pikachu/pikachu_pic_tilemaps.asm index d11ba04e..df06b2a1 100644 --- a/data/pikachu/pikachu_pic_tilemaps.asm +++ b/data/pikachu/pikachu_pic_tilemaps.asm @@ -1,4 +1,4 @@ -pikatilemap_def: MACRO +MACRO pikatilemap_def \1_id: dw \1 ENDM |