diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-03 16:01:46 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-03 16:01:46 -0700 |
| commit | 4e36d85ee966f8f22531183679549061263b2166 (patch) | |
| tree | fc0811dbe3abbc57d137cc4be2ae323925d0320f /wram.asm | |
| parent | c0a01c998240bacae77addbb08a5d2133cf58a21 (diff) | |
| parent | 7ff9ab5d08d569b7134ae09a48a6f895d7cf2c10 (diff) | |
Merge pull request #186 from kanzure/yenatch-master
rename a bunch of bad labels and split out tilesets
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 36 |
1 files changed, 26 insertions, 10 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 @@ -1176,25 +1192,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 |