Finish out game options and FatalError

Some data cleanup as well. Thanks pika for the noreturn tip for
FatalError.

2 files changed, 124 insertions, 45 deletions

diff --git a/data/data_80D47B8.s b/data/data_80D47B8.s
index 6dd541f..2a662f9 100644
--- a/data/data_80D47B8.s
+++ b/data/data_80D47B8.s
@@ -623,15 +623,30 @@ gUnknown_80DB7D0: @ 80DB7D0
 
 	.global gUnknown_80DB7E8
 gUnknown_80DB7E8: @ 80DB7E8
-.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x14, 0x00, 0x04, 0x00, 0x06, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x14, 0x00, 0x04, 0x00
+        .byte 0x06, 0x00, 0x03, 0x00
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DB800
 gUnknown_80DB800: @ 80DB800
-.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x14, 0x00, 0x09, 0x00, 0x06, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x14, 0x00, 0x09, 0x00
+        .byte 0x06, 0x00, 0x03, 0x00
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DB818
 gUnknown_80DB818: @ 80DB818
-.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x14, 0x00, 0x0e, 0x00, 0x06, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x14, 0x00, 0x0e, 0x00
+        .byte 0x06, 0x00, 0x04, 0x00
+        .byte 0x04, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_80DB830
 gUnknown_80DB830: @ 80DB830
@@ -1062,7 +1077,9 @@ gUnknown_80DBE98: @ 80DBE98
 
 	.global gUnknown_80DBEB0
 gUnknown_80DBEB0: @ 80DBEB0
-	.incbin "baserom.gba", 0xDBEB0, 0x60
+        .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x03, 0x00, 0x08, 0x00, 0x06, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
+        .byte 0x0c, 0x00, 0x04, 0x00, 0x10, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x0e, 0x00, 0x1a, 0x00, 0x04, 0x00
+        .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 	.global gMenuItems
 gMenuItems: @ 80DBF10
@@ -1455,6 +1472,7 @@ gUnknown_80DC34C: @ 80DC34C
         .byte 0x06, 0x00, 0x03, 0x00
         .byte 0x03, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
+
         .byte 0x00, 0x00, 0x00, 0x00
         .byte 0x03, 0x00, 0x00, 0x00
         .byte 0x16, 0x00, 0x0e, 0x00
diff --git a/data/data_80F4278.s b/data/data_80F4278.s
index 9203841..37482ec 100644
--- a/data/data_80F4278.s
+++ b/data/data_80F4278.s
@@ -1789,15 +1789,15 @@ gUnknown_80F6DF8: @ 80F6DF8
 
 	.global gUnknown_80F7AE8
 gUnknown_80F7AE8: @ 80F7AE8
-	.incbin "baserom.gba", 0xF7AE8, 0x2
+        .byte 0x00, 0x00
 
 	.global gUnknown_80F7AEA
 gUnknown_80F7AEA: @ 80F7AEA
-	.incbin "baserom.gba", 0xF7AEA, 0xE
+        .byte 0x0d, 0x03, 0x0d, 0x01, 0x0d, 0x03, 0x0d, 0x01, 0x01, 0x03, 0x01, 0x00, 0x11, 0x00
 
 	.global gUnknown_80F7AF8
 gUnknown_80F7AF8: @ 80F7AF8
-	.incbin "baserom.gba", 0xF7AF8, 0x4
+        .byte 0x3f, 0x3f, 0x00, 0x00
 
 	.global gUnknown_80F7AFC
 gUnknown_80F7AFC: @ 80F7AFC
@@ -7339,11 +7339,11 @@ gUnknown_8106A1C: @ 8106A1C
 
 	.global gUnknown_8106A4C
 gUnknown_8106A4C: @ 8106A4C
-	.incbin "baserom.gba", 0x106A4C, 0x4
+        .4byte 0
 
 	.global gUnknown_8106A50
 gUnknown_8106A50: @ 8106A50
-	.incbin "baserom.gba", 0x106A50, 0x4
+        .4byte 1
 
 	.global gUnknown_8106A54
 gUnknown_8106A54: @ 8106A54
@@ -7359,7 +7359,7 @@ gUnknown_8106AC8: @ 8106AC8
 
 	.global gUnknown_8106AE8
 gUnknown_8106AE8: @ 8106AE8
-	.incbin "baserom.gba", 0x106AE8, 0x4
+        .byte 0x00, 0x00, 0x01, 0x00
 
 	.global gUnknown_8106AEC
 gUnknown_8106AEC: @ 8106AEC
@@ -7374,7 +7374,7 @@ gUnknown_8106B50: @ 8106B50
 
 	.global gUnknown_8106B60
 gUnknown_8106B60: @ 8106B60
-	.incbin "baserom.gba", 0x106B60, 0xC
+        .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x50, 0x00, 0x01, 0x00, 0x00, 0x00
 
 	.global gUnknown_8106B6C
 gUnknown_8106B6C: @ 8106B6C
@@ -7425,31 +7425,57 @@ gUnknown_8106BD0: @ 8106BD0
 
 	.global gUnknown_8106BD4
 gUnknown_8106BD4: @ 8106BD4
-	.incbin "baserom.gba", 0x106BD4, 0xC
+        .byte 0x87, 0x42, 0x24, 0x6d, 0x30, 0x23, 0x3d, 0x59, 0x24, 0x6d, 0x31, 0x00
 
 	.global gUnknown_8106BE0
 gUnknown_8106BE0: @ 8106BE0
-	.incbin "baserom.gba", 0x106BE0, 0xC
+        .byte 0x87, 0x40, 0x24, 0x6d, 0x30, 0x23, 0x3d, 0x59, 0x24, 0x6d, 0x31, 0x00
 
 	.global gUnknown_8106BEC
 gUnknown_8106BEC: @ 8106BEC
-	.incbin "baserom.gba", 0x106BEC, 0x8
+        .byte 0x87, 0x42, 0x24, 0x6d, 0x30, 0x00, 0x00, 0x00
 
 	.global gUnknown_8106BF4
 gUnknown_8106BF4: @ 8106BF4
-	.incbin "baserom.gba", 0x106BF4, 0xC
+        .byte 0x87, 0x40, 0x24, 0x6d, 0x30, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0f, 0x00
 
 	.global gUnknown_8106C00
 gUnknown_8106C00: @ 8106C00
-	.incbin "baserom.gba", 0x106C00, 0x18
+        .byte 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x0a, 0x00, 0x12, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00, 0xfc, 0x6b, 0x10, 0x08
 
 	.global gUnknown_8106C18
 gUnknown_8106C18: @ 8106C18
-	.incbin "baserom.gba", 0x106C18, 0x18
+        .byte 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x0a, 0x00, 0x12, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0xfc, 0x6b, 0x10, 0x08
 
 	.global gUnknown_8106C30
 gUnknown_8106C30: @ 8106C30
-	.incbin "baserom.gba", 0x106C30, 0x60
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x0e, 0x00, 0x02, 0x00
+        .byte 0x0e, 0x00, 0x10, 0x00
+        .byte 0x10, 0x00, 0x00, 0x00
+        .byte 0x70, 0xf2, 0x02, 0x02
+
+        .byte 0x00, 0x00, 0x00, 0x00
+        .byte 0x03, 0x00, 0x00, 0x00
+        .byte 0x02, 0x00, 0x02, 0x00
+        .byte 0x0a, 0x00, 0x02, 0x00
+        .byte 0x02, 0x00, 0x00, 0x00
+        .byte 0x00, 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
+
+        .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_8106C90
 gUnknown_8106C90: @ 8106C90
@@ -7513,11 +7539,14 @@ gUnknown_8106CF4: @ 8106CF4
 
 	.global gUnknown_8106D08
 gUnknown_8106D08: @ 8106D08
-	.incbin "baserom.gba", 0x106D08, 0x60
+        .byte 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x12, 0x00, 0x0e, 0x00, 0x12, 0x00, 0x02, 0x00, 0x3c, 0xb4, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_8106D68
 gUnknown_8106D68: @ 8106D68
-	.incbin "baserom.gba", 0x106D68, 0x24
+        .byte 0x01, 0x00, 0x38, 0x00, 0x00, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x02, 0x00, 0x38, 0x00, 0x68, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_8106D8C
 gUnknown_8106D8C: @ 8106D8C
@@ -7530,11 +7559,14 @@ gUnknown_8106D8C: @ 8106D8C
 
 	.global gUnknown_8106DA4
 gUnknown_8106DA4: @ 8106DA4
-	.incbin "baserom.gba", 0x106DA4, 0x24
+        .byte 0x01, 0x00, 0x38, 0x00, 0x00, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x02, 0x00, 0x38, 0x00, 0x68, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_8106DC8
 gUnknown_8106DC8: @ 8106DC8
-	.incbin "baserom.gba", 0x106DC8, 0x60
+        .byte 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x11, 0x00, 0x0e, 0x00, 0x12, 0x00, 0x02, 0x00, 0x08, 0xf3, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
+        .byte 0x15, 0x00, 0x04, 0x00, 0x07, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_8106E28
 gUnknown_8106E28: @ 8106E28
@@ -7666,8 +7698,7 @@ gUnknown_8106F7C: @ 8106F7C
 
 	.global gUnknown_8106FA4
 gUnknown_8106FA4: @ 8106FA4
-@ replacing .incbin "baserom.gba", 0x00106fa4, 0x9
-        .byte 0x23, 0x63, 0x25, 0x63, 0x25, 0x73, 0x23, 0x72, 0x00
+        .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0"
 
 	.global gUnknown_8106FAD
 gUnknown_8106FAD: @ 8106FAD
@@ -7787,16 +7818,12 @@ gUnknown_81075F4: @ 81075F4
 
 	.global gUnknown_8107600
 gUnknown_8107600: @ 8107600
-        .string "#c"
-        .byte 0x06
-        .string "%s#r"
+        .string "#{YELLOW_ALT}%s#r"
         .align 2,0
 
 	.global gUnknown_8107608
 gUnknown_8107608: @ 8107608
-        .string "#c"
-        .byte 0x05
-        .string "%s#r"
+        .string "#{CYAN_ALT}%s#r"
         .align 2,0
 
 	.global gUnownLetters
@@ -7820,11 +7847,12 @@ gUnknown_810763C: @ 810763C
 
 	.global gUnknown_8107645
 gUnknown_8107645: @ 8107645
-	.incbin "baserom.gba", 0x107645, 0xF
+        .byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_8107654
 gUnknown_8107654: @ 8107654
-	.incbin "baserom.gba", 0x107654, 0x30
+        .byte 0x9d, 0x01, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00
+        .byte 0x33, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 	.global gUnknown_8107684
 gUnknown_8107684: @ 8107684
@@ -7847,11 +7875,36 @@ gUnknown_81076BC: @ 81076BC
 
 	.global gUnknown_81076C4
 gUnknown_81076C4: @ 81076C4
-	.incbin "baserom.gba", 0x1076C4, 0x20
+.byte 0xfc, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
 
 	.global gUnknown_81076E4
 gUnknown_81076E4: @ 81076E4
-	.incbin "baserom.gba", 0x1076E4, 0x70
+        .4byte 9999
+        .4byte 4
+        .4byte 1
+        .4byte 2
+        .4byte 4
+        .4byte 4
+        .4byte 6
+        .4byte 7
+        .4byte 8
+        .4byte 9
+        .4byte 9
+        .4byte 9
+        .4byte 10
+        .4byte 10
+        .4byte 11
+        .4byte 11
+        .4byte 14
+        .4byte 14
+        .4byte 14
+        .4byte 16
+        .4byte 16
+        .4byte 9
+        .4byte 17
+        .4byte 6
+        .string "pksdir0\0"
+        .string "pksdir0\0"
 
 	.global gUnknown_8107754
 gUnknown_8107754: @ 8107754
@@ -7973,11 +8026,11 @@ gUnknown_8108F40: @ 8108F40
 
 	.global gUnknown_8108F42
 gUnknown_8108F42: @ 8108F42
-	.incbin "baserom.gba", 0x108F42, 0x8
+        .byte 0x99, 0x00, 0x9c, 0x00, 0x9e, 0x00, 0xdb, 0x00
 
 	.global gUnknown_8108F4A
 gUnknown_8108F4A: @ 8108F4A
-	.incbin "baserom.gba", 0x108F4A, 0x6
+        .byte 0xe1, 0xe7, 0xe6, 0xe2, 0x00, 0x00
 
 	.global gUnknown_8108F50
 gUnknown_8108F50: @ 8108F50
@@ -8007,27 +8060,37 @@ gUnknown_8109778: @ 8109778
 
 	.global gUnknown_810977C
 gUnknown_810977C: @ 810977C
-	.incbin "baserom.gba", 0x10977C, 0x8
+        @ replacing .incbin "baserom.gba", 0x0010977c, 0x8
+        .string "%d {POKE}\0"
 
 	.global gUnknown_8109784
 gUnknown_8109784: @ 8109784
-	.incbin "baserom.gba", 0x109784, 0x8
+        @ replacing .incbin "baserom.gba", 0x00109784, 0x8
+        .byte 0x87, 0x44
+        .asciz "%s\0"
+        .align 2,0
 
 	.global gUnknown_810978C
 gUnknown_810978C: @ 810978C
-	.incbin "baserom.gba", 0x10978C, 0x8
+        @ replacing .incbin "baserom.gba", 0x0010978c, 0x8
+        .byte 0x87, 0x41
+        .asciz "%s\0"
+        .align 2,0
 
 	.global gUnknown_8109794
 gUnknown_8109794: @ 8109794
-	.incbin "baserom.gba", 0x109794, 0x10
+        @ replacing .incbin "baserom.gba", 0x00109794, 0x10
+        .byte 0x25, 0x73, 0x23, 0x3d, 0x25, 0x63, 0x23, 0x43, 0x04, 0x25, 0x73, 0x23, 0x52, 0x00, 0x00, 0x00
 
 	.global gUnknown_81097A4
 gUnknown_81097A4: @ 81097A4
-	.incbin "baserom.gba", 0x1097A4, 0xC
+        @ replacing .incbin "baserom.gba", 0x001097a4, 0xc
+        .byte 0x25, 0x73, 0x23, 0x43, 0x04, 0x25, 0x73, 0x23, 0x52, 0x00, 0x00, 0x00
 
 	.global gUnknown_81097B0
 gUnknown_81097B0: @ 81097B0
-	.incbin "baserom.gba", 0x1097B0, 0x14
+        @ replacing .incbin "baserom.gba", 0x001097b0, 0x14
+        .byte 0xa0, 0x86, 0x01, 0x00, 0x10, 0x27, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00
 
 	.global gUnknown_81097C4
 gUnknown_81097C4: @ 81097C4
@@ -8066,7 +8129,6 @@ gUnknown_81097F8: @ 81097F8
 
 	.global gRescueRankMaxPoints
 gRescueRankMaxPoints: @ 8109810
-        @ replacing .incbin "baserom.gba", 0x00109810, 0x1c
         .4byte 50
         .4byte 500
         .4byte 1500
@@ -8077,8 +8139,7 @@ gRescueRankMaxPoints: @ 8109810
 
 	.global gTeamNamePlaceholder
 gTeamNamePlaceholder: @ 810982C
-        @ replacing .incbin "baserom.gba", 0x0010982c, 0x10
-        .byte 0x50, 0x6f, 0x6b, 0xe9, 0x6d, 0x6f, 0x6e, 0x00
+        .string "Pokémon\0"
         .string "pksdir0\0"
 
 	.global gUnknown_810983C