diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-17 19:06:56 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-17 19:06:56 -0400 |
| commit | dd690920c9f8502b649f1022fadbb99fab67a44a (patch) | |
| tree | 6241fa9659e8ba2a82ea6fa45194dbd6e5dc39ef /data | |
| parent | 4b64b146e4d723980d26470d171fb18e63f4a215 (diff) | |
Use rgbds 0.5.0 features:
- FOR loops
- {interpolation}
- REDEF EQUS
- \# for all macro args
Diffstat (limited to 'data')
| -rw-r--r-- | data/moves/tmhm_moves.asm | 24 | ||||
| -rw-r--r-- | data/tilesets/collision_tile_ids.asm | 7 | ||||
| -rw-r--r-- | data/tilesets/door_tile_ids.asm | 7 | ||||
| -rw-r--r-- | data/tilesets/warp_carpet_tile_ids.asm | 7 | ||||
| -rw-r--r-- | data/tilesets/warp_tile_ids.asm | 7 | ||||
| -rw-r--r-- | data/trainers/move_choices.asm | 7 |
6 files changed, 19 insertions, 40 deletions
diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index 123df8c6..6b279f5a 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -4,28 +4,12 @@ TechnicalMachines: table_width 1, TechnicalMachines -n = 1 -REPT NUM_TMS -IF n < 10 -MOVE_FOR_TM EQUS "TM0{d:n}_MOVE" -ELSE -MOVE_FOR_TM EQUS "TM{d:n}_MOVE" -ENDC - db MOVE_FOR_TM -PURGE MOVE_FOR_TM -n = n + 1 +FOR n, 1, NUM_TMS + 1 + db TM{02d:n}_MOVE ENDR assert_table_length NUM_TMS -n = 1 -REPT NUM_HMS -IF n < 10 -MOVE_FOR_HM EQUS "HM0{d:n}_MOVE" -ELSE -MOVE_FOR_HM EQUS "HM{d:n}_MOVE" -ENDC - db MOVE_FOR_HM -PURGE MOVE_FOR_HM -n = n + 1 +FOR n, 1, NUM_HMS + 1 + db HM{02d:n}_MOVE ENDR assert_table_length NUM_TM_HM diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index d348d5d5..c1bee7ce 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -1,8 +1,7 @@ coll_tiles: MACRO -REPT _NARG - db \1 - shift -ENDR + IF _NARG + db \# ; all args + ENDC db -1 ; end ENDM diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm index c371e92b..716f76f3 100644 --- a/data/tilesets/door_tile_ids.asm +++ b/data/tilesets/door_tile_ids.asm @@ -15,10 +15,9 @@ DoorTileIDPointers: db -1 ; end door_tiles: MACRO -REPT _NARG - db \1 - shift -ENDR + IF _NARG + db \# ; all args + ENDC db 0 ; end ENDM diff --git a/data/tilesets/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm index be327599..a8a19011 100644 --- a/data/tilesets/warp_carpet_tile_ids.asm +++ b/data/tilesets/warp_carpet_tile_ids.asm @@ -5,10 +5,9 @@ WarpTileListPointers: dw .FacingRightWarpTiles warp_carpet_tiles: MACRO -REPT _NARG - db \1 - shift -ENDR + IF _NARG + db \# ; all args + ENDC db -1 ; end ENDM diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 94c5397c..80df6cdf 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -27,10 +27,9 @@ WarpTileIDPointers: assert_table_length NUM_TILESETS warp_tiles: MACRO -REPT _NARG - db \1 - shift -ENDR + IF _NARG + db \# ; all args + ENDC db -1 ; end ENDM diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm index d4900c9f..2c3498af 100644 --- a/data/trainers/move_choices.asm +++ b/data/trainers/move_choices.asm @@ -1,8 +1,7 @@ move_choices: MACRO -REPT _NARG - db \1 - shift -ENDR + IF _NARG + db \# ; all args + ENDC db 0 ; end list_index = list_index + 1 ENDM |