diff --git a/asm/pokenav.s b/asm/pokenav.s
index b52715cb42..32d053222f 100755
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -6948,7 +6948,7 @@ sub_81CA818: @ 81CA818
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r5, =gUnknown_0861FC7A
+	ldr r5, =gUnknown_0861FC78 + 2
 	adds r0, r4, 0
 	movs r1, 0x1
 	adds r2, r5, 0
@@ -6967,7 +6967,7 @@ sub_81CA818: @ 81CA818
 	thumb_func_start sub_81CA850
 sub_81CA850: @ 81CA850
 	push {lr}
-	ldr r0, =gUnknown_0861FC86
+	ldr r0, =gUnknown_0861FC78 + 0xE
 	movs r1, 0x31
 	movs r2, 0x4
 	bl sub_81C7944
@@ -6985,7 +6985,7 @@ sub_81CA864: @ 81CA864
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r5, =gUnknown_0861FC86
+	ldr r5, =gUnknown_0861FC78 + 0xE
 	adds r0, r4, 0
 	movs r1, 0x1
 	adds r2, r5, 0
@@ -26754,7 +26754,7 @@ _081D4368:
 	b _081D449E
 _081D4394:
 	movs r3, 0
-	ldr r1, =gUnknown_0862608E
+	ldr r1, =gUnknown_0862608C + 2
 	adds r0, r7, r1
 	movs r2, 0x16
 	ldrsh r1, [r4, r2]
@@ -26887,7 +26887,7 @@ _081D449E:
 	mov r3, r10
 	adds r4, r0, r3
 	ldr r6, =gUnknown_0862608C
-	ldr r1, =gUnknown_0862608E
+	ldr r1, =gUnknown_0862608C + 2
 	adds r0, r7, r1
 	movs r3, 0x16
 	ldrsh r1, [r4, r3]
diff --git a/data/event_scripts.s b/data/event_scripts.s
index d0f286848b..839235589e 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -8912,6 +8912,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "You’re an inspiration!\n"
 	.string "See you again!$"
 
+gText_Mom_Pokenav_2B227B:: @ 82B227B
 	.string "MOM: Your father and you…\n"
 	.string "Everyone is captivated by POKéMON.\p"
 	.string "What is the charm of POKéMON?\p"
@@ -8919,6 +8920,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "I adore POKéMON that help me with\l"
 	.string "my everyday chores.$"
 
+gText_Mom_Pokenav_2B2310:: @ 82B2310
 	.string "MOM: Hi, {PLAYER}!\n"
 	.string "Your father keeps himself locked\l"
 	.string "away in the PETALBURG GYM.\p"
@@ -8928,11 +8930,13 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "I’m guessing that losing to you\n"
 	.string "was a big blow to his pride!$"
 
+gText_Mom_Pokenav_2B23F3:: @ 82B23F3
 	.string "MOM: {PLAYER}…\n"
 	.string "Don’t worry about me or the house.\p"
 	.string "Wear those RUNNING SHOES until\n"
 	.string "they fall apart, honey!$"
 
+gText_Roxanne_Pokenav_2B2456:: @ 82B2456
 	.string "ROXANNE: Oh, hello, {PLAYER}!\p"
 	.string "I’ve been hard at work retraining\n"
 	.string "since we met.\p"
@@ -8941,6 +8945,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "But when I do, please visit my GYM\n"
 	.string "for a rematch!$"
 
+gText_Roxanne_Pokenav_2B250E:: @ 82B250E
 	.string "ROXANNE: Is this {PLAYER}?\n"
 	.string "Congratulations!\l"
 	.string "I’ve been hearing about you!\p"
@@ -8949,15 +8954,18 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "But when I do, please visit my GYM\n"
 	.string "for a rematch!$"
 
+gText_Roxanne_Pokenav_2B25C1:: @ 82B25C1
 	.string "ROXANNE: {PLAYER}!\n"
 	.string "My GYM is ready!\p"
 	.string "Please visit RUSTBORO whenever\n"
 	.string "you can!$"
 
+gText_Roxanne_Pokenav_2B2607:: @ 82B2607
 	.string "ROXANNE: At the RUSTBORO GYM,\n"
 	.string "the fact that we battled, {PLAYER},\l"
 	.string "is a matter of pride.$"
 
+gText_Brawly_Pokenav_2B2659:: @ 82B2659
 	.string "BRAWLY: Hey, there, {PLAYER}{STRING 5}!\p"
 	.string "I learned a lot from the battle we\n"
 	.string "had together.\p"
@@ -8968,6 +8976,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "But if I can reopen the GYM,\n"
 	.string "I want you to challenge us again.$"
 
+gText_Brawly_Pokenav_2B275D:: @ 82B275D
 	.string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n"
 	.string "Congratulations!\p"
 	.string "Word about your exploits arrived\n"
@@ -8979,14 +8988,17 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "But if I can reopen the GYM,\n"
 	.string "I want you to challenge us again.$"
 
+gText_Brawly_Pokenav_2B286F:: @ 82B286F
 	.string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n"
 	.string "My GYM’s ready for action!\p"
 	.string "Come back to DEWFORD anytime\n"
 	.string "for another challenge!$"
 
+gText_Brawly_Pokenav_2B28D1:: @ 82B28D1
 	.string "BRAWLY: {PLAYER}{STRING 5}, I don’t think\n"
 	.string "I’ll ever get bored of battling you!$"
 
+gText_Wattson_Pokenav_2B2912:: @ 82B2912
 	.string "WATTSON: Oh, it’s you!\p"
 	.string "After you left, I’ve been redoing\n"
 	.string "my training from scratch.\p"
@@ -8995,6 +9007,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "You’ll have to wait till then!\n"
 	.string "Wahahahaha!$"
 
+gText_Wattson_Pokenav_2B29CA:: @ 82B29CA
 	.string "WATTSON: Wahahahaha!\p"
 	.string "You’ve really done it, haven’t you?\n"
 	.string "I’ve been getting word about you!\p"
@@ -9005,15 +9018,18 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "You’ll have to wait till then!\n"
 	.string "Wahahahaha!$"
 
+gText_Wattson_Pokenav_2B2AB6:: @ 82B2AB6
 	.string "WATTSON: Oh, it’s you!\n"
 	.string "My GYM’s ready!\p"
 	.string "Visit MAUVILLE anytime!\n"
 	.string "Wahahahaha!$"
 
+gText_Wattson_Pokenav_2B2B01:: @ 82B2B01
 	.string "WATTSON: Wahahaha!\p"
 	.string "A battle with you is always charged\n"
 	.string "with shocking power!$"
 
+gText_Flannery_Pokenav_2B2B4D:: @ 82B2B4D
 	.string "FLANNERY: {PLAYER}…\p"
 	.string "When we battled, I learned exactly\n"
 	.string "how immature I was.\p"
@@ -9023,6 +9039,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "When the time comes, {PLAYER},\n"
 	.string "please challenge us again.$"
 
+gText_Flannery_Pokenav_2B2C0E:: @ 82B2C0E
 	.string "FLANNERY: Hello, {PLAYER}?\n"
 	.string "Congratulations!\p"
 	.string "Word of your success has reached\n"
@@ -9033,37 +9050,44 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "appear beside my name in the\l"
 	.string "MATCH CALL list.$"
 
+gText_Flannery_Pokenav_2B2CF1:: @ 82B2CF1
 	.string "FLANNERY: Oh, {PLAYER}?\n"
 	.string "Our GYM’s ready!\p"
 	.string "Come to LAVARIDGE for a soak\n"
 	.string "in the hot spring and a challenge!$"
 
+gText_Flannery_Pokenav_2B2D54:: @ 82B2D54
 	.string "FLANNERY: {PLAYER}…\n"
 	.string "I’m positive that you keep getting\l"
 	.string "better at training every time.$"
 
+gText_Winona_Pokenav_2B2DA4:: @ 82B2DA4
 	.string "WINONA: Hello, {PLAYER}!\p"
 	.string "Thanks to our battle, I’ve come\n"
 	.string "to understand my weak points!\p"
 	.string "When I reopen the GYM, I won’t go\n"
 	.string "down in defeat again!$"
 
+gText_Winona_Pokenav_2B2E2B:: @ 82B2E2B
 	.string "WINONA: You’ve done it, {PLAYER}!\p"
 	.string "News about the new CHAMPION\n"
 	.string "has reached us in FORTREE!\p"
 	.string "But… The next time we battle,\n"
 	.string "it’s not going to end the same way.$"
 
+gText_Winona_Pokenav_2B2EC2:: @ 82B2EC2
 	.string "WINONA: Is this {PLAYER}?\n"
 	.string "Our GYM is back in operation!\p"
 	.string "We’re waiting for you in FORTREE!$"
 
+gText_Winona_Pokenav_2B2F16:: @ 82B2F16
 	.string "WINONA: {PLAYER}…\n"
 	.string "Though I have lost, my wings will\l"
 	.string "never break.\p"
 	.string "Yes, in exactly the same way that\n"
 	.string "you never lost sight of your dream.$"
 
+gText_TateLiza_Pokenav_2B2F97:: @ 82B2F97
 	.string "TATE: Oh! You’re…\n"
 	.string "LIZA: {PLAYER}!\p"
 	.string "TATE: We’re in training again…\n"
@@ -9073,6 +9097,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "TATE: A mark’ll appear by our name…\n"
 	.string "LIZA: On the MATCH CALL list.$"
 
+gText_TateLiza_Pokenav_2B306E:: @ 82B306E
 	.string "TATE: {PLAYER}, congratulations!\n"
 	.string "LIZA: {PLAYER}, congratulations!\p"
 	.string "TATE: The two of us are…\n"
@@ -9082,6 +9107,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "TATE: A mark’ll appear by our name…\n"
 	.string "LIZA: On the MATCH CALL list.$"
 
+gText_TateLiza_Pokenav_2B3158:: @ 82B3158
 	.string "TATE: {PLAYER}!\n"
 	.string "LIZA: {PLAYER}!\p"
 	.string "TATE: Our GYM is ready!\n"
@@ -9089,11 +9115,13 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "TATE: Please come visit…\n"
 	.string "LIZA: MOSSDEEP anytime!$"
 
+gText_TateLiza_Pokenav_2B31CD:: @ 82B31CD
 	.string "TATE: {PLAYER}, the battle we had…\n"
 	.string "LIZA: Is an invaluable experience.\p"
 	.string "TATE: It would be nice if…\n"
 	.string "LIZA: We could all battle again!$"
 
+gText_Juan_Pokenav_2B3249:: @ 82B3249
 	.string "JUAN: Hmm…\n"
 	.string "{PLAYER}{STRING 5}… Was it?\p"
 	.string "Our battle together--it brought\n"
@@ -9102,6 +9130,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "Perhaps you are a genius who may\n"
 	.string "yet surpass WALLACE!$"
 
+gText_Juan_Pokenav_2B32EC:: @ 82B32EC
 	.string "JUAN: Fufu… {PLAYER}{STRING 5}…\n"
 	.string "You’ve finally achieved your goal.\p"
 	.string "My eye for appraising talent wasn’t\n"
@@ -9110,12 +9139,14 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "you, for you have scaled the peak\l"
 	.string "of power and prestige.$"
 
+gText_Juan_Pokenav_2B33AA:: @ 82B33AA
 	.string "JUAN: Hoho… {PLAYER}{STRING 5}…\p"
 	.string "Our SOOTOPOLIS GYM has finally\n"
 	.string "reopened.\p"
 	.string "If you wish to see me, you are\n"
 	.string "welcome to visit anytime.$"
 
+gText_Juan_Pokenav_2B341E:: @ 82B341E
 	.string "JUAN: {PLAYER}{STRING 5}…\p"
 	.string "Like the finest music, the battles\n"
 	.string "we wage together strike chords\l"
@@ -9123,6 +9154,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "When I close my eyes, I see visions\n"
 	.string "of you soaring with the melody…$"
 
+gText_Sidney_Pokenav_2B34CC:: @ 82B34CC
 	.string "SIDNEY: Yo, {PLAYER}!\p"
 	.string "If you want to battle with me\n"
 	.string "again, you come on back whenever\l"
@@ -9130,6 +9162,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "I’ll always be here!\n"
 	.string "I’ll be waiting!$"
 
+gText_Phoebe_Pokenav_2B3561:: @ 82B3561
 	.string "PHOEBE: Hi, {PLAYER}!\p"
 	.string "How about coming back here again\n"
 	.string "sometime?\p"
@@ -9137,6 +9170,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "your bond has grown with your\l"
 	.string "POKéMON.$"
 
+gText_Glacia_Pokenav_2B35E4:: @ 82B35E4
 	.string "GLACIA: Hello, {PLAYER}.\p"
 	.string "I trust you haven’t become\n"
 	.string "complacent with your power?\p"
@@ -9144,6 +9178,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "hot emotions just a little, do come\l"
 	.string "to the POKéMON LEAGUE…$"
 
+gText_Drake_Pokenav_2B368B:: @ 82B368B
 	.string "DRAKE: That voice… {PLAYER}, is it?\n"
 	.string "You sound well…\p"
 	.string "I understand that there is now\n"
@@ -9155,6 +9190,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
 	.string "the POKéMON LEAGUE!\p"
 	.string "Don’t you agree, {PLAYER}?$"
 
+gText_Wallace_Pokenav_2B3790:: @ 82B3790
 	.string "WALLACE: Hello, {PLAYER}{STRING 5}.\n"
 	.string "Have you met STEVEN?\p"
 	.string "He is…\n"
@@ -9197,12 +9233,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
+gText_May_Pokenav_2B3AB3:: @ 2B3AB3
 	.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
 	.string "MR. BRINEY retired as a SAILOR,\n"
 	.string "but I still see him out on the sea\l"
 	.string "with his pet PEEKO sometimes.\p"
 	.string "He must love the sea still.$"
 
+gText_May_Pokenav_2B3B3F:: @ 2B3B3F
 	.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
 	.string "You know how little towns like\n"
 	.string "PETALBURG and DEWFORD have GYMS?\p"
@@ -9211,6 +9249,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "When they finally build a GYM there,\n"
 	.string "I should apply to be the LEADER.$"
 
+gText_May_Pokenav_2B3C13:: @ 2B3C13
 	.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
 	.string "Do you remember a man named\n"
 	.string "the CUTTER in RUSTBORO?\l"
@@ -9222,11 +9261,13 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "… … … … … …\p"
 	.string "The ROCK SMASH GUY!$"
 
+gText_May_Pokenav_2B3CF3:: @ 2B3CF3
 	.string "MAY: {PLAYER}{STRING 5}?\p"
 	.string "RUSTURF TUNNEL…\n"
 	.string "They named it that because it\l"
 	.string "joins RUSTBORO and VERDANTURF.$"
 
+gText_May_Pokenav_2B3D4B:: @ 2B3D4B
 	.string "MAY: {PLAYER}{STRING 5}, how are you?\p"
 	.string "I’m out on ROUTE 111 now.\p"
 	.string "I’m going to get a rest at an old\n"
@@ -9234,6 +9275,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "She lives just north of\n"
 	.string "the desert.$"
 
+gText_May_Pokenav_2B3DD1:: @ 2B3DD1
 	.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
 	.string "Did you know about the MIRAGE\n"
 	.string "TOWER in the desert?\p"
@@ -9241,18 +9283,21 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "to mysteriously come and go.\p"
 	.string "I wish I could see it.$"
 
+gText_May_Pokenav_2B3E69:: @ 2B3E69
 	.string "MAY: {PLAYER}{STRING 5}, yahoo!\n"
 	.string "I’m on ROUTE 119 now.\p"
 	.string "There’s a big river here, and\n"
 	.string "it often rains.\p"
 	.string "I got soaked!$"
 
+gText_May_Pokenav_2B3ECD:: @ 2B3ECD
 	.string "MAY: {PLAYER}{STRING 5}, hi.\p"
 	.string "MT. PYRE is a memorial to POKéMON\n"
 	.string "whose lives have ended.\p"
 	.string "Maybe as a result, it’s infested\n"
 	.string "with many GHOST-type POKéMON!$"
 
+gText_May_Pokenav_2B3F2B:: @ 2B3F2B
 	.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
 	.string "I was thinking of going to the hot\n"
 	.string "spring in LAVARIDGE.\p"
@@ -9260,12 +9305,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "PASS, I ran into some bad-looking\l"
 	.string "characters. The mood was ugly!$"
 
+gText_May_Pokenav_2B3FFB:: @ 2B3FFB
 	.string "MAY: Hi, {PLAYER}{STRING 5}!\n"
 	.string "Did you see the news?\p"
 	.string "They say CAPT. STERN discovered\n"
 	.string "the SEAFLOOR CAVERN while on his\l"
 	.string "submarine expedition.$"
 
+gText_May_Pokenav_2B402B:: @ 2B402B
 	.string "MAY: Hi, {PLAYER}{STRING 5}!\n"
 	.string "Don’t you think it’s neat?\p"
 	.string "Even if you don’t have a boat,\n"
@@ -9275,6 +9322,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "There’s a POKéMON move that lets\n"
 	.string "you go to the bottom of the sea.$"
 
+gText_May_Pokenav_2B414B:: @ 2B414B
 	.string "MAY: Hi, {PLAYER}{STRING 5}!\n"
 	.string "Hope things are okay!\p"
 	.string "Have you been on the sea and\n"
@@ -9285,6 +9333,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "When you get to the other side,\n"
 	.string "come up to the surface. Easy!$"
 
+gText_May_Pokenav_2B4228:: @ 2B4228
 	.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
 	.string "How’s it going?\n"
 	.string "Are you filling your POKéDEX?\p"
@@ -9293,6 +9342,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "And there are three of them!\p"
 	.string "I would love to see even one…$"
 
+gText_May_Pokenav_2B42E0:: @ 2B42E0
 	.string "MAY: {PLAYER}{STRING 5}!\n"
 	.string "I heard the rumors!\p"
 	.string "You beat the SOOTOPOLIS GYM\n"
@@ -9300,6 +9350,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "That means you don’t have far\n"
 	.string "to go, do you?$"
 
+gText_May_Pokenav_2B4350:: @ 2B4350
 	.string "MAY: There isn’t a single TRAINER\n"
 	.string "left in HOENN who doesn’t know who\l"
 	.string "you are, {PLAYER}{STRING 5}!\p"
@@ -9307,6 +9358,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "with you, {PLAYER}{STRING 5}, they’re all\l"
 	.string "surprised!$"
 
+gText_Brendan_Pokenav_2B43EF:: @ 2B43EF
 	.string "BRENDAN: Hey, {PLAYER}!\p"
 	.string "MR. BRINEY retired as a SAILOR,\n"
 	.string "but I still see him out on the sea\l"
@@ -9314,6 +9366,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "I guess he must love\n"
 	.string "the sea still.$"
 
+gText_Brendan_Pokenav_2B4486:: @ 2B4486
 	.string "BRENDAN: Hey, {PLAYER}!\p"
 	.string "I don’t get how little towns like\n"
 	.string "PETALBURG and DEWFORD have GYMS.\p"
@@ -9322,6 +9375,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "When they finally build a GYM there,\n"
 	.string "I should apply to be the LEADER.$"
 
+gText_Brendan_Pokenav_2B4560:: @ 2B4560
 	.string "BRENDAN: Yo, {PLAYER}!\p"
 	.string "Do you remember a guy named\n"
 	.string "the CUTTER in RUSTBORO?\l"
@@ -9333,12 +9387,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "… … … … … …\p"
 	.string "The ROCK SMASH GUY!$"
 
+gText_Brendan_Pokenav_2B463F:: @ 2B463F
 	.string "BRENDAN: This voice… {PLAYER}?\p"
 	.string "They gave RUSTURF TUNNEL its name\n"
 	.string "because it joins RUSTBORO and\l"
 	.string "VERDANTURF.\p"
 	.string "Did you know that?$"
 
+gText_Brendan_Pokenav_2B46B7:: @ 2B46B7
 	.string "BRENDAN: {PLAYER}, what’s up?\p"
 	.string "Hey, I’m out on ROUTE 111 now.\p"
 	.string "I’m going to rest up at an old\n"
@@ -9346,6 +9402,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "If you’re in the area, you should\n"
 	.string "visit her, too.$"
 
+gText_Brendan_Pokenav_2B4761:: @ 2B4761
 	.string "BRENDAN: Hey, {PLAYER}!\p"
 	.string "Did you know about the MIRAGE\n"
 	.string "TOWER in the desert?\p"
@@ -9353,18 +9410,21 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "seen only sometimes.\p"
 	.string "I’d like to see that!$"
 
+gText_Brendan_Pokenav_2B47F4:: @ 2B47F4
 	.string "BRENDAN: Who’s this? Oh, {PLAYER}?\n"
 	.string "Guess what? I’m on ROUTE 119 now.\p"
 	.string "There’s a big river here, and\n"
 	.string "it rains all the time.\p"
 	.string "I got soaked to the bone!$"
 
+gText_Brendan_Pokenav_2B4882:: @ 2B4882
 	.string "BRENDAN: {PLAYER}!\p"
 	.string "MT. PYRE is a memorial to POKéMON\n"
 	.string "whose lives have ended.\p"
 	.string "That’s probably why it’s infested\n"
 	.string "with many GHOST-type POKéMON!$"
 
+gText_Brendan_Pokenav_2B4909:: @ 2B4909
 	.string "BRENDAN: Hey there, {PLAYER}.\p"
 	.string "I was on my way back to the hot\n"
 	.string "spring in LAVARIDGE.\p"
@@ -9373,12 +9433,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "Those creeps…\n"
 	.string "I think they were TEAM MAGMA.$"
 
+gText_Brendan_Pokenav_2B49C4:: @ 2B49C4
 	.string "BRENDAN: Hi, {PLAYER}!\n"
 	.string "Did you catch the news?\p"
 	.string "They say CAPT. STERN discovered\n"
 	.string "the SEAFLOOR CAVERN while on his\l"
 	.string "submarine expedition.$"
 
+gText_Brendan_Pokenav_2B4A44:: @ 2B4A44
 	.string "BRENDAN: Hey there, {PLAYER}!\n"
 	.string "Don’t you think it’s awesome?\p"
 	.string "Even if you don’t have a boat,\n"
@@ -9388,6 +9450,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "travel to the bottom of the sea.\p"
 	.string "Man, POKéMON can do anything!$"
 
+gText_Brendan_Pokenav_2B4B28:: @ 2B4B28
 	.string "BRENDAN: Howdy, {PLAYER}!\n"
 	.string "How are you holding up?\p"
 	.string "Ever found your way to the other\n"
@@ -9397,6 +9460,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "When you get to the other side,\n"
 	.string "come up to the surface. Simple!$"
 
+gText_Brendan_Pokenav_2B4C15:: @ 2B4C15
 	.string "BRENDAN: Hey there, {PLAYER}!\p"
 	.string "How’s it going? Filling up your\n"
 	.string "POKéDEX successfully?\p"
@@ -9405,12 +9469,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "And not just one--three!\p"
 	.string "I’d love to catch even one…$"
 
+gText_Brendan_Pokenav_2B4CD8:: @ 2B4CD8
 	.string "BRENDAN: {PLAYER}!\n"
 	.string "I heard the rumors!\p"
 	.string "You beat the SOOTOPOLIS GYM\n"
 	.string "LEADER? Awesome!\p"
 	.string "You’re getting awful close now!$"
 
+gText_Brendan_Pokenav_2B4D46:: @ 2B4D46
 	.string "BRENDAN: There isn’t a TRAINER in\n"
 	.string "all of HOENN who doesn’t know who\l"
 	.string "you are, {PLAYER}!\p"
@@ -9418,16 +9484,19 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "with you, {PLAYER}, they get pretty\l"
 	.string "envious!$"
 
+gText_Wally_Pokenav_2B4DE2:: @ 2B4DE2
 	.string "WALLY: Oh, {PLAYER}!\p"
 	.string "I’ve been getting healthier and\n"
 	.string "more physically fit.\p"
 	.string "I hope I can become a TRAINER like\n"
 	.string "you soon, {PLAYER}!$"
 
+gText_Wally_Pokenav_2B4E57:: @ 2B4E57
 	.string "WALLY: {PLAYER}, hello!\p"
 	.string "After RUSTURF TUNNEL went\n"
 	.string "through, WANDA’s been very happy!$"
 
+gText_Wally_Pokenav_2B4EA5:: @ 2B4EA5
 	.string "WALLY: Oh, {PLAYER}!\p"
 	.string "I… I left my uncle’s place in\n"
 	.string "VERDANTURF without telling anyone.\p"
@@ -9435,6 +9504,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "{PLAYER}, you understand how\n"
 	.string "I feel, don’t you?$"
 
+gText_Wally_Pokenav_2B4F41:: @ 2B4F41
 	.string "WALLY: {PLAYER}?\n"
 	.string "It’s me, WALLY!\p"
 	.string "The world of TRAINERS is amazing!\p"
@@ -9443,6 +9513,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "It’s as if everyone’s getting\n"
 	.string "connected through POKéMON!$"
 
+gText_Wally_Pokenav_2B4FF3:: @ 2B4FF3
 	.string "WALLY: {PLAYER}? It’s awesome!\n"
 	.string "That RALTS we caught together?\l"
 	.string "It evolved, {PLAYER}!\p"
@@ -9452,11 +9523,13 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "After all, it’s the POKéMON that\n"
 	.string "should be praised!$"
 
+gText_Wally_Pokenav_2B50B1:: @ 2B50B1
 	.string "… … … … … …\n"
 	.string "… … … … … …\p"
 	.string "WALLY appears to be out of\n"
 	.string "the POKéNAV’s service area…$"
 
+gText_Wally_Pokenav_2B5100:: @ 2B5100
 	.string "WALLY: Oh, {PLAYER}!\p"
 	.string "Before I met you, I hardly ever\n"
 	.string "left my house…\p"
@@ -9465,6 +9538,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "{PLAYER}…\n"
 	.string "Thank you…$"
 
+gText_Scott_Pokenav_2B5184:: @ 2B5184
 	.string "SCOTT: Howdy, {PLAYER}{STRING 5}!\p"
 	.string "You know how POKéMON can be found\n"
 	.string "everywhere?\p"
@@ -9475,6 +9549,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "As a result, I have to hurry\n"
 	.string "everywhere, too. Busy, busy!$"
 
+gText_Scott_Pokenav_2B5275:: @ 2B5275
 	.string "SCOTT: I’m on ROUTE 119 right now.\n"
 	.string "It’s teeming with TRAINERS!\p"
 	.string "It’s also overgrown with tall grass\n"
@@ -9482,6 +9557,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "Walking around in shorts here\n"
 	.string "makes me all ticklish!$"
 
+gText_Scott_Pokenav_2B5323:: @ 2B5323
 	.string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p"
 	.string "Have you had the chance to climb\n"
 	.string "MT. PYRE?\p"
@@ -9490,6 +9566,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "It’s somewhere every TRAINER\n"
 	.string "should climb to the top of once.$"
 
+gText_Scott_Pokenav_2B53DB:: @ 2B53DB
 	.string "SCOTT: Hi, {PLAYER}{STRING 5}!\p"
 	.string "I’ve been hearing about these odd\n"
 	.string "gangs being a nuisance.\p"
@@ -9499,6 +9576,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "skilled TRAINERS among them.\p"
 	.string "…But if they’re thugs…$"
 
+gText_Scott_Pokenav_2B54A5:: @ 2B54A5
 	.string "SCOTT: Oh, hi, {PLAYER}{STRING 5}.\p"
 	.string "Might there be tough TRAINERS\n"
 	.string "at the bottom of the sea?\p"
@@ -9506,6 +9584,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "I can’t swim, for one.\l"
 	.string "And I don’t raise POKéMON…$"
 
+gText_Scott_Pokenav_2B5541:: @ 2B5541
 	.string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p"
 	.string "You know that you can challenge\n"
 	.string "the POKéMON LEAGUE when you’ve\l"
@@ -9522,17 +9601,20 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "the POKéMON LEAGUE into the HALL\l"
 	.string "OF FAME!$"
 
+gText_Scott_Pokenav_2B56CA:: @ 2B56CA
 	.string "… … … … … …\n"
 	.string "… … … … … …\p"
 	.string "SCOTT appears to be out of\n"
 	.string "the POKéNAV’s service area…$"
 
+gText_Norman_Pokenav_2B5719:: @ 82B5719
 	.string "DAD: In RUSTBORO, there’s a man\n"
 	.string "that goes by the odd name of\l"
 	.string "the CUTTER.\p"
 	.string "If you’re in the area, you should\n"
 	.string "pay him a visit.$"
 
+gText_Norman_Pokenav_2B5795:: @ 82B5795
 	.string "DAD: Hm… Little by little, but also\n"
 	.string "very surely, you’re getting\l"
 	.string "tougher, {PLAYER}.\p"
@@ -9541,6 +9623,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "and me…\p"
 	.string "This feeling is hard to explain.$"
 
+gText_Norman_Pokenav_2B584D:: @ 82B584D
 	.string "DAD: I see…\n"
 	.string "You’ve collected four GYM BADGES…\p"
 	.string "There’s no avoiding it now.\n"
@@ -9548,6 +9631,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "Come anytime.\n"
 	.string "We’ll all be waiting for you!$"
 
+gText_Norman_Pokenav_2B58E3:: @ 82B58E3
 	.string "DAD: {PLAYER}! You’d better go visit\n"
 	.string "Mother every so often.\p"
 	.string "I’m going to remain here and\n"
@@ -9555,23 +9639,27 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "The way of battling is deep\n"
 	.string "and unforgiving!$"
 
+gText_Norman_Pokenav_2B5979:: @ 82B5979
 	.string "DAD: Oh, hi, {PLAYER}!\p"
 	.string "What’s that? MAGMA EMBLEM?\n"
 	.string "I don’t know what that’s about.\p"
 	.string "But with a name like that, it may\n"
 	.string "be somehow linked to a volcano!$"
 
+gText_Norman_Pokenav_2B5A07:: @ 82B5A07
 	.string "DAD: Hiyah! Haah! Dwah!\p"
 	.string "…Oh? {PLAYER}!\p"
 	.string "You caught me right in the middle\n"
 	.string "of a POKéMON training session!$"
 
+gText_Norman_Pokenav_2B5A69:: @ 82B5A69
 	.string "DAD: {PLAYER}!\p"
 	.string "Who would’ve thought you’d become\n"
 	.string "the POKéMON LEAGUE CHAMPION…\p"
 	.string "Okay!\n"
 	.string "I won’t be left behind!$"
 
+gText_Norman_Pokenav_2B5ACF:: @ 82B5ACF
 	.string "DAD: Hm? {PLAYER}?\n"
 	.string "What good timing!\p"
 	.string "This time, I’m going to challenge\n"
@@ -9579,9 +9667,11 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "I’m waiting in the PETALBURG GYM.\n"
 	.string "Accept my challenge anytime!$"
 
+gText_Norman_Pokenav_2B5B5E:: @ 82B5B5E
 	.string "DAD: …You amaze me, {PLAYER}.\n"
 	.string "How much higher will you soar?$"
 
+gText_Steven_Pokenav_2B5B95:: @ 82B5B95
 	.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
 	.string "Have you been to MAUVILLE\n"
 	.string "already?\p"
@@ -9592,12 +9682,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "You may make a new discovery\n"
 	.string "there.$"
 
+gText_Steven_Pokenav_2B5C53:: @ 82B5C53
 	.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
 	.string "I’ve met a lot of different\n"
 	.string "TRAINERS so far.\p"
 	.string "But you’re one of a kind.\n"
 	.string "You’re not like anyone else.$"
 
+gText_Steven_Pokenav_2B5CC9:: @ 82B5CC9
 	.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
 	.string "When you’re on an adventure with\n"
 	.string "your POKéMON, what do you think?\p"
@@ -9608,6 +9700,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "Depending on how you think, your\n"
 	.string "adventure’s significance changes.$"
 
+gText_Steven_Pokenav_2B5DB4:: @ 82B5DB4
 	.string "STEVEN: Hello?\n"
 	.string "{PLAYER}{STRING 5}?\p"
 	.string "I’m involved in a spot of trouble\n"
@@ -9615,6 +9708,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "I’m sorry, but I can’t talk now.\n"
 	.string "Bye!$"
 
+gText_Steven_Pokenav_2B5E26:: @ 82B5E26
 	.string "STEVEN: Oh!\n"
 	.string "{PLAYER}{STRING 5}!\p"
 	.string "There’s no need to talk.\n"
@@ -9622,10 +9716,12 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
 	.string "You have to believe in yourself\n"
 	.string "and do what’s right.$"
 
+gText_Steven_Pokenav_2B5EA2:: @ 82B5EA2
 	.string "… … … … … …\p"
 	.string "STEVEN appears not to be getting\n"
 	.string "the call…$"
 
+gText_Steven_Pokenav_2B5ED9:: @ 82B5ED9
 	.string "STEVEN: {PLAYER}{STRING 5}… Congratulations\n"
 	.string "for entering the HALL OF FAME.\p"
 	.string "… … … … … …\n"
@@ -9652,6 +9748,7 @@ Route101_Text_2B603A: @ 82B603A
 	.string "the POKéDEX and POKéNAV, studying\l"
 	.string "POKéMON becomes more fun, eh?$"
 
+gText_MrStone_Pokenav_2B60C0:: @ 82B60C0
 	.string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p"
 	.string "Since you called me, the POKéNAV\n"
 	.string "must be working properly!\p"
@@ -9666,6 +9763,7 @@ Route101_Text_2B603A: @ 82B603A
 	.string "Wahahaha!\n"
 	.string "See you again!$"
 
+gText_MrStone_Pokenav_2B61E6:: @ 82B61E6
 	.string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p"
 	.string "What’s wrong? Have you forgotten\n"
 	.string "about that little errand of mine?\p"
@@ -9677,6 +9775,7 @@ Route101_Text_2B603A: @ 82B603A
 	.string "Now, since I am a busy PRESIDENT,\n"
 	.string "I have to go! Bye-bye!$"
 
+gText_MrStone_Pokenav_2B6302:: @ 82B6302
 	.string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p"
 	.string "Ah, so you’ve met STEVEN!\n"
 	.string "I’d better reward you, then!\p"
@@ -9684,6 +9783,7 @@ Route101_Text_2B603A: @ 82B603A
 	.string "come see me at my office.\p"
 	.string "I’ll be waiting for you!$"
 
+gText_MrStone_Pokenav_2B63A0:: @ 82B63A0
 	.string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p"
 	.string "Did you know that DEVON was\n"
 	.string "digging the RUSTURF TUNNEL?\p"
@@ -9694,12 +9794,14 @@ Route101_Text_2B603A: @ 82B603A
 	.string "live in peace than worry about our\l"
 	.string "own convenience.$"
 
+gText_MrStone_Pokenav_2B64A2:: @ 82B64A2
 	.string "MR. STONE: Hello, hello, {PLAYER}{STRING 5}!\p"
 	.string "I heard from someone in PETALBURG\n"
 	.string "that you’re NORMAN’s child!\p"
 	.string "No wonder you’re such a capable\n"
 	.string "being!$"
 
+gText_MrStone_Pokenav_2B6526:: @ 82B6526
 	.string "MR. STONE: What’s that?\p"
 	.string "You battled your own father and\n"
 	.string "defeated him?\p"
@@ -9707,6 +9809,7 @@ Route101_Text_2B603A: @ 82B603A
 	.string "I had no idea that I befriended\n"
 	.string "someone so special! Wahaha!$"
 
+gText_MrStone_Pokenav_2B65BB:: @ 82B65BB
 	.string "Hello!\n"
 	.string "This is DEVON CORPORATI…\l"
 	.string "Oh, hello, {PLAYER}!\p"
@@ -9715,18 +9818,21 @@ Route101_Text_2B603A: @ 82B603A
 	.string "Our PRESIDENT is busy, but you\n"
 	.string "seem to be just as busy, {PLAYER}.$"
 
+gText_MrStone_Pokenav_2B6664:: @ 82B6664
 	.string "…Huh? …What’s that?\p"
 	.string "GROU… Yes? …DON?\p"
 	.string "You’re breaking up…\n"
 	.string "…can’t hear…\p"
 	.string "BZZZZ…$"
 
+gText_MrStone_Pokenav_2B66B1:: @ 82B66B1
 	.string "…Huh? …What’s that?\p"
 	.string "Seaflo… Yes? …Caver…?\p"
 	.string "You’re breaking up…\n"
 	.string "…can’t hear…\p"
 	.string "BZZZZ…$"
 
+gText_MrStone_Pokenav_2B6703:: @ 82B6703
 	.string "MR. STONE: {PLAYER}{STRING 5}! It’s me!\p"
 	.string "You were apparently involved in all\n"
 	.string "sorts of things, but I, being busy,\l"
@@ -9736,6 +9842,7 @@ Route101_Text_2B603A: @ 82B603A
 	.string "I’ll always be in your corner!\n"
 	.string "Take care!$"
 
+gText_MrStone_Pokenav_2B67ED:: @ 82B67ED
 	.string "MR. STONE: … … … … … …\n"
 	.string "Is this maybe {PLAYER}{STRING 5}?\p"
 	.string "Your voice is so full of confidence,\n"
diff --git a/data/pokenav.s b/data/pokenav.s
index 35fdafee5f..3a8be11a3e 100644
--- a/data/pokenav.s
+++ b/data/pokenav.s
@@ -111,16 +111,23 @@ gUnknown_0861F3EC:: @ 861F3EC
 	.4byte sub_81CFE98
 
 gUnknown_0861F590:: @ 861F590
-	.incbin "baserom.gba", 0x61F590, 0x20
+	.incbin "graphics/pokenav/icon2.gbapal"
 
 gUnknown_0861F5B0:: @ 861F5B0
-	.incbin "baserom.gba", 0x61f5b0, 0x454
+	.incbin "graphics/pokenav/icon2.4bpp.lz"
+
+gUnknown_0861F994:: @ 861F994
+	.incbin "graphics/pokenav/icon2_unused.4bpp.lz"
 
 gUnknown_0861FA04:: @ 861FA04
-	.incbin "baserom.gba", 0x61fa04, 0x4
+	.byte 0x50
+	.byte 0x0
+	.byte 0x0
+	.byte 0x0
 
 gUnknown_0861FA08:: @ 861FA08
-	.incbin "baserom.gba", 0x61fa08, 0x10
+	window_template 0, 1, 0x16, 0x10, 0x2, 0x0, 0x36
+	window_template_terminator
 
 gUnknown_0861FA18:: @ 861FA18
 	.4byte gUnknown_085EBED5
@@ -137,7 +144,10 @@ gUnknown_0861FA18:: @ 861FA18
 	.4byte gUnknown_085EBF84
 
 gUnknown_0861FA48:: @ 861FA48
-	.incbin "baserom.gba", 0x61fa48, 0x4
+	.byte 0x4
+	.byte 0x1
+	.byte 0x2
+	.byte 0x0
 
 gUnknown_0861FA4C:: @ 861FA4C
 	obj_tiles gUnknown_0861F5B0, 0x1000, 0
@@ -205,82 +215,205 @@ gUnknown_0861FB2C:: @ 861FB2C
 	spr_template 2, 1, gUnknown_0861FB1C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_0861FB44:: @ 861FB44
-	.incbin "baserom.gba", 0x61fb44, 0xa0
+	spr_template 2, 2, gUnknown_0861FB24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	
+gUnknown_0861FB5C:: @ 861FB5C
+	.incbin "graphics/pokenav/arrows_matchcall.gbapal"
+	
+gUnknown_0861FB7C:: @ 861FB7C
+	.incbin "graphics/pokenav/arrows_matchcall.4bpp.lz"
 
 gUnknown_0861FBE4:: @ 861FBE4
-	.incbin "baserom.gba", 0x61fbe4, 0x4
+	.byte 0x0
+	.byte 0x2
+	.byte 0x5
+	.byte 0x0
 
 gUnknown_0861FBE8:: @ 861FBE8
-	.incbin "baserom.gba", 0x61fbe8, 0xc
+	.4byte gUnknown_085EBEA8
+	.4byte gUnknown_085EBEB1
+	.4byte gUnknown_085EBEC3
 
 gUnknown_0861FBF4:: @ 861FBF4
-	.incbin "baserom.gba", 0x61fbf4, 0x3
+	.byte 0x1
+	.byte 0x4
+	.byte 0x5
 
 gUnknown_0861FBF7:: @ 861FBF7
-	.incbin "baserom.gba", 0x61fbf7, 0x5
+	.byte 0x2
+	.byte 0x4
+	.byte 0x6
+	.byte 0x7
+	.byte 0x0
 
 gUnknown_0861FBFC:: @ 861FBFC
-	.incbin "baserom.gba", 0x61fbfc, 0x8
+	.4byte gUnknown_0861FB7C
+	.2byte 0xC0
+	.2byte 0xA
 
 gUnknown_0861FC04:: @ 861FC04
-	.incbin "baserom.gba", 0x61fc04, 0x18
+	.4byte gUnknown_0861FB5C
+	.4byte 0x14
+	.4byte 0x0
+	.4byte 0x0
+	
+gUnknown_0861FC14:: @ 861FC14
+	.4byte 0x8000
+	.4byte 0x800
 
 gUnknown_0861FC1C:: @ 861FC1C
-	.incbin "baserom.gba", 0x61fc1c, 0x20
+	spr_template 10, 20, gUnknown_0861FC14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81C9080
+	
+gUnknown_0861FC34:: @ 861FC34
+	.4byte 0x4000
+	.4byte 0x800
 
 gUnknown_0861FC3C:: @ 861FC3C
-	.incbin "baserom.gba", 0x61fc3c, 0x18
+	spr_template 10, 20, gUnknown_0861FC34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_0861FC54:: @ 861FC54
-	.incbin "baserom.gba", 0x61fc54, 0x5
+	.byte 2
+	.byte 3
+	.byte 4
+	.byte 2
+	.byte 5
 
 gUnknown_0861FC59:: @ 861FC59
-	.incbin "baserom.gba", 0x61fc59, 0x1f
+	.byte 0, 1, 4, 4, 4, 4, 0, 1, 2, 4, 4, 4, 0, 1, 2, 3, 4, 4, 5, 6, 7, 4, 4, 4, 8, 9, 10, 11, 12, 13, 0
 
 gUnknown_0861FC78:: @ 861FC78
-	.incbin "baserom.gba", 0x61fc78, 0x2
-
-gUnknown_0861FC7A:: @ 861FC7A
-	.incbin "baserom.gba", 0x61fc7a, 0xc
-
-gUnknown_0861FC86:: @ 861FC86
-	.incbin "baserom.gba", 0x61fc86, 0x12
+	.incbin "graphics/pokenav/bg.gbapal"
 
 gUnknown_0861FC98:: @ 861FC98
-	.incbin "baserom.gba", 0x61fc98, 0x14
+	.incbin "graphics/pokenav/bg.4bpp.lz"
 
 gUnknown_0861FCAC:: @ 861FCAC
-	.incbin "baserom.gba", 0x61fcac, 0xa0
+	.incbin "graphics/pokenav/bg.bin.lz"
 
 gUnknown_0861FD4C:: @ 861FD4C
-	.incbin "baserom.gba", 0x61fd4c, 0x20
+	.incbin "graphics/pokenav/outline.gbapal"
 
 gUnknown_0861FD6C:: @ 861FD6C
-	.incbin "baserom.gba", 0x61fd6c, 0x288
+	.incbin "graphics/pokenav/outline.4bpp.lz"
 
 gUnknown_0861FFF4:: @ 861FFF4
-	.incbin "baserom.gba", 0x61fff4, 0x1a0
+	.incbin "graphics/pokenav/outline_map.bin.lz"
+
+gUnknown_08620104:: @ 8620104
+	.incbin "graphics/pokenav/blue_light.gbapal"
+	
+gUnknown_08620124:: @ 8620124
+	.incbin "graphics/pokenav/blue_light.4bpp.lz"
 
 gUnknown_08620194:: @ 8620194
-	.incbin "baserom.gba", 0x620194, 0xc
+	.byte 0xF5, 0x10, 0, 0, 0x7A, 0x21, 0, 0, 0xFF, 0x31, 0, 0
 
 gUnknown_086201A0:: @ 86201A0
-	.incbin "baserom.gba", 0x6201a0, 0x24
+	.4byte NULL
+	.4byte sub_81C9C6C
+	.4byte sub_81C9CA8
+	.4byte sub_81C9D44
+	.4byte sub_81C9DD8
+	.4byte sub_81C9E58
+	.4byte sub_81C9EC8
+	.4byte sub_81C9EF8
+	.4byte sub_81C9F28
 
 gUnknown_086201C4:: @ 86201C4
-	.incbin "baserom.gba", 0x6201c4, 0x10
+	.4byte gPokenavOptions_Gfx
+	.byte 0, 0x34, 3, 0
+	.4byte gUnknown_08620124
+	.byte 0, 1, 1, 0
 
 gUnknown_086201D4:: @ 86201D4
-	.incbin "baserom.gba", 0x6201d4, 0x6c
+	.4byte gPokenavOptions_Pal + 0x0, 4
+	.4byte gPokenavOptions_Pal + 0x20, 5
+	.4byte gPokenavOptions_Pal + 0x40, 6
+	.4byte gPokenavOptions_Pal + 0x60, 7
+	.4byte gPokenavOptions_Pal + 0x80, 8
+	.4byte gUnknown_08620104, 3
+	.4byte 0, 0
+	
+gUnknown_0862020C:: @ 862020C
+	.2byte 0, 0
+
+gUnknown_08620210:: @ 8620210
+	.2byte 0x20, 1
+	
+gUnknown_08620214:: @ 8620214
+	.2byte 0x40, 4
+	
+gUnknown_08620218:: @ 8620218
+	.2byte 0x60, 2
+
+gUnknown_0862021C:: @ 862021C
+	.2byte 0x80, 3
+	
+gUnknown_08620220:: @ 8620220
+	.2byte 0xA0, 1
+
+gUnknown_08620224:: @ 8620224
+	.2byte 0xC0, 1
+
+gUnknown_08620228:: @ 8620228
+	.2byte 0xE0, 4
+
+gUnknown_0862022C:: @ 862022C
+	.2byte 0x100, 1
+
+gUnknown_08620230:: @ 8620230
+	.2byte 0x120, 2
+
+gUnknown_08620234:: @ 8620234
+	.2byte 0x140, 0
+
+gUnknown_08620238:: @ 8620238
+	.2byte 0x160, 0
+
+gUnknown_0862023C:: @ 862023C
+	.2byte 0x180, 3
 
 gUnknown_08620240:: @ 8620240
-	.incbin "baserom.gba", 0x620240, 0x4
+	.2byte 0x2A, 0x14
 
 gUnknown_08620244:: @ 8620244
-	.incbin "baserom.gba", 0x620244, 0x88
+	.4byte gUnknown_0862020C
+	.4byte gUnknown_08620210
+	.4byte gUnknown_0862021C
+	.4byte NULL
+	.4byte NULL
+	.4byte NULL
+	.2byte 0x2A, 0x14
+	.4byte gUnknown_0862020C
+	.4byte gUnknown_08620210
+	.4byte gUnknown_08620214
+	.4byte gUnknown_0862021C
+	.4byte NULL
+	.4byte NULL
+	.2byte 0x2A, 0x14
+	.4byte gUnknown_0862020C
+	.4byte gUnknown_08620210
+	.4byte gUnknown_08620214
+	.4byte gUnknown_08620218
+	.4byte gUnknown_0862021C
+	.4byte NULL
+	.2byte 0x38, 0x14
+	.4byte gUnknown_08620220
+	.4byte gUnknown_08620224
+	.4byte gUnknown_0862023C
+	.4byte NULL
+	.4byte NULL
+	.4byte NULL
+	.2byte 0x28, 0x10
+	.4byte gUnknown_08620228
+	.4byte gUnknown_0862022C
+	.4byte gUnknown_08620230
+	.4byte gUnknown_08620234
+	.4byte gUnknown_08620238
+	.4byte gUnknown_0862023C
 
 gUnknown_086202CC:: @ 86202CC
-	.incbin "baserom.gba", 0x6202cc, 0x8
+	window_template 1, 3, 17, 0x18, 2, 1, 8
 
 gUnknown_086202D4:: @ 86202D4
 	.4byte gUnknown_085EBCC5
@@ -299,19 +432,43 @@ gUnknown_086202D4:: @ 86202D4
 	.4byte gUnknown_085EBE41
 
 gUnknown_0862030C:: @ 862030C
-	.incbin "baserom.gba", 0x62030c, 0x3
+	.byte 6, 8, 7
 
 gUnknown_0862030F:: @ 862030F
-	.incbin "baserom.gba", 0x62030f, 0x3d
+	.byte 6, 8, 7, 0, 0
+	
+gUnknown_08620314:: @ 8620314
+	.byte 0, 0x40, 0, 0x80, 0, 8, 0, 0
+	
+gUnknown_0862031C:: @ 862031C
+	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
+	obj_rot_scal_anim_end
+	
+gUnknown_0862032C:: @ 862032C
+	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
+	obj_rot_scal_anim_frame 0x10, 0x10, 0, 0x12
+	obj_rot_scal_anim_end
+
+gUnknown_08620344:: @ 8620344
+	.4byte gUnknown_0862031C
+	.4byte gUnknown_0862032C
 
 gUnknown_0862034C:: @ 862034C
-	.incbin "baserom.gba", 0x62034c, 0x20
+	spr_template 3, 4, gUnknown_08620314, gDummySpriteAnimTable, NULL, gUnknown_08620344, SpriteCallbackDummy
+	
+gUnknown_08620364:: @ 8620364
+	.2byte 0x4000
+	.2byte 0x8000
+	.2byte 0x800
+	.2byte 0
 
 gUnknown_0862036C:: @ 862036C
-	.incbin "baserom.gba", 0x62036c, 0x18
+	spr_template 1, 3, gUnknown_08620364, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_08620384:: @ 8620384
-	 .incbin "baserom.gba", 0x620384, 0xC
+	 .4byte 0x4000040
+	 .4byte 0xa2600001
+	 .byte 1, 0, 0, 0
 	 
 gUnknown_08620390:: @ 8620390
 	.string "Becalm fighting emotions.$"
@@ -1333,40 +1490,44 @@ gUnknown_08622028:: @ 8622028
 	.4byte gUnknown_08621FC9, gUnknown_08621FDE, gUnknown_08621FF9, gUnknown_0862200F
 
 gUnknown_08622508:: @ 8622508
-	.incbin "baserom.gba", 0x622508, 0x2
+	.byte 0, 2
 
 gUnknown_0862250A:: @ 862250A
-	.incbin "baserom.gba", 0x62250a, 0x6
+	.byte 0, 1, 2, 0, 0, 0
 
 gUnknown_08622510:: @ 8622510
-	.incbin "baserom.gba", 0x622510, 0x20
+	.incbin "graphics/pokenav/ui_matchcall.gbapal"
 
 gUnknown_08622530:: @ 8622530
-	.incbin "baserom.gba", 0x622530, 0xa4
+	.incbin "graphics/pokenav/ui_matchcall.4bpp.lz"
 
 gUnknown_086225D4:: @ 86225D4
-	 .incbin "baserom.gba", 0x6225d4, 0xC4
+	.incbin "graphics/pokenav/ui_matchcall.bin.lz"
 
 gUnknown_08622698:: @ 8622698
-	 .incbin "baserom.gba", 0x622698, 0x48
+	.incbin "graphics/pokenav/arrow2.gbapal"
+	
+gUnknown_086226B8:: @ 86226B8
+	.incbin "graphics/pokenav/arrow2.4bpp.lz"
 
 gUnknown_086226E0:: @ 86226E0
-	.incbin "baserom.gba", 0x6226e0, 0x20
+	.incbin "graphics/pokenav/86226E0.gbapal"
 
 gUnknown_08622700:: @ 8622700
-	.incbin "baserom.gba", 0x622700, 0x20
+	.incbin "graphics/pokenav/8622700.gbapal"
 
 gUnknown_08622720:: @ 8622720
-	.incbin "baserom.gba", 0x622720, 0x40
+	.incbin "graphics/pokenav/pokeball_matchcall.gbapal"
 
 gUnknown_08622760:: @ 8622760
-	.incbin "baserom.gba", 0x622760, 0x2c
+	.incbin "graphics/pokenav/pokeball_matchcall.4bpp.lz"
 
 gUnknown_0862278C:: @ 862278C
-	.incbin "baserom.gba", 0x62278c, 0x8
+	.4byte 0x11FD
+	.4byte 0x20206A
 
 gUnknown_08622794:: @ 8622794
-	.incbin "baserom.gba", 0x622794, 0x4
+	.4byte 0x3077
 
 gUnknown_08622798:: @ 8622798
 	.4byte NULL
@@ -1387,10 +1548,10 @@ gUnknown_08622798:: @ 8622798
 	.4byte sub_81CBB74
 
 gUnknown_086227D8:: @ 86227D8
-	.incbin "baserom.gba", 0x6227d8, 0x8
+	window_template 2, 0, 5, 11, 2, 2, 16
 
 gUnknown_086227E0:: @ 86227E0
-	.incbin "baserom.gba", 0x6227e0, 0x8
+	window_template 2, 0, 9, 11, 8, 2, 0x26
 
 gUnknown_086227E8:: @ 86227E8
 	.4byte gUnknown_085EC017
@@ -1398,13 +1559,15 @@ gUnknown_086227E8:: @ 86227E8
 	.4byte gUnknown_085EC022
 
 gUnknown_086227F4:: @ 86227F4
-	.incbin "baserom.gba", 0x6227f4, 0x14
+	.string "·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·\p"
+	.string "$"
+	.align 2
 
 gUnknown_08622808:: @ 8622808
-	.incbin "baserom.gba", 0x622808, 0x8
+	window_template 1, 1, 12, 0x1C, 4, 1, 10
 
 gUnknown_08622810:: @ 8622810
-	.incbin "baserom.gba", 0x622810, 0x8
+	obj_tiles gUnknown_086226B8, 0x40, 7
 
 gUnknown_08622818:: @ 8622818
 	obj_pal gUnknown_08622698, 12
@@ -1429,79 +1592,81 @@ gUnknown_08622850:: @ 8622850
 	spr_template 8, 13, gUnknown_08622848, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_08622868:: @ 8622868
-	.incbin "baserom.gba", 0x622868, 0x20
+	.incbin "graphics/pokenav/8622868.gbapal"
 
 gUnknown_08622888:: @ 8622888
-	 .incbin "baserom.gba", 0x622888, 0x1F4
+	.incbin "graphics/pokenav/zoom_tiles.4bpp.lz"
 
 gUnknown_08622A7C:: @ 8622A7C
-	 .incbin "baserom.gba", 0x622a7c, 0x44
+	 .incbin "graphics/pokenav/city_maps/lavaridge_0.bin.lz"
 
 gUnknown_08622AC0:: @ 8622AC0
-	 .incbin "baserom.gba", 0x622ac0, 0x48
+	 .incbin "graphics/pokenav/city_maps/fallarbor_0.bin.lz"
 
 gUnknown_08622B08:: @ 8622B08
-	 .incbin "baserom.gba", 0x622b08, 0x50
+	 .incbin "graphics/pokenav/city_maps/fortree_0.bin.lz"
 
 gUnknown_08622B58:: @ 8622B58
-	 .incbin "baserom.gba", 0x622b58, 0x60
+	 .incbin "graphics/pokenav/city_maps/slateport_0.bin.lz"
 
 gUnknown_08622BB8:: @ 8622BB8
-	 .incbin "baserom.gba", 0x622bb8, 0x4C
+	 .incbin "graphics/pokenav/city_maps/slateport_1.bin.lz"
 
 gUnknown_08622C04:: @ 8622C04
-	 .incbin "baserom.gba", 0x622c04, 0x54
+	 .incbin "graphics/pokenav/city_maps/rustboro_0.bin.lz"
 
 gUnknown_08622C58:: @ 8622C58
-	 .incbin "baserom.gba", 0x622c58, 0x54
+	 .incbin "graphics/pokenav/city_maps/rustboro_1.bin.lz"
 
 gUnknown_08622CAC:: @ 8622CAC
-	 .incbin "baserom.gba", 0x622cac, 0x40
+	 .incbin "graphics/pokenav/city_maps/pacifidlog_0.bin.lz"
 
 gUnknown_08622CEC:: @ 8622CEC
-	 .incbin "baserom.gba", 0x622cec, 0x58
+	 .incbin "graphics/pokenav/city_maps/mauville_0.bin.lz"
 
 gUnknown_08622D44:: @ 8622D44
-	 .incbin "baserom.gba", 0x622d44, 0x54
+	 .incbin "graphics/pokenav/city_maps/mauville_1.bin.lz"
 
 gUnknown_08622D98:: @ 8622D98
-	 .incbin "baserom.gba", 0x622d98, 0x30
+	 .incbin "graphics/pokenav/city_maps/oldale_0.bin.lz"
 
 gUnknown_08622DC8:: @ 8622DC8
-	 .incbin "baserom.gba", 0x622dc8, 0x4C
+	 .incbin "graphics/pokenav/city_maps/lilycove_0.bin.lz"
 
 gUnknown_08622E14:: @ 8622E14
-	 .incbin "baserom.gba", 0x622e14, 0x58
+	 .incbin "graphics/pokenav/city_maps/lilycove_1.bin.lz"
 
 gUnknown_08622E6C:: @ 8622E6C
-	 .incbin "baserom.gba", 0x622e6c, 0x30
+	 .incbin "graphics/pokenav/city_maps/littleroot_0.bin.lz"
 
 gUnknown_08622E9C:: @ 8622E9C
-	 .incbin "baserom.gba", 0x622e9c, 0x38
+	 .incbin "graphics/pokenav/city_maps/dewford_0.bin.lz"
 
 gUnknown_08622ED4:: @ 8622ED4
-	 .incbin "baserom.gba", 0x622ed4, 0x40
+	 .incbin "graphics/pokenav/city_maps/sootopolis_0.bin.lz"
 
 gUnknown_08622F14:: @ 8622F14
-	 .incbin "baserom.gba", 0x622f14, 0x48
+	 .incbin "graphics/pokenav/city_maps/ever_grande_0.bin.lz"
 
 gUnknown_08622F5C:: @ 8622F5C
-	 .incbin "baserom.gba", 0x622f5c, 0x44
+	 .incbin "graphics/pokenav/city_maps/ever_grande_1.bin.lz"
 
 gUnknown_08622FA0:: @ 8622FA0
-	 .incbin "baserom.gba", 0x622fa0, 0x38
+	 .incbin "graphics/pokenav/city_maps/verdanturf_0.bin.lz"
 
 gUnknown_08622FD8:: @ 8622FD8
-	 .incbin "baserom.gba", 0x622fd8, 0x48
+	 .incbin "graphics/pokenav/city_maps/mossdeep_0.bin.lz"
 
 gUnknown_08623020:: @ 8623020
-	 .incbin "baserom.gba", 0x623020, 0x5C
+	 .incbin "graphics/pokenav/city_maps/mossdeep_1.bin.lz"
 
 gUnknown_0862307C:: @ 862307C
-	 .incbin "baserom.gba", 0x62307c, 0x5C
+	 .incbin "graphics/pokenav/city_maps/petalburg_0.bin.lz"
 
 gUnknown_086230D8:: @ 86230D8
-	.incbin "baserom.gba", 0x6230d8, 0xc
+	.4byte 0x11F5
+	.4byte 0x206A
+	.4byte 0x3402
 
 gUnknown_086230E4:: @ 86230E4
 	.4byte NULL
@@ -1518,7 +1683,13 @@ gUnknown_08623100:: @ 8623100
 	null_obj_pal
 
 gUnknown_08623110:: @ 8623110
-	.incbin "baserom.gba", 0x623110, 0x8
+	.byte 1
+	.byte 17
+	.byte 4
+	.byte 12
+	.byte 13
+	.byte 1
+	.2byte 0x4C
 
 gUnknown_08623118:: @ 8623118
 	.4byte 0, gUnknown_08622E6C 
@@ -1554,34 +1725,36 @@ gUnknown_086231D0:: @ 86231D0
 	spr_template 6, 11, gUnknown_086231C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81CCEF4
 
 gUnknown_086231E8:: @ 86231E8
-	.incbin "baserom.gba", 0x6231e8, 0x20
+	.incbin "graphics/pokenav/86231E8.gbapal"
 
 gUnknown_08623208:: @ 8623208
-	.incbin "baserom.gba", 0x623208, 0x20
+	.incbin "graphics/pokenav/8623208.gbapal"
 
 gUnknown_08623228:: @ 8623228
-	.incbin "baserom.gba", 0x623228, 0x14
+	.incbin "graphics/pokenav/8623228.4bpp.lz"
 
 gUnknown_0862323C:: @ 862323C
-	.incbin "baserom.gba", 0x62323c, 0xfc
+	.incbin "graphics/pokenav/862323C.bin.lz"
 
 gUnknown_08623338:: @ 8623338
-	.incbin "baserom.gba", 0x623338, 0x20
+	.incbin "graphics/pokenav/8623338.gbapal"
 
 gUnknown_08623358:: @ 8623358
-	.incbin "baserom.gba", 0x623358, 0xc
+	.4byte 0x11F5
+	.4byte 0x21DE
+	.4byte 0x31EB
 
 gUnknown_08623364:: @ 8623364
-	.incbin "baserom.gba", 0x623364, 0x8
+	window_template 1, 13, 1, 13, 4, 15, 2
 
 gUnknown_0862336C:: @ 862336C
-	.incbin "baserom.gba", 0x62336c, 0x8
+	window_template 1, 1, 6, 7, 2, 15, 0x36
 
 gUnknown_08623374:: @ 8623374
-	.incbin "baserom.gba", 0x623374, 0x8
+	window_template 1, 1, 0x1C, 5, 2, 15, 0x44
 
 gUnknown_0862337C:: @ 862337C
-	.incbin "baserom.gba", 0x62337c, 0x8
+	window_template 1, 13, 0x1C, 3, 2, 15, 0x44
 
 gUnknown_08623384:: @ 8623384
 	.4byte NULL
@@ -1593,7 +1766,7 @@ gUnknown_08623384:: @ 8623384
 	.4byte sub_81CE700
 
 gUnknown_086233A0:: @ 86233A0
-	.incbin "baserom.gba", 0x6233a0, 0x14
+	.4byte 0x16, 0x17, 0x18, 0x21, 0x2F
 
 gUnknown_086233B4:: @ 86233B4
 	.4byte sub_81CF134
@@ -1602,22 +1775,22 @@ gUnknown_086233B4:: @ 86233B4
 	.4byte sub_81CF278
 
 gUnknown_086233C4:: @ 86233C4
-	.incbin "baserom.gba", 0x6233c4, 0x20
+	.incbin "graphics/pokenav/condition_search2.gbapal"
 
 gUnknown_086233E4:: @ 86233E4
-	.incbin "baserom.gba", 0x6233e4, 0xc8
+	.incbin "graphics/pokenav/condition_search2.4bpp.lz"
 
 gUnknown_086234AC:: @ 86234AC
-	.incbin "baserom.gba", 0x6234ac, 0xc4
+	.incbin "graphics/pokenav/condition_search2.bin.lz"
 
 gUnknown_08623570:: @ 8623570
-	.incbin "baserom.gba", 0x623570, 0x20
+	.incbin "graphics/pokenav/8623570.gbapal"
 
 gUnknown_08623590:: @ 8623590
-	.incbin "baserom.gba", 0x623590, 0x4
+	.4byte 0x2065
 
 gUnknown_08623594:: @ 8623594
-	.incbin "baserom.gba", 0x623594, 0x4
+	.4byte 0x307A
 
 gUnknown_08623598:: @ 8623598
 	.4byte NULL
@@ -1629,16 +1802,19 @@ gUnknown_08623598:: @ 8623598
 	.4byte sub_81CF798
 
 gUnknown_086235B4:: @ 86235B4
-	.incbin "baserom.gba", 0x6235b4, 0x8
+	window_template 1, 1, 6, 7, 2, 1, 20
 
 gUnknown_086235BC:: @ 86235BC
-	.incbin "baserom.gba", 0x6235bc, 0xc
+	.string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$"
+	.align 2
 
 gUnknown_086235C8:: @ 86235C8
-	.incbin "baserom.gba", 0x6235c8, 0xc
+	.string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$"
+	.align 2
 
 gUnknown_086235D4:: @ 86235D4
-	.incbin "baserom.gba", 0x6235d4, 0x4
+	.string "{0x77}$"
+	.align 2
 
 gUnknown_086235D8:: @ 86235D8
 	.4byte sub_81CFB8C
@@ -1646,22 +1822,22 @@ gUnknown_086235D8:: @ 86235D8
 	.4byte sub_81CFC40
 
 gUnknown_086235E4:: @ 86235E4
-	.incbin "baserom.gba", 0x6235e4, 0x20
+	.incbin "graphics/pokenav/ui_ribbons.gbapal"
 
 gUnknown_08623604:: @ 8623604
-	.incbin "baserom.gba", 0x623604, 0xc8
+	.incbin "graphics/pokenav/ui_ribbons.4bpp.lz"
 
 gUnknown_086236CC:: @ 86236CC
-	.incbin "baserom.gba", 0x6236cc, 0xc4
+	.incbin "graphics/pokenav/ui_ribbons.bin.lz"
 
 gUnknown_08623790:: @ 8623790
-	.incbin "baserom.gba", 0x623790, 0x20
+	.incbin "graphics/pokenav/8623790.gbapal"
 
 gUnknown_086237B0:: @ 86237B0
-	.incbin "baserom.gba", 0x6237b0, 0x4
+	.4byte 0x2065
 
 gUnknown_086237B4:: @ 86237B4
-	.incbin "baserom.gba", 0x6237b4, 0x4
+	.4byte 0x307A
 
 gUnknown_086237B8:: @ 86237B8
 	.4byte NULL
@@ -1673,19 +1849,38 @@ gUnknown_086237B8:: @ 86237B8
 	.4byte sub_81D021C
 
 gUnknown_086237D4:: @ 86237D4
-	.incbin "baserom.gba", 0x6237d4, 0x8
+	window_template 1, 1, 6, 7, 2, 1, 20
 
 gUnknown_086237DC:: @ 86237DC
-	.incbin "baserom.gba", 0x6237dc, 0xc
+	.string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$"
+	.align 2
 
 gUnknown_086237E8:: @ 86237E8
-	.incbin "baserom.gba", 0x6237e8, 0xc
+	.string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$"
+	.align 2
 
 gUnknown_086237F4:: @ 86237F4
-	.incbin "baserom.gba", 0x6237f4, 0x4
+	.string "{0x77}$"
+	.align 2
 
 gUnknown_086237F8:: @ 86237F8
-	.incbin "baserom.gba", 0x6237f8, 0x44
+	.byte 1, 1, 0, 0
+	.byte 3, 4, 1, 0
+	.byte 3, 4, 5, 0
+	.byte 3, 4, 9, 0
+	.byte 3, 4, 13, 0
+	.byte 3, 4, 17, 0
+	.byte 1, 1, 21, 0
+	.byte 1, 1, 22, 0
+	.byte 1, 1, 23, 0
+	.byte 1, 1, 24, 0
+	.byte 1, 1, 25, 1
+	.byte 1, 1, 26, 1
+	.byte 1, 1, 27, 1
+	.byte 1, 1, 28, 1
+	.byte 1, 1, 29, 1
+	.byte 1, 1, 30, 1
+	.byte 1, 1, 31, 1
 
 @ 862383C
 	.include "data/text/ribbon_descriptions.inc"
@@ -1694,31 +1889,32 @@ gUnknown_086237F8:: @ 86237F8
 	.include "data/text/gift_ribbon_descriptions.inc"
 
 gUnknown_08623FF8:: @ 8623FF8
-	 .incbin "baserom.gba", 0x623ff8, 0x20
+	 .incbin "graphics/pokenav/ribbons_icon1.gbapal"
 
 gUnknown_08624018:: @ 8624018
-	 .incbin "baserom.gba", 0x624018, 0x20
+	 .incbin "graphics/pokenav/ribbons_icon2.gbapal"
 
 gUnknown_08624038:: @ 8624038
-	 .incbin "baserom.gba", 0x624038, 0x20
+	 .incbin "graphics/pokenav/ribbons_icon3.gbapal"
 
 gUnknown_08624058:: @ 8624058
-	 .incbin "baserom.gba", 0x624058, 0x20
+	 .incbin "graphics/pokenav/ribbons_icon4.gbapal"
 
 gUnknown_08624078:: @ 8624078
-	 .incbin "baserom.gba", 0x624078, 0x20
+	 .incbin "graphics/pokenav/ribbons_icon5.gbapal"
 
 gUnknown_08624098:: @ 8624098
-	 .incbin "baserom.gba", 0x624098, 0x20
+	 .incbin "graphics/pokenav/8624098.gbapal"
 
 gUnknown_086240B8:: @ 86240B8
-	 .incbin "baserom.gba", 0x6240b8, 0x1C8
+	 .incbin "graphics/pokenav/ribbons_icon.4bpp.lz"
 
 gUnknown_08624280:: @ 8624280
-	 .incbin "baserom.gba", 0x624280, 0x918
+	 .incbin "graphics/pokenav/ribbons_icon_big.4bpp.lz"
 
 gUnknown_08624B98:: @ 8624B98
-	.incbin "baserom.gba", 0x624b98, 0x8
+	.4byte 0x107D
+	.4byte 0x2066
 
 gUnknown_08624BA0:: @ 8624BA0
 	.4byte NULL
@@ -1729,28 +1925,48 @@ gUnknown_08624BA0:: @ 8624BA0
 	.4byte sub_81D0C54
 
 gUnknown_08624BB8:: @ 8624BB8
-	.incbin "baserom.gba", 0x624bb8, 0x8
+	window_template 2, 12, 13, 16, 4, 1, 20
 
 gUnknown_08624BC0:: @ 8624BC0
-	.incbin "baserom.gba", 0x624bc0, 0x4
+	.byte 4, 2, 3, 0
 
 gUnknown_08624BC4:: @ 8624BC4
-	.incbin "baserom.gba", 0x624bc4, 0x8
+	window_template 2, 14, 1, 13, 2, 10, 0x54
 
 gUnknown_08624BCC:: @ 8624BCC
-	.incbin "baserom.gba", 0x624bcc, 0xc
+	.string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$"
+	.align 2
 
 gUnknown_08624BD8:: @ 8624BD8
-	.incbin "baserom.gba", 0x624bd8, 0xc
+	.string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$"
+	.align 2
 
 gUnknown_08624BE4:: @ 8624BE4
-	.incbin "baserom.gba", 0x624be4, 0x4
+	.string "{0x77}$"
+	.align 2
 
 gUnknown_08624BE8:: @ 8624BE8
-	.incbin "baserom.gba", 0x624be8, 0x10
+	window_template 2, 1, 5, 7, 2, 1, 0x6E
+	.4byte NULL
+	.4byte NULL
 
 gUnknown_08624BF8:: @ 8624BF8
-	.incbin "baserom.gba", 0x624bf8, 0x80
+	.2byte 0, 0, 1, 0
+	.2byte 2, 0, 3, 0
+	.2byte 4, 0, 1, 1
+	.2byte 2, 1, 3, 1
+	.2byte 4, 1, 1, 2
+	.2byte 2, 2, 3, 2
+	.2byte 4, 2, 1, 3
+	.2byte 2, 3, 3, 3
+	.2byte 4, 3, 1, 4
+	.2byte 2, 4, 3, 4
+	.2byte 4, 4, 5, 0
+	.2byte 6, 0, 7, 1
+	.2byte 8, 2, 9, 1
+	.2byte 9, 3, 9, 4
+	.2byte 10, 3, 10, 4
+	.2byte 11, 0, 11, 1
 
 gUnknown_08624C78:: @ 8624C78
 	obj_tiles gUnknown_08624280, 0x1800, 9
@@ -1764,73 +1980,710 @@ gUnknown_08624C80:: @ 8624C80
 	null_obj_pal
 
 gUnknown_08624CB0:: @ 8624CB0
-	.incbin "baserom.gba", 0x624cb0, 0x54
+	.2byte 0x100
+	.2byte 0x8000
+	.2byte 0x400
+	.2byte 0x0
+
+gUnknown_08624CB8:: @ 8624CB8
+	.2byte 0x80
+	.2byte 0x80
+	.2byte 0
+	.2byte 0
+	.2byte 0x7FFF
+	.2byte 0
+	.2byte 0
+	.2byte 0
+	
+gUnknown_08624CC8:: @ 8624CC8
+	.2byte 0x80
+	.2byte 0x80
+	.2byte 0
+	.2byte 0
+	.2byte 0x20
+	.2byte 0x20
+	.2byte 0x400
+	.2byte 0
+	.2byte 0x7FFF
+	.2byte 0
+	.2byte 0
+	.2byte 0
+	
+gUnknown_08624CE0:: @ 8624CE0
+	.2byte 0x100
+	.2byte 0x100
+	.2byte 0
+	.2byte 0
+	.2byte 0xFFE0
+	.2byte 0xFFE0
+	.2byte 0x400
+	.2byte 0
+	.2byte 0x7FFF
+	.2byte 0
+	.2byte 0
+	.2byte 0
+	
+gUnknown_08624CF8:: @ 8624CF8
+	.4byte gUnknown_08624CB8
+	.4byte gUnknown_08624CC8
+	.4byte gUnknown_08624CE0
 
 gUnknown_08624D04:: @ 8624D04
-	 .incbin "baserom.gba", 0x624d04, 0x78
+	spr_template 9, 15, gUnknown_08624CB0, gDummySpriteAnimTable, NULL, gUnknown_08624CF8, SpriteCallbackDummy
+	
+gUnknown_08624D1C:: @ 8624D1C
+	 .4byte gText_MrStone_Pokenav_2B60C0
+	 .2byte 0xFFFF
+	 .byte 0x58
+	 .byte 1
+	 .4byte gText_MrStone_Pokenav_2B61E6
+	 .byte 0x58
+	 .byte 1
+	 .2byte 0xFFFF
+	 .4byte gText_MrStone_Pokenav_2B6302
+	 .byte 0xBD
+	 .byte 0
+	 .2byte 0xFFFF
+	 .4byte gText_MrStone_Pokenav_2B63A0
+	 .byte 16
+	 .byte 1
+	 .2byte 0xFFFF
+	 .4byte gText_MrStone_Pokenav_2B64A2
+	 .byte 0x6A
+	 .byte 0
+	 .2byte 0xFFFF
+	 .4byte gText_MrStone_Pokenav_2B6526
+	 .byte 0xF4
+	 .byte 4
+	 .2byte 0xFFFF
+	 .4byte gText_MrStone_Pokenav_2B65BB
+	 .byte 0x97
+	 .byte 0
+	 .2byte 0xFFFF
+	 .4byte gText_MrStone_Pokenav_2B6664
+	 .byte 0x6f
+	 .byte 0
+	 .2byte 0xFFFF
+	 .4byte gText_MrStone_Pokenav_2B66B1
+	 .byte 0x70
+	 .byte 0
+	 .2byte 0xFFFF
+	 .4byte gText_MrStone_Pokenav_2B6703
+	 .byte 0xf7
+	 .byte 4
+	 .2byte 0xFFFF
+	 .4byte gText_MrStone_Pokenav_2B67ED
+	 .byte 0x64
+	 .byte 8
+	 .2byte 0xFFFF
+	 .4byte NULL
+	 .4byte 0xFFFFFFFF
 
 gUnknown_08624D7C:: @ 8624D7C
-	 .incbin "baserom.gba", 0x624d7c, 0x60
+	 .byte 0
+	 .byte 10
+	 .2byte 0xFFFF
+	 .4byte gUnknown_085EFAEF
+	 .4byte gUnknown_085EFAFA
+	 .4byte gUnknown_08624D1C
+
+gUnknown_08624D8C:: @ 8624D8C
+	 .4byte gText_Norman_Pokenav_2B5719
+	 .byte 0x32
+	 .byte 1
+	 .2byte 0xFFFF
+	 .4byte gText_Norman_Pokenav_2B5795
+	 .byte 0xF1
+	 .byte 4
+	 .2byte 0xFFFF
+	 .4byte gText_Norman_Pokenav_2B584D
+	 .byte 0xF3
+	 .byte 4
+	 .2byte 0xFFFF
+	 .4byte gText_Norman_Pokenav_2B58E3
+	 .byte 0xF4
+	 .byte 4
+	 .2byte 0xFFFF
+	 .4byte gText_Norman_Pokenav_2B5979
+	 .byte 0xD4
+	 .byte 0
+	 .2byte 0xFFFF
+	 .4byte gText_Norman_Pokenav_2B5A07
+	 .byte 0xFE
+	 .byte 0xFF
+	 .2byte 0xFFFF
+	 .4byte gText_Norman_Pokenav_2B5A69
+	 .byte 0x64
+	 .byte 8
+	 .2byte 0xFFFF
+	 .4byte gText_Norman_Pokenav_2B5ACF
+	 .byte 0x64
+	 .byte 8
+	 .2byte 0xFFFF
+	 .4byte gText_Norman_Pokenav_2B5B5E
+	 .byte 0x64
+	 .byte 8
+	 .2byte 0xFFFF
+	 .4byte NULL
+	 .4byte 0xFFFFFFFF
 
 gUnknown_08624DDC:: @ 8624DDC
-	 .incbin "baserom.gba", 0x624ddc, 0x14
+	 .byte 5, 7, 0x32, 1, 0x45, 0, 0, 0
+	 .4byte gUnknown_085EFB25
+	 .4byte gUnknown_085EFB47
+	 .4byte gUnknown_08624D8C
 
 gUnknown_08624DF0:: @ 8624DF0
-	 .incbin "baserom.gba", 0x624df0, 0x2C
+	 .byte 3, 0, 0x19, 1
+	 .4byte gUnknown_085EFBC9
+	 .4byte gUnknown_085E8270
+	 
+gUnknown_08624DFC:: @ 8624DFC
+	 .4byte gText_Mom_Pokenav_2B227B
+	 .byte 0xFF
+	 .byte 0xFF
+	 .2byte 0xFFFF
+	 .4byte gText_Mom_Pokenav_2B2310
+	 .byte 0xF4
+	 .byte 0x4
+	 .2byte 0xFFFF
+	 .4byte gText_Mom_Pokenav_2B23F3
+	 .byte 0x64
+	 .byte 8
+	 .2byte 0xFFFF
+	 .4byte NULL
+	 .4byte 0xFFFFFFFF
 
 gUnknown_08624E1C:: @ 8624E1C
-	 .incbin "baserom.gba", 0x624e1c, 0x50
+	 .byte 0, 0, 0xD8, 0
+	 .4byte gUnknown_085EFB32
+	 .4byte gUnknown_085EFB4B
+	 .4byte gUnknown_08624DFC
+	 
+gUnknown_08624E2C:: @ 8624E2C
+	.4byte gText_Steven_Pokenav_2B5B95
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Steven_Pokenav_2B5C53
+	.byte 0xC7
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Steven_Pokenav_2B5CC9
+	.byte 0xD4
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Steven_Pokenav_2B5DB4
+	.byte 0x70
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Steven_Pokenav_2B5E26
+	.byte 0xF6
+	.byte 4
+	.2byte 0xFFFF
+	.4byte gText_Steven_Pokenav_2B5EA2
+	.byte 0x81
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Steven_Pokenav_2B5ED9
+	.byte 0x64
+	.byte 8
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_08624E6C:: @ 8624E6C
-	 .incbin "baserom.gba", 0x624e6c, 0x90
+	 .byte 0, 0xD5, 0x31, 1
+	 .4byte gUnknown_085EFB04
+	 .4byte gUnknown_085EFB11
+	 .4byte gUnknown_08624E2C
+	 
+gUnknown_08624E7C:: @ 8624E7C
+	.4byte gText_May_Pokenav_2B3AB3
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B3B3F
+	.byte 0xF1
+	.byte 0x4
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B3C13
+	.byte 0x95
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B3CF3
+	.byte 0x24
+	.byte 0x3
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B3D4B
+	.byte 0x6A
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B3DD1
+	.byte 0xF3
+	.byte 0x4
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B3E69
+	.byte 0xF4
+	.byte 4
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B3ECD
+	.byte 0x97
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B3F2B
+	.byte 0xD4
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B3FFB
+	.byte 0x6F
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B402B
+	.byte 0x61
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B414B
+	.byte 0x70
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B4228
+	.byte 0x81
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B42E0
+	.byte 0xF7
+	.byte 4
+	.2byte 0xFFFF
+	.4byte gText_May_Pokenav_2B4350
+	.byte 0x64
+	.byte 8
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_08624EFC:: @ 8624EFC
-	 .incbin "baserom.gba", 0x624efc, 0x90
+	 .byte 4, 0, 0xFD, 0
+	 .4byte gUnknown_085EFB18
+	 .4byte gExpandedPlaceholder_May
+	 .4byte gUnknown_08624E7C
+
+gUnknown_08624F0C:: @ 8624F0C
+	.4byte gText_Brendan_Pokenav_2B43EF
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B4486
+	.byte 0xF1
+	.byte 0x4
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B4560
+	.byte 0x95
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B463F
+	.byte 0x24
+	.byte 0x3
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B46B7
+	.byte 0x6A
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B4761
+	.byte 0xF3
+	.byte 0x4
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B47F4
+	.byte 0xF4
+	.byte 4
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B4882
+	.byte 0x97
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B4909
+	.byte 0xD4
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B49C4
+	.byte 0x6F
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B4A44
+	.byte 0x61
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B4B28
+	.byte 0x70
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B4C15
+	.byte 0x81
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B4CD8
+	.byte 0xF7
+	.byte 4
+	.2byte 0xFFFF
+	.4byte gText_Brendan_Pokenav_2B4D46
+	.byte 0x64
+	.byte 8
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_08624F8C:: @ 8624F8C
-	 .incbin "baserom.gba", 0x624f8c, 0x60
+	 .byte 4, 1, 0xFD, 0
+	 .4byte gUnknown_085EFB18
+	 .4byte gExpandedPlaceholder_Brendan
+	 .4byte gUnknown_08624F0C
+	 
+gUnknown_08624F9C:: @ 8624F9C
+	.4byte gText_Wally_Pokenav_2B4DE2
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Wally_Pokenav_2B4E57
+	.byte 0xC7
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Wally_Pokenav_2B4EA5
+	.byte 0xF3
+	.byte 0x4
+	.2byte 0xFFFF
+	.4byte gText_Wally_Pokenav_2B4F41
+	.byte 0x97
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Wally_Pokenav_2B4FF3
+	.byte 0x6F
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Wally_Pokenav_2B50B1
+	.byte 0x81
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Wally_Pokenav_2B5100
+	.byte 0x7E
+	.byte 0
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
+gUnknown_08624FDC:: @ 8624FDC
+	.byte 0x24, 3, 5, 0
+	.2byte 0x6F, 0xD5
+	.byte 0x5A, 3, 0x46, 0, 0xFF, 0xFF, 0xD5, 0
+	
 gUnknown_08624FEC:: @ 8624FEC
-	 .incbin "baserom.gba", 0x624fec, 0x54
+	 .byte 2, 0, 0xD6, 0
+	 .4byte 0x40
+	 .4byte gUnknown_085EFB3E
+	 .4byte gUnknown_08624F9C
+	 .4byte gUnknown_08624FDC
+	 
+gUnknown_08624500:: @ 8624500
+	.4byte gText_Scott_Pokenav_2B5184
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Scott_Pokenav_2B5275
+	.byte 0x8B
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Scott_Pokenav_2B5323
+	.byte 0x97
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Scott_Pokenav_2B53DB
+	.byte 0xD4
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Scott_Pokenav_2B54A5
+	.byte 0x70
+	.byte 0
+	.2byte 0xFFFF
+	.4byte gText_Scott_Pokenav_2B5541
+	.byte 0xF7
+	.byte 4
+	.2byte 0xFFFF
+	.4byte gText_Scott_Pokenav_2B56CA
+	.byte 0x64
+	.byte 8
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
+
 
 gUnknown_08625040:: @ 8625040
-	 .incbin "baserom.gba", 0x625040, 0x38
+	 .byte 0, 0xD5, 0xD7, 0
+	 .4byte gUnknown_085EFB4F
+	 .4byte gUnknown_085EFB5C
+	 .4byte gUnknown_08624500
+	 
+gUnknown_08625050:: @ 8625050
+	.4byte gText_Roxanne_Pokenav_2B2456
+	.byte 0xFE
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Roxanne_Pokenav_2B250E
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Roxanne_Pokenav_2B25C1
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Roxanne_Pokenav_2B2607
+	.byte 0x64
+	.byte 0x8
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_08625078:: @ 8625078
-	 .incbin "baserom.gba", 0x625078, 0x3C
+	 .byte 5, 10, 0xD3, 1
+	 .4byte 0x41
+	 .4byte gUnknown_085EFB62
+	 .4byte NULL
+	 .4byte gUnknown_08625050
+	 
+gUnknown_0862508C:: @ 862508C
+	.4byte gText_Brawly_Pokenav_2B2659
+	.byte 0xFE
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Brawly_Pokenav_2B275D
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Brawly_Pokenav_2B286F
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Brawly_Pokenav_2B28D1
+	.byte 0x64
+	.byte 0x8
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_086250B4:: @ 86250B4
-	 .incbin "baserom.gba", 0x6250b4, 0x3C
+	 .byte 5, 2, 0xD4, 1
+	 .4byte 0x42
+	 .4byte gUnknown_085EFB6F
+	 .4byte NULL
+	 .4byte gUnknown_0862508C
+	 
+gUnknown_086250C8:: @ 86250C8
+	.4byte gText_Wattson_Pokenav_2B2912
+	.byte 0xFE
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Wattson_Pokenav_2B29CA
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Wattson_Pokenav_2B2AB6
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Wattson_Pokenav_2B2B01
+	.byte 0x64
+	.byte 0x8
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_086250F0:: @ 86250F0
-	 .incbin "baserom.gba", 0x6250f0, 0x3C
+	 .byte 5, 9, 0xD5, 1
+	 .4byte 0x43
+	 .4byte gUnknown_085EFB7B
+	 .4byte NULL
+	 .4byte gUnknown_086250C8
+	 
+gUnknown_08625104:: @ 8625104
+	.4byte gText_Flannery_Pokenav_2B2B4D
+	.byte 0xFE
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Flannery_Pokenav_2B2C0E
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Flannery_Pokenav_2B2CF1
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Flannery_Pokenav_2B2D54
+	.byte 0x64
+	.byte 0x8
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_0862512C:: @ 862512C
-	 .incbin "baserom.gba", 0x62512c, 0x3C
+	 .byte 5, 3, 0xD6, 1
+	 .4byte 0x44
+	 .4byte gUnknown_085EFB87
+	 .4byte NULL
+	 .4byte gUnknown_08625104
+	 
+gUnknown_08625140:: @ 8625140
+	.4byte gText_Winona_Pokenav_2B2DA4
+	.byte 0xFE
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Winona_Pokenav_2B2E2B
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Winona_Pokenav_2B2EC2
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Winona_Pokenav_2B2F16
+	.byte 0x64
+	.byte 0x8
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_08625168:: @ 8625168
-	 .incbin "baserom.gba", 0x625168, 0x3C
+	 .byte 5, 11, 0xD7, 1
+	 .4byte 0x46
+	 .4byte gUnknown_085EFB94
+	 .4byte NULL
+	 .4byte gUnknown_08625140
+
+gUnknown_0862517C:: @ 862517C
+	.4byte gText_TateLiza_Pokenav_2B2F97
+	.byte 0xFE
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_TateLiza_Pokenav_2B306E
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_TateLiza_Pokenav_2B3158
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_TateLiza_Pokenav_2B31CD
+	.byte 0x64
+	.byte 0x8
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_086251A4:: @ 86251A4
-	 .incbin "baserom.gba", 0x6251a4, 0x3C
+	 .byte 5, 13, 0xD8, 1
+	 .4byte 0x47
+	 .4byte gUnknown_085EFB9E
+	 .4byte NULL
+	 .4byte gUnknown_0862517C
+	 
+gUnknown_086251B8:: @ 86251B8
+	.4byte gText_Juan_Pokenav_2B3249
+	.byte 0xFE
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Juan_Pokenav_2B32EC
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Juan_Pokenav_2B33AA
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte gText_Juan_Pokenav_2B341E
+	.byte 0x64
+	.byte 0x8
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_086251E0:: @ 86251E0
-	 .incbin "baserom.gba", 0x6251e0, 0x24
+	 .byte 5, 14, 0xD9, 1
+	 .4byte 0x48
+	 .4byte gUnknown_085EFBA9
+	 .4byte NULL
+	 .4byte gUnknown_086251B8
+	 
+gUnknown_086251F4:: @ 86251F4
+	.4byte gText_Sidney_Pokenav_2B34CC
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_08625204:: @ 8625204
-	 .incbin "baserom.gba", 0x625204, 0x24
+	 .byte 5, 15, 0xA5, 1
+	 .4byte 0x49
+	 .4byte gUnknown_085EFBB5
+	 .4byte NULL
+	 .4byte gUnknown_086251F4
+	 
+gUnknown_08625218:: @ 8625218
+	.4byte gText_Phoebe_Pokenav_2B3561
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_08625228:: @ 8625228
-	 .incbin "baserom.gba", 0x625228, 0x24
+	 .byte 5, 15, 0xA6, 1
+	 .4byte 0x4A
+	 .4byte gUnknown_085EFBB5
+	 .4byte NULL
+	 .4byte gUnknown_08625218
+	 
+gUnknown_0862523C:: @ 862523C
+	.4byte gText_Glacia_Pokenav_2B35E4
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_0862524C:: @ 862524C
-	 .incbin "baserom.gba", 0x62524c, 0x24
+	 .byte 5, 15, 0xA7, 1
+	 .4byte 0x4B
+	 .4byte gUnknown_085EFBB5
+	 .4byte NULL
+	 .4byte gUnknown_0862523C
+	 
+gUnknown_08625260:: @ 8625260
+	.4byte gText_Drake_Pokenav_2B368B
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_08625270:: @ 8625270
-	 .incbin "baserom.gba", 0x625270, 0x24
+	 .byte 5, 15, 0xA8, 1
+	 .4byte 0x4C
+	 .4byte gUnknown_085EFBB5
+	 .4byte NULL
+	 .4byte gUnknown_08625260
+	 
+gUnknown_08625284:: @ 8625284
+	.4byte gText_Wallace_Pokenav_2B3790
+	.byte 0xFF
+	.byte 0xFF
+	.2byte 0xFFFF
+	.4byte NULL
+	.4byte 0xFFFFFFFF
 
 gUnknown_08625294:: @ 8625294
-	 .incbin "baserom.gba", 0x625294, 0x14
+	 .byte 5, 15, 0xA9, 1
+	 .4byte 0x4D
+	 .4byte gUnknown_085EFBC0
+	 .4byte NULL
+	 .4byte gUnknown_08625284
 
 gUnknown_086252A8:: @ 86252A8
 	.4byte gUnknown_08624D7C
@@ -1905,61 +2758,212 @@ gUnknown_08625374:: @ 8625374
 	.4byte sub_81D1B00
 
 gUnknown_08625388:: @ 8625388
-	.incbin "baserom.gba", 0x625388, 0x60
+	.2byte 7, 0x4B, 0xFFFF, 0
+	.4byte gUnknown_085ED453
+	.4byte gUnknown_085ED46B
+	.4byte gUnknown_085ED483
+	.4byte gUnknown_085ED49D
+	.2byte 7, 0x4B, 0x4F6, 0
+	.4byte gUnknown_085ED453
+	.4byte gUnknown_085ED46B
+	.4byte gUnknown_085ED4B3
+	.4byte gUnknown_085ED4CE
+	.2byte 2, 0X3C, 0xFFFF, 0
+	.4byte gUnknown_085ED4E3
+	.4byte gUnknown_085ED4FA
+	.4byte gUnknown_085ED516
+	.4byte gUnknown_085ED52F
+	.2byte 3, 0x3F, 0xFFFF, 0
+	.4byte gUnknown_085ED547
+	.4byte gUnknown_085ED563
+	.4byte gUnknown_085ED579
+	.4byte gUnknown_085ED58F
 
 gUnknown_086253E8:: @ 86253E8
-	.incbin "baserom.gba", 0x6253e8, 0x18
+	.4byte 0x8010100
+	.4byte 0x80F02
+	.4byte 0x8011500
+	.4byte 0x180F12
+	.4byte 0xB010100
+	.4byte 0x180F08
 
 gUnknown_08625400:: @ 8625400
-	.incbin "baserom.gba", 0x625400, 0x3
+	.byte 1, 2, 3
 
 gUnknown_08625403:: @ 8625403
-	.incbin "baserom.gba", 0x625403, 0x1
+	.byte 0xFF
 
 gUnknown_08625404:: @ 8625404
-	.incbin "baserom.gba", 0x625404, 0xc
+	.byte 0x40, 0, 0, 4, 1, 0, 0x60, 0xA6, 1, 0, 0, 0
 
 gUnknown_08625410:: @ 8625410
-	.incbin "baserom.gba", 0x625410, 0x100
+	.byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23
 
 gUnknown_08625510:: @ 8625510
-	.incbin "baserom.gba", 0x625510, 0x30
+	.4byte 0x10010101
+	.4byte 0xA0F0C
+	.4byte 0x10010101
+	.4byte 0xCA0F0C
+	.4byte 0xA011301
+	.4byte 0x18A0F0C
+	.4byte 0x160F0401
+	.4byte 0x2020F04
+	.4byte 0x5081600
+	.4byte 0x25A0F04
+	.4byte 0xFF
+	.4byte NULL
 
 gUnknown_08625540:: @ 8625540
-	.incbin "baserom.gba", 0x625540, 0x8
+	.4byte 0x5081600
+	.4byte 0x25A0F04
 
 gUnknown_08625548:: @ 8625548
-	.incbin "baserom.gba", 0x625548, 0x500
+	.4byte NULL
+	.4byte sub_81D2BD0
+	.4byte NULL
+	.2byte 0
+	.2byte 0
+	.byte 2
+	.byte 0
+	.byte 8
+	.byte 0
+	.4byte 0x1003121
+	
+gUnknown_08625560:: @ 8625560
+	.incbin "graphics/pokenav/pokeball.4bpp"
+
+gUnknown_08625660:: @ 8625660
+	.incbin "graphics/pokenav/8625660.4bpp"
+	
+gUnknown_08625680:: @ 8625680
+	.incbin "graphics/pokenav/sparkle.gbapal"
+	
+gUnknown_086256A0:: @ 86255A0
+	.incbin "graphics/pokenav/sparkle.4bpp"
+	
+gUnknown_08625A20:: @ 8625A20
+	.2byte 0
+	.2byte 0xC000
+	.2byte 0x400
+	.2byte 0
+	
+gUnknown_08625A28:: @ 8625A28
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0x800
+	.2byte 0
+	
+gUnknown_08625A30:: @ 8625A30
+	.2byte 0
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625A38:: @ 8625A38
+	.2byte 4
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625A40:: @ 8625A40
+	.4byte gUnknown_08625A30
+	.4byte gUnknown_08625A38
 
 gUnknown_08625A48:: @ 8625A48
-	.incbin "baserom.gba", 0x625a48, 0x8
+	.4byte NULL
+	.4byte 0x640800
 
 gUnknown_08625A50:: @ 8625A50
-	.incbin "baserom.gba", 0x625a50, 0x18
+	spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_08625A68:: @ 8625A68
-	.incbin "baserom.gba", 0x625a68, 0x8
+	.4byte NULL
+	.4byte 0x64
 
 gUnknown_08625A70:: @ 8625A70
-	.incbin "baserom.gba", 0x625a70, 0x20
+	.4byte gUnknown_08625560
+	.byte 0, 1, 0x65, 0
+	.4byte gUnknown_08625660
+	.2byte 0x20, 0x67
+	.4byte gPokenavConditionCancel_Gfx
+	.byte 0, 1, 0x66, 0
+	.4byte NULL, NULL
 
 gUnknown_08625A90:: @ 8625A90
-	.incbin "baserom.gba", 0x625a90, 0x18
+	.4byte gPokenavConditionCancel_Pal + 0x0
+	.byte 0x65, 0, 0, 0
+	.4byte gPokenavConditionCancel_Pal + 0x20
+	.byte 0x66, 0, 0, 0
+	.4byte NULL, NULL
 
 gUnknown_08625AA8:: @ 8625AA8
-	.incbin "baserom.gba", 0x625aa8, 0x18
+	spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_08625AC0:: @ 8625AC0
-	.incbin "baserom.gba", 0x625ac0, 0x8
+	.4byte gUnknown_086256A0
+	.byte 0x80, 3, 0x68, 0
 
 gUnknown_08625AC8:: @ 8625AC8
-	.incbin "baserom.gba", 0x625ac8, 0x4c
+	.4byte gUnknown_08625680
+	.byte 0x68, 0, 0, 0
+	
+gUnknown_08625AD0:: @ 8625AD0
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0
+	.2byte 0
+	
+gUnknown_08625AD8:: @ 8625AD8
+	.2byte 0
+	.2byte 5
+	.2byte 4
+	.2byte 5
+	
+gUnknown_08625AE0:: @ 8625AE0
+	.2byte 8
+	.2byte 5
+	.2byte 12
+	.2byte 5
+	
+gUnknown_08625AE8:: @ 8625AE8
+	.2byte 16
+	.2byte 5
+	.2byte 20
+	.2byte 5
+	
+gUnknown_08625AF0:: @ 8625AF0
+	.2byte 24
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625AF8:: @ 8625AF8
+	.4byte gUnknown_08625AD8
+	.4byte gUnknown_08625AE0
+	
+gUnknown_08625B00:: @ 8625B00
+	.4byte gUnknown_08625AE8
+	.4byte gUnknown_08625AF0
+	
+gUnknown_08625B08:: @ 8625B08
+	.4byte gUnknown_08625AF8
+	.4byte gUnknown_08625B00
+	.4byte gUnknown_08625B08
 
 gUnknown_08625B14:: @ 8625B14
-	.incbin "baserom.gba", 0x625b14, 0x18
+	spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564
 
 gUnknown_08625B2C:: @ 8625B2C
-	.incbin "baserom.gba", 0x625b2c, 0x28
+	.2byte 0, 0xFFDD
+	.2byte 20, 0xFFE4
+	.2byte 33, 0xFFF6
+	.2byte 33, 10
+	.2byte 20, 28
+	.2byte 0, 35
+	.2byte 0xFFEC, 28
+	.2byte 0xFFDF, 10
+	.2byte 0xFFDF, 0xFFF6
+	.2byte 0xFFEC, 0xFFE4
 
 gUnknown_08625B54:: @ 8625B54
 	.4byte gUnknown_085EEA46
@@ -1970,28 +2974,176 @@ gUnknown_08625B54:: @ 8625B54
 	.4byte gUnknown_085EEA5D
 
 gUnknown_08625B6C:: @ 8625B6C
-	.incbin "baserom.gba", 0x625b6c, 0x520
+@ apparently e-reader trainer data? idk
+.byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06
+.byte 0x22, 0x27, 0x2c, 0x16, 0x07, 0x06, 0x01, 0x0c, 0x47, 0x0a, 0x06, 0x06, 0x24, 0x0e, 0x00, 0x1e, 0x19, 0x12, 0x05, 0x0c, 0x25, 0x16, 0x25, 0x10, 0x0d, 0x1c, 0x2a, 0x1c, 0x06, 0x0a, 0x06, 0x0c
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+.byte 0xff, 0xff, 0xff, 0x00, 0x70, 0x01, 0xdb, 0x00, 0xbc, 0x00, 0xf7, 0x00, 0xdc, 0x00, 0x19, 0x01, 0x00, 0x00, 0x37, 0xff, 0x64, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
+.byte 0x80, 0x00, 0x00, 0x00, 0x6f, 0x79, 0x69, 0xae, 0x71, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x26, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0xbc, 0x00, 0xf7, 0x00, 0xca, 0x00, 0x00, 0x00, 0x00, 0xff
+.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x95, 0x58, 0x59, 0x52, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7d, 0x01, 0xb7, 0x00
+.byte 0xf6, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x9b, 0xff, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x2f, 0x00, 0x00, 0x00, 0x8d, 0xae, 0x77, 0x7e
+.byte 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6a, 0x79, 0x6b, 0x64, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1b, 0x01, 0x00, 0x00, 0x00, 0x54, 0x27, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a
+.byte 0x20, 0x06, 0x00, 0x0c, 0x13, 0x24, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x05, 0x12, 0x00, 0x0c, 0x6b, 0x26, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x0e, 0x12, 0x00, 0x0c, 0x2c, 0x24, 0x2b, 0x0e
+.byte 0xff, 0xff, 0x3b, 0x0a, 0x17, 0x12, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x59, 0x01, 0xb7, 0x00, 0xca, 0x00, 0xb9, 0x00, 0x09, 0x00, 0x4a, 0x00, 0x00, 0x00, 0x37, 0x00, 0x64, 0x00, 0xff, 0x64
+.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x8c, 0x00, 0x00, 0x00, 0x69, 0x58, 0x60, 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x31, 0x01, 0xb3, 0x00, 0x07, 0x01, 0x4c, 0x01
+.byte 0x62, 0x00, 0x68, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x80, 0x00, 0x00, 0x00, 0x55, 0x55, 0x5d, 0x96, 0x72, 0xff, 0xff, 0xff
+.byte 0xff, 0xff, 0xff, 0xff, 0x44, 0x01, 0x86, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
+.byte 0x00, 0x00, 0x00, 0x00, 0x65, 0x6f, 0x8e, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x72, 0x52, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00
+.byte 0x4a, 0x04, 0x0e, 0x02, 0x35, 0x16, 0x10, 0x10, 0xda, 0x26, 0x3e, 0x10, 0x4a, 0x04, 0x0e, 0x02, 0x47, 0x0a, 0xd9, 0x26, 0x21, 0x16, 0x3e, 0x10, 0x14, 0x1e, 0x07, 0x1e, 0x30, 0x06, 0x23, 0x16
+.byte 0x24, 0x0e, 0x06, 0x0c, 0x18, 0x14, 0x2f, 0x14, 0x1a, 0x08, 0x27, 0x1c, 0x00, 0x0c, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff
+.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x3c, 0x01, 0x8d, 0x00, 0x2f, 0x00, 0x22, 0x00, 0xf7, 0x00, 0xe7, 0x00
+.byte 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x54, 0x68, 0x5a, 0x7b, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+.byte 0x6b, 0x01, 0xc8, 0x00, 0xca, 0x00, 0x40, 0x01, 0x5c, 0x00, 0x49, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x06, 0x00, 0x00, 0x00
+.byte 0x7b, 0x8f, 0x78, 0x51, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x24, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0x4c, 0x01, 0xd5, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x64, 0xc8, 0x00, 0x00, 0xc8, 0x00
+.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x51, 0x8a, 0x6a, 0x7e, 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9c, 0x54, 0xae, 0x79, 0xff, 0xff, 0xff, 0xff
+.byte 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x46, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x0a, 0x0a, 0x23, 0x10, 0x00, 0x0c, 0x28, 0x0c, 0x14, 0x18, 0x32, 0x14, 0x02, 0x16, 0x05, 0x10, 0xff, 0xff
+.byte 0x0c, 0x1e, 0x0a, 0x0a, 0x34, 0x12, 0x11, 0x1e, 0x1a, 0x08, 0x05, 0x0c, 0x1e, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x22, 0x0a, 0x15, 0x10, 0x01, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+.byte 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x63, 0x01, 0xb3, 0x00
+.byte 0xf2, 0x00, 0x35, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0xff, 0x9b, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x58, 0x61, 0xae, 0x64
+.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10
+.byte 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00, 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01
+.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 
 gUnknown_0862608C:: @ 862608C
-	.incbin "baserom.gba", 0x62608c, 0x2
+	.2byte 21, 16
+	.2byte 25, 16
+	.2byte 16, 17
+	.2byte 20, 20
+	
+gUnknown_0862609C:: @ 862609C
+	.incbin "data/unknown_jp_62609C.bin"
+	
+gUnknown_08626814:: @ 8626814
+	.incbin "data/pokenav/unk_struct_1.bin"
 
-gUnknown_0862608E:: @ 862608E
-	.incbin "baserom.gba", 0x62608e, 0x4326
+gUnknown_086276FC:: @ 86276FC
+	.incbin "data/pokenav/unk_struct_2.bin"
+
+gUnknown_086285E4:: @ 86285E4
+	.incbin "data/pokenav/unk_struct_3.bin"
+
+gUnknown_086294CC:: @ 86294CC
+	.incbin "data/pokenav/unk_struct_4.bin"
 
 gUnknown_0862A3B4:: @ 862A3B4
-	.incbin "baserom.gba", 0x62a3b4, 0x218
+	.byte 0x03, 0x06, 0x00, 0x00, 0x0B, 0x06, 0x00, 0x00, 0x0D, 0x06, 0x00, 0x00, 0x0F, 0x01, 0x00, 0x00, 0x2B, 0x04, 0x00, 0x00, 0x2D, 0x01, 0x00, 0x00, 0x24, 0x09, 0x00, 0x00, 0x29, 0x04, 0x00, 0x00, 0x05, 0x05, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x2E, 0x09, 0x00, 0x00, 0x11, 0x0C, 0x00, 0x00, 0x10, 0x0B, 0x00, 0x00, 0x1E, 0x0D, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x17, 0x03, 0x00, 0x00, 0x0C, 0x04, 0x00, 0x00, 0x38, 0x04, 0x00, 0x00, 0x1C, 0x03, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x19, 0x0B, 0x00, 0x00, 0x09, 0x07, 0x00, 0x00, 0x31, 0x07, 0x00, 0x00, 0x35, 0x07, 0x00, 0x00, 0x36, 0x01, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x2A, 0x03, 0x00, 0x00, 0x16, 0x0D, 0x00, 0x00, 0x0E, 0x03, 0x00, 0x00, 0x15, 0x01, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x2C, 0x01, 0x00, 0x00, 0x1B, 0x02, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x07, 0x03, 0x00, 0x00, 0x34, 0x05, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x37, 0x02, 0x00, 0x00, 0x1D, 0x04, 0x00, 0x00, 0x22, 0x09, 0x00, 0x00, 0x1F, 0x01, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x0A, 0x04, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x06, 0x05, 0x00, 0x00, 0x27, 0x0B, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x12, 0x02, 0x00, 0x00, 0x39, 0x08, 0x00, 0x00, 0x02, 0x0B, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00
 
+gUnknown_0862A48C:: @ 862A48C
+	.2byte 0x44, 0x22, 0x14, 0x18, 0x51, 0x3
+	
+gUnknown_0862A498:: @ 862A498
+	.2byte 0xB, 0x22, 0x14, 0x18, 0x51, 3
+	
+gUnknown_0862A4A4:: @ 862A4A4
+	.2byte 0x19, 0x22, 0x14, 0x18, 0x51, 3
+
+gUnknown_0862A4B0:: @ 862A4B0
+	.2byte 0x23, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A4BC:: @ 862A4BC
+	.2byte 0x24, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A4C8:: @ 862A4C8
+	.2byte 0x125, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A4D4:: @ 862A4D4
+	.2byte 0x144, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A4E0:: @ 862A4E0  
+	.2byte 0x126, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A4EC:: @ 862A4EC
+	.2byte 0x12B, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A4F8:: @ 862A4F8
+	.2byte 0x13A, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A504:: @ 862A504
+	.2byte 0x44, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A510:: @ 862A510
+	.2byte 0xB, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A51C:: @ 862A51C	 
+	.2byte 0x19, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A528:: @ 862A528
+	.2byte 0x23, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A534:: @ 862A534
+	.2byte 0x24, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A540:: @ 862A540
+	.2byte 0x13F, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A54C:: @ 862A54C
+	.2byte 0x149, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A558:: @ 862A558
+	.2byte 0x150, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A564:: @ 862A564
+	.2byte 0x133, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A570:: @ 862A570
+	.2byte 0x14D, 0x22, 0x14, 0x18, 0x51, 0x3
+
+gUnknown_0862A57C:: @ 862A57C	
+	.4byte gUnknown_0862A48C
+	.4byte gUnknown_0862A498
+	.4byte gUnknown_0862A4A4
+	.4byte gUnknown_0862A4B0
+	.4byte gUnknown_0862A4BC
+	.4byte gUnknown_0862A4C8
+	.4byte gUnknown_0862A4D4
+	.4byte gUnknown_0862A4E0
+	.4byte gUnknown_0862A4EC
+	.4byte gUnknown_0862A4F8
+
+gUnknown_0862A5A4:: @ 862A5A4
+	.4byte gUnknown_0862A504
+	.4byte gUnknown_0862A510
+	.4byte gUnknown_0862A51C
+	.4byte gUnknown_0862A528
+	.4byte gUnknown_0862A534
+	.4byte gUnknown_0862A540
+	.4byte gUnknown_0862A54C
+	.4byte gUnknown_0862A558
+	.4byte gUnknown_0862A564
+	.4byte gUnknown_0862A570
+	
 gUnknown_0862A5CC:: @ 862A5CC
-	.incbin "baserom.gba", 0x62a5cc, 0x8
+	.4byte gUnknown_0862A57C
+	.4byte gUnknown_0862A5A4
 
 gUnknown_0862A5D4:: @ 862A5D4
-	.incbin "baserom.gba", 0x62a5d4, 0x20
+	.incbin "graphics/pokenav/862A5D4.gbapal"
 
 gUnknown_0862A5F4:: @ 862A5F4
-	.incbin "baserom.gba", 0x62a5f4, 0x4
+	.byte 0, 2, 3, 0
 
 gUnknown_0862A5F8:: @ 862A5F8
-	.incbin "baserom.gba", 0x62a5f8, 0x20
+	.4byte gUnknown_08626814
+	.4byte gUnknown_086276FC
+	.4byte gUnknown_086285E4
+	.4byte gUnknown_086294CC
+	.4byte gUnknown_085EF8B6
+	.4byte gUnknown_085EF8B9
+	.4byte gUnknown_085EF8BC
+	.4byte gUnknown_085EF8BF
 
 gUnknown_0862A618:: @ 862A618
 	.4byte sub_81D581C
@@ -2020,10 +3172,12 @@ gUnknown_0862A660:: @ 862A660
 	.4byte gUnknown_085EB361
 
 gUnknown_0862A670:: @ 862A670
-	.incbin "baserom.gba", 0x62a670, 0x18
+	.byte 0, 0x64
+	.4byte NULL
+	.2byte 0, 0x103, 17, 1, 0, 0, 0, 0, 0
 
 gUnknown_0862A688:: @ 862A688
-	.incbin "baserom.gba", 0x62a688, 0x10
+	.2byte 0x3E, 0, 0x3F, 0, 0x40, 0, 0x41, 0
 
 gUnknown_0862A698:: @ 862A698
-	.incbin "baserom.gba", 0x62a698, 0x8
+	.byte 0, 1, 2, 3, 4, 5, 0, 0
diff --git a/data/pokenav/unk_struct_1.bin b/data/pokenav/unk_struct_1.bin
new file mode 100644
index 0000000000..18a696cf43
Binary files /dev/null and b/data/pokenav/unk_struct_1.bin differ
diff --git a/data/pokenav/unk_struct_2.bin b/data/pokenav/unk_struct_2.bin
new file mode 100644
index 0000000000..a3547fbbbb
Binary files /dev/null and b/data/pokenav/unk_struct_2.bin differ
diff --git a/data/pokenav/unk_struct_3.bin b/data/pokenav/unk_struct_3.bin
new file mode 100644
index 0000000000..93273aae28
Binary files /dev/null and b/data/pokenav/unk_struct_3.bin differ
diff --git a/data/pokenav/unk_struct_4.bin b/data/pokenav/unk_struct_4.bin
new file mode 100644
index 0000000000..569193acd3
Binary files /dev/null and b/data/pokenav/unk_struct_4.bin differ
diff --git a/data/unknown_jp_62609C.bin b/data/unknown_jp_62609C.bin
new file mode 100644
index 0000000000..1394e7aa8b
Binary files /dev/null and b/data/unknown_jp_62609C.bin differ
diff --git a/graphics/pokenav/86226E0.pal b/graphics/pokenav/86226E0.pal
new file mode 100755
index 0000000000..77e8abf070
--- /dev/null
+++ b/graphics/pokenav/86226E0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 255 255
+16 16 8
+222 222 230
+255 0 0
+230 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokenav/8622700.pal b/graphics/pokenav/8622700.pal
new file mode 100755
index 0000000000..f27c29bdfb
--- /dev/null
+++ b/graphics/pokenav/8622700.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 197 0
+246 197 123
+255 255 255
+106 115 123
+255 74 16
+65 8 8
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokenav/8622720.pal b/graphics/pokenav/8622720.pal
new file mode 100755
index 0000000000..25baec5176
--- /dev/null
+++ b/graphics/pokenav/8622720.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 197 0
+246 197 123
+255 255 255
+106 115 123
+0 0 0
+189 106 65
+49 65 74
+255 222 156
+180 131 82
+189 139 106
+197 197 197
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+255 74 16
+0 197 0
+246 197 123
+255 255 255
+106 115 123
+0 0 0
+189 106 65
+49 65 74
+255 222 156
+180 131 82
+189 139 106
+197 197 197
+197 197 197
+0 0 0
+0 0 0
+0 0 0
+189 106 65
diff --git a/graphics/pokenav/8622868.pal b/graphics/pokenav/8622868.pal
new file mode 100755
index 0000000000..c7abf2b874
--- /dev/null
+++ b/graphics/pokenav/8622868.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+0 0 0
+213 213 213
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokenav/86231E8.pal b/graphics/pokenav/86231E8.pal
new file mode 100755
index 0000000000..98c309d52a
--- /dev/null
+++ b/graphics/pokenav/86231E8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
+0 255 0
diff --git a/graphics/pokenav/8623208.pal b/graphics/pokenav/8623208.pal
new file mode 100755
index 0000000000..7c8a712755
--- /dev/null
+++ b/graphics/pokenav/8623208.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+98 98 98
+213 213 205
+65 205 255
+0 139 189
+255 156 148
+189 90 82
+98 98 115
+246 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokenav/8623228.png b/graphics/pokenav/8623228.png
new file mode 100755
index 0000000000..bf6d6178f3
Binary files /dev/null and b/graphics/pokenav/8623228.png differ
diff --git a/graphics/pokenav/862323C.bin b/graphics/pokenav/862323C.bin
new file mode 100755
index 0000000000..817decbb3d
Binary files /dev/null and b/graphics/pokenav/862323C.bin differ
diff --git a/graphics/pokenav/8623338.pal b/graphics/pokenav/8623338.pal
new file mode 100755
index 0000000000..9b39ac8cf9
--- /dev/null
+++ b/graphics/pokenav/8623338.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+189 222 246
+164 197 230
+172 205 230
+255 255 255
+230 238 246
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokenav/8623570.pal b/graphics/pokenav/8623570.pal
new file mode 100755
index 0000000000..18eea783eb
--- /dev/null
+++ b/graphics/pokenav/8623570.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 197 0
+98 172 230
+255 255 255
+106 115 123
+0 0 0
+41 222 255
+0 90 172
+255 164 205
+148 24 32
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokenav/8623790.pal b/graphics/pokenav/8623790.pal
new file mode 100755
index 0000000000..da3be28fd1
--- /dev/null
+++ b/graphics/pokenav/8623790.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 197 0
+255 156 106
+255 255 255
+106 115 123
+0 0 0
+41 222 255
+0 90 172
+255 164 205
+148 24 32
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokenav/8624098.pal b/graphics/pokenav/8624098.pal
new file mode 100755
index 0000000000..2fc3f3d064
--- /dev/null
+++ b/graphics/pokenav/8624098.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 197 0
+255 205 222
+0 0 0
+205 205 205
+0 0 0
+41 222 255
+0 90 172
+255 164 205
+148 24 32
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokenav/8625660.png b/graphics/pokenav/8625660.png
new file mode 100755
index 0000000000..84c74462d6
Binary files /dev/null and b/graphics/pokenav/8625660.png differ
diff --git a/graphics/pokenav/862A5D4.pal b/graphics/pokenav/862A5D4.pal
new file mode 100755
index 0000000000..4b0812f094
--- /dev/null
+++ b/graphics/pokenav/862A5D4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokenav/arrow2.png b/graphics/pokenav/arrow2.png
new file mode 100755
index 0000000000..963cc4a642
Binary files /dev/null and b/graphics/pokenav/arrow2.png differ
diff --git a/graphics/pokenav/arrows_matchcall.png b/graphics/pokenav/arrows_matchcall.png
new file mode 100755
index 0000000000..8b13338d54
Binary files /dev/null and b/graphics/pokenav/arrows_matchcall.png differ
diff --git a/graphics/pokenav/bg.bin b/graphics/pokenav/bg.bin
new file mode 100755
index 0000000000..7161609bb0
Binary files /dev/null and b/graphics/pokenav/bg.bin differ
diff --git a/graphics/pokenav/bg.png b/graphics/pokenav/bg.png
new file mode 100755
index 0000000000..056e2400b8
Binary files /dev/null and b/graphics/pokenav/bg.png differ
diff --git a/graphics/pokenav/blue_light.png b/graphics/pokenav/blue_light.png
new file mode 100755
index 0000000000..c32a9b9be9
Binary files /dev/null and b/graphics/pokenav/blue_light.png differ
diff --git a/graphics/pokenav/city_maps/dewford_0.bin b/graphics/pokenav/city_maps/dewford_0.bin
new file mode 100755
index 0000000000..1cfedcec7f
Binary files /dev/null and b/graphics/pokenav/city_maps/dewford_0.bin differ
diff --git a/graphics/pokenav/city_maps/ever_grande_0.bin b/graphics/pokenav/city_maps/ever_grande_0.bin
new file mode 100755
index 0000000000..7a8d4019d4
Binary files /dev/null and b/graphics/pokenav/city_maps/ever_grande_0.bin differ
diff --git a/graphics/pokenav/city_maps/ever_grande_1.bin b/graphics/pokenav/city_maps/ever_grande_1.bin
new file mode 100755
index 0000000000..7721054d06
Binary files /dev/null and b/graphics/pokenav/city_maps/ever_grande_1.bin differ
diff --git a/graphics/pokenav/city_maps/fallarbor_0.bin b/graphics/pokenav/city_maps/fallarbor_0.bin
new file mode 100755
index 0000000000..fc7126f37a
Binary files /dev/null and b/graphics/pokenav/city_maps/fallarbor_0.bin differ
diff --git a/graphics/pokenav/city_maps/fortree_0.bin b/graphics/pokenav/city_maps/fortree_0.bin
new file mode 100755
index 0000000000..223e9a4871
Binary files /dev/null and b/graphics/pokenav/city_maps/fortree_0.bin differ
diff --git a/graphics/pokenav/city_maps/lavaridge_0.bin b/graphics/pokenav/city_maps/lavaridge_0.bin
new file mode 100755
index 0000000000..7920578ea3
Binary files /dev/null and b/graphics/pokenav/city_maps/lavaridge_0.bin differ
diff --git a/graphics/pokenav/city_maps/lilycove_0.bin b/graphics/pokenav/city_maps/lilycove_0.bin
new file mode 100755
index 0000000000..e8bf09eaef
Binary files /dev/null and b/graphics/pokenav/city_maps/lilycove_0.bin differ
diff --git a/graphics/pokenav/city_maps/lilycove_1.bin b/graphics/pokenav/city_maps/lilycove_1.bin
new file mode 100755
index 0000000000..99895574d1
Binary files /dev/null and b/graphics/pokenav/city_maps/lilycove_1.bin differ
diff --git a/graphics/pokenav/city_maps/littleroot_0.bin b/graphics/pokenav/city_maps/littleroot_0.bin
new file mode 100755
index 0000000000..902ce80bb9
Binary files /dev/null and b/graphics/pokenav/city_maps/littleroot_0.bin differ
diff --git a/graphics/pokenav/city_maps/mauville_0.bin b/graphics/pokenav/city_maps/mauville_0.bin
new file mode 100755
index 0000000000..103d39e54b
Binary files /dev/null and b/graphics/pokenav/city_maps/mauville_0.bin differ
diff --git a/graphics/pokenav/city_maps/mauville_1.bin b/graphics/pokenav/city_maps/mauville_1.bin
new file mode 100755
index 0000000000..a0662010a7
Binary files /dev/null and b/graphics/pokenav/city_maps/mauville_1.bin differ
diff --git a/graphics/pokenav/city_maps/mossdeep_0.bin b/graphics/pokenav/city_maps/mossdeep_0.bin
new file mode 100755
index 0000000000..fd03cfe023
Binary files /dev/null and b/graphics/pokenav/city_maps/mossdeep_0.bin differ
diff --git a/graphics/pokenav/city_maps/mossdeep_1.bin b/graphics/pokenav/city_maps/mossdeep_1.bin
new file mode 100755
index 0000000000..6c11d5624f
Binary files /dev/null and b/graphics/pokenav/city_maps/mossdeep_1.bin differ
diff --git a/graphics/pokenav/city_maps/oldale_0.bin b/graphics/pokenav/city_maps/oldale_0.bin
new file mode 100755
index 0000000000..297bf4c058
Binary files /dev/null and b/graphics/pokenav/city_maps/oldale_0.bin differ
diff --git a/graphics/pokenav/city_maps/pacifidlog_0.bin b/graphics/pokenav/city_maps/pacifidlog_0.bin
new file mode 100755
index 0000000000..eb3f192460
Binary files /dev/null and b/graphics/pokenav/city_maps/pacifidlog_0.bin differ
diff --git a/graphics/pokenav/city_maps/petalburg_0.bin b/graphics/pokenav/city_maps/petalburg_0.bin
new file mode 100755
index 0000000000..45124943d9
Binary files /dev/null and b/graphics/pokenav/city_maps/petalburg_0.bin differ
diff --git a/graphics/pokenav/city_maps/rustboro_0.bin b/graphics/pokenav/city_maps/rustboro_0.bin
new file mode 100755
index 0000000000..ccf5b21a2a
Binary files /dev/null and b/graphics/pokenav/city_maps/rustboro_0.bin differ
diff --git a/graphics/pokenav/city_maps/rustboro_1.bin b/graphics/pokenav/city_maps/rustboro_1.bin
new file mode 100755
index 0000000000..961dd0dcc2
Binary files /dev/null and b/graphics/pokenav/city_maps/rustboro_1.bin differ
diff --git a/graphics/pokenav/city_maps/slateport_0.bin b/graphics/pokenav/city_maps/slateport_0.bin
new file mode 100755
index 0000000000..bdc1391c39
Binary files /dev/null and b/graphics/pokenav/city_maps/slateport_0.bin differ
diff --git a/graphics/pokenav/city_maps/slateport_1.bin b/graphics/pokenav/city_maps/slateport_1.bin
new file mode 100755
index 0000000000..11815b2a5e
Binary files /dev/null and b/graphics/pokenav/city_maps/slateport_1.bin differ
diff --git a/graphics/pokenav/city_maps/sootopolis_0.bin b/graphics/pokenav/city_maps/sootopolis_0.bin
new file mode 100755
index 0000000000..78d069d56a
Binary files /dev/null and b/graphics/pokenav/city_maps/sootopolis_0.bin differ
diff --git a/graphics/pokenav/city_maps/verdanturf_0.bin b/graphics/pokenav/city_maps/verdanturf_0.bin
new file mode 100755
index 0000000000..2b651d26f8
Binary files /dev/null and b/graphics/pokenav/city_maps/verdanturf_0.bin differ
diff --git a/graphics/pokenav/condition_search2.bin b/graphics/pokenav/condition_search2.bin
new file mode 100755
index 0000000000..4c54a20702
Binary files /dev/null and b/graphics/pokenav/condition_search2.bin differ
diff --git a/graphics/pokenav/condition_search2.png b/graphics/pokenav/condition_search2.png
new file mode 100755
index 0000000000..c50985beef
Binary files /dev/null and b/graphics/pokenav/condition_search2.png differ
diff --git a/graphics/pokenav/icon2.png b/graphics/pokenav/icon2.png
new file mode 100755
index 0000000000..83624135ba
Binary files /dev/null and b/graphics/pokenav/icon2.png differ
diff --git a/graphics/pokenav/icon2_unused.png b/graphics/pokenav/icon2_unused.png
new file mode 100755
index 0000000000..c32a9b9be9
Binary files /dev/null and b/graphics/pokenav/icon2_unused.png differ
diff --git a/graphics/pokenav/outline.png b/graphics/pokenav/outline.png
new file mode 100755
index 0000000000..5700b272ce
Binary files /dev/null and b/graphics/pokenav/outline.png differ
diff --git a/graphics/pokenav/outline_map.bin b/graphics/pokenav/outline_map.bin
new file mode 100755
index 0000000000..6d70bdcd97
Binary files /dev/null and b/graphics/pokenav/outline_map.bin differ
diff --git a/graphics/pokenav/pokeball.png b/graphics/pokenav/pokeball.png
new file mode 100755
index 0000000000..9eb7d91651
Binary files /dev/null and b/graphics/pokenav/pokeball.png differ
diff --git a/graphics/pokenav/pokeball_matchcall.pal b/graphics/pokenav/pokeball_matchcall.pal
new file mode 100755
index 0000000000..25baec5176
--- /dev/null
+++ b/graphics/pokenav/pokeball_matchcall.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 197 0
+246 197 123
+255 255 255
+106 115 123
+0 0 0
+189 106 65
+49 65 74
+255 222 156
+180 131 82
+189 139 106
+197 197 197
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+255 74 16
+0 197 0
+246 197 123
+255 255 255
+106 115 123
+0 0 0
+189 106 65
+49 65 74
+255 222 156
+180 131 82
+189 139 106
+197 197 197
+197 197 197
+0 0 0
+0 0 0
+0 0 0
+189 106 65
diff --git a/graphics/pokenav/pokeball_matchcall.png b/graphics/pokenav/pokeball_matchcall.png
new file mode 100755
index 0000000000..456994258a
Binary files /dev/null and b/graphics/pokenav/pokeball_matchcall.png differ
diff --git a/graphics/pokenav/ribbons_icon.png b/graphics/pokenav/ribbons_icon.png
new file mode 100755
index 0000000000..095891feb7
Binary files /dev/null and b/graphics/pokenav/ribbons_icon.png differ
diff --git a/graphics/pokenav/ribbons_icon1.pal b/graphics/pokenav/ribbons_icon1.pal
new file mode 100755
index 0000000000..ae6725c654
--- /dev/null
+++ b/graphics/pokenav/ribbons_icon1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 246
+74 74 82
+139 139 156
+222 222 230
+255 255 255
+246 246 98
+197 197 98
+156 156 32
+197 65 65
+238 90 65
+164 98 205
+197 106 255
+0 0 0
+0 197 255
+0 0 0
+0 0 0
diff --git a/graphics/pokenav/ribbons_icon2.pal b/graphics/pokenav/ribbons_icon2.pal
new file mode 100755
index 0000000000..78dcdf6f03
--- /dev/null
+++ b/graphics/pokenav/ribbons_icon2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 246
+74 74 82
+139 139 156
+222 222 230
+255 255 255
+246 246 98
+197 197 98
+156 156 32
+98 123 197
+98 156 255
+0 0 0
+0 0 0
+0 0 0
+98 238 0
+74 90 180
+90 115 238
diff --git a/graphics/pokenav/ribbons_icon3.pal b/graphics/pokenav/ribbons_icon3.pal
new file mode 100755
index 0000000000..7deb2fd4de
--- /dev/null
+++ b/graphics/pokenav/ribbons_icon3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 246
+74 74 82
+139 139 156
+222 222 230
+255 255 255
+246 246 98
+197 197 98
+156 156 32
+205 115 131
+246 156 172
+197 98 82
+238 139 65
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokenav/ribbons_icon4.pal b/graphics/pokenav/ribbons_icon4.pal
new file mode 100755
index 0000000000..3321186ed1
--- /dev/null
+++ b/graphics/pokenav/ribbons_icon4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 246
+74 74 82
+139 139 156
+222 222 230
+255 255 255
+246 246 98
+197 197 98
+156 156 32
+106 213 82
+180 246 115
+156 156 172
+222 222 205
+0 0 0
+139 139 213
+148 106 82
+205 172 98
diff --git a/graphics/pokenav/ribbons_icon5.pal b/graphics/pokenav/ribbons_icon5.pal
new file mode 100755
index 0000000000..0a01d552fe
--- /dev/null
+++ b/graphics/pokenav/ribbons_icon5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 197 246
+74 74 82
+139 139 156
+222 222 230
+255 255 255
+246 246 98
+197 197 98
+156 156 32
+197 164 65
+255 222 65
+189 189 57
+238 238 65
+0 0 0
+238 90 65
+90 139 230
+90 172 255
diff --git a/graphics/pokenav/ribbons_icon_big.png b/graphics/pokenav/ribbons_icon_big.png
new file mode 100755
index 0000000000..cf8c8cb322
Binary files /dev/null and b/graphics/pokenav/ribbons_icon_big.png differ
diff --git a/graphics/pokenav/sparkle.png b/graphics/pokenav/sparkle.png
new file mode 100755
index 0000000000..5949b376ef
Binary files /dev/null and b/graphics/pokenav/sparkle.png differ
diff --git a/graphics/pokenav/ui_matchcall.bin b/graphics/pokenav/ui_matchcall.bin
new file mode 100755
index 0000000000..9aec20dfe9
Binary files /dev/null and b/graphics/pokenav/ui_matchcall.bin differ
diff --git a/graphics/pokenav/ui_matchcall.png b/graphics/pokenav/ui_matchcall.png
new file mode 100755
index 0000000000..24c6c2ff66
Binary files /dev/null and b/graphics/pokenav/ui_matchcall.png differ
diff --git a/graphics/pokenav/ui_ribbons.bin b/graphics/pokenav/ui_ribbons.bin
new file mode 100755
index 0000000000..4c54a20702
Binary files /dev/null and b/graphics/pokenav/ui_ribbons.bin differ
diff --git a/graphics/pokenav/ui_ribbons.png b/graphics/pokenav/ui_ribbons.png
new file mode 100755
index 0000000000..aa9d9e305c
Binary files /dev/null and b/graphics/pokenav/ui_ribbons.png differ
diff --git a/graphics/pokenav/zoom_tiles.png b/graphics/pokenav/zoom_tiles.png
new file mode 100755
index 0000000000..40ae2717b6
Binary files /dev/null and b/graphics/pokenav/zoom_tiles.png differ
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index c9745e7def..2af8259447 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -15,7 +15,7 @@ TYPESGFXDIR := graphics/types
 RAYQUAZAGFXDIR := graphics/rayquaza_scene
 ROULETTEGFXDIR := graphics/roulette
 SLOTMACHINEGFXDIR := graphics/slot_machine
-PKNAVGFXDIR := graphics/pokenav/
+PKNAVGFXDIR := graphics/pokenav
 PKNAVOPTIONSGFXDIR := graphics/pokenav/options
 PSSGFXDIR := graphics/pokemon_storage
 
@@ -23,33 +23,33 @@ types := normal fight flying poison ground rock bug ghost steel mystery fire wat
 contest_types := cool beauty cute smart tough
 
 $(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \
-                                                   $(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \
-                                                   $(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \
-                                                   $(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp
+												   $(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \
+												   $(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \
+												   $(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp
 	@cat $^ >$@
 
 $(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \
-                                      $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \
-                                      $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \
-                                      $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp
+									  $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \
+									  $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \
+									  $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp
 	@cat $^ >$@
 
 $(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \
-                                        $(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \
-                                        $(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \
-                                        $(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp
+										$(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \
+										$(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \
+										$(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp
 	@cat $^ >$@
 
 $(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \
-                                      $(MONPALDIR)/castform_sunny_form_palette.gbapal \
-                                      $(MONPALDIR)/castform_rainy_form_palette.gbapal \
-                                      $(MONPALDIR)/castform_snowy_form_palette.gbapal
+									  $(MONPALDIR)/castform_sunny_form_palette.gbapal \
+									  $(MONPALDIR)/castform_rainy_form_palette.gbapal \
+									  $(MONPALDIR)/castform_snowy_form_palette.gbapal
 	@cat $^ >$@
 
 $(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \
-                                            $(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \
-                                            $(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \
-                                            $(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal
+											$(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \
+											$(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \
+											$(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal
 	@cat $^ >$@
 
 $(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png
@@ -300,7 +300,7 @@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
 
 graphics/intro/copyright.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 39
-    
+	
 graphics/interface/pkmnjump_bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 63
 
@@ -311,44 +311,44 @@ graphics/misc/japanese_hof.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 29
 
 $(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal \
-                        $(MENUGFXDIR)/menu_1.gbapal
+						$(MENUGFXDIR)/menu_1.gbapal
 	@cat $^ >$@
 
 $(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \
-                          $(BTLANMSPRGFXDIR)/010_1.4bpp \
-                          $(BTLANMSPRGFXDIR)/010_2.4bpp \
-                          $(BTLANMSPRGFXDIR)/010_3.4bpp
+						  $(BTLANMSPRGFXDIR)/010_1.4bpp \
+						  $(BTLANMSPRGFXDIR)/010_2.4bpp \
+						  $(BTLANMSPRGFXDIR)/010_3.4bpp
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \
-                                    $(UNUSEDGFXDIR)/old_pal2.gbapal \
-                                    $(UNUSEDGFXDIR)/old_pal3.gbapal
+									$(UNUSEDGFXDIR)/old_pal2.gbapal \
+									$(UNUSEDGFXDIR)/old_pal3.gbapal
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal \
-                                    $(UNUSEDGFXDIR)/old_pal6.gbapal \
-                                    $(UNUSEDGFXDIR)/old_pal7.gbapal
+									$(UNUSEDGFXDIR)/old_pal6.gbapal \
+									$(UNUSEDGFXDIR)/old_pal7.gbapal
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp \
-                           $(UNUSEDGFXDIR)/old_charizard.4bpp
+						   $(UNUSEDGFXDIR)/old_charizard.4bpp
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \
-                           $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \
-                           $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \
-                           $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp
+						   $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \
+						   $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \
+						   $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp
 	@cat $^ >$@
 
 $(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp \
-                            $(MENUGFXDIR)/numbers1.4bpp \
-                            $(MENUGFXDIR)/numbers2.4bpp
+							$(MENUGFXDIR)/numbers1.4bpp \
+							$(MENUGFXDIR)/numbers2.4bpp
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
-                                          $(UNUSEDGFXDIR)/yellow_frame.bin \
-                                          $(UNUSEDGFXDIR)/green_frame.bin \
-                                          $(UNUSEDGFXDIR)/blank_frame.bin
+										  $(UNUSEDGFXDIR)/yellow_frame.bin \
+										  $(UNUSEDGFXDIR)/green_frame.bin \
+										  $(UNUSEDGFXDIR)/blank_frame.bin
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png
@@ -358,38 +358,38 @@ $(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 5
 
 $(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp \
-                                  $(UNUSEDGFXDIR)/old_contest_floor.4bpp \
-                                  $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \
-                                  $(UNUSEDGFXDIR)/old_contest_symbols.4bpp \
-                                  $(UNUSEDGFXDIR)/old_contest_meter.4bpp \
-                                  $(UNUSEDGFXDIR)/old_contest_classes.4bpp \
-                                  $(UNUSEDGFXDIR)/old_contest_numbers.4bpp
+								  $(UNUSEDGFXDIR)/old_contest_floor.4bpp \
+								  $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \
+								  $(UNUSEDGFXDIR)/old_contest_symbols.4bpp \
+								  $(UNUSEDGFXDIR)/old_contest_meter.4bpp \
+								  $(UNUSEDGFXDIR)/old_contest_classes.4bpp \
+								  $(UNUSEDGFXDIR)/old_contest_numbers.4bpp
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \
-                                    $(UNUSEDGFXDIR)/old_contest_2_2.4bpp
+									$(UNUSEDGFXDIR)/old_contest_2_2.4bpp
 	@cat $^ >$@
 
 $(UNKNOWNGFXDIR)/unknown_C19470.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 36
 
 $(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp \
-                          $(BTLANMSPRGFXDIR)/141_1.4bpp \
-                          $(BTLANMSPRGFXDIR)/141_2.4bpp \
-                          $(BTLANMSPRGFXDIR)/141_3.4bpp \
-                          $(BTLANMSPRGFXDIR)/141_4.4bpp
+						  $(BTLANMSPRGFXDIR)/141_1.4bpp \
+						  $(BTLANMSPRGFXDIR)/141_2.4bpp \
+						  $(BTLANMSPRGFXDIR)/141_3.4bpp \
+						  $(BTLANMSPRGFXDIR)/141_4.4bpp
 	@cat $^ >$@
 
 $(BTLANMSPRGFXDIR)/074.4bpp: $(BTLANMSPRGFXDIR)/074_0.4bpp \
-                          $(BTLANMSPRGFXDIR)/074_1.4bpp
+						  $(BTLANMSPRGFXDIR)/074_1.4bpp
 	@cat $^ >$@
 
 $(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp \
-                          $(BTLANMSPRGFXDIR)/159_1.4bpp
+						  $(BTLANMSPRGFXDIR)/159_1.4bpp
 	@cat $^ >$@
 
 $(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp \
-                          $(BTLANMSPRGFXDIR)/001_1.4bpp
+						  $(BTLANMSPRGFXDIR)/001_1.4bpp
 	@cat $^ >$@
 
 $(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png
@@ -405,8 +405,8 @@ $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types
 	@cat $^ >$@
 
 $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \
-                               $(TYPESGFXDIR)/move_types_2.gbapal \
-                               $(TYPESGFXDIR)/move_types_3.gbapal
+							   $(TYPESGFXDIR)/move_types_2.gbapal \
+							   $(TYPESGFXDIR)/move_types_3.gbapal
 	@cat $^ >$@
 
 $(MENUGFXDIR)/bag_screen.4bpp: %.4bpp: %.png
@@ -435,13 +435,13 @@ graphics/picture_frame/frame5.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 86
 
 $(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \
-                                      $(ROULETTEGFXDIR)/tailow.4bpp
+									  $(ROULETTEGFXDIR)/tailow.4bpp
 	@cat $^ >$@
 
 $(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \
-                                    $(ROULETTEGFXDIR)/azurill.4bpp \
-                                    $(ROULETTEGFXDIR)/skitty.4bpp \
-                                    $(ROULETTEGFXDIR)/makuhita.4bpp
+									$(ROULETTEGFXDIR)/azurill.4bpp \
+									$(ROULETTEGFXDIR)/skitty.4bpp \
+									$(ROULETTEGFXDIR)/makuhita.4bpp
 	@cat $^ >$@
 
 $(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png
@@ -451,43 +451,25 @@ $(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 938
 
 $(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
-                                         $(BATTRANSGFXDIR)/frontier_squares_1.4bpp
+										 $(BATTRANSGFXDIR)/frontier_squares_1.4bpp
 	@cat $^ >$@
 
 $(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
-                                         $(BATTRANSGFXDIR)/frontier_squares_2.4bpp
+										 $(BATTRANSGFXDIR)/frontier_squares_2.4bpp
 	@cat $^ >$@
  
 $(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
-                                         $(BATTRANSGFXDIR)/frontier_squares_3.4bpp
+										 $(BATTRANSGFXDIR)/frontier_squares_3.4bpp
 	@cat $^ >$@
 
 $(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
-                                         $(BATTRANSGFXDIR)/frontier_squares_4.4bpp
+										 $(BATTRANSGFXDIR)/frontier_squares_4.4bpp
 	@cat $^ >$@
 
 $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.4bpp \
 										 $(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp
 	@cat $^ >$@
 
-$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/condition.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/match_call.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/ribbons.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/switch_off.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/party.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/search.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/cool.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/beauty.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/cute.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/smart.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/tough.4bpp \
-                                $(PKNAVOPTIONSGFXDIR)/cancel.4bpp
-	@cat $^ >$@
-
-$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
-
 $(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 374
 
@@ -646,3 +628,27 @@ $(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludico
 
 $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp
 	@cat $^ >$@
+
+$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/condition.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/match_call.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/ribbons.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/switch_off.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/party.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/search.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/cool.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/beauty.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/cute.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/smart.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/tough.4bpp \
+								$(PKNAVOPTIONSGFXDIR)/cancel.4bpp
+	@cat $^ >$@
+
+$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 53
+
+$(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 53
+	
+$(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 13
diff --git a/tools/gbagfx/convert_png.c b/tools/gbagfx/convert_png.c
index 37904318c1..cdfa39a7ad 100644
--- a/tools/gbagfx/convert_png.c
+++ b/tools/gbagfx/convert_png.c
@@ -45,6 +45,40 @@ static FILE *PngReadOpen(char *path, png_structp *pngStruct, png_infop *pngInfo)
     return fp;
 }
 
+static unsigned char *ConvertBitDepth(unsigned char *src, int srcBitDepth, int destBitDepth, int numPixels)
+{
+    // Round the number of bits up to the next 8 and divide by 8 to get the number of bytes.
+    int srcSize = ((numPixels * srcBitDepth + 7) & ~7) / 8;
+    int destSize = ((numPixels * destBitDepth + 7) & ~7) / 8;
+    unsigned char *output = calloc(destSize, 1);
+    unsigned char *dest = output;
+    int i;
+    int j;
+    int destBit = 8 - destBitDepth;
+
+    for (i = 0; i < srcSize; i++)
+    {
+        unsigned char srcByte = src[i];
+
+        for (j = 8 - srcBitDepth; j >= 0; j -= srcBitDepth)
+        {
+            unsigned char pixel = (srcByte >> j) % (1 << srcBitDepth);
+
+            if (pixel >= (1 << destBitDepth))
+                FATAL_ERROR("Image exceeds the maximum color value for a %ibpp image.\n", destBitDepth);
+            *dest |= pixel << destBit;
+            destBit -= destBitDepth;
+            if (destBit < 0)
+            {
+                dest++;
+                destBit = 8 - destBitDepth;
+            }
+        }
+    }
+
+    return output;
+}
+
 void ReadPng(char *path, struct Image *image)
 {
     png_structp png_ptr;
@@ -54,9 +88,6 @@ void ReadPng(char *path, struct Image *image)
 
     int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
 
-    if (bit_depth != image->bitDepth)
-        FATAL_ERROR("\"%s\" has a bit depth of %d, but the expected bit depth is %d.\n", path, bit_depth, image->bitDepth);
-
     int color_type = png_get_color_type(png_ptr, info_ptr);
 
     if (color_type != PNG_COLOR_TYPE_GRAY && color_type != PNG_COLOR_TYPE_PALETTE)
@@ -93,6 +124,17 @@ void ReadPng(char *path, struct Image *image)
 
     free(row_pointers);
     fclose(fp);
+
+    if (bit_depth != image->bitDepth)
+    {
+        unsigned char *src = image->pixels;
+
+        if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 && bit_depth != 8)
+            FATAL_ERROR("Bit depth of image must be 1, 2, 4, or 8.\n");
+        image->pixels = ConvertBitDepth(image->pixels, bit_depth, image->bitDepth, image->width * image->height);
+        free(src);
+        image->bitDepth = bit_depth;
+    }
 }
 
 void ReadPngPalette(char *path, struct Palette *palette)