summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-07-18 08:17:29 -0700
committerYamaArashi <shadow962@live.com>2015-07-18 08:17:46 -0700
commitfc9af362ae65d24c66b39ea7759637cc9c1f9b0a (patch)
tree37074f79564b1e47b109566dfd9c3c454a4cc226 /macros.asm
parentb85d7c65f35e93534a871ed34b1950daf59ab189 (diff)
fix variable naming
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm6
1 files changed, 5 insertions, 1 deletions
diff --git a/macros.asm b/macros.asm
index 6a693a0b..9899ec29 100644
--- a/macros.asm
+++ b/macros.asm
@@ -13,6 +13,10 @@ dex EQUS "db $5f, $50" ; End a Pokedex entry.
percent EQUS "* $ff / 100"
+lb: MACRO ; r, hi, lo
+ ld \1, (\2) << 8 + (\3)
+ ENDM
+
; Constant enumeration is useful for monsters, items, moves, etc.
const_def: MACRO
@@ -530,7 +534,7 @@ ENDM
SOUTH_MAP_CONNECTION: MACRO
db \1 ; map id
dw \6 + \4 ; "Conection Strip" location
- dw wOverworldMap + 3 + (\8 + 3) * (\7 + 6) + \3 ; current map positoin
+ dw wOverworldMap + 3 + (\8 + 3) * (\7 + 6) + \3 ; current map position
db \5 ; width of connection strip
db \2 ; map width
db 0 ; y alignment (y coordinate of player when entering map)