diff options
author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /engine/variables.asm | |
parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'engine/variables.asm')
-rwxr-xr-x | engine/variables.asm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engine/variables.asm b/engine/variables.asm index 1b418ea3c..56c49f085 100755 --- a/engine/variables.asm +++ b/engine/variables.asm @@ -35,9 +35,10 @@ _GetVarAction:: ; 80648 (20:4648) ; 80671 (20:4671) .VarActionTable: ; 80671 -; RETVAR_STRBUF2: copy [de] to StringBuffer2 -; RETVAR_ADDR_DE: return address in de -; RETVAR_EXECUTE: call function +; entries correspond to VAR_* constants + ; RETVAR_STRBUF2: copy [de] to StringBuffer2 + ; RETVAR_ADDR_DE: return address in de + ; RETVAR_EXECUTE: call function dwb StringBuffer2, RETVAR_STRBUF2 dwb PartyCount, RETVAR_STRBUF2 dwb .BattleResult, RETVAR_EXECUTE @@ -125,7 +126,7 @@ _GetVarAction:: ; 80648 (20:4648) ret z inc b ld a, b - cp 26 + cp NUM_UNOWN jr c, .loop ret ; 80715 |