diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-22 16:41:10 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-22 16:41:10 -0400 |
| commit | ea59f5ee474e1ee56a303feef44dc7e9f30db21d (patch) | |
| tree | 98894d5ed8a8804a13f4dd51dc07bb4df87998ef /data | |
| parent | b4ee57c480cf937ccd68495e7f4a56b3edbeddd8 (diff) | |
Miscellaneous cleanup
Diffstat (limited to 'data')
| -rw-r--r-- | data/decorations/decorations.asm | 1 | ||||
| -rw-r--r-- | data/events/special_pointers.asm | 6 | ||||
| -rw-r--r-- | data/growth_rates.asm | 2 | ||||
| -rw-r--r-- | data/items/pocket_names.asm | 2 | ||||
| -rw-r--r-- | data/moves/tmhm_moves.asm | 2 | ||||
| -rw-r--r-- | data/sprites/map_objects.asm | 6 | ||||
| -rw-r--r-- | data/wild/fish.asm | 3 |
7 files changed, 14 insertions, 8 deletions
diff --git a/data/decorations/decorations.asm b/data/decorations/decorations.asm index a5519efa..9cd24d1f 100644 --- a/data/decorations/decorations.asm +++ b/data/decorations/decorations.asm @@ -47,6 +47,7 @@ DecorationIDs: db DECO_GEODUDE_DOLL ; 30 db DECO_MACHOP_DOLL ; 31 db DECO_TENTACOOL_DOLL ; 32 + db DECO_BIG_SNORLAX_DOLL ; 1a db DECO_BIG_ONIX_DOLL ; 1b db DECO_BIG_LAPRAS_DOLL ; 1c diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm index e120ec4e..9cb15130 100644 --- a/data/events/special_pointers.asm +++ b/data/events/special_pointers.asm @@ -4,11 +4,11 @@ add_special: MACRO ; Some ROM0 specials have a nonzero bank. \1Special:: -IF _NARG == 1 +if _NARG == 1 dba \1 -ELSE +else dbw \2, \1 -ENDC +endc ENDM SpecialsPointers:: diff --git a/data/growth_rates.asm b/data/growth_rates.asm index 92948b3d..cd07fc13 100644 --- a/data/growth_rates.asm +++ b/data/growth_rates.asm @@ -11,9 +11,11 @@ ENDM GrowthRates: ; entries correspond to GROWTH_* (see constants/pokemon_data_constants.asm) + table_width 4, GrowthRates growth_rate 1, 1, 0, 0, 0 ; Medium Fast growth_rate 3, 4, 10, 0, 30 ; Slightly Fast growth_rate 3, 4, 20, 0, 70 ; Slightly Slow growth_rate 6, 5, -15, 100, 140 ; Medium Slow growth_rate 4, 5, 0, 0, 0 ; Fast growth_rate 5, 4, 0, 0, 0 ; Slow + assert_table_length NUM_GROWTH_RATES diff --git a/data/items/pocket_names.asm b/data/items/pocket_names.asm index 880e08fe..9669c527 100644 --- a/data/items/pocket_names.asm +++ b/data/items/pocket_names.asm @@ -1,9 +1,11 @@ ItemPocketNames: ; entries correspond to item type constants + table_width 2, ItemPocketNames dw .Item dw .Key dw .Ball dw .TM + assert_table_length NUM_ITEM_TYPES .Item: db "ITEM POCKET@" .Key: db "KEY POCKET@" diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index ed8cc6c2..47e92c59 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -17,6 +17,7 @@ endc PURGE MOVE_FOR_TM n = n + 1 endr + assert_table_length NUM_TMS ; HMs n = 1 @@ -30,7 +31,6 @@ endc PURGE MOVE_FOR_HM n = n + 1 endr - assert_table_length NUM_TM_HM db 0 ; end diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm index 60a71813..5bc0e0eb 100644 --- a/data/sprites/map_objects.asm +++ b/data/sprites/map_objects.asm @@ -298,12 +298,12 @@ SpriteMovementData:: db 0 ; flags2 db SWIMMING ; palette flags -; 25 + assert_table_length NUM_SPRITEMOVEDATA + +; unused db SPRITEMOVEFN_00 ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action db 0 ; flags1 db 0 ; flags2 db 0 ; palette flags - - assert_table_length NUM_SPRITEMOVEDATA + 1 diff --git a/data/wild/fish.asm b/data/wild/fish.asm index b849b933..5795dd80 100644 --- a/data/wild/fish.asm +++ b/data/wild/fish.asm @@ -2,7 +2,8 @@ time_group EQUS "0," ; use the nth TimeFishGroups entry fishgroup: MACRO ; chance, old rod, good rod, super rod - dbwww \1, \2, \3, \4 + db \1 + dw \2, \3, \4 ENDM FishGroups: |