diff options
| author | ehw <Knuckles500@gmail.com> | 2018-06-04 19:14:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 19:14:03 -0400 |
| commit | ba6c027f84c11d9f0ef0ea2cb440a582d946b9b3 (patch) | |
| tree | 9f338310a8b330f81e7cc7b04b3075b82c44bb19 /macros/wram.asm | |
| parent | b18ab8b2b7b8a1d945c909b78afa45a3dd2f7560 (diff) | |
| parent | 4f87e62feddaed6b2ede988289abbf3fc43a8614 (diff) | |
Merge pull request #1 from pret/master
Merge latest changes from master
Diffstat (limited to 'macros/wram.asm')
| -rw-r--r-- | macros/wram.asm | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/macros/wram.asm b/macros/wram.asm index c598245..77fe153 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -114,6 +114,19 @@ box: MACRO ENDM +map_connection_struct: MACRO +\1ConnectedMapGroup:: db +\1ConnectedMapNumber:: db +\1ConnectionStripPointer:: dw +\1ConnectionStripLocation:: dw +\1ConnectionStripLength:: db +\1ConnectedMapWidth:: db +\1ConnectionStripYOffset:: db +\1ConnectionStripXOffset:: db +\1ConnectionWindow:: dw +ENDM + + channel_struct: MACRO ; TODO: CH1 isn't at C101, please rebase all of these ; Addreses are Channel1 (c101). @@ -247,7 +260,6 @@ slot_reel: MACRO endm object_struct: MACRO -\1Struct:: \1Sprite:: ds 1 \1MapObjectIndex:: ds 1 \1SpriteTile:: ds 1 @@ -285,7 +297,6 @@ object_struct: MACRO ENDM map_object: MACRO -\1Object:: \1ObjectStructID:: ds 1 \1ObjectSprite:: ds 1 \1ObjectYCoord:: ds 1 |