diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2019-10-08 22:46:32 +0100 |
|---|---|---|
| committer | SatoMew <SatoMew@users.noreply.github.com> | 2019-10-08 22:46:32 +0100 |
| commit | 2c254082de042dde46cee9d2da2d9bb1bc340905 (patch) | |
| tree | af99bcac2c6fece9523b12dbabe4128ec26f6fc9 /data | |
| parent | 78558b07b0983b6b8b06085933fdf66b801658e9 (diff) | |
| parent | 2a7205dec677c98d087cb8ba191370de464c8bf0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokefirered
Diffstat (limited to 'data')
65 files changed, 2650 insertions, 829 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 944275acc..09cc3cfb2 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -4,7 +4,7 @@ .section script_data, "aw", %progbits -BattleAIs:: @ 81D9BF4 +gBattleAI_ScriptsTable:: @ 81D9BF4 .4byte AI_CheckBadMove .4byte AI_TryToFaint .4byte AI_CheckViability diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 3d1de8ac5..4b45f3669 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -10,8 +10,8 @@ gUnknown_81C68F4:: @ 81C68F4 gUnknown_81C6E84:: @ 81C6E84 .incbin "baserom.gba", 0x1C6E84, 0x24 -gUnknown_81C6EA8:: @ 81C6EA8 +gBattleAnims_General:: @ 81C6EA8 .incbin "baserom.gba", 0x1C6EA8, 0x70 -gUnknown_81C6F18:: @ 81C6F18 +gBattleAnims_Special:: @ 81C6F18 .incbin "baserom.gba", 0x1C6F18, 0xF690 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a3b44dc0d..0fd65d2e0 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1,45 +1,45 @@ .section script_data, "aw", %progbits -gUnknown_81D65A8:: @ 81D65A8 +gBattleScriptsForMoveEffects:: @ 81D65A8 .incbin "baserom.gba", 0x1D65A8, 0x388 -gUnknown_81D6930:: @ 81D6930 +BattleScript_HitFromCritCalc:: @ 81D6930 .incbin "baserom.gba", 0x1D6930, 0x1E -gUnknown_81D694E:: @ 81D694E +BattleScript_MoveEnd:: @ 81D694E .incbin "baserom.gba", 0x1D694E, 0x12 -gUnknown_81D6960:: @ 81D6960 +BattleScript_MoveMissedPause:: @ 81D6960 .incbin "baserom.gba", 0x1D6960, 0x271 -gUnknown_81D6BD1:: @ 81D6BD1 +BattleScript_StatUp:: @ 81D6BD1 .incbin "baserom.gba", 0x1D6BD1, 0x91 -gUnknown_81D6C62:: @ 81D6C62 +BattleScript_StatDown:: @ 81D6C62 .incbin "baserom.gba", 0x1D6C62, 0x6E0 -gUnknown_81D7342:: @ 81D7342 +BattleScript_MoveUsedMustRecharge:: @ 81D7342 .incbin "baserom.gba", 0x1D7342, 0xA75 -gUnknown_81D7DB7:: @ 81D7DB7 +BattleScript_PresentHealTarget:: @ 81D7DB7 .incbin "baserom.gba", 0x1D7DB7, 0x1A -gUnknown_81D7DD1:: @ 81D7DD1 +BattleScript_AlreadyAtFullHp:: @ 81D7DD1 .incbin "baserom.gba", 0x1D7DD1, 0x21 -gUnknown_81D7DF2:: @ 81D7DF2 +BattleScript_ButItFailed:: @ 81D7DF2 .incbin "baserom.gba", 0x1D7DF2, 0x882 -gUnknown_81D8674:: @ 81D8674 +BattleScript_FaintAttacker:: @ 81D8674 .incbin "baserom.gba", 0x1D8674, 0x10 -gUnknown_81D8684:: @ 81D8684 +BattleScript_FaintTarget:: @ 81D8684 .incbin "baserom.gba", 0x1D8684, 0x10 -gUnknown_81D8694:: @ 81D8694 +BattleScript_GiveExp:: @ 81D8694 .incbin "baserom.gba", 0x1D8694, 0x9 -gUnknown_81D869D:: @ 81D869D +BattleScript_HandleFaintedMon:: @ 81D869D .incbin "baserom.gba", 0x1D869D, 0x152 gUnknown_81D87EF:: @ 81D87EF @@ -84,226 +84,226 @@ gUnknown_81D8949:: @ 81D8949 gUnknown_81D894D:: @ 81D894D .incbin "baserom.gba", 0x1D894D, 0xA4 -gUnknown_81D89F1:: @ 81D89F1 +BattleScript_Pausex20:: @ 81D89F1 .incbin "baserom.gba", 0x1D89F1, 0x4 -gUnknown_81D89F5:: @ 81D89F5 +BattleScript_LevelUp:: @ 81D89F5 .incbin "baserom.gba", 0x1D89F5, 0x6F -gUnknown_81D8A64:: @ 81D8A64 +BattleScript_RainContinuesOrEnds:: @ 81D8A64 .incbin "baserom.gba", 0x1D8A64, 0x1B -gUnknown_81D8A7F:: @ 81D8A7F +BattleScript_DamagingWeatherContinues:: @ 81D8A7F .incbin "baserom.gba", 0x1D8A7F, 0x82 -gUnknown_81D8B01:: @ 81D8B01 +BattleScript_SandStormHailEnds:: @ 81D8B01 .incbin "baserom.gba", 0x1D8B01, 0x9 -gUnknown_81D8B0A:: @ 81D8B0A +BattleScript_SunlightContinues:: @ 81D8B0A .incbin "baserom.gba", 0x1D8B0A, 0xE -gUnknown_81D8B18:: @ 81D8B18 +BattleScript_SunlightFaded:: @ 81D8B18 .incbin "baserom.gba", 0x1D8B18, 0x7 -gUnknown_81D8B1F:: @ 81D8B1F +BattleScript_OverworldWeatherStarts:: @ 81D8B1F .incbin "baserom.gba", 0x1D8B1F, 0x13 -gUnknown_81D8B32:: @ 81D8B32 +BattleScript_SideStatusWoreOff:: @ 81D8B32 .incbin "baserom.gba", 0x1D8B32, 0x11 -gUnknown_81D8B43:: @ 81D8B43 +BattleScript_SafeguardEnds:: @ 81D8B43 .incbin "baserom.gba", 0x1D8B43, 0xA -gUnknown_81D8B4D:: @ 81D8B4D +BattleScript_LeechSeedTurnDrain:: @ 81D8B4D .incbin "baserom.gba", 0x1D8B4D, 0x5C -gUnknown_81D8BA9:: @ 81D8BA9 +BattleScript_BideStoringEnergy:: @ 81D8BA9 .incbin "baserom.gba", 0x1D8BA9, 0xB -gUnknown_81D8BB4:: @ 81D8BB4 +BattleScript_BideAttack:: @ 81D8BB4 .incbin "baserom.gba", 0x1D8BB4, 0x48 -gUnknown_81D8BFC:: @ 81D8BFC +BattleScript_BideNoEnergyToAttack:: @ 81D8BFC .incbin "baserom.gba", 0x1D8BFC, 0x14 -gUnknown_81D8C10:: @ 81D8C10 +BattleScript_SuccessForceOut:: @ 81D8C10 .incbin "baserom.gba", 0x1D8C10, 0x2E -gUnknown_81D8C3E:: @ 81D8C3E +BattleScript_MistProtected:: @ 81D8C3E .incbin "baserom.gba", 0x1D8C3E, 0xA -gUnknown_81D8C48:: @ 81D8C48 +BattleScript_RageIsBuilding:: @ 81D8C48 .incbin "baserom.gba", 0x1D8C48, 0x7 -gUnknown_81D8C4F:: @ 81D8C4F +BattleScript_MoveUsedIsDisabled:: @ 81D8C4F .incbin "baserom.gba", 0x1D8C4F, 0xB -gUnknown_81D8C5A:: @ 81D8C5A +BattleScript_SelectingDisabledMove:: @ 81D8C5A .incbin "baserom.gba", 0x1D8C5A, 0x4 -gUnknown_81D8C5E:: @ 81D8C5E +BattleScript_DisabledNoMore:: @ 81D8C5E .incbin "baserom.gba", 0x1D8C5E, 0x7 -gUnknown_81D8C65:: @ 81D8C65 +BattleScript_EncoredNoMore:: @ 81D8C65 .incbin "baserom.gba", 0x1D8C65, 0x7 -gUnknown_81D8C6C:: @ 81D8C6C +BattleScript_DestinyBondTakesLife:: @ 81D8C6C .incbin "baserom.gba", 0x1D8C6C, 0x1B -gUnknown_81D8C87:: @ 81D8C87 +BattleScript_SpikesOnAttacker:: @ 81D8C87 .incbin "baserom.gba", 0x1D8C87, 0x37 -gUnknown_81D8CBE:: @ 81D8CBE +BattleScript_SpikesOnTarget:: @ 81D8CBE .incbin "baserom.gba", 0x1D8CBE, 0x37 -gUnknown_81D8CF5:: @ 81D8CF5 +BattleScript_SpikesOnFaintedBattler:: @ 81D8CF5 .incbin "baserom.gba", 0x1D8CF5, 0x3E -gUnknown_81D8D33:: @ 81D8D33 +BattleScript_PerishSongTakesLife:: @ 81D8D33 .incbin "baserom.gba", 0x1D8D33, 0x1B -gUnknown_81D8D4E:: @ 81D8D4E +BattleScript_PerishSongCountGoesDown:: @ 81D8D4E .incbin "baserom.gba", 0x1D8D4E, 0x7 -gUnknown_81D8D55:: @ 81D8D55 +BattleScript_AllStatsUp:: @ 81D8D55 .incbin "baserom.gba", 0x1D8D55, 0x9C -gUnknown_81D8DF1:: @ 81D8DF1 +BattleScript_RapidSpinAway:: @ 81D8DF1 .incbin "baserom.gba", 0x1D8DF1, 0x2 -gUnknown_81D8DF3:: @ 81D8DF3 +BattleScript_WrapFree:: @ 81D8DF3 .incbin "baserom.gba", 0x1D8DF3, 0x11 -gUnknown_81D8E04:: @ 81D8E04 +BattleScript_LeechSeedFree:: @ 81D8E04 .incbin "baserom.gba", 0x1D8E04, 0x7 -gUnknown_81D8E0B:: @ 81D8E0B +BattleScript_SpikesFree:: @ 81D8E0B .incbin "baserom.gba", 0x1D8E0B, 0x7 -gUnknown_81D8E12:: @ 81D8E12 +BattleScript_MonTookFutureAttack:: @ 81D8E12 .incbin "baserom.gba", 0x1D8E12, 0x8E -gUnknown_81D8EA0:: @ 81D8EA0 +BattleScript_NoMovesLeft:: @ 81D8EA0 .incbin "baserom.gba", 0x1D8EA0, 0x4 -gUnknown_81D8EA4:: @ 81D8EA4 +BattleScript_SelectingMoveWithNoPP:: @ 81D8EA4 .incbin "baserom.gba", 0x1D8EA4, 0x4 -gUnknown_81D8EA8:: @ 81D8EA8 +BattleScript_NoPPForMove:: @ 81D8EA8 .incbin "baserom.gba", 0x1D8EA8, 0xF -gUnknown_81D8EB7:: @ 81D8EB7 +BattleScript_SelectingTormentedMove:: @ 81D8EB7 .incbin "baserom.gba", 0x1D8EB7, 0xF -gUnknown_81D8EC6:: @ 81D8EC6 +BattleScript_SelectingNotAllowedMoveTaunt:: @ 81D8EC6 .incbin "baserom.gba", 0x1D8EC6, 0x4 -gUnknown_81D8ECA:: @ 81D8ECA +BattleScript_MoveUsedIsTaunted:: @ 81D8ECA .incbin "baserom.gba", 0x1D8ECA, 0xB -gUnknown_81D8ED5:: @ 81D8ED5 +BattleScript_WishComesTrue:: @ 81D8ED5 .incbin "baserom.gba", 0x1D8ED5, 0x37 -gUnknown_81D8F0C:: @ 81D8F0C +BattleScript_IngrainTurnHeal:: @ 81D8F0C .incbin "baserom.gba", 0x1D8F0C, 0x29 -gUnknown_81D8F35:: @ 81D8F35 +BattleScript_AtkDefDown:: @ 81D8F35 .incbin "baserom.gba", 0x1D8F35, 0x51 -gUnknown_81D8F86:: @ 81D8F86 +BattleScript_KnockedOff:: @ 81D8F86 .incbin "baserom.gba", 0x1D8F86, 0xE -gUnknown_81D8F94:: @ 81D8F94 +BattleScript_MoveUsedIsImprisoned:: @ 81D8F94 .incbin "baserom.gba", 0x1D8F94, 0xB -gUnknown_81D8F9F:: @ 81D8F9F +BattleScript_SelectingImprisonedMove:: @ 81D8F9F .incbin "baserom.gba", 0x1D8F9F, 0x4 -gUnknown_81D8FA3:: @ 81D8FA3 +BattleScript_GrudgeTakesPp:: @ 81D8FA3 .incbin "baserom.gba", 0x1D8FA3, 0x7 -gUnknown_81D8FAA:: @ 81D8FAA +BattleScript_MagicCoatBounce:: @ 81D8FAA .incbin "baserom.gba", 0x1D8FAA, 0x18 -gUnknown_81D8FC2:: @ 81D8FC2 +BattleScript_SnatchedMove:: @ 81D8FC2 .incbin "baserom.gba", 0x1D8FC2, 0x1B -gUnknown_81D8FDD:: @ 81D8FDD +BattleScript_EnduredMsg:: @ 81D8FDD .incbin "baserom.gba", 0x1D8FDD, 0x7 -gUnknown_81D8FE4:: @ 81D8FE4 +BattleScript_OneHitKOMsg:: @ 81D8FE4 .incbin "baserom.gba", 0x1D8FE4, 0x7 -gUnknown_81D8FEB:: @ 81D8FEB +BattleScript_SAtkDown2:: @ 81D8FEB .incbin "baserom.gba", 0x1D8FEB, 0x2A gUnknown_81D9015:: @ 81D9015 .incbin "baserom.gba", 0x1D9015, 0x14 -gUnknown_81D9029:: @ 81D9029 +BattleScript_MoveUsedIsAsleep:: @ 81D9029 .incbin "baserom.gba", 0x1D9029, 0xD -gUnknown_81D9036:: @ 81D9036 +BattleScript_MoveUsedWokeUp:: @ 81D9036 .incbin "baserom.gba", 0x1D9036, 0x14 -gUnknown_81D904A:: @ 81D904A +BattleScript_MonWokeUpInUproar:: @ 81D904A .incbin "baserom.gba", 0x1D904A, 0x9 -gUnknown_81D9053:: @ 81D9053 +BattleScript_PoisonTurnDmg:: @ 81D9053 .incbin "baserom.gba", 0x1D9053, 0x22 -gUnknown_81D9075:: @ 81D9075 +BattleScript_BurnTurnDmg:: @ 81D9075 .incbin "baserom.gba", 0x1D9075, 0xB -gUnknown_81D9080:: @ 81D9080 +BattleScript_MoveUsedIsFrozen:: @ 81D9080 .incbin "baserom.gba", 0x1D9080, 0xD -gUnknown_81D908D:: @ 81D908D +BattleScript_MoveUsedUnfroze:: @ 81D908D .incbin "baserom.gba", 0x1D908D, 0xB -gUnknown_81D9098:: @ 81D9098 +BattleScript_DefrostedViaFireMove:: @ 81D9098 .incbin "baserom.gba", 0x1D9098, 0x9 -gUnknown_81D90A1:: @ 81D90A1 +BattleScript_MoveUsedIsParalyzed:: @ 81D90A1 .incbin "baserom.gba", 0x1D90A1, 0x10 -gUnknown_81D90B1:: @ 81D90B1 +BattleScript_MoveUsedFlinched:: @ 81D90B1 .incbin "baserom.gba", 0x1D90B1, 0xB -gUnknown_81D90BC:: @ 81D90BC +BattleScript_PrintUproarOverTurns:: @ 81D90BC .incbin "baserom.gba", 0x1D90BC, 0x9 -gUnknown_81D90C5:: @ 81D90C5 +BattleScript_ThrashConfuses:: @ 81D90C5 .incbin "baserom.gba", 0x1D90C5, 0xE -gUnknown_81D90D3:: @ 81D90D3 +BattleScript_MoveUsedIsConfused:: @ 81D90D3 .incbin "baserom.gba", 0x1D90D3, 0x43 -gUnknown_81D9116:: @ 81D9116 +BattleScript_MoveUsedIsConfusedNoMore:: @ 81D9116 .incbin "baserom.gba", 0x1D9116, 0x7 -gUnknown_81D911D:: @ 81D911D +BattleScript_PrintPayDayMoneyString:: @ 81D911D .incbin "baserom.gba", 0x1D911D, 0x7 -gUnknown_81D9124:: @ 81D9124 +BattleScript_WrapTurnDmg:: @ 81D9124 .incbin "baserom.gba", 0x1D9124, 0x12 -gUnknown_81D9136:: @ 81D9136 +BattleScript_WrapEnds:: @ 81D9136 .incbin "baserom.gba", 0x1D9136, 0x7 -gUnknown_81D913D:: @ 81D913D +BattleScript_MoveUsedIsInLove:: @ 81D913D .incbin "baserom.gba", 0x1D913D, 0xD -gUnknown_81D914A:: @ 81D914A +BattleScript_MoveUsedIsInLoveCantAttack:: @ 81D914A .incbin "baserom.gba", 0x1D914A, 0xB -gUnknown_81D9155:: @ 81D9155 +BattleScript_NightmareTurnDmg:: @ 81D9155 .incbin "baserom.gba", 0x1D9155, 0x11 -gUnknown_81D9166:: @ 81D9166 +BattleScript_CurseTurnDmg:: @ 81D9166 .incbin "baserom.gba", 0x1D9166, 0x11 -gUnknown_81D9177:: @ 81D9177 +BattleScript_TargetPRLZHeal:: @ 81D9177 .incbin "baserom.gba", 0x1D9177, 0x9 gUnknown_81D9180:: @ 81D9180 @@ -313,211 +313,244 @@ gUnknown_81D9192:: @ 81D9192 .incbin "baserom.gba", 0x1D9192, 0xF gUnknown_81D91A1:: @ 81D91A1 - .incbin "baserom.gba", 0x1D91A1, 0x26 + .incbin "baserom.gba", 0x1D91A1, 0x18 -gUnknown_81D91C7:: @ 81D91C7 - .incbin "baserom.gba", 0x1D91C7, 0xAA +BattleScript_MoveEffectSleep:: @ 81D91B9 + .incbin "baserom.gba", 0x1D91B9, 0xE -gUnknown_81D9271:: @ 81D9271 +BattleScript_YawnMakesAsleep:: @ 81D91C7 + .incbin "baserom.gba", 0x1D91C7, 0xE + +BattleScript_MoveEffectPoison:: @ 81D91D5 + .incbin "baserom.gba", 0x1D91D5, 0xF + +BattleScript_MoveEffectBurn:: @ 81D91E4 + .incbin "baserom.gba", 0x1D91E4, 0xF + +BattleScript_MoveEffectFreeze:: @ 81D91F3 + .incbin "baserom.gba", 0x1D91F3, 0xF + +BattleScript_MoveEffectParalysis:: @ 81D9202 + .incbin "baserom.gba", 0x1D9202, 0xF + +BattleScript_MoveEffectUproar:: @ 81D9211 + .incbin "baserom.gba", 0x1D9211, 0x7 + +BattleScript_MoveEffectToxic:: @ 81D9218 + .incbin "baserom.gba", 0x1D9218, 0xD + +BattleScript_MoveEffectPayDay:: @ 81D9225 + .incbin "baserom.gba", 0x1D9225, 0x7 + +BattleScript_MoveEffectWrap:: @ 81D922C + .incbin "baserom.gba", 0x1D922C, 0x9 + +BattleScript_MoveEffectConfusion:: @ 81D9235 + .incbin "baserom.gba", 0x1D9235, 0xE + +BattleScript_MoveEffectRecoil:: @ 81D9243 + .incbin "baserom.gba", 0x1D9243, 0x2E + +BattleScript_ItemSteal:: @ 81D9271 .incbin "baserom.gba", 0x1D9271, 0xE -gUnknown_81D927F:: @ 81D927F +BattleScript_DrizzleActivates:: @ 81D927F .incbin "baserom.gba", 0x1D927F, 0x14 -gUnknown_81D9293:: @ 81D9293 +BattleScript_SpeedBoostActivates:: @ 81D9293 .incbin "baserom.gba", 0x1D9293, 0xE -gUnknown_81D92A1:: @ 81D92A1 +BattleScript_TraceActivates:: @ 81D92A1 .incbin "baserom.gba", 0x1D92A1, 0xA -gUnknown_81D92AB:: @ 81D92AB +BattleScript_RainDishActivates:: @ 81D92AB .incbin "baserom.gba", 0x1D92AB, 0x14 -gUnknown_81D92BF:: @ 81D92BF +BattleScript_SandstreamActivates:: @ 81D92BF .incbin "baserom.gba", 0x1D92BF, 0x14 -gUnknown_81D92D3:: @ 81D92D3 +BattleScript_ShedSkinActivates:: @ 81D92D3 .incbin "baserom.gba", 0x1D92D3, 0x25 -gUnknown_81D92F8:: @ 81D92F8 +BattleScript_CastformChange:: @ 81D92F8 .incbin "baserom.gba", 0x1D92F8, 0xF -gUnknown_81D9307:: @ 81D9307 +BattleScript_IntimidateActivatesEnd3:: @ 81D9307 .incbin "baserom.gba", 0x1D9307, 0x9 -gUnknown_81D9310:: @ 81D9310 +BattleScript_IntimidateActivates:: @ 81D9310 .incbin "baserom.gba", 0x1D9310, 0x69 -gUnknown_81D9379:: @ 81D9379 +BattleScript_DroughtActivates:: @ 81D9379 .incbin "baserom.gba", 0x1D9379, 0x14 -gUnknown_81D938D:: @ 81D938D +BattleScript_TookAttack:: @ 81D938D .incbin "baserom.gba", 0x1D938D, 0x14 -gUnknown_81D93A1:: @ 81D93A1 +BattleScript_SturdyPreventsOHKO:: @ 81D93A1 .incbin "baserom.gba", 0x1D93A1, 0xE -gUnknown_81D93AF:: @ 81D93AF +BattleScript_DampStopsExplosion:: @ 81D93AF .incbin "baserom.gba", 0x1D93AF, 0xE -gUnknown_81D93BD:: @ 81D93BD +BattleScript_MoveHPDrain_PPLoss:: @ 81D93BD .incbin "baserom.gba", 0x1D93BD, 0x1 -gUnknown_81D93BE:: @ 81D93BE +BattleScript_MoveHPDrain:: @ 81D93BE .incbin "baserom.gba", 0x1D93BE, 0x22 -gUnknown_81D93E0:: @ 81D93E0 +BattleScript_MonMadeMoveUseless_PPLoss:: @ 81D93E0 .incbin "baserom.gba", 0x1D93E0, 0x1 -gUnknown_81D93E1:: @ 81D93E1 +BattleScript_MonMadeMoveUseless:: @ 81D93E1 .incbin "baserom.gba", 0x1D93E1, 0x15 -gUnknown_81D93F6:: @ 81D93F6 +BattleScript_FlashFireBoost_PPLoss:: @ 81D93F6 .incbin "baserom.gba", 0x1D93F6, 0x1 -gUnknown_81D93F7:: @ 81D93F7 +BattleScript_FlashFireBoost:: @ 81D93F7 .incbin "baserom.gba", 0x1D93F7, 0x1F -gUnknown_81D9416:: @ 81D9416 +BattleScript_AbilityNoStatLoss:: @ 81D9416 .incbin "baserom.gba", 0x1D9416, 0xA -gUnknown_81D9420:: @ 81D9420 +BattleScript_BRNPrevention:: @ 81D9420 .incbin "baserom.gba", 0x1D9420, 0xC -gUnknown_81D942C:: @ 81D942C +BattleScript_PRLZPrevention:: @ 81D942C .incbin "baserom.gba", 0x1D942C, 0xC -gUnknown_81D9438:: @ 81D9438 +BattleScript_PSNPrevention:: @ 81D9438 .incbin "baserom.gba", 0x1D9438, 0xC -gUnknown_81D9444:: @ 81D9444 +BattleScript_ObliviousPreventsAttraction:: @ 81D9444 .incbin "baserom.gba", 0x1D9444, 0xE -gUnknown_81D9452:: @ 81D9452 +BattleScript_FlinchPrevention:: @ 81D9452 .incbin "baserom.gba", 0x1D9452, 0x1C -gUnknown_81D946E:: @ 81D946E +BattleScript_SoundproofProtected:: @ 81D946E .incbin "baserom.gba", 0x1D946E, 0x10 -gUnknown_81D947E:: @ 81D947E +BattleScript_AbilityNoSpecificStatLoss:: @ 81D947E .incbin "baserom.gba", 0x1D947E, 0x10 -gUnknown_81D948E:: @ 81D948E +BattleScript_StickyHoldActivates:: @ 81D948E .incbin "baserom.gba", 0x1D948E, 0xE -gUnknown_81D949C:: @ 81D949C +BattleScript_ColorChangeActivates:: @ 81D949C .incbin "baserom.gba", 0x1D949C, 0x7 -gUnknown_81D94A3:: @ 81D94A3 +BattleScript_RoughSkinActivates:: @ 81D94A3 .incbin "baserom.gba", 0x1D94A3, 0x1B -gUnknown_81D94BE:: @ 81D94BE +BattleScript_CuteCharmActivates:: @ 81D94BE .incbin "baserom.gba", 0x1D94BE, 0xD -gUnknown_81D94CB:: @ 81D94CB +BattleScript_ApplySecondaryEffect:: @ 81D94CB .incbin "baserom.gba", 0x1D94CB, 0x3 -gUnknown_81D94CE:: @ 81D94CE +BattleScript_SynchronizeActivates:: @ 81D94CE .incbin "baserom.gba", 0x1D94CE, 0x3 -gUnknown_81D94D1:: @ 81D94D1 +BattleScript_AbilityCuredStatus:: @ 81D94D1 .incbin "baserom.gba", 0x1D94D1, 0x9 -gUnknown_81D94DA:: @ 81D94DA +BattleScript_IgnoresWhileAsleep:: @ 81D94DA .incbin "baserom.gba", 0x1D94DA, 0x10 -gUnknown_81D94EA:: @ 81D94EA +BattleScript_IgnoresAndUsesRandomMove:: @ 81D94EA .incbin "baserom.gba", 0x1D94EA, 0x8 -gUnknown_81D94F2:: @ 81D94F2 +BattleScript_MoveUsedLoafingAround:: @ 81D94F2 .incbin "baserom.gba", 0x1D94F2, 0x12 -gUnknown_81D9504:: @ 81D9504 +BattleScript_IgnoresAndFallsAsleep:: @ 81D9504 .incbin "baserom.gba", 0x1D9504, 0x17 -gUnknown_81D951B:: @ 81D951B +BattleScript_IgnoresAndHitsItself:: @ 81D951B .incbin "baserom.gba", 0x1D951B, 0xB -gUnknown_81D9526:: @ 81D9526 +BattleScript_SubstituteFade:: @ 81D9526 .incbin "baserom.gba", 0x1D9526, 0xB -gUnknown_81D9531:: @ 81D9531 +BattleScript_BerryCurePrlzEnd2:: @ 81D9531 .incbin "baserom.gba", 0x1D9531, 0x6 -gUnknown_81D9537:: @ 81D9537 +BattleScript_BerryCureParRet:: @ 81D9537 .incbin "baserom.gba", 0x1D9537, 0x12 -gUnknown_81D9549:: @ 81D9549 +BattleScript_BerryCurePsnEnd2:: @ 81D9549 .incbin "baserom.gba", 0x1D9549, 0x6 -gUnknown_81D954F:: @ 81D954F +BattleScript_BerryCurePsnRet:: @ 81D954F .incbin "baserom.gba", 0x1D954F, 0x12 -gUnknown_81D9561:: @ 81D9561 +BattleScript_BerryCureBrnEnd2:: @ 81D9561 .incbin "baserom.gba", 0x1D9561, 0x6 -gUnknown_81D9567:: @ 81D9567 +BattleScript_BerryCureBrnRet:: @ 81D9567 .incbin "baserom.gba", 0x1D9567, 0x12 -gUnknown_81D9579:: @ 81D9579 +BattleScript_BerryCureFrzEnd2:: @ 81D9579 .incbin "baserom.gba", 0x1D9579, 0x6 -gUnknown_81D957F:: @ 81D957F +BattleScript_BerryCureFrzRet:: @ 81D957F .incbin "baserom.gba", 0x1D957F, 0x12 -gUnknown_81D9591:: @ 81D9591 +BattleScript_BerryCureSlpEnd2:: @ 81D9591 .incbin "baserom.gba", 0x1D9591, 0x6 -gUnknown_81D9597:: @ 81D9597 +BattleScript_BerryCureSlpRet:: @ 81D9597 .incbin "baserom.gba", 0x1D9597, 0x12 -gUnknown_81D95A9:: @ 81D95A9 +BattleScript_BerryCureConfusionEnd2:: @ 81D95A9 .incbin "baserom.gba", 0x1D95A9, 0x6 -gUnknown_81D95AF:: @ 81D95AF +BattleScript_BerryCureConfusionRet:: @ 81D95AF .incbin "baserom.gba", 0x1D95AF, 0x10 -gUnknown_81D95BF:: @ 81D95BF +BattleScript_BerryCureChosenStatusEnd2:: @ 81D95BF .incbin "baserom.gba", 0x1D95BF, 0x6 -gUnknown_81D95C5:: @ 81D95C5 +BattleScript_BerryCureChosenStatusRet:: @ 81D95C5 .incbin "baserom.gba", 0x1D95C5, 0x14 -gUnknown_81D95D9:: @ 81D95D9 +BattleScript_WhiteHerbEnd2:: @ 81D95D9 .incbin "baserom.gba", 0x1D95D9, 0x6 -gUnknown_81D95DF:: @ 81D95DF +BattleScript_WhiteHerbRet:: @ 81D95DF .incbin "baserom.gba", 0x1D95DF, 0x10 -gUnknown_81D95EF:: @ 81D95EF +BattleScript_ItemHealHP_RemoveItem:: @ 81D95EF .incbin "baserom.gba", 0x1D95EF, 0x1D -gUnknown_81D960C:: @ 81D960C +BattleScript_BerryPPHealEnd2:: @ 81D960C .incbin "baserom.gba", 0x1D960C, 0x10 -gUnknown_81D961C:: @ 81D961C +BattleScript_ItemHealHP_End2:: @ 81D961C .incbin "baserom.gba", 0x1D961C, 0x6 -gUnknown_81D9622:: @ 81D9622 +BattleScript_ItemHealHP_Ret:: @ 81D9622 .incbin "baserom.gba", 0x1D9622, 0x1B -gUnknown_81D963D:: @ 81D963D +BattleScript_SelectingNotAllowedMoveChoiceItem:: @ 81D963D .incbin "baserom.gba", 0x1D963D, 0x4 -gUnknown_81D9641:: @ 81D9641 +BattleScript_HangedOnMsg:: @ 81D9641 .incbin "baserom.gba", 0x1D9641, 0xE -gUnknown_81D964F:: @ 81D964F +BattleScript_BerryConfuseHealEnd2:: @ 81D964F .incbin "baserom.gba", 0x1D964F, 0x2A -gUnknown_81D9679:: @ 81D9679 +BattleScript_BerryStatRaiseEnd2:: @ 81D9679 .incbin "baserom.gba", 0x1D9679, 0x1B -gUnknown_81D9694:: @ 81D9694 +BattleScript_BerryFocusEnergyEnd2:: @ 81D9694 .incbin "baserom.gba", 0x1D9694, 0x10 gUnknown_81D96A4:: @ 81D96A4 .incbin "baserom.gba", 0x1D96A4, 0x4 -gUnknown_81D96A8:: @ 81D96A8 +BattleScript_FlushMessageBox:: @ 81D96A8 .incbin "baserom.gba", 0x1D96A8, 0x4 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index d9cd0829c..c3747cd8d 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -12,17 +12,17 @@ gUnknown_81D99FC:: @ 81D99FC gUnknown_81D9A04:: @ 81D9A04 .incbin "baserom.gba", 0x1D9A04, 0x3E -gUnknown_81D9A42:: @ 81D9A42 +BattleScript_SuccessBallThrow:: @ 81D9A42 .incbin "baserom.gba", 0x1D9A42, 0x46 gUnknown_81D9A88:: @ 81D9A88 .incbin "baserom.gba", 0x1D9A88, 0xB -gUnknown_81D9A93:: @ 81D9A93 +BattleScript_ShakeBallThrow:: @ 81D9A93 .incbin "baserom.gba", 0x1D9A93, 0x2E -gUnknown_81D9AC1:: @ 81D9AC1 +BattleScript_TrainerBallBlock:: @ 81D9AC1 .incbin "baserom.gba", 0x1D9AC1, 0x10 -gUnknown_81D9AD1:: @ 81D9AD1 +BattleScript_GhostBallDodge:: @ 81D9AD1 .incbin "baserom.gba", 0x1D9AD1, 0x123 diff --git a/data/berry_pouch.s b/data/berry_pouch.s deleted file mode 100644 index 172443b5e..000000000 --- a/data/berry_pouch.s +++ /dev/null @@ -1,59 +0,0 @@ - .section .rodata - .align 2 - -gUnknown_846434C:: @ 846434C - .incbin "baserom.gba", 0x46434C, 0xC - -gUnknown_8464358:: @ 8464358 - .incbin "baserom.gba", 0x464358, 0x14 - -gUnknown_846436C:: @ 846436C - .incbin "baserom.gba", 0x46436C, 0x8 - -gUnknown_8464374:: @ 8464374 - .incbin "baserom.gba", 0x464374, 0x8 - -gUnknown_846437C:: @ 846437C - .incbin "baserom.gba", 0x46437C, 0x28 - -gUnknown_84643A4:: @ 84643A4 - .incbin "baserom.gba", 0x4643A4, 0x4 - -gUnknown_84643A8:: @ 84643A8 - .incbin "baserom.gba", 0x4643A8, 0x4 - -gUnknown_84643AC:: @ 84643AC - .incbin "baserom.gba", 0x4643AC, 0x4 - -gUnknown_84643B0:: @ 84643B0 - .incbin "baserom.gba", 0x4643B0, 0x4 - -gUnknown_84643B4:: @ 84643B4 - .incbin "baserom.gba", 0x4643B4, 0x4 - -gUnknown_84643B8:: @ 84643B8 - .incbin "baserom.gba", 0x4643B8, 0x20 - -gUnknown_84643D8:: @ 84643D8 - .incbin "baserom.gba", 0x4643D8, 0x18 - -gUnknown_84643F0:: @ 84643F0 - .incbin "baserom.gba", 0x4643F0, 0x8 - -gUnknown_84643F8:: @ 84643F8 - .incbin "baserom.gba", 0x4643F8, 0x8 - -gUnknown_8464400:: @ 8464400 - .incbin "baserom.gba", 0x464400, 0x48 - -gUnknown_8464448:: @ 8464448 - .incbin "baserom.gba", 0x464448, 0x60 - -gUnknown_84644A8:: @ 84644A8 - .incbin "baserom.gba", 0x4644A8, 0x8 - -gUnknown_84644B0:: @ 84644B0 - .incbin "baserom.gba", 0x4644B0, 0x8 - -gUnknown_84644B8:: @ 84644B8 - .incbin "baserom.gba", 0x4644B8, 0x32C diff --git a/data/credits/unk_840C630.pal b/data/credits/unk_840C630.pal new file mode 100644 index 000000000..01f113381 --- /dev/null +++ b/data/credits/unk_840C630.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/data/credits/unk_840C650.png b/data/credits/unk_840C650.png Binary files differnew file mode 100644 index 000000000..9afadd699 --- /dev/null +++ b/data/credits/unk_840C650.png diff --git a/data/credits/unk_840CA54.bin b/data/credits/unk_840CA54.bin Binary files differnew file mode 100644 index 000000000..a127ba9ca --- /dev/null +++ b/data/credits/unk_840CA54.bin diff --git a/data/credits/unk_840CB8C.bin b/data/credits/unk_840CB8C.bin Binary files differnew file mode 100644 index 000000000..3dd1c74a0 --- /dev/null +++ b/data/credits/unk_840CB8C.bin diff --git a/data/credits/unk_840D228.bin b/data/credits/unk_840D228.bin Binary files differnew file mode 100644 index 000000000..f6c336c01 --- /dev/null +++ b/data/credits/unk_840D228.bin diff --git a/data/credits/unk_840DC0C.bin b/data/credits/unk_840DC0C.bin Binary files differnew file mode 100644 index 000000000..a52ea8056 --- /dev/null +++ b/data/credits/unk_840DC0C.bin diff --git a/data/credits/unk_840E158.bin b/data/credits/unk_840E158.bin Binary files differnew file mode 100644 index 000000000..2d9128634 --- /dev/null +++ b/data/credits/unk_840E158.bin diff --git a/data/credits/unk_840E904.bin b/data/credits/unk_840E904.bin Binary files differnew file mode 100644 index 000000000..4887c1e7e --- /dev/null +++ b/data/credits/unk_840E904.bin diff --git a/data/credits/unk_840F240.bin b/data/credits/unk_840F240.bin Binary files differnew file mode 100644 index 000000000..285a468b6 --- /dev/null +++ b/data/credits/unk_840F240.bin diff --git a/data/credits/unk_840F944.bin b/data/credits/unk_840F944.bin Binary files differnew file mode 100644 index 000000000..ba2cdab77 --- /dev/null +++ b/data/credits/unk_840F944.bin diff --git a/data/credits/unk_8410198.bin b/data/credits/unk_8410198.bin Binary files differnew file mode 100644 index 000000000..f7b3a02a5 --- /dev/null +++ b/data/credits/unk_8410198.bin diff --git a/data/credits/unk_84105B4.bin b/data/credits/unk_84105B4.bin Binary files differnew file mode 100644 index 000000000..d173e611e --- /dev/null +++ b/data/credits/unk_84105B4.bin diff --git a/data/credits/unk_8410B20.bin b/data/credits/unk_8410B20.bin Binary files differnew file mode 100644 index 000000000..eea1940ee --- /dev/null +++ b/data/credits/unk_8410B20.bin diff --git a/data/credits/unk_8410B20.png b/data/credits/unk_8410B20.png Binary files differnew file mode 100644 index 000000000..19ce2f796 --- /dev/null +++ b/data/credits/unk_8410B20.png diff --git a/data/credits/unk_8410E10.pal b/data/credits/unk_8410E10.pal new file mode 100644 index 000000000..5667181bd --- /dev/null +++ b/data/credits/unk_8410E10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 57 123 +172 123 65 +255 197 148 +222 148 115 +123 65 65 +82 106 156 +57 57 123 +115 164 197 +123 123 131 +238 238 255 +180 180 213 +255 106 74 +197 57 57 +255 222 90 +213 180 74 +0 0 0 diff --git a/data/credits/unk_8410E30.png b/data/credits/unk_8410E30.png Binary files differnew file mode 100644 index 000000000..ec065cdb6 --- /dev/null +++ b/data/credits/unk_8410E30.png diff --git a/data/credits/unk_8411BF8.pal b/data/credits/unk_8411BF8.pal new file mode 100644 index 000000000..5667181bd --- /dev/null +++ b/data/credits/unk_8411BF8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +57 57 123 +172 123 65 +255 197 148 +222 148 115 +123 65 65 +82 106 156 +57 57 123 +115 164 197 +123 123 131 +238 238 255 +180 180 213 +255 106 74 +197 57 57 +255 222 90 +213 180 74 +0 0 0 diff --git a/data/credits/unk_8411C18.png b/data/credits/unk_8411C18.png Binary files differnew file mode 100644 index 000000000..341594160 --- /dev/null +++ b/data/credits/unk_8411C18.png diff --git a/data/credits/unk_84129A0.pal b/data/credits/unk_84129A0.pal new file mode 100644 index 000000000..ac601cddf --- /dev/null +++ b/data/credits/unk_84129A0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +49 49 49 +255 222 205 +238 180 148 +197 139 106 +106 74 74 +222 164 74 +197 123 8 +49 65 82 +205 139 255 +115 82 131 +156 106 172 +106 123 131 +197 205 180 +238 74 24 +255 255 255 +0 0 0 diff --git a/data/credits/unk_84129C0.png b/data/credits/unk_84129C0.png Binary files differnew file mode 100644 index 000000000..ea9c61c88 --- /dev/null +++ b/data/credits/unk_84129C0.png diff --git a/data/credits/unk_8413318.pal b/data/credits/unk_8413318.pal new file mode 100644 index 000000000..284b70b77 --- /dev/null +++ b/data/credits/unk_8413318.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 197 0 +74 139 0 +32 115 0 +0 82 0 +106 172 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/credits/unk_8413338.png b/data/credits/unk_8413338.png Binary files differnew file mode 100644 index 000000000..7fa79c06a --- /dev/null +++ b/data/credits/unk_8413338.png diff --git a/data/credits/unk_8413854.pal b/data/credits/unk_8413854.pal new file mode 100644 index 000000000..46d4f48dd --- /dev/null +++ b/data/credits/unk_8413854.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 180 98 +172 164 74 +156 148 49 +123 115 24 +222 213 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 0 255 diff --git a/data/credits/unk_8413874.png b/data/credits/unk_8413874.png Binary files differnew file mode 100644 index 000000000..18e34725f --- /dev/null +++ b/data/credits/unk_8413874.png diff --git a/data/credits/unk_8413D98.pal b/data/credits/unk_8413D98.pal new file mode 100644 index 000000000..a3476d0d4 --- /dev/null +++ b/data/credits/unk_8413D98.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 197 0 +74 139 0 +32 115 0 +0 82 0 +106 172 0 +189 180 98 +172 164 74 +156 148 49 +123 115 24 +222 213 131 +222 222 222 +205 205 205 +189 189 189 +238 238 238 +131 131 131 diff --git a/data/credits/unk_8413DB8.png b/data/credits/unk_8413DB8.png Binary files differnew file mode 100644 index 000000000..5b10bd699 --- /dev/null +++ b/data/credits/unk_8413DB8.png diff --git a/data/data.s b/data/data.s index 0322670c0..d0bd198e1 100644 --- a/data/data.s +++ b/data/data.s @@ -6,43 +6,14 @@ .section .rodata - .align 2 -gUnknown_8231EC4:: @ 8231EC4 - .incbin "baserom.gba", 0x231EC4, 0x20 - - .align 2 -gWirelessLinkDisplay4bpp:: @ 8231EE4 - .incbin "graphics/interface/wireless_link_display.4bpp.lz" - - .align 2 -gWirelessLinkDisplayBin:: @ 823238C - .incbin "graphics/interface/wireless_link_display.bin.lz" - - .align 2 -gUnknown_8232578:: @ 8232578 - .incbin "baserom.gba", 0x232578, 0x20 - -gUnknown_8232598:: @ 8232598 - .incbin "baserom.gba", 0x232598, 0x2000 - -gUnknown_8234598:: @ 8234598 - .incbin "baserom.gba", 0x234598, 0x28 - -gUnknown_82345C0:: @ 82345C0 - .incbin "baserom.gba", 0x2345C0, 0x10 - -gUnknown_82345D0:: @ 82345D0 - .incbin "baserom.gba", 0x2345D0, 0x18 - -gUnknown_82345E8:: @ 82345E8 - .incbin "baserom.gba", 0x2345E8, 0x8 - -gUnknown_82345F0:: @ 82345F0 - .incbin "baserom.gba", 0x2345F0, 0x20 + .align 2, 0 +gUnknown_8234614:: + .string "$" -gUnknown_8234610:: @ 8234610 - .incbin "baserom.gba", 0x234610, 0x8 +gUnknown_8234615:: + .string "\n$" + .align 2, 0 gUnknown_8234618:: @ 8234618 .incbin "baserom.gba", 0x234618, 0x8 @@ -145,7 +116,7 @@ gMonShinyPaletteTable:: @ 82380CC gTrainerFrontAnimsPtrTable:: @ 82390DC .incbin "baserom.gba", 0x2390DC, 0x250 -gUnknown_823932C:: @ 823932C +gTrainerFrontPicCoords:: @ 823932C .incbin "baserom.gba", 0x23932C, 0x250 gTrainerFrontPicTable:: @ 823957C @@ -157,16 +128,16 @@ gTrainerFrontPicPaletteTable:: @ 8239A1C gTrainerBackAnimsPtrTable:: @ 8239F74 .incbin "baserom.gba", 0x239F74, 0x18 -gUnknown_8239F8C:: @ 8239F8C +gTrainerBackPicCoords:: @ 8239F8C .incbin "baserom.gba", 0x239F8C, 0x18 gTrainerBackPicTable:: @ 8239FA4 .incbin "baserom.gba", 0x239FA4, 0x30 -gUnknown_8239FD4:: @ 8239FD4 +gTrainerBackPicPaletteTable:: @ 8239FD4 .incbin "baserom.gba", 0x239FD4, 0x30 -gUnknown_823A004:: @ 823A004 +gEnemyMonElevation:: @ 823A004 .incbin "baserom.gba", 0x23A004, 0x4554 gTrainerClassNames:: @ 823E558 @@ -233,13 +204,13 @@ gUnknown_824F020:: @ 824F020 gUnknown_824F048:: @ 824F048 .incbin "baserom.gba", 0x24F048, 0x8 -gUnknown_824F050:: @ 824F050 +gTypeEffectiveness:: @ 824F050 .incbin "baserom.gba", 0x24F050, 0x150 -gUnknown_824F1A0:: @ 824F1A0 +gTypeNames:: @ 824F1A0 .incbin "baserom.gba", 0x24F1A0, 0x80 -gUnknown_824F220:: @ 824F220 +gTrainerMoneyTable:: @ 824F220 .incbin "baserom.gba", 0x24F220, 0x8E8 gUnknown_824FB08:: @ 824FB08 @@ -254,137 +225,34 @@ gUnknown_8250038:: @ 8250038 gUnknown_8250070:: @ 8250070 .incbin "baserom.gba", 0x250070, 0x24 -gUnknown_8250094:: @ 8250094 +gStatusConditionString_PoisonJpn:: @ 8250094 .incbin "baserom.gba", 0x250094, 0x8 -gUnknown_825009C:: @ 825009C +gStatusConditionString_SleepJpn:: @ 825009C .incbin "baserom.gba", 0x25009C, 0x8 -gUnknown_82500A4:: @ 82500A4 +gStatusConditionString_ParalysisJpn:: @ 82500A4 .incbin "baserom.gba", 0x2500A4, 0x8 -gUnknown_82500AC:: @ 82500AC +gStatusConditionString_BurnJpn:: @ 82500AC .incbin "baserom.gba", 0x2500AC, 0x8 -gUnknown_82500B4:: @ 82500B4 +gStatusConditionString_IceJpn:: @ 82500B4 .incbin "baserom.gba", 0x2500B4, 0x8 -gUnknown_82500BC:: @ 82500BC +gStatusConditionString_ConfusionJpn:: @ 82500BC .incbin "baserom.gba", 0x2500BC, 0x8 -gUnknown_82500C4:: @ 82500C4 +gStatusConditionString_LoveJpn:: @ 82500C4 .incbin "baserom.gba", 0x2500C4, 0x8 gUnknown_82500CC:: @ 82500CC .incbin "baserom.gba", 0x2500CC, 0x38 -gUnknown_8250104:: @ 8250104 - .incbin "baserom.gba", 0x250104, 0x18 - -gUnknown_825011C:: @ 825011C - .incbin "baserom.gba", 0x25011C, 0x3E0 - -gUnknown_82504FC:: @ 82504FC - .incbin "baserom.gba", 0x2504FC, 0x34 - -gUnknown_8250530:: @ 8250530 - .incbin "baserom.gba", 0x250530, 0xC - -gUnknown_825053C:: @ 825053C - .incbin "baserom.gba", 0x25053C, 0xF0 - -gUnknown_825062C:: @ 825062C - .incbin "baserom.gba", 0x25062C, 0xA4 - -gUnknown_82506D0:: @ 82506D0 - .incbin "baserom.gba", 0x2506D0, 0x20 - -gUnknown_82506F0:: @ 82506F0 - .incbin "baserom.gba", 0x2506F0, 0xD8 - -gUnknown_82507C8:: @ 82507C8 - .incbin "baserom.gba", 0x2507C8, 0x18 - -gUnknown_82507E0:: @ 82507E0 - .incbin "baserom.gba", 0x2507E0, 0x8 - -gUnknown_82507E8:: @ 82507E8 - .incbin "baserom.gba", 0x2507E8, 0x28 - -gUnknown_8250810:: @ 8250810 - .incbin "baserom.gba", 0x250810, 0xC - -gUnknown_825081C:: @ 825081C - .incbin "baserom.gba", 0x25081C, 0x14 - -gUnknown_8250830:: @ 8250830 - .incbin "baserom.gba", 0x250830, 0x18 - -gUnknown_8250848:: @ 8250848 - .incbin "baserom.gba", 0x250848, 0x40 - -gUnknown_8250888:: @ 8250888 - .incbin "baserom.gba", 0x250888, 0xA - -gUnknown_8250892:: @ 8250892 - .incbin "baserom.gba", 0x250892, 0xA - -gUnknown_825089C:: @ 825089C - .incbin "baserom.gba", 0x25089C, 0xE4 - -gUnknown_8250980:: @ 8250980 - .incbin "baserom.gba", 0x250980, 0xC - -gUnknown_825098C:: @ 825098C - .incbin "baserom.gba", 0x25098C, 0x8 - -gUnknown_8250994:: @ 8250994 - .incbin "baserom.gba", 0x250994, 0x60 - -gUnknown_82509F4:: @ 82509F4 - .incbin "baserom.gba", 0x2509F4, 0x18 - -gUnknown_8250A0C:: @ 8250A0C - .incbin "baserom.gba", 0x250A0C, 0x10 - -gUnknown_8250A1C:: @ 8250A1C - .incbin "baserom.gba", 0x250A1C, 0x18 - -gUnknown_8250A34:: @ 8250A34 - .incbin "baserom.gba", 0x250A34, 0xEC - -gUnknown_8250B20:: @ 8250B20 - .incbin "baserom.gba", 0x250B20, 0xE4 - - .section .rodata.825EF0C - - .align 2 -gUnknown_8260208:: @ 8260208 - .incbin "baserom.gba", 0x260208, 0x8 - -gUnknown_8260210:: @ 8260210 - .incbin "baserom.gba", 0x260210, 0x8 - -gUnknown_8260218:: @ 8260218 - .incbin "baserom.gba", 0x260218, 0x8 - -gUnknown_8260220:: @ 8260220 - .incbin "baserom.gba", 0x260220, 0x8 - -gUnknown_8260228:: @ 8260228 - .incbin "baserom.gba", 0x260228, 0x8 - -gUnknown_8260230:: @ 8260230 - .incbin "baserom.gba", 0x260230, 0x8 - -gUnknown_8260238:: @ 8260238 - .incbin "baserom.gba", 0x260238, 0x8 - -gUnknown_8260240:: @ 8260240 - .incbin "baserom.gba", 0x260240, 0x20 + .section .rodata.8260270 -gUnknown_8260260:: @ 8260260 - .incbin "baserom.gba", 0x260260, 0x18 +gUnknown_8260270:: @ 8260270 + .incbin "baserom.gba", 0x260270, 0x8 gUnknown_8260278:: @ 8260278 .incbin "baserom.gba", 0x260278, 0x30 diff --git a/data/data_835B488.s b/data/data_835B488.s index c106c46c4..742224d2b 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -55,7 +55,7 @@ gUnknown_83C7294:: @ 83C7294 gUnknown_83C7388:: @ 83C7388 .incbin "baserom.gba", 0x3C7388, 0x2930 -gUnknown_83C9CB8:: @ 83C9CB8 +gWildMonHeaders:: @ 83C9CB8 .incbin "baserom.gba", 0x3C9CB8, 0xA64 gUnknown_83CA71C:: @ 83CA71C diff --git a/data/data_83F5738.s b/data/data_83F5738.s index dc09b0532..1dd697956 100644 --- a/data/data_83F5738.s +++ b/data/data_83F5738.s @@ -133,10 +133,10 @@ gUnknown_83F846D:: @ 83F846D gUnknown_83F847D:: @ 83F847D .incbin "baserom.gba", 0x3F847D, 0x323 - .section .rodata.83FB134 + .section .rodata.83FB218 -gUnknown_83FB134:: @ 83FB134 - .incbin "baserom.gba", 0x3FB134, 0xA80 +gUnknown_83FB218:: @ 83FB218 + .incbin "baserom.gba", 0x3FB218, 0x99C BattleText_MistShroud:: @ 83FBBB4 .incbin "baserom.gba", 0x3FBBB4, 0x35 @@ -369,10 +369,10 @@ gUnknown_83FDDEB:: @ 83FDDEB gUnknown_83FDF3C:: @ 83FDF3C .incbin "baserom.gba", 0x3FDF3C, 0x5D8 -gUnknown_83FE514:: @ 83FE514 +gMissStringIds:: @ 83FE514 .incbin "baserom.gba", 0x3FE514, 0x150 -gUnknown_83FE664:: @ 83FE664 +gTrappingMoves:: @ 83FE664 .incbin "baserom.gba", 0x3FE664, 0xE gUnknown_83FE672:: @ 83FE672 @@ -387,7 +387,7 @@ gUnknown_83FE6B5:: @ 83FE6B5 gUnknown_83FE6D0:: @ 83FE6D0 .incbin "baserom.gba", 0x3FE6D0, 0x5 -gUnknown_83FE6D5:: @ 83FE6D5 +gText_WhatWillPkmnDo:: @ 83FE6D5 .incbin "baserom.gba", 0x3FE6D5, 0x11 gUnknown_83FE6E6:: @ 83FE6E6 @@ -396,7 +396,7 @@ gUnknown_83FE6E6:: @ 83FE6E6 gUnknown_83FE6FA:: @ 83FE6FA .incbin "baserom.gba", 0x3FE6FA, 0x1A -gUnknown_83FE714:: @ 83FE714 +gText_LinkStandby:: @ 83FE714 .incbin "baserom.gba", 0x3FE714, 0x11 gUnknown_83FE725:: @ 83FE725 @@ -405,19 +405,19 @@ gUnknown_83FE725:: @ 83FE725 gUnknown_83FE747:: @ 83FE747 .incbin "baserom.gba", 0x3FE747, 0x1F -gUnknown_83FE766:: @ 83FE766 +gText_MoveInterfacePP:: @ 83FE766 .incbin "baserom.gba", 0x3FE766, 0x4 -gUnknown_83FE76A:: @ 83FE76A +gText_MoveInterfaceType:: @ 83FE76A .incbin "baserom.gba", 0x3FE76A, 0x6 gUnknown_83FE770:: @ 83FE770 .incbin "baserom.gba", 0x3FE770, 0x21 -gUnknown_83FE791:: @ 83FE791 +gText_BattleYesNoChoice:: @ 83FE791 .incbin "baserom.gba", 0x3FE791, 0xF -gUnknown_83FE7A0:: @ 83FE7A0 +gText_BattleSwitchWhich:: @ 83FE7A0 .incbin "baserom.gba", 0x3FE7A0, 0x6C gUnknown_83FE80C:: @ 83FE80C diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 2107a7c0f..0944bf82a 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -26,8 +26,10 @@ gUnknown_83FECF4:: @ 83FECF4 gUnknown_83FECFA:: @ 83FECFA .incbin "baserom.gba", 0x3FECFA, 0x6 -gUnknown_83FED00:: @ 83FED00 - .incbin "baserom.gba", 0x3FED00, 0x380 + .section .rodata.83FEDE4 + +gUnknown_83FEDE4:: @ 83FEDE4 + .incbin "baserom.gba", 0x3FEDE4, 0x29C gUnknown_83FF080:: @ 83FF080 .incbin "baserom.gba", 0x3FF080, 0xB0 @@ -230,125 +232,6 @@ gUnknown_840C39C:: @ 840C39C gUnknown_840C3BC:: @ 840C3BC .incbin "baserom.gba", 0x40C3BC, 0x1E8 -gUnknown_840C5A4:: @ 840C5A4 - .incbin "baserom.gba", 0x40C5A4, 0xC - -gUnknown_840C5B0:: @ 840C5B0 - .incbin "baserom.gba", 0x40C5B0, 0x20 - -gUnknown_840C5D0:: @ 840C5D0 - .incbin "baserom.gba", 0x40C5D0, 0x20 - -gUnknown_840C5F0:: @ 840C5F0 - .incbin "baserom.gba", 0x40C5F0, 0x20 - -gUnknown_840C610:: @ 840C610 - .incbin "baserom.gba", 0x40C610, 0x20 - -gUnknown_840C630:: @ 840C630 - .incbin "baserom.gba", 0x40C630, 0x20 - -gUnknown_840C650:: @ 840C650 - .incbin "baserom.gba", 0x40C650, 0x404 - -gUnknown_840CA54:: @ 840CA54 - .incbin "baserom.gba", 0x40CA54, 0x138 - -gUnknown_840CB8C:: @ 840CB8C - .incbin "baserom.gba", 0x40CB8C, 0x69C - -gUnknown_840D228:: @ 840D228 - .incbin "baserom.gba", 0x40D228, 0xF30 - -gUnknown_840E158:: @ 840E158 - .incbin "baserom.gba", 0x40E158, 0x7AC - -gUnknown_840E904:: @ 840E904 - .incbin "baserom.gba", 0x40E904, 0x93C - -gUnknown_840F240:: @ 840F240 - .incbin "baserom.gba", 0x40F240, 0x704 - -gUnknown_840F944:: @ 840F944 - .incbin "baserom.gba", 0x40F944, 0x854 - -gUnknown_8410198:: @ 8410198 - .incbin "baserom.gba", 0x410198, 0x41C - -gUnknown_84105B4:: @ 84105B4 - .incbin "baserom.gba", 0x4105B4, 0x728 - -gUnknown_8410CDC:: @ 8410CDC - .incbin "baserom.gba", 0x410CDC, 0x18 - -gUnknown_8410CF4:: @ 8410CF4 - .incbin "baserom.gba", 0x410CF4, 0x10C - -gUnknown_8410E00:: @ 8410E00 - .incbin "baserom.gba", 0x410E00, 0x4 - -gUnknown_8410E04:: @ 8410E04 - .incbin "baserom.gba", 0x410E04, 0x4 - -gUnknown_8410E08:: @ 8410E08 - .incbin "baserom.gba", 0x410E08, 0x8 - -gUnknown_8410E10:: @ 8410E10 - .incbin "baserom.gba", 0x410E10, 0x20 - -gUnknown_8410E30:: @ 8410E30 - .incbin "baserom.gba", 0x410E30, 0xDC8 - -gUnknown_8411BF8:: @ 8411BF8 - .incbin "baserom.gba", 0x411BF8, 0x20 - -gUnknown_8411C18:: @ 8411C18 - .incbin "baserom.gba", 0x411C18, 0xD88 - -gUnknown_84129A0:: @ 84129A0 - .incbin "baserom.gba", 0x4129A0, 0x20 - -gUnknown_84129C0:: @ 84129C0 - .incbin "baserom.gba", 0x4129C0, 0x958 - -gUnknown_8413318:: @ 8413318 - .incbin "baserom.gba", 0x413318, 0x20 - -gUnknown_8413338:: @ 8413338 - .incbin "baserom.gba", 0x413338, 0x51C - -gUnknown_8413854:: @ 8413854 - .incbin "baserom.gba", 0x413854, 0x20 - -gUnknown_8413874:: @ 8413874 - .incbin "baserom.gba", 0x413874, 0x524 - -gUnknown_8413D98:: @ 8413D98 - .incbin "baserom.gba", 0x413D98, 0x20 - -gUnknown_8413DB8:: @ 8413DB8 - .incbin "baserom.gba", 0x413DB8, 0x564 - -gUnknown_841431C:: @ 841431C - .incbin "baserom.gba", 0x41431C, 0x48 - -gUnknown_8414364:: @ 8414364 - .incbin "baserom.gba", 0x414364, 0x54 - -gUnknown_84143B8:: @ 84143B8 - .incbin "baserom.gba", 0x4143B8, 0x18 - -gUnknown_84143D0:: @ 84143D0 - .incbin "baserom.gba", 0x4143D0, 0x1B8 - -gUnknown_8414588:: @ 8414588 - .incbin "baserom.gba", 0x414588, 0x34 - -gUnknown_84145BC:: @ 84145BC - .incbin "baserom.gba", 0x4145BC, 0x204 - - @ strings - .section .rodata.841EE44 .align 2 gUnknown_841EE44:: @ 841EE44 @@ -787,20 +670,17 @@ gUnknown_8452F6C:: @ 8452F6C gUnknown_8452F7C:: @ 8452F7C .incbin "baserom.gba", 0x452F7C, 0xC0 - .section .rodata.8453F6C -// mailbox_pc.o -gUnknown_8453FE8:: @ 8453FE8 - .incbin "baserom.gba", 0x453FE8, 0x18 - -gUnknown_8454000:: @ 8454000 - .incbin "baserom.gba", 0x454000, 0x3 - -gUnknown_8454003:: @ 8454003 - .incbin "baserom.gba", 0x454003, 0x2615 - + @ save_location.o + @ bag.o + @ trainer_pokemon_sprites.o + @ vs_seeker.o + @ item_pc.o + @ mailbox_pc.o + @ decorations.o @ menu.o @ quest_log.o @ link_rfu_3.o + .section .rodata.8456C74 gUnknown_8456C74:: @ 8456C74 .incbin "baserom.gba", 0x456C74, 0x5C diff --git a/data/decoration_tiles.inc b/data/decoration_tiles.inc new file mode 100644 index 000000000..2a53f2d8e --- /dev/null +++ b/data/decoration_tiles.inc @@ -0,0 +1,359 @@ +gUnknown_8454004:: @ 8454004 + .2byte 0x087 + +gUnknown_8454006:: @ 8454006 + .2byte 0x08F + +gUnknown_8454008:: @ 8454008 + .2byte 0x090, 0x091, 0x092, 0x098, 0x099, 0x09A + +gUnknown_8454014:: @ 8454014 + .2byte 0x093, 0x094, 0x095, 0x09B, 0x09C, 0x09D + +gUnknown_8454020:: @ 8454020 + .2byte 0x096, 0x097, 0x0A3, 0x09E, 0x09F, 0x0AB + +gUnknown_845402C:: @ 845402C + .2byte 0x0BD, 0x0BE, 0x0BF, 0x0C5, 0x0C6, 0x0C7, 0x0CD, 0x0CE, 0x0CF + +gUnknown_845403E:: @ 845403E + .2byte 0x0A0, 0x0A1, 0x0A2, 0x0A8, 0x0A9, 0x0AA, 0x0B0, 0x0B1, 0x0B2 + +gUnknown_8454050:: @ 8454050 + .2byte 0x0A4, 0x0A5, 0x0A6, 0x0AC, 0x0AD, 0x0AE, 0x0B4, 0x0B5, 0x0B6 + +gUnknown_8454062:: @ 8454062 + .2byte 0x0A7, 0x0BB, 0x0BC, 0x0AF, 0x0C3, 0x0C4, 0x0B7, 0x0CB, 0x0CC + +gUnknown_8454074:: @ 8454074 + .2byte 0x0B8 + +gUnknown_8454076:: @ 8454076 + .2byte 0x0B9 + +gUnknown_8454078:: @ 8454078 + .2byte 0x0BA + +gUnknown_845407A:: @ 845407A + .2byte 0x0C0 + +gUnknown_845407C:: @ 845407C + .2byte 0x0C1 + +gUnknown_845407E:: @ 845407E + .2byte 0x0C2 + +gUnknown_8454080:: @ 8454080 + .2byte 0x0C8 + +gUnknown_8454082:: @ 8454082 + .2byte 0x0C9 + +gUnknown_8454084:: @ 8454084 + .2byte 0x0CA + +gUnknown_8454086:: @ 8454086 + .2byte 0x0D0, 0x0D8 + +gUnknown_845408A:: @ 845408A + .2byte 0x0D2, 0x0DA + +gUnknown_845408E:: @ 845408E + .2byte 0x0D4, 0x0DC + +gUnknown_8454092:: @ 8454092 + .2byte 0x0E0, 0x0E2, 0x0E8, 0x0E9 + +gUnknown_845409A:: @ 845409A + .2byte 0x0E4, 0x0E6, 0x0EC, 0x0ED + +gUnknown_84540A2:: @ 84540A2 + .2byte 0x0F0, 0x0F2, 0x0F8, 0x0F9 + +gUnknown_84540AA:: @ 84540AA + .2byte 0x025, 0x02D + +gUnknown_84540AE:: @ 84540AE + .2byte 0x026, 0x02E + +gUnknown_84540B2:: @ 84540B2 + .2byte 0x027, 0x02F + +gUnknown_84540B6:: @ 84540B6 + .2byte 0x138 + +gUnknown_84540B8:: @ 84540B8 + .2byte 0x13C + +gUnknown_84540BA:: @ 84540BA + .2byte 0x140 + +gUnknown_84540BC:: @ 84540BC + .2byte 0x030, 0x031, 0x032, 0x038, 0x039, 0x03A, 0x040, 0x041, 0x03B + +gUnknown_84540CE:: @ 84540CE + .2byte 0x048, 0x049, 0x068, 0x050, 0x051, 0x070, 0x058, 0x059, 0x069 + +gUnknown_84540E0:: @ 84540E0 + .2byte 0x034, 0x03C + +gUnknown_84540E4:: @ 84540E4 + .2byte 0x035, 0x036, 0x03D, 0x03E, 0x063, 0x064, 0x06F, 0x077 + +gUnknown_84540F4:: @ 84540F4 + .2byte 0x033 + +gUnknown_84540F6:: @ 84540F6 + .2byte 0x02C + +gUnknown_84540F8:: @ 84540F8 + .2byte 0x080, 0x081, 0x088, 0x089 + +gUnknown_8454100:: @ 8454100 + .2byte 0x06A, 0x06B, 0x06C, 0x06D, 0x072, 0x073, 0x074, 0x075 + +gUnknown_8454110:: @ 8454110 + .2byte 0x028 + +gUnknown_8454112:: @ 8454112 + .2byte 0x037, 0x03F + +gUnknown_8454116:: @ 8454116 + .2byte 0x085, 0x08D + +gUnknown_845411A:: @ 845411A + .2byte 0x0D6, 0x0DE + +gUnknown_845411E:: @ 845411E + .2byte 0x12E, 0x136 + +gUnknown_8454122:: @ 8454122 + .2byte 0x082, 0x08A + +gUnknown_8454126:: @ 8454126 + .2byte 0x0F4 + +gUnknown_8454128:: @ 8454128 + .2byte 0x0F5 + +gUnknown_845412A:: @ 845412A + .2byte 0x0F6 + +gUnknown_845412C:: @ 845412C + .2byte 0x060 + +gUnknown_845412E:: @ 845412E + .2byte 0x061 + +gUnknown_8454130:: @ 8454130 + .2byte 0x062 + +gUnknown_8454132:: @ 8454132 + .2byte 0x078 + +gUnknown_8454134:: @ 8454134 + .2byte 0x079 + +gUnknown_8454136:: @ 8454136 + .2byte 0x07A + +gUnknown_8454138:: @ 8454138 + .2byte 0x07B + +gUnknown_845413A:: @ 845413A + .2byte 0x07C + +gUnknown_845413C:: @ 845413C + .2byte 0x07D + +gUnknown_845413E:: @ 845413E + .2byte 0x07E + +gUnknown_8454140:: @ 8454140 + .2byte 0x0B3 + +gUnknown_8454142:: @ 8454142 + .2byte 0x042, 0x043, 0x044, 0x04A, 0x04B, 0x04C, 0x052, 0x053, 0x054 + +gUnknown_8454154:: @ 8454154 + .2byte 0x045, 0x046, 0x047, 0x04D, 0x04E, 0x04F, 0x055, 0x056, 0x057 + +gUnknown_8454166:: @ 8454166 + .2byte 0x05A, 0x05B, 0x05C, 0x05D, 0x05E, 0x05F, 0x065, 0x066, 0x067 + +gUnknown_8454178:: @ 8454178 + .2byte 0x100, 0x101, 0x102, 0x108, 0x109, 0x10A, 0x110, 0x111, 0x112 + +gUnknown_845418A:: @ 845418A + .2byte 0x103, 0x104, 0x105, 0x10B, 0x10C, 0x10D, 0x113, 0x114, 0x115 + +gUnknown_845419C:: @ 845419C + .2byte 0x106, 0x107, 0x118, 0x10E, 0x10F, 0x120, 0x116, 0x117, 0x128 + +gUnknown_84541AE:: @ 84541AE + .2byte 0x119, 0x11A, 0x11B, 0x121, 0x122, 0x123, 0x129, 0x12A, 0x12B + +gUnknown_84541C0:: @ 84541C0 + .2byte 0x130 + +gUnknown_84541C2:: @ 84541C2 + .2byte 0x131 + +gUnknown_84541C4:: @ 84541C4 + .2byte 0x132 + +gUnknown_84541C6:: @ 84541C6 + .2byte 0x133 + +gUnknown_84541C8:: @ 84541C8 + .2byte 0x134 + +gUnknown_84541CA:: @ 84541CA + .2byte 0x11C, 0x11D + +gUnknown_84541CE:: @ 84541CE + .2byte 0x11E, 0x11F + +gUnknown_84541D2:: @ 84541D2 + .2byte 0x124, 0x125 + +gUnknown_84541D6:: @ 84541D6 + .2byte 0x126, 0x127 + +gUnknown_84541DA:: @ 84541DA + .2byte 0x12C, 0x12D + +gUnknown_84541DE:: @ 84541DE + .2byte 0x05C + +gUnknown_84541E0:: @ 84541E0 + .2byte 0x05C + +gUnknown_84541E2:: @ 84541E2 + .2byte 0x05C + +gUnknown_84541E4:: @ 84541E4 + .2byte 0x05C + +gUnknown_84541E6:: @ 84541E6 + .2byte 0x05C + +gUnknown_84541E8:: @ 84541E8 + .2byte 0x05C + +gUnknown_84541EA:: @ 84541EA + .2byte 0x05C + +gUnknown_84541EC:: @ 84541EC + .2byte 0x05C + +gUnknown_84541EE:: @ 84541EE + .2byte 0x05C + +gUnknown_84541F0:: @ 84541F0 + .2byte 0x05C + +gUnknown_84541F2:: @ 84541F2 + .2byte 0x05C + +gUnknown_84541F4:: @ 84541F4 + .2byte 0x05C + +gUnknown_84541F6:: @ 84541F6 + .2byte 0x05C + +gUnknown_84541F8:: @ 84541F8 + .2byte 0x05C + +gUnknown_84541FA:: @ 84541FA + .2byte 0x05C + +gUnknown_84541FC:: @ 84541FC + .2byte 0x05C + +gUnknown_84541FE:: @ 84541FE + .2byte 0x05C + +gUnknown_8454200:: @ 8454200 + .2byte 0x05C + +gUnknown_8454202:: @ 8454202 + .2byte 0x05C + +gUnknown_8454204:: @ 8454204 + .2byte 0x05C + +gUnknown_8454206:: @ 8454206 + .2byte 0x05C + +gUnknown_8454208:: @ 8454208 + .2byte 0x05C + +gUnknown_845420A:: @ 845420A + .2byte 0x05C + +gUnknown_845420C:: @ 845420C + .2byte 0x05C + +gUnknown_845420E:: @ 845420E + .2byte 0x05C + +gUnknown_8454210:: @ 8454210 + .2byte 0x05C + +gUnknown_8454212:: @ 8454212 + .2byte 0x05C + +gUnknown_8454214:: @ 8454214 + .2byte 0x05C + +gUnknown_8454216:: @ 8454216 + .2byte 0x05C + +gUnknown_8454218:: @ 8454218 + .2byte 0x05C + +gUnknown_845421A:: @ 845421A + .2byte 0x05C + +gUnknown_845421C:: @ 845421C + .2byte 0x05C + +gUnknown_845421E:: @ 845421E + .2byte 0x05C + +gUnknown_8454220:: @ 8454220 + .2byte 0x05C + +gUnknown_8454222:: @ 8454222 + .2byte 0x05C + +gUnknown_8454224:: @ 8454224 + .2byte 0x05C + +gUnknown_8454226:: @ 8454226 + .2byte 0x05C + +gUnknown_8454228:: @ 8454228 + .2byte 0x05C + +gUnknown_845422A:: @ 845422A + .2byte 0x05C + +gUnknown_845422C:: @ 845422C + .2byte 0x05C + +gUnknown_845422E:: @ 845422E + .2byte 0x05C + +gUnknown_8454230:: @ 8454230 + .2byte 0x05C + +gUnknown_8454232:: @ 8454232 + .2byte 0x05C + +gUnknown_8454234:: @ 8454234 + .2byte 0x05C + +gUnknown_8454236:: @ 8454236 + .2byte 0x05C diff --git a/data/decorations.s b/data/decorations.s new file mode 100644 index 000000000..0d6e85efe --- /dev/null +++ b/data/decorations.s @@ -0,0 +1,857 @@ +#include "constants/decorations.h" + .include "asm/macros.inc" + .include "constants/constants.inc" + .section .rodata + .align 2 + + .include "data/decoration_tiles.inc" + .include "data/text/decoration_descriptions.inc" + + .align 2 +gDecorations:: @ 84556F8 + .byte DECOR_NONE + .string "SMALL DESK$", 16 + .byte 0x00, 0x00, 0x00 + .2byte 0, 0 + .4byte gUnknown_8454238 + .4byte gUnknown_8454004 + + .byte DECOR_SMALL_DESK + .string "SMALL DESK$", 16 + .byte 0x00, 0x00, 0x00 + .2byte 3000, 0 + .4byte gUnknown_8454238 + .4byte gUnknown_8454004 + + .byte DECOR_POKEMON_DESK + .string "POKéMON DESK$", 16 + .byte 0x00, 0x00, 0x00 + .2byte 3000, 0 + .4byte gUnknown_8454254 + .4byte gUnknown_8454006 + + .byte DECOR_HEAVY_DESK + .string "HEAVY DESK$", 16 + .byte 0x00, 0x09, 0x00 + .2byte 6000, 0 + .4byte gUnknown_8454284 + .4byte gUnknown_8454008 + + .byte DECOR_RAGGED_DESK + .string "RAGGED DESK$", 16 + .byte 0x00, 0x09, 0x00 + .2byte 6000, 0 + .4byte gUnknown_84542BC + .4byte gUnknown_8454014 + + .byte DECOR_COMFORT_DESK + .string "COMFORT DESK$", 16 + .byte 0x00, 0x09, 0x00 + .2byte 6000, 0 + .4byte gUnknown_84542F3 + .4byte gUnknown_8454020 + + .byte DECOR_PRETTY_DESK + .string "PRETTY DESK$", 16 + .byte 0x00, 0x08, 0x00 + .2byte 9000, 0 + .4byte gUnknown_845432C + .4byte gUnknown_845402C + + .byte DECOR_BRICK_DESK + .string "BRICK DESK$", 16 + .byte 0x00, 0x08, 0x00 + .2byte 9000, 0 + .4byte gUnknown_8454362 + .4byte gUnknown_845403E + + .byte DECOR_CAMP_DESK + .string "CAMP DESK$", 16 + .byte 0x00, 0x08, 0x00 + .2byte 9000, 0 + .4byte gUnknown_8454398 + .4byte gUnknown_8454050 + + .byte DECOR_HARD_DESK + .string "HARD DESK$", 16 + .byte 0x00, 0x08, 0x00 + .2byte 9000, 0 + .4byte gUnknown_84543D1 + .4byte gUnknown_8454062 + + .byte DECOR_SMALL_CHAIR + .string "SMALL CHAIR$", 16 + .byte 0x01, 0x00, 0x01 + .2byte 2000, 0 + .4byte gUnknown_8454404 + .4byte gUnknown_8454074 + + .byte DECOR_POKEMON_CHAIR + .string "POKéMON CHAIR$", 16 + .byte 0x01, 0x00, 0x01 + .2byte 2000, 0 + .4byte gUnknown_8454420 + .4byte gUnknown_8454076 + + .byte DECOR_HEAVY_CHAIR + .string "HEAVY CHAIR$", 16 + .byte 0x01, 0x00, 0x01 + .2byte 2000, 0 + .4byte gUnknown_8454451 + .4byte gUnknown_8454078 + + .byte DECOR_PRETTY_CHAIR + .string "PRETTY CHAIR$", 16 + .byte 0x01, 0x00, 0x01 + .2byte 2000, 0 + .4byte gUnknown_845446E + .4byte gUnknown_845407A + + .byte DECOR_COMFORT_CHAIR + .string "COMFORT CHAIR$", 16 + .byte 0x01, 0x00, 0x01 + .2byte 2000, 0 + .4byte gUnknown_845448B + .4byte gUnknown_845407C + + .byte DECOR_RAGGED_CHAIR + .string "RAGGED CHAIR$", 16 + .byte 0x01, 0x00, 0x01 + .2byte 2000, 0 + .4byte gUnknown_84544A9 + .4byte gUnknown_845407E + + .byte DECOR_BRICK_CHAIR + .string "BRICK CHAIR$", 16 + .byte 0x01, 0x00, 0x01 + .2byte 2000, 0 + .4byte gUnknown_84544C5 + .4byte gUnknown_8454080 + + .byte DECOR_CAMP_CHAIR + .string "CAMP CHAIR$", 16 + .byte 0x01, 0x00, 0x01 + .2byte 2000, 0 + .4byte gUnknown_84544E2 + .4byte gUnknown_8454082 + + .byte DECOR_HARD_CHAIR + .string "HARD CHAIR$", 16 + .byte 0x01, 0x00, 0x01 + .2byte 2000, 0 + .4byte gUnknown_84544FE + .4byte gUnknown_8454084 + + .byte DECOR_RED_PLANT + .string "RED PLANT$", 16 + .byte 0x02, 0x05, 0x02 + .2byte 3000, 0 + .4byte gUnknown_845451A + .4byte gUnknown_8454086 + + .byte DECOR_TROPICAL_PLANT + .string "TROPICAL PLANT$", 16 + .byte 0x02, 0x05, 0x02 + .2byte 3000, 0 + .4byte gUnknown_8454534 + .4byte gUnknown_845408A + + .byte DECOR_PRETTY_FLOWERS + .string "PRETTY FLOWERS$", 16 + .byte 0x02, 0x05, 0x02 + .2byte 3000, 0 + .4byte gUnknown_8454559 + .4byte gUnknown_845408E + + .byte DECOR_COLORFUL_PLANT + .string "COLORFUL PLANT$", 16 + .byte 0x02, 0x04, 0x02 + .2byte 5000, 0 + .4byte gUnknown_8454570 + .4byte gUnknown_8454092 + + .byte DECOR_BIG_PLANT + .string "BIG PLANT$", 16 + .byte 0x02, 0x04, 0x02 + .2byte 5000, 0 + .4byte gUnknown_8454598 + .4byte gUnknown_845409A + + .byte DECOR_GORGEOUS_PLANT + .string "GORGEOUS PLANT$", 16 + .byte 0x02, 0x04, 0x02 + .2byte 5000, 0 + .4byte gUnknown_84545C6 + .4byte gUnknown_84540A2 + + .byte DECOR_RED_BRICK + .string "RED BRICK$", 16 + .byte 0x00, 0x05, 0x03 + .2byte 500, 0 + .4byte gUnknown_84545EE + .4byte gUnknown_84540AA + + .byte DECOR_YELLOW_BRICK + .string "YELLOW BRICK$", 16 + .byte 0x00, 0x05, 0x03 + .2byte 500, 0 + .4byte gUnknown_8454625 + .4byte gUnknown_84540AE + + .byte DECOR_BLUE_BRICK + .string "BLUE BRICK$", 16 + .byte 0x00, 0x05, 0x03 + .2byte 500, 0 + .4byte gUnknown_845465A + .4byte gUnknown_84540B2 + + .byte DECOR_RED_BALLOON + .string "RED BALLOON$", 16 + .byte 0x01, 0x00, 0x03 + .2byte 500, 0 + .4byte gUnknown_845468D + .4byte gUnknown_84540B6 + + .byte DECOR_BLUE_BALLOON + .string "BLUE BALLOON$", 16 + .byte 0x01, 0x00, 0x03 + .2byte 500, 0 + .4byte gUnknown_84546C4 + .4byte gUnknown_84540B8 + + .byte DECOR_YELLOW_BALLOON + .string "YELLOW BALLOON$", 16 + .byte 0x01, 0x00, 0x03 + .2byte 500, 0 + .4byte gUnknown_84546FC + .4byte gUnknown_84540BA + + .byte DECOR_RED_TENT + .string "RED TENT$", 16 + .byte 0x01, 0x08, 0x03 + .2byte 10000, 0 + .4byte gUnknown_8454734 + .4byte gUnknown_84540BC + + .byte DECOR_BLUE_TENT + .string "BLUE TENT$", 16 + .byte 0x01, 0x08, 0x03 + .2byte 10000, 0 + .4byte gUnknown_845475E + .4byte gUnknown_84540CE + + .byte DECOR_SOLID_BOARD + .string "SOLID BOARD$", 16 + .byte 0x01, 0x05, 0x03 + .2byte 3000, 0 + .4byte gUnknown_8454789 + .4byte gUnknown_84540E0 + + .byte DECOR_SLIDE + .string "SLIDE$", 16 + .byte 0x01, 0x07, 0x03 + .2byte 8000, 0 + .4byte gUnknown_84547B7 + .4byte gUnknown_84540E4 + + .byte DECOR_FENCE_LENGTH + .string "FENCE LENGTH$", 16 + .byte 0x00, 0x00, 0x03 + .2byte 500, 0 + .4byte gUnknown_84547DC + .4byte gUnknown_84540F4 + + .byte DECOR_FENCE_WIDTH + .string "FENCE WIDTH$", 16 + .byte 0x00, 0x00, 0x03 + .2byte 500, 0 + .4byte gUnknown_84547FF + .4byte gUnknown_84540F6 + + .byte DECOR_TIRE + .string "TIRE$", 16 + .byte 0x00, 0x04, 0x03 + .2byte 800, 0 + .4byte gUnknown_8454822 + .4byte gUnknown_84540F8 + + .byte DECOR_STAND + .string "STAND$", 16 + .byte 0x01, 0x03, 0x03 + .2byte 7000, 0 + .4byte gUnknown_8454857 + .4byte gUnknown_8454100 + + .byte DECOR_MUD_BALL + .string "MUD BALL$", 16 + .byte 0x01, 0x00, 0x03 + .2byte 200, 0 + .4byte gUnknown_8454874 + .4byte gUnknown_8454110 + + .byte DECOR_BREAKABLE_DOOR + .string "BREAKABLE DOOR$", 16 + .byte 0x01, 0x05, 0x03 + .2byte 3000, 0 + .4byte gUnknown_84548A1 + .4byte gUnknown_8454112 + + .byte DECOR_SAND_ORNAMENT + .string "SAND ORNAMENT$", 16 + .byte 0x02, 0x05, 0x03 + .2byte 3000, 0 + .4byte gUnknown_84548D2 + .4byte gUnknown_8454116 + + .byte DECOR_SILVER_SHIELD + .string "SILVER SHIELD$", 16 + .byte 0x02, 0x05, 0x03 + .2byte 0, 0 + .4byte gUnknown_8454901 + .4byte gUnknown_845411A + + .byte DECOR_GOLD_SHIELD + .string "GOLD SHIELD$", 16 + .byte 0x02, 0x05, 0x03 + .2byte 0, 0 + .4byte gUnknown_8454933 + .4byte gUnknown_845411E + + .byte DECOR_GLASS_ORNAMENT + .string "GLASS ORNAMENT$", 16 + .byte 0x02, 0x05, 0x03 + .2byte 0, 0 + .4byte gUnknown_8454966 + .4byte gUnknown_8454122 + + .byte DECOR_TV + .string "TV$", 16 + .byte 0x00, 0x00, 0x03 + .2byte 3000, 0 + .4byte gUnknown_845499F + .4byte gUnknown_8454126 + + .byte DECOR_ROUND_TV + .string "ROUND TV$", 16 + .byte 0x00, 0x00, 0x03 + .2byte 4000, 0 + .4byte gUnknown_84549BE + .4byte gUnknown_8454128 + + .byte DECOR_CUTE_TV + .string "CUTE TV$", 16 + .byte 0x00, 0x00, 0x03 + .2byte 4000, 0 + .4byte gUnknown_84549E9 + .4byte gUnknown_845412A + + .byte DECOR_GLITTER_MAT + .string "GLITTER MAT$", 16 + .byte 0x01, 0x00, 0x04 + .2byte 2000, 0 + .4byte gUnknown_8454A14 + .4byte gUnknown_845412C + + .byte DECOR_JUMP_MAT + .string "JUMP MAT$", 16 + .byte 0x01, 0x00, 0x04 + .2byte 2000, 0 + .4byte gUnknown_8454A3C + .4byte gUnknown_845412E + + .byte DECOR_SPIN_MAT + .string "SPIN MAT$", 16 + .byte 0x01, 0x00, 0x04 + .2byte 2000, 0 + .4byte gUnknown_8454A6A + .4byte gUnknown_8454130 + + .byte DECOR_C_LOW_NOTE_MAT + .string "C Low NOTE MAT$", 16 + .byte 0x01, 0x00, 0x04 + .2byte 500, 0 + .4byte gUnknown_8454A99 + .4byte gUnknown_8454132 + + .byte DECOR_D_NOTE_MAT + .string "D NOTE MAT$", 16 + .byte 0x01, 0x00, 0x04 + .2byte 500, 0 + .4byte gUnknown_8454AC8 + .4byte gUnknown_8454134 + + .byte DECOR_E_NOTE_MAT + .string "E NOTE MAT$", 16 + .byte 0x01, 0x00, 0x04 + .2byte 500, 0 + .4byte gUnknown_8454AF3 + .4byte gUnknown_8454136 + + .byte DECOR_F_NOTE_MAT + .string "F NOTE MAT$", 16 + .byte 0x01, 0x00, 0x04 + .2byte 500, 0 + .4byte gUnknown_8454B1F + .4byte gUnknown_8454138 + + .byte DECOR_G_NOTE_MAT + .string "G NOTE MAT$", 16 + .byte 0x01, 0x00, 0x04 + .2byte 500, 0 + .4byte gUnknown_8454B4B + .4byte gUnknown_845413A + + .byte DECOR_A_NOTE_MAT + .string "A NOTE MAT$", 16 + .byte 0x01, 0x00, 0x04 + .2byte 500, 0 + .4byte gUnknown_8454B76 + .4byte gUnknown_845413C + + .byte DECOR_B_NOTE_MAT + .string "B NOTE MAT$", 16 + .byte 0x01, 0x00, 0x04 + .2byte 500, 0 + .4byte gUnknown_8454BA2 + .4byte gUnknown_845413E + + .byte DECOR_C_HIGH_NOTE_MAT + .string "C High NOTE MAT$", 16 + .byte 0x01, 0x00, 0x04 + .2byte 500, 0 + .4byte gUnknown_8454BCD + .4byte gUnknown_8454140 + + .byte DECOR_SURF_MAT + .string "SURF MAT$", 16 + .byte 0x01, 0x08, 0x04 + .2byte 4000, 0 + .4byte gUnknown_8454BFD + .4byte gUnknown_8454142 + + .byte DECOR_THUNDER_MAT + .string "THUNDER MAT$", 16 + .byte 0x01, 0x08, 0x04 + .2byte 4000, 0 + .4byte gUnknown_8454C31 + .4byte gUnknown_8454154 + + .byte DECOR_FIRE_BLAST_MAT + .string "FIRE BLAST MAT$", 16 + .byte 0x01, 0x08, 0x04 + .2byte 4000, 0 + .4byte gUnknown_8454C68 + .4byte gUnknown_8454166 + + .byte DECOR_POWDER_SNOW_MAT + .string "POWDER SNOW MAT$", 16 + .byte 0x01, 0x08, 0x04 + .2byte 4000, 0 + .4byte gUnknown_8454CA2 + .4byte gUnknown_8454178 + + .byte DECOR_ATTRACT_MAT + .string "ATTRACT MAT$", 16 + .byte 0x01, 0x08, 0x04 + .2byte 4000, 0 + .4byte gUnknown_8454CDB + .4byte gUnknown_845418A + + .byte DECOR_FISSURE_MAT + .string "FISSURE MAT$", 16 + .byte 0x01, 0x08, 0x04 + .2byte 4000, 0 + .4byte gUnknown_8454D13 + .4byte gUnknown_845419C + + .byte DECOR_SPIKES_MAT + .string "SPIKES MAT$", 16 + .byte 0x01, 0x08, 0x04 + .2byte 4000, 0 + .4byte gUnknown_8454D4A + .4byte gUnknown_84541AE + + .byte DECOR_BALL_POSTER + .string "BALL POSTER$", 16 + .byte 0x03, 0x00, 0x05 + .2byte 1000, 0 + .4byte gUnknown_8454D80 + .4byte gUnknown_84541C0 + + .byte DECOR_GREEN_POSTER + .string "GREEN POSTER$", 16 + .byte 0x03, 0x00, 0x05 + .2byte 1000, 0 + .4byte gUnknown_8454DA8 + .4byte gUnknown_84541C2 + + .byte DECOR_RED_POSTER + .string "RED POSTER$", 16 + .byte 0x03, 0x00, 0x05 + .2byte 1000, 0 + .4byte gUnknown_8454DCD + .4byte gUnknown_84541C4 + + .byte DECOR_BLUE_POSTER + .string "BLUE POSTER$", 16 + .byte 0x03, 0x00, 0x05 + .2byte 1000, 0 + .4byte gUnknown_8454DF2 + .4byte gUnknown_84541C6 + + .byte DECOR_CUTE_POSTER + .string "CUTE POSTER$", 16 + .byte 0x03, 0x00, 0x05 + .2byte 1000, 0 + .4byte gUnknown_8454E16 + .4byte gUnknown_84541C8 + + .byte DECOR_PIKA_POSTER + .string "PIKA POSTER$", 16 + .byte 0x03, 0x01, 0x05 + .2byte 1500, 0 + .4byte gUnknown_8454E3C + .4byte gUnknown_84541CA + + .byte DECOR_LONG_POSTER + .string "LONG POSTER$", 16 + .byte 0x03, 0x01, 0x05 + .2byte 1500, 0 + .4byte gUnknown_8454E6B + .4byte gUnknown_84541CE + + .byte DECOR_SEA_POSTER + .string "SEA POSTER$", 16 + .byte 0x03, 0x01, 0x05 + .2byte 1500, 0 + .4byte gUnknown_8454E90 + .4byte gUnknown_84541D2 + + .byte DECOR_SKY_POSTER + .string "SKY POSTER$", 16 + .byte 0x03, 0x01, 0x05 + .2byte 1500, 0 + .4byte gUnknown_8454EB7 + .4byte gUnknown_84541D6 + + .byte DECOR_KISS_POSTER + .string "KISS POSTER$", 16 + .byte 0x03, 0x01, 0x05 + .2byte 1500, 0 + .4byte gUnknown_8454EDC + .4byte gUnknown_84541DA + + .byte DECOR_PICHU_DOLL + .string "PICHU DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8454F02 + .4byte gUnknown_84541DE + + .byte DECOR_PIKACHU_DOLL + .string "PIKACHU DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8454F2D + .4byte gUnknown_84541E0 + + .byte DECOR_MARILL_DOLL + .string "MARILL DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8454F5A + .4byte gUnknown_84541E2 + + .byte DECOR_TOGEPI_DOLL + .string "TOGEPI DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8454F86 + .4byte gUnknown_84541E4 + + .byte DECOR_CYNDAQUIL_DOLL + .string "CYNDAQUIL DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8454FB2 + .4byte gUnknown_84541E6 + + .byte DECOR_CHIKORITA_DOLL + .string "CHIKORITA DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8454FE1 + .4byte gUnknown_84541E8 + + .byte DECOR_TOTODILE_DOLL + .string "TOTODILE DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8455010 + .4byte gUnknown_84541EA + + .byte DECOR_JIGGLYPUFF_DOLL + .string "JIGGLYPUFF DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_845503E + .4byte gUnknown_84541EC + + .byte DECOR_MEOWTH_DOLL + .string "MEOWTH DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_845506E + .4byte gUnknown_84541EE + + .byte DECOR_CLEFAIRY_DOLL + .string "CLEFAIRY DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_845509A + .4byte gUnknown_84541F0 + + .byte DECOR_DITTO_DOLL + .string "DITTO DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_84550C8 + .4byte gUnknown_84541F2 + + .byte DECOR_SMOOCHUM_DOLL + .string "SMOOCHUM DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_84550F3 + .4byte gUnknown_84541F4 + + .byte DECOR_TREECKO_DOLL + .string "TREECKO DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8455121 + .4byte gUnknown_84541F6 + + .byte DECOR_TORCHIC_DOLL + .string "TORCHIC DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_845514E + .4byte gUnknown_84541F8 + + .byte DECOR_MUDKIP_DOLL + .string "MUDKIP DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_845517B + .4byte gUnknown_84541FA + + .byte DECOR_DUSKULL_DOLL + .string "DUSKULL DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_84551A7 + .4byte gUnknown_84541FC + + .byte DECOR_WYNAUT_DOLL + .string "WYNAUT DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_84551D4 + .4byte gUnknown_84541FE + + .byte DECOR_BALTOY_DOLL + .string "BALTOY DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8455200 + .4byte gUnknown_8454200 + + .byte DECOR_KECLEON_DOLL + .string "KECLEON DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_845522C + .4byte gUnknown_8454202 + + .byte DECOR_AZURILL_DOLL + .string "AZURILL DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8455259 + .4byte gUnknown_8454204 + + .byte DECOR_SKITTY_DOLL + .string "SKITTY DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8455287 + .4byte gUnknown_8454206 + + .byte DECOR_SWABLU_DOLL + .string "SWABLU DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_84552B3 + .4byte gUnknown_8454208 + + .byte DECOR_GULPIN_DOLL + .string "GULPIN DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_84552DF + .4byte gUnknown_845420A + + .byte DECOR_LOTAD_DOLL + .string "LOTAD DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_845530B + .4byte gUnknown_845420C + + .byte DECOR_SEEDOT_DOLL + .string "SEEDOT DOLL$", 16 + .byte 0x04, 0x00, 0x06 + .2byte 3000, 0 + .4byte gUnknown_8455336 + .4byte gUnknown_845420E + + .byte DECOR_PIKA_CUSHION + .string "PIKA CUSHION$", 16 + .byte 0x04, 0x00, 0x07 + .2byte 2000, 0 + .4byte gUnknown_8455362 + .4byte gUnknown_8454210 + + .byte DECOR_ROUND_CUSHION + .string "ROUND CUSHION$", 16 + .byte 0x04, 0x00, 0x07 + .2byte 2000, 0 + .4byte gUnknown_8455392 + .4byte gUnknown_8454212 + + .byte DECOR_KISS_CUSHION + .string "KISS CUSHION$", 16 + .byte 0x04, 0x00, 0x07 + .2byte 2000, 0 + .4byte gUnknown_84553C1 + .4byte gUnknown_8454214 + + .byte DECOR_ZIGZAG_CUSHION + .string "ZIGZAG CUSHION$", 16 + .byte 0x04, 0x00, 0x07 + .2byte 2000, 0 + .4byte gUnknown_84553F2 + .4byte gUnknown_8454216 + + .byte DECOR_SPIN_CUSHION + .string "SPIN CUSHION$", 16 + .byte 0x04, 0x00, 0x07 + .2byte 2000, 0 + .4byte gUnknown_8455424 + .4byte gUnknown_8454218 + + .byte DECOR_DIAMOND_CUSHION + .string "DIAMOND CUSHION$", 16 + .byte 0x04, 0x00, 0x07 + .2byte 2000, 0 + .4byte gUnknown_8455453 + .4byte gUnknown_845421A + + .byte DECOR_BALL_CUSHION + .string "BALL CUSHION$", 16 + .byte 0x04, 0x00, 0x07 + .2byte 2000, 0 + .4byte gUnknown_8455483 + .4byte gUnknown_845421C + + .byte DECOR_GRASS_CUSHION + .string "GRASS CUSHION$", 16 + .byte 0x04, 0x00, 0x07 + .2byte 2000, 0 + .4byte gUnknown_84554B0 + .4byte gUnknown_845421E + + .byte DECOR_FIRE_CUSHION + .string "FIRE CUSHION$", 16 + .byte 0x04, 0x00, 0x07 + .2byte 2000, 0 + .4byte gUnknown_84554E3 + .4byte gUnknown_8454220 + + .byte DECOR_WATER_CUSHION + .string "WATER CUSHION$", 16 + .byte 0x04, 0x00, 0x07 + .2byte 2000, 0 + .4byte gUnknown_8455515 + .4byte gUnknown_8454222 + + .byte DECOR_SNORLAX_DOLL + .string "SNORLAX DOLL$", 16 + .byte 0x04, 0x05, 0x06 + .2byte 10000, 0 + .4byte gUnknown_8455548 + .4byte gUnknown_8454224 + + .byte DECOR_RHYDON_DOLL + .string "RHYDON DOLL$", 16 + .byte 0x04, 0x05, 0x06 + .2byte 10000, 0 + .4byte gUnknown_8455573 + .4byte gUnknown_8454226 + + .byte DECOR_LAPRAS_DOLL + .string "LAPRAS DOLL$", 16 + .byte 0x04, 0x05, 0x06 + .2byte 10000, 0 + .4byte gUnknown_845559E + .4byte gUnknown_8454228 + + .byte DECOR_VENUSAUR_DOLL + .string "VENUSAUR DOLL$", 16 + .byte 0x04, 0x05, 0x06 + .2byte 10000, 0 + .4byte gUnknown_84555C9 + .4byte gUnknown_845422A + + .byte DECOR_CHARIZARD_DOLL + .string "CHARIZARD DOLL$", 16 + .byte 0x04, 0x05, 0x06 + .2byte 10000, 0 + .4byte gUnknown_84555F4 + .4byte gUnknown_845422C + + .byte DECOR_BLASTOISE_DOLL + .string "BLASTOISE DOLL$", 16 + .byte 0x04, 0x05, 0x06 + .2byte 10000, 0 + .4byte gUnknown_845561F + .4byte gUnknown_845422E + + .byte DECOR_WAILMER_DOLL + .string "WAILMER DOLL$", 16 + .byte 0x04, 0x05, 0x06 + .2byte 10000, 0 + .4byte gUnknown_845564A + .4byte gUnknown_8454230 + + .byte DECOR_REGIROCK_DOLL + .string "REGIROCK DOLL$", 16 + .byte 0x04, 0x05, 0x06 + .2byte 10000, 0 + .4byte gUnknown_8455675 + .4byte gUnknown_8454232 + + .byte DECOR_REGICE_DOLL + .string "REGICE DOLL$", 16 + .byte 0x04, 0x05, 0x06 + .2byte 10000, 0 + .4byte gUnknown_84556A0 + .4byte gUnknown_8454234 + + .byte DECOR_REGISTEEL_DOLL + .string "REGISTEEL DOLL$", 16 + .byte 0x04, 0x05, 0x06 + .2byte 10000, 0 + .4byte gUnknown_84556CB + .4byte gUnknown_8454236 diff --git a/data/graphics.s b/data/graphics.s index 4b00c1c4b..9c5d1c3f9 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -146,7 +146,7 @@ gFile_graphics_interface_ball_Open_sheet:: @ 8D022E8 .incbin "graphics/interface/ball_open.4bpp.lz" .align 2 -gFile_graphics_interface_blank_sheet:: @ 8D02364 +gBlankGfxCompressed:: @ 8D02364 .incbin "graphics/interface/blank.4bpp.lz" .align 2 @@ -1062,8 +1062,11 @@ gFile_graphics_unused_basic_frame_tilemap:: @ 8D11A78 .incbin "graphics/unused/basic_frame.bin.lz" .align 2 -gUnknown_8D11B84:: @ 8D11B84 - .incbin "baserom.gba", 0xD11B84, 0x40 +gBattleInterface_BallStatusBarPal:: @ 8D11B84 + .incbin "baserom.gba", 0xD11B84, 0x20 + +gBattleInterface_BallDisplayPal:: @ 8D11BA4 + .incbin "baserom.gba", 0xD11BA4, 0x20 gUnknown_8D11BC4:: @ 8D11BC4 .incbin "baserom.gba", 0xD11BC4, 0xF00 @@ -1761,23 +1764,23 @@ gFile_graphics_battle_anims_sprites_186_palette:: @ 8D1F31C .incbin "graphics/battle_anims/sprites/186.gbapal.lz" .align 2 -gUnknown_8D1F340:: @ 8D1F340 +gHealthboxSinglesPlayerGfx:: @ 8D1F340 .incbin "baserom.gba", 0xD1F340, 0x2C4 .align 2 -gUnknown_8D1F604:: @ 8D1F604 +gHealthboxSinglesOpponentGfx:: @ 8D1F604 .incbin "baserom.gba", 0xD1F604, 0x190 .align 2 -gUnknown_8D1F794:: @ 8D1F794 +gHealthboxDoublesPlayerGfx:: @ 8D1F794 .incbin "baserom.gba", 0xD1F794, 0x194 .align 2 -gUnknown_8D1F928:: @ 8D1F928 +gHealthboxDoublesOpponentGfx:: @ 8D1F928 .incbin "baserom.gba", 0xD1F928, 0x194 .align 2 -gFile_graphics_battle_interface_healthbox_safari_sheet:: @ 8D1FABC +gHealthboxSafariGfx:: @ 8D1FABC .incbin "graphics/battle_interface/healthbox_safari.4bpp.lz" .align 2 @@ -2365,15 +2368,15 @@ gFile_graphics_battle_anims_sprites_240_palette:: @ 8D2D068 .incbin "graphics/battle_anims/sprites/240.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_substitute_palette:: @ 8D2D090 +gSubstituteDollPal:: @ 8D2D090 .incbin "graphics/battle_anims/sprites/substitute.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_substitute_sheet:: @ 8D2D0B4 +gSubstituteDollGfx:: @ 8D2D0B4 .incbin "graphics/battle_anims/sprites/substitute.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_substitute_tilemap:: @ 8D2D2F4 +gSubstituteDollTilemap:: @ 8D2D2F4 .incbin "graphics/battle_anims/sprites/substitute.bin.lz" .align 2 @@ -13985,23 +13988,23 @@ gItemPcBgPals:: @ 8E85408 gItemPcTilemap:: @ 8E85458 .incbin "graphics/item_pc/unk_8E85458.bin.lz" -gUnknown_8E8560C:: @ 8E8560C - .incbin "baserom.gba", 0xE8560C, 0x3C4 +gBerryPouchSpriteTiles:: @ 8E8560C + .incbin "graphics/berry_pouch/unk_8E8560C.4bpp.lz" -gUnknown_8E859D0:: @ 8E859D0 - .incbin "baserom.gba", 0xE859D0, 0x1D4 +gBerryPouchBgGfx:: @ 8E859D0 + .incbin "graphics/berry_pouch/unk_8E859D0.4bpp.lz" -gUnknown_8E85BA4:: @ 8E85BA4 - .incbin "baserom.gba", 0xE85BA4, 0x50 +gBerryPouchBgPals:: @ 8E85BA4 + .incbin "graphics/berry_pouch/unk_8E85BA4.gbapal.lz" -gUnknown_8E85BF4:: @ 8E85BF4 - .incbin "baserom.gba", 0xE85BF4, 0x28 +gBerryPouchBgPal0FemaleOverride:: @ 8E85BF4 + .incbin "graphics/berry_pouch/unk_8E85BF4.gbapal.lz" -gUnknown_8E85C1C:: @ 8E85C1C - .incbin "baserom.gba", 0xE85C1C, 0x28 +gBerryPouchSpritePalette:: @ 8E85C1C + .incbin "graphics/berry_pouch/unk_8E85C1C.gbapal.lz" -gUnknown_8E85C44:: @ 8E85C44 - .incbin "baserom.gba", 0xE85C44, 0x184 +gBerryPouchBg1Tilemap:: @ 8E85C44 + .incbin "graphics/berry_pouch/unk_8E85C44.bin.lz" gUnknown_8E85DC8:: @ 8E85DC8 .incbin "baserom.gba", 0xE85DC8, 0x134 @@ -15923,10 +15926,10 @@ gFile_graphics_battle_anims_sprites_271_sheet:: @ 8E93AB4 .incbin "graphics/battle_anims/sprites/271.4bpp.lz" .align 2 -gUnknown_8E93B14:: @ 8E93B14 +gGhostPalette:: @ 8E93B14 .incbin "baserom.gba", 0xE93B14, 0x24 -gUnknown_8E93B38:: @ 8E93B38 +gGhostFrontPic:: @ 8E93B38 .incbin "baserom.gba", 0xE93B38, 0x368 gUnknown_8E93EA0:: @ 8E93EA0 @@ -16343,14 +16346,17 @@ gUnknown_8EAAA10:: @ 8EAAA10 gUnknown_8EAAA6C:: @ 8EAAA6C .incbin "baserom.gba", 0xEAAA6C, 0xAC -gUnknown_8EAAB18:: @ 8EAAB18 - .incbin "baserom.gba", 0xEAAB18, 0x80 @UNKNOWN +gCreditsMonBackdropPals:: @ 8EAAB18 + .incbin "graphics/credits/charizard.gbapal" + .incbin "graphics/credits/venusaur.gbapal" + .incbin "graphics/credits/blastoise.gbapal" + .incbin "graphics/credits/pikachu.gbapal" -gUnknown_8EAAB98:: @ 8EAAB98 - .incbin "baserom.gba", 0xEAAB98, 0x774 +gCreditsPokeballBgGfxTiles:: @ 8EAAB98 + .incbin "graphics/credits/unk_8EAAB98.4bpp.lz" -gUnknown_8EAB30C:: @ 8EAB30C - .incbin "baserom.gba", 0xEAB30C, 0x3B8 +gCreditsPokeballBgGfxMap:: @ 8EAB30C + .incbin "graphics/credits/unk_8EAB30C.bin.lz" @ title_screen gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4 @@ -16386,14 +16392,14 @@ gGraphics_TitleScreen_FirePals:: @ 8EAE488 gGraphics_TitleScreen_BlankObjTiles:: @ 8EAE4A8 .incbin "graphics/title_screen/unk_8eae4a8.4bpp.lz" -gUnknown_8EAE528:: @ 8EAE528 - .incbin "baserom.gba", 0xEAE528, 0x20 @UNKNOWN +gCreditsAllRightsReservedGfxPal:: @ 8EAE528 + .incbin "graphics/credits/unk_8EAE548.gbapal" -gUnknown_8EAE548:: @ 8EAE548 - .incbin "baserom.gba", 0xEAE548, 0x3B8 +gCreditsAllRightsReservedGfxTiles:: @ 8EAE548 + .incbin "graphics/credits/unk_8EAE548.4bpp.lz" -gUnknown_8EAE900:: @ 8EAE900 - .incbin "baserom.gba", 0xEAE900, 0x100 +gCreditsAllRightsReservedGfxMap:: @ 8EAE900 + .incbin "graphics/credits/unk_8EAE548.bin.lz" gUnknown_8EAEA00:: @ 8EAEA00 .incbin "baserom.gba", 0xEAEA00, 0x20 @UNKNOWN diff --git a/data/itemfinder.s b/data/itemfinder.s deleted file mode 100644 index 3a955deeb..000000000 --- a/data/itemfinder.s +++ /dev/null @@ -1,7 +0,0 @@ - .section .rodata - .align 2 -gUnknown_84647E4:: @ 84647E4 - .incbin "baserom.gba", 0x4647E4, 0x18 - -gUnknown_84647FC:: @ 84647FC - .incbin "baserom.gba", 0x4647FC, 0x8 diff --git a/data/itemfinder/spr_tiles.png b/data/itemfinder/spr_tiles.png Binary files differnew file mode 100644 index 000000000..4171f37b4 --- /dev/null +++ b/data/itemfinder/spr_tiles.png diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 917611a02..e45575959 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -1435,7 +1435,7 @@ Text_1A644F:: @ 81A644F .string "once. Is that okay?$" -gUnknown_81A6481:: @ 81A6481 +EventScript_ResetAllMapFlags:: @ 81A6481 setflag FLAG_0x02B setflag FLAG_0x02C setflag FLAG_0x033 @@ -1485,14 +1485,14 @@ gUnknown_81A6481:: @ 81A6481 setflag FLAG_0x09F setflag FLAG_0x0A0 setflag FLAG_0x0AE - setvar VAR_MIRAGE_RND_L, 500 + setvar VAR_0x4025, 500 end EventScript_1A651A:: @ 81A651A clearflag FLAG_0x09D call EventScript_1A6551 special sub_81130A8 - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 0 call_if 1, EventScript_1A653B call EventScript_1A6541 @@ -1576,27 +1576,23 @@ EventScript_1A661D:: @ 81A661D waitmessage applymovement VAR_LAST_TALKED, Movement_1A666C waitmovement 0 - loadword 0, Text_1A5511 - callstd 4 + msgbox Text_1A5511 return EventScript_1A6636:: @ 81A6636 checkflag 2114 goto_if_eq EventScript_1A661D - loadword 0, Text_1A552B - callstd 4 + msgbox Text_1A552B setflag 2114 message Text_1BCCCA waitmessage applymovement VAR_LAST_TALKED, Movement_1A666C waitmovement 0 - loadword 0, Text_1A5511 - callstd 4 + msgbox Text_1A5511 return EventScript_1A6663:: @ 81A6663 - loadword 0, Text_1A5511 - callstd 4 + msgbox Text_1A5511 return Movement_1A666C:: @ 81A666C @@ -1681,8 +1677,7 @@ EventScript_1A6749:: @ 81A6749 message Text_1A51F6 waitfanfare waitmessage - loadword 0, gUnknown_81A5218 - callstd 4 + msgbox gUnknown_81A5218 setvar VAR_RESULT, 1 return @@ -1717,8 +1712,7 @@ EventScript_1A6795:: @ 81A6795 message Text_1A52F0 waitfanfare waitmessage - loadword 0, gUnknown_81A532F - callstd 4 + msgbox gUnknown_81A532F setvar VAR_RESULT, 1 return @@ -1755,8 +1749,7 @@ EventScript_1A67EE:: @ 81A67EE call_if 1, EventScript_1A6827 waitfanfare waitmessage - loadword 0, gUnknown_81A5218 - callstd 4 + msgbox gUnknown_81A5218 return EventScript_1A6821:: @ 81A6821 @@ -1768,15 +1761,100 @@ EventScript_1A6827:: @ 81A6827 return EventScript_1A682D:: @ 81A682D - loadword 0, Text_1A51F6 - callstd 4 - loadword 0, gUnknown_81A5242 - callstd 4 + msgbox Text_1A51F6 + msgbox gUnknown_81A5242 setvar VAR_RESULT, 0 return -gUnknown_81A6843:: @ 81A6843 - .incbin "baserom.gba", 0x1A6843, 0x112 +EventScript_PickUpHiddenItem:: @ 81A6843 + lockall + textcolor 3 + waitse + compare_var_to_value VAR_0x8005, 0 + goto_if_eq EventScript_PickUpHiddenCoins + call EventScript_GiveItem + compare_var_to_value VAR_0x8007, 1 + goto_if_eq EventScript_ItemInPocketMessage + compare_var_to_value VAR_0x8007, 0 + goto_if_eq EventScript_BagIsFullMessage + end + +EventScript_GiveItem:: + additem VAR_0x8005, VAR_0x8006 + copyvar VAR_0x8007, VAR_RESULT + getitemname 1, VAR_0x8005 + checkitemtype VAR_0x8005 + call EventScript_1A66BC + return + +EventScript_ItemInPocketMessage:: + compare_var_to_value VAR_0x8006, 1 + call_if 1, EventScript_FoundSingleItemMessage + compare_var_to_value VAR_0x8006, 1 + call_if 5, EventScript_FoundMultipleItemsMessage + waitfanfare + waitmessage + msgbox gUnknown_81A5218 + special Special_SetHiddenItemFlag + releaseall + end + +EventScript_FoundSingleItemMessage:: + message Text_1A5231 + return + +EventScript_FoundCoinsMessage:: + getnumberstring 0, VAR_0x8006 + message Text_1A525C + return + +EventScript_FoundMultipleItemsMessage:: + getnumberstring 0, VAR_0x8006 + message Text_1A52DD + return + +EventScript_BagIsFullMessage:: + msgbox Text_1A5231 + msgbox gUnknown_81A5242 + setvar VAR_RESULT, 0 + releaseall + end + +EventScript_PickUpHiddenCoins:: + checkflag FLAG_GOT_COIN_CASE + goto_if 0, EventScript_HiddenCoinsButNoCoinCase + checkcoins VAR_RESULT + specialvar VAR_RESULT, Special_CheckAddCoins + compare_var_to_value VAR_RESULT, 0 + goto_if_eq EventScript_HiddenCoinsButTheCoinCaseIsFull + givecoins VAR_0x8006 + getstdstring 1, 0x17 + call EventScript_1A6764 + call EventScript_FoundCoinsMessage + waitfanfare + waitmessage + msgbox Text_1A526C + special Special_SetHiddenItemFlag + releaseall + end + +EventScript_HiddenCoinsButTheCoinCaseIsFull:: + getnumberstring 0, VAR_0x8006 + getstdstring 1, 0x17 + msgbox Text_1A525C + msgbox Text_1A5294 + setvar VAR_RESULT, 0 + releaseall + end + +EventScript_HiddenCoinsButNoCoinCase:: + getnumberstring 0, VAR_0x8006 + getstdstring 1, 0x17 + msgbox Text_1A525C + msgbox Text_1A52B4 + setvar VAR_RESULT, 0 + releaseall + end gUnknown_81A6955:: @ 81A6955 .incbin "baserom.gba", 0x1A6955, 0x173 @@ -2275,8 +2353,33 @@ ViridianCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 .incbin "baserom.gba", 0x1A8D08, 0x41 -gUnknown_81A8D49:: @ 81A8D49 - .incbin "baserom.gba", 0x1A8D49, 0x4E +EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 + lockall + textcolor 3 + waitse + call EventScript_GiveItem + compare_var_to_value VAR_0x8007, 1 + goto_if_eq EventScript_DigUpItemPutInPocket + compare_var_to_value VAR_0x8007, 0 + goto_if_eq EventScript_DigUpItemBagIsFull + end + +EventScript_DigUpItemPutInPocket:: + message Text_1A5700 + waitfanfare + waitmessage + delay 60 + msgbox gUnknown_81A5218 + special Special_SetHiddenItemFlag + releaseall + end + +EventScript_DigUpItemBagIsFull:: + msgbox Text_1A5700 + msgbox gUnknown_81A5242 + setvar VAR_RESULT, 0 + releaseall + end gUnknown_81A8D97:: @ 81A8D97 .incbin "baserom.gba", 0x1A8D97, 0x41 diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index dca647299..9115b2812 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -39,7 +39,7 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D end EventScript_16C6E6:: @ 816C6E6 - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16C790 compare_var_to_value VAR_0x8009, 0 goto_if_eq EventScript_16C734 @@ -134,7 +134,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 checkflag FLAG_0x26E goto_if_eq EventScript_16C849 msgbox gUnknown_8196AF3 - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9990 @@ -198,7 +198,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E checkflag FLAG_0x26F goto_if_eq EventScript_16C8F0 msgbox gUnknown_8196D2B - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 @@ -228,7 +228,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE checkflag FLAG_0x270 goto_if_eq EventScript_16C950 msgbox gUnknown_8196DB7 - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 @@ -263,7 +263,7 @@ EventScript_16C96A:: @ 816C96A end EventScript_16C96C:: @ 816C96C - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 911847541..4a60c9814 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -12,7 +12,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 lock faceplayer - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 @@ -191,7 +191,7 @@ EventScript_16CE12:: @ 816CE12 CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D lock faceplayer - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 @@ -289,7 +289,7 @@ EventScript_16CF79:: @ 816CF79 CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 lock faceplayer - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if 0, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index e52d88636..379d07271 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -12,7 +12,7 @@ CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4 CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD lock faceplayer - checkflag FLAG_0x243 + checkflag FLAG_GOT_COIN_CASE goto_if_eq EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 @@ -20,7 +20,7 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD goto_if_eq EventScript_16D241 additem ITEM_COIN_CASE, 1 giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE - setflag FLAG_0x243 + setflag FLAG_GOT_COIN_CASE release end diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index 873224926..8e7705650 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -59,7 +59,7 @@ EventScript_167264:: @ 8167264 setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0 removeobject 1 removeobject 2 - special sub_80F39B4 + special Special_Credits waitstate releaseall end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 7dae5f353..048ca96d6 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -5,7 +5,7 @@ IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 call_if 1, EventScript_16EA79 end @@ -19,7 +19,7 @@ EventScript_16EA79:: @ 816EA79 IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A lock faceplayer - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_16EAA6 msgbox gUnknown_819A8D8 diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 7a1941f72..83a42e67d 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -220,7 +220,7 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 goto_if_eq EventScript_171044 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 goto_if_eq EventScript_1710F2 - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_1710FC compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index dd3f05aa9..9f304b583 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -51,7 +51,7 @@ EventScript_168DB9:: @ 8168DB9 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 - compare_var_to_value VAR_MIRAGE_RND_L, 500 + compare_var_to_value VAR_0x4025, 500 goto_if 0, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index faadadcda..11df46047 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -37,7 +37,7 @@ EventScript_162D70:: @ 8162D70 call EventScript_1A651A setrespawn SPAWN_PALLET_TOWN fadescreenspeed 1, 24 - special sub_80CA2E4 + special Special_HallOfFame waitstate releaseall end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 9fc141070..7cdedc60c 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 1 call_if 1, EventScript_164D50 @@ -26,7 +26,7 @@ ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 faceplayer checkflag FLAG_0x2E2 goto_if_eq EventScript_164DC2 - specialvar VAR_RESULT, sub_806E25C + specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 goto_if_eq EventScript_164D90 msgbox gUnknown_817D13B diff --git a/data/palette.s b/data/palette.s deleted file mode 100644 index fc479bbd6..000000000 --- a/data/palette.s +++ /dev/null @@ -1,18 +0,0 @@ - .section .rodata - .align 2 -gUnknown_83AC960:: @ 83AC960 - .2byte 0xFFFF - .align 2 - .4byte 0 - .2byte 0 - .byte 0, 0x20, 0 - - .align 2 -gUnknown_83AC970:: @ 83AC970 - .byte 0, 0, 0, 0, 0 - .byte 5, 5, 5, 5, 5 - .byte 11, 11, 11, 11, 11 - .byte 16, 16, 16, 16, 16 - .byte 21, 21, 21, 21, 21 - .byte 27, 27, 27, 27, 27 - .byte 31, 31 diff --git a/data/pokedex_area_markers.s b/data/pokedex_area_markers.s deleted file mode 100644 index bf63a3210..000000000 --- a/data/pokedex_area_markers.s +++ /dev/null @@ -1,14 +0,0 @@ - .section .rodata - .align 2 - -gUnknown_846341C:: @ 846341C - .incbin "baserom.gba", 0x46341C, 0x20 - -gUnknown_846343C:: @ 846343C - .incbin "baserom.gba", 0x46343C, 0x128 - -gUnknown_8463564:: @ 8463564 - .incbin "baserom.gba", 0x463564, 0x1C - -gUnknown_8463580:: @ 8463580 - .incbin "baserom.gba", 0x463580, 0x140 diff --git a/data/pokedex_area_markers/marker.pal b/data/pokedex_area_markers/marker.pal new file mode 100644 index 000000000..5a7190a3a --- /dev/null +++ b/data/pokedex_area_markers/marker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 197 115 +255 139 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/pokedex_area_markers/marker_0.png b/data/pokedex_area_markers/marker_0.png Binary files differnew file mode 100644 index 000000000..10ef6d24b --- /dev/null +++ b/data/pokedex_area_markers/marker_0.png diff --git a/data/pokedex_area_markers/marker_1.png b/data/pokedex_area_markers/marker_1.png Binary files differnew file mode 100644 index 000000000..21db66b29 --- /dev/null +++ b/data/pokedex_area_markers/marker_1.png diff --git a/data/pokedex_area_markers/marker_2.png b/data/pokedex_area_markers/marker_2.png Binary files differnew file mode 100644 index 000000000..e25be6f5c --- /dev/null +++ b/data/pokedex_area_markers/marker_2.png diff --git a/data/pokedex_area_markers/marker_3.png b/data/pokedex_area_markers/marker_3.png Binary files differnew file mode 100644 index 000000000..1e8fe22d2 --- /dev/null +++ b/data/pokedex_area_markers/marker_3.png diff --git a/data/pokedex_area_markers/marker_4.png b/data/pokedex_area_markers/marker_4.png Binary files differnew file mode 100644 index 000000000..193697384 --- /dev/null +++ b/data/pokedex_area_markers/marker_4.png diff --git a/data/pokedex_area_markers/marker_5.png b/data/pokedex_area_markers/marker_5.png Binary files differnew file mode 100644 index 000000000..0919682f4 --- /dev/null +++ b/data/pokedex_area_markers/marker_5.png diff --git a/data/pokedex_area_markers/marker_6.png b/data/pokedex_area_markers/marker_6.png Binary files differnew file mode 100644 index 000000000..439d858e1 --- /dev/null +++ b/data/pokedex_area_markers/marker_6.png diff --git a/data/smokescreen.s b/data/smokescreen.s new file mode 100644 index 000000000..17d611d3c --- /dev/null +++ b/data/smokescreen.s @@ -0,0 +1,17 @@ + .section .rodata + .balign 4 + +gUnknown_825098C:: @ 825098C + .incbin "baserom.gba", 0x25098C, 0x8 + +gUnknown_8250994:: @ 8250994 + .incbin "baserom.gba", 0x250994, 0x60 + +gUnknown_82509F4:: @ 82509F4 + .incbin "baserom.gba", 0x2509F4, 0x18 + +gSpriteSheet_EnemyShadow:: @ 8250A0C + .incbin "baserom.gba", 0x250A0C, 0x10 + +gSpriteTemplate_EnemyShadow:: @ 8250A1C + .incbin "baserom.gba", 0x250A1C, 0x18 diff --git a/data/specials.inc b/data/specials.inc index cdd41f50d..5e9a3aeae 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -159,7 +159,7 @@ gSpecials:: @ 815FD60 def_special sub_80CA6BC def_special sub_80CA6DC def_special sub_80CA714 - def_special sub_80CA758 + def_special Special_SetHiddenItemFlag def_special nullsub_75 def_special nullsub_75 def_special Overworld_PlaySpecialMapMusic @@ -281,7 +281,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_61 def_special DoSoftReset - def_special sub_80CA2E4 + def_special Special_HallOfFame def_special sub_80CB498 def_special nullsub_75 def_special SpawnScriptFieldObject @@ -359,7 +359,7 @@ gSpecials:: @ 815FD60 def_special sub_80CADEC def_special sub_805D1A8 def_special sub_80CB0A8 - def_special sub_80CB1D8 + def_special Special_CheckAddCoins def_special GetDaycarePokemonCount def_special sub_80CB63C def_special sub_80CBD80 @@ -371,7 +371,7 @@ gSpecials:: @ 815FD60 def_special sub_80CC2BC def_special sub_80CC3CC def_special sub_80CC524 - def_special sub_8009480 + def_special IsWirelessAdapterConnected def_special sub_8115A24 def_special BerryBlenderLinkJoinGroup def_special UnionRoomSpecial @@ -412,7 +412,7 @@ gSpecials:: @ 815FD60 def_special sub_812B35C def_special Special_SSAnneDepartureCutscene def_special sub_8149A18 - def_special sub_806E25C + def_special IsNationalPokedexEnabled def_special sub_815D9E8 def_special sub_814B504 def_special sub_80CC8CC @@ -430,7 +430,7 @@ gSpecials:: @ 815FD60 def_special sub_814EA7C def_special sub_80CCB94 def_special sub_80CCCF8 - def_special sub_80F39B4 + def_special Special_Credits def_special sub_8153810 def_special sub_809D764 def_special sub_809D8C0 diff --git a/data/strings.s b/data/strings.s index 4f6b40d85..be47054b5 100644 --- a/data/strings.s +++ b/data/strings.s @@ -372,7 +372,7 @@ gUnknown_8416195:: gOtherText_Use:: .string "USE$" -gUnknown_84161A4:: +gOtherText_Toss:: .string "TOSS$" gUnknown_84161A9:: @@ -393,7 +393,7 @@ gFameCheckerText_Cancel:: @ 84161C1 gOtherText_Exit:: @ 84161C8 .string "EXIT$" -gUnknown_84161CD:: @ 84161CD +gString_Dummy:: @ 84161CD .string "$" gUnknown_84161CE:: @@ -555,25 +555,25 @@ gOtherText_WhereShouldTheStrVar1BePlaced:: @ 841633F gText_ItemCantBeHeld:: @ 841635E .string "The {STR_VAR_1} can't be held.$" -gUnknown_8416374:: @ 8416374 +gText_TheStrVar1CantBeHeldHere:: @ 8416374 .string "The {STR_VAR_1} can't be held\nhere.$" gUnknown_841638F:: @ 841638F - .string "Deposit how many\n{STR_VAR_1}シsス?$" + .string "Deposit how many\n{STR_VAR_1}(s)?$" gUnknown_84163A7:: @ 84163A7 - .string "Deposited {STR_VAR_2}\n{STR_VAR_1}シsス.$" + .string "Deposited {STR_VAR_2}\n{STR_VAR_1}(s).$" gUnknown_84163BB:: @ 84163BB .string "There's no room to\nstore items.$" -gUnknown_84163DB:: @ 84163DB - .string "Toss out how many\n{STR_VAR_1}シsス?$" +gText_TossOutHowManyStrVar1s:: @ 84163DB + .string "Toss out how many\n{STR_VAR_1}(s)?$" -gUnknown_84163F4:: @ 84163F4 - .string "Threw away {STR_VAR_2}\n{STR_VAR_1}シsス.$" +gText_ThrewAwayStrVar2StrVar1s:: @ 84163F4 + .string "Threw away {STR_VAR_2}\n{STR_VAR_1}(s).$" -gUnknown_8416409:: @ 8416409 +gText_ThrowAwayStrVar2OfThisItemQM:: @ 8416409 .string "Throw away {STR_VAR_2} of\nthis item?$" gUnknown_8416425:: @ 8416425 @@ -582,13 +582,13 @@ gUnknown_8416425:: @ 8416425 gUnknown_8416451:: @ 8416451 .string "You can't dismount your BIKE here.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416476:: @ 8416476 +gText_ItemfinderResponding:: @ 8416476 .string "Huh?\nThe ITEMFINDER's responding!\pThere's an item buried around here!{PAUSE_UNTIL_PRESS}$" -gUnknown_84164BE:: @ 84164BE +gText_ItemfinderShakingWildly:: @ 84164BE .string "Oh!\nThe ITEMFINDER's shaking wildly!\pThere's an item buried underfoot!\p‥ ‥ ‥ ‥ ‥ ‥{PAUSE_UNTIL_PRESS}$" -gUnknown_8416513:: @ 8416513 +gText_NopeTheresNoResponse:: @ 8416513 .string "‥ ‥ ‥ ‥Nope!\nThere's no response.{PAUSE_UNTIL_PRESS}$" gUnknown_8416537:: @ 8416537 @@ -654,10 +654,10 @@ gText_FontSize2:: @ 8416703 gUnknown_8416707:: @ 8416707 .string " $" -gUnknown_841670A:: @ 841670A +gText_BerryPouch:: @ 841670A .string "BERRY POUCH$" -gUnknown_8416716:: @ 8416716 +gText_TheBerryPouchWillBePutAway:: @ 8416716 .string "The BERRY POUCH will be\nput away.$" gUnknown_8416738:: @ 0x8416738 @@ -3320,263 +3320,348 @@ gUnknown_841D18D:: @ 841D18D .string "ROOFTOP$" .align 2 -gUnknown_841D198:: @ 841D198 +gString_PokemonFireRed_Staff:: @ 841D198 .string "Pokémon FireRed Version\nStaff$" -gUnknown_841D1B6:: @ 0x841D1B6 - .string " Pokémon LeafGreen Version\nStaff$" + .align 2 +gString_PokemonLeafGreen_Staff:: @ 0x841D1B8 + .string "Pokémon LeafGreen Version\nStaff$" -gUnknown_841D1D8:: @ 0x841D1D8 + .align 2 +gCreditsString_Director:: @ 0x841D1D8 .string "\n\nDirector\n\n\n\n$" -gUnknown_841D1E7:: @ 0x841D1E7 - .string " \n\n\nJunichi Masuda\n\n\n$" + .align 2 +gCreditsString_Junichi_Masuda:: @ 0x841D1E8 + .string "\n\n\nJunichi Masuda\n\n\n$" -gUnknown_841D1FD:: @ 0x841D1FD - .string " \nArt Director\n\nBattle Director\n\n\n$" + .align 2 +gCreditsString_Art_Director_Battle_Director:: @ 0x841D200 + .string "\nArt Director\n\nBattle Director\n\n\n$" -gUnknown_841D222:: @ 0x841D222 - .string " \n\nKen Sugimori\n\nShigeki Morimoto\n\n$" + .align 2 +gCreditsString_Ken_Sugimori_Shigeki_Morimoto:: @ 0x841D224 + .string "\n\nKen Sugimori\n\nShigeki Morimoto\n\n$" -gUnknown_841D247:: @ 0x841D247 - .string " Program Leader\n\nPlanning Leader\n\nGraphic Design Leader\n\n$" + .align 2 +gCreditsString_Program_Leader_Planning_Leader_Graphic_Design_Leader:: @ 0x841D248 + .string "Program Leader\n\nPlanning Leader\n\nGraphic Design Leader\n\n$" -gUnknown_841D281:: @ 0x841D281 - .string " \nTetsuya Watanabe\n\nKoji Nishino\n\nTakao Unno\n$" + .align 2 +gCreditsString_Tetsuya_Watanabe_Koji_Nishino_Takao_Unno:: @ 0x841D284 + .string "\nTetsuya Watanabe\n\nKoji Nishino\n\nTakao Unno\n$" -gUnknown_841D2B1:: @ 0x841D2B1 - .string " Programmers\n\n\n\n\n$" + .align 2 +gCreditsString_Programmers:: @ 0x841D2B4 + .string "Programmers\n\n\n\n\n$" -gUnknown_841D2C5:: @ 0x841D2C5 - .string " \nHiroyuki Nakamura\nMasao Taya\nSatoshi Nohara\nMiyuki Iwasawa\nDaisuke Goto\n$" + .align 2 +gCreditsString_Hiroyuki_Nakamura_Masao_Taya_Satoshi_Nohara_Miyuki_Iwasawa_Daisuke_Goto:: @ 0x841D2C8 + .string "\nHiroyuki Nakamura\nMasao Taya\nSatoshi Nohara\nMiyuki Iwasawa\nDaisuke Goto\n$" -gUnknown_841D312:: @ 0x841D312 - .string " System Programmers\n\n\n\n\n\n$" + .align 2 +gCreditsString_System_Programmers:: @ 0x841D314 + .string "System Programmers\n\n\n\n\n\n$" -gUnknown_841D32D:: @ 0x841D32D - .string " \nTetsuya Watanabe\nAkito Mori\nHisashi Sogabe\nSousuke Tamada\n\n$" + .align 2 +gCreditsString_Tetsuya_Watanabe_Akito_Mori_Hisashi_Sogabe_Sousuke_Tamada:: @ 0x841D330 + .string "\nTetsuya Watanabe\nAkito Mori\nHisashi Sogabe\nSousuke Tamada\n\n$" -gUnknown_841D36D:: @ 0x841D36D - .string " Graphic Designers\n\n\n\n\n\n$" + .align 2 +gCreditsString_Graphic_Designers:: @ 0x841D370 + .string "Graphic Designers\n\n\n\n\n\n$" -gUnknown_841D388:: @ 0x841D388 + .align 2 +gCreditsString_Takao_Unno_Asuka_Iwashita_Kanako_Eo_Hiroki_Fuchino:: @ 0x841D388 .string "\nTakao Unno\nAsuka Iwashita\nKanako Eo\nHiroki Fuchino\n\n$" -gUnknown_841D3BE:: @ 0x841D3BE - .string " \nGraphic Designers\n\n\n\n\n$" + .align 2 +gCreditsString_Graphic_Designers_2:: @ 0x841D3C0 + .string "\nGraphic Designers\n\n\n\n\n$" -gUnknown_841D3D8:: @ 0x841D3D8 + .align 2 +gCreditsString_Ken_Sugimori_Hironobu_Yoshida:: @ 0x841D3D8 .string "\n\nKen Sugimori\nHironobu Yoshida\n\n\n$" -gUnknown_841D3FB:: @ 0x841D3FB - .string " \nMusic Composition\n\n\n\n\n$" + .align 2 +gCreditsString_Music_Composition:: @ 0x841D3FC + .string "\nMusic Composition\n\n\n\n\n$" -gUnknown_841D414:: @ 0x841D414 + .align 2 +gCreditsString_Go_Ichinose_Junichi_Masuda:: @ 0x841D414 .string "\n\nGo Ichinose\nJunichi Masuda\n\n\n$" -gUnknown_841D434:: @ 0x841D434 + .align 2 +gCreditsString_Sound_Effects:: @ 0x841D434 .string "\n\nSound Effects\n\n\n\n$" -gUnknown_841D448:: @ 0x841D448 + .align 2 +gCreditsString_Go_Ichinose:: @ 0x841D448 .string "\n\n\nGo Ichinose\n\n\n$" -gUnknown_841D45A:: @ 0x841D45A - .string " \nGame Designers\n\n\n\n\n$" + .align 2 +gCreditsString_Game_Designers:: @ 0x841D45C + .string "\nGame Designers\n\n\n\n\n$" -gUnknown_841D471:: @ 0x841D471 - .string " \n\nJunichi Masuda\nKoji Nishino\nTetsuji Ohta\n\n$" + .align 2 +gCreditsString_Junichi_Masuda_Koji_Nishino_Tetsuji_Ohta:: @ 0x841D474 + .string "\n\nJunichi Masuda\nKoji Nishino\nTetsuji Ohta\n\n$" -gUnknown_841D4A1:: @ 0x841D4A1 - .string " \nGame Designers\n\n\n\n\n$" + .align 2 +gCreditsString_Game_Designers_2:: @ 0x841D4A4 + .string "\nGame Designers\n\n\n\n\n$" -gUnknown_841D4B9:: @ 0x841D4B9 - .string " \n\nHitomi Sato\nShigeru Ohmori\nTadashi Takahashi\n\n$" + .align 2 +gCreditsString_Hitomi_Sato_Shigeru_Ohmori_Tadashi_Takahashi:: @ 0x841D4BC + .string "\n\nHitomi Sato\nShigeru Ohmori\nTadashi Takahashi\n\n$" -gUnknown_841D4ED:: @ 0x841D4ED - .string " \nGame Scenario\n\n\n\n\n$" + .align 2 +gCreditsString_Game_Scenario:: @ 0x841D4F0 + .string "\nGame Scenario\n\n\n\n\n$" -gUnknown_841D504:: @ 0x841D504 + .align 2 +gCreditsString_Hitomi_Sato_Satoshi_Tajiri:: @ 0x841D504 .string "\n\nHitomi Sato\nSatoshi Tajiri\n\n\n$" -gUnknown_841D524:: @ 0x841D524 + .align 2 +gCreditsString_Script_Designer_Map_Designer:: @ 0x841D524 .string "\nScript Designer\n\nMap Designer\n\n\n$" -gUnknown_841D546:: @ 0x841D546 - .string " \n\nSatoshi Nohara\n\nShigeru Ohmori\n\n$" + .align 2 +gCreditsString_Satoshi_Nohara_Shigeru_Ohmori:: @ 0x841D548 + .string "\n\nSatoshi Nohara\n\nShigeru Ohmori\n\n$" -gUnknown_841D56B:: @ 0x841D56B - .string " \nParametric Designers\n\n\n\n\n$" + .align 2 +gCreditsString_Parametric_Designers:: @ 0x841D56C + .string "\nParametric Designers\n\n\n\n\n$" -gUnknown_841D587:: @ 0x841D587 - .string " \n\nKoji Nishino\nTetsuji Ohta\nShigeki Morimoto\n\n$" + .align 2 +gCreditsString_Koji_Nishino_Tetsuji_Ohta_Shigeki_Morimoto:: @ 0x841D588 + .string "\n\nKoji Nishino\nTetsuji Ohta\nShigeki Morimoto\n\n$" -gUnknown_841D5B7:: @ 0x841D5B7 - .string " \n\nPOKéDEX Text\n\n\n\n$" + .align 2 +gCreditsString_POKeDEX_Text:: @ 0x841D5B8 + .string "\n\nPOKéDEX Text\n\n\n\n$" -gUnknown_841D5CB:: @ 0x841D5CB - .string " \n\n\nKenji Matsushima\n\n\n$" + .align 2 +gCreditsString_Kenji_Matsushima:: @ 0x841D5CC + .string "\n\n\nKenji Matsushima\n\n\n$" -gUnknown_841D5E3:: @ 0x841D5E3 - .string " POKéMON Designers\n\n\n\n\n\n$" + .align 2 +gCreditsString_POKeMON_Designers:: @ 0x841D5E4 + .string "POKéMON Designers\n\n\n\n\n\n$" -gUnknown_841D5FC:: @ 0x841D5FC + .align 2 +gCreditsString_Ken_Sugimori_Motofumi_Fujiwara_Shigeki_Morimoto_Hironobu_Yoshida:: @ 0x841D5FC .string "\nKen Sugimori\nMotofumi Fujiwara\nShigeki Morimoto\nHironobu Yoshida\n\n$" -gUnknown_841D640:: @ 0x841D640 + .align 2 +gCreditsString_POKeMON_Designers_2:: @ 0x841D640 .string "POKéMON Designers\n\n\n\n\n\n$" -gUnknown_841D658:: @ 0x841D658 + .align 2 +gCreditsString_Satoshi_Ohta_Asuka_Iwashita_Takao_Unno_Kanako_Eo_Aimi_Tomita:: @ 0x841D658 .string "\nSatoshi Ohta\nAsuka Iwashita\nTakao Unno\nKanako Eo\nAimi Tomita\n$" -gUnknown_841D697:: @ 0x841D697 - .string " POKéMON Designers\n\n\n\n\n\n$" + .align 2 +gCreditsString_POKeMON_Designers_3:: @ 0x841D698 + .string "POKéMON Designers\n\n\n\n\n\n$" -gUnknown_841D6B0:: @ 0x841D6B0 + .align 2 +gCreditsString_Atsuko_Nishida_Muneo_Saito_Rena_Yoshikawa_Jun_Okutani:: @ 0x841D6B0 .string "\nAtsuko Nishida\nMuneo Saito\nRena Yoshikawa\nJun Okutani\n\n$" -gUnknown_841D6E9:: @ 0x841D6E9 - .string " Supporting Programmers\n\n\n\n$" + .align 2 +gCreditsString_Supporting_Programmers:: @ 0x841D6EC + .string "Supporting Programmers\n\n\n\n$" -gUnknown_841D707:: @ 0x841D707 - .string " \nTeruyuki Yoshioka\nTakao Nakano\n\nSatoshi Mitsuhara\nDaisuke Hoshino\n$" + .align 2 +gCreditsString_Teruyuki_Yoshioka_Takao_Nakano_Satoshi_Mitsuhara_Daisuke_Hoshino:: @ 0x841D708 + .string "\nTeruyuki Yoshioka\nTakao Nakano\n\nSatoshi Mitsuhara\nDaisuke Hoshino\n$" -gUnknown_841D74C:: @ 0x841D74C + .align 2 +gCreditsString_NCL_Product_Testing:: @ 0x841D74C .string "\n\nNCL Product Testing\n\n\n\n$" -gUnknown_841D766:: @ 0x841D766 - .string " \n\n\nNCL Super Mario Club\n\n\n$" + .align 2 +gCreditsString_NCL_Super_Mario_Club:: @ 0x841D768 + .string "\n\n\nNCL Super Mario Club\n\n\n$" -gUnknown_841D783:: @ 0x841D783 - .string " Special Thanks\n\n\n\n\n\n$" + .align 2 +gCreditsString_Special_Thanks:: @ 0x841D784 + .string "Special Thanks\n\n\n\n\n\n$" -gUnknown_841D799:: @ 0x841D799 - .string " \nHiro Nakamura\nHiroyuki Uesugi\nTeruki Murakawa\n\nKazuya Suyama\n$" + .align 2 +gCreditsString_Hiro_Nakamura_Hiroyuki_Uesugi_Teruki_Murakawa_Kazuya_Suyama:: @ 0x841D79C + .string "\nHiro Nakamura\nHiroyuki Uesugi\nTeruki Murakawa\n\nKazuya Suyama\n$" -gUnknown_841D7DB:: @ 0x841D7DB - .string " Special Thanks\n\n\n\n\n\n$" + .align 2 +gCreditsString_Special_Thanks_2:: @ 0x841D7DC + .string "Special Thanks\n\n\n\n\n\n$" -gUnknown_841D7F1:: @ 0x841D7F1 - .string " \nKenji Tominaga\n\nKenjiro Ito\nTomotaka Komura\nMichiko Takizawa\n$" + .align 2 +gCreditsString_Kenji_Tominaga_Kenjiro_Ito_Tomotaka_Komura_Michiko_Takizawa:: @ 0x841D7F4 + .string "\nKenji Tominaga\n\nKenjiro Ito\nTomotaka Komura\nMichiko Takizawa\n$" -gUnknown_841D833:: @ 0x841D833 - .string " Special Thanks\n\n\n\n\n\n$" + .align 2 +gCreditsString_Special_Thanks_3:: @ 0x841D834 + .string "Special Thanks\n\n\n\n\n\n$" -gUnknown_841D849:: @ 0x841D849 - .string " \nMakiko Takada\nMikiko Ohashi\nShusaku Egami\nTakanao Kondo\nRui Kawaguchi\n$" + .align 2 +gCreditsString_Makiko_Takada_Mikiko_Ohashi_Shusaku_Egami_Takanao_Kondo_Rui_Kawaguchi:: @ 0x841D84C + .string "\nMakiko Takada\nMikiko Ohashi\nShusaku Egami\nTakanao Kondo\nRui Kawaguchi\n$" -gUnknown_841D894:: @ 0x841D894 + .align 2 +gCreditsString_Braille_Code_Check:: @ 0x841D894 .string "\n\nBraille Code Check\n\n\n\n$" -gUnknown_841D8AD:: @ 0x841D8AD - .string " \n\n\nJapan Braille Library\n\n\n$" + .align 2 +gCreditsString_Japan_Braille_Library:: @ 0x841D8B0 + .string "\n\n\nJapan Braille Library\n\n\n$" -gUnknown_841D8CC:: @ 0x841D8CC + .align 2 +gCreditsString_Information_Supervisors:: @ 0x841D8CC .string "Information Supervisors\n\n\n\n\n\n$" -gUnknown_841D8EA:: @ 0x841D8EA - .string " \nHiroki Enomoto\nKazuyuki Terada\nYuri Sakurai\nYumi Funasaka\nNaoko Yanase\n$" + .align 2 +gCreditsString_Hiroki_Enomoto_Kazuyuki_Terada_Yuri_Sakurai_Yumi_Funasaka_Naoko_Yanase:: @ 0x841D8EC + .string "\nHiroki Enomoto\nKazuyuki Terada\nYuri Sakurai\nYumi Funasaka\nNaoko Yanase\n$" -gUnknown_841D935:: @ 0x841D935 - .string " Coordinators\n\n\n\n\n\n$" + .align 2 +gCreditsString_Coordinators:: @ 0x841D938 + .string "Coordinators\n\n\n\n\n\n$" -gUnknown_841D94B:: @ 0x841D94B - .string " \nAzusa Tajima\nAkira Kinashi\nKazuki Yoshihara\n\nRetsuji Nomoto\n$" + .align 2 +gCreditsString_Azusa_Tajima_Akira_Kinashi_Kazuki_Yoshihara_Retsuji_Nomoto:: @ 0x841D94C + .string "\nAzusa Tajima\nAkira Kinashi\nKazuki Yoshihara\n\nRetsuji Nomoto\n$" -gUnknown_841D98A:: @ 0x841D98A - .string " \nTask Managers\n\n\n\n\n$" + .align 2 +gCreditsString_Task_Managers:: @ 0x841D98C + .string "\nTask Managers\n\n\n\n\n$" -gUnknown_841D9A0:: @ 0x841D9A0 + .align 2 +gCreditsString_Hitoshi_Yamagami_Gakuji_Nomoto:: @ 0x841D9A0 .string "\n\nHitoshi Yamagami\nGakuji Nomoto\n\n\n$" -gUnknown_841D9C4:: @ 0x841D9C4 + .align 2 +gCreditsString_Producers:: @ 0x841D9C4 .string "\nProducers\n\n\n\n\n$" -gUnknown_841D9D4:: @ 0x841D9D4 + .align 2 +gCreditsString_Hiroyuki_Jinnai_Takehiro_Izushi_Hiroaki_Tsuru:: @ 0x841D9D4 .string "\n\nHiroyuki Jinnai\nTakehiro Izushi\nHiroaki Tsuru\n\n$" -gUnknown_841DA06:: @ 0x841DA06 - .string " \n\nExecutive Director\n\n\n\n$" + .align 2 +gCreditsString_Executive_Director:: @ 0x841DA08 + .string "\n\nExecutive Director\n\n\n\n$" -gUnknown_841DA21:: @ 0x841DA21 - .string " \n\n\nSatoshi Tajiri\n\n\n$" + .align 2 +gCreditsString_Satoshi_Tajiri:: @ 0x841DA24 + .string "\n\n\nSatoshi Tajiri\n\n\n$" -gUnknown_841DA39:: @ 0x841DA39 - .string " \n\nExecutive Producer\n\n\n\n$" + .align 2 +gCreditsString_Executive_Producer:: @ 0x841DA3C + .string "\n\nExecutive Producer\n\n\n\n$" -gUnknown_841DA55:: @ 0x841DA55 - .string " \n\n\nSatoru Iwata\n\n\n$" + .align 2 +gCreditsString_Satoru_Iwata:: @ 0x841DA58 + .string "\n\n\nSatoru Iwata\n\n\n$" -gUnknown_841DA6B:: @ 0x841DA6B - .string " \n\nExecutive Producer\n\n\n\n$" + .align 2 +gCreditsString_Executive_Producer_2:: @ 0x841DA6C + .string "\n\nExecutive Producer\n\n\n\n$" -gUnknown_841DA85:: @ 0x841DA85 - .string " \n\n\nTsunekaz Ishihara\n\n\n$" + .align 2 +gCreditsString_Tsunekaz_Ishihara:: @ 0x841DA88 + .string "\n\n\nTsunekaz Ishihara\n\n\n$" -gUnknown_841DAA0:: @ 0x841DAA0 + .align 2 +gCreditsString_English_Version_Coordinators:: @ 0x841DAA0 .string "\nEnglish Version Coordinators\n\n\n\n\n$" -gUnknown_841DAC3:: @ 0x841DAC3 - .string " \n\nHiro Nakamura\nSeth McMahill\n\n\n$" + .align 2 +gCreditsString_Hiro_Nakamura_Seth_McMahill:: @ 0x841DAC4 + .string "\n\nHiro Nakamura\nSeth McMahill\n\n\n$" -gUnknown_841DAE5:: @ 0x841DAE5 - .string " \nTranslator\n\nText Editor\n\n\n$" + .align 2 +gCreditsString_Translator_Text_Editor:: @ 0x841DAE8 + .string "\nTranslator\n\nText Editor\n\n\n$" -gUnknown_841DB04:: @ 0x841DB04 + .align 2 +gCreditsString_Nob_Ogasawara_Teresa_Lillygren:: @ 0x841DB04 .string "\n\nNob Ogasawara\n\nTeresa Lillygren\n\n$" -gUnknown_841DB28:: @ 0x841DB28 + .align 2 +gCreditsString_Programmers_2:: @ 0x841DB28 .string "Programmers\n\n\n\n\n\n$" -gUnknown_841DB3A:: @ 0x841DB3A - .string " \nTeruki Murakawa\nSouichi Yamamoto\nYuichiro Ito\nAkira Kinashi\n\n$" + .align 2 +gCreditsString_Teruki_Murakawa_Souichi_Yamamoto_Yuichiro_Ito_Akira_Kinashi:: @ 0x841DB3C + .string "\nTeruki Murakawa\nSouichi Yamamoto\nYuichiro Ito\nAkira Kinashi\n\n$" -gUnknown_841DB7B:: @ 0x841DB7B - .string " \nEnvironment を Tool Programmers\n\n\n\n\n$" + .align 2 +gCreditsString_Environment_Tool_Programmers:: @ 0x841DB7C + .string "\nEnvironment を Tool Programmers\n\n\n\n\n$" -gUnknown_841DBA1:: @ 0x841DBA1 - .string " \n\nTeruki Murakawa\nSouichi Yamamoto\nKimiko Nakamichi\n\n$" + .align 2 +gCreditsString_Teruki_Murakawa_Souichi_Yamamoto_Kimiko_Nakamichi:: @ 0x841DBA4 + .string "\n\nTeruki Murakawa\nSouichi Yamamoto\nKimiko Nakamichi\n\n$" -gUnknown_841DBDA:: @ 0x841DBDA - .string " NOA Product Testing\n\n\n\n\n\n$" + .align 2 +gCreditsString_NOA_Product_Testing:: @ 0x841DBDC + .string "NOA Product Testing\n\n\n\n\n\n$" -gUnknown_841DBF6:: @ 0x841DBF6 - .string " \nThomas Hertzog\nKathy Huguenard\nMika Kurosawa\n\n\n$" + .align 2 +gCreditsString_Thomas_Hertzog_Kathy_Huguenard_Mika_Kurosawa:: @ 0x841DBF8 + .string "\nThomas Hertzog\nKathy Huguenard\nMika Kurosawa\n\n\n$" -gUnknown_841DC29:: @ 0x841DC29 - .string " Braille Code Check\n\n\n\n\n\n$" + .align 2 +gCreditsString_Braille_Code_Check_2:: @ 0x841DC2C + .string "Braille Code Check\n\n\n\n\n\n$" -gUnknown_841DC45:: @ 0x841DC45 - .string " \nNational Federation\n{CLEAR_TO 0x13}of the Blind\nPatricia A. Maurer\nJapan Braille Library\nEuropean Blind Union\n$" + .align 2 +gCreditsString_National_Federation_of_the_Blind_Patricia_A_Maurer_Japan_Braille_Library_European_Blind_Union:: @ 0x841DC48 + .string "\nNational Federation\n{CLEAR_TO 0x13}of the Blind\nPatricia A. Maurer\nJapan Braille Library\nEuropean Blind Union\n$" -gUnknown_841DCAC:: @ 0x841DCAC + .align 2 +gCreditsString_Braille_Code_Check_3:: @ 0x841DCAC .string "\nBraille Code Check\n\n\n\n\n$" -gUnknown_841DCC5:: @ 0x841DCC5 - .string " \n\nNational Information Library\n{CLEAR_TO 0x2D}Service\nMargaret Campion\n\n$" + .align 2 +gCreditsString_National_Information_Library_Service_Margaret_Campion:: @ 0x841DCC8 + .string "\n\nNational Information Library\n{CLEAR_TO 0x2D}Service\nMargaret Campion\n\n$" -gUnknown_841DD05:: @ 0x841DD05 - .string " Special Thanks\n\n\n\n\n\n$" + .align 2 +gCreditsString_Special_Thanks_4:: @ 0x841DD08 + .string "Special Thanks\n\n\n\n\n\n$" -gUnknown_841DD1D:: @ 0x841DD1D - .string " \nTakehiro Izushi\nMotoyasu Tojima\nHitoshi Yamagami\nHiroyuki Uesugi\n\n$" + .align 2 +gCreditsString_Takehiro_Izushi_Motoyasu_Tojima_Hitoshi_Yamagami_Hiroyuki_Uesugi:: @ 0x841DD20 + .string "\nTakehiro Izushi\nMotoyasu Tojima\nHitoshi Yamagami\nHiroyuki Uesugi\n\n$" -gUnknown_841DD64:: @ 0x841DD64 + .align 2 +gCreditsString_Special_Thanks_5:: @ 0x841DD64 .string "Special Thanks\n\n\n\n\n\n$" -gUnknown_841DD79:: @ 0x841DD79 - .string " \nNicola Pratt-Barlow\nShellie Dow\nAnthony Howitt\nNaoko Saeki\nKyoko Onishi\n$" + .align 2 +gCreditsString_Nicola_Pratt_Barlow_Shellie_Dow_Anthony_Howitt_Naoko_Saeki_Kyoko_Onishi:: @ 0x841DD7C + .string "\nNicola Pratt-Barlow\nShellie Dow\nAnthony Howitt\nNaoko Saeki\nKyoko Onishi\n$" -gUnknown_841DDC6:: @ 0x841DDC6 - .string " \nBraille Code Check\n\n\n\n\n$" + .align 2 +gCreditsString_Braille_Code_Check_4:: @ 0x841DDC8 + .string "\nBraille Code Check\n\n\n\n\n$" -gUnknown_841DDE1:: @ 0x841DDE1 - .string " \n\nThe Royal New Zealand\nFoundation of the Blind\nGreg Moran\n\n$" + .align 2 +gCreditsString_The_Royal_New_Zealand_Foundation_of_the_Blind_Greg_Moran:: @ 0x841DDE4 + .string "\n\nThe Royal New Zealand\nFoundation of the Blind\nGreg Moran\n\n$" -gUnknown_841DE21:: @ 0x841DE21 - .string " \n\nGraphic Designer\n\n\n\n$" + .align 2 +gCreditsString_Graphic_Designer:: @ 0x841DE24 + .string "\n\nGraphic Designer\n\n\n\n$" -gUnknown_841DE3B:: @ 0x841DE3B - .string " \n\n\nAkira Kinashi\n\n\n$" + .align 2 +gCreditsString_Akira_Kinashi:: @ 0x841DE3C + .string "\n\n\nAkira Kinashi\n\n\n$" gJPText_MysteryGift:: @ 841DE50 .string "$" @@ -3629,22 +3714,22 @@ gUnknown_841DE9B:: @ 841DE9B gUnknown_841DE9C:: @ 841DE9C .string "$" -gUnknown_841DE9D:: @ 841DE9D +gText_CommErrorCheckConnections:: @ 841DE9D .string "Communication error…\n" .string "Please check all connections,\n" .string "then turn the power OFF and ON.$" -gUnknown_841DEF0:: @ 841DEF0 +gText_CommErrorEllipsis:: @ 841DEF0 .string "Communication error…$" -gUnknown_841DF05:: @ 841DF05 +gText_MoveCloserToLinkPartner:: @ 841DF05 .string "Move closer to your link partner(s).\n" .string "Avoid obstacles between partners.$" -gUnknown_841DF4C:: @ 841DF4C +gText_ABtnRegistrationCounter:: @ 841DF4C .string "A Button: Registration Counter$" -gUnknown_841DF6B:: @ 841DF6B +gText_ABtnTitleScreen:: @ 841DF6B .string "A Button: Title Screen$" gUnknown_841DF82:: @ 841DF82 diff --git a/data/text/decoration_descriptions.inc b/data/text/decoration_descriptions.inc new file mode 100644 index 000000000..358070cb1 --- /dev/null +++ b/data/text/decoration_descriptions.inc @@ -0,0 +1,573 @@ +gUnknown_8454238:: @ 8454238 + .string "A small desk built\n" + .string "for one.$" + +gUnknown_8454254:: @ 8454254 + .string "A small desk built in\n" + .string "the shape of a POKé\n" + .string "BALL.$" + +gUnknown_8454284:: @ 8454284 + .string "A large desk made\n" + .string "of steel. Put some\n" + .string "decorations on it.$" + +gUnknown_84542BC:: @ 84542BC + .string "A large desk made\n" + .string "of wood. Put some\n" + .string "decorations on it.$" + +gUnknown_84542F3:: @ 84542F3 + .string "A large desk made\n" + .string "of leaves. Put some\n" + .string "decorations on it.$" + +gUnknown_845432C:: @ 845432C + .string "A huge desk made\n" + .string "of glass. Holds lots\n" + .string "of decorations.$" + +gUnknown_8454362:: @ 8454362 + .string "A huge desk made\n" + .string "of brick. Holds lots\n" + .string "of decorations.$" + +gUnknown_8454398:: @ 8454398 + .string "A huge desk made\n" + .string "of logs. Put lots of\n" + .string "decorations on it.$" + +gUnknown_84543D1:: @ 84543D1 + .string "A huge desk made\n" + .string "of rocks. Holds\n" + .string "many decorations.$" + +gUnknown_8454404:: @ 8454404 + .string "A small chair made\n" + .string "for one.$" + +gUnknown_8454420:: @ 8454420 + .string "A small chair built\n" + .string "in the shape of a\n" + .string "POKé BALL.$" + +gUnknown_8454451:: @ 8454451 + .string "A small chair made\n" + .string "of steel.$" + +gUnknown_845446E:: @ 845446E + .string "A small chair made\n" + .string "of glass.$" + +gUnknown_845448B:: @ 845448B + .string "A small chair made\n" + .string "of leaves.$" + +gUnknown_84544A9:: @ 84544A9 + .string "A small chair made\n" + .string "of wood.$" + +gUnknown_84544C5:: @ 84544C5 + .string "A small chair made\n" + .string "of brick.$" + +gUnknown_84544E2:: @ 84544E2 + .string "A small chair made\n" + .string "of logs.$" + +gUnknown_84544FE:: @ 84544FE + .string "A small chair made\n" + .string "of rock.$" + +gUnknown_845451A:: @ 845451A + .string "A vivid red potted\n" + .string "plant.$" + +gUnknown_8454534:: @ 8454534 + .string "A flowering tropical\n" + .string "plant in a pot.$" + +gUnknown_8454559:: @ 8454559 + .string "A pot of cute\n" + .string "flowers.$" + +gUnknown_8454570:: @ 8454570 + .string "A large pot with\n" + .string "many colorful\n" + .string "flowers.$" + +gUnknown_8454598:: @ 8454598 + .string "A large, umbrella-\n" + .string "shaped plant in a\n" + .string "big pot.$" + +gUnknown_84545C6:: @ 84545C6 + .string "A large, impressive\n" + .string "plant in a big pot.$" + +gUnknown_84545EE:: @ 84545EE + .string "A red-colored brick.\n" + .string "Decorations can be\n" + .string "placed on top.$" + +gUnknown_8454625:: @ 8454625 + .string "A yellow-colored\n" + .string "brick. Put some\n" + .string "decorations on top.$" + +gUnknown_845465A:: @ 845465A + .string "A blue-colored\n" + .string "brick. Put some\n" + .string "decorations on top.$" + +gUnknown_845468D:: @ 845468D + .string "A red balloon filled\n" + .string "with water. Bursts\n" + .string "if stepped on.$" + +gUnknown_84546C4:: @ 84546C4 + .string "A blue balloon filled\n" + .string "with water. Bursts\n" + .string "if stepped on.$" + +gUnknown_84546FC:: @ 84546FC + .string "A yellow balloon\n" + .string "filled with water.\n" + .string "Pops if stepped on.$" + +gUnknown_8454734:: @ 8454734 + .string "A large red tent.\n" + .string "You can hide inside\n" + .string "it.$" + +gUnknown_845475E:: @ 845475E + .string "A large blue tent.\n" + .string "You can hide inside\n" + .string "it.$" + +gUnknown_8454789:: @ 8454789 + .string "Place over a hole to\n" + .string "cross to the other\n" + .string "side.$" + +gUnknown_84547B7:: @ 84547B7 + .string "Use to slide down\n" + .string "from the platform.$" + +gUnknown_84547DC:: @ 84547DC + .string "A small fence that\n" + .string "blocks passage.$" + +gUnknown_84547FF:: @ 84547FF + .string "A small fence that\n" + .string "blocks passage.$" + +gUnknown_8454822:: @ 8454822 + .string "An old large tire.\n" + .string "Decorations can be\n" + .string "placed on top.$" + +gUnknown_8454857:: @ 8454857 + .string "A large pedestal\n" + .string "with steps.$" + +gUnknown_8454874:: @ 8454874 + .string "A large ball of mud.\n" + .string "Crumbles if stepped\n" + .string "on.$" + +gUnknown_84548A1:: @ 84548A1 + .string "A weird door that\n" + .string "people can walk\n" + .string "right through.$" + +gUnknown_84548D2:: @ 84548D2 + .string "An ornament made\n" + .string "of sand. Crumbles if\n" + .string "touched.$" + +gUnknown_8454901:: @ 8454901 + .string "Awarded for 50\n" + .string "straight wins at\n" + .string "the BATTLE TOWER.$" + +gUnknown_8454933:: @ 8454933 + .string "Awarded for 100\n" + .string "straight wins at\n" + .string "the BATTLE TOWER.$" + +gUnknown_8454966:: @ 8454966 + .string "A glass replica of\n" + .string "a famous sculpture\n" + .string "at the ART MUSEUM.$" + +gUnknown_845499F:: @ 845499F + .string "A small, gray-\n" + .string "colored toy TV.$" + +gUnknown_84549BE:: @ 84549BE + .string "A toy TV modeled\n" + .string "in the image of a\n" + .string "SEEDOT.$" + +gUnknown_84549E9:: @ 84549E9 + .string "A toy TV modeled\n" + .string "in the image of a\n" + .string "SKITTY.$" + +gUnknown_8454A14:: @ 8454A14 + .string "An odd mat that\n" + .string "glitters if stepped\n" + .string "on.$" + +gUnknown_8454A3C:: @ 8454A3C + .string "A trick mat that\n" + .string "jumps when it is\n" + .string "stepped on.$" + +gUnknown_8454A6A:: @ 8454A6A + .string "A trick mat that\n" + .string "spins around when\n" + .string "stepped on.$" + +gUnknown_8454A99:: @ 8454A99 + .string "A mat that plays\n" + .string "a low C note when\n" + .string "stepped on.$" + +gUnknown_8454AC8:: @ 8454AC8 + .string "A mat that plays\n" + .string "a D note when\n" + .string "stepped on.$" + +gUnknown_8454AF3:: @ 8454AF3 + .string "A mat that plays\n" + .string "an E note when\n" + .string "stepped on.$" + +gUnknown_8454B1F:: @ 8454B1F + .string "A mat that plays\n" + .string "an F note when\n" + .string "stepped on.$" + +gUnknown_8454B4B:: @ 8454B4B + .string "A mat that plays\n" + .string "a G note when\n" + .string "stepped on.$" + +gUnknown_8454B76:: @ 8454B76 + .string "A mat that plays\n" + .string "an A note when\n" + .string "stepped on.$" + +gUnknown_8454BA2:: @ 8454BA2 + .string "A mat that plays\n" + .string "a B note when\n" + .string "stepped on.$" + +gUnknown_8454BCD:: @ 8454BCD + .string "A mat that plays\n" + .string "a high C note when\n" + .string "stepped on.$" + +gUnknown_8454BFD:: @ 8454BFD + .string "A mat designed with\n" + .string "a SURF image.\n" + .string "Put items on top.$" + +gUnknown_8454C31:: @ 8454C31 + .string "A mat designed with\n" + .string "a THUNDER image.\n" + .string "Put items on top.$" + +gUnknown_8454C68:: @ 8454C68 + .string "A mat designed with\n" + .string "a FIRE BLAST image.\n" + .string "Put items on top.$" + +gUnknown_8454CA2:: @ 8454CA2 + .string "A mat with a POWDER\n" + .string "SNOW image design.\n" + .string "Put items on top.$" + +gUnknown_8454CDB:: @ 8454CDB + .string "A mat designed with\n" + .string "an ATTRACT image.\n" + .string "Put items on top.$" + +gUnknown_8454D13:: @ 8454D13 + .string "A mat designed with\n" + .string "a FISSURE image.\n" + .string "Put items on top.$" + +gUnknown_8454D4A:: @ 8454D4A + .string "A mat designed with\n" + .string "a SPIKES image.\n" + .string "Put items on top.$" + +gUnknown_8454D80:: @ 8454D80 + .string "A small poster\n" + .string "printed with POKé\n" + .string "BALLS.$" + +gUnknown_8454DA8:: @ 8454DA8 + .string "A small poster with\n" + .string "a TREECKO print.$" + +gUnknown_8454DCD:: @ 8454DCD + .string "A small poster with\n" + .string "a TORCHIC print.$" + +gUnknown_8454DF2:: @ 8454DF2 + .string "A small poster with\n" + .string "a MUDKIP print.$" + +gUnknown_8454E16:: @ 8454E16 + .string "A small poster with\n" + .string "an AZURILL print.$" + +gUnknown_8454E3C:: @ 8454E3C + .string "A large poster with\n" + .string "a PIKACHU and\n" + .string "PICHU print.$" + +gUnknown_8454E6B:: @ 8454E6B + .string "A large poster with\n" + .string "a SEVIPER print.$" + +gUnknown_8454E90:: @ 8454E90 + .string "A large poster with\n" + .string "a RELICANTH print.$" + +gUnknown_8454EB7:: @ 8454EB7 + .string "A large poster with\n" + .string "a WINGULL print.$" + +gUnknown_8454EDC:: @ 8454EDC + .string "A large poster with\n" + .string "a SMOOCHUM print.$" + +gUnknown_8454F02:: @ 8454F02 + .string "A PICHU doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8454F2D:: @ 8454F2D + .string "A PIKACHU doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8454F5A:: @ 8454F5A + .string "A MARILL doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8454F86:: @ 8454F86 + .string "A TOGEPI doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8454FB2:: @ 8454FB2 + .string "A CYNDAQUIL doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8454FE1:: @ 8454FE1 + .string "A CHIKORITA doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455010:: @ 8455010 + .string "A TOTODILE doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_845503E:: @ 845503E + .string "A JIGGLYPUFF doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_845506E:: @ 845506E + .string "A MEOWTH doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_845509A:: @ 845509A + .string "A CLEFAIRY doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84550C8:: @ 84550C8 + .string "A DITTO doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84550F3:: @ 84550F3 + .string "A SMOOCHUM doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455121:: @ 8455121 + .string "A TREECKO doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_845514E:: @ 845514E + .string "A TORCHIC doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_845517B:: @ 845517B + .string "A MUDKIP doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84551A7:: @ 84551A7 + .string "A DUSKULL doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84551D4:: @ 84551D4 + .string "A WYNAUT doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455200:: @ 8455200 + .string "A BALTOY doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_845522C:: @ 845522C + .string "A KECLEON doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455259:: @ 8455259 + .string "An AZURILL doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455287:: @ 8455287 + .string "A SKITTY doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84552B3:: @ 84552B3 + .string "A SWABLU doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84552DF:: @ 84552DF + .string "A GULPIN doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_845530B:: @ 845530B + .string "A LOTAD doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455336:: @ 8455336 + .string "A SEEDOT doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455362:: @ 8455362 + .string "A PIKACHU cushion.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455392:: @ 8455392 + .string "A MARILL cushion.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84553C1:: @ 84553C1 + .string "A SMOOCHUM\n" + .string "cushion. Place it on\n" + .string "a mat or a desk.$" + +gUnknown_84553F2:: @ 84553F2 + .string "A ZIGZAGOON\n" + .string "cushion. Place it on\n" + .string "a mat or a desk.$" + +gUnknown_8455424:: @ 8455424 + .string "A SPINDA cushion.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455453:: @ 8455453 + .string "A SABLEYE cushion.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455483:: @ 8455483 + .string "A BALL cushion.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84554B0:: @ 84554B0 + .string "A grass-mark\n" + .string "cushion. Place it on\n" + .string "a mat or a desk.$" + +gUnknown_84554E3:: @ 84554E3 + .string "A fire-mark\n" + .string "cushion. Place it on\n" + .string "a mat or a desk.$" + +gUnknown_8455515:: @ 8455515 + .string "A water-mark\n" + .string "cushion. Place it on\n" + .string "a mat or a desk.$" + +gUnknown_8455548:: @ 8455548 + .string "A large doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455573:: @ 8455573 + .string "A large doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_845559E:: @ 845559E + .string "A large doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84555C9:: @ 84555C9 + .string "A large doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84555F4:: @ 84555F4 + .string "A large doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_845561F:: @ 845561F + .string "A large doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_845564A:: @ 845564A + .string "A large doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_8455675:: @ 8455675 + .string "A large doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84556A0:: @ 84556A0 + .string "A large doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" + +gUnknown_84556CB:: @ 84556CB + .string "A large doll.\n" + .string "Place it on a mat\n" + .string "or a desk.$" diff --git a/data/wild_pokemon_area.s b/data/wild_pokemon_area.s deleted file mode 100644 index 26913b7c6..000000000 --- a/data/wild_pokemon_area.s +++ /dev/null @@ -1,14 +0,0 @@ - .section .rodata - .align 2 - -gUnknown_8464148:: @ 8464148 - .incbin "baserom.gba", 0x464148, 0x174 - -gUnknown_84642BC:: @ 84642BC - .incbin "baserom.gba", 0x4642BC, 0x4 - -gUnknown_84642C0:: @ 84642C0 - .incbin "baserom.gba", 0x4642C0, 0x34 - -gUnknown_84642F4:: @ 84642F4 - .incbin "baserom.gba", 0x4642F4, 0xC |
