summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/animation_constants.asm34
-rw-r--r--constants/battle_constants.asm30
-rwxr-xr-xconstants/battle_tower_constants.asm33
-rw-r--r--constants/gfx_constants.asm4
-rw-r--r--constants/item_constants.asm148
-rw-r--r--constants/map_constants.asm15
-rw-r--r--constants/map_setup_constants.asm20
-rw-r--r--constants/misc_constants.asm69
-rw-r--r--constants/move_constants.asm41
-rw-r--r--constants/pokemon_constants.asm86
-rw-r--r--constants/radio_constants.asm15
-rw-r--r--constants/script_constants.asm14
-rw-r--r--constants/sprite_constants.asm78
-rw-r--r--constants/tilemap_constants.asm38
-rw-r--r--constants/wram_constants.asm7
15 files changed, 473 insertions, 159 deletions
diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm
index ea57f7230..27cb1f319 100644
--- a/constants/animation_constants.asm
+++ b/constants/animation_constants.asm
@@ -1,26 +1,3 @@
-ANIM_SWEET_SCENT_2 EQU 255 ; unused?
-ANIM_THROW_POKE_BALL EQU 256
-ANIM_SEND_OUT_MON EQU 257 ; seems to also cover shiny
-ANIM_RETURN_MON EQU 258
-ANIM_CONFUSED EQU 259
-ANIM_SLP EQU 260
-ANIM_BRN EQU 261
-ANIM_PSN EQU 262
-ANIM_SAP EQU 263
-ANIM_FRZ EQU 264
-ANIM_PAR EQU 265
-ANIM_IN_LOVE EQU 266
-ANIM_IN_SANDSTORM EQU 267
-ANIM_IN_NIGHTMARE EQU 268
-ANIM_IN_WHIRLPOOL EQU 269
-ANIM_MISS EQU 270
-ANIM_ENEMY_DAMAGE EQU 271
-ANIM_ENEMY_STAT_DOWN EQU 272 ; vibrate horizontally
-ANIM_PLAYER_STAT_DOWN EQU 273 ; wobble horizontally
-ANIM_PLAYER_DAMAGE EQU 274
-ANIM_WOBBLE EQU 275
-ANIM_SHAKE EQU 276
-ANIM_HIT_CONFUSION EQU 277
ANIM_OBJ_BURNED EQU $10
ANIM_OBJ_FROZEN EQU $2a
@@ -60,3 +37,14 @@ ANIM_BG_PSYCHIC EQU $29
ANIM_BG_VIBRATE_MON EQU $33
ANIM_BG_WOBBLE_MON EQU $34
+
+ const_def
+ const ANIM_MON_SLOW ; 0
+ const ANIM_MON_NORMAL ; 1
+ const ANIM_MON_MENU ; 2
+ const ANIM_MON_TRADE ; 3
+ const ANIM_MON_EVOLVE ; 4
+ const ANIM_MON_HATCH ; 5
+ const ANIM_MON_UNUSED ; 6
+ const ANIM_MON_EGG1 ; 7
+ const ANIM_MON_EGG2 ; 8
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index 6ee0995cd..804f223cb 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -4,6 +4,8 @@ EGG_LEVEL EQU 5
NUM_MOVES EQU 4
REST_TURNS EQU 2
+MAX_STAT_LEVEL EQU 13
+BASE_STAT_LEVEL EQU 7
const_def
const ATTACK
@@ -13,6 +15,8 @@ REST_TURNS EQU 2
const SP_DEFENSE
const ACCURACY
const EVASION
+ const ABILITY
+NUM_LEVEL_STATS EQU const_value
; move struct
const_def
@@ -94,6 +98,8 @@ const_value SET 3
const PAR
const SLP ; 7 turns
+ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP
+
; substatus
enum_start 7, -1
enum SUBSTATUS_IN_LOVE
@@ -344,3 +350,27 @@ SUBSTATUS_CURLED EQU 0
const ENEMY_COUNTER_MOVE
const PLAYER_LAST_MOVE
const ENEMY_LAST_MOVE
+
+; wBattleAction
+ const_def
+ const BATTLEACTION_MOVE1
+ const BATTLEACTION_MOVE2
+ const BATTLEACTION_MOVE3
+ const BATTLEACTION_MOVE4
+ const BATTLEACTION_SWITCH1
+ const BATTLEACTION_SWITCH2
+ const BATTLEACTION_SWITCH3
+ const BATTLEACTION_SWITCH4
+ const BATTLEACTION_SWITCH5
+ const BATTLEACTION_SWITCH6
+ const BATTLEACTION_A
+ const BATTLEACTION_B
+ const BATTLEACTION_C
+ const BATTLEACTION_D
+ const BATTLEACTION_E
+ const BATTLEACTION_FORFEIT
+
+ const_def
+ const WIN
+ const LOSE
+ const DRAW
diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm
new file mode 100755
index 000000000..49311f35d
--- /dev/null
+++ b/constants/battle_tower_constants.asm
@@ -0,0 +1,33 @@
+ const_def
+ const BATTLE_TOWER_ACTION_00
+ const BATTLE_TOWER_ACTION_01
+ const BATTLE_TOWER_ACTION_02
+ const BATTLE_TOWER_ACTION_03
+ const BATTLE_TOWER_ACTION_04
+ const BATTLE_TOWER_ACTION_05
+ const BATTLE_TOWER_ACTION_06
+ const BATTLE_TOWER_ACTION_07
+ const BATTLE_TOWER_ACTION_08
+ const BATTLE_TOWER_ACTION_09
+ const BATTLE_TOWER_ACTION_0A
+ const BATTLE_TOWER_ACTION_0B
+ const BATTLE_TOWER_ACTION_0C
+ const BATTLE_TOWER_ACTION_0D
+ const BATTLE_TOWER_ACTION_0E
+ const BATTLE_TOWER_ACTION_0F
+ const BATTLE_TOWER_ACTION_10
+ const BATTLE_TOWER_ACTION_11
+ const BATTLE_TOWER_ACTION_12
+ const BATTLE_TOWER_ACTION_13
+ const BATTLE_TOWER_ACTION_14
+ const BATTLE_TOWER_ACTION_15
+ const BATTLE_TOWER_ACTION_16
+ const BATTLE_TOWER_ACTION_17
+ const BATTLE_TOWER_ACTION_18
+ const BATTLE_TOWER_ACTION_19
+ const BATTLE_TOWER_ACTION_1A
+ const BATTLE_TOWER_ACTION_1B
+ const BATTLE_TOWER_ACTION_1C
+ const BATTLE_TOWER_ACTION_1D
+ const BATTLE_TOWER_ACTION_1E
+ const BATTLE_TOWER_ACTION_1F
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm
index 5e7583f8e..c774faa95 100644
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -39,4 +39,8 @@ const_value SET 1
const ANIM_GFX_WAVE
const ANIM_GFX_AEROBLAST
+
+LEN_2BPP_TILE EQU 16
+LEN_1BPP_TILE EQU 8
+TILES_PER_FRAME EQU 6
TILESIZE EQU $10
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 4a144515f..71cc2ba60 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -191,81 +191,81 @@
const MIRAGE_MAIL ; $BD
const ITEM_BE ; $BE
- add_tm DYNAMICPUNCH
- add_tm HEADBUTT
- add_tm CURSE
- add_tm ROLLOUT
- const ITEM_C3
- add_tm ROAR
- add_tm TOXIC
- add_tm ZAP_CANNON
- add_tm ROCK_SMASH
- add_tm PSYCH_UP
- add_tm HIDDEN_POWER
- add_tm SUNNY_DAY
- add_tm SWEET_SCENT
- add_tm SNORE
- add_tm BLIZZARD
- add_tm HYPER_BEAM
- add_tm ICY_WIND
- add_tm PROTECT
- add_tm RAIN_DANCE
- add_tm GIGA_DRAIN
- add_tm ENDURE
- add_tm FRUSTRATION
- add_tm SOLARBEAM
- add_tm IRON_TAIL
- add_tm DRAGONBREATH
- add_tm THUNDER
- add_tm EARTHQUAKE
- add_tm RETURN
- add_tm DIG
- const ITEM_DC
- add_tm PSYCHIC
- add_tm SHADOW_BALL
- add_tm MUD_SLAP
- add_tm DOUBLE_TEAM
- add_tm ICE_PUNCH
- add_tm SWAGGER
- add_tm SLEEP_TALK
- add_tm SLUDGE_BOMB
- add_tm SANDSTORM
- add_tm FIRE_BLAST
- add_tm SWIFT
- add_tm DEFENSE_CURL
- add_tm THUNDERPUNCH
- add_tm DREAM_EATER
- add_tm DETECT
- add_tm REST
- add_tm ATTRACT
- add_tm THIEF
- add_tm STEEL_WING
- add_tm FIRE_PUNCH
- add_tm FURY_CUTTER
- add_tm NIGHTMARE
+ add_tm DYNAMICPUNCH ; $BF
+ add_tm HEADBUTT ; $C0
+ add_tm CURSE ; $C1
+ add_tm ROLLOUT ; $C2
+ const ITEM_C3 ; $C3
+ add_tm ROAR ; $C4
+ add_tm TOXIC ; $C5
+ add_tm ZAP_CANNON ; $C6
+ add_tm ROCK_SMASH ; $C7
+ add_tm PSYCH_UP ; $C8
+ add_tm HIDDEN_POWER ; $C9
+ add_tm SUNNY_DAY ; $CA
+ add_tm SWEET_SCENT ; $CB
+ add_tm SNORE ; $CC
+ add_tm BLIZZARD ; $CD
+ add_tm HYPER_BEAM ; $CE
+ add_tm ICY_WIND ; $CF
+ add_tm PROTECT ; $D0
+ add_tm RAIN_DANCE ; $D1
+ add_tm GIGA_DRAIN ; $D2
+ add_tm ENDURE ; $D3
+ add_tm FRUSTRATION ; $D4
+ add_tm SOLARBEAM ; $D5
+ add_tm IRON_TAIL ; $D6
+ add_tm DRAGONBREATH ; $D7
+ add_tm THUNDER ; $D8
+ add_tm EARTHQUAKE ; $D9
+ add_tm RETURN ; $DA
+ add_tm DIG ; $DB
+ const ITEM_DC ; $DC
+ add_tm PSYCHIC ; $DD
+ add_tm SHADOW_BALL ; $DE
+ add_tm MUD_SLAP ; $DF
+ add_tm DOUBLE_TEAM ; $E0
+ add_tm ICE_PUNCH ; $E1
+ add_tm SWAGGER ; $E2
+ add_tm SLEEP_TALK ; $E3
+ add_tm SLUDGE_BOMB ; $E4
+ add_tm SANDSTORM ; $E5
+ add_tm FIRE_BLAST ; $E6
+ add_tm SWIFT ; $E7
+ add_tm DEFENSE_CURL ; $E8
+ add_tm THUNDERPUNCH ; $E9
+ add_tm DREAM_EATER ; $EA
+ add_tm DETECT ; $EB
+ add_tm REST ; $EC
+ add_tm ATTRACT ; $ED
+ add_tm THIEF ; $EE
+ add_tm STEEL_WING ; $EF
+ add_tm FIRE_PUNCH ; $F0
+ add_tm FURY_CUTTER ; $F1
+ add_tm NIGHTMARE ; $F2
NUM_TMS = const_value - TM01 - 2
- add_hm CUT
- add_hm FLY
- add_hm SURF
- add_hm STRENGTH
- add_hm FLASH
- add_hm WHIRLPOOL
- add_hm WATERFALL
+ add_hm CUT ; $F3
+ add_hm FLY ; $F4
+ add_hm SURF ; $F5
+ add_hm STRENGTH ; $F6
+ add_hm FLASH ; $F7
+ add_hm WHIRLPOOL ; $F8
+ add_hm WATERFALL ; $F9
NUM_HMS = const_value - HM01
- const HM_08
+ const HM_08 ; $FA
add_mt FLAMETHROWER
add_mt THUNDERBOLT
add_mt ICE_BEAM
+ITEM_FROM_MEM EQU $ff
; leftovers from red
SAFARI_BALL EQU 8 ; MOON_STONE
MOON_STONE_RED EQU 10 ; BURN_HEAL
FULL_HEAL_RED EQU 52 ; X_SPEED
-
MAIL_MAX_LENGTH EQU $20
; pockets
@@ -318,6 +318,7 @@ const_value SET 30
const HELD_SP_DEFENSE_UP
const HELD_ACCURACY_UP
const HELD_EVASION_UP
+ const HELD_38
const_value SET 40
const HELD_40
@@ -412,3 +413,28 @@ ITEMMENU_CLOSE EQU 6
const MART_MT_MOON
const MART_INDIGO_PLATEAU
const MART_UNDERGROUND
+
+; PartyMenuActionText
+ const_def
+ const PARTYMENUACTION_00
+ const PARTYMENUACTION_HEALING_ITEM
+ const PARTYMENUACTION_02
+ const PARTYMENUACTION_TEACH_TM
+ const PARTYMENUACTION_04
+ const PARTYMENUACTION_EVO_STONE
+ const PARTYMENUACTION_06
+ const PARTYMENUACTION_07
+ const PARTYMENUACTION_08
+ const PARTYMENUACTION_MOBILE
+
+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 0880a4f1e..c98c64ff9 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -494,6 +494,11 @@ MAP_NONE EQU 0
const _ROOF
; connection directions
+ const_def
+ const EAST_F
+ const WEST_F
+ const SOUTH_F
+ const NORTH_F
const_def
shift_const EAST
@@ -540,7 +545,7 @@ const_value SET 1
const OBJECT_SPRITE_Y
const OBJECT_SPRITE_X_OFFSET
const OBJECT_SPRITE_Y_OFFSET
- const OBJECT_27
+ const OBJECT_MOVEMENT_BYTE_INDEX
const OBJECT_28
const OBJECT_29
const OBJECT_30
@@ -566,11 +571,10 @@ const_value SET 1
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_3_DATA_WIDTH EQU 6
-OBJECT_STRUCT_3_DATA_HEIGHT EQU 37
OW_DOWN EQU DOWN << 2
OW_UP EQU UP << 2
@@ -586,7 +590,10 @@ OW_RIGHT EQU RIGHT << 2
const EMOTE_BOLT ; 5
const EMOTE_SLEEP ; 6
const EMOTE_FISH ; 7
- const EMOTE_ROD ; 8 - add directional constant
+ const EMOTE_08 ; 8
+ const EMOTE_09 ; 9
+ const EMOTE_0A ; 10
+ const EMOTE_0B ; 11
EMOTE_MEM EQU -1
const_def
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index e3088496f..194257996 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -1,16 +1,16 @@
-const_value SET $f0
- const MAPSETUP_00
+const_value SET $f1
const MAPSETUP_WARP
- const MAPSETUP_02
+ const MAPSETUP_CONTINUE
const MAPSETUP_RELOADMAP
- const MAPSETUP_04
- const MAPSETUP_05
- const MAPSETUP_06
- const MAPSETUP_07
- const MAPSETUP_08
- const MAPSETUP_09
- const MAPSETUP_10
+ const MAPSETUP_TELEPORT
+ const MAPSETUP_DOOR
+ const MAPSETUP_FALL
+ const MAPSETUP_CONNECTION
+ const MAPSETUP_LINKRETURN
+ const MAPSETUP_TRAIN
+ const MAPSETUP_SUBMENU
const MAPSETUP_BADWARP
+ const MAPSETUP_FLY
; Command descriptions from Condensation water's scripting compendium. const_def
const_def
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index d8e5fc9e5..108eda873 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -7,6 +7,7 @@ MAX_PC_ITEMS EQU 50
; strings
PLAYER_NAME_LENGTH EQU 8
+BOX_NAME_LENGTH EQU 9
PKMN_NAME_LENGTH EQU 11
MOVE_NAME_LENGTH EQU 13
ITEM_NAME_LENGTH EQU 13
@@ -109,14 +110,19 @@ const_value = 1
const MOM_ITEM
const MOM_DOLL
-BATTLETOWER_PKMNSTRUCTLENGTH EQU $30
BATTLETOWER_NROFPKMNS EQU 3
BATTLETOWER_TRAINERDATALENGTH EQU $24
BATTLETOWER_NROFTRAINERS EQU 7
+BATTLETOWER_NRMONSPERLEVELBRACKET EQU BATTLETOWER_NROFPKMNS * BATTLETOWER_NROFTRAINERS
+BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + 3 * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH
NUM_WILDMONS_PER_AREA_TIME_OF_DAY EQU 7
WILDMON_GRASS_STRUCTURE_LENGTH EQU 2 + 3 * (1 + 2 * NUM_WILDMONS_PER_AREA_TIME_OF_DAY)
+MOBILE_EVENT_OBJECT_GS_BALL EQU $b
+
+MALE EQU 0
+FEMALE EQU 1
PRINTNUM_MONEY_F EQU 5
PRINTNUM_RIGHTALIGN_F EQU 6
@@ -157,3 +163,64 @@ const_value = 1
HMENURETURN_SCRIPT EQU %10000000
HMENURETURN_ASM EQU %11111111
+
+NUM_MON_SUBMENU_ITEMS EQU 8
+
+ const_def
+ const ZEPHYRBADGE
+ const HIVEBADGE
+ const PLAINBADGE
+ const FOGBADGE
+ const MINERALBADGE
+ const STORMBADGE
+ const GLACIERBADGE
+ const RISINGBADGE
+NUM_JOHTO_BADGES EQU const_value
+ const_def
+ const BOULDERBADGE
+ const CASCADEBADGE
+ const THUNDERBADGE
+ const RAINBOWBADGE
+ const SOULBADGE
+ const MARSHBADGE
+ const VOLCANOBADGE
+ const EARTHBADGE
+NUM_KANTO_BADGES EQU const_value
+NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
+
+ const_def
+ const JUMPTABLE_8D24B_FUNCTION_00
+ const JUMPTABLE_8D24B_FUNCTION_01
+ const JUMPTABLE_8D24B_FUNCTION_02
+ const JUMPTABLE_8D24B_FUNCTION_03
+ const JUMPTABLE_8D24B_FUNCTION_04
+ const JUMPTABLE_8D24B_FUNCTION_05
+ const JUMPTABLE_8D24B_FUNCTION_06
+ const JUMPTABLE_8D24B_FUNCTION_07
+ const JUMPTABLE_8D24B_FUNCTION_08
+ const JUMPTABLE_8D24B_FUNCTION_09
+ const JUMPTABLE_8D24B_FUNCTION_0A
+ const JUMPTABLE_8D24B_FUNCTION_0B
+ const JUMPTABLE_8D24B_FUNCTION_0C
+ const JUMPTABLE_8D24B_FUNCTION_0D
+ const JUMPTABLE_8D24B_FUNCTION_0E
+ const JUMPTABLE_8D24B_FUNCTION_0F
+ const JUMPTABLE_8D24B_FUNCTION_10
+ const JUMPTABLE_8D24B_FUNCTION_11
+ const JUMPTABLE_8D24B_FUNCTION_12
+ const JUMPTABLE_8D24B_FUNCTION_13
+ const JUMPTABLE_8D24B_FUNCTION_14
+ const JUMPTABLE_8D24B_FUNCTION_15
+ const JUMPTABLE_8D24B_FUNCTION_16
+ const JUMPTABLE_8D24B_FUNCTION_17
+ const JUMPTABLE_8D24B_FUNCTION_18
+ const JUMPTABLE_8D24B_FUNCTION_19
+ const JUMPTABLE_8D24B_FUNCTION_1A
+ const JUMPTABLE_8D24B_FUNCTION_1B
+ const JUMPTABLE_8D24B_FUNCTION_1C
+ const JUMPTABLE_8D24B_FUNCTION_1D
+ const JUMPTABLE_8D24B_FUNCTION_1E
+ const JUMPTABLE_8D24B_FUNCTION_1F
+ const JUMPTABLE_8D24B_FUNCTION_20
+ const JUMPTABLE_8D24B_FUNCTION_21
+ const JUMPTABLE_8D24B_FUNCTION_22
diff --git a/constants/move_constants.asm b/constants/move_constants.asm
index d88b0b560..e8392b45a 100644
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -256,3 +256,44 @@
const_value SET const_value + -1
const NUM_ATTACKS ; $fb
+
+; Battle animations use the same constants
+; as the moves up to this point.
+ const ANIM_FC ; $fc
+ const ANIM_FD ; $fd
+ const ANIM_FE ; $fe
+ const ANIM_SWEET_SCENT_2 ; $ff
+ const ANIM_THROW_POKE_BALL ; $100
+ const ANIM_SEND_OUT_MON ; $101
+ const ANIM_RETURN_MON ; $102
+ const ANIM_CONFUSED ; $103
+ const ANIM_SLP ; $104
+ const ANIM_BRN ; $105
+ const ANIM_PSN ; $106
+ const ANIM_SAP ; $107
+ const ANIM_FRZ ; $108
+ const ANIM_PAR ; $109
+ const ANIM_IN_LOVE ; $10a
+ const ANIM_IN_SANDSTORM ; $10b
+ const ANIM_IN_NIGHTMARE ; $10c
+ const ANIM_IN_WHIRLPOOL ; $10d
+; battle anims
+ const ANIM_MISS ; $10e
+ const ANIM_ENEMY_DAMAGE ; $10f
+ const ANIM_ENEMY_STAT_DOWN ; $110
+ const ANIM_PLAYER_STAT_DOWN ; $111
+ const ANIM_PLAYER_DAMAGE ; $112
+ const ANIM_WOBBLE ; $113
+ const ANIM_SHAKE ; $114
+ const ANIM_HIT_CONFUSION ; $115
+
+; wcfca uses offsets from ANIM_MISS
+ const_def
+ const BATTLEANIM_NONE
+ const BATTLEANIM_ENEMY_DAMAGE
+ const BATTLEANIM_ENEMY_STAT_DOWN
+ const BATTLEANIM_PLAYER_STAT_DOWN
+ const BATTLEANIM_PLAYER_DAMAGE
+ const BATTLEANIM_WOBBLE
+ const BATTLEANIM_SHAKE
+ const BATTLEANIM_HIT_CONFUSION \ No newline at end of file
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 0012ec1e2..3407281c4 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -260,30 +260,62 @@ NUM_POKEMON EQU const_value
EGG EQU 253
; pokemon structure in RAM
-MON_SPECIES EQUS "PartyMon1Species - PartyMon1"
-MON_ITEM EQUS "PartyMon1Item - PartyMon1"
-MON_MOVES EQUS "PartyMon1Moves - PartyMon1"
-MON_ID EQUS "PartyMon1ID - PartyMon1"
-MON_EXP EQUS "PartyMon1Exp - PartyMon1"
-MON_HP_EXP EQUS "PartyMon1HPExp - PartyMon1"
-MON_ATK_EXP EQUS "PartyMon1AtkExp - PartyMon1"
-MON_DEF_EXP EQUS "PartyMon1DefExp - PartyMon1"
-MON_SPD_EXP EQUS "PartyMon1SpdExp - PartyMon1"
-MON_SPC_EXP EQUS "PartyMon1SpcExp - PartyMon1"
-MON_DVS EQUS "PartyMon1DVs - PartyMon1"
-MON_PP EQUS "PartyMon1PP - PartyMon1"
-MON_HAPPINESS EQUS "PartyMon1Happiness - PartyMon1"
-MON_PKRUS EQUS "PartyMon1PokerusStatus - PartyMon1"
-MON_CAUGHTTIME EQUS "PartyMon1CaughtTime - PartyMon1"
-MON_CAUGHTGENDER EQUS "PartyMon1CaughtGender - PartyMon1"
-MON_LEVEL EQUS "PartyMon1Level - PartyMon1"
-MON_STATUS EQUS "PartyMon1Status - PartyMon1"
-MON_HP EQUS "PartyMon1HP - PartyMon1"
-MON_MAXHP EQUS "PartyMon1MaxHP - PartyMon1"
-MON_ATK EQUS "PartyMon1Attack - PartyMon1"
-MON_DEF EQUS "PartyMon1Defense - PartyMon1"
-MON_SPD EQUS "PartyMon1Speed - PartyMon1"
-MON_SAT EQUS "PartyMon1SpclAtk - PartyMon1"
-MON_SDF EQUS "PartyMon1SpclDef - PartyMon1"
-BOXMON_STRUCT_LENGTH EQUS "PartyMon1Status - PartyMon1"
-PARTYMON_STRUCT_LENGTH EQUS "PartyMon1StatsEnd - PartyMon1"
+MON_SPECIES EQUS "(PartyMon1Species - PartyMon1)"
+MON_ITEM EQUS "(PartyMon1Item - PartyMon1)"
+MON_MOVES EQUS "(PartyMon1Moves - PartyMon1)"
+MON_ID EQUS "(PartyMon1ID - PartyMon1)"
+MON_EXP EQUS "(PartyMon1Exp - PartyMon1)"
+MON_STAT_EXP EQUS "(PartyMon1StatExp - PartyMon1)"
+MON_HP_EXP EQUS "(PartyMon1HPExp - PartyMon1)"
+MON_ATK_EXP EQUS "(PartyMon1AtkExp - PartyMon1)"
+MON_DEF_EXP EQUS "(PartyMon1DefExp - PartyMon1)"
+MON_SPD_EXP EQUS "(PartyMon1SpdExp - PartyMon1)"
+MON_SPC_EXP EQUS "(PartyMon1SpcExp - PartyMon1)"
+MON_DVS EQUS "(PartyMon1DVs - PartyMon1)"
+MON_PP EQUS "(PartyMon1PP - PartyMon1)"
+MON_HAPPINESS EQUS "(PartyMon1Happiness - PartyMon1)"
+MON_PKRUS EQUS "(PartyMon1PokerusStatus - PartyMon1)"
+MON_CAUGHTDATA EQUS "(PartyMon1CaughtData - PartyMon1)"
+MON_CAUGHTLEVEL EQUS "(PartyMon1CaughtLevel - PartyMon1)"
+MON_CAUGHTTIME EQUS "(PartyMon1CaughtTime - PartyMon1)"
+MON_CAUGHTGENDER EQUS "(PartyMon1CaughtGender - PartyMon1)"
+MON_CAUGHTLOCATION EQUS "(PartyMon1CaughtLocation - PartyMon1)"
+MON_LEVEL EQUS "(PartyMon1Level - PartyMon1)"
+MON_STATUS EQUS "(PartyMon1Status - PartyMon1)"
+MON_HP EQUS "(PartyMon1HP - PartyMon1)"
+MON_MAXHP EQUS "(PartyMon1MaxHP - PartyMon1)"
+MON_ATK EQUS "(PartyMon1Attack - PartyMon1)"
+MON_DEF EQUS "(PartyMon1Defense - PartyMon1)"
+MON_SPD EQUS "(PartyMon1Speed - PartyMon1)"
+MON_SAT EQUS "(PartyMon1SpclAtk - PartyMon1)"
+MON_SDF EQUS "(PartyMon1SpclDef - PartyMon1)"
+BOXMON_STRUCT_LENGTH EQUS "(PartyMon1End - PartyMon1)"
+PARTYMON_STRUCT_LENGTH EQUS "(PartyMon1StatsEnd - PartyMon1)"
+SCRATCHMON_STRUCT_LENGTH EQUS "(PartyMon1StatsEnd - PartyMon1Item)"
+
+const_value SET 1
+ 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
+
+ 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
+
+MONMENU_FIELD_MOVE EQU 0
+MONMENU_MENUOPTION EQU 1
diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm
index 46341c305..ee9cd6ce6 100644
--- a/constants/radio_constants.asm
+++ b/constants/radio_constants.asm
@@ -93,3 +93,18 @@
const BUENA_ITEM
const BUENA_MOVE
const BUENA_STRING
+
+ const_def
+ const BUENA_STARTERS
+ const BUENA_DRINKS
+ const BUENA_ITEMS
+ const BUENA_BALLS
+ const BUENA_MON1
+ const BUENA_MON2
+ const BUENA_TOWNS
+ const BUENA_TYPES
+ const BUENA_MOVES
+ const BUENA_XITEMS
+ const BUENA_STATIONS
+NUM_PASSWORD_CATEGORIES EQU const_value
+NUM_PASSWORDS_PER_CATEGORY EQU 3
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index 191a9c024..058f9d92d 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -35,3 +35,17 @@ NUM_VARS EQU const_value
RETVAR_STRBUF2 EQU (0 << 6)
RETVAR_ADDR_DE EQU (1 << 6)
RETVAR_EXECUTE EQU (2 << 6)
+
+const_value SET -1
+ const PLAYEREVENT_MAPSCRIPT
+ const PLAYEREVENT_NONE
+ const PLAYEREVENT_SEENBYTRAINER
+ const PLAYEREVENT_TALKTOTRAINER
+ const PLAYEREVENT_ITEMBALL
+ const PLAYEREVENT_CONNECTION
+ const PLAYEREVENT_WARP
+ const PLAYEREVENT_FALL
+ const PLAYEREVENT_WHITEOUT
+ const PLAYEREVENT_HATCH
+ const PLAYEREVENT_JOYCHANGEFACING
+NUM_PLAYER_EVENTS EQU const_value
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index a355877f2..a017d41b0 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -170,6 +170,16 @@ const_value SET 1
const STANDING_SPRITE
const STILL_SPRITE
+; sprite header fields
+ const_def
+ const SPRITEHEADER_ADDR_LO
+ const SPRITEHEADER_ADDR_HI
+ const SPRITEHEADER_SIZE
+ const SPRITEHEADER_BANK
+ const SPRITEHEADER_TYPE
+ const SPRITEHEADER_PALETTE
+NUM_SPRITEHEADER_FIELDS EQU const_value
+
; sprite palettes
const_def
const PAL_OW_RED
@@ -184,17 +194,17 @@ const_value SET 1
; sprite movement data table indices
const_def
const SPRITEMOVEDATA_00
- const SPRITEMOVEDATA_01
- const SPRITEMOVEDATA_02
- const SPRITEMOVEDATA_03
+ const SPRITEMOVEDATA_ITEM_TREE
+ const SPRITEMOVEDATA_WANDER
+ const SPRITEMOVEDATA_SPINRANDOM_SLOW
const SPRITEMOVEDATA_WALK_UP_DOWN
const SPRITEMOVEDATA_WALK_LEFT_RIGHT
const SPRITEMOVEDATA_STANDING_DOWN
const SPRITEMOVEDATA_STANDING_UP
const SPRITEMOVEDATA_STANDING_LEFT
const SPRITEMOVEDATA_STANDING_RIGHT
- const SPRITEMOVEDATA_0A
- const SPRITEMOVEDATA_0B
+ const SPRITEMOVEDATA_SPINRANDOM_FAST
+ const SPRITEMOVEDATA_PLAYER
const SPRITEMOVEDATA_0C
const SPRITEMOVEDATA_0D
const SPRITEMOVEDATA_0E
@@ -202,36 +212,38 @@ const_value SET 1
const SPRITEMOVEDATA_10
const SPRITEMOVEDATA_11
const SPRITEMOVEDATA_12
- const SPRITEMOVEDATA_13
- const SPRITEMOVEDATA_14
- const SPRITEMOVEDATA_15
- const SPRITEMOVEDATA_16
- const SPRITEMOVEDATA_17
- const SPRITEMOVEDATA_18
- const SPRITEMOVEDATA_19
- const SPRITEMOVEDATA_1A
+ const SPRITEMOVEDATA_FOLLOWING
+ const SPRITEMOVEDATA_SCRIPTED
+ const SPRITEMOVEDATA_SNORLAX
+ const SPRITEMOVEDATA_POKEMON
+ const SPRITEMOVEDATA_SUDOWOODO
+ const SPRITEMOVEDATA_SMASHABLE_ROCK
+ const SPRITEMOVEDATA_STRENGTH_BOULDER
+ const SPRITEMOVEDATA_FOLLOWNOTEXACT
const SPRITEMOVEDATA_1B
const SPRITEMOVEDATA_1C
const SPRITEMOVEDATA_1D
- const SPRITEMOVEDATA_1E
- const SPRITEMOVEDATA_1F
+ const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE
+ const SPRITEMOVEDATA_SPINCLOCKWISE
const SPRITEMOVEDATA_20
- const SPRITEMOVEDATA_21
+ const SPRITEMOVEDATA_BIGDOLL
const SPRITEMOVEDATA_22
const SPRITEMOVEDATA_23
- const SPRITEMOVEDATA_24
+ const SPRITEMOVEDATA_LAPRAS
const SPRITEMOVEDATA_25
+NUM_SPRITEMOVEDATA EQU const_value +- 1
+SPRITEMOVEDATA_FIELDS EQU 6
; sprite movement functions
const_def
const SPRITEMOVEFN_00
- const SPRITEMOVEFN_01
- const SPRITEMOVEFN_02
- const SPRITEMOVEFN_03
- const SPRITEMOVEFN_04
- const SPRITEMOVEFN_05
- const SPRITEMOVEFN_06
- const SPRITEMOVEFN_07
+ const SPRITEMOVEFN_RANDOM_WALK_Y
+ const SPRITEMOVEFN_RANDOM_WALK_X
+ const SPRITEMOVEFN_RANDOM_WALK_XY
+ const SPRITEMOVEFN_SLOW_RANDOM_SPIN
+ const SPRITEMOVEFN_FAST_RANDOM_SPIN
+ const SPRITEMOVEFN_STANDING
+ const SPRITEMOVEFN_OBEY_DPAD
const SPRITEMOVEFN_08
const SPRITEMOVEFN_09
const SPRITEMOVEFN_0A
@@ -239,16 +251,18 @@ const_value SET 1
const SPRITEMOVEFN_0C
const SPRITEMOVEFN_0D
const SPRITEMOVEFN_0E
- const SPRITEMOVEFN_0F
- const SPRITEMOVEFN_10
- const SPRITEMOVEFN_11
- const SPRITEMOVEFN_12
+ const SPRITEMOVEFN_FOLLOW
+ const SPRITEMOVEFN_SCRIPTED
+ const SPRITEMOVEFN_STRENGTH
+ const SPRITEMOVEFN_FOLLOWNOTEXACT
const SPRITEMOVEFN_13
const SPRITEMOVEFN_14
- const SPRITEMOVEFN_15
- const SPRITEMOVEFN_16
+ const SPRITEMOVEFN_BIG_SNORLAX
+ const SPRITEMOVEFN_BOUNCE
const SPRITEMOVEFN_17
- const SPRITEMOVEFN_18
- const SPRITEMOVEFN_19
+ const SPRITEMOVEFN_SPIN_CLOCKWISE
+ const SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE
const SPRITEMOVEFN_1A
const SPRITEMOVEFN_1B
+
+MAX_OUTDOOR_SPRITES EQU 23
diff --git a/constants/tilemap_constants.asm b/constants/tilemap_constants.asm
index e47a1b269..215bd2934 100644
--- a/constants/tilemap_constants.asm
+++ b/constants/tilemap_constants.asm
@@ -3,3 +3,41 @@ WALLTILE EQU 1
WATRTILE EQU 15
TALK EQU 1 << 4
+
+const_value SET 1
+ const TILESET_JOHTO_OUTSIDE_1 ; 01
+ const TILESET_JOHTO_OUTSIDE_2 ; 02
+ const TILESET_KANTO_OUTSIDE ; 03
+ const TILESET_BATTLE_TOWER_OUTSIDE ; 04
+ const TILESET_HOUSE_1 ; 05
+ const TILESET_KRISS_HOUSE ; 06
+ const TILESET_POKECENTER ; 07
+ const TILESET_GATE ; 08
+ const TILESET_PORT ; 09
+ const TILESET_LAB ; 0a
+ const TILESET_POWER_PLANT ; 0b
+ const TILESET_MART ; 0c
+ const TILESET_CELADON_MANSION ; 0d
+ const TILESET_GAME_CORNER ; 0e
+ const TILESET_GYM_1 ; 0f
+ const TILESET_KURT_HOUSE ; 10
+ const TILESET_TRAIN_STATION ; 11
+ const TILESET_OLIVINE_GYM ; 12
+ const TILESET_LIGHTHOUSE ; 13
+ const TILESET_KRISS_HOUSE_2F ; 14
+ const TILESET_GOLDENROD_POKECOM_CENTER_2F_MOBILE ; 15
+ const TILESET_BATTLE_TOWER ; 16
+ const TILESET_SPROUT_TOWER ; 17
+ const TILESET_CAVE ; 18
+ const TILESET_PARK ; 19
+ const TILESET_RUINS_OF_ALPH ; 1a
+ const TILESET_RADIO_TOWER ; 1b
+ const TILESET_UNDERGROUND ; 1c
+ const TILESET_ICE_PATH ; 1d
+ const TILESET_WHIRL_ISLANDS ; 1e
+ const TILESET_ILEX_FOREST ; 1f
+ const TILESET_20 ; 20
+ const TILESET_HO_OH_WORD_ROOM ; 21
+ const TILESET_KABUTO_WORD_ROOM ; 22
+ const TILESET_OMANYTE_WORD_ROOM ; 23
+ const TILESET_AERODACTYL_WORD_ROOM ; 24
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 9bb72b2a2..ffe9b11a6 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -54,7 +54,6 @@ SATURDAY EQU 6
PLAYER_OBJECT EQU 0
NUM_OBJECTS EQU $10
-OBJECT_LENGTH EQU $10
; InputType: ; c2c7
AUTO_INPUT EQU $ff
@@ -76,3 +75,9 @@ NUM_OBJECT_STRUCTS EQU 13
; After-Champion Spawn
SPAWN_LANCE EQU 1
SPAWN_RED EQU 2
+
+; wPokemonWithdrawDepositParameter
+PC_WITHDRAW EQU 0
+PC_DEPOSIT EQU 1
+DAYCARE_WITHDRAW EQU 2
+DAYCARE_DEPOSIT EQU 3