summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-11-02 10:33:47 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2020-11-02 10:33:47 -0500
commit356aa1a0c394124579f5fbc80981260fa4fc5d5a (patch)
tree30f59a27cfaf797ae5df1e13f3ad23bad7c862e7
parentc9bf53310fd8834a0370a5a52e4aaeb9a79becb5 (diff)
Group link-related WRAM labels together
-rw-r--r--wram.asm33
1 files changed, 13 insertions, 20 deletions
diff --git a/wram.asm b/wram.asm
index 73beea91..1d801b4f 100644
--- a/wram.asm
+++ b/wram.asm
@@ -537,7 +537,19 @@ wUnusedJigglypuffNoteXCoord:: db
NEXTU
; raw link data
-wLinkData:: ds $514
+wLinkData:: ds 271
+wc80f:: ds 229
+wc8f4:: ds 5
+wc8f9:: ds 198
+wc9bf:: ds 79
+wca0e:: ds 5
+wca13:: ds 113
+wca84:: ds 100
+wcae8:: dw
+wLinkOTPartyMonTypes:: ds 2 * PARTY_LENGTH
+ ds 84
+wcb4a:: ds 84
+wcb9e:: ds 118
wLinkDataEnd::
NEXTU
@@ -586,7 +598,6 @@ wMysteryGiftGameVersion:: db
wMysteryGiftPartnerID:: dw
wMysteryGiftPartnerName:: ds NAME_LENGTH
wMysteryGiftPartnerDexCaught:: db
-wc80f::
wMysteryGiftPartnerSentDeco:: db
wMysteryGiftPartnerWhichItem:: db
wMysteryGiftPartnerWhichDeco:: db
@@ -608,11 +619,6 @@ wMysteryGiftPlayerBackupItem:: db
ds 1
wMysteryGiftPlayerDataEnd::
- ds 144
-
-wc8f4:: ds 5
-wc8f9:: ds 7
-
NEXTU
; LCD expects wLYOverrides to have an alignment of $100
wLYOverrides:: ds SCREEN_HEIGHT_PX
@@ -641,19 +647,6 @@ wMysteryGiftMessageCount:: db
wMysteryGiftStagedDataLength:: db
NEXTU
-; link
- ds 191
-wc9bf:: ds 79
-wca0e:: ds 5
-wca13:: ds 113
-wca84:: ds 100
-wcae8:: dw
-wLinkOTPartyMonTypes:: ds 2 * PARTY_LENGTH
- ds 84
-wcb4a:: ds 84
-wcb9e:: ds 130
-
-NEXTU
; battle
wBattleAnimTileDict::
; wBattleAnimTileDict pairs keys with values