diff options
| author | vulcandth <vulcandth@gmail.com> | 2022-06-06 16:25:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-06 17:25:31 -0400 |
| commit | 6b5be9129cabe72b9f775b02db1bf7e7169153da (patch) | |
| tree | d92012450c70f90bf8086bed32ec3dc87b68b332 /macros/wram.asm | |
| parent | Improved Virtual Console patch identifiers (#357) (diff) | |
| download | pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.gz pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.tar.xz pokeyellow-6b5be9129cabe72b9f775b02db1bf7e7169153da.zip | |
RGBDS syntax updates (#358)
New MACRO and DEF syntax
Diffstat (limited to 'macros/wram.asm')
| -rw-r--r-- | macros/wram.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/macros/wram.asm b/macros/wram.asm index 872e7f57..df5dcf90 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -1,12 +1,12 @@ ; Used in wram.asm -flag_array: MACRO +MACRO flag_array ds ((\1) + 7) / 8 ENDM -BOX_STRUCT_LENGTH EQU 25 + NUM_MOVES * 2 +DEF BOX_STRUCT_LENGTH EQU 25 + NUM_MOVES * 2 -box_struct: MACRO +MACRO box_struct \1Species:: db \1HP:: dw \1BoxLevel:: db @@ -27,7 +27,7 @@ box_struct: MACRO \1PP:: ds NUM_MOVES ENDM -party_struct: MACRO +MACRO party_struct box_struct \1 \1Level:: db \1Stats:: @@ -38,7 +38,7 @@ party_struct: MACRO \1Special:: dw ENDM -battle_struct: MACRO +MACRO battle_struct \1Species:: db \1HP:: dw \1PartyPos:: @@ -60,7 +60,7 @@ battle_struct: MACRO \1PP:: ds NUM_MOVES ENDM -spritestatedata1: MACRO +MACRO spritestatedata1 \1PictureID:: db \1MovementStatus:: db \1ImageIndex:: db @@ -78,7 +78,7 @@ spritestatedata1: MACRO \1End:: ENDM -spritestatedata2: MACRO +MACRO spritestatedata2 \1WalkAnimationCounter:: db ds 1 \1YDisplacement:: db @@ -96,14 +96,14 @@ spritestatedata2: MACRO \1End:: ENDM -sprite_oam_struct: MACRO +MACRO sprite_oam_struct \1YCoord:: db \1XCoord:: db \1TileID:: db \1Attributes:: db ENDM -map_connection_struct: MACRO +MACRO map_connection_struct \1ConnectedMap:: db \1ConnectionStripSrc:: dw \1ConnectionStripDest:: dw |