diff options
| -rw-r--r-- | asm/emerald.s | 4 | ||||
| -rw-r--r-- | data/data2.s | 10 | ||||
| -rw-r--r-- | data/text/gift_ribbon_descriptions.s | 208 | ||||
| -rw-r--r-- | data/text/move_descriptions.s | 4 | ||||
| -rw-r--r-- | data/text/ribbon_descriptions.s | 85 |
5 files changed, 302 insertions, 9 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index c3b527a0a..473315454 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -899314,7 +899314,7 @@ sub_81D0EFC: ; 81D0EFC cmp r5, 0x18 bhi @081D0F60 lsls r1, r5, 3 - ldr r0, =gUnknown_086239AC + ldr r0, =gRibbonDescriptionPointers adds r6, r1, r0 movs r5, 0x80 lsls r5, 17 @@ -899352,7 +899352,7 @@ sub_81D0EFC: ; 81D0EFC beq @081D0FB2 subs r5, 0x1 movs r4, 0 - ldr r0, =gUnknown_08623DF8 + ldr r0, =gGiftRibbonDescriptionPointers mov r8, r0 movs r6, 0x80 lsls r6, 17 diff --git a/data/data2.s b/data/data2.s index 2148b9122..6d7bdaf34 100644 --- a/data/data2.s +++ b/data/data2.s @@ -11601,13 +11601,13 @@ gUnknown_086237F4: ; 86237F4 .incbin "base_emerald.gba", 0x6237f4, 0x4 gUnknown_086237F8: ; 86237F8 - .incbin "base_emerald.gba", 0x6237f8, 0x1b4 + .incbin "base_emerald.gba", 0x6237f8, 0x44 -gUnknown_086239AC: ; 86239AC - .incbin "base_emerald.gba", 0x6239ac, 0x44c +; 862383C + .include "data/text/ribbon_descriptions.s" -gUnknown_08623DF8: ; 8623DF8 - .incbin "base_emerald.gba", 0x623df8, 0x200 +; 8623A74 + .include "data/text/gift_ribbon_descriptions.s" gUnknown_08623FF8: ; 8623FF8 .incbin "base_emerald.gba", 0x623ff8, 0xa0 diff --git a/data/text/gift_ribbon_descriptions.s b/data/text/gift_ribbon_descriptions.s new file mode 100644 index 000000000..e58c57a0d --- /dev/null +++ b/data/text/gift_ribbon_descriptions.s @@ -0,0 +1,208 @@ +gGiftRibbonDescriptionPart1_2003RegionalTourney: ; 8623A74 + .charmapstr "2003 REGIONAL TOURNEY$" + +gGiftRibbonDescriptionPart2_Champion: ; 8623A8A + .charmapstr "CHAMPION RIBBON$" + +gGiftRibbonDescriptionPart1_2003NationalTourney: ; 8623A9A + .charmapstr "2003 NATIONAL TOURNEY$" + +gGiftRibbonDescriptionPart1_2003GlobalCup: ; 8623AB0 + .charmapstr "2003 GLOBAL CUP$" + +gGiftRibbonDescriptionPart2_RunnerUp: ; 8623AC0 + .charmapstr "Runner-up RIBBON$" + +gGiftRibbonDescriptionPart2_Semifinalist: ; 8623AD1 + .charmapstr "Semifinalist RIBBON$" + +gGiftRibbonDescriptionPart1_2004RegionalTourney: ; 8623AE5 + .charmapstr "2004 REGIONAL TOURNEY$" + +gGiftRibbonDescriptionPart1_2004NationalTourney: ; 8623AFB + .charmapstr "2004 NATIONAL TOURNEY$" + +gGiftRibbonDescriptionPart1_2004GlobalCup: ; 8623B11 + .charmapstr "2004 GLOBAL CUP$" + +gGiftRibbonDescriptionPart1_2005RegionalTourney: ; 8623B21 + .charmapstr "2005 REGIONAL TOURNEY$" + +gGiftRibbonDescriptionPart1_2005NationalTourney: ; 8623B37 + .charmapstr "2005 NATIONAL TOURNEY$" + +gGiftRibbonDescriptionPart1_2005GlobalCup: ; 8623B4D + .charmapstr "2005 GLOBAL CUP$" + +gGiftRibbonDescriptionPart1_PokemonBattleCup: ; 8623B5D + .charmapstr "POKéMON BATTLE CUP$" + +gGiftRibbonDescriptionPart2_Participation: ; 8623B70 + .charmapstr "Participation RIBBON$" + +gGiftRibbonDescriptionPart1_PokemonLeague: ; 8623B85 + .charmapstr "POKéMON LEAGUE$" + +gGiftRibbonDescriptionPart1_AdvanceCup: ; 8623B94 + .charmapstr "ADVANCE CUP$" + +gGiftRibbonDescriptionPart1_PokemonTournament: ; 8623BA0 + .charmapstr "POKéMON Tournament$" + +gGiftRibbonDescriptionPart2_Participation2: ; 8623BB3 + .charmapstr "Participation RIBBON$" + +gGiftRibbonDescriptionPart1_PokemonEvent: ; 8623BC8 + .charmapstr "POKéMON Event$" + +gGiftRibbonDescriptionPart1_PokemonFestival: ; 8623BD6 + .charmapstr "POKéMON Festival$" + +gGiftRibbonDescriptionPart1_DifficultyClearing: ; 8623BE7 + .charmapstr "Difficulty-clearing$" + +gGiftRibbonDescriptionPart2_Commemorative: ; 8623BFB + .charmapstr "Commemorative RIBBON$" + +gGiftRibbonDescriptionPart1_ClearingAllChallenges: ; 8623C10 + .charmapstr "RIBBON awarded for$" + +gGiftRibbonDescriptionPart2_ClearingAllChallenges: ; 8623C23 + .charmapstr "clearing all challenges.$" + +gGiftRibbonDescriptionPart1_100StraightWin: ; 8623C3C + .charmapstr "100-straight Win$" + +gGiftRibbonDescriptionPart1_DarknessTower: ; 8623C4D + .charmapstr "DARKNESS TOWER Clear$" + +gGiftRibbonDescriptionPart1_RedTower: ; 8623C62 + .charmapstr "RED TOWER Clear$" + +gGiftRibbonDescriptionPart1_BlackironTower: ; 8623C72 + .charmapstr "BLACKIRON TOWER Clear$" + +gGiftRibbonDescriptionPart1_FinalTower: ; 8623C88 + .charmapstr "FINAL TOWER Clear$" + +gGiftRibbonDescriptionPart1_LegendMaking: ; 8623C9A + .charmapstr "Legend-making$" + +gGiftRibbonDescriptionPart1_PokemonCenterTokyo: ; 8623CA8 + .charmapstr "POKéMON CENTER TOKYO$" + +gGiftRibbonDescriptionPart1_PokemonCenterOsaka: ; 8623CBD + .charmapstr "POKéMON CENTER OSAKA$" + +gGiftRibbonDescriptionPart1_PokemonCenterNagoya: ; 8623CD2 + .charmapstr "POKéMON CENTER NAGOYA$" + +gGiftRibbonDescriptionPart1_PokemonCenterNY: ; 8623CE8 + .charmapstr "POKéMON CENTER NY$" + +gGiftRibbonDescriptionPart1_SummerHolidays: ; 8623CFA + .charmapstr "Summer Holidays RIBBON$" + +gGiftRibbonDescriptionPart2_EmptyString: ; 8623D11 + .charmapstr "$" + +gGiftRibbonDescriptionPart1_WinterHolidays: ; 8623D12 + .charmapstr "Winter Holidays RIBBON$" + +gGiftRibbonDescriptionPart1_SpringHolidays: ; 8623D29 + .charmapstr "Spring Holidays RIBBON$" + +gGiftRibbonDescriptionPart1_Evergreen: ; 8623D40 + .charmapstr "Evergreen RIBBON$" + +gGiftRibbonDescriptionPart1_SpecialHoliday: ; 8623D51 + .charmapstr "Special Holiday RIBBON$" + +gGiftRibbonDescriptionPart1_HardWorker: ; 8623D68 + .charmapstr "Hard Worker RIBBON$" + +gGiftRibbonDescriptionPart1_LotsOfFriends: ; 8623D7B + .charmapstr "Lots of Friends RIBBON$" + +gGiftRibbonDescriptionPart1_FullOfEnergy: ; 8623D92 + .charmapstr "Full of Energy RIBBON$" + +gGiftRibbonDescriptionPart1_LovedPokemon: ; 8623DA8 + .charmapstr "A commemorative RIBBON$" + +gGiftRibbonDescriptionPart2_LovedPokemon: ; 8623DBF + .charmapstr "for a loved POKéMON.$" + +gGiftRibbonDescriptionPart1_LoveForPokemon: ; 8623DD4 + .charmapstr "RIBBON that shows$" + +gGiftRibbonDescriptionPart2_LoveForPokemon: ; 8623DE6 + .charmapstr "love for POKéMON.$" + + .align 2, 0 + +gGiftRibbonDescriptionPointers: ; 8623DF8 + .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_ClearingAllChallenges, gGiftRibbonDescriptionPart2_ClearingAllChallenges + .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/move_descriptions.s b/data/text/move_descriptions.s index 2dbe5bbc5..9c94abbe8 100644 --- a/data/text/move_descriptions.s +++ b/data/text/move_descriptions.s @@ -22,7 +22,7 @@ gFirePunchMoveDescription: ; 86182C9 gIcePunchMoveDescription: ; 86182EE .charmapstr "An icy punch that may{next}freeze the foe.$" -gThunderpunchMoveDescription: ; 8618314 +gThunderPunchMoveDescription: ; 8618314 .charmapstr "An electrified punch that{next}may paralyze the foe.$" gScratchMoveDescription: ; 8618344 @@ -1071,7 +1071,7 @@ gMoveDescriptionPointers: ; 861C524 .4byte gPayDayMoveDescription .4byte gFirePunchMoveDescription .4byte gIcePunchMoveDescription - .4byte gThunderpunchMoveDescription + .4byte gThunderPunchMoveDescription .4byte gScratchMoveDescription .4byte gVicegripMoveDescription .4byte gGuillotineMoveDescription diff --git a/data/text/ribbon_descriptions.s b/data/text/ribbon_descriptions.s new file mode 100644 index 000000000..473ce37e5 --- /dev/null +++ b/data/text/ribbon_descriptions.s @@ -0,0 +1,85 @@ +gRibbonDescriptionPart1_Champion: ; 862383C + .charmapstr "CHAMPION-beating, HALL$" + +gRibbonDescriptionPart2_Champion: ; 8623853 + .charmapstr "OF FAME Member RIBBON$" + +gRibbonDescriptionPart1_CoolContest: ; 8623869 + .charmapstr "COOL CONTEST$" + +gRibbonDescriptionPart1_BeautyContest: ; 8623876 + .charmapstr "BEAUTY CONTEST$" + +gRibbonDescriptionPart1_CuteContest: ; 8623885 + .charmapstr "CUTE CONTEST$" + +gRibbonDescriptionPart1_SmartContest: ; 8623892 + .charmapstr "SMART CONTEST$" + +gRibbonDescriptionPart1_ToughContest: ; 86238A0 + .charmapstr "TOUGH CONTEST$" + +gRibbonDescriptionPart2_NormalRank: ; 86238AE + .charmapstr "Normal Rank winner!$" + +gRibbonDescriptionPart2_SuperRank: ; 86238C2 + .charmapstr "Super Rank winner!$" + +gRibbonDescriptionPart2_HyperRank: ; 86238D5 + .charmapstr "Hyper Rank winner!$" + +gRibbonDescriptionPart2_MasterRank: ; 86238E8 + .charmapstr "Master Rank winner!$" + +gRibbonDescriptionPart1_Winning: ; 86238FC + .charmapstr "For clearing LV50$" + +gRibbonDescriptionPart2_Winning: ; 862390E + .charmapstr "at the BATTLE TOWER.$" + +gRibbonDescriptionPart1_Victory: ; 8623923 + .charmapstr "For clearing Open Level$" + +gRibbonDescriptionPart2_Victory: ; 862393B + .charmapstr "at the BATTLE TOWER.$" + +gRibbonDescriptionPart1_Artist: ; 8623950 + .charmapstr "RIBBON for being chosen$" + +gRibbonDescriptionPart2_Artist: ; 8623968 + .charmapstr "as a super sketch model.$" + +gRibbonDescriptionPart1_Effort: ; 8623981 + .charmapstr "RIBBON awarded for$" + +gRibbonDescriptionPart2_Effort: ; 8623994 + .charmapstr "being a hard worker.$" + + .align 2, 0 + +gRibbonDescriptionPointers: ; 86239AC + .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 |