diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-18 12:29:05 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-18 12:29:05 -0500 |
| commit | 54c1893d579cdf6853c6a64953bae281a6075fe3 (patch) | |
| tree | 11717604336caa83ddcdb1bd8b1c765d54cf708b /macros.asm | |
| parent | Clean up map connections (diff) | |
| parent | fix variable naming (diff) | |
| download | pokeyellow-54c1893d579cdf6853c6a64953bae281a6075fe3.tar.gz pokeyellow-54c1893d579cdf6853c6a64953bae281a6075fe3.tar.xz pokeyellow-54c1893d579cdf6853c6a64953bae281a6075fe3.zip | |
Merge pull request #104 from YamaArashi/master
fix variable naming
Diffstat (limited to 'macros.asm')
| -rw-r--r-- | macros.asm | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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) |