diff options
| -rw-r--r-- | data/text/battle.asm | 1083 | ||||
| -rwxr-xr-x | items/item_effects.asm | 2 | ||||
| -rw-r--r-- | main.asm | 6 | ||||
| -rw-r--r-- | wram.asm | 4 |
4 files changed, 1090 insertions, 5 deletions
diff --git a/data/text/battle.asm b/data/text/battle.asm new file mode 100644 index 00000000..0f21e800 --- /dev/null +++ b/data/text/battle.asm @@ -0,0 +1,1083 @@ +BattleText:: ; used only for BANK(BattleText) + +BattleText_PlayerPickedUpPayDayMoney: + text "<PLAYER> picked up" + line "¥@" + deciram wPayDayMoney, 3, 6 + text "!" + prompt + +WildPokemonAppearedText: + text "Wild @" + text_from_ram wEnemyMonNick + text_start + line "appeared!" + prompt + +HookedPokemonAttackedText: + text "The hooked" + line "@" + text_from_ram wEnemyMonNick + text_start + cont "attacked!" + prompt + +PokemonFellFromTreeText: + text_from_ram wEnemyMonNick + text " fell" + line "out of the tree!" + prompt + +WantsToBattleText:: + text "<ENEMY>" + line "wants to battle!" + prompt + +BattleText_WildFled: + text "Wild @" + text_from_ram wEnemyMonNick + text_start + line "fled!" + prompt + +BattleText_EnemyFled: + text "Enemy @" + text_from_ram wEnemyMonNick + text_start + line "fled!" + prompt + +HurtByPoisonText: + text "<USER>" + line "is hurt by poison!" + prompt + +HurtByBurnText: + text "<USER>'s" + line "hurt by its burn!" + prompt + +LeechSeedSapsText: + text "LEECH SEED saps" + line "<USER>!" + prompt + +HasANightmareText: + text "<USER>" + line "has a NIGHTMARE!" + prompt + +HurtByCurseText: + text "<USER>'s" + line "hurt by the CURSE!" + prompt + +SandstormHitsText: + text "The SANDSTORM hits" + line "<USER>!" + prompt + +PerishCountText: + text "<USER>'s" + line "PERISH count is @" + deciram wDeciramBuffer, 1, 1 + text "!" + prompt + +BattleText_TargetRecoveredWithItem: + text "<TARGET>" + line "recovered with" + cont "@" + text_from_ram wStringBuffer1 + text "." + prompt + +BattleText_UserRecoveredPPUsing: + text "<USER>" + line "recovered PP using" + cont "@" + text_from_ram wStringBuffer1 + text "." + prompt + +BattleText_TargetWasHitByFutureSight: + text "<TARGET>" + line "was hit by FUTURE" + cont "SIGHT!" + prompt + +BattleText_SafeguardFaded: + text "<USER>'s" + line "SAFEGUARD faded!" + prompt + +BattleText_MonsLightScreenFell: + text_from_ram wStringBuffer1 + text " #MON's" + line "LIGHT SCREEN fell!" + prompt + +BattleText_MonsReflectFaded: + text_from_ram wStringBuffer1 + text " #MON's" + line "REFLECT faded!" + prompt + +BattleText_RainContinuesToFall: + text "Rain continues to" + line "fall." + prompt + +BattleText_TheSunlightIsStrong: + text "The sunlight is" + line "strong." + prompt + +BattleText_TheSandstormRages: + text "The SANDSTORM" + line "rages." + prompt + +BattleText_TheRainStopped: + text "The rain stopped." + prompt + +BattleText_TheSunlightFaded: + text "The sunlight" + line "faded." + prompt + +BattleText_TheSandstormSubsided: + text "The SANDSTORM" + line "subsided." + prompt + +BattleText_EnemyMonFainted: + text "Enemy @" + text_from_ram wEnemyMonNick + text_start + line "fainted!" + prompt + +GotMoneyForWinningText: + text "<PLAYER> got ¥@" + deciram wBattleReward, 3, 6 + text_start + line "for winning!" + prompt + +BattleText_EnemyWasDefeated: + text "<ENEMY>" + line "was defeated!" + prompt + +TiedAgainstText: + text "Tied against" + line "<ENEMY>!" + prompt + +SentSomeToMomText: + text "<PLAYER> got ¥@" + deciram wBattleReward, 3, 6 + text_start + line "for winning!" + cont "Sent some to MOM!" + prompt + +SentHalfToMomText: + text "Sent half to MOM!" + prompt + +SentAllToMomText: + text "Sent all to MOM!" + prompt + +BattleText_0x80a4f: + text "<RIVAL>: Huh? I" + line "should've chosen" + cont "your #MON!" + prompt + +BattleText_MonFainted: + text_from_ram wBattleMonNick + text_start + line "fainted!" + prompt + +BattleText_UseNextMon: + text "Use next #MON?" + done + +BattleText_0x80a93: + text "<RIVAL>: Yes!" + line "I guess I chose a" + cont "good #MON!" + prompt + +LostAgainstText: + text "Lost against" + line "<ENEMY>!" + prompt + +BattleText_EnemyIsAboutToUseWillPlayerChangeMon: + text "<ENEMY>" + line "is about to use" + cont "@" + text_from_ram wEnemyMonNick + text "." + + para "Will <PLAYER>" + line "change #MON?" + done + +BattleText_EnemySentOut: + text "<ENEMY>" + line "sent out" + cont "@" + text_from_ram wEnemyMonNick + text "!" + done + +BattleText_TheresNoWillToBattle: + text "There's no will to" + line "battle!" + prompt + +BattleText_AnEGGCantBattle: + text "An EGG can't" + line "battle!" + prompt + +BattleText_CantEscape2: + text "Can't escape!" + prompt + +BattleText_TheresNoEscapeFromTrainerBattle: + text "No! There's no" + line "running from a" + cont "trainer battle!" + prompt + +BattleText_GotAwaySafely: + text "Got away safely!" + prompt + +BattleText_UserFledUsingAStringBuffer1: + text "<USER>" + line "fled using a" + cont "@" + text_from_ram wStringBuffer1 + text "!" + prompt + +BattleText_CantEscape: + text "Can't escape!" + prompt + +BattleText_UserHurtBySpikes: + text "<USER>'s" + line "hurt by SPIKES!" + prompt + +RecoveredUsingText: + text "<TARGET>" + line "recovered using a" + cont "@" + text_from_ram wStringBuffer1 + text "!" + prompt + +BattleText_UsersStringBuffer1Activated: + text "<USER>'s" + line "@" + text_from_ram wStringBuffer1 + text_start + cont "activated!" + prompt + +BattleText_ItemsCantBeUsedHere: + text "Items can't be" + line "used here." + prompt + +BattleText_MonIsAlreadyOut: + text_from_ram wBattleMonNick + text_start + line "is already out." + prompt + +BattleText_MonCantBeRecalled: + text_from_ram wBattleMonNick + text_start + line "can't be recalled!" + prompt + +BattleText_TheresNoPPLeftForThisMove: + text "There's no PP left" + line "for this move!" + prompt + +BattleText_TheMoveIsDisabled: + text "The move is" + line "DISABLED!" + prompt + +BattleText_MonHasNoMovesLeft: + text_from_ram wBattleMonNick + text_start + line "has no moves left!" + done + +BattleText_TargetsEncoreEnded: + text "<TARGET>'s" + line "ENCORE ended!" + prompt + +BattleText_StringBuffer1GrewToLevel: + text_from_ram wStringBuffer1 + text " grew to" + line "level @" + deciram wCurPartyLevel, 1, 3 + text "!@" + sound_dex_fanfare_50_79 + db "@" + +BattleText_WildMonIsEating: + text "Wild @" + text_from_ram wEnemyMonNick + text_start + line "is eating!" + prompt + +BattleText_WildMonIsAngry: + text "Wild @" + text_from_ram wEnemyMonNick + text_start + line "is angry!" + prompt + +FastAsleepText: + text "<USER>" + line "is fast asleep!" + prompt + +WokeUpText: + text "<USER>" + line "woke up!" + prompt + +FrozenSolidText: + text "<USER>" + line "is frozen solid!" + prompt + +FlinchedText: + text "<USER>" + line "flinched!" + prompt + +MustRechargeText: + text "<USER>" + line "must recharge!" + prompt + +DisabledNoMoreText: + text "<USER>'s" + line "disabled no more!" + prompt + +IsConfusedText: + text "<USER>" + line "is confused!" + prompt + +HurtItselfText: + text "It hurt itself in" + line "its confusion!" + prompt + +ConfusedNoMoreText: + text "<USER>'s" + line "confused no more!" + prompt + +BecameConfusedText: + text "<TARGET>" + line "became confused!" + prompt +; ItemHealedConfusion + +BattleText_ItemHealedConfusion: ; ItemHealedConfusion + text "A @" + text_from_ram wStringBuffer1 + text " rid" + line "<TARGET>" + cont "of its confusion." + prompt + +AlreadyConfusedText: + text "<TARGET>'s" + line "already confused!" + prompt + +BattleText_UsersHurtByStringBuffer1: + text "<USER>'s" + line "hurt by" + cont "@" + text_from_ram wStringBuffer1 + text "!" + prompt + +BattleText_UserWasReleasedFromStringBuffer1: + text "<USER>" + line "was released from" + cont "@" + text_from_ram wStringBuffer1 + text "!" + prompt + +UsedBindText: + text "<USER>" + line "used BIND on" + cont "<TARGET>!" + prompt + +WhirlpoolTrapText: + text "<TARGET>" + line "was trapped!" + prompt + +WrappedByText: + text "<TARGET>" + line "was WRAPPED by" + cont "<USER>!" + prompt + +ClampedByText: + text "<TARGET>" + line "was CLAMPED by" + cont "<USER>!" + prompt + +StoringEnergyText: + text "<USER>" + line "is storing energy!" + prompt + +UnleashedEnergyText: + text "<USER>" + line "unleashed energy!" + prompt + +HungOnText: + text "<TARGET>" + line "hung on with" + cont "@" + text_from_ram wStringBuffer1 + text "!" + prompt + +EnduredText: + text "<TARGET>" + line "ENDURED the hit!" + prompt + +InLoveWithText: + text "<USER>" + line "is in love with" + cont "<TARGET>!" + prompt + +InfatuationText: + text "<USER>'s" + line "infatuation kept" + cont "it from attacking!" + prompt + +DisabledMoveText: + text "<USER>'s" + line "@" + text_from_ram wStringBuffer1 + text " is" + cont "DISABLED!" + prompt + +LoafingAroundText: + text_from_ram wBattleMonNick + text " is" + line "loafing around." + prompt + +BeganToNapText: + text_from_ram wBattleMonNick + text " began" + line "to nap!" + prompt + +WontObeyText: + text_from_ram wBattleMonNick + text " won't" + line "obey!" + prompt + +TurnedAwayText: + text_from_ram wBattleMonNick + text " turned" + line "away!" + prompt + +IgnoredOrdersText: + text_from_ram wBattleMonNick + text " ignored" + line "orders!" + prompt + +IgnoredSleepingText: + text_from_ram wBattleMonNick + text " ignored" + line "orders…sleeping!" + prompt + +NoPPLeftText: + text "But no PP is left" + line "for the move!" + prompt + +HasNoPPLeftText: + text "<USER>" + line "has no PP left for" + cont "@" + text_from_ram wStringBuffer2 + text "!" + prompt + +WentToSleepText: + text "<USER>" + line "went to sleep!" + done + +RestedText: + text "<USER>" + line "fell asleep and" + cont "became healthy!" + done + +RegainedHealthText: + text "<USER>" + line "regained health!" + prompt + +AttackMissedText: + text "<USER>'s" + line "attack missed!" + prompt + +AttackMissed2Text: + text "<USER>'s" + line "attack missed!" + prompt + +CrashedText: + text "<USER>" + line "kept going and" + cont "crashed!" + prompt + +UnaffectedText: + text "<TARGET>'s" + line "unaffected!" + prompt + +DoesntAffectText: + text "It doesn't affect" + line "<TARGET>!" + prompt + +CriticalHitText: + text "A critical hit!" + prompt + +OneHitKOText: + text "It's a one-hit KO!" + prompt + +SuperEffectiveText: + text "It's super-" + line "effective!" + prompt + +NotVeryEffectiveText: + text "It's not very" + line "effective…" + prompt + +TookDownWithItText: + text "<TARGET>" + line "took down with it," + cont "<USER>!" + prompt + +RageBuildingText: + text "<USER>'s" + line "RAGE is building!" + prompt + +GotAnEncoreText: + text "<TARGET>" + line "got an ENCORE!" + prompt + +SharedPainText: + text "The battlers" + line "shared pain!" + prompt + +TookAimText: + text "<USER>" + line "took aim!" + prompt + +SketchedText: + text "<USER>" + line "SKETCHED" + cont "@" + text_from_ram wStringBuffer1 + text "!" + prompt + +DestinyBondEffectText: + text "<USER>'s" + line "trying to take its" + cont "opponent with it!" + prompt + +SpiteEffectText: + text "<TARGET>'s" + line "@" + text_from_ram wStringBuffer1 + text " was" + cont "reduced by @" + deciram wDeciramBuffer, 1, 1 + text "!" + prompt + +BellChimedText: + text "A bell chimed!" + line "" + prompt + +FellAsleepText: + text "<TARGET>" + line "fell asleep!" + prompt + +AlreadyAsleepText: + text "<TARGET>'s" + line "already asleep!" + prompt + +WasPoisonedText: + text "<TARGET>" + line "was poisoned!" + prompt + +BadlyPoisonedText: + text "<TARGET>'s" + line "badly poisoned!" + prompt + +AlreadyPoisonedText: + text "<TARGET>'s" + line "already poisoned!" + prompt + +SuckedHealthText: + text "Sucked health from" + line "<TARGET>!" + prompt + +DreamEatenText: + text "<TARGET>'s" + line "dream was eaten!" + prompt + +WasBurnedText: + text "<TARGET>" + line "was burned!" + prompt + +DefrostedOpponentText: + text "<TARGET>" + line "was defrosted!" + prompt + +WasFrozenText: + text "<TARGET>" + line "was frozen solid!" + prompt + +WontRiseAnymoreText: + text "<USER>'s" + line "@" + text_from_ram wStringBuffer2 + text " won't" + cont "rise anymore!" + prompt + +WontDropAnymoreText: + text "<TARGET>'s" + line "@" + text_from_ram wStringBuffer2 + text " won't" + cont "drop anymore!" + prompt + +FledFromBattleText:: + text "<USER>" + line "fled from battle!" + prompt + +FledInFearText: + text "<TARGET>" + line "fled in fear!" + prompt + +BlownAwayText: + text "<TARGET>" + line "was blown away!" + prompt + +PlayerHitTimesText: + text "Hit @" + deciram wPlayerDamageTaken, 1, 1 + text " times!" + prompt + +EnemyHitTimesText: + text "Hit @" + deciram wEnemyDamageTaken, 1, 1 + text " times!" + prompt + +MistText: + text "<USER>'s" + line "shrouded in MIST!" + prompt + +ProtectedByMistText: + text "<TARGET>'s" + line "protected by MIST." + prompt + +GettingPumpedText: + interpret_data + text "<USER>'s" + line "getting pumped!" + prompt + +RecoilText: + text "<USER>'s" + line "hit with recoil!" + prompt + +MadeSubstituteText: + text "<USER>" + line "made a SUBSTITUTE!" + prompt + +HasSubstituteText: + text "<USER>" + line "has a SUBSTITUTE!" + prompt + +TooWeakSubText: + text "Too weak to make" + line "a SUBSTITUTE!" + prompt + +SubTookDamageText: + text "The SUBSTITUTE" + line "took damage for" + cont "<TARGET>!" + prompt + +SubFadedText: + text "<TARGET>'s" + line "SUBSTITUTE faded!" + prompt + +LearnedMoveText: + text "<USER>" + line "learned" + cont "@" + text_from_ram wStringBuffer1 + text "!" + prompt + +WasSeededText: + text "<TARGET>" + line "was seeded!" + prompt + +EvadedText: + text "<TARGET>" + line "evaded the attack!" + prompt + +WasDisabledText: + text "<TARGET>'s" + line "@" + text_from_ram wStringBuffer1 + text " was" + cont "DISABLED!" + prompt + +CoinsScatteredText: + text "Coins scattered" + line "everywhere!" + prompt + +TransformedTypeText: + text "<USER>" + line "transformed into" + cont "the @" + text_from_ram wStringBuffer1 + text "-type!" + prompt + +EliminatedStatsText: + text "All stat changes" + line "were eliminated!" + prompt + +TransformedText: + text "<USER>" + line "TRANSFORMED into" + cont "@" + text_from_ram wStringBuffer1 + text "!" + prompt + +LightScreenEffectText: + text "<USER>'s" + line "SPCL.DEF rose!" + prompt + +ReflectEffectText: + text "<USER>'s" + line "DEFENSE rose!" + prompt + +NothingHappenedText: + text "But nothing" + line "happened." + prompt + +ButItFailedText: + text "But it failed!" + prompt + +ItFailedText: + text "It failed!" + prompt + +DidntAffect1Text: + text "It didn't affect" + line "<TARGET>!" + prompt + +DidntAffect2Text: + text "It didn't affect" + line "<TARGET>!" + prompt + +HPIsFullText: + text "<USER>'s" + line "HP is full!" + prompt + +DraggedOutText: + text "<USER>" + line "was dragged out!" + prompt + +ParalyzedText: + text "<TARGET>'s" + line "paralyzed! Maybe" + cont "it can't attack!" + prompt + +FullyParalyzedText: + text "<USER>'s" + line "fully paralyzed!" + prompt + +AlreadyParalyzedText: + text "<TARGET>'s" + line "already paralyzed!" + prompt + +ProtectedByText: + text "<TARGET>'s" + line "protected by" + cont "@" + text_from_ram wStringBuffer1 + text "!" + prompt + +MirrorMoveFailedText: + text "The MIRROR MOVE" + next "failed!" + prompt + +StoleText: + text "<USER>" + line "stole @" + text_from_ram wStringBuffer1 + text_start + cont "from its foe!" + prompt + +CantEscapeNowText: + text "<TARGET>" + line "can't escape now!" + prompt + +StartedNightmareText: + text "<TARGET>" + line "started to have a" + cont "NIGHTMARE!" + prompt + +WasDefrostedText: + text "<USER>" + line "was defrosted!" + prompt + +PutACurseText: + text "<USER>" + line "cut its own HP and" + + para "put a CURSE on" + line "<TARGET>!" + prompt + +ProtectedItselfText: + text "<USER>" + line "PROTECTED itself!" + prompt + +ProtectingItselfText: + text "<TARGET>'s" + line "PROTECTING itself!" + done + +SpikesText: + text "SPIKES scattered" + line "all around" + cont "<TARGET>!" + prompt + +IdentifiedText: + text "<USER>" + line "identified" + cont "<TARGET>!" + prompt + +StartPerishText: + text "Both #MON will" + line "faint in 3 turns!" + prompt + +SandstormBrewedText: + text "A SANDSTORM" + line "brewed!" + prompt + +BracedItselfText: + text "<USER>" + line "braced itself!" + prompt + +FellInLoveText: + text "<TARGET>" + line "fell in love!" + prompt + +CoveredByVeilText: + text "<USER>'s" + line "covered by a veil!" + prompt + +SafeguardProtectText: + text "<TARGET>" + line "is protected by" + cont "SAFEGUARD!" + prompt + +MagnitudeText: + text "Magnitude @" + deciram wDeciramBuffer, 1, 1 + text "!" + prompt + +ReleasedByText: + text "<USER>" + line "was released by" + cont "<TARGET>!" + prompt + +ShedLeechSeedText: + text "<USER>" + line "shed LEECH SEED!" + prompt + +BlewSpikesText: + text "<USER>" + line "blew away SPIKES!" + prompt + +DownpourText: + text "A downpour" + line "started!" + prompt + +SunGotBrightText: + text "The sunlight got" + line "bright!" + prompt + +BellyDrumText: + text "<USER>" + line "cut its HP and" + cont "maximized ATTACK!" + prompt + +CopiedStatsText: + text "<USER>" + line "copied the stat" + + para "changes of" + line "<TARGET>!" + prompt + +ForesawAttackText: + text "<USER>" + line "foresaw an attack!" + prompt + +BeatUpAttackText: + text_from_ram wStringBuffer1 + text "'s" + line "attack!" + done + +CanReceiveGiftText: + text "<TARGET> can't" + line "receive the gift!" + prompt + +IgnoredOrders2Text: + text "<USER>" + line "ignored orders!" + prompt diff --git a/items/item_effects.asm b/items/item_effects.asm index 1f277493..2e87ed74 100755 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -1477,7 +1477,7 @@ BitterBerry: ; f1c0 xor a ld [hBattleTurn], a call Functionf7d0 - ld hl, Text_ConfusedNoMore ; $5746 + ld hl, ConfusedNoMoreText call StdBattleTextBox ld a, $0 .asm_f1d9 @@ -1518,11 +1518,9 @@ Predef3A:: dr $fc002, $100000 SECTION "bank40", ROMX, BANK[$40] -BattleText:: ; Not actually where it is, I just needed the label for BANK to work - dr $100000, $101746 + dr $100000, $10110c -Text_ConfusedNoMore:: - dr $101746, $104000 +INCLUDE "data/text/battle.asm" SECTION "bank41", ROMX, BANK[$41] dr $104000, $108000 @@ -1646,10 +1646,13 @@ wcb5c:: ds 1 ; cb5c wcb5d:: ds 1 ; cb5d wcb5e:: ds 1 ; cb5e wcb5f:: ds 1 ; cb5f +wPlayerDamageTaken:: wcb60:: ds 1 ; cb60 wcb61:: ds 1 ; cb61 +wEnemyDamageTaken:: wcb62:: ds 1 ; cb62 wcb63:: ds 1 ; cb63 +wBattleReward:: wcb64:: ds 1 ; cb64 wcb65:: ds 1 ; cb65 wcb66:: ds 1 ; cb66 @@ -2699,6 +2702,7 @@ wWildMon:: ds 1 ; d14f wd150:: ds 1 ; d150 wTempNumBuffer:: wNamedObjectIndexBuffer:: +wDeciramBuffer:: wd151:: ds 1 ; d151 wd152:: ds 1 ; d152 wd153:: ds 1 ; d153 |