From 7b02d57a8c0f1dd86d923951b0379335471d92a2 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 27 Nov 2013 14:37:38 -0500 Subject: [PATCH] split wram constants out of constants.asm --- constants.asm | 70 ++---------------------------------- constants/wram_constants.asm | 66 ++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 68 deletions(-) create mode 100644 constants/wram_constants.asm diff --git a/constants.asm b/constants.asm index 6648166c2..6899cf4a2 100644 --- a/constants.asm +++ b/constants.asm @@ -6,77 +6,11 @@ JumpTable EQU $28 INCLUDE "macros.asm" - -; wram constants -; MonType: ; cf5f -PARTYMON EQU 0 -OTPARTYMON EQU 1 -BOXMON EQU 2 -WILDMON EQU 4 - -; WalkingDirection: ; d043 -STANDING EQU -1 -DOWN EQU 0 -UP EQU 1 -LEFT EQU 2 -RIGHT EQU 3 - -; FacingDirection: ; d044 -FACE_CURRENT EQU 0 -FACE_DOWN EQU 8 -FACE_UP EQU 4 -FACE_LEFT EQU 2 -FACE_RIGHT EQU 1 - -; TimeOfDay: ; d269 -MORN EQU 0 -DAY EQU 1 -NITE EQU 2 -DARKNESS EQU 3 - -; ScriptFlags: ; d434 -SCRIPT_RUNNING EQU 2 - -; ScriptMode: ; d437 -SCRIPT_OFF EQU 0 -SCRIPT_READ EQU 1 -SCRIPT_WAIT_MOVEMENT EQU 2 -SCRIPT_WAIT EQU 3 - -; CurDay: ; d4cb -SUNDAY EQU 0 -MONDAY EQU 1 -TUESDAY EQU 2 -WEDNESDAY EQU 3 -THURSDAY EQU 4 -FRIDAY EQU 5 -SATURDAY EQU 6 - -; MapObjects: ; d71e - -PLAYER_OBJECT EQU 0 - -NUM_OBJECTS EQU $10 -OBJECT_LENGTH EQU $10 - -; InputType: ; c2c7 -AUTO_INPUT EQU $ff - -; WhichRegisteredItem: ; d95b -REGISTERED_POCKET EQU %11000000 -REGISTERED_NUMBER EQU %00111111 - -; PlayerState: ; d95d -PLAYER_NORMAL EQU 0 -PLAYER_BIKE EQU 1 -PLAYER_SLIP EQU 2 -PLAYER_SURF EQU 4 -PLAYER_SURF_PIKA EQU 8 - - INCLUDE "gbhw.asm" INCLUDE "hram.asm" +INCLUDE "constants/wram_constants.asm" + INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/move_constants.asm" INCLUDE "constants/battle_constants.asm" diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm new file mode 100644 index 000000000..e60725000 --- /dev/null +++ b/constants/wram_constants.asm @@ -0,0 +1,66 @@ + +; MonType: ; cf5f +PARTYMON EQU 0 +OTPARTYMON EQU 1 +BOXMON EQU 2 +WILDMON EQU 4 + +; WalkingDirection: ; d043 +STANDING EQU -1 +DOWN EQU 0 +UP EQU 1 +LEFT EQU 2 +RIGHT EQU 3 + +; FacingDirection: ; d044 +FACE_CURRENT EQU 0 +FACE_DOWN EQU 8 +FACE_UP EQU 4 +FACE_LEFT EQU 2 +FACE_RIGHT EQU 1 + +; TimeOfDay: ; d269 +MORN EQU 0 +DAY EQU 1 +NITE EQU 2 +DARKNESS EQU 3 + +; ScriptFlags: ; d434 +SCRIPT_RUNNING EQU 2 + +; ScriptMode: ; d437 +SCRIPT_OFF EQU 0 +SCRIPT_READ EQU 1 +SCRIPT_WAIT_MOVEMENT EQU 2 +SCRIPT_WAIT EQU 3 + +; CurDay: ; d4cb +SUNDAY EQU 0 +MONDAY EQU 1 +TUESDAY EQU 2 +WEDNESDAY EQU 3 +THURSDAY EQU 4 +FRIDAY EQU 5 +SATURDAY EQU 6 + +; MapObjects: ; d71e + +PLAYER_OBJECT EQU 0 + +NUM_OBJECTS EQU $10 +OBJECT_LENGTH EQU $10 + +; InputType: ; c2c7 +AUTO_INPUT EQU $ff + +; WhichRegisteredItem: ; d95b +REGISTERED_POCKET EQU %11000000 +REGISTERED_NUMBER EQU %00111111 + +; PlayerState: ; d95d +PLAYER_NORMAL EQU 0 +PLAYER_BIKE EQU 1 +PLAYER_SLIP EQU 2 +PLAYER_SURF EQU 4 +PLAYER_SURF_PIKA EQU 8 +