diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_anim_constants.asm | 2 | ||||
| -rw-r--r-- | constants/battle_tower_constants.asm | 2 | ||||
| -rw-r--r-- | constants/map_object_constants.asm | 3 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 12 | ||||
| -rw-r--r-- | constants/script_constants.asm | 2 | ||||
| -rw-r--r-- | constants/sfx_constants.asm | 4 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 28 |
7 files changed, 39 insertions, 14 deletions
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index 91733cd34..c9eeac130 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -11,7 +11,7 @@ const BATTLEANIMSTRUCT_YCOORD const BATTLEANIMSTRUCT_XOFFSET const BATTLEANIMSTRUCT_YOFFSET - const BATTLEANIMSTRUCT_0B + const BATTLEANIMSTRUCT_PARAM const BATTLEANIMSTRUCT_DURATION const BATTLEANIMSTRUCT_FRAME const BATTLEANIMSTRUCT_ANON_JT_INDEX diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 0965d626a..9bf7bd7aa 100644 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -5,7 +5,7 @@ BATTLETOWER_NUM_UNIQUE_MON EQU 21 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 BATTLETOWER_TRAINERDATALENGTH EQU $24 -BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * (PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH +BATTLE_TOWER_STRUCT_LENGTH EQUS "(NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * NICKNAMED_MON_STRUCT_LENGTH + BATTLETOWER_TRAINERDATALENGTH)" ; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm) const_def diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 55a3f358b..00ddb772a 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -70,6 +70,9 @@ EMOTE_OBJECT EQU 1 << EMOTE_OBJECT_F const OBJ_FLAGS2_2 ; 2 const OVERHEAD_F ; 3 const USE_OBP1_F ; 4 + const OBJ_FLAGS2_5 ; 5 + const OBJ_FLAGS2_6 ; 6 + const OBJ_FLAGS2_7 ; 7 LOW_PRIORITY EQU 1 << LOW_PRIORITY_F HIGH_PRIORITY EQU 1 << HIGH_PRIORITY_F diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 1aedf20cb..ac88133d6 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -97,6 +97,8 @@ MON_SAT EQUS "(wPartyMon1SpclAtk - wPartyMon1)" MON_SDF EQUS "(wPartyMon1SpclDef - wPartyMon1)" BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)" PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)" + +NICKNAMED_MON_STRUCT_LENGTH EQUS "(PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH)" REDMON_STRUCT_LENGTH EQU 44 ; caught data @@ -121,9 +123,9 @@ 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 +HOF_MON_LENGTH EQU 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, level, nick +HOF_LENGTH EQU 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator +NUM_HOF_TEAMS EQU 30 ; evolution types (used in data/pokemon/evos_attacks.asm) const_def 1 @@ -150,8 +152,8 @@ NUM_HOF_TEAMS = 30 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 +GRASS_WILDDATA_LENGTH EQU 2 + (1 + NUM_GRASSMON * 2) * 3 +WATER_WILDDATA_LENGTH EQU 2 + (1 + NUM_WATERMON * 2) * 1 FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3 NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm) diff --git a/constants/script_constants.asm b/constants/script_constants.asm index a31394a36..34f2bc864 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -163,7 +163,7 @@ NUM_CMDQUEUE_TYPES EQU const_value const EMOTE_ROD ; 9 const EMOTE_BOULDER_DUST ; 10 const EMOTE_GRASS_RUSTLE ; 11 -EMOTE_MEM EQU -1 +EMOTE_FROM_MEM EQU -1 ; fruittree arguments ; FruitTreeItems indexes (see data/items/fruit_trees.asm) diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm index 37fd908db..b58af59ea 100644 --- a/constants/sfx_constants.asm +++ b/constants/sfx_constants.asm @@ -189,10 +189,10 @@ const SFX_TRAIN_ARRIVED ; b9 const SFX_STOP_SLOT ; ba const SFX_2_BOOPS ; bb - const SFX_GLASS_TING ; bc - const SFX_GLASS_TING_2 ; bd ; new to Crystal + const SFX_GLASS_TING ; bc + const SFX_GLASS_TING_2 ; bd const SFX_INTRO_UNOWN_1 ; be const SFX_INTRO_UNOWN_2 ; bf const SFX_INTRO_UNOWN_3 ; c0 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index abdef53e9..1c8ff5192 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -94,6 +94,13 @@ REMOVE_BOX EQU 1 DAY_CARE_WITHDRAW EQU 2 DAY_CARE_DEPOSIT EQU 3 +; wPlayerStepFlags:: ; d150 + const_def 4 + const PLAYERSTEP_MIDAIR_F ; 4 + const PLAYERSTEP_CONTINUE_F ; 5 + const PLAYERSTEP_STOP_F ; 6 + const PLAYERSTEP_START_F ; 7 + ; wInitListType:: ; d263 INIT_ENEMYOT_LIST EQU 1 INIT_BAG_ITEM_LIST EQU 2 @@ -126,14 +133,27 @@ PLAYERSPRITESETUP_RESET_ACTION_F EQU 7 ; wPlayerGender:: ; d472 PLAYERGENDER_FEMALE_F EQU 0 +; wMapStatus:: ; d432 + const_def + const MAPSTATUS_START ; 0 + const MAPSTATUS_ENTER ; 1 + const MAPSTATUS_HANDLE ; 2 + const MAPSTATUS_DONE ; 3 + +; wMapEventStatus:: ; d433 + const_def + const MAPEVENTS_ON ; 0 + const MAPEVENTS_OFF ; 1 + ; wScriptFlags:: ; d434 SCRIPT_RUNNING EQU 2 ; wScriptMode:: ; d437 -SCRIPT_OFF EQU 0 -SCRIPT_READ EQU 1 -SCRIPT_WAIT_MOVEMENT EQU 2 -SCRIPT_WAIT EQU 3 + const_def + const SCRIPT_OFF + const SCRIPT_READ + const SCRIPT_WAIT_MOVEMENT + const SCRIPT_WAIT ; wSpawnAfterChampion:: ; d4b5 SPAWN_LANCE EQU 1 |