diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-04 15:08:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-04 15:08:36 -0400 |
| commit | 059680a04dc065b14800b0327c4aa2ce6176befa (patch) | |
| tree | db32f8c4a895cfde73b2698ff5838548e8032e4a /macros/wram.asm | |
| parent | 4a28a9d7da98a70ef2f786c2330c734252b5a5d7 (diff) | |
| parent | 17fb962a85448abcb714331c005a2c83b9db0c52 (diff) | |
Merge branch 'master' into clean_shim
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 |