Sese's vacation work

2 files changed, 84 insertions, 22 deletions

diff --git a/data/data_80D47B8.s b/data/data_80D47B8.s
index 2a662f9..8746063 100644
--- a/data/data_80D47B8.s
+++ b/data/data_80D47B8.s
@@ -56,36 +56,36 @@ gUnknown_80D4830: @ 80D4830
 
 	.global gUnknown_80D485C
 gUnknown_80D485C: @ 80D485C
-        .4byte Data_80D4878
+        .4byte Yes_80D4878
         .byte 0x01, 0x00, 0x00, 0x00
-        .4byte Data_80D4874
+        .4byte No_80D4874
         .byte 0x00, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0xFF, 0xFF, 0xFF, 0xFF
+        .4byte -1
 
-        .global Data_80D4874
-        Data_80D4874:
+        .global No_80D4874
+        No_80D4874:
         .string "No\0"
         .align 2,0
-        .global Data_80D4878
-        Data_80D4878:
+        .global Yes_80D4878
+        Yes_80D4878:
         .string "*Yes\0"
         .align 2,0
 
 	.global gUnknown_80D4880
 gUnknown_80D4880: @ 80D4880
-        .4byte Data_80D489C
+        .4byte Yes_80D489C
         .byte 0x01, 0x00, 0x00, 0x00
-        .4byte Data_80D4898
+        .4byte No_80D4898
         .byte 0x00, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00 @ End of table
-        .byte 0xFF, 0xFF, 0xFF, 0xFF
+        .4byte -1
 
-        .global Data_80D4898
-        Data_80D4898:
+        .global No_80D4898
+        No_80D4898:
         .string "*No\0"
-        .global Data_80D489C
-        Data_80D489C:
+        .global Yes_80D489C
+        Yes_80D489C:
         .string "Yes\0"
         .align 2,0
 
diff --git a/data/data_80E2068.s b/data/data_80E2068.s
index 094f272..d7a494a 100644
--- a/data/data_80E2068.s
+++ b/data/data_80E2068.s
@@ -306,27 +306,89 @@ gUnknown_80E236C: @ 80E236C
 
 	.global gUnknown_80E23A8
 gUnknown_80E23A8: @ 80E23A8
-	.incbin "baserom.gba", 0xE23A8, 0x48
+@ replacing .incbin "baserom.gba", 0x000e23a8, 0x48
+        .4byte SendPokemon_80E23E0
+        .byte 0x0f, 0x00, 0x00, 0x00
+        .4byte DontSendPokemon_80E23C8
+        .byte 0x10, 0x00, 0x00, 0x00
+        .4byte Cancel_80E22A8
+        .byte 0x08, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x08, 0x00, 0x00, 0x00
+
+        .global DontSendPokemon_80E23C8
+        DontSendPokemon_80E23C8:
+        .string "Don~27t Send Pokémon\0"
+        .align 2,0
+
+        .global SendPokemon_80E23E0
+        SendPokemon_80E23E0:
+        .string "Send Pokémon\0"
+        .align 2,0
 
 	.global gUnknown_80E23F0
 gUnknown_80E23F0: @ 80E23F0
-	.incbin "baserom.gba", 0xE23F0, 0x18
+        @ replacing .incbin "baserom.gba", 0x000e23f0, 0x18
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x15, 0x00, 0x04, 0x00
+        .byte 0x06, 0x00, 0x05, 0x00
+        .byte 0x05, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80E2408
 gUnknown_80E2408: @ 80E2408
-	.incbin "baserom.gba", 0xE2408, 0x38
+        @ replacing .incbin "baserom.gba", 0x000e2408, 0x38
+        .4byte Confirm_80E2364
+        .byte 0x09, 0x00, 0x00, 0x00
+        .4byte Info_80E2098
+        .byte 0x0a, 0x00, 0x00, 0x00
+        .4byte Cancel_80E22A8
+        .byte 0x05, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x08, 0x00, 0x00, 0x00
+
+        .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_80E2440
 gUnknown_80E2440: @ 80E2440
-	.incbin "baserom.gba", 0xE2440, 0x18
+        @ replacing .incbin "baserom.gba", 0x000e2440, 0x18
+        .4byte Yes_80E22B0
+        .byte 0x06, 0x00, 0x00, 0x00
+        .4byte Cancel_80E22A8
+        .byte 0x08, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x08, 0x00, 0x00, 0x00
 
 	.global gUnknown_80E2458
 gUnknown_80E2458: @ 80E2458
-	.incbin "baserom.gba", 0xE2458, 0x18
+        @ replacing .incbin "baserom.gba", 0x000e2458, 0x18
+        .4byte Yes_80E22B0
+        .byte 0x06, 0x00, 0x00, 0x00
+        .4byte No_80E22CC
+        .byte 0x07, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x08, 0x00, 0x00, 0x00
 
 	.global gUnknown_80E2470
 gUnknown_80E2470: @ 80E2470
-	.incbin "baserom.gba", 0xE2470, 0x40
+        @ replacing .incbin "baserom.gba", 0x000e2470, 0x40
+        .byte 0xa4, 0x24, 0x0e, 0x08
+        .byte 0x15, 0x00, 0x00, 0x00
+        .byte 0x90, 0x24, 0x0e, 0x08
+        .byte 0x16, 0x00, 0x00, 0x00
+        .byte 0xa8, 0x22, 0x0e, 0x08
+        .byte 0x08, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x08, 0x00, 0x00, 0x00
+        .byte 0x44, 0x6f, 0x6e, 0x7e, 0x32, 0x37, 0x74, 0x20, 0x53, 0x65, 0x6e, 0x64, 0x20, 0x49, 0x74, 0x65, 0x6d, 0x00, 0x00, 0x00
+        .byte 0x53, 0x65, 0x6e, 0x64, 0x20, 0x49, 0x74, 0x65, 0x6d, 0x00, 0x00, 0x00
+
 
 	.global gUnknown_80E24B0
 gUnknown_80E24B0: @ 80E24B0
@@ -1041,7 +1103,7 @@ gUnknown_80E60A0: @ 80E60A0
 	.global gUnknown_80E60D4
 gUnknown_80E60D4: @ 80E60D4
         .4byte SendItem_80E60C8
-        .byte 0xFF, 0xFF, 0xFF, 0xFF
+        .4byte -1
         .4byte ReceiveItem_80E60B8
         .4byte 2
         .4byte 0
@@ -1938,7 +2000,7 @@ gUnknown_80E7894: @ 80E7894
         .4byte GameLinkCable_80E78C8
         .4byte 3
         .4byte Password_80E78BC
-        .byte 0xFF, 0xFF, 0xFF, 0xFF
+        .4byte -1
         .4byte Cancel_80E78B4
         .4byte 8
         .4byte 0