summaryrefslogtreecommitdiff
path: root/constants/misc_constants.asm
diff options
context:
space:
mode:
Diffstat (limited to 'constants/misc_constants.asm')
-rw-r--r--constants/misc_constants.asm20
1 files changed, 13 insertions, 7 deletions
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index 8e5b9866..bc8a767c 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -45,6 +45,8 @@ SCREEN_HEIGHT EQU 18
SCREEN_WIDTH_PIXELS EQU SCREEN_WIDTH * 8
SCREEN_HEIGHT_PIXELS EQU SCREEN_HEIGHT * 8
+BYTES_PER_TILE EQU 16
+
BG_MAP_WIDTH EQU 32
BG_MAP_HEIGHT EQU 32
@@ -110,12 +112,12 @@ ZZZ_BUBBLE EQU 6
FISH_BUBBLE EQU 7
; slot symbols
-SLOTS7 EQU $0200
-SLOTSBAR EQU $0604
-SLOTSCHERRY EQU $0A08
-SLOTSFISH EQU $0E0C
-SLOTSBIRD EQU $1210
-SLOTSMOUSE EQU $1614
+SLOTS7 EQU $0200
+SLOTSBAR EQU $0604
+SLOTSCHERRY EQU $0A08
+SLOTSFISH EQU $0E0C
+SLOTSBIRD EQU $1210
+SLOTSMOUSE EQU $1614
; party menu types
NORMAL_PARTY_MENU EQU 0
@@ -125,7 +127,7 @@ TMHM_PARTY_MENU EQU 3
SWAP_MONS_PARTY_MENU EQU 4
EVO_STONE_PARTY_MENU EQU 5
-; party memu message IDs
+; party menu message IDs
ANTIDOTE_MSG EQU $F0
BURN_HEAL_MSG EQU $F1
ICE_HEAL_MSG EQU $F2
@@ -208,6 +210,10 @@ LINK_STATE_BATTLING EQU $04 ; in a link battle
LINK_STATE_RESET EQU $05 ; reset game (unused)
LINK_STATE_TRADING EQU $32 ; in a link trade
+LINKBATTLE_RUN EQU $F
+LINKBATTLE_STRUGGLE EQU $E
+LINKBATTLE_NO_ACTION EQU $D
+
; pikachu happiness modifiers
const_value set 1
const PIKAHAPPY_LEVELUP