diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/animation_constants.asm | 53 | ||||
| -rwxr-xr-x | constants/battle_tower_constants.asm | 4 | ||||
| -rw-r--r-- | constants/event_flags.asm | 2 | ||||
| -rw-r--r-- | constants/gfx_constants.asm | 42 | ||||
| -rw-r--r-- | constants/map_constants.asm | 2 | ||||
| -rw-r--r-- | constants/map_setup_constants.asm | 2 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 2 | ||||
| -rw-r--r-- | constants/radio_constants.asm | 2 | ||||
| -rw-r--r-- | constants/trainer_constants.asm | 2 |
9 files changed, 56 insertions, 55 deletions
diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm index 5ae2f324f..9ea2f3f34 100644 --- a/constants/animation_constants.asm +++ b/constants/animation_constants.asm @@ -76,7 +76,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const ANIM_OBJ_2F const ANIM_OBJ_30 const ANIM_OBJ_31 - const ANIM_OBJ_32 + const ANIM_OBJ_LIGHTNING_BOLT const ANIM_OBJ_33 const ANIM_OBJ_34 const ANIM_OBJ_35 @@ -136,8 +136,8 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const ANIM_OBJ_6B const ANIM_OBJ_6C const ANIM_OBJ_6D - const ANIM_OBJ_6E - const ANIM_OBJ_6F + const ANIM_OBJ_SKY_ATTACK_FEAROW + const ANIM_OBJ_LICK const ANIM_OBJ_70 const ANIM_OBJ_71 const ANIM_OBJ_72 @@ -168,7 +168,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const ANIM_OBJ_8B const ANIM_OBJ_8C const ANIM_OBJ_8D - const ANIM_OBJ_8E + const ANIM_OBJ_SPIKES const ANIM_OBJ_8F const ANIM_OBJ_90 const ANIM_OBJ_91 @@ -192,7 +192,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const ANIM_OBJ_A3 const ANIM_OBJ_A4 const ANIM_OBJ_A5 - const ANIM_OBJ_A6 + const ANIM_OBJ_PERISH_SONG const ANIM_OBJ_A7 const ANIM_OBJ_A8 const ANIM_OBJ_A9 @@ -742,7 +742,7 @@ const_value SET 1 const ANIM_BG_25 const ANIM_BG_26 const ANIM_BG_27 - const ANIM_BG_28 + const ANIM_BG_WAVE_DEFORM_USER const ANIM_BG_PSYCHIC const ANIM_BG_2A const ANIM_BG_2B @@ -768,6 +768,47 @@ const_value SET 1 const ANIM_MON_EGG1 ; 7 const ANIM_MON_EGG2 ; 8 +const_value SET 1 + const ANIM_GFX_HIT + const ANIM_GFX_CUT + const ANIM_GFX_FIRE + const ANIM_GFX_WATER + const ANIM_GFX_LIGHTNING + const ANIM_GFX_PLANT + const ANIM_GFX_SMOKE + const ANIM_GFX_EXPLOSION + const ANIM_GFX_ROCKS + const ANIM_GFX_ICE + const ANIM_GFX_POKE_BALL + const ANIM_GFX_POISON + const ANIM_GFX_BUBBLE + const ANIM_GFX_NOISE + const ANIM_GFX_POWDER + const ANIM_GFX_BEAM + const ANIM_GFX_SPEED + const ANIM_GFX_CHARGE + const ANIM_GFX_WIND + const ANIM_GFX_WHIP + const ANIM_GFX_EGG + const ANIM_GFX_ROPE + const ANIM_GFX_PSYCHIC + const ANIM_GFX_REFLECT + const ANIM_GFX_STATUS + const ANIM_GFX_SAND + const ANIM_GFX_WEB + const ANIM_GFX_HAZE + const ANIM_GFX_HORN + const ANIM_GFX_FLOWER + const ANIM_GFX_MISC + const ANIM_GFX_SKY_ATTACK + const ANIM_GFX_GLOBE + const ANIM_GFX_SHAPES + const ANIM_GFX_OBJECTS + const ANIM_GFX_SHINE + const ANIM_GFX_ANGELS + const ANIM_GFX_WAVE + const ANIM_GFX_AEROBLAST + const_def const BG_EFFECT_STRUCT_FUNCTION const BG_EFFECT_STRUCT_JT_INDEX diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 1e5b0d625..c690c9b0b 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -19,8 +19,8 @@ const BATTLETOWERACTION_11 ; store 0 in 5:aa8d const BATTLETOWERACTION_12 ; store 1 in 5:aa8d const BATTLETOWERACTION_13 ; check 5:aa8d - const BATTLETOWERACTION_14 ; if save file is yours: bit 0, [sbe4f] - const BATTLETOWERACTION_15 ; set 0, [sbe4f] + const BATTLETOWERACTION_14 ; if save file is yours: bit 0, [s1_be4f] + const BATTLETOWERACTION_15 ; set 0, [s1_be4f] const BATTLETOWERACTION_16 ; update time in SRAM bank 5 const BATTLETOWERACTION_17 ; check time in SRAM bank 5 const BATTLETOWERACTION_18 ; level check diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 775991a87..636d0226c 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1232,7 +1232,7 @@ const EVENT_BEAT_BLACKBELT_LUNG const EVENT_BEAT_BLACKBELT_KENJI const EVENT_BEAT_BLACKBELT_WAI -; Beauti +; Beauty const EVENT_BEAT_BEAUTY_VICTORIA const EVENT_BEAT_BEAUTY_SAMANTHA const EVENT_BEAT_BEAUTY_JULIE diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index c774faa95..9478cd123 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -1,45 +1,3 @@ -const_value SET 1 - const ANIM_GFX_HIT - const ANIM_GFX_CUT - const ANIM_GFX_FIRE - const ANIM_GFX_WATER - const ANIM_GFX_LIGHTNING - const ANIM_GFX_PLANT - const ANIM_GFX_SMOKE - const ANIM_GFX_EXPLOSION - const ANIM_GFX_ROCKS - const ANIM_GFX_ICE - const ANIM_GFX_POKE_BALL - const ANIM_GFX_POISON - const ANIM_GFX_BUBBLE - const ANIM_GFX_NOISE - const ANIM_GFX_POWDER - const ANIM_GFX_BEAM - const ANIM_GFX_SPEED - const ANIM_GFX_CHARGE - const ANIM_GFX_WIND - const ANIM_GFX_WHIP - const ANIM_GFX_EGG - const ANIM_GFX_ROPE - const ANIM_GFX_PSYCHIC - const ANIM_GFX_REFLECT - const ANIM_GFX_STATUS - const ANIM_GFX_SAND - const ANIM_GFX_WEB - const ANIM_GFX_HAZE - const ANIM_GFX_HORN - const ANIM_GFX_FLOWER - const ANIM_GFX_MISC - const ANIM_GFX_SKY_ATTACK - const ANIM_GFX_GLOBE - const ANIM_GFX_SHAPES - const ANIM_GFX_OBJECTS - const ANIM_GFX_SHINE - const ANIM_GFX_ANGELS - const ANIM_GFX_WAVE - const ANIM_GFX_AEROBLAST - - LEN_2BPP_TILE EQU 16 LEN_1BPP_TILE EQU 8 TILES_PER_FRAME EQU 6 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 9be0a775a..4e1dd718f 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -707,3 +707,5 @@ CMDQUEUE_04 EQU 4 CMDQUEUE_05 EQU 5 CMDQUEUE_ENTRY_SIZE EQU 6 CMDQUEUE_CAPACITY EQU 4 + +CMDQUEUE_STONETABLE EQU 2 diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm index 0ee137ead..1a3f60e7b 100644 --- a/constants/map_setup_constants.asm +++ b/constants/map_setup_constants.asm @@ -19,7 +19,7 @@ const_value SET 1 const MAPCALLBACK_SPRITES const MAPCALLBACK_NEWMAP -; Command descriptions from Condensation water's scripting compendium. const_def +; Command descriptions from Condensation water's scripting compendium. const_def const map_lcd_on ; 00 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index d13bafea3..41a6f7da0 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -172,7 +172,7 @@ const_value = 1 const HAPPINESS_REVIVALHERB ; 11 const HAPPINESS_MASSAGE ; 12 const HAPPINESS_GAINLEVELATHOME ; 13 - + const_def const LINK_NULL diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm index 92aa39adc..14bc75a41 100644 --- a/constants/radio_constants.asm +++ b/constants/radio_constants.asm @@ -1,6 +1,6 @@ const_def const OAKS_POKEMON_TALK ; $00 - const POKEDEX_SHOW ; $01 + const POKEDEX_SHOW ; $01 const POKEMON_MUSIC ; $02 const LUCKY_CHANNEL ; $03 const BUENAS_PASSWORD ; $04 diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 06a263348..74b1e341d 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -7,7 +7,7 @@ CHRIS EQU __enum__ const PHONECONTACT_BILL const PHONECONTACT_ELM const PHONECONTACT_BUENA - + KRIS EQU __enum__ trainerclass FALKNER ; 1 |