diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-19 03:52:20 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-19 03:52:20 -0500 |
| commit | 64b4cf624fe2175e2c7539b91bc41b6dae28a00e (patch) | |
| tree | 971ea955f5d40af7612f7b69029b49db98064690 /macros.asm | |
| parent | Name sound effects (diff) | |
| parent | small changes (diff) | |
| download | pokeyellow-64b4cf624fe2175e2c7539b91bc41b6dae28a00e.tar.gz pokeyellow-64b4cf624fe2175e2c7539b91bc41b6dae28a00e.tar.xz pokeyellow-64b4cf624fe2175e2c7539b91bc41b6dae28a00e.zip | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/evos_moves.asm
engine/overworld/healing_machine.asm
Diffstat (limited to 'macros.asm')
| -rw-r--r-- | macros.asm | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -14,7 +14,7 @@ dex EQUS "db $5f, $50" ; End a Pokedex entry. percent EQUS "* $ff / 100" lb: MACRO ; r, hi, lo - ld \1, (\2) << 8 + (\3) + ld \1, (\2) << 8 + ((\3) & $ff) ENDM |