Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Identify wcd6d as wNameBuffer and others #455

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Identify wcd6d as wNameBuffer and others #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/text/text_1.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ _CardKeyFailText::
done

_TrainerNameText::
text_ram wcd6d
text_ram wNameBuffer
text ": @"
text_end

Expand Down
46 changes: 23 additions & 23 deletions data/text/text_2.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ _AIBattleUseItemText::
text_ram wTrainerName
text_start
line "used @"
text_ram wcd6d
text_ram wNameBuffer
text_start
cont "on @"
text_ram wEnemyMonNick
Expand All @@ -36,7 +36,7 @@ _TradeSendsText::
text_ram wLinkEnemyTrainerName
text " sends"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text "."
done

Expand All @@ -47,23 +47,23 @@ _TradeWavesFarewellText::
done

_TradeTransferredText::
text_ram wcd6d
text_ram wNameBuffer
text " is"
line "transferred."
done

_TradeTakeCareText::
text "Take good care of"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text "."
done

_TradeWillTradeText::
text_ram wLinkEnemyTrainerName
text " will"
line "trade @"
text_ram wcd6d
text_ram wNameBuffer
text_start
done

Expand Down Expand Up @@ -751,7 +751,7 @@ _VermilionGymTrashFailText::
_FoundHiddenItemText::
text "<PLAYER> found"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text "!@"
text_end

Expand Down Expand Up @@ -1070,7 +1070,7 @@ _CantMoveText::
_MoveIsDisabledText::
text "<USER>'s"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text " is"
cont "disabled!"
prompt
Expand Down Expand Up @@ -1205,7 +1205,7 @@ _HitXTimesText::
prompt

_GainedText::
text_ram wcd6d
text_ram wNameBuffer
text " gained"
line "@"
text_end
Expand All @@ -1226,7 +1226,7 @@ _ExpPointsText::
prompt

_GrewLevelText::
text_ram wcd6d
text_ram wNameBuffer
text " grew"
line "to level @"
text_decimal wCurEnemyLVL, 1, 3
Expand Down Expand Up @@ -1382,57 +1382,57 @@ _PartyMenuSwapMonText::
done

_PotionText::
text_ram wcd6d
text_ram wNameBuffer
text_start
line "recovered by @"
text_decimal wHPBarHPDifference, 2, 3
text "!"
done

_AntidoteText::
text_ram wcd6d
text_ram wNameBuffer
text " was"
line "cured of poison!"
done

_ParlyzHealText::
text_ram wcd6d
text_ram wNameBuffer
text "'s"
line "rid of paralysis!"
done

_BurnHealText::
text_ram wcd6d
text_ram wNameBuffer
text "'s"
line "burn was healed!"
done

_IceHealText::
text_ram wcd6d
text_ram wNameBuffer
text " was"
line "defrosted!"
done

_AwakeningText::
text_ram wcd6d
text_ram wNameBuffer
text_start
line "woke up!"
done

_FullHealText::
text_ram wcd6d
text_ram wNameBuffer
text "'s"
line "health returned!"
done

_ReviveText::
text_ram wcd6d
text_ram wNameBuffer
text_start
line "is revitalized!"
done

_RareCandyText::
text_ram wcd6d
text_ram wNameBuffer
text " grew"
line "to level @"
text_decimal wCurEnemyLVL, 1, 3
Expand Down Expand Up @@ -1487,7 +1487,7 @@ _DepositHowManyText::
done

_ItemWasStoredText::
text_ram wcd6d
text_ram wNameBuffer
text " was"
line "stored via PC."
prompt
Expand All @@ -1514,7 +1514,7 @@ _WithdrawHowManyText::
_WithdrewItemText::
text "Withdrew"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text "."
prompt

Expand Down Expand Up @@ -1642,7 +1642,7 @@ _HereYouGoText::
_SoYouWantPrizeText::
text "So, you want"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text "?"
done

Expand Down Expand Up @@ -1756,7 +1756,7 @@ _DoYouWantToNicknameText::
text "Do you want to"
line "give a nickname"
cont "to @"
text_ram wcd6d
text_ram wNameBuffer
text "?"
done

Expand All @@ -1775,7 +1775,7 @@ _WillBeTradedText::
text_ram wNameOfPlayerMonToBeTraded
text " and"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text " will"
cont "be traded."
done
Expand Down
8 changes: 4 additions & 4 deletions data/text/text_3.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ _EvolvedText::
_IntoText::
text_start
line "into @"
text_ram wcd6d
text_ram wNameBuffer
text "!"
done

Expand Down Expand Up @@ -181,14 +181,14 @@ _MimicLearnedMoveText::
text "<USER>"
line "learned"
cont "@"
text_ram wcd6d
text_ram wNameBuffer
text "!"
prompt

_MoveWasDisabledText::
text "<TARGET>'s"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text " was"
cont "disabled!"
prompt
Expand Down Expand Up @@ -291,7 +291,7 @@ _TransformedText::
text "<USER>"
line "transformed into"
cont "@"
text_ram wcd6d
text_ram wNameBuffer
text "!"
prompt

Expand Down
4 changes: 2 additions & 2 deletions data/text/text_4.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _PokemartGreetingText::
done

_PokemonFaintedText::
text_ram wcd6d
text_ram wNameBuffer
text_start
line "fainted!"
done
Expand Down Expand Up @@ -145,7 +145,7 @@ _ForgotAndText::
text_ram wLearnMoveMonName
text " forgot"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text "!"

para "And..."
Expand Down
10 changes: 5 additions & 5 deletions data/text/text_5.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ _CableClubNPCMakingPreparationsText::
done

_UsedStrengthText::
text_ram wcd6d
text_ram wNameBuffer
text " used"
line "STRENGTH.@"
text_end

_CanMoveBouldersText::
text_ram wcd6d
text_ram wNameBuffer
text " can"
line "move boulders."
prompt
Expand All @@ -41,13 +41,13 @@ _WarpToLastPokemonCenterText::
done

_CannotUseTeleportNowText::
text_ram wcd6d
text_ram wNameBuffer
text " can't"
line "use TELEPORT now."
prompt

_CannotFlyHereText::
text_ram wcd6d
text_ram wNameBuffer
text " can't"
line "FLY here."
prompt
Expand Down Expand Up @@ -75,7 +75,7 @@ _CannotGetOffHereText::
_GotMonText::
text "<PLAYER> got"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text "!@"
text_end

Expand Down
8 changes: 4 additions & 4 deletions data/text/text_6.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ _ItemUseBallText06::
_SurfingGotOnText::
text "<PLAYER> got on"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text "!"
prompt

Expand All @@ -69,7 +69,7 @@ _SurfingNoPlaceToGetOffText::
prompt

_VitaminStatRoseText::
text_ram wcd6d
text_ram wNameBuffer
text "'s"
line "@"
text_ram wStringBuffer
Expand Down Expand Up @@ -174,7 +174,7 @@ _TeachMachineMoveText::
done

_MonCannotLearnMachineMoveText::
text_ram wcd6d
text_ram wNameBuffer
text " is not"
line "compatible with"
cont "@"
Expand Down Expand Up @@ -220,7 +220,7 @@ _NoCyclingAllowedHereText::
_NoSurfingHereText::
text "No SURFing on"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text " here!"
prompt

Expand Down
6 changes: 3 additions & 3 deletions data/text/text_7.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ _GotOffBicycleText2::
_ThrewAwayItemText::
text "Threw away"
line "@"
text_ram wcd6d
text_ram wNameBuffer
text "."
prompt

Expand All @@ -46,7 +46,7 @@ _TooImportantToTossText::
prompt

_AlreadyKnowsText::
text_ram wcd6d
text_ram wNameBuffer
text " knows"
line "@"
text_ram wStringBuffer
Expand Down Expand Up @@ -194,7 +194,7 @@ _NothingToCutText::
prompt

_UsedCutText::
text_ram wcd6d
text_ram wNameBuffer
text " hacked"
line "away with CUT!"
prompt
Loading