more labeling of stuff with rom map (thx MegaMinerd)

5 files changed, 51 insertions, 17 deletions

diff --git a/asm/code_808DAB4.s b/asm/code_808DAB4.s
index 5880b5c..6505725 100644
--- a/asm/code_808DAB4.s
+++ b/asm/code_808DAB4.s
@@ -936,7 +936,7 @@ sub_808E4FC:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0808E518: .4byte gUnknown_810D628
+_0808E518: .4byte gFormattedStatusNames
 	thumb_func_end sub_808E4FC
 
 	thumb_func_start sub_808E51C
@@ -955,7 +955,7 @@ sub_808E51C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0808E538: .4byte gUnknown_810D628
+_0808E538: .4byte gFormattedStatusNames
 	thumb_func_end sub_808E51C
 
 	thumb_func_start sub_808E53C
@@ -1749,7 +1749,7 @@ sub_808EAC0:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0808EAD8: .4byte gUnknown_8112C14
+_0808EAD8: .4byte gTactics
 	thumb_func_end sub_808EAC0
 
 	thumb_func_start sub_808EADC
@@ -4026,7 +4026,7 @@ _0808FC96:
 	str r7, [sp]
 	b _0808FD98
 	.align 2, 0
-_0808FCA0: .4byte gUnknown_810CF1C
+_0808FCA0: .4byte gStatusNames
 _0808FCA4: .4byte gUnknown_202DEA8
 _0808FCA8: .4byte gUnknown_8107784
 _0808FCAC: .4byte gUnknown_810DF78
diff --git a/asm/code_8092334.s b/asm/code_8092334.s
index c68b7d2..8f83f45 100644
--- a/asm/code_8092334.s
+++ b/asm/code_8092334.s
@@ -1402,7 +1402,7 @@ sub_8092D54:
 	bx r0
 	.align 2, 0
 _08092D78: .4byte gUnknown_810992C
-_08092D7C: .4byte gUnknown_810CC0C
+_08092D7C: .4byte gRangeNames
 	thumb_func_end sub_8092D54
 
 	thumb_func_start sub_8092D80
diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s
index 61b0a18..056e5e7 100644
--- a/data/data_80B9BB8.s
+++ b/data/data_80B9BB8.s
@@ -108,6 +108,8 @@ gUnknown_80CE788: @ 80CE788
         .align 2,0
         .asciz "pksdir0"
 
+@ Status Conditions Graphics
+
 	.global gUnknown_80CE79C
 gUnknown_80CE79C: @ 80CE79C
 	.incbin "baserom.gba", 0xCE79C, 0x198
@@ -122,6 +124,8 @@ gUnknown_80D3474: @ 80D3474
 
         .include "data/text/pksdir0.inc"
 
+@ Friend Area Data
+
 	.global gUnknown_80D3570
 gUnknown_80D3570: @ 80D3570
 	.incbin "baserom.gba", 0xD3570, 0x94C
@@ -257,6 +261,7 @@ gUnknown_80D4120: @ 80D4120
 gUnknown_80D4124: @ 80D4124
 	.incbin "baserom.gba", 0xD4124, 0x20
 
+@ Error Handling
 	.global gUnknown_80D4144
 gUnknown_80D4144: @ 80D4144
 	.incbin "baserom.gba", 0xD4144, 0x48
diff --git a/data/data_80F4278.s b/data/data_80F4278.s
index beb9dcb..3ce982c 100644
--- a/data/data_80F4278.s
+++ b/data/data_80F4278.s
@@ -6988,8 +6988,8 @@ gAbilityNames: @ 810B4C8
 AbilityDescriptions: @ 810B988
 	.incbin "baserom.gba", 0x10B988, 0x1284
 
-	.global gUnknown_810CC0C
-gUnknown_810CC0C: @ 810CC0C
+	.global gRangeNames
+gRangeNames: @ 810CC0C
 	.incbin "baserom.gba", 0x10CC0C, 0x2F4
 
 	.global gUnknown_810CF00
@@ -7005,12 +7005,12 @@ gUnknown_810CF0C: @ 810CF0C
         .align 2,0
         .byte 0x10, 0xCF, 0x10, 0x08 @ (pointer to power string)
 
-	.global gUnknown_810CF1C
-gUnknown_810CF1C: @ 810CF1C
+	.global gStatusNames
+gStatusNames: @ 810CF1C
 	.incbin "baserom.gba", 0x10CF1C, 0x70C
 
-	.global gUnknown_810D628
-gUnknown_810D628: @ 810D628
+	.global gFormattedStatusNames
+gFormattedStatusNames: @ 810D628
 	.incbin "baserom.gba", 0x10D628, 0x730
 
 	.global gUnknown_810DD58
@@ -7197,8 +7197,8 @@ gIQSkillNames: @ 8112234
 gIQSkillDescriptions: @ 811240C
 	.incbin "baserom.gba", 0x11240C, 0x808
 
-	.global gUnknown_8112C14
-gUnknown_8112C14: @ 8112C14
+	.global gTactics
+gTactics: @ 8112C14
 	.incbin "baserom.gba", 0x112C14, 0xE8
 
 	.global gTacticsDescriptions
@@ -9465,6 +9465,7 @@ gUnknown_811BAF4: @ 811BAF4
         .byte 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x61, 0x6d, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x30, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64
         .byte 0x69, 0x72, 0x30, 0x00
 
+@ Script Data
 	.global gUnknown_811E258
 gUnknown_811E258: @ 811E258
 	.incbin "baserom.gba", 0x11E258, 0x39C
diff --git a/data/dungeon_sbin.s b/data/dungeon_sbin.s
index 0b47f34..32fb419 100644
--- a/data/dungeon_sbin.s
+++ b/data/dungeon_sbin.s
@@ -1,4 +1,7 @@
-	.section .rodata
+#include "constants/bg_music.h"
+#include "constants/weather.h"
+
+    .section .rodata
 
 .include "data/unk_dungeon.inc"
 
@@ -5306,7 +5309,16 @@
 .byte 0xb6, 0xb0, 0x4c, 0x08, 0x22, 0xb2, 0x4c, 0x08, 0x8e, 0xb3, 0x4c, 0x08, 0xba, 0xb3, 0x4c, 0x08, 0xe6, 0xb4, 0x4c, 0x08, 0x74, 0x9e, 0x4a, 0x08
 .byte 0x74, 0x9f, 0x4a, 0x08 @ Pointer to Main Data
 .byte 0x6c, 0xb5, 0x4c, 0x08
-.byte 0x9c, 0x2a, 0x4c, 0x08, 0xd8, 0x4e, 0x4c, 0x08, 0x53, 0x49, 0x52, 0x4f, 0x58, 0xb8, 0x4c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0xbf, 0x4c, 0x08, 0x34, 0xbf, 0x4c, 0x08
+.byte 0x9c, 0x2a, 0x4c, 0x08, 0xd8, 0x4e, 0x4c, 0x08
+
+@ SIRO Header
+.byte 0x53, 0x49, 0x52, 0x4f
+.byte 0x58, 0xb8, 0x4c, 0x08
+.byte 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00
+
+@ Dungeon Partner Dialogue and Pointer Tables
+.byte 0x54, 0xbf, 0x4c, 0x08, 0x34, 0xbf, 0x4c, 0x08
 .byte 0x18, 0xbf, 0x4c, 0x08, 0xf4, 0xbe, 0x4c, 0x08, 0xc4, 0xbe, 0x4c, 0x08, 0x98, 0xbe, 0x4c, 0x08, 0x74, 0xbe, 0x4c, 0x08, 0x50, 0xbe, 0x4c, 0x08, 0x28, 0xbe, 0x4c, 0x08, 0x08, 0xbe, 0x4c, 0x08
 .byte 0xe4, 0xbd, 0x4c, 0x08, 0xa8, 0xbd, 0x4c, 0x08, 0x74, 0xbd, 0x4c, 0x08, 0x08, 0xbe, 0x4c, 0x08, 0x58, 0xbd, 0x4c, 0x08, 0x38, 0xbd, 0x4c, 0x08, 0x04, 0xbd, 0x4c, 0x08, 0xc0, 0xbc, 0x4c, 0x08
 .byte 0x98, 0xbc, 0x4c, 0x08, 0x58, 0xbc, 0x4c, 0x08, 0x2c, 0xbc, 0x4c, 0x08, 0xec, 0xbb, 0x4c, 0x08, 0xb8, 0xbb, 0x4c, 0x08, 0xa0, 0xbb, 0x4c, 0x08, 0x70, 0xbb, 0x4c, 0x08, 0x34, 0xbb, 0x4c, 0x08
@@ -8131,7 +8143,16 @@
 .byte 0x74, 0x68, 0x61, 0x74, 0x20, 0x6d, 0x75, 0x63, 0x68, 0x20, 0x68, 0x61, 0x72, 0x64, 0x65, 0x72, 0x21, 0x00, 0x00, 0x00, 0x24, 0x6d, 0x30, 0x3a, 0x20, 0x20, 0x4e, 0x6f, 0x20, 0x6d, 0x6f, 0x72
 .byte 0x65, 0x2e, 0x2e, 0x2e, 0x0d, 0x49, 0x20, 0x66, 0x65, 0x65, 0x6c, 0x20, 0x66, 0x61, 0x69, 0x6e, 0x74, 0x2e, 0x2e, 0x2e, 0x20, 0x48, 0x65, 0x6c, 0x70, 0x2e, 0x2e, 0x2e, 0x00, 0x00, 0x00, 0x00
 .byte 0x24, 0x6d, 0x30, 0x3a, 0x20, 0x20, 0x4d, 0x79, 0x20, 0x73, 0x68, 0x65, 0x6c, 0x6c, 0x20, 0x69, 0x73, 0x20, 0x68, 0x61, 0x72, 0x64, 0x65, 0x72, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x0d, 0x61, 0x6e
-.byte 0x79, 0x20, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x21, 0x00, 0x00, 0x53, 0x49, 0x52, 0x4f, 0x7c, 0x19, 0x4e, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x1f, 0x4e, 0x08
+.byte 0x79, 0x20, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x21, 0x00, 0x00
+
+@ SIRO Header
+.byte 0x53, 0x49, 0x52, 0x4f
+.byte 0x7c, 0x19, 0x4e, 0x08
+.byte 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00
+
+@ Dungeon Partner Dialogue Debug Names
+.byte 0xb4, 0x1f, 0x4e, 0x08
 .byte 0x94, 0x1f, 0x4e, 0x08, 0x78, 0x1f, 0x4e, 0x08, 0x54, 0x1f, 0x4e, 0x08, 0x28, 0x1f, 0x4e, 0x08, 0x04, 0x1f, 0x4e, 0x08, 0xcc, 0x1e, 0x4e, 0x08, 0xb0, 0x1e, 0x4e, 0x08, 0x8c, 0x1e, 0x4e, 0x08
 .byte 0x68, 0x1e, 0x4e, 0x08, 0x44, 0x1e, 0x4e, 0x08, 0x20, 0x1e, 0x4e, 0x08, 0xfc, 0x1d, 0x4e, 0x08, 0xd8, 0x1d, 0x4e, 0x08, 0xb4, 0x1d, 0x4e, 0x08, 0x90, 0x1d, 0x4e, 0x08, 0x4c, 0x1d, 0x4e, 0x08
 .byte 0x2c, 0x1d, 0x4e, 0x08, 0xf8, 0x1c, 0x4e, 0x08, 0xec, 0x92, 0x4d, 0x08, 0xd4, 0x1c, 0x4e, 0x08, 0xb0, 0x1c, 0x4e, 0x08, 0x8c, 0x1c, 0x4e, 0x08, 0x68, 0x1c, 0x4e, 0x08, 0x44, 0x1c, 0x4e, 0x08
@@ -8182,7 +8203,14 @@
 .byte 0x6c, 0x65, 0x64, 0x20, 0x75, 0x70, 0x2e, 0x20, 0x49, 0x7e, 0x32, 0x37, 0x6d, 0x20, 0x68, 0x61, 0x70, 0x70, 0x79, 0x21, 0x00, 0x00, 0x00, 0x00, 0x24, 0x6d, 0x30, 0x3a, 0x20, 0x20, 0x49, 0x20
 .byte 0x63, 0x61, 0x6e, 0x7e, 0x32, 0x37, 0x74, 0x20, 0x67, 0x6f, 0x20, 0x6f, 0x6e, 0x2e, 0x2e, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x24, 0x6d, 0x30, 0x3a, 0x20, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69
 .byte 0x73, 0x20, 0x67, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x6f, 0x75, 0x67, 0x68, 0x2e, 0x2e, 0x2e, 0x00, 0x00, 0x24, 0x6d, 0x30, 0x3a, 0x20, 0x20, 0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68
-.byte 0x69, 0x6e, 0x67, 0x2e, 0x2e, 0x2e, 0x00, 0x00, 0x53, 0x49, 0x52, 0x4f, 0xd8, 0x1f, 0x4e, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0x25, 0x4e, 0x08, 0xd0, 0x25, 0x4e, 0x08
+.byte 0x69, 0x6e, 0x67, 0x2e, 0x2e, 0x2e, 0x00, 0x00
+
+.byte 0x53, 0x49, 0x52, 0x4f
+.byte 0xd8, 0x1f, 0x4e, 0x08
+.byte 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00
+
+.byte 0xf4, 0x25, 0x4e, 0x08, 0xd0, 0x25, 0x4e, 0x08
 .byte 0xac, 0x25, 0x4e, 0x08, 0x88, 0x25, 0x4e, 0x08, 0x64, 0x25, 0x4e, 0x08, 0x40, 0x25, 0x4e, 0x08, 0x1c, 0x25, 0x4e, 0x08, 0xf8, 0x24, 0x4e, 0x08, 0xd4, 0x24, 0x4e, 0x08, 0xb0, 0x24, 0x4e, 0x08
 .byte 0x8c, 0x24, 0x4e, 0x08, 0x68, 0x24, 0x4e, 0x08, 0x44, 0x24, 0x4e, 0x08, 0x20, 0x24, 0x4e, 0x08, 0xfc, 0x23, 0x4e, 0x08, 0xd8, 0x23, 0x4e, 0x08, 0xb4, 0x23, 0x4e, 0x08, 0x90, 0x23, 0x4e, 0x08
 .byte 0x6c, 0x23, 0x4e, 0x08, 0x48, 0x23, 0x4e, 0x08, 0x24, 0x23, 0x4e, 0x08, 0x00, 0x23, 0x4e, 0x08, 0xdc, 0x22, 0x4e, 0x08, 0xb8, 0x22, 0x4e, 0x08, 0x94, 0x22, 0x4e, 0x08, 0x70, 0x22, 0x4e, 0x08