diff options
Diffstat (limited to 'mobile')
| -rwxr-xr-x | mobile/fixed_words.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_40.asm | 4 | ||||
| -rw-r--r-- | mobile/mobile_42.asm | 2 | ||||
| -rwxr-xr-x | mobile/mobile_46.asm | 8 | ||||
| -rwxr-xr-x | mobile/mobile_5c.asm | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index 922e89455..a57722747 100755 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -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 diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 68d554b7e..48751e4fa 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -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 diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 4b09c366c..ff815df3e 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -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 diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 05c859622..8090c3a9b 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -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 diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 1b6c71a3d..cb6589fb0 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -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 |