diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_flags.asm | 50 | ||||
| -rw-r--r-- | constants/sprite_anim_constants.asm | 3 |
2 files changed, 28 insertions, 25 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 2aa6bf22..bb1476b1 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -621,7 +621,7 @@ const EVENT_GAVE_KURT_PNK_APRICORN ; Phone events const EVENT_JACK_ASKED_FOR_PHONE_NUMBER - const EVENT_JACK_READY_FOR_REMATCH ; 0260 + const EVENT_JACK_READY_FOR_REMATCH ; 260 const EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER const EVENT_BEVERLY_READY_FOR_REMATCH const EVENT_HUEY_ASKED_FOR_PHONE_NUMBER @@ -637,7 +637,7 @@ const EVENT_BETH_ASKED_FOR_PHONE_NUMBER const EVENT_BETH_READY_FOR_REMATCH const EVENT_JOSE_ASKED_FOR_PHONE_NUMBER - const EVENT_JOSE_READY_FOR_REMATCH ; 0270 + const EVENT_JOSE_READY_FOR_REMATCH ; 270 const EVENT_REENA_ASKED_FOR_PHONE_NUMBER const EVENT_REENA_READY_FOR_REMATCH const EVENT_JOEY_ASKED_FOR_PHONE_NUMBER @@ -669,7 +669,7 @@ const EVENT_DEREK_ASKED_FOR_PHONE_NUMBER const EVENT_DEREK_READY_FOR_REMATCH const EVENT_CHRIS_ASKED_FOR_PHONE_NUMBER - const EVENT_CHRIS_READY_FOR_REMATCH + const EVENT_CHRIS_READY_FOR_REMATCH ; 290 const EVENT_BRENT_ASKED_FOR_PHONE_NUMBER const EVENT_BRENT_READY_FOR_REMATCH const EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER @@ -1669,7 +1669,7 @@ ; The map script command macros `disappear` and `appear` set/clear these flags and immediately apply the effect on visibility. ; The map script command macros `setevent` and `clearevent` set/clear these flags, and their effects will be seen when the map is reloaded. ; Johto itemballs - const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB + const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB ; 640 const EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB const EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB const EVENT_VIOLET_CITY_PP_UP @@ -1685,7 +1685,7 @@ const EVENT_TIN_TOWER_4F_PP_UP const EVENT_TIN_TOWER_4F_ESCAPE_ROPE const EVENT_TIN_TOWER_5F_RARE_CANDY - const EVENT_TIN_TOWER_7F_MAX_REVIVE + const EVENT_TIN_TOWER_7F_MAX_REVIVE ; 650 const EVENT_TIN_TOWER_8F_NUGGET const EVENT_TIN_TOWER_8F_MAX_ELIXER const EVENT_TIN_TOWER_8F_FULL_RESTORE @@ -1701,7 +1701,7 @@ const EVENT_UNION_CAVE_1F_AWAKENING const EVENT_UNION_CAVE_B1F_TM_SWIFT const EVENT_UNION_CAVE_B1F_X_DEFEND - const EVENT_UNION_CAVE_B2F_ELIXER + const EVENT_UNION_CAVE_B2F_ELIXER ; 660 const EVENT_UNION_CAVE_B2F_HYPER_POTION const EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION const EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE @@ -1717,7 +1717,7 @@ const EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL const EVENT_TEAM_ROCKET_BASE_B3F_DIRE_HIT const EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN - const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL + const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL ; 670 const EVENT_ILEX_FOREST_REVIVE const EVENT_GOLDENROD_UNDERGROUND_COIN_CASE const EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL @@ -1733,7 +1733,7 @@ const EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE const EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE const EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION - const EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION + const EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION ; 680 const EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY const EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL const EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE @@ -1749,7 +1749,7 @@ const EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST const EVENT_ICE_PATH_B3F_NEVERMELTICE const EVENT_WHIRL_ISLAND_NE_ULTRA_BALL - const EVENT_WHIRL_ISLAND_SW_GUARD_SPEC + const EVENT_WHIRL_ISLAND_SW_GUARD_SPEC ; 690 const EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE const EVENT_WHIRL_ISLAND_B1F_CARBOS const EVENT_WHIRL_ISLAND_B1F_CALCIUM @@ -1765,7 +1765,7 @@ const EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE const EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION const EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL - const EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION ; 6a0 const EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE const EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE const EVENT_VICTORY_ROAD_TM_EARTHQUAKE @@ -1781,7 +1781,7 @@ const EVENT_ROUTE_29_POTION const EVENT_ROUTE_31_ANTIDOTE const EVENT_ROUTE_31_POKE_BALL - const EVENT_ROUTE_32_GREAT_BALL + const EVENT_ROUTE_32_GREAT_BALL ; 6b0 const EVENT_ROUTE_32_POTION const EVENT_ROUTE_35_TM_ROLLOUT const EVENT_ROUTE_42_ULTRA_BALL @@ -1798,7 +1798,7 @@ const EVENT_RIVAL_NEW_BARK_TOWN const EVENT_RIVAL_CHERRYGROVE_CITY const EVENT_RIVAL_AZALEA_TOWN - const EVENT_RIVAL_TEAM_ROCKET_BASE + const EVENT_RIVAL_TEAM_ROCKET_BASE ; 6c0 const EVENT_RIVAL_GOLDENROD_UNDERGROUND const EVENT_RIVAL_VICTORY_ROAD const EVENT_RIVAL_OLIVINE_CITY @@ -1814,7 +1814,7 @@ const EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER const EVENT_RADIO_TOWER_ROCKET_TAKEOVER const EVENT_GOLDENROD_CITY_CIVILIANS - const EVENT_RADIO_TOWER_CIVILIANS_AFTER + const EVENT_RADIO_TOWER_CIVILIANS_AFTER ; 6d0 const EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS const EVENT_OLIVINE_LIGHTHOUSE_JASMINE const EVENT_OLIVINE_GYM_JASMINE @@ -1830,7 +1830,7 @@ const EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE const EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE const EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE - const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 ; 6e0 const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 const EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM @@ -1846,7 +1846,7 @@ const EVENT_ILEX_FOREST_FARFETCHD5 const EVENT_ILEX_FOREST_FARFETCHD6 const EVENT_ILEX_FOREST_FARFETCHD7 - const EVENT_ILEX_FOREST_FARFETCHD8 + const EVENT_ILEX_FOREST_FARFETCHD8 ; 6f0 const EVENT_ILEX_FOREST_FARFETCHD9 const EVENT_ILEX_FOREST_FARFETCHD10 const EVENT_ILEX_FOREST_APPRENTICE @@ -1862,7 +1862,7 @@ const EVENT_KURTS_HOUSE_SLOWPOKE const EVENT_GUIDE_GENT_IN_HIS_HOUSE const EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE - const EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + const EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER ; 700 const EVENT_ELMS_AIDE_IN_LAB const EVENT_COP_IN_ELMS_LAB const EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST @@ -1878,7 +1878,7 @@ const EVENT_BOULDER_IN_ICE_PATH_1A const EVENT_BOULDER_IN_ICE_PATH_2A const EVENT_BOULDER_IN_ICE_PATH_3A - const EVENT_BOULDER_IN_ICE_PATH_4A + const EVENT_BOULDER_IN_ICE_PATH_4A ; 710 const EVENT_MYSTERY_GIFT_DELIVERY_GUY const EVENT_MET_BILL const EVENT_ECRUTEAK_POKE_CENTER_BILL @@ -1894,7 +1894,7 @@ const EVENT_BUG_CATCHING_CONTESTANT_8A const EVENT_BUG_CATCHING_CONTESTANT_9A const EVENT_BUG_CATCHING_CONTESTANT_10A - const EVENT_BUG_CATCHING_CONTESTANT_1B + const EVENT_BUG_CATCHING_CONTESTANT_1B ; 720 const EVENT_BUG_CATCHING_CONTESTANT_2B const EVENT_BUG_CATCHING_CONTESTANT_3B const EVENT_BUG_CATCHING_CONTESTANT_4B @@ -1910,7 +1910,7 @@ const EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR const EVENT_FAST_SHIP_B1F_SAILOR_LEFT const EVENT_FAST_SHIP_B1F_SAILOR_RIGHT - const EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + const EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN ; 730 const EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 const EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 const EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M @@ -1964,12 +1964,12 @@ const EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY const EVENT_BURNED_TOWER_FIREBREATHER_DICK_NORMAL const EVENT_BURNED_TOWER_FIREBREATHER_DICK_ASHES - const EVENT_RANG_CLEAR_BELL_1 - const EVENT_RANG_CLEAR_BELL_2 - const EVENT_FLORIA_AT_FLOWER_SHOP - const EVENT_FLORIA_AT_SUDOWOODO - const EVENT_GOLDENROD_CITY_MOVE_TUTOR - const EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR + const EVENT_RANG_CLEAR_BELL_1 ; rename? + const EVENT_RANG_CLEAR_BELL_2 ; rename? + const EVENT_FLORIA_AT_FLOWER_SHOP ; rename? + const EVENT_FLORIA_AT_SUDOWOODO ; rename? + const EVENT_GOLDENROD_CITY_MOVE_TUTOR ; rename? + const EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR ; rename? ; Kanto people const EVENT_ROUTE_24_ROCKET const EVENT_CERULEAN_GYM_ROCKET diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 04c01743..1df8c368 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -23,6 +23,9 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs SPRITE_ANIM_INDEX_PARTY_MON EQU $00 SPRITE_ANIM_INDEX_GS_TITLE_TRAIL EQU $0f SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR EQU $14 +SPRITE_ANIM_INDEX_GAMEFREAK_LOGO EQU $15 +SPRITE_ANIM_INDEX_GS_INTRO_STAR EQU $16 +SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE EQU $17 SPRITE_ANIM_INDEX_SLOTS_GOLEM EQU $18 SPRITE_ANIM_INDEX_SLOTS_CHANSEY EQU $19 SPRITE_ANIM_INDEX_SLOTS_EGG EQU $1a |