diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /engine/smallflag.asm | |
parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
parent | 364854623267a8a39242243b0cdf80144e868642 (diff) |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'engine/smallflag.asm')
-rw-r--r-- | engine/smallflag.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/smallflag.asm b/engine/smallflag.asm index 2a6d91ee1..22819e5d5 100644 --- a/engine/smallflag.asm +++ b/engine/smallflag.asm @@ -1,4 +1,4 @@ -SmallFarFlagAction: ; 4d7c1 +SmallFarFlagAction: ; Perform action b on bit c in flag array hl. ; If checking a flag, check flag array d:hl unless d is 0. |