From 12823eea3ea185d98e06320a0ee1a3baba1a0986 Mon Sep 17 00:00:00 2001 From: Pokeglitch Date: Mon, 18 Jun 2018 08:41:39 -0400 Subject: Added in macros for scripts, queue --- constants/move_constants.asm | 2 +- constants/pokemon_data_constants.asm | 2 +- constants/script_constants.asm | 2 +- constants/wram_constants.asm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'constants') diff --git a/constants/move_constants.asm b/constants/move_constants.asm index dee94ff..4c26c04 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -296,4 +296,4 @@ NUM_ATTACKS EQU const_value + -1 const BATTLEANIM_HIT_CONFUSION -MOVE_DATA_SIZE EQU 7 \ No newline at end of file +MOVE_DATA_SIZE EQU 7 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 9038685..e9ed0c1 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -134,4 +134,4 @@ PP_MASK EQU %00111111 ; HP ENEMY_HP_BAR EQU 0 BATTLE_HP_BAR EQU 1 -POKEMON_MENU_HP_BAR EQU 2 \ No newline at end of file +POKEMON_MENU_HP_BAR EQU 2 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 4a6390e..702e400 100755 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -19,4 +19,4 @@ SCRIPT_FAIL EQU 0 ; Some script don't combine the return value with the flag ; Instead, they load this into the wFieldMoveScriptID, and keep ; the return value in a -SCRIPT_FINISHED EQU -1 \ No newline at end of file +SCRIPT_FINISHED EQU -1 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 32a0379..c530a8b 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -20,4 +20,4 @@ PLAYER_NORMAL EQU 0 PLAYER_BIKE EQU 1 PLAYER_SKATE EQU 2 PLAYER_SURF EQU 4 -PLAYER_SURF_PIKA EQU 8 \ No newline at end of file +PLAYER_SURF_PIKA EQU 8 -- cgit v1.2.3