diff options
Diffstat (limited to 'constants')
31 files changed, 973 insertions, 660 deletions
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index c55d4e9d6..58e19462e 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -708,7 +708,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const BATTLEANIMOAMSET_D7 ; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm) -const_value set 1 + const_def 1 const ANIM_BG_FLASH_INVERTED const ANIM_BG_FLASH_WHITE const ANIM_BG_WHITE_HUES @@ -764,7 +764,7 @@ const_value set 1 const ANIM_BG_35 ; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm) -const_value set 1 + const_def 1 const ANIM_GFX_HIT const ANIM_GFX_CUT const ANIM_GFX_FIRE diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 2355cc5d1..b1f57514a 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -55,7 +55,7 @@ MOVE_LENGTH EQU const_value ; indexes for: ; - wPlayerStats and wEnemyStats (see wram.asm) ; - party_struct and battle_struct members (see macros/wram.asm) -const_value set 1 + const_def 1 const STAT_HP const STAT_ATK const STAT_DEF @@ -76,7 +76,7 @@ ATKDEFDV_SHINY EQU $EA SPDSPCDV_SHINY EQU $AA ; battle classes (wBattleMode values) -const_value set 1 + const_def 1 const WILD_BATTLE const TRAINER_BATTLE @@ -96,7 +96,7 @@ const_value set 1 const BATTLETYPE_CELEBI const BATTLETYPE_SUICUNE -; GetBattleVar and GetBattleVarAddr arguments (see home/battle.asm) +; BattleVarPairs indexes (see home/battle.asm) const_def const BATTLE_VARS_SUBSTATUS1 const BATTLE_VARS_SUBSTATUS2 @@ -120,7 +120,7 @@ const_value set 1 const BATTLE_VARS_LAST_MOVE const BATTLE_VARS_LAST_MOVE_OPP -; GetBattleVar and GetBattleVarAddr internal indexes (see home/battle.asm) +; BattleVarLocations indexes (see home/battle.asm) const_def const PLAYER_SUBSTATUS_1 const ENEMY_SUBSTATUS_1 @@ -151,7 +151,7 @@ const_value set 1 ; status condition bit flags SLP EQU %111 ; 0-7 turns -const_value set 3 + const_def 3 const PSN const BRN const FRZ diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 71b8de8be..81e1880a0 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -47,7 +47,7 @@ BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * (P MOBILE_EVENT_OBJECT_GS_BALL EQU $b ; BattleTowerText arguments (see engine/events/battle_tower/trainer_text.asm) -const_value set 1 + const_def 1 const BATTLETOWERTEXT_INTRO const BATTLETOWERTEXT_WIN_TEXT const BATTLETOWERTEXT_LOSS_TEXT diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm index fba7583c0..7b23e11e1 100644 --- a/constants/credits_constants.asm +++ b/constants/credits_constants.asm @@ -105,7 +105,7 @@ const PAAD_TESTING ; CreditsScript indexes (see data/credits_script.asm) -const_value set -7 + const_def -7 const CREDITS_THEEND const CREDITS_WAIT2 const CREDITS_MUSIC diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index 84fcdb94d..3b0230965 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -121,8 +121,7 @@ __enum__ = 0 deco GEODUDE_DOLL deco MACHOP_DOLL deco TENTACOOL_DOLL +NUM_NON_TROPHY_DECOS = __enum__ deco GOLD_TROPHY_DOLL deco SILVER_TROPHY_DOLL - NUM_DECOS = __enum__ -NUM_NON_TROPHY_DECOS = NUM_DECOS +- 2 diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index ad8632db0..7941f3b10 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -13,13 +13,13 @@ const ENGINE_DAY_CARE_LADY_HAS_MON ; wMomSavingMoney const ENGINE_MOM_SAVING_MONEY - const ENGINE_DST + const ENGINE_MOM_ACTIVE ; wUnusedTwoDayTimerOn const ENGINE_0A ; wStatusFlags const ENGINE_POKEDEX const ENGINE_UNOWN_DEX - const ENGINE_POKERUS + const ENGINE_CAUGHT_POKERUS const ENGINE_ROCKET_SIGNAL_ON_CH20 const ENGINE_CREDITS_SKIP const ENGINE_BUG_CONTEST_ON ; 10 @@ -28,8 +28,8 @@ const ENGINE_SAFARI_ZONE const ENGINE_ROCKETS_IN_RADIO_TOWER const ENGINE_BIKE_SHOP_CALL_ENABLED - const ENGINE_GIVE_POKERUS - const ENGINE_FLORIA + const ENGINE_15 + const ENGINE_REACHED_GOLDENROD const ENGINE_ROCKETS_IN_MAHOGANY ; wBikeFlags const ENGINE_STRENGTH_ACTIVE @@ -54,16 +54,16 @@ const ENGINE_VOLCANOBADGE const ENGINE_EARTHBADGE ; wUnlockedUnowns - const ENGINE_UNLOCKED_UNOWNS_1 - const ENGINE_UNLOCKED_UNOWNS_2 - const ENGINE_UNLOCKED_UNOWNS_3 - const ENGINE_UNLOCKED_UNOWNS_4 - const ENGINE_UNLOCKED_UNOWNS_5 - const ENGINE_UNLOCKED_UNOWNS_6 ; 30 - const ENGINE_UNLOCKED_UNOWNS_7 - const ENGINE_UNLOCKED_UNOWNS_8 + const ENGINE_UNLOCKED_UNOWNS_A_TO_K + const ENGINE_UNLOCKED_UNOWNS_L_TO_R + const ENGINE_UNLOCKED_UNOWNS_S_TO_W + const ENGINE_UNLOCKED_UNOWNS_X_TO_Z + const ENGINE_UNLOCKED_UNOWNS_UNUSED_4 + const ENGINE_UNLOCKED_UNOWNS_UNUSED_5 ; 30 + const ENGINE_UNLOCKED_UNOWNS_UNUSED_6 + const ENGINE_UNLOCKED_UNOWNS_UNUSED_7 ; wVisitedSpawns - const ENGINE_FLYPOINT_KRISS_HOUSE + const ENGINE_FLYPOINT_PLAYERS_HOUSE const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER const ENGINE_FLYPOINT_PALLET const ENGINE_FLYPOINT_VIRIDIAN @@ -97,18 +97,18 @@ ; wDailyFlags const ENGINE_KURT_MAKING_BALLS ; 50 const ENGINE_DAILY_BUG_CONTEST - const ENGINE_SPECIAL_WILDDATA + const ENGINE_FISH_SWARM const ENGINE_TIME_CAPSULE const ENGINE_ALL_FRUIT_TREES - const ENGINE_SHUCKLE_GIVEN + const ENGINE_GOT_SHUCKIE_TODAY const ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED const ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY ; wWeeklyFlags const ENGINE_MT_MOON_SQUARE_CLEFAIRY const ENGINE_UNION_CAVE_LAPRAS const ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - const ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT - const ENGINE_TEA_IN_BLUES_HOUSE + const ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN + const ENGINE_DAISYS_GROOMING const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT const ENGINE_DAILY_MOVE_TUTOR const ENGINE_BUENAS_PASSWORD @@ -120,7 +120,7 @@ ; wPlayerGender const ENGINE_PLAYER_IS_FEMALE ; wCelebiEvent - const ENGINE_HAVE_EXAMINED_GS_BALL + const ENGINE_FOREST_IS_RESTLESS ; wDailyRematchFlags const ENGINE_JACK const ENGINE_HUEY diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 9ee7ff40a..879f12852 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1,14 +1,14 @@ ; wEventFlags bit flags const_def ; The first eight flags are reset upon reloading the map - const EVENT_GAVE_KURT_APRICORNS ; 000 - const EVENT_RECEIVED_BALLS_FROM_KURT - const EVENT_DRAGON_SHRINE_QUESTION_2 - const EVENT_DRAGON_SHRINE_QUESTION_3 - const EVENT_DRAGON_SHRINE_QUESTION_4 - const EVENT_DRAGON_SHRINE_QUESTION_5 - const EVENT_JUST_RECEIVED_DRATINI - const EVENT_IN_YOUR_ROOM + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 ; 000 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 + const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 ; Johto Gym Leader TM gifts const EVENT_GOT_TM31_MUD_SLAP const EVENT_GOT_TM49_FURY_CUTTER @@ -730,7 +730,7 @@ const EVENT_DECO_GEODUDE_DOLL const EVENT_DECO_MACHOP_DOLL const EVENT_DECO_TENTACOOL_DOLL - const EVENT_KRISS_ROOM_POSTER + const EVENT_PLAYERS_ROOM_POSTER const EVENT_DECO_GOLD_TROPHY const EVENT_DECO_SILVER_TROPHY const EVENT_DECO_BIG_SNORLAX_DOLL @@ -1806,8 +1806,8 @@ const EVENT_RIVAL_SPROUT_TOWER const EVENT_RIVAL_BURNED_TOWER const EVENT_RIVAL_DRAGONS_DEN - const EVENT_KRISS_HOUSE_MOM_1 - const EVENT_KRISS_HOUSE_MOM_2 + const EVENT_PLAYERS_HOUSE_MOM_1 + const EVENT_PLAYERS_HOUSE_MOM_2 const EVENT_MR_POKEMONS_HOUSE_OAK const EVENT_VIOLET_CITY_EARL const EVENT_EARLS_ACADEMY_EARL @@ -1928,10 +1928,10 @@ const EVENT_KURTS_HOUSE_KURT_1 const EVENT_KURTS_HOUSE_KURT_2 const EVENT_SLOWPOKE_WELL_KURT ; 740 - const EVENT_KRISS_HOUSE_2F_CONSOLE - const EVENT_KRISS_HOUSE_2F_DOLL_1 - const EVENT_KRISS_HOUSE_2F_DOLL_2 - const EVENT_KRISS_HOUSE_2F_BIG_DOLL + const EVENT_PLAYERS_HOUSE_2F_CONSOLE + const EVENT_PLAYERS_HOUSE_2F_DOLL_1 + const EVENT_PLAYERS_HOUSE_2F_DOLL_2 + const EVENT_PLAYERS_HOUSE_2F_BIG_DOLL const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY const EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY @@ -2012,8 +2012,8 @@ const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS const EVENT_DRAGON_SHRINE_CLAIR ; 790 const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER - const EVENT_KRISS_HOUSE_1F_NEIGHBOR - const EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + const EVENT_PLAYERS_HOUSE_1F_NEIGHBOR + const EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR const EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM const EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM const EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM @@ -2043,7 +2043,7 @@ const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY const EVENT_SAW_SUICUNE_ON_ROUTE_42 const EVENT_SAW_SUICUNE_ON_ROUTE_36 ; 7b0 - const EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + const EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE const EVENT_TIN_TOWER_1F_SUICUNE const EVENT_TIN_TOWER_1F_ENTEI const EVENT_TIN_TOWER_1F_RAIKOU diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 6ac7dbba4..d0f8b2b62 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -3,9 +3,12 @@ LEN_1BPP_TILE EQU 1 * TILE_WIDTH ; bytes LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes NUM_PAL_COLORS EQU 4 +PAL_COLOR_SIZE EQU 2 +PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff + SCREEN_WIDTH EQU 20 ; tiles SCREEN_HEIGHT EQU 18 ; tiles SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels @@ -16,11 +19,18 @@ BG_MAP_HEIGHT EQU 32 ; tiles WMISC_WIDTH EQU 6 * 4 WMISC_HEIGHT EQU 5 * 4 + HP_BAR_LENGTH EQU 6 ; tiles EXP_BAR_LENGTH EQU 8 ; tiles HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels +; GetHPPal return values (see home.asm) +HP_GREEN EQU 0 +HP_YELLOW EQU 1 +HP_RED EQU 2 + + ; sprite_oam_struct members (see macros/wram.asm) const_def const SPRITEOAMSTRUCT_YCOORD ; 0 @@ -29,3 +39,16 @@ EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels const SPRITEOAMSTRUCT_ATTRIBUTES ; 3 SPRITEOAMSTRUCT_LENGTH EQU const_value NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM + + +; PokeAnims indexes (see engine/pic_animation.asm) + const_def + const ANIM_MON_SLOW + const ANIM_MON_NORMAL + const ANIM_MON_MENU + const ANIM_MON_TRADE + const ANIM_MON_EVOLVE + const ANIM_MON_HATCH + const ANIM_MON_UNUSED + const ANIM_MON_EGG1 + const ANIM_MON_EGG2 diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 0914e7ab6..455af6d12 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -288,7 +288,7 @@ NUM_HMS = const_value - HM01 add_mt FLAMETHROWER add_mt THUNDERBOLT add_mt ICE_BEAM -NUM_TM_HM_TUTOR = __enum__ +- 1 +NUM_TM_HM_TUTOR = __enum__ + -1 USE_SCRIPT_VAR EQU $00 ITEM_FROM_MEM EQU $ff diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm index b3a35d72b..1af3c47ac 100644 --- a/constants/item_data_constants.asm +++ b/constants/item_data_constants.asm @@ -10,7 +10,7 @@ ITEMATTR_STRUCT_LENGTH EQU const_value ; item types -const_value set 1 + const_def 1 const ITEM ; 1 const KEY_ITEM ; 2 const BALL ; 3 @@ -18,14 +18,18 @@ const_value set 1 ; item menu types ; UseItem.dw indexes (see engine/pack.asm) +; UseRegisteredItem.SwitchTo indexes (see engine/select_menu.asm) ITEMMENU_NOUSE EQU 0 ITEMMENU_CURRENT EQU 4 ITEMMENU_PARTY EQU 5 ITEMMENU_CLOSE EQU 6 ; item actions -CANT_SELECT EQU 1 << 6 -CANT_TOSS EQU 1 << 7 +CANT_SELECT_F EQU 6 +CANT_TOSS_F EQU 7 + +CANT_SELECT EQU 1 << CANT_SELECT_F +CANT_TOSS EQU 1 << CANT_TOSS_F ; pack pockets @@ -34,7 +38,7 @@ CANT_TOSS EQU 1 << 7 const BALL_POCKET ; 1 const KEY_ITEM_POCKET ; 2 const TM_HM_POCKET ; 3 -NUM_POCKETS EQU const_value +- 1 +NUM_POCKETS EQU const_value MAX_ITEMS EQU 20 MAX_BALLS EQU 12 @@ -61,7 +65,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct const HELD_7 const HELD_CLEANSE_TAG -const_value set 10 + const_def 10 const HELD_HEAL_POISON const HELD_HEAL_FREEZE const HELD_HEAL_BURN @@ -70,7 +74,7 @@ const_value set 10 const HELD_HEAL_STATUS const HELD_HEAL_CONFUSION -const_value set 20 + const_def 20 const HELD_PREVENT_POISON const HELD_PREVENT_BURN const HELD_PREVENT_FREEZE @@ -78,7 +82,7 @@ const_value set 20 const HELD_PREVENT_PARALYZE const HELD_PREVENT_CONFUSE -const_value set 30 + const_def 30 const HELD_30 const HELD_ATTACK_UP const HELD_DEFENSE_UP @@ -89,12 +93,12 @@ const_value set 30 const HELD_EVASION_UP const HELD_38 -const_value set 40 + const_def 40 const HELD_40 const HELD_41 const HELD_METAL_POWDER -const_value set 50 + const_def 50 const HELD_NORMAL_BOOST const HELD_FIGHTING_BOOST const HELD_FLYING_BOOST @@ -113,7 +117,7 @@ const_value set 50 const HELD_DARK_BOOST const HELD_STEEL_BOOST -const_value set 70 + const_def 70 const HELD_CATCH_CHANCE const HELD_71 const HELD_ESCAPE @@ -170,29 +174,3 @@ const_value set 70 const MART_MT_MOON const MART_INDIGO_PLATEAU const MART_UNDERGROUND - - -; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm) - const_def - const PARTYMENUACTION_CHOOSE_POKEMON - const PARTYMENUACTION_HEALING_ITEM - const PARTYMENUACTION_SWITCH - const PARTYMENUACTION_TEACH_TMHM - const PARTYMENUACTION_MOVE - const PARTYMENUACTION_EVO_STONE - const PARTYMENUACTION_GIVE_MON - const PARTYMENUACTION_GIVE_MON_FEMALE ; unused - const PARTYMENUACTION_GIVE_ITEM - const PARTYMENUACTION_MOBILE ; mobile -; PrintPartyMenuActionText arguments (see engine/party_menu.asm) -const_value set $f0 - const PARTYMENUTEXT_HEAL_PSN - const PARTYMENUTEXT_HEAL_BRN - const PARTYMENUTEXT_HEAL_FRZ - const PARTYMENUTEXT_HEAL_SLP - const PARTYMENUTEXT_HEAL_PAR - const PARTYMENUTEXT_HEAL_HP - const PARTYMENUTEXT_HEAL_ALL - const PARTYMENUTEXT_REVIVE - const PARTYMENUTEXT_LEVEL_UP - const PARTYMENUTEXT_HEAL_CONFUSION diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 204b2cf20..c1f7c3b70 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -145,7 +145,7 @@ ENDM newgroup ; 4 - mapconst ECRUTEAK_HOUSE, 9, 10 ; 1 + mapconst ECRUTEAK_TIN_TOWER_ENTRANCE, 9, 10 ; 1 mapconst WISE_TRIOS_ROOM, 4, 4 ; 2 mapconst ECRUTEAK_POKECENTER_1F, 4, 5 ; 3 mapconst ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4 @@ -245,7 +245,7 @@ ENDM mapconst GOLDENROD_GYM, 9, 10 ; 3 mapconst GOLDENROD_BIKE_SHOP, 4, 4 ; 4 mapconst GOLDENROD_HAPPINESS_RATER, 4, 4 ; 5 - mapconst GOLDENROD_BILLS_HOUSE, 4, 4 ; 6 + mapconst BILLS_FAMILYS_HOUSE, 4, 4 ; 6 mapconst GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7 mapconst GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 mapconst GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 @@ -260,7 +260,7 @@ ENDM mapconst GOLDENROD_DEPT_STORE_ROOF, 4, 8 ; 18 mapconst GOLDENROD_GAME_CORNER, 7, 10 ; 19 mapconst GOLDENROD_POKECENTER_1F, 4, 5 ; 20 - mapconst GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 ; 21 + mapconst POKECOM_CENTER_ADMIN_ROOM_MOBILE, 16, 16 ; 21 mapconst ILEX_FOREST_AZALEA_GATE, 4, 5 ; 22 mapconst ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 23 mapconst DAY_CARE, 4, 5 ; 24 @@ -270,13 +270,13 @@ ENDM mapconst ROUTE_6, 9, 10 ; 1 mapconst ROUTE_11, 9, 20 ; 2 mapconst VERMILION_CITY, 18, 20 ; 3 - mapconst VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4 ; 4 + mapconst VERMILION_FISHING_SPEECH_HOUSE, 4, 4 ; 4 mapconst VERMILION_POKECENTER_1F, 4, 5 ; 5 mapconst VERMILION_POKECENTER_2F_BETA, 4, 8 ; 6 mapconst POKEMON_FAN_CLUB, 4, 5 ; 7 mapconst VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4 ; 8 mapconst VERMILION_MART, 4, 6 ; 9 - mapconst VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10 + mapconst VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10 mapconst VERMILION_GYM, 9, 5 ; 11 mapconst ROUTE_6_SAFFRON_GATE, 4, 5 ; 12 mapconst ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13 @@ -337,7 +337,7 @@ ENDM mapconst FUCHSIA_MART, 4, 6 ; 6 mapconst SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7 mapconst FUCHSIA_GYM, 9, 5 ; 8 - mapconst FUCHSIA_BILL_SPEECH_HOUSE, 4, 4 ; 9 + mapconst BILLS_BROTHERS_HOUSE, 4, 4 ; 9 mapconst FUCHSIA_POKECENTER_1F, 4, 5 ; 10 mapconst FUCHSIA_POKECENTER_2F_BETA, 4, 8 ; 11 mapconst SAFARI_ZONE_WARDENS_HOME, 4, 5 ; 12 @@ -365,7 +365,7 @@ ENDM mapconst ROUTE_28, 9, 20 ; 1 mapconst SILVER_CAVE_OUTSIDE, 18, 20 ; 2 mapconst SILVER_CAVE_POKECENTER_1F, 4, 5 ; 3 - mapconst ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4 ; 4 + mapconst ROUTE_28_STEEL_WING_HOUSE, 4, 4 ; 4 newgroup ; 20 @@ -373,7 +373,7 @@ ENDM mapconst TRADE_CENTER, 4, 5 ; 2 mapconst COLOSSEUM, 4, 5 ; 3 mapconst TIME_CAPSULE, 4, 5 ; 4 - mapconst MOBILE_TRADE_ROOM_MOBILE, 4, 5 ; 5 + mapconst MOBILE_TRADE_ROOM, 4, 5 ; 5 mapconst MOBILE_BATTLE_ROOM, 4, 5 ; 6 newgroup ; 21 @@ -436,7 +436,7 @@ ENDM mapconst VIRIDIAN_MART, 4, 6 ; 8 mapconst VIRIDIAN_POKECENTER_1F, 4, 5 ; 9 mapconst VIRIDIAN_POKECENTER_2F_BETA, 4, 8 ; 10 - mapconst ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4 ; 11 + mapconst ROUTE_2_NUGGET_HOUSE, 4, 4 ; 11 mapconst ROUTE_2_GATE, 4, 5 ; 12 mapconst VICTORY_ROAD_GATE, 9, 10 ; 13 @@ -447,12 +447,12 @@ ENDM mapconst ROUTE_29, 9, 30 ; 3 mapconst NEW_BARK_TOWN, 9, 10 ; 4 mapconst ELMS_LAB, 6, 5 ; 5 - mapconst KRISS_HOUSE_1F, 4, 5 ; 6 - mapconst KRISS_HOUSE_2F, 3, 4 ; 7 - mapconst KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8 + mapconst PLAYERS_HOUSE_1F, 4, 5 ; 6 + mapconst PLAYERS_HOUSE_2F, 3, 4 ; 7 + mapconst PLAYERS_NEIGHBORS_HOUSE, 4, 4 ; 8 mapconst ELMS_HOUSE, 4, 4 ; 9 - mapconst ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10 - mapconst ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 + mapconst ROUTE_26_HEAL_HOUSE, 4, 4 ; 10 + mapconst DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 mapconst ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12 mapconst ROUTE_29_ROUTE_46_GATE, 4, 5 ; 13 @@ -472,7 +472,7 @@ ENDM mapconst COPYCATS_HOUSE_2F, 3, 5 ; 12 mapconst ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13 mapconst ROUTE_5_SAFFRON_GATE, 4, 5 ; 14 - mapconst ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15 + mapconst ROUTE_5_CLEANSE_TAG_HOUSE, 4, 4 ; 15 newgroup ; 26 @@ -484,6 +484,6 @@ ENDM mapconst CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 ; 6 mapconst GUIDE_GENTS_HOUSE, 4, 4 ; 7 mapconst CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 ; 8 - mapconst ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4 ; 9 + mapconst ROUTE_30_BERRY_HOUSE, 4, 4 ; 9 mapconst MR_POKEMONS_HOUSE, 4, 4 ; 10 mapconst ROUTE_31_VIOLET_GATE, 4, 5 ; 11 diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 2f1b690c3..0178e22b1 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -4,21 +4,20 @@ GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map header struct members (see data/maps/definitions.asm) +; map struct members (see data/maps/maps.asm) const_def - const MAPDEF_MAPDATA_BANK ; 0 - const MAPDEF_TILESET ; 1 - const MAPDEF_ENVIRONMENT ; 2 - const MAPDEF_MAPDATA ; 3 - const MAPDEF_MAPDATA_HI ; 4 - const MAPDEF_LOCATION ; 5 - const MAPDEF_MUSIC ; 6 - const MAPDEF_PALETTE ; 7 - const MAPDEF_FISHGROUP ; 8 -NUM_MAPDEF_ATTRIBUTES EQU const_value + const MAP_MAPATTRIBUTES_BANK ; 0 + const MAP_TILESET ; 1 + const MAP_ENVIRONMENT ; 2 + const MAP_MAPATTRIBUTES ; 3 + const MAP_MAPATTRIBUTES_HI ; 4 + const MAP_LOCATION ; 5 + const MAP_MUSIC ; 6 + const MAP_PALETTE ; 7 + const MAP_FISHGROUP ; 8 ; map environments (wEnvironment) -const_value set 1 + const_def 1 const TOWN const ROUTE const INDOOR @@ -35,7 +34,7 @@ const_value set 1 const PALETTE_MORN const PALETTE_DARK -; fish groups +; FishGroups indexes (see data/wild/fish.asm) const_def const FISHGROUP_NONE const FISHGROUP_SHORE @@ -97,7 +96,7 @@ const_value = -1 const SPAWN_OLIVINE const SPAWN_ECRUTEAK const SPAWN_MAHOGANY - const SPAWN_LAKE + const SPAWN_LAKE_OF_RAGE const SPAWN_BLACKTHORN const SPAWN_MT_SILVER const SPAWN_FAST_SHIP @@ -107,79 +106,3 @@ NUM_SPAWNS EQU const_value ; outdoor sprite limits (see engine/overworld.asm) MAX_OUTDOOR_SPRITES EQU 23 SPRITE_GFX_LIST_CAPACITY EQU $20 - - -; map_object struct members (see macros/wram.asm) - const_def - const MAPOBJECT_OBJECT_STRUCT_ID ; 0 - const MAPOBJECT_SPRITE ; 1 - const MAPOBJECT_Y_COORD ; 2 - const MAPOBJECT_X_COORD ; 3 - const MAPOBJECT_MOVEMENT ; 4 - const MAPOBJECT_RADIUS ; 5 - const MAPOBJECT_HOUR ; 6 - const MAPOBJECT_TIMEOFDAY ; 7 - const MAPOBJECT_COLOR ; 8 - const MAPOBJECT_RANGE ; 9 - const MAPOBJECT_SCRIPT_POINTER ; a - const MAPOBJECT_POINTER_HI ; b - const MAPOBJECT_EVENT_FLAG ; c - const MAPOBJECT_FLAG_HI ; d - const MAPOBJECT_E ; unused - const MAPOBJECT_F ; unused -OBJECT_LENGTH EQU const_value - -MAPOBJECT_SCREEN_HEIGHT EQU 11 -MAPOBJECT_SCREEN_WIDTH EQU 12 - - -; object_struct members (see macros/wram.asm) - const_def - const OBJECT_SPRITE ; 00 - const OBJECT_MAP_OBJECT_INDEX ; 01 - const OBJECT_SPRITE_TILE ; 02 - const OBJECT_MOVEMENTTYPE ; 03 - const OBJECT_FLAGS1 ; 04 - const OBJECT_FLAGS2 ; 05 - const OBJECT_PALETTE ; 06 - const OBJECT_DIRECTION_WALKING ; 07 - const OBJECT_FACING ; 08 - const OBJECT_STEP_TYPE ; 09 - const OBJECT_STEP_DURATION ; 0a - const OBJECT_ACTION ; 0b - const OBJECT_STEP_FRAME ; 0c - const OBJECT_FACING_STEP ; 0d - const OBJECT_NEXT_TILE ; 0e - const OBJECT_STANDING_TILE ; 0f - const OBJECT_NEXT_MAP_X ; 10 - const OBJECT_NEXT_MAP_Y ; 11 - const OBJECT_MAP_X ; 12 - const OBJECT_MAP_Y ; 13 - const OBJECT_INIT_X ; 14 - const OBJECT_INIT_Y ; 15 - const OBJECT_RADIUS ; 16 - const OBJECT_SPRITE_X ; 17 - const OBJECT_SPRITE_Y ; 18 - const OBJECT_SPRITE_X_OFFSET ; 19 - const OBJECT_SPRITE_Y_OFFSET ; 1a - const OBJECT_MOVEMENT_BYTE_INDEX ; 1b - const OBJECT_1C ; 1c - const OBJECT_1D ; 1d - const OBJECT_1E ; 1e - const OBJECT_1F ; 1f - const OBJECT_RANGE ; 20 - ; 21-27 are not used -OBJECT_STRUCT_LENGTH EQU 40 -NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs - -; object_struct OBJECT_FACING values -OW_DOWN EQU DOWN << 2 -OW_UP EQU UP << 2 -OW_LEFT EQU LEFT << 2 -OW_RIGHT EQU RIGHT << 2 - -; object_struct OBJECT_FLAGS1 bit flags -INVISIBLE EQU 0 -FIXED_FACING EQU 2 -SLIDING EQU 3 -EMOTE_OBJECT EQU 7 diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm new file mode 100644 index 000000000..b752b66e8 --- /dev/null +++ b/constants/map_object_constants.asm @@ -0,0 +1,249 @@ +; object_struct members (see macros/wram.asm) + const_def + const OBJECT_SPRITE ; 00 + const OBJECT_MAP_OBJECT_INDEX ; 01 + const OBJECT_SPRITE_TILE ; 02 + const OBJECT_MOVEMENTTYPE ; 03 + const OBJECT_FLAGS1 ; 04 + const OBJECT_FLAGS2 ; 05 + const OBJECT_PALETTE ; 06 + const OBJECT_DIRECTION_WALKING ; 07 + const OBJECT_FACING ; 08 + const OBJECT_STEP_TYPE ; 09 + const OBJECT_STEP_DURATION ; 0a + const OBJECT_ACTION ; 0b + const OBJECT_STEP_FRAME ; 0c + const OBJECT_FACING_STEP ; 0d + const OBJECT_NEXT_TILE ; 0e + const OBJECT_STANDING_TILE ; 0f + const OBJECT_NEXT_MAP_X ; 10 + const OBJECT_NEXT_MAP_Y ; 11 + const OBJECT_MAP_X ; 12 + const OBJECT_MAP_Y ; 13 + const OBJECT_INIT_X ; 14 + const OBJECT_INIT_Y ; 15 + const OBJECT_RADIUS ; 16 + const OBJECT_SPRITE_X ; 17 + const OBJECT_SPRITE_Y ; 18 + const OBJECT_SPRITE_X_OFFSET ; 19 + const OBJECT_SPRITE_Y_OFFSET ; 1a + const OBJECT_MOVEMENT_BYTE_INDEX ; 1b + const OBJECT_1C ; 1c + const OBJECT_1D ; 1d + const OBJECT_1E ; 1e + const OBJECT_1F ; 1f + const OBJECT_RANGE ; 20 + ; 21-27 are not used +OBJECT_STRUCT_LENGTH EQU 40 +NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs + +; object_struct OBJECT_FACING values +OW_DOWN EQU DOWN << 2 +OW_UP EQU UP << 2 +OW_LEFT EQU LEFT << 2 +OW_RIGHT EQU RIGHT << 2 + +; object_struct OBJECT_FLAGS1 bit flags +INVISIBLE EQU 0 +FIXED_FACING EQU 2 +SLIDING EQU 3 +EMOTE_OBJECT EQU 7 + +; object_struct OBJECT_FLAGS2 bit flags +LOW_PRIORITY EQU 0 +HIGH_PRIORITY EQU 1 +OVERHEAD EQU 3 + + +; map_object struct members (see macros/wram.asm) + const_def + const MAPOBJECT_OBJECT_STRUCT_ID ; 0 + const MAPOBJECT_SPRITE ; 1 + const MAPOBJECT_Y_COORD ; 2 + const MAPOBJECT_X_COORD ; 3 + const MAPOBJECT_MOVEMENT ; 4 + const MAPOBJECT_RADIUS ; 5 + const MAPOBJECT_HOUR ; 6 + const MAPOBJECT_TIMEOFDAY ; 7 + const MAPOBJECT_COLOR ; 8 + const MAPOBJECT_RANGE ; 9 + const MAPOBJECT_SCRIPT_POINTER ; a + const MAPOBJECT_POINTER_HI ; b + const MAPOBJECT_EVENT_FLAG ; c + const MAPOBJECT_FLAG_HI ; d + const MAPOBJECT_E ; unused + const MAPOBJECT_F ; unused +OBJECT_LENGTH EQU const_value + +MAPOBJECT_SCREEN_HEIGHT EQU 11 +MAPOBJECT_SCREEN_WIDTH EQU 12 + + +; SpriteMovementData indexes (see data/sprites/map_objects.asm) + const_def + const SPRITEMOVEDATA_00 ; 00 + const SPRITEMOVEDATA_STILL ; 01 + const SPRITEMOVEDATA_WANDER ; 02 + const SPRITEMOVEDATA_SPINRANDOM_SLOW ; 03 + const SPRITEMOVEDATA_WALK_UP_DOWN ; 04 + const SPRITEMOVEDATA_WALK_LEFT_RIGHT ; 05 + const SPRITEMOVEDATA_STANDING_DOWN ; 06 + const SPRITEMOVEDATA_STANDING_UP ; 07 + const SPRITEMOVEDATA_STANDING_LEFT ; 08 + const SPRITEMOVEDATA_STANDING_RIGHT ; 09 + const SPRITEMOVEDATA_SPINRANDOM_FAST ; 0a + const SPRITEMOVEDATA_PLAYER ; 0b + const SPRITEMOVEDATA_0C ; 0c + const SPRITEMOVEDATA_0D ; 0d + const SPRITEMOVEDATA_0E ; 0e + const SPRITEMOVEDATA_0F ; 0f + const SPRITEMOVEDATA_10 ; 10 + const SPRITEMOVEDATA_11 ; 11 + const SPRITEMOVEDATA_12 ; 12 + const SPRITEMOVEDATA_FOLLOWING ; 13 + const SPRITEMOVEDATA_SCRIPTED ; 14 + const SPRITEMOVEDATA_BIGDOLLSYM ; 15 + const SPRITEMOVEDATA_POKEMON ; 16 + const SPRITEMOVEDATA_SUDOWOODO ; 17 + const SPRITEMOVEDATA_SMASHABLE_ROCK ; 18 + const SPRITEMOVEDATA_STRENGTH_BOULDER ; 19 + const SPRITEMOVEDATA_FOLLOWNOTEXACT ; 1a + const SPRITEMOVEDATA_SHADOW ; 1b + const SPRITEMOVEDATA_EMOTE ; 1c + const SPRITEMOVEDATA_SCREENSHAKE ; 1d + const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE ; 1e + const SPRITEMOVEDATA_SPINCLOCKWISE ; 1f + const SPRITEMOVEDATA_BIGDOLLASYM ; 20 + const SPRITEMOVEDATA_BIGDOLL ; 21 + const SPRITEMOVEDATA_BOULDERDUST ; 22 + const SPRITEMOVEDATA_GRASS ; 23 + const SPRITEMOVEDATA_SWIM_WANDER ; 24 +NUM_SPRITEMOVEDATA EQU const_value +SPRITEMOVEDATA_FIELDS EQU 6 + +; MapObjectMovementPattern.Pointers indexes (see engine/map_objects.asm) + const_def + const SPRITEMOVEFN_00 ; 00 + const SPRITEMOVEFN_RANDOM_WALK_Y ; 01 + const SPRITEMOVEFN_RANDOM_WALK_X ; 02 + const SPRITEMOVEFN_RANDOM_WALK_XY ; 03 + const SPRITEMOVEFN_SLOW_RANDOM_SPIN ; 04 + const SPRITEMOVEFN_FAST_RANDOM_SPIN ; 05 + const SPRITEMOVEFN_STANDING ; 06 + const SPRITEMOVEFN_OBEY_DPAD ; 07 + const SPRITEMOVEFN_08 ; 08 + const SPRITEMOVEFN_09 ; 09 + const SPRITEMOVEFN_0A ; 0a + const SPRITEMOVEFN_0B ; 0b + const SPRITEMOVEFN_0C ; 0c + const SPRITEMOVEFN_0D ; 0d + const SPRITEMOVEFN_0E ; 0e + const SPRITEMOVEFN_FOLLOW ; 0f + const SPRITEMOVEFN_SCRIPTED ; 10 + const SPRITEMOVEFN_STRENGTH ; 11 + const SPRITEMOVEFN_FOLLOWNOTEXACT ; 12 + const SPRITEMOVEFN_SHADOW ; 13 + const SPRITEMOVEFN_EMOTE ; 14 + const SPRITEMOVEFN_BIG_SNORLAX ; 15 + const SPRITEMOVEFN_BOUNCE ; 16 + const SPRITEMOVEFN_SCREENSHAKE ; 17 + const SPRITEMOVEFN_SPIN_CLOCKWISE ; 18 + const SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE ; 19 + const SPRITEMOVEFN_BOULDERDUST ; 1a + const SPRITEMOVEFN_GRASS ; 1b + +; StepTypesJumptable indexes (see engine/map_objects.asm) + const_def + const STEP_TYPE_00 ; 00 + const STEP_TYPE_SLEEP ; 01 + const STEP_TYPE_NPC_WALK ; 02 + const STEP_TYPE_03 ; 03 + const STEP_TYPE_04 ; 04 + const STEP_TYPE_05 ; 05 + const STEP_TYPE_PLAYER_WALK ; 06 + const STEP_TYPE_07 ; 07 + const STEP_TYPE_NPC_JUMP ; 08 + const STEP_TYPE_PLAYER_JUMP ; 09 + const STEP_TYPE_HALF_STEP ; 0a + const STEP_TYPE_BUMP ; 0b + const STEP_TYPE_TELEPORT_FROM ; 0c + const STEP_TYPE_TELEPORT_TO ; 0d + const STEP_TYPE_SKYFALL ; 0e + const STEP_TYPE_0F ; 0f + const STEP_TYPE_GOT_BITE ; 10 + const STEP_TYPE_ROCK_SMASH ; 11 + const STEP_TYPE_RETURN_DIG ; 12 + const STEP_TYPE_TRACKING_OBJECT ; 13 + const STEP_TYPE_14 ; 14 + const STEP_TYPE_15 ; 15 + const STEP_TYPE_16 ; 16 + const STEP_TYPE_17 ; 17 + const STEP_TYPE_18 ; 18 + const STEP_TYPE_SKYFALL_TOP ; 19 + +; ObjectActionPairPointers indexes (see engine/map_object_action.asm) + const_def + const OBJECT_ACTION_00 ; 00 + const OBJECT_ACTION_STAND ; 01 + const OBJECT_ACTION_STEP ; 02 + const OBJECT_ACTION_BUMP ; 03 + const OBJECT_ACTION_SPIN ; 04 + const OBJECT_ACTION_SPIN_FLICKER ; 05 + const OBJECT_ACTION_FISHING ; 06 + const OBJECT_ACTION_SHADOW ; 07 + const OBJECT_ACTION_EMOTE ; 08 + const OBJECT_ACTION_BIG_DOLL_SYM ; 09 + const OBJECT_ACTION_BOUNCE ; 0a + const OBJECT_ACTION_WEIRD_TREE ; 0b + const OBJECT_ACTION_BIG_DOLL_ASYM ; 0c + const OBJECT_ACTION_BIG_DOLL ; 0d + const OBJECT_ACTION_BOULDER_DUST ; 0e + const OBJECT_ACTION_GRASS_SHAKE ; 0f + const OBJECT_ACTION_SKYFALL ; 10 + +; Facings indexes (see data/sprites/facings.asm) + const_def + const FACING_STEP_DOWN_0 ; 00 + const FACING_STEP_DOWN_1 ; 01 + const FACING_STEP_DOWN_2 ; 02 + const FACING_STEP_DOWN_3 ; 03 + const FACING_STEP_UP_0 ; 04 + const FACING_STEP_UP_1 ; 05 + const FACING_STEP_UP_2 ; 06 + const FACING_STEP_UP_3 ; 07 + const FACING_STEP_LEFT_0 ; 08 + const FACING_STEP_LEFT_1 ; 09 + const FACING_STEP_LEFT_2 ; 0a + const FACING_STEP_LEFT_3 ; 0b + const FACING_STEP_RIGHT_0 ; 0c + const FACING_STEP_RIGHT_1 ; 0d + const FACING_STEP_RIGHT_2 ; 0e + const FACING_STEP_RIGHT_3 ; 0f + const FACING_FISH_DOWN ; 10 + const FACING_FISH_UP ; 11 + const FACING_FISH_LEFT ; 12 + const FACING_FISH_RIGHT ; 13 + const FACING_EMOTE ; 14 + const FACING_SHADOW ; 15 + const FACING_BIG_DOLL_ASYM ; 16 + const FACING_BIG_DOLL_SYM ; 17 + const FACING_WEIRD_TREE_0 ; 18 + const FACING_WEIRD_TREE_1 ; 19 + const FACING_WEIRD_TREE_2 ; 1a + const FACING_WEIRD_TREE_3 ; 1b + const FACING_BOULDER_DUST_1 ; 1c + const FACING_BOULDER_DUST_2 ; 1d + const FACING_GRASS_1 ; 1e + const FACING_GRASS_2 ; 1f + + +; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm) + const_def + const STEP_SLOW ; 0 + const STEP_WALK ; 1 + const STEP_BIKE ; 2 + const STEP_LEDGE ; 3 + const STEP_ICE ; 4 + const STEP_TURN ; 5 + const STEP_BACK_LEDGE ; 6 + const STEP_WALK_IN_PLACE ; 7 diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm index d9abd6e9b..9c6164169 100644 --- a/constants/map_setup_constants.asm +++ b/constants/map_setup_constants.asm @@ -1,6 +1,6 @@ ; hMapEntryMethod values ; MapSetupScripts indexes (see data/maps/setup_scripts.asm) -const_value set $f1 + const_def $f1 const MAPSETUP_WARP ; f1 const MAPSETUP_CONTINUE ; f2 const MAPSETUP_RELOADMAP ; f3 @@ -44,8 +44,8 @@ const_value set $f1 const map_load_spawn ; 17 const map_load_connection ; 18 const map_load_warp ; 19 - const map_attributes ; 1a - const map_attributes_2 ; 1b + const map_load_attributes ; 1a + const map_load_attributes_2 ; 1b const map_clear_bg_palettes ; 1c const map_fade_out_palettes ; 1d const map_fade_in_palettes ; 1e @@ -67,7 +67,7 @@ const_value set $f1 map_end EQU -1 ; callback types -const_value set 1 + const_def 1 const MAPCALLBACK_TILES const MAPCALLBACK_OBJECTS const MAPCALLBACK_CMDQUEUE diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index 9174159ea..f1ca20ae5 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -1,4 +1,4 @@ -; MenuDataHeader flags +; MenuHeader flags const_def shift_const MENU_RESTORE_TILES ; Will be set if MENU_BACKUP_TILES(_2) is set. shift_const MENU_UNUSED_1 @@ -9,7 +9,7 @@ shift_const MENU_BACKUP_TILES shift_const MENU_BACKUP_TILES_2 -; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuDataHeader2 flags +; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuData flags ; Per flag the comment specifies which menus actually implement it const_def shift_const STATICMENU_DISABLE_B ; VerticalMenu/_2DMenu @@ -21,7 +21,7 @@ shift_const STATICMENU_NO_TOP_SPACING ; VerticalMenu/_2DMenu shift_const STATICMENU_CURSOR ; VerticalMenu/_2DMenu -; ScrollingMenu MenuDataHeader2 flags +; ScrollingMenu MenuData flags const_def shift_const SCROLLINGMENU_CALL_FUNCTION1_CANCEL shift_const SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH @@ -31,3 +31,67 @@ shift_const SCROLLINGMENU_ENABLE_FUNCTION3 shift_const SCROLLINGMENU_ENABLE_START shift_const SCROLLINGMENU_ENABLE_SELECT + + +; MonMenuOptions indexes (see data/mon_menu.asm) +; used by PokemonActionSubmenu (see engine/start_menu.asm) + const_def 1 + ; moves + const MONMENUITEM_CUT ; 1 + const MONMENUITEM_FLY ; 2 + const MONMENUITEM_SURF ; 3 + const MONMENUITEM_STRENGTH ; 4 + const MONMENUITEM_WATERFALL ; 5 + const MONMENUITEM_FLASH ; 6 + const MONMENUITEM_WHIRLPOOL ; 7 + const MONMENUITEM_DIG ; 8 + const MONMENUITEM_TELEPORT ; 9 + const MONMENUITEM_SOFTBOILED ; 10 + const MONMENUITEM_HEADBUTT ; 11 + const MONMENUITEM_ROCKSMASH ; 12 + const MONMENUITEM_MILKDRINK ; 13 + const MONMENUITEM_SWEETSCENT ; 14 + ; options + const MONMENUITEM_STATS ; 15 + const MONMENUITEM_SWITCH ; 16 + const MONMENUITEM_ITEM ; 17 + const MONMENUITEM_CANCEL ; 18 + const MONMENUITEM_MOVE ; 19 + const MONMENUITEM_MAIL ; 20 + const MONMENUITEM_ERROR ; 21 + +; MonMenuOptions categories +MONMENU_FIELD_MOVE EQU 0 +MONMENU_MENUOPTION EQU 1 + +NUM_MONMENU_ITEMS EQU 8 + +; start/select menu return values +HMENURETURN_SCRIPT EQU %10000000 +HMENURETURN_ASM EQU %11111111 + + +; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm) + const_def + const PARTYMENUACTION_CHOOSE_POKEMON + const PARTYMENUACTION_HEALING_ITEM + const PARTYMENUACTION_SWITCH + const PARTYMENUACTION_TEACH_TMHM + const PARTYMENUACTION_MOVE + const PARTYMENUACTION_EVO_STONE + const PARTYMENUACTION_GIVE_MON + const PARTYMENUACTION_GIVE_MON_FEMALE ; unused + const PARTYMENUACTION_GIVE_ITEM + const PARTYMENUACTION_MOBILE ; mobile +; PrintPartyMenuActionText arguments (see engine/party_menu.asm) + const_def $f0 + const PARTYMENUTEXT_HEAL_PSN + const PARTYMENUTEXT_HEAL_BRN + const PARTYMENUTEXT_HEAL_FRZ + const PARTYMENUTEXT_HEAL_SLP + const PARTYMENUTEXT_HEAL_PAR + const PARTYMENUTEXT_HEAL_HP + const PARTYMENUTEXT_HEAL_ALL + const PARTYMENUTEXT_REVIVE + const PARTYMENUTEXT_LEVEL_UP + const PARTYMENUTEXT_HEAL_CONFUSION diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index adcaf9a49..d1423eae0 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -11,11 +11,6 @@ RESET_FLAG EQU 0 SET_FLAG EQU 1 CHECK_FLAG EQU 2 -; GetHPPal return values (see home.asm) -HP_GREEN EQU 0 -HP_YELLOW EQU 1 -HP_RED EQU 2 - ; G/S version ID: 0 = Gold, 1 = Silver (used by checkver) GS_VERSION EQU 0 @@ -23,21 +18,6 @@ GS_VERSION EQU 0 SAVE_CHECK_VALUE_1 EQU 99 SAVE_CHECK_VALUE_2 EQU 127 -; hMenuReturn -HMENURETURN_SCRIPT EQU %10000000 -HMENURETURN_ASM EQU %11111111 - -; DoPlayerMovement.DoStep arguments (see engine/player_movement.asm) - const_def - const STEP_SLOW ; 0 - const STEP_WALK ; 1 - const STEP_BIKE ; 2 - const STEP_LEDGE ; 3 - const STEP_ICE ; 4 - const STEP_TURN ; 5 - const STEP_BACK_LEDGE ; 6 - const STEP_WALK_IN_PLACE ; 7 - ; time of day boundaries MORN_HOUR EQU 4 ; 4 AM DAY_HOUR EQU 10 ; 10 AM @@ -45,44 +25,14 @@ NITE_HOUR EQU 18 ; 6 PM NOON_HOUR EQU 12 ; 12 PM MAX_HOUR EQU 24 ; 12 AM -; boxes -MONS_PER_BOX EQU 20 -NUM_BOXES EQU 14 - -; hall of fame -HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH +- 1) ; species, id, dvs, level, nick -HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator -NUM_HOF_TEAMS = 30 - -MAX_LINK_RECORD EQU 9999 - ; significant money values START_MONEY EQU 3000 MOM_MONEY EQU 2300 MAX_MONEY EQU 999999 MAX_COINS EQU 9999 -; ChangeHappiness arguments (see data/happiness_changes.asm) -const_value = 1 - const HAPPINESS_GAINLEVEL ; 01 - const HAPPINESS_USEDITEM ; 02 - const HAPPINESS_USEDXITEM ; 03 - const HAPPINESS_GYMBATTLE ; 04 - const HAPPINESS_LEARNMOVE ; 05 - const HAPPINESS_FAINTED ; 06 - const HAPPINESS_POISONFAINT ; 07 - const HAPPINESS_BEATENBYSTRONGFOE ; 08 - const HAPPINESS_YOUNGCUT1 ; 09 - const HAPPINESS_YOUNGCUT2 ; 0a - const HAPPINESS_YOUNGCUT3 ; 0b - const HAPPINESS_OLDERCUT1 ; 0c - const HAPPINESS_OLDERCUT2 ; 0d - const HAPPINESS_OLDERCUT3 ; 0e - const HAPPINESS_BITTERPOWDER ; 0f - const HAPPINESS_ENERGYROOT ; 10 - const HAPPINESS_REVIVALHERB ; 11 - const HAPPINESS_MASSAGE ; 12 - const HAPPINESS_GAINLEVELATHOME ; 13 +; link record +MAX_LINK_RECORD EQU 9999 ; day-care MAX_DAY_CARE_EXP EQU $500000 diff --git a/constants/npc_trade_constants.asm b/constants/npc_trade_constants.asm new file mode 100644 index 000000000..653ce3555 --- /dev/null +++ b/constants/npc_trade_constants.asm @@ -0,0 +1,44 @@ + ; npctrade struct members (see data/events/npc_trades.asm) +NPCTRADE_DIALOG EQU 0 ; db +NPCTRADE_GIVEMON EQU 1 ; db +NPCTRADE_GETMON EQU 2 ; db +NPCTRADE_NICK EQU 3 ; ds MON_NAME_LENGTH +NPCTRADE_DVS EQU 14 ; dw +NPCTRADE_ITEM EQU 16 ; db +NPCTRADE_OT_ID EQU 17 ; dw +NPCTRADE_OT_NAME EQU 19 ; ds NAME_LENGTH +NPCTRADE_GENDER EQU 30 ; db +NPCTRADE_PADDING EQU 31 ; db + +; NPCTrades indexes (see data/events/npc_trades.asm) + const_def + const NPC_TRADE_MIKE ; 0 + const NPC_TRADE_KYLE ; 1 + const NPC_TRADE_TIM ; 2 + const NPC_TRADE_EMY ; 3 + const NPC_TRADE_CHRIS ; 4 + const NPC_TRADE_KIM ; 5 + const NPC_TRADE_FOREST ; 6 + +; trade gender limits + const_def + const TRADE_GENDER_EITHER + const TRADE_GENDER_MALE + const TRADE_GENDER_FEMALE + +; TradeTexts indexes (see engine/events/npc_trade.asm) + +; trade dialogs + const_def + const TRADE_DIALOG_INTRO + const TRADE_DIALOG_CANCEL + const TRADE_DIALOG_WRONG + const TRADE_DIALOG_COMPLETE + const TRADE_DIALOG_AFTER + +; trade dialog sets + const_def + const TRADE_DIALOGSET_COLLECTOR + const TRADE_DIALOGSET_HAPPY + const TRADE_DIALOGSET_NEWBIE + const TRADE_DIALOGSET_GIRL diff --git a/constants/npctrade_constants.asm b/constants/npctrade_constants.asm deleted file mode 100644 index 5464e4dbb..000000000 --- a/constants/npctrade_constants.asm +++ /dev/null @@ -1,43 +0,0 @@ -; npctrade struct members (see data/npc_trades.asm) -TRADE_DIALOG EQU 0 -TRADE_GIVEMON EQU 1 -TRADE_GETMON EQU 2 -TRADE_NICK EQU 3 -TRADE_DVS EQU 14 -TRADE_ITEM EQU 16 -TRADE_OT_ID EQU 17 -TRADE_OT_NAME EQU 19 -TRADE_GENDER EQU 30 -TRADE_PADDING EQU 31 - -; NPCTrades indexes (see data/npc_trades.asm) - const_def - const NPCTRADE_MIKE ; 0 - const NPCTRADE_KYLE ; 1 - const NPCTRADE_TIM ; 2 - const NPCTRADE_EMY ; 3 - const NPCTRADE_CHRIS ; 4 - const NPCTRADE_KIM ; 5 - const NPCTRADE_FOREST ; 6 - -; trade gender limits -TRADE_EITHER_GENDER EQU 0 -TRADE_MALE_ONLY EQU 1 -TRADE_FEMALE_ONLY EQU 2 - -; TradeTexts indexes (see engine/npctrade.asm) - -; trade dialogs - const_def - const TRADE_INTRO - const TRADE_CANCEL - const TRADE_WRONG - const TRADE_COMPLETE - const TRADE_AFTER - -; trade dialog sets - const_def - const TRADE_DIALOG_COLLECTOR - const TRADE_DIALOG_HAPPY - const TRADE_DIALOG_NEWBIE - const TRADE_DIALOG_GIRL diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index d4c49c5f5..939ac72f2 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -12,13 +12,13 @@ ; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm) ; - EZChat_SortedPokemon (see data/pokemon/ezchat_order.asm) ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm) -; - Pokered_MonIndices (see data/pokemon/rby_order.asm) +; - Pokered_MonIndices (see data/pokemon/gen1_order.asm) ; - AnimationPointers (see gfx/pokemon/anim_pointers.asm) ; - AnimationIdlePointers (see gfx/pokemon/idle_pointers.asm) ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm) ; - FramesPointers (see gfx/pokemon/frame_pointers.asm) ; - Footprints (see gfx/footprints.asm) -const_value set 1 + const_def 1 const BULBASAUR ; 01 const IVYSAUR ; 02 const VENUSAUR ; 03 @@ -271,10 +271,44 @@ JOHTO_POKEMON EQU const_value const LUGIA ; f9 const HO_OH ; fa const CELEBI ; fb -NUM_POKEMON EQU const_value +- 1 +NUM_POKEMON EQU const_value + -1 const MON_FC ; fc const EGG ; fd const MON_FE ; fe -; number of Unown forms -NUM_UNOWN EQU 26 +; Unown forms +; indexes for: +; - UnownWords (see data/pokemon/unown_words.asm) +; - UnownPicPointers (see data/pokemon/unown_pic_pointers.asm) +; - UnownAnimationPointers (see gfx/pokemon/unown_anim_pointers.asm) +; - UnownAnimationIdlePointers (see gfx/pokemon/unown_idle_pointers.asm) +; - UnownBitmasksPointers (see gfx/pokemon/unown_bitmask_pointers.asm) +; - UnownFramesPointers (see gfx/pokemon/unown_frame_pointers.asm) + const_def 1 + const UNOWN_A ; 1 + const UNOWN_B ; 2 + const UNOWN_C ; 3 + const UNOWN_D ; 4 + const UNOWN_E ; 5 + const UNOWN_F ; 6 + const UNOWN_G ; 7 + const UNOWN_H ; 8 + const UNOWN_I ; 9 + const UNOWN_J ; 10 + const UNOWN_K ; 11 + const UNOWN_L ; 12 + const UNOWN_M ; 13 + const UNOWN_N ; 14 + const UNOWN_O ; 15 + const UNOWN_P ; 16 + const UNOWN_Q ; 17 + const UNOWN_R ; 18 + const UNOWN_S ; 19 + const UNOWN_T ; 20 + const UNOWN_U ; 21 + const UNOWN_V ; 22 + const UNOWN_W ; 23 + const UNOWN_X ; 24 + const UNOWN_Y ; 25 + const UNOWN_Z ; 26 +NUM_UNOWN EQU const_value + -1 ; 26 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 65015da69..35985d565 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -27,40 +27,40 @@ BASE_DATA_SIZE EQUS "(wCurBaseDataEnd - wCurBaseData)" ; gender ratio constants GENDER_F0 EQU 0 percent -GENDER_F12_5 EQU 31 ; 12.5 percent +GENDER_F12_5 EQU 12 percent + 1 GENDER_F25 EQU 25 percent GENDER_F50 EQU 50 percent GENDER_F75 EQU 75 percent -GENDER_F100 EQU 254 ; 100 percent -GENDERLESS EQU 255 +GENDER_F100 EQU 100 percent - 1 +GENDERLESS EQU -1 ; wBaseGrowthRate values ; GrowthRates indexes (see data/growth_rates.asm) const_def - const MEDIUM_FAST - const SLIGHTLY_FAST - const SLIGHTLY_SLOW - const MEDIUM_SLOW - const FAST - const SLOW + const GROWTH_MEDIUM_FAST + const GROWTH_SLIGHTLY_FAST + const GROWTH_SLIGHTLY_SLOW + const GROWTH_MEDIUM_SLOW + const GROWTH_FAST + const GROWTH_SLOW ; wBaseEggGroups values -const_value set 1 - const MONSTER ; 1 - const AMPHIBIAN ; 2 - const INSECT ; 3 - const AVIAN ; 4 - const FIELD ; 5 - const FAIRY ; 6 - const PLANT ; 7 - const HUMANSHAPE ; 8 - const INVERTEBRATE ; 9 - const INANIMATE ; a - const AMORPHOUS ; b - const FISH ; c - const LADIES_MAN ; d - const REPTILE ; e - const NO_EGGS ; f + const_def 1 + const EGG_MONSTER ; 1 + const EGG_WATER_1 ; 2 + const EGG_BUG ; 3 + const EGG_FLYING ; 4 + const EGG_FIELD ; 5 + const EGG_FAIRY ; 6 + const EGG_GRASS ; 7 + const EGG_HUMANLIKE ; 8 + const EGG_WATER_3 ; 9 + const EGG_MINERAL ; a + const EGG_AMORPHOUS ; b + const EGG_WATER_2 ; c + const EGG_DITTO ; d + const EGG_DRAGON ; e + const EGG_UNDISCOVERED ; f ; pokedex entries (see data/pokemon/dex_entries.asm) @@ -120,9 +120,18 @@ CAUGHT_EGG_LEVEL EQU 1 ; maximum number of party pokemon PARTY_LENGTH EQU 6 +; boxes +MONS_PER_BOX EQU 20 +NUM_BOXES EQU 14 + +; hall of fame +HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, level, nick +HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator +NUM_HOF_TEAMS = 30 + ; evolution types (used in data/pokemon/evos_attacks.asm) -const_value set 1 + const_def 1 const EVOLVE_LEVEL const EVOLVE_ITEM const EVOLVE_TRADE @@ -130,62 +139,27 @@ const_value set 1 const EVOLVE_STAT ; EVOLVE_HAPPINESS triggers -const_value set 1 + const_def 1 const TR_ANYTIME const TR_MORNDAY const TR_NITE ; EVOLVE_STAT triggers -const_value set 1 + const_def 1 const ATK_GT_DEF const ATK_LT_DEF const ATK_EQ_DEF -; PokeAnims indexes (see engine/pic_animation.asm) - const_def - const ANIM_MON_SLOW - const ANIM_MON_NORMAL - const ANIM_MON_MENU - const ANIM_MON_TRADE - const ANIM_MON_EVOLVE - const ANIM_MON_HATCH - const ANIM_MON_UNUSED - const ANIM_MON_EGG1 - const ANIM_MON_EGG2 - - -; MonMenuOptions indexes (see engine/mon_menu.asm) -const_value set 1 -; moves - const MONMENU_CUT ; 1 - const MONMENU_FLY ; 2 - const MONMENU_SURF ; 3 - const MONMENU_STRENGTH ; 4 - const MONMENU_WATERFALL ; 5 - const MONMENU_FLASH ; 6 - const MONMENU_WHIRLPOOL ; 7 - const MONMENU_DIG ; 8 - const MONMENU_TELEPORT ; 9 - const MONMENU_SOFTBOILED ; 10 - const MONMENU_HEADBUTT ; 11 - const MONMENU_ROCKSMASH ; 12 - const MONMENU_MILKDRINK ; 13 - const MONMENU_SWEETSCENT ; 14 -; options - const MONMENU_STATS ; 15 - const MONMENU_SWITCH ; 16 - const MONMENU_ITEM ; 17 - const MONMENU_CANCEL ; 18 - const MONMENU_MOVE ; 19 - const MONMENU_MAIL ; 20 - const MONMENU_ERROR ; 21 - -; MonMenuOptions types -MONMENU_FIELD_MOVE EQU 0 -MONMENU_MENUOPTION EQU 1 - -NUM_MONMENU_ITEMS EQU 8 +; wild data + +NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size +NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size + +GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2 +WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2 + +NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm) ; treemon sets @@ -193,7 +167,7 @@ NUM_MONMENU_ITEMS EQU 8 const_def const TREEMON_SET_CITY const TREEMON_SET_CANYON - const TREEMON_SET_AZALEA + const TREEMON_SET_TOWN const TREEMON_SET_ROUTE const TREEMON_SET_KANTO const TREEMON_SET_LAKE @@ -208,25 +182,27 @@ NUM_TREEMON_SETS EQU const_value const TREEMON_SCORE_RARE ; 2 -; wild data - -NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size -NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size - -GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2 -WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2 - -NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm) - - -; swarms - -SWARM_DUNSPARCE EQU 0 -SWARM_YANMA EQU 1 - -FISHSWARM_QWILFISH EQU 1 -FISHSWARM_REMORAID EQU 2 - +; ChangeHappiness arguments (see data/happiness_changes.asm) +const_value = 1 + const HAPPINESS_GAINLEVEL ; 01 + const HAPPINESS_USEDITEM ; 02 + const HAPPINESS_USEDXITEM ; 03 + const HAPPINESS_GYMBATTLE ; 04 + const HAPPINESS_LEARNMOVE ; 05 + const HAPPINESS_FAINTED ; 06 + const HAPPINESS_POISONFAINT ; 07 + const HAPPINESS_BEATENBYSTRONGFOE ; 08 + const HAPPINESS_YOUNGCUT1 ; 09 + const HAPPINESS_YOUNGCUT2 ; 0a + const HAPPINESS_YOUNGCUT3 ; 0b + const HAPPINESS_OLDERCUT1 ; 0c + const HAPPINESS_OLDERCUT2 ; 0d + const HAPPINESS_OLDERCUT3 ; 0e + const HAPPINESS_BITTERPOWDER ; 0f + const HAPPINESS_ENERGYROOT ; 10 + const HAPPINESS_REVIVALHERB ; 11 + const HAPPINESS_GROOMING ; 12 + const HAPPINESS_GAINLEVELATHOME ; 13 ; significant happiness values BASE_HAPPINESS EQU 70 diff --git a/constants/printer_constants.asm b/constants/printer_constants.asm index b6b5da7e7..f0b8b4818 100755 --- a/constants/printer_constants.asm +++ b/constants/printer_constants.asm @@ -1,5 +1,5 @@ ; wPrinterStatus -const_value set 1 + const_def 1 const PRINTER_STATUS_CHECKING const PRINTER_STATUS_TRANSMITTING const PRINTER_STATUS_PRINTING diff --git a/constants/scene_constants.asm b/constants/scene_constants.asm new file mode 100644 index 000000000..67a0351ce --- /dev/null +++ b/constants/scene_constants.asm @@ -0,0 +1,157 @@ +; See data/maps/scenes.asm for which maps have scene variables. +; Each scene_script and coord_event is associated with a current scene ID. + +; Scene variables default to 0. +SCENE_DEFAULT EQU 0 +; Often a map will have a one-time default event for scene 0, and switch to a +; do-nothing scene 1 when the event finishes. +SCENE_FINISHED EQU 1 + +; wPokecenter2FSceneID + const_def 1 + const SCENE_POKECENTER2F_LEAVE_TRADE_CENTER ; 1 + const SCENE_POKECENTER2F_LEAVE_COLOSSEUM ; 2 + const SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE ; 3 + const SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM ; 4 + const SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM ; 5 + +; wPowerPlantSceneID + const_def + const SCENE_POWERPLANT_NOTHING ; 0 + const SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL ; 1 + +; wCeruleanGymSceneID + const_def + const SCENE_CERULEANGYM_NOTHING ; 0 + const SCENE_CERULEANGYM_GRUNT_RUNS_OUT ; 1 + +; wRoute25SceneID + const_def + const SCENE_ROUTE25_NOTHING ; 0 + const SCENE_ROUTE25_MISTYS_DATE ; 1 + +; wLancesRoomSceneID + const_def 1 + const SCENE_LANCESROOM_APPROACH_LANCE ; 1 + +; wElmsLabSceneID + const_def 1 + const SCENE_ELMSLAB_CANT_LEAVE ; 1 + const SCENE_ELMSLAB_NOTHING ; 2 + const SCENE_ELMSLAB_MEET_OFFICER ; 3 + const SCENE_ELMSLAB_UNUSED ; 4 + const SCENE_ELMSLAB_AIDE_GIVES_POTION ; 5 + const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS ; 6 + +; wRoute29SceneID + const_def + const SCENE_ROUTE29_NOTHING ; 0 + const SCENE_ROUTE29_CATCH_TUTORIAL ; 1 + +; wCherrygroveCitySceneID + const_def + const SCENE_CHERRYGROVECITY_NOTHING ; 0 + const SCENE_CHERRYGROVECITY_MEET_RIVAL ; 1 + +; wRoute32SceneID + const_def 1 + const SCENE_ROUTE32_OFFER_SLOWPOKETAIL ; 1 + const SCENE_ROUTE32_NOTHING ; 2 + +; wRoute35NationalParkGateSceneID + const_def + const SCENE_ROUTE35NATIONALPARKGATE_NOTHING ; 0 + const SCENE_ROUTE35NATIONALPARKGATE_UNUSED ; 1 + const SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY ; 2 + +; wRoute36SceneID + const_def + const SCENE_ROUTE36_NOTHING ; 0 + const SCENE_ROUTE36_SUICUNE ; 1 + +; wRoute36NationalParkGateSceneID + const_def + const SCENE_ROUTE36NATIONALPARKGATE_NOTHING ; 0 + const SCENE_ROUTE36NATIONALPARKGATE_UNUSED ; 1 + const SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY ; 2 + +; wAzaleaTownSceneID + const_def + const SCENE_AZALEATOWN_NOTHING ; 0 + const SCENE_AZALEATOWN_RIVAL_BATTLE ; 1 + const SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL ; 2 + +; wGoldenrodGymSceneID + const_def + const SCENE_GOLDENRODGYM_NOTHING ; 0 + const SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING ; 1 + +; wRoute42SceneID + const_def + const SCENE_ROUTE42_NOTHING ; 0 + const SCENE_ROUTE42_SUICUNE ; 1 + +; wCianwoodCitySceneID + const_def + const SCENE_CIANWOODCITY_NOTHING ; 0 + const SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE ; 1 + +; wBurnedTower1FSceneID + const_def 1 + const SCENE_BURNEDTOWER1F_RIVAL_BATTLE ; 1 + const SCENE_BURNEDTOWER1F_NOTHING ; 2 + +; wRadioTower5FSceneID + const_def 1 + const SCENE_RADIOTOWER5F_ROCKET_BOSS ; 1 + const SCENE_RADIOTOWER5F_NOTHING ; 2 + +; wRuinsOfAlphOutsideSceneID + const_def + const SCENE_RUINSOFALPHOUTSIDE_NOTHING ; 0 + const SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX ; 1 + +; wRuinsOfAlphResearchCenterSceneID + const_def + const SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING ; 0 + const SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX ; 1 + +; wRuinsOfAlphInnerChamberSceneID + const_def + const SCENE_RUINSOFALPHINNERCHAMBER_NOTHING ; 0 + const SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE ; 1 + +; wMahoganyMart1FSceneID + const_def + const SCENE_MAHOGANYMART1F_NOTHING ; 0 + const SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS ; 1 + +; wTeamRocketBaseB2FSceneID + const_def 1 + const SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS ; 1 + const SCENE_TEAMROCKETBASEB2F_ELECTRODES ; 2 + const SCENE_TEAMROCKETBASEB2F_NOTHING ; 3 + +; wTeamRocketBaseB3FSceneID + const_def 1 + const SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER ; 1 + const SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS ; 2 + const SCENE_TEAMROCKETBASEB3F_NOTHING ; 3 + +; wDragonsDenB1FSceneID + const_def + const SCENE_DRAGONSDENB1F_NOTHING ; 0 + const SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM ; 1 + +; wOlivinePortSceneID + const_def 1 + const SCENE_OLIVINEPORT_LEAVE_SHIP ; 1 + +; wVermilionPortSceneID + const_def 1 + const SCENE_VERMILIONPORT_LEAVE_SHIP ; 1 + +; wFastShip1FSceneID + const_def 1 + const SCENE_FASTSHIP1F_ENTER_SHIP ; 1 + const SCENE_FASTSHIP1F_MEET_GRANDPA ; 2 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index b72e50c1b..dd086e6b3 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -1,4 +1,4 @@ -; script vars +; person constants PLAYER EQU 0 LAST_TALKED EQU -2 @@ -76,7 +76,7 @@ RETVAR_EXECUTE EQU (2 << 6) ; PlayerEventScriptPointers indexes (see engine/events.asm) -const_value set -1 + const_def -1 const PLAYEREVENT_MAPSCRIPT const PLAYEREVENT_NONE const PLAYEREVENT_SEENBYTRAINER @@ -91,6 +91,7 @@ const_value set -1 NUM_PLAYER_EVENTS EQU const_value +; bg_event types ; TryBGEvent arguments (see engine/events.asm) const_def const BGEVENT_READ @@ -115,6 +116,40 @@ NUM_PLAYER_EVENTS EQU const_value const OBJECTTYPE_6 +; command queue members +CMDQUEUE_TYPE EQU 0 +CMDQUEUE_ADDR EQU 1 +CMDQUEUE_03 EQU 3 +CMDQUEUE_04 EQU 4 +CMDQUEUE_05 EQU 5 +CMDQUEUE_ENTRY_SIZE EQU 6 +CMDQUEUE_CAPACITY EQU 4 + +; command queue types +CMDQUEUE_STONETABLE EQU 2 + + +; elevfloor macro values +; ElevatorFloorNames indexes (see data/events/elevator_floors.asm) + const_def + const FLOOR_B4F + const FLOOR_B3F + const FLOOR_B2F + const FLOOR_B1F + const FLOOR_1F + const FLOOR_2F + const FLOOR_3F + const FLOOR_4F + const FLOOR_5F + const FLOOR_6F + const FLOOR_7F + const FLOOR_8F + const FLOOR_9F + const FLOOR_10F + const FLOOR_11F + const FLOOR_ROOF + + ; showemote arguments ; Emotes indexes (see data/sprites/emotes.asm) const_def @@ -132,10 +167,9 @@ NUM_PLAYER_EVENTS EQU const_value const EMOTE_GRASS_RUSTLE ; 11 EMOTE_MEM EQU -1 - ; fruittree arguments ; FruitTreeItems indexes (see data/items/fruit_trees.asm) -const_value set 1 + const_def 1 const FRUITTREE_ROUTE_29 ; 01 const FRUITTREE_ROUTE_30_1 ; 02 const FRUITTREE_ROUTE_38 ; 03 @@ -166,8 +200,7 @@ const_value set 1 const FRUITTREE_PEWTER_CITY_1 ; 1c const FRUITTREE_PEWTER_CITY_2 ; 1d const FRUITTREE_FUCHSIA_CITY ; 1e -NUM_FRUIT_TREES EQU const_value +- 1 - +NUM_FRUIT_TREES EQU const_value + -1 ; describedecoration arguments ; DescribeDecoration.JumpTable indexes (see engine/decorations.asm) @@ -178,40 +211,18 @@ NUM_FRUIT_TREES EQU const_value +- 1 const DECODESC_BIG_DOLL ; 3 const DECODESC_CONSOLE ; 4 - -; elevfloor macro values -; ElevatorFloorNames indexes (see data/elevator_floors.asm) +; swarm arguments +; StoreSwarmMapIndices arguments const_def - const FLOOR_B4F - const FLOOR_B3F - const FLOOR_B2F - const FLOOR_B1F - const FLOOR_1F - const FLOOR_2F - const FLOOR_3F - const FLOOR_4F - const FLOOR_5F - const FLOOR_6F - const FLOOR_7F - const FLOOR_8F - const FLOOR_9F - const FLOOR_10F - const FLOOR_11F - const FLOOR_ROOF - - -; command queue members -CMDQUEUE_TYPE EQU 0 -CMDQUEUE_ADDR EQU 1 -CMDQUEUE_03 EQU 3 -CMDQUEUE_04 EQU 4 -CMDQUEUE_05 EQU 5 -CMDQUEUE_ENTRY_SIZE EQU 6 -CMDQUEUE_CAPACITY EQU 4 + const SWARM_DUNSPARCE ; 0 + const SWARM_YANMA ; 1 -; command queue types -CMDQUEUE_STONETABLE EQU 2 +; ActivateFishingSwarm writebyte arguments + const_def + const FISHSWARM_NONE ; 0 + const FISHSWARM_QWILFISH ; 1 + const FISHSWARM_REMORAID ; 2 ; SpecialGameboyCheck return values const_def @@ -219,7 +230,7 @@ CMDQUEUE_STONETABLE EQU 2 const GBCHECK_SGB ; 1 const GBCHECK_CGB ; 2 -; Special_CheckMagikarpLength return values +; CheckMagikarpLength return values const_def const MAGIKARPLENGTH_NOT_MAGIKARP ; 0 const MAGIKARPLENGTH_REFUSED ; 1 @@ -247,7 +258,7 @@ CMDQUEUE_STONETABLE EQU 2 const HEALMACHINE_ELMS_LAB ; 1 const HEALMACHINE_HALL_OF_FAME ; 2 -; Special_UnownPuzzle writebyte arguments +; UnownPuzzle writebyte arguments ; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/unown_puzzle.asm) const_def const UNOWNPUZZLE_KABUTO ; 0 @@ -256,16 +267,16 @@ CMDQUEUE_STONETABLE EQU 2 const UNOWNPUZZLE_HO_OH ; 3 NUM_UNOWN_PUZZLES EQU const_value -; Special_DisplayUnownWords writebyte arguments -; UnownWalls and MenuDataHeaders_UnownWalls indexes (see data/unown_walls.asm) +; DisplayUnownWords writebyte arguments +; UnownWalls and MenuHeaders_UnownWalls indexes (see data/events/unown_walls.asm) const_def const UNOWNWORDS_ESCAPE ; 0 const UNOWNWORDS_LIGHT ; 1 const UNOWNWORDS_WATER ; 2 const UNOWNWORDS_HO_OH ; 3 -; Special_MoveTutor writebyte arguments -const_value set 1 +; MoveTutor writebyte arguments + const_def 1 const MOVETUTOR_FLAMETHROWER ; 1 const MOVETUTOR_THUNDERBOLT ; 2 const MOVETUTOR_ICE_BEAM ; 3 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 180be3323..c23a3b246 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -106,7 +106,7 @@ const SPRITE_STANDING_YOUNGSTER ; 66 ; SpriteMons indexes (see data/sprites/sprite_mons.asm) -const_value set $80 + const_def $80 SPRITE_POKEMON EQU const_value const SPRITE_UNOWN ; 80 const SPRITE_GEODUDE ; 81 @@ -145,12 +145,12 @@ SPRITE_POKEMON EQU const_value const SPRITE_HO_OH ; a2 ; special GetMonSprite values (see engine/overworld.asm) -const_value set $e0 + const_def $e0 const SPRITE_DAY_CARE_MON_1 ; e0 const SPRITE_DAY_CARE_MON_2 ; e1 ; wVariableSprites indexes (see wram.asm) -const_value set $f0 + const_def $f0 SPRITE_VARS EQU const_value const SPRITE_CONSOLE ; f0 const SPRITE_DOLL_1 ; f1 diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm index db53c3ca1..329833b1e 100644 --- a/constants/sprite_data_constants.asm +++ b/constants/sprite_data_constants.asm @@ -9,7 +9,7 @@ NUM_SPRITEDATA_FIELDS EQU const_value ; sprite types -const_value set 1 + const_def 1 const WALKING_SPRITE ; 1 const STANDING_SPRITE ; 2 const STILL_SPRITE ; 3 @@ -27,7 +27,7 @@ const_value set 1 ; object_events set bit 3 so as not to use the sprite's default palette ; MapObjectPals indexes (see gfx/overworld/npc_sprites.pal) -const_value set (1 << 3) + const_def 1 << 3 const PAL_NPC_RED ; 8 const PAL_NPC_BLUE ; 9 const PAL_NPC_GREEN ; a @@ -36,160 +36,3 @@ const_value set (1 << 3) const PAL_NPC_SILVER ; d const PAL_NPC_TREE ; e const PAL_NPC_ROCK ; f - -; SpriteMovementData indexes (see data/sprites/map_objects.asm) - const_def - const SPRITEMOVEDATA_00 ; 00 - const SPRITEMOVEDATA_ITEM_TREE ; 01 - const SPRITEMOVEDATA_WANDER ; 02 - const SPRITEMOVEDATA_SPINRANDOM_SLOW ; 03 - const SPRITEMOVEDATA_WALK_UP_DOWN ; 04 - const SPRITEMOVEDATA_WALK_LEFT_RIGHT ; 05 - const SPRITEMOVEDATA_STANDING_DOWN ; 06 - const SPRITEMOVEDATA_STANDING_UP ; 07 - const SPRITEMOVEDATA_STANDING_LEFT ; 08 - const SPRITEMOVEDATA_STANDING_RIGHT ; 09 - const SPRITEMOVEDATA_SPINRANDOM_FAST ; 0a - const SPRITEMOVEDATA_PLAYER ; 0b - const SPRITEMOVEDATA_0C ; 0c - const SPRITEMOVEDATA_0D ; 0d - const SPRITEMOVEDATA_0E ; 0e - const SPRITEMOVEDATA_0F ; 0f - const SPRITEMOVEDATA_10 ; 10 - const SPRITEMOVEDATA_11 ; 11 - const SPRITEMOVEDATA_12 ; 12 - const SPRITEMOVEDATA_FOLLOWING ; 13 - const SPRITEMOVEDATA_SCRIPTED ; 14 - const SPRITEMOVEDATA_SNORLAX ; 15 - const SPRITEMOVEDATA_POKEMON ; 16 - const SPRITEMOVEDATA_SUDOWOODO ; 17 - const SPRITEMOVEDATA_SMASHABLE_ROCK ; 18 - const SPRITEMOVEDATA_STRENGTH_BOULDER ; 19 - const SPRITEMOVEDATA_FOLLOWNOTEXACT ; 1a - const SPRITEMOVEDATA_SHADOW ; 1b - const SPRITEMOVEDATA_EMOTE ; 1c - const SPRITEMOVEDATA_SCREENSHAKE ; 1d - const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE ; 1e - const SPRITEMOVEDATA_SPINCLOCKWISE ; 1f - const SPRITEMOVEDATA_20 ; 20 - const SPRITEMOVEDATA_BIGDOLL ; 21 - const SPRITEMOVEDATA_BOULDERDUST ; 22 - const SPRITEMOVEDATA_GRASS ; 23 - const SPRITEMOVEDATA_LAPRAS ; 24 -NUM_SPRITEMOVEDATA EQU const_value -SPRITEMOVEDATA_FIELDS EQU 6 - -; MapObjectMovementPattern.Pointers indexes (see engine/map_objects.asm) - const_def - const SPRITEMOVEFN_00 ; 00 - const SPRITEMOVEFN_RANDOM_WALK_Y ; 01 - const SPRITEMOVEFN_RANDOM_WALK_X ; 02 - const SPRITEMOVEFN_RANDOM_WALK_XY ; 03 - const SPRITEMOVEFN_SLOW_RANDOM_SPIN ; 04 - const SPRITEMOVEFN_FAST_RANDOM_SPIN ; 05 - const SPRITEMOVEFN_STANDING ; 06 - const SPRITEMOVEFN_OBEY_DPAD ; 07 - const SPRITEMOVEFN_08 ; 08 - const SPRITEMOVEFN_09 ; 09 - const SPRITEMOVEFN_0A ; 0a - const SPRITEMOVEFN_0B ; 0b - const SPRITEMOVEFN_0C ; 0c - const SPRITEMOVEFN_0D ; 0d - const SPRITEMOVEFN_0E ; 0e - const SPRITEMOVEFN_FOLLOW ; 0f - const SPRITEMOVEFN_SCRIPTED ; 10 - const SPRITEMOVEFN_STRENGTH ; 11 - const SPRITEMOVEFN_FOLLOWNOTEXACT ; 12 - const SPRITEMOVEFN_SHADOW ; 13 - const SPRITEMOVEFN_EMOTE ; 14 - const SPRITEMOVEFN_BIG_SNORLAX ; 15 - const SPRITEMOVEFN_BOUNCE ; 16 - const SPRITEMOVEFN_SCREENSHAKE ; 17 - const SPRITEMOVEFN_SPIN_CLOCKWISE ; 18 - const SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE ; 19 - const SPRITEMOVEFN_BOULDERDUST ; 1a - const SPRITEMOVEFN_GRASS ; 1b - -; StepTypesJumptable indexes (see engine/map_objects.asm) - const_def - const STEP_TYPE_00 ; 00 - const STEP_TYPE_SLEEP ; 01 - const STEP_TYPE_NPC_WALK ; 02 - const STEP_TYPE_03 ; 03 - const STEP_TYPE_04 ; 04 - const STEP_TYPE_05 ; 05 - const STEP_TYPE_PLAYER_WALK ; 06 - const STEP_TYPE_07 ; 07 - const STEP_TYPE_NPC_JUMP ; 08 - const STEP_TYPE_PLAYER_JUMP ; 09 - const STEP_TYPE_HALF_STEP ; 0a - const STEP_TYPE_BUMP ; 0b - const STEP_TYPE_TELEPORT_FROM ; 0c - const STEP_TYPE_TELEPORT_TO ; 0d - const STEP_TYPE_SKYFALL ; 0e - const STEP_TYPE_0F ; 0f - const STEP_TYPE_GOT_BITE ; 10 - const STEP_TYPE_ROCK_SMASH ; 11 - const STEP_TYPE_RETURN_DIG ; 12 - const STEP_TYPE_TRACKING_OBJECT ; 13 - const STEP_TYPE_14 ; 14 - const STEP_TYPE_15 ; 15 - const STEP_TYPE_16 ; 16 - const STEP_TYPE_17 ; 17 - const STEP_TYPE_18 ; 18 - const STEP_TYPE_SKYFALL_TOP ; 19 - -; ObjectActionPairPointers indexes (see engine/map_object_action.asm) - const_def - const OBJECT_ACTION_00 ; 00 - const OBJECT_ACTION_STAND ; 01 - const OBJECT_ACTION_STEP ; 02 - const OBJECT_ACTION_BUMP ; 03 - const OBJECT_ACTION_SPIN ; 04 - const OBJECT_ACTION_SPIN_FLICKER ; 05 - const OBJECT_ACTION_FISHING ; 06 - const OBJECT_ACTION_SHADOW ; 07 - const OBJECT_ACTION_EMOTE ; 08 - const OBJECT_ACTION_BIG_SNORLAX ; 09 - const OBJECT_ACTION_BOUNCE ; 0a - const OBJECT_ACTION_WEIRD_TREE ; 0b - const OBJECT_ACTION_BIG_LAPRAS ; 0c - const OBJECT_ACTION_BIG_DOLL ; 0d - const OBJECT_ACTION_BOULDER_DUST ; 0e - const OBJECT_ACTION_GRASS_SHAKE ; 0f - const OBJECT_ACTION_SKYFALL ; 10 - -; Facings indexes (see data/sprites/facings.asm) - const_def - const FACING_STEP_DOWN_0 ; 00 - const FACING_STEP_DOWN_1 ; 01 - const FACING_STEP_DOWN_2 ; 02 - const FACING_STEP_DOWN_3 ; 03 - const FACING_STEP_UP_0 ; 04 - const FACING_STEP_UP_1 ; 05 - const FACING_STEP_UP_2 ; 06 - const FACING_STEP_UP_3 ; 07 - const FACING_STEP_LEFT_0 ; 08 - const FACING_STEP_LEFT_1 ; 09 - const FACING_STEP_LEFT_2 ; 0a - const FACING_STEP_LEFT_3 ; 0b - const FACING_STEP_RIGHT_0 ; 0c - const FACING_STEP_RIGHT_1 ; 0d - const FACING_STEP_RIGHT_2 ; 0e - const FACING_STEP_RIGHT_3 ; 0f - const FACING_FISH_DOWN ; 10 - const FACING_FISH_UP ; 11 - const FACING_FISH_LEFT ; 12 - const FACING_FISH_RIGHT ; 13 - const FACING_EMOTE ; 14 - const FACING_SHADOW ; 15 - const FACING_BIG_DOLL_ASYM ; 16 - const FACING_BIG_DOLL_SYM ; 17 - const FACING_WEIRD_TREE_0 ; 18 - const FACING_WEIRD_TREE_1 ; 19 - const FACING_WEIRD_TREE_2 ; 1a - const FACING_WEIRD_TREE_3 ; 1b - const FACING_BOULDER_DUST_1 ; 1c - const FACING_BOULDER_DUST_2 ; 1d - const FACING_GRASS_1 ; 1e - const FACING_GRASS_2 ; 1f diff --git a/constants/std_constants.asm b/constants/std_constants.asm index 06b0b4f2d..18e64f450 100644 --- a/constants/std_constants.asm +++ b/constants/std_constants.asm @@ -1,5 +1,5 @@ ; StdScripts indexes (see engine/events/std_scripts.asm) -; also used in TileCollisionStdScripts (see data/collision_stdscripts.asm) +; also used in TileCollisionStdScripts (see data/events/collision_stdscripts.asm) enum_start enum pokecenternurse enum difficultbookshelf diff --git a/constants/text_constants.asm b/constants/text_constants.asm index a6052065c..a64039f64 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -9,7 +9,7 @@ TRAINER_CLASS_NAME_LENGTH EQU 13 NAME_LENGTH_JAPANESE EQU 6 ; GetName types (see home/names.asm) -const_value set 1 + const_def 1 const MON_NAME ; 1 const MOVE_NAME ; 2 const DUMMY_NAME ; 3 @@ -31,7 +31,7 @@ TEXTBOX_Y EQU SCREEN_HEIGHT - TEXTBOX_HEIGHT TEXTBOX_INNERY EQU TEXTBOX_Y + 2 ; PrintNum bit flags -const_value set 5 + const_def 5 const PRINTNUM_MONEY_F ; 5 const PRINTNUM_RIGHTALIGN_F ; 6 const PRINTNUM_LEADINGZEROS_F ; 7 diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index 5fda5bd5b..e89714fee 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -1,5 +1,5 @@ ; Tilesets indexes (see data/tilesets.asm) -const_value set 1 + const_def 1 const TILESET_JOHTO ; 01 const TILESET_JOHTO_MODERN ; 02 const TILESET_KANTO ; 03 diff --git a/constants/trainer_data_constants.asm b/constants/trainer_data_constants.asm index 2d87d8764..00c1c6c38 100644 --- a/constants/trainer_data_constants.asm +++ b/constants/trainer_data_constants.asm @@ -10,6 +10,7 @@ NUM_TRAINER_ATTRIBUTES EQU const_value ; TRNATTR_AI_MOVE_WEIGHTS bit flags (wEnemyTrainerAIFlags) +; AIScoringPointers indexes (see engine/battle/ai/move.asm) const_def const NO_AI const_value = 0 diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 6587c3a70..c3524e9d9 100644 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -2,7 +2,8 @@ ; also used in: ; - PokedexTypeSearchConversionTable (see data/types/search_types.asm) ; - PokedexTypeSearchStrings (see data/types/search_strings.asm) -; - TypeMatchups (see data/battle/type_matchups.asm) +; - TypeMatchups (see data/types/type_matchups.asm) +; - TypeBoostItems (see data/types/type_boost_items.asm) const_def PHYSICAL EQU const_value diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 074f8a7de..f1c0c8b76 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -1,4 +1,14 @@ -; wMonType: ; cf5f +; wInputType:: ; c2c7 +AUTO_INPUT EQU $ff + +; wCurrentDexMode:: ; c7d4 + const_def + const DEXMODE_NEW + const DEXMODE_OLD + const DEXMODE_ABC + const DEXMODE_UNOWN + +; wMonType:: ; cf5f const_def const PARTYMON ; 0 const OTPARTYMON ; 1 @@ -6,19 +16,23 @@ const TEMPMON ; 3 const WILDMON ; 4 -; wOptions: (bits) ; cfcc -const_value set 4 +; wGameTimerPause:: ; cfbc +GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0 +GAMETIMERPAUSE_MOBILE_7_F EQU 7 + +; wOptions:: (bits 4-7) ; cfcc + const_def 4 const NO_TEXT_SCROLL ; 4 const STEREO ; 5 const BATTLE_SHIFT ; 6 const BATTLE_SCENE ; 7 -; wOptions: (bits 0-2) +; wOptions:: (bits 0-2) ; cfcc TEXT_DELAY_FAST EQU 1 TEXT_DELAY_MED EQU 3 TEXT_DELAY_SLOW EQU 5 -; wTextBoxFrame: ; cfce +; wTextBoxFrame:: ; cfce const_def const FRAME_1 ; 0 const FRAME_2 ; 1 @@ -30,24 +44,24 @@ TEXT_DELAY_SLOW EQU 5 const FRAME_8 ; 7 NUM_FRAMES EQU const_value -; wTextBoxFlags: +; wTextBoxFlags:: ; cfcf const_def const FAST_TEXT_DELAY_F ; 0 const NO_TEXT_DELAY_F ; 1 -; wOptions2: - const_def - const MENU_ACCOUNT ; 0 - -; wGBPrinter: +; wGBPrinter:: ; cfd0 GBPRINTER_LIGHTEST EQU $00 GBPRINTER_LIGHTER EQU $20 GBPRINTER_NORMAL EQU $40 GBPRINTER_DARKER EQU $60 GBPRINTER_DARKEST EQU $7f -; wWalkingDirection: ; d043 -const_value set -1 +; wOptions2:: ; cfd1 + const_def + const MENU_ACCOUNT ; 0 + +; wWalkingDirection:: ; d043 + const_def -1 const STANDING ; -1 const DOWN ; 0 const UP ; 1 @@ -60,14 +74,27 @@ UP_MASK EQU 1 << UP LEFT_MASK EQU 1 << LEFT RIGHT_MASK EQU 1 << RIGHT -; wFacingDirection: ; d044 +; wFacingDirection:: ; d044 FACE_CURRENT EQU 0 -FACE_DOWN EQU 8 -FACE_UP EQU 4 -FACE_LEFT EQU 2 -FACE_RIGHT EQU 1 +FACE_DOWN EQU 8 +FACE_UP EQU 4 +FACE_LEFT EQU 2 +FACE_RIGHT EQU 1 + +; wPokemonWithdrawDepositParameter:: ; d10b +PC_WITHDRAW EQU 0 +PC_DEPOSIT EQU 1 +DAY_CARE_WITHDRAW EQU 2 +DAY_CARE_DEPOSIT EQU 3 + +; wInitListType:: ; d263 +INIT_ENEMYOT_LIST EQU 1 +INIT_BAG_ITEM_LIST EQU 2 +INIT_OTHER_ITEM_LIST EQU 3 +INIT_PLAYEROT_LIST EQU 4 +INIT_MON_LIST EQU 5 -; wTimeOfDay: ; d269 +; wTimeOfDay:: ; d269 const_def const MORN_F ; 0 const DAY_F ; 1 @@ -82,16 +109,30 @@ DARKNESS EQU 1 << DARKNESS_F ANYTIME EQU MORN | DAY | NITE -; wScriptFlags: ; d434 +; wPlayerSpriteSetupFlags:: ; d45b +PLAYERSPRITESETUP_FACING_MASK EQU %11 +PLAYERSPRITESETUP_FEMALE_TO_MALE_F EQU 2 +PLAYERSPRITESETUP_CUSTOM_FACING_F EQU 5 +PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F EQU 6 +PLAYERSPRITESETUP_RESET_ACTION_F EQU 7 + +; wPlayerGender:: ; d472 +PLAYERGENDER_FEMALE_F EQU 0 + +; wScriptFlags:: ; d434 SCRIPT_RUNNING EQU 2 -; wScriptMode: ; d437 +; wScriptMode:: ; d437 SCRIPT_OFF EQU 0 SCRIPT_READ EQU 1 SCRIPT_WAIT_MOVEMENT EQU 2 SCRIPT_WAIT EQU 3 -; wCurDay: ; d4cb +; wSpawnAfterChampion:: ; d4b5 +SPAWN_LANCE EQU 1 +SPAWN_RED EQU 2 + +; wCurDay:: ; d4cb const_def const SUNDAY ; 0 const MONDAY ; 1 @@ -101,44 +142,41 @@ SCRIPT_WAIT EQU 3 const FRIDAY ; 5 const SATURDAY ; 6 -; wMapObjects: ; d71e - +; wMapObjects:: ; d71e PLAYER_OBJECT EQU 0 - NUM_OBJECTS EQU $10 -; wInputType: ; c2c7 -AUTO_INPUT EQU $ff - -; wWhichRegisteredItem: ; d95b -REGISTERED_POCKET EQU %11000000 -REGISTERED_NUMBER EQU %00111111 - -; wPlayerState: ; d95d -PLAYER_NORMAL EQU 0 -PLAYER_BIKE EQU 1 -PLAYER_SKATE EQU 2 -PLAYER_SURF EQU 4 -PLAYER_SURF_PIKA EQU 8 +; wStatusFlags:: ; d84c + const_def + const STATUSFLAGS_POKEDEX_F ; 0 + const STATUSFLAGS_UNOWN_DEX_F ; 1 + const STATUSFLAGS_FLASH_F ; 2 + const STATUSFLAGS_CAUGHT_POKERUS_F ; 3 + const STATUSFLAGS_ROCKET_SIGNAL_F ; 4 + const STATUSFLAGS_NO_WILD_ENCOUNTERS_F ; 5 + const STATUSFLAGS_HALL_OF_FAME_F ; 6 + const STATUSFLAGS_BUG_CONTEST_ON_F ; 7 -; After-Champion Spawn -SPAWN_LANCE EQU 1 -SPAWN_RED EQU 2 +; wStatusFlags2:: ; d84d + const_def + const STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F ; 0 + const STATUSFLAGS2_SAFARI_GAME_F ; 1 + const STATUSFLAGS2_BUG_CONTEST_TIMER_F ; 2 + const STATUSFLAGS2_UNUSED_3_F ; 3 + const STATUSFLAGS2_BIKE_SHOP_CALL_F ; 4 + const STATUSFLAGS2_UNUSED_5_F ; 5 + const STATUSFLAGS2_REACHED_GOLDENROD_F ; 6 + const STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F ; 7 -; wPokemonWithdrawDepositParameter -PC_WITHDRAW EQU 0 -PC_DEPOSIT EQU 1 -DAY_CARE_WITHDRAW EQU 2 -DAY_CARE_DEPOSIT EQU 3 +; wMomSavingMoney:: ; d854 +MOM_SAVING_SOME_MONEY_F EQU 0 +MOM_SAVING_HALF_MONEY_F EQU 1 +MOM_SAVING_ALL_MONEY_F EQU 2 +MOM_ACTIVE_F EQU 7 -; wCurrentDexMode - const_def - const DEXMODE_NEW - const DEXMODE_OLD - const DEXMODE_ABC - const DEXMODE_UNOWN +MOM_SAVING_MONEY_MASK EQU (1 << MOM_SAVING_SOME_MONEY_F) | (1 << MOM_SAVING_HALF_MONEY_F) | (1 << MOM_SAVING_ALL_MONEY_F) -; wJohtoBadges: +; wJohtoBadges:: ; d857 const_def const ZEPHYRBADGE const HIVEBADGE @@ -150,7 +188,7 @@ DAY_CARE_DEPOSIT EQU 3 const RISINGBADGE NUM_JOHTO_BADGES EQU const_value -; wKantoBadges: +; wKantoBadges:: ; d858 const_def const BOULDERBADGE const CASCADEBADGE @@ -163,9 +201,74 @@ NUM_JOHTO_BADGES EQU const_value NUM_KANTO_BADGES EQU const_value NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES -; wInitListType: -INIT_ENEMYOT_LIST EQU 1 -INIT_BAG_ITEM_LIST EQU 2 -INIT_OTHER_ITEM_LIST EQU 3 -INIT_PLAYEROT_LIST EQU 4 -INIT_MON_LIST EQU 5 +; wPokegearFlags:: ; d957 + const_def + const POKEGEAR_MAP_CARD_F ; 0 + const POKEGEAR_RADIO_CARD_F ; 1 + const POKEGEAR_PHONE_CARD_F ; 2 + const POKEGEAR_EXPN_CARD_F ; 3 + +POKEGEAR_OBTAINED_F EQU 7 + +; wWhichRegisteredItem:: ; d95b +REGISTERED_POCKET EQU %11000000 +REGISTERED_NUMBER EQU %00111111 + +; wPlayerState:: ; d95d +PLAYER_NORMAL EQU 0 +PLAYER_BIKE EQU 1 +PLAYER_SKATE EQU 2 +PLAYER_SURF EQU 4 +PLAYER_SURF_PIKA EQU 8 + +; wCelebiEvent:: ; dbf3 +CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2 + +; wBikeFlags:: ; dbf5 + const_def + const BIKEFLAGS_STRENGTH_ACTIVE_F ; 0 + const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1 + const BIKEFLAGS_DOWNHILL_F ; 2 + +; wDailyFlags:: ; dc1e + const_def + const DAILYFLAGS_KURT_MAKING_BALLS_F ; 0 + const DAILYFLAGS_BUG_CONTEST_F ; 1 + const DAILYFLAGS_FISH_SWARM_F ; 2 + const DAILYFLAGS_TIME_CAPSULE_F ; 3 + const DAILYFLAGS_ALL_FRUIT_TREES_F ; 4 + const DAILYFLAGS_GOT_SHUCKIE_TODAY_F ; 5 + const DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F ; 6 + const DAILYFLAGS_TRAINER_HOUSE_F ; 7 + +; wWeeklyFlags:: ; dc1f + const_def + const WEEKLYFLAGS_MT_MOON_SQUARE_CLEFAIRY_F ; 0 + const WEEKLYFLAGS_UNION_CAVE_LAPRAS_F ; 1 + const WEEKLYFLAGS_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F ; 2 + const WEEKLYFLAGS_GOLDENROD_DEPT_STORE_TM27_RETURN_F ; 3 + const WEEKLYFLAGS_DAISYS_GROOMING_F ; 4 + const WEEKLYFLAGS_INDIGO_PLATEAU_RIVAL_FIGHT_F ; 5 + const WEEKLYFLAGS_DAILY_MOVE_TUTOR_F ; 6 + const WEEKLYFLAGS_BUENAS_PASSWORD_F ; 7 + +; wSwarmFlags:: ; dc20 + const_def + const SWARMFLAGS_BUENAS_PASSWORD_F ; 0 + const SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F ; 1 + const SWARMFLAGS_DUNSPARCE_SWARM_F ; 2 + const SWARMFLAGS_YANMA_SWARM_F ; 3 + const SWARMFLAGS_MOBILE_4_F ; 4 + +; wLuckyNumberShowFlag:: ; dc9d +LUCKYNUMBERSHOW_GAME_OVER_F EQU 0 + +; wDayCareMan:: ; def5 +DAYCAREMAN_HAS_MON_F EQU 0 +DAYCAREMAN_MONS_COMPATIBLE_F EQU 5 +DAYCAREMAN_HAS_EGG_F EQU 6 +DAYCAREMAN_ACTIVE_F EQU 7 + +; wDayCareLady:: ; df2c +DAYCARELADY_HAS_MON_F EQU 0 +DAYCARELADY_ACTIVE_F EQU 7 |