Merge remote-tracking branch 'Bird/dump_pokenav.s'

This commit is contained in:
Diegoisawesome 2018-01-18 14:38:45 -06:00
commit b7ee548897
73 changed files with 1998 additions and 270 deletions

View File

@ -6948,7 +6948,7 @@ sub_81CA818: @ 81CA818
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r5, =gUnknown_0861FC7A ldr r5, =gUnknown_0861FC78 + 2
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
adds r2, r5, 0 adds r2, r5, 0
@ -6967,7 +6967,7 @@ sub_81CA818: @ 81CA818
thumb_func_start sub_81CA850 thumb_func_start sub_81CA850
sub_81CA850: @ 81CA850 sub_81CA850: @ 81CA850
push {lr} push {lr}
ldr r0, =gUnknown_0861FC86 ldr r0, =gUnknown_0861FC78 + 0xE
movs r1, 0x31 movs r1, 0x31
movs r2, 0x4 movs r2, 0x4
bl sub_81C7944 bl sub_81C7944
@ -6985,7 +6985,7 @@ sub_81CA864: @ 81CA864
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r5, =gUnknown_0861FC86 ldr r5, =gUnknown_0861FC78 + 0xE
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
adds r2, r5, 0 adds r2, r5, 0
@ -26754,7 +26754,7 @@ _081D4368:
b _081D449E b _081D449E
_081D4394: _081D4394:
movs r3, 0 movs r3, 0
ldr r1, =gUnknown_0862608E ldr r1, =gUnknown_0862608C + 2
adds r0, r7, r1 adds r0, r7, r1
movs r2, 0x16 movs r2, 0x16
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
@ -26887,7 +26887,7 @@ _081D449E:
mov r3, r10 mov r3, r10
adds r4, r0, r3 adds r4, r0, r3
ldr r6, =gUnknown_0862608C ldr r6, =gUnknown_0862608C
ldr r1, =gUnknown_0862608E ldr r1, =gUnknown_0862608C + 2
adds r0, r7, r1 adds r0, r7, r1
movs r3, 0x16 movs r3, 0x16
ldrsh r1, [r4, r3] ldrsh r1, [r4, r3]

View File

@ -8912,6 +8912,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Youre an inspiration!\n" .string "Youre an inspiration!\n"
.string "See you again!$" .string "See you again!$"
gText_Mom_Pokenav_2B227B:: @ 82B227B
.string "MOM: Your father and you\n" .string "MOM: Your father and you\n"
.string "Everyone is captivated by POKéMON.\p" .string "Everyone is captivated by POKéMON.\p"
.string "What is the charm of 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 "I adore POKéMON that help me with\l"
.string "my everyday chores.$" .string "my everyday chores.$"
gText_Mom_Pokenav_2B2310:: @ 82B2310
.string "MOM: Hi, {PLAYER}!\n" .string "MOM: Hi, {PLAYER}!\n"
.string "Your father keeps himself locked\l" .string "Your father keeps himself locked\l"
.string "away in the PETALBURG GYM.\p" .string "away in the PETALBURG GYM.\p"
@ -8928,11 +8930,13 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Im guessing that losing to you\n" .string "Im guessing that losing to you\n"
.string "was a big blow to his pride!$" .string "was a big blow to his pride!$"
gText_Mom_Pokenav_2B23F3:: @ 82B23F3
.string "MOM: {PLAYER}\n" .string "MOM: {PLAYER}\n"
.string "Dont worry about me or the house.\p" .string "Dont worry about me or the house.\p"
.string "Wear those RUNNING SHOES until\n" .string "Wear those RUNNING SHOES until\n"
.string "they fall apart, honey!$" .string "they fall apart, honey!$"
gText_Roxanne_Pokenav_2B2456:: @ 82B2456
.string "ROXANNE: Oh, hello, {PLAYER}!\p" .string "ROXANNE: Oh, hello, {PLAYER}!\p"
.string "Ive been hard at work retraining\n" .string "Ive been hard at work retraining\n"
.string "since we met.\p" .string "since we met.\p"
@ -8941,6 +8945,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "But when I do, please visit my GYM\n" .string "But when I do, please visit my GYM\n"
.string "for a rematch!$" .string "for a rematch!$"
gText_Roxanne_Pokenav_2B250E:: @ 82B250E
.string "ROXANNE: Is this {PLAYER}?\n" .string "ROXANNE: Is this {PLAYER}?\n"
.string "Congratulations!\l" .string "Congratulations!\l"
.string "Ive been hearing about you!\p" .string "Ive been hearing about you!\p"
@ -8949,15 +8954,18 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "But when I do, please visit my GYM\n" .string "But when I do, please visit my GYM\n"
.string "for a rematch!$" .string "for a rematch!$"
gText_Roxanne_Pokenav_2B25C1:: @ 82B25C1
.string "ROXANNE: {PLAYER}!\n" .string "ROXANNE: {PLAYER}!\n"
.string "My GYM is ready!\p" .string "My GYM is ready!\p"
.string "Please visit RUSTBORO whenever\n" .string "Please visit RUSTBORO whenever\n"
.string "you can!$" .string "you can!$"
gText_Roxanne_Pokenav_2B2607:: @ 82B2607
.string "ROXANNE: At the RUSTBORO GYM,\n" .string "ROXANNE: At the RUSTBORO GYM,\n"
.string "the fact that we battled, {PLAYER},\l" .string "the fact that we battled, {PLAYER},\l"
.string "is a matter of pride.$" .string "is a matter of pride.$"
gText_Brawly_Pokenav_2B2659:: @ 82B2659
.string "BRAWLY: Hey, there, {PLAYER}{STRING 5}!\p" .string "BRAWLY: Hey, there, {PLAYER}{STRING 5}!\p"
.string "I learned a lot from the battle we\n" .string "I learned a lot from the battle we\n"
.string "had together.\p" .string "had together.\p"
@ -8968,6 +8976,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "But if I can reopen the GYM,\n" .string "But if I can reopen the GYM,\n"
.string "I want you to challenge us again.$" .string "I want you to challenge us again.$"
gText_Brawly_Pokenav_2B275D:: @ 82B275D
.string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n" .string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n"
.string "Congratulations!\p" .string "Congratulations!\p"
.string "Word about your exploits arrived\n" .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 "But if I can reopen the GYM,\n"
.string "I want you to challenge us again.$" .string "I want you to challenge us again.$"
gText_Brawly_Pokenav_2B286F:: @ 82B286F
.string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n" .string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n"
.string "My GYMs ready for action!\p" .string "My GYMs ready for action!\p"
.string "Come back to DEWFORD anytime\n" .string "Come back to DEWFORD anytime\n"
.string "for another challenge!$" .string "for another challenge!$"
gText_Brawly_Pokenav_2B28D1:: @ 82B28D1
.string "BRAWLY: {PLAYER}{STRING 5}, I dont think\n" .string "BRAWLY: {PLAYER}{STRING 5}, I dont think\n"
.string "Ill ever get bored of battling you!$" .string "Ill ever get bored of battling you!$"
gText_Wattson_Pokenav_2B2912:: @ 82B2912
.string "WATTSON: Oh, its you!\p" .string "WATTSON: Oh, its you!\p"
.string "After you left, Ive been redoing\n" .string "After you left, Ive been redoing\n"
.string "my training from scratch.\p" .string "my training from scratch.\p"
@ -8995,6 +9007,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Youll have to wait till then!\n" .string "Youll have to wait till then!\n"
.string "Wahahahaha!$" .string "Wahahahaha!$"
gText_Wattson_Pokenav_2B29CA:: @ 82B29CA
.string "WATTSON: Wahahahaha!\p" .string "WATTSON: Wahahahaha!\p"
.string "Youve really done it, havent you?\n" .string "Youve really done it, havent you?\n"
.string "Ive been getting word about you!\p" .string "Ive been getting word about you!\p"
@ -9005,15 +9018,18 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Youll have to wait till then!\n" .string "Youll have to wait till then!\n"
.string "Wahahahaha!$" .string "Wahahahaha!$"
gText_Wattson_Pokenav_2B2AB6:: @ 82B2AB6
.string "WATTSON: Oh, its you!\n" .string "WATTSON: Oh, its you!\n"
.string "My GYMs ready!\p" .string "My GYMs ready!\p"
.string "Visit MAUVILLE anytime!\n" .string "Visit MAUVILLE anytime!\n"
.string "Wahahahaha!$" .string "Wahahahaha!$"
gText_Wattson_Pokenav_2B2B01:: @ 82B2B01
.string "WATTSON: Wahahaha!\p" .string "WATTSON: Wahahaha!\p"
.string "A battle with you is always charged\n" .string "A battle with you is always charged\n"
.string "with shocking power!$" .string "with shocking power!$"
gText_Flannery_Pokenav_2B2B4D:: @ 82B2B4D
.string "FLANNERY: {PLAYER}\p" .string "FLANNERY: {PLAYER}\p"
.string "When we battled, I learned exactly\n" .string "When we battled, I learned exactly\n"
.string "how immature I was.\p" .string "how immature I was.\p"
@ -9023,6 +9039,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "When the time comes, {PLAYER},\n" .string "When the time comes, {PLAYER},\n"
.string "please challenge us again.$" .string "please challenge us again.$"
gText_Flannery_Pokenav_2B2C0E:: @ 82B2C0E
.string "FLANNERY: Hello, {PLAYER}?\n" .string "FLANNERY: Hello, {PLAYER}?\n"
.string "Congratulations!\p" .string "Congratulations!\p"
.string "Word of your success has reached\n" .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 "appear beside my name in the\l"
.string "MATCH CALL list.$" .string "MATCH CALL list.$"
gText_Flannery_Pokenav_2B2CF1:: @ 82B2CF1
.string "FLANNERY: Oh, {PLAYER}?\n" .string "FLANNERY: Oh, {PLAYER}?\n"
.string "Our GYMs ready!\p" .string "Our GYMs ready!\p"
.string "Come to LAVARIDGE for a soak\n" .string "Come to LAVARIDGE for a soak\n"
.string "in the hot spring and a challenge!$" .string "in the hot spring and a challenge!$"
gText_Flannery_Pokenav_2B2D54:: @ 82B2D54
.string "FLANNERY: {PLAYER}\n" .string "FLANNERY: {PLAYER}\n"
.string "Im positive that you keep getting\l" .string "Im positive that you keep getting\l"
.string "better at training every time.$" .string "better at training every time.$"
gText_Winona_Pokenav_2B2DA4:: @ 82B2DA4
.string "WINONA: Hello, {PLAYER}!\p" .string "WINONA: Hello, {PLAYER}!\p"
.string "Thanks to our battle, Ive come\n" .string "Thanks to our battle, Ive come\n"
.string "to understand my weak points!\p" .string "to understand my weak points!\p"
.string "When I reopen the GYM, I wont go\n" .string "When I reopen the GYM, I wont go\n"
.string "down in defeat again!$" .string "down in defeat again!$"
gText_Winona_Pokenav_2B2E2B:: @ 82B2E2B
.string "WINONA: Youve done it, {PLAYER}!\p" .string "WINONA: Youve done it, {PLAYER}!\p"
.string "News about the new CHAMPION\n" .string "News about the new CHAMPION\n"
.string "has reached us in FORTREE!\p" .string "has reached us in FORTREE!\p"
.string "But The next time we battle,\n" .string "But The next time we battle,\n"
.string "its not going to end the same way.$" .string "its not going to end the same way.$"
gText_Winona_Pokenav_2B2EC2:: @ 82B2EC2
.string "WINONA: Is this {PLAYER}?\n" .string "WINONA: Is this {PLAYER}?\n"
.string "Our GYM is back in operation!\p" .string "Our GYM is back in operation!\p"
.string "Were waiting for you in FORTREE!$" .string "Were waiting for you in FORTREE!$"
gText_Winona_Pokenav_2B2F16:: @ 82B2F16
.string "WINONA: {PLAYER}\n" .string "WINONA: {PLAYER}\n"
.string "Though I have lost, my wings will\l" .string "Though I have lost, my wings will\l"
.string "never break.\p" .string "never break.\p"
.string "Yes, in exactly the same way that\n" .string "Yes, in exactly the same way that\n"
.string "you never lost sight of your dream.$" .string "you never lost sight of your dream.$"
gText_TateLiza_Pokenav_2B2F97:: @ 82B2F97
.string "TATE: Oh! Youre\n" .string "TATE: Oh! Youre\n"
.string "LIZA: {PLAYER}!\p" .string "LIZA: {PLAYER}!\p"
.string "TATE: Were in training again\n" .string "TATE: Were in training again\n"
@ -9073,6 +9097,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "TATE: A markll appear by our name\n" .string "TATE: A markll appear by our name\n"
.string "LIZA: On the MATCH CALL list.$" .string "LIZA: On the MATCH CALL list.$"
gText_TateLiza_Pokenav_2B306E:: @ 82B306E
.string "TATE: {PLAYER}, congratulations!\n" .string "TATE: {PLAYER}, congratulations!\n"
.string "LIZA: {PLAYER}, congratulations!\p" .string "LIZA: {PLAYER}, congratulations!\p"
.string "TATE: The two of us are\n" .string "TATE: The two of us are\n"
@ -9082,6 +9107,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "TATE: A markll appear by our name\n" .string "TATE: A markll appear by our name\n"
.string "LIZA: On the MATCH CALL list.$" .string "LIZA: On the MATCH CALL list.$"
gText_TateLiza_Pokenav_2B3158:: @ 82B3158
.string "TATE: {PLAYER}!\n" .string "TATE: {PLAYER}!\n"
.string "LIZA: {PLAYER}!\p" .string "LIZA: {PLAYER}!\p"
.string "TATE: Our GYM is ready!\n" .string "TATE: Our GYM is ready!\n"
@ -9089,11 +9115,13 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "TATE: Please come visit\n" .string "TATE: Please come visit\n"
.string "LIZA: MOSSDEEP anytime!$" .string "LIZA: MOSSDEEP anytime!$"
gText_TateLiza_Pokenav_2B31CD:: @ 82B31CD
.string "TATE: {PLAYER}, the battle we had\n" .string "TATE: {PLAYER}, the battle we had\n"
.string "LIZA: Is an invaluable experience.\p" .string "LIZA: Is an invaluable experience.\p"
.string "TATE: It would be nice if\n" .string "TATE: It would be nice if\n"
.string "LIZA: We could all battle again!$" .string "LIZA: We could all battle again!$"
gText_Juan_Pokenav_2B3249:: @ 82B3249
.string "JUAN: Hmm\n" .string "JUAN: Hmm\n"
.string "{PLAYER}{STRING 5} Was it?\p" .string "{PLAYER}{STRING 5} Was it?\p"
.string "Our battle together--it brought\n" .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 "Perhaps you are a genius who may\n"
.string "yet surpass WALLACE!$" .string "yet surpass WALLACE!$"
gText_Juan_Pokenav_2B32EC:: @ 82B32EC
.string "JUAN: Fufu {PLAYER}{STRING 5}\n" .string "JUAN: Fufu {PLAYER}{STRING 5}\n"
.string "Youve finally achieved your goal.\p" .string "Youve finally achieved your goal.\p"
.string "My eye for appraising talent wasnt\n" .string "My eye for appraising talent wasnt\n"
@ -9110,12 +9139,14 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "you, for you have scaled the peak\l" .string "you, for you have scaled the peak\l"
.string "of power and prestige.$" .string "of power and prestige.$"
gText_Juan_Pokenav_2B33AA:: @ 82B33AA
.string "JUAN: Hoho {PLAYER}{STRING 5}\p" .string "JUAN: Hoho {PLAYER}{STRING 5}\p"
.string "Our SOOTOPOLIS GYM has finally\n" .string "Our SOOTOPOLIS GYM has finally\n"
.string "reopened.\p" .string "reopened.\p"
.string "If you wish to see me, you are\n" .string "If you wish to see me, you are\n"
.string "welcome to visit anytime.$" .string "welcome to visit anytime.$"
gText_Juan_Pokenav_2B341E:: @ 82B341E
.string "JUAN: {PLAYER}{STRING 5}\p" .string "JUAN: {PLAYER}{STRING 5}\p"
.string "Like the finest music, the battles\n" .string "Like the finest music, the battles\n"
.string "we wage together strike chords\l" .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 "When I close my eyes, I see visions\n"
.string "of you soaring with the melody$" .string "of you soaring with the melody$"
gText_Sidney_Pokenav_2B34CC:: @ 82B34CC
.string "SIDNEY: Yo, {PLAYER}!\p" .string "SIDNEY: Yo, {PLAYER}!\p"
.string "If you want to battle with me\n" .string "If you want to battle with me\n"
.string "again, you come on back whenever\l" .string "again, you come on back whenever\l"
@ -9130,6 +9162,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Ill always be here!\n" .string "Ill always be here!\n"
.string "Ill be waiting!$" .string "Ill be waiting!$"
gText_Phoebe_Pokenav_2B3561:: @ 82B3561
.string "PHOEBE: Hi, {PLAYER}!\p" .string "PHOEBE: Hi, {PLAYER}!\p"
.string "How about coming back here again\n" .string "How about coming back here again\n"
.string "sometime?\p" .string "sometime?\p"
@ -9137,6 +9170,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "your bond has grown with your\l" .string "your bond has grown with your\l"
.string "POKéMON.$" .string "POKéMON.$"
gText_Glacia_Pokenav_2B35E4:: @ 82B35E4
.string "GLACIA: Hello, {PLAYER}.\p" .string "GLACIA: Hello, {PLAYER}.\p"
.string "I trust you havent become\n" .string "I trust you havent become\n"
.string "complacent with your power?\p" .string "complacent with your power?\p"
@ -9144,6 +9178,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "hot emotions just a little, do come\l" .string "hot emotions just a little, do come\l"
.string "to the POKéMON LEAGUE$" .string "to the POKéMON LEAGUE$"
gText_Drake_Pokenav_2B368B:: @ 82B368B
.string "DRAKE: That voice {PLAYER}, is it?\n" .string "DRAKE: That voice {PLAYER}, is it?\n"
.string "You sound well\p" .string "You sound well\p"
.string "I understand that there is now\n" .string "I understand that there is now\n"
@ -9155,6 +9190,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "the POKéMON LEAGUE!\p" .string "the POKéMON LEAGUE!\p"
.string "Dont you agree, {PLAYER}?$" .string "Dont you agree, {PLAYER}?$"
gText_Wallace_Pokenav_2B3790:: @ 82B3790
.string "WALLACE: Hello, {PLAYER}{STRING 5}.\n" .string "WALLACE: Hello, {PLAYER}{STRING 5}.\n"
.string "Have you met STEVEN?\p" .string "Have you met STEVEN?\p"
.string "He is\n" .string "He is\n"
@ -9197,12 +9233,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string " \n" .string " \n"
.string " Click!$" .string " Click!$"
gText_May_Pokenav_2B3AB3:: @ 2B3AB3
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "MR. BRINEY retired as a SAILOR,\n" .string "MR. BRINEY retired as a SAILOR,\n"
.string "but I still see him out on the sea\l" .string "but I still see him out on the sea\l"
.string "with his pet PEEKO sometimes.\p" .string "with his pet PEEKO sometimes.\p"
.string "He must love the sea still.$" .string "He must love the sea still.$"
gText_May_Pokenav_2B3B3F:: @ 2B3B3F
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "You know how little towns like\n" .string "You know how little towns like\n"
.string "PETALBURG and DEWFORD have GYMS?\p" .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 "When they finally build a GYM there,\n"
.string "I should apply to be the LEADER.$" .string "I should apply to be the LEADER.$"
gText_May_Pokenav_2B3C13:: @ 2B3C13
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "Do you remember a man named\n" .string "Do you remember a man named\n"
.string "the CUTTER in RUSTBORO?\l" .string "the CUTTER in RUSTBORO?\l"
@ -9222,11 +9261,13 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string " \p" .string " \p"
.string "The ROCK SMASH GUY!$" .string "The ROCK SMASH GUY!$"
gText_May_Pokenav_2B3CF3:: @ 2B3CF3
.string "MAY: {PLAYER}{STRING 5}?\p" .string "MAY: {PLAYER}{STRING 5}?\p"
.string "RUSTURF TUNNEL\n" .string "RUSTURF TUNNEL\n"
.string "They named it that because it\l" .string "They named it that because it\l"
.string "joins RUSTBORO and VERDANTURF.$" .string "joins RUSTBORO and VERDANTURF.$"
gText_May_Pokenav_2B3D4B:: @ 2B3D4B
.string "MAY: {PLAYER}{STRING 5}, how are you?\p" .string "MAY: {PLAYER}{STRING 5}, how are you?\p"
.string "Im out on ROUTE 111 now.\p" .string "Im out on ROUTE 111 now.\p"
.string "Im going to get a rest at an old\n" .string "Im 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 "She lives just north of\n"
.string "the desert.$" .string "the desert.$"
gText_May_Pokenav_2B3DD1:: @ 2B3DD1
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "Did you know about the MIRAGE\n" .string "Did you know about the MIRAGE\n"
.string "TOWER in the desert?\p" .string "TOWER in the desert?\p"
@ -9241,18 +9283,21 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "to mysteriously come and go.\p" .string "to mysteriously come and go.\p"
.string "I wish I could see it.$" .string "I wish I could see it.$"
gText_May_Pokenav_2B3E69:: @ 2B3E69
.string "MAY: {PLAYER}{STRING 5}, yahoo!\n" .string "MAY: {PLAYER}{STRING 5}, yahoo!\n"
.string "Im on ROUTE 119 now.\p" .string "Im on ROUTE 119 now.\p"
.string "Theres a big river here, and\n" .string "Theres a big river here, and\n"
.string "it often rains.\p" .string "it often rains.\p"
.string "I got soaked!$" .string "I got soaked!$"
gText_May_Pokenav_2B3ECD:: @ 2B3ECD
.string "MAY: {PLAYER}{STRING 5}, hi.\p" .string "MAY: {PLAYER}{STRING 5}, hi.\p"
.string "MT. PYRE is a memorial to POKéMON\n" .string "MT. PYRE is a memorial to POKéMON\n"
.string "whose lives have ended.\p" .string "whose lives have ended.\p"
.string "Maybe as a result, its infested\n" .string "Maybe as a result, its infested\n"
.string "with many GHOST-type POKéMON!$" .string "with many GHOST-type POKéMON!$"
gText_May_Pokenav_2B3F2B:: @ 2B3F2B
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "I was thinking of going to the hot\n" .string "I was thinking of going to the hot\n"
.string "spring in LAVARIDGE.\p" .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 "PASS, I ran into some bad-looking\l"
.string "characters. The mood was ugly!$" .string "characters. The mood was ugly!$"
gText_May_Pokenav_2B3FFB:: @ 2B3FFB
.string "MAY: Hi, {PLAYER}{STRING 5}!\n" .string "MAY: Hi, {PLAYER}{STRING 5}!\n"
.string "Did you see the news?\p" .string "Did you see the news?\p"
.string "They say CAPT. STERN discovered\n" .string "They say CAPT. STERN discovered\n"
.string "the SEAFLOOR CAVERN while on his\l" .string "the SEAFLOOR CAVERN while on his\l"
.string "submarine expedition.$" .string "submarine expedition.$"
gText_May_Pokenav_2B402B:: @ 2B402B
.string "MAY: Hi, {PLAYER}{STRING 5}!\n" .string "MAY: Hi, {PLAYER}{STRING 5}!\n"
.string "Dont you think its neat?\p" .string "Dont you think its neat?\p"
.string "Even if you dont have a boat,\n" .string "Even if you dont have a boat,\n"
@ -9275,6 +9322,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Theres a POKéMON move that lets\n" .string "Theres a POKéMON move that lets\n"
.string "you go to the bottom of the sea.$" .string "you go to the bottom of the sea.$"
gText_May_Pokenav_2B414B:: @ 2B414B
.string "MAY: Hi, {PLAYER}{STRING 5}!\n" .string "MAY: Hi, {PLAYER}{STRING 5}!\n"
.string "Hope things are okay!\p" .string "Hope things are okay!\p"
.string "Have you been on the sea and\n" .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 "When you get to the other side,\n"
.string "come up to the surface. Easy!$" .string "come up to the surface. Easy!$"
gText_May_Pokenav_2B4228:: @ 2B4228
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "Hows it going?\n" .string "Hows it going?\n"
.string "Are you filling your POKéDEX?\p" .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 "And there are three of them!\p"
.string "I would love to see even one$" .string "I would love to see even one$"
gText_May_Pokenav_2B42E0:: @ 2B42E0
.string "MAY: {PLAYER}{STRING 5}!\n" .string "MAY: {PLAYER}{STRING 5}!\n"
.string "I heard the rumors!\p" .string "I heard the rumors!\p"
.string "You beat the SOOTOPOLIS GYM\n" .string "You beat the SOOTOPOLIS GYM\n"
@ -9300,6 +9350,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "That means you dont have far\n" .string "That means you dont have far\n"
.string "to go, do you?$" .string "to go, do you?$"
gText_May_Pokenav_2B4350:: @ 2B4350
.string "MAY: There isnt a single TRAINER\n" .string "MAY: There isnt a single TRAINER\n"
.string "left in HOENN who doesnt know who\l" .string "left in HOENN who doesnt know who\l"
.string "you are, {PLAYER}{STRING 5}!\p" .string "you are, {PLAYER}{STRING 5}!\p"
@ -9307,6 +9358,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "with you, {PLAYER}{STRING 5}, theyre all\l" .string "with you, {PLAYER}{STRING 5}, theyre all\l"
.string "surprised!$" .string "surprised!$"
gText_Brendan_Pokenav_2B43EF:: @ 2B43EF
.string "BRENDAN: Hey, {PLAYER}!\p" .string "BRENDAN: Hey, {PLAYER}!\p"
.string "MR. BRINEY retired as a SAILOR,\n" .string "MR. BRINEY retired as a SAILOR,\n"
.string "but I still see him out on the sea\l" .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 "I guess he must love\n"
.string "the sea still.$" .string "the sea still.$"
gText_Brendan_Pokenav_2B4486:: @ 2B4486
.string "BRENDAN: Hey, {PLAYER}!\p" .string "BRENDAN: Hey, {PLAYER}!\p"
.string "I dont get how little towns like\n" .string "I dont get how little towns like\n"
.string "PETALBURG and DEWFORD have GYMS.\p" .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 "When they finally build a GYM there,\n"
.string "I should apply to be the LEADER.$" .string "I should apply to be the LEADER.$"
gText_Brendan_Pokenav_2B4560:: @ 2B4560
.string "BRENDAN: Yo, {PLAYER}!\p" .string "BRENDAN: Yo, {PLAYER}!\p"
.string "Do you remember a guy named\n" .string "Do you remember a guy named\n"
.string "the CUTTER in RUSTBORO?\l" .string "the CUTTER in RUSTBORO?\l"
@ -9333,12 +9387,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string " \p" .string " \p"
.string "The ROCK SMASH GUY!$" .string "The ROCK SMASH GUY!$"
gText_Brendan_Pokenav_2B463F:: @ 2B463F
.string "BRENDAN: This voice {PLAYER}?\p" .string "BRENDAN: This voice {PLAYER}?\p"
.string "They gave RUSTURF TUNNEL its name\n" .string "They gave RUSTURF TUNNEL its name\n"
.string "because it joins RUSTBORO and\l" .string "because it joins RUSTBORO and\l"
.string "VERDANTURF.\p" .string "VERDANTURF.\p"
.string "Did you know that?$" .string "Did you know that?$"
gText_Brendan_Pokenav_2B46B7:: @ 2B46B7
.string "BRENDAN: {PLAYER}, whats up?\p" .string "BRENDAN: {PLAYER}, whats up?\p"
.string "Hey, Im out on ROUTE 111 now.\p" .string "Hey, Im out on ROUTE 111 now.\p"
.string "Im going to rest up at an old\n" .string "Im going to rest up at an old\n"
@ -9346,6 +9402,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "If youre in the area, you should\n" .string "If youre in the area, you should\n"
.string "visit her, too.$" .string "visit her, too.$"
gText_Brendan_Pokenav_2B4761:: @ 2B4761
.string "BRENDAN: Hey, {PLAYER}!\p" .string "BRENDAN: Hey, {PLAYER}!\p"
.string "Did you know about the MIRAGE\n" .string "Did you know about the MIRAGE\n"
.string "TOWER in the desert?\p" .string "TOWER in the desert?\p"
@ -9353,18 +9410,21 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "seen only sometimes.\p" .string "seen only sometimes.\p"
.string "Id like to see that!$" .string "Id like to see that!$"
gText_Brendan_Pokenav_2B47F4:: @ 2B47F4
.string "BRENDAN: Whos this? Oh, {PLAYER}?\n" .string "BRENDAN: Whos this? Oh, {PLAYER}?\n"
.string "Guess what? Im on ROUTE 119 now.\p" .string "Guess what? Im on ROUTE 119 now.\p"
.string "Theres a big river here, and\n" .string "Theres a big river here, and\n"
.string "it rains all the time.\p" .string "it rains all the time.\p"
.string "I got soaked to the bone!$" .string "I got soaked to the bone!$"
gText_Brendan_Pokenav_2B4882:: @ 2B4882
.string "BRENDAN: {PLAYER}!\p" .string "BRENDAN: {PLAYER}!\p"
.string "MT. PYRE is a memorial to POKéMON\n" .string "MT. PYRE is a memorial to POKéMON\n"
.string "whose lives have ended.\p" .string "whose lives have ended.\p"
.string "Thats probably why its infested\n" .string "Thats probably why its infested\n"
.string "with many GHOST-type POKéMON!$" .string "with many GHOST-type POKéMON!$"
gText_Brendan_Pokenav_2B4909:: @ 2B4909
.string "BRENDAN: Hey there, {PLAYER}.\p" .string "BRENDAN: Hey there, {PLAYER}.\p"
.string "I was on my way back to the hot\n" .string "I was on my way back to the hot\n"
.string "spring in LAVARIDGE.\p" .string "spring in LAVARIDGE.\p"
@ -9373,12 +9433,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Those creeps\n" .string "Those creeps\n"
.string "I think they were TEAM MAGMA.$" .string "I think they were TEAM MAGMA.$"
gText_Brendan_Pokenav_2B49C4:: @ 2B49C4
.string "BRENDAN: Hi, {PLAYER}!\n" .string "BRENDAN: Hi, {PLAYER}!\n"
.string "Did you catch the news?\p" .string "Did you catch the news?\p"
.string "They say CAPT. STERN discovered\n" .string "They say CAPT. STERN discovered\n"
.string "the SEAFLOOR CAVERN while on his\l" .string "the SEAFLOOR CAVERN while on his\l"
.string "submarine expedition.$" .string "submarine expedition.$"
gText_Brendan_Pokenav_2B4A44:: @ 2B4A44
.string "BRENDAN: Hey there, {PLAYER}!\n" .string "BRENDAN: Hey there, {PLAYER}!\n"
.string "Dont you think its awesome?\p" .string "Dont you think its awesome?\p"
.string "Even if you dont have a boat,\n" .string "Even if you dont have a boat,\n"
@ -9388,6 +9450,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "travel to the bottom of the sea.\p" .string "travel to the bottom of the sea.\p"
.string "Man, POKéMON can do anything!$" .string "Man, POKéMON can do anything!$"
gText_Brendan_Pokenav_2B4B28:: @ 2B4B28
.string "BRENDAN: Howdy, {PLAYER}!\n" .string "BRENDAN: Howdy, {PLAYER}!\n"
.string "How are you holding up?\p" .string "How are you holding up?\p"
.string "Ever found your way to the other\n" .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 "When you get to the other side,\n"
.string "come up to the surface. Simple!$" .string "come up to the surface. Simple!$"
gText_Brendan_Pokenav_2B4C15:: @ 2B4C15
.string "BRENDAN: Hey there, {PLAYER}!\p" .string "BRENDAN: Hey there, {PLAYER}!\p"
.string "Hows it going? Filling up your\n" .string "Hows it going? Filling up your\n"
.string "POKéDEX successfully?\p" .string "POKéDEX successfully?\p"
@ -9405,12 +9469,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "And not just one--three!\p" .string "And not just one--three!\p"
.string "Id love to catch even one$" .string "Id love to catch even one$"
gText_Brendan_Pokenav_2B4CD8:: @ 2B4CD8
.string "BRENDAN: {PLAYER}!\n" .string "BRENDAN: {PLAYER}!\n"
.string "I heard the rumors!\p" .string "I heard the rumors!\p"
.string "You beat the SOOTOPOLIS GYM\n" .string "You beat the SOOTOPOLIS GYM\n"
.string "LEADER? Awesome!\p" .string "LEADER? Awesome!\p"
.string "Youre getting awful close now!$" .string "Youre getting awful close now!$"
gText_Brendan_Pokenav_2B4D46:: @ 2B4D46
.string "BRENDAN: There isnt a TRAINER in\n" .string "BRENDAN: There isnt a TRAINER in\n"
.string "all of HOENN who doesnt know who\l" .string "all of HOENN who doesnt know who\l"
.string "you are, {PLAYER}!\p" .string "you are, {PLAYER}!\p"
@ -9418,16 +9484,19 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "with you, {PLAYER}, they get pretty\l" .string "with you, {PLAYER}, they get pretty\l"
.string "envious!$" .string "envious!$"
gText_Wally_Pokenav_2B4DE2:: @ 2B4DE2
.string "WALLY: Oh, {PLAYER}!\p" .string "WALLY: Oh, {PLAYER}!\p"
.string "Ive been getting healthier and\n" .string "Ive been getting healthier and\n"
.string "more physically fit.\p" .string "more physically fit.\p"
.string "I hope I can become a TRAINER like\n" .string "I hope I can become a TRAINER like\n"
.string "you soon, {PLAYER}!$" .string "you soon, {PLAYER}!$"
gText_Wally_Pokenav_2B4E57:: @ 2B4E57
.string "WALLY: {PLAYER}, hello!\p" .string "WALLY: {PLAYER}, hello!\p"
.string "After RUSTURF TUNNEL went\n" .string "After RUSTURF TUNNEL went\n"
.string "through, WANDAs been very happy!$" .string "through, WANDAs been very happy!$"
gText_Wally_Pokenav_2B4EA5:: @ 2B4EA5
.string "WALLY: Oh, {PLAYER}!\p" .string "WALLY: Oh, {PLAYER}!\p"
.string "I I left my uncles place in\n" .string "I I left my uncles place in\n"
.string "VERDANTURF without telling anyone.\p" .string "VERDANTURF without telling anyone.\p"
@ -9435,6 +9504,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "{PLAYER}, you understand how\n" .string "{PLAYER}, you understand how\n"
.string "I feel, dont you?$" .string "I feel, dont you?$"
gText_Wally_Pokenav_2B4F41:: @ 2B4F41
.string "WALLY: {PLAYER}?\n" .string "WALLY: {PLAYER}?\n"
.string "Its me, WALLY!\p" .string "Its me, WALLY!\p"
.string "The world of TRAINERS is amazing!\p" .string "The world of TRAINERS is amazing!\p"
@ -9443,6 +9513,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Its as if everyones getting\n" .string "Its as if everyones getting\n"
.string "connected through POKéMON!$" .string "connected through POKéMON!$"
gText_Wally_Pokenav_2B4FF3:: @ 2B4FF3
.string "WALLY: {PLAYER}? Its awesome!\n" .string "WALLY: {PLAYER}? Its awesome!\n"
.string "That RALTS we caught together?\l" .string "That RALTS we caught together?\l"
.string "It evolved, {PLAYER}!\p" .string "It evolved, {PLAYER}!\p"
@ -9452,11 +9523,13 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "After all, its the POKéMON that\n" .string "After all, its the POKéMON that\n"
.string "should be praised!$" .string "should be praised!$"
gText_Wally_Pokenav_2B50B1:: @ 2B50B1
.string " \n" .string " \n"
.string " \p" .string " \p"
.string "WALLY appears to be out of\n" .string "WALLY appears to be out of\n"
.string "the POKéNAVs service area$" .string "the POKéNAVs service area$"
gText_Wally_Pokenav_2B5100:: @ 2B5100
.string "WALLY: Oh, {PLAYER}!\p" .string "WALLY: Oh, {PLAYER}!\p"
.string "Before I met you, I hardly ever\n" .string "Before I met you, I hardly ever\n"
.string "left my house\p" .string "left my house\p"
@ -9465,6 +9538,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "{PLAYER}\n" .string "{PLAYER}\n"
.string "Thank you$" .string "Thank you$"
gText_Scott_Pokenav_2B5184:: @ 2B5184
.string "SCOTT: Howdy, {PLAYER}{STRING 5}!\p" .string "SCOTT: Howdy, {PLAYER}{STRING 5}!\p"
.string "You know how POKéMON can be found\n" .string "You know how POKéMON can be found\n"
.string "everywhere?\p" .string "everywhere?\p"
@ -9475,6 +9549,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "As a result, I have to hurry\n" .string "As a result, I have to hurry\n"
.string "everywhere, too. Busy, busy!$" .string "everywhere, too. Busy, busy!$"
gText_Scott_Pokenav_2B5275:: @ 2B5275
.string "SCOTT: Im on ROUTE 119 right now.\n" .string "SCOTT: Im on ROUTE 119 right now.\n"
.string "Its teeming with TRAINERS!\p" .string "Its teeming with TRAINERS!\p"
.string "Its also overgrown with tall grass\n" .string "Its also overgrown with tall grass\n"
@ -9482,6 +9557,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Walking around in shorts here\n" .string "Walking around in shorts here\n"
.string "makes me all ticklish!$" .string "makes me all ticklish!$"
gText_Scott_Pokenav_2B5323:: @ 2B5323
.string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p" .string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p"
.string "Have you had the chance to climb\n" .string "Have you had the chance to climb\n"
.string "MT. PYRE?\p" .string "MT. PYRE?\p"
@ -9490,6 +9566,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Its somewhere every TRAINER\n" .string "Its somewhere every TRAINER\n"
.string "should climb to the top of once.$" .string "should climb to the top of once.$"
gText_Scott_Pokenav_2B53DB:: @ 2B53DB
.string "SCOTT: Hi, {PLAYER}{STRING 5}!\p" .string "SCOTT: Hi, {PLAYER}{STRING 5}!\p"
.string "Ive been hearing about these odd\n" .string "Ive been hearing about these odd\n"
.string "gangs being a nuisance.\p" .string "gangs being a nuisance.\p"
@ -9499,6 +9576,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "skilled TRAINERS among them.\p" .string "skilled TRAINERS among them.\p"
.string "But if theyre thugs$" .string "But if theyre thugs$"
gText_Scott_Pokenav_2B54A5:: @ 2B54A5
.string "SCOTT: Oh, hi, {PLAYER}{STRING 5}.\p" .string "SCOTT: Oh, hi, {PLAYER}{STRING 5}.\p"
.string "Might there be tough TRAINERS\n" .string "Might there be tough TRAINERS\n"
.string "at the bottom of the sea?\p" .string "at the bottom of the sea?\p"
@ -9506,6 +9584,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "I cant swim, for one.\l" .string "I cant swim, for one.\l"
.string "And I dont raise POKéMON$" .string "And I dont raise POKéMON$"
gText_Scott_Pokenav_2B5541:: @ 2B5541
.string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p" .string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p"
.string "You know that you can challenge\n" .string "You know that you can challenge\n"
.string "the POKéMON LEAGUE when youve\l" .string "the POKéMON LEAGUE when youve\l"
@ -9522,17 +9601,20 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "the POKéMON LEAGUE into the HALL\l" .string "the POKéMON LEAGUE into the HALL\l"
.string "OF FAME!$" .string "OF FAME!$"
gText_Scott_Pokenav_2B56CA:: @ 2B56CA
.string " \n" .string " \n"
.string " \p" .string " \p"
.string "SCOTT appears to be out of\n" .string "SCOTT appears to be out of\n"
.string "the POKéNAVs service area$" .string "the POKéNAVs service area$"
gText_Norman_Pokenav_2B5719:: @ 82B5719
.string "DAD: In RUSTBORO, theres a man\n" .string "DAD: In RUSTBORO, theres a man\n"
.string "that goes by the odd name of\l" .string "that goes by the odd name of\l"
.string "the CUTTER.\p" .string "the CUTTER.\p"
.string "If youre in the area, you should\n" .string "If youre in the area, you should\n"
.string "pay him a visit.$" .string "pay him a visit.$"
gText_Norman_Pokenav_2B5795:: @ 82B5795
.string "DAD: Hm Little by little, but also\n" .string "DAD: Hm Little by little, but also\n"
.string "very surely, youre getting\l" .string "very surely, youre getting\l"
.string "tougher, {PLAYER}.\p" .string "tougher, {PLAYER}.\p"
@ -9541,6 +9623,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "and me\p" .string "and me\p"
.string "This feeling is hard to explain.$" .string "This feeling is hard to explain.$"
gText_Norman_Pokenav_2B584D:: @ 82B584D
.string "DAD: I see\n" .string "DAD: I see\n"
.string "Youve collected four GYM BADGES\p" .string "Youve collected four GYM BADGES\p"
.string "Theres no avoiding it now.\n" .string "Theres no avoiding it now.\n"
@ -9548,6 +9631,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Come anytime.\n" .string "Come anytime.\n"
.string "Well all be waiting for you!$" .string "Well all be waiting for you!$"
gText_Norman_Pokenav_2B58E3:: @ 82B58E3
.string "DAD: {PLAYER}! Youd better go visit\n" .string "DAD: {PLAYER}! Youd better go visit\n"
.string "Mother every so often.\p" .string "Mother every so often.\p"
.string "Im going to remain here and\n" .string "Im 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 "The way of battling is deep\n"
.string "and unforgiving!$" .string "and unforgiving!$"
gText_Norman_Pokenav_2B5979:: @ 82B5979
.string "DAD: Oh, hi, {PLAYER}!\p" .string "DAD: Oh, hi, {PLAYER}!\p"
.string "Whats that? MAGMA EMBLEM?\n" .string "Whats that? MAGMA EMBLEM?\n"
.string "I dont know what thats about.\p" .string "I dont know what thats about.\p"
.string "But with a name like that, it may\n" .string "But with a name like that, it may\n"
.string "be somehow linked to a volcano!$" .string "be somehow linked to a volcano!$"
gText_Norman_Pokenav_2B5A07:: @ 82B5A07
.string "DAD: Hiyah! Haah! Dwah!\p" .string "DAD: Hiyah! Haah! Dwah!\p"
.string "Oh? {PLAYER}!\p" .string "Oh? {PLAYER}!\p"
.string "You caught me right in the middle\n" .string "You caught me right in the middle\n"
.string "of a POKéMON training session!$" .string "of a POKéMON training session!$"
gText_Norman_Pokenav_2B5A69:: @ 82B5A69
.string "DAD: {PLAYER}!\p" .string "DAD: {PLAYER}!\p"
.string "Who wouldve thought youd become\n" .string "Who wouldve thought youd become\n"
.string "the POKéMON LEAGUE CHAMPION\p" .string "the POKéMON LEAGUE CHAMPION\p"
.string "Okay!\n" .string "Okay!\n"
.string "I wont be left behind!$" .string "I wont be left behind!$"
gText_Norman_Pokenav_2B5ACF:: @ 82B5ACF
.string "DAD: Hm? {PLAYER}?\n" .string "DAD: Hm? {PLAYER}?\n"
.string "What good timing!\p" .string "What good timing!\p"
.string "This time, Im going to challenge\n" .string "This time, Im going to challenge\n"
@ -9579,9 +9667,11 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Im waiting in the PETALBURG GYM.\n" .string "Im waiting in the PETALBURG GYM.\n"
.string "Accept my challenge anytime!$" .string "Accept my challenge anytime!$"
gText_Norman_Pokenav_2B5B5E:: @ 82B5B5E
.string "DAD: You amaze me, {PLAYER}.\n" .string "DAD: You amaze me, {PLAYER}.\n"
.string "How much higher will you soar?$" .string "How much higher will you soar?$"
gText_Steven_Pokenav_2B5B95:: @ 82B5B95
.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p" .string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
.string "Have you been to MAUVILLE\n" .string "Have you been to MAUVILLE\n"
.string "already?\p" .string "already?\p"
@ -9592,12 +9682,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "You may make a new discovery\n" .string "You may make a new discovery\n"
.string "there.$" .string "there.$"
gText_Steven_Pokenav_2B5C53:: @ 82B5C53
.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p" .string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
.string "Ive met a lot of different\n" .string "Ive met a lot of different\n"
.string "TRAINERS so far.\p" .string "TRAINERS so far.\p"
.string "But youre one of a kind.\n" .string "But youre one of a kind.\n"
.string "Youre not like anyone else.$" .string "Youre not like anyone else.$"
gText_Steven_Pokenav_2B5CC9:: @ 82B5CC9
.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p" .string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
.string "When youre on an adventure with\n" .string "When youre on an adventure with\n"
.string "your POKéMON, what do you think?\p" .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 "Depending on how you think, your\n"
.string "adventures significance changes.$" .string "adventures significance changes.$"
gText_Steven_Pokenav_2B5DB4:: @ 82B5DB4
.string "STEVEN: Hello?\n" .string "STEVEN: Hello?\n"
.string "{PLAYER}{STRING 5}?\p" .string "{PLAYER}{STRING 5}?\p"
.string "Im involved in a spot of trouble\n" .string "Im involved in a spot of trouble\n"
@ -9615,6 +9708,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Im sorry, but I cant talk now.\n" .string "Im sorry, but I cant talk now.\n"
.string "Bye!$" .string "Bye!$"
gText_Steven_Pokenav_2B5E26:: @ 82B5E26
.string "STEVEN: Oh!\n" .string "STEVEN: Oh!\n"
.string "{PLAYER}{STRING 5}!\p" .string "{PLAYER}{STRING 5}!\p"
.string "Theres no need to talk.\n" .string "Theres no need to talk.\n"
@ -9622,10 +9716,12 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "You have to believe in yourself\n" .string "You have to believe in yourself\n"
.string "and do whats right.$" .string "and do whats right.$"
gText_Steven_Pokenav_2B5EA2:: @ 82B5EA2
.string " \p" .string " \p"
.string "STEVEN appears not to be getting\n" .string "STEVEN appears not to be getting\n"
.string "the call$" .string "the call$"
gText_Steven_Pokenav_2B5ED9:: @ 82B5ED9
.string "STEVEN: {PLAYER}{STRING 5} Congratulations\n" .string "STEVEN: {PLAYER}{STRING 5} Congratulations\n"
.string "for entering the HALL OF FAME.\p" .string "for entering the HALL OF FAME.\p"
.string " \n" .string " \n"
@ -9652,6 +9748,7 @@ Route101_Text_2B603A: @ 82B603A
.string "the POKéDEX and POKéNAV, studying\l" .string "the POKéDEX and POKéNAV, studying\l"
.string "POKéMON becomes more fun, eh?$" .string "POKéMON becomes more fun, eh?$"
gText_MrStone_Pokenav_2B60C0:: @ 82B60C0
.string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p" .string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p"
.string "Since you called me, the POKéNAV\n" .string "Since you called me, the POKéNAV\n"
.string "must be working properly!\p" .string "must be working properly!\p"
@ -9666,6 +9763,7 @@ Route101_Text_2B603A: @ 82B603A
.string "Wahahaha!\n" .string "Wahahaha!\n"
.string "See you again!$" .string "See you again!$"
gText_MrStone_Pokenav_2B61E6:: @ 82B61E6
.string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p" .string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p"
.string "Whats wrong? Have you forgotten\n" .string "Whats wrong? Have you forgotten\n"
.string "about that little errand of mine?\p" .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 "Now, since I am a busy PRESIDENT,\n"
.string "I have to go! Bye-bye!$" .string "I have to go! Bye-bye!$"
gText_MrStone_Pokenav_2B6302:: @ 82B6302
.string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p" .string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p"
.string "Ah, so youve met STEVEN!\n" .string "Ah, so youve met STEVEN!\n"
.string "Id better reward you, then!\p" .string "Id better reward you, then!\p"
@ -9684,6 +9783,7 @@ Route101_Text_2B603A: @ 82B603A
.string "come see me at my office.\p" .string "come see me at my office.\p"
.string "Ill be waiting for you!$" .string "Ill be waiting for you!$"
gText_MrStone_Pokenav_2B63A0:: @ 82B63A0
.string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p" .string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p"
.string "Did you know that DEVON was\n" .string "Did you know that DEVON was\n"
.string "digging the RUSTURF TUNNEL?\p" .string "digging the RUSTURF TUNNEL?\p"
@ -9694,12 +9794,14 @@ Route101_Text_2B603A: @ 82B603A
.string "live in peace than worry about our\l" .string "live in peace than worry about our\l"
.string "own convenience.$" .string "own convenience.$"
gText_MrStone_Pokenav_2B64A2:: @ 82B64A2
.string "MR. STONE: Hello, hello, {PLAYER}{STRING 5}!\p" .string "MR. STONE: Hello, hello, {PLAYER}{STRING 5}!\p"
.string "I heard from someone in PETALBURG\n" .string "I heard from someone in PETALBURG\n"
.string "that youre NORMANs child!\p" .string "that youre NORMANs child!\p"
.string "No wonder youre such a capable\n" .string "No wonder youre such a capable\n"
.string "being!$" .string "being!$"
gText_MrStone_Pokenav_2B6526:: @ 82B6526
.string "MR. STONE: Whats that?\p" .string "MR. STONE: Whats that?\p"
.string "You battled your own father and\n" .string "You battled your own father and\n"
.string "defeated him?\p" .string "defeated him?\p"
@ -9707,6 +9809,7 @@ Route101_Text_2B603A: @ 82B603A
.string "I had no idea that I befriended\n" .string "I had no idea that I befriended\n"
.string "someone so special! Wahaha!$" .string "someone so special! Wahaha!$"
gText_MrStone_Pokenav_2B65BB:: @ 82B65BB
.string "Hello!\n" .string "Hello!\n"
.string "This is DEVON CORPORATI\l" .string "This is DEVON CORPORATI\l"
.string "Oh, hello, {PLAYER}!\p" .string "Oh, hello, {PLAYER}!\p"
@ -9715,18 +9818,21 @@ Route101_Text_2B603A: @ 82B603A
.string "Our PRESIDENT is busy, but you\n" .string "Our PRESIDENT is busy, but you\n"
.string "seem to be just as busy, {PLAYER}.$" .string "seem to be just as busy, {PLAYER}.$"
gText_MrStone_Pokenav_2B6664:: @ 82B6664
.string "Huh? Whats that?\p" .string "Huh? Whats that?\p"
.string "GROU Yes? DON?\p" .string "GROU Yes? DON?\p"
.string "Youre breaking up\n" .string "Youre breaking up\n"
.string "cant hear\p" .string "cant hear\p"
.string "BZZZZ$" .string "BZZZZ$"
gText_MrStone_Pokenav_2B66B1:: @ 82B66B1
.string "Huh? Whats that?\p" .string "Huh? Whats that?\p"
.string "Seaflo Yes? Caver?\p" .string "Seaflo Yes? Caver?\p"
.string "Youre breaking up\n" .string "Youre breaking up\n"
.string "cant hear\p" .string "cant hear\p"
.string "BZZZZ$" .string "BZZZZ$"
gText_MrStone_Pokenav_2B6703:: @ 82B6703
.string "MR. STONE: {PLAYER}{STRING 5}! Its me!\p" .string "MR. STONE: {PLAYER}{STRING 5}! Its me!\p"
.string "You were apparently involved in all\n" .string "You were apparently involved in all\n"
.string "sorts of things, but I, being busy,\l" .string "sorts of things, but I, being busy,\l"
@ -9736,6 +9842,7 @@ Route101_Text_2B603A: @ 82B603A
.string "Ill always be in your corner!\n" .string "Ill always be in your corner!\n"
.string "Take care!$" .string "Take care!$"
gText_MrStone_Pokenav_2B67ED:: @ 82B67ED
.string "MR. STONE: \n" .string "MR. STONE: \n"
.string "Is this maybe {PLAYER}{STRING 5}?\p" .string "Is this maybe {PLAYER}{STRING 5}?\p"
.string "Your voice is so full of confidence,\n" .string "Your voice is so full of confidence,\n"

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
data/unknown_jp_62609C.bin Normal file

Binary file not shown.

19
graphics/pokenav/86226E0.pal Executable file
View File

@ -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

19
graphics/pokenav/8622700.pal Executable file
View File

@ -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

35
graphics/pokenav/8622720.pal Executable file
View File

@ -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

19
graphics/pokenav/8622868.pal Executable file
View File

@ -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

19
graphics/pokenav/86231E8.pal Executable file
View File

@ -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

19
graphics/pokenav/8623208.pal Executable file
View File

@ -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

BIN
graphics/pokenav/8623228.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 B

1
graphics/pokenav/862323C.bin Executable file
View File

@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

19
graphics/pokenav/8623338.pal Executable file
View File

@ -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

19
graphics/pokenav/8623570.pal Executable file
View File

@ -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

19
graphics/pokenav/8623790.pal Executable file
View File

@ -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

19
graphics/pokenav/8624098.pal Executable file
View File

@ -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

BIN
graphics/pokenav/8625660.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 B

19
graphics/pokenav/862A5D4.pal Executable file
View File

@ -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

BIN
graphics/pokenav/arrow2.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 153 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 197 B

1
graphics/pokenav/bg.bin Executable file
View File

@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

BIN
graphics/pokenav/bg.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B

BIN
graphics/pokenav/blue_light.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

View File

@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

View File

@ -0,0 +1,4 @@
00000000000000000000000000000000000
00000000000 00000000000
0000000000
000000000 000000000000000000000000

View File

@ -0,0 +1,3 @@
000000000000000000000000
0000000000
00000000000 000000000 0000000000000000000000000000000000000000000000

View File

@ -0,0 +1,2 @@
0000000000000000000000000000000000000000000000000000 0 0000 00000000
00000000000 000000000000000000000000

View File

@ -0,0 +1 @@
00000000000000000000000000000000000 000000000 00 0 000000000000000000 0 00000000 000 00000000000000000000000

View File

@ -0,0 +1,3 @@
000000000000000000000000000000000000000000000
00
000000000 00000000000000000000000000000000000000000000

View File

@ -0,0 +1 @@
0000000000000000000000000000000 0 0000000000000000000 00000000000000000000 00000000000000000000000000000

View File

@ -0,0 +1,3 @@
00000000000000000000000000000000 0 0 0 0 00 000000000
0000 0 0 0 0 0 00 000000000
000000 0 0 0 00 0000000000000000000000

View File

@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

View File

@ -0,0 +1,3 @@
000000000000000000000000000000000000000000 00 00 0 000000
0000000000
00000000 0 00 00000000000000000000000000

View File

@ -0,0 +1,3 @@
000000000000000000000000000000000000
000000 000 00 0 000000
0000000000 0000000000000 0 00000000 00000000000000

View File

@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000 0 00000000000000000

View File

@ -0,0 +1,3 @@
00000000000000000000000000 0 00000000
0000000000
000000000 000000000 000 0 00000000 0000000000000000000000000

View File

@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

View File

@ -0,0 +1,3 @@
0000000000000000000000000000000000000000000 00 0 00000000
0000000000
00000000000 0 000000000000000000000000

View File

@ -0,0 +1,4 @@
000000000000000000000000000000000
00000000 0 00 00000000000
00000000000 00 0000000
00000000000 00000000000000

View File

@ -0,0 +1,5 @@
000000000000000000000000000000000000 0 0 0000000
0000000000
000000000 00 0 00000000
0000000000
000000000000000

View File

@ -0,0 +1,6 @@
000000000000000
0000000000
0000000 0 0 00000000000
0000000000
00000000000 0 0 000000
0000000000 0000000000000000

View File

@ -0,0 +1,5 @@
00000000000000000000000000000000000
00000000 0 00 0 00000
000000000 00 0 00000000
000
000000 00 0 0000000000000000

View File

@ -0,0 +1,7 @@
000000000000
000
0000000000
0000000000
0000000000
0000000000
000000000 00 0 00000000 0000000000000000000000000

View File

@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

View File

@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 B

BIN
graphics/pokenav/icon2.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 630 B

BIN
graphics/pokenav/icon2_unused.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

BIN
graphics/pokenav/outline.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 596 B

BIN
graphics/pokenav/outline_map.bin Executable file

Binary file not shown.

BIN
graphics/pokenav/pokeball.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 B

View File

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 164 B

BIN
graphics/pokenav/ribbons_icon.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 486 B

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
graphics/pokenav/sparkle.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 B

BIN
graphics/pokenav/ui_matchcall.bin Executable file

Binary file not shown.

BIN
graphics/pokenav/ui_matchcall.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 251 B

BIN
graphics/pokenav/ui_ribbons.bin Executable file

Binary file not shown.

BIN
graphics/pokenav/ui_ribbons.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 B

BIN
graphics/pokenav/zoom_tiles.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 431 B

View File

@ -15,7 +15,7 @@ TYPESGFXDIR := graphics/types
RAYQUAZAGFXDIR := graphics/rayquaza_scene RAYQUAZAGFXDIR := graphics/rayquaza_scene
ROULETTEGFXDIR := graphics/roulette ROULETTEGFXDIR := graphics/roulette
SLOTMACHINEGFXDIR := graphics/slot_machine SLOTMACHINEGFXDIR := graphics/slot_machine
PKNAVGFXDIR := graphics/pokenav/ PKNAVGFXDIR := graphics/pokenav
PKNAVOPTIONSGFXDIR := graphics/pokenav/options PKNAVOPTIONSGFXDIR := graphics/pokenav/options
PSSGFXDIR := graphics/pokemon_storage 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 contest_types := cool beauty cute smart tough
$(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \ $(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \
$(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \ $(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \
$(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \ $(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \
$(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp $(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp
@cat $^ >$@ @cat $^ >$@
$(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \ $(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \
$(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \ $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \
$(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \ $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \
$(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp
@cat $^ >$@ @cat $^ >$@
$(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \ $(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \
$(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \ $(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \
$(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \ $(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \
$(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp $(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp
@cat $^ >$@ @cat $^ >$@
$(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \ $(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \
$(MONPALDIR)/castform_sunny_form_palette.gbapal \ $(MONPALDIR)/castform_sunny_form_palette.gbapal \
$(MONPALDIR)/castform_rainy_form_palette.gbapal \ $(MONPALDIR)/castform_rainy_form_palette.gbapal \
$(MONPALDIR)/castform_snowy_form_palette.gbapal $(MONPALDIR)/castform_snowy_form_palette.gbapal
@cat $^ >$@ @cat $^ >$@
$(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \ $(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \
$(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \ $(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \
$(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \ $(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \
$(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal $(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal
@cat $^ >$@ @cat $^ >$@
$(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png $(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 graphics/intro/copyright.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 39 $(GFX) $< $@ -num_tiles 39
graphics/interface/pkmnjump_bg.4bpp: %.4bpp: %.png graphics/interface/pkmnjump_bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 63 $(GFX) $< $@ -num_tiles 63
@ -311,44 +311,44 @@ graphics/misc/japanese_hof.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 29 $(GFX) $< $@ -num_tiles 29
$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal \ $(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal \
$(MENUGFXDIR)/menu_1.gbapal $(MENUGFXDIR)/menu_1.gbapal
@cat $^ >$@ @cat $^ >$@
$(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \ $(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \
$(BTLANMSPRGFXDIR)/010_1.4bpp \ $(BTLANMSPRGFXDIR)/010_1.4bpp \
$(BTLANMSPRGFXDIR)/010_2.4bpp \ $(BTLANMSPRGFXDIR)/010_2.4bpp \
$(BTLANMSPRGFXDIR)/010_3.4bpp $(BTLANMSPRGFXDIR)/010_3.4bpp
@cat $^ >$@ @cat $^ >$@
$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \ $(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \
$(UNUSEDGFXDIR)/old_pal2.gbapal \ $(UNUSEDGFXDIR)/old_pal2.gbapal \
$(UNUSEDGFXDIR)/old_pal3.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal
@cat $^ >$@ @cat $^ >$@
$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal \ $(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal \
$(UNUSEDGFXDIR)/old_pal6.gbapal \ $(UNUSEDGFXDIR)/old_pal6.gbapal \
$(UNUSEDGFXDIR)/old_pal7.gbapal $(UNUSEDGFXDIR)/old_pal7.gbapal
@cat $^ >$@ @cat $^ >$@
$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp \ $(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp \
$(UNUSEDGFXDIR)/old_charizard.4bpp $(UNUSEDGFXDIR)/old_charizard.4bpp
@cat $^ >$@ @cat $^ >$@
$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \ $(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \
$(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \ $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \
$(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \ $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \
$(UNUSEDGFXDIR)/old_battle_interface_3.4bpp $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp
@cat $^ >$@ @cat $^ >$@
$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp \ $(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp \
$(MENUGFXDIR)/numbers1.4bpp \ $(MENUGFXDIR)/numbers1.4bpp \
$(MENUGFXDIR)/numbers2.4bpp $(MENUGFXDIR)/numbers2.4bpp
@cat $^ >$@ @cat $^ >$@
$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
$(UNUSEDGFXDIR)/yellow_frame.bin \ $(UNUSEDGFXDIR)/yellow_frame.bin \
$(UNUSEDGFXDIR)/green_frame.bin \ $(UNUSEDGFXDIR)/green_frame.bin \
$(UNUSEDGFXDIR)/blank_frame.bin $(UNUSEDGFXDIR)/blank_frame.bin
@cat $^ >$@ @cat $^ >$@
$(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png $(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png
@ -358,38 +358,38 @@ $(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 5 $(GFX) $< $@ -num_tiles 5
$(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp \ $(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp \
$(UNUSEDGFXDIR)/old_contest_floor.4bpp \ $(UNUSEDGFXDIR)/old_contest_floor.4bpp \
$(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \ $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \
$(UNUSEDGFXDIR)/old_contest_symbols.4bpp \ $(UNUSEDGFXDIR)/old_contest_symbols.4bpp \
$(UNUSEDGFXDIR)/old_contest_meter.4bpp \ $(UNUSEDGFXDIR)/old_contest_meter.4bpp \
$(UNUSEDGFXDIR)/old_contest_classes.4bpp \ $(UNUSEDGFXDIR)/old_contest_classes.4bpp \
$(UNUSEDGFXDIR)/old_contest_numbers.4bpp $(UNUSEDGFXDIR)/old_contest_numbers.4bpp
@cat $^ >$@ @cat $^ >$@
$(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \ $(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \
$(UNUSEDGFXDIR)/old_contest_2_2.4bpp $(UNUSEDGFXDIR)/old_contest_2_2.4bpp
@cat $^ >$@ @cat $^ >$@
$(UNKNOWNGFXDIR)/unknown_C19470.4bpp: %.4bpp: %.png $(UNKNOWNGFXDIR)/unknown_C19470.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 36 $(GFX) $< $@ -num_tiles 36
$(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp \ $(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp \
$(BTLANMSPRGFXDIR)/141_1.4bpp \ $(BTLANMSPRGFXDIR)/141_1.4bpp \
$(BTLANMSPRGFXDIR)/141_2.4bpp \ $(BTLANMSPRGFXDIR)/141_2.4bpp \
$(BTLANMSPRGFXDIR)/141_3.4bpp \ $(BTLANMSPRGFXDIR)/141_3.4bpp \
$(BTLANMSPRGFXDIR)/141_4.4bpp $(BTLANMSPRGFXDIR)/141_4.4bpp
@cat $^ >$@ @cat $^ >$@
$(BTLANMSPRGFXDIR)/074.4bpp: $(BTLANMSPRGFXDIR)/074_0.4bpp \ $(BTLANMSPRGFXDIR)/074.4bpp: $(BTLANMSPRGFXDIR)/074_0.4bpp \
$(BTLANMSPRGFXDIR)/074_1.4bpp $(BTLANMSPRGFXDIR)/074_1.4bpp
@cat $^ >$@ @cat $^ >$@
$(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp \ $(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp \
$(BTLANMSPRGFXDIR)/159_1.4bpp $(BTLANMSPRGFXDIR)/159_1.4bpp
@cat $^ >$@ @cat $^ >$@
$(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp \ $(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp \
$(BTLANMSPRGFXDIR)/001_1.4bpp $(BTLANMSPRGFXDIR)/001_1.4bpp
@cat $^ >$@ @cat $^ >$@
$(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png $(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png
@ -405,8 +405,8 @@ $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types
@cat $^ >$@ @cat $^ >$@
$(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \
$(TYPESGFXDIR)/move_types_2.gbapal \ $(TYPESGFXDIR)/move_types_2.gbapal \
$(TYPESGFXDIR)/move_types_3.gbapal $(TYPESGFXDIR)/move_types_3.gbapal
@cat $^ >$@ @cat $^ >$@
$(MENUGFXDIR)/bag_screen.4bpp: %.4bpp: %.png $(MENUGFXDIR)/bag_screen.4bpp: %.4bpp: %.png
@ -435,13 +435,13 @@ graphics/picture_frame/frame5.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 86 $(GFX) $< $@ -num_tiles 86
$(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \ $(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \
$(ROULETTEGFXDIR)/tailow.4bpp $(ROULETTEGFXDIR)/tailow.4bpp
@cat $^ >$@ @cat $^ >$@
$(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \ $(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \
$(ROULETTEGFXDIR)/azurill.4bpp \ $(ROULETTEGFXDIR)/azurill.4bpp \
$(ROULETTEGFXDIR)/skitty.4bpp \ $(ROULETTEGFXDIR)/skitty.4bpp \
$(ROULETTEGFXDIR)/makuhita.4bpp $(ROULETTEGFXDIR)/makuhita.4bpp
@cat $^ >$@ @cat $^ >$@
$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png $(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png
@ -451,43 +451,25 @@ $(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 938 $(GFX) $< $@ -num_tiles 938
$(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ $(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
$(BATTRANSGFXDIR)/frontier_squares_1.4bpp $(BATTRANSGFXDIR)/frontier_squares_1.4bpp
@cat $^ >$@ @cat $^ >$@
$(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ $(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
$(BATTRANSGFXDIR)/frontier_squares_2.4bpp $(BATTRANSGFXDIR)/frontier_squares_2.4bpp
@cat $^ >$@ @cat $^ >$@
$(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ $(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
$(BATTRANSGFXDIR)/frontier_squares_3.4bpp $(BATTRANSGFXDIR)/frontier_squares_3.4bpp
@cat $^ >$@ @cat $^ >$@
$(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ $(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
$(BATTRANSGFXDIR)/frontier_squares_4.4bpp $(BATTRANSGFXDIR)/frontier_squares_4.4bpp
@cat $^ >$@ @cat $^ >$@
$(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.4bpp \ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.4bpp \
$(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp $(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp
@cat $^ >$@ @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 $(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 374 $(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 $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp
@cat $^ >$@ @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

View File

@ -45,6 +45,40 @@ static FILE *PngReadOpen(char *path, png_structp *pngStruct, png_infop *pngInfo)
return fp; 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) void ReadPng(char *path, struct Image *image)
{ {
png_structp png_ptr; 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); 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); int color_type = png_get_color_type(png_ptr, info_ptr);
if (color_type != PNG_COLOR_TYPE_GRAY && color_type != PNG_COLOR_TYPE_PALETTE) 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); free(row_pointers);
fclose(fp); 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) void ReadPngPalette(char *path, struct Palette *palette)