summaryrefslogtreecommitdiff
path: root/constants/wram_constants.asm
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-05-12 13:10:01 -0400
committerentrpntr <entrpntr@gmail.com>2020-05-12 13:31:27 -0400
commit3e40a1ecd0dc81d1d5be5f1adda1fbbe14b67d83 (patch)
treef16febfeb0c404b6fd1c0e630d26da14eaf07a71 /constants/wram_constants.asm
parentdac57cee381b68350ef50317619334892c140945 (diff)
Simple cleanups in constants/data/macros and banks 1-4.
Diffstat (limited to 'constants/wram_constants.asm')
-rw-r--r--constants/wram_constants.asm18
1 files changed, 10 insertions, 8 deletions
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index a56a59aa..da50cd5d 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -80,14 +80,16 @@ RIGHT_MASK EQU 1 << RIGHT
; wFacingDirection:: ; cf2f
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:: ; d008
-PC_WITHDRAW EQU 0
-PC_DEPOSIT EQU 1
+PC_WITHDRAW EQU 0
+PC_DEPOSIT EQU 1
+REMOVE_PARTY EQU 0
+REMOVE_BOX EQU 1
DAY_CARE_WITHDRAW EQU 2
DAY_CARE_DEPOSIT EQU 3
@@ -151,7 +153,7 @@ SCRIPT_RUNNING EQU 2
; wSpawnAfterChampion::
SPAWN_LANCE EQU 1
-SPAWN_RED EQU 2
+SPAWN_RED EQU 2
; wCurDay:: ; d1f2
const_def
@@ -278,5 +280,5 @@ DAYCAREMAN_HAS_EGG_F EQU 6
; wDayCareLady:: ; dc77
DAYCARELADY_HAS_MON_F EQU 0
-; used with both wDayCareMan and wDayCareLady
+; shared flag between wDayCareMan and wDayCareLady
DAYCARE_INTRO_SEEN_F EQU 7