diff --git a/data/event_scripts.s b/data/event_scripts.s index 5238a3462..e260b8689 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -5260,83 +5260,94 @@ gUnknown_0827EA0C:: @ 827EA0C gUnknown_0827EA17:: @ 827EA17 .string "CONTEST$" +gContestRankNormal:: .string "NORMAL RANK$" +gContestRankSuper:: .string "SUPER RANK$" +gContestRankHyper:: .string "HYPER RANK$" +gContestRankMaster:: .string "MASTER RANK$" +gContestLink:: .string "LINK$" +gContestCoolness:: .string "COOLNESS$" +gContestBeauty:: .string "BEAUTY$" +gContestCuteness:: .string "CUTENESS$" +gContestSmartness:: .string "SMARTNESS$" +gContestToughness:: .string "TOUGHNESS$" +gContestPaintingCool1:: .string "Nonstop supercool--\n" .string "the inestimable {STR_VAR_1}$" +gContestPaintingCool2:: .string "Hey, there!\n" .string "The good-looking POKéMON {STR_VAR_1}$" +gContestPaintingCool3:: .string "The marvelous, wonderful, and\n" .string "very great {STR_VAR_1}$" +gContestPaintingBeauty1:: .string "This century’s last Venus--\n" .string "the beautiful {STR_VAR_1}$" +gContestPaintingBeauty2:: .string "{STR_VAR_1}’s dazzling,\n" .string "glittering smile$" +gContestPaintingBeauty3:: .string "POKéMON CENTER’s super idol--\n" .string "the incomparable {STR_VAR_1}$" +gContestPaintingCute1:: .string "The lovely and sweet {STR_VAR_1}$" +gContestPaintingCute2:: .string "The pretty {STR_VAR_1}’s\n" .string "winning portrait$" +gContestPaintingCute3:: .string "Give us a wink!\n" .string "The cutie POKéMON {STR_VAR_1}$" +gContestPaintingSmart1:: .string "The smartness maestro--\n" .string "the wise POKéMON {STR_VAR_1}$" +gContestPaintingSmart2:: .string "{STR_VAR_1}--the one chosen\n" .string "above all POKéMON$" +gContestPaintingSmart3:: .string "The excellent {STR_VAR_1}’s\n" .string "moment of elegance$" +gContestPaintingTough1:: .string "The powerfully muscular\n" .string "speedster {STR_VAR_1}$" +gContestPaintingTough2:: .string "The strong, stronger, and\n" .string "strongest {STR_VAR_1}$" -<<<<<<< HEAD -gUnknown_0827EA0C:: @ 827EA0C - .incbin "baserom.gba", 0x27ea0c, 0x13 - -@ 827EA1F - .include "data/text/contest_rank_text.inc" - -gUnknown_0827EA52:: @ 827EA52 - .incbin "baserom.gba", 0x27ea52, 0x2d - -@ 827EA7F - .include "data/text/contest_painting_descriptions.inc" -======= +gContestPaintingTough3:: .string "The mighty tough\n" .string "hyper POKéMON {STR_VAR_1}$" ->>>>>>> 055a419830c0725a629f971b0299c89082c192fd gUnknown_0827ECBC:: @ 27ECBC .string "ODDISH$" diff --git a/data/text/contest_painting_descriptions.inc b/data/text/contest_painting_descriptions.inc deleted file mode 100644 index ab6120f29..000000000 --- a/data/text/contest_painting_descriptions.inc +++ /dev/null @@ -1,44 +0,0 @@ -gContestPaintingCool1:: @ 827EA7F - .string "Nonstop supercool--\nthe inestimable {STR_VAR_1}$" - -gContestPaintingCool2:: @ 827EAA6 - .string "Hey, there!\nThe good-looking POKéMON {STR_VAR_1}$" - -gContestPaintingCool3:: @ 827EACE - .string "The marvelous, wonderful, and\nvery great {STR_VAR_1}$" - -gContestPaintingBeauty1:: @ 827EAFA - .string "This century’s last Venus--\nthe beautiful {STR_VAR_1}$" - -gContestPaintingBeauty2:: @ 827EB27 - .string "{STR_VAR_1}’s dazzling,\nglittering smile$" - -gContestPaintingBeauty3:: @ 827EB47 - .string "POKéMON CENTER’s super idol--\nthe incomparable {STR_VAR_1}$" - -gContestPaintingCute1:: @ 827EB79 - .string "The lovely and sweet {STR_VAR_1}$" - -gContestPaintingCute2:: @ 827EB91 - .string "The pretty {STR_VAR_1}’s\nwinning portrait$" - -gContestPaintingCute3:: @ 827EBB2 - .string "Give us a wink!\nThe cutie POKéMON {STR_VAR_1}$" - -gContestPaintingSmart1:: @ 827EBD7 - .string "The smartness maestro--\nthe wise POKéMON {STR_VAR_1}$" - -gContestPaintingSmart2:: @ 827EC03 - .string "{STR_VAR_1}--the one chosen\nabove all POKéMON$" - -gContestPaintingSmart3:: @ 827EC28 - .string "The excellent {STR_VAR_1}’s\nmoment of elegance$" - -gContestPaintingTough1:: @ 827EC4E - .string "The powerfully muscular\nspeedster {STR_VAR_1}$" - -gContestPaintingTough2:: @ 827EC73 - .string "The strong, stronger, and\nstrongest {STR_VAR_1}$" - -gContestPaintingTough3:: @ 827EC9A - .string "The mighty tough\nhyper POKéMON {STR_VAR_1}$" diff --git a/data/text/contest_rank_text.inc b/data/text/contest_rank_text.inc deleted file mode 100644 index 0751543d3..000000000 --- a/data/text/contest_rank_text.inc +++ /dev/null @@ -1,14 +0,0 @@ -gContestRankNormal:: @ 827EA1F - .string "NORMAL RANK$" - -gContestRankSuper:: @ 827EA2B - .string "SUPER RANK$" - -gContestRankHyper:: @ 827EA36 - .string "HYPER RANK$" - -gContestRankMaster:: @ 827EA41 - .string "MASTER RANK$" - -gContestLink:: @ 827EA4D - .string "LINK$"