dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document fonts

Browse Source
This commit is contained in:
GriffinR
2022-11-22 13:44:40 -05:00
parent 8f95e41d44
commit e78094de85
101 changed files with 1084 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charmap.txt
+6 -6
View File
@@ -445,12 +445,12 @@ RESUME_MUSIC = FC 18
@ fonts @ fonts
FONT_0 = FC 06 00 FONT_SMALL = FC 06 00
FONT_1 = FC 06 01 FONT_NORMAL_COPY_1 = FC 06 01
FONT_2 = FC 06 02 FONT_NORMAL = FC 06 02
FONT_3 = FC 06 03 FONT_NORMAL_COPY_2 = FC 06 03
FONT_4 = FC 06 04 FONT_MALE = FC 06 04
FONT_5 = FC 06 05 FONT_FEMALE = FC 06 05
@ colors @ colors
data/maps/CeladonCity_DepartmentStore_Roof/text.inc
+1 -1
View File
@@ -1,7 +1,7 @@
CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink:: CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink::
.string "I'm thirsty!\n" .string "I'm thirsty!\n"
.string "I want something to drink!\p" .string "I want something to drink!\p"
.string "{FONT_2}Give her a drink?$" .string "{FONT_NORMAL}Give her a drink?$"
CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink:: CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink::
.string "Give her which drink?$" .string "Give her which drink?$"
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc
+1 -1
View File
@@ -64,7 +64,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain::
CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor:: CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor::
.string "So!\n" .string "So!\n"
.string "You hurry and give me that!\p" .string "You hurry and give me that!\p"
.string "{FONT_2}{PLAYER} handed over the\n" .string "{FONT_NORMAL}{PLAYER} handed over the\n"
.string "{STR_VAR_2} to the weird doctor.$" .string "{STR_VAR_2} to the weird doctor.$"
CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk:: CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk::
data/maps/PalletTown_RivalsHouse/text.inc
+2 -2
View File
@@ -62,8 +62,8 @@ PalletTown_RivalsHouse_Text_LookingNiceInNoTime::
.string "nice in no time.$" .string "nice in no time.$"
PalletTown_RivalsHouse_Text_ThereYouGoAllDone:: PalletTown_RivalsHouse_Text_ThereYouGoAllDone::
.string "{FONT_2}{STR_VAR_1} looks dreamily content…\p" .string "{FONT_NORMAL}{STR_VAR_1} looks dreamily content…\p"
.string "{FONT_5}DAISY: There you go! All done.\n" .string "{FONT_FEMALE}DAISY: There you go! All done.\n"
.string "See? Doesn't it look nice?\p" .string "See? Doesn't it look nice?\p"
.string "Giggle…\n" .string "Giggle…\n"
.string "It's such a cute POKéMON.$" .string "It's such a cute POKéMON.$"
data/maps/PewterCity_Gym/text.inc
+2 -2
View File
@@ -23,9 +23,9 @@ PewterCity_Gym_Text_BrockDefeat::
.string "As proof of your victory, I confer\n" .string "As proof of your victory, I confer\n"
.string "on you this…the official POKéMON\l" .string "on you this…the official POKéMON\l"
.string "LEAGUE BOULDERBADGE.\p" .string "LEAGUE BOULDERBADGE.\p"
.string "{FONT_2}{PLAYER} received the BOULDERBADGE\n" .string "{FONT_NORMAL}{PLAYER} received the BOULDERBADGE\n"
.string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p" .string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p"
.string "{FONT_4}Just having the BOULDERBADGE makes\n" .string "{FONT_MALE}Just having the BOULDERBADGE makes\n"
.string "your POKéMON more powerful.\p" .string "your POKéMON more powerful.\p"
.string "It also enables the use of the\n" .string "It also enables the use of the\n"
.string "move FLASH outside of battle.\p" .string "move FLASH outside of battle.\p"
data/maps/VermilionCity/text.inc
+4 -4
View File
@@ -61,14 +61,14 @@ VermilionCity_Text_DoYouHaveATicket::
.string "Excuse me, do you have a ticket?$" .string "Excuse me, do you have a ticket?$"
VermilionCity_Text_FlashedSSTicket:: VermilionCity_Text_FlashedSSTicket::
.string "{FONT_2}{PLAYER} flashed the S.S. TICKET!\p" .string "{FONT_NORMAL}{PLAYER} flashed the S.S. TICKET!\p"
.string "{FONT_4}Great!\n" .string "{FONT_MALE}Great!\n"
.string "Welcome to the S.S. ANNE!$" .string "Welcome to the S.S. ANNE!$"
VermilionCity_Text_DontHaveNeededSSTicket:: VermilionCity_Text_DontHaveNeededSSTicket::
.string "{FONT_2}{PLAYER} doesn't have the needed\n" .string "{FONT_NORMAL}{PLAYER} doesn't have the needed\n"
.string "S.S. TICKET.\p" .string "S.S. TICKET.\p"
.string "{FONT_4}Sorry!\p" .string "{FONT_MALE}Sorry!\p"
.string "You need a ticket to get aboard.$" .string "You need a ticket to get aboard.$"
VermilionCity_Text_TheShipSetSail:: VermilionCity_Text_TheShipSetSail::
data/text/fame_checker.inc
+86 -86
View File
@@ -4,13 +4,13 @@ gFameCheckerFlavorText_ProfOak0:: @ 0x81AD106
gFameCheckerFlavorText_ProfOak1:: @ 0x81AD145 gFameCheckerFlavorText_ProfOak1:: @ 0x81AD145
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}To make a complete guide on all\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}To make a complete guide on all\n"
.string "the POKéMON in the world…\p" .string "the POKéMON in the world…\p"
.string "That was my dream!$" .string "That was my dream!$"
gFameCheckerFlavorText_ProfOak2:: @ 0x81AD1BB gFameCheckerFlavorText_ProfOak2:: @ 0x81AD1BB
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK may not look like much,\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK may not look like much,\n"
.string "but he's the authority on POKéMON.\p" .string "but he's the authority on POKéMON.\p"
.string "Many POKéMON TRAINERS hold him in\n" .string "Many POKéMON TRAINERS hold him in\n"
.string "high regard.$" .string "high regard.$"
@@ -22,7 +22,7 @@ gFameCheckerFlavorText_ProfOak3:: @ 0x81AD258
gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9 gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n"
.string "interest in you, child.\p" .string "interest in you, child.\p"
.string "That old duff was once tough and\n" .string "That old duff was once tough and\n"
.string "handsome.\p" .string "handsome.\p"
@@ -31,26 +31,26 @@ gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9
gFameCheckerFlavorText_ProfOak5:: @ 0x81AD377 gFameCheckerFlavorText_ProfOak5:: @ 0x81AD377
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK is going to have his own\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK is going to have his own\n"
.string "radio show soon.\p" .string "radio show soon.\p"
.string "The program will be called PROF.\n" .string "The program will be called PROF.\n"
.string "OAK'S POKéMON SEMINAR.$" .string "OAK'S POKéMON SEMINAR.$"
gFameCheckerFlavorText_Daisy0:: @ 0x81AD40C gFameCheckerFlavorText_Daisy0:: @ 0x81AD40C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}If you show DAISY your POKéMON,\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}If you show DAISY your POKéMON,\n"
.string "she can tell how much it likes you.\p" .string "she can tell how much it likes you.\p"
.string "Occasionally, she will even groom\n" .string "Occasionally, she will even groom\n"
.string "a POKéMON for you.$" .string "a POKéMON for you.$"
gFameCheckerFlavorText_Daisy1:: @ 0x81AD4AE gFameCheckerFlavorText_Daisy1:: @ 0x81AD4AE
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}But the person who is most liked by\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}But the person who is most liked by\n"
.string "POKéMON is DAISY, I think.$" .string "POKéMON is DAISY, I think.$"
gFameCheckerFlavorText_Daisy2:: @ 0x81AD516 gFameCheckerFlavorText_Daisy2:: @ 0x81AD516
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}She was gently grooming POKéMON…\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}She was gently grooming POKéMON…\n"
.string "She was a little angel.\p" .string "She was a little angel.\p"
.string "That little girl's name…\n" .string "That little girl's name…\n"
.string "I think it was DAISY.$" .string "I think it was DAISY.$"
@@ -62,7 +62,7 @@ gFameCheckerFlavorText_Daisy3:: @ 0x81AD5A7
gFameCheckerFlavorText_Daisy4:: @ 0x81AD608 gFameCheckerFlavorText_Daisy4:: @ 0x81AD608
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}A girl from PALLET TOWN, DAISY,\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}A girl from PALLET TOWN, DAISY,\n"
.string "she enjoys TEA every day.\p" .string "she enjoys TEA every day.\p"
.string "She visits the CELADON DEPT. STORE\n" .string "She visits the CELADON DEPT. STORE\n"
.string "to buy some TEA.$" .string "to buy some TEA.$"
@@ -81,7 +81,7 @@ gFameCheckerFlavorText_Brock0:: @ 0x81AD705
gFameCheckerFlavorText_Brock1:: @ 0x81AD771 gFameCheckerFlavorText_Brock1:: @ 0x81AD771
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My rock-hard willpower is evident\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My rock-hard willpower is evident\n"
.string "in even my POKéMON.\p" .string "in even my POKéMON.\p"
.string "My POKéMON are all rock hard and\n" .string "My POKéMON are all rock hard and\n"
.string "have true-grit determination.\p" .string "have true-grit determination.\p"
@@ -90,7 +90,7 @@ gFameCheckerFlavorText_Brock1:: @ 0x81AD771
gFameCheckerFlavorText_Brock2:: @ 0x81AD840 gFameCheckerFlavorText_Brock2:: @ 0x81AD840
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There aren't many serious POKéMON\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There aren't many serious POKéMON\n"
.string "TRAINERS here.\p" .string "TRAINERS here.\p"
.string "They're all like BUG CATCHERS,\n" .string "They're all like BUG CATCHERS,\n"
.string "you know, just hobbyists.\p" .string "you know, just hobbyists.\p"
@@ -99,14 +99,14 @@ gFameCheckerFlavorText_Brock2:: @ 0x81AD840
gFameCheckerFlavorText_Brock3:: @ 0x81AD908 gFameCheckerFlavorText_Brock3:: @ 0x81AD908
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BROCK is cool. He's not just tough.\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BROCK is cool. He's not just tough.\n"
.string "People like and respect him.\p" .string "People like and respect him.\p"
.string "I want to become a GYM LEADER\n" .string "I want to become a GYM LEADER\n"
.string "like him.$" .string "like him.$"
gFameCheckerFlavorText_Brock4:: @ 0x81AD99A gFameCheckerFlavorText_Brock4:: @ 0x81AD99A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hi, I'm excavating for fossils here\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hi, I'm excavating for fossils here\n"
.string "under MT. MOON.\p" .string "under MT. MOON.\p"
.string "Sometimes, BROCK of PEWTER GYM\n" .string "Sometimes, BROCK of PEWTER GYM\n"
.string "lends me a hand.$" .string "lends me a hand.$"
@@ -124,25 +124,25 @@ gFameCheckerFlavorText_Misty0:: @ 0x81ADA91
gFameCheckerFlavorText_Misty1:: @ 0x81ADAF6 gFameCheckerFlavorText_Misty1:: @ 0x81ADAF6
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My policy is an all-out offensive\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My policy is an all-out offensive\n"
.string "with WATER-type POKéMON!$" .string "with WATER-type POKéMON!$"
gFameCheckerFlavorText_Misty2:: @ 0x81ADB5A gFameCheckerFlavorText_Misty2:: @ 0x81ADB5A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}MISTY is a TRAINER who's going to\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}MISTY is a TRAINER who's going to\n"
.string "keep improving.\p" .string "keep improving.\p"
.string "She won't lose to someone like you!$" .string "She won't lose to someone like you!$"
gFameCheckerFlavorText_Misty3:: @ 0x81ADBD9 gFameCheckerFlavorText_Misty3:: @ 0x81ADBD9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Strong TRAINERS and WATER POKéMON\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Strong TRAINERS and WATER POKéMON\n"
.string "are common sights in these parts.\p" .string "are common sights in these parts.\p"
.string "They say that MISTY of the\n" .string "They say that MISTY of the\n"
.string "CERULEAN GYM trains here.$" .string "CERULEAN GYM trains here.$"
gFameCheckerFlavorText_Misty4:: @ 0x81ADC72 gFameCheckerFlavorText_Misty4:: @ 0x81ADC72
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This cape is a famous date spot.\p" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This cape is a famous date spot.\p"
.string "MISTY, the GYM LEADER, has high\n" .string "MISTY, the GYM LEADER, has high\n"
.string "hopes about this place.$" .string "hopes about this place.$"
@@ -159,23 +159,23 @@ gFameCheckerFlavorText_LtSurge0:: @ 0x81ADD3C
gFameCheckerFlavorText_LtSurge1:: @ 0x81ADDA7 gFameCheckerFlavorText_LtSurge1:: @ 0x81ADDA7
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I tell you, kid, electric POKéMON\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I tell you, kid, electric POKéMON\n"
.string "saved me during the war!$" .string "saved me during the war!$"
gFameCheckerFlavorText_LtSurge2:: @ 0x81ADE0B gFameCheckerFlavorText_LtSurge2:: @ 0x81ADE0B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When I was in the Army, LT. SURGE\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When I was in the Army, LT. SURGE\n"
.string "was my strict CO.\p" .string "was my strict CO.\p"
.string "He was a hard taskmaster.$" .string "He was a hard taskmaster.$"
gFameCheckerFlavorText_LtSurge3:: @ 0x81ADE82 gFameCheckerFlavorText_LtSurge3:: @ 0x81ADE82
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE was always famous for\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE was always famous for\n"
.string "his cautious nature in the Army.$" .string "his cautious nature in the Army.$"
gFameCheckerFlavorText_LtSurge4:: @ 0x81ADEEC gFameCheckerFlavorText_LtSurge4:: @ 0x81ADEEC
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE installed the traps in\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE installed the traps in\n"
.string "the GYM himself.\p" .string "the GYM himself.\p"
.string "He set up double locks everywhere.$" .string "He set up double locks everywhere.$"
@@ -194,26 +194,26 @@ gFameCheckerFlavorText_Erika0:: @ 0x81AE009
gFameCheckerFlavorText_Erika1:: @ 0x81AE072 gFameCheckerFlavorText_Erika1:: @ 0x81AE072
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am a student of the art of\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am a student of the art of\n"
.string "flower arranging.\p" .string "flower arranging.\p"
.string "My POKéMON are solely of the\n" .string "My POKéMON are solely of the\n"
.string "GRASS type.$" .string "GRASS type.$"
gFameCheckerFlavorText_Erika2:: @ 0x81AE0F3 gFameCheckerFlavorText_Erika2:: @ 0x81AE0F3
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER ERIKA might be quiet,\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER ERIKA might be quiet,\n"
.string "but she's famous around here.$" .string "but she's famous around here.$"
gFameCheckerFlavorText_Erika3:: @ 0x81AE15B gFameCheckerFlavorText_Erika3:: @ 0x81AE15B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We only use GRASS-type POKéMON at\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We only use GRASS-type POKéMON at\n"
.string "our GYM.\p" .string "our GYM.\p"
.string "Why? We also use them for making\n" .string "Why? We also use them for making\n"
.string "flower arrangements!$" .string "flower arrangements!$"
gFameCheckerFlavorText_Erika4:: @ 0x81AE1E5 gFameCheckerFlavorText_Erika4:: @ 0x81AE1E5
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I would never collect POKéMON if\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I would never collect POKéMON if\n"
.string "they were unattractive.$" .string "they were unattractive.$"
gFameCheckerFlavorText_Erika5:: @ 0x81AE247 gFameCheckerFlavorText_Erika5:: @ 0x81AE247
@@ -230,18 +230,18 @@ gFameCheckerFlavorText_Koga0:: @ 0x81AE2B6
gFameCheckerFlavorText_Koga1:: @ 0x81AE31D gFameCheckerFlavorText_Koga1:: @ 0x81AE31D
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Despair to the creeping horror of\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Despair to the creeping horror of\n"
.string "POISON-type POKéMON!$" .string "POISON-type POKéMON!$"
gFameCheckerFlavorText_Koga2:: @ 0x81AE37D gFameCheckerFlavorText_Koga2:: @ 0x81AE37D
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even though I've lost, I will keep\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even though I've lost, I will keep\n"
.string "training according to the teachings\l" .string "training according to the teachings\l"
.string "of KOGA, my ninja master.$" .string "of KOGA, my ninja master.$"
gFameCheckerFlavorText_Koga3:: @ 0x81AE407 gFameCheckerFlavorText_Koga3:: @ 0x81AE407
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My father is the GYM LEADER of\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My father is the GYM LEADER of\n"
.string "this town.\p" .string "this town.\p"
.string "I'm training to use POISON POKéMON\n" .string "I'm training to use POISON POKéMON\n"
.string "as well as my father.$" .string "as well as my father.$"
@@ -255,7 +255,7 @@ gFameCheckerFlavorText_Koga4:: @ 0x81AE48D
gFameCheckerFlavorText_Koga5:: @ 0x81AE51B gFameCheckerFlavorText_Koga5:: @ 0x81AE51B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The SAFARI ZONE's huge, wouldn't\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The SAFARI ZONE's huge, wouldn't\n"
.string "you say?\p" .string "you say?\p"
.string "FUCHSIA's GYM LEADER, KOGA, \n" .string "FUCHSIA's GYM LEADER, KOGA, \n"
.string "patrols the grounds every so often.\p" .string "patrols the grounds every so often.\p"
@@ -270,21 +270,21 @@ gFameCheckerFlavorText_Sabrina0:: @ 0x81AE5E8
gFameCheckerFlavorText_Sabrina1:: @ 0x81AE656 gFameCheckerFlavorText_Sabrina1:: @ 0x81AE656
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know about a girl GYM LEADER\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know about a girl GYM LEADER\n"
.string "in SAFFRON CITY?\p" .string "in SAFFRON CITY?\p"
.string "She uses PSYCHIC-type POKéMON,\n" .string "She uses PSYCHIC-type POKéMON,\n"
.string "right?$" .string "right?$"
gFameCheckerFlavorText_Sabrina2:: @ 0x81AE6D7 gFameCheckerFlavorText_Sabrina2:: @ 0x81AE6D7
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I have had psychic powers since\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I have had psychic powers since\n"
.string "I was a child.\p" .string "I was a child.\p"
.string "It started when a spoon I\n" .string "It started when a spoon I\n"
.string "carelessly tossed, bent.$" .string "carelessly tossed, bent.$"
gFameCheckerFlavorText_Sabrina3:: @ 0x81AE762 gFameCheckerFlavorText_Sabrina3:: @ 0x81AE762
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I dislike battling, but if you wish,\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I dislike battling, but if you wish,\n"
.string "I will show you my powers!$" .string "I will show you my powers!$"
gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB
@@ -295,7 +295,7 @@ gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB
gFameCheckerFlavorText_Sabrina5:: @ 0x81AE841 gFameCheckerFlavorText_Sabrina5:: @ 0x81AE841
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}SABRINA just wiped out the KARATE\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}SABRINA just wiped out the KARATE\n"
.string "MASTER next door.$" .string "MASTER next door.$"
gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E
@@ -306,13 +306,13 @@ gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E
gFameCheckerFlavorText_Blaine1:: @ 0x81AE90A gFameCheckerFlavorText_Blaine1:: @ 0x81AE90A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fiery POKéMON are all rough\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fiery POKéMON are all rough\n"
.string "and ready with intense heat!\p" .string "and ready with intense heat!\p"
.string "They incinerate all challengers!$" .string "They incinerate all challengers!$"
gFameCheckerFlavorText_Blaine2:: @ 0x81AE990 gFameCheckerFlavorText_Blaine2:: @ 0x81AE990
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER, BLAINE, became lost\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER, BLAINE, became lost\n"
.string "in the mountains but good.\p" .string "in the mountains but good.\p"
.string "Night fell when a fiery bird\n" .string "Night fell when a fiery bird\n"
.string "POKéMON appeared.\p" .string "POKéMON appeared.\p"
@@ -321,7 +321,7 @@ gFameCheckerFlavorText_Blaine2:: @ 0x81AE990
gFameCheckerFlavorText_Blaine3:: @ 0x81AEA59 gFameCheckerFlavorText_Blaine3:: @ 0x81AEA59
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}CINNABAR GYM's BLAINE is quite the\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}CINNABAR GYM's BLAINE is quite the\n"
.string "odd fellow.\p" .string "odd fellow.\p"
.string "He's lived on the island since way\n" .string "He's lived on the island since way\n"
.string "before the LAB was built.$" .string "before the LAB was built.$"
@@ -341,16 +341,16 @@ gFameCheckerFlavorText_Blaine5:: @ 0x81AEB69
gFameCheckerFlavorText_Lorelei0:: @ 0x81AEBDF gFameCheckerFlavorText_Lorelei0:: @ 0x81AEBDF
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am LORELEI of the ELITE FOUR.$" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am LORELEI of the ELITE FOUR.$"
gFameCheckerFlavorText_Lorelei1:: @ 0x81AEC28 gFameCheckerFlavorText_Lorelei1:: @ 0x81AEC28
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}No one can best me when it comes\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}No one can best me when it comes\n"
.string "to icy POKéMON.$" .string "to icy POKéMON.$"
gFameCheckerFlavorText_Lorelei2:: @ 0x81AEC82 gFameCheckerFlavorText_Lorelei2:: @ 0x81AEC82
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Where was this person born?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Where was this person born?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We've had a great and powerful\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We've had a great and powerful\n"
.string "TRAINER grow up on this island.\p" .string "TRAINER grow up on this island.\p"
.string "I bet even you'd know her.\n" .string "I bet even you'd know her.\n"
.string "It's LORELEI of the ELITE FOUR!$" .string "It's LORELEI of the ELITE FOUR!$"
@@ -363,14 +363,14 @@ gFameCheckerFlavorText_Lorelei3:: @ 0x81AED27
gFameCheckerFlavorText_Lorelei4:: @ 0x81AEDAA gFameCheckerFlavorText_Lorelei4:: @ 0x81AEDAA
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Did you know that LORELEI has lots\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Did you know that LORELEI has lots\n"
.string "and lots of stuffed dolls?\p" .string "and lots of stuffed dolls?\p"
.string "Every time she comes back to\n" .string "Every time she comes back to\n"
.string "FOUR ISLAND, her collection grows!$" .string "FOUR ISLAND, her collection grows!$"
gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51 gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The LAPRAS she has, I imagine it\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The LAPRAS she has, I imagine it\n"
.string "to be the one she met as a child.\p" .string "to be the one she met as a child.\p"
.string "I believe it was in ICEFALL CAVE\n" .string "I believe it was in ICEFALL CAVE\n"
.string "that she caught it.\p" .string "that she caught it.\p"
@@ -379,11 +379,11 @@ gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51
gFameCheckerFlavorText_Bruno0:: @ 0x81AEF25 gFameCheckerFlavorText_Bruno0:: @ 0x81AEF25
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am BRUNO of the ELITE FOUR!$" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am BRUNO of the ELITE FOUR!$"
gFameCheckerFlavorText_Bruno1:: @ 0x81AEF6C gFameCheckerFlavorText_Bruno1:: @ 0x81AEF6C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I've lived and trained with my\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I've lived and trained with my\n"
.string "fighting POKéMON!$" .string "fighting POKéMON!$"
gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6 gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6
@@ -394,14 +394,14 @@ gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6
gFameCheckerFlavorText_Bruno3:: @ 0x81AF04C gFameCheckerFlavorText_Bruno3:: @ 0x81AF04C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BRUNO, who's a senior ahead of me,\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BRUNO, who's a senior ahead of me,\n"
.string "visits the SPA on occasion.\p" .string "visits the SPA on occasion.\p"
.string "He comes to rehab injuries, both\n" .string "He comes to rehab injuries, both\n"
.string "his own and his POKéMON's.$" .string "his own and his POKéMON's.$"
gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0 gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's one of the ELITE FOUR.\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's one of the ELITE FOUR.\n"
.string "His name is BRUNO.\p" .string "His name is BRUNO.\p"
.string "He went away disappointed when he\n" .string "He went away disappointed when he\n"
.string "found out that they were all sold\l" .string "found out that they were all sold\l"
@@ -409,22 +409,22 @@ gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0
gFameCheckerFlavorText_Bruno5:: @ 0x81AF19A gFameCheckerFlavorText_Bruno5:: @ 0x81AF19A
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even BRUNO…\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even BRUNO…\n"
.string "He trained with a fellow by the\l" .string "He trained with a fellow by the\l"
.string "name of BRAWLY before.$" .string "name of BRAWLY before.$"
gFameCheckerFlavorText_Agatha0:: @ 0x81AF200 gFameCheckerFlavorText_Agatha0:: @ 0x81AF200
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am AGATHA of the ELITE FOUR.$" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am AGATHA of the ELITE FOUR.$"
gFameCheckerFlavorText_Agatha1:: @ 0x81AF248 gFameCheckerFlavorText_Agatha1:: @ 0x81AF248
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}AGATHA's GHOST-type POKéMON are\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}AGATHA's GHOST-type POKéMON are\n"
.string "horrifically terrifying in toughness.$" .string "horrifically terrifying in toughness.$"
gFameCheckerFlavorText_Agatha2:: @ 0x81AF2B7 gFameCheckerFlavorText_Agatha2:: @ 0x81AF2B7
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}That old lady's also got a really\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}That old lady's also got a really\n"
.string "short fuse, too.\p" .string "short fuse, too.\p"
.string "It doesn't take anything to get\n" .string "It doesn't take anything to get\n"
.string "that scary lady hollering.$" .string "that scary lady hollering.$"
@@ -437,7 +437,7 @@ gFameCheckerFlavorText_Agatha3:: @ 0x81AF34E
gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n"
.string "interest in you, child.\p" .string "interest in you, child.\p"
.string "That old duff was once tough and\n" .string "That old duff was once tough and\n"
.string "handsome.\p" .string "handsome.\p"
@@ -446,19 +446,19 @@ gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE
gFameCheckerFlavorText_Agatha5:: @ 0x81AF47C gFameCheckerFlavorText_Agatha5:: @ 0x81AF47C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Take AGATHA, for example.\p" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Take AGATHA, for example.\p"
.string "She set a record for being the\n" .string "She set a record for being the\n"
.string "oldest-ever ELITE FOUR member.$" .string "oldest-ever ELITE FOUR member.$"
gFameCheckerFlavorText_Lance0:: @ 0x81AF4FD gFameCheckerFlavorText_Lance0:: @ 0x81AF4FD
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I lead the ELITE FOUR.\p" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I lead the ELITE FOUR.\p"
.string "You can call me LANCE the dragon\n" .string "You can call me LANCE the dragon\n"
.string "TRAINER.$" .string "TRAINER.$"
gFameCheckerFlavorText_Lance1:: @ 0x81AF567 gFameCheckerFlavorText_Lance1:: @ 0x81AF567
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know that dragons are\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know that dragons are\n"
.string "mythical POKéMON.\p" .string "mythical POKéMON.\p"
.string "They're hard to catch and raise,\n" .string "They're hard to catch and raise,\n"
.string "but their powers are superior.\p" .string "but their powers are superior.\p"
@@ -467,13 +467,13 @@ gFameCheckerFlavorText_Lance1:: @ 0x81AF567
gFameCheckerFlavorText_Lance2:: @ 0x81AF641 gFameCheckerFlavorText_Lance2:: @ 0x81AF641
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He stands for justice!\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He stands for justice!\n"
.string "He's cool, and yet passionate!\l" .string "He's cool, and yet passionate!\l"
.string "He's the greatest, LANCE!$" .string "He's the greatest, LANCE!$"
gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We have a customer, LANCE, who\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We have a customer, LANCE, who\n"
.string "occasionally comes.\p" .string "occasionally comes.\p"
.string "He always buys capes.\p" .string "He always buys capes.\p"
.string "I wonder… Does he have many\n" .string "I wonder… Does he have many\n"
@@ -487,56 +487,56 @@ gFameCheckerFlavorText_Lance4:: @ 0x81AF758
gFameCheckerFlavorText_Lance5:: @ 0x81AF7CB gFameCheckerFlavorText_Lance5:: @ 0x81AF7CB
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}From what I've heard, LANCE has\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}From what I've heard, LANCE has\n"
.string "a cousin who's a GYM LEADER\l" .string "a cousin who's a GYM LEADER\l"
.string "somewhere far away.$" .string "somewhere far away.$"
gFameCheckerFlavorText_Bill0:: @ 0x81AF83E gFameCheckerFlavorText_Bill0:: @ 0x81AF83E
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}After all, BILL's world-famous as a\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}After all, BILL's world-famous as a\n"
.string "POKéMANIAC.\p" .string "POKéMANIAC.\p"
.string "He invented the POKéMON Storage\n" .string "He invented the POKéMON Storage\n"
.string "System on PC, too.$" .string "System on PC, too.$"
gFameCheckerFlavorText_Bill1:: @ 0x81AF8CA gFameCheckerFlavorText_Bill1:: @ 0x81AF8CA
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL has lots of POKéMON!\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL has lots of POKéMON!\n"
.string "He collects rare ones, too!$" .string "He collects rare ones, too!$"
gFameCheckerFlavorText_Bill2:: @ 0x81AF929 gFameCheckerFlavorText_Bill2:: @ 0x81AF929
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's my grandson!\p" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's my grandson!\p"
.string "He always liked collecting things,\n" .string "He always liked collecting things,\n"
.string "even as a child!$" .string "even as a child!$"
gFameCheckerFlavorText_Bill3:: @ 0x81AF998 gFameCheckerFlavorText_Bill3:: @ 0x81AF998
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL is a POKéMANIAC, so he loves\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL is a POKéMANIAC, so he loves\n"
.string "every kind.\p" .string "every kind.\p"
.string "Apparently, the first one he caught\n" .string "Apparently, the first one he caught\n"
.string "was an ABRA.$" .string "was an ABRA.$"
gFameCheckerFlavorText_Bill4:: @ 0x81AFA20 gFameCheckerFlavorText_Bill4:: @ 0x81AFA20
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL's hometown is GOLDENROD CITY,\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL's hometown is GOLDENROD CITY,\n"
.string "where his folks still live.\p" .string "where his folks still live.\p"
.string "I've heard that it's quite the\n" .string "I've heard that it's quite the\n"
.string "festive, bustling city.$" .string "festive, bustling city.$"
gFameCheckerFlavorText_Bill5:: @ 0x81AFAB9 gFameCheckerFlavorText_Bill5:: @ 0x81AFAB9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Apparently, BILL simply can't\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Apparently, BILL simply can't\n"
.string "stomach milk at all.$" .string "stomach milk at all.$"
gFameCheckerFlavorText_MrFuji0:: @ 0x81AFB0C gFameCheckerFlavorText_MrFuji0:: @ 0x81AFB0C
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's really kind.\p" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's really kind.\p"
.string "He looks after abandoned and\n" .string "He looks after abandoned and\n"
.string "orphaned POKéMON.$" .string "orphaned POKéMON.$"
gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76 gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This old guy marched right up to\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This old guy marched right up to\n"
.string "our HIDEOUT.\p" .string "our HIDEOUT.\p"
.string "Then, he starts ranting about how\n" .string "Then, he starts ranting about how\n"
.string "TEAM ROCKET's abusing POKéMON.\p" .string "TEAM ROCKET's abusing POKéMON.\p"
@@ -553,7 +553,7 @@ gFameCheckerFlavorText_MrFuji2:: @ 0x81AFC38
gFameCheckerFlavorText_MrFuji3:: @ 0x81AFCE9 gFameCheckerFlavorText_MrFuji3:: @ 0x81AFCE9
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear that MR. FUJI's not from\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear that MR. FUJI's not from\n"
.string "these parts originally, either.$" .string "these parts originally, either.$"
gFameCheckerFlavorText_MrFuji4:: @ 0x81AFD49 gFameCheckerFlavorText_MrFuji4:: @ 0x81AFD49
@@ -572,7 +572,7 @@ gFameCheckerFlavorText_MrFuji5:: @ 0x81AFDC4
gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68 gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET captures POKéMON from\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET captures POKéMON from\n"
.string "around the world.\p" .string "around the world.\p"
.string "They're important tools for keeping\n" .string "They're important tools for keeping\n"
.string "our criminal enterprise going.\p" .string "our criminal enterprise going.\p"
@@ -580,32 +580,32 @@ gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68
gFameCheckerFlavorText_Giovanni1:: @ 0x81AFF23 gFameCheckerFlavorText_Giovanni1:: @ 0x81AFF23
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Those thugs that took over our\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Those thugs that took over our\n"
.string "building…\p" .string "building…\p"
.string "Their BOSS said he was looking for\n" .string "Their BOSS said he was looking for\n"
.string "strong POKéMON.$" .string "strong POKéMON.$"
gFameCheckerFlavorText_Giovanni2:: @ 0x81AFFA8 gFameCheckerFlavorText_Giovanni2:: @ 0x81AFFA8
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET's BOSS is terribly\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET's BOSS is terribly\n"
.string "cruel!\p" .string "cruel!\p"
.string "To him, POKéMON are just tools to\n" .string "To him, POKéMON are just tools to\n"
.string "be used.$" .string "be used.$"
gFameCheckerFlavorText_Giovanni3:: @ 0x81B0022 gFameCheckerFlavorText_Giovanni3:: @ 0x81B0022
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Welcome to my hideout!\p" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Welcome to my hideout!\p"
.string "It shall be so until I can restore\n" .string "It shall be so until I can restore\n"
.string "TEAM ROCKET to its former glory.$" .string "TEAM ROCKET to its former glory.$"
gFameCheckerFlavorText_Giovanni4:: @ 0x81B00A6 gFameCheckerFlavorText_Giovanni4:: @ 0x81B00A6
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Blow me away! GIOVANNI was the\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Blow me away! GIOVANNI was the\n"
.string "GYM LEADER of VIRIDIAN?$" .string "GYM LEADER of VIRIDIAN?$"
gFameCheckerFlavorText_Giovanni5:: @ 0x81B0106 gFameCheckerFlavorText_Giovanni5:: @ 0x81B0106
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You… You're not GIOVANNI's kid,\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You… You're not GIOVANNI's kid,\n"
.string "are you?\p" .string "are you?\p"
.string "No, that can't be right.\n" .string "No, that can't be right.\n"
.string "GIOVANNI's kid has red hair.$" .string "GIOVANNI's kid has red hair.$"
@@ -617,7 +617,7 @@ gFameCheckerPersonName_ProfOak:: @ 0x81B0188
gFameCheckerPersonQuote_ProfOak:: @ 0x81B0198 gFameCheckerPersonQuote_ProfOak:: @ 0x81B0198
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: PROF. OAK\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: PROF. OAK\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Why do POKéMON compete and battle\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Why do POKéMON compete and battle\n"
.string "so hard for you?\p" .string "so hard for you?\p"
.string "They do so because they can see\n" .string "They do so because they can see\n"
.string "the love and trust you have\l" .string "the love and trust you have\l"
@@ -630,7 +630,7 @@ gFameCheckerPersonName_Daisy:: @ 0x81B0251
gFameCheckerPersonQuote_Daisy:: @ 0x81B025D gFameCheckerPersonQuote_Daisy:: @ 0x81B025D
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: DAISY\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: DAISY\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}While I was comfortably enjoying\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}While I was comfortably enjoying\n"
.string "my tea breaks, you've grown very\l" .string "my tea breaks, you've grown very\l"
.string "skilled and powerful.\p" .string "skilled and powerful.\p"
.string "I hope you'll remain a good rival\n" .string "I hope you'll remain a good rival\n"
@@ -642,7 +642,7 @@ gFameCheckerPersonName_Brock:: @ 0x81B030F
gFameCheckerPersonQuote_Brock:: @ 0x81B031B gFameCheckerPersonQuote_Brock:: @ 0x81B031B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BROCK\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BROCK\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}In this big world of ours, there\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}In this big world of ours, there\n"
.string "must be many tough TRAINERS.\p" .string "must be many tough TRAINERS.\p"
.string "Let's both keep training and\n" .string "Let's both keep training and\n"
.string "making ourselves stronger!$" .string "making ourselves stronger!$"
@@ -653,7 +653,7 @@ gFameCheckerPersonName_Misty:: @ 0x81B03B3
gFameCheckerPersonQuote_Misty:: @ 0x81B03BF gFameCheckerPersonQuote_Misty:: @ 0x81B03BF
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MISTY\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MISTY\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm going to keep training here at\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm going to keep training here at\n"
.string "this GYM.\p" .string "this GYM.\p"
.string "When I get better, I'd love to hit\n" .string "When I get better, I'd love to hit\n"
.string "the road and travel.$" .string "the road and travel.$"
@@ -664,7 +664,7 @@ gFameCheckerPersonName_LtSurge:: @ 0x81B0446
gFameCheckerPersonQuote_LtSurge:: @ 0x81B0456 gFameCheckerPersonQuote_LtSurge:: @ 0x81B0456
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LT. SURGE\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LT. SURGE\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, kid!\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, kid!\n"
.string "You electrified me in our battle!\p" .string "You electrified me in our battle!\p"
.string "I didn't know that there were\n" .string "I didn't know that there were\n"
.string "gutsy TRAINERS like you.\p" .string "gutsy TRAINERS like you.\p"
@@ -677,7 +677,7 @@ gFameCheckerPersonName_Erika:: @ 0x81B0504
gFameCheckerPersonQuote_Erika:: @ 0x81B0510 gFameCheckerPersonQuote_Erika:: @ 0x81B0510
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: ERIKA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: ERIKA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am so glad that there are strong\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am so glad that there are strong\n"
.string "TRAINERS like you.\p" .string "TRAINERS like you.\p"
.string "That awareness alone inspires and\n" .string "That awareness alone inspires and\n"
.string "motivates me to try harder.\p" .string "motivates me to try harder.\p"
@@ -690,7 +690,7 @@ gFameCheckerPersonName_Koga:: @ 0x81B05C2
gFameCheckerPersonQuote_Koga:: @ 0x81B05CD gFameCheckerPersonQuote_Koga:: @ 0x81B05CD
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: KOGA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: KOGA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You and I, we must both set our\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You and I, we must both set our\n"
.string "sights higher and work towards\l" .string "sights higher and work towards\l"
.string "meeting our challenges.\p" .string "meeting our challenges.\p"
.string "Now, I must go train my daughter.$" .string "Now, I must go train my daughter.$"
@@ -701,7 +701,7 @@ gFameCheckerPersonName_Sabrina:: @ 0x81B0667
gFameCheckerPersonQuote_Sabrina:: @ 0x81B0675 gFameCheckerPersonQuote_Sabrina:: @ 0x81B0675
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: SABRINA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: SABRINA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The love you have towards your\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The love you have towards your\n"
.string "POKéMON…\p" .string "POKéMON…\p"
.string "It was a power that was never\n" .string "It was a power that was never\n"
.string "bested by my psychic power.$" .string "bested by my psychic power.$"
@@ -712,7 +712,7 @@ gFameCheckerPersonName_Blaine:: @ 0x81B06FB
gFameCheckerPersonQuote_Blaine:: @ 0x81B0708 gFameCheckerPersonQuote_Blaine:: @ 0x81B0708
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BLAINE\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BLAINE\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fire POKéMON!\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fire POKéMON!\n"
.string "They'll become even more powerful!\p" .string "They'll become even more powerful!\p"
.string "And now, a quiz. How many kinds of\n" .string "And now, a quiz. How many kinds of\n"
.string "FIRE-type POKéMON are there?$" .string "FIRE-type POKéMON are there?$"
@@ -723,7 +723,7 @@ gFameCheckerPersonName_Lorelei:: @ 0x81B079F
gFameCheckerPersonQuote_Lorelei:: @ 0x81B07AD gFameCheckerPersonQuote_Lorelei:: @ 0x81B07AD
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LORELEI\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LORELEI\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I needed to thank you for your\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I needed to thank you for your\n"
.string "help.\p" .string "help.\p"
.string "But that has nothing to do with our\n" .string "But that has nothing to do with our\n"
.string "battles.\p" .string "battles.\p"
@@ -735,7 +735,7 @@ gFameCheckerPersonName_Bruno:: @ 0x81B0845
gFameCheckerPersonQuote_Bruno:: @ 0x81B0851 gFameCheckerPersonQuote_Bruno:: @ 0x81B0851
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BRUNO\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BRUNO\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The super power of your POKéMON\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The super power of your POKéMON\n"
.string "and you I've experienced myself.\p" .string "and you I've experienced myself.\p"
.string "Next time, maybe I should show you\n" .string "Next time, maybe I should show you\n"
.string "how to train yourself.$" .string "how to train yourself.$"
@@ -746,7 +746,7 @@ gFameCheckerPersonName_Agatha:: @ 0x81B08EE
gFameCheckerPersonQuote_Agatha:: @ 0x81B08FB gFameCheckerPersonQuote_Agatha:: @ 0x81B08FB
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: AGATHA\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: AGATHA\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When you grow older, don't you\n" .string "{FONT_FEMALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When you grow older, don't you\n"
.string "dare go soft like that coot OAK!\p" .string "dare go soft like that coot OAK!\p"
.string "Be like me and keep battling on!$" .string "Be like me and keep battling on!$"
@@ -756,7 +756,7 @@ gFameCheckerPersonName_Lance:: @ 0x81B097F
gFameCheckerPersonQuote_Lance:: @ 0x81B098B gFameCheckerPersonQuote_Lance:: @ 0x81B098B
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LANCE\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LANCE\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm considering going back to my\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm considering going back to my\n"
.string "hometown.\p" .string "hometown.\p"
.string "I want to retrain my DRAGON-type\n" .string "I want to retrain my DRAGON-type\n"
.string "POKéMON and strengthen them.\p" .string "POKéMON and strengthen them.\p"
@@ -769,7 +769,7 @@ gFameCheckerPersonName_Bill:: @ 0x81B0A45
gFameCheckerPersonQuote_Bill:: @ 0x81B0A50 gFameCheckerPersonQuote_Bill:: @ 0x81B0A50
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BILL\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BILL\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, there! CELIO had nothing but\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, there! CELIO had nothing but\n"
.string "praise for you.\p" .string "praise for you.\p"
.string "Hearing that makes me happy.\p" .string "Hearing that makes me happy.\p"
.string "When you catch some rare POKéMON,\n" .string "When you catch some rare POKéMON,\n"
@@ -781,7 +781,7 @@ gFameCheckerPersonName_MrFuji:: @ 0x81B0AFF
gFameCheckerPersonQuote_MrFuji:: @ 0x81B0B0E gFameCheckerPersonQuote_MrFuji:: @ 0x81B0B0E
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MR. FUJI\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MR. FUJI\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Instead of hoping for the happiness\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Instead of hoping for the happiness\n"
.string "of just your POKéMON…\p" .string "of just your POKéMON…\p"
.string "…Can I get you to wish for the\n" .string "…Can I get you to wish for the\n"
.string "happiness of all POKéMON?$" .string "happiness of all POKéMON?$"
@@ -792,7 +792,7 @@ gFameCheckerPersonName_Giovanni:: @ 0x81B0BA6
gFameCheckerPersonQuote_Giovanni:: @ 0x81B0BB5 gFameCheckerPersonQuote_Giovanni:: @ 0x81B0BB5
.string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: GIOVANNI\n" .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: GIOVANNI\n"
.string "To: {PLAYER}\p" .string "To: {PLAYER}\p"
.string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There is nothing that I wish to say\n" .string "{FONT_MALE}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There is nothing that I wish to say\n"
.string "to you.\p" .string "to you.\p"
.string "I will concentrate solely on\n" .string "I will concentrate solely on\n"
.string "bettering myself, and none other.$" .string "bettering myself, and none other.$"
data/text/pokedex_rating.inc
+1 -1
View File
@@ -8,7 +8,7 @@ PokedexRating_Text_SeenXOwnedY::
.string "on your POKéDEX is:\p" .string "on your POKéDEX is:\p"
.string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_1} POKéMON seen and\n"
.string "{STR_VAR_2} POKéMON owned.\p" .string "{STR_VAR_2} POKéMON owned.\p"
.string "{FONT_2}PROF. OAK's rating:$" .string "{FONT_NORMAL}PROF. OAK's rating:$"
PokedexRating_Text_LessThan10:: PokedexRating_Text_LessThan10::
.string "You still have lots to do.\p" .string "You still have lots to do.\p"
graphics/fonts/font6_braille.png → graphics/fonts/braille.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 220 B

graphics/fonts/font9_jap.png → graphics/fonts/japanese_bold.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

graphics/fonts/font5_jap.png → graphics/fonts/japanese_female.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

graphics/fonts/font4_jap.png → graphics/fonts/japanese_male.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

graphics/fonts/font2_jap.png → graphics/fonts/japanese_normal.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

graphics/fonts/font0_jap.png → graphics/fonts/japanese_small.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

graphics/fonts/font1_jap.png → graphics/fonts/japanese_tall.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

graphics/fonts/font2_latin.png → graphics/fonts/latin_female.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

graphics/fonts/font4_latin.png → graphics/fonts/latin_male.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

graphics/fonts/font5_latin.png → graphics/fonts/latin_normal.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

graphics/fonts/font0_latin.png → graphics/fonts/latin_small.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

graphics_file_rules.mk
+11 -11
View File
@@ -60,37 +60,37 @@ $(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/normal/shiny.gbapal \
$(CASTFORMGFXDIR)/snowy/shiny.gbapal $(CASTFORMGFXDIR)/snowy/shiny.gbapal
@cat $^ >$@ @cat $^ >$@
$(FONTGFXDIR)/font0_latin.latfont: $(FONTGFXDIR)/font0_latin.png $(FONTGFXDIR)/latin_small.latfont: $(FONTGFXDIR)/latin_small.png
$(GFX) $< $@ $(GFX) $< $@
$(FONTGFXDIR)/font0_jap.fwjpnfont: $(FONTGFXDIR)/font0_jap.png $(FONTGFXDIR)/japanese_small.fwjpnfont: $(FONTGFXDIR)/japanese_small.png
$(GFX) $< $@ $(GFX) $< $@
$(FONTGFXDIR)/font1_jap.fwjpnfont: $(FONTGFXDIR)/font1_jap.png $(FONTGFXDIR)/japanese_tall.fwjpnfont: $(FONTGFXDIR)/japanese_tall.png
$(GFX) $< $@ $(GFX) $< $@
$(FONTGFXDIR)/font2_latin.latfont: $(FONTGFXDIR)/font2_latin.png $(FONTGFXDIR)/latin_normal.latfont: $(FONTGFXDIR)/latin_normal.png
$(GFX) $< $@ $(GFX) $< $@
$(FONTGFXDIR)/font2_jap.fwjpnfont: $(FONTGFXDIR)/font2_jap.png $(FONTGFXDIR)/japanese_normal.fwjpnfont: $(FONTGFXDIR)/japanese_normal.png
$(GFX) $< $@ $(GFX) $< $@
$(FONTGFXDIR)/font4_latin.latfont: $(FONTGFXDIR)/font4_latin.png $(FONTGFXDIR)/latin_male.latfont: $(FONTGFXDIR)/latin_male.png
$(GFX) $< $@ $(GFX) $< $@
$(FONTGFXDIR)/font4_jap.fwjpnfont: $(FONTGFXDIR)/font4_jap.png $(FONTGFXDIR)/japanese_male.fwjpnfont: $(FONTGFXDIR)/japanese_male.png
$(GFX) $< $@ $(GFX) $< $@
$(FONTGFXDIR)/font5_latin.latfont: $(FONTGFXDIR)/font5_latin.png $(FONTGFXDIR)/latin_female.latfont: $(FONTGFXDIR)/latin_female.png
$(GFX) $< $@ $(GFX) $< $@
$(FONTGFXDIR)/font5_jap.fwjpnfont: $(FONTGFXDIR)/font5_jap.png $(FONTGFXDIR)/japanese_female.fwjpnfont: $(FONTGFXDIR)/japanese_female.png
$(GFX) $< $@ $(GFX) $< $@
$(FONTGFXDIR)/font6.fwjpnfont: $(FONTGFXDIR)/font6_braille.png $(FONTGFXDIR)/braille.fwjpnfont: $(FONTGFXDIR)/braille.png
$(GFX) $< $@ $(GFX) $< $@
$(FONTGFXDIR)/font9_jap.fwjpnfont: $(FONTGFXDIR)/font9_jap.png $(FONTGFXDIR)/japanese_bold.fwjpnfont: $(FONTGFXDIR)/japanese_bold.png
$(GFX) $< $@ $(GFX) $< $@
graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
include/strings.h
+2 -2
View File
@@ -103,8 +103,8 @@ extern const u8 gText_ItemCantBeHeld[];
extern const u8 gText_TMCase[]; extern const u8 gText_TMCase[];
extern const u8 gText_Close[]; extern const u8 gText_Close[];
extern const u8 gText_TMCaseWillBePutAway[]; extern const u8 gText_TMCaseWillBePutAway[];
extern const u8 gText_Font0[]; extern const u8 gText_FontSmall[];
extern const u8 gText_Font2[]; extern const u8 gText_FontNormal[];
extern const u8 gText_OhNoICantBuyThat[]; extern const u8 gText_OhNoICantBuyThat[];
extern const u8 gText_HowManyWouldYouLikeToSell[]; extern const u8 gText_HowManyWouldYouLikeToSell[];
extern const u8 gText_ICanPayThisMuch_WouldThatBeOkay[]; extern const u8 gText_ICanPayThisMuch_WouldThatBeOkay[];
include/text.h
+18 -20
View File
@@ -13,14 +13,14 @@
#define TEXT_SKIP_DRAW 0xFF #define TEXT_SKIP_DRAW 0xFF
enum { enum {
FONT_0, FONT_SMALL,
FONT_1, FONT_NORMAL_COPY_1,
FONT_2, FONT_NORMAL,
FONT_3, FONT_NORMAL_COPY_2,
FONT_4, FONT_MALE,
FONT_5, FONT_FEMALE,
FONT_BRAILLE, FONT_BRAILLE,
FONT_7, FONT_BOLD,
}; };
// Return values for font functions // Return values for font functions
@@ -160,15 +160,13 @@ u8 GetLastTextColor(u8 colorType);
void CopyGlyphToWindow(struct TextPrinter *x); void CopyGlyphToWindow(struct TextPrinter *x);
void ClearTextSpan(struct TextPrinter *textPrinter, u32 width); void ClearTextSpan(struct TextPrinter *textPrinter, u32 width);
u16 Font0Func(struct TextPrinter *textPrinter); u16 FontFunc_Small(struct TextPrinter *textPrinter);
u16 Font1Func(struct TextPrinter *textPrinter); u16 FontFunc_NormalCopy1(struct TextPrinter *textPrinter);
u16 Font2Func(struct TextPrinter *textPrinter); u16 FontFunc_Normal(struct TextPrinter *textPrinter);
u16 Font3Func(struct TextPrinter *textPrinter); u16 FontFunc_NormalCopy2(struct TextPrinter *textPrinter);
u16 Font4Func(struct TextPrinter *textPrinter); u16 FontFunc_Male(struct TextPrinter *textPrinter);
u16 Font5Func(struct TextPrinter *textPrinter); u16 FontFunc_Female(struct TextPrinter *textPrinter);
u16 Font7Func(struct TextPrinter *textPrinter); u16 FontFunc_Braille(struct TextPrinter *textPrinter);
u16 Font8Func(struct TextPrinter *textPrinter);
u16 Font6Func(struct TextPrinter *textPrinter);
void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter); void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter);
void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter); void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter);
@@ -187,10 +185,10 @@ u8 GetKeypadIconWidth(u8 keypadIconId);
u8 GetKeypadIconHeight(u8 keypadIconId); u8 GetKeypadIconHeight(u8 keypadIconId);
u8 GetFontAttribute(u8 fontId, u8 attributeId); u8 GetFontAttribute(u8 fontId, u8 attributeId);
u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension); u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension);
void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese); void DecompressGlyph_Small(u16 glyphId, bool32 isJapanese);
void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese); void DecompressGlyph_Normal(u16 glyphId, bool32 isJapanese);
void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese); void DecompressGlyph_Female(u16 glyphId, bool32 isJapanese);
s32 GetGlyphWidthFont6(u16 font_type, bool32 isJapanese); s32 GetGlyphWidth_Braille(u16 font_type, bool32 isJapanese);
void sub_80062B0(struct Sprite *sprite); void sub_80062B0(struct Sprite *sprite);
u8 CreateTextCursorSpriteForOakSpeech(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority); u8 CreateTextCursorSpriteForOakSpeech(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority);
void DestroyTextCursorSprite(u8 spriteId); void DestroyTextCursorSprite(u8 spriteId);
src/bag.c
+6 -6
View File
@@ -225,16 +225,16 @@ void BagPrintTextOnWindow(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8
void BagPrintTextOnWin1CenteredColor0(const u8 * str, u8 unused) void BagPrintTextOnWin1CenteredColor0(const u8 * str, u8 unused)
{ {
u32 x = 0x48 - GetStringWidth(FONT_1, str, 0); u32 x = 0x48 - GetStringWidth(FONT_NORMAL_COPY_1, str, 0);
AddTextPrinterParameterized3(2, FONT_1, x / 2, 1, sTextColors[0], 0, str); AddTextPrinterParameterized3(2, FONT_NORMAL_COPY_1, x / 2, 1, sTextColors[0], 0, str);
} }
void BagDrawDepositItemTextBox(void) void BagDrawDepositItemTextBox(void)
{ {
u32 x; u32 x;
DrawStdFrameWithCustomTileAndPalette(2, FALSE, 0x081, 0x0C); DrawStdFrameWithCustomTileAndPalette(2, FALSE, 0x081, 0x0C);
x = 0x40 - GetStringWidth(FONT_0, gText_DepositItem, 0); x = 0x40 - GetStringWidth(FONT_SMALL, gText_DepositItem, 0);
AddTextPrinterParameterized(2, FONT_0, gText_DepositItem, x / 2, 1, 0, NULL); AddTextPrinterParameterized(2, FONT_SMALL, gText_DepositItem, x / 2, 1, 0, NULL);
} }
u8 ShowBagWindow(u8 whichWindow, u8 nItems) u8 ShowBagWindow(u8 whichWindow, u8 nItems)
@@ -293,12 +293,12 @@ u8 GetBagWindow(u8 whichWindow)
void BagCreateYesNoMenuBottomRight(u8 taskId, const struct YesNoFuncTable * ptrs) void BagCreateYesNoMenuBottomRight(u8 taskId, const struct YesNoFuncTable * ptrs)
{ {
CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[3], FONT_2, 0, 2, 0x064, 0x0E, ptrs); CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[3], FONT_NORMAL, 0, 2, 0x064, 0x0E, ptrs);
} }
void BagCreateYesNoMenuTopRight(u8 taskId, const struct YesNoFuncTable * ptrs) void BagCreateYesNoMenuTopRight(u8 taskId, const struct YesNoFuncTable * ptrs)
{ {
CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[4], FONT_2, 0, 2, 0x064, 0x0E, ptrs); CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[4], FONT_NORMAL, 0, 2, 0x064, 0x0E, ptrs);
} }
void BagPrintMoneyAmount(void) void BagPrintMoneyAmount(void)
src/battle_interface.c
+2 -2
View File
@@ -1766,7 +1766,7 @@ static void UpdateLeftNoOfBallsTextOnHealthbox(u8 healthboxSpriteId)
txtPtr = StringCopy(text, gText_HighlightRed_Left); txtPtr = StringCopy(text, gText_HighlightRed_Left);
ConvertIntToDecimalStringN(txtPtr, gNumSafariBalls, STR_CONV_MODE_LEFT_ALIGN, 2); ConvertIntToDecimalStringN(txtPtr, gNumSafariBalls, STR_CONV_MODE_LEFT_ALIGN, 2);
windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 47 - GetStringWidth(FONT_0, text, 0), 3, &windowId); windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 47 - GetStringWidth(FONT_SMALL, text, 0), 3, &windowId);
spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP; spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP;
SafariTextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x2C0) + spriteTileNum, windowTileData, 2); SafariTextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x2C0) + spriteTileNum, windowTileData, 2);
SafariTextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0xA00) + spriteTileNum, windowTileData + 0x40, 4); SafariTextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0xA00) + spriteTileNum, windowTileData + 0x40, 4);
@@ -2211,7 +2211,7 @@ static u8 *AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y,
color[1] = 1; color[1] = 1;
color[2] = 3; color[2] = 3;
AddTextPrinterParameterized4(winId, FONT_0, x, y, 0, 0, color, -1, str); AddTextPrinterParameterized4(winId, FONT_SMALL, x, y, 0, 0, color, -1, str);
*windowId = winId; *windowId = winId;
return (u8 *)(GetWindowAttribute(winId, WINDOW_TILE_DATA)); return (u8 *)(GetWindowAttribute(winId, WINDOW_TILE_DATA));
src/battle_message.c
+30 -30
View File
@@ -1292,7 +1292,7 @@ static const u8 sText_RightArrow2[] = _("{RIGHT_ARROW_2}");
static const u8 sText_Plus[] = _("{PLUS}"); static const u8 sText_Plus[] = _("{PLUS}");
static const u8 sText_Dash[] = _("-"); static const u8 sText_Dash[] = _("-");
static const u8 sText_MaxHP[] = _("{FONT_0}Max{FONT_2} HP"); static const u8 sText_MaxHP[] = _("{FONT_SMALL}Max{FONT_NORMAL} HP");
static const u8 sText_Attack[] = _("ATTACK "); static const u8 sText_Attack[] = _("ATTACK ");
static const u8 sText_Defense[] = _("DEFENSE"); static const u8 sText_Defense[] = _("DEFENSE");
static const u8 sText_SpAtk[] = _("SP. ATK"); static const u8 sText_SpAtk[] = _("SP. ATK");
@@ -2407,7 +2407,7 @@ static void ChooseTypeOfMoveUsedString(u8 *dst)
static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = { static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
[B_WIN_MSG] = { [B_WIN_MSG] = {
.fillValue = PIXEL_FILL(0xf), .fillValue = PIXEL_FILL(0xf),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 2, .x = 2,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2419,7 +2419,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_ACTION_PROMPT] = { [B_WIN_ACTION_PROMPT] = {
.fillValue = PIXEL_FILL(0xf), .fillValue = PIXEL_FILL(0xf),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 2, .x = 2,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2431,7 +2431,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_ACTION_MENU] = { [B_WIN_ACTION_MENU] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_1, .fontId = FONT_NORMAL_COPY_1,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2443,7 +2443,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_MOVE_NAME_1] = { [B_WIN_MOVE_NAME_1] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_0, .fontId = FONT_SMALL,
.x = 0, .x = 0,
.y = 1, .y = 1,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2455,7 +2455,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_MOVE_NAME_2] = { [B_WIN_MOVE_NAME_2] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_0, .fontId = FONT_SMALL,
.x = 0, .x = 0,
.y = 1, .y = 1,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2467,7 +2467,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_MOVE_NAME_3] = { [B_WIN_MOVE_NAME_3] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_0, .fontId = FONT_SMALL,
.x = 0, .x = 0,
.y = 1, .y = 1,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2479,7 +2479,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_MOVE_NAME_4] = { [B_WIN_MOVE_NAME_4] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_0, .fontId = FONT_SMALL,
.x = 0, .x = 0,
.y = 1, .y = 1,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2491,7 +2491,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_PP] = { [B_WIN_PP] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_0, .fontId = FONT_SMALL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2503,7 +2503,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_MOVE_TYPE] = { [B_WIN_MOVE_TYPE] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_0, .fontId = FONT_SMALL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2515,7 +2515,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_PP_REMAINING] = { [B_WIN_PP_REMAINING] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_1, .fontId = FONT_NORMAL_COPY_1,
.x = 10, .x = 10,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2527,7 +2527,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_DUMMY] = { [B_WIN_DUMMY] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_1, .fontId = FONT_NORMAL_COPY_1,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2539,7 +2539,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_SWITCH_PROMPT] = { [B_WIN_SWITCH_PROMPT] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_1, .fontId = FONT_NORMAL_COPY_1,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2551,7 +2551,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_LEVEL_UP_BOX] = { [B_WIN_LEVEL_UP_BOX] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 0, .x = 0,
.y = 0, .y = 0,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2563,7 +2563,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_LEVEL_UP_BANNER] = { [B_WIN_LEVEL_UP_BANNER] = {
.fillValue = PIXEL_FILL(0x0), .fillValue = PIXEL_FILL(0x0),
.fontId = FONT_0, .fontId = FONT_SMALL,
.x = 0x20, .x = 0x20,
.y = 0, .y = 0,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2575,7 +2575,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_YESNO] = { [B_WIN_YESNO] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 1, .letterSpacing = 1,
@@ -2587,7 +2587,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_VS_PLAYER] = { [B_WIN_VS_PLAYER] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2599,7 +2599,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_VS_OPPONENT] = { [B_WIN_VS_OPPONENT] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2611,7 +2611,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_VS_MULTI_PLAYER_1] = { [B_WIN_VS_MULTI_PLAYER_1] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2623,7 +2623,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_VS_MULTI_PLAYER_2] = { [B_WIN_VS_MULTI_PLAYER_2] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2635,7 +2635,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_VS_MULTI_PLAYER_3] = { [B_WIN_VS_MULTI_PLAYER_3] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2647,7 +2647,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_VS_MULTI_PLAYER_4] = { [B_WIN_VS_MULTI_PLAYER_4] = {
.fillValue = PIXEL_FILL(0xe), .fillValue = PIXEL_FILL(0xe),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2659,7 +2659,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_VS_OUTCOME_DRAW] = { [B_WIN_VS_OUTCOME_DRAW] = {
.fillValue = PIXEL_FILL(0x0), .fillValue = PIXEL_FILL(0x0),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2671,7 +2671,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_VS_OUTCOME_LEFT] = { [B_WIN_VS_OUTCOME_LEFT] = {
.fillValue = PIXEL_FILL(0x0), .fillValue = PIXEL_FILL(0x0),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2683,7 +2683,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_VS_OUTCOME_RIGHT] = { [B_WIN_VS_OUTCOME_RIGHT] = {
.fillValue = PIXEL_FILL(0x0), .fillValue = PIXEL_FILL(0x0),
.fontId = FONT_2, .fontId = FONT_NORMAL,
.x = 0, .x = 0,
.y = 2, .y = 2,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2695,7 +2695,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
}, },
[B_WIN_OAK_OLD_MAN] = { [B_WIN_OAK_OLD_MAN] = {
.fillValue = PIXEL_FILL(0x1), .fillValue = PIXEL_FILL(0x1),
.fontId = FONT_4, .fontId = FONT_MALE,
.x = 0, .x = 0,
.y = 1, .y = 1,
.letterSpacing = 0, .letterSpacing = 0,
@@ -2709,10 +2709,10 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] = {
static const u8 sNpcTextColorToFont[] = static const u8 sNpcTextColorToFont[] =
{ {
[NPC_TEXT_COLOR_MALE] = FONT_4, [NPC_TEXT_COLOR_MALE] = FONT_MALE,
[NPC_TEXT_COLOR_FEMALE] = FONT_5, [NPC_TEXT_COLOR_FEMALE] = FONT_FEMALE,
[NPC_TEXT_COLOR_MON] = FONT_2, [NPC_TEXT_COLOR_MON] = FONT_NORMAL,
[NPC_TEXT_COLOR_NEUTRAL] = FONT_2, [NPC_TEXT_COLOR_NEUTRAL] = FONT_NORMAL,
}; };
// windowId: Upper 2 bits are text flags // windowId: Upper 2 bits are text flags
src/battle_records.c
+7 -7
View File
@@ -486,7 +486,7 @@ static void PrintTotalRecord(struct LinkBattleRecords * records)
} }
StringExpandPlaceholders(gStringVar4, gString_BattleRecords_TotalRecord); StringExpandPlaceholders(gStringVar4, gString_BattleRecords_TotalRecord);
AddTextPrinterParameterized4(0, FONT_2, 12, 24, 0, 2, sTextColor, 0, gStringVar4); AddTextPrinterParameterized4(0, FONT_NORMAL, 12, 24, 0, 2, sTextColor, 0, gStringVar4);
} }
static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y) static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y)
@@ -496,7 +496,7 @@ static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y)
if (record->wins == 0 && record->losses == 0 && record->draws == 0) if (record->wins == 0 && record->losses == 0 && record->draws == 0)
{ {
AddTextPrinterParameterized4(0, FONT_2, 0, y, 0, 2, sTextColor, 0, gString_BattleRecords_7Dashes); AddTextPrinterParameterized4(0, FONT_NORMAL, 0, y, 0, 2, sTextColor, 0, gString_BattleRecords_7Dashes);
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
if (i == 0) if (i == 0)
@@ -505,7 +505,7 @@ static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y)
x = 0x84; x = 0x84;
else else
x = 0xB4; x = 0xB4;
AddTextPrinterParameterized4(0, FONT_2, x, y, 0, 2, sTextColor, 0, gString_BattleRecords_4Dashes); AddTextPrinterParameterized4(0, FONT_NORMAL, x, y, 0, 2, sTextColor, 0, gString_BattleRecords_4Dashes);
} }
} }
else else
@@ -533,7 +533,7 @@ static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y)
x = 0xB4; x = 0xB4;
ConvertIntToDecimalStringN(gStringVar1, record->draws, STR_CONV_MODE_RIGHT_ALIGN, 4); ConvertIntToDecimalStringN(gStringVar1, record->draws, STR_CONV_MODE_RIGHT_ALIGN, 4);
} }
AddTextPrinterParameterized4(0, FONT_2, x, y, 0, 2, sTextColor, 0, gStringVar1); AddTextPrinterParameterized4(0, FONT_NORMAL, x, y, 0, 2, sTextColor, 0, gStringVar1);
} }
} }
} }
@@ -545,10 +545,10 @@ static void PrintBattleRecords(void)
FillWindowPixelRect(0, PIXEL_FILL(0), 0, 0, 0xD8, 0x90); FillWindowPixelRect(0, PIXEL_FILL(0), 0, 0, 0xD8, 0x90);
StringExpandPlaceholders(gStringVar4, gString_BattleRecords_PlayersBattleResults); StringExpandPlaceholders(gStringVar4, gString_BattleRecords_PlayersBattleResults);
left = 0xD0 - GetStringWidth(FONT_2, gStringVar4, -1); left = 0xD0 - GetStringWidth(FONT_NORMAL, gStringVar4, -1);
AddTextPrinterParameterized4(0, FONT_2, left / 2, 4, 0, 2, sTextColor, 0, gStringVar4); AddTextPrinterParameterized4(0, FONT_NORMAL, left / 2, 4, 0, 2, sTextColor, 0, gStringVar4);
PrintTotalRecord(&gSaveBlock2Ptr->linkBattleRecords); PrintTotalRecord(&gSaveBlock2Ptr->linkBattleRecords);
AddTextPrinterParameterized4(0, FONT_2, 0x54, 0x30, 0, 2, sTextColor, 0, gString_BattleRecords_ColumnHeaders); AddTextPrinterParameterized4(0, FONT_NORMAL, 0x54, 0x30, 0, 2, sTextColor, 0, gString_BattleRecords_ColumnHeaders);
for (i = 0; i < LINK_B_RECORDS_COUNT; i++) for (i = 0; i < LINK_B_RECORDS_COUNT; i++)
PrintOpponentBattleRecord(&gSaveBlock2Ptr->linkBattleRecords.entries[i], 0x3D + 14 * i); PrintOpponentBattleRecord(&gSaveBlock2Ptr->linkBattleRecords.entries[i], 0x3D + 14 * i);
CommitWindow(0); CommitWindow(0);
src/battle_script_commands.c
+1 -1
View File
@@ -5824,7 +5824,7 @@ static void DrawLevelUpBannerText(void)
printerTemplate.currentChar = gStringVar4; printerTemplate.currentChar = gStringVar4;
printerTemplate.windowId = B_WIN_LEVEL_UP_BANNER; printerTemplate.windowId = B_WIN_LEVEL_UP_BANNER;
printerTemplate.fontId = FONT_0; printerTemplate.fontId = FONT_SMALL;
printerTemplate.x = 32; printerTemplate.x = 32;
printerTemplate.y = 0; printerTemplate.y = 0;
printerTemplate.currentX = 32; printerTemplate.currentX = 32;
src/berry_crush.c
+39 -39
View File
@@ -1268,11 +1268,11 @@ static u32 Cmd_PrintMessage(struct BerryCrushGame * game, u8 *args)
if (bFlags & F_MSG_EXPAND) if (bFlags & F_MSG_EXPAND)
{ {
StringExpandPlaceholders(gStringVar4, sMessages[bMsgId]); StringExpandPlaceholders(gStringVar4, sMessages[bMsgId]);
AddTextPrinterParameterized2(0, FONT_2, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
else else
{ {
AddTextPrinterParameterized2(0, FONT_2, sMessages[bMsgId], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[bMsgId], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
break; break;
@@ -2222,7 +2222,7 @@ static u32 Cmd_SaveGame(struct BerryCrushGame * game, u8 *args)
if (!IsLinkTaskFinished()) if (!IsLinkTaskFinished())
return 0; return 0;
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, FONT_2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
CreateTask(Task_LinkFullSave, 0); CreateTask(Task_LinkFullSave, 0);
break; break;
@@ -2367,9 +2367,9 @@ static u32 Cmd_StopGame(struct BerryCrushGame * game, u8 *args)
case 0: case 0:
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
if (game->playAgainState == PLAY_AGAIN_NO_BERRIES) if (game->playAgainState == PLAY_AGAIN_NO_BERRIES)
AddTextPrinterParameterized2(0, FONT_2, sMessages[MSG_NO_BERRIES], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_NO_BERRIES], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
else else
AddTextPrinterParameterized2(0, FONT_2, sMessages[MSG_DROPPED], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sMessages[MSG_DROPPED], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
break; break;
case 1: case 1:
@@ -2896,8 +2896,8 @@ static void FramesToMinSec(struct BerryCrushGame_Gfx * gfx, u16 frames)
static void PrintTextCentered(u8 windowId, u8 left, u8 colorId, const u8 *string) static void PrintTextCentered(u8 windowId, u8 left, u8 colorId, const u8 *string)
{ {
left = (left * 4) - (GetStringWidth(FONT_2, string, -1) / 2u); left = (left * 4) - (GetStringWidth(FONT_NORMAL, string, -1) / 2u);
AddTextPrinterParameterized3(windowId, FONT_2, left, 0, sBerryCrushTextColorTable[colorId], 0, string); AddTextPrinterParameterized3(windowId, FONT_NORMAL, left, 0, sBerryCrushTextColorTable[colorId], 0, string);
} }
static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8 y) static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8 y)
@@ -2922,9 +2922,9 @@ static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8
if (i != 0 && bcPlayers->stats[command][i] != bcPlayers->stats[command][i - 1]) if (i != 0 && bcPlayers->stats[command][i] != bcPlayers->stats[command][i - 1])
linkIdToPrint = i; linkIdToPrint = i;
ConvertIntToDecimalStringN(gStringVar1, bcPlayers->stats[command][i], STR_CONV_MODE_RIGHT_ALIGN, 4); ConvertIntToDecimalStringN(gStringVar1, bcPlayers->stats[command][i], STR_CONV_MODE_RIGHT_ALIGN, 4);
realX = x - GetStringWidth(FONT_2, sBCRankingHeaders[command], -1) - 4; realX = x - GetStringWidth(FONT_NORMAL, sBCRankingHeaders[command], -1) - 4;
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, realX, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, sBCRankingHeaders[command]); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, realX, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, sBCRankingHeaders[command]);
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, realX - 24, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar1); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, realX - 24, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar1);
break; break;
case RESULTS_PAGE_RANDOM: case RESULTS_PAGE_RANDOM:
// Neatness // Neatness
@@ -2943,7 +2943,7 @@ static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8
ConvertIntToDecimalStringN(gStringVar2, realX, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar2, realX, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]); StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]);
realX2 = x - 4; realX2 = x - 4;
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, realX2 - GetStringWidth(FONT_2, gStringVar4, 0), y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, realX2 - GetStringWidth(FONT_NORMAL, gStringVar4, 0), y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4);
break; break;
case RESULTS_PAGE_CRUSHING: case RESULTS_PAGE_CRUSHING:
// Berry names // Berry names
@@ -2954,7 +2954,7 @@ static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8
j = 0; j = 0;
StringCopy(gStringVar1, gBerries[j].name); StringCopy(gStringVar1, gBerries[j].name);
StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]); StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]);
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x - GetStringWidth(FONT_2, gStringVar4, -1) - 4, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, x - GetStringWidth(FONT_NORMAL, gStringVar4, -1) - 4, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4);
break; break;
} }
if (linkPlayerId == game->localId) if (linkPlayerId == game->localId)
@@ -2964,7 +2964,7 @@ static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8
gStringVar3[0] = linkIdToPrint + CHAR_1; gStringVar3[0] = linkIdToPrint + CHAR_1;
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, game->players[linkPlayerId].name); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, game->players[linkPlayerId].name);
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gStringVar3); DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gStringVar3);
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, 4, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, 4, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4);
} }
} }
@@ -2977,30 +2977,30 @@ static void printCrushingResults(struct BerryCrushGame * game)
u8 y = GetWindowAttribute(game->gfx.resultsWindowId, WINDOW_HEIGHT) * 8 - 42; u8 y = GetWindowAttribute(game->gfx.resultsWindowId, WINDOW_HEIGHT) * 8 - 42;
FramesToMinSec(&game->gfx, players->time); FramesToMinSec(&game->gfx, players->time);
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_TimeColon); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_TimeColon);
x = 190 - (u8)GetStringWidth(FONT_2, gText_SpaceSec, 0); x = 190 - (u8)GetStringWidth(FONT_NORMAL, gText_SpaceSec, 0);
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_SpaceSec); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_SpaceSec);
x -= 32; x -= 32;
ConvertIntToDecimalStringN(gStringVar1, game->gfx.secondsInt, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar1, game->gfx.secondsInt, STR_CONV_MODE_LEADING_ZEROS, 2);
ConvertIntToDecimalStringN(gStringVar2, game->gfx.secondsFrac, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar2, game->gfx.secondsFrac, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_XDotY2); StringExpandPlaceholders(gStringVar4, gText_XDotY2);
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4);
x -= (u8)GetStringWidth(FONT_2, gText_SpaceMin, 0) + 3; x -= (u8)GetStringWidth(FONT_NORMAL, gText_SpaceMin, 0) + 3;
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_SpaceMin); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_SpaceMin);
x -= 9; x -= 9;
ConvertIntToDecimalStringN(gStringVar1, game->gfx.minutes, STR_CONV_MODE_LEADING_ZEROS, 1); ConvertIntToDecimalStringN(gStringVar1, game->gfx.minutes, STR_CONV_MODE_LEADING_ZEROS, 1);
StringExpandPlaceholders(gStringVar4, gText_StrVar1); StringExpandPlaceholders(gStringVar4, gText_StrVar1);
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4);
y += 14; y += 14;
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_PressingSpeed); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_PressingSpeed);
x = 190 - (u8)GetStringWidth(FONT_2, gText_TimesPerSec, 0); x = 190 - (u8)GetStringWidth(FONT_NORMAL, gText_TimesPerSec, 0);
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_3, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_TimesPerSec); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL_COPY_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_TimesPerSec);
for (i = 0; i < 8; ++i) for (i = 0; i < 8; ++i)
if (((u8)game->pressingSpeed >> (7 - i)) & 1) if (((u8)game->pressingSpeed >> (7 - i)) & 1)
@@ -3010,17 +3010,17 @@ static void printCrushingResults(struct BerryCrushGame * game)
StringExpandPlaceholders(gStringVar4, gText_XDotY3); StringExpandPlaceholders(gStringVar4, gText_XDotY3);
x -= 38; x -= 38;
if (game->newRecord) if (game->newRecord)
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_RED], 0, gStringVar4); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, x, y, sBerryCrushTextColorTable[COLORID_RED], 0, gStringVar4);
else else
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4);
y += 14; y += 14;
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_Silkiness); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_Silkiness);
ConvertIntToDecimalStringN(gStringVar1, players->silkiness, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, players->silkiness, STR_CONV_MODE_RIGHT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_Var1Percent); StringExpandPlaceholders(gStringVar4, gText_Var1Percent);
x = 190 - (u8)GetStringWidth(FONT_2, gStringVar4, 0); x = 190 - (u8)GetStringWidth(FONT_NORMAL, gStringVar4, 0);
AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_NORMAL, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4);
} }
static bool32 OpenResultsWindow(struct BerryCrushGame * game, struct BerryCrushGame_Gfx * spriteManager) static bool32 OpenResultsWindow(struct BerryCrushGame * game, struct BerryCrushGame_Gfx * spriteManager)
@@ -3109,20 +3109,20 @@ static void Task_ShowBerryCrushRankings(u8 taskId)
DrawStdFrameWithCustomTileAndPalette(tWindowId, 0, 0x21D, 0xD); DrawStdFrameWithCustomTileAndPalette(tWindowId, 0, 0x21D, 0xD);
break; break;
case 1: case 1:
xPos = 96 - GetStringWidth(FONT_2, gText_BerryCrush2, -1) / 2u; xPos = 96 - GetStringWidth(FONT_NORMAL, gText_BerryCrush2, -1) / 2u;
AddTextPrinterParameterized3( AddTextPrinterParameterized3(
tWindowId, tWindowId,
FONT_2, FONT_NORMAL,
xPos, xPos,
2, 2,
sBerryCrushTextColorTable[COLORID_BLUE], sBerryCrushTextColorTable[COLORID_BLUE],
0, 0,
gText_BerryCrush2 gText_BerryCrush2
); );
xPos = 96 - GetStringWidth(FONT_2, gText_PressingSpeedRankings, -1) / 2u; xPos = 96 - GetStringWidth(FONT_NORMAL, gText_PressingSpeedRankings, -1) / 2u;
AddTextPrinterParameterized3( AddTextPrinterParameterized3(
tWindowId, tWindowId,
FONT_2, FONT_NORMAL,
xPos, xPos,
18, 18,
sBerryCrushTextColorTable[COLORID_BLUE], sBerryCrushTextColorTable[COLORID_BLUE],
@@ -3136,7 +3136,7 @@ static void Task_ShowBerryCrushRankings(u8 taskId)
StringExpandPlaceholders(gStringVar4, gText_Var1Players); StringExpandPlaceholders(gStringVar4, gText_Var1Players);
AddTextPrinterParameterized3( AddTextPrinterParameterized3(
tWindowId, tWindowId,
FONT_2, FONT_NORMAL,
4, 4,
yPos, yPos,
sBerryCrushTextColorTable[COLORID_GRAY], sBerryCrushTextColorTable[COLORID_GRAY],
@@ -3153,10 +3153,10 @@ static void Task_ShowBerryCrushRankings(u8 taskId)
str = StringExpandPlaceholders(gStringVar4, gText_XDotY3); str = StringExpandPlaceholders(gStringVar4, gText_XDotY3);
*str++ = CHAR_SPACE; *str++ = CHAR_SPACE;
StringCopy(str, gText_TimesPerSec); StringCopy(str, gText_TimesPerSec);
xPos = 192 - (u8)GetStringWidth(FONT_3, gStringVar4, 0); xPos = 192 - (u8)GetStringWidth(FONT_NORMAL_COPY_2, gStringVar4, 0);
AddTextPrinterParameterized3( AddTextPrinterParameterized3(
tWindowId, tWindowId,
FONT_3, FONT_NORMAL_COPY_2,
xPos, xPos,
yPos, yPos,
sBerryCrushTextColorTable[COLORID_GRAY], sBerryCrushTextColorTable[COLORID_GRAY],
@@ -3239,8 +3239,8 @@ static void DrawPlayerNameWindows(struct BerryCrushGame * game)
{ {
AddTextPrinterParameterized4( AddTextPrinterParameterized4(
game->gfx.nameWindowIds[i], game->gfx.nameWindowIds[i],
FONT_2, FONT_NORMAL,
36 - GetStringWidth(FONT_2, game->players[i].name, 0) / 2u, 36 - GetStringWidth(FONT_NORMAL, game->players[i].name, 0) / 2u,
1, 1,
0, 0,
0, 0,
@@ -3253,8 +3253,8 @@ static void DrawPlayerNameWindows(struct BerryCrushGame * game)
{ {
AddTextPrinterParameterized4( AddTextPrinterParameterized4(
game->gfx.nameWindowIds[i], game->gfx.nameWindowIds[i],
FONT_2, FONT_NORMAL,
36 - GetStringWidth(FONT_2, game->players[i].name, 0) / 2u, 36 - GetStringWidth(FONT_NORMAL, game->players[i].name, 0) / 2u,
1, 1,
0, 0,
0, 0,
src/berry_pouch.c
+24 -24
View File
@@ -672,7 +672,7 @@ static void SetUpListMenuTemplate(void)
gMultiuseListMenuTemplate.itemVerticalPadding = 2; gMultiuseListMenuTemplate.itemVerticalPadding = 2;
gMultiuseListMenuTemplate.upText_Y = 2; gMultiuseListMenuTemplate.upText_Y = 2;
gMultiuseListMenuTemplate.maxShowed = sResources->listMenuMaxShowed; gMultiuseListMenuTemplate.maxShowed = sResources->listMenuMaxShowed;
gMultiuseListMenuTemplate.fontId = FONT_2; gMultiuseListMenuTemplate.fontId = FONT_NORMAL;
gMultiuseListMenuTemplate.cursorPal = 2; gMultiuseListMenuTemplate.cursorPal = 2;
gMultiuseListMenuTemplate.fillValue = 0; gMultiuseListMenuTemplate.fillValue = 0;
gMultiuseListMenuTemplate.cursorShadowPal = 3; gMultiuseListMenuTemplate.cursorShadowPal = 3;
@@ -684,13 +684,13 @@ static void SetUpListMenuTemplate(void)
static void GetBerryNameAndIndexForMenu(u8 * dest, u16 itemId) static void GetBerryNameAndIndexForMenu(u8 * dest, u16 itemId)
{ {
StringCopy(gStringVar4, gText_Font0); StringCopy(gStringVar4, gText_FontSmall);
StringAppend(gStringVar4, gText_NumberClear01); StringAppend(gStringVar4, gText_NumberClear01);
ConvertIntToDecimalStringN(gStringVar1, itemId - FIRST_BERRY_INDEX + 1, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar1, itemId - FIRST_BERRY_INDEX + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
StringAppend(gStringVar4, gStringVar1); StringAppend(gStringVar4, gStringVar1);
CopyItemName(itemId, gStringVar1); CopyItemName(itemId, gStringVar1);
StringAppend(gStringVar4, sText_Space); StringAppend(gStringVar4, sText_Space);
StringAppend(gStringVar4, gText_Font2); StringAppend(gStringVar4, gText_FontNormal);
StringAppend(gStringVar4, gStringVar1); StringAppend(gStringVar4, gStringVar1);
StringCopy(dest, gStringVar4); StringCopy(dest, gStringVar4);
} }
@@ -726,7 +726,7 @@ static void BerryPouchItemPrintFunc(u8 windowId, u32 itemId, u8 y)
itemQuantity = BagGetQuantityByPocketPosition(POCKET_BERRY_POUCH, itemId); itemQuantity = BagGetQuantityByPocketPosition(POCKET_BERRY_POUCH, itemId);
ConvertIntToDecimalStringN(gStringVar1, itemQuantity, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, itemQuantity, STR_CONV_MODE_RIGHT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
BerryPouchPrint(windowId, FONT_0, gStringVar4, 110, y, 0, 0, 0xFF, 1); BerryPouchPrint(windowId, FONT_SMALL, gStringVar4, 110, y, 0, 0, 0xFF, 1);
} }
} }
@@ -741,14 +741,14 @@ static void BerryPouchSetArrowCursorAt(u8 y, u8 colorIdx)
u8 height; u8 height;
if (colorIdx == 0xFF) if (colorIdx == 0xFF)
{ {
width = GetMenuCursorDimensionByFont(FONT_2, 0); width = GetMenuCursorDimensionByFont(FONT_NORMAL, 0);
height = GetMenuCursorDimensionByFont(FONT_2, 1); height = GetMenuCursorDimensionByFont(FONT_NORMAL, 1);
FillWindowPixelRect(0, 0, 1, y, width, height); FillWindowPixelRect(0, 0, 1, y, width, height);
CopyWindowToVram(0, COPYWIN_GFX); CopyWindowToVram(0, COPYWIN_GFX);
} }
else else
{ {
BerryPouchPrint(0, FONT_2, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx); BerryPouchPrint(0, FONT_NORMAL, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx);
} }
} }
@@ -760,7 +760,7 @@ static void PrintSelectedBerryDescription(s32 itemIdx)
else else
str = gText_TheBerryPouchWillBePutAway; str = gText_TheBerryPouchWillBePutAway;
FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(1, PIXEL_FILL(0));
BerryPouchPrint(1, FONT_2, str, 0, 2, 2, 0, 0, 0); BerryPouchPrint(1, FONT_NORMAL, str, 0, 2, 2, 0, 0, 0);
} }
static void SetDescriptionWindowBorderPalette(s32 pal) static void SetDescriptionWindowBorderPalette(s32 pal)
@@ -800,8 +800,8 @@ static void DestroyScrollIndicatorArrows(void)
static void PrintBerryPouchHeaderCentered(void) static void PrintBerryPouchHeaderCentered(void)
{ {
u32 slack = 72 - GetStringWidth(FONT_1, gText_BerryPouch, 0); u32 slack = 72 - GetStringWidth(FONT_NORMAL_COPY_1, gText_BerryPouch, 0);
BerryPouchPrint(2, FONT_1, gText_BerryPouch, slack / 2, 1, 0, 0, 0, 0); BerryPouchPrint(2, FONT_NORMAL_COPY_1, gText_BerryPouch, slack / 2, 1, 0, 0, 0, 0);
} }
void BerryPouch_CursorResetToTop(void) void BerryPouch_CursorResetToTop(void)
@@ -914,11 +914,11 @@ void InitTossQuantitySelectUI(u8 taskId, const u8 * str)
u8 windowId2; u8 windowId2;
CopySelectedListMenuItemName(data[1], gStringVar1); CopySelectedListMenuItemName(data[1], gStringVar1);
StringExpandPlaceholders(gStringVar4, str); StringExpandPlaceholders(gStringVar4, str);
BerryPouchPrint(windowId, FONT_2, gStringVar4, 0, 2, 1, 2, 0, 1); BerryPouchPrint(windowId, FONT_NORMAL, gStringVar4, 0, 2, 1, 2, 0, 1);
windowId2 = GetOrCreateVariableWindow(0); windowId2 = GetOrCreateVariableWindow(0);
ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 3); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 3);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
BerryPouchPrint(windowId2, FONT_0, gStringVar4, 4, 10, 1, 0, 0, 1); BerryPouchPrint(windowId2, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0, 1);
} }
static void PrintxQuantityOnWindow(u8 whichWindow, s16 quantity, u8 ndigits) static void PrintxQuantityOnWindow(u8 whichWindow, s16 quantity, u8 ndigits)
@@ -927,7 +927,7 @@ static void PrintxQuantityOnWindow(u8 whichWindow, s16 quantity, u8 ndigits)
FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, ndigits); ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, ndigits);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
BerryPouchPrint(windowId, FONT_0, gStringVar4, 4, 10, 1, 0, 0, 1); BerryPouchPrint(windowId, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0, 1);
} }
static void Task_BerryPouchMain(u8 taskId) static void Task_BerryPouchMain(u8 taskId)
@@ -1023,12 +1023,12 @@ static void CreateNormalContextMenu(u8 taskId)
sContextMenuNumOptions = 4; sContextMenuNumOptions = 4;
} }
windowId = GetOrCreateVariableWindow(sContextMenuNumOptions + 9); windowId = GetOrCreateVariableWindow(sContextMenuNumOptions + 9);
AddItemMenuActionTextPrinters(windowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING), GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumOptions, sContextMenuActions, sContextMenuOptions); AddItemMenuActionTextPrinters(windowId, FONT_NORMAL, GetMenuCursorDimensionByFont(FONT_NORMAL, 0), 2, GetFontAttribute(FONT_NORMAL, FONTATTR_LETTER_SPACING), GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumOptions, sContextMenuActions, sContextMenuOptions);
Menu_InitCursor(windowId, FONT_2, 0, 2, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumOptions, 0); Menu_InitCursor(windowId, FONT_NORMAL, 0, 2, GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumOptions, 0);
windowId2 = GetOrCreateVariableWindow(6); windowId2 = GetOrCreateVariableWindow(6);
CopySelectedListMenuItemName(data[1], gStringVar1); CopySelectedListMenuItemName(data[1], gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
BerryPouchPrint(windowId2, FONT_2, gStringVar4, 0, 2, 1, 2, 0, 1); BerryPouchPrint(windowId2, FONT_NORMAL, gStringVar4, 0, 2, 1, 2, 0, 1);
} }
static void Task_NormalContextMenu(u8 taskId) static void Task_NormalContextMenu(u8 taskId)
@@ -1104,7 +1104,7 @@ static void Task_AskTossMultiple(u8 taskId)
s16 * data = gTasks[taskId].data; s16 * data = gTasks[taskId].data;
ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_ThrowAwayStrVar2OfThisItemQM); StringExpandPlaceholders(gStringVar4, gText_ThrowAwayStrVar2OfThisItemQM);
BerryPouchPrint(GetOrCreateVariableWindow(7), FONT_2, gStringVar4, 0, 2, 1, 2, 0, 1); BerryPouchPrint(GetOrCreateVariableWindow(7), FONT_NORMAL, gStringVar4, 0, 2, 1, 2, 0, 1);
CreateYesNoMenuWin3(taskId, &sYesNoFuncs_Toss); CreateYesNoMenuWin3(taskId, &sYesNoFuncs_Toss);
} }
@@ -1158,7 +1158,7 @@ static void Task_TossYes(u8 taskId)
CopySelectedListMenuItemName(data[1], gStringVar1); CopySelectedListMenuItemName(data[1], gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_ThrewAwayStrVar2StrVar1s); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayStrVar2StrVar1s);
BerryPouchPrint(GetOrCreateVariableWindow(9), FONT_2, gStringVar4, 0, 2, 1, 2, 0, 1); BerryPouchPrint(GetOrCreateVariableWindow(9), FONT_NORMAL, gStringVar4, 0, 2, 1, 2, 0, 1);
gTasks[taskId].func = Task_WaitButtonThenTossBerries; gTasks[taskId].func = Task_WaitButtonThenTossBerries;
} }
@@ -1201,7 +1201,7 @@ static void Task_BerryPouch_Give(u8 taskId)
static void Task_Give_PrintThereIsNoPokemon(u8 taskId) static void Task_Give_PrintThereIsNoPokemon(u8 taskId)
{ {
DisplayItemMessageInBerryPouch(taskId, FONT_2, gText_ThereIsNoPokemon, Task_WaitButtonBeforeDialogueWindowDestruction); DisplayItemMessageInBerryPouch(taskId, FONT_NORMAL, gText_ThereIsNoPokemon, Task_WaitButtonBeforeDialogueWindowDestruction);
} }
static void Task_WaitButtonBeforeDialogueWindowDestruction(u8 taskId) static void Task_WaitButtonBeforeDialogueWindowDestruction(u8 taskId)
@@ -1247,7 +1247,7 @@ static void Task_ContextMenu_FromPartyGiveMenu(u8 taskId)
{ {
CopyItemName(itemId, gStringVar1); CopyItemName(itemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_TheStrVar1CantBeHeldHere); StringExpandPlaceholders(gStringVar4, gText_TheStrVar1CantBeHeldHere);
DisplayItemMessageInBerryPouch(taskId, FONT_2, gStringVar4, Task_WaitButtonBeforeDialogueWindowDestruction); DisplayItemMessageInBerryPouch(taskId, FONT_NORMAL, gStringVar4, Task_WaitButtonBeforeDialogueWindowDestruction);
} }
else else
{ {
@@ -1322,7 +1322,7 @@ static void Task_Sell_PrintSelectMultipleUI(u8 taskId)
u8 windowId = GetOrCreateVariableWindow(1); u8 windowId = GetOrCreateVariableWindow(1);
ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
BerryPouchPrint(windowId, FONT_0, gStringVar4, 4, 10, 1, 0, 0xFF, 1); BerryPouchPrint(windowId, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0xFF, 1);
SellMultiple_UpdateSellPriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8]); SellMultiple_UpdateSellPriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8]);
PrintMoneyInWin2(); PrintMoneyInWin2();
CreateScrollIndicatorArrows_SellQuantity(); CreateScrollIndicatorArrows_SellQuantity();
@@ -1375,7 +1375,7 @@ static void Task_SellYes(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1); CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6); ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen); StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen);
DisplayItemMessageInBerryPouch(taskId, FONT_2, gStringVar4, Task_SellBerries_PlaySfxAndRemoveBerries); DisplayItemMessageInBerryPouch(taskId, FONT_NORMAL, gStringVar4, Task_SellBerries_PlaySfxAndRemoveBerries);
} }
static void Task_SellBerries_PlaySfxAndRemoveBerries(u8 taskId) static void Task_SellBerries_PlaySfxAndRemoveBerries(u8 taskId)
@@ -1490,12 +1490,12 @@ void DisplayItemMessageInBerryPouch(u8 taskId, u8 fontId, const u8 * str, TaskFu
static void CreateYesNoMenuWin3(u8 taskId, const struct YesNoFuncTable *ptrs) static void CreateYesNoMenuWin3(u8 taskId, const struct YesNoFuncTable *ptrs)
{ {
CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates_Variable[3], FONT_2, 0, 2, 0x001, 0xE, ptrs); CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates_Variable[3], FONT_NORMAL, 0, 2, 0x001, 0xE, ptrs);
} }
static void CreateYesNoMenuWin4(u8 taskId, const struct YesNoFuncTable *ptrs) static void CreateYesNoMenuWin4(u8 taskId, const struct YesNoFuncTable *ptrs)
{ {
CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates_Variable[4], FONT_2, 0, 2, 0x001, 0xE, ptrs); CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates_Variable[4], FONT_NORMAL, 0, 2, 0x001, 0xE, ptrs);
} }
static void PrintMoneyInWin2(void) static void PrintMoneyInWin2(void)
src/berry_powder.c
+2 -2
View File
@@ -94,13 +94,13 @@ u32 GetBerryPowder(void)
static void PrintBerryPowderAmount(u8 windowId, u32 amount, u8 x, u8 y, u8 speed) static void PrintBerryPowderAmount(u8 windowId, u32 amount, u8 x, u8 y, u8 speed)
{ {
ConvertIntToDecimalStringN(gStringVar1, amount, STR_CONV_MODE_RIGHT_ALIGN, 5); ConvertIntToDecimalStringN(gStringVar1, amount, STR_CONV_MODE_RIGHT_ALIGN, 5);
AddTextPrinterParameterized(windowId, FONT_0, gStringVar1, x, y, speed, NULL); AddTextPrinterParameterized(windowId, FONT_SMALL, gStringVar1, x, y, speed, NULL);
} }
static void DrawPlayerPowderAmount(u8 windowId, u16 baseBlock, u8 palette, u32 amount) static void DrawPlayerPowderAmount(u8 windowId, u16 baseBlock, u8 palette, u32 amount)
{ {
DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, baseBlock, palette); DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, baseBlock, palette);
AddTextPrinterParameterized(windowId, FONT_0, gOtherText_Powder, 0, 0, -1, NULL); AddTextPrinterParameterized(windowId, FONT_SMALL, gOtherText_Powder, 0, 0, -1, NULL);
PrintBerryPowderAmount(windowId, amount, 39, 12, 0); PrintBerryPowderAmount(windowId, amount, 39, 12, 0);
} }
src/braille_text.c
+10 -10
View File
@@ -9,11 +9,11 @@ static const u8 sScrollDistances[] = {
[OPTIONS_TEXT_SPEED_MID] = 2, [OPTIONS_TEXT_SPEED_MID] = 2,
[OPTIONS_TEXT_SPEED_FAST] = 4, [OPTIONS_TEXT_SPEED_FAST] = 4,
}; };
static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("graphics/fonts/font6.fwjpnfont"); static const u16 sBrailleGlyphs[] = INCBIN_U16("graphics/fonts/braille.fwjpnfont");
static void DecompressGlyphFont6(u16); static void DecompressGlyph_Braille(u16);
u16 Font6Func(struct TextPrinter *textPrinter) u16 FontFunc_Braille(struct TextPrinter *textPrinter)
{ {
u16 char_; u16 char_;
struct TextPrinterSubStruct *sub; struct TextPrinterSubStruct *sub;
@@ -129,14 +129,14 @@ u16 Font6Func(struct TextPrinter *textPrinter)
textPrinter->state = 3; textPrinter->state = 3;
TextPrinterInitDownArrowCounters(textPrinter); TextPrinterInitDownArrowCounters(textPrinter);
return 3; return 3;
case 0xF9: case CHAR_EXTRA_SYMBOL:
char_ = *textPrinter->printerTemplate.currentChar++| 0x100; char_ = *textPrinter->printerTemplate.currentChar++| 0x100;
break; break;
case 0xF8: case CHAR_KEYPAD_ICON:
textPrinter->printerTemplate.currentChar++; textPrinter->printerTemplate.currentChar++;
return 0; return 0;
} }
DecompressGlyphFont6(char_); DecompressGlyph_Braille(char_);
CopyGlyphToWindow(textPrinter); CopyGlyphToWindow(textPrinter);
textPrinter->printerTemplate.currentX += gGlyphInfo.width + textPrinter->printerTemplate.letterSpacing; textPrinter->printerTemplate.currentX += gGlyphInfo.width + textPrinter->printerTemplate.letterSpacing;
return 0; return 0;
@@ -204,11 +204,11 @@ u16 Font6Func(struct TextPrinter *textPrinter)
return 1; return 1;
} }
static void DecompressGlyphFont6(u16 glyph) static void DecompressGlyph_Braille(u16 glyph)
{ {
const u16 *glyphs; const u16 *glyphs;
glyphs = sFont6BrailleGlyphs + 0x100 * (glyph / 8) + 0x10 * (glyph % 8); glyphs = sBrailleGlyphs + 0x100 * (glyph / 8) + 0x10 * (glyph % 8);
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20)); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20));
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40));
@@ -217,7 +217,7 @@ static void DecompressGlyphFont6(u16 glyph)
gGlyphInfo.height = 0x10; gGlyphInfo.height = 0x10;
} }
s32 GetGlyphWidthFont6(u16 font_type, bool32 isJapanese) s32 GetGlyphWidth_Braille(u16 font_type, bool32 isJapanese)
{ {
return 0x10; return 16;
} }
src/buy_menu_helpers.c
+1 -1
View File
@@ -200,5 +200,5 @@ void BuyMenuQuantityBoxThinBorder(u8 windowId, bool8 copyToVram)
void BuyMenuConfirmPurchase(u8 taskId, const struct YesNoFuncTable *yesNo) void BuyMenuConfirmPurchase(u8 taskId, const struct YesNoFuncTable *yesNo)
{ {
CreateYesNoMenuWithCallbacks(taskId, &sShopBuyMenuYesNoWindowTemplate, FONT_2, 0, 2, 1, 0xD, yesNo); CreateYesNoMenuWithCallbacks(taskId, &sShopBuyMenuYesNoWindowTemplate, FONT_NORMAL, 0, 2, 1, 0xD, yesNo);
} }
src/cable_club.c
+1 -1
View File
@@ -89,7 +89,7 @@ static void PrintNumPlayersInLink(u16 windowId, s32 numPlayers)
ConvertIntToDecimalStringN(gStringVar1, numPlayers, STR_CONV_MODE_LEFT_ALIGN, 1); ConvertIntToDecimalStringN(gStringVar1, numPlayers, STR_CONV_MODE_LEFT_ALIGN, 1);
SetStdWindowBorderStyle(windowId, FALSE); SetStdWindowBorderStyle(windowId, FALSE);
StringExpandPlaceholders(gStringVar4, gText_NumPlayerLink); StringExpandPlaceholders(gStringVar4, gText_NumPlayerLink);
AddTextPrinterParameterized(windowId, FONT_2, gStringVar4, 0, 0, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, 0, 0, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(windowId, COPYWIN_FULL); CopyWindowToVram(windowId, COPYWIN_FULL);
} }
src/clear_save_data_screen.c
+3 -3
View File
@@ -106,11 +106,11 @@ static void Task_DrawClearSaveDataScreen(u8 taskId)
break; break;
case 4: case 4:
DrawStdFrameWithCustomTileAndPalette(1, TRUE, 0x001, 0xF); DrawStdFrameWithCustomTileAndPalette(1, TRUE, 0x001, 0xF);
AddTextPrinterParameterized4(1, FONT_2, 0, 3, 1, 1, sTextColor, 0, gText_ClearAllSaveData); AddTextPrinterParameterized4(1, FONT_NORMAL, 0, 3, 1, 1, sTextColor, 0, gText_ClearAllSaveData);
CopyWindowToVram(1, COPYWIN_GFX); CopyWindowToVram(1, COPYWIN_GFX);
break; break;
case 5: case 5:
CreateYesNoMenu(&sWindowTemplates[0], FONT_2, 0, 2, 0x001, 0xF, 1); CreateYesNoMenu(&sWindowTemplates[0], FONT_NORMAL, 0, 2, 0x001, 0xF, 1);
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
break; break;
default: default:
@@ -138,7 +138,7 @@ static void Task_HandleYesNoMenu(u8 taskId)
case 0: case 0:
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
FillWindowPixelBuffer(1, PIXEL_FILL(1)); FillWindowPixelBuffer(1, PIXEL_FILL(1));
AddTextPrinterParameterized4(1, FONT_2, 0, 3, 1, 1, sTextColor, 0, gText_ClearingData); AddTextPrinterParameterized4(1, FONT_NORMAL, 0, 3, 1, 1, sTextColor, 0, gText_ClearingData);
CopyWindowToVram(1, COPYWIN_FULL); CopyWindowToVram(1, COPYWIN_FULL);
ClearSaveData(); ClearSaveData();
break; break;
src/coins.c
+5 -5
View File
@@ -53,14 +53,14 @@ static void PrintCoinsString_Parameterized(u8 windowId, u32 coinAmount, u8 x, u8
{ {
ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4); ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4);
StringExpandPlaceholders(gStringVar4, gText_Coins); StringExpandPlaceholders(gStringVar4, gText_Coins);
AddTextPrinterParameterized(windowId, FONT_0, gStringVar4, x, y, speed, NULL); AddTextPrinterParameterized(windowId, FONT_SMALL, gStringVar4, x, y, speed, NULL);
} }
// Unused // Unused
static void ShowCoinsWindow_Parameterized(u8 windowId, u16 tileStart, u8 palette, u32 coinAmount) static void ShowCoinsWindow_Parameterized(u8 windowId, u16 tileStart, u8 palette, u32 coinAmount)
{ {
DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, tileStart, palette); DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, tileStart, palette);
AddTextPrinterParameterized(windowId, FONT_2, gText_Coins_2, 0, 0, 0xFF, 0); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Coins_2, 0, 0, 0xFF, 0);
PrintCoinsString_Parameterized(windowId, coinAmount, 0x10, 0xC, 0); PrintCoinsString_Parameterized(windowId, coinAmount, 0x10, 0xC, 0);
} }
@@ -71,9 +71,9 @@ void PrintCoinsString(u32 coinAmount)
ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4); ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4);
StringExpandPlaceholders(gStringVar4, gText_Coins); StringExpandPlaceholders(gStringVar4, gText_Coins);
width = GetStringWidth(FONT_0, gStringVar4, 0); width = GetStringWidth(FONT_SMALL, gStringVar4, 0);
windowId = sCoinsWindowId; windowId = sCoinsWindowId;
AddTextPrinterParameterized(windowId, FONT_0, gStringVar4, 64 - width, 0xC, 0, NULL); AddTextPrinterParameterized(windowId, FONT_SMALL, gStringVar4, 64 - width, 0xC, 0, NULL);
} }
void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y) void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y)
@@ -86,7 +86,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y)
PutWindowTilemap(sCoinsWindowId); PutWindowTilemap(sCoinsWindowId);
LoadStdWindowGfx(sCoinsWindowId, 0x21D, 0xD0); LoadStdWindowGfx(sCoinsWindowId, 0x21D, 0xD0);
DrawStdFrameWithCustomTileAndPalette(sCoinsWindowId, FALSE, 0x21D, 0xD); DrawStdFrameWithCustomTileAndPalette(sCoinsWindowId, FALSE, 0x21D, 0xD);
AddTextPrinterParameterized(sCoinsWindowId, FONT_2, gText_Coins_2, 0, 0, 0xFF, 0); AddTextPrinterParameterized(sCoinsWindowId, FONT_NORMAL, gText_Coins_2, 0, 0, 0xFF, 0);
PrintCoinsString(coinAmount); PrintCoinsString(coinAmount);
} }
src/credits.c
+3 -3
View File
@@ -856,7 +856,7 @@ static s32 RollCredits(void)
} }
sCreditsMgr->timer = 360; sCreditsMgr->timer = 360;
AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_1, 0x08, 0x29, 1, 2, sTextColor_Header, 0, TITLE_TEXT); AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_NORMAL_COPY_1, 0x08, 0x29, 1, 2, sTextColor_Header, 0, TITLE_TEXT);
sCreditsMgr->mainseqno = CREDITSSCENE_WAIT_TITLE_STAFF; sCreditsMgr->mainseqno = CREDITSSCENE_WAIT_TITLE_STAFF;
return 0; return 0;
case CREDITSSCENE_WAIT_TITLE_STAFF: case CREDITSSCENE_WAIT_TITLE_STAFF:
@@ -913,12 +913,12 @@ static s32 RollCredits(void)
if (gPaletteFade.active) if (gPaletteFade.active)
return sCreditsMgr->canSpeedThrough; return sCreditsMgr->canSpeedThrough;
win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_8; // unused win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_8; // unused
AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_1, 2, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_0); AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_NORMAL_COPY_1, 2, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_0);
sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_ADDPRINTER2; sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_ADDPRINTER2;
return sCreditsMgr->canSpeedThrough; return sCreditsMgr->canSpeedThrough;
case CREDITSSCENE_PRINT_ADDPRINTER2: case CREDITSSCENE_PRINT_ADDPRINTER2:
win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_8; win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_8;
AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_2, 8, 6, 0, 0, sTextColor_Regular, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_4); AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_NORMAL, 8, 6, 0, 0, sTextColor_Regular, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_4);
sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_DELAY; sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_DELAY;
return sCreditsMgr->canSpeedThrough; return sCreditsMgr->canSpeedThrough;
case CREDITSSCENE_PRINT_DELAY: case CREDITSSCENE_PRINT_DELAY:
src/data/union_room.h
+7 -7
View File
@@ -98,7 +98,7 @@ static const struct ListMenuTemplate sListMenuTemplate_PossibleGroupMembers = {
.lettersSpacing = 0, .lettersSpacing = 0,
.itemVerticalPadding = 2, .itemVerticalPadding = 2,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 1 .cursorKind = 1
}; };
@@ -158,7 +158,7 @@ static const struct ListMenuTemplate sListMenuTemplate_UnionRoomGroups = {
.lettersSpacing = 0, .lettersSpacing = 0,
.itemVerticalPadding = 2, .itemVerticalPadding = 2,
.scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD, .scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -196,7 +196,7 @@ static const struct ListMenuTemplate sListMenuTemplate_InviteToActivity = {
.lettersSpacing = 1, .lettersSpacing = 1,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -233,7 +233,7 @@ static const struct ListMenuTemplate sListMenuTemplate_RegisterForTrade = {
.lettersSpacing = 1, .lettersSpacing = 1,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -285,7 +285,7 @@ static const struct ListMenuTemplate sListMenuTemplate_TypeNames = {
.lettersSpacing = 1, .lettersSpacing = 1,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -339,7 +339,7 @@ static const struct ListMenuTemplate sListMenuTemplate_TradeBoard = {
.lettersSpacing = 1, .lettersSpacing = 1,
.itemVerticalPadding = 1, .itemVerticalPadding = 1,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -389,7 +389,7 @@ static const struct ListMenuTemplate sListMenuTemplate_Unused = {
.lettersSpacing = 1, .lettersSpacing = 1,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD, .scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0 .cursorKind = 0
}; };
src/daycare.c
+5 -5
View File
@@ -119,7 +119,7 @@ static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
.lettersSpacing = 1, .lettersSpacing = 1,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = 0, .scrollMultiple = 0,
.fontId = FONT_3, .fontId = FONT_NORMAL_COPY_2,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -1439,7 +1439,7 @@ static void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y)
printer.currentChar = text; printer.currentChar = text;
printer.windowId = windowId; printer.windowId = windowId;
printer.fontId = FONT_3; printer.fontId = FONT_NORMAL_COPY_2;
printer.x = x; printer.x = x;
printer.y = y; printer.y = y;
printer.currentX = x; printer.currentX = x;
@@ -1479,7 +1479,7 @@ static void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycare
level = GetLevelAfterDaycareSteps(&daycare->mons[daycareSlotId].mon, daycare->mons[daycareSlotId].steps); level = GetLevelAfterDaycareSteps(&daycare->mons[daycareSlotId].mon, daycare->mons[daycareSlotId].steps);
ConvertIntToDecimalStringN(intText, level, STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(intText, level, STR_CONV_MODE_LEFT_ALIGN, 3);
StringAppend(lvlText, intText); StringAppend(lvlText, intText);
x = 132 - GetStringWidth(FONT_3, lvlText, 0); x = 132 - GetStringWidth(FONT_NORMAL_COPY_2, lvlText, 0);
DaycareAddTextPrinter(windowId, lvlText, x, y); DaycareAddTextPrinter(windowId, lvlText, x, y);
} }
@@ -1957,7 +1957,7 @@ static void CB2_EggHatch_1(void)
if (!IsTextPrinterActive(sEggHatchData->windowId)) if (!IsTextPrinterActive(sEggHatchData->windowId))
{ {
LoadUserWindowGfx2(sEggHatchData->windowId, 0x140, 0xE0); LoadUserWindowGfx2(sEggHatchData->windowId, 0x140, 0xE0);
CreateYesNoMenu(&sYesNoWinTemplate, FONT_3, 0, 2, 0x140, 0xE, 0); CreateYesNoMenu(&sYesNoWinTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x140, 0xE, 0);
sEggHatchData->CB2_state++; sEggHatchData->CB2_state++;
} }
break; break;
@@ -2159,5 +2159,5 @@ static void EggHatchPrintMessage(u8 windowId, u8 *string, u8 x, u8 y, u8 speed)
sEggHatchData->textColor[0] = 0; sEggHatchData->textColor[0] = 0;
sEggHatchData->textColor[1] = 5; sEggHatchData->textColor[1] = 5;
sEggHatchData->textColor[2] = 6; sEggHatchData->textColor[2] = 6;
AddTextPrinterParameterized4(windowId, FONT_3, x, y, 1, 1, sEggHatchData->textColor, speed, string); AddTextPrinterParameterized4(windowId, FONT_NORMAL_COPY_2, x, y, 1, 1, sEggHatchData->textColor, speed, string);
} }
src/diploma.c
+5 -5
View File
@@ -265,11 +265,11 @@ static void DiplomaPrintText(void)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gText_Diploma_Kanto); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gText_Diploma_Kanto);
FillWindowPixelBuffer(WIN_TEXT, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_TEXT, PIXEL_FILL(0));
DynamicPlaceholderTextUtil_ExpandPlaceholders(str, gText_Diploma_Player); DynamicPlaceholderTextUtil_ExpandPlaceholders(str, gText_Diploma_Player);
width = GetStringWidth(FONT_2, str, -1); width = GetStringWidth(FONT_NORMAL, str, -1);
AddTextPrinterParameterized3(WIN_TEXT, FONT_2, 120 - (width / 2), 4, sTextColors, TEXT_SKIP_DRAW, str); AddTextPrinterParameterized3(WIN_TEXT, FONT_NORMAL, 120 - (width / 2), 4, sTextColors, TEXT_SKIP_DRAW, str);
DynamicPlaceholderTextUtil_ExpandPlaceholders(str, gText_Diploma_ThisDocument); DynamicPlaceholderTextUtil_ExpandPlaceholders(str, gText_Diploma_ThisDocument);
width = GetStringWidth(FONT_2, str, -1); width = GetStringWidth(FONT_NORMAL, str, -1);
AddTextPrinterParameterized3(WIN_TEXT, FONT_2, 120 - (width / 2), 30, sTextColors, TEXT_SKIP_DRAW, str); AddTextPrinterParameterized3(WIN_TEXT, FONT_NORMAL, 120 - (width / 2), 30, sTextColors, TEXT_SKIP_DRAW, str);
AddTextPrinterParameterized3(WIN_TEXT, FONT_2, 120, 105, sTextColors, 0, gText_Diploma_GameFreak); AddTextPrinterParameterized3(WIN_TEXT, FONT_NORMAL, 120, 105, sTextColors, 0, gText_Diploma_GameFreak);
PutWindowTilemap(WIN_TEXT); PutWindowTilemap(WIN_TEXT);
} }
src/dodrio_berry_picking.c
+35 -35
View File
@@ -3005,14 +3005,14 @@ static void PrintRecordsText(u8 windowId)
LoadStdWindowGfx(windowId, 0x21D, 0xD0); LoadStdWindowGfx(windowId, 0x21D, 0xD0);
DrawTextBorderOuter(windowId, 0x21D, 0xD); DrawTextBorderOuter(windowId, 0x21D, 0xD);
FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
AddTextPrinterParameterized(windowId, FONT_2, sRecordsTexts[0], 1, 1, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, sRecordsTexts[0], 1, 1, TEXT_SKIP_DRAW, NULL);
for (i = 0; i < NUM_RECORD_TYPES; i++) for (i = 0; i < NUM_RECORD_TYPES; i++)
{ {
ConvertIntToDecimalStringN(strbuf, recordNums[i], STR_CONV_MODE_LEFT_ALIGN, sRecordNumMaxDigits[i]); ConvertIntToDecimalStringN(strbuf, recordNums[i], STR_CONV_MODE_LEFT_ALIGN, sRecordNumMaxDigits[i]);
numWidth = GetStringWidth(FONT_2, strbuf, -1); numWidth = GetStringWidth(FONT_NORMAL, strbuf, -1);
AddTextPrinterParameterized(windowId, FONT_2, sRecordsTexts[i + 1], 1, sRecordTextYCoords[i][0], TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, sRecordsTexts[i + 1], 1, sRecordTextYCoords[i][0], TEXT_SKIP_DRAW, NULL);
x = DISPLAY_WIDTH - 16 - numWidth; x = DISPLAY_WIDTH - 16 - numWidth;
AddTextPrinterParameterized(windowId, FONT_2, strbuf, x, sRecordNumYCoords[i][0], TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, strbuf, x, sRecordNumYCoords[i][0], TEXT_SKIP_DRAW, NULL);
} }
PutWindowTilemap(windowId); PutWindowTilemap(windowId);
} }
@@ -4371,7 +4371,7 @@ static void ShowNames(void)
{ {
colorsId = 0; colorsId = 0;
playerId = GetPlayerIdByPos(i); playerId = GetPlayerIdByPos(i);
left = (56 - GetStringWidth(FONT_0, GetPlayerName(playerId), -1)) / 2u; left = (56 - GetStringWidth(FONT_SMALL, GetPlayerName(playerId), -1)) / 2u;
window.tilemapLeft = coords->left; window.tilemapLeft = coords->left;
window.tilemapTop = coords->top; window.tilemapTop = coords->top;
sGfx->windowIds[i] = AddWindow(&window); sGfx->windowIds[i] = AddWindow(&window);
@@ -4380,7 +4380,7 @@ static void ShowNames(void)
if (playerId == GetMultiplayerId()) if (playerId == GetMultiplayerId())
colorsId = COLORID_BLUE; colorsId = COLORID_BLUE;
name = GetPlayerName(playerId); name = GetPlayerName(playerId);
AddTextPrinterParameterized3(sGfx->windowIds[i], FONT_0, left, 1, sTextColorTable[colorsId], TEXT_SKIP_DRAW, name); AddTextPrinterParameterized3(sGfx->windowIds[i], FONT_SMALL, left, 1, sTextColorTable[colorsId], TEXT_SKIP_DRAW, name);
CopyWindowToVram(sGfx->windowIds[i], COPYWIN_GFX); CopyWindowToVram(sGfx->windowIds[i], COPYWIN_GFX);
window.baseBlock += 0xE; window.baseBlock += 0xE;
DrawMessageWindow(&window); DrawMessageWindow(&window);
@@ -4457,22 +4457,22 @@ static void PrintRankedScores(u8 numPlayers_)
} }
// Print text // Print text
x = 216 - GetStringWidth(FONT_0, gText_SpacePoints, 0); x = 216 - GetStringWidth(FONT_SMALL, gText_SpacePoints, 0);
for (i = 0; i < numPlayers; i++) for (i = 0; i < numPlayers; i++)
{ {
u8 colorsId = COLORID_GRAY; u8 colorsId = COLORID_GRAY;
u8 playerId = playersByRanking[i]; u8 playerId = playersByRanking[i];
u32 points = scoreResults[playerId].score; u32 points = scoreResults[playerId].score;
AddTextPrinterParameterized(sGfx->windowIds[1], FONT_0, sRankingTexts[scoreResults[playerId].ranking], 8, sRankingYCoords[i], TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[1], FONT_SMALL, sRankingTexts[scoreResults[playerId].ranking], 8, sRankingYCoords[i], TEXT_SKIP_DRAW, NULL);
if (playerId == GetMultiplayerId()) if (playerId == GetMultiplayerId())
colorsId =COLORID_BLUE; colorsId =COLORID_BLUE;
name = GetPlayerName(playerId); name = GetPlayerName(playerId);
AddTextPrinterParameterized3(sGfx->windowIds[1], FONT_0, 28, sRankingYCoords[i], sTextColorTable[colorsId], TEXT_SKIP_DRAW, name); AddTextPrinterParameterized3(sGfx->windowIds[1], FONT_SMALL, 28, sRankingYCoords[i], sTextColorTable[colorsId], TEXT_SKIP_DRAW, name);
ConvertIntToDecimalStringN(numString, points, STR_CONV_MODE_RIGHT_ALIGN, 7); ConvertIntToDecimalStringN(numString, points, STR_CONV_MODE_RIGHT_ALIGN, 7);
numWidth = GetStringWidth(FONT_0, numString, -1); numWidth = GetStringWidth(FONT_SMALL, numString, -1);
AddTextPrinterParameterized(sGfx->windowIds[1], FONT_0, numString, x - 35, sRankingYCoords[i], TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[1], FONT_SMALL, numString, x - 35, sRankingYCoords[i], TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(sGfx->windowIds[1], FONT_0, gText_SpacePoints, x, sRankingYCoords[i], TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[1], FONT_SMALL, gText_SpacePoints, x, sRankingYCoords[i], TEXT_SKIP_DRAW, NULL);
} }
} }
@@ -4503,10 +4503,10 @@ static void ShowResults(void)
case 2: case 2:
FillWindowPixelBuffer(sGfx->windowIds[0], PIXEL_FILL(1)); FillWindowPixelBuffer(sGfx->windowIds[0], PIXEL_FILL(1));
FillWindowPixelBuffer(sGfx->windowIds[1], PIXEL_FILL(1)); FillWindowPixelBuffer(sGfx->windowIds[1], PIXEL_FILL(1));
strWidth = GetStringWidth(FONT_0, gText_BerryPickingResults, -1); strWidth = GetStringWidth(FONT_SMALL, gText_BerryPickingResults, -1);
x = (DISPLAY_WIDTH - 16 - strWidth) / 2; x = (DISPLAY_WIDTH - 16 - strWidth) / 2;
AddTextPrinterParameterized(sGfx->windowIds[0], FONT_0, gText_BerryPickingResults, x, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[0], FONT_SMALL, gText_BerryPickingResults, x, 2, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(sGfx->windowIds[1], FONT_0, gText_10P30P50P50P, 68, 16, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[1], FONT_SMALL, gText_10P30P50P50P, 68, 16, TEXT_SKIP_DRAW, NULL);
for (i = 0; i < numPlayers; i++) for (i = 0; i < numPlayers; i++)
{ {
u8 colorsId = COLORID_GRAY; u8 colorsId = COLORID_GRAY;
@@ -4514,7 +4514,7 @@ static void ShowResults(void)
colorsId = COLORID_BLUE; colorsId = COLORID_BLUE;
name = GetPlayerName(i); name = GetPlayerName(i);
AddTextPrinterParameterized3(sGfx->windowIds[1], FONT_0, 2, sResultsYCoords[i], sTextColorTable[colorsId], TEXT_SKIP_DRAW, name); AddTextPrinterParameterized3(sGfx->windowIds[1], FONT_SMALL, 2, sResultsYCoords[i], sTextColorTable[colorsId], TEXT_SKIP_DRAW, name);
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
{ {
u32 width; u32 width;
@@ -4522,13 +4522,13 @@ static void ShowResults(void)
u16 maxBerriesPicked = Min(GetHighestBerryResult(j), MAX_BERRIES); u16 maxBerriesPicked = Min(GetHighestBerryResult(j), MAX_BERRIES);
ConvertIntToDecimalStringN(strBuff_Large, berriesPicked, STR_CONV_MODE_LEFT_ALIGN, 4); ConvertIntToDecimalStringN(strBuff_Large, berriesPicked, STR_CONV_MODE_LEFT_ALIGN, 4);
width = GetStringWidth(FONT_0, strBuff_Large, -1); width = GetStringWidth(FONT_SMALL, strBuff_Large, -1);
// If player got the most of a berry type, highlight their number in red // If player got the most of a berry type, highlight their number in red
if (maxBerriesPicked == berriesPicked && maxBerriesPicked != 0) if (maxBerriesPicked == berriesPicked && maxBerriesPicked != 0)
AddTextPrinterParameterized3(sGfx->windowIds[1], FONT_0, sResultsXCoords[j] - width, sResultsYCoords[i], sTextColorTable[1], TEXT_SKIP_DRAW, strBuff_Large); AddTextPrinterParameterized3(sGfx->windowIds[1], FONT_SMALL, sResultsXCoords[j] - width, sResultsYCoords[i], sTextColorTable[1], TEXT_SKIP_DRAW, strBuff_Large);
else else
AddTextPrinterParameterized(sGfx->windowIds[1], FONT_0, strBuff_Large, sResultsXCoords[j] - width, sResultsYCoords[i], TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[1], FONT_SMALL, strBuff_Large, sResultsXCoords[j] - width, sResultsYCoords[i], TEXT_SKIP_DRAW, NULL);
} }
} }
CopyWindowToVram(sGfx->windowIds[0], COPYWIN_GFX); CopyWindowToVram(sGfx->windowIds[0], COPYWIN_GFX);
@@ -4557,9 +4557,9 @@ static void ShowResults(void)
case 5: case 5:
FillWindowPixelBuffer(sGfx->windowIds[0], PIXEL_FILL(1)); FillWindowPixelBuffer(sGfx->windowIds[0], PIXEL_FILL(1));
FillWindowPixelBuffer(sGfx->windowIds[1], PIXEL_FILL(1)); FillWindowPixelBuffer(sGfx->windowIds[1], PIXEL_FILL(1));
strWidth = GetStringWidth(FONT_0, gText_AnnouncingRankings, -1); strWidth = GetStringWidth(FONT_SMALL, gText_AnnouncingRankings, -1);
x = (DISPLAY_WIDTH - 16 - strWidth) / 2; x = (DISPLAY_WIDTH - 16 - strWidth) / 2;
AddTextPrinterParameterized(sGfx->windowIds[0], FONT_0, gText_AnnouncingRankings, x, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[0], FONT_SMALL, gText_AnnouncingRankings, x, 2, TEXT_SKIP_DRAW, NULL);
sGfx->state++; sGfx->state++;
break; break;
case 6: case 6:
@@ -4603,14 +4603,14 @@ static void ShowResults(void)
PlayNewMapMusic(MUS_LEVEL_UP); PlayNewMapMusic(MUS_LEVEL_UP);
FillWindowPixelBuffer(sGfx->windowIds[0], PIXEL_FILL(1)); FillWindowPixelBuffer(sGfx->windowIds[0], PIXEL_FILL(1));
FillWindowPixelBuffer(sGfx->windowIds[1], PIXEL_FILL(1)); FillWindowPixelBuffer(sGfx->windowIds[1], PIXEL_FILL(1));
strWidth = GetStringWidth(FONT_0, gText_AnnouncingPrizes, -1); strWidth = GetStringWidth(FONT_SMALL, gText_AnnouncingPrizes, -1);
x = (DISPLAY_WIDTH - 16 - strWidth) / 2; x = (DISPLAY_WIDTH - 16 - strWidth) / 2;
AddTextPrinterParameterized(sGfx->windowIds[0], FONT_0, gText_AnnouncingPrizes, x, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[0], FONT_SMALL, gText_AnnouncingPrizes, x, 2, TEXT_SKIP_DRAW, NULL);
DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_Reset();
CopyItemName(GetPrizeItemId(), strBuff_Small); CopyItemName(GetPrizeItemId(), strBuff_Small);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, strBuff_Small); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, strBuff_Small);
DynamicPlaceholderTextUtil_ExpandPlaceholders(strBuff_Large, gText_FirstPlacePrize); DynamicPlaceholderTextUtil_ExpandPlaceholders(strBuff_Large, gText_FirstPlacePrize);
AddTextPrinterParameterized(sGfx->windowIds[1], FONT_0, strBuff_Large, 8, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[1], FONT_SMALL, strBuff_Large, 8, 2, TEXT_SKIP_DRAW, NULL);
prizeState = TryGivePrize(); prizeState = TryGivePrize();
if (prizeState != PRIZE_RECEIVED && prizeState != NO_PRIZE) if (prizeState != PRIZE_RECEIVED && prizeState != NO_PRIZE)
{ {
@@ -4621,7 +4621,7 @@ static void ShowResults(void)
DynamicPlaceholderTextUtil_ExpandPlaceholders(strBuff_Large, gText_CantHoldAnyMore); DynamicPlaceholderTextUtil_ExpandPlaceholders(strBuff_Large, gText_CantHoldAnyMore);
else if (prizeState == PRIZE_FILLED_BAG) else if (prizeState == PRIZE_FILLED_BAG)
DynamicPlaceholderTextUtil_ExpandPlaceholders(strBuff_Large, gText_FilledStorageSpace); DynamicPlaceholderTextUtil_ExpandPlaceholders(strBuff_Large, gText_FilledStorageSpace);
AddTextPrinterParameterized(sGfx->windowIds[1], FONT_0, strBuff_Large, 8, 40, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[1], FONT_SMALL, strBuff_Large, 8, 40, TEXT_SKIP_DRAW, NULL);
} }
CopyWindowToVram(sGfx->windowIds[0], COPYWIN_GFX); CopyWindowToVram(sGfx->windowIds[0], COPYWIN_GFX);
CopyWindowToVram(sGfx->windowIds[1], COPYWIN_GFX); CopyWindowToVram(sGfx->windowIds[1], COPYWIN_GFX);
@@ -4679,10 +4679,10 @@ static void Msg_WantToPlayAgain(void)
// Print text // Print text
FillWindowPixelBuffer(sGfx->windowIds[WIN_PLAY_AGAIN], PIXEL_FILL(1)); FillWindowPixelBuffer(sGfx->windowIds[WIN_PLAY_AGAIN], PIXEL_FILL(1));
FillWindowPixelBuffer(sGfx->windowIds[WIN_YES_NO], PIXEL_FILL(1)); FillWindowPixelBuffer(sGfx->windowIds[WIN_YES_NO], PIXEL_FILL(1));
AddTextPrinterParameterized(sGfx->windowIds[WIN_PLAY_AGAIN], FONT_2, gText_WantToPlayAgain, 0, 6, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[WIN_PLAY_AGAIN], FONT_NORMAL, gText_WantToPlayAgain, 0, 6, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_2, gText_Yes, 8, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_Yes, 8, 2, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_2, gText_No, 8, 16, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_No, 8, 16, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_2, gText_SelectorArrow2, 0, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_SelectorArrow2, 0, 2, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(sGfx->windowIds[WIN_PLAY_AGAIN], COPYWIN_GFX); CopyWindowToVram(sGfx->windowIds[WIN_PLAY_AGAIN], COPYWIN_GFX);
CopyWindowToVram(sGfx->windowIds[WIN_YES_NO], COPYWIN_GFX); CopyWindowToVram(sGfx->windowIds[WIN_YES_NO], COPYWIN_GFX);
sGfx->state++; sGfx->state++;
@@ -4703,9 +4703,9 @@ static void Msg_WantToPlayAgain(void)
if (y == PLAY_AGAIN_NONE) if (y == PLAY_AGAIN_NONE)
y = PLAY_AGAIN_YES; y = PLAY_AGAIN_YES;
FillWindowPixelBuffer(sGfx->windowIds[WIN_YES_NO], PIXEL_FILL(1)); FillWindowPixelBuffer(sGfx->windowIds[WIN_YES_NO], PIXEL_FILL(1));
AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_2, gText_Yes, 8, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_Yes, 8, 2, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_2, gText_No, 8, 16, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_No, 8, 16, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_2, gText_SelectorArrow2, 0, y == 1 ? 2 : 16, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], FONT_NORMAL, gText_SelectorArrow2, 0, y == 1 ? 2 : 16, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(sGfx->windowIds[WIN_YES_NO], COPYWIN_FULL); CopyWindowToVram(sGfx->windowIds[WIN_YES_NO], COPYWIN_FULL);
// Increment state only if A or B button have been pressed. // Increment state only if A or B button have been pressed.
@@ -4758,7 +4758,7 @@ static void Msg_SavingDontTurnOff(void)
{ {
case 0: case 0:
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized2(0, FONT_2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
sGfx->state++; sGfx->state++;
break; break;
case 1: case 1:
@@ -4796,7 +4796,7 @@ static void Msg_CommunicationStandby(void)
break; break;
case 1: case 1:
FillWindowPixelBuffer(sGfx->windowIds[0], PIXEL_FILL(1)); FillWindowPixelBuffer(sGfx->windowIds[0], PIXEL_FILL(1));
AddTextPrinterParameterized(sGfx->windowIds[0], FONT_2, gText_CommunicationStandby3, 0, 6, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[0], FONT_NORMAL, gText_CommunicationStandby3, 0, 6, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(sGfx->windowIds[0], COPYWIN_GFX); CopyWindowToVram(sGfx->windowIds[0], COPYWIN_GFX);
sGfx->state++; sGfx->state++;
break; break;
@@ -4836,7 +4836,7 @@ static void Msg_SomeoneDroppedOut(void)
break; break;
case 1: case 1:
FillWindowPixelBuffer(sGfx->windowIds[0], PIXEL_FILL(1)); FillWindowPixelBuffer(sGfx->windowIds[0], PIXEL_FILL(1));
AddTextPrinterParameterized(sGfx->windowIds[0], FONT_2, gText_SomeoneDroppedOut, 0, 6, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sGfx->windowIds[0], FONT_NORMAL, gText_SomeoneDroppedOut, 0, 6, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(sGfx->windowIds[0], COPYWIN_GFX); CopyWindowToVram(sGfx->windowIds[0], COPYWIN_GFX);
sGfx->state++; sGfx->state++;
break; break;
src/easy_chat_3.c
+14 -14
View File
@@ -711,12 +711,12 @@ static bool8 ECInterfaceCmd_02(void)
{ {
if (*ecWord == 0xFFFF) if (*ecWord == 0xFFFF)
{ {
stringWidth = GetStringWidth(FONT_1, sText_Underscore, 0) * 7; stringWidth = GetStringWidth(FONT_NORMAL_COPY_1, sText_Underscore, 0) * 7;
} }
else else
{ {
CopyEasyChatWord(str, *ecWord); CopyEasyChatWord(str, *ecWord);
stringWidth = GetStringWidth(FONT_1, str, 0); stringWidth = GetStringWidth(FONT_NORMAL_COPY_1, str, 0);
} }
trueStringWidth = stringWidth + 17; trueStringWidth = stringWidth + 17;
@@ -1335,16 +1335,16 @@ static void PrintTitleText(void)
if (titleText == NULL) if (titleText == NULL)
return; return;
xOffset = (128 - GetStringWidth(FONT_1, titleText, 0)) / 2u; xOffset = (128 - GetStringWidth(FONT_NORMAL_COPY_1, titleText, 0)) / 2u;
FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(0, PIXEL_FILL(0));
EC_AddTextPrinterParameterized2(0, FONT_1, titleText, xOffset, 0, TEXT_SKIP_DRAW, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); EC_AddTextPrinterParameterized2(0, FONT_NORMAL_COPY_1, titleText, xOffset, 0, TEXT_SKIP_DRAW, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY);
PutWindowTilemap(0); PutWindowTilemap(0);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
} }
static void EC_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16)) static void EC_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16))
{ {
if (fontId == FONT_1) if (fontId == FONT_NORMAL_COPY_1)
y += 2; y += 2;
AddTextPrinterParameterized(windowId, fontId, str, x, y, speed, callback); AddTextPrinterParameterized(windowId, fontId, str, x, y, speed, callback);
} }
@@ -1352,7 +1352,7 @@ static void EC_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str
static void EC_AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, u8 bg, u8 fg, u8 shadow) static void EC_AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, u8 bg, u8 fg, u8 shadow)
{ {
u8 color[3]; u8 color[3];
if (fontId == FONT_1) if (fontId == FONT_NORMAL_COPY_1)
y += 2; y += 2;
color[0] = bg; color[0] = bg;
color[1] = fg; color[1] = fg;
@@ -1392,17 +1392,17 @@ static void PrintECInterfaceTextById(u8 direction)
FillWindowPixelBuffer(1, PIXEL_FILL(1)); FillWindowPixelBuffer(1, PIXEL_FILL(1));
if (text1) if (text1)
EC_AddTextPrinterParameterized(1, FONT_1, text1, 0, 0, TEXT_SKIP_DRAW, NULL); EC_AddTextPrinterParameterized(1, FONT_NORMAL_COPY_1, text1, 0, 0, TEXT_SKIP_DRAW, NULL);
if (text2) if (text2)
EC_AddTextPrinterParameterized(1, FONT_1, text2, 0, 16, TEXT_SKIP_DRAW, NULL); EC_AddTextPrinterParameterized(1, FONT_NORMAL_COPY_1, text2, 0, 16, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(1, COPYWIN_FULL); CopyWindowToVram(1, COPYWIN_FULL);
} }
static void EC_CreateYesNoMenuWithInitialCursorPos(u8 initialCursorPos) static void EC_CreateYesNoMenuWithInitialCursorPos(u8 initialCursorPos)
{ {
CreateYesNoMenu(&sEasyChatYesNoWindowTemplate, FONT_1, 0, 2, 0x001, 14, initialCursorPos); CreateYesNoMenu(&sEasyChatYesNoWindowTemplate, FONT_NORMAL_COPY_1, 0, 2, 0x001, 14, initialCursorPos);
} }
static void CreatePhraseFrameWindow(void) static void CreatePhraseFrameWindow(void)
@@ -1469,7 +1469,7 @@ static void PrintECFields(void)
} }
*str = EOS; *str = EOS;
EC_AddTextPrinterParameterized(sEasyChatGraphicsResources->windowId, FONT_1, sEasyChatGraphicsResources->ecPrintBuffer, 0, i * 16, TEXT_SKIP_DRAW, NULL); EC_AddTextPrinterParameterized(sEasyChatGraphicsResources->windowId, FONT_NORMAL_COPY_1, sEasyChatGraphicsResources->ecPrintBuffer, 0, i * 16, TEXT_SKIP_DRAW, NULL);
} }
CopyWindowToVram(sEasyChatGraphicsResources->windowId, COPYWIN_FULL); CopyWindowToVram(sEasyChatGraphicsResources->windowId, COPYWIN_FULL);
@@ -1584,7 +1584,7 @@ static void PrintECGroupsMenu(void)
return; return;
} }
EC_AddTextPrinterParameterized(2, FONT_1, GetEasyChatWordGroupName(groupId), x * 84 + 10, y, TEXT_SKIP_DRAW, NULL); EC_AddTextPrinterParameterized(2, FONT_NORMAL_COPY_1, GetEasyChatWordGroupName(groupId), x * 84 + 10, y, TEXT_SKIP_DRAW, NULL);
} }
y += 16; y += 16;
@@ -1596,7 +1596,7 @@ static void PrintEasyChatKeyboardText(void)
u32 i; u32 i;
for (i = 0; i < ARRAY_COUNT(sEasyChatKeyboardAlphabet); i++) for (i = 0; i < ARRAY_COUNT(sEasyChatKeyboardAlphabet); i++)
EC_AddTextPrinterParameterized(2, FONT_1, sEasyChatKeyboardAlphabet[i], 10, 96 + i * 16, TEXT_SKIP_DRAW, NULL); EC_AddTextPrinterParameterized(2, FONT_NORMAL_COPY_1, sEasyChatKeyboardAlphabet[i], 10, 96 + i * 16, TEXT_SKIP_DRAW, NULL);
} }
static void PrintECWordsMenu(void) static void PrintECWordsMenu(void)
@@ -1670,7 +1670,7 @@ static void PrintECRowsWin2(u8 row, u8 remrow)
CopyEasyChatWordPadded(sEasyChatGraphicsResources->ecPaddedWordBuffer, easyChatWord, 0); CopyEasyChatWordPadded(sEasyChatGraphicsResources->ecPaddedWordBuffer, easyChatWord, 0);
EC_AddTextPrinterParameterized(2, FONT_1, sEasyChatGraphicsResources->ecPaddedWordBuffer, (j * 13 + 3) * 8, y_, TEXT_SKIP_DRAW, NULL); EC_AddTextPrinterParameterized(2, FONT_NORMAL_COPY_1, sEasyChatGraphicsResources->ecPaddedWordBuffer, (j * 13 + 3) * 8, y_, TEXT_SKIP_DRAW, NULL);
} }
} }
y += 16; y += 16;
@@ -2311,6 +2311,6 @@ static void CreateFooterWindow(void)
template.baseBlock = 0x030; template.baseBlock = 0x030;
windowId = AddWindow(&template); windowId = AddWindow(&template);
FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
EC_AddTextPrinterParameterized(windowId, FONT_1, gText_DelAllCancelOk, 0, 0, 0, NULL); EC_AddTextPrinterParameterized(windowId, FONT_NORMAL_COPY_1, gText_DelAllCancelOk, 0, 0, 0, NULL);
PutWindowTilemap(windowId); PutWindowTilemap(windowId);
} }
src/evolution_scene.c
+1 -1
View File
@@ -1332,7 +1332,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
if (!IsTextPrinterActive(0) && !IsSEPlaying()) if (!IsTextPrinterActive(0) && !IsSEPlaying())
{ {
LoadUserWindowGfx2(0, 0xA8, 0xE0); LoadUserWindowGfx2(0, 0xA8, 0xE0);
CreateYesNoMenu(&gTradeEvolutionSceneYesNoWindowTemplate, FONT_3, 0, 2, 0xA8, 0xE, 0); CreateYesNoMenu(&gTradeEvolutionSceneYesNoWindowTemplate, FONT_NORMAL_COPY_2, 0, 2, 0xA8, 0xE, 0);
sEvoCursorPos = 0; sEvoCursorPos = 0;
gTasks[taskId].tLearnMoveState++; gTasks[taskId].tLearnMoveState++;
sEvoCursorPos = 0; sEvoCursorPos = 0;
src/fame_checker.c
+15 -15
View File
@@ -822,7 +822,7 @@ static bool8 TryExitPickMode(u8 taskId)
static void MessageBoxPrintEmptyText(void) static void MessageBoxPrintEmptyText(void)
{ {
AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_2, gFameCheckerText_ClearTextbox, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_NORMAL, gFameCheckerText_ClearTextbox, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
static void Task_EnterPickMode(u8 taskId) static void Task_EnterPickMode(u8 taskId)
@@ -962,7 +962,7 @@ static void GetPickModeText(void)
if (HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE) if (HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE)
whichText = NUM_FAMECHECKER_PERSONS; whichText = NUM_FAMECHECKER_PERSONS;
StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[who] + whichText]); StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[who] + whichText]);
AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_NORMAL, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
} }
} }
@@ -973,7 +973,7 @@ static void PrintSelectedNameInBrightGreen(u8 taskId)
u16 cursorPos = FameCheckerGetCursorY(); u16 cursorPos = FameCheckerGetCursorY();
FillWindowPixelRect(FCWINDOWID_MSGBOX, PIXEL_FILL(1), 0, 0, 0xd0, 0x20); FillWindowPixelRect(FCWINDOWID_MSGBOX, PIXEL_FILL(1), 0, 0, 0xd0, 0x20);
StringExpandPlaceholders(gStringVar4, sFameCheckerFlavorTextPointers[sFameCheckerData->unlockedPersons[cursorPos] * 6 + data[1]]); StringExpandPlaceholders(gStringVar4, sFameCheckerFlavorTextPointers[sFameCheckerData->unlockedPersons[cursorPos] * 6 + data[1]]);
AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_NORMAL, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
} }
@@ -1081,9 +1081,9 @@ static void PrintUIHelp(u8 state)
if (state == 1) if (state == 1)
src = gFameCheckerText_PickScreenUI; src = gFameCheckerText_PickScreenUI;
} }
width = GetStringWidth(FONT_0, src, 0); width = GetStringWidth(FONT_SMALL, src, 0);
FillWindowPixelRect(FCWINDOWID_UIHELP, PIXEL_FILL(0), 0, 0, 0xc0, 0x10); FillWindowPixelRect(FCWINDOWID_UIHELP, PIXEL_FILL(0), 0, 0, 0xc0, 0x10);
AddTextPrinterParameterized4(FCWINDOWID_UIHELP, FONT_0, 188 - width, 0, 0, 2, sTextColor_White, -1, src); AddTextPrinterParameterized4(FCWINDOWID_UIHELP, FONT_SMALL, 188 - width, 0, 0, 2, sTextColor_White, -1, src);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_UIHELP); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_UIHELP);
} }
@@ -1395,11 +1395,11 @@ static void UpdateIconDescriptionBox(u8 whichText)
HandleFlavorTextModeSwitch(TRUE); HandleFlavorTextModeSwitch(TRUE);
gIconDescriptionBoxIsOpen = 1; gIconDescriptionBoxIsOpen = 1;
FillWindowPixelRect(FCWINDOWID_ICONDESC, PIXEL_FILL(0), 0, 0, 0x58, 0x20); FillWindowPixelRect(FCWINDOWID_ICONDESC, PIXEL_FILL(0), 0, 0, 0x58, 0x20);
width = (0x54 - GetStringWidth(FONT_0, sFlavorTextOriginLocationTexts[idx], 0)) / 2; width = (0x54 - GetStringWidth(FONT_SMALL, sFlavorTextOriginLocationTexts[idx], 0)) / 2;
AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, FONT_0, width, 0, 0, 2, sTextColor_DkGrey, -1, sFlavorTextOriginLocationTexts[idx]); AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, FONT_SMALL, width, 0, 0, 2, sTextColor_DkGrey, -1, sFlavorTextOriginLocationTexts[idx]);
StringExpandPlaceholders(gStringVar1, sFlavorTextOriginObjectNameTexts[idx]); StringExpandPlaceholders(gStringVar1, sFlavorTextOriginObjectNameTexts[idx]);
width = (0x54 - GetStringWidth(FONT_0, gStringVar1, 0)) / 2; width = (0x54 - GetStringWidth(FONT_SMALL, gStringVar1, 0)) / 2;
AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, FONT_0, width, 10, 0, 2, sTextColor_DkGrey, -1, gStringVar1); AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, FONT_SMALL, width, 10, 0, 2, sTextColor_DkGrey, -1, gStringVar1);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC);
} }
@@ -1435,7 +1435,7 @@ static void InitListMenuTemplate(void)
gFameChecker_ListMenuTemplate.lettersSpacing = 0; gFameChecker_ListMenuTemplate.lettersSpacing = 0;
gFameChecker_ListMenuTemplate.itemVerticalPadding = 0; gFameChecker_ListMenuTemplate.itemVerticalPadding = 0;
gFameChecker_ListMenuTemplate.scrollMultiple = 0; gFameChecker_ListMenuTemplate.scrollMultiple = 0;
gFameChecker_ListMenuTemplate.fontId = FONT_2; gFameChecker_ListMenuTemplate.fontId = FONT_NORMAL;
gFameChecker_ListMenuTemplate.cursorKind = 0; gFameChecker_ListMenuTemplate.cursorKind = 0;
} }
@@ -1513,7 +1513,7 @@ static void Task_SwitchToPickMode(u8 taskId)
static void PrintCancelDescription(void) static void PrintCancelDescription(void)
{ {
FillWindowPixelRect(FCWINDOWID_MSGBOX, PIXEL_FILL(1), 0, 0, 0xd0, 0x20); FillWindowPixelRect(FCWINDOWID_MSGBOX, PIXEL_FILL(1), 0, 0, 0xd0, 0x20);
AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_2, gFameCheckerText_FameCheckerWillBeClosed, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_NORMAL, gFameCheckerText_FameCheckerWillBeClosed, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX);
} }
@@ -1524,14 +1524,14 @@ static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit)
u16 who; u16 who;
ListMenuGetScrollAndRow(sFameCheckerData->listMenuTaskId, &listY, &cursorY); ListMenuGetScrollAndRow(sFameCheckerData->listMenuTaskId, &listY, &cursorY);
who = listY + cursorY; who = listY + cursorY;
AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_2, 8, 14 * cursorY + 4, 0, 0, sTextColor_Green, 0, sListMenuItems[itemIndex].label); AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_NORMAL, 8, 14 * cursorY + 4, 0, 0, sTextColor_Green, 0, sListMenuItems[itemIndex].label);
if (!onInit) if (!onInit)
{ {
if (listY < sFameCheckerData->listMenuTopIdx2) if (listY < sFameCheckerData->listMenuTopIdx2)
sFameCheckerData->listMenuDrawnSelIdx++; sFameCheckerData->listMenuDrawnSelIdx++;
else if (listY > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1) else if (listY > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1)
sFameCheckerData->listMenuDrawnSelIdx--; sFameCheckerData->listMenuDrawnSelIdx--;
AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].label); AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_NORMAL, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].label);
} }
sFameCheckerData->listMenuCurIdx = itemIndex; sFameCheckerData->listMenuCurIdx = itemIndex;
@@ -1729,7 +1729,7 @@ static void PlaceListMenuCursor(bool8 isActive)
{ {
u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->listMenuTaskId); u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->listMenuTaskId);
if (isActive == TRUE) if (isActive == TRUE)
AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_2, 0, cursorY, 0, 0, sTextColor_DkGrey, 0, gText_SelectorArrow2); AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_NORMAL, 0, cursorY, 0, 0, sTextColor_DkGrey, 0, gText_SelectorArrow2);
else else
AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_2, 0, cursorY, 0, 0, sTextColor_White, 0, gText_SelectorArrow2); AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_NORMAL, 0, cursorY, 0, 0, sTextColor_White, 0, gText_SelectorArrow2);
} }
src/field_player_avatar.c
+4 -4
View File
@@ -1766,7 +1766,7 @@ static bool8 Fishing5(struct Task *task)
} }
else else
{ {
AddTextPrinterParameterized(0, FONT_2, dot, task->tNumDots * 12, 1, 0, NULL); AddTextPrinterParameterized(0, FONT_NORMAL, dot, task->tNumDots * 12, 1, 0, NULL);
task->tNumDots++; task->tNumDots++;
} }
} }
@@ -1845,7 +1845,7 @@ static bool8 Fishing10(struct Task *task)
{ {
AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, gText_PokemonOnHook, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_PokemonOnHook, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep++; task->tStep++;
task->tFrameCounter = 0; task->tFrameCounter = 0;
return FALSE; return FALSE;
@@ -1892,7 +1892,7 @@ static bool8 Fishing12(struct Task *task)
AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, gText_NotEvenANibble, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_NotEvenANibble, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep = FISHING_SHOW_RESULT; task->tStep = FISHING_SHOW_RESULT;
return TRUE; return TRUE;
} }
@@ -1902,7 +1902,7 @@ static bool8 Fishing13(struct Task *task)
{ {
AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]);
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
AddTextPrinterParameterized2(0, FONT_2, gText_ItGotAway, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_ItGotAway, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tStep++; task->tStep++;
return TRUE; return TRUE;
} }
src/field_screen_effect.c
+1 -1
View File
@@ -368,7 +368,7 @@ static bool8 PrintWhiteOutRecoveryMessage(u8 taskId, const u8 *text, u8 x, u8 y)
case 0: case 0:
FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
StringExpandPlaceholders(gStringVar4, text); StringExpandPlaceholders(gStringVar4, text);
AddTextPrinterParameterized4(windowId, FONT_2, x, y, 1, 0, sWhiteoutTextColors, 1, gStringVar4); AddTextPrinterParameterized4(windowId, FONT_NORMAL, x, y, 1, 0, sWhiteoutTextColors, 1, gStringVar4);
gTextFlags.canABSpeedUpPrint = FALSE; gTextFlags.canABSpeedUpPrint = FALSE;
gTasks[taskId].tPrintState = 1; gTasks[taskId].tPrintState = 1;
break; break;
src/field_specials.c
+6 -6
View File
@@ -545,7 +545,7 @@ void NullFieldSpecial(void)
void DoPicboxCancel(void) void DoPicboxCancel(void)
{ {
u8 t = EOS; u8 t = EOS;
AddTextPrinterParameterized(0, FONT_2, &t, 0, 1, 0, NULL); AddTextPrinterParameterized(0, FONT_NORMAL, &t, 0, 1, 0, NULL);
PicboxCancel(); PicboxCancel();
} }
@@ -1100,10 +1100,10 @@ void DrawElevatorCurrentFloorWindow(void)
sElevatorCurrentFloorWindowId = AddWindow(&sElevatorCurrentFloorWindowTemplate); sElevatorCurrentFloorWindowId = AddWindow(&sElevatorCurrentFloorWindowTemplate);
LoadStdWindowGfx(sElevatorCurrentFloorWindowId, 0x21D, 0xD0); LoadStdWindowGfx(sElevatorCurrentFloorWindowId, 0x21D, 0xD0);
DrawStdFrameWithCustomTileAndPalette(sElevatorCurrentFloorWindowId, FALSE, 0x21D, 0xD); DrawStdFrameWithCustomTileAndPalette(sElevatorCurrentFloorWindowId, FALSE, 0x21D, 0xD);
AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, FONT_2, gText_NowOn, 0, 2, 0xFF, NULL); AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, FONT_NORMAL, gText_NowOn, 0, 2, 0xFF, NULL);
floorname = sFloorNamePointers[gSpecialVar_0x8005]; floorname = sFloorNamePointers[gSpecialVar_0x8005];
strwidth = GetStringWidth(FONT_2, floorname, 0); strwidth = GetStringWidth(FONT_NORMAL, floorname, 0);
AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, FONT_2, floorname, 56 - strwidth, 16, 0xFF, NULL); AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, FONT_NORMAL, floorname, 56 - strwidth, 16, 0xFF, NULL);
PutWindowTilemap(sElevatorCurrentFloorWindowId); PutWindowTilemap(sElevatorCurrentFloorWindowId);
CopyWindowToVram(sElevatorCurrentFloorWindowId, COPYWIN_FULL); CopyWindowToVram(sElevatorCurrentFloorWindowId, COPYWIN_FULL);
} }
@@ -1346,7 +1346,7 @@ static void Task_CreateScriptListMenu(u8 taskId)
{ {
sListMenuItems[i].label = sListMenuLabels[gSpecialVar_0x8004][i]; sListMenuItems[i].label = sListMenuLabels[gSpecialVar_0x8004][i];
sListMenuItems[i].index = i; sListMenuItems[i].index = i;
width = GetStringWidth(FONT_2, sListMenuItems[i].label, 0); width = GetStringWidth(FONT_NORMAL, sListMenuItems[i].label, 0);
if (width > mwidth) if (width > mwidth)
mwidth = width; mwidth = width;
} }
@@ -1384,7 +1384,7 @@ static void CreateScriptListMenu(void)
sFieldSpecialsListMenuTemplate.lettersSpacing = 1; sFieldSpecialsListMenuTemplate.lettersSpacing = 1;
sFieldSpecialsListMenuTemplate.itemVerticalPadding = 0; sFieldSpecialsListMenuTemplate.itemVerticalPadding = 0;
sFieldSpecialsListMenuTemplate.scrollMultiple = 0; sFieldSpecialsListMenuTemplate.scrollMultiple = 0;
sFieldSpecialsListMenuTemplate.fontId = FONT_2; sFieldSpecialsListMenuTemplate.fontId = FONT_NORMAL;
sFieldSpecialsListMenuTemplate.cursorKind = 0; sFieldSpecialsListMenuTemplate.cursorKind = 0;
} }
src/hall_of_fame.c
+17 -17
View File
@@ -454,7 +454,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
*lastSavedTeam = *sHofMonPtr; *lastSavedTeam = *sHofMonPtr;
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, 0);
AddTextPrinterParameterized2(0, FONT_2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_Hof_TrySaveData; gTasks[taskId].func = Task_Hof_TrySaveData;
} }
@@ -640,7 +640,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
HallOfFame_PrintPlayerInfo(1, 2); HallOfFame_PrintPlayerInfo(1, 2);
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, 0);
AddTextPrinterParameterized2(0, FONT_2, gText_LeagueChamp, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_LeagueChamp, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_Hof_ExitOnKeyPressed; gTasks[taskId].func = Task_Hof_ExitOnKeyPressed;
} }
@@ -970,7 +970,7 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
{ {
TopBarWindowPrintString(gText_ABUTTONExit, 8, TRUE); TopBarWindowPrintString(gText_ABUTTONExit, 8, TRUE);
DrawDialogueFrame(0, 0); DrawDialogueFrame(0, 0);
AddTextPrinterParameterized2(0, FONT_2, gText_HOFCorrupted, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_HOFCorrupted, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
gTasks[taskId].func = Task_HofPC_ExitOnButtonPress; gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;
} }
@@ -983,10 +983,10 @@ static void Task_HofPC_ExitOnButtonPress(u8 taskId)
static void HallOfFame_PrintWelcomeText(u8 not, u8 used) static void HallOfFame_PrintWelcomeText(u8 not, u8 used)
{ {
u8 x = (0xD0 - GetStringWidth(FONT_2, gText_WelcomeToHOF, 0)) / 2; u8 x = (0xD0 - GetStringWidth(FONT_NORMAL, gText_WelcomeToHOF, 0)) / 2;
FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(0, PIXEL_FILL(0));
PutWindowTilemap(0); PutWindowTilemap(0);
AddTextPrinterParameterized3(0, FONT_2, x, 1, sTextColors[0], 0, gText_WelcomeToHOF); AddTextPrinterParameterized3(0, FONT_NORMAL, x, 1, sTextColors[0], 0, gText_WelcomeToHOF);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
} }
@@ -1021,7 +1021,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
} }
text[3] = EOS; text[3] = EOS;
StringAppend(text2, text); StringAppend(text2, text);
AddTextPrinterParameterized3(0, FONT_2, 16, 1, sTextColors[0], 0, text2); AddTextPrinterParameterized3(0, FONT_NORMAL, 16, 1, sTextColors[0], 0, text2);
} }
// nick, species names, gender and lvl // nick, species names, gender and lvl
@@ -1034,12 +1034,12 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
} }
} }
text[i] = EOS; text[i] = EOS;
width = GetStringWidth(FONT_2, text, GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING)); width = GetStringWidth(FONT_NORMAL, text, GetFontAttribute(FONT_NORMAL, FONTATTR_LETTER_SPACING));
if (currMon->species == SPECIES_EGG) if (currMon->species == SPECIES_EGG)
x = 0x80 - width / 2; x = 0x80 - width / 2;
else else
x = 0x80 - width; x = 0x80 - width;
AddTextPrinterParameterized3(0, FONT_2, x, 1, sTextColors[0], 0, text); AddTextPrinterParameterized3(0, FONT_NORMAL, x, 1, sTextColors[0], 0, text);
if (currMon->species != SPECIES_EGG) if (currMon->species != SPECIES_EGG)
{ {
text[0] = CHAR_SLASH; text[0] = CHAR_SLASH;
@@ -1063,15 +1063,15 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
} }
*stringPtr = EOS; *stringPtr = EOS;
AddTextPrinterParameterized3(0, FONT_2, 0x80, 1, sTextColors[0], 0, text); AddTextPrinterParameterized3(0, FONT_NORMAL, 0x80, 1, sTextColors[0], 0, text);
stringPtr = StringCopy(text, gText_Level); stringPtr = StringCopy(text, gText_Level);
ConvertIntToDecimalStringN(stringPtr, currMon->lvl, STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(stringPtr, currMon->lvl, STR_CONV_MODE_LEFT_ALIGN, 3);
AddTextPrinterParameterized3(0, FONT_2, 0x20, 0x11, sTextColors[0], 0, text); AddTextPrinterParameterized3(0, FONT_NORMAL, 0x20, 0x11, sTextColors[0], 0, text);
stringPtr = StringCopy(text, gText_IDNumber); stringPtr = StringCopy(text, gText_IDNumber);
ConvertIntToDecimalStringN(stringPtr, (u16)(currMon->tid), STR_CONV_MODE_LEADING_ZEROS, 5); ConvertIntToDecimalStringN(stringPtr, (u16)(currMon->tid), STR_CONV_MODE_LEADING_ZEROS, 5);
AddTextPrinterParameterized3(0, FONT_2, 0x60, 0x11, sTextColors[0], 0, text); AddTextPrinterParameterized3(0, FONT_NORMAL, 0x60, 0x11, sTextColors[0], 0, text);
} }
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
@@ -1086,21 +1086,21 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
FillWindowPixelBuffer(1, PIXEL_FILL(1)); FillWindowPixelBuffer(1, PIXEL_FILL(1));
PutWindowTilemap(1); PutWindowTilemap(1);
DrawStdFrameWithCustomTileAndPalette(1, FALSE, 0x21D, 0xD); DrawStdFrameWithCustomTileAndPalette(1, FALSE, 0x21D, 0xD);
AddTextPrinterParameterized4(1, FONT_2, 4, 3, 0, 0, sTextColors[1], 0, gText_Name); AddTextPrinterParameterized4(1, FONT_NORMAL, 4, 3, 0, 0, sTextColors[1], 0, gText_Name);
AddTextPrinterParameterized3(1, FONT_2, textWidth - GetStringWidth(FONT_2, gSaveBlock2Ptr->playerName, 0), 3, sTextColors[1], 0, gSaveBlock2Ptr->playerName); AddTextPrinterParameterized3(1, FONT_NORMAL, textWidth - GetStringWidth(FONT_NORMAL, gSaveBlock2Ptr->playerName, 0), 3, sTextColors[1], 0, gSaveBlock2Ptr->playerName);
trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) | (gSaveBlock2Ptr->playerTrainerId[1] << 8); trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) | (gSaveBlock2Ptr->playerTrainerId[1] << 8);
AddTextPrinterParameterized3(1, FONT_2, 4, 18, sTextColors[1], 0, gText_IDNumber); AddTextPrinterParameterized3(1, FONT_NORMAL, 4, 18, sTextColors[1], 0, gText_IDNumber);
text[0] = (trainerId % 100000) / 10000 + CHAR_0; text[0] = (trainerId % 100000) / 10000 + CHAR_0;
text[1] = (trainerId % 10000) / 1000 + CHAR_0; text[1] = (trainerId % 10000) / 1000 + CHAR_0;
text[2] = (trainerId % 1000) / 100 + CHAR_0; text[2] = (trainerId % 1000) / 100 + CHAR_0;
text[3] = (trainerId % 100) / 10 + CHAR_0; text[3] = (trainerId % 100) / 10 + CHAR_0;
text[4] = (trainerId % 10) / 1 + CHAR_0; text[4] = (trainerId % 10) / 1 + CHAR_0;
text[5] = EOS; text[5] = EOS;
AddTextPrinterParameterized3(1, FONT_2, textWidth - 30, 18, sTextColors[1], 0, text); AddTextPrinterParameterized3(1, FONT_NORMAL, textWidth - 30, 18, sTextColors[1], 0, text);
AddTextPrinterParameterized3(1, FONT_2, 4, 32, sTextColors[1], 0, gText_MainMenuTime); AddTextPrinterParameterized3(1, FONT_NORMAL, 4, 32, sTextColors[1], 0, gText_MainMenuTime);
text[0] = (gSaveBlock2Ptr->playTimeHours / 100) + CHAR_0; text[0] = (gSaveBlock2Ptr->playTimeHours / 100) + CHAR_0;
text[1] = (gSaveBlock2Ptr->playTimeHours % 100) / 10 + CHAR_0; text[1] = (gSaveBlock2Ptr->playTimeHours % 100) / 10 + CHAR_0;
text[2] = (gSaveBlock2Ptr->playTimeHours % 10) + CHAR_0; text[2] = (gSaveBlock2Ptr->playTimeHours % 10) + CHAR_0;
@@ -1115,7 +1115,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
text[5] = (gSaveBlock2Ptr->playTimeMinutes % 10) + CHAR_0; text[5] = (gSaveBlock2Ptr->playTimeMinutes % 10) + CHAR_0;
text[6] = EOS; text[6] = EOS;
AddTextPrinterParameterized3(1, FONT_2, textWidth - 36, 32, sTextColors[1], 0, text); AddTextPrinterParameterized3(1, FONT_NORMAL, textWidth - 36, 32, sTextColors[1], 0, text);
CopyWindowToVram(1, COPYWIN_FULL); CopyWindowToVram(1, COPYWIN_FULL);
} }
src/help_message.c
+1 -1
View File
@@ -94,7 +94,7 @@ static const u8 sHelpMessageTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMI
static void PrintHelpMessageText(const u8 *text) static void PrintHelpMessageText(const u8 *text)
{ {
AddTextPrinterParameterized4(sHelpMessageWindowId, FONT_2, 2, 5, 1, 1, sHelpMessageTextColors, -1, text); AddTextPrinterParameterized4(sHelpMessageWindowId, FONT_NORMAL, 2, 5, 1, 1, sHelpMessageTextColors, -1, text);
} }
void PrintTextOnHelpMessageWindow(const u8 *text, u8 mode) void PrintTextOnHelpMessageWindow(const u8 *text, u8 mode)
src/help_system_util.c
+13 -13
View File
@@ -410,7 +410,7 @@ void HelpSystemRenderText(u8 fontId, u8 * dest, const u8 * src, u8 x, u8 y, u8 w
} }
DecompressAndRenderGlyph(fontId, gSaveBlock2Ptr->playerName[i], &srcBlit, &destBlit, dest, x, y, width, height); DecompressAndRenderGlyph(fontId, gSaveBlock2Ptr->playerName[i], &srcBlit, &destBlit, dest, x, y, width, height);
// This is required to match a dummy [sp+#0x24] read here // This is required to match a dummy [sp+#0x24] read here
if (fontId == FONT_0) if (fontId == FONT_SMALL)
{ {
x += gGlyphInfo.width; x += gGlyphInfo.width;
} }
@@ -440,7 +440,7 @@ void HelpSystemRenderText(u8 fontId, u8 * dest, const u8 * src, u8 x, u8 y, u8 w
} }
DecompressAndRenderGlyph(fontId, gString_Someone[i], &srcBlit, &destBlit, dest, x, y, width, height); DecompressAndRenderGlyph(fontId, gString_Someone[i], &srcBlit, &destBlit, dest, x, y, width, height);
} }
if (fontId == FONT_0) if (fontId == FONT_SMALL)
{ {
x += gGlyphInfo.width; x += gGlyphInfo.width;
} }
@@ -529,7 +529,7 @@ void HelpSystemRenderText(u8 fontId, u8 * dest, const u8 * src, u8 x, u8 y, u8 w
default: default:
if (curChar == CHAR_SPACE) if (curChar == CHAR_SPACE)
{ {
if (fontId == FONT_0) if (fontId == FONT_SMALL)
{ {
x += 5; x += 5;
} }
@@ -541,7 +541,7 @@ void HelpSystemRenderText(u8 fontId, u8 * dest, const u8 * src, u8 x, u8 y, u8 w
else else
{ {
DecompressAndRenderGlyph(fontId, curChar, &srcBlit, &destBlit, dest, x, y, width, height); DecompressAndRenderGlyph(fontId, curChar, &srcBlit, &destBlit, dest, x, y, width, height);
if (fontId == FONT_0) if (fontId == FONT_SMALL)
{ {
x += gGlyphInfo.width; x += gGlyphInfo.width;
} }
@@ -557,12 +557,12 @@ void HelpSystemRenderText(u8 fontId, u8 * dest, const u8 * src, u8 x, u8 y, u8 w
void DecompressAndRenderGlyph(u8 fontId, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height) void DecompressAndRenderGlyph(u8 fontId, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height)
{ {
if (fontId == FONT_0) if (fontId == FONT_SMALL)
DecompressGlyphFont0(glyph, FALSE); DecompressGlyph_Small(glyph, FALSE);
else if (fontId == FONT_5) else if (fontId == FONT_FEMALE)
DecompressGlyphFont5(glyph, FALSE); DecompressGlyph_Female(glyph, FALSE);
else else
DecompressGlyphFont2(glyph, FALSE); DecompressGlyph_Normal(glyph, FALSE);
srcBlit->pixels = gGlyphInfo.pixels; srcBlit->pixels = gGlyphInfo.pixels;
srcBlit->width = 16; srcBlit->width = 16;
srcBlit->height = 16; srcBlit->height = 16;
@@ -580,7 +580,7 @@ void HelpSystem_PrintTextInTopLeftCorner(const u8 * str)
void HelpSystem_PrintTextRightAlign_Row52(const u8 * str) void HelpSystem_PrintTextRightAlign_Row52(const u8 * str)
{ {
s32 left = 0x7C - GetStringWidth(FONT_0, str, 0); s32 left = 0x7C - GetStringWidth(FONT_SMALL, str, 0);
GenerateFontHalfRowLookupTable(TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_DARK_GRAY); GenerateFontHalfRowLookupTable(TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_DARK_GRAY);
HelpSystemRenderText(0, gDecompressionBuffer + 0x3400, str, left, 2, 16, 2); HelpSystemRenderText(0, gDecompressionBuffer + 0x3400, str, left, 2, 16, 2);
} }
@@ -713,7 +713,7 @@ void HS_UpdateMenuScrollArrows(void)
void PrintListMenuItems(void) void PrintListMenuItems(void)
{ {
u8 glyphHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 1; u8 glyphHeight = GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 1;
s32 i; s32 i;
s32 r5 = gHelpSystemListMenu.itemsAbove; s32 r5 = gHelpSystemListMenu.itemsAbove;
@@ -728,7 +728,7 @@ void PrintListMenuItems(void)
void PlaceListMenuCursor(void) void PlaceListMenuCursor(void)
{ {
u8 glyphHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 1; u8 glyphHeight = GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 1;
u8 x = gHelpSystemListMenu.sub.left; u8 x = gHelpSystemListMenu.sub.left;
u8 y = gHelpSystemListMenu.sub.top + glyphHeight * gHelpSystemListMenu.cursorPos; u8 y = gHelpSystemListMenu.sub.top + glyphHeight * gHelpSystemListMenu.cursorPos;
HelpSystem_PrintTextAt(gText_SelectorArrow2, x, y); HelpSystem_PrintTextAt(gText_SelectorArrow2, x, y);
@@ -736,7 +736,7 @@ void PlaceListMenuCursor(void)
void HS_RemoveSelectionCursorAt(u8 i) void HS_RemoveSelectionCursorAt(u8 i)
{ {
u8 glyphHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 1; u8 glyphHeight = GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 1;
u8 x = gHelpSystemListMenu.sub.left; u8 x = gHelpSystemListMenu.sub.left;
u8 y = gHelpSystemListMenu.sub.top + i * glyphHeight; u8 y = gHelpSystemListMenu.sub.top + i * glyphHeight;
HelpSystem_PrintTextAt(gString_HelpSystem_ClearTo8, x, y); HelpSystem_PrintTextAt(gString_HelpSystem_ClearTo8, x, y);
src/item_menu.c
+26 -26
View File
@@ -660,7 +660,7 @@ static void Bag_BuildListMenuTemplate(u8 pocket)
gMultiuseListMenuTemplate.itemVerticalPadding = 2; gMultiuseListMenuTemplate.itemVerticalPadding = 2;
gMultiuseListMenuTemplate.upText_Y = 2; gMultiuseListMenuTemplate.upText_Y = 2;
gMultiuseListMenuTemplate.maxShowed = sBagMenuDisplay->maxShowed[pocket]; gMultiuseListMenuTemplate.maxShowed = sBagMenuDisplay->maxShowed[pocket];
gMultiuseListMenuTemplate.fontId = FONT_2; gMultiuseListMenuTemplate.fontId = FONT_NORMAL;
gMultiuseListMenuTemplate.cursorPal = 2; gMultiuseListMenuTemplate.cursorPal = 2;
gMultiuseListMenuTemplate.fillValue = 0; gMultiuseListMenuTemplate.fillValue = 0;
gMultiuseListMenuTemplate.cursorShadowPal = 3; gMultiuseListMenuTemplate.cursorShadowPal = 3;
@@ -718,7 +718,7 @@ static void BagListMenuItemPrintFunc(u8 windowId, u32 itemId, u8 y)
{ {
ConvertIntToDecimalStringN(gStringVar1, bagItemQuantity, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, bagItemQuantity, STR_CONV_MODE_RIGHT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
BagPrintTextOnWindow(windowId, FONT_0, gStringVar4, 0x6e, y, 0, 0, 0xFF, 1); BagPrintTextOnWindow(windowId, FONT_SMALL, gStringVar4, 0x6e, y, 0, 0, 0xFF, 1);
} }
else if (gSaveBlock1Ptr->registeredItem != ITEM_NONE && gSaveBlock1Ptr->registeredItem == bagItemId) else if (gSaveBlock1Ptr->registeredItem != ITEM_NONE && gSaveBlock1Ptr->registeredItem == bagItemId)
{ {
@@ -736,11 +736,11 @@ static void bag_menu_print_cursor(u8 y, u8 colorIdx)
{ {
if (colorIdx == 0xFF) if (colorIdx == 0xFF)
{ {
FillWindowPixelRect(0, PIXEL_FILL(0), 1, y, GetMenuCursorDimensionByFont(FONT_2, 0), GetMenuCursorDimensionByFont(FONT_2, 1)); FillWindowPixelRect(0, PIXEL_FILL(0), 1, y, GetMenuCursorDimensionByFont(FONT_NORMAL, 0), GetMenuCursorDimensionByFont(FONT_NORMAL, 1));
} }
else else
{ {
BagPrintTextOnWindow(0, FONT_2, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx); BagPrintTextOnWindow(0, FONT_NORMAL, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx);
} }
} }
@@ -758,7 +758,7 @@ static void PrintItemDescriptionOnMessageWindow(s32 itemIndex)
else else
description = gText_CloseBag; description = gText_CloseBag;
FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(1, PIXEL_FILL(0));
BagPrintTextOnWindow(1, FONT_2, description, 0, 3, 2, 0, 0, 0); BagPrintTextOnWindow(1, FONT_NORMAL, description, 0, 3, 2, 0, 0, 0);
} }
static void CreatePocketScrollArrowPair(void) static void CreatePocketScrollArrowPair(void)
@@ -1230,7 +1230,7 @@ static void BeginMovingItemInPocket(u8 taskId, s16 itemIndex)
StringCopy(gStringVar1, ItemId_GetName(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1]))); StringCopy(gStringVar1, ItemId_GetName(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])));
StringExpandPlaceholders(gStringVar4, gOtherText_WhereShouldTheStrVar1BePlaced); StringExpandPlaceholders(gStringVar4, gOtherText_WhereShouldTheStrVar1BePlaced);
FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(1, PIXEL_FILL(0));
BagPrintTextOnWindow(1, FONT_2, gStringVar4, 0, 3, 2, 0, 0, 0); BagPrintTextOnWindow(1, FONT_NORMAL, gStringVar4, 0, 3, 2, 0, 0, 0);
UpdateSwapLinePos(0, ListMenuGetYCoordForPrintingArrowCursor(data[0])); UpdateSwapLinePos(0, ListMenuGetYCoordForPrintingArrowCursor(data[0]));
SetSwapLineInvisibility(FALSE); SetSwapLineInvisibility(FALSE);
BagDestroyPocketSwitchArrowPair(); BagDestroyPocketSwitchArrowPair();
@@ -1315,11 +1315,11 @@ static void InitQuantityToTossOrDeposit(u16 cursorPos, const u8 *str)
u8 r5 = ShowBagWindow(6, 2); u8 r5 = ShowBagWindow(6, 2);
CopyItemName(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, cursorPos), gStringVar1); CopyItemName(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, cursorPos), gStringVar1);
StringExpandPlaceholders(gStringVar4, str); StringExpandPlaceholders(gStringVar4, str);
BagPrintTextOnWindow(r5, FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); BagPrintTextOnWindow(r5, FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1);
r4 = ShowBagWindow(0, 0); r4 = ShowBagWindow(0, 0);
ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 3); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 3);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
BagPrintTextOnWindow(r4, FONT_0, gStringVar4, 4, 10, 1, 0, 0, 1); BagPrintTextOnWindow(r4, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0, 1);
CreateArrowPair_QuantitySelect(); CreateArrowPair_QuantitySelect();
} }
@@ -1329,7 +1329,7 @@ static void UpdateQuantityToTossOrDeposit(s16 value, u8 ndigits)
FillWindowPixelBuffer(r6, PIXEL_FILL(1)); FillWindowPixelBuffer(r6, PIXEL_FILL(1));
ConvertIntToDecimalStringN(gStringVar1, value, STR_CONV_MODE_LEADING_ZEROS, ndigits); ConvertIntToDecimalStringN(gStringVar1, value, STR_CONV_MODE_LEADING_ZEROS, ndigits);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
BagPrintTextOnWindow(r6, FONT_0, gStringVar4, 4, 10, 1, 0, 0, 1); BagPrintTextOnWindow(r6, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0, 1);
} }
static void CopyBagListBgTileRowToTilemapBuffer(u8 frame) static void CopyBagListBgTileRowToTilemapBuffer(u8 frame)
@@ -1422,20 +1422,20 @@ static void OpenContextMenu(u8 taskId)
r6 = ShowBagWindow(10, sContextMenuNumItems - 1); r6 = ShowBagWindow(10, sContextMenuNumItems - 1);
AddItemMenuActionTextPrinters( AddItemMenuActionTextPrinters(
r6, r6,
FONT_2, FONT_NORMAL,
GetMenuCursorDimensionByFont(FONT_2, 0), GetMenuCursorDimensionByFont(FONT_NORMAL, 0),
2, 2,
GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING), GetFontAttribute(FONT_NORMAL, FONTATTR_LETTER_SPACING),
GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 2,
sContextMenuNumItems, sContextMenuNumItems,
sItemMenuContextActions, sItemMenuContextActions,
sContextMenuItemsPtr sContextMenuItemsPtr
); );
Menu_InitCursor(r6, FONT_2, 0, 2, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumItems, 0); Menu_InitCursor(r6, FONT_NORMAL, 0, 2, GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumItems, 0);
r4 = ShowBagWindow(6, 0); r4 = ShowBagWindow(6, 0);
CopyItemName(gSpecialVar_ItemId, gStringVar1); CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
BagPrintTextOnWindow(r4, FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); BagPrintTextOnWindow(r4, FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1);
} }
static void Task_ItemContext_FieldOrBattle(u8 taskId) static void Task_ItemContext_FieldOrBattle(u8 taskId)
@@ -1507,7 +1507,7 @@ static void Task_ConfirmTossItems(u8 taskId)
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_ThrowAwayStrVar2OfThisItemQM); StringExpandPlaceholders(gStringVar4, gText_ThrowAwayStrVar2OfThisItemQM);
BagPrintTextOnWindow(ShowBagWindow(6, 1), FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); BagPrintTextOnWindow(ShowBagWindow(6, 1), FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1);
BagCreateYesNoMenuBottomRight(taskId, &sYesNoMenu_Toss); BagCreateYesNoMenuBottomRight(taskId, &sYesNoMenu_Toss);
} }
@@ -1559,7 +1559,7 @@ static void Task_TossItem_Yes(u8 taskId)
CopyItemName(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1]), gStringVar1); CopyItemName(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1]), gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_ThrewAwayStrVar2StrVar1s); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayStrVar2StrVar1s);
BagPrintTextOnWindow(ShowBagWindow(6, 3), FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); BagPrintTextOnWindow(ShowBagWindow(6, 3), FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1);
gTasks[taskId].func = Task_WaitAB_RedrawAndReturnToBag; gTasks[taskId].func = Task_WaitAB_RedrawAndReturnToBag;
} }
@@ -1610,7 +1610,7 @@ static void Task_ItemMenuAction_Give(u8 taskId)
PutWindowTilemap(1); PutWindowTilemap(1);
CopyWindowToVram(0, COPYWIN_MAP); CopyWindowToVram(0, COPYWIN_MAP);
if (!IsWritingMailAllowed(itemId)) if (!IsWritingMailAllowed(itemId))
DisplayItemMessageInBag(taskId, FONT_2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu);
else if (ItemId_GetImportance(itemId) == 0) else if (ItemId_GetImportance(itemId) == 0)
{ {
if (CalculatePlayerPartyCount() == 0) if (CalculatePlayerPartyCount() == 0)
@@ -1629,14 +1629,14 @@ static void Task_ItemMenuAction_Give(u8 taskId)
static void Task_PrintThereIsNoPokemon(u8 taskId) static void Task_PrintThereIsNoPokemon(u8 taskId)
{ {
DisplayItemMessageInBag(taskId, FONT_2, gText_ThereIsNoPokemon, Task_WaitAButtonAndCloseContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gText_ThereIsNoPokemon, Task_WaitAButtonAndCloseContextMenu);
} }
static void Task_PrintItemCantBeHeld(u8 taskId) static void Task_PrintItemCantBeHeld(u8 taskId)
{ {
CopyItemName(gSpecialVar_ItemId, gStringVar1); CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_ItemCantBeHeld); StringExpandPlaceholders(gStringVar4, gText_ItemCantBeHeld);
DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_WaitAButtonAndCloseContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gStringVar4, Task_WaitAButtonAndCloseContextMenu);
} }
static void Task_WaitAButtonAndCloseContextMenu(u8 taskId) static void Task_WaitAButtonAndCloseContextMenu(u8 taskId)
@@ -1705,7 +1705,7 @@ static void Task_ItemContext_FieldGive(u8 taskId)
u16 itemId = BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1]); u16 itemId = BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1]);
if (!IsWritingMailAllowed(itemId)) if (!IsWritingMailAllowed(itemId))
{ {
DisplayItemMessageInBag(taskId, FONT_2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu);
} }
else if (itemId == ITEM_TM_CASE) else if (itemId == ITEM_TM_CASE)
{ {
@@ -1749,7 +1749,7 @@ static void Task_ItemContext_PcBoxGive(u8 taskId)
u16 itemId = BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1]); u16 itemId = BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1]);
if (ItemIsMail(itemId) == TRUE) if (ItemIsMail(itemId) == TRUE)
{ {
DisplayItemMessageInBag(taskId, FONT_2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu);
} }
else if (itemId == ITEM_TM_CASE) else if (itemId == ITEM_TM_CASE)
{ {
@@ -1872,7 +1872,7 @@ static void Task_InitSaleQuantitySelectInterface(u8 taskId)
u8 r4 = ShowBagWindow(0, 1); u8 r4 = ShowBagWindow(0, 1);
ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
BagPrintTextOnWindow(r4, FONT_0, gStringVar4, 4, 10, 1, 0, 0xFF, 1); BagPrintTextOnWindow(r4, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0xFF, 1);
UpdateSalePriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8]); UpdateSalePriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8]);
BagPrintMoneyAmount(); BagPrintMoneyAmount();
CreatePocketScrollArrowPair_SellQuantity(); CreatePocketScrollArrowPair_SellQuantity();
@@ -1925,7 +1925,7 @@ static void Task_SellItem_Yes(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1); CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6); ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen); StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen);
DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_FinalizeSaleToShop); DisplayItemMessageInBag(taskId, FONT_NORMAL, gStringVar4, Task_FinalizeSaleToShop);
} }
static void Task_FinalizeSaleToShop(u8 taskId) static void Task_FinalizeSaleToShop(u8 taskId)
@@ -2013,12 +2013,12 @@ static void Task_TryDoItemDeposit(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1); CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_DepositedStrVar2StrVar1s); StringExpandPlaceholders(gStringVar4, gText_DepositedStrVar2StrVar1s);
BagPrintTextOnWindow(ShowBagWindow(6, 3), FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); BagPrintTextOnWindow(ShowBagWindow(6, 3), FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1);
gTasks[taskId].func = Task_WaitAB_RedrawAndReturnToBag; gTasks[taskId].func = Task_WaitAB_RedrawAndReturnToBag;
} }
else else
{ {
DisplayItemMessageInBag(taskId, FONT_2, gText_NoRoomToStoreItems, Task_WaitAButtonAndCloseContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gText_NoRoomToStoreItems, Task_WaitAButtonAndCloseContextMenu);
} }
} }
src/item_pc.c
+21 -21
View File
@@ -498,7 +498,7 @@ static void ItemPc_BuildListMenuTemplate(void)
gMultiuseListMenuTemplate.itemVerticalPadding = 2; gMultiuseListMenuTemplate.itemVerticalPadding = 2;
gMultiuseListMenuTemplate.upText_Y = 2; gMultiuseListMenuTemplate.upText_Y = 2;
gMultiuseListMenuTemplate.maxShowed = sStateDataPtr->maxShowed; gMultiuseListMenuTemplate.maxShowed = sStateDataPtr->maxShowed;
gMultiuseListMenuTemplate.fontId = FONT_2; gMultiuseListMenuTemplate.fontId = FONT_NORMAL;
gMultiuseListMenuTemplate.cursorPal = 2; gMultiuseListMenuTemplate.cursorPal = 2;
gMultiuseListMenuTemplate.fillValue = 0; gMultiuseListMenuTemplate.fillValue = 0;
gMultiuseListMenuTemplate.cursorShadowPal = 3; gMultiuseListMenuTemplate.cursorShadowPal = 3;
@@ -534,7 +534,7 @@ static void ItemPc_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *
} }
sStateDataPtr->itemMenuIconSlot ^= 1; sStateDataPtr->itemMenuIconSlot ^= 1;
FillWindowPixelBuffer(1, 0); FillWindowPixelBuffer(1, 0);
ItemPc_AddTextPrinterParameterized(1, FONT_2, desc, 0, 3, 2, 0, 0, 3); ItemPc_AddTextPrinterParameterized(1, FONT_NORMAL, desc, 0, 3, 2, 0, 0, 3);
} }
} }
@@ -552,7 +552,7 @@ static void ItemPc_ItemPrintFunc(u8 windowId, u32 itemId, u8 y)
u16 quantity = ItemPc_GetItemQuantityBySlotId(itemId); u16 quantity = ItemPc_GetItemQuantityBySlotId(itemId);
ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_RIGHT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
ItemPc_AddTextPrinterParameterized(windowId, FONT_0, gStringVar4, 110, y, 0, 0, 0xFF, 1); ItemPc_AddTextPrinterParameterized(windowId, FONT_SMALL, gStringVar4, 110, y, 0, 0, 0xFF, 1);
} }
} }
@@ -565,19 +565,19 @@ static void ItemPc_PrintOrRemoveCursorAt(u8 y, u8 colorIdx)
{ {
if (colorIdx == 0xFF) if (colorIdx == 0xFF)
{ {
u8 maxWidth = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_WIDTH); u8 maxWidth = GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_WIDTH);
u8 maxHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT); u8 maxHeight = GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT);
FillWindowPixelRect(0, 0, 0, y, maxWidth, maxHeight); FillWindowPixelRect(0, 0, 0, y, maxWidth, maxHeight);
} }
else else
{ {
ItemPc_AddTextPrinterParameterized(0, FONT_2, gText_SelectorArrow2, 0, y, 0, 0, 0, colorIdx); ItemPc_AddTextPrinterParameterized(0, FONT_NORMAL, gText_SelectorArrow2, 0, y, 0, 0, 0, colorIdx);
} }
} }
static void ItemPc_PrintWithdrawItem(void) static void ItemPc_PrintWithdrawItem(void)
{ {
ItemPc_AddTextPrinterParameterized(2, FONT_0, gText_WithdrawItem, 0, 1, 0, 1, 0, 0); ItemPc_AddTextPrinterParameterized(2, FONT_SMALL, gText_WithdrawItem, 0, 1, 0, 1, 0, 0);
} }
static void ItemPc_PlaceTopMenuScrollIndicatorArrows(void) static void ItemPc_PlaceTopMenuScrollIndicatorArrows(void)
@@ -773,7 +773,7 @@ static void ItemPc_MoveItemModeInit(u8 taskId, s16 pos)
StringCopy(gStringVar1, ItemId_GetName(ItemPc_GetItemIdBySlotId(data[1]))); StringCopy(gStringVar1, ItemId_GetName(ItemPc_GetItemIdBySlotId(data[1])));
StringExpandPlaceholders(gStringVar4, gOtherText_WhereShouldTheStrVar1BePlaced); StringExpandPlaceholders(gStringVar4, gOtherText_WhereShouldTheStrVar1BePlaced);
FillWindowPixelBuffer(1, 0x00); FillWindowPixelBuffer(1, 0x00);
ItemPc_AddTextPrinterParameterized(1, FONT_2, gStringVar4, 0, 3, 2, 3, 0, 0); ItemPc_AddTextPrinterParameterized(1, FONT_NORMAL, gStringVar4, 0, 3, 2, 3, 0, 0);
UpdateSwapLinePos(-32, ListMenuGetYCoordForPrintingArrowCursor(data[0])); UpdateSwapLinePos(-32, ListMenuGetYCoordForPrintingArrowCursor(data[0]));
SetSwapLineInvisibility(FALSE); SetSwapLineInvisibility(FALSE);
ItemPc_PrintOrRemoveCursor(data[0], 2); ItemPc_PrintOrRemoveCursor(data[0], 2);
@@ -839,11 +839,11 @@ static void Task_ItemPcSubmenuInit(u8 taskId)
ItemPc_SetBorderStyleOnWindow(4); ItemPc_SetBorderStyleOnWindow(4);
windowId = ItemPc_GetOrCreateSubwindow(0); windowId = ItemPc_GetOrCreateSubwindow(0);
PrintTextArray(4, FONT_2, 8, 2, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, sItemPcSubmenuOptions); PrintTextArray(4, FONT_NORMAL, 8, 2, GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, sItemPcSubmenuOptions);
Menu_InitCursor(4, FONT_2, 0, 2, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, 0); Menu_InitCursor(4, FONT_NORMAL, 0, 2, GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, 0);
CopyItemName(ItemPc_GetItemIdBySlotId(data[1]), gStringVar1); CopyItemName(ItemPc_GetItemIdBySlotId(data[1]), gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
ItemPc_AddTextPrinterParameterized(windowId, FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); ItemPc_AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, 0, 2, 1, 0, 0, 1);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
gTasks[taskId].func = Task_ItemPcSubmenuRun; gTasks[taskId].func = Task_ItemPcSubmenuRun;
} }
@@ -901,13 +901,13 @@ static void ItemPc_DoWithdraw(u8 taskId)
ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_WithdrewQuantItem); StringExpandPlaceholders(gStringVar4, gText_WithdrewQuantItem);
windowId = ItemPc_GetOrCreateSubwindow(2); windowId = ItemPc_GetOrCreateSubwindow(2);
AddTextPrinterParameterized(windowId, FONT_2, gStringVar4, 0, 2, 0, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, 0, 2, 0, NULL);
gTasks[taskId].func = Task_ItemPcWaitButtonAndFinishWithdrawMultiple; gTasks[taskId].func = Task_ItemPcWaitButtonAndFinishWithdrawMultiple;
} }
else else
{ {
windowId = ItemPc_GetOrCreateSubwindow(2); windowId = ItemPc_GetOrCreateSubwindow(2);
AddTextPrinterParameterized(windowId, FONT_2, gText_NoMoreRoomInBag, 0, 2, 0, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_NoMoreRoomInBag, 0, 2, 0, NULL);
gTasks[taskId].func = Task_ItemPcWaitButtonWithdrawMultipleFailed; gTasks[taskId].func = Task_ItemPcWaitButtonWithdrawMultipleFailed;
} }
} }
@@ -957,11 +957,11 @@ static void ItemPc_WithdrawMultipleInitWindow(u16 slotId)
CopyItemName(itemId, gStringVar1); CopyItemName(itemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_WithdrawHowMany); StringExpandPlaceholders(gStringVar4, gText_WithdrawHowMany);
AddTextPrinterParameterized(ItemPc_GetOrCreateSubwindow(1), FONT_2, gStringVar4, 0, 2, 0, NULL); AddTextPrinterParameterized(ItemPc_GetOrCreateSubwindow(1), FONT_NORMAL, gStringVar4, 0, 2, 0, NULL);
ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 3); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 3);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
ItemPc_SetBorderStyleOnWindow(3); ItemPc_SetBorderStyleOnWindow(3);
ItemPc_AddTextPrinterParameterized(3, FONT_0, gStringVar4, 8, 10, 1, 0, 0, 1); ItemPc_AddTextPrinterParameterized(3, FONT_SMALL, gStringVar4, 8, 10, 1, 0, 0, 1);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
} }
@@ -970,7 +970,7 @@ static void UpdateWithdrawQuantityDisplay(s16 quantity)
FillWindowPixelRect(3, PIXEL_FILL(1), 10, 10, 28, 12); FillWindowPixelRect(3, PIXEL_FILL(1), 10, 10, 28, 12);
ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, 3); ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, 3);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
ItemPc_AddTextPrinterParameterized(3, FONT_0, gStringVar4, 8, 10, 1, 0, 0, 1); ItemPc_AddTextPrinterParameterized(3, FONT_SMALL, gStringVar4, 8, 10, 1, 0, 0, 1);
} }
static void Task_ItemPcHandleWithdrawMultiple(u8 taskId) static void Task_ItemPcHandleWithdrawMultiple(u8 taskId)
@@ -1090,7 +1090,7 @@ static void unused_ItemPc_AddTextPrinterParameterized(u8 windowId, const u8 * st
template.currentChar = string; template.currentChar = string;
template.windowId = windowId; template.windowId = windowId;
template.fontId = FONT_3; template.fontId = FONT_NORMAL_COPY_2;
template.x = x; template.x = x;
template.y = y; template.y = y;
template.currentX = x; template.currentX = x;
@@ -1098,9 +1098,9 @@ static void unused_ItemPc_AddTextPrinterParameterized(u8 windowId, const u8 * st
template.fgColor = 2; template.fgColor = 2;
template.bgColor = 0; template.bgColor = 0;
template.shadowColor = 3; template.shadowColor = 3;
template.unk = GetFontAttribute(FONT_3, FONTATTR_UNKNOWN); template.unk = GetFontAttribute(FONT_NORMAL_COPY_2, FONTATTR_UNKNOWN);
template.letterSpacing = letterSpacing + GetFontAttribute(FONT_3, FONTATTR_LETTER_SPACING); template.letterSpacing = letterSpacing + GetFontAttribute(FONT_NORMAL_COPY_2, FONTATTR_LETTER_SPACING);
template.lineSpacing = lineSpacing + GetFontAttribute(FONT_3, FONTATTR_LINE_SPACING); template.lineSpacing = lineSpacing + GetFontAttribute(FONT_NORMAL_COPY_2, FONTATTR_LINE_SPACING);
AddTextPrinter(&template, speed, NULL); AddTextPrinter(&template, speed, NULL);
} }
@@ -1140,6 +1140,6 @@ static u8 ItemPc_GetSubwindow(u8 idx)
static void ItemPc_PrintOnWindow5WithContinueTask(u8 taskId, const u8 * str, TaskFunc taskFunc) static void ItemPc_PrintOnWindow5WithContinueTask(u8 taskId, const u8 * str, TaskFunc taskFunc)
{ {
DisplayMessageAndContinueTask(taskId, 5, 0x3AC, 0x0B, FONT_2, GetTextSpeedSetting(), str, taskFunc); DisplayMessageAndContinueTask(taskId, 5, 0x3AC, 0x0B, FONT_NORMAL, GetTextSpeedSetting(), str, taskFunc);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
} }
src/item_use.c
+21 -21
View File
@@ -190,7 +190,7 @@ static void DisplayItemMessageInCurrentContext(u8 taskId, bool8 inField, u8 font
static void PrintNotTheTimeToUseThat(u8 taskId, bool8 inField) static void PrintNotTheTimeToUseThat(u8 taskId, bool8 inField)
{ {
DisplayItemMessageInCurrentContext(taskId, inField, FONT_4, gText_OakForbidsUseOfItemHere); DisplayItemMessageInCurrentContext(taskId, inField, FONT_MALE, gText_OakForbidsUseOfItemHere);
} }
static void Task_ItemUse_CloseMessageBoxAndReturnToField(u8 taskId) static void Task_ItemUse_CloseMessageBoxAndReturnToField(u8 taskId)
@@ -263,7 +263,7 @@ void FieldUseFunc_Bike(u8 taskId)
|| MetatileBehavior_IsHorizontalRail(behavior) == TRUE || MetatileBehavior_IsHorizontalRail(behavior) == TRUE
|| MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE
|| MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE) || MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE)
DisplayItemMessageInCurrentContext(taskId, gTasks[taskId].data[3], FONT_2, gText_CantDismountBike); DisplayItemMessageInCurrentContext(taskId, gTasks[taskId].data[3], FONT_NORMAL, gText_CantDismountBike);
else if (Overworld_IsBikingAllowed() == TRUE && !IsBikingDisallowedByPlayer()) else if (Overworld_IsBikingAllowed() == TRUE && !IsBikingDisallowedByPlayer())
{ {
sItemUseOnFieldCB = ItemUseOnFieldCB_Bicycle; sItemUseOnFieldCB = ItemUseOnFieldCB_Bicycle;
@@ -340,9 +340,9 @@ void FieldUseFunc_CoinCase(u8 taskId)
StringExpandPlaceholders(gStringVar4, gText_CoinCase); StringExpandPlaceholders(gStringVar4, gText_CoinCase);
ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF); ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF);
if (gTasks[taskId].data[3] == 0) if (gTasks[taskId].data[3] == 0)
DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_ReturnToBagFromContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gStringVar4, Task_ReturnToBagFromContextMenu);
else else
DisplayItemMessageOnField(taskId, FONT_2, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField); DisplayItemMessageOnField(taskId, FONT_NORMAL, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField);
} }
void FieldUseFunc_PowderJar(u8 taskId) void FieldUseFunc_PowderJar(u8 taskId)
@@ -351,9 +351,9 @@ void FieldUseFunc_PowderJar(u8 taskId)
StringExpandPlaceholders(gStringVar4, gText_PowderQty); StringExpandPlaceholders(gStringVar4, gText_PowderQty);
ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF); ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF);
if (gTasks[taskId].data[3] == 0) if (gTasks[taskId].data[3] == 0)
DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_ReturnToBagFromContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gStringVar4, Task_ReturnToBagFromContextMenu);
else else
DisplayItemMessageOnField(taskId, FONT_2, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField); DisplayItemMessageOnField(taskId, FONT_NORMAL, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField);
} }
void FieldUseFunc_PokeFlute(u8 taskId) void FieldUseFunc_PokeFlute(u8 taskId)
@@ -371,16 +371,16 @@ void FieldUseFunc_PokeFlute(u8 taskId)
{ {
ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF); ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF);
if (gTasks[taskId].data[3] == 0) if (gTasks[taskId].data[3] == 0)
DisplayItemMessageInBag(taskId, FONT_2, gText_PlayedPokeFlute, Task_PlayPokeFlute); DisplayItemMessageInBag(taskId, FONT_NORMAL, gText_PlayedPokeFlute, Task_PlayPokeFlute);
else else
DisplayItemMessageOnField(taskId, FONT_2, gText_PlayedPokeFlute, Task_PlayPokeFlute); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_PlayedPokeFlute, Task_PlayPokeFlute);
} }
else else
{ {
if (gTasks[taskId].data[3] == 0) if (gTasks[taskId].data[3] == 0)
DisplayItemMessageInBag(taskId, FONT_2, gText_PlayedPokeFluteCatchy, Task_ReturnToBagFromContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gText_PlayedPokeFluteCatchy, Task_ReturnToBagFromContextMenu);
else else
DisplayItemMessageOnField(taskId, FONT_2, gText_PlayedPokeFluteCatchy, Task_ItemUse_CloseMessageBoxAndReturnToField); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_PlayedPokeFluteCatchy, Task_ItemUse_CloseMessageBoxAndReturnToField);
} }
} }
@@ -395,9 +395,9 @@ static void Task_DisplayPokeFluteMessage(u8 taskId)
if (WaitFanfare(FALSE)) if (WaitFanfare(FALSE))
{ {
if (gTasks[taskId].data[3] == 0) if (gTasks[taskId].data[3] == 0)
DisplayItemMessageInBag(taskId, FONT_2, gText_PokeFluteAwakenedMon, Task_ReturnToBagFromContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gText_PokeFluteAwakenedMon, Task_ReturnToBagFromContextMenu);
else else
DisplayItemMessageOnField(taskId, FONT_2, gText_PokeFluteAwakenedMon, Task_ItemUse_CloseMessageBoxAndReturnToField); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_PokeFluteAwakenedMon, Task_ItemUse_CloseMessageBoxAndReturnToField);
} }
} }
@@ -556,7 +556,7 @@ void FieldUseFunc_Repel(u8 taskId)
} }
else else
// An earlier repel is still in effect // An earlier repel is still in effect
DisplayItemMessageInBag(taskId, FONT_2, gText_RepelEffectsLingered, Task_ReturnToBagFromContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gText_RepelEffectsLingered, Task_ReturnToBagFromContextMenu);
} }
static void Task_UseRepel(u8 taskId) static void Task_UseRepel(u8 taskId)
@@ -566,7 +566,7 @@ static void Task_UseRepel(u8 taskId)
ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF); ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF);
VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gSpecialVar_ItemId)); VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gSpecialVar_ItemId));
RemoveUsedItem(); RemoveUsedItem();
DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_ReturnToBagFromContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gStringVar4, Task_ReturnToBagFromContextMenu);
} }
} }
@@ -607,7 +607,7 @@ static void Task_UsedBlackWhiteFlute(u8 taskId)
if (++gTasks[taskId].data[8] > 7) if (++gTasks[taskId].data[8] > 7)
{ {
PlaySE(SE_GLASS_FLUTE); PlaySE(SE_GLASS_FLUTE);
DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_ReturnToBagFromContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gStringVar4, Task_ReturnToBagFromContextMenu);
} }
} }
@@ -636,7 +636,7 @@ static void ItemUseOnFieldCB_EscapeRope(u8 taskId)
Overworld_ResetStateAfterDigEscRope(); Overworld_ResetStateAfterDigEscRope();
RemoveUsedItem(); RemoveUsedItem();
gTasks[taskId].data[0] = 0; gTasks[taskId].data[0] = 0;
DisplayItemMessageOnField(taskId, FONT_2, gStringVar4, Task_UseDigEscapeRopeOnField); DisplayItemMessageOnField(taskId, FONT_NORMAL, gStringVar4, Task_UseDigEscapeRopeOnField);
} }
void Task_UseDigEscapeRopeOnField(u8 taskId) void Task_UseDigEscapeRopeOnField(u8 taskId)
@@ -743,7 +743,7 @@ void BattleUseFunc_PokeBallEtc(u8 taskId)
ItemMenu_StartFadeToExitCallback(taskId); ItemMenu_StartFadeToExitCallback(taskId);
} }
else else
DisplayItemMessageInBag(taskId, FONT_2, gText_BoxFull, Task_ReturnToBagFromContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gText_BoxFull, Task_ReturnToBagFromContextMenu);
} }
void BattleUseFunc_PokeFlute(u8 taskId) void BattleUseFunc_PokeFlute(u8 taskId)
@@ -755,7 +755,7 @@ void BattleUseFunc_PokeFlute(u8 taskId)
void BattleUseFunc_StatBooster(u8 taskId) void BattleUseFunc_StatBooster(u8 taskId)
{ {
if (ExecuteTableBasedItemEffect(&gPlayerParty[gBattlerPartyIndexes[gBattlerInMenuId]], gSpecialVar_ItemId, gBattlerPartyIndexes[gBattlerInMenuId], 0)) if (ExecuteTableBasedItemEffect(&gPlayerParty[gBattlerPartyIndexes[gBattlerInMenuId]], gSpecialVar_ItemId, gBattlerPartyIndexes[gBattlerInMenuId], 0))
DisplayItemMessageInBag(taskId, FONT_2, gText_WontHaveEffect, Task_ReturnToBagFromContextMenu); DisplayItemMessageInBag(taskId, FONT_NORMAL, gText_WontHaveEffect, Task_ReturnToBagFromContextMenu);
else else
{ {
gTasks[taskId].data[8] = 0; gTasks[taskId].data[8] = 0;
@@ -772,7 +772,7 @@ static void Task_BattleUse_StatBooster_DelayAndPrint(u8 taskId)
u16 itemId = gSpecialVar_ItemId; u16 itemId = gSpecialVar_ItemId;
PlaySE(SE_USE_ITEM); PlaySE(SE_USE_ITEM);
RemoveBagItem(itemId, 1); RemoveBagItem(itemId, 1);
DisplayItemMessageInBag(taskId, FONT_2, Battle_PrintStatBoosterEffectMessage(itemId), Task_BattleUse_StatBooster_WaitButton_ReturnToBattle); DisplayItemMessageInBag(taskId, FONT_NORMAL, Battle_PrintStatBoosterEffectMessage(itemId), Task_BattleUse_StatBooster_WaitButton_ReturnToBattle);
} }
} }
@@ -824,7 +824,7 @@ void BattleUseFunc_PokeDoll(u8 taskId)
{ {
RemoveUsedItem(); RemoveUsedItem();
ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, 0, gSpecialVar_ItemId, 0xFFFF); ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, 0, gSpecialVar_ItemId, 0xFFFF);
DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, ItemMenu_StartFadeToExitCallback); DisplayItemMessageInBag(taskId, FONT_NORMAL, gStringVar4, ItemMenu_StartFadeToExitCallback);
} }
else else
PrintNotTheTimeToUseThat(taskId, 0); PrintNotTheTimeToUseThat(taskId, 0);
@@ -904,7 +904,7 @@ void FieldUseFunc_OakStopsYou(u8 taskId)
if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH) if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH)
{ {
StringExpandPlaceholders(gStringVar4, gText_OakForbidsUseOfItemHere); StringExpandPlaceholders(gStringVar4, gText_OakForbidsUseOfItemHere);
DisplayItemMessageInBerryPouch(taskId, FONT_4, gStringVar4, Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu); DisplayItemMessageInBerryPouch(taskId, FONT_MALE, gStringVar4, Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu);
} }
else else
PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]); PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]);
src/itemfinder.c
+3 -3
View File
@@ -143,7 +143,7 @@ void ItemUseOnFieldCB_Itemfinder(u8 taskId)
} }
else else
{ {
DisplayItemMessageOnField(taskId, FONT_2, gText_NopeTheresNoResponse, Task_NoResponse_CleanUp); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_NopeTheresNoResponse, Task_NoResponse_CleanUp);
} }
} }
@@ -479,7 +479,7 @@ static u8 GetPlayerDirectionTowardsHiddenItem(s16 itemX, s16 itemY)
static void Task_ItemfinderResponsePrintMessage(u8 taskId) static void Task_ItemfinderResponsePrintMessage(u8 taskId)
{ {
DisplayItemMessageOnField(taskId, FONT_2, gText_ItemfinderResponding, Task_ItemfinderResponseCleanUp); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_ItemfinderResponding, Task_ItemfinderResponseCleanUp);
} }
static void Task_ItemfinderResponseCleanUp(u8 taskId) static void Task_ItemfinderResponseCleanUp(u8 taskId)
@@ -493,7 +493,7 @@ static void Task_ItemfinderResponseCleanUp(u8 taskId)
static void Task_ItemfinderUnderfootPrintMessage(u8 taskId) static void Task_ItemfinderUnderfootPrintMessage(u8 taskId)
{ {
DisplayItemMessageOnField(taskId, FONT_2, gText_ItemfinderShakingWildly, Task_ItemfinderUnderfootDigUpItem); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_ItemfinderShakingWildly, Task_ItemfinderUnderfootDigUpItem);
} }
static void Task_ItemfinderUnderfootDigUpItem(u8 taskId) static void Task_ItemfinderUnderfootDigUpItem(u8 taskId)
src/learn_move.c
+6 -6
View File
@@ -353,7 +353,7 @@ static const struct ListMenuTemplate sMoveRelearnerListMenuTemplate = {
.lettersSpacing = 1, .lettersSpacing = 1,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = 0, .scrollMultiple = 0,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0, .cursorKind = 0,
}; };
@@ -506,7 +506,7 @@ static void MoveRelearnerStateMachine(void)
MoveRelearnerMenuHandleInput(); MoveRelearnerMenuHandleInput();
break; break;
case MENU_STATE_PRINT_TEACH_MOVE_PROMPT: case MENU_STATE_PRINT_TEACH_MOVE_PROMPT:
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_3, 0, 2, 0x001, 0xE, 0); CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 0xE, 0);
sMoveRelearner->state++; sMoveRelearner->state++;
break; break;
case MENU_STATE_TEACH_MOVE_CONFIRM : case MENU_STATE_TEACH_MOVE_CONFIRM :
@@ -531,7 +531,7 @@ static void MoveRelearnerStateMachine(void)
} }
break; break;
case MENU_STATE_PRINT_GIVE_UP_PROMPT: case MENU_STATE_PRINT_GIVE_UP_PROMPT:
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_3, 0, 2, 0x001, 0xE, 0); CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 0xE, 0);
sMoveRelearner->state++; sMoveRelearner->state++;
break; break;
case MENU_STATE_GIVE_UP_CONFIRM: case MENU_STATE_GIVE_UP_CONFIRM:
@@ -552,7 +552,7 @@ static void MoveRelearnerStateMachine(void)
sMoveRelearner->state++; sMoveRelearner->state++;
break; break;
case MENU_STATE_WAIT_FOR_TRYING_TO_LEARN: case MENU_STATE_WAIT_FOR_TRYING_TO_LEARN:
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_3, 0, 2, 0x001, 0xE, 0); CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 0xE, 0);
sMoveRelearner->state = 18; sMoveRelearner->state = 18;
break; break;
case MENU_STATE_CONFIRM_DELETE_OLD_MOVE: case MENU_STATE_CONFIRM_DELETE_OLD_MOVE:
@@ -573,7 +573,7 @@ static void MoveRelearnerStateMachine(void)
sMoveRelearner->state++; sMoveRelearner->state++;
break; break;
case MENU_STATE_WAIT_FOR_STOP_TEACHING: case MENU_STATE_WAIT_FOR_STOP_TEACHING:
CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_3, 0, 2, 0x001, 0xE, 0); CreateYesNoMenu(&sMoveRelearnerYesNoMenuTemplate, FONT_NORMAL_COPY_2, 0, 2, 0x001, 0xE, 0);
sMoveRelearner->state = 26; sMoveRelearner->state = 26;
break; break;
case MENU_STATE_CONFIRM_STOP_TEACHING: case MENU_STATE_CONFIRM_STOP_TEACHING:
@@ -928,5 +928,5 @@ static void PrintTextOnWindow(u8 windowId, const u8 *str, u8 x, u8 y, s32 speed,
} }
if (colorIdx != 1) if (colorIdx != 1)
FillWindowPixelBuffer(windowId, PIXEL_FILL(sMoveRelearner->textColor[0])); FillWindowPixelBuffer(windowId, PIXEL_FILL(sMoveRelearner->textColor[0]));
AddTextPrinterParameterized4(windowId, FONT_3, x, y, letterSpacing, lineSpacing, sMoveRelearner->textColor, speed, str); AddTextPrinterParameterized4(windowId, FONT_NORMAL_COPY_2, x, y, letterSpacing, lineSpacing, sMoveRelearner->textColor, speed, str);
} }
src/link.c
+5 -5
View File
@@ -1428,8 +1428,8 @@ static void ErrorMsg_MoveCloserToPartner(void)
LoadPalette(sWirelessLinkDisplayPal, 0, 0x20); LoadPalette(sWirelessLinkDisplayPal, 0, 0x20);
FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(0, PIXEL_FILL(0));
FillWindowPixelBuffer(2, PIXEL_FILL(0)); FillWindowPixelBuffer(2, PIXEL_FILL(0));
AddTextPrinterParameterized3(0, FONT_3, 2, 5, sLinkErrorTextColor, 0, gText_CommErrorEllipsis); AddTextPrinterParameterized3(0, FONT_NORMAL_COPY_2, 2, 5, sLinkErrorTextColor, 0, gText_CommErrorEllipsis);
AddTextPrinterParameterized3(2, FONT_3, 2, 2, sLinkErrorTextColor, 0, gText_MoveCloserToLinkPartner); AddTextPrinterParameterized3(2, FONT_NORMAL_COPY_2, 2, 2, sLinkErrorTextColor, 0, gText_MoveCloserToLinkPartner);
PutWindowTilemap(0); PutWindowTilemap(0);
PutWindowTilemap(2); PutWindowTilemap(2);
CopyWindowToVram(0, COPYWIN_NONE); // Does nothing CopyWindowToVram(0, COPYWIN_NONE); // Does nothing
@@ -1442,7 +1442,7 @@ static void ErrorMsg_CheckConnections(void)
{ {
FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(1, PIXEL_FILL(0));
FillWindowPixelBuffer(2, PIXEL_FILL(0)); FillWindowPixelBuffer(2, PIXEL_FILL(0));
AddTextPrinterParameterized3(1, FONT_3, 2, 0, sLinkErrorTextColor, 0, gText_CommErrorCheckConnections); AddTextPrinterParameterized3(1, FONT_NORMAL_COPY_2, 2, 0, sLinkErrorTextColor, 0, gText_CommErrorCheckConnections);
PutWindowTilemap(1); PutWindowTilemap(1);
PutWindowTilemap(2); PutWindowTilemap(2);
CopyWindowToVram(1, COPYWIN_NONE); // Does nothing CopyWindowToVram(1, COPYWIN_NONE); // Does nothing
@@ -1473,9 +1473,9 @@ static void CB2_PrintErrorMessage(void)
break; break;
case 130: case 130:
if (gWirelessCommType == 2) if (gWirelessCommType == 2)
AddTextPrinterParameterized3(0, FONT_3, 2, 20, sLinkErrorTextColor, 0, gText_ABtnTitleScreen); AddTextPrinterParameterized3(0, FONT_NORMAL_COPY_2, 2, 20, sLinkErrorTextColor, 0, gText_ABtnTitleScreen);
else if (gWirelessCommType == 1) else if (gWirelessCommType == 1)
AddTextPrinterParameterized3(0, FONT_3, 2, 20, sLinkErrorTextColor, 0, gText_ABtnRegistrationCounter); AddTextPrinterParameterized3(0, FONT_NORMAL_COPY_2, 2, 20, sLinkErrorTextColor, 0, gText_ABtnRegistrationCounter);
break; break;
} }
if (gMain.state == 160) if (gMain.state == 160)
src/mail.c
+4 -4
View File
@@ -669,13 +669,13 @@ static void AddMailMessagePrinters(void)
{ {
if (sMailViewResources->messageLinesBuffer[i][0] != EOS && sMailViewResources->messageLinesBuffer[i][0] != CHAR_SPACE) if (sMailViewResources->messageLinesBuffer[i][0] != EOS && sMailViewResources->messageLinesBuffer[i][0] != CHAR_SPACE)
{ {
AddTextPrinterParameterized3(0, FONT_1, sMailViewResources->messageLayout->linesLayout[i].lineXoffset + sMailViewResources->messageLayout->messageLeft, y + sMailViewResources->messageLayout->messageTop, sTextColor, 0, sMailViewResources->messageLinesBuffer[i]); AddTextPrinterParameterized3(0, FONT_NORMAL_COPY_1, sMailViewResources->messageLayout->linesLayout[i].lineXoffset + sMailViewResources->messageLayout->messageLeft, y + sMailViewResources->messageLayout->messageTop, sTextColor, 0, sMailViewResources->messageLinesBuffer[i]);
y += sMailViewResources->messageLayout->linesLayout[i].lineHeight; y += sMailViewResources->messageLayout->linesLayout[i].lineHeight;
} }
} }
width = GetStringWidth(FONT_1, gText_From, 0); width = GetStringWidth(FONT_NORMAL_COPY_1, gText_From, 0);
AddTextPrinterParameterized3(1, FONT_1, sMailViewResources->nameX, sMailViewResources->messageLayout->nameY, sTextColor, 0, gText_From); AddTextPrinterParameterized3(1, FONT_NORMAL_COPY_1, sMailViewResources->nameX, sMailViewResources->messageLayout->nameY, sTextColor, 0, gText_From);
AddTextPrinterParameterized3(1, FONT_1, sMailViewResources->nameX + width, sMailViewResources->messageLayout->nameY, sTextColor, 0, sMailViewResources->authorNameBuffer); AddTextPrinterParameterized3(1, FONT_NORMAL_COPY_1, sMailViewResources->nameX + width, sMailViewResources->messageLayout->nameY, sTextColor, 0, sMailViewResources->authorNameBuffer);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
CopyWindowToVram(1, COPYWIN_FULL); CopyWindowToVram(1, COPYWIN_FULL);
} }
src/mailbox_pc.c
+3 -3
View File
@@ -87,7 +87,7 @@ static void ItemPrintFunc(u8 windowId, u32 itemId, u8 y)
StringCopy(strbuf, gSaveBlock1Ptr->mail[itemId + PARTY_SIZE].playerName); StringCopy(strbuf, gSaveBlock1Ptr->mail[itemId + PARTY_SIZE].playerName);
if (StringLength(strbuf) <= 5) if (StringLength(strbuf) <= 5)
ConvertInternationalString(strbuf, LANGUAGE_JAPANESE); ConvertInternationalString(strbuf, LANGUAGE_JAPANESE);
AddTextPrinterParameterized4(windowId, FONT_2, 8, y, 0, 0, sTextColor, -1, strbuf); AddTextPrinterParameterized4(windowId, FONT_NORMAL, 8, y, 0, 0, sTextColor, -1, strbuf);
} }
} }
@@ -106,12 +106,12 @@ u8 MailboxPC_InitListMenu(struct PlayerPCItemPageStruct * playerPcStruct)
gMultiuseListMenuTemplate.totalItems = playerPcStruct->count + 1; gMultiuseListMenuTemplate.totalItems = playerPcStruct->count + 1;
gMultiuseListMenuTemplate.windowId = sWindowIds[1]; gMultiuseListMenuTemplate.windowId = sWindowIds[1];
gMultiuseListMenuTemplate.header_X = 0; gMultiuseListMenuTemplate.header_X = 0;
gMultiuseListMenuTemplate.item_X = GetMenuCursorDimensionByFont(FONT_2, 0); gMultiuseListMenuTemplate.item_X = GetMenuCursorDimensionByFont(FONT_NORMAL, 0);
gMultiuseListMenuTemplate.cursor_X = 0; gMultiuseListMenuTemplate.cursor_X = 0;
gMultiuseListMenuTemplate.lettersSpacing = 0; gMultiuseListMenuTemplate.lettersSpacing = 0;
gMultiuseListMenuTemplate.itemVerticalPadding = 2; gMultiuseListMenuTemplate.itemVerticalPadding = 2;
gMultiuseListMenuTemplate.maxShowed = 8; gMultiuseListMenuTemplate.maxShowed = 8;
gMultiuseListMenuTemplate.fontId = FONT_2; gMultiuseListMenuTemplate.fontId = FONT_NORMAL;
gMultiuseListMenuTemplate.upText_Y = 10; gMultiuseListMenuTemplate.upText_Y = 10;
gMultiuseListMenuTemplate.cursorPal = 2; gMultiuseListMenuTemplate.cursorPal = 2;
gMultiuseListMenuTemplate.fillValue = 1; gMultiuseListMenuTemplate.fillValue = 1;
src/main_menu.c
+15 -15
View File
@@ -349,7 +349,7 @@ static void Task_PrintMainMenuText(u8 taskId)
case MAIN_MENU_NEWGAME: case MAIN_MENU_NEWGAME:
default: default:
FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME_ONLY, PIXEL_FILL(10)); FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME_ONLY, PIXEL_FILL(10));
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME_ONLY, FONT_2, 2, 2, sTextColor1, -1, gText_NewGame); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME_ONLY, FONT_NORMAL, 2, 2, sTextColor1, -1, gText_NewGame);
MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME_ONLY]); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME_ONLY]);
PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME_ONLY); PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME_ONLY);
CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME_ONLY, COPYWIN_FULL); CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME_ONLY, COPYWIN_FULL);
@@ -357,8 +357,8 @@ static void Task_PrintMainMenuText(u8 taskId)
case MAIN_MENU_CONTINUE: case MAIN_MENU_CONTINUE:
FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10)); FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10));
FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME, PIXEL_FILL(10)); FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME, PIXEL_FILL(10));
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 2, sTextColor1, -1, gText_Continue); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_NORMAL, 2, 2, sTextColor1, -1, gText_Continue);
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME, FONT_2, 2, 2, sTextColor1, -1, gText_NewGame); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME, FONT_NORMAL, 2, 2, sTextColor1, -1, gText_NewGame);
PrintContinueStats(); PrintContinueStats();
MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_CONTINUE]); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_CONTINUE]);
MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME]); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME]);
@@ -371,10 +371,10 @@ static void Task_PrintMainMenuText(u8 taskId)
FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10)); FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10));
FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME, PIXEL_FILL(10)); FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME, PIXEL_FILL(10));
FillWindowPixelBuffer(MAIN_MENU_WINDOW_MYSTERYGIFT, PIXEL_FILL(10)); FillWindowPixelBuffer(MAIN_MENU_WINDOW_MYSTERYGIFT, PIXEL_FILL(10));
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 2, sTextColor1, -1, gText_Continue); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_NORMAL, 2, 2, sTextColor1, -1, gText_Continue);
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME, FONT_2, 2, 2, sTextColor1, -1, gText_NewGame); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME, FONT_NORMAL, 2, 2, sTextColor1, -1, gText_NewGame);
gTasks[taskId].tMGErrorType = 1; gTasks[taskId].tMGErrorType = 1;
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_MYSTERYGIFT, FONT_2, 2, 2, sTextColor1, -1, gText_MysteryGift); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_MYSTERYGIFT, FONT_NORMAL, 2, 2, sTextColor1, -1, gText_MysteryGift);
PrintContinueStats(); PrintContinueStats();
MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_CONTINUE]); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_CONTINUE]);
MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME]); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME]);
@@ -600,7 +600,7 @@ static void PrintMessageOnWindow4(const u8 *str)
{ {
FillWindowPixelBuffer(MAIN_MENU_WINDOW_ERROR, PIXEL_FILL(10)); FillWindowPixelBuffer(MAIN_MENU_WINDOW_ERROR, PIXEL_FILL(10));
MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_ERROR]); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_ERROR]);
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_ERROR, FONT_2, 0, 2, sTextColor1, 2, str); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_ERROR, FONT_NORMAL, 0, 2, sTextColor1, 2, str);
PutWindowTilemap(MAIN_MENU_WINDOW_ERROR); PutWindowTilemap(MAIN_MENU_WINDOW_ERROR);
CopyWindowToVram(MAIN_MENU_WINDOW_ERROR, COPYWIN_GFX); CopyWindowToVram(MAIN_MENU_WINDOW_ERROR, COPYWIN_GFX);
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE( 19, 221)); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE( 19, 221));
@@ -620,12 +620,12 @@ static void PrintPlayerName(void)
s32 i; s32 i;
u8 name[PLAYER_NAME_LENGTH + 1]; u8 name[PLAYER_NAME_LENGTH + 1];
u8 *ptr; u8 *ptr;
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 18, sTextColor2, -1, gText_Player); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_NORMAL, 2, 18, sTextColor2, -1, gText_Player);
ptr = name; ptr = name;
for (i = 0; i < PLAYER_NAME_LENGTH; i++) for (i = 0; i < PLAYER_NAME_LENGTH; i++)
*ptr++ = gSaveBlock2Ptr->playerName[i]; *ptr++ = gSaveBlock2Ptr->playerName[i];
*ptr = EOS; *ptr = EOS;
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 62, 18, sTextColor2, -1, name); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_NORMAL, 62, 18, sTextColor2, -1, name);
} }
static void PrintPlayTime(void) static void PrintPlayTime(void)
@@ -633,11 +633,11 @@ static void PrintPlayTime(void)
u8 strbuf[30]; u8 strbuf[30];
u8 *ptr; u8 *ptr;
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 34, sTextColor2, -1, gText_Time); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_NORMAL, 2, 34, sTextColor2, -1, gText_Time);
ptr = ConvertIntToDecimalStringN(strbuf, gSaveBlock2Ptr->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3); ptr = ConvertIntToDecimalStringN(strbuf, gSaveBlock2Ptr->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3);
*ptr++ = CHAR_COLON; *ptr++ = CHAR_COLON;
ConvertIntToDecimalStringN(ptr, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(ptr, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2);
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 62, 34, sTextColor2, -1, strbuf); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_NORMAL, 62, 34, sTextColor2, -1, strbuf);
} }
static void PrintDexCount(void) static void PrintDexCount(void)
@@ -651,10 +651,10 @@ static void PrintDexCount(void)
dexcount = GetNationalPokedexCount(FLAG_GET_CAUGHT); dexcount = GetNationalPokedexCount(FLAG_GET_CAUGHT);
else else
dexcount = GetKantoPokedexCount(FLAG_GET_CAUGHT); dexcount = GetKantoPokedexCount(FLAG_GET_CAUGHT);
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 50, sTextColor2, -1, gText_Pokedex); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_NORMAL, 2, 50, sTextColor2, -1, gText_Pokedex);
ptr = ConvertIntToDecimalStringN(strbuf, dexcount, STR_CONV_MODE_LEFT_ALIGN, 3); ptr = ConvertIntToDecimalStringN(strbuf, dexcount, STR_CONV_MODE_LEFT_ALIGN, 3);
StringAppend(ptr, gTextJPDummy_Hiki); StringAppend(ptr, gTextJPDummy_Hiki);
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 62, 50, sTextColor2, -1, strbuf); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_NORMAL, 62, 50, sTextColor2, -1, strbuf);
} }
} }
@@ -669,10 +669,10 @@ static void PrintBadgeCount(void)
if (FlagGet(flagId)) if (FlagGet(flagId))
nbadges++; nbadges++;
} }
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 66, sTextColor2, -1, gText_Badges); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_NORMAL, 2, 66, sTextColor2, -1, gText_Badges);
ptr = ConvertIntToDecimalStringN(strbuf, nbadges, STR_CONV_MODE_LEADING_ZEROS, 1); ptr = ConvertIntToDecimalStringN(strbuf, nbadges, STR_CONV_MODE_LEADING_ZEROS, 1);
StringAppend(ptr, gTextJPDummy_Ko); StringAppend(ptr, gTextJPDummy_Ko);
AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 62, 66, sTextColor2, -1, strbuf); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_NORMAL, 62, 66, sTextColor2, -1, strbuf);
} }
static void LoadUserFrameToBg(u8 bgId) static void LoadUserFrameToBg(u8 bgId)
src/map_name_popup.c
+2 -2
View File
@@ -197,9 +197,9 @@ static void MapNamePopupPrintMapNameOnWindow(u16 windowId)
ptr = MapNamePopupAppendFloorNum(ptr, gMapHeader.floorNum); ptr = MapNamePopupAppendFloorNum(ptr, gMapHeader.floorNum);
maxWidth = gMapHeader.floorNum != 0x7F ? 152 : 176; maxWidth = gMapHeader.floorNum != 0x7F ? 152 : 176;
} }
xpos = (maxWidth - GetStringWidth(FONT_2, mapName, -1)) / 2; xpos = (maxWidth - GetStringWidth(FONT_NORMAL, mapName, -1)) / 2;
FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
AddTextPrinterParameterized(windowId, FONT_2, mapName, xpos, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, mapName, xpos, 2, TEXT_SKIP_DRAW, NULL);
} }
static u8 *MapNamePopupAppendFloorNum(u8 *dest, s8 floorNum) static u8 *MapNamePopupAppendFloorNum(u8 *dest, s8 floorNum)
src/map_preview_screen.c
+2 -2
View File
@@ -457,8 +457,8 @@ u16 MapPreview_CreateMapNameWindow(u8 mapsec)
color[1] = TEXT_COLOR_RED; // Access violation color[1] = TEXT_COLOR_RED; // Access violation
color[2] = TEXT_COLOR_LIGHT_GRAY; // Access violation color[2] = TEXT_COLOR_LIGHT_GRAY; // Access violation
GetMapName(gStringVar4, mapsec, 0); GetMapName(gStringVar4, mapsec, 0);
xctr = 104 - GetStringWidth(FONT_2, gStringVar4, 0); xctr = 104 - GetStringWidth(FONT_NORMAL, gStringVar4, 0);
AddTextPrinterParameterized4(windowId, FONT_2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4); AddTextPrinterParameterized4(windowId, FONT_NORMAL, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4);
return windowId; return windowId;
} }
src/menu.c
+5 -5
View File
@@ -192,8 +192,8 @@ void TopBarWindowPrintString(const u8 *string, u8 unused, bool8 copyToVram)
{ {
PutWindowTilemap(sTopBarWindowId); PutWindowTilemap(sTopBarWindowId);
FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(15)); FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(15));
width = GetStringWidth(FONT_0, string, 0); width = GetStringWidth(FONT_SMALL, string, 0);
AddTextPrinterParameterized3(sTopBarWindowId, FONT_0, -20 - width, 1, sTopBarWindowTextColors, 0, string); AddTextPrinterParameterized3(sTopBarWindowId, FONT_SMALL, -20 - width, 1, sTopBarWindowTextColors, 0, string);
if (copyToVram) if (copyToVram)
CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL); CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL);
} }
@@ -223,10 +223,10 @@ void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgCo
FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(15)); FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(15));
if (string2) if (string2)
{ {
width = GetStringWidth(FONT_0, string2, 0); width = GetStringWidth(FONT_SMALL, string2, 0);
AddTextPrinterParameterized3(sTopBarWindowId, FONT_0, -20 - width, 1, color, 0, string2); AddTextPrinterParameterized3(sTopBarWindowId, FONT_SMALL, -20 - width, 1, color, 0, string2);
} }
AddTextPrinterParameterized4(sTopBarWindowId, FONT_1, 4, 1, 0, 0, color, 0, string); AddTextPrinterParameterized4(sTopBarWindowId, FONT_NORMAL_COPY_1, 4, 1, 0, 0, color, 0, string);
if (copyToVram) if (copyToVram)
CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL); CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL);
} }
src/menu2.c
+2 -2
View File
@@ -500,11 +500,11 @@ void Menu_PrintFormatIntlPlayerName(u8 windowId, const u8 * src, u16 x, u16 y)
StringExpandPlaceholders(gStringVar4, src); StringExpandPlaceholders(gStringVar4, src);
if (i != 5) if (i != 5)
{ {
AddTextPrinterParameterized(windowId, FONT_2, gStringVar4, x, y, 0xFF, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, x, y, 0xFF, NULL);
} }
else else
{ {
AddTextPrinterParameterized5(windowId, FONT_2, gStringVar4, x, y, 0xFF, NULL, 0, 0); AddTextPrinterParameterized5(windowId, FONT_NORMAL, gStringVar4, x, y, 0xFF, NULL, 0, 0);
} }
} }
src/menu_helpers.c
+2 -2
View File
@@ -237,7 +237,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *quantity_p, u16 qmax)
u8 GetDialogBoxFontId(void) u8 GetDialogBoxFontId(void)
{ {
if (ContextNpcGetTextColor() == NPC_TEXT_COLOR_MALE) if (ContextNpcGetTextColor() == NPC_TEXT_COLOR_MALE)
return FONT_4; return FONT_MALE;
else else
return FONT_5; return FONT_FEMALE;
} }
src/money.c
+3 -3
View File
@@ -84,7 +84,7 @@ void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed)
*(txtPtr++) = 0; *(txtPtr++) = 0;
StringExpandPlaceholders(txtPtr, gText_PokedollarVar1); StringExpandPlaceholders(txtPtr, gText_PokedollarVar1);
AddTextPrinterParameterized(windowId, FONT_0, gStringVar4, 64 - GetStringWidth(FONT_0, gStringVar4, 0), 0xC, speed, NULL); AddTextPrinterParameterized(windowId, FONT_SMALL, gStringVar4, 64 - GetStringWidth(FONT_SMALL, gStringVar4, 0), 0xC, speed, NULL);
} }
void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed) void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed)
@@ -101,13 +101,13 @@ void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed)
*(txtPtr++) = 0; *(txtPtr++) = 0;
StringExpandPlaceholders(txtPtr, gText_PokedollarVar1); StringExpandPlaceholders(txtPtr, gText_PokedollarVar1);
AddTextPrinterParameterized(windowId, FONT_0, gStringVar4, x, y, speed, NULL); AddTextPrinterParameterized(windowId, FONT_SMALL, gStringVar4, x, y, speed, NULL);
} }
void PrintMoneyAmountInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount) void PrintMoneyAmountInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount)
{ {
DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, tileStart, pallete); DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, tileStart, pallete);
AddTextPrinterParameterized(windowId, FONT_2, gText_TrainerCardMoney, 0, 0, 0xFF, 0); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_TrainerCardMoney, 0, 0, 0xFF, 0);
PrintMoneyAmountInMoneyBox(windowId, amount, 0); PrintMoneyAmountInMoneyBox(windowId, amount, 0);
} }
src/mystery_gift_menu.c
+15 -15
View File
@@ -221,7 +221,7 @@ const struct ListMenuTemplate sListMenuTemplate_ThreeOptions = {
.lettersSpacing = 0, .lettersSpacing = 0,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = 0, .scrollMultiple = 0,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -266,7 +266,7 @@ const struct ListMenuTemplate sListMenu_ReceiveSendToss = {
.lettersSpacing = 0, .lettersSpacing = 0,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = 0, .scrollMultiple = 0,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -287,7 +287,7 @@ const struct ListMenuTemplate sListMenu_ReceiveToss = {
.lettersSpacing = 0, .lettersSpacing = 0,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = 0, .scrollMultiple = 0,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -308,7 +308,7 @@ const struct ListMenuTemplate sListMenu_ReceiveSend = {
.lettersSpacing = 0, .lettersSpacing = 0,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = 0, .scrollMultiple = 0,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -329,7 +329,7 @@ const struct ListMenuTemplate sListMenu_Receive = {
.lettersSpacing = 0, .lettersSpacing = 0,
.itemVerticalPadding = 2, .itemVerticalPadding = 2,
.scrollMultiple = 0, .scrollMultiple = 0,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0 .cursorKind = 0
}; };
@@ -469,14 +469,14 @@ void PrintMysteryGiftOrEReaderTopMenu(bool8 mg_or_ereader, bool32 usePickOkCance
if (!mg_or_ereader) if (!mg_or_ereader)
{ {
src = usePickOkCancel == TRUE ? gText_PickOKExit : gText_PickOKCancel; src = usePickOkCancel == TRUE ? gText_PickOKExit : gText_PickOKCancel;
AddTextPrinterParameterized4(0, FONT_2, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gText_MysteryGift2); AddTextPrinterParameterized4(0, FONT_NORMAL, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gText_MysteryGift2);
width = 222 - GetStringWidth(FONT_0, src, 0); width = 222 - GetStringWidth(FONT_SMALL, src, 0);
AddTextPrinterParameterized4(0, FONT_0, width, 2, 0, 0, sMG_Ereader_TextColor_1, 0, src); AddTextPrinterParameterized4(0, FONT_SMALL, width, 2, 0, 0, sMG_Ereader_TextColor_1, 0, src);
} }
else else
{ {
AddTextPrinterParameterized4(0, FONT_2, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_MysteryGift); AddTextPrinterParameterized4(0, FONT_NORMAL, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_MysteryGift);
AddTextPrinterParameterized4(0, FONT_0, 0x78, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_DecideStop); AddTextPrinterParameterized4(0, FONT_SMALL, 0x78, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_DecideStop);
} }
CopyWindowToVram(0, COPYWIN_GFX); CopyWindowToVram(0, COPYWIN_GFX);
PutWindowTilemap(0); PutWindowTilemap(0);
@@ -527,7 +527,7 @@ void AddTextPrinterToWindow1(const u8 *str)
{ {
StringExpandPlaceholders(gStringVar4, str); StringExpandPlaceholders(gStringVar4, str);
FillWindowPixelBuffer(1, 0x11); FillWindowPixelBuffer(1, 0x11);
AddTextPrinterParameterized4(1, FONT_2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4); AddTextPrinterParameterized4(1, FONT_NORMAL, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4);
DrawTextBorderOuter(1, 0x001, 0xF); DrawTextBorderOuter(1, 0x001, 0xF);
PutWindowTilemap(1); PutWindowTilemap(1);
CopyWindowToVram(1, COPYWIN_FULL); CopyWindowToVram(1, COPYWIN_FULL);
@@ -634,7 +634,7 @@ u32 MysteryGift_HandleThreeOptionMenu(u8 * unused0, u16 * unused1, u8 whichMenu)
width = 0; width = 0;
for (i = 0; i < listMenuTemplate.totalItems; i++) for (i = 0; i < listMenuTemplate.totalItems; i++)
{ {
u32 curWidth = GetStringWidth(FONT_2, listMenuTemplate.items[i].label, listMenuTemplate.lettersSpacing); u32 curWidth = GetStringWidth(FONT_NORMAL, listMenuTemplate.items[i].label, listMenuTemplate.lettersSpacing);
if (curWidth > width) if (curWidth > width)
width = curWidth; width = curWidth;
} }
@@ -668,7 +668,7 @@ s8 DoMysteryGiftYesNo(u8 * textState, u16 * windowId, bool8 yesNoBoxPlacement, c
*windowId = AddWindow(&sWindowTemplate_PromptYesOrNo_Width20); *windowId = AddWindow(&sWindowTemplate_PromptYesOrNo_Width20);
} }
FillWindowPixelBuffer(*windowId, 0x11); FillWindowPixelBuffer(*windowId, 0x11);
AddTextPrinterParameterized4(*windowId, FONT_2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4); AddTextPrinterParameterized4(*windowId, FONT_NORMAL, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4);
DrawTextBorderOuter(*windowId, 0x001, 0x0F); DrawTextBorderOuter(*windowId, 0x001, 0x0F);
CopyWindowToVram(*windowId, COPYWIN_GFX); CopyWindowToVram(*windowId, COPYWIN_GFX);
PutWindowTilemap(*windowId); PutWindowTilemap(*windowId);
@@ -684,7 +684,7 @@ s8 DoMysteryGiftYesNo(u8 * textState, u16 * windowId, bool8 yesNoBoxPlacement, c
{ {
windowTemplate.tilemapTop = 15; windowTemplate.tilemapTop = 15;
} }
CreateYesNoMenu(&windowTemplate, FONT_2, 0, 2, 10, 14, 0); CreateYesNoMenu(&windowTemplate, FONT_NORMAL, 0, 2, 10, 14, 0);
(*textState)++; (*textState)++;
break; break;
case 2: case 2:
@@ -729,7 +729,7 @@ s32 HandleMysteryGiftListMenu(u8 * textState, u16 * windowId, bool32 cannotToss,
} }
*windowId = AddWindow(&sMysteryGiftMenuWindowTemplate); *windowId = AddWindow(&sMysteryGiftMenuWindowTemplate);
FillWindowPixelBuffer(*windowId, 0x11); FillWindowPixelBuffer(*windowId, 0x11);
AddTextPrinterParameterized4(*windowId, FONT_2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4); AddTextPrinterParameterized4(*windowId, FONT_NORMAL, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4);
DrawTextBorderOuter(*windowId, 0x001, 0x0F); DrawTextBorderOuter(*windowId, 0x001, 0x0F);
CopyWindowToVram(*windowId, COPYWIN_GFX); CopyWindowToVram(*windowId, COPYWIN_GFX);
PutWindowTilemap(*windowId); PutWindowTilemap(*windowId);
src/mystery_gift_show_card.c
+12 -12
View File
@@ -399,25 +399,25 @@ static void DrawCardWindow(u8 whichWindow)
{ {
// Print card title/subtitle // Print card title/subtitle
s32 x; s32 x;
AddTextPrinterParameterized3(windowId, FONT_3, 0, 1, sTextColorTable[sWonderCardData->gfx->titleTextPal], 0, sWonderCardData->titleText); AddTextPrinterParameterized3(windowId, FONT_NORMAL_COPY_2, 0, 1, sTextColorTable[sWonderCardData->gfx->titleTextPal], 0, sWonderCardData->titleText);
x = 160 - GetStringWidth(FONT_3, sWonderCardData->subtitleText, GetFontAttribute(FONT_3, FONTATTR_LETTER_SPACING)); x = 160 - GetStringWidth(FONT_NORMAL_COPY_2, sWonderCardData->subtitleText, GetFontAttribute(FONT_NORMAL_COPY_2, FONTATTR_LETTER_SPACING));
if (x < 0) if (x < 0)
x = 0; x = 0;
AddTextPrinterParameterized3(windowId, FONT_3, x, 17, sTextColorTable[sWonderCardData->gfx->titleTextPal], 0, sWonderCardData->subtitleText); AddTextPrinterParameterized3(windowId, FONT_NORMAL_COPY_2, x, 17, sTextColorTable[sWonderCardData->gfx->titleTextPal], 0, sWonderCardData->subtitleText);
// Print id number // Print id number
if (sWonderCardData->card.idNumber != 0) if (sWonderCardData->card.idNumber != 0)
AddTextPrinterParameterized3(windowId, FONT_2, 166, 17, sTextColorTable[sWonderCardData->gfx->titleTextPal], 0, sWonderCardData->idNumberText); AddTextPrinterParameterized3(windowId, FONT_NORMAL, 166, 17, sTextColorTable[sWonderCardData->gfx->titleTextPal], 0, sWonderCardData->idNumberText);
break; break;
} }
case WIN_BODY: case WIN_BODY:
// Print body text // Print body text
for (; i < WONDER_CARD_BODY_TEXT_LINES; i++) for (; i < WONDER_CARD_BODY_TEXT_LINES; i++)
AddTextPrinterParameterized3(windowId, FONT_3, 0, 16 * i + 2, sTextColorTable[sWonderCardData->gfx->bodyTextPal], 0, sWonderCardData->bodyText[i]); AddTextPrinterParameterized3(windowId, FONT_NORMAL_COPY_2, 0, 16 * i + 2, sTextColorTable[sWonderCardData->gfx->bodyTextPal], 0, sWonderCardData->bodyText[i]);
break; break;
case WIN_FOOTER: case WIN_FOOTER:
// Print footer line 1 // Print footer line 1
AddTextPrinterParameterized3(windowId, FONT_3, 0, AddTextPrinterParameterized3(windowId, FONT_NORMAL_COPY_2, 0,
sFooterTextOffsets[sWonderCardData->card.type], sFooterTextOffsets[sWonderCardData->card.type],
sTextColorTable[sWonderCardData->gfx->footerTextPal], sTextColorTable[sWonderCardData->gfx->footerTextPal],
0, sWonderCardData->footerLine1Text); 0, sWonderCardData->footerLine1Text);
@@ -427,7 +427,7 @@ static void DrawCardWindow(u8 whichWindow)
{ {
// Print gift text // Print gift text
// Odd that CARD_TYPE_STAMP is not ignored, it has empty text for this // Odd that CARD_TYPE_STAMP is not ignored, it has empty text for this
AddTextPrinterParameterized3(windowId, FONT_3, 0, AddTextPrinterParameterized3(windowId, FONT_NORMAL_COPY_2, 0,
16 + sFooterTextOffsets[sWonderCardData->card.type], 16 + sFooterTextOffsets[sWonderCardData->card.type],
sTextColorTable[sWonderCardData->gfx->footerTextPal], sTextColorTable[sWonderCardData->gfx->footerTextPal],
0, sWonderCardData->footerLine2Text); 0, sWonderCardData->footerLine2Text);
@@ -436,19 +436,19 @@ static void DrawCardWindow(u8 whichWindow)
{ {
s32 x = 0; s32 x = 0;
s32 y = sFooterTextOffsets[sWonderCardData->card.type] + 16; s32 y = sFooterTextOffsets[sWonderCardData->card.type] + 16;
s32 spacing = GetFontAttribute(FONT_3, FONTATTR_LETTER_SPACING); s32 spacing = GetFontAttribute(FONT_NORMAL_COPY_2, FONTATTR_LETTER_SPACING);
for (; i < sWonderCardData->recordIdx; i++) for (; i < sWonderCardData->recordIdx; i++)
{ {
// Print stat text // Print stat text
AddTextPrinterParameterized3(windowId, FONT_3, x, y, sTextColorTable[sWonderCardData->gfx->footerTextPal], 0, sWonderCardData->statTextData[i].statText); AddTextPrinterParameterized3(windowId, FONT_NORMAL_COPY_2, x, y, sTextColorTable[sWonderCardData->gfx->footerTextPal], 0, sWonderCardData->statTextData[i].statText);
if (sWonderCardData->statTextData[i].statNumberText[0] != EOS) if (sWonderCardData->statTextData[i].statNumberText[0] != EOS)
{ {
// Print stat number // Print stat number
x += GetStringWidth(FONT_3, sWonderCardData->statTextData[i].statText, spacing); x += GetStringWidth(FONT_NORMAL_COPY_2, sWonderCardData->statTextData[i].statText, spacing);
AddTextPrinterParameterized3(windowId, FONT_2, x, y, AddTextPrinterParameterized3(windowId, FONT_NORMAL, x, y,
sTextColorTable[sWonderCardData->gfx->footerTextPal], sTextColorTable[sWonderCardData->gfx->footerTextPal],
0, sWonderCardData->statTextData[i].statNumberText); 0, sWonderCardData->statTextData[i].statNumberText);
x += GetStringWidth(FONT_3, sWonderCardData->statTextData[i].statNumberText, spacing) + sWonderCardData->statTextData[i].width; x += GetStringWidth(FONT_NORMAL_COPY_2, sWonderCardData->statTextData[i].statNumberText, spacing) + sWonderCardData->statTextData[i].width;
} }
} }
} }
src/mystery_gift_show_news.c
+3 -3
View File
@@ -360,15 +360,15 @@ static void DrawNewsWindows(void)
FillWindowPixelBuffer(sWonderNewsData->windowIds[WIN_BODY], 0); FillWindowPixelBuffer(sWonderNewsData->windowIds[WIN_BODY], 0);
// Print title text // Print title text
x = (224 - GetStringWidth(FONT_3, sWonderNewsData->titleText, GetFontAttribute(FONT_3, FONTATTR_LETTER_SPACING))) / 2; x = (224 - GetStringWidth(FONT_NORMAL_COPY_2, sWonderNewsData->titleText, GetFontAttribute(FONT_NORMAL_COPY_2, FONTATTR_LETTER_SPACING))) / 2;
if (x < 0) if (x < 0)
x = 0; x = 0;
AddTextPrinterParameterized3(sWonderNewsData->windowIds[WIN_TITLE], FONT_3, x, 6, sTextColorTable[sWonderNewsData->gfx->titleTextPal], 0, sWonderNewsData->titleText); AddTextPrinterParameterized3(sWonderNewsData->windowIds[WIN_TITLE], FONT_NORMAL_COPY_2, x, 6, sTextColorTable[sWonderNewsData->gfx->titleTextPal], 0, sWonderNewsData->titleText);
// Print body text // Print body text
for (; i < WONDER_NEWS_BODY_TEXT_LINES; ++i) for (; i < WONDER_NEWS_BODY_TEXT_LINES; ++i)
{ {
AddTextPrinterParameterized3(sWonderNewsData->windowIds[WIN_BODY], FONT_3, 0, AddTextPrinterParameterized3(sWonderNewsData->windowIds[WIN_BODY], FONT_NORMAL_COPY_2, 0,
16 * i + 2, 16 * i + 2,
sTextColorTable[sWonderNewsData->gfx->bodyTextPal], sTextColorTable[sWonderNewsData->gfx->bodyTextPal],
0, sWonderNewsData->bodyText[i]); 0, sWonderNewsData->bodyText[i]);
src/naming_screen.c
+8 -8
View File
@@ -743,7 +743,7 @@ static void DisplaySentToPCMessage(void)
StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]); StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]);
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
gTextFlags.canABSpeedUpPrint = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
AddTextPrinterParameterized2(0, FONT_2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
} }
@@ -1698,7 +1698,7 @@ static void HandleDpadMovement(struct Task *task)
static void DrawNormalTextEntryBox(void) static void DrawNormalTextEntryBox(void)
{ {
FillWindowPixelBuffer(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], PIXEL_FILL(1)); FillWindowPixelBuffer(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], PIXEL_FILL(1));
AddTextPrinterParameterized(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], FONT_1, sNamingScreen->template->title, 1, 1, 0, NULL); AddTextPrinterParameterized(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], FONT_NORMAL_COPY_1, sNamingScreen->template->title, 1, 1, 0, NULL);
PutWindowTilemap(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX]); PutWindowTilemap(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX]);
} }
@@ -1709,7 +1709,7 @@ static void DrawMonTextEntryBox(void)
StringCopy(buffer, gSpeciesNames[sNamingScreen->monSpecies]); StringCopy(buffer, gSpeciesNames[sNamingScreen->monSpecies]);
StringAppendN(buffer, sNamingScreen->template->title, 15); StringAppendN(buffer, sNamingScreen->template->title, 15);
FillWindowPixelBuffer(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], PIXEL_FILL(1)); FillWindowPixelBuffer(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], PIXEL_FILL(1));
AddTextPrinterParameterized(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], FONT_1, buffer, 1, 1, 0, NULL); AddTextPrinterParameterized(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX], FONT_NORMAL_COPY_1, buffer, 1, 1, 0, NULL);
PutWindowTilemap(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX]); PutWindowTilemap(sNamingScreen->windows[WIN_TEXT_ENTRY_BOX]);
} }
@@ -1762,7 +1762,7 @@ static void DrawGenderIcon(void)
StringCopy(genderSymbol, gText_FemaleSymbol); StringCopy(genderSymbol, gText_FemaleSymbol);
gender = FEMALE; gender = FEMALE;
} }
AddTextPrinterParameterized3(sNamingScreen->windows[2], FONT_2, 0x68, 1, sGenderColors[gender], TEXT_SKIP_DRAW, genderSymbol); AddTextPrinterParameterized3(sNamingScreen->windows[2], FONT_NORMAL, 0x68, 1, sGenderColors[gender], TEXT_SKIP_DRAW, genderSymbol);
} }
} }
@@ -1898,7 +1898,7 @@ static void DrawTextEntry(void)
temp[1] = gExpandedPlaceholder_Empty[0]; temp[1] = gExpandedPlaceholder_Empty[0];
extraWidth = (IsWideLetter(temp[0]) == TRUE) ? 2 : 0; extraWidth = (IsWideLetter(temp[0]) == TRUE) ? 2 : 0;
AddTextPrinterParameterized(sNamingScreen->windows[WIN_TEXT_ENTRY], FONT_2, temp, i * 8 + xpos + extraWidth, 1, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sNamingScreen->windows[WIN_TEXT_ENTRY], FONT_NORMAL, temp, i * 8 + xpos + extraWidth, 1, TEXT_SKIP_DRAW, NULL);
} }
TryDrawGenderIcon(); TryDrawGenderIcon();
@@ -1940,7 +1940,7 @@ static void PrintKeyboardKeys(u8 window, u8 page)
FillWindowPixelBuffer(window, sFillValues[page]); FillWindowPixelBuffer(window, sFillValues[page]);
for (i = 0; i < KBROW_COUNT; i++) for (i = 0; i < KBROW_COUNT; i++)
AddTextPrinterParameterized3(window, FONT_1, 0, i * 16 + 1, sKeyboardTextColors[page], 0, sNamingScreenKeyboardText[page][i]); AddTextPrinterParameterized3(window, FONT_NORMAL_COPY_1, 0, i * 16 + 1, sKeyboardTextColors[page], 0, sNamingScreenKeyboardText[page][i]);
PutWindowTilemap(window); PutWindowTilemap(window);
} }
@@ -1980,10 +1980,10 @@ static void DrawKeyboardPageOnDeck(void)
static void PrintControls(void) static void PrintControls(void)
{ {
const u8 color[3] = { TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY }; const u8 color[3] = { TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY };
int strwidth = GetStringWidth(FONT_0, gText_MoveOkBack, 0); int strwidth = GetStringWidth(FONT_SMALL, gText_MoveOkBack, 0);
FillWindowPixelBuffer(sNamingScreen->windows[WIN_BANNER], PIXEL_FILL(15)); FillWindowPixelBuffer(sNamingScreen->windows[WIN_BANNER], PIXEL_FILL(15));
AddTextPrinterParameterized3(sNamingScreen->windows[WIN_BANNER], FONT_0, DISPLAY_WIDTH - 4 - strwidth, 0, color, 0, gText_MoveOkBack); AddTextPrinterParameterized3(sNamingScreen->windows[WIN_BANNER], FONT_SMALL, DISPLAY_WIDTH - 4 - strwidth, 0, color, 0, gText_MoveOkBack);
PutWindowTilemap(sNamingScreen->windows[WIN_BANNER]); PutWindowTilemap(sNamingScreen->windows[WIN_BANNER]);
CopyWindowToVram(sNamingScreen->windows[WIN_BANNER], COPYWIN_FULL); CopyWindowToVram(sNamingScreen->windows[WIN_BANNER], COPYWIN_FULL);
} }
src/new_menu_helpers.c
+29 -29
View File
@@ -58,8 +58,8 @@ static const struct WindowTemplate sYesNo_WindowTemplate =
static const struct FontInfo gFontInfos[] = static const struct FontInfo gFontInfos[] =
{ {
[FONT_0] = { [FONT_SMALL] = {
.fontFunction = Font0Func, .fontFunction = FontFunc_Small,
.maxLetterWidth = 8, .maxLetterWidth = 8,
.maxLetterHeight = 13, .maxLetterHeight = 13,
.letterSpacing = 0, .letterSpacing = 0,
@@ -68,8 +68,8 @@ static const struct FontInfo gFontInfos[] =
.bgColor = 1, .bgColor = 1,
.shadowColor = 3, .shadowColor = 3,
}, },
[FONT_1] = { [FONT_NORMAL_COPY_1] = {
.fontFunction = Font1Func, .fontFunction = FontFunc_NormalCopy1,
.maxLetterWidth = 8, .maxLetterWidth = 8,
.maxLetterHeight = 14, .maxLetterHeight = 14,
.letterSpacing = 0, .letterSpacing = 0,
@@ -78,8 +78,8 @@ static const struct FontInfo gFontInfos[] =
.bgColor = 1, .bgColor = 1,
.shadowColor = 3, .shadowColor = 3,
}, },
[FONT_2] = { [FONT_NORMAL] = {
.fontFunction = Font2Func, .fontFunction = FontFunc_Normal,
.maxLetterWidth = 10, .maxLetterWidth = 10,
.maxLetterHeight = 14, .maxLetterHeight = 14,
.letterSpacing = 1, .letterSpacing = 1,
@@ -88,8 +88,8 @@ static const struct FontInfo gFontInfos[] =
.bgColor = 1, .bgColor = 1,
.shadowColor = 3, .shadowColor = 3,
}, },
[FONT_3] = { [FONT_NORMAL_COPY_2] = {
.fontFunction = Font3Func, .fontFunction = FontFunc_NormalCopy2,
.maxLetterWidth = 10, .maxLetterWidth = 10,
.maxLetterHeight = 14, .maxLetterHeight = 14,
.letterSpacing = 1, .letterSpacing = 1,
@@ -98,8 +98,8 @@ static const struct FontInfo gFontInfos[] =
.bgColor = 1, .bgColor = 1,
.shadowColor = 3, .shadowColor = 3,
}, },
[FONT_4] = { [FONT_MALE] = {
.fontFunction = Font4Func, .fontFunction = FontFunc_Male,
.maxLetterWidth = 10, .maxLetterWidth = 10,
.maxLetterHeight = 14, .maxLetterHeight = 14,
.letterSpacing = 0, .letterSpacing = 0,
@@ -108,8 +108,8 @@ static const struct FontInfo gFontInfos[] =
.bgColor = 1, .bgColor = 1,
.shadowColor = 3, .shadowColor = 3,
}, },
[FONT_5] = { [FONT_FEMALE] = {
.fontFunction = Font5Func, .fontFunction = FontFunc_Female,
.maxLetterWidth = 10, .maxLetterWidth = 10,
.maxLetterHeight = 14, .maxLetterHeight = 14,
.letterSpacing = 0, .letterSpacing = 0,
@@ -119,7 +119,7 @@ static const struct FontInfo gFontInfos[] =
.shadowColor = 3, .shadowColor = 3,
}, },
[FONT_BRAILLE] = { [FONT_BRAILLE] = {
.fontFunction = Font6Func, .fontFunction = FontFunc_Braille,
.maxLetterWidth = 8, .maxLetterWidth = 8,
.maxLetterHeight = 16, .maxLetterHeight = 16,
.letterSpacing = 0, .letterSpacing = 0,
@@ -128,7 +128,7 @@ static const struct FontInfo gFontInfos[] =
.bgColor = 1, .bgColor = 1,
.shadowColor = 3, .shadowColor = 3,
}, },
[FONT_7] = { [FONT_BOLD] = {
.fontFunction = NULL, .fontFunction = NULL,
.maxLetterWidth = 8, .maxLetterWidth = 8,
.maxLetterHeight = 8, .maxLetterHeight = 8,
@@ -142,14 +142,14 @@ static const struct FontInfo gFontInfos[] =
static const u8 gMenuCursorDimensions[][2] = static const u8 gMenuCursorDimensions[][2] =
{ {
[FONT_0] = { 8, 13 }, [FONT_SMALL] = { 8, 13 },
[FONT_1] = { 8, 14 }, [FONT_NORMAL_COPY_1] = { 8, 14 },
[FONT_2] = { 8, 14 }, [FONT_NORMAL] = { 8, 14 },
[FONT_3] = { 8, 14 }, [FONT_NORMAL_COPY_2] = { 8, 14 },
[FONT_4] = { 8, 14 }, [FONT_MALE] = { 8, 14 },
[FONT_5] = { 8, 14 }, [FONT_FEMALE] = { 8, 14 },
[FONT_BRAILLE] = { 8, 16 }, [FONT_BRAILLE] = { 8, 16 },
[FONT_7] = {} [FONT_BOLD] = {}
}; };
static u16 CopyDecompressedTileDataToVram(u8 bgId, const void *src, u16 size, u16 offset, u8 mode); static u16 CopyDecompressedTileDataToVram(u8 bgId, const void *src, u16 size, u16 offset, u8 mode);
@@ -428,23 +428,23 @@ void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress)
gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress;
color = ContextNpcGetTextColor(); color = ContextNpcGetTextColor();
if (color == NPC_TEXT_COLOR_MALE) if (color == NPC_TEXT_COLOR_MALE)
AddTextPrinterParameterized2(0, FONT_4, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_BLUE, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_MALE, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_BLUE, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
else if (color == NPC_TEXT_COLOR_FEMALE) else if (color == NPC_TEXT_COLOR_FEMALE)
AddTextPrinterParameterized2(0, FONT_5, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_RED, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_FEMALE, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_RED, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
else // NPC_TEXT_COLOR_MON / NPC_TEXT_COLOR_NEUTRAL else // NPC_TEXT_COLOR_MON / NPC_TEXT_COLOR_NEUTRAL
AddTextPrinterParameterized2(0, FONT_2, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress) void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress)
{ {
gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress;
AddTextPrinterParameterized2(0, FONT_2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed) void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed)
{ {
gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress;
AddTextPrinterParameterized2(0, FONT_2, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
void LoadStdWindowFrameGfx(void) void LoadStdWindowFrameGfx(void)
@@ -647,12 +647,12 @@ void DisplayItemMessageOnField(u8 taskId, u8 fontId, const u8 *string, TaskFunc
void DisplayYesNoMenuDefaultYes(void) void DisplayYesNoMenuDefaultYes(void)
{ {
CreateYesNoMenu(&sYesNo_WindowTemplate, FONT_2, 0, 2, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0); CreateYesNoMenu(&sYesNo_WindowTemplate, FONT_NORMAL, 0, 2, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0);
} }
void DisplayYesNoMenuDefaultNo(void) void DisplayYesNoMenuDefaultNo(void)
{ {
CreateYesNoMenu(&sYesNo_WindowTemplate, FONT_2, 0, 2, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 1); CreateYesNoMenu(&sYesNo_WindowTemplate, FONT_NORMAL, 0, 2, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 1);
} }
u8 GetTextSpeedSetting(void) u8 GetTextSpeedSetting(void)
src/oak_speech.c
+13 -13
View File
@@ -593,7 +593,7 @@ static void CreateHelpDocsPage1(void)
sOakSpeechResources->unk_0014[0] = AddWindow(sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012]); sOakSpeechResources->unk_0014[0] = AddWindow(sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012]);
PutWindowTilemap(sOakSpeechResources->unk_0014[0]); PutWindowTilemap(sOakSpeechResources->unk_0014[0]);
FillWindowPixelBuffer(sOakSpeechResources->unk_0014[0], 0x00); FillWindowPixelBuffer(sOakSpeechResources->unk_0014[0], 0x00);
AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[0], FONT_2, 2, 0, 1, 1, sTextColor_HelpSystem, 0, gNewGame_HelpDocs1); AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[0], FONT_NORMAL, 2, 0, 1, 1, sTextColor_HelpSystem, 0, gNewGame_HelpDocs1);
CopyWindowToVram(sOakSpeechResources->unk_0014[0], COPYWIN_FULL); CopyWindowToVram(sOakSpeechResources->unk_0014[0], COPYWIN_FULL);
FillBgTilemapBufferRect_Palette0(1, 0x3000, 1, 3, 5, 16); FillBgTilemapBufferRect_Palette0(1, 0x3000, 1, 3, 5, 16);
CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(1);
@@ -615,7 +615,7 @@ static void Task_OakSpeech4(u8 taskId)
sOakSpeechResources->unk_0014[i] = AddWindow(&sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012][i]); sOakSpeechResources->unk_0014[i] = AddWindow(&sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012][i]);
PutWindowTilemap(sOakSpeechResources->unk_0014[i]); PutWindowTilemap(sOakSpeechResources->unk_0014[i]);
FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00); FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00);
AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[i], FONT_2, 6, 0, 1, 1, sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]); AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[i], FONT_NORMAL, 6, 0, 1, 1, sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]);
CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_FULL); CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_FULL);
} }
@@ -747,7 +747,7 @@ static void Task_OakSpeech6(u8 taskId)
sOakSpeechResources->unk_0012 = 0; sOakSpeechResources->unk_0012 = 0;
gMain.state = 0; gMain.state = 0;
data[15] = 16; data[15] = 16;
AddTextPrinterParameterized4(data[14], FONT_2, 3, 5, 1, 0, sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[0]); AddTextPrinterParameterized4(data[14], FONT_NORMAL, 3, 5, 1, 0, sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[0]);
data[5] = CreateTextCursorSpriteForOakSpeech(0, 0xe2, 0x91, 0, 0); data[5] = CreateTextCursorSpriteForOakSpeech(0, 0xe2, 0x91, 0, 0);
gSprites[data[5]].oam.objMode = ST_OAM_OBJ_BLEND; gSprites[data[5]].oam.objMode = ST_OAM_OBJ_BLEND;
gSprites[data[5]].oam.priority = 0; gSprites[data[5]].oam.priority = 0;
@@ -807,7 +807,7 @@ static void Task_OakSpeech7(u8 taskId)
if (data[15] <= 0) if (data[15] <= 0)
{ {
FillWindowPixelBuffer(data[14], 0x00); FillWindowPixelBuffer(data[14], 0x00);
AddTextPrinterParameterized4(data[14], FONT_2, 3, 5, 1, 0, sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[sOakSpeechResources->unk_0012]); AddTextPrinterParameterized4(data[14], FONT_NORMAL, 3, 5, 1, 0, sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[sOakSpeechResources->unk_0012]);
if (sOakSpeechResources->unk_0012 == 0) if (sOakSpeechResources->unk_0012 == 0)
{ {
ClearTopBarWindow(); ClearTopBarWindow();
@@ -906,11 +906,11 @@ static void Task_OakSpeech9(u8 taskId)
if (str != gStringVar4) \ if (str != gStringVar4) \
{ \ { \
StringExpandPlaceholders(gStringVar4, str); \ StringExpandPlaceholders(gStringVar4, str); \
AddTextPrinterParameterized2(0, FONT_4, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); \ AddTextPrinterParameterized2(0, FONT_MALE, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); \
} \ } \
else \ else \
{ \ { \
AddTextPrinterParameterized2(0, FONT_4, str, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); \ AddTextPrinterParameterized2(0, FONT_MALE, str, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); \
} \ } \
CopyWindowToVram(0, COPYWIN_FULL); \ CopyWindowToVram(0, COPYWIN_FULL); \
}) })
@@ -1076,12 +1076,12 @@ static void Task_OakSpeech19(u8 taskId)
sOakSpeechResources->textColor[0] = 1; sOakSpeechResources->textColor[0] = 1;
sOakSpeechResources->textColor[1] = 2; sOakSpeechResources->textColor[1] = 2;
sOakSpeechResources->textColor[2] = 3; sOakSpeechResources->textColor[2] = 3;
AddTextPrinterParameterized3(gTasks[taskId].data[13], FONT_2, 8, 1, sOakSpeechResources->textColor, 0, gText_Boy); AddTextPrinterParameterized3(gTasks[taskId].data[13], FONT_NORMAL, 8, 1, sOakSpeechResources->textColor, 0, gText_Boy);
sOakSpeechResources->textColor[0] = 1; sOakSpeechResources->textColor[0] = 1;
sOakSpeechResources->textColor[1] = 2; sOakSpeechResources->textColor[1] = 2;
sOakSpeechResources->textColor[2] = 3; sOakSpeechResources->textColor[2] = 3;
AddTextPrinterParameterized3(gTasks[taskId].data[13], FONT_2, 8, 17, sOakSpeechResources->textColor, 0, gText_Girl); AddTextPrinterParameterized3(gTasks[taskId].data[13], FONT_NORMAL, 8, 17, sOakSpeechResources->textColor, 0, gText_Girl);
Menu_InitCursor(gTasks[taskId].data[13], FONT_2, 0, 1, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 2, 0); Menu_InitCursor(gTasks[taskId].data[13], FONT_NORMAL, 0, 1, GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 2, 2, 0);
CopyWindowToVram(gTasks[taskId].data[13], COPYWIN_FULL); CopyWindowToVram(gTasks[taskId].data[13], COPYWIN_FULL);
gTasks[taskId].func = Task_OakSpeech20; gTasks[taskId].func = Task_OakSpeech20;
} }
@@ -1263,7 +1263,7 @@ static void Task_OakSpeech26(u8 taskId)
data[3]--; data[3]--;
else else
{ {
CreateYesNoMenu(&sNewGameAdventureIntroWindowTemplates[2], FONT_2, 0, 2, GetStdWindowBaseTileNum(), 14, 0); CreateYesNoMenu(&sNewGameAdventureIntroWindowTemplates[2], FONT_NORMAL, 0, 2, GetStdWindowBaseTileNum(), 14, 0);
gTasks[taskId].func = Task_OakSpeech27; gTasks[taskId].func = Task_OakSpeech27;
} }
} }
@@ -1871,16 +1871,16 @@ static void PrintNameChoiceOptions(u8 taskId, u8 hasPlayerBeenNamed)
PutWindowTilemap(data[13]); PutWindowTilemap(data[13]);
DrawStdFrameWithCustomTileAndPalette(data[13], 1, GetStdWindowBaseTileNum(), 14); DrawStdFrameWithCustomTileAndPalette(data[13], 1, GetStdWindowBaseTileNum(), 14);
FillWindowPixelBuffer(gTasks[taskId].data[13], 0x11); FillWindowPixelBuffer(gTasks[taskId].data[13], 0x11);
AddTextPrinterParameterized(data[13], FONT_2, gOtherText_NewName, 8, 1, 0, NULL); AddTextPrinterParameterized(data[13], FONT_NORMAL, gOtherText_NewName, 8, 1, 0, NULL);
if (hasPlayerBeenNamed == FALSE) if (hasPlayerBeenNamed == FALSE)
textPtrs = gSaveBlock2Ptr->playerGender == MALE ? sMaleNameChoices : sFemaleNameChoices; textPtrs = gSaveBlock2Ptr->playerGender == MALE ? sMaleNameChoices : sFemaleNameChoices;
else else
textPtrs = sRivalNameChoices; textPtrs = sRivalNameChoices;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
AddTextPrinterParameterized(data[13], FONT_2, textPtrs[i], 8, 16 * (i + 1) + 1, 0, NULL); AddTextPrinterParameterized(data[13], FONT_NORMAL, textPtrs[i], 8, 16 * (i + 1) + 1, 0, NULL);
} }
Menu_InitCursor(data[13], FONT_2, 0, 1, 16, 5, 0); Menu_InitCursor(data[13], FONT_NORMAL, 0, 1, 16, 5, 0);
CopyWindowToVram(data[13], COPYWIN_FULL); CopyWindowToVram(data[13], COPYWIN_FULL);
} }
src/option_menu.c
+13 -13
View File
@@ -316,9 +316,9 @@ static void InitOptionMenuBg(void)
static void OptionMenu_PickSwitchCancel(void) static void OptionMenu_PickSwitchCancel(void)
{ {
s32 x; s32 x;
x = 0xE4 - GetStringWidth(FONT_0, gText_PickSwitchCancel, 0); x = 0xE4 - GetStringWidth(FONT_SMALL, gText_PickSwitchCancel, 0);
FillWindowPixelBuffer(2, PIXEL_FILL(15)); FillWindowPixelBuffer(2, PIXEL_FILL(15));
AddTextPrinterParameterized3(2, FONT_0, x, 0, sOptionMenuPickSwitchCancelTextColor, 0, gText_PickSwitchCancel); AddTextPrinterParameterized3(2, FONT_SMALL, x, 0, sOptionMenuPickSwitchCancelTextColor, 0, gText_PickSwitchCancel);
PutWindowTilemap(2); PutWindowTilemap(2);
CopyWindowToVram(2, COPYWIN_FULL); CopyWindowToVram(2, COPYWIN_FULL);
} }
@@ -472,31 +472,31 @@ static void BufferOptionMenuString(u8 selection)
memcpy(dst, sOptionMenuTextColor, 3); memcpy(dst, sOptionMenuTextColor, 3);
x = 0x82; x = 0x82;
y = ((GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) - 1) * selection) + 2; y = ((GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) - 1) * selection) + 2;
FillWindowPixelRect(1, 1, x, y, 0x46, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT)); FillWindowPixelRect(1, 1, x, y, 0x46, GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT));
switch (selection) switch (selection)
{ {
case MENUITEM_TEXTSPEED: case MENUITEM_TEXTSPEED:
AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, sTextSpeedOptions[sOptionMenuPtr->option[selection]]); AddTextPrinterParameterized3(1, FONT_NORMAL, x, y, dst, -1, sTextSpeedOptions[sOptionMenuPtr->option[selection]]);
break; break;
case MENUITEM_BATTLESCENE: case MENUITEM_BATTLESCENE:
AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, sBattleSceneOptions[sOptionMenuPtr->option[selection]]); AddTextPrinterParameterized3(1, FONT_NORMAL, x, y, dst, -1, sBattleSceneOptions[sOptionMenuPtr->option[selection]]);
break; break;
case MENUITEM_BATTLESTYLE: case MENUITEM_BATTLESTYLE:
AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, sBattleStyleOptions[sOptionMenuPtr->option[selection]]); AddTextPrinterParameterized3(1, FONT_NORMAL, x, y, dst, -1, sBattleStyleOptions[sOptionMenuPtr->option[selection]]);
break; break;
case MENUITEM_SOUND: case MENUITEM_SOUND:
AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, sSoundOptions[sOptionMenuPtr->option[selection]]); AddTextPrinterParameterized3(1, FONT_NORMAL, x, y, dst, -1, sSoundOptions[sOptionMenuPtr->option[selection]]);
break; break;
case MENUITEM_BUTTONMODE: case MENUITEM_BUTTONMODE:
AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, sButtonTypeOptions[sOptionMenuPtr->option[selection]]); AddTextPrinterParameterized3(1, FONT_NORMAL, x, y, dst, -1, sButtonTypeOptions[sOptionMenuPtr->option[selection]]);
break; break;
case MENUITEM_FRAMETYPE: case MENUITEM_FRAMETYPE:
StringCopy(str, gText_FrameType); StringCopy(str, gText_FrameType);
ConvertIntToDecimalStringN(buf, sOptionMenuPtr->option[selection] + 1, 1, 2); ConvertIntToDecimalStringN(buf, sOptionMenuPtr->option[selection] + 1, 1, 2);
StringAppendN(str, buf, 3); StringAppendN(str, buf, 3);
AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, str); AddTextPrinterParameterized3(1, FONT_NORMAL, x, y, dst, -1, str);
break; break;
default: default:
break; break;
@@ -524,7 +524,7 @@ static void CloseAndSaveOptionMenu(u8 taskId)
static void PrintOptionMenuHeader(void) static void PrintOptionMenuHeader(void)
{ {
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized(WIN_TEXT_OPTION, FONT_2, gText_Option, 8, 1, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(WIN_TEXT_OPTION, FONT_NORMAL, gText_Option, 8, 1, TEXT_SKIP_DRAW, NULL);
PutWindowTilemap(0); PutWindowTilemap(0);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
} }
@@ -560,7 +560,7 @@ static void LoadOptionMenuItemNames(void)
FillWindowPixelBuffer(1, PIXEL_FILL(1)); FillWindowPixelBuffer(1, PIXEL_FILL(1));
for (i = 0; i < MENUITEM_COUNT; i++) for (i = 0; i < MENUITEM_COUNT; i++)
{ {
AddTextPrinterParameterized(WIN_OPTIONS, FONT_2, sOptionMenuItemsNames[i], 8, (u8)((i * (GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT))) + 2) - i, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(WIN_OPTIONS, FONT_NORMAL, sOptionMenuItemsNames[i], 8, (u8)((i * (GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT))) + 2) - i, TEXT_SKIP_DRAW, NULL);
} }
} }
@@ -568,7 +568,7 @@ static void UpdateSettingSelectionDisplay(u16 selection)
{ {
u16 maxLetterHeight, y; u16 maxLetterHeight, y;
maxLetterHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT); maxLetterHeight = GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT);
y = selection * (maxLetterHeight - 1) + 0x3A; y = selection * (maxLetterHeight - 1) + 0x3A;
SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(y, y + maxLetterHeight)); SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(y, y + maxLetterHeight));
SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0x10, 0xE0)); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0x10, 0xE0));
src/party_menu.c
+18 -18
View File
@@ -2135,7 +2135,7 @@ static void CreateCancelConfirmWindows(bool8 chooseMultiple)
{ {
confirmWindowId = AddWindow(&sConfirmButtonWindowTemplate); confirmWindowId = AddWindow(&sConfirmButtonWindowTemplate);
FillWindowPixelBuffer(confirmWindowId, PIXEL_FILL(0)); FillWindowPixelBuffer(confirmWindowId, PIXEL_FILL(0));
AddTextPrinterParameterized4(confirmWindowId, FONT_0, (48 - GetStringWidth(FONT_0, gText_PartyMenu_OK, 0)) / 2u, 1, 0, 0, sFontColorTable[0], -1, gText_PartyMenu_OK); AddTextPrinterParameterized4(confirmWindowId, FONT_SMALL, (48 - GetStringWidth(FONT_SMALL, gText_PartyMenu_OK, 0)) / 2u, 1, 0, 0, sFontColorTable[0], -1, gText_PartyMenu_OK);
PutWindowTilemap(confirmWindowId); PutWindowTilemap(confirmWindowId);
CopyWindowToVram(confirmWindowId, COPYWIN_GFX); CopyWindowToVram(confirmWindowId, COPYWIN_GFX);
cancelWindowId = AddWindow(&sMultiCancelButtonWindowTemplate); cancelWindowId = AddWindow(&sMultiCancelButtonWindowTemplate);
@@ -2150,13 +2150,13 @@ static void CreateCancelConfirmWindows(bool8 chooseMultiple)
// Branches are functionally identical. Second branch is never reached, Spin Trade wasnt fully implemented // Branches are functionally identical. Second branch is never reached, Spin Trade wasnt fully implemented
if (gPartyMenu.menuType != PARTY_MENU_TYPE_SPIN_TRADE) if (gPartyMenu.menuType != PARTY_MENU_TYPE_SPIN_TRADE)
{ {
offset += (48 - GetStringWidth(FONT_0, gFameCheckerText_Cancel, 0)) / 2; offset += (48 - GetStringWidth(FONT_SMALL, gFameCheckerText_Cancel, 0)) / 2;
AddTextPrinterParameterized3(cancelWindowId, FONT_0, offset, 1, sFontColorTable[0], -1, gFameCheckerText_Cancel); AddTextPrinterParameterized3(cancelWindowId, FONT_SMALL, offset, 1, sFontColorTable[0], -1, gFameCheckerText_Cancel);
} }
else else
{ {
offset += (48 - GetStringWidth(FONT_0, gOtherText_Exit, 0)) / 2; offset += (48 - GetStringWidth(FONT_SMALL, gOtherText_Exit, 0)) / 2;
AddTextPrinterParameterized3(cancelWindowId, FONT_0, offset, 1, sFontColorTable[0], -1, gOtherText_Exit); AddTextPrinterParameterized3(cancelWindowId, FONT_SMALL, offset, 1, sFontColorTable[0], -1, gOtherText_Exit);
} }
PutWindowTilemap(cancelWindowId); PutWindowTilemap(cancelWindowId);
CopyWindowToVram(cancelWindowId, COPYWIN_GFX); CopyWindowToVram(cancelWindowId, COPYWIN_GFX);
@@ -2297,7 +2297,7 @@ static void LoadPartyBoxPalette(struct PartyMenuBox *menuBox, u8 palFlags)
static void DisplayPartyPokemonBarDetail(u8 windowId, const u8 *str, u8 color, const u8 *dimensions) static void DisplayPartyPokemonBarDetail(u8 windowId, const u8 *str, u8 color, const u8 *dimensions)
{ {
AddTextPrinterParameterized3(windowId, FONT_0, dimensions[0], dimensions[1], sFontColorTable[color], 0, str); AddTextPrinterParameterized3(windowId, FONT_SMALL, dimensions[0], dimensions[1], sFontColorTable[color], 0, str);
} }
static void DisplayPartyPokemonNickname(struct Pokemon *mon, struct PartyMenuBox *menuBox, u8 drawMenuBoxOrText) static void DisplayPartyPokemonNickname(struct Pokemon *mon, struct PartyMenuBox *menuBox, u8 drawMenuBoxOrText)
@@ -2453,7 +2453,7 @@ static void DisplayPartyPokemonDescriptionText(u8 stringId, struct PartyMenuBox
if (drawMenuBoxOrText != DRAW_TEXT_ONLY) if (drawMenuBoxOrText != DRAW_TEXT_ONLY)
menuBox->infoRects->blitFunc(menuBox->windowId, menuBox->infoRects->descTextLeft / 8, menuBox->infoRects->descTextTop / 8, menuBox->infoRects->descTextWidth / 8, menuBox->infoRects->descTextHeight / 8, TRUE); menuBox->infoRects->blitFunc(menuBox->windowId, menuBox->infoRects->descTextLeft / 8, menuBox->infoRects->descTextTop / 8, menuBox->infoRects->descTextWidth / 8, menuBox->infoRects->descTextHeight / 8, TRUE);
if (drawMenuBoxOrText != DRAW_MENU_BOX_ONLY) if (drawMenuBoxOrText != DRAW_MENU_BOX_ONLY)
AddTextPrinterParameterized3(menuBox->windowId, FONT_1, menuBox->infoRects->descTextLeft, menuBox->infoRects->descTextTop, sFontColorTable[0], 0, sDescriptionStringTable[stringId]); AddTextPrinterParameterized3(menuBox->windowId, FONT_NORMAL_COPY_1, menuBox->infoRects->descTextLeft, menuBox->infoRects->descTextTop, sFontColorTable[0], 0, sDescriptionStringTable[stringId]);
} }
static void PartyMenuRemoveWindow(u8 *windowId) static void PartyMenuRemoveWindow(u8 *windowId)
@@ -2505,7 +2505,7 @@ void DisplayPartyMenuStdMessage(u32 stringId)
} }
DrawStdFrameWithCustomTileAndPalette(*windowPtr, FALSE, 0x58, 0xF); DrawStdFrameWithCustomTileAndPalette(*windowPtr, FALSE, 0x58, 0xF);
StringExpandPlaceholders(gStringVar4, sActionStringTable[stringId]); StringExpandPlaceholders(gStringVar4, sActionStringTable[stringId]);
AddTextPrinterParameterized(*windowPtr, FONT_2, gStringVar4, 0, 2, 0, 0); AddTextPrinterParameterized(*windowPtr, FONT_NORMAL, gStringVar4, 0, 2, 0, 0);
ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(2);
} }
} }
@@ -2554,15 +2554,15 @@ static u8 DisplaySelectionWindow(u8 windowType)
DrawStdFrameWithCustomTileAndPalette(sPartyMenuInternal->windowId[0], FALSE, 0x4F, 13); DrawStdFrameWithCustomTileAndPalette(sPartyMenuInternal->windowId[0], FALSE, 0x4F, 13);
if (windowType == SELECTWINDOW_MOVES) if (windowType == SELECTWINDOW_MOVES)
return sPartyMenuInternal->windowId[0]; return sPartyMenuInternal->windowId[0];
cursorDimension = GetMenuCursorDimensionByFont(FONT_2, 0); cursorDimension = GetMenuCursorDimensionByFont(FONT_NORMAL, 0);
fontAttribute = GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING); fontAttribute = GetFontAttribute(FONT_NORMAL, FONTATTR_LETTER_SPACING);
for (i = 0; i < sPartyMenuInternal->numActions; ++i) for (i = 0; i < sPartyMenuInternal->numActions; ++i)
{ {
u8 fontColorsId = (sPartyMenuInternal->actions[i] >= CURSOR_OPTION_FIELD_MOVES) ? 4 : 3; u8 fontColorsId = (sPartyMenuInternal->actions[i] >= CURSOR_OPTION_FIELD_MOVES) ? 4 : 3;
AddTextPrinterParameterized4(sPartyMenuInternal->windowId[0], FONT_2, cursorDimension, (i * 16) + 2, fontAttribute, 0, sFontColorTable[fontColorsId], 0, sCursorOptions[sPartyMenuInternal->actions[i]].text); AddTextPrinterParameterized4(sPartyMenuInternal->windowId[0], FONT_NORMAL, cursorDimension, (i * 16) + 2, fontAttribute, 0, sFontColorTable[fontColorsId], 0, sCursorOptions[sPartyMenuInternal->actions[i]].text);
} }
Menu_InitCursorInternal(sPartyMenuInternal->windowId[0], FONT_2, 0, 2, 16, sPartyMenuInternal->numActions, 0, 1); Menu_InitCursorInternal(sPartyMenuInternal->windowId[0], FONT_NORMAL, 0, 2, 16, sPartyMenuInternal->numActions, 0, 1);
ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(2);
return sPartyMenuInternal->windowId[0]; return sPartyMenuInternal->windowId[0];
} }
@@ -2571,12 +2571,12 @@ static void PartyMenuPrintText(const u8 *text)
{ {
DrawStdFrameWithCustomTileAndPalette(6, FALSE, 0x4F, 13); DrawStdFrameWithCustomTileAndPalette(6, FALSE, 0x4F, 13);
gTextFlags.canABSpeedUpPrint = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
AddTextPrinterParameterized2(6, FONT_2, text, GetTextSpeedSetting(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(6, FONT_NORMAL, text, GetTextSpeedSetting(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
static void PartyMenuDisplayYesNoMenu(void) static void PartyMenuDisplayYesNoMenu(void)
{ {
CreateYesNoMenu(&sPartyMenuYesNoWindowTemplate, FONT_2, 0, 2, 0x4F, 13, 0); CreateYesNoMenu(&sPartyMenuYesNoWindowTemplate, FONT_NORMAL, 0, 2, 0x4F, 13, 0);
} }
static u8 CreateLevelUpStatsWindow(void) static u8 CreateLevelUpStatsWindow(void)
@@ -2596,7 +2596,7 @@ static void PartyMenu_Oak_PrintText(u8 windowId, const u8 *str)
{ {
StringExpandPlaceholders(gStringVar4, str); StringExpandPlaceholders(gStringVar4, str);
gTextFlags.canABSpeedUpPrint = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
AddTextPrinterParameterized2(windowId, FONT_4, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(windowId, FONT_MALE, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
static bool8 FirstBattleEnterParty_CreateWindowAndMsg1Printer(void) static bool8 FirstBattleEnterParty_CreateWindowAndMsg1Printer(void)
@@ -2637,8 +2637,8 @@ static void ToggleFieldMoveDescriptionWindow(u8 action)
if (ptr->windowId[2] == WINDOW_NONE) if (ptr->windowId[2] == WINDOW_NONE)
ptr->windowId[2] = AddWindow(&sFieldMoveDescriptionWindowTemplate); ptr->windowId[2] = AddWindow(&sFieldMoveDescriptionWindowTemplate);
DrawHelpMessageWindowTilesById(ptr->windowId[2]); DrawHelpMessageWindowTilesById(ptr->windowId[2]);
letterSpacing = GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING); letterSpacing = GetFontAttribute(FONT_NORMAL, FONTATTR_LETTER_SPACING);
AddTextPrinterParameterized4(ptr->windowId[2], FONT_2, 3, 6, letterSpacing, 0, sFontColorTable[5], 0, sFieldMoveDescriptionTable[action - CURSOR_OPTION_FIELD_MOVES]); AddTextPrinterParameterized4(ptr->windowId[2], FONT_NORMAL, 3, 6, letterSpacing, 0, sFontColorTable[5], 0, sFieldMoveDescriptionTable[action - CURSOR_OPTION_FIELD_MOVES]);
PutWindowTilemap(ptr->windowId[2]); PutWindowTilemap(ptr->windowId[2]);
ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(2);
} }
@@ -4555,7 +4555,7 @@ static void ShowMoveSelectWindow(u8 slot)
{ {
u8 i; u8 i;
u8 moveCount = 0; u8 moveCount = 0;
u8 fontId = FONT_2; u8 fontId = FONT_NORMAL;
u8 windowId = DisplaySelectionWindow(SELECTWINDOW_MOVES); u8 windowId = DisplaySelectionWindow(SELECTWINDOW_MOVES);
u16 move; u16 move;
src/player_pc.c
+20 -20
View File
@@ -157,7 +157,7 @@ void BedroomPC(void)
sItemOrder = sItemOrder_BedroomPC; sItemOrder = sItemOrder_BedroomPC;
sTopMenuItemCount = 3; sTopMenuItemCount = 3;
taskId = CreateTask(TaskDummy, 0); taskId = CreateTask(TaskDummy, 0);
DisplayItemMessageOnField(taskId, FONT_2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu);
} }
void PlayerPC(void) void PlayerPC(void)
@@ -169,7 +169,7 @@ void PlayerPC(void)
sItemOrder = sItemOrder_PlayerPC; sItemOrder = sItemOrder_PlayerPC;
sTopMenuItemCount = 3; sTopMenuItemCount = 3;
taskId = CreateTask(TaskDummy, 0); taskId = CreateTask(TaskDummy, 0);
DisplayItemMessageOnField(taskId, FONT_2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu);
} }
static void Task_DrawPlayerPcTopMenu(u8 taskId) static void Task_DrawPlayerPcTopMenu(u8 taskId)
@@ -180,8 +180,8 @@ static void Task_DrawPlayerPcTopMenu(u8 taskId)
else else
tWindowId = AddWindow(&sWindowTemplate_TopMenu_4Items); tWindowId = AddWindow(&sWindowTemplate_TopMenu_4Items);
SetStdWindowBorderStyle(tWindowId, 0); SetStdWindowBorderStyle(tWindowId, 0);
AddItemMenuActionTextPrinters(tWindowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING), 16, sTopMenuItemCount, sMenuActions_TopMenu, sItemOrder); AddItemMenuActionTextPrinters(tWindowId, FONT_NORMAL, GetMenuCursorDimensionByFont(FONT_NORMAL, 0), 2, GetFontAttribute(FONT_NORMAL, FONTATTR_LETTER_SPACING), 16, sTopMenuItemCount, sMenuActions_TopMenu, sItemOrder);
Menu_InitCursor(tWindowId, FONT_2, 0, 2, 16, sTopMenuItemCount, 0); Menu_InitCursor(tWindowId, FONT_NORMAL, 0, 2, 16, sTopMenuItemCount, 0);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
gTasks[taskId].func = Task_TopMenuHandleInput; gTasks[taskId].func = Task_TopMenuHandleInput;
} }
@@ -215,7 +215,7 @@ static void Task_TopMenuHandleInput(u8 taskId)
static void Task_ReturnToTopMenu(u8 taskId) static void Task_ReturnToTopMenu(u8 taskId)
{ {
RestoreHelpContext(); RestoreHelpContext();
DisplayItemMessageOnField(taskId, FONT_2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu);
} }
static void Task_PlayerPcItemStorage(u8 taskId) static void Task_PlayerPcItemStorage(u8 taskId)
@@ -229,7 +229,7 @@ static void Task_PlayerPcMailbox(u8 taskId)
gPlayerPcMenuManager.count = CountPCMail(); gPlayerPcMenuManager.count = CountPCMail();
if (gPlayerPcMenuManager.count == 0) if (gPlayerPcMenuManager.count == 0)
{ {
DisplayItemMessageOnField(taskId, FONT_2, gText_TheresNoMailHere, Task_ReturnToTopMenu); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_TheresNoMailHere, Task_ReturnToTopMenu);
} }
else else
{ {
@@ -249,7 +249,7 @@ static void Task_PlayerPcMailbox(u8 taskId)
} }
else else
{ {
DisplayItemMessageOnField(taskId, FONT_2, gText_TheresNoMailHere, Task_ReturnToTopMenu); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_TheresNoMailHere, Task_ReturnToTopMenu);
} }
} }
} }
@@ -272,8 +272,8 @@ static void Task_CreateItemStorageSubmenu(u8 taskId, u8 cursorPos)
SetHelpContext(HELPCONTEXT_PLAYERS_PC_ITEMS); SetHelpContext(HELPCONTEXT_PLAYERS_PC_ITEMS);
tWindowId = AddWindow(&sWindowTemplate_ItemStorageSubmenu); tWindowId = AddWindow(&sWindowTemplate_ItemStorageSubmenu);
SetStdWindowBorderStyle(tWindowId, FALSE); SetStdWindowBorderStyle(tWindowId, FALSE);
PrintTextArray(tWindowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, 16, 3, sMenuActions_ItemPc); PrintTextArray(tWindowId, FONT_NORMAL, GetMenuCursorDimensionByFont(FONT_NORMAL, 0), 2, 16, 3, sMenuActions_ItemPc);
Menu_InitCursor(tWindowId, FONT_2, 0, 2, 16, 3, cursorPos); Menu_InitCursor(tWindowId, FONT_NORMAL, 0, 2, 16, 3, cursorPos);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
PrintStringOnWindow0WithDialogueFrame(sItemStorageActionDescriptionPtrs[cursorPos]); PrintStringOnWindow0WithDialogueFrame(sItemStorageActionDescriptionPtrs[cursorPos]);
} }
@@ -281,7 +281,7 @@ static void Task_CreateItemStorageSubmenu(u8 taskId, u8 cursorPos)
static void PrintStringOnWindow0WithDialogueFrame(const u8 *str) static void PrintStringOnWindow0WithDialogueFrame(const u8 *str)
{ {
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
AddTextPrinterParameterized(0, FONT_2, str, 0, 1, 0, NULL); AddTextPrinterParameterized(0, FONT_NORMAL, str, 0, 1, 0, NULL);
} }
static void Task_TopMenu_ItemStorageSubmenu_HandleInput(u8 taskId) static void Task_TopMenu_ItemStorageSubmenu_HandleInput(u8 taskId)
@@ -364,7 +364,7 @@ static void Task_PlayerPcWithdrawItem(u8 taskId)
ClearStdWindowAndFrameToTransparent(tWindowId, FALSE); ClearStdWindowAndFrameToTransparent(tWindowId, FALSE);
ClearWindowTilemap(tWindowId); ClearWindowTilemap(tWindowId);
RemoveWindow(tWindowId); RemoveWindow(tWindowId);
DisplayItemMessageOnField(taskId, FONT_2, gText_ThereAreNoItems, Task_PlayerPcItemStorage); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_ThereAreNoItems, Task_PlayerPcItemStorage);
} }
} }
@@ -453,9 +453,9 @@ static void PCMailCompaction(void)
static void Task_DrawMailboxPcMenu(u8 taskId) static void Task_DrawMailboxPcMenu(u8 taskId)
{ {
u8 windowId = MailboxPC_GetAddWindow(0); u8 windowId = MailboxPC_GetAddWindow(0);
s32 width = GetStringWidth(FONT_2, gText_Mailbox, 0); s32 width = GetStringWidth(FONT_NORMAL, gText_Mailbox, 0);
MailboxPC_GetAddWindow(1); MailboxPC_GetAddWindow(1);
AddTextPrinterParameterized(windowId, FONT_2, gText_Mailbox, (80 - width) / 2, 2, 0, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Mailbox, (80 - width) / 2, 2, 0, NULL);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
gTasks[taskId].tListMenuTaskId = MailboxPC_InitListMenu(&gPlayerPcMenuManager); gTasks[taskId].tListMenuTaskId = MailboxPC_InitListMenu(&gPlayerPcMenuManager);
MailboxPC_AddScrollIndicatorArrows(&gPlayerPcMenuManager); MailboxPC_AddScrollIndicatorArrows(&gPlayerPcMenuManager);
@@ -512,7 +512,7 @@ static void Task_PrintWhatToDoWithSelectedMail(u8 taskId)
ConvertInternationalString(gStringVar1, LANGUAGE_JAPANESE); ConvertInternationalString(gStringVar1, LANGUAGE_JAPANESE);
} }
StringExpandPlaceholders(gStringVar4, gText_WhatWouldYouLikeToDoWithPlayersMail); StringExpandPlaceholders(gStringVar4, gText_WhatWouldYouLikeToDoWithPlayersMail);
DisplayItemMessageOnField(taskId, FONT_2, gStringVar4, Task_DrawMailSubmenu); DisplayItemMessageOnField(taskId, FONT_NORMAL, gStringVar4, Task_DrawMailSubmenu);
} }
static void Task_DestroyMailboxPcViewAndCancel(u8 taskId) static void Task_DestroyMailboxPcViewAndCancel(u8 taskId)
@@ -529,8 +529,8 @@ static void Task_DestroyMailboxPcViewAndCancel(u8 taskId)
static void Task_DrawMailSubmenu(u8 taskId) static void Task_DrawMailSubmenu(u8 taskId)
{ {
u8 windowId = MailboxPC_GetAddWindow(2); u8 windowId = MailboxPC_GetAddWindow(2);
PrintTextArray(windowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, 16, 4, sMenuActions_MailSubmenu); PrintTextArray(windowId, FONT_NORMAL, GetMenuCursorDimensionByFont(FONT_NORMAL, 0), 2, 16, 4, sMenuActions_MailSubmenu);
Menu_InitCursor(windowId, FONT_2, 0, 2, 16, 4, 0); Menu_InitCursor(windowId, FONT_NORMAL, 0, 2, 16, 4, 0);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
gTasks[taskId].func = Task_MailSubmenuHandleInput; gTasks[taskId].func = Task_MailSubmenuHandleInput;
} }
@@ -600,7 +600,7 @@ static void CB2_SetCbToReturnToMailbox(void)
static void Task_PlayerPcMoveMailToBag(u8 taskId) static void Task_PlayerPcMoveMailToBag(u8 taskId)
{ {
DisplayItemMessageOnField(taskId, FONT_2, gText_MessageWillBeLost, Task_DrawYesNoMenuToConfirmMoveToBag); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_MessageWillBeLost, Task_DrawYesNoMenuToConfirmMoveToBag);
} }
static void Task_DrawYesNoMenuToConfirmMoveToBag(u8 taskId) static void Task_DrawYesNoMenuToConfirmMoveToBag(u8 taskId)
@@ -632,11 +632,11 @@ static void Task_TryPutMailInBag_DestroyMsgIfSuccessful(u8 taskId)
struct Mail * mail = &SELECTED_MAIL; struct Mail * mail = &SELECTED_MAIL;
if (!AddBagItem(mail->itemId, 1)) if (!AddBagItem(mail->itemId, 1))
{ {
DisplayItemMessageOnField(taskId, FONT_2, gText_BagIsFull, Task_PlayerPcExitMailSubmenu); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_BagIsFull, Task_PlayerPcExitMailSubmenu);
} }
else else
{ {
DisplayItemMessageOnField(taskId, FONT_2, gText_MailReturnedToBagMessageErased, Task_PlayerPcExitMailSubmenu); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_MailReturnedToBagMessageErased, Task_PlayerPcExitMailSubmenu);
ClearMailStruct(mail); ClearMailStruct(mail);
PCMailCompaction(); PCMailCompaction();
gPlayerPcMenuManager.count--; gPlayerPcMenuManager.count--;
@@ -715,7 +715,7 @@ void Mailbox_ReturnToMailListAfterDeposit(void)
static void Task_Error_NoPokemon(u8 taskId) static void Task_Error_NoPokemon(u8 taskId)
{ {
DisplayItemMessageOnField(taskId, FONT_2, gText_ThereIsNoPokemon, Task_PlayerPcExitMailSubmenu); DisplayItemMessageOnField(taskId, FONT_NORMAL, gText_ThereIsNoPokemon, Task_PlayerPcExitMailSubmenu);
} }
static void Task_RedrawPlayerPcMailboxAndSetUpInputHandler(u8 taskId) static void Task_RedrawPlayerPcMailboxAndSetUpInputHandler(u8 taskId)
src/pokedex_screen.c
+40 -40
View File
@@ -353,7 +353,7 @@ static const struct ListMenuTemplate sListMenuTemplate_KantoDexModeSelect = {
.lettersSpacing = 1, .lettersSpacing = 1,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = 0, .scrollMultiple = 0,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0, .cursorKind = 0,
}; };
@@ -397,7 +397,7 @@ static const struct ListMenuTemplate sListMenuTemplate_NatDexModeSelect = {
.lettersSpacing = 1, .lettersSpacing = 1,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = 0, .scrollMultiple = 0,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0, .cursorKind = 0,
}; };
@@ -520,7 +520,7 @@ static const struct ListMenuTemplate sListMenuTemplate_OrderedListMenu = {
.lettersSpacing = 1, .lettersSpacing = 1,
.itemVerticalPadding = 0, .itemVerticalPadding = 0,
.scrollMultiple = 1, .scrollMultiple = 1,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0, .cursorKind = 0,
}; };
@@ -1133,15 +1133,15 @@ static void DexScreen_InitGfxForTopMenu(void)
listMenuTemplate.windowId = sPokedexScreenData->modeSelectWindowId; listMenuTemplate.windowId = sPokedexScreenData->modeSelectWindowId;
sPokedexScreenData->modeSelectListMenuId = ListMenuInit(&listMenuTemplate, sPokedexScreenData->modeSelectCursorPos, sPokedexScreenData->modeSelectItemsAbove); sPokedexScreenData->modeSelectListMenuId = ListMenuInit(&listMenuTemplate, sPokedexScreenData->modeSelectCursorPos, sPokedexScreenData->modeSelectItemsAbove);
FillWindowPixelBuffer(sPokedexScreenData->dexCountsWindowId, PIXEL_FILL(0)); FillWindowPixelBuffer(sPokedexScreenData->dexCountsWindowId, PIXEL_FILL(0));
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_Seen, 0, 2, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_SMALL, gText_Seen, 0, 2, 0);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_Kanto, 8, 13, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_SMALL, gText_Kanto, 8, 13, 0);
DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numSeenKanto, 52, 13, 2); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numSeenKanto, 52, 13, 2);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_National, 8, 24, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_SMALL, gText_National, 8, 24, 0);
DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numSeenNational, 52, 24, 2); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numSeenNational, 52, 24, 2);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_Owned, 0, 37, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_SMALL, gText_Owned, 0, 37, 0);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_Kanto, 8, 48, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_SMALL, gText_Kanto, 8, 48, 0);
DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numOwnedKanto, 52, 48, 2); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numOwnedKanto, 52, 48, 2);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_National, 8, 59, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_SMALL, gText_National, 8, 59, 0);
DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numOwnedNational, 52, 59, 2); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numOwnedNational, 52, 59, 2);
} }
else else
@@ -1150,9 +1150,9 @@ static void DexScreen_InitGfxForTopMenu(void)
listMenuTemplate.windowId = sPokedexScreenData->modeSelectWindowId; listMenuTemplate.windowId = sPokedexScreenData->modeSelectWindowId;
sPokedexScreenData->modeSelectListMenuId = ListMenuInit(&listMenuTemplate, sPokedexScreenData->modeSelectCursorPos, sPokedexScreenData->modeSelectItemsAbove); sPokedexScreenData->modeSelectListMenuId = ListMenuInit(&listMenuTemplate, sPokedexScreenData->modeSelectCursorPos, sPokedexScreenData->modeSelectItemsAbove);
FillWindowPixelBuffer(sPokedexScreenData->dexCountsWindowId, PIXEL_FILL(0)); FillWindowPixelBuffer(sPokedexScreenData->dexCountsWindowId, PIXEL_FILL(0));
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_1, gText_Seen, 0, 9, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_NORMAL_COPY_1, gText_Seen, 0, 9, 0);
DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 1, sPokedexScreenData->numSeenKanto, 32, 21, 2); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 1, sPokedexScreenData->numSeenKanto, 32, 21, 2);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_1, gText_Owned, 0, 37, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_NORMAL_COPY_1, gText_Owned, 0, 37, 0);
DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 1, sPokedexScreenData->numOwnedKanto, 32, 49, 2); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 1, sPokedexScreenData->numOwnedKanto, 32, 49, 2);
} }
FillWindowPixelBuffer(0, PIXEL_FILL(15)); FillWindowPixelBuffer(0, PIXEL_FILL(15));
@@ -1548,7 +1548,7 @@ static void ItemPrintFunc_OrderedListMenu(u8 windowId, u32 itemId, u8 y)
bool8 seen = (itemId >> 16) & 1; // not used but required to match bool8 seen = (itemId >> 16) & 1; // not used but required to match
bool8 caught = (itemId >> 17) & 1; bool8 caught = (itemId >> 17) & 1;
u8 type1; u8 type1;
DexScreen_PrintMonDexNo(sPokedexScreenData->numericalOrderWindowId, FONT_0, species, 12, y); DexScreen_PrintMonDexNo(sPokedexScreenData->numericalOrderWindowId, FONT_SMALL, species, 12, y);
if (caught) if (caught)
{ {
BlitMoveInfoIcon(sPokedexScreenData->numericalOrderWindowId, 0, 0x28, y); BlitMoveInfoIcon(sPokedexScreenData->numericalOrderWindowId, 0, 0x28, y);
@@ -2161,7 +2161,7 @@ static void DexScreen_AddTextPrinterParameterized(u8 windowId, u8 fontId, const
textColor[2] = 2; textColor[2] = 2;
break; break;
} }
AddTextPrinterParameterized4(windowId, fontId, x, y, fontId == FONT_0 ? 0 : 1, 0, textColor, -1, str); AddTextPrinterParameterized4(windowId, fontId, x, y, fontId == FONT_SMALL ? 0 : 1, 0, textColor, -1, str);
} }
static void DexScreen_PrintNum3LeadingZeroes(u8 windowId, u8 fontId, u16 num, u8 x, u8 y, u8 colorIdx) static void DexScreen_PrintNum3LeadingZeroes(u8 windowId, u8 fontId, u16 num, u8 x, u8 y, u8 colorIdx)
@@ -2293,7 +2293,7 @@ static u16 DexScreen_GetDexCount(u8 caseId, bool8 whichDex)
static void DexScreen_PrintControlInfo(const u8 *src) static void DexScreen_PrintControlInfo(const u8 *src)
{ {
DexScreen_AddTextPrinterParameterized(1, FONT_0, src, 236 - GetStringWidth(FONT_0, src, 0), 2, 4); DexScreen_AddTextPrinterParameterized(1, FONT_SMALL, src, 236 - GetStringWidth(FONT_SMALL, src, 0), 2, 4);
} }
bool8 DexScreen_DrawMonPicInCategoryPage(u16 species, u8 slot, u8 numSlots) bool8 DexScreen_DrawMonPicInCategoryPage(u16 species, u8 slot, u8 numSlots)
@@ -2327,8 +2327,8 @@ bool8 DexScreen_DrawMonPicInCategoryPage(u16 species, u8 slot, u8 numSlots)
template.baseBlock = slot * 40 + 0x108; template.baseBlock = slot * 40 + 0x108;
sPokedexScreenData->categoryMonInfoWindowIds[slot] = AddWindow(&template); sPokedexScreenData->categoryMonInfoWindowIds[slot] = AddWindow(&template);
CopyToWindowPixelBuffer(sPokedexScreenData->categoryMonInfoWindowIds[slot], sCategoryMonInfoBgTiles, 0, 0); CopyToWindowPixelBuffer(sPokedexScreenData->categoryMonInfoWindowIds[slot], sCategoryMonInfoBgTiles, 0, 0);
DexScreen_PrintMonDexNo(sPokedexScreenData->categoryMonInfoWindowIds[slot], FONT_0, species, 12, 0); DexScreen_PrintMonDexNo(sPokedexScreenData->categoryMonInfoWindowIds[slot], FONT_SMALL, species, 12, 0);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->categoryMonInfoWindowIds[slot], FONT_2, gSpeciesNames[species], 2, 13, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->categoryMonInfoWindowIds[slot], FONT_NORMAL, gSpeciesNames[species], 2, 13, 0);
if (DexScreen_GetSetPokedexFlag(species, FLAG_GET_CAUGHT, TRUE)) if (DexScreen_GetSetPokedexFlag(species, FLAG_GET_CAUGHT, TRUE))
BlitBitmapRectToWindow(sPokedexScreenData->categoryMonInfoWindowIds[slot], sDexScreen_CaughtIcon, 0, 0, 8, 8, 2, 3, 8, 8); BlitBitmapRectToWindow(sPokedexScreenData->categoryMonInfoWindowIds[slot], sDexScreen_CaughtIcon, 0, 0, 8, 8, 2, 3, 8, 8);
PutWindowTilemap(sPokedexScreenData->categoryMonInfoWindowIds[slot]); PutWindowTilemap(sPokedexScreenData->categoryMonInfoWindowIds[slot]);
@@ -2695,9 +2695,9 @@ void DexScreen_PrintMonCategory(u8 windowId, u16 species, u8 x, u8 y)
categoryStr[index] = EOS; categoryStr[index] = EOS;
DexScreen_AddTextPrinterParameterized(windowId, FONT_0, categoryStr, x, y, 0); DexScreen_AddTextPrinterParameterized(windowId, FONT_SMALL, categoryStr, x, y, 0);
x += GetStringWidth(FONT_0, categoryStr, 0); x += GetStringWidth(FONT_SMALL, categoryStr, 0);
DexScreen_AddTextPrinterParameterized(windowId, FONT_0, gText_PokedexPokemon, x, y, 0); DexScreen_AddTextPrinterParameterized(windowId, FONT_SMALL, gText_PokedexPokemon, x, y, 0);
} }
void DexScreen_PrintMonHeight(u8 windowId, u16 species, u8 x, u8 y) void DexScreen_PrintMonHeight(u8 windowId, u16 species, u8 x, u8 y)
@@ -2752,9 +2752,9 @@ void DexScreen_PrintMonHeight(u8 windowId, u16 species, u8 x, u8 y)
} }
buffer[i++] = EOS; buffer[i++] = EOS;
DexScreen_AddTextPrinterParameterized(windowId, FONT_0, labelText, x, y, 0); DexScreen_AddTextPrinterParameterized(windowId, FONT_SMALL, labelText, x, y, 0);
x += 30; x += 30;
DexScreen_AddTextPrinterParameterized(windowId, FONT_0, buffer, x, y, 0); DexScreen_AddTextPrinterParameterized(windowId, FONT_SMALL, buffer, x, y, 0);
} }
void DexScreen_PrintMonWeight(u8 windowId, u16 species, u8 x, u8 y) void DexScreen_PrintMonWeight(u8 windowId, u16 species, u8 x, u8 y)
@@ -2844,9 +2844,9 @@ void DexScreen_PrintMonWeight(u8 windowId, u16 species, u8 x, u8 y)
buffer[i + j] = lbsText[j]; buffer[i + j] = lbsText[j];
buffer[i + j] = EOS; buffer[i + j] = EOS;
DexScreen_AddTextPrinterParameterized(windowId, FONT_0, labelText, x, y, 0); DexScreen_AddTextPrinterParameterized(windowId, FONT_SMALL, labelText, x, y, 0);
x += 30; x += 30;
DexScreen_AddTextPrinterParameterized(windowId, FONT_0, buffer, x, y, 0); DexScreen_AddTextPrinterParameterized(windowId, FONT_SMALL, buffer, x, y, 0);
} }
void DexScreen_PrintMonFlavorText(u8 windowId, u16 species, u8 x, u8 y) void DexScreen_PrintMonFlavorText(u8 windowId, u16 species, u8 x, u8 y)
@@ -2861,7 +2861,7 @@ void DexScreen_PrintMonFlavorText(u8 windowId, u16 species, u8 x, u8 y)
{ {
printerTemplate.currentChar = gPokedexEntries[species].description; printerTemplate.currentChar = gPokedexEntries[species].description;
printerTemplate.windowId = windowId; printerTemplate.windowId = windowId;
printerTemplate.fontId = FONT_2; printerTemplate.fontId = FONT_NORMAL;
printerTemplate.letterSpacing = 1; printerTemplate.letterSpacing = 1;
printerTemplate.lineSpacing = 0; printerTemplate.lineSpacing = 0;
printerTemplate.unk = 0; printerTemplate.unk = 0;
@@ -2869,7 +2869,7 @@ void DexScreen_PrintMonFlavorText(u8 windowId, u16 species, u8 x, u8 y)
printerTemplate.bgColor = 0; printerTemplate.bgColor = 0;
printerTemplate.shadowColor = 2; printerTemplate.shadowColor = 2;
length = GetStringWidth(FONT_2, gPokedexEntries[species].description, 0); length = GetStringWidth(FONT_NORMAL, gPokedexEntries[species].description, 0);
xCenter = x + (240 - length) / 2; xCenter = x + (240 - length) / 2;
if (xCenter > 0) if (xCenter > 0)
@@ -2937,8 +2937,8 @@ static u8 DexScreen_DrawMonDexPage(bool8 justRegistered)
// Species stats // Species stats
FillWindowPixelBuffer(sPokedexScreenData->windowIds[1], PIXEL_FILL(0)); FillWindowPixelBuffer(sPokedexScreenData->windowIds[1], PIXEL_FILL(0));
DexScreen_PrintMonDexNo(sPokedexScreenData->windowIds[1], FONT_0, sPokedexScreenData->dexSpecies, 0, 8); DexScreen_PrintMonDexNo(sPokedexScreenData->windowIds[1], FONT_SMALL, sPokedexScreenData->dexSpecies, 0, 8);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[1], FONT_2, gSpeciesNames[sPokedexScreenData->dexSpecies], 28, 8, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[1], FONT_NORMAL, gSpeciesNames[sPokedexScreenData->dexSpecies], 28, 8, 0);
DexScreen_PrintMonCategory(sPokedexScreenData->windowIds[1], sPokedexScreenData->dexSpecies, 0, 24); DexScreen_PrintMonCategory(sPokedexScreenData->windowIds[1], sPokedexScreenData->dexSpecies, 0, 24);
DexScreen_PrintMonHeight(sPokedexScreenData->windowIds[1], sPokedexScreenData->dexSpecies, 0, 36); DexScreen_PrintMonHeight(sPokedexScreenData->windowIds[1], sPokedexScreenData->dexSpecies, 0, 36);
DexScreen_PrintMonWeight(sPokedexScreenData->windowIds[1], sPokedexScreenData->dexSpecies, 0, 48); DexScreen_PrintMonWeight(sPokedexScreenData->windowIds[1], sPokedexScreenData->dexSpecies, 0, 48);
@@ -2956,7 +2956,7 @@ static u8 DexScreen_DrawMonDexPage(bool8 justRegistered)
FillWindowPixelBuffer(1, PIXEL_FILL(15)); FillWindowPixelBuffer(1, PIXEL_FILL(15));
if (justRegistered == FALSE) if (justRegistered == FALSE)
{ {
DexScreen_AddTextPrinterParameterized(1, FONT_0, gText_Cry, 8, 2, 4); DexScreen_AddTextPrinterParameterized(1, FONT_SMALL, gText_Cry, 8, 2, 4);
DexScreen_PrintControlInfo(gText_NextDataCancel); DexScreen_PrintControlInfo(gText_NextDataCancel);
} }
else else
@@ -3059,8 +3059,8 @@ u8 DexScreen_DrawMonAreaPage(void)
// Print "Size" // Print "Size"
FillWindowPixelBuffer(sPokedexScreenData->windowIds[9], PIXEL_FILL(0)); FillWindowPixelBuffer(sPokedexScreenData->windowIds[9], PIXEL_FILL(0));
{ {
s32 strWidth = GetStringWidth(FONT_0, gText_Size, 0); s32 strWidth = GetStringWidth(FONT_SMALL, gText_Size, 0);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[9], FONT_0, gText_Size, (sWindowTemplate_AreaMap_Size.width * 8 - strWidth) / 2, 4, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[9], FONT_SMALL, gText_Size, (sWindowTemplate_AreaMap_Size.width * 8 - strWidth) / 2, 4, 0);
} }
PutWindowTilemap(sPokedexScreenData->windowIds[9]); PutWindowTilemap(sPokedexScreenData->windowIds[9]);
CopyWindowToVram(sPokedexScreenData->windowIds[9], COPYWIN_GFX); CopyWindowToVram(sPokedexScreenData->windowIds[9], COPYWIN_GFX);
@@ -3068,8 +3068,8 @@ u8 DexScreen_DrawMonAreaPage(void)
// Print "Area" // Print "Area"
FillWindowPixelBuffer(sPokedexScreenData->windowIds[10], PIXEL_FILL(0)); FillWindowPixelBuffer(sPokedexScreenData->windowIds[10], PIXEL_FILL(0));
{ {
s32 strWidth = GetStringWidth(FONT_0, gText_Area, 0); s32 strWidth = GetStringWidth(FONT_SMALL, gText_Area, 0);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[10], FONT_0, gText_Area, (sWindowTemplate_AreaMap_Area.width * 8 - strWidth) / 2, 4, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[10], FONT_SMALL, gText_Area, (sWindowTemplate_AreaMap_Area.width * 8 - strWidth) / 2, 4, 0);
} }
SetWindowAttribute(sPokedexScreenData->windowIds[10], WINDOW_TILEMAP_TOP, GetWindowAttribute(sPokedexScreenData->windowIds[10], WINDOW_TILEMAP_TOP) + kantoMapVoff); SetWindowAttribute(sPokedexScreenData->windowIds[10], WINDOW_TILEMAP_TOP, GetWindowAttribute(sPokedexScreenData->windowIds[10], WINDOW_TILEMAP_TOP) + kantoMapVoff);
PutWindowTilemap(sPokedexScreenData->windowIds[10]); PutWindowTilemap(sPokedexScreenData->windowIds[10]);
@@ -3077,8 +3077,8 @@ u8 DexScreen_DrawMonAreaPage(void)
// Print species name // Print species name
FillWindowPixelBuffer(sPokedexScreenData->windowIds[8], PIXEL_FILL(0)); FillWindowPixelBuffer(sPokedexScreenData->windowIds[8], PIXEL_FILL(0));
DexScreen_PrintMonDexNo(sPokedexScreenData->windowIds[8], FONT_0, species, 0, 0); DexScreen_PrintMonDexNo(sPokedexScreenData->windowIds[8], FONT_SMALL, species, 0, 0);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[8], FONT_2, gSpeciesNames[species], 3, 12, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[8], FONT_NORMAL, gSpeciesNames[species], 3, 12, 0);
PutWindowTilemap(sPokedexScreenData->windowIds[8]); PutWindowTilemap(sPokedexScreenData->windowIds[8]);
CopyWindowToVram(sPokedexScreenData->windowIds[8], COPYWIN_GFX); CopyWindowToVram(sPokedexScreenData->windowIds[8], COPYWIN_GFX);
@@ -3128,15 +3128,15 @@ u8 DexScreen_DrawMonAreaPage(void)
{ {
BlitBitmapRectToWindow(sPokedexScreenData->windowIds[0], (void *)sBlitTiles_WideEllipse, 0, 0, 88, 16, 4, 28, 88, 16); BlitBitmapRectToWindow(sPokedexScreenData->windowIds[0], (void *)sBlitTiles_WideEllipse, 0, 0, 88, 16, 4, 28, 88, 16);
{ {
s32 strWidth = GetStringWidth(FONT_0, gText_AreaUnknown, 0); s32 strWidth = GetStringWidth(FONT_SMALL, gText_AreaUnknown, 0);
DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[0], FONT_0, gText_AreaUnknown, (96 - strWidth) / 2, 29, 0); DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[0], FONT_SMALL, gText_AreaUnknown, (96 - strWidth) / 2, 29, 0);
} }
} }
CopyWindowToVram(sPokedexScreenData->windowIds[0], COPYWIN_GFX); CopyWindowToVram(sPokedexScreenData->windowIds[0], COPYWIN_GFX);
// Draw the control info // Draw the control info
FillWindowPixelBuffer(1, PIXEL_FILL(15)); FillWindowPixelBuffer(1, PIXEL_FILL(15));
DexScreen_AddTextPrinterParameterized(1, FONT_0, gText_Cry, 8, 2, 4); DexScreen_AddTextPrinterParameterized(1, FONT_SMALL, gText_Cry, 8, 2, 4);
DexScreen_PrintControlInfo(gText_CancelPreviousData); DexScreen_PrintControlInfo(gText_CancelPreviousData);
PutWindowTilemap(1); PutWindowTilemap(1);
CopyWindowToVram(1, COPYWIN_GFX); CopyWindowToVram(1, COPYWIN_GFX);
@@ -3436,13 +3436,13 @@ void DexScreen_PrintStringWithAlignment(const u8 * str, s32 mode)
x = 8; x = 8;
break; break;
case TEXT_CENTER: case TEXT_CENTER:
x = (u32)(240 - GetStringWidth(FONT_2, str, 0)) / 2; x = (u32)(240 - GetStringWidth(FONT_NORMAL, str, 0)) / 2;
break; break;
case TEXT_RIGHT: case TEXT_RIGHT:
default: default:
x = 232 - GetStringWidth(FONT_2, str, 0); x = 232 - GetStringWidth(FONT_NORMAL, str, 0);
break; break;
} }
DexScreen_AddTextPrinterParameterized(0, FONT_2, str, x, 2, 4); DexScreen_AddTextPrinterParameterized(0, FONT_NORMAL, str, x, 2, 4);
} }
src/pokemon_jump.c
+16 -16
View File
@@ -3169,7 +3169,7 @@ static void Msg_WantToPlayAgain(void)
{ {
case 0: case 0:
sPokemonJumpGfx->msgWindowId = AddMessageWindow(1, 8, 20, 2); sPokemonJumpGfx->msgWindowId = AddMessageWindow(1, 8, 20, 2);
AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, gText_WantToPlayAgain2, 0, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, gText_WantToPlayAgain2, 0, 2, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX);
sPokemonJumpGfx->mainState++; sPokemonJumpGfx->mainState++;
break; break;
@@ -3196,7 +3196,7 @@ static void Msg_SavingDontTurnOff(void)
{ {
case 0: case 0:
sPokemonJumpGfx->msgWindowId = AddMessageWindow(2, 7, 26, 4); sPokemonJumpGfx->msgWindowId = AddMessageWindow(2, 7, 26, 4);
AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, gText_SavingDontTurnOffPower, 0, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, gText_SavingDontTurnOffPower, 0, 2, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX);
sPokemonJumpGfx->mainState++; sPokemonJumpGfx->mainState++;
break; break;
@@ -3239,7 +3239,7 @@ static void Msg_SomeoneDroppedOut(void)
{ {
case 0: case 0:
sPokemonJumpGfx->msgWindowId = AddMessageWindow(2, 8, 22, 4); sPokemonJumpGfx->msgWindowId = AddMessageWindow(2, 8, 22, 4);
AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, gText_SomeoneDroppedOut2, 0, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, gText_SomeoneDroppedOut2, 0, 2, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX);
sPokemonJumpGfx->mainState++; sPokemonJumpGfx->mainState++;
break; break;
@@ -3265,7 +3265,7 @@ static void Msg_CommunicationStandby(void)
{ {
case 0: case 0:
sPokemonJumpGfx->msgWindowId = AddMessageWindow(7, 10, 16, 2); sPokemonJumpGfx->msgWindowId = AddMessageWindow(7, 10, 16, 2);
AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, gText_CommunicationStandby4, 0, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, gText_CommunicationStandby4, 0, 2, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX);
sPokemonJumpGfx->mainState++; sPokemonJumpGfx->mainState++;
break; break;
@@ -3358,7 +3358,7 @@ static void PrintPrizeMessage(u16 itemId, u16 quantity)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sPokemonJumpGfx->itemQuantityStr); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sPokemonJumpGfx->itemQuantityStr);
DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_AwesomeWonF701F700); DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_AwesomeWonF701F700);
sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 8, 22, 4); sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 8, 22, 4);
AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX);
sPokemonJumpGfx->fanfare = MUS_LEVEL_UP; sPokemonJumpGfx->fanfare = MUS_LEVEL_UP;
sPokemonJumpGfx->msgWindowState = 0; sPokemonJumpGfx->msgWindowState = 0;
@@ -3371,7 +3371,7 @@ static void PrintPrizeFilledBagMessage(u16 itemId)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName);
DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_FilledStorageSpace2); DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_FilledStorageSpace2);
sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 8, 22, 4); sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 8, 22, 4);
AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX);
sPokemonJumpGfx->fanfare = MUS_DUMMY; sPokemonJumpGfx->fanfare = MUS_DUMMY;
sPokemonJumpGfx->msgWindowState = 0; sPokemonJumpGfx->msgWindowState = 0;
@@ -3384,7 +3384,7 @@ static void PrintNoRoomForPrizeMessage(u16 itemId)
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName);
DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_CantHoldMore); DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_CantHoldMore);
sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 9, 22, 2); sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 9, 22, 2);
AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_NORMAL, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL);
CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX);
sPokemonJumpGfx->fanfare = MUS_DUMMY; sPokemonJumpGfx->fanfare = MUS_DUMMY;
sPokemonJumpGfx->msgWindowState = 0; sPokemonJumpGfx->msgWindowState = 0;
@@ -3493,7 +3493,7 @@ static void CreatePokeJumpYesNoMenu(u16 left, u16 top, u8 cursorPos)
window.paletteNum = 2; window.paletteNum = 2;
window.baseBlock = 0x2B; window.baseBlock = 0x2B;
CreateYesNoMenu(&window, FONT_2, 0, 2, 0x00a, 0xD, a); CreateYesNoMenu(&window, FONT_NORMAL, 0, 2, 0x00a, 0xD, a);
} }
// "Points" for jump score and "times" for number of jumps in a row // "Points" for jump score and "times" for number of jumps in a row
@@ -3505,8 +3505,8 @@ static void PrintScoreSuffixes(void)
PutWindowTilemap(WIN_TIMES); PutWindowTilemap(WIN_TIMES);
FillWindowPixelBuffer(WIN_POINTS, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_POINTS, PIXEL_FILL(0));
FillWindowPixelBuffer(WIN_TIMES, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_TIMES, PIXEL_FILL(0));
AddTextPrinterParameterized3(WIN_POINTS, FONT_0, 0, 2, color, 0, gText_SpacePoints2); AddTextPrinterParameterized3(WIN_POINTS, FONT_SMALL, 0, 2, color, 0, gText_SpacePoints2);
AddTextPrinterParameterized3(WIN_TIMES, FONT_0, 0, 2, color, 0, gText_SpaceTimes3); AddTextPrinterParameterized3(WIN_TIMES, FONT_SMALL, 0, 2, color, 0, gText_SpaceTimes3);
} }
// The venusaurs in the background are actually an empty 256x512 bg with 3 pairs of venusaurs on it. // The venusaurs in the background are actually an empty 256x512 bg with 3 pairs of venusaurs on it.
@@ -3726,9 +3726,9 @@ static void PrintPokeJumpPlayerName(int multiplayerId, u8 bgColor, u8 fgColor, u
u8 colors[3] = {bgColor, fgColor, shadow}; u8 colors[3] = {bgColor, fgColor, shadow};
FillWindowPixelBuffer(sPokemonJumpGfx->nameWindowIds[multiplayerId], PIXEL_FILL(0)); FillWindowPixelBuffer(sPokemonJumpGfx->nameWindowIds[multiplayerId], PIXEL_FILL(0));
x = 64 - GetStringWidth(FONT_0, GetPokeJumpPlayerName(multiplayerId), -1); x = 64 - GetStringWidth(FONT_SMALL, GetPokeJumpPlayerName(multiplayerId), -1);
x /= 2; x /= 2;
AddTextPrinterParameterized3(sPokemonJumpGfx->nameWindowIds[multiplayerId], FONT_0, x, 2, colors, TEXT_SKIP_DRAW, GetPokeJumpPlayerName(multiplayerId)); AddTextPrinterParameterized3(sPokemonJumpGfx->nameWindowIds[multiplayerId], FONT_SMALL, x, 2, colors, TEXT_SKIP_DRAW, GetPokeJumpPlayerName(multiplayerId));
CopyWindowToVram(sPokemonJumpGfx->nameWindowIds[multiplayerId], COPYWIN_GFX); CopyWindowToVram(sPokemonJumpGfx->nameWindowIds[multiplayerId], COPYWIN_GFX);
} }
@@ -4557,14 +4557,14 @@ static void PrintRecordsText(u16 windowId)
LoadStdWindowGfx(windowId, 0x21D, 0xD0); LoadStdWindowGfx(windowId, 0x21D, 0xD0);
DrawTextBorderOuter(windowId, 0x21D, 0xD); DrawTextBorderOuter(windowId, 0x21D, 0xD);
FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
AddTextPrinterParameterized5(windowId, FONT_2, gText_PkmnJumpRecords, 0, 0, TEXT_SKIP_DRAW, NULL, 1, 0); AddTextPrinterParameterized5(windowId, FONT_NORMAL, gText_PkmnJumpRecords, 0, 0, TEXT_SKIP_DRAW, NULL, 1, 0);
for (i = 0; i < ARRAY_COUNT(sRecordsTexts); i++) for (i = 0; i < ARRAY_COUNT(sRecordsTexts); i++)
{ {
AddTextPrinterParameterized5(windowId, FONT_2, sRecordsTexts[i], 0, 20 + (i * 14), TEXT_SKIP_DRAW, NULL, 1, 0); AddTextPrinterParameterized5(windowId, FONT_NORMAL, sRecordsTexts[i], 0, 20 + (i * 14), TEXT_SKIP_DRAW, NULL, 1, 0);
ConvertIntToDecimalStringN(strbuf, recordNums[i], STR_CONV_MODE_LEFT_ALIGN, 5); ConvertIntToDecimalStringN(strbuf, recordNums[i], STR_CONV_MODE_LEFT_ALIGN, 5);
TruncateToFirstWordOnly(strbuf); TruncateToFirstWordOnly(strbuf);
x = 0xDE - GetStringWidth(FONT_2, strbuf, 0); x = 0xDE - GetStringWidth(FONT_NORMAL, strbuf, 0);
AddTextPrinterParameterized5(windowId, FONT_2, strbuf, x, 20 + (i * 14), TEXT_SKIP_DRAW, NULL, 0, 0); AddTextPrinterParameterized5(windowId, FONT_NORMAL, strbuf, x, 20 + (i * 14), TEXT_SKIP_DRAW, NULL, 0, 0);
} }
PutWindowTilemap(windowId); PutWindowTilemap(windowId);
} }
src/pokemon_special_anim_scene.c
+8 -8
View File
@@ -415,10 +415,10 @@ void PSA_PrintMessage(u8 messageId)
DynamicPlaceholderTextUtil_ExpandPlaceholders(scene->textBuf, gText_MonLearnedTMHM); DynamicPlaceholderTextUtil_ExpandPlaceholders(scene->textBuf, gText_MonLearnedTMHM);
break; break;
case 4: case 4:
strWidth += GetStringWidth(FONT_2, gText_Counting_2And, -1); strWidth += GetStringWidth(FONT_NORMAL, gText_Counting_2And, -1);
// fallthrough // fallthrough
case 3: case 3:
strWidth += GetStringWidth(FONT_2, gText_Counting_1, -1); strWidth += GetStringWidth(FONT_NORMAL, gText_Counting_1, -1);
// fallthrough // fallthrough
case 2: // 1 case 2: // 1
StringCopy(scene->textBuf, s1_2_and_Poof_textPtrs[messageId - 2]); StringCopy(scene->textBuf, s1_2_and_Poof_textPtrs[messageId - 2]);
@@ -443,7 +443,7 @@ void PSA_PrintMessage(u8 messageId)
return; return;
} }
AddTextPrinterParameterized5(0, FONT_2, scene->textBuf, strWidth, 0, textSpeed, NULL, 0, 4); AddTextPrinterParameterized5(0, FONT_NORMAL, scene->textBuf, strWidth, 0, textSpeed, NULL, 0, 4);
} }
void PSA_AfterPoof_ClearMessageWindow(void) void PSA_AfterPoof_ClearMessageWindow(void)
@@ -1513,13 +1513,13 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *beforeStats, u16 *afterStats, u8 bg
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
{ {
AddTextPrinterParameterized3(windowId, FONT_2, 0, i * 15, textColor, TEXT_SKIP_DRAW, sLevelUpWindowStatNames[i]); AddTextPrinterParameterized3(windowId, FONT_NORMAL, 0, i * 15, textColor, TEXT_SKIP_DRAW, sLevelUpWindowStatNames[i]);
StringCopy(textbuf, diffStats[i] >= 0 ? gText_LevelUp_Plus : gText_LevelUp_Minus); StringCopy(textbuf, diffStats[i] >= 0 ? gText_LevelUp_Plus : gText_LevelUp_Minus);
AddTextPrinterParameterized3(windowId, FONT_2, 56, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); AddTextPrinterParameterized3(windowId, FONT_NORMAL, 56, i * 15, textColor, TEXT_SKIP_DRAW, textbuf);
textbuf[0] = CHAR_SPACE; textbuf[0] = CHAR_SPACE;
x = abs(diffStats[i]) < 10 ? 12 : 6; x = abs(diffStats[i]) < 10 ? 12 : 6;
ConvertIntToDecimalStringN(textbuf + 1, abs(diffStats[i]), STR_CONV_MODE_LEFT_ALIGN, 2); ConvertIntToDecimalStringN(textbuf + 1, abs(diffStats[i]), STR_CONV_MODE_LEFT_ALIGN, 2);
AddTextPrinterParameterized3(windowId, FONT_2, x + 56, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); AddTextPrinterParameterized3(windowId, FONT_NORMAL, x + 56, i * 15, textColor, TEXT_SKIP_DRAW, textbuf);
} }
} }
@@ -1555,7 +1555,7 @@ void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgColor, u8 fgColor,
ndigits = 1; ndigits = 1;
ConvertIntToDecimalStringN(textbuf, statsRearrange[i], STR_CONV_MODE_LEFT_ALIGN, ndigits); ConvertIntToDecimalStringN(textbuf, statsRearrange[i], STR_CONV_MODE_LEFT_ALIGN, ndigits);
x = 6 * (4 - ndigits); x = 6 * (4 - ndigits);
AddTextPrinterParameterized3(windowId, FONT_2, 0, i * 15, textColor, TEXT_SKIP_DRAW, sLevelUpWindowStatNames[i]); AddTextPrinterParameterized3(windowId, FONT_NORMAL, 0, i * 15, textColor, TEXT_SKIP_DRAW, sLevelUpWindowStatNames[i]);
AddTextPrinterParameterized3(windowId, FONT_2, 56 + x, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); AddTextPrinterParameterized3(windowId, FONT_NORMAL, 56 + x, i * 15, textColor, TEXT_SKIP_DRAW, textbuf);
} }
} }
src/pokemon_storage_system_data.c
+2 -2
View File
@@ -2108,8 +2108,8 @@ void AddMenu(void)
gStorage->menuWindowId = AddWindow(&gStorage->menuWindow); gStorage->menuWindowId = AddWindow(&gStorage->menuWindow);
ClearWindowTilemap(gStorage->menuWindowId); ClearWindowTilemap(gStorage->menuWindowId);
DrawStdFrameWithCustomTileAndPalette(gStorage->menuWindowId, FALSE, 11, 14); DrawStdFrameWithCustomTileAndPalette(gStorage->menuWindowId, FALSE, 11, 14);
PrintTextArray(gStorage->menuWindowId, FONT_1, 8, 2, 16, gStorage->menuItemsCount, (void *)gStorage->menuItems); PrintTextArray(gStorage->menuWindowId, FONT_NORMAL_COPY_1, 8, 2, 16, gStorage->menuItemsCount, (void *)gStorage->menuItems);
Menu_InitCursor(gStorage->menuWindowId, FONT_1, 0, 2, 16, gStorage->menuItemsCount, 0); Menu_InitCursor(gStorage->menuWindowId, FONT_NORMAL_COPY_1, 0, 2, 16, gStorage->menuItemsCount, 0);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
gStorage->menuUnusedField = 0; gStorage->menuUnusedField = 0;
} }
src/pokemon_storage_system_graphics.c
+1 -1
View File
@@ -1442,7 +1442,7 @@ static void CycleBoxTitleColor(void)
static s16 GetBoxTitleBaseX(const u8 *string) static s16 GetBoxTitleBaseX(const u8 *string)
{ {
return DISPLAY_WIDTH - 64 - GetStringWidth(FONT_1, string, 0) / 2; return DISPLAY_WIDTH - 64 - GetStringWidth(FONT_NORMAL_COPY_1, string, 0) / 2;
} }
// Sprite data for box scroll arrows // Sprite data for box scroll arrows
src/pokemon_storage_system_menu.c
+11 -11
View File
@@ -63,7 +63,7 @@ void DrawTextWindowAndBufferTiles(const u8 *string, void *dst, u8 zero1, u8 zero
txtColor[0] = zero2; txtColor[0] = zero2;
txtColor[1] = TEXT_DYNAMIC_COLOR_6; txtColor[1] = TEXT_DYNAMIC_COLOR_6;
txtColor[2] = TEXT_DYNAMIC_COLOR_5; txtColor[2] = TEXT_DYNAMIC_COLOR_5;
AddTextPrinterParameterized4(windowId, FONT_1, 0, 2, 0, 0, txtColor, -1, string); AddTextPrinterParameterized4(windowId, FONT_NORMAL_COPY_1, 0, 2, 0, 0, txtColor, -1, string);
tileBytesToBuffer = bytesToBuffer; tileBytesToBuffer = bytesToBuffer;
if (tileBytesToBuffer > 6) if (tileBytesToBuffer > 6)
@@ -106,7 +106,7 @@ static void PrintStringToBufferCopyNow(const u8 *string, void *dst, u16 offset,
txtColor[0] = bgColor; txtColor[0] = bgColor;
txtColor[1] = fgColor; txtColor[1] = fgColor;
txtColor[2] = shadowColor; txtColor[2] = shadowColor;
AddTextPrinterParameterized4(windowId, FONT_1, 0, 2, 0, 0, txtColor, -1, string); AddTextPrinterParameterized4(windowId, FONT_NORMAL_COPY_1, 0, 2, 0, 0, txtColor, -1, string);
CpuCopy16(tileData1, dst, var); CpuCopy16(tileData1, dst, var);
CpuCopy16(tileData2, dst + offset, var); CpuCopy16(tileData2, dst + offset, var);
RemoveWindow(windowId); RemoveWindow(windowId);
@@ -250,7 +250,7 @@ static void Task_PCMainMenu(u8 taskId)
LoadStdWindowFrameGfx(); LoadStdWindowFrameGfx();
DrawDialogueFrame(0, FALSE); DrawDialogueFrame(0, FALSE);
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, sMainMenuTexts[task->tSelectedOption].desc, TEXT_SKIP_DRAW, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, TEXT_SKIP_DRAW, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
CopyWindowToVram(task->tWindowId, COPYWIN_FULL); CopyWindowToVram(task->tWindowId, COPYWIN_FULL);
task->tState++; task->tState++;
@@ -275,7 +275,7 @@ static void Task_PCMainMenu(u8 taskId)
{ {
task->tSelectedOption = task->tNextOption; task->tSelectedOption = task->tNextOption;
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
break; break;
case MENU_B_PRESSED: case MENU_B_PRESSED:
@@ -291,14 +291,14 @@ static void Task_PCMainMenu(u8 taskId)
{ {
// Can't withdraw // Can't withdraw
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, gText_PartyFull, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_PartyFull, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_ERROR_MSG; task->tState = STATE_ERROR_MSG;
} }
else if (task->tInput == OPTION_DEPOSIT && CountPartyMons() == 1) else if (task->tInput == OPTION_DEPOSIT && CountPartyMons() == 1)
{ {
// Can't deposit // Can't deposit
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, gText_JustOnePkmn, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_JustOnePkmn, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_ERROR_MSG; task->tState = STATE_ERROR_MSG;
} }
else else
@@ -316,7 +316,7 @@ static void Task_PCMainMenu(u8 taskId)
if (JOY_NEW(A_BUTTON | B_BUTTON)) if (JOY_NEW(A_BUTTON | B_BUTTON))
{ {
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_HANDLE_INPUT; task->tState = STATE_HANDLE_INPUT;
} }
else if (JOY_NEW(DPAD_UP)) else if (JOY_NEW(DPAD_UP))
@@ -326,7 +326,7 @@ static void Task_PCMainMenu(u8 taskId)
Menu_MoveCursor(-1); Menu_MoveCursor(-1);
task->tSelectedOption = Menu_GetCursorPos(); task->tSelectedOption = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_HANDLE_INPUT; task->tState = STATE_HANDLE_INPUT;
} }
else if (JOY_NEW(DPAD_DOWN)) else if (JOY_NEW(DPAD_DOWN))
@@ -336,7 +336,7 @@ static void Task_PCMainMenu(u8 taskId)
Menu_MoveCursor(1); Menu_MoveCursor(1);
task->tSelectedOption = Menu_GetCursorPos(); task->tSelectedOption = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
task->tState = STATE_HANDLE_INPUT; task->tState = STATE_HANDLE_INPUT;
} }
break; break;
@@ -388,8 +388,8 @@ static void CreatePCMainMenu(u8 whichMenu, s16 *windowIdPtr)
s16 windowId = AddWindow(&sWindowTemplate_MainMenu); s16 windowId = AddWindow(&sWindowTemplate_MainMenu);
DrawStdWindowFrame(windowId, FALSE); DrawStdWindowFrame(windowId, FALSE);
PrintTextArray(windowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, 16, ARRAY_COUNT(sMainMenuTexts), (void *)sMainMenuTexts); PrintTextArray(windowId, FONT_NORMAL, GetMenuCursorDimensionByFont(FONT_NORMAL, 0), 2, 16, ARRAY_COUNT(sMainMenuTexts), (void *)sMainMenuTexts);
Menu_InitCursor(windowId, FONT_2, 0, 2, 16, ARRAY_COUNT(sMainMenuTexts), whichMenu); Menu_InitCursor(windowId, FONT_NORMAL, 0, 2, 16, ARRAY_COUNT(sMainMenuTexts), whichMenu);
*windowIdPtr = windowId; *windowIdPtr = windowId;
} }
src/pokemon_storage_system_misc.c
+1 -1
View File
@@ -1147,7 +1147,7 @@ void PrintItemDescription(void)
description = ItemId_GetDescription(gStorage->displayMonItemId); description = ItemId_GetDescription(gStorage->displayMonItemId);
FillWindowPixelBuffer(2, PIXEL_FILL(1)); FillWindowPixelBuffer(2, PIXEL_FILL(1));
AddTextPrinterParameterized5(2, FONT_2, description, 2, 0, 0, NULL, 0, 0); AddTextPrinterParameterized5(2, FONT_NORMAL, description, 2, 0, 0, NULL, 0, 0);
} }
void InitItemInfoWindow(void) void InitItemInfoWindow(void)
src/pokemon_storage_system_tasks.c
+6 -6
View File
@@ -2292,15 +2292,15 @@ static void PrintDisplayMonInfo(void)
if (gStorage->boxOption != OPTION_MOVE_ITEMS) if (gStorage->boxOption != OPTION_MOVE_ITEMS)
{ {
for (i = 0, y = 0; i < 3; i++, y += 14) for (i = 0, y = 0; i < 3; i++, y += 14)
AddTextPrinterParameterized(0, FONT_2, gStorage->displayMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(0, FONT_NORMAL, gStorage->displayMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(0, FONT_0, gStorage->displayMonTexts[3], 6, y + 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(0, FONT_SMALL, gStorage->displayMonTexts[3], 6, y + 2, TEXT_SKIP_DRAW, NULL);
} }
else else
{ {
AddTextPrinterParameterized(0, FONT_0, gStorage->displayMonTexts[3], 6, 0, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(0, FONT_SMALL, gStorage->displayMonTexts[3], 6, 0, TEXT_SKIP_DRAW, NULL);
for (i = 0, y = 15; i < 3; i++, y += 14) for (i = 0, y = 15; i < 3; i++, y += 14)
AddTextPrinterParameterized(0, FONT_2, gStorage->displayMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(0, FONT_NORMAL, gStorage->displayMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL);
} }
CopyWindowToVram(0, COPYWIN_GFX); CopyWindowToVram(0, COPYWIN_GFX);
@@ -2585,7 +2585,7 @@ static void PrintStorageMessage(u8 id)
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStorage->actionText, sMessages[id].text); DynamicPlaceholderTextUtil_ExpandPlaceholders(gStorage->actionText, sMessages[id].text);
FillWindowPixelBuffer(1, PIXEL_FILL(1)); FillWindowPixelBuffer(1, PIXEL_FILL(1));
AddTextPrinterParameterized(1, FONT_1, gStorage->actionText, 0, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(1, FONT_NORMAL_COPY_1, gStorage->actionText, 0, 2, TEXT_SKIP_DRAW, NULL);
DrawTextBorderOuter(1, 2, 13); DrawTextBorderOuter(1, 2, 13);
PutWindowTilemap(1); PutWindowTilemap(1);
CopyWindowToVram(1, COPYWIN_GFX); CopyWindowToVram(1, COPYWIN_GFX);
@@ -2594,7 +2594,7 @@ static void PrintStorageMessage(u8 id)
static void ShowYesNoWindow(s8 cursorPos) static void ShowYesNoWindow(s8 cursorPos)
{ {
CreateYesNoMenu(&sYesNoWindowTemplate, FONT_1, 0, 2, 11, 14, 1); CreateYesNoMenu(&sYesNoWindowTemplate, FONT_NORMAL_COPY_1, 0, 2, 11, 14, 1);
Menu_MoveCursorNoWrapAround(cursorPos); Menu_MoveCursorNoWrapAround(cursorPos);
} }
src/pokemon_summary_screen.c
+38 -38
View File
@@ -2405,7 +2405,7 @@ static void PokeSum_FinishSetup(void)
static void PokeSum_PrintPageName(const u8 * str) static void PokeSum_PrintPageName(const u8 * str)
{ {
FillWindowPixelBuffer(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME], 0); FillWindowPixelBuffer(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME], 0);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME], FONT_2, 4, 1, sLevelNickTextColors[1], 0, str); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME], FONT_NORMAL, 4, 1, sLevelNickTextColors[1], 0, str);
PutWindowTilemap(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME]); PutWindowTilemap(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME]);
} }
@@ -2416,9 +2416,9 @@ static void PokeSum_PrintControlsString(const u8 * str)
u8 r1; u8 r1;
FillWindowPixelBuffer(sMonSummaryScreen->windowIds[POKESUM_WIN_CONTROLS], 0); FillWindowPixelBuffer(sMonSummaryScreen->windowIds[POKESUM_WIN_CONTROLS], 0);
width = GetStringWidth(FONT_0, str, 0); width = GetStringWidth(FONT_SMALL, str, 0);
r1 = sMonSummaryScreen->windowIds[POKESUM_WIN_CONTROLS]; r1 = sMonSummaryScreen->windowIds[POKESUM_WIN_CONTROLS];
AddTextPrinterParameterized3(r1, FONT_0, 0x54 - width, 0, sLevelNickTextColors[1], 0, str); AddTextPrinterParameterized3(r1, FONT_SMALL, 0x54 - width, 0, sLevelNickTextColors[1], 0, str);
PutWindowTilemap(sMonSummaryScreen->windowIds[POKESUM_WIN_CONTROLS]); PutWindowTilemap(sMonSummaryScreen->windowIds[POKESUM_WIN_CONTROLS]);
} }
@@ -2431,12 +2431,12 @@ static void PrintMonLevelNickOnWindow2(const u8 * str)
if (sMonSummaryScreen->curPageIndex != PSS_PAGE_MOVES_INFO) if (sMonSummaryScreen->curPageIndex != PSS_PAGE_MOVES_INFO)
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2, 4, 2, sLevelNickTextColors[1], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.levelStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2, 4, 2, sLevelNickTextColors[1], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.levelStrBuf);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], FONT_2, 40, 2, sLevelNickTextColors[1], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.nicknameStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], FONT_NORMAL, 40, 2, sLevelNickTextColors[1], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.nicknameStrBuf);
if (GetMonGender(&sMonSummaryScreen->currentMon) == MON_FEMALE) if (GetMonGender(&sMonSummaryScreen->currentMon) == MON_FEMALE)
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], FONT_2, 105, 2, sLevelNickTextColors[3], 0, sMonSummaryScreen->summary.genderSymbolStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], FONT_NORMAL, 105, 2, sLevelNickTextColors[3], 0, sMonSummaryScreen->summary.genderSymbolStrBuf);
else else
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], FONT_2, 105, 2, sLevelNickTextColors[2], 0, sMonSummaryScreen->summary.genderSymbolStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], FONT_NORMAL, 105, 2, sLevelNickTextColors[2], 0, sMonSummaryScreen->summary.genderSymbolStrBuf);
} }
PutWindowTilemap(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK]); PutWindowTilemap(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK]);
@@ -2465,14 +2465,14 @@ static void PokeSum_PrintRightPaneText(void)
static void PrintInfoPage(void) static void PrintInfoPage(void)
{ {
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 47, 19, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.speciesNameStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 47, 19, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.speciesNameStrBuf);
if (!sMonSummaryScreen->isEgg) if (!sMonSummaryScreen->isEgg)
{ {
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 47 + sMonSkillsPrinterXpos->unk00, 5, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.dexNumStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 47 + sMonSkillsPrinterXpos->unk00, 5, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.dexNumStrBuf);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 47, 49, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.otNameStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 47, 49, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.otNameStrBuf);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 47, 64, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.unk306C); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 47, 64, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.unk306C);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 47, 79, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.itemNameStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 47, 79, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.itemNameStrBuf);
} }
else else
{ {
@@ -2493,20 +2493,20 @@ static void PrintInfoPage(void)
if (sMonSummaryScreen->isBadEgg) if (sMonSummaryScreen->isBadEgg)
hatchMsgIndex = 0; hatchMsgIndex = 0;
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 7, 45, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sEggHatchTimeTexts[hatchMsgIndex]); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 7, 45, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sEggHatchTimeTexts[hatchMsgIndex]);
} }
} }
static void PrintSkillsPage(void) static void PrintSkillsPage(void)
{ {
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 14 + sMonSkillsPrinterXpos->curHpStr, 4, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.curHpStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 14 + sMonSkillsPrinterXpos->curHpStr, 4, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.curHpStrBuf);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 50 + sMonSkillsPrinterXpos->atkStr, 22, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_ATK]); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 50 + sMonSkillsPrinterXpos->atkStr, 22, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_ATK]);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 50 + sMonSkillsPrinterXpos->defStr, 35, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_DEF]); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 50 + sMonSkillsPrinterXpos->defStr, 35, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_DEF]);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 50 + sMonSkillsPrinterXpos->spAStr, 48, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPA]); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 50 + sMonSkillsPrinterXpos->spAStr, 48, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPA]);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 50 + sMonSkillsPrinterXpos->spDStr, 61, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPD]); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 50 + sMonSkillsPrinterXpos->spDStr, 61, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPD]);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 50 + sMonSkillsPrinterXpos->speStr, 74, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPE]); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 50 + sMonSkillsPrinterXpos->speStr, 74, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPE]);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 15 + sMonSkillsPrinterXpos->expStr, 87, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.expPointsStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 15 + sMonSkillsPrinterXpos->expStr, 87, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.expPointsStrBuf);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 15 + sMonSkillsPrinterXpos->toNextLevel, 100, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.expToNextLevelStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 15 + sMonSkillsPrinterXpos->toNextLevel, 100, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.expToNextLevelStrBuf);
} }
#define GetMoveNamePrinterYpos(x) ((x) * 28 + 5) #define GetMoveNamePrinterYpos(x) ((x) * 28 + 5)
@@ -2524,7 +2524,7 @@ static void PrintMovesPage(void)
if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
PokeSum_PrintMoveName(4); PokeSum_PrintMoveName(4);
else else
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL,
3, GetMoveNamePrinterYpos(4), 3, GetMoveNamePrinterYpos(4),
sPrintMoveTextColors[0], TEXT_SKIP_DRAW, gFameCheckerText_Cancel); sPrintMoveTextColors[0], TEXT_SKIP_DRAW, gFameCheckerText_Cancel);
} }
@@ -2541,7 +2541,7 @@ static void PokeSum_PrintMoveName(u8 i)
if (i == 4) if (i == 4)
curPP = maxPP; curPP = maxPP;
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 3, GetMoveNamePrinterYpos(i), sPrintMoveTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveNameStrBufs[i]); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 3, GetMoveNamePrinterYpos(i), sPrintMoveTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveNameStrBufs[i]);
if (sMonSummaryScreen->moveIds[i] == 0 || (curPP == maxPP)) if (sMonSummaryScreen->moveIds[i] == 0 || (curPP == maxPP))
colorIdx = 0; colorIdx = 0;
@@ -2567,14 +2567,14 @@ static void PokeSum_PrintMoveName(u8 i)
colorIdx = 1; colorIdx = 1;
} }
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 36, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 36, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW,
gText_PokeSum_PP); gText_PokeSum_PP);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 46 + sMonSkillsPrinterXpos->curPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveCurPpStrBufs[i]); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 46 + sMonSkillsPrinterXpos->curPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveCurPpStrBufs[i]);
if (sMonSummaryScreen->moveIds[i] != MOVE_NONE) if (sMonSummaryScreen->moveIds[i] != MOVE_NONE)
{ {
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 58, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, gText_Slash); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 58, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, gText_Slash);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 64 + sMonSkillsPrinterXpos->maxPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveMaxPpStrBufs[i]); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 64 + sMonSkillsPrinterXpos->maxPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveMaxPpStrBufs[i]);
} }
} }
@@ -2679,7 +2679,7 @@ static void PokeSum_PrintTrainerMemo_Mon_HeldByOT(void)
} }
} }
AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr);
} }
static void PokeSum_PrintTrainerMemo_Mon_NotHeldByOT(void) static void PokeSum_PrintTrainerMemo_Mon_NotHeldByOT(void)
@@ -2728,7 +2728,7 @@ static void PokeSum_PrintTrainerMemo_Mon_NotHeldByOT(void)
DynamicPlaceholderTextUtil_ExpandPlaceholders(natureMetOrHatchedAtLevelStr, gText_PokeSum_MetInATrade); DynamicPlaceholderTextUtil_ExpandPlaceholders(natureMetOrHatchedAtLevelStr, gText_PokeSum_MetInATrade);
} }
AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr);
return; return;
} }
@@ -2776,7 +2776,7 @@ static void PokeSum_PrintTrainerMemo_Mon_NotHeldByOT(void)
} }
} }
AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr);
} }
static void PokeSum_PrintTrainerMemo_Mon(void) static void PokeSum_PrintTrainerMemo_Mon(void)
@@ -2837,17 +2837,17 @@ static void PokeSum_PrintTrainerMemo_Egg(void)
if (sMonSummaryScreen->isBadEgg) if (sMonSummaryScreen->isBadEgg)
chosenStrIndex = 0; chosenStrIndex = 0;
AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sEggOriginTexts[chosenStrIndex]); AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sEggOriginTexts[chosenStrIndex]);
} }
static void PokeSum_PrintExpPoints_NextLv(void) static void PokeSum_PrintExpPoints_NextLv(void)
{ {
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL,
26, 7, 26, 7,
sLevelNickTextColors[0], TEXT_SKIP_DRAW, sLevelNickTextColors[0], TEXT_SKIP_DRAW,
gText_PokeSum_ExpPoints); gText_PokeSum_ExpPoints);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL,
26, 20, 26, 20,
sLevelNickTextColors[0], TEXT_SKIP_DRAW, sLevelNickTextColors[0], TEXT_SKIP_DRAW,
gText_PokeSum_NextLv); gText_PokeSum_NextLv);
@@ -2860,17 +2860,17 @@ static void PokeSum_PrintSelectedMoveStats(void)
if (sMonSummaryScreen->mode != PSS_MODE_SELECT_MOVE && sMoveSelectionCursorPos == 4) if (sMonSummaryScreen->mode != PSS_MODE_SELECT_MOVE && sMoveSelectionCursorPos == 4)
return; return;
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL,
57, 1, 57, 1,
sLevelNickTextColors[0], TEXT_SKIP_DRAW, sLevelNickTextColors[0], TEXT_SKIP_DRAW,
sMonSummaryScreen->summary.movePowerStrBufs[sMoveSelectionCursorPos]); sMonSummaryScreen->summary.movePowerStrBufs[sMoveSelectionCursorPos]);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL,
57, 15, 57, 15,
sLevelNickTextColors[0], TEXT_SKIP_DRAW, sLevelNickTextColors[0], TEXT_SKIP_DRAW,
sMonSummaryScreen->summary.moveAccuracyStrBufs[sMoveSelectionCursorPos]); sMonSummaryScreen->summary.moveAccuracyStrBufs[sMoveSelectionCursorPos]);
AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL,
7, 42, 7, 42,
0, 0, 0, 0,
sLevelNickTextColors[0], TEXT_SKIP_DRAW, sLevelNickTextColors[0], TEXT_SKIP_DRAW,
@@ -2900,10 +2900,10 @@ static void PokeSum_PrintAbilityNameAndDesc(void)
{ {
FillWindowPixelBuffer(sMonSummaryScreen->windowIds[5], 0); FillWindowPixelBuffer(sMonSummaryScreen->windowIds[5], 0);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], FONT_2, AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], FONT_NORMAL,
66, 1, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.abilityNameStrBuf); 66, 1, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.abilityNameStrBuf);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], FONT_2, AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], FONT_NORMAL,
2, 15, sLevelNickTextColors[0], TEXT_SKIP_DRAW, 2, 15, sLevelNickTextColors[0], TEXT_SKIP_DRAW,
sMonSummaryScreen->summary.abilityDescStrBuf); sMonSummaryScreen->summary.abilityDescStrBuf);
@@ -3893,7 +3893,7 @@ static void Task_InputHandler_SelectOrForgetMove(u8 taskId)
break; break;
case 5: case 5:
FillWindowPixelBuffer(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 0); FillWindowPixelBuffer(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 0);
AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL,
7, 42, 7, 42,
0, 0, 0, 0,
sLevelNickTextColors[0], TEXT_SKIP_DRAW, sLevelNickTextColors[0], TEXT_SKIP_DRAW,
src/quest_log.c
+2 -2
View File
@@ -496,7 +496,7 @@ void DrawPreviouslyOnQuestHeader(u8 sceneNum)
StringAppend(gStringVar4, gStringVar1); StringAppend(gStringVar4, gStringVar1);
} }
AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[0], FONT_2, 2, 2, 1, 2, sTextColors, 0, gStringVar4); AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[0], FONT_NORMAL, 2, 2, 1, 2, sTextColors, 0, gStringVar4);
PutWindowTilemap(sQuestLogHeaderWindowIds[0]); PutWindowTilemap(sQuestLogHeaderWindowIds[0]);
PutWindowTilemap(sQuestLogHeaderWindowIds[1]); PutWindowTilemap(sQuestLogHeaderWindowIds[1]);
CopyWindowToVram(sQuestLogHeaderWindowIds[0], COPYWIN_GFX); CopyWindowToVram(sQuestLogHeaderWindowIds[0], COPYWIN_GFX);
@@ -991,7 +991,7 @@ static void DrawQuestLogSceneDescription(void)
PutWindowTilemap(sQuestLogHeaderWindowIds[2]); PutWindowTilemap(sQuestLogHeaderWindowIds[2]);
sub_8111D90(sQuestLogHeaderWindowIds[2]); sub_8111D90(sQuestLogHeaderWindowIds[2]);
AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[2], FONT_2, 2, sQuestLogTextLineYCoords[numLines], 1, 0, sTextColors, 0, gStringVar4); AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[2], FONT_NORMAL, 2, sQuestLogTextLineYCoords[numLines], 1, 0, sTextColors, 0, gStringVar4);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
} }
src/region_map.c
+6 -6
View File
@@ -1446,7 +1446,7 @@ static void DisplayCurrentMapName(void)
else else
{ {
GetMapName(sRegionMap->mapName, GetMapsecUnderCursor(), 0); GetMapName(sRegionMap->mapName, GetMapsecUnderCursor(), 0);
AddTextPrinterParameterized3(WIN_MAP_NAME, FONT_2, 2, 2, sTextColor_White, 0, sRegionMap->mapName); AddTextPrinterParameterized3(WIN_MAP_NAME, FONT_NORMAL, 2, 2, sTextColor_White, 0, sRegionMap->mapName);
PutWindowTilemap(WIN_MAP_NAME); PutWindowTilemap(WIN_MAP_NAME);
CopyWindowToVram(WIN_MAP_NAME, COPYWIN_GFX); CopyWindowToVram(WIN_MAP_NAME, COPYWIN_GFX);
SetGpuWindowDims(0, &sMapsecNameWindowDims[WIN_MAP_NAME]); SetGpuWindowDims(0, &sMapsecNameWindowDims[WIN_MAP_NAME]);
@@ -1478,7 +1478,7 @@ static void DisplayCurrentDungeonName(void)
sRegionMap->dungeonWinBottom = 48; sRegionMap->dungeonWinBottom = 48;
FillWindowPixelBuffer(WIN_DUNGEON_NAME, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_DUNGEON_NAME, PIXEL_FILL(0));
StringCopy(sRegionMap->dungeonName, sMapNames[descOffset]); StringCopy(sRegionMap->dungeonName, sMapNames[descOffset]);
AddTextPrinterParameterized3(WIN_DUNGEON_NAME, FONT_2, 12, 2, sTextColorTable[GetSelectedMapsecType(LAYER_DUNGEON) - 2], 0, sRegionMap->dungeonName); AddTextPrinterParameterized3(WIN_DUNGEON_NAME, FONT_NORMAL, 12, 2, sTextColorTable[GetSelectedMapsecType(LAYER_DUNGEON) - 2], 0, sRegionMap->dungeonName);
PutWindowTilemap(WIN_DUNGEON_NAME); PutWindowTilemap(WIN_DUNGEON_NAME);
CopyWindowToVram(WIN_DUNGEON_NAME, COPYWIN_FULL); CopyWindowToVram(WIN_DUNGEON_NAME, COPYWIN_FULL);
} }
@@ -2060,8 +2060,8 @@ static void Task_DrawDungeonMapPreviewFlavorText(u8 taskId)
// Draw text // Draw text
if (sDungeonMapPreview->timer > 25) if (sDungeonMapPreview->timer > 25)
{ {
AddTextPrinterParameterized3(WIN_MAP_PREVIEW, FONT_2, 4, 0, sTextColor_Green, -1, GetDungeonName(GetDungeonMapsecUnderCursor())); AddTextPrinterParameterized3(WIN_MAP_PREVIEW, FONT_NORMAL, 4, 0, sTextColor_Green, -1, GetDungeonName(GetDungeonMapsecUnderCursor()));
AddTextPrinterParameterized3(WIN_MAP_PREVIEW, FONT_2, 2, 14, sTextColor_White, -1, GetDungeonFlavorText(GetDungeonMapsecUnderCursor())); AddTextPrinterParameterized3(WIN_MAP_PREVIEW, FONT_NORMAL, 2, 14, sTextColor_White, -1, GetDungeonFlavorText(GetDungeonMapsecUnderCursor()));
CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_FULL); CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_FULL);
sDungeonMapPreview->drawState++; sDungeonMapPreview->drawState++;
} }
@@ -3842,7 +3842,7 @@ static void PrintTopBarTextLeft(const u8 *str)
FillWindowPixelBuffer(WIN_TOPBAR_LEFT, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_TOPBAR_LEFT, PIXEL_FILL(0));
else else
FillWindowPixelBuffer(WIN_TOPBAR_LEFT, PIXEL_FILL(15)); FillWindowPixelBuffer(WIN_TOPBAR_LEFT, PIXEL_FILL(15));
AddTextPrinterParameterized3(WIN_TOPBAR_LEFT, FONT_0, 0, 0, sTextColors, 0, str); AddTextPrinterParameterized3(WIN_TOPBAR_LEFT, FONT_SMALL, 0, 0, sTextColors, 0, str);
CopyWindowToVram(WIN_TOPBAR_LEFT, COPYWIN_GFX); CopyWindowToVram(WIN_TOPBAR_LEFT, COPYWIN_GFX);
} }
@@ -3852,7 +3852,7 @@ static void PrintTopBarTextRight(const u8 *str)
FillWindowPixelBuffer(WIN_TOPBAR_RIGHT, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_TOPBAR_RIGHT, PIXEL_FILL(0));
else else
FillWindowPixelBuffer(WIN_TOPBAR_RIGHT, PIXEL_FILL(15)); FillWindowPixelBuffer(WIN_TOPBAR_RIGHT, PIXEL_FILL(15));
AddTextPrinterParameterized3(WIN_TOPBAR_RIGHT, FONT_0, 0, 0, sTextColors, 0, str); AddTextPrinterParameterized3(WIN_TOPBAR_RIGHT, FONT_SMALL, 0, 0, sTextColors, 0, str);
CopyWindowToVram(WIN_TOPBAR_RIGHT, COPYWIN_FULL); CopyWindowToVram(WIN_TOPBAR_RIGHT, COPYWIN_FULL);
} }
src/script_menu.c
+27 -27
View File
@@ -664,7 +664,7 @@ static const u8 *const sSeagallopDestStrings[] = {
static u16 GetStringTilesWide(const u8 *str) static u16 GetStringTilesWide(const u8 *str)
{ {
return (GetStringWidth(FONT_1, str, 0) + 7) / 8; return (GetStringWidth(FONT_NORMAL_COPY_1, str, 0) + 7) / 8;
} }
static u8 GetMenuWidthFromList(const struct MenuAction * items, u8 count) static u8 GetMenuWidthFromList(const struct MenuAction * items, u8 count)
@@ -719,7 +719,7 @@ static void DrawVerticalMultichoiceMenu(u8 left, u8 top, u8 mcId, u8 ignoreBpres
strWidth = 0; strWidth = 0;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
tmp = GetStringWidth(FONT_2, list[i].text, 0); tmp = GetStringWidth(FONT_NORMAL, list[i].text, 0);
if (tmp > strWidth) if (tmp > strWidth)
strWidth = tmp; strWidth = tmp;
} }
@@ -730,10 +730,10 @@ static void DrawVerticalMultichoiceMenu(u8 left, u8 top, u8 mcId, u8 ignoreBpres
windowId = CreateWindowFromRect(left, top, width, height); windowId = CreateWindowFromRect(left, top, width, height);
SetStdWindowBorderStyle(windowId, FALSE); SetStdWindowBorderStyle(windowId, FALSE);
if (mcId == 30 || mcId == 13 || mcId == 41) if (mcId == 30 || mcId == 13 || mcId == 41)
MultichoiceList_PrintItems(windowId, FONT_2, 8, 2, 14, count, list, 0, 2); MultichoiceList_PrintItems(windowId, FONT_NORMAL, 8, 2, 14, count, list, 0, 2);
else else
MultichoiceList_PrintItems(windowId, FONT_2, 8, 2, 14, count, list, 0, 2); MultichoiceList_PrintItems(windowId, FONT_NORMAL, 8, 2, 14, count, list, 0, 2);
Menu_InitCursor(windowId, FONT_2, 0, 2, 14, count, initPos); Menu_InitCursor(windowId, FONT_NORMAL, 0, 2, 14, count, initPos);
CreateMCMenuInputHandlerTask(ignoreBpress, count, windowId, mcId); CreateMCMenuInputHandlerTask(ignoreBpress, count, windowId, mcId);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
} }
@@ -827,15 +827,15 @@ static void MultiChoicePrintHelpDescription(u8 mcId)
{ {
case 39: case 39:
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, sDescriptionPtrs_CableClub_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sDescriptionPtrs_CableClub_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break; break;
case 47: case 47:
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break; break;
case 50: case 50:
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, sDescriptionPtrs_WirelessCenter_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sDescriptionPtrs_WirelessCenter_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
break; break;
} }
} }
@@ -910,8 +910,8 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 co
gTasks[taskId].data[4] = a4; gTasks[taskId].data[4] = a4;
gTasks[taskId].data[6] = CreateWindowFromRect(left, top, width * columnCount, rowCount * 2); gTasks[taskId].data[6] = CreateWindowFromRect(left, top, width * columnCount, rowCount * 2);
SetStdWindowBorderStyle(gTasks[taskId].data[6], FALSE); SetStdWindowBorderStyle(gTasks[taskId].data[6], FALSE);
MultichoiceGrid_PrintItems(gTasks[taskId].data[6], FONT_1, width * 8, 16, columnCount, rowCount, list); MultichoiceGrid_PrintItems(gTasks[taskId].data[6], FONT_NORMAL_COPY_1, width * 8, 16, columnCount, rowCount, list);
MultichoiceGrid_InitCursor(gTasks[taskId].data[6], FONT_1, 0, 1, width * 8, columnCount, rowCount, 0); MultichoiceGrid_InitCursor(gTasks[taskId].data[6], FONT_NORMAL_COPY_1, 0, 1, width * 8, columnCount, rowCount, 0);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
} }
return TRUE; return TRUE;
@@ -951,8 +951,8 @@ bool8 CreatePCMenu(void)
static void CreatePCMenuWindow(void) static void CreatePCMenuWindow(void)
{ {
u8 cursorWidth = GetMenuCursorDimensionByFont(FONT_2, 0); u8 cursorWidth = GetMenuCursorDimensionByFont(FONT_NORMAL, 0);
u8 height = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT); u8 height = GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT);
u8 windowWidth; u8 windowWidth;
u8 nitems; u8 nitems;
u8 windowId; u8 windowId;
@@ -974,9 +974,9 @@ static void CreatePCMenuWindow(void)
nitems = 5; nitems = 5;
windowId = CreateWindowFromRect(0, 0, windowWidth, 10); windowId = CreateWindowFromRect(0, 0, windowWidth, 10);
SetStdWindowBorderStyle(windowId, FALSE); SetStdWindowBorderStyle(windowId, FALSE);
AddTextPrinterParameterized(windowId, FONT_2, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL);
AddTextPrinterParameterized(windowId, FONT_2, gText_HallOfFame_2, cursorWidth, 50, 0xFF, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_HallOfFame_2, cursorWidth, 50, 0xFF, NULL);
AddTextPrinterParameterized(windowId, FONT_2, gText_LogOff, cursorWidth, 66, 0xFF, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_LogOff, cursorWidth, 66, 0xFF, NULL);
} }
else else
{ {
@@ -987,16 +987,16 @@ static void CreatePCMenuWindow(void)
windowId = CreateWindowFromRect(0, 0, windowWidth, nitems * 2); windowId = CreateWindowFromRect(0, 0, windowWidth, nitems * 2);
SetStdWindowBorderStyle(windowId, FALSE); SetStdWindowBorderStyle(windowId, FALSE);
if (FlagGet(FLAG_SYS_POKEDEX_GET)) if (FlagGet(FLAG_SYS_POKEDEX_GET))
AddTextPrinterParameterized(windowId, FONT_2, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL);
AddTextPrinterParameterized(windowId, FONT_2, gText_LogOff, cursorWidth, 2 + 16 * (nitems - 1), 0xFF, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_LogOff, cursorWidth, 2 + 16 * (nitems - 1), 0xFF, NULL);
} }
if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC)) if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC))
AddTextPrinterParameterized(windowId, FONT_2, gText_BillSPc, cursorWidth, 2 , 0xFF, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_BillSPc, cursorWidth, 2 , 0xFF, NULL);
else else
AddTextPrinterParameterized(windowId, FONT_2, gText_SomeoneSPc, cursorWidth, 2 , 0xFF, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_SomeoneSPc, cursorWidth, 2 , 0xFF, NULL);
StringExpandPlaceholders(gStringVar4, gText_SPc); StringExpandPlaceholders(gStringVar4, gText_SPc);
Menu_PrintFormatIntlPlayerName(windowId, gStringVar4, cursorWidth, 18); Menu_PrintFormatIntlPlayerName(windowId, gStringVar4, cursorWidth, 18);
Menu_InitCursor(windowId, FONT_2, 0, 2, 16, nitems, 0); Menu_InitCursor(windowId, FONT_NORMAL, 0, 2, 16, nitems, 0);
CreateMCMenuInputHandlerTask(FALSE, nitems, windowId, 0xFF); CreateMCMenuInputHandlerTask(FALSE, nitems, windowId, 0xFF);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
} }
@@ -1004,7 +1004,7 @@ static void CreatePCMenuWindow(void)
void ScriptMenu_DisplayPCStartupPrompt(void) void ScriptMenu_DisplayPCStartupPrompt(void)
{ {
LoadMessageBoxAndFrameGfx(0, TRUE); LoadMessageBoxAndFrameGfx(0, TRUE);
AddTextPrinterParameterized2(0, FONT_2, Text_AccessWhichPC, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, Text_AccessWhichPC, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
} }
static void Task_ScriptShowMonPic(u8 taskId) static void Task_ScriptShowMonPic(u8 taskId)
@@ -1222,24 +1222,24 @@ void DrawSeagallopDestinationMenu(void)
nitems = 6; nitems = 6;
top = 0; top = 0;
} }
cursorWidth = GetMenuCursorDimensionByFont(FONT_2, 0); cursorWidth = GetMenuCursorDimensionByFont(FONT_NORMAL, 0);
fontHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT); fontHeight = GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT);
windowId = CreateWindowFromRect(17, top, 11, nitems * 2); windowId = CreateWindowFromRect(17, top, 11, nitems * 2);
SetStdWindowBorderStyle(windowId, FALSE); SetStdWindowBorderStyle(windowId, FALSE);
for (i = 0; i < nitems - 2; i++) for (i = 0; i < nitems - 2; i++)
{ {
if (r4 != gSpecialVar_0x8004) if (r4 != gSpecialVar_0x8004)
AddTextPrinterParameterized(windowId, FONT_2, sSeagallopDestStrings[r4], cursorWidth, i * 16 + 2, 0xFF, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, sSeagallopDestStrings[r4], cursorWidth, i * 16 + 2, 0xFF, NULL);
else else
i--; i--;
r4++; r4++;
if (r4 == SEAGALLOP_CINNABAR_ISLAND) if (r4 == SEAGALLOP_CINNABAR_ISLAND)
r4 = SEAGALLOP_VERMILION_CITY; r4 = SEAGALLOP_VERMILION_CITY;
} }
AddTextPrinterParameterized(windowId, FONT_2, gText_Other, cursorWidth, i * 16 + 2, 0xFF, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_Other, cursorWidth, i * 16 + 2, 0xFF, NULL);
i++; i++;
AddTextPrinterParameterized(windowId, FONT_2, gOtherText_Exit, cursorWidth, i * 16 + 2, 0xFF, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gOtherText_Exit, cursorWidth, i * 16 + 2, 0xFF, NULL);
Menu_InitCursor(windowId, FONT_2, 0, 2, 16, nitems, 0); Menu_InitCursor(windowId, FONT_NORMAL, 0, 2, 16, nitems, 0);
CreateMCMenuInputHandlerTask(FALSE, nitems, windowId, 0xFF); CreateMCMenuInputHandlerTask(FALSE, nitems, windowId, 0xFF);
ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(0);
} }
src/shop.c
+17 -17
View File
@@ -218,14 +218,14 @@ static u8 CreateShopMenu(u8 a0)
gShopData.martType = GetMartTypeFromItemList(a0); gShopData.martType = GetMartTypeFromItemList(a0);
gShopData.selectedRow = 0; gShopData.selectedRow = 0;
if (ContextNpcGetTextColor() == NPC_TEXT_COLOR_MALE) if (ContextNpcGetTextColor() == NPC_TEXT_COLOR_MALE)
gShopData.fontId = FONT_4; gShopData.fontId = FONT_MALE;
else else
gShopData.fontId = FONT_5; gShopData.fontId = FONT_FEMALE;
sShopMenuWindowId = AddWindow(&sShopMenuWindowTemplate); sShopMenuWindowId = AddWindow(&sShopMenuWindowTemplate);
SetStdWindowBorderStyle(sShopMenuWindowId, 0); SetStdWindowBorderStyle(sShopMenuWindowId, 0);
PrintTextArray(sShopMenuWindowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, 16, 3, sShopMenuActions_BuySellQuit); PrintTextArray(sShopMenuWindowId, FONT_NORMAL, GetMenuCursorDimensionByFont(FONT_NORMAL, 0), 2, 16, 3, sShopMenuActions_BuySellQuit);
Menu_InitCursor(sShopMenuWindowId, FONT_2, 0, 2, 16, 3, 0); Menu_InitCursor(sShopMenuWindowId, FONT_NORMAL, 0, 2, 16, 3, 0);
PutWindowTilemap(sShopMenuWindowId); PutWindowTilemap(sShopMenuWindowId);
CopyWindowToVram(sShopMenuWindowId, COPYWIN_MAP); CopyWindowToVram(sShopMenuWindowId, COPYWIN_MAP);
return CreateTask(Task_ShopMenu, 8); return CreateTask(Task_ShopMenu, 8);
@@ -547,8 +547,8 @@ bool8 BuyMenuBuildListMenuTemplate(void)
gMultiuseListMenuTemplate.upText_Y = 2; gMultiuseListMenuTemplate.upText_Y = 2;
gMultiuseListMenuTemplate.fontId = 2; gMultiuseListMenuTemplate.fontId = 2;
gMultiuseListMenuTemplate.fillValue = 0; gMultiuseListMenuTemplate.fillValue = 0;
gMultiuseListMenuTemplate.cursorPal = GetFontAttribute(FONT_2, FONTATTR_COLOR_FOREGROUND); gMultiuseListMenuTemplate.cursorPal = GetFontAttribute(FONT_NORMAL, FONTATTR_COLOR_FOREGROUND);
gMultiuseListMenuTemplate.cursorShadowPal = GetFontAttribute(FONT_2, FONTATTR_COLOR_SHADOW); gMultiuseListMenuTemplate.cursorShadowPal = GetFontAttribute(FONT_NORMAL, FONTATTR_COLOR_SHADOW);
gMultiuseListMenuTemplate.moveCursorFunc = BuyMenuPrintItemDescriptionAndShowItemIcon; gMultiuseListMenuTemplate.moveCursorFunc = BuyMenuPrintItemDescriptionAndShowItemIcon;
gMultiuseListMenuTemplate.itemPrintFunc = BuyMenuPrintPriceInList; gMultiuseListMenuTemplate.itemPrintFunc = BuyMenuPrintPriceInList;
gMultiuseListMenuTemplate.scrollMultiple = 0; gMultiuseListMenuTemplate.scrollMultiple = 0;
@@ -597,13 +597,13 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, s
CreateItemMenuIcon(ITEMS_COUNT, gShopData.itemSlot); CreateItemMenuIcon(ITEMS_COUNT, gShopData.itemSlot);
gShopData.itemSlot ^= 1; gShopData.itemSlot ^= 1;
BuyMenuPrint(5, FONT_2, description, 0, 3, 2, 1, 0, 0); BuyMenuPrint(5, FONT_NORMAL, description, 0, 3, 2, 1, 0, 0);
} }
else //TM Mart else //TM Mart
{ {
FillWindowPixelBuffer(6, PIXEL_FILL(0)); FillWindowPixelBuffer(6, PIXEL_FILL(0));
LoadTmHmNameInMart(item); LoadTmHmNameInMart(item);
BuyMenuPrint(5, FONT_2, description, 2, 3, 1, 0, 0, 0); BuyMenuPrint(5, FONT_NORMAL, description, 2, 3, 1, 0, 0, 0);
} }
} }
@@ -620,7 +620,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, u32 item, u8 y)
while (x-- != 0) while (x-- != 0)
*loc++ = 0; *loc++ = 0;
StringExpandPlaceholders(loc, gText_PokedollarVar1); StringExpandPlaceholders(loc, gText_PokedollarVar1);
BuyMenuPrint(windowId, FONT_0, gStringVar4, 0x69, y, 0, 0, TEXT_SKIP_DRAW, 1); BuyMenuPrint(windowId, FONT_SMALL, gStringVar4, 0x69, y, 0, 0, TEXT_SKIP_DRAW, 1);
} }
} }
@@ -631,14 +631,14 @@ static void LoadTmHmNameInMart(s32 item)
ConvertIntToDecimalStringN(gStringVar1, item - ITEM_DEVON_SCOPE, 2, 2); ConvertIntToDecimalStringN(gStringVar1, item - ITEM_DEVON_SCOPE, 2, 2);
StringCopy(gStringVar4, gText_NumberClear01); StringCopy(gStringVar4, gText_NumberClear01);
StringAppend(gStringVar4, gStringVar1); StringAppend(gStringVar4, gStringVar1);
BuyMenuPrint(6, FONT_0, gStringVar4, 0, 0, 0, 0, TEXT_SKIP_DRAW, 1); BuyMenuPrint(6, FONT_SMALL, gStringVar4, 0, 0, 0, 0, TEXT_SKIP_DRAW, 1);
StringCopy(gStringVar4, gMoveNames[ItemIdToBattleMoveId(item)]); StringCopy(gStringVar4, gMoveNames[ItemIdToBattleMoveId(item)]);
BuyMenuPrint(6, FONT_2, gStringVar4, 0, 0x10, 0, 0, 0, 1); BuyMenuPrint(6, FONT_NORMAL, gStringVar4, 0, 0x10, 0, 0, 0, 1);
} }
else else
{ {
BuyMenuPrint(6, FONT_0, gText_ThreeHyphens, 0, 0, 0, 0, TEXT_SKIP_DRAW, 1); BuyMenuPrint(6, FONT_SMALL, gText_ThreeHyphens, 0, 0, 0, 0, TEXT_SKIP_DRAW, 1);
BuyMenuPrint(6, FONT_2, gText_SevenHyphens, 0, 0x10, 0, 0, 0, 1); BuyMenuPrint(6, FONT_NORMAL, gText_SevenHyphens, 0, 0x10, 0, 0, 0, 1);
} }
} }
@@ -656,12 +656,12 @@ static void BuyMenuPrintCursorAtYPosition(u8 y, u8 a1)
{ {
if (a1 == 0xFF) if (a1 == 0xFF)
{ {
FillWindowPixelRect(4, 0, 1, y, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_WIDTH), GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT)); FillWindowPixelRect(4, 0, 1, y, GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_WIDTH), GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT));
CopyWindowToVram(4, COPYWIN_GFX); CopyWindowToVram(4, COPYWIN_GFX);
} }
else else
{ {
BuyMenuPrint(4, FONT_2, gText_SelectorArrow2, 1, y, 0, 0, 0, a1); BuyMenuPrint(4, FONT_NORMAL, gText_SelectorArrow2, 1, y, 0, 0, 0, a1);
} }
} }
@@ -876,7 +876,7 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId)
PrintMoneyAmount(3, 0x36, 0xA, gShopData.itemPrice, TEXT_SKIP_DRAW); PrintMoneyAmount(3, 0x36, 0xA, gShopData.itemPrice, TEXT_SKIP_DRAW);
ConvertIntToDecimalStringN(gStringVar1, tItemCount, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar1, tItemCount, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
BuyMenuPrint(3, FONT_0, gStringVar4, 2, 0xA, 0, 0, 0, 1); BuyMenuPrint(3, FONT_SMALL, gStringVar4, 2, 0xA, 0, 0, 0, 1);
} }
static void Task_BuyMenu(u8 taskId) static void Task_BuyMenu(u8 taskId)
@@ -926,7 +926,7 @@ static void Task_BuyHowManyDialogueInit(u8 taskId)
BuyMenuQuantityBoxThinBorder(1, 0); BuyMenuQuantityBoxThinBorder(1, 0);
ConvertIntToDecimalStringN(gStringVar1, quantityInBag, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, quantityInBag, STR_CONV_MODE_RIGHT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_InBagVar1); StringExpandPlaceholders(gStringVar4, gText_InBagVar1);
BuyMenuPrint(1, FONT_2, gStringVar4, 0, 2, 0, 0, 0, 1); BuyMenuPrint(1, FONT_NORMAL, gStringVar4, 0, 2, 0, 0, 0, 1);
tItemCount = 1; tItemCount = 1;
BuyMenuQuantityBoxNormalBorder(3, 0); BuyMenuQuantityBoxNormalBorder(3, 0);
BuyMenuPrintItemQuantityAndPrice(taskId); BuyMenuPrintItemQuantityAndPrice(taskId);
src/slot_machine.c
+4 -4
View File
@@ -1988,11 +1988,11 @@ static bool8 SlotsTask_GraphicsInit(u8 * state, struct SlotMachineSetupTaskData
FillWindowPixelBuffer(1, 0xFF); FillWindowPixelBuffer(1, 0xFF);
PutWindowTilemap(1); PutWindowTilemap(1);
x = 236 - GetStringWidth(FONT_0, gString_SlotMachineControls, 0); x = 236 - GetStringWidth(FONT_SMALL, gString_SlotMachineControls, 0);
textColor[0] = TEXT_DYNAMIC_COLOR_6; textColor[0] = TEXT_DYNAMIC_COLOR_6;
textColor[1] = TEXT_COLOR_WHITE; textColor[1] = TEXT_COLOR_WHITE;
textColor[2] = TEXT_COLOR_DARK_GRAY; textColor[2] = TEXT_COLOR_DARK_GRAY;
AddTextPrinterParameterized3(1, FONT_0, x, 0, textColor, 0, gString_SlotMachineControls); AddTextPrinterParameterized3(1, FONT_SMALL, x, 0, textColor, 0, gString_SlotMachineControls);
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | 0x20 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON); SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | 0x20 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
@@ -2265,7 +2265,7 @@ static void Slot_PrintOnWindow0(const u8 * str)
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
PutWindowTilemap(0); PutWindowTilemap(0);
DrawTextBorderOuter(0, 0x001, 15); DrawTextBorderOuter(0, 0x001, 15);
AddTextPrinterParameterized5(0, FONT_2, str, 1, 2, TEXT_SKIP_DRAW, NULL, 1, 2); AddTextPrinterParameterized5(0, FONT_NORMAL, str, 1, 2, TEXT_SKIP_DRAW, NULL, 1, 2);
} }
static void Slot_ClearWindow0(void) static void Slot_ClearWindow0(void)
@@ -2387,7 +2387,7 @@ static void SignalStopWinningLineFlashTask(void)
static void Slot_CreateYesNoMenu(u8 cursorPos) static void Slot_CreateYesNoMenu(u8 cursorPos)
{ {
CreateYesNoMenu(&sYesNoWindowTemplate, FONT_2, 0, 2, 10, 13, cursorPos); CreateYesNoMenu(&sYesNoWindowTemplate, FONT_NORMAL, 0, 2, 10, 13, cursorPos);
Menu_MoveCursorNoWrapAround(cursorPos); Menu_MoveCursorNoWrapAround(cursorPos);
GetSlotMachineSetupTaskDataPtr()->yesNoMenuActive = TRUE; GetSlotMachineSetupTaskDataPtr()->yesNoMenuActive = TRUE;
} }
src/start_menu.c
+14 -14
View File
@@ -253,7 +253,7 @@ static void DrawSafariZoneStatsWindow(void)
ConvertIntToDecimalStringN(gStringVar2, 600, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, 600, STR_CONV_MODE_RIGHT_ALIGN, 3);
ConvertIntToDecimalStringN(gStringVar3, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2); ConvertIntToDecimalStringN(gStringVar3, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2);
StringExpandPlaceholders(gStringVar4, gText_MenuSafariStats); StringExpandPlaceholders(gStringVar4, gText_MenuSafariStats);
AddTextPrinterParameterized(sSafariZoneStatsWindowId, FONT_2, gStringVar4, 4, 3, 0xFF, NULL); AddTextPrinterParameterized(sSafariZoneStatsWindowId, FONT_NORMAL, gStringVar4, 4, 3, 0xFF, NULL);
CopyWindowToVram(sSafariZoneStatsWindowId, COPYWIN_GFX); CopyWindowToVram(sSafariZoneStatsWindowId, COPYWIN_GFX);
} }
@@ -279,7 +279,7 @@ static s8 PrintStartMenuItems(s8 *cursor_p, u8 nitems)
else else
{ {
StringExpandPlaceholders(gStringVar4, sStartMenuActionTable[sStartMenuOrder[i]].text); StringExpandPlaceholders(gStringVar4, sStartMenuActionTable[sStartMenuOrder[i]].text);
AddTextPrinterParameterized(GetStartMenuWindowId(), FONT_2, gStringVar4, 8, i * 15, 0xFF, NULL); AddTextPrinterParameterized(GetStartMenuWindowId(), FONT_NORMAL, gStringVar4, 8, i * 15, 0xFF, NULL);
} }
i++; i++;
if (i >= sNumStartMenuItems) if (i >= sNumStartMenuItems)
@@ -318,7 +318,7 @@ static s8 DoDrawStartMenu(void)
sDrawStartMenuState[0]++; sDrawStartMenuState[0]++;
break; break;
case 5: case 5:
sStartMenuCursorPos = Menu_InitCursor(GetStartMenuWindowId(), FONT_2, 0, 0, 15, sNumStartMenuItems, sStartMenuCursorPos); sStartMenuCursorPos = Menu_InitCursor(GetStartMenuWindowId(), FONT_NORMAL, 0, 0, 15, sNumStartMenuItems, sStartMenuCursorPos);
if (!MenuHelpers_IsLinkActive() && InUnionRoom() != TRUE && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_HELP) if (!MenuHelpers_IsLinkActive() && InUnionRoom() != TRUE && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_HELP)
{ {
DrawHelpMessageWindowWithText(sStartMenuDescPointers[sStartMenuOrder[sStartMenuCursorPos]]); DrawHelpMessageWindowWithText(sStartMenuDescPointers[sStartMenuOrder[sStartMenuCursorPos]]);
@@ -909,7 +909,7 @@ static void task50_after_link_battle_save(u8 taskId)
{ {
case 0: case 0:
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, FONT_2, gText_SavingDontTurnOffThePower2, 0xFF, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, gText_SavingDontTurnOffThePower2, 0xFF, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
DrawTextBorderOuter(0, 0x008, 0x0F); DrawTextBorderOuter(0, 0x008, 0x0F);
PutWindowTilemap(0); PutWindowTilemap(0);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
@@ -960,26 +960,26 @@ static void PrintSaveStats(void)
LoadStdWindowGfx(sSaveStatsWindowId, 0x21D, 0xD0); LoadStdWindowGfx(sSaveStatsWindowId, 0x21D, 0xD0);
DrawStdFrameWithCustomTileAndPalette(sSaveStatsWindowId, FALSE, 0x21D, 0x0D); DrawStdFrameWithCustomTileAndPalette(sSaveStatsWindowId, FALSE, 0x21D, 0x0D);
SaveStatToString(SAVE_STAT_LOCATION, gStringVar4, 8); SaveStatToString(SAVE_STAT_LOCATION, gStringVar4, 8);
x = (u32)(112 - GetStringWidth(FONT_2, gStringVar4, -1)) / 2; x = (u32)(112 - GetStringWidth(FONT_NORMAL, gStringVar4, -1)) / 2;
AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_2, x, 0, sTextColor_LocationHeader, -1, gStringVar4); AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_NORMAL, x, 0, sTextColor_LocationHeader, -1, gStringVar4);
x = (u32)(112 - GetStringWidth(FONT_2, gStringVar4, -1)) / 2; x = (u32)(112 - GetStringWidth(FONT_NORMAL, gStringVar4, -1)) / 2;
AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 2, 14, sTextColor_StatName, -1, gSaveStatName_Player); AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_SMALL, 2, 14, sTextColor_StatName, -1, gSaveStatName_Player);
SaveStatToString(SAVE_STAT_NAME, gStringVar4, 2); SaveStatToString(SAVE_STAT_NAME, gStringVar4, 2);
Menu_PrintFormatIntlPlayerName(sSaveStatsWindowId, gStringVar4, 60, 14); Menu_PrintFormatIntlPlayerName(sSaveStatsWindowId, gStringVar4, 60, 14);
AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 2, 28, sTextColor_StatName, -1, gSaveStatName_Badges); AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_SMALL, 2, 28, sTextColor_StatName, -1, gSaveStatName_Badges);
SaveStatToString(SAVE_STAT_BADGES, gStringVar4, 2); SaveStatToString(SAVE_STAT_BADGES, gStringVar4, 2);
AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 60, 28, sTextColor_StatValue, -1, gStringVar4); AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_SMALL, 60, 28, sTextColor_StatValue, -1, gStringVar4);
y = 42; y = 42;
if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
{ {
AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 2, 42, sTextColor_StatName, -1, gSaveStatName_Pokedex); AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_SMALL, 2, 42, sTextColor_StatName, -1, gSaveStatName_Pokedex);
SaveStatToString(SAVE_STAT_POKEDEX, gStringVar4, 2); SaveStatToString(SAVE_STAT_POKEDEX, gStringVar4, 2);
AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 60, 42, sTextColor_StatValue, -1, gStringVar4); AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_SMALL, 60, 42, sTextColor_StatValue, -1, gStringVar4);
y = 56; y = 56;
} }
AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 2, y, sTextColor_StatName, -1, gSaveStatName_Time); AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_SMALL, 2, y, sTextColor_StatName, -1, gSaveStatName_Time);
SaveStatToString(SAVE_STAT_TIME, gStringVar4, 2); SaveStatToString(SAVE_STAT_TIME, gStringVar4, 2);
AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 60, y, sTextColor_StatValue, -1, gStringVar4); AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_SMALL, 60, y, sTextColor_StatValue, -1, gStringVar4);
CopyWindowToVram(sSaveStatsWindowId, COPYWIN_GFX); CopyWindowToVram(sSaveStatsWindowId, COPYWIN_GFX);
} }
src/strings.c
+43 -43
View File
@@ -207,15 +207,15 @@ const u8 gText_PokeFluteAwakenedMon[] = _("The POKé FLUTE awakened sleeping\nPO
const u8 gText_TMCase[] = _("TM CASE"); const u8 gText_TMCase[] = _("TM CASE");
const u8 gText_Close[] = _("CLOSE"); const u8 gText_Close[] = _("CLOSE");
const u8 gText_TMCaseWillBePutAway[] = _("The TM CASE will be\nput away."); const u8 gText_TMCaseWillBePutAway[] = _("The TM CASE will be\nput away.");
const u8 gText_Font0[] = _("{FONT_0}"); const u8 gText_FontSmall[] = _("{FONT_SMALL}");
const u8 gText_Font2[] = _("{FONT_2}"); const u8 gText_FontNormal[] = _("{FONT_NORMAL}");
const u8 gText_EmptySpace[] = _(" "); const u8 gText_EmptySpace[] = _(" ");
const u8 gText_BerryPouch[] = _("BERRY POUCH"); const u8 gText_BerryPouch[] = _("BERRY POUCH");
const u8 gText_TheBerryPouchWillBePutAway[] = _("The BERRY POUCH will be\nput away."); const u8 gText_TheBerryPouchWillBePutAway[] = _("The BERRY POUCH will be\nput away.");
const u8 gText_ShopBuy[] = _("BUY"); const u8 gText_ShopBuy[] = _("BUY");
const u8 gText_ShopSell[] = _("SELL"); const u8 gText_ShopSell[] = _("SELL");
const u8 gText_ShopQuit[] = _("SEE YA!"); const u8 gText_ShopQuit[] = _("SEE YA!");
const u8 gText_InBagVar1[] = _("IN BAG:{FONT_0} {STR_VAR_1}"); const u8 gText_InBagVar1[] = _("IN BAG:{FONT_SMALL} {STR_VAR_1}");
const u8 gText_QuitShopping[] = _("Quit shopping."); const u8 gText_QuitShopping[] = _("Quit shopping.");
const u8 gText_Var1CertainlyHowMany[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); const u8 gText_Var1CertainlyHowMany[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?");
const u8 gText_Var1AndYouWantedVar2[] = _("{STR_VAR_1}, and you want {STR_VAR_2}.\nThat will be ¥{STR_VAR_3}. Okay?"); const u8 gText_Var1AndYouWantedVar2[] = _("{STR_VAR_1}, and you want {STR_VAR_2}.\nThat will be ¥{STR_VAR_3}. Okay?");
@@ -419,11 +419,11 @@ const u8 gText_DoubleBattle[] = _("DOUBLE BATTLE");
const u8 gText_MultiBattle[] = _("MULTI BATTLE"); const u8 gText_MultiBattle[] = _("MULTI BATTLE");
const u8 gText_MakeAChallenge[] = _("Make a challenge."); const u8 gText_MakeAChallenge[] = _("Make a challenge.");
const u8 gText_Info_2[] = _("INFO"); const u8 gText_Info_2[] = _("INFO");
const u8 gText_FreshWater_200[] = _("FRESH WATER{CLEAR_TO 0x57}{FONT_0}¥200"); const u8 gText_FreshWater_200[] = _("FRESH WATER{CLEAR_TO 0x57}{FONT_SMALL}¥200");
const u8 gText_SodaPop_300[] = _("SODA POP{CLEAR_TO 0x57}{FONT_0}¥300"); const u8 gText_SodaPop_300[] = _("SODA POP{CLEAR_TO 0x57}{FONT_SMALL}¥300");
const u8 gText_Lemonade_350[] = _("LEMONADE{CLEAR_TO 0x57}{FONT_0}¥350"); const u8 gText_Lemonade_350[] = _("LEMONADE{CLEAR_TO 0x57}{FONT_SMALL}¥350");
const u8 gText_50Coins_1000[] = _("{FONT_0} 50 COINS{CLEAR_TO 0x45}¥1,000"); const u8 gText_50Coins_1000[] = _("{FONT_SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000");
const u8 gText_500Coins_10000[] = _("{FONT_0}500 COINS{CLEAR_TO 0x40}¥10,000"); const u8 gText_500Coins_10000[] = _("{FONT_SMALL}500 COINS{CLEAR_TO 0x40}¥10,000");
const u8 gText_Excellent[] = _("Excellent"); const u8 gText_Excellent[] = _("Excellent");
const u8 gText_NotSoBad[] = _("Not so bad"); const u8 gText_NotSoBad[] = _("Not so bad");
const u8 gText_RedShard[] = _("RED SHARD"); const u8 gText_RedShard[] = _("RED SHARD");
@@ -433,11 +433,11 @@ const u8 gText_GreenShard[] = _("GREEN SHARD");
const u8 gText_BattleTower[] = _("バトルタワ-"); const u8 gText_BattleTower[] = _("バトルタワ-");
const u8 gText_Right[] = _("Right"); const u8 gText_Right[] = _("Right");
const u8 gText_Left[] = _("Left"); const u8 gText_Left[] = _("Left");
const u8 gText_Tm13_4000Coins[] = _("TM13{CLEAR_TO 0x48}{FONT_0}4,000 COINS"); const u8 gText_Tm13_4000Coins[] = _("TM13{CLEAR_TO 0x48}{FONT_SMALL}4,000 COINS");
const u8 gText_Tm23_3500Coins[] = _("TM23{CLEAR_TO 0x48}{FONT_0}3,500 COINS"); const u8 gText_Tm23_3500Coins[] = _("TM23{CLEAR_TO 0x48}{FONT_SMALL}3,500 COINS");
const u8 gText_Tm24_4000Coins[] = _("TM24{CLEAR_TO 0x48}{FONT_0}4,000 COINS"); const u8 gText_Tm24_4000Coins[] = _("TM24{CLEAR_TO 0x48}{FONT_SMALL}4,000 COINS");
const u8 gText_Tm30_4500Coins[] = _("TM30{CLEAR_TO 0x48}{FONT_0}4,500 COINS"); const u8 gText_Tm30_4500Coins[] = _("TM30{CLEAR_TO 0x48}{FONT_SMALL}4,500 COINS");
const u8 gText_Tm35_4000Coins[] = _("TM35{CLEAR_TO 0x48}{FONT_0}4,000 COINS"); const u8 gText_Tm35_4000Coins[] = _("TM35{CLEAR_TO 0x48}{FONT_SMALL}4,000 COINS");
const u8 gText_1F_2[] = _("1F"); const u8 gText_1F_2[] = _("1F");
const u8 gText_2F_2[] = _("2F"); const u8 gText_2F_2[] = _("2F");
const u8 gText_3F_2[] = _("3F"); const u8 gText_3F_2[] = _("3F");
@@ -485,18 +485,18 @@ const u8 gText_FreshWater[] = _("FRESH WATER");
const u8 gText_SodaPop[] = _("SODA POP"); const u8 gText_SodaPop[] = _("SODA POP");
const u8 gText_Lemonade[] = _("LEMONADE"); const u8 gText_Lemonade[] = _("LEMONADE");
const u8 gText_Coins_2[] = _("COINS"); const u8 gText_Coins_2[] = _("COINS");
const u8 gText_Bicycle_Price[] = _("BICYCLE{CLEAR_TO 0x49}{FONT_0}¥1,000,000"); const u8 gText_Bicycle_Price[] = _("BICYCLE{CLEAR_TO 0x49}{FONT_SMALL}¥1,000,000");
const u8 gText_NoThanks[] = _("NO THANKS"); const u8 gText_NoThanks[] = _("NO THANKS");
const u8 gText_Abra_180Coins[] = _("ABRA{CLEAR_TO 0x55}{FONT_0} 180 COINS"); const u8 gText_Abra_180Coins[] = _("ABRA{CLEAR_TO 0x55}{FONT_SMALL} 180 COINS");
const u8 gText_Clefairy_500Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{FONT_0} 500 COINS"); const u8 gText_Clefairy_500Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{FONT_SMALL} 500 COINS");
const u8 gText_Dratini_2800Coins[] = _("DRATINI{CLEAR_TO 0x4B}{FONT_0} 2,800 COINS"); const u8 gText_Dratini_2800Coins[] = _("DRATINI{CLEAR_TO 0x4B}{FONT_SMALL} 2,800 COINS");
const u8 gText_Scyther_5500Coins[] = _("SCYTHER{CLEAR_TO 0x4B}{FONT_0} 5,500 COINS"); const u8 gText_Scyther_5500Coins[] = _("SCYTHER{CLEAR_TO 0x4B}{FONT_SMALL} 5,500 COINS");
const u8 gText_Porygon_9999Coins[] = _("PORYGON{CLEAR_TO 0x4B}{FONT_0} 9,999 COINS"); const u8 gText_Porygon_9999Coins[] = _("PORYGON{CLEAR_TO 0x4B}{FONT_SMALL} 9,999 COINS");
const u8 gText_Abra_120Coins[] = _("ABRA{CLEAR_TO 0x55}{FONT_0} 120 COINS"); const u8 gText_Abra_120Coins[] = _("ABRA{CLEAR_TO 0x55}{FONT_SMALL} 120 COINS");
const u8 gText_Clefairy_750Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{FONT_0} 750 COINS"); const u8 gText_Clefairy_750Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{FONT_SMALL} 750 COINS");
const u8 gText_Pinsir_2500Coins[] = _("PINSIR{CLEAR_TO 0x4B}{FONT_0} 2,500 COINS"); const u8 gText_Pinsir_2500Coins[] = _("PINSIR{CLEAR_TO 0x4B}{FONT_SMALL} 2,500 COINS");
const u8 gText_Dratini_4600Coins[] = _("DRATINI{CLEAR_TO 0x4B}{FONT_0} 4,600 COINS"); const u8 gText_Dratini_4600Coins[] = _("DRATINI{CLEAR_TO 0x4B}{FONT_SMALL} 4,600 COINS");
const u8 gText_Porygon_6500Coins[] = _("PORYGON{CLEAR_TO 0x4B}{FONT_0} 6,500 COINS"); const u8 gText_Porygon_6500Coins[] = _("PORYGON{CLEAR_TO 0x4B}{FONT_SMALL} 6,500 COINS");
const u8 gText_NoThanks_2[] = _("NO THANKS"); const u8 gText_NoThanks_2[] = _("NO THANKS");
const u8 gText_HelixFossil[] = _("HELIX FOSSIL"); const u8 gText_HelixFossil[] = _("HELIX FOSSIL");
const u8 gText_DomeFossil[] = _("DOME FOSSIL"); const u8 gText_DomeFossil[] = _("DOME FOSSIL");
@@ -532,11 +532,11 @@ const u8 gText_1BigMushroom[] = _("1 BIG MUSHROOM");
const u8 gText_SeviiIslands[] = _("SEVII ISLANDS"); const u8 gText_SeviiIslands[] = _("SEVII ISLANDS");
const u8 gText_NavelRock[] = _("NAVEL ROCK"); const u8 gText_NavelRock[] = _("NAVEL ROCK");
const u8 gText_BirthIsland[] = _("BIRTH ISLAND"); const u8 gText_BirthIsland[] = _("BIRTH ISLAND");
const u8 gText_MiracleSeed_1000Coins[] = _("MIRACLE SEED{CLEAR_TO 0x50}{FONT_0}1,000 COINS"); const u8 gText_MiracleSeed_1000Coins[] = _("MIRACLE SEED{CLEAR_TO 0x50}{FONT_SMALL}1,000 COINS");
const u8 gText_Charcoal_1000Coins[] = _("CHARCOAL{CLEAR_TO 0x50}{FONT_0}1,000 COINS"); const u8 gText_Charcoal_1000Coins[] = _("CHARCOAL{CLEAR_TO 0x50}{FONT_SMALL}1,000 COINS");
const u8 gText_MysticWater_1000Coins[] = _("MYSTIC WATER{CLEAR_TO 0x50}{FONT_0}1,000 COINS"); const u8 gText_MysticWater_1000Coins[] = _("MYSTIC WATER{CLEAR_TO 0x50}{FONT_SMALL}1,000 COINS");
const u8 gText_YellowFlute_1600Coins[] = _("YELLOW FLUTE{CLEAR_TO 0x50}{FONT_0}1,600 COINS"); const u8 gText_YellowFlute_1600Coins[] = _("YELLOW FLUTE{CLEAR_TO 0x50}{FONT_SMALL}1,600 COINS");
const u8 gText_SmokeBall_800Coins[] = _("SMOKE BALL{CLEAR_TO 0x5A}{FONT_0}800 COINS"); const u8 gText_SmokeBall_800Coins[] = _("SMOKE BALL{CLEAR_TO 0x5A}{FONT_SMALL}800 COINS");
const u8 gText_Multichoice_Empty2[] = _(""); const u8 gText_Multichoice_Empty2[] = _("");
const u8 gText_Multichoice_Empty1[] = _(""); const u8 gText_Multichoice_Empty1[] = _("");
const u8 gText_BecomeLeader[] = _("BECOME LEADER"); const u8 gText_BecomeLeader[] = _("BECOME LEADER");
@@ -582,17 +582,17 @@ const u8 gText_NowOn[] = _("Now on:");
const u8 gText_LinkedGamePlay[] = _("LINKED GAME PLAY"); const u8 gText_LinkedGamePlay[] = _("LINKED GAME PLAY");
const u8 gText_DirectCorner[] = _("DIRECT CORNER"); const u8 gText_DirectCorner[] = _("DIRECT CORNER");
const u8 gText_UnionRoom[] = _("UNION ROOM"); const u8 gText_UnionRoom[] = _("UNION ROOM");
const u8 gText_Energypowder_50[] = _("ENERGYPOWDER{CLEAR_TO 0x74}{FONT_0}50"); const u8 gText_Energypowder_50[] = _("ENERGYPOWDER{CLEAR_TO 0x74}{FONT_SMALL}50");
const u8 gText_EnergyRoot_80[] = _("ENERGY ROOT{CLEAR_TO 0x74}{FONT_0}80"); const u8 gText_EnergyRoot_80[] = _("ENERGY ROOT{CLEAR_TO 0x74}{FONT_SMALL}80");
const u8 gText_HealPowder_50[] = _("HEAL POWDER{CLEAR_TO 0x74}{FONT_0}50"); const u8 gText_HealPowder_50[] = _("HEAL POWDER{CLEAR_TO 0x74}{FONT_SMALL}50");
const u8 gText_RevivalHerb_300[] = _("REVIVAL HERB{CLEAR_TO 0x6F}{FONT_0}300"); const u8 gText_RevivalHerb_300[] = _("REVIVAL HERB{CLEAR_TO 0x6F}{FONT_SMALL}300");
const u8 gText_Protein_1000[] = _("PROTEIN{CLEAR_TO 0x65}{FONT_0}1,000"); const u8 gText_Protein_1000[] = _("PROTEIN{CLEAR_TO 0x65}{FONT_SMALL}1,000");
const u8 gText_Iron_1000[] = _("IRON{CLEAR_TO 0x65}{FONT_0}1,000"); const u8 gText_Iron_1000[] = _("IRON{CLEAR_TO 0x65}{FONT_SMALL}1,000");
const u8 gText_Carbos_1000[] = _("CARBOS{CLEAR_TO 0x65}{FONT_0}1,000"); const u8 gText_Carbos_1000[] = _("CARBOS{CLEAR_TO 0x65}{FONT_SMALL}1,000");
const u8 gText_Calcium_1000[] = _("CALCIUM{CLEAR_TO 0x65}{FONT_0}1,000"); const u8 gText_Calcium_1000[] = _("CALCIUM{CLEAR_TO 0x65}{FONT_SMALL}1,000");
const u8 gText_Zinc_1000[] = _("ZINC{CLEAR_TO 0x65}{FONT_0}1,000"); const u8 gText_Zinc_1000[] = _("ZINC{CLEAR_TO 0x65}{FONT_SMALL}1,000");
const u8 gText_HpUp_1000[] = _("HP UP{CLEAR_TO 0x65}{FONT_0}1,000"); const u8 gText_HpUp_1000[] = _("HP UP{CLEAR_TO 0x65}{FONT_SMALL}1,000");
const u8 gText_PpUp_3000[] = _("PP UP{CLEAR_TO 0x65}{FONT_0}3,000"); const u8 gText_PpUp_3000[] = _("PP UP{CLEAR_TO 0x65}{FONT_SMALL}3,000");
const u8 gString_BattleRecords_PlayersBattleResults[] = _("{PLAYER}'s BATTLE RESULTS"); const u8 gString_BattleRecords_PlayersBattleResults[] = _("{PLAYER}'s BATTLE RESULTS");
const u8 gString_BattleRecords_TotalRecord[] = _("TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}"); const u8 gString_BattleRecords_TotalRecord[] = _("TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}");
const u8 gString_BattleRecords_ColumnHeaders[] = _("WIN{CLEAR_TO 0x30}LOSE{CLEAR_TO 0x60}DRAW"); const u8 gString_BattleRecords_ColumnHeaders[] = _("WIN{CLEAR_TO 0x30}LOSE{CLEAR_TO 0x60}DRAW");
@@ -911,14 +911,14 @@ const u8 gText_WasUsedOn[] = _(" was used on\n");
const u8 gText_Period[] = _("."); const u8 gText_Period[] = _(".");
const u8 gText_LevelRoseTo[] = _("'s level rose to\n"); const u8 gText_LevelRoseTo[] = _("'s level rose to\n");
const u8 gText_Period2[] = _("."); const u8 gText_Period2[] = _(".");
const u8 gText_LevelUp_MaxHP[] = _("{FONT_0}MAX.{FONT_2} HP"); const u8 gText_LevelUp_MaxHP[] = _("{FONT_SMALL}MAX.{FONT_NORMAL} HP");
const u8 gText_LevelUp_Attack[] = _("ATTACK"); const u8 gText_LevelUp_Attack[] = _("ATTACK");
const u8 gText_LevelUp_Defense[] = _("DEFENSE"); const u8 gText_LevelUp_Defense[] = _("DEFENSE");
const u8 gText_LevelUp_Speed[] = _("SPEED"); const u8 gText_LevelUp_Speed[] = _("SPEED");
const u8 gText_LevelUp_SpAtk[] = _("SP. ATK"); const u8 gText_LevelUp_SpAtk[] = _("SP. ATK");
const u8 gText_LevelUp_SpDef[] = _("SP. DEF"); const u8 gText_LevelUp_SpDef[] = _("SP. DEF");
const u8 gText_LevelUp_Plus[] = _("{FONT_0}{PLUS}{FONT_2}"); const u8 gText_LevelUp_Plus[] = _("{FONT_SMALL}{PLUS}{FONT_NORMAL}");
const u8 gText_LevelUp_Minus[] = _("{FONT_0}-{FONT_2}"); const u8 gText_LevelUp_Minus[] = _("{FONT_SMALL}-{FONT_NORMAL}");
const u8 gText_Counting_1[] = _("1, "); const u8 gText_Counting_1[] = _("1, ");
const u8 gText_Counting_2And[] = _("2, and ‥ ‥ ‥ "); const u8 gText_Counting_2And[] = _("2, and ‥ ‥ ‥ ");
const u8 gText_Poof[] = _("Poof!\p"); const u8 gText_Poof[] = _("Poof!\p");
src/teachy_tv.c
+2 -2
View File
@@ -240,7 +240,7 @@ static const struct ListMenuTemplate sListMenuTemplate =
.lettersSpacing = 0x0, .lettersSpacing = 0x0,
.itemVerticalPadding = 0x0, .itemVerticalPadding = 0x0,
.scrollMultiple = 0x1, .scrollMultiple = 0x1,
.fontId = FONT_2, .fontId = FONT_NORMAL,
.cursorKind = 0x0, .cursorKind = 0x0,
}; };
@@ -676,7 +676,7 @@ static void TeachyTvSetupPostBattleWindowAndObj(u8 taskId)
static void TeachyTvInitTextPrinter(const u8 *text) static void TeachyTvInitTextPrinter(const u8 *text)
{ {
gTextFlags.autoScroll = 0; gTextFlags.autoScroll = 0;
AddTextPrinterParameterized2(0, FONT_4, text, GetTextSpeedSetting(), 0, 1, 0xC, 3); AddTextPrinterParameterized2(0, FONT_MALE, text, GetTextSpeedSetting(), 0, 1, 0xC, 3);
} }
static void TeachyTvFree(void) static void TeachyTvFree(void)
src/text.c
+105 -110
View File
@@ -8,16 +8,16 @@
extern const struct OamData gOamData_AffineOff_ObjNormal_16x16; extern const struct OamData gOamData_AffineOff_ObjNormal_16x16;
static void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese); static void DecompressGlyph_NormalCopy1(u16 glyphId, bool32 isJapanese);
static void DecompressGlyphFont3(u16 glyphId, bool32 isJapanese); static void DecompressGlyph_NormalCopy2(u16 glyphId, bool32 isJapanese);
static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese); static void DecompressGlyph_Male(u16 glyphId, bool32 isJapanese);
static void DecompressGlyph_Bold(u16 glyphId); static void DecompressGlyph_Bold(u16 glyphId);
static s32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese); static s32 GetGlyphWidth_Small(u16 glyphId, bool32 isJapanese);
static s32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese); static s32 GetGlyphWidth_NormalCopy1(u16 glyphId, bool32 isJapanese);
static s32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese); static s32 GetGlyphWidth_Normal(u16 glyphId, bool32 isJapanese);
static s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese); static s32 GetGlyphWidth_NormalCopy2(u16 glyphId, bool32 isJapanese);
static s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese); static s32 GetGlyphWidth_Male(u16 glyphId, bool32 isJapanese);
static s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese); static s32 GetGlyphWidth_Female(u16 glyphId, bool32 isJapanese);
TextFlags gTextFlags; TextFlags gTextFlags;
@@ -36,13 +36,13 @@ static const u8 sWindowVerticalScrollSpeeds[] = {
}; };
static const struct GlyphWidthFunc sGlyphWidthFuncs[] = { static const struct GlyphWidthFunc sGlyphWidthFuncs[] = {
{ FONT_0, GetGlyphWidthFont0 }, { FONT_SMALL, GetGlyphWidth_Small },
{ FONT_1, GetGlyphWidthFont1 }, // copy of 2 { FONT_NORMAL_COPY_1, GetGlyphWidth_NormalCopy1 },
{ FONT_2, GetGlyphWidthFont2 }, { FONT_NORMAL, GetGlyphWidth_Normal },
{ FONT_3, GetGlyphWidthFont3 }, // copy of 2 { FONT_NORMAL_COPY_2, GetGlyphWidth_NormalCopy2 },
{ FONT_4, GetGlyphWidthFont4 }, { FONT_MALE, GetGlyphWidth_Male },
{ FONT_5, GetGlyphWidthFont5 }, { FONT_FEMALE, GetGlyphWidth_Female },
{ FONT_BRAILLE, GetGlyphWidthFont6 } { FONT_BRAILLE, GetGlyphWidth_Braille }
}; };
static const struct SpriteSheet sUnknown_81EA68C[] = static const struct SpriteSheet sUnknown_81EA68C[] =
@@ -93,9 +93,8 @@ struct
const u8 gKeypadIconTiles[] = INCBIN_U8("graphics/fonts/keypad_icons.4bpp"); const u8 gKeypadIconTiles[] = INCBIN_U8("graphics/fonts/keypad_icons.4bpp");
// Font 0 static const u16 sFontSmallLatinGlyphs[] = INCBIN_U16("graphics/fonts/latin_small.latfont");
static const u16 sFont0LatinGlyphs[] = INCBIN_U16("graphics/fonts/font0_latin.latfont"); static const u8 sFontSmallLatinGlyphWidths[] =
static const u8 sFont0LatinGlyphWidths[] =
{ {
5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 4, 4, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
@@ -135,11 +134,10 @@ static const u8 sFont0LatinGlyphWidths[] =
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 5 8, 8, 8, 8, 8, 8, 8, 5
}; };
static const u16 sFont0JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font0_jap.fwjpnfont"); static const u16 sFontSmallJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/japanese_small.fwjpnfont");
// Font 1 static const u16 sFontNormalCopy1LatinGlyphs[] = INCBIN_U16("graphics/fonts/latin_normal.latfont");
static const u16 sFont1LatinGlyphs[] = INCBIN_U16("graphics/fonts/font2_latin.latfont"); static const u8 sFontNormalCopy1LatinGlyphWidths[] =
static const u8 sFont1LatinGlyphWidths[] =
{ {
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
@@ -179,11 +177,10 @@ static const u8 sFont1LatinGlyphWidths[] =
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 6 8, 8, 8, 8, 8, 8, 8, 6
}; };
static const u16 sFont1JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font1_jap.fwjpnfont"); static const u16 sFontTallJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/japanese_tall.fwjpnfont");
// Font 2 static const u16 sFontNormalLatinGlyphs[] = INCBIN_U16("graphics/fonts/latin_normal.latfont");
static const u16 sFont2LatinGlyphs[] = INCBIN_U16("graphics/fonts/font2_latin.latfont"); static const u8 sFontNormalLatinGlyphWidths[] =
static const u8 sFont2LatinGlyphWidths[] =
{ {
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
@@ -223,8 +220,8 @@ static const u8 sFont2LatinGlyphWidths[] =
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 6 8, 8, 8, 8, 8, 8, 8, 6
}; };
static const u16 sFont2JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font2_jap.fwjpnfont"); static const u16 sFontNormalJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/japanese_normal.fwjpnfont");
static const u8 sFont2JapaneseGlyphWidths[] = static const u8 sFontNormalJapaneseGlyphWidths[] =
{ {
0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
@@ -248,9 +245,8 @@ static const u8 sFont2JapaneseGlyphWidths[] =
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0
}; };
// Font 4 static const u16 sFontMaleLatinGlyphs[] = INCBIN_U16("graphics/fonts/latin_male.latfont");
static const u16 sFont4LatinGlyphs[] = INCBIN_U16("graphics/fonts/font4_latin.latfont"); static const u8 sFontMaleLatinGlyphWidths[] =
static const u8 sFont4LatinGlyphWidths[] =
{ {
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
@@ -290,8 +286,8 @@ static const u8 sFont4LatinGlyphWidths[] =
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 6 8, 8, 8, 8, 8, 8, 8, 6
}; };
static const u16 sFont4JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font4_jap.fwjpnfont"); static const u16 sFontMaleJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/japanese_male.fwjpnfont");
static const u8 sFont4JapaneseGlyphWidths[] = static const u8 sFontMaleJapaneseGlyphWidths[] =
{ {
0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
@@ -315,9 +311,8 @@ static const u8 sFont4JapaneseGlyphWidths[] =
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0
}; };
// Font 5 static const u16 sFontFemaleLatinGlyphs[] = INCBIN_U16("graphics/fonts/latin_female.latfont");
static const u16 sFont5LatinGlyphs[] = INCBIN_U16("graphics/fonts/font5_latin.latfont"); static const u8 sFontFemaleLatinGlyphWidths[] =
static const u8 sFont5LatinGlyphWidths[] =
{ {
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
@@ -357,8 +352,8 @@ static const u8 sFont5LatinGlyphWidths[] =
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 6 8, 8, 8, 8, 8, 8, 8, 6
}; };
static const u16 sFont5JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font5_jap.fwjpnfont"); static const u16 sFontFemaleJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/japanese_female.fwjpnfont");
static const u8 sFont5JapaneseGlyphWidths[] = static const u8 sFontFemaleJapaneseGlyphWidths[] =
{ {
0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
@@ -382,76 +377,75 @@ static const u8 sFont5JapaneseGlyphWidths[] =
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0
}; };
// Font 9 static const u16 sFontBoldJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/japanese_bold.fwjpnfont");
static const u16 sFont9JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font9_jap.fwjpnfont");
u16 Font0Func(struct TextPrinter *textPrinter) u16 FontFunc_Small(struct TextPrinter *textPrinter)
{ {
struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub; struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub;
if (subStruct->hasGlyphIdBeenSet == 0) if (subStruct->hasGlyphIdBeenSet == 0)
{ {
textPrinter->subUnion.sub.glyphId = 0; textPrinter->subUnion.sub.glyphId = FONT_SMALL;
subStruct->hasGlyphIdBeenSet = 1; subStruct->hasGlyphIdBeenSet = 1;
} }
return RenderText(textPrinter); return RenderText(textPrinter);
} }
u16 Font1Func(struct TextPrinter *textPrinter) u16 FontFunc_NormalCopy1(struct TextPrinter *textPrinter)
{ {
struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub; struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub;
if (subStruct->hasGlyphIdBeenSet == 0) if (subStruct->hasGlyphIdBeenSet == 0)
{ {
textPrinter->subUnion.sub.glyphId = 1; textPrinter->subUnion.sub.glyphId = FONT_NORMAL_COPY_1;
subStruct->hasGlyphIdBeenSet = 1; subStruct->hasGlyphIdBeenSet = 1;
} }
return RenderText(textPrinter); return RenderText(textPrinter);
} }
u16 Font2Func(struct TextPrinter *textPrinter) u16 FontFunc_Normal(struct TextPrinter *textPrinter)
{ {
struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub; struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub;
if (subStruct->hasGlyphIdBeenSet == 0) if (subStruct->hasGlyphIdBeenSet == 0)
{ {
textPrinter->subUnion.sub.glyphId = 2; textPrinter->subUnion.sub.glyphId = FONT_NORMAL;
subStruct->hasGlyphIdBeenSet = 1; subStruct->hasGlyphIdBeenSet = 1;
} }
return RenderText(textPrinter); return RenderText(textPrinter);
} }
u16 Font3Func(struct TextPrinter *textPrinter) u16 FontFunc_NormalCopy2(struct TextPrinter *textPrinter)
{ {
struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub; struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub;
if (subStruct->hasGlyphIdBeenSet == 0) if (subStruct->hasGlyphIdBeenSet == 0)
{ {
textPrinter->subUnion.sub.glyphId = 3; textPrinter->subUnion.sub.glyphId = FONT_NORMAL_COPY_2;
subStruct->hasGlyphIdBeenSet = 1; subStruct->hasGlyphIdBeenSet = 1;
} }
return RenderText(textPrinter); return RenderText(textPrinter);
} }
u16 Font4Func(struct TextPrinter *textPrinter) u16 FontFunc_Male(struct TextPrinter *textPrinter)
{ {
struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub; struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub;
if (subStruct->hasGlyphIdBeenSet == 0) if (subStruct->hasGlyphIdBeenSet == 0)
{ {
textPrinter->subUnion.sub.glyphId = 4; textPrinter->subUnion.sub.glyphId = FONT_MALE;
subStruct->hasGlyphIdBeenSet = 1; subStruct->hasGlyphIdBeenSet = 1;
} }
return RenderText(textPrinter); return RenderText(textPrinter);
} }
u16 Font5Func(struct TextPrinter *textPrinter) u16 FontFunc_Female(struct TextPrinter *textPrinter)
{ {
struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub; struct TextPrinterSubStruct *subStruct = &textPrinter->subUnion.sub;
if (subStruct->hasGlyphIdBeenSet == 0) if (subStruct->hasGlyphIdBeenSet == 0)
{ {
textPrinter->subUnion.sub.glyphId = 5; textPrinter->subUnion.sub.glyphId = FONT_FEMALE;
subStruct->hasGlyphIdBeenSet = 1; subStruct->hasGlyphIdBeenSet = 1;
} }
return RenderText(textPrinter); return RenderText(textPrinter);
@@ -818,23 +812,23 @@ u16 RenderText(struct TextPrinter *textPrinter)
switch (subStruct->glyphId) switch (subStruct->glyphId)
{ {
case FONT_0: case FONT_SMALL:
DecompressGlyphFont0(currChar, textPrinter->japanese); DecompressGlyph_Small(currChar, textPrinter->japanese);
break; break;
case FONT_1: case FONT_NORMAL_COPY_1:
DecompressGlyphFont1(currChar, textPrinter->japanese); DecompressGlyph_NormalCopy1(currChar, textPrinter->japanese);
break; break;
case FONT_2: case FONT_NORMAL:
DecompressGlyphFont2(currChar, textPrinter->japanese); DecompressGlyph_Normal(currChar, textPrinter->japanese);
break; break;
case FONT_3: case FONT_NORMAL_COPY_2:
DecompressGlyphFont3(currChar, textPrinter->japanese); DecompressGlyph_NormalCopy2(currChar, textPrinter->japanese);
break; break;
case FONT_4: case FONT_MALE:
DecompressGlyphFont4(currChar, textPrinter->japanese); DecompressGlyph_Male(currChar, textPrinter->japanese);
break; break;
case FONT_5: case FONT_FEMALE:
DecompressGlyphFont5(currChar, textPrinter->japanese); DecompressGlyph_Female(currChar, textPrinter->japanese);
break; break;
} }
@@ -1365,13 +1359,13 @@ u8 GetKeypadIconHeight(u8 keypadIconId)
return sKeypadIcons[keypadIconId].height; return sKeypadIcons[keypadIconId].height;
} }
void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese) void DecompressGlyph_Small(u16 glyphId, bool32 isJapanese)
{ {
const u16 *glyphs; const u16 *glyphs;
if (isJapanese == TRUE) if (isJapanese == TRUE)
{ {
glyphs = sFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF)); glyphs = sFontSmallJapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40));
gGlyphInfo.width = 8; gGlyphInfo.width = 8;
@@ -1379,30 +1373,31 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
} }
else else
{ {
glyphs = sFont0LatinGlyphs + (0x10 * glyphId); glyphs = sFontSmallLatinGlyphs + (0x10 * glyphId);
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x40));
gGlyphInfo.width = sFont0LatinGlyphWidths[glyphId]; gGlyphInfo.width = sFontSmallLatinGlyphWidths[glyphId];
gGlyphInfo.height = 13; gGlyphInfo.height = 13;
} }
} }
static s32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese) static s32 GetGlyphWidth_Small(u16 glyphId, bool32 isJapanese)
{ {
if (isJapanese == TRUE) if (isJapanese == TRUE)
return 8; return 8;
else else
return sFont0LatinGlyphWidths[glyphId]; return sFontSmallLatinGlyphWidths[glyphId];
} }
static void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese) static void DecompressGlyph_NormalCopy1(u16 glyphId, bool32 isJapanese)
{ {
const u16 *glyphs; const u16 *glyphs;
if (isJapanese == TRUE) if (isJapanese == TRUE)
{ {
// This font only differs from the Normal font in Japanese
int eff; int eff;
glyphs = sFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now glyphs = sFontTallJapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF))); // shh, no questions, only matching now
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40));
gGlyphInfo.width = 8; gGlyphInfo.width = 8;
@@ -1410,25 +1405,25 @@ static void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
} }
else else
{ {
glyphs = sFont1LatinGlyphs + (0x20 * glyphId); glyphs = sFontNormalCopy1LatinGlyphs + (0x20 * glyphId);
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20)); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20));
DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo.pixels + 0x40));
DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo.pixels + 0x60)); DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo.pixels + 0x60));
gGlyphInfo.width = sFont1LatinGlyphWidths[glyphId]; gGlyphInfo.width = sFontNormalCopy1LatinGlyphWidths[glyphId];
gGlyphInfo.height = 14; gGlyphInfo.height = 14;
} }
} }
static s32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese) static s32 GetGlyphWidth_NormalCopy1(u16 glyphId, bool32 isJapanese)
{ {
if (isJapanese == TRUE) if (isJapanese == TRUE)
return 8; return 8;
else else
return sFont1LatinGlyphWidths[glyphId]; return sFontNormalCopy1LatinGlyphWidths[glyphId];
} }
void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese) void DecompressGlyph_Normal(u16 glyphId, bool32 isJapanese)
{ {
const u16 *glyphs; const u16 *glyphs;
int i; int i;
@@ -1450,12 +1445,12 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
} }
else else
{ {
glyphs = sFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); glyphs = sFontNormalJapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20)); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20));
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40));
DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo.pixels + 0x60)); DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo.pixels + 0x60));
gGlyphInfo.width = sFont2JapaneseGlyphWidths[glyphId]; gGlyphInfo.width = sFontNormalJapaneseGlyphWidths[glyphId];
gGlyphInfo.height = 12; gGlyphInfo.height = 12;
} }
} }
@@ -1469,39 +1464,39 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
{ {
gGlyphInfo.pixels[i] = lastColor | lastColor << 4; gGlyphInfo.pixels[i] = lastColor | lastColor << 4;
// but why // but why
gGlyphInfo.width = sFont2LatinGlyphWidths[0]; gGlyphInfo.width = sFontNormalLatinGlyphWidths[0];
gGlyphInfo.height = 14; gGlyphInfo.height = 14;
} }
} }
else else
{ {
glyphs = sFont2LatinGlyphs + (0x20 * glyphId); glyphs = sFontNormalLatinGlyphs + (0x20 * glyphId);
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20)); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20));
DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo.pixels + 0x40));
DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo.pixels + 0x60)); DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo.pixels + 0x60));
gGlyphInfo.width = sFont2LatinGlyphWidths[glyphId]; gGlyphInfo.width = sFontNormalLatinGlyphWidths[glyphId];
gGlyphInfo.height = 14; gGlyphInfo.height = 14;
} }
} }
} }
static s32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese) static s32 GetGlyphWidth_Normal(u16 glyphId, bool32 isJapanese)
{ {
if (isJapanese == TRUE) if (isJapanese == TRUE)
{ {
if(glyphId == 0) if(glyphId == 0)
return 10; return 10;
return sFont2JapaneseGlyphWidths[glyphId]; return sFontNormalJapaneseGlyphWidths[glyphId];
} }
else else
{ {
return sFont2LatinGlyphWidths[glyphId]; return sFontNormalLatinGlyphWidths[glyphId];
} }
} }
static void DecompressGlyphFont3(u16 glyphId, bool32 isJapanese) static void DecompressGlyph_NormalCopy2(u16 glyphId, bool32 isJapanese)
{ {
const u16 *glyphs; const u16 *glyphs;
int i; int i;
@@ -1523,7 +1518,7 @@ static void DecompressGlyphFont3(u16 glyphId, bool32 isJapanese)
} }
else else
{ {
glyphs = sFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); glyphs = sFontNormalJapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20)); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20));
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40));
@@ -1533,18 +1528,18 @@ static void DecompressGlyphFont3(u16 glyphId, bool32 isJapanese)
} }
} }
else else
DecompressGlyphFont2(glyphId, isJapanese); DecompressGlyph_Normal(glyphId, isJapanese);
} }
static s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese) static s32 GetGlyphWidth_NormalCopy2(u16 glyphId, bool32 isJapanese)
{ {
if(isJapanese == TRUE) if(isJapanese == TRUE)
return 10; return 10;
else else
return sFont2LatinGlyphWidths[glyphId]; return sFontNormalLatinGlyphWidths[glyphId];
} }
static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese) static void DecompressGlyph_Male(u16 glyphId, bool32 isJapanese)
{ {
const u16 *glyphs; const u16 *glyphs;
int i; int i;
@@ -1566,12 +1561,12 @@ static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese)
} }
else else
{ {
glyphs = sFont4JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); glyphs = sFontMaleJapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20)); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20));
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40));
DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo.pixels + 0x60)); DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo.pixels + 0x60));
gGlyphInfo.width = sFont4JapaneseGlyphWidths[glyphId]; gGlyphInfo.width = sFontMaleJapaneseGlyphWidths[glyphId];
gGlyphInfo.height = 12; gGlyphInfo.height = 12;
} }
} }
@@ -1585,37 +1580,37 @@ static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese)
{ {
gGlyphInfo.pixels[i] = lastColor | lastColor << 4; gGlyphInfo.pixels[i] = lastColor | lastColor << 4;
// but why // but why
gGlyphInfo.width = sFont4LatinGlyphWidths[0]; gGlyphInfo.width = sFontMaleLatinGlyphWidths[0];
gGlyphInfo.height = 14; gGlyphInfo.height = 14;
} }
} }
else else
{ {
glyphs = sFont4LatinGlyphs + (0x20 * glyphId); glyphs = sFontMaleLatinGlyphs + (0x20 * glyphId);
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20)); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20));
DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo.pixels + 0x40));
DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo.pixels + 0x60)); DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo.pixels + 0x60));
gGlyphInfo.width = sFont4LatinGlyphWidths[glyphId]; gGlyphInfo.width = sFontMaleLatinGlyphWidths[glyphId];
gGlyphInfo.height = 14; gGlyphInfo.height = 14;
} }
} }
} }
static s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese) static s32 GetGlyphWidth_Male(u16 glyphId, bool32 isJapanese)
{ {
if(isJapanese == TRUE) if(isJapanese == TRUE)
{ {
if(glyphId == 0) if(glyphId == 0)
return 10; return 10;
return sFont4JapaneseGlyphWidths[glyphId]; return sFontMaleJapaneseGlyphWidths[glyphId];
} }
else else
return sFont4LatinGlyphWidths[glyphId]; return sFontMaleLatinGlyphWidths[glyphId];
} }
void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese) void DecompressGlyph_Female(u16 glyphId, bool32 isJapanese)
{ {
const u16 *glyphs; const u16 *glyphs;
int i; int i;
@@ -1637,12 +1632,12 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese)
} }
else else
{ {
glyphs = sFont5JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7)); glyphs = sFontFemaleJapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20)); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20));
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40));
DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo.pixels + 0x60)); DecompressGlyphTile(glyphs + 0x88, (u16 *)(gGlyphInfo.pixels + 0x60));
gGlyphInfo.width = sFont5JapaneseGlyphWidths[glyphId]; gGlyphInfo.width = sFontFemaleJapaneseGlyphWidths[glyphId];
gGlyphInfo.height = 12; gGlyphInfo.height = 12;
} }
} }
@@ -1656,39 +1651,39 @@ void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese)
{ {
gGlyphInfo.pixels[i] = lastColor | lastColor << 4; gGlyphInfo.pixels[i] = lastColor | lastColor << 4;
// but why // but why
gGlyphInfo.width = sFont5LatinGlyphWidths[0]; gGlyphInfo.width = sFontFemaleLatinGlyphWidths[0];
gGlyphInfo.height = 14; gGlyphInfo.height = 14;
} }
} }
else else
{ {
glyphs = sFont5LatinGlyphs + (0x20 * glyphId); glyphs = sFontFemaleLatinGlyphs + (0x20 * glyphId);
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20)); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gGlyphInfo.pixels + 0x20));
DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x10, (u16 *)(gGlyphInfo.pixels + 0x40));
DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo.pixels + 0x60)); DecompressGlyphTile(glyphs + 0x18, (u16 *)(gGlyphInfo.pixels + 0x60));
gGlyphInfo.width = sFont5LatinGlyphWidths[glyphId]; gGlyphInfo.width = sFontFemaleLatinGlyphWidths[glyphId];
gGlyphInfo.height = 14; gGlyphInfo.height = 14;
} }
} }
} }
static s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese) static s32 GetGlyphWidth_Female(u16 glyphId, bool32 isJapanese)
{ {
if(isJapanese == TRUE) if(isJapanese == TRUE)
{ {
if(glyphId == 0) if(glyphId == 0)
return 10; return 10;
return sFont5JapaneseGlyphWidths[glyphId]; return sFontFemaleJapaneseGlyphWidths[glyphId];
} }
else else
return sFont5LatinGlyphWidths[glyphId]; return sFontFemaleLatinGlyphWidths[glyphId];
} }
static void DecompressGlyph_Bold(u16 glyphId) static void DecompressGlyph_Bold(u16 glyphId)
{ {
const u16 *glyphs = sFont9JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF)); const u16 *glyphs = sFontBoldJapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels);
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40));
gGlyphInfo.width = 8; gGlyphInfo.width = 8;
src/tm_case.c
+26 -26
View File
@@ -664,7 +664,7 @@ static void InitTMCaseListMenuItems(void)
gMultiuseListMenuTemplate.itemVerticalPadding = 2; gMultiuseListMenuTemplate.itemVerticalPadding = 2;
gMultiuseListMenuTemplate.upText_Y = 2; gMultiuseListMenuTemplate.upText_Y = 2;
gMultiuseListMenuTemplate.maxShowed = sTMCaseDynamicResources->maxTMsShown; gMultiuseListMenuTemplate.maxShowed = sTMCaseDynamicResources->maxTMsShown;
gMultiuseListMenuTemplate.fontId = FONT_2; gMultiuseListMenuTemplate.fontId = FONT_NORMAL;
gMultiuseListMenuTemplate.cursorPal = 2; gMultiuseListMenuTemplate.cursorPal = 2;
gMultiuseListMenuTemplate.fillValue = 0; gMultiuseListMenuTemplate.fillValue = 0;
gMultiuseListMenuTemplate.cursorShadowPal = 3; gMultiuseListMenuTemplate.cursorShadowPal = 3;
@@ -676,7 +676,7 @@ static void InitTMCaseListMenuItems(void)
static void GetTMNumberAndMoveString(u8 * dest, u16 itemId) static void GetTMNumberAndMoveString(u8 * dest, u16 itemId)
{ {
StringCopy(gStringVar4, gText_Font0); StringCopy(gStringVar4, gText_FontSmall);
if (itemId >= ITEM_HM01) if (itemId >= ITEM_HM01)
{ {
StringAppend(gStringVar4, sText_ClearTo18); StringAppend(gStringVar4, sText_ClearTo18);
@@ -691,7 +691,7 @@ static void GetTMNumberAndMoveString(u8 * dest, u16 itemId)
StringAppend(gStringVar4, gStringVar1); StringAppend(gStringVar4, gStringVar1);
} }
StringAppend(gStringVar4, sText_SingleSpace); StringAppend(gStringVar4, sText_SingleSpace);
StringAppend(gStringVar4, gText_Font2); StringAppend(gStringVar4, gText_FontNormal);
StringAppend(gStringVar4, gMoveNames[ItemIdToBattleMoveId(itemId)]); StringAppend(gStringVar4, gMoveNames[ItemIdToBattleMoveId(itemId)]);
StringCopy(dest, gStringVar4); StringCopy(dest, gStringVar4);
} }
@@ -722,7 +722,7 @@ static void List_ItemPrintFunc(u8 windowId, u32 itemIndex, u8 y)
{ {
ConvertIntToDecimalStringN(gStringVar1, BagGetQuantityByPocketPosition(POCKET_TM_CASE, itemIndex), STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, BagGetQuantityByPocketPosition(POCKET_TM_CASE, itemIndex), STR_CONV_MODE_RIGHT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
TMCase_Print(windowId, FONT_0, gStringVar4, 126, y, 0, 0, TEXT_SKIP_DRAW, COLOR_DARK); TMCase_Print(windowId, FONT_SMALL, gStringVar4, 126, y, 0, 0, TEXT_SKIP_DRAW, COLOR_DARK);
} }
else else
{ {
@@ -739,7 +739,7 @@ static void PrintDescription(s32 itemIndex)
else else
str = gText_TMCaseWillBePutAway; str = gText_TMCaseWillBePutAway;
FillWindowPixelBuffer(WIN_DESCRIPTION, 0); FillWindowPixelBuffer(WIN_DESCRIPTION, 0);
TMCase_Print(WIN_DESCRIPTION, FONT_2, str, 2, 3, 1, 0, 0, COLOR_LIGHT); TMCase_Print(WIN_DESCRIPTION, FONT_NORMAL, str, 2, 3, 1, 0, 0, COLOR_LIGHT);
} }
// Darkens (or subsequently lightens) the blue bg tiles around the description window when a TM/HM is selected. // Darkens (or subsequently lightens) the blue bg tiles around the description window when a TM/HM is selected.
@@ -760,12 +760,12 @@ static void PrintListCursorAtRow(u8 y, u8 colorIdx)
if (colorIdx == COLOR_CURSOR_ERASE) if (colorIdx == COLOR_CURSOR_ERASE)
{ {
// Never used. Would erase cursor (but also a portion of the list text) // Never used. Would erase cursor (but also a portion of the list text)
FillWindowPixelRect(WIN_LIST, 0, 0, y, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_WIDTH), GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT)); FillWindowPixelRect(WIN_LIST, 0, 0, y, GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_WIDTH), GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT));
CopyWindowToVram(WIN_LIST, COPYWIN_GFX); CopyWindowToVram(WIN_LIST, COPYWIN_GFX);
} }
else else
{ {
TMCase_Print(WIN_LIST, FONT_2, gText_SelectorArrow2, 0, y, 0, 0, 0, colorIdx); TMCase_Print(WIN_LIST, FONT_NORMAL, gText_SelectorArrow2, 0, y, 0, 0, 0, colorIdx);
} }
} }
@@ -963,22 +963,22 @@ static void Task_SelectedTMHM_Field(u8 taskId)
// Print context window actions // Print context window actions
AddItemMenuActionTextPrinters(sTMCaseDynamicResources->contextMenuWindowId, AddItemMenuActionTextPrinters(sTMCaseDynamicResources->contextMenuWindowId,
FONT_2, FONT_NORMAL,
GetMenuCursorDimensionByFont(FONT_2, 0), GetMenuCursorDimensionByFont(FONT_NORMAL, 0),
2, 2,
0, 0,
GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 2,
sTMCaseDynamicResources->numMenuActions, sTMCaseDynamicResources->numMenuActions,
sMenuActions, sMenuActions,
sTMCaseDynamicResources->menuActionIndices); sTMCaseDynamicResources->menuActionIndices);
Menu_InitCursor(sTMCaseDynamicResources->contextMenuWindowId, FONT_2, 0, 2, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sTMCaseDynamicResources->numMenuActions, 0); Menu_InitCursor(sTMCaseDynamicResources->contextMenuWindowId, FONT_NORMAL, 0, 2, GetFontAttribute(FONT_NORMAL, FONTATTR_MAX_LETTER_HEIGHT) + 2, sTMCaseDynamicResources->numMenuActions, 0);
// Print label text next to the context window // Print label text next to the context window
strbuf = Alloc(256); strbuf = Alloc(256);
GetTMNumberAndMoveString(strbuf, gSpecialVar_ItemId); GetTMNumberAndMoveString(strbuf, gSpecialVar_ItemId);
StringAppend(strbuf, gText_Var1IsSelected + 2); // +2 skips over the stringvar StringAppend(strbuf, gText_Var1IsSelected + 2); // +2 skips over the stringvar
TMCase_Print(WIN_SELECTED_MSG, FONT_2, strbuf, 0, 2, 1, 0, 0, COLOR_DARK); TMCase_Print(WIN_SELECTED_MSG, FONT_NORMAL, strbuf, 0, 2, 1, 0, 0, COLOR_DARK);
Free(strbuf); Free(strbuf);
if (IS_HM(gSpecialVar_ItemId)) if (IS_HM(gSpecialVar_ItemId))
{ {
@@ -1068,14 +1068,14 @@ static void Action_Give(u8 taskId)
static void PrintError_ThereIsNoPokemon(u8 taskId) static void PrintError_ThereIsNoPokemon(u8 taskId)
{ {
PrintMessageWithFollowupTask(taskId, FONT_2, gText_ThereIsNoPokemon, Task_WaitButtonAfterErrorPrint); PrintMessageWithFollowupTask(taskId, FONT_NORMAL, gText_ThereIsNoPokemon, Task_WaitButtonAfterErrorPrint);
} }
static void PrintError_ItemCantBeHeld(u8 taskId) static void PrintError_ItemCantBeHeld(u8 taskId)
{ {
CopyItemName(gSpecialVar_ItemId, gStringVar1); CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_ItemCantBeHeld); StringExpandPlaceholders(gStringVar4, gText_ItemCantBeHeld);
PrintMessageWithFollowupTask(taskId, FONT_2, gStringVar4, Task_WaitButtonAfterErrorPrint); PrintMessageWithFollowupTask(taskId, FONT_NORMAL, gStringVar4, Task_WaitButtonAfterErrorPrint);
} }
static void Task_WaitButtonAfterErrorPrint(u8 taskId) static void Task_WaitButtonAfterErrorPrint(u8 taskId)
@@ -1221,7 +1221,7 @@ static void Task_InitQuantitySelectUI(u8 taskId)
TMCase_SetWindowBorder1(WIN_SELL_QUANTITY); TMCase_SetWindowBorder1(WIN_SELL_QUANTITY);
ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
TMCase_Print(WIN_SELL_QUANTITY, FONT_0, gStringVar4, 4, 10, 1, 0, 0, COLOR_DARK); TMCase_Print(WIN_SELL_QUANTITY, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0, COLOR_DARK);
SellTM_PrintQuantityAndSalePrice(1, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_CASE, tSelection)) / 2 * tQuantitySelected); SellTM_PrintQuantityAndSalePrice(1, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_CASE, tSelection)) / 2 * tQuantitySelected);
PrintPlayersMoney(); PrintPlayersMoney();
CreateQuantityScrollArrows(); CreateQuantityScrollArrows();
@@ -1235,7 +1235,7 @@ static void SellTM_PrintQuantityAndSalePrice(s16 quantity, s32 amount)
FillWindowPixelBuffer(WIN_SELL_QUANTITY, 0x11); FillWindowPixelBuffer(WIN_SELL_QUANTITY, 0x11);
ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
TMCase_Print(WIN_SELL_QUANTITY, FONT_0, gStringVar4, 4, 10, 1, 0, 0, COLOR_DARK); TMCase_Print(WIN_SELL_QUANTITY, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0, COLOR_DARK);
PrintMoneyAmount(WIN_SELL_QUANTITY, 0x38, 0x0A, amount, 0); PrintMoneyAmount(WIN_SELL_QUANTITY, 0x38, 0x0A, amount, 0);
} }
@@ -1282,7 +1282,7 @@ static void Task_PrintSaleConfirmedText(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1); CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_CASE, tSelection)) / 2 * tQuantitySelected, STR_CONV_MODE_LEFT_ALIGN, 6); ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_TM_CASE, tSelection)) / 2 * tQuantitySelected, STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen); StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen);
PrintMessageWithFollowupTask(taskId, FONT_2, gStringVar4, Task_DoSaleOfTMs); PrintMessageWithFollowupTask(taskId, FONT_NORMAL, gStringVar4, Task_DoSaleOfTMs);
} }
static void Task_DoSaleOfTMs(u8 taskId) static void Task_DoSaleOfTMs(u8 taskId)
@@ -1418,7 +1418,7 @@ static void Task_Pokedude_Run(u8 taskId)
break; break;
case 8: case 8:
SetDescriptionWindowShade(1); SetDescriptionWindowShade(1);
PrintMessageWithFollowupTask(taskId, FONT_4, gPokedudeText_TMTypes, NULL); PrintMessageWithFollowupTask(taskId, FONT_MALE, gPokedudeText_TMTypes, NULL);
gTasks[taskId].func = Task_Pokedude_Run; gTasks[taskId].func = Task_Pokedude_Run;
tPokedudeState++; tPokedudeState++;
break; break;
@@ -1440,7 +1440,7 @@ static void Task_Pokedude_Run(u8 taskId)
break; break;
case 18: case 18:
SetDescriptionWindowShade(1); SetDescriptionWindowShade(1);
PrintMessageWithFollowupTask(taskId, FONT_4, gPokedudeText_ReadTMDescription, NULL); PrintMessageWithFollowupTask(taskId, FONT_MALE, gPokedudeText_ReadTMDescription, NULL);
gTasks[taskId].func = Task_Pokedude_Run; // this function gTasks[taskId].func = Task_Pokedude_Run; // this function
tPokedudeState++; tPokedudeState++;
break; break;
@@ -1523,8 +1523,8 @@ static void PrintMessageWithFollowupTask(u8 taskId, u8 fontId, const u8 * str, T
static void PrintTitle(void) static void PrintTitle(void)
{ {
u32 distance = 72 - GetStringWidth(FONT_1, gText_TMCase, 0); u32 distance = 72 - GetStringWidth(FONT_NORMAL_COPY_1, gText_TMCase, 0);
AddTextPrinterParameterized3(WIN_TITLE, FONT_1, distance / 2, 1, sTextColors[COLOR_LIGHT], 0, gText_TMCase); AddTextPrinterParameterized3(WIN_TITLE, FONT_NORMAL_COPY_1, distance / 2, 1, sTextColors[COLOR_LIGHT], 0, gText_TMCase);
} }
static void DrawMoveInfoLabels(void) static void DrawMoveInfoLabels(void)
@@ -1546,7 +1546,7 @@ static void PrintMoveInfo(u16 itemId)
if (itemId == ITEM_NONE) if (itemId == ITEM_NONE)
{ {
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
TMCase_Print(WIN_MOVE_INFO, FONT_3, gText_ThreeHyphens, 7, 12 * i, 0, 0, TEXT_SKIP_DRAW, COLOR_MOVE_INFO); TMCase_Print(WIN_MOVE_INFO, FONT_NORMAL_COPY_2, gText_ThreeHyphens, 7, 12 * i, 0, 0, TEXT_SKIP_DRAW, COLOR_MOVE_INFO);
CopyWindowToVram(WIN_MOVE_INFO, COPYWIN_GFX); CopyWindowToVram(WIN_MOVE_INFO, COPYWIN_GFX);
} }
else else
@@ -1563,7 +1563,7 @@ static void PrintMoveInfo(u16 itemId)
ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].power, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].power, STR_CONV_MODE_RIGHT_ALIGN, 3);
str = gStringVar1; str = gStringVar1;
} }
TMCase_Print(WIN_MOVE_INFO, FONT_3, str, 7, 12, 0, 0, TEXT_SKIP_DRAW, COLOR_MOVE_INFO); TMCase_Print(WIN_MOVE_INFO, FONT_NORMAL_COPY_2, str, 7, 12, 0, 0, TEXT_SKIP_DRAW, COLOR_MOVE_INFO);
// Print accuracy // Print accuracy
if (gBattleMoves[move].accuracy == 0) if (gBattleMoves[move].accuracy == 0)
@@ -1573,11 +1573,11 @@ static void PrintMoveInfo(u16 itemId)
ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3);
str = gStringVar1; str = gStringVar1;
} }
TMCase_Print(WIN_MOVE_INFO, FONT_3, str, 7, 24, 0, 0, TEXT_SKIP_DRAW, COLOR_MOVE_INFO); TMCase_Print(WIN_MOVE_INFO, FONT_NORMAL_COPY_2, str, 7, 24, 0, 0, TEXT_SKIP_DRAW, COLOR_MOVE_INFO);
// Print PP // Print PP
ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].pp, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].pp, STR_CONV_MODE_RIGHT_ALIGN, 3);
TMCase_Print(WIN_MOVE_INFO, FONT_3, gStringVar1, 7, 36, 0, 0, TEXT_SKIP_DRAW, COLOR_MOVE_INFO); TMCase_Print(WIN_MOVE_INFO, FONT_NORMAL_COPY_2, gStringVar1, 7, 36, 0, 0, TEXT_SKIP_DRAW, COLOR_MOVE_INFO);
CopyWindowToVram(WIN_MOVE_INFO, COPYWIN_GFX); CopyWindowToVram(WIN_MOVE_INFO, COPYWIN_GFX);
} }
@@ -1595,7 +1595,7 @@ static void PrintPlayersMoney(void)
static void HandleCreateYesNoMenu(u8 taskId, const struct YesNoFuncTable *ptrs) static void HandleCreateYesNoMenu(u8 taskId, const struct YesNoFuncTable *ptrs)
{ {
CreateYesNoMenuWithCallbacks(taskId, &sYesNoWindowTemplate, FONT_2, 0, 2, 91, 14, ptrs); CreateYesNoMenuWithCallbacks(taskId, &sYesNoWindowTemplate, FONT_NORMAL, 0, 2, 91, 14, ptrs);
} }
static u8 AddContextMenu(u8 * windowId, u8 windowIndex) static u8 AddContextMenu(u8 * windowId, u8 windowIndex)
src/trade.c
+14 -14
View File
@@ -891,7 +891,7 @@ static void CB2_ReturnFromLinkTrade2(void)
break; break;
case 12: case 12:
name = gSaveBlock2Ptr->playerName; name = gSaveBlock2Ptr->playerName;
width = GetStringWidth(FONT_1, name, 0); width = GetStringWidth(FONT_NORMAL_COPY_1, name, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -901,7 +901,7 @@ static void CB2_ReturnFromLinkTrade2(void)
} }
id = GetMultiplayerId(); id = GetMultiplayerId();
name = gLinkPlayers[id ^ 1].name; name = gLinkPlayers[id ^ 1].name;
width = GetStringWidth(FONT_1, name, 0); width = GetStringWidth(FONT_NORMAL_COPY_1, name, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -1086,7 +1086,7 @@ void CB2_ReturnToTradeMenuFromSummary(void)
break; break;
case 12: case 12:
name = gSaveBlock2Ptr->playerName; name = gSaveBlock2Ptr->playerName;
width = GetStringWidth(FONT_1, name, 0); width = GetStringWidth(FONT_NORMAL_COPY_1, name, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -1096,7 +1096,7 @@ void CB2_ReturnToTradeMenuFromSummary(void)
} }
id = GetMultiplayerId(); id = GetMultiplayerId();
name = gLinkPlayers[id ^ 1].name; name = gLinkPlayers[id ^ 1].name;
width = GetStringWidth(FONT_1, name, 0); width = GetStringWidth(FONT_NORMAL_COPY_1, name, 0);
xPos = (56 - width) / 2; xPos = (56 - width) / 2;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -1719,8 +1719,8 @@ static void TradeMenuCB_0(void)
{ {
DrawTextBorderOuter(1, 1, 14); DrawTextBorderOuter(1, 1, 14);
FillWindowPixelBuffer(1, PIXEL_FILL(1)); FillWindowPixelBuffer(1, PIXEL_FILL(1));
UnionRoomAndTradeMenuPrintOptions(1, FONT_3, 16, 2, sMenuAction_SummaryTrade); UnionRoomAndTradeMenuPrintOptions(1, FONT_NORMAL_COPY_2, 16, 2, sMenuAction_SummaryTrade);
Menu_InitCursor(1, FONT_3, 0, 0, 16, 2, 0); Menu_InitCursor(1, FONT_NORMAL_COPY_2, 0, 0, 16, 2, 0);
PutWindowTilemap(1); PutWindowTilemap(1);
CopyWindowToVram(1, COPYWIN_FULL); CopyWindowToVram(1, COPYWIN_FULL);
sTradeMenuResourcesPtr->tradeMenuCBnum = 1; sTradeMenuResourcesPtr->tradeMenuCBnum = 1;
@@ -1732,7 +1732,7 @@ static void TradeMenuCB_0(void)
} }
else if (sTradeMenuResourcesPtr->tradeMenuCursorPosition == 12) else if (sTradeMenuResourcesPtr->tradeMenuCursorPosition == 12)
{ {
CreateYesNoMenu(&sWindowTemplate_YesNo, FONT_3, 0, 2, 0x001, 14, 0); CreateYesNoMenu(&sWindowTemplate_YesNo, FONT_NORMAL_COPY_2, 0, 2, 0x001, 14, 0);
sTradeMenuResourcesPtr->tradeMenuCBnum = 4; sTradeMenuResourcesPtr->tradeMenuCBnum = 4;
RenderTextToVramViaBuffer(sTradeUITextPtrs[TRADEUITEXT_ASKCANCEL], (void *)OBJ_VRAM0 + sTradeMenuResourcesPtr->cursorStartTile * 32, 24); RenderTextToVramViaBuffer(sTradeUITextPtrs[TRADEUITEXT_ASKCANCEL], (void *)OBJ_VRAM0 + sTradeMenuResourcesPtr->cursorStartTile * 32, 24);
} }
@@ -1946,7 +1946,7 @@ static void TradeMenuCB_14(void)
if (sTradeMenuResourcesPtr->loadUISpritesState > 120) if (sTradeMenuResourcesPtr->loadUISpritesState > 120)
{ {
CreateYesNoMenu(&sWindowTemplate_YesNo, FONT_3, 0, 2, 1, 14, 0); CreateYesNoMenu(&sWindowTemplate_YesNo, FONT_NORMAL_COPY_2, 0, 2, 1, 14, 0);
sTradeMenuResourcesPtr->loadUISpritesState = 0; sTradeMenuResourcesPtr->loadUISpritesState = 0;
sTradeMenuResourcesPtr->tradeMenuCBnum = 3; sTradeMenuResourcesPtr->tradeMenuCBnum = 3;
} }
@@ -2150,9 +2150,9 @@ static void HandleRedrawTradeMenuOnSide(u8 side)
gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].x2 = 0; gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].x2 = 0;
gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].y2 = 0; gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].y2 = 0;
nameStringWidth = GetNicknameStringWidthByPartyAndMonIdx(nickname, whichParty, partyIdx); nameStringWidth = GetNicknameStringWidthByPartyAndMonIdx(nickname, whichParty, partyIdx);
AddTextPrinterParameterized3((side * 2) + 14, FONT_0, (80 - nameStringWidth) / 2, 4, sTextColor_PartyMonNickname, 0, nickname); AddTextPrinterParameterized3((side * 2) + 14, FONT_SMALL, (80 - nameStringWidth) / 2, 4, sTextColor_PartyMonNickname, 0, nickname);
BuildMovesString(movesString, whichParty, partyIdx); BuildMovesString(movesString, whichParty, partyIdx);
AddTextPrinterParameterized4((side * 2) + 15, FONT_1, 0, 0, 0, 0, sTextColor_PartyMonNickname, 0, movesString); AddTextPrinterParameterized4((side * 2) + 15, FONT_NORMAL_COPY_1, 0, 0, 0, 0, sTextColor_PartyMonNickname, 0, movesString);
PutWindowTilemap((side * 2) + 14); PutWindowTilemap((side * 2) + 14);
CopyWindowToVram((side * 2) + 14, COPYWIN_FULL); CopyWindowToVram((side * 2) + 14, COPYWIN_FULL);
PutWindowTilemap((side * 2) + 15); PutWindowTilemap((side * 2) + 15);
@@ -2174,7 +2174,7 @@ static u8 GetNicknameStringWidthByPartyAndMonIdx(u8 *dest, u8 whichParty, u8 par
else else
GetMonData(&gEnemyParty[partyIdx], MON_DATA_NICKNAME, nickname); GetMonData(&gEnemyParty[partyIdx], MON_DATA_NICKNAME, nickname);
StringCopy_Nickname(dest, nickname); StringCopy_Nickname(dest, nickname);
return GetStringWidth(FONT_0, dest, GetFontAttribute(FONT_0, FONTATTR_LETTER_SPACING)); return GetStringWidth(FONT_SMALL, dest, GetFontAttribute(FONT_SMALL, FONTATTR_LETTER_SPACING));
} }
static void BuildMovesString(u8 *movesString, u8 whichParty, u8 whichMon) static void BuildMovesString(u8 *movesString, u8 whichParty, u8 whichMon)
@@ -2221,8 +2221,8 @@ static void PrintPartyMonNickname(u8 whichParty, u8 windowId, const u8 *str)
s8 speed; s8 speed;
windowId += (whichParty * PARTY_SIZE) + 2; windowId += (whichParty * PARTY_SIZE) + 2;
speed = 0; speed = 0;
xPos = (64u - GetStringWidth(FONT_0, str, GetFontAttribute(FONT_0, FONTATTR_LETTER_SPACING))) / 2; xPos = (64u - GetStringWidth(FONT_SMALL, str, GetFontAttribute(FONT_SMALL, FONTATTR_LETTER_SPACING))) / 2;
AddTextPrinterParameterized3(windowId, FONT_0, xPos, 4, sTextColor_PartyMonNickname, speed, str); AddTextPrinterParameterized3(windowId, FONT_SMALL, xPos, 4, sTextColor_PartyMonNickname, speed, str);
PutWindowTilemap(windowId); PutWindowTilemap(windowId);
CopyWindowToVram(windowId, COPYWIN_FULL); CopyWindowToVram(windowId, COPYWIN_FULL);
} }
@@ -2432,7 +2432,7 @@ static void RunScheduledLinkTasks(void)
static void PrintTradeErrorOrStatusMessage(u8 idx) static void PrintTradeErrorOrStatusMessage(u8 idx)
{ {
FillWindowPixelBuffer(0, PIXEL_FILL(1)); FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized(0, FONT_3, sTradeErrorOrStatusMessagePtrs[idx], 0, 2, 0xFF, NULL); AddTextPrinterParameterized(0, FONT_NORMAL_COPY_2, sTradeErrorOrStatusMessagePtrs[idx], 0, 2, 0xFF, NULL);
DrawTextBorderOuter(0, 0x014, 12); DrawTextBorderOuter(0, 0x014, 12);
PutWindowTilemap(0); PutWindowTilemap(0);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
src/trade_scene.c
+1 -1
View File
@@ -2765,7 +2765,7 @@ void DrawTextOnTradeWindow(u8 windowId, const u8 *str, s8 speed)
sTradeData->textColor[0] = 15; sTradeData->textColor[0] = 15;
sTradeData->textColor[1] = 1; sTradeData->textColor[1] = 1;
sTradeData->textColor[2] = 6; sTradeData->textColor[2] = 6;
AddTextPrinterParameterized4(windowId, FONT_2, 0, 2, 0, 2, sTradeData->textColor, speed, str); AddTextPrinterParameterized4(windowId, FONT_NORMAL, 0, 2, 0, 2, sTradeData->textColor, speed, str);
CopyWindowToVram(windowId, COPYWIN_FULL); CopyWindowToVram(windowId, COPYWIN_FULL);
} }
src/trainer_card.c
+6 -6
View File
@@ -274,7 +274,7 @@ static const u16 *const sKantoTrainerCardStarPals[] =
static const u8 sTrainerCardTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY}; static const u8 sTrainerCardTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
static const u8 sTrainerCardStatColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED}; static const u8 sTrainerCardStatColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED};
static const u8 sTimeColonInvisibleTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT}; static const u8 sTimeColonInvisibleTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT};
static const u8 sTrainerCardFontIds[] = {FONT_0, FONT_2, FONT_0}; static const u8 sTrainerCardFontIds[] = {FONT_SMALL, FONT_NORMAL, FONT_SMALL};
static const u8 sTrainerPicOffsets[2][GENDER_COUNT][2] = static const u8 sTrainerPicOffsets[2][GENDER_COUNT][2] =
{ {
@@ -620,7 +620,7 @@ static void Task_TrainerCard(u8 taskId)
case STATE_WAIT_LINK_PARTNER: case STATE_WAIT_LINK_PARTNER:
SetCloseLinkCallback(); SetCloseLinkCallback();
DrawDialogueFrame(0, 1); DrawDialogueFrame(0, 1);
AddTextPrinterParameterized(0, FONT_2, gText_WaitingTrainerFinishReading, 0, 1, TEXT_SKIP_DRAW, 0); AddTextPrinterParameterized(0, FONT_NORMAL, gText_WaitingTrainerFinishReading, 0, 1, TEXT_SKIP_DRAW, 0);
CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(0, COPYWIN_FULL);
sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD_LINK; sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD_LINK;
break; break;
@@ -1237,16 +1237,16 @@ static void PrintProfilePhraseOnCard(void)
{ {
if (sTrainerCardDataPtr->isLink) if (sTrainerCardDataPtr->isLink)
{ {
AddTextPrinterParameterized3(1, FONT_2, 10, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType], AddTextPrinterParameterized3(1, FONT_NORMAL, 10, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType],
sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[0]); sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[0]);
AddTextPrinterParameterized3(1, FONT_2, GetStringWidth(FONT_2, sTrainerCardDataPtr->easyChatProfile[0], 0) + 16, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType], AddTextPrinterParameterized3(1, FONT_NORMAL, GetStringWidth(FONT_NORMAL, sTrainerCardDataPtr->easyChatProfile[0], 0) + 16, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType],
sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[1]); sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[1]);
AddTextPrinterParameterized3(1, FONT_2, 10, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType], AddTextPrinterParameterized3(1, FONT_NORMAL, 10, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType],
sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[2]); sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[2]);
AddTextPrinterParameterized3(1, FONT_2, GetStringWidth(FONT_2, sTrainerCardDataPtr->easyChatProfile[2], 0) + 16, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType], AddTextPrinterParameterized3(1, FONT_NORMAL, GetStringWidth(FONT_NORMAL, sTrainerCardDataPtr->easyChatProfile[2], 0) + 16, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType],
sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[3]); sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[3]);
} }
} }
src/trainer_tower.c
+7 -7
View File
@@ -632,7 +632,7 @@ static void TT_ConvertEasyChatMessageToString(u16 *ecWords, u8 *dest)
{ {
s32 i; s32 i;
ConvertEasyChatWordsToString(dest, ecWords, 3, 2); ConvertEasyChatWordsToString(dest, ecWords, 3, 2);
if ((unsigned)GetStringWidth(FONT_2, dest, -1) > 196) if ((unsigned)GetStringWidth(FONT_NORMAL, dest, -1) > 196)
{ {
// Has to be printed 2x3 // Has to be printed 2x3
ConvertEasyChatWordsToString(dest, ecWords, 2, 3); ConvertEasyChatWordsToString(dest, ecWords, 2, 3);
@@ -905,15 +905,15 @@ static void ShowResultsBoard(void)
windowId = AddWindow(sTimeBoardWindowTemplate); windowId = AddWindow(sTimeBoardWindowTemplate);
LoadStdWindowFrameGfx(); LoadStdWindowFrameGfx();
DrawStdWindowFrame(windowId, FALSE); DrawStdWindowFrame(windowId, FALSE);
AddTextPrinterParameterized(windowId, FONT_2, gText_TimeBoard, 74, 0, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_TimeBoard, 74, 0, TEXT_SKIP_DRAW, NULL);
for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++) for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++)
{ {
PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime)); PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime));
StringExpandPlaceholders(gStringVar4, gText_XMinYZSec); StringExpandPlaceholders(gStringVar4, gText_XMinYZSec);
AddTextPrinterParameterized(windowId, FONT_2, gTrainerTowerChallengeTypeTexts[i - 1], 24, 36 + 20 * i, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gTrainerTowerChallengeTypeTexts[i - 1], 24, 36 + 20 * i, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(windowId, FONT_2, gStringVar4, 96, 46 + 20 * i, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(windowId, FONT_NORMAL, gStringVar4, 96, 46 + 20 * i, TEXT_SKIP_DRAW, NULL);
} }
PutWindowTilemap(windowId); PutWindowTilemap(windowId);
@@ -1059,14 +1059,14 @@ void PrintTrainerTowerRecords(void)
SetUpTrainerTowerDataStruct(); SetUpTrainerTowerDataStruct();
FillWindowPixelRect(0, PIXEL_FILL(0), 0, 0, 216, 144); FillWindowPixelRect(0, PIXEL_FILL(0), 0, 0, 216, 144);
ValidateOrResetCurTrainerTowerRecord(); ValidateOrResetCurTrainerTowerRecord();
AddTextPrinterParameterized3(0, FONT_2, 0x4a, 0, sTextColors, 0, gText_TimeBoard); AddTextPrinterParameterized3(0, FONT_NORMAL, 0x4a, 0, sTextColors, 0, gText_TimeBoard);
for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++) for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++)
{ {
PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&gSaveBlock1Ptr->trainerTower[i].bestTime)); PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&gSaveBlock1Ptr->trainerTower[i].bestTime));
StringExpandPlaceholders(gStringVar4, gText_XMinYZSec); StringExpandPlaceholders(gStringVar4, gText_XMinYZSec);
AddTextPrinterParameterized3(windowId, FONT_2, 0x18, 0x24 + 0x14 * i, sTextColors, 0, gTrainerTowerChallengeTypeTexts[i]); AddTextPrinterParameterized3(windowId, FONT_NORMAL, 0x18, 0x24 + 0x14 * i, sTextColors, 0, gTrainerTowerChallengeTypeTexts[i]);
AddTextPrinterParameterized3(windowId, FONT_2, 0x60, 0x24 + 0x14 * i, sTextColors, 0, gStringVar4); AddTextPrinterParameterized3(windowId, FONT_NORMAL, 0x60, 0x24 + 0x14 * i, sTextColors, 0, gStringVar4);
} }
PutWindowTilemap(windowId); PutWindowTilemap(windowId);
src/union_room.c
+18 -18
View File
@@ -307,16 +307,16 @@ static void PrintNumPlayersWaitingForMsg(u8 windowId, u8 capacityCode, u8 string
switch (capacityCode << 8) switch (capacityCode << 8)
{ {
case LINK_GROUP_CAPACITY(0, 2): case LINK_GROUP_CAPACITY(0, 2):
PrintUnionRoomText(windowId, FONT_2, gTexts_UR_PlayersNeededOrMode[0][stringId - 1], 0, 2, UR_COLOR_DEFAULT); PrintUnionRoomText(windowId, FONT_NORMAL, gTexts_UR_PlayersNeededOrMode[0][stringId - 1], 0, 2, UR_COLOR_DEFAULT);
break; break;
case LINK_GROUP_CAPACITY(0, 4): case LINK_GROUP_CAPACITY(0, 4):
PrintUnionRoomText(windowId, FONT_2, gTexts_UR_PlayersNeededOrMode[1][stringId - 1], 0, 2, UR_COLOR_DEFAULT); PrintUnionRoomText(windowId, FONT_NORMAL, gTexts_UR_PlayersNeededOrMode[1][stringId - 1], 0, 2, UR_COLOR_DEFAULT);
break; break;
case LINK_GROUP_CAPACITY(2, 5): case LINK_GROUP_CAPACITY(2, 5):
PrintUnionRoomText(windowId, FONT_2, gTexts_UR_PlayersNeededOrMode[2][stringId - 1], 0, 2, UR_COLOR_DEFAULT); PrintUnionRoomText(windowId, FONT_NORMAL, gTexts_UR_PlayersNeededOrMode[2][stringId - 1], 0, 2, UR_COLOR_DEFAULT);
break; break;
case LINK_GROUP_CAPACITY(3, 5): case LINK_GROUP_CAPACITY(3, 5):
PrintUnionRoomText(windowId, FONT_2, gTexts_UR_PlayersNeededOrMode[3][stringId - 1], 0, 2, UR_COLOR_DEFAULT); PrintUnionRoomText(windowId, FONT_NORMAL, gTexts_UR_PlayersNeededOrMode[3][stringId - 1], 0, 2, UR_COLOR_DEFAULT);
break; break;
} }
@@ -328,11 +328,11 @@ static void PrintPlayerNameAndIdOnWindow(u8 windowId)
u8 text[12]; u8 text[12];
u8 text2[12]; u8 text2[12];
PrintUnionRoomText(windowId, FONT_2, gSaveBlock2Ptr->playerName, 0, 2, UR_COLOR_DEFAULT); PrintUnionRoomText(windowId, FONT_NORMAL, gSaveBlock2Ptr->playerName, 0, 2, UR_COLOR_DEFAULT);
StringCopy(text2, gText_UR_ID); StringCopy(text2, gText_UR_ID);
ConvertIntToDecimalStringN(text, ReadAsU16(gSaveBlock2Ptr->playerTrainerId), STR_CONV_MODE_LEADING_ZEROS, 5); ConvertIntToDecimalStringN(text, ReadAsU16(gSaveBlock2Ptr->playerTrainerId), STR_CONV_MODE_LEADING_ZEROS, 5);
StringAppend(text2, text); StringAppend(text2, text);
PrintUnionRoomText(windowId, FONT_0, text2, 0, 16, UR_COLOR_DEFAULT); PrintUnionRoomText(windowId, FONT_SMALL, text2, 0, 16, UR_COLOR_DEFAULT);
} }
static void GetAwaitingCommunicationText(u8 *dst, u8 caseId) static void GetAwaitingCommunicationText(u8 *dst, u8 caseId)
@@ -406,7 +406,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
data->nPlayerModeWindowId = AddWindow(&sWindowTemplate_NumPlayerMode); data->nPlayerModeWindowId = AddWindow(&sWindowTemplate_NumPlayerMode);
FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2)); FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2));
PrintUnionRoomText(data->bButtonCancelWindowId, FONT_0, gText_UR_BButtonCancel, 8, 2, UR_COLOR_CANCEL); PrintUnionRoomText(data->bButtonCancelWindowId, FONT_SMALL, gText_UR_BButtonCancel, 8, 2, UR_COLOR_CANCEL);
PutWindowTilemap(data->bButtonCancelWindowId); PutWindowTilemap(data->bButtonCancelWindowId);
CopyWindowToVram(data->bButtonCancelWindowId, COPYWIN_GFX); CopyWindowToVram(data->bButtonCancelWindowId, COPYWIN_GFX);
@@ -941,7 +941,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
data->playerNameAndIdWindowId = AddWindow(&sWindowTemplate_PlayerNameAndId); data->playerNameAndIdWindowId = AddWindow(&sWindowTemplate_PlayerNameAndId);
FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2)); FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2));
PrintUnionRoomText(data->bButtonCancelWindowId, FONT_0, gText_UR_ChooseJoinCancel, 8, 2, UR_COLOR_CANCEL); PrintUnionRoomText(data->bButtonCancelWindowId, FONT_SMALL, gText_UR_ChooseJoinCancel, 8, 2, UR_COLOR_CANCEL);
PutWindowTilemap(data->bButtonCancelWindowId); PutWindowTilemap(data->bButtonCancelWindowId);
CopyWindowToVram(data->bButtonCancelWindowId, COPYWIN_GFX); CopyWindowToVram(data->bButtonCancelWindowId, COPYWIN_GFX);
@@ -3485,7 +3485,7 @@ static u8 CreateTradeBoardWindow(const struct WindowTemplate * template)
u8 windowId = AddWindow(template); u8 windowId = AddWindow(template);
DrawStdWindowFrame(windowId, FALSE); DrawStdWindowFrame(windowId, FALSE);
FillWindowPixelBuffer(windowId, PIXEL_FILL(15)); FillWindowPixelBuffer(windowId, PIXEL_FILL(15));
PrintUnionRoomText(windowId, FONT_0, gText_UR_NameWantedOfferLv, 8, 1, UR_COLOR_TRADE_BOARD_OTHER); PrintUnionRoomText(windowId, FONT_SMALL, gText_UR_NameWantedOfferLv, 8, 1, UR_COLOR_TRADE_BOARD_OTHER);
PutWindowTilemap(windowId); PutWindowTilemap(windowId);
CopyWindowToVram(windowId, COPYWIN_GFX); CopyWindowToVram(windowId, COPYWIN_GFX);
return windowId; return windowId;
@@ -3795,18 +3795,18 @@ static void PrintGroupMemberOnWindow(u8 windowId, u8 x, u8 y, struct RfuPlayer *
ConvertIntToDecimalStringN(gStringVar4, id + 1, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar4, id + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
StringAppend(gStringVar4, gText_UR_Colon); StringAppend(gStringVar4, gText_UR_Colon);
PrintUnionRoomText(windowId, FONT_0, gStringVar4, x, y, UR_COLOR_DEFAULT); PrintUnionRoomText(windowId, FONT_SMALL, gStringVar4, x, y, UR_COLOR_DEFAULT);
x += 18; x += 18;
activity = player->rfu.data.activity; activity = player->rfu.data.activity;
if (player->groupScheduledAnim == UNION_ROOM_SPAWN_IN && !(activity & IN_UNION_ROOM)) if (player->groupScheduledAnim == UNION_ROOM_SPAWN_IN && !(activity & IN_UNION_ROOM))
{ {
CopyAndTranslatePlayerName2(uname, *player); CopyAndTranslatePlayerName2(uname, *player);
PrintUnionRoomText(windowId, FONT_2, uname, x, y, colorIdx); PrintUnionRoomText(windowId, FONT_NORMAL, uname, x, y, colorIdx);
ConvertIntToDecimalStringN(trainerId, player->rfu.data.compatibility.playerTrainerId[0] | (player->rfu.data.compatibility.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5); ConvertIntToDecimalStringN(trainerId, player->rfu.data.compatibility.playerTrainerId[0] | (player->rfu.data.compatibility.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5);
StringCopy(gStringVar4, gText_UR_ID); StringCopy(gStringVar4, gText_UR_ID);
StringAppend(gStringVar4, trainerId); StringAppend(gStringVar4, trainerId);
x += 77; x += 77;
PrintUnionRoomText(windowId, FONT_0, gStringVar4, x, y, colorIdx); PrintUnionRoomText(windowId, FONT_SMALL, gStringVar4, x, y, colorIdx);
} }
} }
@@ -3818,12 +3818,12 @@ static void PrintGroupCandidateOnWindow(u8 windowId, u8 x, u8 y, struct RfuPlaye
if (player->groupScheduledAnim == UNION_ROOM_SPAWN_IN) if (player->groupScheduledAnim == UNION_ROOM_SPAWN_IN)
{ {
CopyAndTranslatePlayerName2(uname, *player); CopyAndTranslatePlayerName2(uname, *player);
PrintUnionRoomText(windowId, FONT_2, uname, x, y, colorIdx); PrintUnionRoomText(windowId, FONT_NORMAL, uname, x, y, colorIdx);
ConvertIntToDecimalStringN(id_str, player->rfu.data.compatibility.playerTrainerId[0] | (player->rfu.data.compatibility.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5); ConvertIntToDecimalStringN(id_str, player->rfu.data.compatibility.playerTrainerId[0] | (player->rfu.data.compatibility.playerTrainerId[1] << 8), STR_CONV_MODE_LEADING_ZEROS, 5);
StringCopy(gStringVar4, gText_UR_ID); StringCopy(gStringVar4, gText_UR_ID);
StringAppend(gStringVar4, id_str); StringAppend(gStringVar4, id_str);
x += 71; x += 71;
PrintUnionRoomText(windowId, FONT_0, gStringVar4, x, y, colorIdx); PrintUnionRoomText(windowId, FONT_SMALL, gStringVar4, x, y, colorIdx);
} }
} }
@@ -3927,17 +3927,17 @@ static void TradeBoardPrintItemInfo(u8 windowId, u8 y, struct RfuGameData * data
u8 type = data->tradeType; u8 type = data->tradeType;
u8 level = data->tradeLevel; u8 level = data->tradeLevel;
PrintUnionRoomText(windowId, FONT_2, playerName, 8, y, colorIdx); PrintUnionRoomText(windowId, FONT_NORMAL, playerName, 8, y, colorIdx);
if (species == SPECIES_EGG) if (species == SPECIES_EGG)
{ {
PrintUnionRoomText(windowId, FONT_2, gText_UR_EggTrade, 68, y, colorIdx); PrintUnionRoomText(windowId, FONT_NORMAL, gText_UR_EggTrade, 68, y, colorIdx);
} }
else else
{ {
BlitMoveInfoIcon(windowId, type + 1, 68, y); BlitMoveInfoIcon(windowId, type + 1, 68, y);
PrintUnionRoomText(windowId, FONT_2, gSpeciesNames[species], 118, y, colorIdx); PrintUnionRoomText(windowId, FONT_NORMAL, gSpeciesNames[species], 118, y, colorIdx);
ConvertIntToDecimalStringN(levelStr, level, STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(levelStr, level, STR_CONV_MODE_LEFT_ALIGN, 3);
PrintUnionRoomText(windowId, FONT_2, levelStr, GetStringRightAlignXOffset(2, levelStr, 218), y, colorIdx); PrintUnionRoomText(windowId, FONT_NORMAL, levelStr, GetStringRightAlignXOffset(2, levelStr, 218), y, colorIdx);
} }
} }
src/union_room_battle.c
+1 -1
View File
@@ -67,7 +67,7 @@ static void UnionRoomBattle_CreateTextPrinter(u8 windowId, const u8 * str, u8 x,
s32 letterSpacing = 1; s32 letterSpacing = 1;
s32 lineSpacing = 1; s32 lineSpacing = 1;
FillWindowPixelBuffer(windowId, PIXEL_FILL(sTextColors[0])); FillWindowPixelBuffer(windowId, PIXEL_FILL(sTextColors[0]));
AddTextPrinterParameterized4(windowId, FONT_3, x, y, letterSpacing, lineSpacing, sTextColors, speed, str); AddTextPrinterParameterized4(windowId, FONT_NORMAL_COPY_2, x, y, letterSpacing, lineSpacing, sTextColors, speed, str);
} }
static bool32 UnionRoomBattle_PrintTextOnWindow0(s16 * state, const u8 * str, s32 speed) static bool32 UnionRoomBattle_PrintTextOnWindow0(s16 * state, const u8 * str, s32 speed)
src/union_room_chat_display.c
+15 -15
View File
@@ -952,10 +952,10 @@ static void PlaceYesNoMenuAt(u8 left, u8 top, u8 initialCursorPos)
{ {
FillWindowPixelBuffer(sWork->yesNoMenuWinId, PIXEL_FILL(1)); FillWindowPixelBuffer(sWork->yesNoMenuWinId, PIXEL_FILL(1));
PutWindowTilemap(sWork->yesNoMenuWinId); PutWindowTilemap(sWork->yesNoMenuWinId);
AddTextPrinterParameterized(sWork->yesNoMenuWinId, FONT_2, gText_Yes, 8, 2, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sWork->yesNoMenuWinId, FONT_NORMAL, gText_Yes, 8, 2, TEXT_SKIP_DRAW, NULL);
AddTextPrinterParameterized(sWork->yesNoMenuWinId, FONT_2, gText_No, 8, 16, TEXT_SKIP_DRAW, NULL); AddTextPrinterParameterized(sWork->yesNoMenuWinId, FONT_NORMAL, gText_No, 8, 16, TEXT_SKIP_DRAW, NULL);
DrawTextBorderOuter(sWork->yesNoMenuWinId, 1, 13); DrawTextBorderOuter(sWork->yesNoMenuWinId, 1, 13);
Menu_InitCursor(sWork->yesNoMenuWinId, FONT_2, 0, 2, 14, 2, initialCursorPos); Menu_InitCursor(sWork->yesNoMenuWinId, FONT_NORMAL, 0, 2, 14, 2, initialCursorPos);
} }
} }
@@ -1023,7 +1023,7 @@ static void PlaceStdMessageWindow(int id, u16 bg0vofs)
DrawTextBorderInner(windowId, 0xA, 2); DrawTextBorderInner(windowId, 0xA, 2);
AddTextPrinterParameterized5( AddTextPrinterParameterized5(
windowId, windowId,
FONT_2, FONT_NORMAL,
str, str,
sMessageWindowInfo[id].x + 8, sMessageWindowInfo[id].x + 8,
sMessageWindowInfo[id].y + 8, sMessageWindowInfo[id].y + 8,
@@ -1037,7 +1037,7 @@ static void PlaceStdMessageWindow(int id, u16 bg0vofs)
DrawTextBorderOuter(windowId, 0xA, 2); DrawTextBorderOuter(windowId, 0xA, 2);
AddTextPrinterParameterized5( AddTextPrinterParameterized5(
windowId, windowId,
FONT_2, FONT_NORMAL,
str, str,
sMessageWindowInfo[id].x, sMessageWindowInfo[id].x,
sMessageWindowInfo[id].y, sMessageWindowInfo[id].y,
@@ -1090,7 +1090,7 @@ static void PrintOnWin1Parameterized(u16 x, u8 *str, u8 bgColor, u8 fgColor, u8
strbuf[1] = EXT_CTRL_CODE_MIN_LETTER_SPACING; strbuf[1] = EXT_CTRL_CODE_MIN_LETTER_SPACING;
strbuf[2] = 8; strbuf[2] = 8;
StringCopy(&strbuf[3], str); StringCopy(&strbuf[3], str);
AddTextPrinterParameterized3(1, FONT_2, x * 8, 1, color, TEXT_SKIP_DRAW, strbuf); AddTextPrinterParameterized3(1, FONT_NORMAL, x * 8, 1, color, TEXT_SKIP_DRAW, strbuf);
} }
static void PrintCurrentKeyboardPage(void) static void PrintCurrentKeyboardPage(void)
@@ -1124,7 +1124,7 @@ static void PrintCurrentKeyboardPage(void)
return; return;
StringCopy(&str[3], gUnionRoomKeyboardText[page][i]); StringCopy(&str[3], gUnionRoomKeyboardText[page][i]);
AddTextPrinterParameterized3(2, FONT_0, left, top, color, TEXT_SKIP_DRAW, str); AddTextPrinterParameterized3(2, FONT_SMALL, left, top, color, TEXT_SKIP_DRAW, str);
} }
} }
else else
@@ -1133,9 +1133,9 @@ static void PrintCurrentKeyboardPage(void)
for (i = 0, top = 0; i < 10; i++, top += 12) for (i = 0, top = 0; i < 10; i++, top += 12)
{ {
str2 = UnionRoomChat_GetWorkRegisteredText(i); str2 = UnionRoomChat_GetWorkRegisteredText(i);
if (GetStringWidth(FONT_0, str2, 0) <= 40) if (GetStringWidth(FONT_SMALL, str2, 0) <= 40)
{ {
AddTextPrinterParameterized3(2, FONT_0, left, top, color, TEXT_SKIP_DRAW, str2); AddTextPrinterParameterized3(2, FONT_SMALL, left, top, color, TEXT_SKIP_DRAW, str2);
} }
else else
{ {
@@ -1144,10 +1144,10 @@ static void PrintCurrentKeyboardPage(void)
{ {
length--; length--;
StringCopyN_Multibyte(str, str2, length); StringCopyN_Multibyte(str, str2, length);
} while (GetStringWidth(FONT_0, str, 0) > 35); } while (GetStringWidth(FONT_SMALL, str, 0) > 35);
AddTextPrinterParameterized3(2, FONT_0, left, top, color, TEXT_SKIP_DRAW, str); AddTextPrinterParameterized3(2, FONT_SMALL, left, top, color, TEXT_SKIP_DRAW, str);
AddTextPrinterParameterized3(2, FONT_0, left + 35, top, color, TEXT_SKIP_DRAW, gText_Ellipsis); AddTextPrinterParameterized3(2, FONT_SMALL, left + 35, top, color, TEXT_SKIP_DRAW, gText_Ellipsis);
} }
} }
} }
@@ -1195,8 +1195,8 @@ static void PrintKeyboardSwapTextsOnWin3(void)
{ {
FillWindowPixelBuffer(3, PIXEL_FILL(1)); FillWindowPixelBuffer(3, PIXEL_FILL(1));
DrawTextBorderOuter(3, 1, 13); DrawTextBorderOuter(3, 1, 13);
UnionRoomAndTradeMenuPrintOptions(3, FONT_2, 14, 5, sKeyboardSwapTexts); UnionRoomAndTradeMenuPrintOptions(3, FONT_NORMAL, 14, 5, sKeyboardSwapTexts);
Menu_InitCursor(3, FONT_2, 0, 0, 14, 5, GetCurrentKeyboardPage()); Menu_InitCursor(3, FONT_NORMAL, 0, 0, 14, 5, GetCurrentKeyboardPage());
PutWindowTilemap(3); PutWindowTilemap(3);
} }
@@ -1214,7 +1214,7 @@ static void PrintTextOnWin0Colorized(u16 row, u8 *str, u8 colorIdx)
color[1] = colorIdx * 2 + 2; color[1] = colorIdx * 2 + 2;
color[2] = colorIdx * 2 + 3; color[2] = colorIdx * 2 + 3;
FillWindowPixelRect(0, PIXEL_FILL(1), 0, row * 15, 168, 15); FillWindowPixelRect(0, PIXEL_FILL(1), 0, row * 15, 168, 15);
AddTextPrinterParameterized3(0, FONT_2, 0, row * 15, color, TEXT_SKIP_DRAW, str); AddTextPrinterParameterized3(0, FONT_NORMAL, 0, row * 15, color, TEXT_SKIP_DRAW, str);
} }
static void ResetGpuBgState(void) static void ResetGpuBgState(void)
src/vs_seeker.c
+3 -3
View File
@@ -751,12 +751,12 @@ void Task_VsSeeker_0(u8 taskId)
if (respval == VSSEEKER_NOT_CHARGED) if (respval == VSSEEKER_NOT_CHARGED)
{ {
Free(sVsSeeker); Free(sVsSeeker);
DisplayItemMessageOnField(taskId, FONT_2, VSSeeker_Text_BatteryNotChargedNeedXSteps, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); DisplayItemMessageOnField(taskId, FONT_NORMAL, VSSeeker_Text_BatteryNotChargedNeedXSteps, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker);
} }
else if (respval == VSSEEKER_NO_ONE_IN_RANGE) else if (respval == VSSEEKER_NO_ONE_IN_RANGE)
{ {
Free(sVsSeeker); Free(sVsSeeker);
DisplayItemMessageOnField(taskId, FONT_2, VSSeeker_Text_NoTrainersWithinRange, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); DisplayItemMessageOnField(taskId, FONT_NORMAL, VSSeeker_Text_NoTrainersWithinRange, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker);
} }
else if (respval == VSSEEKER_CAN_USE) else if (respval == VSSEEKER_CAN_USE)
{ {
@@ -829,7 +829,7 @@ static void Task_VsSeeker_3(u8 taskId)
{ {
if (sVsSeeker->responseCode == VSSEEKER_RESPONSE_NO_RESPONSE) if (sVsSeeker->responseCode == VSSEEKER_RESPONSE_NO_RESPONSE)
{ {
DisplayItemMessageOnField(taskId, FONT_2, VSSeeker_Text_TrainersNotReady, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); DisplayItemMessageOnField(taskId, FONT_NORMAL, VSSeeker_Text_TrainersNotReady, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker);
} }
else else
{ {

Some files were not shown because too many files have changed in this diff Show More