diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-05 16:39:42 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-05 16:39:42 -0400 |
| commit | 08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239 (patch) | |
| tree | 7b5d7d54ed3ce4cebd9b3e2809c5ce54e8eaddfd /constants | |
| parent | 8cdf73265f95e9a55112f373804867244512878d (diff) | |
| parent | 2f0305d80a0f64c093eabceb434a2fd0c122caa2 (diff) | |
Merge pull request #11 from PikalaxALT/master
MILESTONE: Finish disassembly
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/hide_show_constants.asm | 6 | ||||
| -rwxr-xr-x | constants/oam_constants.asm | 15 |
2 files changed, 18 insertions, 3 deletions
diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 4ca9e178..10cffac8 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -192,9 +192,9 @@ const HS_SILPH_CO_10F_ITEM_2 ; B9 const HS_SILPH_CO_10F_ITEM_3 ; BA const HS_SILPH_CO_11F_1 ; BB - const HS_SILPH_CO_11F_2 ; BC - const HS_SILPH_CO_11F_JESSIE ; BD - const HS_SILPH_CO_11F_JAMES ; BE + const HS_SILPH_CO_11F_JAMES ; BC + const HS_SILPH_CO_11F_2 ; BD + const HS_SILPH_CO_11F_JESSIE ; BE const HS_MAP_F4_1 ; BF const HS_MANSION_2_ITEM ; C0 const HS_MANSION_3_ITEM_1 ; C1 diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm index ddf95648..8e855fc9 100755 --- a/constants/oam_constants.asm +++ b/constants/oam_constants.asm @@ -7,3 +7,18 @@ OAMFLAG_VFLIPPED EQU %00100000 ; OAM flag flips the sprite vertically. ; OAM attribute flags OAM_HFLIP EQU %00100000 ; horizontal flip OAM_VFLIP EQU %01000000 ; vertical flip + +frame: MACRO + db \1 +x = \2 +REPT _NARG +- 2 +x = x | (\3 << 1) + shift +endr + db x + endm + +delanim EQUS "db $fc" +dorepeat EQUS "db $fd," +dorestart EQUS "db $fe" +endanim EQUS "db $ff" |