PARTY_LENGTH; MON_NAME; sgb_border.bin

This commit is contained in:
Remy Oukaour 2018-01-20 12:25:55 -05:00
parent 8127d1fbcf
commit 05382d3e3c
51 changed files with 147 additions and 146 deletions

View File

@ -1,11 +1,11 @@
BATTLETOWER_PARTY_SIZE EQU 3 BATTLETOWER_PARTY_LENGTH EQU 3
BATTLETOWER_STREAK_SIZE EQU 7 BATTLETOWER_STREAK_LENGTH EQU 7
BATTLETOWER_NUM_UNIQUE_PKMN EQU 21 BATTLETOWER_NUM_UNIQUE_PKMN EQU 21
BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70
BATTLETOWER_TRAINERDATALENGTH EQU $24 BATTLETOWER_TRAINERDATALENGTH EQU $24
BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_SIZE * (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * (PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH
; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm) ; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm)
const_def const_def

View File

@ -50,7 +50,7 @@ MONS_PER_BOX EQU 20
NUM_BOXES EQU 14 NUM_BOXES EQU 14
; hall of fame ; hall of fame
HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (PKMN_NAME_LENGTH +- 1) ; species, id, dvs, level, nick HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH +- 1) ; species, id, dvs, level, nick
HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator
NUM_HOF_TEAMS = 30 NUM_HOF_TEAMS = 30

View File

@ -94,12 +94,12 @@
const POKEDEX_SHOW_7 ; 56 const POKEDEX_SHOW_7 ; 56
const POKEDEX_SHOW_8 ; 57 const POKEDEX_SHOW_8 ; 57
; PlayRadio arguments (see engine/pokegear.asm) ; PlayRadio.StationPointers indexes (see engine/pokegear.asm)
const_def const_def
const MAPRADIO_POKEMON_CHANNEL const MAPRADIO_POKEMON_CHANNEL
const MAPRADIO_OAKS_MON_TALK const MAPRADIO_OAKS_MON_TALK
const MAPRADIO_POKEDEX_SHOW const MAPRADIO_POKEDEX_SHOW
const MAPRADIO_PKMN_MUSIC const MAPRADIO_POKEMON_MUSIC
const MAPRADIO_LUCKY_CHANNEL const MAPRADIO_LUCKY_CHANNEL
const MAPRADIO_UNOWN const MAPRADIO_UNOWN
const MAPRADIO_PLACES_PEOPLE const MAPRADIO_PLACES_PEOPLE

View File

@ -1,16 +1,16 @@
; name lengths ; name lengths
NAME_LENGTH EQU 11 NAME_LENGTH EQU 11
PLAYER_NAME_LENGTH EQU 8 PLAYER_NAME_LENGTH EQU 8
BOX_NAME_LENGTH EQU 9 BOX_NAME_LENGTH EQU 9
PKMN_NAME_LENGTH EQU 11 MON_NAME_LENGTH EQU 11
MOVE_NAME_LENGTH EQU 13 MOVE_NAME_LENGTH EQU 13
ITEM_NAME_LENGTH EQU 13 ITEM_NAME_LENGTH EQU 13
TRAINER_CLASS_NAME_LENGTH EQU 13 TRAINER_CLASS_NAME_LENGTH EQU 13
NAME_LENGTH_JAPANESE EQU 6 NAME_LENGTH_JAPANESE EQU 6
; GetName types (see home/names.asm) ; GetName types (see home/names.asm)
const_value set 1 const_value set 1
const PKMN_NAME ; 1 const MON_NAME ; 1
const MOVE_NAME ; 2 const MOVE_NAME ; 2
const DUMMY_NAME ; 3 const DUMMY_NAME ; 3
const ITEM_NAME ; 4 const ITEM_NAME ; 4

View File

@ -746,7 +746,7 @@ Data_DaisyMassage: ; 746b
CopyPokemonName_Buffer1_Buffer3: ; 746e CopyPokemonName_Buffer1_Buffer3: ; 746e
ld hl, StringBuffer1 ld hl, StringBuffer1
ld de, StringBuffer3 ld de, StringBuffer3
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
jp CopyBytes jp CopyBytes
``` ```

View File

@ -3989,7 +3989,7 @@ InitBattleMon: ; 3da0d
ld a, [CurBattleMon] ld a, [CurBattleMon]
call SkipNames call SkipNames
ld de, BattleMonNick ld de, BattleMonNick
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld hl, BattleMonAttack ld hl, BattleMonAttack
ld de, PlayerStats ld de, PlayerStats
@ -4074,7 +4074,7 @@ InitEnemyMon: ; 3dabd
ld a, [CurPartyMon] ld a, [CurPartyMon]
call SkipNames call SkipNames
ld de, EnemyMonNick ld de, EnemyMonNick
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld hl, EnemyMonAttack ld hl, EnemyMonAttack
ld de, EnemyStats ld de, EnemyStats
@ -6578,7 +6578,7 @@ LoadEnemyMon: ; 3e8eb
; Update enemy nick ; Update enemy nick
ld hl, StringBuffer1 ld hl, StringBuffer1
ld de, EnemyMonNick ld de, EnemyMonNick
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
; Saw this mon ; Saw this mon
@ -7766,7 +7766,7 @@ AnimateExpBar: ; 3f136
call PrintPlayerHUD call PrintPlayerHUD
ld hl, BattleMonNick ld hl, BattleMonNick
ld de, StringBuffer1 ld de, StringBuffer1
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
call TerminateExpBarSound call TerminateExpBarSound
ld de, SFX_HIT_END_OF_EXP_BAR ld de, SFX_HIT_END_OF_EXP_BAR

View File

@ -1331,11 +1331,11 @@ BillsPC_RefreshTextboxes: ; e2c2c (38:6c2c)
jr z, .boxfail jr z, .boxfail
ld bc, sBoxMonNicknames - sBox ld bc, sBoxMonNicknames - sBox
add hl, bc add hl, bc
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
ld a, e ld a, e
call AddNTimes call AddNTimes
ld de, StringBuffer1 ld de, StringBuffer1
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM
pop hl pop hl
@ -1357,11 +1357,11 @@ BillsPC_RefreshTextboxes: ; e2c2c (38:6c2c)
and a and a
jr z, .partyfail jr z, .partyfail
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
ld a, e ld a, e
call AddNTimes call AddNTimes
ld de, StringBuffer1 ld de, StringBuffer1
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
pop hl pop hl
ld de, StringBuffer1 ld de, StringBuffer1
@ -1383,11 +1383,11 @@ BillsPC_RefreshTextboxes: ; e2c2c (38:6c2c)
and a and a
jr z, .sBoxFail jr z, .sBoxFail
ld hl, sBoxMonNicknames ld hl, sBoxMonNicknames
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
ld a, e ld a, e
call AddNTimes call AddNTimes
ld de, StringBuffer1 ld de, StringBuffer1
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM
pop hl pop hl
@ -2171,11 +2171,11 @@ CopySpeciesToTemp: ; e3357 (38:7357)
ret ret
CopyNicknameToTemp: ; e3363 (38:7363) CopyNicknameToTemp: ; e3363 (38:7363)
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
ld a, [CurPartyMon] ld a, [CurPartyMon]
call AddNTimes call AddNTimes
ld de, wBufferMonNick ld de, wBufferMonNick
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ret ret

View File

@ -320,7 +320,7 @@ HatchEggs: ; 16f70 (5:6f70)
call PrintText call PrintText
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call AddNTimes call AddNTimes
ld d, h ld d, h
ld e, l ld e, l
@ -345,7 +345,7 @@ HatchEggs: ; 16f70 (5:6f70)
.nonickname .nonickname
ld hl, StringBuffer1 ld hl, StringBuffer1
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
.next ; 1707d (5:707d) .next ; 1707d (5:707d)

View File

@ -42,7 +42,7 @@ Special_CheckPartyFullAfterContest: ; 4d9e5
call GetPokemonName call GetPokemonName
ld hl, StringBuffer1 ld hl, StringBuffer1
ld de, wMonOrItemNameBuffer ld de, wMonOrItemNameBuffer
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
call GiveANickname_YesNo call GiveANickname_YesNo
jr c, .Party_SkipNickname jr c, .Party_SkipNickname
@ -120,7 +120,7 @@ Special_CheckPartyFullAfterContest: ; 4d9e5
ld a, BANK(sBoxMonNicknames) ld a, BANK(sBoxMonNicknames)
call GetSRAMBank call GetSRAMBank
ld de, sBoxMonNicknames ld de, sBoxMonNicknames
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM

View File

@ -1195,7 +1195,8 @@ PredefPals:
INCLUDE "gfx/sgb/predef.pal" INCLUDE "gfx/sgb/predef.pal"
SGBBorderMap: SGBBorderMap:
INCBIN "gfx/sgb/sgb_border.tilemap" ; interleaved tile ids and palette ids
INCBIN "gfx/sgb/sgb_border.bin"
SGBBorderPalettes: SGBBorderPalettes:
INCLUDE "gfx/sgb/sgb_border.pal" INCLUDE "gfx/sgb/sgb_border.pal"

View File

@ -285,7 +285,7 @@ ReadBTTrainerParty: ; 1702b7
; Check the nicknames for illegal characters, and replace bad nicknames ; Check the nicknames for illegal characters, and replace bad nicknames
; with their species names. ; with their species names.
ld de, wBT_OTTempPkmn1Name ; $c643 ld de, wBT_OTTempPkmn1Name ; $c643
ld c, PKMN_NAME_LENGTH ld c, MON_NAME_LENGTH
farcall CheckStringForErrors farcall CheckStringForErrors
jr nc, .skip_mon_1 jr nc, .skip_mon_1
@ -295,12 +295,12 @@ ReadBTTrainerParty: ; 1702b7
ld l, e ld l, e
ld h, d ld h, d
ld de, wBT_OTTempPkmn1Name ; $c643 ld de, wBT_OTTempPkmn1Name ; $c643
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
.skip_mon_1 .skip_mon_1
ld de, wBT_OTTempPkmn2Name ; $c67e ld de, wBT_OTTempPkmn2Name ; $c67e
ld c, PKMN_NAME_LENGTH ld c, MON_NAME_LENGTH
farcall CheckStringForErrors farcall CheckStringForErrors
jr nc, .skip_mon_2 jr nc, .skip_mon_2
ld a, [wBT_OTTempPkmn2] ; [$c64e] ld a, [wBT_OTTempPkmn2] ; [$c64e]
@ -309,12 +309,12 @@ ReadBTTrainerParty: ; 1702b7
ld l, e ld l, e
ld h, d ld h, d
ld de, wBT_OTTempPkmn2Name ; $c67e ld de, wBT_OTTempPkmn2Name ; $c67e
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
.skip_mon_2 .skip_mon_2
ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9 ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9
ld c, PKMN_NAME_LENGTH ld c, MON_NAME_LENGTH
farcall CheckStringForErrors farcall CheckStringForErrors
jr nc, .skip_mon_3 jr nc, .skip_mon_3
ld a, [wBT_OTTempPkmn3] ; [$c689] ld a, [wBT_OTTempPkmn3] ; [$c689]
@ -323,7 +323,7 @@ ReadBTTrainerParty: ; 1702b7
ld l, e ld l, e
ld h, d ld h, d
ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9 ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
.skip_mon_3 .skip_mon_3
@ -363,7 +363,7 @@ ReadBTTrainerParty: ; 1702b7
; Copy Pkmn into Memory from the address in hl ; Copy Pkmn into Memory from the address in hl
ld de, OTPartyMon1Species ld de, OTPartyMon1Species
ld bc, OTPartyCount ld bc, OTPartyCount
ld a, BATTLETOWER_PARTY_SIZE ld a, BATTLETOWER_PARTY_LENGTH
ld [bc], a ld [bc], a
inc bc inc bc
.otpartymon_loop .otpartymon_loop
@ -379,7 +379,7 @@ ReadBTTrainerParty: ; 1702b7
ld e, a ld e, a
ld a, [BGMapBuffer + 1] ld a, [BGMapBuffer + 1]
ld d, a ld d, a
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld a, e ld a, e
ld [BGMapBuffer], a ld [BGMapBuffer], a
@ -399,7 +399,7 @@ ReadBTTrainerParty: ; 1702b7
ValidateBTParty: ; 170394 ValidateBTParty: ; 170394
; Check for and fix errors in party data ; Check for and fix errors in party data
ld hl, wBT_OTTempPkmn1Species ld hl, wBT_OTTempPkmn1Species
ld d, BATTLETOWER_PARTY_SIZE ld d, BATTLETOWER_PARTY_LENGTH
.pkmn_loop .pkmn_loop
push de push de
push hl push hl
@ -495,7 +495,7 @@ endr
ld a, [hl] ld a, [hl]
ld [de], a ld [de], a
pop hl pop hl
ld bc, PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH
add hl, bc add hl, bc
pop de pop de
dec d dec d
@ -509,7 +509,7 @@ BT_ChrisName: ; 170426
Function17042c: ; 17042c Function17042c: ; 17042c
ld hl, w3_d202TrainerData ld hl, w3_d202TrainerData
ld a, BATTLETOWER_STREAK_SIZE ld a, BATTLETOWER_STREAK_LENGTH
.loop .loop
push af push af
push hl push hl
@ -956,7 +956,7 @@ ResetBattleTowerTrainersSRAM: ; 1706d6 (5c:46d6) BattleTowerAction $1a
ld a, $ff ld a, $ff
ld hl, sBTTrainers ld hl, sBTTrainers
ld bc, BATTLETOWER_STREAK_SIZE ld bc, BATTLETOWER_STREAK_LENGTH
call ByteFill call ByteFill
xor a xor a

View File

@ -41,7 +41,7 @@ endc
ld a, BANK(sBTTrainers) ld a, BANK(sBTTrainers)
call GetSRAMBank call GetSRAMBank
ld c, BATTLETOWER_STREAK_SIZE ld c, BATTLETOWER_STREAK_LENGTH
ld hl, sBTTrainers ld hl, sBTTrainers
.next_trainer .next_trainer
ld a, [hli] ld a, [hli]
@ -93,7 +93,7 @@ endc
Function_LoadRandomBattleTowerPkmn: ; 1f8081 Function_LoadRandomBattleTowerPkmn: ; 1f8081
ld c, BATTLETOWER_PARTY_SIZE ld c, BATTLETOWER_PARTY_LENGTH
.loop .loop
push bc push bc
ld a, BANK(sBTPkmnPrevTrainer1) ld a, BANK(sBTPkmnPrevTrainer1)
@ -123,7 +123,7 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
; Check if Pkmn was already loaded before ; Check if Pkmn was already loaded before
; Check current and the 2 previous teams ; Check current and the 2 previous teams
; includes check if item is double at the current team ; includes check if item is double at the current team
ld bc, PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH
call AddNTimes call AddNTimes
ld a, [hli] ld a, [hli]
ld b, a ld b, a
@ -166,13 +166,13 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
cp b cp b
jr z, .FindARandomBattleTowerPkmn jr z, .FindARandomBattleTowerPkmn
ld bc, PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld a, [wNamedObjectIndexBuffer] ld a, [wNamedObjectIndexBuffer]
push af push af
push de push de
ld hl, - (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) ld hl, - (PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH)
add hl, de add hl, de
ld a, [hl] ld a, [hl]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
@ -183,7 +183,7 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
ld h, d ld h, d
ld l, e ld l, e
pop de pop de
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
pop de pop de

View File

@ -213,7 +213,7 @@ BattleTower_ExecuteJumptable: ; 8b25b
BattleTower_CheckPartyLengthIs3: ; 8b2bb BattleTower_CheckPartyLengthIs3: ; 8b2bb
ld a, [PartyCount] ld a, [PartyCount]
cp BATTLETOWER_PARTY_SIZE cp BATTLETOWER_PARTY_LENGTH
ret ret
; 8b2c1 ; 8b2c1
@ -235,13 +235,13 @@ BattleTower_CheckPartyHasThreeMonsThatAreNotEggs: ; 8b2c1
cp b cp b
ret z ret z
ld a, b ld a, b
cp BATTLETOWER_PARTY_SIZE cp BATTLETOWER_PARTY_LENGTH
ret ret
; 8b2da ; 8b2da
Function_PartyCountEq3: ; 8b2da Function_PartyCountEq3: ; 8b2da
ld a, [PartyCount] ld a, [PartyCount]
cp BATTLETOWER_PARTY_SIZE cp BATTLETOWER_PARTY_LENGTH
ret z ret z
scf scf
ret ret

View File

@ -531,7 +531,7 @@ DayCare_GiveEgg: ; 169ac
ld [hl], a ld [hl], a
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call DayCare_GetCurrentPartyMember call DayCare_GetCurrentPartyMember
ld hl, wEggNick ld hl, wEggNick
call CopyBytes call CopyBytes
@ -620,7 +620,7 @@ DayCare_InitBreeding: ; 16a3b
ld bc, wEggMonEnd - wEggMon ld bc, wEggMonEnd - wEggMon
call ByteFill call ByteFill
ld hl, wEggNick ld hl, wEggNick
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call ByteFill call ByteFill
ld hl, wEggOT ld hl, wEggOT
ld bc, NAME_LENGTH ld bc, NAME_LENGTH

View File

@ -208,9 +208,9 @@ GetHallOfFameParty: ; 8653f
push bc push bc
ld a, c ld a, c
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call AddNTimes call AddNTimes
ld bc, PKMN_NAME_LENGTH - 1 ld bc, MON_NAME_LENGTH - 1
call CopyBytes call CopyBytes
pop bc pop bc
@ -460,7 +460,7 @@ DisplayHOFMon: ; 86748
ld a, [hli] ld a, [hli]
ld [TempMonLevel], a ld [TempMonLevel], a
ld de, StringBuffer2 ld de, StringBuffer2
ld bc, PKMN_NAME_LENGTH - 1 ld bc, MON_NAME_LENGTH - 1
call CopyBytes call CopyBytes
ld a, "@" ld a, "@"
ld [StringBuffer2 + 10], a ld [StringBuffer2 + 10], a

View File

@ -45,13 +45,13 @@ NameRater: ; fb6ed
jr c, .samename jr c, .samename
; Copy the new name from StringBuffer2 ; Copy the new name from StringBuffer2
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
ld a, [CurPartyMon] ld a, [CurPartyMon]
call AddNTimes call AddNTimes
ld e, l ld e, l
ld d, h ld d, h
ld hl, StringBuffer2 ld hl, StringBuffer2
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld hl, NameRaterEvenBetterText ld hl, NameRaterEvenBetterText
@ -115,7 +115,7 @@ CheckIfMonIsYourOT: ; fb78a
IsNewNameEmpty: ; fb7be IsNewNameEmpty: ; fb7be
; Checks to see if the nickname loaded in StringBuffer2 is empty. If so, return carry. ; Checks to see if the nickname loaded in StringBuffer2 is empty. If so, return carry.
ld hl, StringBuffer2 ld hl, StringBuffer2
ld c, PKMN_NAME_LENGTH - 1 ld c, MON_NAME_LENGTH - 1
.loop .loop
ld a, [hli] ld a, [hli]
cp "@" cp "@"
@ -137,7 +137,7 @@ IsNewNameEmpty: ; fb7be
CompareNewToOld: ; fb7d3 CompareNewToOld: ; fb7d3
; Compares the nickname in StringBuffer2 to the previous nickname. If they are the same, return carry. ; Compares the nickname in StringBuffer2 to the previous nickname. If they are the same, return carry.
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
ld a, [CurPartyMon] ld a, [CurPartyMon]
call AddNTimes call AddNTimes
push hl push hl
@ -178,7 +178,7 @@ GetNicknameLength: ; fb802
ret z ret z
inc c inc c
ld a, c ld a, c
cp PKMN_NAME_LENGTH - 1 cp MON_NAME_LENGTH - 1
jr nz, .loop jr nz, .loop
ret ret
; fb80f ; fb80f

View File

@ -43,7 +43,7 @@ GiveOddEgg: ; 1fb4b6
call AddNTimes call AddNTimes
ld de, OddEggSpecies ld de, OddEggSpecies
ld bc, PARTYMON_STRUCT_LENGTH + 2 * PKMN_NAME_LENGTH ld bc, PARTYMON_STRUCT_LENGTH + 2 * MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld a, EGG_TICKET ld a, EGG_TICKET
@ -73,7 +73,7 @@ GiveOddEgg: ; 1fb4b6
; load Odd Egg Name in wTempOddEggNickname ; load Odd Egg Name in wTempOddEggNickname
ld hl, .Odd ld hl, .Odd
ld de, wTempOddEggNickname ld de, wTempOddEggNickname
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
; load pointer to wTempOddEggNickname in wMobileMonOTNamePointerBuffer ; load pointer to wTempOddEggNickname in wMobileMonOTNamePointerBuffer

View File

@ -148,10 +148,10 @@ ReadCaughtData: ; 4f134
GetCaughtName: ; 4f176 GetCaughtName: ; 4f176
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call AddNTimes call AddNTimes
ld de, wSeerNickname ld de, wSeerNickname
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ret ret
; 4f18c ; 4f18c

View File

@ -228,7 +228,7 @@ Data_DaisyMassage: ; 746b
CopyPokemonName_Buffer1_Buffer3: ; 746e CopyPokemonName_Buffer1_Buffer3: ; 746e
ld hl, StringBuffer1 ld hl, StringBuffer1
ld de, StringBuffer3 ld de, StringBuffer3
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
jp CopyBytes jp CopyBytes
DummyPredef1: ; 747a DummyPredef1: ; 747a

View File

@ -371,7 +371,7 @@ UpdateSpeciesNameIfNotNicknamed: ; 42414
jr nz, .loop jr nz, .loop
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
call AddNTimes call AddNTimes
push hl push hl
@ -380,7 +380,7 @@ UpdateSpeciesNameIfNotNicknamed: ; 42414
call GetPokemonName call GetPokemonName
ld hl, StringBuffer1 ld hl, StringBuffer1
pop de pop de
ld bc, PKMN_NAME_LENGTH ld bc, MON_NAME_LENGTH
jp CopyBytes jp CopyBytes
; 42454 ; 42454

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