diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-08 11:18:39 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-08 11:18:39 -0500 |
| commit | 5c4dc08ee451f699471ce69fc8f98265bc80939d (patch) | |
| tree | 33223a7ef5c01b7fbf4a3a3a176c65b237d5e5ab /wram.asm | |
| parent | d4aa6edfa744a45cc82b20cd813462af870b6fef (diff) | |
| parent | 740f91370db08d2e30c16f34be83c6d14e7d1c60 (diff) | |
Merge branch 'master' into refactor-preprocessor
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 45 |
1 files changed, 34 insertions, 11 deletions
@@ -829,7 +829,23 @@ WILDMON EQU 4 CurSpecies: ; cf60 ds 1 - ds $13 + ds 6 + +Requested2bpp: ; cf67 + ds 1 +Requested2bppSource: ; cf68 + ds 2 +Requested2bppDest: ; cf6a + ds 2 + +Requested1bpp: ; cf6c + ds 1 +Requested1bppSource: ; cf6d + ds 2 +Requested1bppDest: ; cf6f + ds 2 + + ds 3 MenuSelection:; cf74 ds 1 @@ -844,7 +860,14 @@ TextDelayFrames: ; cfb2 VBlankOccurred: ; cfb3 ds 1 - ds 8 +PredefID: ; cfb4 + ds 1 +PredefTemp: ; cfb5 + ds 2 +PredefAddress: ; cfb7 + ds 2 + + ds 3 GameTimerPause: ; cfbc ; bit 0 @@ -1176,25 +1199,25 @@ EastConnectionWindow: ; d1d7 ds 2 -TileSetHeader: -TileSetBank: ; d1d9 +TilesetHeader: +TilesetBank: ; d1d9 ds 1 -TileSetAddress: ; d1da +TilesetAddress: ; d1da ds 2 -TileSetBlocksBank: ; d1dc +TilesetBlocksBank: ; d1dc ds 1 -TileSetBlocksAddress: ; d1dd +TilesetBlocksAddress: ; d1dd ds 2 -TileSetCollisionBank: ; d1df +TilesetCollisionBank: ; d1df ds 1 -TileSetCollisionAddress: ; d1e0 +TilesetCollisionAddress: ; d1e0 ds 2 -TileSetAnim: ; d1e2 +TilesetAnim: ; d1e2 ; bank 3f ds 2 ; unused ; d1e4 ds 2 -TileSetPalettes: ; d1e6 +TilesetPalettes: ; d1e6 ; bank 3f ds 2 |