diff options
author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-08-18 10:32:50 -0500 |
---|---|---|
committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-08-18 10:32:50 -0500 |
commit | 1a987d1e1ab96ca9553d4253c72858057332a03a (patch) | |
tree | d101dc054e112304f327a5359532ee972e8da81a /hram.asm | |
parent | fb0a630c062cbb18026abe2792339dea27fac4d8 (diff) | |
parent | 696cffd3ae51d23855a7eb1fc5b62e69198dbf36 (diff) |
Merge pull request #114 from YamaArashi/master
Commented SGB palettes and other things
Diffstat (limited to 'hram.asm')
-rw-r--r-- | hram.asm | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -242,12 +242,12 @@ H_VBCOPYDOUBLEDEST EQU $FFCE ; 00 = no redraw ; 01 = redraw column ; 02 = redraw row -H_SCREENEDGEREDRAW EQU $FFD0 +hRedrawRowOrColumnMode EQU $FFD0 -REDRAWCOL EQU 1 -REDRAWROW EQU 2 +REDRAW_COL EQU 1 +REDRAW_ROW EQU 2 -H_SCREENEDGEREDRAWADDR EQU $FFD1 +hRedrawRowOrColumnDest EQU $FFD1 hRandomAdd EQU $FFD3 hRandomSub EQU $FFD4 @@ -269,7 +269,7 @@ hMovingBGTilesCounter1 EQU $FFD8 H_CURRENTSPRITEOFFSET EQU $FFDA ; multiple of $10 -hFossilCounter EQU $FFDB +hItemCounter EQU $FFDB hGymGateIndex EQU $FFDB @@ -285,7 +285,7 @@ hDexRatingNumMonsOwned EQU $FFDC hOaksAideResult EQU $FFDB hOaksAideRequirement EQU $FFDB ; required number of owned mons -hOaksAideItemReward EQU $FFDC +hOaksAideRewardItem EQU $FFDC hOaksAideNumMonsOwned EQU $FFDD hItemToRemoveID EQU $FFDB @@ -317,5 +317,7 @@ hFlags_0xFFF6 EQU $FFF6 hFieldMoveMonMenuTopMenuItemX EQU $FFF7 +hDisableJoypadPolling EQU $FFF9 + hJoyInput EQU $FFF8 |