Merge branch 'yenatch-static-addresses'

data/graphics.s

@@ -895,7 +895,10 @@ gUnknown_08D1212C::
 gUnknown_08D1214C::
 	.incbin "baserom.gba", 0xd1214c, 0x20
 gUnknown_08D1216C:: @ 8D1216C
-	.incbin "baserom.gba", 0x00d1216c, 0xec0
+	.incbin "baserom.gba", 0xd1216c, 0x840
+
+Tiles_D129AC:: @ 8D129AC
+	.incbin "baserom.gba", 0xd129ac, 0x680
 
 	.align 2
 gBattleAnimSpriteSheet_116:: @ 8D1302C
@@ -3081,10 +3084,22 @@ gBattleAnimSpriteSheet_271:: @ 8E7EB3C
 	.incbin "graphics/battle_anims/sprites/271.4bpp.lz"
 
 gUnknown_08E7EB9C:: @ 8E7EB9C
-	.incbin "baserom.gba", 0x00e7eb9c, 0xa0
+	.incbin "baserom.gba", 0xe7eb9c, 0x80
+
+Palette_08E7EC1C:: @ 8E7EC1C
+	.incbin "baserom.gba", 0xe7ec1c, 0x20
 
 gUnknown_08E7EC3C:: @ 8E7EC3C
-	.incbin "baserom.gba", 0x00e7ec3c, 0x1d30
+	.incbin "baserom.gba", 0xe7ec3c, 0x19d8
+
+gUnknown_08E80614:: @ 8E80614
+	.incbin "baserom.gba", 0xe80614, 0x300
+
+gUnknown_08E80914:: @ 8E80914
+	.incbin "baserom.gba", 0xe80914, 0x30
+
+gUnknown_08E80944:: @ 8E80944
+	.incbin "baserom.gba", 0xe80944, 0x28
 
 gUnknown_08E8096C:: @ 8E8096C
 	.incbin "baserom.gba", 0x00e8096c, 0x72c
@@ -3362,7 +3377,10 @@ gUnknown_08E88A28:: @ 8E88A28
 	.incbin "baserom.gba", 0x00e88a28, 0x20
 
 gUnknown_08E88A48:: @ 8E88A48
-	.incbin "baserom.gba", 0x00e88a48, 0x40
+	.incbin "baserom.gba", 0xe88a48, 0x20
+
+Palette_E88A68:: @ 8E88A68
+	.incbin "baserom.gba", 0xe88a68, 0x20
 
 gUnknown_08E88A88:: @ 8E88A88
 	.incbin "baserom.gba", 0x00e88a88, 0x2c4
@@ -3398,15 +3416,25 @@ gUnknown_08E8A1C2:: @ 8E8A1C2
 	.incbin "baserom.gba", 0x00e8a1c2, 0x1e
 
 gUnknown_08E8A1E0:: @ 8E8A1E0
-	.incbin "baserom.gba", 0x00e8a1e0, 0x3b8
+	.incbin "baserom.gba", 0xe8a1e0, 0x2b8
+
+gTiles_08E8A498:: @ 8E8A498
+	.incbin "baserom.gba", 0xe8a498, 0x100
+
+PokenavContestPokeballPalette:: @ 8E8A598
 	.incbin "graphics/pokenav/contest_pokeball.gbapal"
-	.incbin "baserom.gba", 0x00E8A5B8, 0x20
+
+Palette_E8A5B8:: @ 8E8A5B8
+	.incbin "baserom.gba", 0xe8a5b8, 0x20
 
 gUnknown_08E8A5D8:: @ 8E8A5D8
 	.incbin "baserom.gba", 0x00e8a5d8, 0x1ec
 
 gUnknown_08E8A7C4:: @ 8E8A7C4
-	.incbin "baserom.gba", 0x00e8a7c4, 0x540
+	.incbin "baserom.gba", 0xe8a7c4, 0x520
+
+Palette_E8ACE4:: @ 8E8ACE4
+	.incbin "baserom.gba", 0xe8ace4, 0x20
 
 gUnknown_08E8AD04:: @ 8E8AD04
 	.incbin "baserom.gba", 0x00e8ad04, 0x4c0
@@ -3680,8 +3708,41 @@ gSlotMachineSpritePalette5:: @ 8E97768
 gSlotMachineSpritePalette6:: @ 8E97788
 	.incbin "graphics/slot_machine/spr6.gbapal"
 
-	.incbin "graphics/slot_machine/reel_symbols.4bpp"
-	.incbin "graphics/slot_machine/numbers.4bpp"
+gSlotMachineReelSymbol1Tiles::
+	.incbin "graphics/slot_machine/reel_symbols/1.4bpp"
+gSlotMachineReelSymbol2Tiles::
+	.incbin "graphics/slot_machine/reel_symbols/2.4bpp"
+gSlotMachineReelSymbol3Tiles::
+	.incbin "graphics/slot_machine/reel_symbols/3.4bpp"
+gSlotMachineReelSymbol4Tiles::
+	.incbin "graphics/slot_machine/reel_symbols/4.4bpp"
+gSlotMachineReelSymbol5Tiles::
+	.incbin "graphics/slot_machine/reel_symbols/5.4bpp"
+gSlotMachineReelSymbol6Tiles::
+	.incbin "graphics/slot_machine/reel_symbols/6.4bpp"
+gSlotMachineReelSymbol7Tiles::
+	.incbin "graphics/slot_machine/reel_symbols/7.4bpp"
+
+gSlotMachineNumber0Tiles::
+	.incbin "graphics/slot_machine/numbers/0.4bpp"
+gSlotMachineNumber1Tiles::
+	.incbin "graphics/slot_machine/numbers/1.4bpp"
+gSlotMachineNumber2Tiles::
+	.incbin "graphics/slot_machine/numbers/2.4bpp"
+gSlotMachineNumber3Tiles::
+	.incbin "graphics/slot_machine/numbers/3.4bpp"
+gSlotMachineNumber4Tiles::
+	.incbin "graphics/slot_machine/numbers/4.4bpp"
+gSlotMachineNumber5Tiles::
+	.incbin "graphics/slot_machine/numbers/5.4bpp"
+gSlotMachineNumber6Tiles::
+	.incbin "graphics/slot_machine/numbers/6.4bpp"
+gSlotMachineNumber7Tiles::
+	.incbin "graphics/slot_machine/numbers/7.4bpp"
+gSlotMachineNumber8Tiles::
+	.incbin "graphics/slot_machine/numbers/8.4bpp"
+gSlotMachineNumber9Tiles::
+	.incbin "graphics/slot_machine/numbers/9.4bpp"
 
 	.align 2
 gSpriteImage_8E98828:: @ 8E98828
@@ -3911,16 +3972,25 @@ gUnknown_08E9CA24:: @ 8E9CA24
 	.incbin "baserom.gba", 0x00e9ca24, 0x20
 
 gUnknown_08E9CA44:: @ 8E9CA44
-	.incbin "baserom.gba", 0x00e9ca44, 0xe68
+	.incbin "baserom.gba", 0xe9ca44, 0x500
 
+Tiles_E9CF44:: @ 8E9CF44
+	.incbin "baserom.gba", 0xe9cf44, 0x700
+
+Tiles_E9D644:: @ 8E9D644
+	.incbin "baserom.gba", 0xe9d644, 0x268
+
+gTitleScreenLogoShinePalette::
 	.incbin "graphics/title_screen/logo_shine.gbapal"
 
 gUnknown_08E9D8CC:: @ 8E9D8CC
 	.ifdef SAPPHIRE
 	.incbin "graphics/title_screen/pokemon_sapphire.8bpp.lz"
+gVersionTiles::
 	.incbin "graphics/title_screen/sapphireversion.8bpp.lz"
 	.else
 	.incbin "graphics/title_screen/pokemon_ruby.8bpp.lz"
+gVersionTiles::
 	.incbin "graphics/title_screen/rubyversion.8bpp.lz"
 	.endif
 
@@ -3933,10 +4003,15 @@ gUnknown_08E9F624:: @ 8E9F624
 
 gUnknown_08E9F7E4:: @ 8E9F7E4
 	.incbin "baserom.gba", 0x00e9f7e4, 0x184
+
+gPokenavContestArrowsPalette::
 	.incbin "graphics/pokenav/contest_arrows.gbapal"
 
 gUnknown_08E9F988:: @ 8E9F988
-	.incbin "baserom.gba", 0x00e9f988, 0x60
+	.incbin "baserom.gba", 0xe9f988, 0x20
+
+Tiles_E9F9A8:: @ 8E9F9A8
+	.incbin "baserom.gba", 0xe9f9a8, 0x40
 
 gUnknown_08E9F9E8:: @ 8E9F9E8
 	.incbin "baserom.gba", 0x00e9f9e8, 0x20

data/text/pokemon_news.s

@@ -1,4 +1,4 @@
-UnknownString_81AD135: @ 81AD135
+UnknownString_81AD135:: @ 81AD135
 	.string "Greetings!\n"
 	.string "It’s time for POKéMON NEWS.\p"
 	.string "SLATEPORT’s most popular kind of guy,\n"
@@ -13,7 +13,7 @@ UnknownString_81AD135: @ 81AD135
 	.string "would be well worth your while that day.\p"
 	.string "That’s the news on POKéMON NEWS.$"
 
-UnknownString_81AD2E0: @ 81AD2E0
+UnknownString_81AD2E0:: @ 81AD2E0
 	.string "Greetings!\n"
 	.string "It’s time for POKéMON NEWS.\p"
 	.string "This is the news you’ve all been\n"
@@ -27,7 +27,7 @@ UnknownString_81AD2E0: @ 81AD2E0
 	.string "to your heart’s content?\p"
 	.string "That’s the news on POKéMON NEWS.$"
 
-UnknownString_81AD434: @ 81AD434
+UnknownString_81AD434:: @ 81AD434
 	.string "Greetings!\n"
 	.string "It’s time for POKéMON NEWS.\p"
 	.string "This is the news you’ve all been\n"
@@ -42,7 +42,7 @@ UnknownString_81AD434: @ 81AD434
 	.string "a most enjoyable shopping trip?\p"
 	.string "That’s the news on POKéMON NEWS.$"
 
-UnknownString_81AD5B0: @ 81AD5B0
+UnknownString_81AD5B0:: @ 81AD5B0
 	.string "Greetings!\n"
 	.string "It’s time for POKéMON NEWS.\p"
 	.string "It’s approaching!\n"
@@ -53,7 +53,7 @@ UnknownString_81AD5B0: @ 81AD5B0
 	.string "may be lucky on this particular day!\p"
 	.string "That’s the news on POKéMON NEWS.$"
 
-UnknownString_81AD6AE: @ 81AD6AE
+UnknownString_81AD6AE:: @ 81AD6AE
 	.string "Greetings!\n"
 	.string "It’s time for POKéMON NEWS.\p"
 	.string "It’s here!\n"
@@ -66,7 +66,7 @@ UnknownString_81AD6AE: @ 81AD6AE
 	.string "This is the place!\p"
 	.string "That’s the news on POKéMON NEWS.$"
 
-UnknownString_81AD7A7: @ 81AD7A7
+UnknownString_81AD7A7:: @ 81AD7A7
 	.string "Greetings!\n"
 	.string "It’s time for POKéMON NEWS.\p"
 	.string "It’s here!\n"
@@ -79,7 +79,7 @@ UnknownString_81AD7A7: @ 81AD7A7
 	.string "The location is MAUVILLE CITY.\p"
 	.string "That’s the news on POKéMON NEWS.$"
 
-UnknownString_81AD8B4: @ 81AD8B4
+UnknownString_81AD8B4:: @ 81AD8B4
 	.string "Greetings!\n"
 	.string "It’s time for POKéMON NEWS.\p"
 	.string "We’ve just received wonderful news\n"
@@ -90,7 +90,7 @@ UnknownString_81AD8B4: @ 81AD8B4
 	.string "you’ve always wanted could be yours!\p"
 	.string "That’s the news on POKéMON NEWS.$"
 
-UnknownString_81AD9D3: @ 81AD9D3
+UnknownString_81AD9D3:: @ 81AD9D3
 	.string "Greetings!\n"
 	.string "It’s time for POKéMON NEWS.\p"
 	.string "This is the news you’ve all been\n"
@@ -103,7 +103,7 @@ UnknownString_81AD9D3: @ 81AD9D3
 	.string "with them all!\p"
 	.string "That’s the news on POKéMON NEWS.$"
 
-UnknownString_81ADB01: @ 81ADB01
+UnknownString_81ADB01:: @ 81ADB01
 	.string "Greetings!\n"
 	.string "It’s time for POKéMON NEWS.\p"
 	.string "This is the news you’ve all been\n"
@@ -116,27 +116,27 @@ UnknownString_81ADB01: @ 81ADB01
 	.string "with them all!\p"
 	.string "That’s the news on POKéMON NEWS.$"
 
-UnknownString_81ADC2F: @ 81ADC2F
+UnknownString_81ADC2F:: @ 81ADC2F
 	.string "This program has been brought to you\n"
 	.string "by the DEVON CORPORATION.$"
 
-UnknownString_81ADC6E: @ 81ADC6E
+UnknownString_81ADC6E:: @ 81ADC6E
 	.string "What’s important is love for POKéMON.\p"
 	.string "What you need is a little courage.\p"
 	.string "Let your cherished POKéMON take\n"
 	.string "center stage! POKéMON CONTESTS!$"
 
-UnknownString_81ADCF7: @ 81ADCF7
+UnknownString_81ADCF7:: @ 81ADCF7
 	.string "We raise your beloved POKéMON with\n"
 	.string "all of our love!\p"
 	.string "For all your POKéMON-training needs,\n"
 	.string "visit our DAY CARE on ROUTE 117.$"
 
-UnknownString_81ADD71: @ 81ADD71
+UnknownString_81ADD71:: @ 81ADD71
 	.string "The cauldron of good times and laughs!\n"
 	.string "LAVARIDGE SPA.$"
 
-UnknownString_81ADDA7: @ 81ADDA7
+UnknownString_81ADDA7:: @ 81ADDA7
 	.string "Overflowing with great merchandise\n"
 	.string "and excitement!\p"
 	.string "A great place to find that something\n"

data/text/storyteller.s

@@ -51,13 +51,13 @@ MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5
 	.string "in hearing my epic tales of legendary\l"
 	.string "TRAINERS.$"
 
-UnknownString_81AEFFC: @ 81AEFFC
+UnknownString_81AEFFC:: @ 81AEFFC
 	.string "The Save-Happy TRAINER$"
 
-UnknownString_81AF013: @ 81AF013
+UnknownString_81AF013:: @ 81AF013
 	.string "Saved the game$"
 
-UnknownString_81AF022: @ 81AF022
+UnknownString_81AF022:: @ 81AF022
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER saved the game\n"
@@ -65,13 +65,13 @@ UnknownString_81AF022: @ 81AF022
 	.string "A more cautious TRAINER than\n"
 	.string "{STR_VAR_3} one will never find!$"
 
-UnknownString_81AF0A3: @ 81AF0A3
+UnknownString_81AF0A3:: @ 81AF0A3
 	.string "The Trendsetter TRAINER$"
 
-UnknownString_81AF0BB: @ 81AF0BB
+UnknownString_81AF0BB:: @ 81AF0BB
 	.string "Started trends$"
 
-UnknownString_81AF0CA: @ 81AF0CA
+UnknownString_81AF0CA:: @ 81AF0CA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER started new trends\n"
@@ -79,13 +79,13 @@ UnknownString_81AF0CA: @ 81AF0CA
 	.string "{STR_VAR_3} is setting trends for all\n"
 	.string "the HOENN region!$"
 
-UnknownString_81AF149: @ 81AF149
+UnknownString_81AF149:: @ 81AF149
 	.string "The BERRY-Planting TRAINER$"
 
-UnknownString_81AF164: @ 81AF164
+UnknownString_81AF164:: @ 81AF164
 	.string "Planted BERRIES$"
 
-UnknownString_81AF174: @ 81AF174
+UnknownString_81AF174:: @ 81AF174
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER planted BERRIES\n"
@@ -93,13 +93,13 @@ UnknownString_81AF174: @ 81AF174
 	.string "{STR_VAR_3} is a legendary lover of\n"
 	.string "BERRIES!$"
 
-UnknownString_81AF1E5: @ 81AF1E5
+UnknownString_81AF1E5:: @ 81AF1E5
 	.string "The BIKE-Loving TRAINER$"
 
-UnknownString_81AF1FD: @ 81AF1FD
+UnknownString_81AF1FD:: @ 81AF1FD
 	.string "Traded BIKES$"
 
-UnknownString_81AF20A: @ 81AF20A
+UnknownString_81AF20A:: @ 81AF20A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER swapped BIKES\n"
@@ -107,13 +107,13 @@ UnknownString_81AF20A: @ 81AF20A
 	.string "{STR_VAR_3} must love BIKES deeply\n"
 	.string "and passionately!$"
 
-UnknownString_81AF281: @ 81AF281
+UnknownString_81AF281:: @ 81AF281
 	.string "The Interviewed TRAINER$"
 
-UnknownString_81AF299: @ 81AF299
+UnknownString_81AF299:: @ 81AF299
 	.string "Got interviewed$"
 
-UnknownString_81AF2A9: @ 81AF2A9
+UnknownString_81AF2A9:: @ 81AF2A9
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got interviewed\n"
@@ -121,26 +121,26 @@ UnknownString_81AF2A9: @ 81AF2A9
 	.string "{STR_VAR_3} must be a TRAINER who’s\n"
 	.string "attracting much attention!$"
 
-UnknownString_81AF32C: @ 81AF32C
+UnknownString_81AF32C:: @ 81AF32C
 	.string "The Battle-Happy TRAINER$"
 
-UnknownString_81AF345: @ 81AF345
+UnknownString_81AF345:: @ 81AF345
 	.string "Battled$"
 
-UnknownString_81AF34D: @ 81AF34D
+UnknownString_81AF34D:: @ 81AF34D
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER battled {STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must be a TRAINER who can\n"
 	.string "never refuse a chance to battle!$"
 
-UnknownString_81AF3D0: @ 81AF3D0
+UnknownString_81AF3D0:: @ 81AF3D0
 	.string "The POKéMON-Catching TRAINER$"
 
-UnknownString_81AF3ED: @ 81AF3ED
+UnknownString_81AF3ED:: @ 81AF3ED
 	.string "Caught POKéMON$"
 
-UnknownString_81AF3FC: @ 81AF3FC
+UnknownString_81AF3FC:: @ 81AF3FC
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -148,13 +148,13 @@ UnknownString_81AF3FC: @ 81AF3FC
 	.string "{STR_VAR_3} is a legendary catcher of\n"
 	.string "wild POKéMON!$"
 
-UnknownString_81AF46D: @ 81AF46D
+UnknownString_81AF46D:: @ 81AF46D
 	.string "The Fishing TRAINER$"
 
-UnknownString_81AF481: @ 81AF481
+UnknownString_81AF481:: @ 81AF481
 	.string "Caught POKéMON with a ROD$"
 
-UnknownString_81AF49B: @ 81AF49B
+UnknownString_81AF49B:: @ 81AF49B
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -162,13 +162,13 @@ UnknownString_81AF49B: @ 81AF49B
 	.string "{STR_VAR_3} is a legendary fishing\n"
 	.string "expert!$"
 
-UnknownString_81AF511: @ 81AF511
+UnknownString_81AF511:: @ 81AF511
 	.string "The EGG-Warming TRAINER$"
 
-UnknownString_81AF529: @ 81AF529
+UnknownString_81AF529:: @ 81AF529
 	.string "Hatched EGGS$"
 
-UnknownString_81AF536: @ 81AF536
+UnknownString_81AF536:: @ 81AF536
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER hatched {STR_VAR_1} POKéMON\n"
@@ -176,13 +176,13 @@ UnknownString_81AF536: @ 81AF536
 	.string "{STR_VAR_3} is a legendary warmer\n"
 	.string "of EGGS!$"
 
-UnknownString_81AF5A9: @ 81AF5A9
+UnknownString_81AF5A9:: @ 81AF5A9
 	.string "The Evolver TRAINER$"
 
-UnknownString_81AF5BD: @ 81AF5BD
+UnknownString_81AF5BD:: @ 81AF5BD
 	.string "Evolved POKéMON$"
 
-UnknownString_81AF5CD: @ 81AF5CD
+UnknownString_81AF5CD:: @ 81AF5CD
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {STR_VAR_1} POKéMON\n"
@@ -190,13 +190,13 @@ UnknownString_81AF5CD: @ 81AF5CD
 	.string "{STR_VAR_3} is the ultimate evolver\n"
 	.string "of POKéMON!$"
 
-UnknownString_81AF63F: @ 81AF63F
+UnknownString_81AF63F:: @ 81AF63F
 	.string "The POKéMON CENTER-Loving TRAINER$"
 
-UnknownString_81AF661: @ 81AF661
+UnknownString_81AF661:: @ 81AF661
 	.string "Used POKéMON CENTERS$"
 
-UnknownString_81AF676: @ 81AF676
+UnknownString_81AF676:: @ 81AF676
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -204,13 +204,13 @@ UnknownString_81AF676: @ 81AF676
 	.string "There could be no greater lover of\n"
 	.string "POKéMON CENTERS than {STR_VAR_3}!$"
 
-UnknownString_81AF711: @ 81AF711
+UnknownString_81AF711:: @ 81AF711
 	.string "The Homebody TRAINER$"
 
-UnknownString_81AF726: @ 81AF726
+UnknownString_81AF726:: @ 81AF726
 	.string "Rested POKéMON at home$"
 
-UnknownString_81AF73D: @ 81AF73D
+UnknownString_81AF73D:: @ 81AF73D
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -218,13 +218,13 @@ UnknownString_81AF73D: @ 81AF73D
 	.string "There could be no more of a homebody\n"
 	.string "than {STR_VAR_3}!$"
 
-UnknownString_81AF7BF: @ 81AF7BF
+UnknownString_81AF7BF:: @ 81AF7BF
 	.string "The SAFARI-Loving TRAINER$"
 
-UnknownString_81AF7D9: @ 81AF7D9
+UnknownString_81AF7D9:: @ 81AF7D9
 	.string "Entered the SAFARI ZONE$"
 
-UnknownString_81AF7F1: @ 81AF7F1
+UnknownString_81AF7F1:: @ 81AF7F1
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER went into the SAFARI ZONE\n"
@@ -232,13 +232,13 @@ UnknownString_81AF7F1: @ 81AF7F1
 	.string "{STR_VAR_3} is a TRAINER whose wild side\n"
 	.string "must come out in the SAFARI ZONE!$"
 
-UnknownString_81AF88A: @ 81AF88A
+UnknownString_81AF88A:: @ 81AF88A
 	.string "The CUT-Frenzy TRAINER$"
 
-UnknownString_81AF8A1: @ 81AF8A1
+UnknownString_81AF8A1:: @ 81AF8A1
 	.string "Used CUT$"
 
-UnknownString_81AF8AA: @ 81AF8AA
+UnknownString_81AF8AA:: @ 81AF8AA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used CUT\n"
@@ -246,13 +246,13 @@ UnknownString_81AF8AA: @ 81AF8AA
 	.string "{STR_VAR_3} is a TRAINER who just must\n"
 	.string "love to CUT!$"
 
-UnknownString_81AF91B: @ 81AF91B
+UnknownString_81AF91B:: @ 81AF91B
 	.string "The ROCK-SMASHING TRAINER$"
 
-UnknownString_81AF935: @ 81AF935
+UnknownString_81AF935:: @ 81AF935
 	.string "Smashed rocks$"
 
-UnknownString_81AF943: @ 81AF943
+UnknownString_81AF943:: @ 81AF943
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used ROCK SMASH\n"
@@ -260,13 +260,13 @@ UnknownString_81AF943: @ 81AF943
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "can’t leave a stone unsmashed!$"
 
-UnknownString_81AF9C8: @ 81AF9C8
+UnknownString_81AF9C8:: @ 81AF9C8
 	.string "The Move-Loving TRAINER$"
 
-UnknownString_81AF9E0: @ 81AF9E0
+UnknownString_81AF9E0:: @ 81AF9E0
 	.string "Moved the SECRET BASE$"
 
-UnknownString_81AF9F6: @ 81AF9F6
+UnknownString_81AF9F6:: @ 81AF9F6
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER moved the SECRET BASE\n"
@@ -274,13 +274,13 @@ UnknownString_81AF9F6: @ 81AF9F6
 	.string "{STR_VAR_3} is a TRAINER who loves\n"
 	.string "to move houses often!$"
 
-UnknownString_81AFA79: @ 81AFA79
+UnknownString_81AFA79:: @ 81AFA79
 	.string "The SPLASH-Happy TRAINER$"
 
-UnknownString_81AFA92: @ 81AFA92
+UnknownString_81AFA92:: @ 81AFA92
 	.string "Used SPLASH$"
 
-UnknownString_81AFA9E: @ 81AFA9E
+UnknownString_81AFA9E:: @ 81AFA9E
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used SPLASH\n"
@@ -288,13 +288,13 @@ UnknownString_81AFA9E: @ 81AFA9E
 	.string "{STR_VAR_3} is a TRAINER who must love\n"
 	.string "SPLASHING around!$"
 
-UnknownString_81AFB17: @ 81AFB17
+UnknownString_81AFB17:: @ 81AFB17
 	.string "The Tenacious TRAINER$"
 
-UnknownString_81AFB2D: @ 81AFB2D
+UnknownString_81AFB2D:: @ 81AFB2D
 	.string "Resorted to using STRUGGLE$"
 
-UnknownString_81AFB48: @ 81AFB48
+UnknownString_81AFB48:: @ 81AFB48
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER had to rely on STRUGGLE\n"
@@ -302,13 +302,13 @@ UnknownString_81AFB48: @ 81AFB48
 	.string "{STR_VAR_3} is a tenacious TRAINER\n"
 	.string "who never gives in to adversity!$"
 
-UnknownString_81AFBD8: @ 81AFBD8
+UnknownString_81AFBD8:: @ 81AFBD8
 	.string "The SLOT Champ$"
 
-UnknownString_81AFBE7: @ 81AFBE7
+UnknownString_81AFBE7:: @ 81AFBE7
 	.string "Won the jackpot on the SLOTS$"
 
-UnknownString_81AFC04: @ 81AFC04
+UnknownString_81AFC04:: @ 81AFC04
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won the jackpot on\n"
@@ -316,13 +316,13 @@ UnknownString_81AFC04: @ 81AFC04
 	.string "{STR_VAR_3} is a TRAINER who was lucky\n"
 	.string "on the SLOTS!$"
 
-UnknownString_81AFC8A: @ 81AFC8A
+UnknownString_81AFC8A:: @ 81AFC8A
 	.string "The ROULETTE Champ$"
 
-UnknownString_81AFC9D: @ 81AFC9D
+UnknownString_81AFC9D:: @ 81AFC9D
 	.string "Had consecutive ROULETTE wins of$"
 
-UnknownString_81AFCBE: @ 81AFCBE
+UnknownString_81AFCBE:: @ 81AFCBE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won in ROULETTE\n"
@@ -330,13 +330,13 @@ UnknownString_81AFCBE: @ 81AFCBE
 	.string "{STR_VAR_3} was lucky when the ball\n"
 	.string "bounced in ROULETTE!$"
 
-UnknownString_81AFD44: @ 81AFD44
+UnknownString_81AFD44:: @ 81AFD44
 	.string "The BATTLE TOWER Challenger$"
 
-UnknownString_81AFD60: @ 81AFD60
+UnknownString_81AFD60:: @ 81AFD60
 	.string "Took the BATTLE TOWER challenge$"
 
-UnknownString_81AFD80: @ 81AFD80
+UnknownString_81AFD80:: @ 81AFD80
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER took the BATTLE TOWER\n"
@@ -344,13 +344,13 @@ UnknownString_81AFD80: @ 81AFD80
 	.string "{STR_VAR_3} is a TRAINER who aspires\n"
 	.string "for excellence in the BATTLE TOWER!$"
 
-UnknownString_81AFE1D: @ 81AFE1D
+UnknownString_81AFE1D:: @ 81AFE1D
 	.string "The Blend-Loving TRAINER$"
 
-UnknownString_81AFE36: @ 81AFE36
+UnknownString_81AFE36:: @ 81AFE36
 	.string "Made {POKEBLOCK}S$"
 
-UnknownString_81AFE42: @ 81AFE42
+UnknownString_81AFE42:: @ 81AFE42
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {POKEBLOCK}S\n"
@@ -358,13 +358,13 @@ UnknownString_81AFE42: @ 81AFE42
 	.string "There is none better at using a BERRY\n"
 	.string "BLENDER than {STR_VAR_3}!$"
 
-UnknownString_81AFEC2: @ 81AFEC2
+UnknownString_81AFEC2:: @ 81AFEC2
 	.string "The CONTEST-Loving TRAINER$"
 
-UnknownString_81AFEDD: @ 81AFEDD
+UnknownString_81AFEDD:: @ 81AFEDD
 	.string "Entered CONTESTS$"
 
-UnknownString_81AFEEE: @ 81AFEEE
+UnknownString_81AFEEE:: @ 81AFEEE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER entered CONTESTS\n"
@@ -372,13 +372,13 @@ UnknownString_81AFEEE: @ 81AFEEE
 	.string "{STR_VAR_3} must love showing off\n"
 	.string "POKéMON to others!$"
 
-UnknownString_81AFF68: @ 81AFF68
+UnknownString_81AFF68:: @ 81AFF68
 	.string "The CONTEST Master$"
 
-UnknownString_81AFF7B: @ 81AFF7B
+UnknownString_81AFF7B:: @ 81AFF7B
 	.string "Won CONTESTS$"
 
-UnknownString_81AFF88: @ 81AFF88
+UnknownString_81AFF88:: @ 81AFF88
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won CONTESTS\n"
@@ -386,13 +386,13 @@ UnknownString_81AFF88: @ 81AFF88
 	.string "{STR_VAR_3} must be an incredible\n"
 	.string "CONTEST master!$"
 
-UnknownString_81AFFFB: @ 81AFFFB
+UnknownString_81AFFFB:: @ 81AFFFB
 	.string "The Happy Shopper$"
 
-UnknownString_81B000D: @ 81B000D
+UnknownString_81B000D:: @ 81B000D
 	.string "Shopped$"
 
-UnknownString_81B0015: @ 81B0015
+UnknownString_81B0015:: @ 81B0015
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bought items in shops\n"
@@ -400,13 +400,13 @@ UnknownString_81B0015: @ 81B0015
 	.string "{STR_VAR_3} must be one of those\n"
 	.string "people who are born to shop.$"
 
-UnknownString_81B009D: @ 81B009D
+UnknownString_81B009D:: @ 81B009D
 	.string "The Item-Finding TRAINER$"
 
-UnknownString_81B00B6: @ 81B00B6
+UnknownString_81B00B6:: @ 81B00B6
 	.string "Used an ITEMFINDER$"
 
-UnknownString_81B00C9: @ 81B00C9
+UnknownString_81B00C9:: @ 81B00C9
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used an ITEMFINDER\n"
@@ -414,13 +414,13 @@ UnknownString_81B00C9: @ 81B00C9
 	.string "{STR_VAR_3} must enjoy scouring the\n"
 	.string "ground for hidden items!$"
 
-UnknownString_81B014D: @ 81B014D
+UnknownString_81B014D:: @ 81B014D
 	.string "The Rain-Soaked TRAINER$"
 
-UnknownString_81B0165: @ 81B0165
+UnknownString_81B0165:: @ 81B0165
 	.string "Got rained on$"
 
-UnknownString_81B0173: @ 81B0173
+UnknownString_81B0173:: @ 81B0173
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got soaked by rain\n"
@@ -428,13 +428,13 @@ UnknownString_81B0173: @ 81B0173
 	.string "{STR_VAR_3}’s charisma must even\n"
 	.string "attract rain!$"
 
-UnknownString_81B01E9: @ 81B01E9
+UnknownString_81B01E9:: @ 81B01E9
 	.string "The Avid POKéDEX Reader$"
 
-UnknownString_81B0201: @ 81B0201
+UnknownString_81B0201:: @ 81B0201
 	.string "Checked a POKéDEX$"
 
-UnknownString_81B0213: @ 81B0213
+UnknownString_81B0213:: @ 81B0213
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked a POKéDEX\n"
@@ -442,13 +442,13 @@ UnknownString_81B0213: @ 81B0213
 	.string "{STR_VAR_3} must love inspecting\n"
 	.string "POKéMON in a POKéDEX!$"
 
-UnknownString_81B0290: @ 81B0290
+UnknownString_81B0290:: @ 81B0290
 	.string "The RIBBON Collector$"
 
-UnknownString_81B02A5: @ 81B02A5
+UnknownString_81B02A5:: @ 81B02A5
 	.string "Received RIBBONS$"
 
-UnknownString_81B02B6: @ 81B02B6
+UnknownString_81B02B6:: @ 81B02B6
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER received RIBBONS\n"
@@ -456,13 +456,13 @@ UnknownString_81B02B6: @ 81B02B6
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "loves to collect RIBBONS!$"
 
-UnknownString_81B0337: @ 81B0337
+UnknownString_81B0337:: @ 81B0337
 	.string "The Ledge-Jumping TRAINER$"
 
-UnknownString_81B0351: @ 81B0351
+UnknownString_81B0351:: @ 81B0351
 	.string "Jumped down ledges$"
 
-UnknownString_81B0364: @ 81B0364
+UnknownString_81B0364:: @ 81B0364
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER jumped down ledges\n"
@@ -470,26 +470,26 @@ UnknownString_81B0364: @ 81B0364
 	.string "If there’s a ledge to be jumped,\n"
 	.string "{STR_VAR_3} can’t ignore it!$"
 
-UnknownString_81B03E9: @ 81B03E9
+UnknownString_81B03E9:: @ 81B03E9
 	.string "The Legendary TV Viewer$"
 
-UnknownString_81B0401: @ 81B0401
+UnknownString_81B0401:: @ 81B0401
 	.string "Watched TV$"
 
-UnknownString_81B040C: @ 81B040C
+UnknownString_81B040C:: @ 81B040C
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER watched TV\n"
 	.string "{STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must love watching TV!$"
 
-UnknownString_81B046E: @ 81B046E
+UnknownString_81B046E:: @ 81B046E
 	.string "The Time-Conscious TRAINER$"
 
-UnknownString_81B0489: @ 81B0489
+UnknownString_81B0489:: @ 81B0489
 	.string "Checked the time$"
 
-UnknownString_81B049A: @ 81B049A
+UnknownString_81B049A:: @ 81B049A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked the time\n"
@@ -497,13 +497,13 @@ UnknownString_81B049A: @ 81B049A
 	.string "{STR_VAR_3} must be a punctual TRAINER\n"
 	.string "who’s conscious of the time.$"
 
-UnknownString_81B0523: @ 81B0523
+UnknownString_81B0523:: @ 81B0523
 	.string "The POKéMON LOTTERY Wizard$"
 
-UnknownString_81B053E: @ 81B053E
+UnknownString_81B053E:: @ 81B053E
 	.string "Won POKéMON LOTTERIES$"
 
-UnknownString_81B0554: @ 81B0554
+UnknownString_81B0554:: @ 81B0554
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won POKéMON LOTTERIES\n"
@@ -511,13 +511,13 @@ UnknownString_81B0554: @ 81B0554
 	.string "{STR_VAR_3} must have many friends\n"
 	.string "to trade POKéMON with!$"
 
-UnknownString_81B05D8: @ 81B05D8
+UnknownString_81B05D8:: @ 81B05D8
 	.string "The DAY CARE-Using Trainer$"
 
-UnknownString_81B05F3: @ 81B05F3
+UnknownString_81B05F3:: @ 81B05F3
 	.string "Left POKéMON at the DAY CARE$"
 
-UnknownString_81B0610: @ 81B0610
+UnknownString_81B0610:: @ 81B0610
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER left POKéMON with the\n"
@@ -525,13 +525,13 @@ UnknownString_81B0610: @ 81B0610
 	.string "{STR_VAR_3} must be a real go-getter\n"
 	.string "who raises POKéMON aggressively!$"
 
-UnknownString_81B06A9: @ 81B06A9
+UnknownString_81B06A9:: @ 81B06A9
 	.string "The CABLE CAR-Loving TRAINER$"
 
-UnknownString_81B06C6: @ 81B06C6
+UnknownString_81B06C6:: @ 81B06C6
 	.string "Rode the CABLE CAR$"
 
-UnknownString_81B06D9: @ 81B06D9
+UnknownString_81B06D9:: @ 81B06D9
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER rode the CABLE CAR\n"
@@ -539,13 +539,13 @@ UnknownString_81B06D9: @ 81B06D9
 	.string "{STR_VAR_3} must be a busy TRAINER\n"
 	.string "who’s up and down all the time!$"
 
-UnknownString_81B0763: @ 81B0763
+UnknownString_81B0763:: @ 81B0763
 	.string "The Hot Spring-Loving TRAINER$"
 
-UnknownString_81B0781: @ 81B0781
+UnknownString_81B0781:: @ 81B0781
 	.string "Bathed in hot springs$"
 
-UnknownString_81B0797: @ 81B0797
+UnknownString_81B0797:: @ 81B0797
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bathed in hot springs\n"