hopefully fix kobold PR

11 files changed, 163 insertions, 160 deletions

diff --git a/.gitignore b/.gitignore
index 25be9db78..d3b437493 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,9 +26,4 @@ Thumbs.db
 build/
 .DS_Store
 *.ddump
-data2new.s
-data2old.s
-dump baserom msys code.txt
 *.lnk
-baserom.rar
-datadump/
diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s
index 066e66a11..a6cad8f50 100644
--- a/data/battle_frontier_1.s
+++ b/data/battle_frontier_1.s
@@ -1365,9 +1365,9 @@ gUnknown_0860EF98:: @ 860EF98
 	.incbin "baserom.gba", 0x60ef98, 0x8
 
 gUnknown_0860EFA0:: @ 860EFA0
-	.4byte 0x2021cc4
-	.4byte 0x2021dc4
-	.4byte 0x2021ec4
+	.4byte gStringVar1
+	.4byte gStringVar2
+	.4byte gStringVar3
 
 gUnknown_0860EFAC:: @ 860EFAC
 	.4byte sub_8196A44
diff --git a/data/contest.s b/data/contest.s
index ec91ba216..66a055b7d 100644
--- a/data/contest.s
+++ b/data/contest.s
@@ -59,132 +59,132 @@ gUnknown_08587C30:: @ 8587C30
 	.include "data/text/contest_text_pointers.inc"
 
 @ 8587D5C
-	.4byte 0x827d5c1
-	.4byte 0x827d5dc
-	.4byte 0x827d600
-	.4byte 0x827d612
-	.4byte 0x827d612
-	.4byte 0x827d62d
-	.4byte 0x827d654
-	.4byte 0x827d67e
-	.4byte 0x827d69c
-	.4byte 0x827d6ba
-	.4byte 0x827d6e5
-	.4byte 0x827d706
-	.4byte 0x827d71d
+	.4byte gText_0827D5C1
+	.4byte gText_0827D5DC
+	.4byte gText_0827D600
+	.4byte gText_0827D612
+	.4byte gText_0827D612
+	.4byte gText_0827D62D
+	.4byte gText_0827D654
+	.4byte gText_0827D67E
+	.4byte gText_0827D69C
+	.4byte gText_0827D6BA
+	.4byte gText_0827D6E5
+	.4byte gText_0827D706
+	.4byte gText_0827D71D
 
 gUnknown_08587D90:: @ 8587D90
-	.4byte 0x827d743
-	.4byte 0x827d764
-	.4byte 0x827d785
-	.4byte 0x827d7a5
-	.4byte 0x827d7c8
-	.4byte 0x827d7e8
-	.4byte 0x827d831
-	.4byte 0x827d855
-	.4byte 0x827d830
-	.4byte 0x827d872
-	.4byte 0x827d88f
-	.4byte 0x827d8b5
-	.4byte 0x827d8e4
-	.4byte 0x827d8fe
-	.4byte 0x827d926
-	.4byte 0x827d947
-	.4byte 0x827d961
-	.4byte 0x827d986
-	.4byte 0x827d9b1
-	.4byte 0x827d9d9
-	.4byte 0x827da03
-	.4byte 0x827da31
-	.4byte 0x827da5b
-	.4byte 0x827da85
-	.4byte 0x827dab2
-	.4byte 0x827dada
-	.4byte 0x827db03
-	.4byte 0x827d830
-	.4byte 0x827d830
-	.4byte 0x827d830
-	.4byte 0x827db1f
-	.4byte 0x827db4e
+	.4byte gText_0827D743
+	.4byte gText_0827D764
+	.4byte gText_0827D785
+	.4byte gText_0827D7A5
+	.4byte gText_0827D7C8
+	.4byte gText_0827D7E8
+	.4byte gText_0827D831
+	.4byte gText_0827D855
+	.4byte gText_0827D830
+	.4byte gText_0827D872
+	.4byte gText_0827D88F
+	.4byte gText_0827D8B5
+	.4byte gText_0827D8E4
+	.4byte gText_0827D8FE
+	.4byte gText_0827D926
+	.4byte gText_0827D947
+	.4byte gText_0827D961
+	.4byte gText_0827D986
+	.4byte gText_0827D9B1
+	.4byte gText_0827D9D9
+	.4byte gText_0827DA03
+	.4byte gText_0827DA31
+	.4byte gText_0827DA5B
+	.4byte gText_0827DA85
+	.4byte gText_0827DAB2
+	.4byte gText_0827DADA
+	.4byte gText_0827DB03
+	.4byte gText_0827D830
+	.4byte gText_0827D830
+	.4byte gText_0827D830
+	.4byte gText_0827DB1F
+	.4byte gText_0827DB4E
 
 gUnknown_08587E10:: @ 8587E10
-	.4byte 0x827db75
-	.4byte 0x827dbb0
-	.4byte 0x827dbe0
-	.4byte 0x827dc0f
-	.4byte 0x827dc45
-	.4byte 0x827dc7c
-	.4byte 0x827dcb4
-	.4byte 0x827dce7
-	.4byte 0x827dd12
-	.4byte 0x827dd3d
-	.4byte 0x827dd6f
-	.4byte 0x827dd8e
-	.4byte 0x827ddc7
-	.4byte 0x827ddf2
-	.4byte 0x827de14
-	.4byte 0x827de44
-	.4byte 0x827de73
-	.4byte 0x827dea5
-	.4byte 0x827ded9
-	.4byte 0x827df02
-	.4byte 0x827df3a
-	.4byte 0x827df63
-	.4byte 0x827df8c
-	.4byte 0x827dfb8
-	.4byte 0x827dfe2
-	.4byte 0x827e00c
-	.4byte 0x827e02f
-	.4byte 0x827e05f
-	.4byte 0x827e08b
-	.4byte 0x827e0b5
-	.4byte 0x827e0dd
-	.4byte 0x827e107
-	.4byte 0x827e143
-	.4byte 0x827e17f
-	.4byte 0x827e1bb
-	.4byte 0x827e1f3
-	.4byte 0x827e220
-	.4byte 0x827e254
-	.4byte 0x827e289
-	.4byte 0x827e2c5
-	.4byte 0x827e2fe
-	.4byte 0x827e32e
-	.4byte 0x827e35b
-	.4byte 0x827e38d
-	.4byte 0x827e3c1
-	.4byte 0x827e3eb
-	.4byte 0x827e416
-	.4byte 0x827e448
-	.4byte 0x827e473
-	.4byte 0x827e4a6
-	.4byte 0x827e4d5
-	.4byte 0x827e504
-	.4byte 0x827e531
-	.4byte 0x827e55a
-	.4byte 0x827e5b2
-	.4byte 0x827e5d0
-	.4byte 0x827e606
-	.4byte 0x827e638
-	.4byte 0x827e658
-	.4byte 0x827e68b
-	.4byte 0x827e6c4
-	.4byte 0x827e7ba
+	.4byte gText_827DB75
+	.4byte gText_827DBB0
+	.4byte gText_827DBE0
+	.4byte gText_827DC0F
+	.4byte gText_827DC45
+	.4byte gText_827DC7C
+	.4byte gText_827DCB4
+	.4byte gText_827DCE7
+	.4byte gText_827DD12
+	.4byte gText_827DD3D
+	.4byte gText_827DD6F
+	.4byte gText_827DD8E
+	.4byte gText_827DDC7
+	.4byte gText_827DDF2
+	.4byte gText_827DE14
+	.4byte gText_827DE44
+	.4byte gText_827DE73
+	.4byte gText_827DEA5
+	.4byte gText_827DED9
+	.4byte gText_827DF02
+	.4byte gText_827DF3A
+	.4byte gText_827DF63
+	.4byte gText_827DF8C
+	.4byte gText_827DFB8
+	.4byte gText_827DFE2
+	.4byte gText_827E00C
+	.4byte gText_827E02F
+	.4byte gText_827E05F
+	.4byte gText_827E08B
+	.4byte gText_827E0B5
+	.4byte gText_827E0DD
+	.4byte gText_827E107
+	.4byte gText_827E143
+	.4byte gText_827E17F
+	.4byte gText_827E1BB
+	.4byte gText_827E1F3
+	.4byte gText_827E220
+	.4byte gText_827E254
+	.4byte gText_827E289
+	.4byte gText_827E2C5
+	.4byte gText_0827E2FE
+	.4byte gText_0827E32E
+	.4byte gText_0827E35B
+	.4byte gText_0827E38D
+	.4byte gText_0827E3C1
+	.4byte gText_0827E3EB
+	.4byte gText_0827E416
+	.4byte gText_0827E448
+	.4byte gText_0827E473
+	.4byte gText_0827E4A6
+	.4byte gText_0827E4D5
+	.4byte gText_0827E504
+	.4byte gText_0827E531
+	.4byte gText_0827E55A
+	.4byte gText_0827E5B2
+	.4byte gText_0827E5D0
+	.4byte gText_0827E606
+	.4byte gText_0827E638
+	.4byte gText_0827E658
+	.4byte gText_0827E68B
+	.4byte gText_0827E6C4
+	.4byte gText_0827E7BA
 
 gUnknown_08587F08:: @ 8587F08
-	.4byte 0x827e85f
-	.4byte 0x827e868
-	.4byte 0x827e86f
-	.4byte 0x827e878
-	.4byte 0x827e882
+	.4byte gText_0827E85F
+	.4byte gText_0827E868
+	.4byte gText_0827E86F
+	.4byte gText_0827E878
+	.4byte gText_0827E882
 
 gUnknown_08587F1C:: @ 8587F1C
-	.4byte 0x827e894
-	.4byte 0x827e89e
-	.4byte 0x827e8aa
-	.4byte 0x827e8b4
-	.4byte 0x827e8bf
-	.4byte 0x827e8ca
+	.4byte gText_0827E894
+	.4byte gText_0827E89E
+	.4byte gText_0827E8AA
+	.4byte gText_0827E8B4
+	.4byte gText_0827E8BF
+	.4byte gText_0827E8CA
 
 gUnknown_08587F34:: @ 8587F34
 	.incbin "baserom.gba", 0x587f34, 0x10
diff --git a/data/easy_chat.s b/data/easy_chat.s
index 8d9c561d4..3894cc13d 100644
--- a/data/easy_chat.s
+++ b/data/easy_chat.s
@@ -83,10 +83,10 @@ gUnknown_08597C8C:: @ 8597C8C
 	.incbin "baserom.gba", 0x597c8c, 0x4
 
 gUnknown_08597C90:: @ 8597C90
-	.4byte 0x862b810
-	.4byte 0x862b832
-	.4byte 0x862b84b
-	.4byte 0x862b86c
+	.4byte gUnknown_862B810
+	.4byte gUnknown_862B832
+	.4byte gUnknown_862B84B
+	.4byte gUnknown_862B86C
 
 gUnknown_08597CA0:: @ 8597CA0
 	.incbin "baserom.gba", 0x597ca0, 0x20
diff --git a/data/event_scripts.s b/data/event_scripts.s
index f4b2270a3..12d2a6a3a 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -5862,28 +5862,28 @@ EventScript_292DE5:: @ 8292DE5
 
 	.include "data/scripts/pokeblocks.inc"
 
-Text_294295: @ 8294295
+gText_SoPretty:: @ 8294295
 	.string " so pretty!$"
 
-Text_2942A1: @ 82942A1
+gText_SoDarling:: @ 82942A1
 	.string " so darling!$"
 
-Text_2942AE: @ 82942AE
+gText_SoRelaxed:: @ 82942AE
 	.string " so relaxed!$"
 
-Text_2942BB: @ 82942BB
+gText_SoSunny:: @ 82942BB
 	.string " so sunny!$"
 
-Text_2942C6: @ 82942C6
+gText_SoDesirable:: @ 82942C6
 	.string " so desirable!$"
 
-Text_2942D5: @ 82942D5
+gText_SoExciting:: @ 82942D5
 	.string " so exciting!$"
 
-Text_2942E3: @ 82942E3
+gText_SoAmusing:: @ 82942E3
 	.string " so amusing!$"
 
-Text_2942F0: @ 82942F0
+gText_SoMagical:: @ 82942F0
 	.string " so magical!$"
 
 gUnknown_082942FD:: @ 82942FD
diff --git a/data/field_screen.s b/data/field_screen.s
index 217f049b0..fc89bcfdf 100644
--- a/data/field_screen.s
+++ b/data/field_screen.s
@@ -1545,7 +1545,7 @@ gUnknown_0854014C:: @ 854014C
 
 gUnknown_0854C14C:: @ 854C14C
 @ replacing .incbin "baserom.gba", 0x0054c14c, 0x4
-.4byte 0x2038454
+.4byte gUnknown_02038454
 
 gUnknown_0854C150:: @ 854C150
 @ replacing .incbin "baserom.gba", 0x0054c150, 0xf0
diff --git a/data/librtc_rodata.s b/data/librtc_rodata.s
index 30cc8427f..0ed8b9ade 100644
--- a/data/librtc_rodata.s
+++ b/data/librtc_rodata.s
@@ -13,4 +13,4 @@
 	.4byte 0x3001A7E
 	.4byte 0x3001A7E
 	.4byte 0x3001A7E
-	.4byte 0x80000C6
+	.4byte GPIOPortDirection
diff --git a/data/link_strings.s b/data/link_strings.s
index e137b671d..bb4a41464 100644
--- a/data/link_strings.s
+++ b/data/link_strings.s
@@ -5,10 +5,17 @@
 
 	.align 2
 
+gUnknown_862B810:: @ 862B810
 	.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
-    .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
+
+gUnknown_862B832:: @ 862B832
+	.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
+
+gUnknown_862B84B:: @ 862B84B
     .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
-    .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+
+gUnknown_862B86C:: @ 862B86C
+	.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
 
 gUnknown_0862B88D:: @ 862B88D
     .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$"
diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s
index 0baca9782..d7832b761 100644
--- a/data/mauville_old_man.s
+++ b/data/mauville_old_man.s
@@ -8,24 +8,24 @@ gUnknown_0859EFE4:: @ 859EFE4
 	.2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D
 
 gUnknown_0859EFF0:: @ 859EFF0
-	.4byte 0x8294295
-	.4byte 0x82942a1
-	.4byte 0x82942ae
-	.4byte 0x82942bb
-	.4byte 0x82942c6
-	.4byte 0x82942d5
-	.4byte 0x82942e3
-	.4byte 0x82942f0
+	.4byte gText_SoPretty
+	.4byte gText_SoDarling
+	.4byte gText_SoRelaxed
+	.4byte gText_SoSunny
+	.4byte gText_SoDesirable
+	.4byte gText_SoExciting
+	.4byte gText_SoAmusing
+	.4byte gText_SoMagical
 
 gUnknown_0859F010:: @ 859F010
-	.4byte 0x8294313
-	.4byte 0x8294359
-	.4byte 0x8294398
-	.4byte 0x82943da
-	.4byte 0x829441c
-	.4byte 0x8294460
-	.4byte 0x82944a0
-	.4byte 0x82944d5
+	.4byte gUnknown_08294313
+	.4byte gUnknown_08294359
+	.4byte gUnknown_08294398
+	.4byte gUnknown_082943DA
+	.4byte gUnknown_0829441C
+	.4byte gUnknown_08294460
+	.4byte gUnknown_082944A0
+	.4byte gUnknown_082944D5
 
 gUnknown_0859F030:: @ 859F030
 	.incbin "baserom.gba", 0x59f030, 0x18
diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s
index 2e3664a70..e5525477d 100644
--- a/data/mystery_event_msg.s
+++ b/data/mystery_event_msg.s
@@ -33,7 +33,9 @@ gText_MysteryGiftNewTrainer:: @ 8674C31
 
 gText_MysteryGiftCantBeUsed:: @ 8674C86
 	.string "This data can’t be used in\nthis version.$"
-	.incbin "baserom.gba", 0x00674caf, 0x2e	//no pointer to this one
+	
+gUnknown_08674CAF:: @ 8674CAF
+	.incbin "baserom.gba", 0x00674caf, 0x2e
 
 gText_MysteryGiftStampCard::
 	.string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$"
diff --git a/data/strings.s b/data/strings.s
index 739c6b7ac..ec8acf5fa 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -1,4 +1,3 @@
-
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"