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 /constants/pikachu_emotion_constants.asm | |
| 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 'constants/pikachu_emotion_constants.asm')
| -rw-r--r-- | constants/pikachu_emotion_constants.asm | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/constants/pikachu_emotion_constants.asm b/constants/pikachu_emotion_constants.asm index f9298f16..33442bc0 100644 --- a/constants/pikachu_emotion_constants.asm +++ b/constants/pikachu_emotion_constants.asm @@ -12,15 +12,15 @@ const PIKAHAPPY_CARELESSTRAINER const PIKAHAPPY_TRADE -dpikapic: MACRO +MACRO dpikapic db (\1_id - PikaPicAnimPointers) / 2 ENDM -dpikaemotion: MACRO +MACRO dpikaemotion db (\1_id - PikachuEmotionTable) / 2 ENDM -ldpikaemotion: MACRO +MACRO ldpikaemotion ld \1, (\2_id - PikachuEmotionTable) / 2 ENDM @@ -60,99 +60,99 @@ ENDM ; MACROs for commands -pikaemotion_dummy1: MACRO +MACRO pikaemotion_dummy1 db PIKAEMOTION_DUMMY1 ENDM -pikaemotion_printtext: MACRO +MACRO pikaemotion_printtext db PIKAEMOTION_PRINTTEXT dw \1 ENDM -pikaemotion_pcm: MACRO +MACRO pikaemotion_pcm db PIKAEMOTION_PLAYPCMSOUNDCLIP -IF _NARG > 0 - dpikacry \1 -ELSE - db $ff -ENDC + IF _NARG > 0 + dpikacry \1 + ELSE + db $ff + ENDC ENDM -pikaemotion_emotebubble: MACRO +MACRO pikaemotion_emotebubble db PIKAEMOTION_DOEMOTIONBUBBLE db \1 ENDM -pikaemotion_movement: MACRO +MACRO pikaemotion_movement db PIKAEMOTION_4 dw \1 ENDM -pikaemotion_pikapic: MACRO +MACRO pikaemotion_pikapic db PIKAEMOTION_5 dpikapic \1 ENDM -pikaemotion_subcmd: MACRO +MACRO pikaemotion_subcmd db PIKAEMOTION_SUBCMD db \1 ENDM -pikaemotion_delay: MACRO +MACRO pikaemotion_delay db PIKAEMOTION_DELAYFRAMES db \1 ENDM -pikaemotion_dummy2: MACRO +MACRO pikaemotion_dummy2 db PIKAEMOTION_DUMMY2 ENDM -pikaemotion_9: MACRO +MACRO pikaemotion_9 db PIKAEMOTION_9 ENDM -pikaemotion_dummy3: MACRO +MACRO pikaemotion_dummy3 db PIKAEMOTION_DUMMY3 ENDM -pikacry_def: MACRO +MACRO pikacry_def \1_id:: dba \1 ENDM -dpikacry: MACRO +MACRO dpikacry db (\1_id - PikachuCriesPointerTable) / 3 ENDM -ldpikacry: MACRO +MACRO ldpikacry ld \1, (\2_id - PikachuCriesPointerTable) / 3 ENDM -pikacry: MACRO +MACRO pikacry ldpikacry a, \1 ENDM const_def const pikapic_nop_command -pikapic_nop: MACRO +MACRO pikapic_nop db pikapic_nop_command ENDM const pikapic_writebyte_command -pikapic_writebyte: MACRO +MACRO pikapic_writebyte db pikapic_writebyte_command db \1 ENDM const pikapic_loadgfx_command -pikapic_loadgfx: MACRO +MACRO pikapic_loadgfx db pikapic_loadgfx_command db (\1_id - PikaPicAnimGFXHeaders) / 4 ENDM const pikapic_animation_command -pikapic_animation: MACRO +MACRO pikapic_animation ; frameset pointer, starting vtile, y offset, x offset db pikapic_animation_command db (\1_id - PikaPicAnimBGFramesPointers) / 2 @@ -160,69 +160,69 @@ pikapic_animation: MACRO ENDM const pikapic_nop4_command -pikapic_nop4: MACRO +MACRO pikapic_nop4 db pikapic_nop4_command ENDM const pikapic_nop5_command -pikapic_nop5: MACRO +MACRO pikapic_nop5 db pikapic_nop5_command ENDM const pikapic_waitbgmapeleteobject_command -pikapic_waitbgmapeleteobject: MACRO +MACRO pikapic_waitbgmapeleteobject db pikapic_waitbgmapeleteobject_command db \1 ENDM const pikapic_nop7_command -pikapic_nop7: MACRO +MACRO pikapic_nop7 db pikapic_nop7_command ENDM const pikapic_nop8_command -pikapic_nop8: MACRO +MACRO pikapic_nop8 db pikapic_nop8_command ENDM const pikapic_jump_command -pikapic_jump: MACRO ; 9 +MACRO pikapic_jump ; 9 db pikapic_jump_command dw \1 ENDM const pikapic_setduration_command -pikapic_setduration: MACRO ; a +MACRO pikapic_setduration ; a db pikapic_setduration_command dw \1 ENDM const pikapic_cry_command -pikapic_cry: MACRO ; b +MACRO pikapic_cry ; b db pikapic_cry_command -IF _NARG == 0 - db $ff -else - dpikacry \1 + IF _NARG == 0 + db $ff + else + dpikacry \1 endc ENDM const pikapic_thunderbolt_command -pikapic_thunderbolt: MACRO ; c +MACRO pikapic_thunderbolt ; c db pikapic_thunderbolt_command ENDM const pikapic_waitbgmap_command -pikapic_waitbgmap: MACRO ; d +MACRO pikapic_waitbgmap ; d db pikapic_waitbgmap_command ENDM const pikapic_ret_command -pikapic_ret: MACRO ; e +MACRO pikapic_ret ; e db pikapic_ret_command ENDM -pikapic_looptofinish: MACRO +MACRO pikapic_looptofinish .loop\@ pikapic_waitbgmap pikapic_jump .loop\@ |