Wonder mail Pt. 1 (#11)

Some work on decomping/labeling wonder mail. Renamed corresponding assembly/C files. Labeled a few strings in data too.

2 files changed, 109 insertions, 16 deletions

diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s
index c564236..beae3c9 100644
--- a/data/data_80B9BB8.s
+++ b/data/data_80B9BB8.s
@@ -2383,23 +2383,116 @@ gUnknown_80DD958: @ 80DD958
 
 	.global gUnknown_80DD970
 gUnknown_80DD970: @ 80DD970
-	.incbin "baserom.gba", 0xDD970, 0x7C
+@ replacing .incbin "baserom.gba", 0x000dd970, 0x7c
+        .4byte gWonderMailReceiveSOSMail
+        .byte 0x00, 0x00, 0x00, 0x00
+        .4byte gWonderMailLeaveForRescue
+        .byte 0x01, 0x00, 0x00, 0x00
+        .4byte gWonderMailSendAOKMail
+        .byte 0x02, 0x00, 0x00, 0x00
+        .4byte gWonderMailDeleteMail
+        .byte 0x03, 0x00, 0x00, 0x00
+        .4byte gWonderMailCancel
+        .byte 0x0a, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x0a, 0x00, 0x00, 0x00
+
+        .global gWonderMailCancel @ 80DD9A0
+        gWonderMailCancel:
+        .string "Cancel\0"
+        .align 2,0
+
+        .global gWonderMailDeleteMail @ 80DD9A8
+        gWonderMailDeleteMail:
+        .string "Delete Mail\0"
+        .align 2,0
+
+        .global gWonderMailSendAOKMail @ 80DD9B4
+        gWonderMailSendAOKMail:
+        .string "Send A-OK Mail\0"
+        .align 2,0
+
+        .global gWonderMailLeaveForResuce @ 80DD9C4
+        gWonderMailLeaveForRescue:
+        .string "Leave for Rescue\0"
+        .align 2,0
+
+        .global gWonderMailReceiveSOSMail @ 80DD9D8
+        gWonderMailReceiveSOSMail:
+        .string "Receive SOS Mail\0"
+        .align 2,0
 
 	.global gUnknown_80DD9EC
 gUnknown_80DD9EC: @ 80DD9EC
-	.incbin "baserom.gba", 0xDD9EC, 0x5C
+@ replacing .incbin "baserom.gba", 0x000dd9ec, 0x5c
+        .4byte gWonderMailDeleteSOSMail
+        .byte 0x05, 0x00, 0x00, 0x00
+        .4byte gWonderMailDeleteAOKMail
+        .byte 0x06, 0x00, 0x00, 0x00
+        .4byte gWonderMailDeleteAllMail
+        .byte 0x07, 0x00, 0x00, 0x00
+        .4byte gWonderMailCancel
+        .byte 0x0a, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x0a, 0x00, 0x00, 0x00
+
+        .global gWonderMailDeleteAllMail @ 80DDA14
+        gWonderMailDeleteAllMail:
+        .string "Delete All Mail\0"
+        .align 2,0
+
+        .global gWonderMailDeleteAOKMail @ 80DDA24
+        gWonderMailDeleteAOKMail:
+        .string "Delete A-OK Mail\0"
+        .align 2,0
+
+        .global gWonderMailDeleteSOSMail @ 80DDA38
+        gWonderMailDeleteSOSMail:
+        .string "Delete SOS Mail\0"
+        .align 2,0
 
 	.global gUnknown_80DDA48
 gUnknown_80DDA48: @ 80DDA48
-	.incbin "baserom.gba", 0xDDA48, 0x1C
+@ Menu that shows up when you enter an incorrect Wonder Mail Password
+@ replacing .incbin "baserom.gba", 0x000dda48, 0x1c
+        .4byte gWonderMailYes
+        .byte 0x08, 0x00, 0x00, 0x00
+        .4byte gWonderMailCancel
+        .byte 0x0a, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x0a, 0x00, 0x00, 0x00
+
+        .global gWonderMailYes @ (80DDA60)
+        gWonderMailYes:
+        .string "Yes\0"
+        .align 2,0
 
 	.global gUnknown_80DDA64
 gUnknown_80DDA64: @ 80DDA64
-	.incbin "baserom.gba", 0xDDA64, 0x1C
+@ replacing .incbin "baserom.gba", 0x000dda64, 0x1c
+        .4byte gWonderMailYes
+        .byte 0x08, 0x00, 0x00, 0x00
+        .4byte gWonderMailNo
+        .byte 0x09, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x0a, 0x00, 0x00, 0x00
+
+        .global gWonderMailNo @ (80DDA7C)
+        gWonderMailNo:
+        .string "No\0"
+        .align 2,0
 
 	.global gUnknown_80DDA80
 gUnknown_80DDA80: @ 80DDA80
-	.incbin "baserom.gba", 0xDDA80, 0x20
+@ replacing .incbin "baserom.gba", 0x000dda80, 0x20
+        .4byte gWonderMailYes
+        .byte 0x08, 0x00, 0x00, 0x00
+        .4byte gWonderMailNo
+        .byte 0x09, 0x00, 0x00, 0x00
+        .4byte gWonderMailCancel
+        .byte 0x0a, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x0a, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DDAA0
 gUnknown_80DDAA0: @ 80DDAA0
diff --git a/data/text/wonder_mail_1.inc b/data/text/wonder_mail_1.inc
index a7611fa..fdb94ef 100644
--- a/data/text/wonder_mail_1.inc
+++ b/data/text/wonder_mail_1.inc
@@ -244,41 +244,41 @@ gUnknown_80DE93C:: @ 80DE93C
 	.string " Come again anytime!\0"
 	.align 2, 0
 
-gUnknown_80DE954:: @ 80DE954
+gWonderMailErrorText:: @ 80DE954
 	.string " ...Uh~2c no?\n"
 	.string "Something~27s not working right here...\0"
 	.align 2, 0
 
-gUnknown_80DE98C:: @ 80DE98C
+gWonderMailNumGBAsText:: @ 80DE98C
 	.string " ...Uh~2c no?\n"
 	.string "The number of GBA systems isn~27t right.\n"
 	.string "You~27d better try this again from the top.\0"
 	.align 2, 0
 
-gUnknown_80DE9F0:: @ 80DE9F0
+gWonderMailWrongModeText:: @ 80DE9F0
 	.string " ...Uh~2c no? You~27re not in the\n"
 	.string "same mode as your friend.\n"
 	.string "You~27d better try this again from the top.\0"
 	.align 2, 0
 
-gUnknown_80DEA58:: @ 80DEA58
+gWonderMailStorageFullText:: @ 80DEA58
 	.string " ...Uh~2c no?\n"
 	.string "Your storage space is stuffed full.\n"
 	.string "You~27d better make room and try again.\0"
 	.align 2, 0
 
-gUnknown_80DEAB4:: @ 80DEAB4
+gWonderMailDuplicateText:: @ 80DEAB4
 	.string " ...Uh~2c no? It looks like\n"
 	.string "you received this mail before.\n"
 	.string "You can~27t get the same mail twice. \0"
 	.align 2, 0
 
-gUnknown_80DEB18:: @ 80DEB18
+gWonderMailNotEligibleReceiveText:: @ 80DEB18
 	.string " ...Uh~2c no?\n"
 	.string "You~27re not eligible to receive this mail.\0"
 	.align 2, 0
 
-gUnknown_80DEB54:: @ 80DEB54
+gWonderMailNoRoomText:: @ 80DEB54
 	.string " ...Uh~2c no?\n"
 	.string "There~27s no room for you to \n"
 	.string "receive any more mail.#P"
@@ -287,24 +287,24 @@ gUnknown_80DEB54:: @ 80DEB54
 	.string "me again about receiving new mail.\0"
 	.align 2, 0
 
-gUnknown_80DEC00:: @ 80DEC00
+gWonderMailFriendErrorText:: @ 80DEC00
 	.string " ...Uh~2c no? Looks like your\n"
 	.string "friend didn~27t do what needed doing.\n"
 	.string "You~27d better do this again from the top.\0"
 	.align 2, 0
 
-gUnknown_80DEC70:: @ 80DEC70
+gWonderMailPasswordIncorrectText:: @ 80DEC70
 	.string " ...Uh~2c no?\n"
 	.string "This here password looks wrong.\n"
 	.string "Do you want to try that again?\0"
 	.align 2, 0
 
-gUnknown_80DECC0:: @ 80DECC0
+gWonderMailSOSPasswordIncorrectText:: @ 80DECC0
 	.string " ...Uh~2c no? This password~27s\n"
 	.string "not for any #CGSOS Mail#R.\0"
 	.align 2, 0
 
-gUnknown_80DECFC:: @ 80DECFC
+gWonderMailAOKMailReceivedText:: @ 80DECFC
 	.string ": I received the #CGSOS Mail#R.\n"
 	.string "Your adventure will be saved.\0"
 	.align 2, 0