summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-01-27 20:31:09 -0800
committerYamaArashi <shadow962@live.com>2016-01-27 20:31:09 -0800
commit541e3f7a6fb57afaa19400e1c05ad3db75705fa3 (patch)
treebb4c339a5bc8709a4d523e3e84c75a4f2821ddcb
parent50d13620f278634db9d30d895cd6b6c4492f3017 (diff)
ribbon descriptions
-rw-r--r--asm/rom.s4
-rw-r--r--data/data2.s13
-rw-r--r--data/text/gift_ribbon_descriptions.s208
-rw-r--r--data/text/ribbon_descriptions.s85
4 files changed, 303 insertions, 7 deletions
diff --git a/asm/rom.s b/asm/rom.s
index 3fb24703f..110ba0f2d 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -495576,7 +495576,7 @@ _080F14DC: .4byte gUnknown_083DFEC4
_080F14E0: .4byte 0x0000bc91
_080F14E4: .4byte 0x020388b4
_080F14E8: .4byte 0x0000bc4c
-_080F14EC: .4byte gUnknown_083E113C
+_080F14EC: .4byte gRibbonDescriptions
_080F14F0:
ldr r5, _080F1558
ldr r4, _080F155C
@@ -495634,7 +495634,7 @@ _080F155C: .4byte 0x0000bc8e
_080F1560: .4byte 0x0000bc8f
_080F1564: .4byte 0x02025734
_080F1568: .4byte 0x000030f7
-_080F156C: .4byte gUnknown_083E158C
+_080F156C: .4byte gGiftRibbonDescriptions
_080F1570:
ldr r4, _080F15A4
adds r0, r6, 0
diff --git a/data/data2.s b/data/data2.s
index e73a5fefc..a4ae2d993 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -4071,13 +4071,16 @@ gUnknown_083E05F4: ; 83E05F4
.incbin "baserom.gba", 0x003e05f4, 0x210
gUnknown_083E0804: ; 83E0804
- .incbin "baserom.gba", 0x003e0804, 0x938
+ .incbin "baserom.gba", 0x003e0804, 0x7C4
-gUnknown_083E113C: ; 83E113C
- .incbin "baserom.gba", 0x003e113c, 0x450
+; 83E0FC8
+ .include "data/text/ribbon_descriptions.s"
-gUnknown_083E158C: ; 83E158C
- .incbin "baserom.gba", 0x003e158c, 0x1b10
+; 83E1204
+ .include "data/text/gift_ribbon_descriptions.s"
+
+; 83E178C
+ .incbin "baserom.gba", 0x003e178c, 0x1910
gUnknown_083E309C: ; 83E309C
.incbin "baserom.gba", 0x003e309c, 0x114
diff --git a/data/text/gift_ribbon_descriptions.s b/data/text/gift_ribbon_descriptions.s
new file mode 100644
index 000000000..3b23299b0
--- /dev/null
+++ b/data/text/gift_ribbon_descriptions.s
@@ -0,0 +1,208 @@
+gGiftRibbonDescriptionPart1_2003RegionalTourney:
+ .charmapstr "2003 REGIONAL TOURNEY$"
+
+gGiftRibbonDescriptionPart2_Champion:
+ .charmapstr "CHAMPION RIBBON$"
+
+gGiftRibbonDescriptionPart1_2003NationalTourney:
+ .charmapstr "2003 NATIONAL TOURNEY$"
+
+gGiftRibbonDescriptionPart1_2003GlobalCup:
+ .charmapstr "2003 GLOBAL CUP$"
+
+gGiftRibbonDescriptionPart2_RunnerUp:
+ .charmapstr "Runner-up RIBBON$"
+
+gGiftRibbonDescriptionPart2_Semifinalist:
+ .charmapstr "Semifinalist RIBBON$"
+
+gGiftRibbonDescriptionPart1_2004RegionalTourney:
+ .charmapstr "2004 REGIONAL TOURNEY$"
+
+gGiftRibbonDescriptionPart1_2004NationalTourney:
+ .charmapstr "2004 NATIONAL TOURNEY$"
+
+gGiftRibbonDescriptionPart1_2004GlobalCup:
+ .charmapstr "2004 GLOBAL CUP$"
+
+gGiftRibbonDescriptionPart1_2005RegionalTourney:
+ .charmapstr "2005 REGIONAL TOURNEY$"
+
+gGiftRibbonDescriptionPart1_2005NationalTourney:
+ .charmapstr "2005 NATIONAL TOURNEY$"
+
+gGiftRibbonDescriptionPart1_2005GlobalCup:
+ .charmapstr "2005 GLOBAL CUP$"
+
+gGiftRibbonDescriptionPart1_PokemonBattleCup:
+ .charmapstr "POKéMON BATTLE CUP$"
+
+gGiftRibbonDescriptionPart2_Participation:
+ .charmapstr "Participation RIBBON$"
+
+gGiftRibbonDescriptionPart1_PokemonLeague:
+ .charmapstr "POKéMON LEAGUE$"
+
+gGiftRibbonDescriptionPart1_AdvanceCup:
+ .charmapstr "ADVANCE CUP$"
+
+gGiftRibbonDescriptionPart1_PokemonTournament:
+ .charmapstr "POKéMON Tournament$"
+
+gGiftRibbonDescriptionPart2_Participation2:
+ .charmapstr "Participation RIBBON$"
+
+gGiftRibbonDescriptionPart1_PokemonEvent:
+ .charmapstr "POKéMON Event$"
+
+gGiftRibbonDescriptionPart1_PokemonFestival:
+ .charmapstr "POKéMON Festival$"
+
+gGiftRibbonDescriptionPart1_DifficultyClearing:
+ .charmapstr "Difficulty-clearing$"
+
+gGiftRibbonDescriptionPart2_Commemorative:
+ .charmapstr "Commemorative RIBBON$"
+
+gGiftRibbonDescriptionPart1_ClearingAllDifficulties:
+ .charmapstr "RIBBON awarded for$"
+
+gGiftRibbonDescriptionPart2_ClearingAllDifficulties:
+ .charmapstr "clearing all difficulties.$"
+
+gGiftRibbonDescriptionPart1_100StraightWin:
+ .charmapstr "100-straight Win$"
+
+gGiftRibbonDescriptionPart1_DarknessTower:
+ .charmapstr "DARKNESS TOWER Clear$"
+
+gGiftRibbonDescriptionPart1_RedTower:
+ .charmapstr "RED TOWER Clear$"
+
+gGiftRibbonDescriptionPart1_BlackironTower:
+ .charmapstr "BLACKIRON TOWER Clear$"
+
+gGiftRibbonDescriptionPart1_FinalTower:
+ .charmapstr "FINAL TOWER Clear$"
+
+gGiftRibbonDescriptionPart1_LegendMaking:
+ .charmapstr "Legend-making$"
+
+gGiftRibbonDescriptionPart1_PokemonCenterTokyo:
+ .charmapstr "POKéMON CENTER TOKYO$"
+
+gGiftRibbonDescriptionPart1_PokemonCenterOsaka:
+ .charmapstr "POKéMON CENTER OSAKA$"
+
+gGiftRibbonDescriptionPart1_PokemonCenterNagoya:
+ .charmapstr "POKéMON CENTER NAGOYA$"
+
+gGiftRibbonDescriptionPart1_PokemonCenterNY:
+ .charmapstr "POKéMON CENTER NY$"
+
+gGiftRibbonDescriptionPart1_SummerHolidays:
+ .charmapstr "Summer Holidays RIBBON$"
+
+gGiftRibbonDescriptionPart2_EmptyString:
+ .charmapstr "$"
+
+gGiftRibbonDescriptionPart1_WinterHolidays:
+ .charmapstr "Winter Holidays RIBBON$"
+
+gGiftRibbonDescriptionPart1_SpringHolidays:
+ .charmapstr "Spring Holidays RIBBON$"
+
+gGiftRibbonDescriptionPart1_Evergreen:
+ .charmapstr "Evergreen RIBBON$"
+
+gGiftRibbonDescriptionPart1_SpecialHoliday:
+ .charmapstr "Special Holiday RIBBON$"
+
+gGiftRibbonDescriptionPart1_HardWorker:
+ .charmapstr "Hard Worker RIBBON$"
+
+gGiftRibbonDescriptionPart1_LotsOfFriends:
+ .charmapstr "Lots of Friends RIBBON$"
+
+gGiftRibbonDescriptionPart1_FullOfEnergy:
+ .charmapstr "Full of Energy RIBBON$"
+
+gGiftRibbonDescriptionPart1_LovedPokemon:
+ .charmapstr "A commemorative RIBBON$"
+
+gGiftRibbonDescriptionPart2_LovedPokemon:
+ .charmapstr "for a loved POKéMON.$"
+
+gGiftRibbonDescriptionPart1_LoveForPokemon:
+ .charmapstr "RIBBON that shows$"
+
+gGiftRibbonDescriptionPart2_LoveForPokemon:
+ .charmapstr "love for POKéMON.$"
+
+ .align 2, 0
+
+gGiftRibbonDescriptions: ; 83E158C
+ .4byte gGiftRibbonDescriptionPart1_2003RegionalTourney, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_2003NationalTourney, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_2003GlobalCup, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_2003RegionalTourney, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_2003NationalTourney, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_2003GlobalCup, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_2003RegionalTourney, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_2003NationalTourney, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_2003GlobalCup, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_2004RegionalTourney, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_2004NationalTourney, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_2004GlobalCup, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_2004RegionalTourney, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_2004NationalTourney, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_2004GlobalCup, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_2004RegionalTourney, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_2004NationalTourney, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_2004GlobalCup, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_2005RegionalTourney, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_2005NationalTourney, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_2005GlobalCup, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_2005RegionalTourney, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_2005NationalTourney, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_2005GlobalCup, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_2005RegionalTourney, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_2005NationalTourney, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_2005GlobalCup, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_PokemonBattleCup, gGiftRibbonDescriptionPart2_Participation
+ .4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_PokemonLeague, gGiftRibbonDescriptionPart2_Participation
+ .4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_Champion
+ .4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_RunnerUp
+ .4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_Semifinalist
+ .4byte gGiftRibbonDescriptionPart1_AdvanceCup, gGiftRibbonDescriptionPart2_Participation
+ .4byte gGiftRibbonDescriptionPart1_PokemonTournament, gGiftRibbonDescriptionPart2_Participation2
+ .4byte gGiftRibbonDescriptionPart1_PokemonEvent, gGiftRibbonDescriptionPart2_Participation2
+ .4byte gGiftRibbonDescriptionPart1_PokemonFestival, gGiftRibbonDescriptionPart2_Participation2
+ .4byte gGiftRibbonDescriptionPart1_DifficultyClearing, gGiftRibbonDescriptionPart2_Commemorative
+ .4byte gGiftRibbonDescriptionPart1_ClearingAllDifficulties, gGiftRibbonDescriptionPart2_ClearingAllDifficulties
+ .4byte gGiftRibbonDescriptionPart1_100StraightWin, gGiftRibbonDescriptionPart2_Commemorative
+ .4byte gGiftRibbonDescriptionPart1_DarknessTower, gGiftRibbonDescriptionPart2_Commemorative
+ .4byte gGiftRibbonDescriptionPart1_RedTower, gGiftRibbonDescriptionPart2_Commemorative
+ .4byte gGiftRibbonDescriptionPart1_BlackironTower, gGiftRibbonDescriptionPart2_Commemorative
+ .4byte gGiftRibbonDescriptionPart1_FinalTower, gGiftRibbonDescriptionPart2_Commemorative
+ .4byte gGiftRibbonDescriptionPart1_LegendMaking, gGiftRibbonDescriptionPart2_Commemorative
+ .4byte gGiftRibbonDescriptionPart1_PokemonCenterTokyo, gGiftRibbonDescriptionPart2_Commemorative
+ .4byte gGiftRibbonDescriptionPart1_PokemonCenterOsaka, gGiftRibbonDescriptionPart2_Commemorative
+ .4byte gGiftRibbonDescriptionPart1_PokemonCenterNagoya, gGiftRibbonDescriptionPart2_Commemorative
+ .4byte gGiftRibbonDescriptionPart1_PokemonCenterNY, gGiftRibbonDescriptionPart2_Commemorative
+ .4byte gGiftRibbonDescriptionPart1_SummerHolidays, gGiftRibbonDescriptionPart2_EmptyString
+ .4byte gGiftRibbonDescriptionPart1_WinterHolidays, gGiftRibbonDescriptionPart2_EmptyString
+ .4byte gGiftRibbonDescriptionPart1_SpringHolidays, gGiftRibbonDescriptionPart2_EmptyString
+ .4byte gGiftRibbonDescriptionPart1_Evergreen, gGiftRibbonDescriptionPart2_EmptyString
+ .4byte gGiftRibbonDescriptionPart1_SpecialHoliday, gGiftRibbonDescriptionPart2_EmptyString
+ .4byte gGiftRibbonDescriptionPart1_HardWorker, gGiftRibbonDescriptionPart2_EmptyString
+ .4byte gGiftRibbonDescriptionPart1_LotsOfFriends, gGiftRibbonDescriptionPart2_EmptyString
+ .4byte gGiftRibbonDescriptionPart1_FullOfEnergy, gGiftRibbonDescriptionPart2_EmptyString
+ .4byte gGiftRibbonDescriptionPart1_LovedPokemon, gGiftRibbonDescriptionPart2_LovedPokemon
+ .4byte gGiftRibbonDescriptionPart1_LoveForPokemon, gGiftRibbonDescriptionPart2_LoveForPokemon
diff --git a/data/text/ribbon_descriptions.s b/data/text/ribbon_descriptions.s
new file mode 100644
index 000000000..7d2e8706a
--- /dev/null
+++ b/data/text/ribbon_descriptions.s
@@ -0,0 +1,85 @@
+gRibbonDescriptionPart1_Champion:
+ .charmapstr "CHAMPION-beating, HALL$"
+
+gRibbonDescriptionPart2_Champion:
+ .charmapstr "OF FAME Member RIBBON$"
+
+gRibbonDescriptionPart1_CoolContest:
+ .charmapstr "COOL CONTEST$"
+
+gRibbonDescriptionPart1_BeautyContest:
+ .charmapstr "BEAUTY CONTEST$"
+
+gRibbonDescriptionPart1_CuteContest:
+ .charmapstr "CUTE CONTEST$"
+
+gRibbonDescriptionPart1_SmartContest:
+ .charmapstr "SMART CONTEST$"
+
+gRibbonDescriptionPart1_ToughContest:
+ .charmapstr "TOUGH CONTEST$"
+
+gRibbonDescriptionPart2_NormalRank:
+ .charmapstr "Normal Rank winner!$"
+
+gRibbonDescriptionPart2_SuperRank:
+ .charmapstr "Super Rank winner!$"
+
+gRibbonDescriptionPart2_HyperRank:
+ .charmapstr "Hyper Rank winner!$"
+
+gRibbonDescriptionPart2_MasterRank:
+ .charmapstr "Master Rank winner!$"
+
+gRibbonDescriptionPart1_Winning:
+ .charmapstr "RIBBON for clearing LV50$"
+
+gRibbonDescriptionPart2_Winning:
+ .charmapstr "at the BATTLE TOWER.$"
+
+gRibbonDescriptionPart1_Victory:
+ .charmapstr "Won for clearing LV100$"
+
+gRibbonDescriptionPart2_Victory:
+ .charmapstr "at the BATTLE TOWER.$"
+
+gRibbonDescriptionPart1_Artist:
+ .charmapstr "RIBBON for being chosen$"
+
+gRibbonDescriptionPart2_Artist:
+ .charmapstr "as a super sketch model.$"
+
+gRibbonDescriptionPart1_Effort:
+ .charmapstr "RIBBON awarded for$"
+
+gRibbonDescriptionPart2_Effort:
+ .charmapstr "being a hard worker.$"
+
+ .align 2, 0
+
+gRibbonDescriptions: ; 83E113C
+ .4byte gRibbonDescriptionPart1_Champion, gRibbonDescriptionPart2_Champion
+ .4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_NormalRank
+ .4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_SuperRank
+ .4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_HyperRank
+ .4byte gRibbonDescriptionPart1_CoolContest, gRibbonDescriptionPart2_MasterRank
+ .4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_NormalRank
+ .4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_SuperRank
+ .4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_HyperRank
+ .4byte gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_MasterRank
+ .4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_NormalRank
+ .4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_SuperRank
+ .4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_HyperRank
+ .4byte gRibbonDescriptionPart1_CuteContest, gRibbonDescriptionPart2_MasterRank
+ .4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_NormalRank
+ .4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_SuperRank
+ .4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_HyperRank
+ .4byte gRibbonDescriptionPart1_SmartContest, gRibbonDescriptionPart2_MasterRank
+ .4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_NormalRank
+ .4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_SuperRank
+ .4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_HyperRank
+ .4byte gRibbonDescriptionPart1_ToughContest, gRibbonDescriptionPart2_MasterRank
+ .4byte gRibbonDescriptionPart1_Winning, gRibbonDescriptionPart2_Winning
+ .4byte gRibbonDescriptionPart1_Victory, gRibbonDescriptionPart2_Victory
+ .4byte gRibbonDescriptionPart1_Artist, gRibbonDescriptionPart2_Artist
+ .4byte gRibbonDescriptionPart1_Effort, gRibbonDescriptionPart2_Effort