Merge pull request #1740 from AsparagusEduardo/pret_stringTabs
Fixed inconsistent use of white space for scripts, .c files and .h files.
This commit is contained in:
GriffinR
+505
-505
File diff suppressed because it is too large
Load Diff
@@ -472,8 +472,8 @@ BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded:
|
|||||||
|
|
||||||
@ Unused
|
@ Unused
|
||||||
BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak:
|
BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak:
|
||||||
.string "For the feat of your 7-win streak,\n"
|
.string "For the feat of your 7-win streak,\n"
|
||||||
.string "we present you with Battle Point(s).$"
|
.string "we present you with Battle Point(s).$"
|
||||||
|
|
||||||
BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize:
|
BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize:
|
||||||
.string "You seem to have no space for\n"
|
.string "You seem to have no space for\n"
|
||||||
|
|||||||
@@ -33,8 +33,8 @@ EverGrandeCity_ChampionsRoom_EventScript_EnterRoom::
|
|||||||
waitmovement 0
|
waitmovement 0
|
||||||
setvar VAR_TEMP_1, 1
|
setvar VAR_TEMP_1, 1
|
||||||
goto EverGrandeCity_ChampionsRoom_EventScript_Wallace
|
goto EverGrandeCity_ChampionsRoom_EventScript_Wallace
|
||||||
releaseall
|
releaseall
|
||||||
end
|
end
|
||||||
|
|
||||||
EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace:
|
EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace:
|
||||||
walk_up
|
walk_up
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ FortreeCity_DecorationShop_EventScript_ClerkDesks::
|
|||||||
release
|
release
|
||||||
end
|
end
|
||||||
|
|
||||||
.align 2
|
.align 2
|
||||||
FortreeCity_DecorationShop_PokemartDecor_Desks:
|
FortreeCity_DecorationShop_PokemartDecor_Desks:
|
||||||
.2byte DECOR_SMALL_DESK
|
.2byte DECOR_SMALL_DESK
|
||||||
.2byte DECOR_POKEMON_DESK
|
.2byte DECOR_POKEMON_DESK
|
||||||
|
|||||||
@@ -315,7 +315,7 @@ MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory::
|
|||||||
.string "the HOENN region!$"
|
.string "the HOENN region!$"
|
||||||
|
|
||||||
MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle::
|
MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle::
|
||||||
.string "The BERRY-Planting TRAINER$"
|
.string "The BERRY-Planting TRAINER$"
|
||||||
|
|
||||||
MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction::
|
MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction::
|
||||||
.string "Planted BERRIES$"
|
.string "Planted BERRIES$"
|
||||||
|
|||||||
@@ -1,71 +1,71 @@
|
|||||||
EventTicket_Text_OldSeaMapTooFar:
|
EventTicket_Text_OldSeaMapTooFar:
|
||||||
.string "What's up, youngster?\p"
|
.string "What's up, youngster?\p"
|
||||||
.string "What, it's you who's supposed to have\n"
|
.string "What, it's you who's supposed to have\n"
|
||||||
.string "a tattered old map?\p"
|
.string "a tattered old map?\p"
|
||||||
.string "Let's have a look.\n"
|
.string "Let's have a look.\n"
|
||||||
.string "… … … … … …\p"
|
.string "… … … … … …\p"
|
||||||
.string "Boy, this is quite a ways away.\n"
|
.string "Boy, this is quite a ways away.\n"
|
||||||
.string "I'm afraid I can't help you…$"
|
.string "I'm afraid I can't help you…$"
|
||||||
|
|
||||||
EventTicket_Text_BrineyHoldOnASecond:
|
EventTicket_Text_BrineyHoldOnASecond:
|
||||||
.string "BRINEY: Hold on a second!\p"
|
.string "BRINEY: Hold on a second!\p"
|
||||||
.string "What's the idea of turning down\n"
|
.string "What's the idea of turning down\n"
|
||||||
.string "someone that I owe so much to?$"
|
.string "someone that I owe so much to?$"
|
||||||
|
|
||||||
EventTicket_Text_BrineyLetsSail:
|
EventTicket_Text_BrineyLetsSail:
|
||||||
.string "{PLAYER}{KUN}, I'm terribly sorry.\p"
|
.string "{PLAYER}{KUN}, I'm terribly sorry.\p"
|
||||||
.string "You came to me seeking my help,\n"
|
.string "You came to me seeking my help,\n"
|
||||||
.string "and we almost turned you away.\p"
|
.string "and we almost turned you away.\p"
|
||||||
.string "Well, let me make things right.\p"
|
.string "Well, let me make things right.\p"
|
||||||
.string "We'll sail right away, of course!\p"
|
.string "We'll sail right away, of course!\p"
|
||||||
.string "Let's find this island on\n"
|
.string "Let's find this island on\n"
|
||||||
.string "this OLD SEA MAP!$"
|
.string "this OLD SEA MAP!$"
|
||||||
|
|
||||||
EventTicket_Text_OddTicketGetOnBoard:
|
EventTicket_Text_OddTicketGetOnBoard:
|
||||||
.string "Is it you who brought that odd\n"
|
.string "Is it you who brought that odd\n"
|
||||||
.string "ticket?\p"
|
.string "ticket?\p"
|
||||||
.string "Where you're trying to go is an island\n"
|
.string "Where you're trying to go is an island\n"
|
||||||
.string "that's far, far away.\p"
|
.string "that's far, far away.\p"
|
||||||
.string "No one knows what awaits there…\p"
|
.string "No one knows what awaits there…\p"
|
||||||
.string "The very thought excites my blood\n"
|
.string "The very thought excites my blood\n"
|
||||||
.string "as a sailing man!\p"
|
.string "as a sailing man!\p"
|
||||||
.string "Get on board, youngster!$"
|
.string "Get on board, youngster!$"
|
||||||
|
|
||||||
FarawayIsland_Entrance_Text_SailorReturn:
|
FarawayIsland_Entrance_Text_SailorReturn:
|
||||||
.string "CAPT. BRINEY can be so maddeningly\n"
|
.string "CAPT. BRINEY can be so maddeningly\n"
|
||||||
.string "fickle…\p"
|
.string "fickle…\p"
|
||||||
.string "Do you want to return to LILYCOVE?$"
|
.string "Do you want to return to LILYCOVE?$"
|
||||||
|
|
||||||
BirthIsland_Harbor_Text_SailorReturn:
|
BirthIsland_Harbor_Text_SailorReturn:
|
||||||
.string "What an oddly shaped island, eh?\n"
|
.string "What an oddly shaped island, eh?\n"
|
||||||
.string "Do you want to return to LILYCOVE?$"
|
.string "Do you want to return to LILYCOVE?$"
|
||||||
|
|
||||||
EventTicket_Text_OddTicketsWhereTo:
|
EventTicket_Text_OddTicketsWhereTo:
|
||||||
.string "Is it you who brought those\n"
|
.string "Is it you who brought those\n"
|
||||||
.string "odd tickets?\p"
|
.string "odd tickets?\p"
|
||||||
.string "… … …Hm.\p"
|
.string "… … …Hm.\p"
|
||||||
.string "These tickets will get you to islands\n"
|
.string "These tickets will get you to islands\n"
|
||||||
.string "that are far, far away.\p"
|
.string "that are far, far away.\p"
|
||||||
.string "No one knows what awaits there,\n"
|
.string "No one knows what awaits there,\n"
|
||||||
.string "or what may happen there.\p"
|
.string "or what may happen there.\p"
|
||||||
.string "The very thought excites my blood\n"
|
.string "The very thought excites my blood\n"
|
||||||
.string "as a sailing man!\p"
|
.string "as a sailing man!\p"
|
||||||
.string "Get on board, youngster!\n"
|
.string "Get on board, youngster!\n"
|
||||||
.string "Where shall we sail first?$"
|
.string "Where shall we sail first?$"
|
||||||
|
|
||||||
NavelRock_Harbor_Text_SailorReturn:
|
NavelRock_Harbor_Text_SailorReturn:
|
||||||
.string "Did… Did you hear that?\n"
|
.string "Did… Did you hear that?\n"
|
||||||
.string "That low growling from deep in there.\p"
|
.string "That low growling from deep in there.\p"
|
||||||
.string "Are you sure it's safe?\n"
|
.string "Are you sure it's safe?\n"
|
||||||
.string "Do you think we should leave?$"
|
.string "Do you think we should leave?$"
|
||||||
|
|
||||||
FarawayIsland_Entrance_Text_Sign:
|
FarawayIsland_Entrance_Text_Sign:
|
||||||
.string "The writing is fading as if it was\n"
|
.string "The writing is fading as if it was\n"
|
||||||
.string "written a long time ago…\p"
|
.string "written a long time ago…\p"
|
||||||
.string "“…ber, 6th day\n"
|
.string "“…ber, 6th day\n"
|
||||||
.string "If any human…sets foot here…\l"
|
.string "If any human…sets foot here…\l"
|
||||||
.string "again…et it be a kindhearted pers…\l"
|
.string "again…et it be a kindhearted pers…\l"
|
||||||
.string "…ith that hope, I depar…”$"
|
.string "…ith that hope, I depar…”$"
|
||||||
|
|
||||||
FarawayIsland_Interior_Text_Mew:
|
FarawayIsland_Interior_Text_Mew:
|
||||||
.string "Myuu…$"
|
.string "Myuu…$"
|
||||||
|
|||||||
@@ -1,51 +1,51 @@
|
|||||||
gText_WouldYouLikeToRestYourPkmn::
|
gText_WouldYouLikeToRestYourPkmn::
|
||||||
.string "Hello, and welcome to\n"
|
.string "Hello, and welcome to\n"
|
||||||
.string "the POKéMON CENTER.\p"
|
.string "the POKéMON CENTER.\p"
|
||||||
.string "We restore your tired POKéMON\n"
|
.string "We restore your tired POKéMON\n"
|
||||||
.string "to full health.\p"
|
.string "to full health.\p"
|
||||||
.string "Would you like to rest your POKéMON?$"
|
.string "Would you like to rest your POKéMON?$"
|
||||||
|
|
||||||
gText_IllTakeYourPkmn::
|
gText_IllTakeYourPkmn::
|
||||||
.string "Okay, I'll take your POKéMON\n"
|
.string "Okay, I'll take your POKéMON\n"
|
||||||
.string "for a few seconds.$"
|
.string "for a few seconds.$"
|
||||||
|
|
||||||
gText_RestoredPkmnToFullHealth::
|
gText_RestoredPkmnToFullHealth::
|
||||||
.string "Thank you for waiting.\p"
|
.string "Thank you for waiting.\p"
|
||||||
.string "We've restored your POKéMON\n"
|
.string "We've restored your POKéMON\n"
|
||||||
.string "to full health.$"
|
.string "to full health.$"
|
||||||
|
|
||||||
gText_WeHopeToSeeYouAgain::
|
gText_WeHopeToSeeYouAgain::
|
||||||
.string "We hope to see you again!$"
|
.string "We hope to see you again!$"
|
||||||
|
|
||||||
gText_WelcomeCutShort::
|
gText_WelcomeCutShort::
|
||||||
.string "Hello, and welcome to\n"
|
.string "Hello, and welcome to\n"
|
||||||
.string "the POKéMON CENTER.\p"
|
.string "the POKéMON CENTER.\p"
|
||||||
.string "We restore your tired POKéMON\n"
|
.string "We restore your tired POKéMON\n"
|
||||||
.string "to full health.\p"
|
.string "to full health.\p"
|
||||||
.string "Would you like to…$"
|
.string "Would you like to…$"
|
||||||
|
|
||||||
gText_NoticesGoldCard::
|
gText_NoticesGoldCard::
|
||||||
.string "Th-that card…\n"
|
.string "Th-that card…\n"
|
||||||
.string "Could it be… The GOLD CARD?!\p"
|
.string "Could it be… The GOLD CARD?!\p"
|
||||||
.string "Oh, the gold color is brilliant!\n"
|
.string "Oh, the gold color is brilliant!\n"
|
||||||
.string "The four stars seem to sparkle!\p"
|
.string "The four stars seem to sparkle!\p"
|
||||||
.string "I've seen several TRAINERS with\n"
|
.string "I've seen several TRAINERS with\n"
|
||||||
.string "a SILVER CARD before, but, {PLAYER},\l"
|
.string "a SILVER CARD before, but, {PLAYER},\l"
|
||||||
.string "you're the first TRAINER I've ever\l"
|
.string "you're the first TRAINER I've ever\l"
|
||||||
.string "seen with a GOLD CARD!\p"
|
.string "seen with a GOLD CARD!\p"
|
||||||
.string "Okay, {PLAYER}, please allow me\n"
|
.string "Okay, {PLAYER}, please allow me\n"
|
||||||
.string "the honor of resting your POKéMON!$"
|
.string "the honor of resting your POKéMON!$"
|
||||||
|
|
||||||
gText_YouWantTheUsual::
|
gText_YouWantTheUsual::
|
||||||
.string "I'm delighted to see you, {PLAYER}!\n"
|
.string "I'm delighted to see you, {PLAYER}!\n"
|
||||||
.string "You want the usual, am I right?$"
|
.string "You want the usual, am I right?$"
|
||||||
|
|
||||||
gText_IllTakeYourPkmn2::
|
gText_IllTakeYourPkmn2::
|
||||||
.string "Okay, I'll take your POKéMON\n"
|
.string "Okay, I'll take your POKéMON\n"
|
||||||
.string "for a few seconds.$"
|
.string "for a few seconds.$"
|
||||||
|
|
||||||
gText_ThankYouForWaiting::
|
gText_ThankYouForWaiting::
|
||||||
.string "Thank you for waiting.$"
|
.string "Thank you for waiting.$"
|
||||||
|
|
||||||
gText_WeHopeToSeeYouAgain2::
|
gText_WeHopeToSeeYouAgain2::
|
||||||
.string "We hope to see you again!$"
|
.string "We hope to see you again!$"
|
||||||
|
|||||||
+167
-167
@@ -1,286 +1,286 @@
|
|||||||
SecretBase_Text_Trainer0Intro:
|
SecretBase_Text_Trainer0Intro:
|
||||||
.string "Have you made a SECRET BASE already?\p"
|
.string "Have you made a SECRET BASE already?\p"
|
||||||
.string "I went here, there, everywhere before\n"
|
.string "I went here, there, everywhere before\n"
|
||||||
.string "choosing this place.\p"
|
.string "choosing this place.\p"
|
||||||
.string "Since you're already here, how would\n"
|
.string "Since you're already here, how would\n"
|
||||||
.string "you like to battle?$"
|
.string "you like to battle?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer0AcceptBattle:
|
SecretBase_Text_Trainer0AcceptBattle:
|
||||||
.string "Okay!\n"
|
.string "Okay!\n"
|
||||||
.string "Here we come!$"
|
.string "Here we come!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer0DeclineBattle:
|
SecretBase_Text_Trainer0DeclineBattle:
|
||||||
.string "Hunh?\n"
|
.string "Hunh?\n"
|
||||||
.string "Oh, you can't now…$"
|
.string "Oh, you can't now…$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer0Defeated::
|
SecretBase_Text_Trainer0Defeated::
|
||||||
.string "Waaargh! You're too strong!\n"
|
.string "Waaargh! You're too strong!\n"
|
||||||
.string "About me losing… Please keep it secret!$"
|
.string "About me losing… Please keep it secret!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer0PostBattle:
|
SecretBase_Text_Trainer0PostBattle:
|
||||||
.string "What do you think of my SECRET BASE?\n"
|
.string "What do you think of my SECRET BASE?\n"
|
||||||
.string "Come visit me again tomorrow.$"
|
.string "Come visit me again tomorrow.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer0PreChampion:
|
SecretBase_Text_Trainer0PreChampion:
|
||||||
.string "Have you made a SECRET BASE already?\p"
|
.string "Have you made a SECRET BASE already?\p"
|
||||||
.string "I went here, there, everywhere before\n"
|
.string "I went here, there, everywhere before\n"
|
||||||
.string "choosing this place.\p"
|
.string "choosing this place.\p"
|
||||||
.string "Feel free to hang out!$"
|
.string "Feel free to hang out!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer5Intro:
|
SecretBase_Text_Trainer5Intro:
|
||||||
.string "There're a lot of places where\n"
|
.string "There're a lot of places where\n"
|
||||||
.string "you can make a SECRET BASE.\p"
|
.string "you can make a SECRET BASE.\p"
|
||||||
.string "But I like this spot best.\n"
|
.string "But I like this spot best.\n"
|
||||||
.string "Don't you think it's nice?\p"
|
.string "Don't you think it's nice?\p"
|
||||||
.string "Oh, would you like to have a battle?$"
|
.string "Oh, would you like to have a battle?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer5AcceptBattle:
|
SecretBase_Text_Trainer5AcceptBattle:
|
||||||
.string "Okay, here goes!$"
|
.string "Okay, here goes!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer5DeclineBattle:
|
SecretBase_Text_Trainer5DeclineBattle:
|
||||||
.string "Oh…\n"
|
.string "Oh…\n"
|
||||||
.string "You can't now, okay.$"
|
.string "You can't now, okay.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer5Defeated::
|
SecretBase_Text_Trainer5Defeated::
|
||||||
.string "Hmmm… It's our loss…\n"
|
.string "Hmmm… It's our loss…\n"
|
||||||
.string "But don't tell anyone!\l"
|
.string "But don't tell anyone!\l"
|
||||||
.string "It's a confidential secret!$"
|
.string "It's a confidential secret!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer5PostBattle:
|
SecretBase_Text_Trainer5PostBattle:
|
||||||
.string "If you're in this area again,\n"
|
.string "If you're in this area again,\n"
|
||||||
.string "I hope you'll visit me.$"
|
.string "I hope you'll visit me.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer5PreChampion:
|
SecretBase_Text_Trainer5PreChampion:
|
||||||
.string "There're a lot of places where you can\n"
|
.string "There're a lot of places where you can\n"
|
||||||
.string "make a SECRET BASE.\p"
|
.string "make a SECRET BASE.\p"
|
||||||
.string "But I like this spot best.\n"
|
.string "But I like this spot best.\n"
|
||||||
.string "Don't you think it's nice?$"
|
.string "Don't you think it's nice?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer1Intro:
|
SecretBase_Text_Trainer1Intro:
|
||||||
.string "This is a popular spot.\n"
|
.string "This is a popular spot.\n"
|
||||||
.string "It's always taken.\p"
|
.string "It's always taken.\p"
|
||||||
.string "Oh! Were you thinking about\n"
|
.string "Oh! Were you thinking about\n"
|
||||||
.string "taking this spot, too?\p"
|
.string "taking this spot, too?\p"
|
||||||
.string "I'll tell you what, you can have this\n"
|
.string "I'll tell you what, you can have this\n"
|
||||||
.string "spot if you can beat me.$"
|
.string "spot if you can beat me.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer1AcceptBattle:
|
SecretBase_Text_Trainer1AcceptBattle:
|
||||||
.string "Okay!\n"
|
.string "Okay!\n"
|
||||||
.string "I'm going to defend my SECRET BASE!$"
|
.string "I'm going to defend my SECRET BASE!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer1DeclineBattle:
|
SecretBase_Text_Trainer1DeclineBattle:
|
||||||
.string "Hunh? Is that right?\n"
|
.string "Hunh? Is that right?\n"
|
||||||
.string "You're not interested in this spot?$"
|
.string "You're not interested in this spot?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer1Defeated::
|
SecretBase_Text_Trainer1Defeated::
|
||||||
.string "I can't keep going!\n"
|
.string "I can't keep going!\n"
|
||||||
.string "I surrender!$"
|
.string "I surrender!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer1PostBattle:
|
SecretBase_Text_Trainer1PostBattle:
|
||||||
.string "Okay, when I move one day,\n"
|
.string "Okay, when I move one day,\n"
|
||||||
.string "this place will be yours!$"
|
.string "this place will be yours!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer1PreChampion:
|
SecretBase_Text_Trainer1PreChampion:
|
||||||
.string "This is a popular spot.\n"
|
.string "This is a popular spot.\n"
|
||||||
.string "It's always taken.\p"
|
.string "It's always taken.\p"
|
||||||
.string "I waited a long time for it to open.\n"
|
.string "I waited a long time for it to open.\n"
|
||||||
.string "I finally got to use it!$"
|
.string "I finally got to use it!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer6Intro:
|
SecretBase_Text_Trainer6Intro:
|
||||||
.string "Welcome to my POKéMON LAB.\p"
|
.string "Welcome to my POKéMON LAB.\p"
|
||||||
.string "I carry out research on battling in\n"
|
.string "I carry out research on battling in\n"
|
||||||
.string "secrecy.\p"
|
.string "secrecy.\p"
|
||||||
.string "Would you like to see how strong I am?$"
|
.string "Would you like to see how strong I am?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer6AcceptBattle:
|
SecretBase_Text_Trainer6AcceptBattle:
|
||||||
.string "I'm going to go all out!$"
|
.string "I'm going to go all out!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer6DeclineBattle:
|
SecretBase_Text_Trainer6DeclineBattle:
|
||||||
.string "Oh.\n"
|
.string "Oh.\n"
|
||||||
.string "Some other time, then!$"
|
.string "Some other time, then!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer6Defeated::
|
SecretBase_Text_Trainer6Defeated::
|
||||||
.string "Hmm… I've still got lots to learn.\n"
|
.string "Hmm… I've still got lots to learn.\n"
|
||||||
.string "I have to study some more.$"
|
.string "I have to study some more.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer6PostBattle:
|
SecretBase_Text_Trainer6PostBattle:
|
||||||
.string "Thanks for battling with me.\n"
|
.string "Thanks for battling with me.\n"
|
||||||
.string "Please come back again tomorrow.$"
|
.string "Please come back again tomorrow.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer6PreChampion:
|
SecretBase_Text_Trainer6PreChampion:
|
||||||
.string "Welcome to my POKéMON LAB.\p"
|
.string "Welcome to my POKéMON LAB.\p"
|
||||||
.string "I carry out research on battling in\n"
|
.string "I carry out research on battling in\n"
|
||||||
.string "secrecy.$"
|
.string "secrecy.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer2Intro:
|
SecretBase_Text_Trainer2Intro:
|
||||||
.string "A big mansion is nice, but I like this\n"
|
.string "A big mansion is nice, but I like this\n"
|
||||||
.string "sort of place more.\p"
|
.string "sort of place more.\p"
|
||||||
.string "I like it because all kinds of people\n"
|
.string "I like it because all kinds of people\n"
|
||||||
.string "come visit me.\p"
|
.string "come visit me.\p"
|
||||||
.string "So, how would you like a battle?$"
|
.string "So, how would you like a battle?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer2AcceptBattle:
|
SecretBase_Text_Trainer2AcceptBattle:
|
||||||
.string "That's the way!$"
|
.string "That's the way!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer2DeclineBattle:
|
SecretBase_Text_Trainer2DeclineBattle:
|
||||||
.string "When you're ready, give me a shout!$"
|
.string "When you're ready, give me a shout!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer2Defeated::
|
SecretBase_Text_Trainer2Defeated::
|
||||||
.string "Aww! Done in!\n"
|
.string "Aww! Done in!\n"
|
||||||
.string "But it's still fun to battle!$"
|
.string "But it's still fun to battle!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer2PostBattle:
|
SecretBase_Text_Trainer2PostBattle:
|
||||||
.string "Well, anyway, I should go buy some\n"
|
.string "Well, anyway, I should go buy some\n"
|
||||||
.string "decorations and furniture.\p"
|
.string "decorations and furniture.\p"
|
||||||
.string "I want my SECRET BASE to be a place\n"
|
.string "I want my SECRET BASE to be a place\n"
|
||||||
.string "other people can enjoy.$"
|
.string "other people can enjoy.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer2PreChampion:
|
SecretBase_Text_Trainer2PreChampion:
|
||||||
.string "A big mansion is nice, but I like this\n"
|
.string "A big mansion is nice, but I like this\n"
|
||||||
.string "sort of place more.\p"
|
.string "sort of place more.\p"
|
||||||
.string "I like it because all kinds of people\n"
|
.string "I like it because all kinds of people\n"
|
||||||
.string "come visit me.$"
|
.string "come visit me.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer7Intro:
|
SecretBase_Text_Trainer7Intro:
|
||||||
.string "I simply adore shopping for decorations\n"
|
.string "I simply adore shopping for decorations\n"
|
||||||
.string "and furniture.\p"
|
.string "and furniture.\p"
|
||||||
.string "I also love raising POKéMON just\n"
|
.string "I also love raising POKéMON just\n"
|
||||||
.string "as much.\p"
|
.string "as much.\p"
|
||||||
.string "If you would be so kind, will you battle\n"
|
.string "If you would be so kind, will you battle\n"
|
||||||
.string "with my POKéMON?$"
|
.string "with my POKéMON?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer7AcceptBattle:
|
SecretBase_Text_Trainer7AcceptBattle:
|
||||||
.string "Thank you.\n"
|
.string "Thank you.\n"
|
||||||
.string "Shall we begin?$"
|
.string "Shall we begin?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer7DeclineBattle:
|
SecretBase_Text_Trainer7DeclineBattle:
|
||||||
.string "Oh.\n"
|
.string "Oh.\n"
|
||||||
.string "How disappointing…$"
|
.string "How disappointing…$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer7Defeated::
|
SecretBase_Text_Trainer7Defeated::
|
||||||
.string "I concede…$"
|
.string "I concede…$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer7PostBattle:
|
SecretBase_Text_Trainer7PostBattle:
|
||||||
.string "That was all in good fun!\n"
|
.string "That was all in good fun!\n"
|
||||||
.string "I should go enjoy shopping now.$"
|
.string "I should go enjoy shopping now.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer7PreChampion:
|
SecretBase_Text_Trainer7PreChampion:
|
||||||
.string "I simply adore shopping for decorations\n"
|
.string "I simply adore shopping for decorations\n"
|
||||||
.string "and furniture.\p"
|
.string "and furniture.\p"
|
||||||
.string "I also love raising POKéMON just\n"
|
.string "I also love raising POKéMON just\n"
|
||||||
.string "as much.$"
|
.string "as much.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer3Intro:
|
SecretBase_Text_Trainer3Intro:
|
||||||
.string "Some people make their SECRET BASES in\n"
|
.string "Some people make their SECRET BASES in\n"
|
||||||
.string "hard-to-find places.\l"
|
.string "hard-to-find places.\l"
|
||||||
.string "Do they want to just lie low?\p"
|
.string "Do they want to just lie low?\p"
|
||||||
.string "But since you found me, how about we\n"
|
.string "But since you found me, how about we\n"
|
||||||
.string "have a battle?$"
|
.string "have a battle?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer3AcceptBattle:
|
SecretBase_Text_Trainer3AcceptBattle:
|
||||||
.string "I'm not going down easily!$"
|
.string "I'm not going down easily!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer3DeclineBattle:
|
SecretBase_Text_Trainer3DeclineBattle:
|
||||||
.string "Oh… Are you maybe tired from searching\n"
|
.string "Oh… Are you maybe tired from searching\n"
|
||||||
.string "for this place?$"
|
.string "for this place?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer3Defeated::
|
SecretBase_Text_Trainer3Defeated::
|
||||||
.string "I went down…$"
|
.string "I went down…$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer3PostBattle:
|
SecretBase_Text_Trainer3PostBattle:
|
||||||
.string "Where's your SECRET BASE?\n"
|
.string "Where's your SECRET BASE?\n"
|
||||||
.string "I should go visit you there.$"
|
.string "I should go visit you there.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer3PreChampion:
|
SecretBase_Text_Trainer3PreChampion:
|
||||||
.string "Some people make their SECRET BASES in\n"
|
.string "Some people make their SECRET BASES in\n"
|
||||||
.string "hard-to-find places.\l"
|
.string "hard-to-find places.\l"
|
||||||
.string "Do they want to just lie low?$"
|
.string "Do they want to just lie low?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer8Intro:
|
SecretBase_Text_Trainer8Intro:
|
||||||
.string "People have told me that you can get\n"
|
.string "People have told me that you can get\n"
|
||||||
.string "decorations in several ways.\p"
|
.string "decorations in several ways.\p"
|
||||||
.string "We should have a race to see who can\n"
|
.string "We should have a race to see who can\n"
|
||||||
.string "get nicer decorations and furniture!\p"
|
.string "get nicer decorations and furniture!\p"
|
||||||
.string "In the meantime, want to battle?$"
|
.string "In the meantime, want to battle?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer8AcceptBattle:
|
SecretBase_Text_Trainer8AcceptBattle:
|
||||||
.string "This is my SECRET BASE.\n"
|
.string "This is my SECRET BASE.\n"
|
||||||
.string "I can't lose!$"
|
.string "I can't lose!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer8DeclineBattle:
|
SecretBase_Text_Trainer8DeclineBattle:
|
||||||
.string "I'll battle with you anytime.$"
|
.string "I'll battle with you anytime.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer8Defeated::
|
SecretBase_Text_Trainer8Defeated::
|
||||||
.string "Huh?\n"
|
.string "Huh?\n"
|
||||||
.string "Did I just lose?$"
|
.string "Did I just lose?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer8PostBattle:
|
SecretBase_Text_Trainer8PostBattle:
|
||||||
.string "I won't lose at collecting decorations.\n"
|
.string "I won't lose at collecting decorations.\n"
|
||||||
.string "Come visit again!$"
|
.string "Come visit again!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer8PreChampion:
|
SecretBase_Text_Trainer8PreChampion:
|
||||||
.string "People have told me that you can get\n"
|
.string "People have told me that you can get\n"
|
||||||
.string "decorations in several ways.\p"
|
.string "decorations in several ways.\p"
|
||||||
.string "We should have a race to see who can\n"
|
.string "We should have a race to see who can\n"
|
||||||
.string "get nicer decorations and furniture!$"
|
.string "get nicer decorations and furniture!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer4Intro:
|
SecretBase_Text_Trainer4Intro:
|
||||||
.string "I found a spot I liked, and I did it up\n"
|
.string "I found a spot I liked, and I did it up\n"
|
||||||
.string "with my favorite decorations.\p"
|
.string "with my favorite decorations.\p"
|
||||||
.string "I raise my favorite POKéMON and grow\n"
|
.string "I raise my favorite POKéMON and grow\n"
|
||||||
.string "stronger with it.\p"
|
.string "stronger with it.\p"
|
||||||
.string "That's what I do.\n"
|
.string "That's what I do.\n"
|
||||||
.string "Want to battle with me?$"
|
.string "Want to battle with me?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer4AcceptBattle:
|
SecretBase_Text_Trainer4AcceptBattle:
|
||||||
.string "Show me what you're made of!$"
|
.string "Show me what you're made of!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer4DeclineBattle:
|
SecretBase_Text_Trainer4DeclineBattle:
|
||||||
.string "I guess there are times when you're not\n"
|
.string "I guess there are times when you're not\n"
|
||||||
.string "into it.$"
|
.string "into it.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer4Defeated::
|
SecretBase_Text_Trainer4Defeated::
|
||||||
.string "I know exactly what you're made of now.$"
|
.string "I know exactly what you're made of now.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer4PostBattle:
|
SecretBase_Text_Trainer4PostBattle:
|
||||||
.string "We can both become stronger.\n"
|
.string "We can both become stronger.\n"
|
||||||
.string "Let's keep at it!$"
|
.string "Let's keep at it!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer4PreChampion:
|
SecretBase_Text_Trainer4PreChampion:
|
||||||
.string "I found a spot I liked, and I did it up\n"
|
.string "I found a spot I liked, and I did it up\n"
|
||||||
.string "with my favorite decorations.\p"
|
.string "with my favorite decorations.\p"
|
||||||
.string "I raise my favorite POKéMON and grow\n"
|
.string "I raise my favorite POKéMON and grow\n"
|
||||||
.string "stronger with it.\p"
|
.string "stronger with it.\p"
|
||||||
.string "Every day is a great day.$"
|
.string "Every day is a great day.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer9Intro:
|
SecretBase_Text_Trainer9Intro:
|
||||||
.string "You can learn a lot about the taste\n"
|
.string "You can learn a lot about the taste\n"
|
||||||
.string "and sense of people by the kinds of\l"
|
.string "and sense of people by the kinds of\l"
|
||||||
.string "decorations they have, and how they\l"
|
.string "decorations they have, and how they\l"
|
||||||
.string "display them.\p"
|
.string "display them.\p"
|
||||||
.string "What do you think of my taste?\n"
|
.string "What do you think of my taste?\n"
|
||||||
.string "Are you speechless?\p"
|
.string "Are you speechless?\p"
|
||||||
.string "Want to see my taste in battling?$"
|
.string "Want to see my taste in battling?$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer9AcceptBattle:
|
SecretBase_Text_Trainer9AcceptBattle:
|
||||||
.string "There's no holding back!$"
|
.string "There's no holding back!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer9DeclineBattle:
|
SecretBase_Text_Trainer9DeclineBattle:
|
||||||
.string "I'll be happy to demonstrate my style\n"
|
.string "I'll be happy to demonstrate my style\n"
|
||||||
.string "anytime.$"
|
.string "anytime.$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer9Defeated::
|
SecretBase_Text_Trainer9Defeated::
|
||||||
.string "You're supremely talented!\n"
|
.string "You're supremely talented!\n"
|
||||||
.string "Your power seems to be limitless…$"
|
.string "Your power seems to be limitless…$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer9PostBattle:
|
SecretBase_Text_Trainer9PostBattle:
|
||||||
.string "What did you think of my style?\n"
|
.string "What did you think of my style?\n"
|
||||||
.string "I'll keep on polishing it!$"
|
.string "I'll keep on polishing it!$"
|
||||||
|
|
||||||
SecretBase_Text_Trainer9PreChampion:
|
SecretBase_Text_Trainer9PreChampion:
|
||||||
.string "You can learn a lot about the taste\n"
|
.string "You can learn a lot about the taste\n"
|
||||||
.string "and sense of people by the kinds of\l"
|
.string "and sense of people by the kinds of\l"
|
||||||
.string "decorations they have, and how they\l"
|
.string "decorations they have, and how they\l"
|
||||||
.string "display them.\p"
|
.string "display them.\p"
|
||||||
.string "What do you think of my taste?\n"
|
.string "What do you think of my taste?\n"
|
||||||
.string "Are you speechless?$"
|
.string "Are you speechless?$"
|
||||||
|
|||||||
+16
-16
@@ -3,29 +3,29 @@
|
|||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
BG_ATTR_CHARBASEINDEX = 1,
|
BG_ATTR_CHARBASEINDEX = 1,
|
||||||
BG_ATTR_MAPBASEINDEX,
|
BG_ATTR_MAPBASEINDEX,
|
||||||
BG_ATTR_SCREENSIZE,
|
BG_ATTR_SCREENSIZE,
|
||||||
BG_ATTR_PALETTEMODE,
|
BG_ATTR_PALETTEMODE,
|
||||||
BG_ATTR_MOSAIC,
|
BG_ATTR_MOSAIC,
|
||||||
BG_ATTR_WRAPAROUND,
|
BG_ATTR_WRAPAROUND,
|
||||||
BG_ATTR_PRIORITY,
|
BG_ATTR_PRIORITY,
|
||||||
BG_ATTR_METRIC,
|
BG_ATTR_METRIC,
|
||||||
BG_ATTR_TYPE,
|
BG_ATTR_TYPE,
|
||||||
BG_ATTR_BASETILE,
|
BG_ATTR_BASETILE,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
BG_TYPE_NORMAL,
|
BG_TYPE_NORMAL,
|
||||||
BG_TYPE_AFFINE,
|
BG_TYPE_AFFINE,
|
||||||
BG_TYPE_NONE = 0xFFFF
|
BG_TYPE_NONE = 0xFFFF
|
||||||
};
|
};
|
||||||
|
|
||||||
// Modes for ChangeBgX / ChangeBgY
|
// Modes for ChangeBgX / ChangeBgY
|
||||||
enum {
|
enum {
|
||||||
BG_COORD_SET,
|
BG_COORD_SET,
|
||||||
BG_COORD_ADD,
|
BG_COORD_ADD,
|
||||||
BG_COORD_SUB,
|
BG_COORD_SUB,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Modes for Unused_AdjustBgMosaic
|
// Modes for Unused_AdjustBgMosaic
|
||||||
|
|||||||
+37
-37
@@ -116,21 +116,21 @@ enum
|
|||||||
#define POKENAV_MENU_IDS_START 100000
|
#define POKENAV_MENU_IDS_START 100000
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
POKENAV_MAIN_MENU = POKENAV_MENU_IDS_START, // The main menu where the player selects Hoenn Map/Condition/Match Call/Ribbons
|
POKENAV_MAIN_MENU = POKENAV_MENU_IDS_START, // The main menu where the player selects Hoenn Map/Condition/Match Call/Ribbons
|
||||||
POKENAV_MAIN_MENU_CURSOR_ON_MAP,
|
POKENAV_MAIN_MENU_CURSOR_ON_MAP,
|
||||||
POKENAV_CONDITION_MENU, // The first Condition screen where the player selects Party or Search
|
POKENAV_CONDITION_MENU, // The first Condition screen where the player selects Party or Search
|
||||||
POKENAV_CONDITION_SEARCH_MENU, // The Condition search menu where the player selects a search parameter
|
POKENAV_CONDITION_SEARCH_MENU, // The Condition search menu where the player selects a search parameter
|
||||||
POKENAV_MAIN_MENU_CURSOR_ON_MATCH_CALL,
|
POKENAV_MAIN_MENU_CURSOR_ON_MATCH_CALL,
|
||||||
POKENAV_MAIN_MENU_CURSOR_ON_RIBBONS,
|
POKENAV_MAIN_MENU_CURSOR_ON_RIBBONS,
|
||||||
POKENAV_REGION_MAP,
|
POKENAV_REGION_MAP,
|
||||||
POKENAV_CONDITION_GRAPH_PARTY, // The Condition graph screen when Party has been selected
|
POKENAV_CONDITION_GRAPH_PARTY, // The Condition graph screen when Party has been selected
|
||||||
POKENAV_CONDITION_SEARCH_RESULTS, // The list of results from a Condition search
|
POKENAV_CONDITION_SEARCH_RESULTS, // The list of results from a Condition search
|
||||||
POKENAV_CONDITION_GRAPH_SEARCH, // The Condition graph screen when a search result has been selected
|
POKENAV_CONDITION_GRAPH_SEARCH, // The Condition graph screen when a search result has been selected
|
||||||
POKENAV_RETURN_CONDITION_SEARCH, // Exited the graph screen back to the list of Condition search results
|
POKENAV_RETURN_CONDITION_SEARCH, // Exited the graph screen back to the list of Condition search results
|
||||||
POKENAV_MATCH_CALL,
|
POKENAV_MATCH_CALL,
|
||||||
POKENAV_RIBBONS_MON_LIST, // The list of Pokémon with ribbons
|
POKENAV_RIBBONS_MON_LIST, // The list of Pokémon with ribbons
|
||||||
POKENAV_RIBBONS_SUMMARY_SCREEN, // The ribbon summary screen shown when a Pokémon has been selected
|
POKENAV_RIBBONS_SUMMARY_SCREEN, // The ribbon summary screen shown when a Pokémon has been selected
|
||||||
POKENAV_RIBBONS_RETURN_TO_MON_LIST, // Exited the summary screen back to the ribbon list
|
POKENAV_RIBBONS_RETURN_TO_MON_LIST, // Exited the summary screen back to the ribbon list
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
@@ -185,28 +185,28 @@ enum
|
|||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
MC_HEADER_MR_STONE,
|
MC_HEADER_MR_STONE,
|
||||||
MC_HEADER_PROF_BIRCH,
|
MC_HEADER_PROF_BIRCH,
|
||||||
MC_HEADER_BRENDAN,
|
MC_HEADER_BRENDAN,
|
||||||
MC_HEADER_MAY,
|
MC_HEADER_MAY,
|
||||||
MC_HEADER_WALLY,
|
MC_HEADER_WALLY,
|
||||||
MC_HEADER_NORMAN,
|
MC_HEADER_NORMAN,
|
||||||
MC_HEADER_MOM,
|
MC_HEADER_MOM,
|
||||||
MC_HEADER_STEVEN,
|
MC_HEADER_STEVEN,
|
||||||
MC_HEADER_SCOTT,
|
MC_HEADER_SCOTT,
|
||||||
MC_HEADER_ROXANNE,
|
MC_HEADER_ROXANNE,
|
||||||
MC_HEADER_BRAWLY,
|
MC_HEADER_BRAWLY,
|
||||||
MC_HEADER_WATTSON,
|
MC_HEADER_WATTSON,
|
||||||
MC_HEADER_FLANNERY,
|
MC_HEADER_FLANNERY,
|
||||||
MC_HEADER_WINONA,
|
MC_HEADER_WINONA,
|
||||||
MC_HEADER_TATE_LIZA,
|
MC_HEADER_TATE_LIZA,
|
||||||
MC_HEADER_JUAN,
|
MC_HEADER_JUAN,
|
||||||
MC_HEADER_SIDNEY,
|
MC_HEADER_SIDNEY,
|
||||||
MC_HEADER_PHOEBE,
|
MC_HEADER_PHOEBE,
|
||||||
MC_HEADER_GLACIA,
|
MC_HEADER_GLACIA,
|
||||||
MC_HEADER_DRAKE,
|
MC_HEADER_DRAKE,
|
||||||
MC_HEADER_WALLACE,
|
MC_HEADER_WALLACE,
|
||||||
MC_HEADER_COUNT
|
MC_HEADER_COUNT
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
|||||||
@@ -1,253 +1,253 @@
|
|||||||
const u16 gEasyChatGroup_Pokemon2[] = {
|
const u16 gEasyChatGroup_Pokemon2[] = {
|
||||||
SPECIES_ABRA,
|
SPECIES_ABRA,
|
||||||
SPECIES_AERODACTYL,
|
SPECIES_AERODACTYL,
|
||||||
SPECIES_AIPOM,
|
SPECIES_AIPOM,
|
||||||
SPECIES_ALAKAZAM,
|
SPECIES_ALAKAZAM,
|
||||||
SPECIES_AMPHAROS,
|
SPECIES_AMPHAROS,
|
||||||
SPECIES_ARBOK,
|
SPECIES_ARBOK,
|
||||||
SPECIES_ARCANINE,
|
SPECIES_ARCANINE,
|
||||||
SPECIES_ARIADOS,
|
SPECIES_ARIADOS,
|
||||||
SPECIES_ARTICUNO,
|
SPECIES_ARTICUNO,
|
||||||
SPECIES_AZUMARILL,
|
SPECIES_AZUMARILL,
|
||||||
SPECIES_BAYLEEF,
|
SPECIES_BAYLEEF,
|
||||||
SPECIES_BEEDRILL,
|
SPECIES_BEEDRILL,
|
||||||
SPECIES_BELLOSSOM,
|
SPECIES_BELLOSSOM,
|
||||||
SPECIES_BELLSPROUT,
|
SPECIES_BELLSPROUT,
|
||||||
SPECIES_BLASTOISE,
|
SPECIES_BLASTOISE,
|
||||||
SPECIES_BLISSEY,
|
SPECIES_BLISSEY,
|
||||||
SPECIES_BULBASAUR,
|
SPECIES_BULBASAUR,
|
||||||
SPECIES_BUTTERFREE,
|
SPECIES_BUTTERFREE,
|
||||||
SPECIES_CATERPIE,
|
SPECIES_CATERPIE,
|
||||||
SPECIES_CELEBI,
|
SPECIES_CELEBI,
|
||||||
SPECIES_CHANSEY,
|
SPECIES_CHANSEY,
|
||||||
SPECIES_CHARIZARD,
|
SPECIES_CHARIZARD,
|
||||||
SPECIES_CHARMANDER,
|
SPECIES_CHARMANDER,
|
||||||
SPECIES_CHARMELEON,
|
SPECIES_CHARMELEON,
|
||||||
SPECIES_CHIKORITA,
|
SPECIES_CHIKORITA,
|
||||||
SPECIES_CHINCHOU,
|
SPECIES_CHINCHOU,
|
||||||
SPECIES_CLEFABLE,
|
SPECIES_CLEFABLE,
|
||||||
SPECIES_CLEFAIRY,
|
SPECIES_CLEFAIRY,
|
||||||
SPECIES_CLEFFA,
|
SPECIES_CLEFFA,
|
||||||
SPECIES_CLOYSTER,
|
SPECIES_CLOYSTER,
|
||||||
SPECIES_CORSOLA,
|
SPECIES_CORSOLA,
|
||||||
SPECIES_CROBAT,
|
SPECIES_CROBAT,
|
||||||
SPECIES_CROCONAW,
|
SPECIES_CROCONAW,
|
||||||
SPECIES_CUBONE,
|
SPECIES_CUBONE,
|
||||||
SPECIES_CYNDAQUIL,
|
SPECIES_CYNDAQUIL,
|
||||||
SPECIES_DELIBIRD,
|
SPECIES_DELIBIRD,
|
||||||
SPECIES_DEWGONG,
|
SPECIES_DEWGONG,
|
||||||
SPECIES_DIGLETT,
|
SPECIES_DIGLETT,
|
||||||
SPECIES_DITTO,
|
SPECIES_DITTO,
|
||||||
SPECIES_DODRIO,
|
SPECIES_DODRIO,
|
||||||
SPECIES_DODUO,
|
SPECIES_DODUO,
|
||||||
SPECIES_DONPHAN,
|
SPECIES_DONPHAN,
|
||||||
SPECIES_DRAGONAIR,
|
SPECIES_DRAGONAIR,
|
||||||
SPECIES_DRAGONITE,
|
SPECIES_DRAGONITE,
|
||||||
SPECIES_DRATINI,
|
SPECIES_DRATINI,
|
||||||
SPECIES_DROWZEE,
|
SPECIES_DROWZEE,
|
||||||
SPECIES_DUGTRIO,
|
SPECIES_DUGTRIO,
|
||||||
SPECIES_DUNSPARCE,
|
SPECIES_DUNSPARCE,
|
||||||
SPECIES_EEVEE,
|
SPECIES_EEVEE,
|
||||||
SPECIES_EKANS,
|
SPECIES_EKANS,
|
||||||
SPECIES_ELECTABUZZ,
|
SPECIES_ELECTABUZZ,
|
||||||
SPECIES_ELECTRODE,
|
SPECIES_ELECTRODE,
|
||||||
SPECIES_ELEKID,
|
SPECIES_ELEKID,
|
||||||
SPECIES_ENTEI,
|
SPECIES_ENTEI,
|
||||||
SPECIES_ESPEON,
|
SPECIES_ESPEON,
|
||||||
SPECIES_EXEGGCUTE,
|
SPECIES_EXEGGCUTE,
|
||||||
SPECIES_EXEGGUTOR,
|
SPECIES_EXEGGUTOR,
|
||||||
SPECIES_FARFETCHD,
|
SPECIES_FARFETCHD,
|
||||||
SPECIES_FEAROW,
|
SPECIES_FEAROW,
|
||||||
SPECIES_FERALIGATR,
|
SPECIES_FERALIGATR,
|
||||||
SPECIES_FLAAFFY,
|
SPECIES_FLAAFFY,
|
||||||
SPECIES_FLAREON,
|
SPECIES_FLAREON,
|
||||||
SPECIES_FORRETRESS,
|
SPECIES_FORRETRESS,
|
||||||
SPECIES_FURRET,
|
SPECIES_FURRET,
|
||||||
SPECIES_GASTLY,
|
SPECIES_GASTLY,
|
||||||
SPECIES_GENGAR,
|
SPECIES_GENGAR,
|
||||||
SPECIES_GEODUDE,
|
SPECIES_GEODUDE,
|
||||||
SPECIES_GIRAFARIG,
|
SPECIES_GIRAFARIG,
|
||||||
SPECIES_GLIGAR,
|
SPECIES_GLIGAR,
|
||||||
SPECIES_GLOOM,
|
SPECIES_GLOOM,
|
||||||
SPECIES_GOLBAT,
|
SPECIES_GOLBAT,
|
||||||
SPECIES_GOLDEEN,
|
SPECIES_GOLDEEN,
|
||||||
SPECIES_GOLDUCK,
|
SPECIES_GOLDUCK,
|
||||||
SPECIES_GOLEM,
|
SPECIES_GOLEM,
|
||||||
SPECIES_GRANBULL,
|
SPECIES_GRANBULL,
|
||||||
SPECIES_GRAVELER,
|
SPECIES_GRAVELER,
|
||||||
SPECIES_GRIMER,
|
SPECIES_GRIMER,
|
||||||
SPECIES_GROWLITHE,
|
SPECIES_GROWLITHE,
|
||||||
SPECIES_GYARADOS,
|
SPECIES_GYARADOS,
|
||||||
SPECIES_HAUNTER,
|
SPECIES_HAUNTER,
|
||||||
SPECIES_HERACROSS,
|
SPECIES_HERACROSS,
|
||||||
SPECIES_HITMONCHAN,
|
SPECIES_HITMONCHAN,
|
||||||
SPECIES_HITMONLEE,
|
SPECIES_HITMONLEE,
|
||||||
SPECIES_HITMONTOP,
|
SPECIES_HITMONTOP,
|
||||||
SPECIES_HO_OH,
|
SPECIES_HO_OH,
|
||||||
SPECIES_HOOTHOOT,
|
SPECIES_HOOTHOOT,
|
||||||
SPECIES_HOPPIP,
|
SPECIES_HOPPIP,
|
||||||
SPECIES_HORSEA,
|
SPECIES_HORSEA,
|
||||||
SPECIES_HOUNDOOM,
|
SPECIES_HOUNDOOM,
|
||||||
SPECIES_HOUNDOUR,
|
SPECIES_HOUNDOUR,
|
||||||
SPECIES_HYPNO,
|
SPECIES_HYPNO,
|
||||||
SPECIES_IGGLYBUFF,
|
SPECIES_IGGLYBUFF,
|
||||||
SPECIES_IVYSAUR,
|
SPECIES_IVYSAUR,
|
||||||
SPECIES_JIGGLYPUFF,
|
SPECIES_JIGGLYPUFF,
|
||||||
SPECIES_JOLTEON,
|
SPECIES_JOLTEON,
|
||||||
SPECIES_JUMPLUFF,
|
SPECIES_JUMPLUFF,
|
||||||
SPECIES_JYNX,
|
SPECIES_JYNX,
|
||||||
SPECIES_KABUTO,
|
SPECIES_KABUTO,
|
||||||
SPECIES_KABUTOPS,
|
SPECIES_KABUTOPS,
|
||||||
SPECIES_KADABRA,
|
SPECIES_KADABRA,
|
||||||
SPECIES_KAKUNA,
|
SPECIES_KAKUNA,
|
||||||
SPECIES_KANGASKHAN,
|
SPECIES_KANGASKHAN,
|
||||||
SPECIES_KINGDRA,
|
SPECIES_KINGDRA,
|
||||||
SPECIES_KINGLER,
|
SPECIES_KINGLER,
|
||||||
SPECIES_KOFFING,
|
SPECIES_KOFFING,
|
||||||
SPECIES_KRABBY,
|
SPECIES_KRABBY,
|
||||||
SPECIES_LANTURN,
|
SPECIES_LANTURN,
|
||||||
SPECIES_LAPRAS,
|
SPECIES_LAPRAS,
|
||||||
SPECIES_LARVITAR,
|
SPECIES_LARVITAR,
|
||||||
SPECIES_LEDIAN,
|
SPECIES_LEDIAN,
|
||||||
SPECIES_LEDYBA,
|
SPECIES_LEDYBA,
|
||||||
SPECIES_LICKITUNG,
|
SPECIES_LICKITUNG,
|
||||||
SPECIES_LUGIA,
|
SPECIES_LUGIA,
|
||||||
SPECIES_MACHAMP,
|
SPECIES_MACHAMP,
|
||||||
SPECIES_MACHOKE,
|
SPECIES_MACHOKE,
|
||||||
SPECIES_MACHOP,
|
SPECIES_MACHOP,
|
||||||
SPECIES_MAGBY,
|
SPECIES_MAGBY,
|
||||||
SPECIES_MAGCARGO,
|
SPECIES_MAGCARGO,
|
||||||
SPECIES_MAGIKARP,
|
SPECIES_MAGIKARP,
|
||||||
SPECIES_MAGMAR,
|
SPECIES_MAGMAR,
|
||||||
SPECIES_MAGNEMITE,
|
SPECIES_MAGNEMITE,
|
||||||
SPECIES_MAGNETON,
|
SPECIES_MAGNETON,
|
||||||
SPECIES_MANKEY,
|
SPECIES_MANKEY,
|
||||||
SPECIES_MANTINE,
|
SPECIES_MANTINE,
|
||||||
SPECIES_MAREEP,
|
SPECIES_MAREEP,
|
||||||
SPECIES_MARILL,
|
SPECIES_MARILL,
|
||||||
SPECIES_MAROWAK,
|
SPECIES_MAROWAK,
|
||||||
SPECIES_MEGANIUM,
|
SPECIES_MEGANIUM,
|
||||||
SPECIES_MEOWTH,
|
SPECIES_MEOWTH,
|
||||||
SPECIES_METAPOD,
|
SPECIES_METAPOD,
|
||||||
SPECIES_MEW,
|
SPECIES_MEW,
|
||||||
SPECIES_MEWTWO,
|
SPECIES_MEWTWO,
|
||||||
SPECIES_MILTANK,
|
SPECIES_MILTANK,
|
||||||
SPECIES_MISDREAVUS,
|
SPECIES_MISDREAVUS,
|
||||||
SPECIES_MOLTRES,
|
SPECIES_MOLTRES,
|
||||||
SPECIES_MR_MIME,
|
SPECIES_MR_MIME,
|
||||||
SPECIES_MUK,
|
SPECIES_MUK,
|
||||||
SPECIES_MURKROW,
|
SPECIES_MURKROW,
|
||||||
SPECIES_NATU,
|
SPECIES_NATU,
|
||||||
SPECIES_NIDOKING,
|
SPECIES_NIDOKING,
|
||||||
SPECIES_NIDOQUEEN,
|
SPECIES_NIDOQUEEN,
|
||||||
SPECIES_NIDORAN_F,
|
SPECIES_NIDORAN_F,
|
||||||
SPECIES_NIDORAN_M,
|
SPECIES_NIDORAN_M,
|
||||||
SPECIES_NIDORINA,
|
SPECIES_NIDORINA,
|
||||||
SPECIES_NIDORINO,
|
SPECIES_NIDORINO,
|
||||||
SPECIES_NINETALES,
|
SPECIES_NINETALES,
|
||||||
SPECIES_NOCTOWL,
|
SPECIES_NOCTOWL,
|
||||||
SPECIES_OCTILLERY,
|
SPECIES_OCTILLERY,
|
||||||
SPECIES_ODDISH,
|
SPECIES_ODDISH,
|
||||||
SPECIES_OMANYTE,
|
SPECIES_OMANYTE,
|
||||||
SPECIES_OMASTAR,
|
SPECIES_OMASTAR,
|
||||||
SPECIES_ONIX,
|
SPECIES_ONIX,
|
||||||
SPECIES_PARAS,
|
SPECIES_PARAS,
|
||||||
SPECIES_PARASECT,
|
SPECIES_PARASECT,
|
||||||
SPECIES_PERSIAN,
|
SPECIES_PERSIAN,
|
||||||
SPECIES_PHANPY,
|
SPECIES_PHANPY,
|
||||||
SPECIES_PICHU,
|
SPECIES_PICHU,
|
||||||
SPECIES_PIDGEOT,
|
SPECIES_PIDGEOT,
|
||||||
SPECIES_PIDGEOTTO,
|
SPECIES_PIDGEOTTO,
|
||||||
SPECIES_PIDGEY,
|
SPECIES_PIDGEY,
|
||||||
SPECIES_PIKACHU,
|
SPECIES_PIKACHU,
|
||||||
SPECIES_PILOSWINE,
|
SPECIES_PILOSWINE,
|
||||||
SPECIES_PINECO,
|
SPECIES_PINECO,
|
||||||
SPECIES_PINSIR,
|
SPECIES_PINSIR,
|
||||||
SPECIES_POLITOED,
|
SPECIES_POLITOED,
|
||||||
SPECIES_POLIWAG,
|
SPECIES_POLIWAG,
|
||||||
SPECIES_POLIWHIRL,
|
SPECIES_POLIWHIRL,
|
||||||
SPECIES_POLIWRATH,
|
SPECIES_POLIWRATH,
|
||||||
SPECIES_PONYTA,
|
SPECIES_PONYTA,
|
||||||
SPECIES_PORYGON,
|
SPECIES_PORYGON,
|
||||||
SPECIES_PORYGON2,
|
SPECIES_PORYGON2,
|
||||||
SPECIES_PRIMEAPE,
|
SPECIES_PRIMEAPE,
|
||||||
SPECIES_PSYDUCK,
|
SPECIES_PSYDUCK,
|
||||||
SPECIES_PUPITAR,
|
SPECIES_PUPITAR,
|
||||||
SPECIES_QUAGSIRE,
|
SPECIES_QUAGSIRE,
|
||||||
SPECIES_QUILAVA,
|
SPECIES_QUILAVA,
|
||||||
SPECIES_QWILFISH,
|
SPECIES_QWILFISH,
|
||||||
SPECIES_RAICHU,
|
SPECIES_RAICHU,
|
||||||
SPECIES_RAIKOU,
|
SPECIES_RAIKOU,
|
||||||
SPECIES_RAPIDASH,
|
SPECIES_RAPIDASH,
|
||||||
SPECIES_RATICATE,
|
SPECIES_RATICATE,
|
||||||
SPECIES_RATTATA,
|
SPECIES_RATTATA,
|
||||||
SPECIES_REMORAID,
|
SPECIES_REMORAID,
|
||||||
SPECIES_RHYDON,
|
SPECIES_RHYDON,
|
||||||
SPECIES_RHYHORN,
|
SPECIES_RHYHORN,
|
||||||
SPECIES_SANDSHREW,
|
SPECIES_SANDSHREW,
|
||||||
SPECIES_SANDSLASH,
|
SPECIES_SANDSLASH,
|
||||||
SPECIES_SCIZOR,
|
SPECIES_SCIZOR,
|
||||||
SPECIES_SCYTHER,
|
SPECIES_SCYTHER,
|
||||||
SPECIES_SEADRA,
|
SPECIES_SEADRA,
|
||||||
SPECIES_SEAKING,
|
SPECIES_SEAKING,
|
||||||
SPECIES_SEEL,
|
SPECIES_SEEL,
|
||||||
SPECIES_SENTRET,
|
SPECIES_SENTRET,
|
||||||
SPECIES_SHELLDER,
|
SPECIES_SHELLDER,
|
||||||
SPECIES_SHUCKLE,
|
SPECIES_SHUCKLE,
|
||||||
SPECIES_SKARMORY,
|
SPECIES_SKARMORY,
|
||||||
SPECIES_SKIPLOOM,
|
SPECIES_SKIPLOOM,
|
||||||
SPECIES_SLOWBRO,
|
SPECIES_SLOWBRO,
|
||||||
SPECIES_SLOWKING,
|
SPECIES_SLOWKING,
|
||||||
SPECIES_SLOWPOKE,
|
SPECIES_SLOWPOKE,
|
||||||
SPECIES_SLUGMA,
|
SPECIES_SLUGMA,
|
||||||
SPECIES_SMEARGLE,
|
SPECIES_SMEARGLE,
|
||||||
SPECIES_SMOOCHUM,
|
SPECIES_SMOOCHUM,
|
||||||
SPECIES_SNEASEL,
|
SPECIES_SNEASEL,
|
||||||
SPECIES_SNORLAX,
|
SPECIES_SNORLAX,
|
||||||
SPECIES_SNUBBULL,
|
SPECIES_SNUBBULL,
|
||||||
SPECIES_SPEAROW,
|
SPECIES_SPEAROW,
|
||||||
SPECIES_SPINARAK,
|
SPECIES_SPINARAK,
|
||||||
SPECIES_SQUIRTLE,
|
SPECIES_SQUIRTLE,
|
||||||
SPECIES_STANTLER,
|
SPECIES_STANTLER,
|
||||||
SPECIES_STARMIE,
|
SPECIES_STARMIE,
|
||||||
SPECIES_STARYU,
|
SPECIES_STARYU,
|
||||||
SPECIES_STEELIX,
|
SPECIES_STEELIX,
|
||||||
SPECIES_SUDOWOODO,
|
SPECIES_SUDOWOODO,
|
||||||
SPECIES_SUICUNE,
|
SPECIES_SUICUNE,
|
||||||
SPECIES_SUNFLORA,
|
SPECIES_SUNFLORA,
|
||||||
SPECIES_SUNKERN,
|
SPECIES_SUNKERN,
|
||||||
SPECIES_SWINUB,
|
SPECIES_SWINUB,
|
||||||
SPECIES_TANGELA,
|
SPECIES_TANGELA,
|
||||||
SPECIES_TAUROS,
|
SPECIES_TAUROS,
|
||||||
SPECIES_TEDDIURSA,
|
SPECIES_TEDDIURSA,
|
||||||
SPECIES_TENTACOOL,
|
SPECIES_TENTACOOL,
|
||||||
SPECIES_TENTACRUEL,
|
SPECIES_TENTACRUEL,
|
||||||
SPECIES_TOGEPI,
|
SPECIES_TOGEPI,
|
||||||
SPECIES_TOGETIC,
|
SPECIES_TOGETIC,
|
||||||
SPECIES_TOTODILE,
|
SPECIES_TOTODILE,
|
||||||
SPECIES_TYPHLOSION,
|
SPECIES_TYPHLOSION,
|
||||||
SPECIES_TYRANITAR,
|
SPECIES_TYRANITAR,
|
||||||
SPECIES_TYROGUE,
|
SPECIES_TYROGUE,
|
||||||
SPECIES_UMBREON,
|
SPECIES_UMBREON,
|
||||||
SPECIES_UNOWN,
|
SPECIES_UNOWN,
|
||||||
SPECIES_URSARING,
|
SPECIES_URSARING,
|
||||||
SPECIES_VAPOREON,
|
SPECIES_VAPOREON,
|
||||||
SPECIES_VENOMOTH,
|
SPECIES_VENOMOTH,
|
||||||
SPECIES_VENONAT,
|
SPECIES_VENONAT,
|
||||||
SPECIES_VENUSAUR,
|
SPECIES_VENUSAUR,
|
||||||
SPECIES_VICTREEBEL,
|
SPECIES_VICTREEBEL,
|
||||||
SPECIES_VILEPLUME,
|
SPECIES_VILEPLUME,
|
||||||
SPECIES_VOLTORB,
|
SPECIES_VOLTORB,
|
||||||
SPECIES_VULPIX,
|
SPECIES_VULPIX,
|
||||||
SPECIES_WARTORTLE,
|
SPECIES_WARTORTLE,
|
||||||
SPECIES_WEEDLE,
|
SPECIES_WEEDLE,
|
||||||
SPECIES_WEEPINBELL,
|
SPECIES_WEEPINBELL,
|
||||||
SPECIES_WEEZING,
|
SPECIES_WEEZING,
|
||||||
SPECIES_WIGGLYTUFF,
|
SPECIES_WIGGLYTUFF,
|
||||||
SPECIES_WOBBUFFET,
|
SPECIES_WOBBUFFET,
|
||||||
SPECIES_WOOPER,
|
SPECIES_WOOPER,
|
||||||
SPECIES_XATU,
|
SPECIES_XATU,
|
||||||
SPECIES_YANMA,
|
SPECIES_YANMA,
|
||||||
SPECIES_ZAPDOS,
|
SPECIES_ZAPDOS,
|
||||||
SPECIES_ZUBAT,
|
SPECIES_ZUBAT,
|
||||||
};
|
};
|
||||||
|
|||||||
+32
-32
@@ -110,38 +110,38 @@ ALIGNED(4) const u8 gFontNarrowLatinGlyphWidths[] = {
|
|||||||
|
|
||||||
ALIGNED(4) const u16 gFontShortLatinGlyphs[] = INCBIN_U16("graphics/fonts/short.latfont");
|
ALIGNED(4) const u16 gFontShortLatinGlyphs[] = INCBIN_U16("graphics/fonts/short.latfont");
|
||||||
ALIGNED(4) const u8 gFontShortLatinGlyphWidths[] = {
|
ALIGNED(4) const u8 gFontShortLatinGlyphWidths[] = {
|
||||||
3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6,
|
3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6,
|
||||||
8, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 3,
|
8, 6, 6, 6, 6, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 3,
|
||||||
6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 9, 8, 8, 3,
|
6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 9, 8, 8, 3,
|
||||||
3, 3, 3, 3, 10, 8, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 10, 8, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
6, 6, 6, 8, 8, 8, 8, 8, 8, 4, 6, 8, 5, 5, 3, 3,
|
6, 6, 6, 8, 8, 8, 8, 8, 8, 4, 6, 8, 5, 5, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 6,
|
3, 3, 3, 3, 3, 3, 3, 3, 6, 3, 3, 3, 3, 3, 3, 6,
|
||||||
3, 3, 3, 3, 3, 3, 3, 6, 3, 12, 12, 12, 12, 1, 2, 3,
|
3, 3, 3, 3, 3, 3, 3, 6, 3, 12, 12, 12, 12, 1, 2, 3,
|
||||||
4, 5, 6, 7, 8, 8, 8, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
4, 5, 6, 7, 8, 8, 8, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 5,
|
8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 5,
|
||||||
6, 6, 6, 3, 3, 6, 6, 8, 5, 9, 6, 6, 6, 6, 6, 6,
|
6, 6, 6, 3, 3, 6, 6, 8, 5, 9, 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, 6, 6, 6, 6, 6, 6, 6, 6,
|
||||||
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 4, 6, 5,
|
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 4, 6, 5,
|
||||||
5, 6, 5, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, 6, 8,
|
5, 6, 5, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, 6, 8,
|
||||||
5, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
5, 6, 6, 6, 6, 6, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
12, 12, 12, 12, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
12, 12, 12, 12, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||||
10, 10, 10, 10, 10, 10, 10, 10, 3, 3, 3, 3, 3, 3, 3, 3,
|
10, 10, 10, 10, 10, 10, 10, 10, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||||
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, 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, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3,
|
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3,
|
||||||
};
|
};
|
||||||
|
|
||||||
ALIGNED(4) const u16 gFontNormalLatinGlyphs[] = INCBIN_U16("graphics/fonts/normal.latfont");
|
ALIGNED(4) const u16 gFontNormalLatinGlyphs[] = INCBIN_U16("graphics/fonts/normal.latfont");
|
||||||
|
|||||||
+10
-10
@@ -1,5 +1,5 @@
|
|||||||
@ Note: ROM header data is empty space here.
|
@ Note: ROM header data is empty space here.
|
||||||
@ It's populated by gbafix using data provided in the Makefile.
|
@ It's populated by gbafix using data provided in the Makefile.
|
||||||
|
|
||||||
.global Start
|
.global Start
|
||||||
Start:
|
Start:
|
||||||
@@ -41,20 +41,20 @@ RomHeaderChecksum:
|
|||||||
RomHeaderReserved2:
|
RomHeaderReserved2:
|
||||||
.space 2
|
.space 2
|
||||||
|
|
||||||
.word 0
|
.word 0
|
||||||
|
|
||||||
.global GPIOPortData
|
.global GPIOPortData
|
||||||
GPIOPortData:
|
GPIOPortData:
|
||||||
.2byte 0
|
.2byte 0
|
||||||
|
|
||||||
.global GPIOPortDirection
|
.global GPIOPortDirection
|
||||||
GPIOPortDirection:
|
GPIOPortDirection:
|
||||||
.2byte 0
|
.2byte 0
|
||||||
|
|
||||||
.global GPIOPortReadEnable
|
.global GPIOPortReadEnable
|
||||||
GPIOPortReadEnable:
|
GPIOPortReadEnable:
|
||||||
.2byte 0
|
.2byte 0
|
||||||
|
|
||||||
.2byte 0
|
.2byte 0
|
||||||
|
|
||||||
.space 0x34
|
.space 0x34
|
||||||
|
|||||||
+6
-6
@@ -1040,11 +1040,11 @@ static const struct YesNoFuncTable sYesNoTable_KeepPlaying =
|
|||||||
|
|
||||||
static void CB2_Roulette(void)
|
static void CB2_Roulette(void)
|
||||||
{
|
{
|
||||||
RunTasks();
|
RunTasks();
|
||||||
AnimateSprites();
|
AnimateSprites();
|
||||||
BuildOamBuffer();
|
BuildOamBuffer();
|
||||||
if (sRoulette->flashUtil.enabled)
|
if (sRoulette->flashUtil.enabled)
|
||||||
RouletteFlash_Run(&sRoulette->flashUtil);
|
RouletteFlash_Run(&sRoulette->flashUtil);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void VBlankCB_Roulette(void)
|
static void VBlankCB_Roulette(void)
|
||||||
@@ -4516,7 +4516,7 @@ static void SpriteCB_ShroomishExit(struct Sprite *sprite)
|
|||||||
// Delay for screen shaking, then exit left
|
// Delay for screen shaking, then exit left
|
||||||
if (sprite->data[1]++ >= sprite->data[3])
|
if (sprite->data[1]++ >= sprite->data[3])
|
||||||
{
|
{
|
||||||
sprite->x -= 2;
|
sprite->x -= 2;
|
||||||
if (sprite->x < -16)
|
if (sprite->x < -16)
|
||||||
{
|
{
|
||||||
if (!sRoulette->ballUnstuck)
|
if (!sRoulette->ballUnstuck)
|
||||||
|
|||||||
+20
-20
@@ -165,30 +165,30 @@ static const u16 sPrizeListAttract[] = {ITEM_TM45_ATTRACT, ITEM_ETHER, I
|
|||||||
|
|
||||||
static const u16 *const sPrizeLists1[NUM_TRAINER_HILL_PRIZE_LISTS] =
|
static const u16 *const sPrizeLists1[NUM_TRAINER_HILL_PRIZE_LISTS] =
|
||||||
{
|
{
|
||||||
sPrizeListRareCandy1,
|
sPrizeListRareCandy1,
|
||||||
sPrizeListLuxuryBall1,
|
sPrizeListLuxuryBall1,
|
||||||
sPrizeListMaxRevive1,
|
sPrizeListMaxRevive1,
|
||||||
sPrizeListMaxEther1,
|
sPrizeListMaxEther1,
|
||||||
sPrizeListElixir1,
|
sPrizeListElixir1,
|
||||||
sPrizeListRoar,
|
sPrizeListRoar,
|
||||||
sPrizeListSludgeBomb,
|
sPrizeListSludgeBomb,
|
||||||
sPrizeListToxic,
|
sPrizeListToxic,
|
||||||
sPrizeListSunnyDay,
|
sPrizeListSunnyDay,
|
||||||
sPrizeListEarthQuake
|
sPrizeListEarthQuake
|
||||||
};
|
};
|
||||||
|
|
||||||
static const u16 *const sPrizeLists2[NUM_TRAINER_HILL_PRIZE_LISTS] =
|
static const u16 *const sPrizeLists2[NUM_TRAINER_HILL_PRIZE_LISTS] =
|
||||||
{
|
{
|
||||||
sPrizeListRareCandy2,
|
sPrizeListRareCandy2,
|
||||||
sPrizeListLuxuryBall2,
|
sPrizeListLuxuryBall2,
|
||||||
sPrizeListMaxRevive2,
|
sPrizeListMaxRevive2,
|
||||||
sPrizeListMaxEther2,
|
sPrizeListMaxEther2,
|
||||||
sPrizeListElixir2,
|
sPrizeListElixir2,
|
||||||
sPrizeListBrickBreak,
|
sPrizeListBrickBreak,
|
||||||
sPrizeListTorment,
|
sPrizeListTorment,
|
||||||
sPrizeListSkillSwap,
|
sPrizeListSkillSwap,
|
||||||
sPrizeListGigaDrain,
|
sPrizeListGigaDrain,
|
||||||
sPrizeListAttract
|
sPrizeListAttract
|
||||||
};
|
};
|
||||||
|
|
||||||
static const u16 *const *const sPrizeListSets[] =
|
static const u16 *const *const sPrizeListSets[] =
|
||||||
|
|||||||
+18
-18
@@ -3,35 +3,35 @@
|
|||||||
@ ../gflib/bg.o
|
@ ../gflib/bg.o
|
||||||
.align 2
|
.align 2
|
||||||
gWindowTileAutoAllocEnabled:
|
gWindowTileAutoAllocEnabled:
|
||||||
.space 4
|
.space 4
|
||||||
@ ../gflib/window.o
|
@ ../gflib/window.o
|
||||||
.align 4
|
.align 4
|
||||||
gTransparentTileNumber:
|
gTransparentTileNumber:
|
||||||
.space 1
|
.space 1
|
||||||
.align 4
|
.align 4
|
||||||
gWindowBgTilemapBuffers:
|
gWindowBgTilemapBuffers:
|
||||||
.space 16
|
.space 16
|
||||||
@ ../gflib/text.o
|
@ ../gflib/text.o
|
||||||
.align 4
|
.align 4
|
||||||
gFonts:
|
gFonts:
|
||||||
.space 4
|
.space 4
|
||||||
.align 2
|
.align 2
|
||||||
gDisableTextPrinters:
|
gDisableTextPrinters:
|
||||||
.space 1
|
.space 1
|
||||||
.align 4
|
.align 4
|
||||||
gCurGlyph:
|
gCurGlyph:
|
||||||
.space 132
|
.space 132
|
||||||
.align 2
|
.align 2
|
||||||
gTextFlags:
|
gTextFlags:
|
||||||
.space 4
|
.space 4
|
||||||
@ ../gflib/sprite.o
|
@ ../gflib/sprite.o
|
||||||
.align 2
|
.align 2
|
||||||
gOamMatrixAllocBitmap:
|
gOamMatrixAllocBitmap:
|
||||||
.space 4
|
.space 4
|
||||||
.align 2
|
.align 2
|
||||||
gReservedSpritePaletteCount:
|
gReservedSpritePaletteCount:
|
||||||
.space 1
|
.space 1
|
||||||
.align 4
|
.align 4
|
||||||
.include "link.o"
|
.include "link.o"
|
||||||
.include "AgbRfu_LinkManager.o"
|
.include "AgbRfu_LinkManager.o"
|
||||||
.include "link_rfu_2.o"
|
.include "link_rfu_2.o"
|
||||||
|
|||||||
Reference in New Issue
Block a user