Miscellaneous cleanup

This commit is contained in:
Rangi
2021-03-22 16:41:17 -04:00
parent 8daf8fe19c
commit dbe2360ecd
17 changed files with 65 additions and 46 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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@"

View File

@@ -17,6 +17,7 @@ endc
PURGE MOVE_FOR_TM
n = n + 1
endr
assert_table_length NUM_TMS
; HMs
n = 1
@@ -30,6 +31,7 @@ endc
PURGE MOVE_FOR_HM
n = n + 1
endr
assert_table_length NUM_TMS + NUM_HMS
; Move tutor
n = 1
@@ -43,7 +45,6 @@ endc
PURGE MOVE_FOR_MT
n = n + 1
endr
assert_table_length NUM_TM_HM_TUTOR
db 0 ; end

View File

@@ -13,7 +13,7 @@ BuenasPasswordTable:
dw .RadioStations
assert_table_length NUM_PASSWORD_CATEGORIES
; string type, points, option 1, option 2, option 3
; string type, points, option 1, option 2, option 3
.JohtoStarters: db BUENA_MON, 10, CYNDAQUIL, TOTODILE, CHIKORITA
.Beverages: db BUENA_ITEM, 12, FRESH_WATER, SODA_POP, LEMONADE
.HealingItems: db BUENA_ITEM, 12, POTION, ANTIDOTE, PARLYZ_HEAL

View File

@@ -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

View File

@@ -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: