foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Identify wcd6d as wNameBuffer and others (#455)

Browse source
This commit is contained in:
Sylvie 2024-07-24 12:21:59 -04:00 • committed by GitHub
parent 8fafca714c
commit 6e3ab0a9e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
43 changed files with 142 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/text/text_1.asm
View file

@ -14,7 +14,7 @@ _CardKeyFailText::
done done
_TrainerNameText:: _TrainerNameText::
text_ram wcd6d text_ram wNameBuffer
text ": @" text ": @"
text_end text_end

46
data/text/text_2.asm
View file

@ -10,7 +10,7 @@ _AIBattleUseItemText::
text_ram wTrainerName text_ram wTrainerName
text_start text_start
line "used @" line "used @"
text_ram wcd6d text_ram wNameBuffer
text_start text_start
cont "on @" cont "on @"
text_ram wEnemyMonNick text_ram wEnemyMonNick
@ -36,7 +36,7 @@ _TradeSendsText::
text_ram wLinkEnemyTrainerName text_ram wLinkEnemyTrainerName
text " sends" text " sends"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "." text "."
done done
@ -47,7 +47,7 @@ _TradeWavesFarewellText::
done done
_TradeTransferredText:: _TradeTransferredText::
text_ram wcd6d text_ram wNameBuffer
text " is" text " is"
line "transferred." line "transferred."
done done
@ -55,7 +55,7 @@ _TradeTransferredText::
_TradeTakeCareText:: _TradeTakeCareText::
text "Take good care of" text "Take good care of"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "." text "."
done done
@ -63,7 +63,7 @@ _TradeWillTradeText::
text_ram wLinkEnemyTrainerName text_ram wLinkEnemyTrainerName
text " will" text " will"
line "trade @" line "trade @"
text_ram wcd6d text_ram wNameBuffer
text_start text_start
done done
@ -751,7 +751,7 @@ _VermilionGymTrashFailText::
_FoundHiddenItemText:: _FoundHiddenItemText::
text "<PLAYER> found" text "<PLAYER> found"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "!@" text "!@"
text_end text_end
@ -1070,7 +1070,7 @@ _CantMoveText::
_MoveIsDisabledText:: _MoveIsDisabledText::
text "<USER>'s" text "<USER>'s"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text " is" text " is"
cont "disabled!" cont "disabled!"
prompt prompt
@ -1205,7 +1205,7 @@ _HitXTimesText::
prompt prompt
_GainedText:: _GainedText::
text_ram wcd6d text_ram wNameBuffer
text " gained" text " gained"
line "@" line "@"
text_end text_end
@ -1226,7 +1226,7 @@ _ExpPointsText::
prompt prompt
_GrewLevelText:: _GrewLevelText::
text_ram wcd6d text_ram wNameBuffer
text " grew" text " grew"
line "to level @" line "to level @"
text_decimal wCurEnemyLevel, 1, 3 text_decimal wCurEnemyLevel, 1, 3
@ -1382,7 +1382,7 @@ _PartyMenuSwapMonText::
done done
_PotionText:: _PotionText::
text_ram wcd6d text_ram wNameBuffer
text_start text_start
line "recovered by @" line "recovered by @"
text_decimal wHPBarHPDifference, 2, 3 text_decimal wHPBarHPDifference, 2, 3
@ -1390,49 +1390,49 @@ _PotionText::
done done
_AntidoteText:: _AntidoteText::
text_ram wcd6d text_ram wNameBuffer
text " was" text " was"
line "cured of poison!" line "cured of poison!"
done done
_ParlyzHealText:: _ParlyzHealText::
text_ram wcd6d text_ram wNameBuffer
text "'s" text "'s"
line "rid of paralysis!" line "rid of paralysis!"
done done
_BurnHealText:: _BurnHealText::
text_ram wcd6d text_ram wNameBuffer
text "'s" text "'s"
line "burn was healed!" line "burn was healed!"
done done
_IceHealText:: _IceHealText::
text_ram wcd6d text_ram wNameBuffer
text " was" text " was"
line "defrosted!" line "defrosted!"
done done
_AwakeningText:: _AwakeningText::
text_ram wcd6d text_ram wNameBuffer
text_start text_start
line "woke up!" line "woke up!"
done done
_FullHealText:: _FullHealText::
text_ram wcd6d text_ram wNameBuffer
text "'s" text "'s"
line "health returned!" line "health returned!"
done done
_ReviveText:: _ReviveText::
text_ram wcd6d text_ram wNameBuffer
text_start text_start
line "is revitalized!" line "is revitalized!"
done done
_RareCandyText:: _RareCandyText::
text_ram wcd6d text_ram wNameBuffer
text " grew" text " grew"
line "to level @" line "to level @"
text_decimal wCurEnemyLevel, 1, 3 text_decimal wCurEnemyLevel, 1, 3
@ -1487,7 +1487,7 @@ _DepositHowManyText::
done done
_ItemWasStoredText:: _ItemWasStoredText::
text_ram wcd6d text_ram wNameBuffer
text " was" text " was"
line "stored via PC." line "stored via PC."
prompt prompt
@ -1514,7 +1514,7 @@ _WithdrawHowManyText::
_WithdrewItemText:: _WithdrewItemText::
text "Withdrew" text "Withdrew"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "." text "."
prompt prompt
@ -1642,7 +1642,7 @@ _HereYouGoText::
_SoYouWantPrizeText:: _SoYouWantPrizeText::
text "So, you want" text "So, you want"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "?" text "?"
done done
@ -1756,7 +1756,7 @@ _DoYouWantToNicknameText::
text "Do you want to" text "Do you want to"
line "give a nickname" line "give a nickname"
cont "to @" cont "to @"
text_ram wcd6d text_ram wNameBuffer
text "?" text "?"
done done
@ -1775,7 +1775,7 @@ _WillBeTradedText::
text_ram wNameOfPlayerMonToBeTraded text_ram wNameOfPlayerMonToBeTraded
text " and" text " and"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text " will" text " will"
cont "be traded." cont "be traded."
done done

8
data/text/text_3.asm
View file

@ -40,7 +40,7 @@ _EvolvedText::
_IntoText:: _IntoText::
text_start text_start
line "into @" line "into @"
text_ram wcd6d text_ram wNameBuffer
text "!" text "!"
done done
@ -181,14 +181,14 @@ _MimicLearnedMoveText::
text "<USER>" text "<USER>"
line "learned" line "learned"
cont "@" cont "@"
text_ram wcd6d text_ram wNameBuffer
text "!" text "!"
prompt prompt
_MoveWasDisabledText:: _MoveWasDisabledText::
text "<TARGET>'s" text "<TARGET>'s"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text " was" text " was"
cont "disabled!" cont "disabled!"
prompt prompt
@ -291,7 +291,7 @@ _TransformedText::
text "<USER>" text "<USER>"
line "transformed into" line "transformed into"
cont "@" cont "@"
text_ram wcd6d text_ram wNameBuffer
text "!" text "!"
prompt prompt

4
data/text/text_4.asm
View file

@ -4,7 +4,7 @@ _PokemartGreetingText::
done done
_PokemonFaintedText:: _PokemonFaintedText::
text_ram wcd6d text_ram wNameBuffer
text_start text_start
line "fainted!" line "fainted!"
done done
@ -145,7 +145,7 @@ _ForgotAndText::
text_ram wLearnMoveMonName text_ram wLearnMoveMonName
text " forgot" text " forgot"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "!" text "!"
para "And..." para "And..."

10
data/text/text_5.asm
View file

@ -9,13 +9,13 @@ _CableClubNPCMakingPreparationsText::
done done
_UsedStrengthText:: _UsedStrengthText::
text_ram wcd6d text_ram wNameBuffer
text " used" text " used"
line "STRENGTH.@" line "STRENGTH.@"
text_end text_end
_CanMoveBouldersText:: _CanMoveBouldersText::
text_ram wcd6d text_ram wNameBuffer
text " can" text " can"
line "move boulders." line "move boulders."
prompt prompt
@ -41,13 +41,13 @@ _WarpToLastPokemonCenterText::
done done
_CannotUseTeleportNowText:: _CannotUseTeleportNowText::
text_ram wcd6d text_ram wNameBuffer
text " can't" text " can't"
line "use TELEPORT now." line "use TELEPORT now."
prompt prompt
_CannotFlyHereText:: _CannotFlyHereText::
text_ram wcd6d text_ram wNameBuffer
text " can't" text " can't"
line "FLY here." line "FLY here."
prompt prompt
@ -75,7 +75,7 @@ _CannotGetOffHereText::
_GotMonText:: _GotMonText::
text "<PLAYER> got" text "<PLAYER> got"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "!@" text "!@"
text_end text_end

8
data/text/text_6.asm
View file

@ -59,7 +59,7 @@ _ItemUseBallText06::
_SurfingGotOnText:: _SurfingGotOnText::
text "<PLAYER> got on" text "<PLAYER> got on"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "!" text "!"
prompt prompt
@ -69,7 +69,7 @@ _SurfingNoPlaceToGetOffText::
prompt prompt
_VitaminStatRoseText:: _VitaminStatRoseText::
text_ram wcd6d text_ram wNameBuffer
text "'s" text "'s"
line "@" line "@"
text_ram wStringBuffer text_ram wStringBuffer
@ -174,7 +174,7 @@ _TeachMachineMoveText::
done done
_MonCannotLearnMachineMoveText:: _MonCannotLearnMachineMoveText::
text_ram wcd6d text_ram wNameBuffer
text " is not" text " is not"
line "compatible with" line "compatible with"
cont "@" cont "@"
@ -220,7 +220,7 @@ _NoCyclingAllowedHereText::
_NoSurfingHereText:: _NoSurfingHereText::
text "No SURFing on" text "No SURFing on"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text " here!" text " here!"
prompt prompt

6
data/text/text_7.asm
View file

@ -29,7 +29,7 @@ _GotOffBicycleText2::
_ThrewAwayItemText:: _ThrewAwayItemText::
text "Threw away" text "Threw away"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "." text "."
prompt prompt
@ -46,7 +46,7 @@ _TooImportantToTossText::
prompt prompt
_AlreadyKnowsText:: _AlreadyKnowsText::
text_ram wcd6d text_ram wNameBuffer
text " knows" text " knows"
line "@" line "@"
text_ram wStringBuffer text_ram wStringBuffer
@ -194,7 +194,7 @@ _NothingToCutText::
prompt prompt
_UsedCutText:: _UsedCutText::
text_ram wcd6d text_ram wNameBuffer
text " hacked" text " hacked"
line "away with CUT!" line "away with CUT!"
prompt prompt

10
engine/battle/core.asm
View file

@ -2878,7 +2878,7 @@ PrintMenuItem:
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
and $3f and $3f
ld [wcd6d], a ld [wBattleMenuCurrentPP], a
; print TYPE/<type> and <curPP>/<maxPP> ; print TYPE/<type> and <curPP>/<maxPP>
hlcoord 1, 9 hlcoord 1, 9
ld de, TypeText ld de, TypeText
@ -2888,7 +2888,7 @@ PrintMenuItem:
hlcoord 5, 9 hlcoord 5, 9
ld [hl], "/" ld [hl], "/"
hlcoord 5, 11 hlcoord 5, 11
ld de, wcd6d ld de, wBattleMenuCurrentPP
lb bc, 1, 2 lb bc, 1, 2
call PrintNumber call PrintNumber
hlcoord 8, 11 hlcoord 8, 11
@ -5631,7 +5631,7 @@ EnemyCanExecuteChargingMove:
ld a, MOVE_NAME ld a, MOVE_NAME
ld [wNameListType], a ld [wNameListType], a
call GetName call GetName
ld de, wcd6d ld de, wNameBuffer
call CopyToStringBuffer call CopyToStringBuffer
EnemyCanExecuteMove: EnemyCanExecuteMove:
xor a xor a
@ -6111,7 +6111,7 @@ GetCurrentMove:
ld a, MOVE_NAME ld a, MOVE_NAME
ld [wNameListType], a ld [wNameListType], a
call GetName call GetName
ld de, wcd6d ld de, wNameBuffer
jp CopyToStringBuffer jp CopyToStringBuffer
LoadEnemyMonData: LoadEnemyMonData:
@ -6247,7 +6247,7 @@ LoadEnemyMonData:
ld a, [wEnemyMonSpecies2] ld a, [wEnemyMonSpecies2]
ld [wd11e], a ld [wd11e], a
call GetMonName call GetMonName
ld hl, wcd6d ld hl, wNameBuffer
ld de, wEnemyMonNick ld de, wEnemyMonNick
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyData call CopyData

4
engine/battle/get_trainer_name.asm
View file

@ -17,8 +17,8 @@ GetTrainerName_::
ld a, BANK(TrainerNames) ld a, BANK(TrainerNames)
ld [wPredefBank], a ld [wPredefBank], a
call GetName call GetName
ld hl, wcd6d ld hl, wNameBuffer
.foundName .foundName
ld de, wTrainerName ld de, wTrainerName
ld bc, $d ld bc, ITEM_NAME_LENGTH
jp CopyData jp CopyData

8
engine/battle/misc.asm
View file

@ -14,10 +14,10 @@ FormatMovesString:
ld a, MOVE_NAME ld a, MOVE_NAME
ld [wNameListType], a ld [wNameListType], a
call GetName call GetName
ld hl, wcd6d ld hl, wNameBuffer
.copyNameLoop .copyNameLoop
ld a, [hli] ld a, [hli]
cp $50 cp "@"
jr z, .doneCopyingName jr z, .doneCopyingName
ld [de], a ld [de], a
inc de inc de
@ -26,7 +26,7 @@ FormatMovesString:
ld a, b ld a, b
ld [wNumMovesMinusOne], a ld [wNumMovesMinusOne], a
inc b inc b
ld a, $4e ; line break ld a, "<NEXT>"
ld [de], a ld [de], a
inc de inc de
pop hl pop hl
@ -42,7 +42,7 @@ FormatMovesString:
ld a, b ld a, b
cp NUM_MOVES cp NUM_MOVES
jr z, .done jr z, .done
ld a, $4e ; line break ld a, "<NEXT>"
ld [de], a ld [de], a
inc de inc de
jr .printDashLoop jr .printDashLoop

6
engine/battle/move_effects/pay_day.asm
View file

@ -1,6 +1,6 @@
PayDayEffect_: PayDayEffect_:
xor a xor a
ld hl, wcd6d ld hl, wPayDayMoney
ld [hli], a ld [hli], a
ldh a, [hWhoseTurn] ldh a, [hWhoseTurn]
and a and a
@ -21,7 +21,7 @@ PayDayEffect_:
ld b, $4 ld b, $4
call Divide call Divide
ldh a, [hQuotient + 3] ldh a, [hQuotient + 3]
ld [hli], a ld [hli], a ; wPayDayMoney + 1
ldh a, [hRemainder] ldh a, [hRemainder]
ldh [hDividend + 3], a ldh [hDividend + 3], a
ld a, 10 ld a, 10
@ -33,7 +33,7 @@ PayDayEffect_:
ld b, a ld b, a
ldh a, [hRemainder] ldh a, [hRemainder]
add b add b
ld [hl], a ld [hl], a ; wPayDayMoney + 2
ld de, wTotalPayDayMoney + 2 ld de, wTotalPayDayMoney + 2
ld c, $3 ld c, $3
predef AddBCDPredef predef AddBCDPredef

2
engine/battle/save_trainer_name.asm
View file

@ -9,7 +9,7 @@ SaveTrainerName::
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, wcd6d ld de, wNameBuffer
.CopyCharacter .CopyCharacter
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a

2
engine/events/cinnabar_lab.asm
View file

@ -104,7 +104,7 @@ PrintFossilsInBag:
ldh a, [hItemCounter] ldh a, [hItemCounter]
ld bc, SCREEN_WIDTH * 2 ld bc, SCREEN_WIDTH * 2
call AddNTimes call AddNTimes
ld de, wcd6d ld de, wNameBuffer
call PlaceString call PlaceString
ld hl, hItemCounter ld hl, hItemCounter
inc [hl] inc [hl]

4
engine/events/heal_party.asm
View file

@ -37,10 +37,10 @@ HealParty:
ld hl, Moves ld hl, Moves
ld bc, MOVE_LENGTH ld bc, MOVE_LENGTH
call AddNTimes call AddNTimes
ld de, wcd6d ld de, wMoveData
ld a, BANK(Moves) ld a, BANK(Moves)
call FarCopyData call FarCopyData
ld a, [wcd6d + 5] ; PP is byte 5 of move data ld a, [wMoveData + MOVE_PP]
pop bc pop bc
pop de pop de

2
engine/events/in_game_trades.asm
View file

@ -79,7 +79,7 @@ InGameTrade_GetMonName:
push de push de
ld [wd11e], a ld [wd11e], a
call GetMonName call GetMonName
ld hl, wcd6d ld hl, wNameBuffer
pop de pop de
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
jp CopyData jp CopyData

4
engine/items/item_effects.asm
View file

@ -2493,10 +2493,10 @@ GetMaxPP:
ld hl, Moves ld hl, Moves
ld bc, MOVE_LENGTH ld bc, MOVE_LENGTH
call AddNTimes call AddNTimes
ld de, wcd6d ld de, wMoveData
ld a, BANK(Moves) ld a, BANK(Moves)
call FarCopyData call FarCopyData
ld de, wcd6d + 5 ; PP is byte 5 of move data ld de, wMoveData + MOVE_PP
ld a, [de] ld a, [de]
ld b, a ; b = normal max PP ld b, a ; b = normal max PP
pop hl pop hl

24
engine/items/town_map.asm
View file

@ -1,5 +1,7 @@
DEF NOT_VISITED EQU $fe DEF NOT_VISITED EQU $fe
DEF BIRD_BASE_TILE EQU $04
DisplayTownMap: DisplayTownMap:
call LoadTownMap call LoadTownMap
ld hl, wUpdateSpritesEnabled ld hl, wUpdateSpritesEnabled
@ -12,15 +14,15 @@ DisplayTownMap:
ld a, [wCurMap] ld a, [wCurMap]
push af push af
ld b, $0 ld b, $0
call DrawPlayerOrBirdSprite ; player sprite call DrawPlayerOrBirdSprite
hlcoord 1, 0 hlcoord 1, 0
ld de, wcd6d ld de, wNameBuffer
call PlaceString call PlaceString
ld hl, wShadowOAM ld hl, wShadowOAM
ld de, wTileMapBackup ld de, wTileMapBackup
ld bc, $10 ld bc, $10
call CopyData call CopyData
ld hl, vSprites tile $04 ld hl, vSprites tile BIRD_BASE_TILE
ld de, TownMapCursor ld de, TownMapCursor
lb bc, BANK(TownMapCursor), (TownMapCursorEnd - TownMapCursor) / $8 lb bc, BANK(TownMapCursor), (TownMapCursorEnd - TownMapCursor) / $8
call CopyVideoDataDouble call CopyVideoDataDouble
@ -50,15 +52,15 @@ DisplayTownMap:
ld hl, wShadowOAMSprite04 ld hl, wShadowOAMSprite04
call WriteTownMapSpriteOAM ; town map cursor sprite call WriteTownMapSpriteOAM ; town map cursor sprite
pop hl pop hl
ld de, wcd6d ld de, wNameBuffer
.copyMapName .copyMapName
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de
cp $50 cp "@"
jr nz, .copyMapName jr nz, .copyMapName
hlcoord 1, 0 hlcoord 1, 0
ld de, wcd6d ld de, wNameBuffer
call PlaceString call PlaceString
ld hl, wShadowOAMSprite04 ld hl, wShadowOAMSprite04
ld de, wTileMapBackup + 16 ld de, wTileMapBackup + 16
@ -142,7 +144,7 @@ LoadTownMap_Fly::
call LoadPlayerSpriteGraphics call LoadPlayerSpriteGraphics
call LoadFontTilePatterns call LoadFontTilePatterns
ld de, BirdSprite ld de, BirdSprite
ld hl, vSprites tile $04 ld hl, vSprites tile BIRD_BASE_TILE
lb bc, BANK(BirdSprite), 12 lb bc, BANK(BirdSprite), 12
call CopyVideoData call CopyVideoData
ld de, TownMapUpArrow ld de, TownMapUpArrow
@ -173,10 +175,10 @@ LoadTownMap_Fly::
call ClearScreenArea call ClearScreenArea
pop hl pop hl
ld a, [hl] ld a, [hl]
ld b, $4 ld b, BIRD_BASE_TILE
call DrawPlayerOrBirdSprite ; draw bird sprite call DrawPlayerOrBirdSprite
hlcoord 3, 0 hlcoord 3, 0
ld de, wcd6d ld de, wNameBuffer
call PlaceString call PlaceString
ld c, 15 ld c, 15
call DelayFrames call DelayFrames
@ -356,7 +358,7 @@ DrawPlayerOrBirdSprite:
call TownMapCoordsToOAMCoords call TownMapCoordsToOAMCoords
call WritePlayerOrBirdSpriteOAM call WritePlayerOrBirdSpriteOAM
pop hl pop hl
ld de, wcd6d ld de, wNameBuffer
.loop .loop
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a

2
engine/link/cable_club.asm
View file

@ -699,7 +699,7 @@ TradeCenter_Trade:
ld a, [hl] ld a, [hl]
ld [wd11e], a ld [wd11e], a
call GetMonName call GetMonName
ld hl, wcd6d ld hl, wNameBuffer
ld de, wNameOfPlayerMonToBeTraded ld de, wNameOfPlayerMonToBeTraded
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyData call CopyData

2
engine/menus/league_pc.asm
View file

@ -89,7 +89,7 @@ LeaguePCShowMon:
ld [wWholeScreenPaletteMonSpecies], a ld [wWholeScreenPaletteMonSpecies], a
ld a, [hli] ld a, [hli]
ld [wHoFMonLevel], a ld [wHoFMonLevel], a
ld de, wcd6d ld de, wNameBuffer
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyData call CopyData
ld b, SET_PAL_POKEMON_WHOLE_SCREEN ld b, SET_PAL_POKEMON_WHOLE_SCREEN

2
engine/menus/naming_screen.asm
View file

@ -45,7 +45,7 @@ AskName:
.declinedNickname .declinedNickname
ld d, h ld d, h
ld e, l ld e, l
ld hl, wcd6d ld hl, wNameBuffer
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
jp CopyData jp CopyData

8
engine/menus/party_menu.asm
View file

@ -121,19 +121,19 @@ RedrawPartyMenu_::
rl b rl b
ld c, a ld c, a
add hl, bc add hl, bc
ld de, wcd6d ld de, wEvoDataBuffer
ld a, BANK(EvosMovesPointerTable) ld a, BANK(EvosMovesPointerTable)
ld bc, 2 ld bc, 2
call FarCopyData call FarCopyData
ld hl, wcd6d ld hl, wEvoDataBuffer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, wcd6d ld de, wEvoDataBuffer
ld a, BANK(EvosMovesPointerTable) ld a, BANK(EvosMovesPointerTable)
ld bc, 4 * 3 + 1 ; enough for Eevee's three 4-byte evolutions and 0 terminator ld bc, 4 * 3 + 1 ; enough for Eevee's three 4-byte evolutions and 0 terminator
call FarCopyData call FarCopyData
ld hl, wcd6d ld hl, wEvoDataBuffer
ld de, .notAbleToEvolveText ld de, .notAbleToEvolveText
; loop through the pokemon's evolution entries ; loop through the pokemon's evolution entries
.checkEvolutionsLoop .checkEvolutionsLoop

4
engine/movie/hall_of_fame.asm
View file

@ -165,7 +165,7 @@ HoFDisplayMonInfo:
ld de, HoFMonInfoText ld de, HoFMonInfoText
call PlaceString call PlaceString
hlcoord 1, 4 hlcoord 1, 4
ld de, wcd6d ld de, wNameBuffer
call PlaceString call PlaceString
ld a, [wHoFMonLevel] ld a, [wHoFMonLevel]
hlcoord 8, 7 hlcoord 8, 7
@ -275,7 +275,7 @@ HoFRecordMonInfo:
ld [hli], a ld [hli], a
ld e, l ld e, l
ld d, h ld d, h
ld hl, wcd6d ld hl, wNameBuffer
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
jp CopyData jp CopyData

4
engine/movie/oak_speech/oak_speech2.asm
View file

@ -72,7 +72,7 @@ OakSpeechSlidePicLeft:
ld c, 10 ld c, 10
call DelayFrames call DelayFrames
pop de pop de
ld hl, wcd6d ld hl, wNameBuffer
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyData call CopyData
call Delay3 call Delay3
@ -209,7 +209,7 @@ GetDefaultName:
.foundName .foundName
ld h, d ld h, d
ld l, e ld l, e
ld de, wcd6d ld de, wNameBuffer
ld bc, NAME_BUFFER_LENGTH ld bc, NAME_BUFFER_LENGTH
jp CopyData jp CopyData

2
engine/movie/trade.asm
View file

@ -188,7 +188,7 @@ LoadTradingGFXAndMonNames:
ld a, [wTradedPlayerMonSpecies] ld a, [wTradedPlayerMonSpecies]
ld [wd11e], a ld [wd11e], a
call GetMonName call GetMonName
ld hl, wcd6d ld hl, wNameBuffer
ld de, wStringBuffer ld de, wStringBuffer
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyData call CopyData

2
engine/movie/trade2.asm
View file

@ -32,7 +32,7 @@ Trade_PrintEnemyMonInfoText:
lb bc, LEADING_ZEROES | 1, 3 lb bc, LEADING_ZEROES | 1, 3
call PrintNumber call PrintNumber
hlcoord 5, 12 hlcoord 5, 12
ld de, wcd6d ld de, wNameBuffer
call PlaceString call PlaceString
hlcoord 8, 14 hlcoord 8, 14
ld de, wTradedEnemyMonOT ld de, wTradedEnemyMonOT

4
engine/pokemon/add_mon.asm
View file

@ -261,13 +261,13 @@ AddPartyMon_WriteMovePP:
ld hl, Moves ld hl, Moves
ld bc, MOVE_LENGTH ld bc, MOVE_LENGTH
call AddNTimes call AddNTimes
ld de, wcd6d ld de, wMoveData
ld a, BANK(Moves) ld a, BANK(Moves)
call FarCopyData call FarCopyData
pop bc pop bc
pop de pop de
pop hl pop hl
ld a, [wcd6d + 5] ; PP is byte 5 of move data ld a, [wMoveData + MOVE_PP]
.empty .empty
inc de inc de
ld [de], a ld [de], a

4
engine/pokemon/evos_moves.asm
View file

@ -267,7 +267,7 @@ RenameEvolvedMon:
call GetName call GetName
pop af pop af
ld [wd0b5], a ld [wd0b5], a
ld hl, wcd6d ld hl, wNameBuffer
ld de, wStringBuffer ld de, wStringBuffer
.compareNamesLoop .compareNamesLoop
ld a, [de] ld a, [de]
@ -283,7 +283,7 @@ RenameEvolvedMon:
call AddNTimes call AddNTimes
push hl push hl
call GetName call GetName
ld hl, wcd6d ld hl, wNameBuffer
pop de pop de
jp CopyData jp CopyData

2
engine/pokemon/learn_move.asm
View file

@ -3,7 +3,7 @@ LearnMove:
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
ld hl, wPartyMonNicks ld hl, wPartyMonNicks
call GetPartyMonName call GetPartyMonName
ld hl, wcd6d ld hl, wNameBuffer
ld de, wLearnMoveMonName ld de, wLearnMoveMonName
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyData call CopyData

2
home/list_menu.asm
View file

@ -156,7 +156,7 @@ DisplayListMenuIDLoop::
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
call GetPartyMonName call GetPartyMonName
.storeChosenEntry ; store the menu entry that the player chose and return .storeChosenEntry ; store the menu entry that the player chose and return
ld de, wcd6d ld de, wNameBuffer
call CopyToStringBuffer call CopyToStringBuffer
ld a, CHOSE_MENU_ITEM ld a, CHOSE_MENU_ITEM
ld [wMenuExitMethod], a ld [wMenuExitMethod], a

19
home/names.asm
View file

@ -8,14 +8,14 @@ GetMonName::
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld hl, MonsterNames ld hl, MonsterNames
ld c, 10 ld c, NAME_LENGTH - 1
ld b, 0 ld b, 0
call AddNTimes call AddNTimes
ld de, wcd6d ld de, wNameBuffer
push de push de
ld bc, 10 ld bc, NAME_LENGTH - 1
call CopyData call CopyData
ld hl, wcd6d + 10 ld hl, wNameBuffer + NAME_LENGTH - 1
ld [hl], "@" ld [hl], "@"
pop de pop de
pop af pop af
@ -25,8 +25,7 @@ GetMonName::
ret ret
GetItemName:: GetItemName::
; given an item ID at [wd11e], store the name of the item into a string ; given an item ID at [wd11e], store the name of the item in wNameBuffer
; starting at wcd6d
push hl push hl
push bc push bc
ld a, [wd11e] ld a, [wd11e]
@ -44,13 +43,13 @@ GetItemName::
.Machine .Machine
call GetMachineName call GetMachineName
.Finish .Finish
ld de, wcd6d ; pointer to where item name is stored in RAM ld de, wNameBuffer
pop bc pop bc
pop hl pop hl
ret ret
GetMachineName:: GetMachineName::
; copies the name of the TM/HM in [wd11e] to wcd6d ; copies the name of the TM/HM in [wd11e] to wNameBuffer
push hl push hl
push de push de
push bc push bc
@ -69,7 +68,7 @@ GetMachineName::
ld hl, TechnicalPrefix ; points to "TM" ld hl, TechnicalPrefix ; points to "TM"
ld bc, 2 ld bc, 2
.WriteMachinePrefix .WriteMachinePrefix
ld de, wcd6d ld de, wNameBuffer
call CopyData call CopyData
; now get the machine number and convert it to text ; now get the machine number and convert it to text
@ -136,6 +135,6 @@ GetMoveName::
ld a, BANK(MoveNames) ld a, BANK(MoveNames)
ld [wPredefBank], a ld [wPredefBank], a
call GetName call GetName
ld de, wcd6d ; pointer to where move name is stored in RAM ld de, wNameBuffer
pop hl pop hl
ret ret

2
home/names2.asm
View file

@ -83,7 +83,7 @@ GetName::
jr nz, .nextName jr nz, .nextName
ld h, d ld h, d
ld l, e ld l, e
ld de, wcd6d ld de, wNameBuffer
ld bc, NAME_BUFFER_LENGTH ld bc, NAME_BUFFER_LENGTH
call CopyData call CopyData
.gotPtr .gotPtr

4
home/pokemon.asm
View file

@ -435,7 +435,7 @@ GetMonHeader::
ld [MBC1RomBank], a ld [MBC1RomBank], a
ret ret
; copy party pokemon's name to wcd6d ; copy party pokemon's name to wNameBuffer
GetPartyMonName2:: GetPartyMonName2::
ld a, [wWhichPokemon] ; index within party ld a, [wWhichPokemon] ; index within party
ld hl, wPartyMonNicks ld hl, wPartyMonNicks
@ -445,7 +445,7 @@ GetPartyMonName::
push hl push hl
push bc push bc
call SkipFixedLengthTextEntries ; add NAME_LENGTH to hl, a times call SkipFixedLengthTextEntries ; add NAME_LENGTH to hl, a times
ld de, wcd6d ld de, wNameBuffer
push de push de
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyData call CopyData

20
ram/wram.asm
View file

@ -876,16 +876,28 @@ wDownscaledMonSize::
wNumMovesMinusOne:: db wNumMovesMinusOne:: db
UNION UNION
wcd6d:: ds NAME_BUFFER_LENGTH ; buffer for various data ; storage buffer for various name strings
wNameBuffer:: ds NAME_BUFFER_LENGTH
NEXTU NEXTU
ds 4 ; data copied from Moves for one move
; temp variable used to print a move's current PP on the status screen wMoveData:: ds MOVE_LENGTH
NEXTU
; amount of money made from one use of Pay Day
wPayDayMoney:: ds 3
NEXTU
; evolution data for one mon
wEvoDataBuffer:: ds 4 * 3 + 1 ; enough for Eevee's three 4-byte evolutions and 0 terminator
NEXTU
wBattleMenuCurrentPP:: db
ds 3
wStatusScreenCurrentPP:: db wStatusScreenCurrentPP:: db
ds 6 ds 6
; list of normal max PP (without PP up) values ; list of normal max PP (without PP up) values
wNormalMaxPPList:: ds NUM_MOVES wNormalMaxPPList:: ds NUM_MOVES
ds 5
ENDU ENDU
UNION UNION

2
scripts/CeladonMartRoof.asm
View file

@ -198,7 +198,7 @@ CeladonMartRoofScript_PrintDrinksInBag:
ldh a, [hItemCounter] ldh a, [hItemCounter]
ld bc, SCREEN_WIDTH * 2 ld bc, SCREEN_WIDTH * 2
call AddNTimes call AddNTimes
ld de, wcd6d ld de, wNameBuffer
call PlaceString call PlaceString
ld hl, hItemCounter ld hl, hItemCounter
inc [hl] inc [hl]

2
scripts/Route15Gate2F.asm
View file

@ -16,7 +16,7 @@ Route15Gate2FOaksAideText:
ldh [hOaksAideRewardItem], a ldh [hOaksAideRewardItem], a
ld [wd11e], a ld [wd11e], a
call GetItemName call GetItemName
ld hl, wcd6d ld hl, wNameBuffer
ld de, wOaksAideRewardItemName ld de, wOaksAideRewardItemName
ld bc, ITEM_NAME_LENGTH ld bc, ITEM_NAME_LENGTH
call CopyData call CopyData

2
scripts/Route23.asm
View file

@ -81,7 +81,7 @@ Route23CopyBadgeTextScript:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, wcd6d ld de, wNameBuffer
.copyTextLoop .copyTextLoop
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a

2
scripts/Route2Gate.asm
View file

@ -16,7 +16,7 @@ Route2GateOaksAideText:
ldh [hOaksAideRewardItem], a ldh [hOaksAideRewardItem], a
ld [wd11e], a ld [wd11e], a
call GetItemName call GetItemName
ld hl, wcd6d ld hl, wNameBuffer
ld de, wOaksAideRewardItemName ld de, wOaksAideRewardItemName
ld bc, ITEM_NAME_LENGTH ld bc, ITEM_NAME_LENGTH
call CopyData call CopyData

2
text/ChampionsRoom.asm
View file

@ -96,7 +96,7 @@ _ChampionsRoomOakCongratulatesPlayerText::
line "much since you" line "much since you"
cont "first left with" cont "first left with"
cont "@" cont "@"
text_ram wcd6d text_ram wNameBuffer
text "!" text "!"
para "<PLAYER>, you have" para "<PLAYER>, you have"

4
text/CinnabarLabFossilRoom.asm
View file

@ -38,7 +38,7 @@ _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText::
_CinnabarLabFossilRoomScientist1SeesFossilText:: _CinnabarLabFossilRoomScientist1SeesFossilText::
text "Oh! That is" text "Oh! That is"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "!" text "!"
para "It is fossil of" para "It is fossil of"
@ -60,7 +60,7 @@ _CinnabarLabFossilRoomScientist1TakesFossilText::
para "<PLAYER> handed" para "<PLAYER> handed"
line "over @" line "over @"
text_ram wcd6d text_ram wNameBuffer
text "!" text "!"
prompt prompt

6
text/Daycare.asm
View file

@ -13,7 +13,7 @@ _DaycareGentlemanWhichMonText::
_DaycareGentlemanWillLookAfterMonText:: _DaycareGentlemanWillLookAfterMonText::
text "Fine, I'll look" text "Fine, I'll look"
line "after @" line "after @"
text_ram wcd6d text_ram wNameBuffer
text_start text_start
cont "for a while." cont "for a while."
prompt prompt
@ -25,7 +25,7 @@ _DaycareGentlemanComeSeeMeInAWhileText::
_DaycareGentlemanMonHasGrownText:: _DaycareGentlemanMonHasGrownText::
text "Your @" text "Your @"
text_ram wcd6d text_ram wNameBuffer
text_start text_start
line "has grown a lot!" line "has grown a lot!"
@ -55,7 +55,7 @@ _DaycareGentlemanGotMonBackText::
_DaycareGentlemanMonNeedsMoreTimeText:: _DaycareGentlemanMonNeedsMoreTimeText::
text "Back already?" text "Back already?"
line "Your @" line "Your @"
text_ram wcd6d text_ram wNameBuffer
text_start text_start
cont "needs some more" cont "needs some more"
cont "time with me." cont "time with me."

6
text/NameRatersHouse.asm
View file

@ -14,7 +14,7 @@ _NameRatersHouseNameRaterWhichPokemonText::
prompt prompt
_NameRatersHouseNameRaterGiveItANiceNameText:: _NameRatersHouseNameRaterGiveItANiceNameText::
text_ram wcd6d text_ram wNameBuffer
text ", is it?" text ", is it?"
line "That is a decent" line "That is a decent"
cont "nickname!" cont "nickname!"
@ -48,13 +48,13 @@ _NameRatersHouseNameRaterComeAnyTimeYouLikeText::
done done
_NameRatersHouseNameRaterATrulyImpeccableNameText:: _NameRatersHouseNameRaterATrulyImpeccableNameText::
text_ram wcd6d text_ram wNameBuffer
text ", is it?" text ", is it?"
line "That is a truly" line "That is a truly"
cont "impeccable name!" cont "impeccable name!"
para "Take good care of" para "Take good care of"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "!" text "!"
done done

4
text/OaksLab.asm
View file

@ -51,7 +51,7 @@ _OaksLabMonEnergeticText::
_OaksLabReceivedMonText:: _OaksLabReceivedMonText::
text "<PLAYER> received" text "<PLAYER> received"
line "a @" line "a @"
text_ram wcd6d text_ram wNameBuffer
text "!@" text "!@"
text_end text_end
@ -243,7 +243,7 @@ _OaksLabRivalIllTakeThisOneText::
_OaksLabRivalReceivedMonText:: _OaksLabRivalReceivedMonText::
text "<RIVAL> received" text "<RIVAL> received"
line "a @" line "a @"
text_ram wcd6d text_ram wNameBuffer
text "!@" text "!@"
text_end text_end

8
text/Route23.asm
View file

@ -2,12 +2,12 @@ _Route23YouDontHaveTheBadgeYetText::
text "You can pass here" text "You can pass here"
line "only if you have" line "only if you have"
cont "the @" cont "the @"
text_ram wcd6d text_ram wNameBuffer
text "!" text "!"
para "You don't have the" para "You don't have the"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text " yet!" text " yet!"
para "You have to have" para "You have to have"
@ -19,12 +19,12 @@ _Route23OhThatIsTheBadgeText::
text "You can pass here" text "You can pass here"
line "only if you have" line "only if you have"
cont "the @" cont "the @"
text_ram wcd6d text_ram wNameBuffer
text "!" text "!"
para "Oh! That is the" para "Oh! That is the"
line "@" line "@"
text_ram wcd6d text_ram wNameBuffer
text "!@" text "!@"
text_end text_end