From 3fc06b0f9da7ef993cb75315c5b2b168a3d6a3cf Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 2 Jan 2018 20:35:57 -0500 Subject: Use constants --- constants/wram_constants.asm | 3 --- 1 file changed, 3 deletions(-) (limited to 'constants/wram_constants.asm') diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 8cf06db06..f2cdf7039 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -116,9 +116,6 @@ PLAYER_SKATE EQU 2 PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 -OBJECT_STRUCT_LENGTH EQU 40 -NUM_OBJECT_STRUCTS EQU 13 - ; After-Champion Spawn SPAWN_LANCE EQU 1 SPAWN_RED EQU 2 -- cgit v1.2.3 From 94d6a327218fc56753238b424df208245092d96c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 12:00:01 -0500 Subject: Use maskbits some more --- constants/wram_constants.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'constants/wram_constants.asm') diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index f2cdf7039..755c89bdc 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -52,6 +52,7 @@ const_value set -1 const UP ; 1 const LEFT ; 2 const RIGHT ; 3 +NUM_DIRECTIONS EQU const_value DOWN_MASK EQU 1 << DOWN UP_MASK EQU 1 << UP @@ -71,6 +72,7 @@ FACE_RIGHT EQU 1 const DAY_F ; 1 const NITE_F ; 2 const DARKNESS_F ; 3 +NUM_DAYTIMES EQU const_value MORN EQU 1 << MORN_F DAY EQU 1 << DAY_F -- cgit v1.2.3 From 2085ebcc617fdd78cc8194dc4a9a34e9fb8e8b51 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 23:04:50 -0500 Subject: maskbits for NUM_FRAMES --- constants/wram_constants.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'constants/wram_constants.asm') diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 755c89bdc..617cb906c 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -28,6 +28,7 @@ TEXT_DELAY_SLOW EQU 5 const FRAME_6 ; 5 const FRAME_7 ; 6 const FRAME_8 ; 7 +NUM_FRAMES EQU const_value ; TextBoxFlags: const_def -- cgit v1.2.3 From 2b823389208c7c3691109ad751ccc39aa2408387 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 15 Jan 2018 22:00:56 -0500 Subject: Phone data 0/7 are time masks --- constants/wram_constants.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'constants/wram_constants.asm') diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 617cb906c..6faa87be4 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -80,6 +80,8 @@ DAY EQU 1 << DAY_F NITE EQU 1 << NITE_F DARKNESS EQU 1 << DARKNESS_F +ANYTIME EQU MORN | DAY | NITE + ; ScriptFlags: ; d434 SCRIPT_RUNNING EQU 2 -- cgit v1.2.3