summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2020-09-20 13:58:03 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2020-09-20 13:58:03 -0400
commitfac958b280056922a1828b71a04d84a36e1e807a (patch)
treec094adc59182b253a61defb5fb85de7a9d77b7cc /constants
parentbfb981f1885d21cc59d2656e84c87bb8d64a089c (diff)
- Remove trailing whitespace
- Indent with single tabs, not spaces - Colons after labels - Capitalize BANK, HIGH, and LOW - dbw BANK(X), X -> dba X
Diffstat (limited to 'constants')
-rw-r--r--constants/hardware_constants.asm6
-rw-r--r--constants/main_menu_constants.asm18
-rw-r--r--constants/metatile_constants.asm41
-rw-r--r--constants/move_constants.asm4
-rwxr-xr-xconstants/script_constants.asm2
-rw-r--r--constants/sprite_constants.asm2
-rw-r--r--constants/wram_constants.asm2
7 files changed, 32 insertions, 43 deletions
diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm
index b47da72..b22019d 100644
--- a/constants/hardware_constants.asm
+++ b/constants/hardware_constants.asm
@@ -32,9 +32,9 @@ RTC_M EQU $09 ; Minutes 0-59 (0-3Bh)
RTC_H EQU $0a ; Hours 0-23 (0-17h)
RTC_DL EQU $0b ; Lower 8 bits of Day Counter (0-FFh)
RTC_DH EQU $0c ; Upper 1 bit of Day Counter, Carry Bit, Halt Flag
- ; Bit 0 Most significant bit of Day Counter (Bit 8)
- ; Bit 6 Halt (0=Active, 1=Stop Timer)
- ; Bit 7 Day Counter Carry Bit (1=Counter Overflow)
+ ; Bit 0 Most significant bit of Day Counter (Bit 8)
+ ; Bit 6 Halt (0=Active, 1=Stop Timer)
+ ; Bit 7 Day Counter Carry Bit (1=Counter Overflow)
; interrupt flags
VBLANK EQU 0
diff --git a/constants/main_menu_constants.asm b/constants/main_menu_constants.asm
index bd789ea..0a3519e 100644
--- a/constants/main_menu_constants.asm
+++ b/constants/main_menu_constants.asm
@@ -1,12 +1,12 @@
const_def
- const M_NEW_GAME
- const M_CONTINUE
- const M_PLAY_GAME
- const M_SET_TIME
-
+ const M_NEW_GAME
+ const M_CONTINUE
+ const M_PLAY_GAME
+ const M_SET_TIME
+
const_def
- const CONTINUE
- const NEW_GAME
- const OPTION
- const PLAY_POKEMON
+ const CONTINUE
+ const NEW_GAME
+ const OPTION
+ const PLAY_POKEMON
const SET_TIME
diff --git a/constants/metatile_constants.asm b/constants/metatile_constants.asm
index 88d54ab..062a0d9 100644
--- a/constants/metatile_constants.asm
+++ b/constants/metatile_constants.asm
@@ -1,31 +1,20 @@
-; all outside tileset share certain metatiles
-; this is used in overworld code when editing the map
+; All outside tilesets share certain metatiles.
+; this is used in overworld code when editing the map.
; D - dirt
; L - lawn
; T - small tree
; C - cut tree
; G - grass
-METATILE_GROUND EQU $01 ; DD
- ; DD
-METATILE_LAWN EQU $04 ; LL
- ; LL
-METATILE_SMALL_TREES_N EQU $25 ; TT
- ; LL
-METATILE_SMALL_TREES_W EQU $28 ; TL
- ; TL
-METATILE_SMALL_TREES_E EQU $2a ; LT
- ; LT
-METATILE_CUT_SE_TREES_N EQU $30 ; TT
- ; LC
-METATILE_CUT_NW_TREES_E EQU $31 ; CT
- ; LT
-METATILE_CUT_NE_TREE_NW EQU $32 ; TC
- ; LL
-METATILE_CUT_NE_TREE_SE EQU $33 ; LC
- ; LT
-METATILE_SMALL_TREE_NW EQU $34 ; TL
- ; LL
-METATILE_SMALL_TREE_SE EQU $35 ; TL
- ; LL
-METATILE_GRASS EQU $3b ; GG
- ; GG
+
+METATILE_GROUND EQU $01 ; D D / D D
+METATILE_LAWN EQU $04 ; L L / L L
+METATILE_SMALL_TREES_N EQU $25 ; T T / L L
+METATILE_SMALL_TREES_W EQU $28 ; T L / T L
+METATILE_SMALL_TREES_E EQU $2a ; L T / L T
+METATILE_CUT_SE_TREES_N EQU $30 ; T T / L C
+METATILE_CUT_NW_TREES_E EQU $31 ; C T / L T
+METATILE_CUT_NE_TREE_NW EQU $32 ; T C / L L
+METATILE_CUT_NE_TREE_SE EQU $33 ; L C / L T
+METATILE_SMALL_TREE_NW EQU $34 ; T L / L L
+METATILE_SMALL_TREE_SE EQU $35 ; T L / L L
+METATILE_GRASS EQU $3b ; G G / G G
diff --git a/constants/move_constants.asm b/constants/move_constants.asm
index 4c26c04..c21936f 100644
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -294,6 +294,6 @@ NUM_ATTACKS EQU const_value + -1
const BATTLEANIM_WOBBLE
const BATTLEANIM_SHAKE
const BATTLEANIM_HIT_CONFUSION
-
-
+
+
MOVE_DATA_SIZE EQU 7
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index a656e7a..ad1aaa8 100755
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -7,7 +7,7 @@
const SCRIPT_ID_03 ; 03
const SCRIPT_ID_04 ; 04
const SCRIPT_ID_05 ; 05
-
+
; Flags
SCRIPT_FINISHED_F EQU 7
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index c53866b..12f5e3a 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -91,5 +91,5 @@
const SPRITE_59 ; 59 duplicate SPRITE_OLD_LINK_RECEPTIONIST
const SPRITE_EGG ; 5a
const SPRITE_BOULDER ; 5b
-
+
SPRITE_TILE_SIZE EQU 64
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 8fc2c59..e124e13 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -14,7 +14,7 @@ NUM_DIRECTIONS EQU const_value
const BOXMON ; 2
const TEMPMON ; 3
const WILDMON ; 4
-
+
; wPlayerState:: ; d95d
PLAYER_NORMAL EQU 0
PLAYER_BIKE EQU 1