diff options
Diffstat (limited to 'constants')
-rw-r--r-- | constants/credits_constants.asm | 2 | ||||
-rw-r--r-- | constants/engine_flags.asm | 48 | ||||
-rw-r--r-- | constants/event_flags.asm | 6 | ||||
-rw-r--r-- | constants/sprite_anim_constants.asm | 24 |
4 files changed, 40 insertions, 40 deletions
diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm index 7b23e11e1..a9669b05d 100644 --- a/constants/credits_constants.asm +++ b/constants/credits_constants.asm @@ -1,4 +1,4 @@ -; CreditsStrings indexes (see data/credits_strings.asm) +; CreditsStringsPointers indexes (see data/credits_strings.asm) const_def const SATOSHI_TAJIRI const JUNICHI_MASUDA diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 6c797a2d5..074519e81 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -122,30 +122,30 @@ ; wCelebiEvent const ENGINE_FOREST_IS_RESTLESS ; wDailyRematchFlags - const ENGINE_JACK - const ENGINE_HUEY - const ENGINE_GAVEN - const ENGINE_BETH - const ENGINE_JOSE - const ENGINE_REENA - const ENGINE_JOEY - const ENGINE_WADE - const ENGINE_RALPH - const ENGINE_LIZ - const ENGINE_ANTHONY - const ENGINE_TODD - const ENGINE_GINA - const ENGINE_ARNIE - const ENGINE_ALAN - const ENGINE_DANA - const ENGINE_CHAD - const ENGINE_TULLY - const ENGINE_BRENT - const ENGINE_TIFFANY - const ENGINE_VANCE - const ENGINE_WILTON - const ENGINE_PARRY - const ENGINE_ERIN + const ENGINE_JACK_READY_FOR_REMATCH + const ENGINE_HUEY_READY_FOR_REMATCH + const ENGINE_GAVEN_READY_FOR_REMATCH + const ENGINE_BETH_READY_FOR_REMATCH + const ENGINE_JOSE_READY_FOR_REMATCH + const ENGINE_REENA_READY_FOR_REMATCH + const ENGINE_JOEY_READY_FOR_REMATCH + const ENGINE_WADE_READY_FOR_REMATCH + const ENGINE_RALPH_READY_FOR_REMATCH + const ENGINE_LIZ_READY_FOR_REMATCH + const ENGINE_ANTHONY_READY_FOR_REMATCH + const ENGINE_TODD_READY_FOR_REMATCH + const ENGINE_GINA_READY_FOR_REMATCH + const ENGINE_ARNIE_READY_FOR_REMATCH + const ENGINE_ALAN_READY_FOR_REMATCH + const ENGINE_DANA_READY_FOR_REMATCH + const ENGINE_CHAD_READY_FOR_REMATCH + const ENGINE_TULLY_READY_FOR_REMATCH + const ENGINE_BRENT_READY_FOR_REMATCH + const ENGINE_TIFFANY_READY_FOR_REMATCH + const ENGINE_VANCE_READY_FOR_REMATCH + const ENGINE_WILTON_READY_FOR_REMATCH + const ENGINE_PARRY_READY_FOR_REMATCH + const ENGINE_ERIN_READY_FOR_REMATCH ; wDailyPhoneItemFlags const ENGINE_BEVERLY_HAS_NUGGET const ENGINE_JOSE_HAS_STAR_PIECE diff --git a/constants/event_flags.asm b/constants/event_flags.asm index ee520c8e1..f01e50baa 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -621,11 +621,11 @@ const EVENT_GAVE_KURT_PNK_APRICORN ; Phone events const EVENT_JACK_ASKED_FOR_PHONE_NUMBER - const EVENT_260 + const EVENT_260 ; unused const EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER - const EVENT_262 + const EVENT_262 ; unused const EVENT_HUEY_ASKED_FOR_PHONE_NUMBER - const EVENT_264 + const EVENT_264 ; unused const EVENT_GOT_PROTEIN_FROM_HUEY const EVENT_GOT_HP_UP_FROM_JOEY const EVENT_GOT_CARBOS_FROM_VANCE diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 0fbc4d849..27f017ce0 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -47,7 +47,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs const SPRITE_ANIM_INDEX_CUT_TREE ; 17 const SPRITE_ANIM_INDEX_FLY_LEAF ; 18 const SPRITE_ANIM_INDEX_EGG_CRACK ; 19 - const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH ; 1a + const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA ; 1a const SPRITE_ANIM_INDEX_HEADBUTT ; 1b const SPRITE_ANIM_INDEX_EGG_HATCH ; 1c const SPRITE_ANIM_INDEX_EZCHAT_CURSOR ; 1d @@ -94,7 +94,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs const SPRITE_ANIM_SEQ_FLY_FROM ; 16 const SPRITE_ANIM_SEQ_FLY_LEAF ; 17 const SPRITE_ANIM_SEQ_FLY_TO ; 18 - const SPRITE_ANIM_SEQ_GS_INTRO_HO_OH ; 19 + const SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA ; 19 const SPRITE_ANIM_SEQ_EZCHAT_CURSOR ; 1a const SPRITE_ANIM_SEQ_MOBILE_TRADE_SENT_PULSE ; 1b const SPRITE_ANIM_SEQ_MOBILE_TRADE_OT_PULSE ; 1c @@ -143,7 +143,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs const SPRITE_ANIM_FRAMESET_EGG_HATCH_2 ; 21 const SPRITE_ANIM_FRAMESET_EGG_HATCH_3 ; 22 const SPRITE_ANIM_FRAMESET_EGG_HATCH_4 ; 23 - const SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH ; 24 + const SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA ; 24 const SPRITE_ANIM_FRAMESET_HEADBUTT ; 25 const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1 ; 26 const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 27 @@ -184,10 +184,10 @@ 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_GS_INTRO_LAPRAS_1 ; 08 - const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2 ; 09 - const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 ; 0a - const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4 ; 0b + 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 const SPRITE_ANIM_OAMSET_GS_INTRO_NOTE ; 0c const SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE ; 0d const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1 ; 0e @@ -262,11 +262,11 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs const SPRITE_ANIM_OAMSET_CUT_TREE_4 ; 53 const SPRITE_ANIM_OAMSET_EGG_CRACK ; 54 const SPRITE_ANIM_OAMSET_EGG_HATCH ; 55 - const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1 ; 56 - const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2 ; 57 - const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3 ; 58 - const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4 ; 59 - const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5 ; 5a + const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1 ; 56 + const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2 ; 57 + const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3 ; 58 + const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4 ; 59 + const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5 ; 5a const SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2 ; 5b const SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1 ; 5c const SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2 ; 5d |