diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/collision_constants.asm | 16 | ||||
| -rw-r--r-- | constants/event_flags.asm | 20 | ||||
| -rw-r--r-- | constants/item_constants.asm | 2 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 2 | ||||
| -rw-r--r-- | constants/scgb_constants.asm | 2 | ||||
| -rw-r--r-- | constants/sprite_anim_constants.asm | 38 |
6 files changed, 41 insertions, 39 deletions
diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index 420122ac..c965b2f5 100644 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -20,8 +20,8 @@ COLL_TALL_GRASS EQU $18 COLL_CUT_TREE_1A EQU $1a ; unused COLL_LONG_GRASS_1C EQU $1c ; unused COLL_HEADBUTT_TREE_1D EQU $1d ; unused -COLL_1E EQU $1e ; ? -COLL_1F EQU $1f ; ? +COLL_1E EQU $1e ; garbage +COLL_1F EQU $1f ; garbage COLL_WATER_21 EQU $21 ; unused COLL_ICE EQU $23 COLL_WHIRLPOOL EQU $24 @@ -34,7 +34,7 @@ COLL_WATERFALL_RIGHT EQU $30 ; unused COLL_WATERFALL_LEFT EQU $31 ; unused COLL_WATERFALL_UP EQU $32 ; unused COLL_WATERFALL EQU $33 -COLL_36 EQU $36 ; ? +COLL_36 EQU $36 ; garbage COLL_CURRENT_RIGHT EQU $38 ; unused COLL_CURRENT_LEFT EQU $39 ; unused COLL_CURRENT_UP EQU $3a ; unused @@ -47,8 +47,8 @@ COLL_WALK_DOWN EQU $44 ; unused COLL_BRAKE_45 EQU $45 ; garbage COLL_BRAKE_46 EQU $46 ; unused COLL_BRAKE_47 EQU $47 ; unused -COLL_GRASS_48 EQU $48 -COLL_GRASS_49 EQU $49 +COLL_GRASS_48 EQU $48 ; garbage +COLL_GRASS_49 EQU $49 ; garbage COLL_GRASS_4A EQU $4a ; garbage COLL_GRASS_4B EQU $4b ; garbage COLL_GRASS_4C EQU $4c ; unused @@ -63,7 +63,7 @@ COLL_BRAKE_57 EQU $57 ; unused COLL_5B EQU $5b ; garbage COLL_PIT EQU $60 COLL_VIRTUAL_BOY EQU $61 ; garbage -COLL_63 EQU $63 ; ? +COLL_63 EQU $63 ; garbage COLL_64 EQU $64 ; garbage COLL_65 EQU $65 ; garbage COLL_PIT_68 EQU $68 ; unused @@ -83,8 +83,8 @@ COLL_WARP_PANEL EQU $7c COLL_DOOR_7D EQU $7d ; unused COLL_WARP_CARPET_RIGHT EQU $7e COLL_WARP_7F EQU $7f ; unused -COLL_88 EQU $88 ; ? -COLL_89 EQU $89 ; ? +COLL_88 EQU $88 ; garbage +COLL_89 EQU $89 ; garbage COLL_COUNTER EQU $90 COLL_BOOKSHELF EQU $91 COLL_PC EQU $93 diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 6808cd8a..db0cc597 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1836,16 +1836,16 @@ const EVENT_DAY_CARE_MAN_ON_ROUTE_34 const EVENT_DAY_CARE_MON_1 const EVENT_DAY_CARE_MON_2 - const EVENT_ILEX_FOREST_FARFETCHD1 - const EVENT_ILEX_FOREST_FARFETCHD2 - const EVENT_ILEX_FOREST_FARFETCHD3 - const EVENT_ILEX_FOREST_FARFETCHD4 - const EVENT_ILEX_FOREST_FARFETCHD5 - const EVENT_ILEX_FOREST_FARFETCHD6 - const EVENT_ILEX_FOREST_FARFETCHD7 - const EVENT_ILEX_FOREST_FARFETCHD8 - const EVENT_ILEX_FOREST_FARFETCHD9 - const EVENT_ILEX_FOREST_FARFETCHD10 + const EVENT_ILEX_FOREST_FARFETCHD_1 + const EVENT_ILEX_FOREST_FARFETCHD_2 + const EVENT_ILEX_FOREST_FARFETCHD_3 + const EVENT_ILEX_FOREST_FARFETCHD_4 + const EVENT_ILEX_FOREST_FARFETCHD_5 + const EVENT_ILEX_FOREST_FARFETCHD_6 + const EVENT_ILEX_FOREST_FARFETCHD_7 + const EVENT_ILEX_FOREST_FARFETCHD_8 + const EVENT_ILEX_FOREST_FARFETCHD_9 + const EVENT_ILEX_FOREST_FARFETCHD_10 const EVENT_ILEX_FOREST_APPRENTICE const EVENT_ILEX_FOREST_CHARCOAL_MASTER const EVENT_CHARCOAL_KILN_FARFETCH_D diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 6578ce76..1fbdadae 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -278,6 +278,8 @@ ENDM add_hm WATERFALL ; f9 NUM_HMS EQU const_value - HM01 +NUM_TM_HM EQU __enum__ - 1 + const ITEM_FA ; fa USE_SCRIPT_VAR EQU $00 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index fcc76549..20b31395 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -63,7 +63,7 @@ GENDER_UNKNOWN EQU -1 const EGG_DRAGON ; e const EGG_NONE ; f (Undiscovered) -; pokedex entries (see data/pokemon/dex_entries.asm) +; pokedex entries (see data/pokemon/dex_entries_*.asm) NUM_DEX_ENTRY_BANKS EQU 4 ; party_struct members (see macros/wram.asm) diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index 2b52f7a3..80bfcfc2 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -31,7 +31,7 @@ const SCGB_TRAINER_OR_MON_FRONTPIC_PALS const SCGB_MYSTERY_GIFT const SCGB_1E - const SCGB_POKEDEX_5_5 + const SCGB_POKEDEX_5X5 SCGB_PARTY_MENU_HP_PALS EQU -4 SCGB_RAM EQU -1 diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 2ca59e0f..9926b19d 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -1,21 +1,21 @@ ; sprite_anim_struct members (see macros/wram.asm) const_def - const SPRITEANIMSTRUCT_INDEX ; 00 - const SPRITEANIMSTRUCT_FRAMESET_ID ; 01 - const SPRITEANIMSTRUCT_ANIM_SEQ_ID ; 02 - const SPRITEANIMSTRUCT_TILE_ID ; 03 - const SPRITEANIMSTRUCT_XCOORD ; 04 - const SPRITEANIMSTRUCT_YCOORD ; 05 - const SPRITEANIMSTRUCT_XOFFSET ; 06 - const SPRITEANIMSTRUCT_YOFFSET ; 07 - const SPRITEANIMSTRUCT_DURATION ; 08 - const SPRITEANIMSTRUCT_DURATIONOFFSET ; 09 - const SPRITEANIMSTRUCT_FRAME ; 0a - const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; 0b - const SPRITEANIMSTRUCT_0C ; 0c - const SPRITEANIMSTRUCT_0D ; 0d - const SPRITEANIMSTRUCT_0E ; 0e - const SPRITEANIMSTRUCT_0F ; 0f + const SPRITEANIMSTRUCT_INDEX ; 0 + const SPRITEANIMSTRUCT_FRAMESET_ID ; 1 + const SPRITEANIMSTRUCT_ANIM_SEQ_ID ; 2 + const SPRITEANIMSTRUCT_TILE_ID ; 3 + const SPRITEANIMSTRUCT_XCOORD ; 4 + const SPRITEANIMSTRUCT_YCOORD ; 5 + const SPRITEANIMSTRUCT_XOFFSET ; 6 + const SPRITEANIMSTRUCT_YOFFSET ; 7 + const SPRITEANIMSTRUCT_DURATION ; 8 + const SPRITEANIMSTRUCT_DURATIONOFFSET ; 9 + const SPRITEANIMSTRUCT_FRAME ; a + const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; b + const SPRITEANIMSTRUCT_0C ; c + const SPRITEANIMSTRUCT_0D ; d + const SPRITEANIMSTRUCT_0E ; e + const SPRITEANIMSTRUCT_0F ; f SPRITEANIMSTRUCT_LENGTH EQU const_value NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs @@ -65,7 +65,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs const SPRITE_ANIM_INDEX_CUT_TREE ; 29 const SPRITE_ANIM_INDEX_FLY_LEAF ; 2a const SPRITE_ANIM_INDEX_EGG_CRACK ; 2b - const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH ; 2c + const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA ; 2c const SPRITE_ANIM_INDEX_HEADBUTT ; 2d const SPRITE_ANIM_INDEX_EGG_HATCH ; 2e @@ -162,7 +162,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT ; 2b const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB ; 2c const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED ; 2d - const SPRITE_ANIM_FRAMESET_UNUSED_1C ; 2e + const SPRITE_ANIM_FRAMESET_UNUSED_2E ; 2e const SPRITE_ANIM_FRAMESET_LEAF ; 2f const SPRITE_ANIM_FRAMESET_CUT_TREE ; 30 const SPRITE_ANIM_FRAMESET_EGG_CRACK ; 31 @@ -183,7 +183,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs const SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2 ; 05 const SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1 ; 06 const SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2 ; 07 - const SPRITE_ANIM_OAMSET_UNUSED_LAPRAS ; 08 + const SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS ; 08 const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1 ; 09 const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2 ; 0a const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 ; 0b |