Merge remote-tracking branch 'upstream/master'

3 files changed, 17 insertions, 621 deletions

diff --git a/data/data_80D47B8.s b/data/data_80D47B8.s
index 1b63067..b862a8a 100644
--- a/data/data_80D47B8.s
+++ b/data/data_80D47B8.s
@@ -4749,211 +4749,3 @@ gFriendActionCheckIQ: @ 80DD94C
 gUnknown_80DD958: @ 80DD958
         .string "Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} \0"
         .string "pksdir0\0"
-
-	.global gUnknown_80DD970
-gUnknown_80DD970: @ 80DD970
-@ 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
-@ 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
-@ 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
-@ 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
-@ 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
-        .4byte SendWOPokemon
-        .byte 0x12, 0x00, 0x00, 0x00
-        .4byte gWonderMailCancel
-        .byte 0x0a, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x0a, 0x00, 0x00, 0x00
-
-        .global SendWOPokemon
-        SendWOPokemon:
-        .string "Send w/o Pokémon\0"
-        .align 2,0
-
-	.global gUnknown_80DDACC
-gUnknown_80DDACC: @ 80DDACC
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x16, 0x00, 0x07, 0x00
-        .byte 0x06, 0x00, 0x04, 0x00
-        .byte 0x04, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.global gUnknown_80DDAE4
-gUnknown_80DDAE4: @ 80DDAE4
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x16, 0x00, 0x06, 0x00
-        .byte 0x06, 0x00, 0x04, 0x00
-        .byte 0x04, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.global gUnknown_80DDAFC
-gUnknown_80DDAFC: @ 80DDAFC
-        .4byte Confirm_80DDB1C
-        .byte 0xB, 0x00, 0x00, 0x00
-        .4byte Info_80DDB14
-        .byte 0xC, 0x00, 0x00, 0x00
-        .byte 0x0, 0x00, 0x00, 0x00
-        .byte 0xA, 0x00, 0x00, 0x00
-
-       .global Info_80DDB14
-       Info_80DDB14:
-        .string "Info\0"
-        .align 2,0
-
-        .global Confirm_80DDB1C
-        Confirm_80DDB1C:
-        .string "Confirm\0"
-        .align 2,0
-
-	.global gUnknown_80DDB24
-gUnknown_80DDB24: @ 80DDB24
-        .4byte GameLinkCable_80DDB50
-        .byte 0xD, 0x00, 0x00, 0x00
-        .4byte Password_80DDB44
-        .byte 0xF, 0x00, 0x00, 0x00
-        .4byte gWonderMailCancel
-        .byte 0xA, 0x00, 0x00, 0x00
-        .byte 0x0, 0x00, 0x00, 0x00
-        .byte 0xA, 0x00, 0x00, 0x00
-
-        .global Password_80DDB44
-        Password_80DDB44:
-        .string "Password\0"
-        .align 2,0
-
-        .global GameLinkCable_80DDB50
-        GameLinkCable_80DDB50:
-        .string "Game Link cable\0"
-        .align 2,0
-
-	.global gUnknown_80DDB60
-gUnknown_80DDB60: @ 80DDB60
-
-    .4byte SendPokemon_80DDB98
-    .byte 0x11, 0x00, 0x00, 0x00
-    .4byte DontSendPokemon_80DDB80
-    .byte 0x12, 0x00, 0x00, 0x00
-    .4byte gWonderMailCancel
-    .byte 0x0a, 0x00, 0x00, 0x00
-    .byte 0x00, 0x00, 0x00, 0x00
-    .byte 0x0a, 0x00, 0x00, 0x00
-
-    .global DontSendPokemon_80DDB80
-    DontSendPokemon_80DDB80:
-    .string "Don{APOSTROPHE}t Send Pokémon\0"
-    .align 2,0
-
-    .global SendPokemon_80DDB98
-    SendPokemon_80DDB98:
-    .string "Send Pokémon\0"
-    .align 2,0
-
diff --git a/data/data_80DED44.s b/data/data_80DED44.s
index 758d88b..2f6040a 100644
--- a/data/data_80DED44.s
+++ b/data/data_80DED44.s
@@ -1,98 +1,7 @@
         .section .rodata
 
-	.global gUnknown_80DFBD0
-gUnknown_80DFBD0: @ 80DFBD0
-        .byte 0x00, 0x00, 0x00, 0x00
-
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-        .byte 0x00, 0x00, 0x00, 0x00
-
-
-	.global gUnknown_80DFBE8
-gUnknown_80DFBE8: @ 80DFBE8
-        .byte 0x01, 0x00, 0x0c, 0x00
-
-	.global gUnknown_80DFBEC
-gUnknown_80DFBEC: @ 80DFBEC
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x06, 0x00, 0x00, 0x00
-        .byte 0x02, 0x00, 0x02, 0x00
-        .byte 0x18, 0x00, 0x0e, 0x00
-        .byte 0x0e, 0x00, 0x00, 0x00
-        .4byte gUnknown_80DFBE8
-
-
-	.global gUnknown_80DFC04
-gUnknown_80DFC04: @ 80DFC04
-        .string "News List\0"
-        .align 2,0
-        .string "pksdir0\0"
-
-	.global gUnknown_80DFC18
-gUnknown_80DFC18: @ 80DFC18
-        .byte 0x00, 0x00, 0x00, 0x00
-
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-        .byte 0x00, 0x00, 0x00, 0x00
-
-        .global gUnkData_80DFC30
-        gUnkData_80DFC30:
-        .byte 0x01, 0x00, 0x16, 0x00
-
-	.global gUnknown_80DFC34
-gUnknown_80DFC34: @ 80DFC34
-        .byte 0x00, 0x00, 0x00, 0x00
-
-        .byte 0x06, 0x00, 0x00, 0x00
-        .byte 0x02, 0x00, 0x02, 0x00
-        .byte 0x1A, 0x00, 0x10, 0x00
-        .byte 0x10, 0x00, 0x00, 0x00
-
-        .4byte gUnkData_80DFC30
-
-	.global gUnknown_80DFC4C
-gUnknown_80DFC4C: @ 80DFC4C
-        .string "She\0"
-
-	.global gUnknown_80DFC50
-gUnknown_80DFC50: @ 80DFC50
-        .string "He\0"
-        .align 2,0
-        .string "pksdir0\0"
-
-	.global gUnknown_80DFC5C
-gUnknown_80DFC5C: @ 80DFC5C
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.global gUnknown_80DFC74
-gUnknown_80DFC74: @ 80DFC74
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x06, 0x00, 0x00, 0x00
-        .byte 0x02, 0x00, 0x02, 0x00
-        .byte 0x18, 0x00, 0x0e, 0x00
-        .byte 0x0e, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.global gMailboxText
-gMailboxText: @ 80DFC8C
-        .string "Mailbox\0"
-        .string "pksdir0\0"
-
-	.global gUnknown_80DFC9C
-gUnknown_80DFC9C: @ 80DFC9C
+	.global gUnknown_80DFCE4
+gUnknown_80DFCE4: @ 80DFCE4
         .byte 0x00, 0x00, 0x00, 0x00
         .byte 0x03, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
@@ -100,8 +9,8 @@ gUnknown_80DFC9C: @ 80DFC9C
         .byte 0x00, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
 
-	.global gUnknown_80DFCB4
-gUnknown_80DFCB4: @ 80DFCB4
+	.global gUnknown_80DFCFC
+gUnknown_80DFCFC: @ 80DFCFC
         .byte 0x00, 0x00, 0x00, 0x00
         .byte 0x06, 0x00, 0x00, 0x00
         .byte 0x02, 0x00, 0x02, 0x00
@@ -109,36 +18,6 @@ gUnknown_80DFCB4: @ 80DFCB4
         .byte 0x0e, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
 
-	.global gBulletinBoardText
-gBulletinBoardText: @ 80DFCCC
-        .string "Bulletin Board\0"
-        .align 2,0
-        .string "pksdir0\0"
-
-	.global gUnknown_80DFCE4
-gUnknown_80DFCE4: @ 80DFCE4
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.global gUnknown_80DFCFC
-gUnknown_80DFCFC: @ 80DFCFC
-        .byte 0x00, 0x00
-        .byte 0x00, 0x00
-        .byte 0x06, 0x00
-        .byte 0x00, 0x00
-        .byte 0x02, 0x00
-        .byte 0x02, 0x00
-        .byte 0x18, 0x00
-        .byte 0x0e, 0x00
-        .byte 0x0e, 0x00
-        .byte 0x00, 0x00
-        .byte 0x00, 0x00
-        .byte 0x00, 0x00
-
 	.global gUnknown_80DFD14
 gUnknown_80DFD14: @ 80DFD14
         .string "Job List\0"
@@ -156,33 +35,21 @@ gUnknown_80DFD28: @ 80DFD28
 
 	.global gUnknown_80DFD40
 gUnknown_80DFD40: @ 80DFD40
-        .byte 0x00, 0x00
-        .byte 0x00, 0x00
-        .byte 0x04, 0x00
-        .byte 0x00, 0x00
-        .byte 0x15, 0x00
-        .byte 0x06, 0x00
-        .byte 0x07, 0x00
-        .byte 0x03, 0x00
-        .byte 0x03, 0x00
-        .byte 0x00, 0x00
-        .byte 0x00, 0x00
-        .byte 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x04, 0x00, 0x00, 0x00
+        .byte 0x15, 0x00, 0x06, 0x00
+        .byte 0x07, 0x00, 0x03, 0x00
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DFD58
 gUnknown_80DFD58: @ 80DFD58
-        .byte 0x00, 0x00
-        .byte 0x00, 0x00
-        .byte 0x04, 0x00
-        .byte 0x00, 0x00
-        .byte 0x15, 0x00
-        .byte 0x0f, 0x00
-        .byte 0x06, 0x00
-        .byte 0x03, 0x00
-        .byte 0x03, 0x00
-        .byte 0x00, 0x00
-        .byte 0x00, 0x00
-        .byte 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x04, 0x00, 0x00, 0x00
+        .byte 0x15, 0x00, 0x0f, 0x00
+        .byte 0x06, 0x00, 0x03, 0x00
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DFD70
 gUnknown_80DFD70: @ 80DFD70
@@ -207,7 +74,7 @@ gUnknown_80DFD8C: @ 80DFD8C
 gUnknown_80DFDA4: @ 80DFDA4
         .byte 0x00, 0x00, 0x00, 0x00
         .byte 0x06, 0x00, 0x00, 0x00
-        .byte 0x02, 0x00, 0x02, 0x0
+        .byte 0x02, 0x00, 0x02, 0x00
         .byte 0x18, 0x00, 0x0e, 0x00
         .byte 0x0e, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
diff --git a/data/data_80E59A8.s b/data/data_80E59A8.s
index 9e16004..6fcb699 100644
--- a/data/data_80E59A8.s
+++ b/data/data_80E59A8.s
@@ -1,168 +1,5 @@
 	.section .rodata
 
-	.global gUnknown_80E5CB4
-gUnknown_80E5CB4: @ 80E5CB4
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x02, 0x00, 0x0F, 0x00
-        .byte 0x1A, 0x00, 0x03, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.global gUnknown_80E5CCC
-gUnknown_80E5CCC: @ 80E5CCC
-        .byte 0xe8, 0x5c, 0x0e, 0x08
-        .byte 0xde, 0xff, 0x00, 0x00
-        .byte 0xe4, 0x5c, 0x0e, 0x08
-        .byte 0xde, 0xff, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0xdd, 0xff, 0x00, 0x00
-
-sUnknown_80E5CE4: @ 80E5CE4
-    .string "  \0"
-    .align 2,0
-
-    .string "Start an entirely new adventure.\0"
-    .align 2,0
-
-	.global gUnknown_80E5D0C
-gUnknown_80E5D0C: @ 80E5D0C
-    .4byte sUnknown_80E5D24, 0xFFDE
-    .4byte sUnknown_80E5CE4, 0xFFDE
-    .4byte 0, 0xFFDD
-
-sUnknown_80E5D24: @ 80E5D24
-    .string "Check your career as an adventurer.\0"
-    .align 2, 0
-
-	.global gUnknown_80E5D48
-gUnknown_80E5D48: @ 80E5D48
-    .4byte sUnknown_80E5D88, 0xFFDE
-    .4byte sUnknown_80E5D60, 0xFFDE
-    .4byte 0, 0xFFDD
-
-sUnknown_80E5D60: @ 80E5D60
-    .string "It won~27t be in the release version.\0"
-    .align 2, 0
-
-sUnknown_80E5D88: @ 80E5D88
-    .string "This is the Debug Mode.\0"
-    .align 2, 0
-
-	.global gUnknown_80E5DA0
-gUnknown_80E5DA0: @ 80E5DA0
-    .4byte sUnknown_80E5DCC, 0xFFDE
-    .4byte sUnknown_80E5DB8, 0xFFDE
-    .4byte 0, 0xFFDD
-
-sUnknown_80E5DB8:
-    .string "you last saved.  \0"
-    .align 2, 0
-
-sUnknown_80E5DCC:
-    .string "Resume your adventure from where\0"
-    .align 2, 0
-
-	.global gUnknown_80E5DF0
-gUnknown_80E5DF0: @ 80E5DF0
-    .4byte sUnknown_80E5E34, 0xFFDE
-    .4byte sUnknown_80E5E08, 0xFFDE
-    .4byte 0, 0xFFDD
-
-sUnknown_80E5E08:
-    .string "#C2Beware#R! This will delete it forever!\0"
-    .align 2, 0
-
-sUnknown_80E5E34:
-    .string "This will delete your saved game data.\0"
-    .align 2, 0
-
-	.global gUnknown_80E5E5C
-gUnknown_80E5E5C: @ 80E5E5C
-    .4byte sUnknown_80E5EA0, 0xFFDE
-    .4byte sUnknown_80E5E74, 0xFFDE
-    .4byte 0, 0xFFDD
-
-sUnknown_80E5E74:
-    .string "passwords~2c friends may rescue each other.\0"
-    .align 2, 0
-
-sUnknown_80E5EA0:
-    .string "Using a Game Link cable or\0"
-    .align 2, 0
-
-	.global gUnknown_80E5EBC
-gUnknown_80E5EBC: @ 80E5EBC
-    .4byte sUnknown_80E5EF8, 0xFFDE
-    .4byte sUnknown_80E5ED4, 0xFFDE
-    .4byte 0, 0xFFDD
-
-sUnknown_80E5ED4:
-    .string "trade stored items with a friend.\0"
-    .align 2, 0
-
-sUnknown_80E5EF8:
-    .string "Using a Game Link cable~2c you can\0"
-    .align 2, 0
-
-	.global gUnknown_80E5F1C
-gUnknown_80E5F1C: @ 80E5F1C
-    .4byte sUnknown_80E5F58, 0xFFDE
-    .4byte sUnknown_80E5F34, 0xFFDE
-    .4byte 0, 0xFFDD
-
-sUnknown_80E5F34:
-    .string "You can give up waiting for rescue.\0"
-    .align 2, 0
-
-sUnknown_80E5F58:
-    .string "You are awaiting rescue by a friend.\0"
-    .align 2, 0
-
-	.global gUnknown_80E5F80
-gUnknown_80E5F80: @ 80E5F80
-    .4byte sUnknown_80E5FB0, 0xFFDE
-    .4byte sUnknown_80E5F98, 0xFFDE
-    .4byte 0, 0xFFDD
-
-sUnknown_80E5F98:
-    .string "receive Wonder Mail.\0"
-    .align 2, 0
-
-sUnknown_80E5FB0:
-    .string "Using passwords~2c you can\0"
-    .align 2, 0
-
-	.global gUnknown_80E5FCC
-gUnknown_80E5FCC: @ 80E5FCC
-    .4byte sUnknown_80E6008, 0xFFDE
-    .4byte sUnknown_80E5FE4, 0xFFDE
-    .4byte 0, 0xFFDD
-
-sUnknown_80E5FE4:
-    .string "receive teams from your friends.\0"
-    .align 2, 0
-
-sUnknown_80E6008:
-    .string "Using the Dual Slot function~2c you can\0"
-    .align 2, 0
-
-	.global gUnknown_80E6030
-gUnknown_80E6030: @ 80E6030
-    .4byte sUnknown_80E6070, 0xFFDE
-    .4byte sUnknown_80E6048, 0xFFDE
-    .4byte 0, 0xFFDD
-
-sUnknown_80E6048:
-    .string "go on an adventure to unknown worlds.\0"
-    .align 2, 0
-
-sUnknown_80E6070:
-    .string "Using wireless communication~2c you can\0"
-    .align 2, 0
-
-    .string "pksdir0\0"
-
 @ Start of Trade Items Data
 
 	.global gUnknown_80E60A0
@@ -1239,103 +1076,3 @@ sUnknown_80E75CC:
     .align 2, 0
 
     .string "pksdir0\0"
-
-	.global gUnknown_80E75F8
-gUnknown_80E75F8: @ 80E75F8
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.global gUnknown_80E7610
-gUnknown_80E7610: @ 80E7610
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x02, 0x00, 0x02, 0x00
-        .byte 0x1A, 0x00, 0x0B, 0x00
-        .byte 0x0B, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x20, 0x00, 0x00, 0x00
-
-	.global gUnknown_80E762C
-gUnknown_80E762C: @ 80E762C
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x02, 0x00, 0x0F, 0x00
-        .byte 0x13, 0x00, 0x03, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.global gResumeQuicksaveMenuItems
-gResumeQuicksaveMenuItems: @ 80E7644
-    .4byte ResumeQuicksave_80E7668, 0x5
-    .4byte IsThatOK_80E765C, 0x5
-    .4byte 0, 0x3
-
-IsThatOK_80E765C:
-    .string "Is that OK?\0"
-    .align 2, 0
-
-ResumeQuicksave_80E7668:
-    .string "Resuming from quicksave.\0"
-    .align 2, 0
-
-	.global gResumeAdventureMenuItems
-gResumeAdventureMenuItems: @ 80E7684
-    .4byte ResumeAdventure_80E769C, 0x5
-    .4byte IsThatOK_80E765C, 0x5
-    .4byte 0, 0x3
-
-ResumeAdventure_80E769C:
-    .string "Resuming saved adventure.\0"
-    .align 2, 0
-
-	.global gQuitWaitingRescueMenuItems
-gQuitWaitingRescueMenuItems: @ 80E76B8
-    .4byte QuitAwaitingRescue_80E76D0, 0x5
-    .4byte IsThatOK_80E765C, 0x5
-    .4byte 0, 0x3
-
-QuitAwaitingRescue_80E76D0:
-    .string "Quit awaiting rescue?\0"
-    .align 2, 0
-
-	.global gDeleteSavePromptMenuItems
-gDeleteSavePromptMenuItems: @ 80E76E8
-        .4byte Deleted_80E7718, 0x5
-        .4byte Deleted_80E7700, 0x5
-        .4byte 0, 0x3
-
-Deleted_80E7700:
-    .string "deleted. Is that OK?\0"
-    .align 2, 0
-
-Deleted_80E7718:
-    .string "Your saved data will be\0"
-    .align 2, 0
-
-	.global gDeleteSaveConfirmMenuItems
-gDeleteSaveConfirmMenuItems: @ 80E7730
-    .4byte Deleted_80E7768, 0x5
-    .4byte Deleted_80E7748, 0x5
-    .4byte 0, 0x3
-
-Deleted_80E7748:
-    .string "delete all of your saved data?\0"
-    .align 2, 0
-
-Deleted_80E7768:
-    .string "Are you sure you want to\0"
-    .align 2, 0
-
-	.global gUnknown_80E7784
-gUnknown_80E7784: @ 80E7784
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x17, 0x00, 0x0F, 0x00
-        .byte 0x05, 0x00, 0x03, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-