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

PARTY_LENGTH; MON_NAME; sgb_border.bin

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/battle/core.asm
View File

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

16
engine/billspc.asm
View File

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

4
engine/breeding.asm
View File

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

4
engine/caught_data.asm
View File

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

3
engine/color.asm
View File

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

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

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

12
engine/events/battle_tower/load_trainer.asm
View File

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

6
engine/events/battle_tower/rules.asm
View File

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

4
engine/events/daycare.asm
View File

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

6
engine/events/halloffame.asm
View File

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

10
engine/events/name_rater.asm
View File

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

4
engine/events/odd_egg.asm
View File

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

4
engine/events/poke_seer.asm
View File

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

2
engine/events/special.asm
View File

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

4
engine/evolve.asm
View File

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

6
engine/item_effects.asm
View File

@@ -599,7 +599,7 @@ ParkBall: ; e8a2
dec a
ld [CurPartyMon], a
ld hl, PartyMonNicknames
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call AddNTimes
ld d, h
@@ -668,7 +668,7 @@ ParkBall: ; e8a2
ld hl, wMonOrItemNameBuffer
ld de, sBoxMonNicknames
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
ld hl, sBoxMonNicknames
@@ -683,7 +683,7 @@ ParkBall: ; e8a2
ld hl, sBoxMonNicknames
ld de, wMonOrItemNameBuffer
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
call CloseSRAM

2
engine/learn.asm
View File

@@ -5,7 +5,7 @@ LearnMove: ; 6508
call GetNick
ld hl, StringBuffer1
ld de, wMonOrItemNameBuffer
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
.loop

6
engine/link.asm
View File

@@ -831,7 +831,7 @@ Link_PrepPartyData_Gen2: ; 28595
ld bc, PARTY_LENGTH * NAME_LENGTH
call CopyBytes
ld hl, PartyMonNicknames
ld bc, PARTY_LENGTH * PKMN_NAME_LENGTH
ld bc, PARTY_LENGTH * MON_NAME_LENGTH
call CopyBytes
; Okay, we did all that. Now, are we in the trade center?
@@ -978,7 +978,7 @@ Function2868a: ; 2868a
ld bc, PARTY_LENGTH * NAME_LENGTH
call CopyBytes
ld de, OTPartyMonNicknames
ld bc, PARTY_LENGTH * PKMN_NAME_LENGTH
ld bc, PARTY_LENGTH * MON_NAME_LENGTH
jp CopyBytes
; 286ba
@@ -1657,7 +1657,7 @@ LinkTrade: ; 28b87
call GetPokemonName
ld hl, StringBuffer1
ld de, wd004
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
ld a, [wd003]
ld hl, OTPartySpecies

4
engine/link_trade.asm
View File

@@ -283,7 +283,7 @@ LinkTradeMenu: ; 16d70c
ld [hl], a
push hl
push bc
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
add hl, bc
ld [hl], a
pop bc
@@ -335,7 +335,7 @@ LinkTradeMenu: ; 16d70c
ld [hl], $1f
push hl
push bc
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
add hl, bc
ld [hl], $1f
pop bc

22
engine/move_mon.asm
View File

@@ -60,7 +60,7 @@ TryAddMonToParty: ; d88c
ld d, h
ld e, l
ld hl, StringBuffer1
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
.skipnickname
@@ -397,7 +397,7 @@ AddTempmonToParty: ; da96
ld hl, OTPartyMonNicknames
ld a, [CurPartyMon]
call SkipNames
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
ld a, [CurPartySpecies]
@@ -583,7 +583,7 @@ SendGetPkmnIntoFromBox: ; db3f
call SkipNames
.okay12
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
pop hl
@@ -943,7 +943,7 @@ SendPkmnIntoBox: ; de6e
ld de, sBoxMonNicknames
ld hl, StringBuffer1
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
ld hl, EnemyMon
@@ -1044,7 +1044,7 @@ ShiftBoxMon: ; df47
call .shift
ld hl, sBoxMonNicknames
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call .shift
ld hl, sBoxMons
@@ -1240,7 +1240,7 @@ RemoveMonFromPartyOrBox: ; e039
; Shift the OT names
ld d, h
ld e, l
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
add hl, bc
ld bc, PartyMonNicknames
ld a, [wPokemonWithdrawDepositParameter]
@@ -1283,12 +1283,12 @@ RemoveMonFromPartyOrBox: ; e039
jr z, .party6
ld hl, sBoxMonNicknames
.party6
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
ld a, [CurPartyMon]
call AddNTimes
ld d, h
ld e, l
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
add hl, bc
ld bc, PartyMonNicknamesEnd
ld a, [wPokemonWithdrawDepositParameter]
@@ -1652,7 +1652,7 @@ GivePoke:: ; e277
call GetPokemonName
ld hl, StringBuffer1
ld de, wMonOrItemNameBuffer
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
pop af
and a
@@ -1664,7 +1664,7 @@ GivePoke:: ; e277
push hl
ld a, [ScriptBank]
call GetFarHalfword
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
ld a, [ScriptBank]
call FarCopyBytes
pop hl
@@ -1764,7 +1764,7 @@ GivePoke:: ; e277
call GetSRAMBank
ld hl, wMonOrItemNameBuffer
ld de, sBoxMonNicknames
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
call CloseSRAM
ld b, $1

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