pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Consistent labels for each nickname in RAM

Browse Source
This commit is contained in:
Rangi
2021-03-17 16:16:02 -04:00
parent 6c8f8609cb
commit 4522162d45
57 changed files with 382 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
constants/npc_trade_constants.asm
View File

@ -1,15 +1,15 @@
; npctrade struct members (see data/events/npc_trades.asm) ; npctrade struct members (see data/events/npc_trades.asm)
rsreset rsreset
NPCTRADE_DIALOG rb NPCTRADE_DIALOG rb
NPCTRADE_GIVEMON rb NPCTRADE_GIVEMON rb
NPCTRADE_GETMON rb NPCTRADE_GETMON rb
NPCTRADE_NICK rb MON_NAME_LENGTH NPCTRADE_NICKNAME rb MON_NAME_LENGTH
NPCTRADE_DVS rw NPCTRADE_DVS rw
NPCTRADE_ITEM rb NPCTRADE_ITEM rb
NPCTRADE_OT_ID rw NPCTRADE_OT_ID rw
NPCTRADE_OT_NAME rb NAME_LENGTH NPCTRADE_OT_NAME rb NAME_LENGTH
NPCTRADE_GENDER rb NPCTRADE_GENDER rb
NPCTRADE_PADDING rb rb_skip
NPCTRADE_STRUCT_LENGTH EQU _RS NPCTRADE_STRUCT_LENGTH EQU _RS
; NPCTrades indexes (see data/events/npc_trades.asm) ; NPCTrades indexes (see data/events/npc_trades.asm)

42
data/text/battle.asm
View File

@ -9,7 +9,7 @@ BattleText_PlayerPickedUpPayDayMoney:
WildPokemonAppearedText: WildPokemonAppearedText:
text "Wild @" text "Wild @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "appeared!" line "appeared!"
prompt prompt
@ -17,20 +17,20 @@ WildPokemonAppearedText:
HookedPokemonAttackedText: HookedPokemonAttackedText:
text "The hooked" text "The hooked"
line "@" line "@"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
cont "attacked!" cont "attacked!"
prompt prompt
PokemonFellFromTreeText: PokemonFellFromTreeText:
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text " fell" text " fell"
line "out of the tree!" line "out of the tree!"
prompt prompt
WildCelebiAppearedText: WildCelebiAppearedText:
text "Wild @" text "Wild @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "appeared!" line "appeared!"
prompt prompt
@ -42,14 +42,14 @@ WantsToBattleText::
BattleText_WildFled: BattleText_WildFled:
text "Wild @" text "Wild @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "fled!" line "fled!"
prompt prompt
BattleText_EnemyFled: BattleText_EnemyFled:
text "Enemy @" text "Enemy @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "fled!" line "fled!"
prompt prompt
@ -161,7 +161,7 @@ BattleText_TheSandstormSubsided:
BattleText_EnemyMonFainted: BattleText_EnemyMonFainted:
text "Enemy @" text "Enemy @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "fainted!" line "fainted!"
prompt prompt
@ -206,7 +206,7 @@ UnusedRivalLossText: ; unreferenced
prompt prompt
BattleText_MonFainted: BattleText_MonFainted:
text_ram wBattleMonNick text_ram wBattleMonNickname
text_start text_start
line "fainted!" line "fainted!"
prompt prompt
@ -230,7 +230,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
text "<ENEMY>" text "<ENEMY>"
line "is about to use" line "is about to use"
cont "@" cont "@"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text "." text "."
para "Will <PLAYER>" para "Will <PLAYER>"
@ -241,7 +241,7 @@ BattleText_EnemySentOut:
text "<ENEMY>" text "<ENEMY>"
line "sent out" line "sent out"
cont "@" cont "@"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text "!" text "!"
done done
@ -308,13 +308,13 @@ BattleText_ItemsCantBeUsedHere:
prompt prompt
BattleText_MonIsAlreadyOut: BattleText_MonIsAlreadyOut:
text_ram wBattleMonNick text_ram wBattleMonNickname
text_start text_start
line "is already out." line "is already out."
prompt prompt
BattleText_MonCantBeRecalled: BattleText_MonCantBeRecalled:
text_ram wBattleMonNick text_ram wBattleMonNickname
text_start text_start
line "can't be recalled!" line "can't be recalled!"
prompt prompt
@ -330,7 +330,7 @@ BattleText_TheMoveIsDisabled:
prompt prompt
BattleText_MonHasNoMovesLeft: BattleText_MonHasNoMovesLeft:
text_ram wBattleMonNick text_ram wBattleMonNickname
text_start text_start
line "has no moves left!" line "has no moves left!"
done done
@ -353,14 +353,14 @@ BattleText_StringBuffer1GrewToLevel:
BattleText_WildMonIsEating: BattleText_WildMonIsEating:
text "Wild @" text "Wild @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "is eating!" line "is eating!"
prompt prompt
BattleText_WildMonIsAngry: BattleText_WildMonIsAngry:
text "Wild @" text "Wild @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "is angry!" line "is angry!"
prompt prompt
@ -516,37 +516,37 @@ DisabledMoveText:
prompt prompt
LoafingAroundText: LoafingAroundText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " is" text " is"
line "loafing around." line "loafing around."
prompt prompt
BeganToNapText: BeganToNapText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " began" text " began"
line "to nap!" line "to nap!"
prompt prompt
WontObeyText: WontObeyText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " won't" text " won't"
line "obey!" line "obey!"
prompt prompt
TurnedAwayText: TurnedAwayText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " turned" text " turned"
line "away!" line "away!"
prompt prompt
IgnoredOrdersText: IgnoredOrdersText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " ignored" text " ignored"
line "orders!" line "orders!"
prompt prompt
IgnoredSleepingText: IgnoredSleepingText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " ignored" text " ignored"
line "orders…sleeping!" line "orders…sleeping!"
prompt prompt

4
data/text/common_1.asm
View File

@ -1106,7 +1106,7 @@ _EnemyWithdrewText::
text "<ENEMY>" text "<ENEMY>"
line "withdrew" line "withdrew"
cont "@" cont "@"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text "!" text "!"
prompt prompt
@ -1116,7 +1116,7 @@ _EnemyUsedOnText::
text_ram wMonOrItemNameBuffer text_ram wMonOrItemNameBuffer
text_start text_start
cont "on @" cont "on @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text "!" text "!"
prompt prompt

8
data/text/common_2.asm
View File

@ -133,12 +133,12 @@ _YourFoesWeakGetmMonText::
text_end text_end
_BattleMonNicknameText:: _BattleMonNicknameText::
text_ram wBattleMonNick text_ram wBattleMonNickname
text "!" text "!"
done done
_BattleMonNickCommaText:: _BattleMonNickCommaText::
text_ram wBattleMonNick text_ram wBattleMonNickname
text ",@" text ",@"
text_end text_end
@ -807,7 +807,7 @@ _BreedAskNicknameText::
_LeftWithDayCareLadyText:: _LeftWithDayCareLadyText::
text "It's @" text "It's @"
text_ram wBreedMon2Nick text_ram wBreedMon2Nickname
text_start text_start
line "that was left with" line "that was left with"
cont "the DAY-CARE LADY." cont "the DAY-CARE LADY."
@ -815,7 +815,7 @@ _LeftWithDayCareLadyText::
_LeftWithDayCareManText:: _LeftWithDayCareManText::
text "It's @" text "It's @"
text_ram wBreedMon1Nick text_ram wBreedMon1Nickname
text_start text_start
line "that was left with" line "that was left with"
cont "the DAY-CARE MAN." cont "the DAY-CARE MAN."

10
data/text/common_3.asm
View File

@ -72,7 +72,7 @@ _LinkAbnormalMonText::
_LinkAskTradeForText:: _LinkAskTradeForText::
text "Trade @" text "Trade @"
text_ram wBufferTrademonNick text_ram wBufferTrademonNickname
text_start text_start
line "for @" line "for @"
text_ram wStringBuffer1 text_ram wStringBuffer1
@ -322,7 +322,7 @@ _SeerTradeText::
text_ram wSeerNickname text_ram wSeerNickname
text_start text_start
line "came from @" line "came from @"
text_ram wSeerOTName text_ram wSeerOT
text_start text_start
cont "in a trade?" cont "in a trade?"
@ -330,7 +330,7 @@ _SeerTradeText::
text_ram wSeerCaughtLocation text_ram wSeerCaughtLocation
text_start text_start
line "was where @" line "was where @"
text_ram wSeerOTName text_ram wSeerOT
text_start text_start
cont "met @" cont "met @"
text_ram wSeerNickname text_ram wSeerNickname
@ -1216,7 +1216,7 @@ _BallSoCloseText::
Text_BallCaught:: Text_BallCaught::
text "Gotcha! @" text "Gotcha! @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "was caught!@" line "was caught!@"
sound_caught_mon sound_caught_mon
@ -1237,7 +1237,7 @@ _BallSentToPCText::
prompt prompt
_NewDexDataText:: _NewDexDataText::
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text "'s data" text "'s data"
line "was newly added to" line "was newly added to"
cont "the #DEX.@" cont "the #DEX.@"

14
data/text_buffers.asm
View File

@ -1,9 +1,9 @@
StringBufferPointers:: StringBufferPointers::
; entries correspond to arguments for text_buffer (TX_STRINGBUFFER) ; entries correspond to arguments for text_buffer (TX_STRINGBUFFER)
dw wStringBuffer3 ; 0 dw wStringBuffer3 ; 0
dw wStringBuffer4 ; 1 dw wStringBuffer4 ; 1
dw wStringBuffer5 ; 2 dw wStringBuffer5 ; 2
dw wStringBuffer2 ; 3 dw wStringBuffer2 ; 3
dw wStringBuffer1 ; 4 dw wStringBuffer1 ; 4
dw wEnemyMonNick ; 5 dw wEnemyMonNickname ; 5
dw wBattleMonNick ; 6 dw wBattleMonNickname ; 6

2
docs/bugs_and_glitches.md
View File

@ -566,7 +566,7 @@ This bug affects Attract, Curse, Foresight, Mean Look, Mimic, Nightmare, Spider
.got_mon .got_mon
ld a, [wCurBeatUpPartyMon] ld a, [wCurBeatUpPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ld a, MON_HP ld a, MON_HP
call GetBeatupMonLocation call GetBeatupMonLocation
ld a, [hli] ld a, [hli]

14
docs/text_commands.md
View File

@ -110,13 +110,13 @@ Play `SFX_SLOT_MACHINE_START`.
Write text from one of the following addresses (listed in [data/text_buffers.asm](https://github.com/pret/pokecrystal/blob/master/data/text_buffers.asm)): Write text from one of the following addresses (listed in [data/text_buffers.asm](https://github.com/pret/pokecrystal/blob/master/data/text_buffers.asm)):
0. `StringBuffer3` 0. `wStringBuffer3`
1. `StringBuffer4` 1. `wStringBuffer4`
2. `StringBuffer5` 2. `wStringBuffer5`
3. `StringBuffer2` 3. `wStringBuffer2`
4. `StringBuffer1` 4. `wStringBuffer1`
5. `EnemyMonNick` 5. `wEnemyMonNickname`
6. `BattleMonNick` 6. `wBattleMonNickname`
## `$15`: `text_today` ## `$15`: `text_today`

14
engine/battle/core.asm
View File

@ -3885,7 +3885,7 @@ InitBattleMon:
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld a, [wCurBattleMon] ld a, [wCurBattleMon]
call SkipNames call SkipNames
ld de, wBattleMonNick ld de, wBattleMonNickname
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld hl, wBattleMonAttack ld hl, wBattleMonAttack
@ -3965,7 +3965,7 @@ InitEnemyMon:
ld hl, wOTPartyMonNicknames ld hl, wOTPartyMonNicknames
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call SkipNames call SkipNames
ld de, wEnemyMonNick ld de, wEnemyMonNickname
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld hl, wEnemyMonAttack ld hl, wEnemyMonAttack
@ -4642,7 +4642,7 @@ CheckDanger:
ret ret
PrintPlayerHUD: PrintPlayerHUD:
ld de, wBattleMonNick ld de, wBattleMonNickname
hlcoord 10, 7 hlcoord 10, 7
call Battle_DummyFunction call Battle_DummyFunction
call PlaceString call PlaceString
@ -4728,7 +4728,7 @@ DrawEnemyHUD:
ld [wCurSpecies], a ld [wCurSpecies], a
ld [wCurPartySpecies], a ld [wCurPartySpecies], a
call GetBaseData call GetBaseData
ld de, wEnemyMonNick ld de, wEnemyMonNickname
hlcoord 1, 0 hlcoord 1, 0
call Battle_DummyFunction call Battle_DummyFunction
call PlaceString call PlaceString
@ -6394,7 +6394,7 @@ LoadEnemyMon:
; Update enemy nick ; Update enemy nick
ld hl, wStringBuffer1 ld hl, wStringBuffer1
ld de, wEnemyMonNick ld de, wEnemyMonNickname
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
@ -7112,7 +7112,7 @@ GiveExperiencePoints:
ld [wStringBuffer2], a ld [wStringBuffer2], a
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ld hl, Text_MonGainedExpPoint ld hl, Text_MonGainedExpPoint
call BattleTextbox call BattleTextbox
ld a, [wStringBuffer2 + 1] ld a, [wStringBuffer2 + 1]
@ -7523,7 +7523,7 @@ AnimateExpBar:
ld c, $40 ld c, $40
call .LoopBarAnimation call .LoopBarAnimation
call PrintPlayerHUD call PrintPlayerHUD
ld hl, wBattleMonNick ld hl, wBattleMonNickname
ld de, wStringBuffer1 ld de, wStringBuffer1
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes

2
engine/battle/move_effects/beat_up.asm
View File

@ -28,7 +28,7 @@ BattleCommand_BeatUp:
.got_mon .got_mon
ld a, [wCurBeatUpPartyMon] ld a, [wCurBeatUpPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ld a, MON_HP ld a, MON_HP
call GetBeatupMonLocation call GetBeatupMonLocation
ld a, [hli] ld a, [hli]

2
engine/battle/read_trainer_party.asm
View File

@ -14,7 +14,7 @@ ReadTrainerParty:
ld [hl], a ld [hl], a
ld hl, wOTPartyMons ld hl, wOTPartyMons
ld bc, wOTPartyMonsEnd - wOTPartyMons ld bc, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH
xor a xor a
call ByteFill call ByteFill

2
engine/events/battle_tower/battle_tower.asm
View File

@ -1258,7 +1258,7 @@ BattleTowerAction_EggTicket: ; BattleTowerAction $0e
cp EGG cp EGG
jr nz, .not_egg jr nz, .not_egg
push hl push hl
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld de, NAME_LENGTH_JAPANESE ld de, NAME_LENGTH_JAPANESE
ld a, b ld a, b
and a and a

2
engine/events/bug_contest/display_stats.asm
View File

@ -48,7 +48,7 @@ DisplayCaughtContestMonStats:
ld [wTempMonLevel], a ld [wTempMonLevel], a
call PrintLevel call PrintLevel
ld de, wEnemyMonNick ld de, wEnemyMonNickname
hlcoord 1, 8 hlcoord 1, 8
call PlaceString call PlaceString

20
engine/events/daycare.asm
View File

@ -40,7 +40,7 @@ DayCareMan:
.AskWithdrawMon: .AskWithdrawMon:
farcall GetBreedMon1LevelGrowth farcall GetBreedMon1LevelGrowth
ld hl, wBreedMon1Nick ld hl, wBreedMon1Nickname
call GetPriceToRetrieveBreedmon call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon call DayCare_AskWithdrawBreedMon
jr c, .print_text jr c, .print_text
@ -78,7 +78,7 @@ DayCareLady:
.AskWithdrawMon: .AskWithdrawMon:
farcall GetBreedMon2LevelGrowth farcall GetBreedMon2LevelGrowth
ld hl, wBreedMon2Nick ld hl, wBreedMon2Nickname
call GetPriceToRetrieveBreedmon call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon call DayCare_AskWithdrawBreedMon
jr c, .print_text jr c, .print_text
@ -137,7 +137,7 @@ DayCareAskDepositPokemon:
jr c, .HoldingMail jr c, .HoldingMail
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call GetNick call GetNickname
and a and a
ret ret
@ -467,13 +467,13 @@ DayCare_GiveEgg:
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call DayCare_GetCurrentPartyMember call DayCare_GetCurrentPartyMember
ld hl, wEggNick ld hl, wEggMonNickname
call CopyBytes call CopyBytes
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call DayCare_GetCurrentPartyMember call DayCare_GetCurrentPartyMember
ld hl, wEggOT ld hl, wEggMonOT
call CopyBytes call CopyBytes
ld hl, wPartyMon1 ld hl, wPartyMon1
@ -550,10 +550,10 @@ DayCare_InitBreeding:
ld hl, wEggMon ld hl, wEggMon
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
call ByteFill call ByteFill
ld hl, wEggNick ld hl, wEggMonNickname
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call ByteFill call ByteFill
ld hl, wEggOT ld hl, wEggMonOT
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call ByteFill call ByteFill
ld a, [wBreedMon1DVs] ld a, [wBreedMon1DVs]
@ -606,11 +606,11 @@ DayCare_InitBreeding:
ld [wEggMonSpecies], a ld [wEggMonSpecies], a
call GetBaseData call GetBaseData
ld hl, wEggNick ld hl, wEggMonNickname
ld de, .String_EGG ld de, .String_EGG
call CopyName2 call CopyName2
ld hl, wPlayerName ld hl, wPlayerName
ld de, wEggOT ld de, wEggMonOT
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
xor a xor a

2
engine/events/haircut.asm
View File

@ -33,7 +33,7 @@ HaircutOrGrooming:
cp EGG cp EGG
jr z, .egg jr z, .egg
push hl push hl
call GetCurNick call GetCurNickname
call CopyPokemonName_Buffer1_Buffer3 call CopyPokemonName_Buffer1_Buffer3
pop hl pop hl
call Random call Random

2
engine/events/magikarp.asm
View File

@ -49,7 +49,7 @@ CheckMagikarpLength:
ld [de], a ld [de], a
inc de inc de
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
call CopyBytes call CopyBytes
ld a, MAGIKARPLENGTH_BEAT_RECORD ld a, MAGIKARPLENGTH_BEAT_RECORD

2
engine/events/move_tutor.asm
View File

@ -60,7 +60,7 @@ CheckCanLearnMoveTutorMove:
push bc push bc
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
pop bc pop bc
ld a, c ld a, c

12
engine/events/name_rater.asm
View File

@ -14,7 +14,7 @@ _NameRater:
cp EGG cp EGG
jr z, .egg jr z, .egg
; ... or a Pokemon you got from a trade. ; ... or a Pokemon you got from a trade.
call GetCurNick call GetCurNickname
call CheckIfMonIsYourOT call CheckIfMonIsYourOT
jr c, .traded jr c, .traded
; This name is good, but we can do better. How about it? ; This name is good, but we can do better. How about it?
@ -57,7 +57,7 @@ _NameRater:
.samename .samename
push hl push hl
call GetCurNick call GetCurNickname
ld hl, NameRaterNamedText ld hl, NameRaterNamedText
call PrintText call PrintText
pop hl pop hl
@ -80,7 +80,7 @@ _NameRater:
CheckIfMonIsYourOT: CheckIfMonIsYourOT:
; Checks to see if the partymon loaded in [wCurPartyMon] has the different OT as you. Returns carry if not. ; Checks to see if the partymon loaded in [wCurPartyMon] has the different OT as you. Returns carry if not.
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call AddNTimes call AddNTimes
@ -138,10 +138,10 @@ CompareNewToOld:
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call AddNTimes call AddNTimes
push hl push hl
call GetNicknameLength call GetNicknamenameLength
ld b, c ld b, c
ld hl, wStringBuffer2 ld hl, wStringBuffer2
call GetNicknameLength call GetNicknamenameLength
pop hl pop hl
ld a, c ld a, c
cp b cp b
@ -165,7 +165,7 @@ CompareNewToOld:
scf scf
ret ret
GetNicknameLength: GetNicknamenameLength:
; Gets the length of the name starting at hl and returns it in c. ; Gets the length of the name starting at hl and returns it in c.
ld c, 0 ld c, 0
.loop .loop

6
engine/events/npc_trade.asm
View File

@ -132,7 +132,7 @@ DoNPCTrade:
call GetTradeMonName call GetTradeMonName
call CopyTradeName call CopyTradeName
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call Trade_GetAttributeOfCurrentPartymon call Trade_GetAttributeOfCurrentPartymon
ld de, wPlayerTrademonOTName ld de, wPlayerTrademonOTName
@ -196,7 +196,7 @@ DoNPCTrade:
.incomplete .incomplete
farcall SetGiftPartyMonCaughtData farcall SetGiftPartyMonCaughtData
ld e, NPCTRADE_NICK ld e, NPCTRADE_NICKNAME
call GetTradeAttr call GetTradeAttr
ld de, wOTTrademonNickname ld de, wOTTrademonNickname
call CopyTradeName call CopyTradeName
@ -216,7 +216,7 @@ DoNPCTrade:
ld de, wOTTrademonSenderName ld de, wOTTrademonSenderName
call CopyTradeName call CopyTradeName
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call Trade_GetAttributeOfLastPartymon call Trade_GetAttributeOfLastPartymon
ld hl, wOTTrademonOTName ld hl, wOTTrademonOTName

10
engine/events/odd_egg.asm
View File

@ -42,8 +42,8 @@ _GiveOddEgg:
ld a, NICKNAMED_MON_STRUCT_LENGTH ld a, NICKNAMED_MON_STRUCT_LENGTH
call AddNTimes call AddNTimes
; Writes to wOddEgg, wOddEggName, and wOddEggOTName, ; Writes to wOddEgg, wOddEggName, and wOddEggOT,
; even though OddEggs does not have data for wOddEggOTName ; even though OddEggs does not have data for wOddEggOT
ld de, wOddEgg ld de, wOddEgg
ld bc, NICKNAMED_MON_STRUCT_LENGTH + NAME_LENGTH ld bc, NICKNAMED_MON_STRUCT_LENGTH + NAME_LENGTH
call CopyBytes call CopyBytes
@ -78,11 +78,11 @@ _GiveOddEgg:
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
; load pointer to wTempOddEggNickname in wMobileMonOTNamePointer ; load pointer to wTempOddEggNickname in wMobileMonOTPointer
ld a, LOW(wTempOddEggNickname) ld a, LOW(wTempOddEggNickname)
ld [wMobileMonOTNamePointer], a ld [wMobileMonOTPointer], a
ld a, HIGH(wTempOddEggNickname) ld a, HIGH(wTempOddEggNickname)
ld [wMobileMonOTNamePointer + 1], a ld [wMobileMonOTPointer + 1], a
; load pointer to wOddEggName in wMobileMonNicknamePointer ; load pointer to wOddEggName in wMobileMonNicknamePointer
ld a, LOW(wOddEggName) ld a, LOW(wOddEggName)
ld [wMobileMonNicknamePointer], a ld [wMobileMonNicknamePointer], a

Some files were not shown because too many files have changed in this diff Show More