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

@@ -270,7 +270,7 @@ CopyMobileEZChatToC608: ; 11c156
ld [wd265], a
call GetPokemonName
ld hl, StringBuffer1
ld bc, PKMN_NAME_LENGTH - 1
ld bc, MON_NAME_LENGTH - 1
jr .copy_string
; 11c1ab

View File

@@ -2529,7 +2529,7 @@ Unknown_100fc0: ; 100fc0
dbwww $80, PlayerID, 2, OTPlayerID
dbwww $80, PartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, OTPartyMons
dbwww $80, PartyMonOT, NAME_LENGTH * PARTY_LENGTH, OTPartyMonOT
dbwww $80, PartyMonNicknames, PKMN_NAME_LENGTH * PARTY_LENGTH, OTPartyMonNicknames
dbwww $80, PartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, OTPartyMonNicknames
db -1
Unknown_100feb: ; 100feb
@@ -2550,7 +2550,7 @@ Unknown_100ff3: ; 100ff3
Unknown_10102c: ; 10102c
dbwww $80, OTPlayerName, NAME_LENGTH, NULL
dbwww $80, OTPlayerID, 2, NULL
dbwww $80, OTPartyMonNicknames, PKMN_NAME_LENGTH * PARTY_LENGTH, NULL
dbwww $80, OTPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, NULL
dbwww $80, OTPartyMonOT, NAME_LENGTH * PARTY_LENGTH, NULL
dbwww $80, OTPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, NULL
db -1

View File

@@ -337,7 +337,7 @@ MobileTradeAnim_InitSpeciesName: ; 108239
call GetPokemonName
ld hl, StringBuffer1
pop de
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
ret
; 10824b

View File

@@ -4084,7 +4084,7 @@ BattleTower_UbersCheck: ; 119dd1 (46:5dd1)
call GetPokemonName
ld hl, StringBuffer1
ld de, wcd49
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
call CopyBytes
ld a, $a
ld [wcf66], a
@@ -7839,13 +7839,13 @@ AddMobileMonToParty: ; 11b98f
ld l, a
ld a, [wMobileMonOTNamePointerBuffer + 1]
ld h, a
ld bc, PKMN_NAME_LENGTH - 1
ld bc, MON_NAME_LENGTH - 1
call CopyBytes
ld a, "@"
ld [de], a
ld hl, PartyMonNicknames
ld bc, PKMN_NAME_LENGTH
ld bc, MON_NAME_LENGTH
ld a, [wMobileMonSpeciesBuffer]
.loop4
add hl, bc
@@ -7858,7 +7858,7 @@ AddMobileMonToParty: ; 11b98f
ld l, a
ld a, [wMobileMonNicknamePointerBuffer + 1]
ld h, a
ld bc, PKMN_NAME_LENGTH - 1
ld bc, MON_NAME_LENGTH - 1
call CopyBytes
ld a, "@"
ld [de], a

View File

@@ -219,7 +219,7 @@ Function170c8b: ; 170c8b
; 170c98
CheckBTMonMovesForErrors: ; 170c98
ld c, BATTLETOWER_PARTY_SIZE
ld c, BATTLETOWER_PARTY_LENGTH
ld hl, wBT_OTTempPkmn1Moves
.loop
push hl
@@ -254,7 +254,7 @@ CheckBTMonMovesForErrors: ; 170c98
.done
pop hl
ld de, PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH
ld de, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH
add hl, de
dec c
jr nz, .loop