diff options
| author | dannye <33dannye@gmail.com> | 2021-04-17 21:00:28 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-04-17 21:00:28 -0500 |
| commit | d4154b289176647ff20e19879de70073bd6d9a30 (patch) | |
| tree | f4175a9303dd0e1430f4c42e79a4d5ffb1f32c00 /data | |
| parent | a1081856200cec52ba881fc6f878f5ce0328ab0a (diff) | |
| parent | 2fdcb1a3d6919f378b2f83f14d3b3822a19fcc33 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
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 850b24b4..0e4a79af 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -4,29 +4,13 @@ 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 058a815c..eb09f4fb 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 5fca7114..950115e0 100644 --- a/data/tilesets/door_tile_ids.asm +++ b/data/tilesets/door_tile_ids.asm @@ -16,10 +16,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 bba7787a..b30a731d 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -28,10 +28,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 2950e515..d80722b1 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 |