more datadumping and starting to doc ewram components

4 files changed, 136 insertions, 47 deletions

diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s
index b716482..69207a0 100644
--- a/asm/code_8012A18.s
+++ b/asm/code_8012A18.s
@@ -4710,7 +4710,7 @@ _08014E24:
 	bl sub_80920D8
 	b _08014E48
 	.align 2, 0
-_08014E3C: .4byte gUnknown_202E6E8
+_08014E3C: .4byte gTeamName
 _08014E40:
 	ldr r0, _08014E4C
 	ldr r1, _08014E50
@@ -4719,7 +4719,7 @@ _08014E48:
 	ldr r4, _08014E4C
 	b _08014F0E
 	.align 2, 0
-_08014E4C: .4byte gUnknown_202E6E8
+_08014E4C: .4byte gTeamName
 _08014E50: .4byte gUnknown_80D48F8
 _08014E54:
 	adds r5, 0x1
@@ -36631,7 +36631,7 @@ _08024B4C:
 	ldr r0, _08024B70
 	b _08024CAE
 	.align 2, 0
-_08024B68: .4byte gUnknown_202E2B8
+_08024B68: .4byte gPlayerName
 _08024B6C: .4byte 0x000001ff
 _08024B70: .4byte gUnknown_80DCE68
 _08024B74:
@@ -59425,7 +59425,7 @@ _0803010C:
 	bl sub_80141B4
 	b _080301A0
 	.align 2, 0
-_08030138: .4byte gUnknown_202E2B8
+_08030138: .4byte gPlayerName
 _0803013C: .4byte gUnknown_203B318
 _08030140: .4byte gUnknown_80E0778
 _08030144: .4byte 0x00000101
diff --git a/asm/code_809017C.s b/asm/code_809017C.s
index e539c60..6160c7f 100644
--- a/asm/code_809017C.s
+++ b/asm/code_809017C.s
@@ -22836,7 +22836,7 @@ _0809A8A4: .4byte 0x0000043c
 _0809A8A8: .4byte 0x0000ffff
 _0809A8AC: .4byte gUnknown_202DF98
 _0809A8B0: .4byte gUnknown_811615C
-_0809A8B4: .4byte gUnknown_202E2B8
+_0809A8B4: .4byte gPlayerName
 	thumb_func_end sub_809A83C
 
 	thumb_func_start sub_809A8B8
@@ -23125,7 +23125,7 @@ _0809AAE6:
 	.align 2, 0
 _0809AB28: .4byte gUnknown_202DF98
 _0809AB2C: .4byte gUnknown_811616C
-_0809AB30: .4byte gUnknown_202E2B8
+_0809AB30: .4byte gPlayerName
 _0809AB34:
 	mov r0, r9
 	bl sub_809A83C
@@ -23187,7 +23187,7 @@ _0809ABA0:
 	bx r1
 	.align 2, 0
 _0809ABA8: .4byte gUnknown_202DF98
-_0809ABAC: .4byte gUnknown_202E2B8
+_0809ABAC: .4byte gPlayerName
 _0809ABB0: .4byte gUnknown_811617C
 	thumb_func_end sub_809AB4C
 
@@ -23238,7 +23238,7 @@ _0809AC0A:
 	bx r1
 	.align 2, 0
 _0809AC10: .4byte gUnknown_202DF98
-_0809AC14: .4byte gUnknown_202E2B8
+_0809AC14: .4byte gPlayerName
 	thumb_func_end sub_809ABB4
 
 	thumb_func_start sub_809AC18
@@ -23288,7 +23288,7 @@ _0809AC6E:
 	bx r1
 	.align 2, 0
 _0809AC74: .4byte gUnknown_202DF98
-_0809AC78: .4byte gUnknown_202E2B8
+_0809AC78: .4byte gPlayerName
 	thumb_func_end sub_809AC18
 
 	thumb_func_start sub_809AC7C
@@ -23930,7 +23930,7 @@ _0809B128:
 	.align 2, 0
 _0809B134: .4byte gUnknown_202E5D8
 _0809B138: .4byte gUnknown_8116188
-_0809B13C: .4byte gUnknown_202E2B8
+_0809B13C: .4byte gPlayerName
 _0809B140: .4byte sub_809B428
 _0809B144: .4byte gUnknown_8116148
 _0809B148:
@@ -24283,7 +24283,7 @@ _0809B3C0:
 	.align 2, 0
 _0809B3D0: .4byte gUnknown_202E5D8
 _0809B3D4: .4byte gUnknown_8116188
-_0809B3D8: .4byte gUnknown_202E2B8
+_0809B3D8: .4byte gPlayerName
 _0809B3DC: .4byte gUnknown_3001B64
 _0809B3E0: .4byte gUnknown_8116190
 _0809B3E4: .4byte sub_809B428
@@ -36581,7 +36581,7 @@ _080A1968:
 	.align 2, 0
 _080A1970: .4byte gUnknown_8116710
 _080A1974: .4byte gUnknown_2039D98
-_080A1978: .4byte gUnknown_202E2B8
+_080A1978: .4byte gPlayerName
 _080A197C:
 	ldr r0, _080A1984
 	movs r1, 0x53
@@ -36697,7 +36697,7 @@ _080A1A52:
 	.align 2, 0
 _080A1A64: .4byte gUnknown_8116760
 _080A1A68: .4byte gUnknown_2039D98
-_080A1A6C: .4byte gUnknown_202E2B8
+_080A1A6C: .4byte gPlayerName
 _080A1A70:
 	movs r0, 0x9E
 	movs r1, 0x1
diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s
index 2e4171b..64503b0 100644
--- a/data/data_80B9BB8.s
+++ b/data/data_80B9BB8.s
@@ -1386,11 +1386,25 @@ gUnknown_80DCA2C: @ 80DCA2C
 
 	.global gUnknown_80DD6EC
 gUnknown_80DD6EC: @ 80DD6EC
-	.incbin "baserom.gba", 0xDD6EC, 0x18
+        .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_80DD704
 gUnknown_80DD704: @ 80DD704
-	.incbin "baserom.gba", 0xDD704, 0x18
+        .byte 0x00, 0x00, 0x00, 0x00
+
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x13, 0x00, 0x04, 0x00
+        .byte 0x09, 0x00, 0x03, 0x00
+        .byte 0x03, 0x00, 0x00, 0x00
+
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DD71C
 gUnknown_80DD71C: @ 80DD71C
@@ -1398,11 +1412,23 @@ gUnknown_80DD71C: @ 80DD71C
 
 	.global gUnknown_80DD74C
 gUnknown_80DD74C: @ 80DD74C
-	.incbin "baserom.gba", 0xDD74C, 0x18
+        .byte 0x00, 0x00, 0x00, 0x00
+
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x02, 0x00, 0x11, 0x00
+        .byte 0x1A, 0x00, 0x02, 0x00
+        .byte 0x02, 0x00, 0x00, 0x00
+
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DD764
 gUnknown_80DD764: @ 80DD764
-	.incbin "baserom.gba", 0xDD764, 0x98
+        .string "You have chosen to say farewell\n"
+        .string "to this Pokémon.#P"
+        .string "The Pokémon will leave its Friend Area.\n"
+        .string "It will no longer be available for\n"
+        .string "adventures. Is that OK?"
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DD7FC
 gUnknown_80DD7FC: @ 80DD7FC
@@ -1410,7 +1436,9 @@ gUnknown_80DD7FC: @ 80DD7FC
 
 	.global gUnknown_80DD8A0
 gUnknown_80DD8A0: @ 80DD8A0
-	.incbin "baserom.gba", 0xDD8A0, 0x30
+        .string "#+The #C4$i0#R was\n"
+        .string "#+returned to the Toolbox."
+        .byte 0x00, 0x00, 0x00
 
 	.global gUnknown_80DD8D0
 gUnknown_80DD8D0: @ 80DD8D0
@@ -1418,43 +1446,55 @@ gUnknown_80DD8D0: @ 80DD8D0
 
 	.global gUnknown_80DD8F8
 gUnknown_80DD8F8: @ 80DD8F8
-	.incbin "baserom.gba", 0xDD8F8, 0xC
+        .string "Stand By"
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DD904
 gUnknown_80DD904: @ 80DD904
-	.incbin "baserom.gba", 0xDD904, 0xC
+        .string "Make Leader"
+        .byte 0x00
 
 	.global gUnknown_80DD910
 gUnknown_80DD910: @ 80DD910
-	.incbin "baserom.gba", 0xDD910, 0xC
+        .string "Join Team"
+        .byte 0x00, 0x00, 0x00
 
 	.global gUnknown_80DD91C
 gUnknown_80DD91C: @ 80DD91C
-	.incbin "baserom.gba", 0xDD91C, 0x10
+        .string "Say Farewell"
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DD92C
 gUnknown_80DD92C: @ 80DD92C
-	.incbin "baserom.gba", 0xDD92C, 0x8
+        .string "Give"
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DD934
 gUnknown_80DD934: @ 80DD934
-	.incbin "baserom.gba", 0xDD934, 0x8
+        .string "Take"
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DD93C
 gUnknown_80DD93C: @ 80DD93C
-	.incbin "baserom.gba", 0xDD93C, 0x8
+        .string "Summary"
+        .byte 0x00
 
 	.global gUnknown_80DD944
 gUnknown_80DD944: @ 80DD944
-	.incbin "baserom.gba", 0xDD944, 0x8
+        .string "Moves"
+        .byte 0x00, 0x00, 0x00
 
 	.global gUnknown_80DD94C
 gUnknown_80DD94C: @ 80DD94C
-	.incbin "baserom.gba", 0xDD94C, 0xC
+        .string "Check IQ"
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DD958
 gUnknown_80DD958: @ 80DD958
-	.incbin "baserom.gba", 0xDD958, 0x18
+        .string "Item: #C4$i0#R "
+        .byte 0x00
+        .string "pksdir0"
+        .byte 0x00
 
 	.global gUnknown_80DD970
 gUnknown_80DD970: @ 80DD970
@@ -1550,7 +1590,14 @@ gUnknown_80DEEE4: @ 80DEEE4
 
 	.global gUnknown_80DFBD0
 gUnknown_80DFBD0: @ 80DFBD0
-	.incbin "baserom.gba", 0xDFBD0, 0x18
+        .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
@@ -1562,23 +1609,46 @@ gUnknown_80DFBEC: @ 80DFBEC
 
 	.global gUnknown_80DFC04
 gUnknown_80DFC04: @ 80DFC04
-	.incbin "baserom.gba", 0xDFC04, 0x14
+        .string "News List"
+        .byte 0x00, 0x00, 0x00
+        .string "pksdir0"
+        .byte 0
 
 	.global gUnknown_80DFC18
 gUnknown_80DFC18: @ 80DFC18
-	.incbin "baserom.gba", 0xDFC18, 0x1C
+        .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
+
+        .byte 0x01, 0x00, 0x16, 0x00
 
 	.global gUnknown_80DFC34
 gUnknown_80DFC34: @ 80DFC34
-	.incbin "baserom.gba", 0xDFC34, 0x18
+        .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
+
+        .byte 0x30, 0xFC, 0x0D, 0x08
 
 	.global gUnknown_80DFC4C
 gUnknown_80DFC4C: @ 80DFC4C
-	.incbin "baserom.gba", 0xDFC4C, 0x4
+        .string "She"
+        .byte 0
 
 	.global gUnknown_80DFC50
 gUnknown_80DFC50: @ 80DFC50
-	.incbin "baserom.gba", 0xDFC50, 0xC
+        .string "He"
+        .byte 0x00, 0x00
+        .string "pksdir0"
+        .byte 0
 
 	.global gUnknown_80DFC5C
 gUnknown_80DFC5C: @ 80DFC5C
@@ -1590,7 +1660,10 @@ gUnknown_80DFC74: @ 80DFC74
 
 	.global gUnknown_80DFC8C
 gUnknown_80DFC8C: @ 80DFC8C
-	.incbin "baserom.gba", 0xDFC8C, 0x10
+        .string "Mailbox"
+        .byte 0
+        .string "pksdir0"
+        .byte 0
 
 	.global gUnknown_80DFC9C
 gUnknown_80DFC9C: @ 80DFC9C
@@ -1602,7 +1675,10 @@ gUnknown_80DFCB4: @ 80DFCB4
 
 	.global gUnknown_80DFCCC
 gUnknown_80DFCCC: @ 80DFCCC
-	.incbin "baserom.gba", 0xDFCCC, 0x18
+        .string "Bulletin Board"
+        .byte 0x00, 0x00
+        .string "pksdir0"
+        .byte 0
 
 	.global gUnknown_80DFCE4
 gUnknown_80DFCE4: @ 80DFCE4
@@ -1614,7 +1690,10 @@ gUnknown_80DFCFC: @ 80DFCFC
 
 	.global gUnknown_80DFD14
 gUnknown_80DFD14: @ 80DFD14
-	.incbin "baserom.gba", 0xDFD14, 0x14
+        .string "Job List"
+        .byte 0x00, 0x00, 0x00, 0x00
+        .string "pksdir0"
+        .byte 0x00
 
 	.global gUnknown_80DFD28
 gUnknown_80DFD28: @ 80DFD28
@@ -1630,11 +1709,15 @@ gUnknown_80DFD58: @ 80DFD58
 
 	.global gUnknown_80DFD70
 gUnknown_80DFD70: @ 80DFD70
-	.incbin "baserom.gba", 0xDFD70, 0xC
+        .string "Take Job"
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DFD7C
 gUnknown_80DFD7C: @ 80DFD7C
-	.incbin "baserom.gba", 0xDFD7C, 0x10
+        .string "Suspend"
+        .byte 0
+        .string "pksdir0"
+        .byte 0
 
 	.global gUnknown_80DFD8C
 gUnknown_80DFD8C: @ 80DFD8C
@@ -1803,7 +1886,10 @@ gUnknown_80E03F4: @ 80E03F4
 
 	.global gUnknown_80E040C
 gUnknown_80E040C: @ 80E040C
-	.incbin "baserom.gba", 0xE040C, 0x10
+        .string "Send"
+        .byte 0x00, 0x00, 0x00, 0x00
+        .string "pksdir0"
+        .byte 0
 
 	.global gUnknown_80E041C
 gUnknown_80E041C: @ 80E041C
@@ -1863,7 +1949,8 @@ gUnknown_80E072C: @ 80E072C
 
 	.global gUnknown_80E0744
 gUnknown_80E0744: @ 80E0744
-	.incbin "baserom.gba", 0xE0744, 0xC
+        .string "Dungeons"
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80E0750
 gUnknown_80E0750: @ 80E0750
@@ -1895,7 +1982,8 @@ gUnknown_80E0804: @ 80E0804
 
 	.global gUnknown_80E081C
 gUnknown_80E081C: @ 80E081C
-	.incbin "baserom.gba", 0xE081C, 0x8
+        .string "Courses"
+        .byte 0
 
 	.global gUnknown_80E0824
 gUnknown_80E0824: @ 80E0824
@@ -2165,7 +2253,8 @@ gUnknown_80E25B4: @ 80E25B4
 
 	.global gUnknown_80E25F4
 gUnknown_80E25F4: @ 80E25F4
-	.incbin "baserom.gba", 0xE25F4, 0x1C
+        .string "What would you like to do?"
+        .byte 0x00, 0x00
 
 	.global gUnknown_80E2610
 gUnknown_80E2610: @ 80E2610
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 1d287ee..c2c881a 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -419,7 +419,7 @@ gUnknown_202E1C8 = .; /* 202E1C8 */
 gUnknown_202E218 = .; /* 202E218 */
 	. += 0xA0;
 
-gUnknown_202E2B8 = .; /* 202E2B8 */
+gPlayerName = .; /* 202E2B8 */
 	. += 0x320;
 
 gUnknown_202E5D8 = .; /* 202E5D8 */
@@ -431,7 +431,7 @@ gUnknown_202E628 = .; /* 202E628 */
 gUnknown_202E6E0 = .; /* 202E6E0 */
 	. += 0x8;
 
-gUnknown_202E6E8 = .; /* 202E6E8 */
+gTeamName = .; /* 202E6E8 */
 	. += 0x50;
 
 gUnknown_202E738 = .; /* 202E738 */
@@ -875,7 +875,7 @@ gItemParametersFile = .; /* 20389A0 */
 gUnknown_20389A8 = .; /* 20389A8 */
 	. += 0x268;
 
-gUnknown_2038C10 = .; /* 2038C10 */
+gUnknown_2038C10 = .; /* 2038C10 (seems to be copy of gTeamName)*/
 	. += 0x18;
 
 gUnknown_2038C28 = .; /* 2038C28 */
@@ -1019,7 +1019,7 @@ gUnknown_2039B48 = .; /* 2039B48 */
 gUnknown_2039D50 = .; /* 2039D50 */
 	. += 0x48;
 
-gUnknown_2039D98 = .; /* 2039D98 */
+gUnknown_2039D98 = .; /* 2039D98 (seems to be copy of gTeamName)*/
 	. += 0xC;
 
 gUnknown_2039DA4 = .; /* 2039DA4 */