thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace hardcoded name lengths with NAME_LENGTH

Browse source
This commit is contained in:
dannye 2015-08-10 23:51:20 -05:00
parent 1df1e9181e
commit 4aedff0217
22 changed files with 86 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engine/battle/core.asm
View file

@ -1728,7 +1728,7 @@ LoadBattleMonFromParty: ; 3cba6 (f:4ba6)
ld a, [wPlayerMonNumber]
call SkipFixedLengthTextEntries
ld de, wBattleMonNick
ld bc, $b
ld bc, NAME_LENGTH
call CopyData
ld hl, wBattleMonLevel
ld de, wPlayerMonUnmodifiedLevel ; block of memory used for unmodified stats
@ -1772,7 +1772,7 @@ LoadEnemyMonFromParty: ; 3cc13 (f:4c13)
ld a, [wWhichPokemon]
call SkipFixedLengthTextEntries
ld de, wEnemyMonNick
ld bc, $b
ld bc, NAME_LENGTH
call CopyData
ld hl, wEnemyMonLevel
ld de, wEnemyMonUnmodifiedLevel ; block of memory used for unmodified stats
@ -2099,7 +2099,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
; the following happens for the old man tutorial
ld hl, wPlayerName
ld de, W_GRASSRATE
ld bc, 11
ld bc, NAME_LENGTH
call CopyData ; temporarily save the player name in unused space,
; which is supposed to get overwritten when entering a
; map with wild Pokémon. Due to an oversight, the data
@ -2107,7 +2107,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3)
; Missingno. glitch can show up.
ld hl, .oldManName
ld de, wPlayerName
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
; the following simulates the keystrokes by drawing menus on screen
coord hl, 9, 14
@ -6326,7 +6326,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01)
call GetMonName
ld hl, wcd6d
ld de, wEnemyMonNick
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld a, [wEnemyMonSpecies2]
ld [wd11e], a

8
engine/cable_club.asm
View file

@ -176,7 +176,7 @@ CableClub_DoBattleOrTradeAgain: ; 5345
jr z, .findStartOfEnemyNameLoop
dec hl
ld de, wLinkEnemyTrainerName
ld c, 11
ld c, NAME_LENGTH
.copyEnemyNameLoop
ld a, [hli]
cp SERIAL_NO_DATA_BYTE
@ -698,7 +698,7 @@ TradeCenter_Trade:
call GetMonName
ld hl, wcd6d
ld de, wNameOfPlayerMonToBeTraded
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld a, [wTradingWhichEnemyMon]
ld hl, wEnemyPartyMons
@ -756,7 +756,7 @@ TradeCenter_Trade:
ld hl, wPartyMonOT
call SkipFixedLengthTextEntries
ld de, wTradedPlayerMonOT
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, wPartyMon1Species
ld a, [wTradingWhichPlayerMon]
@ -772,7 +772,7 @@ TradeCenter_Trade:
ld hl, wEnemyMonOT
call SkipFixedLengthTextEntries
ld de, wTradedEnemyMonOT
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, wEnemyMons
ld a, [wTradingWhichEnemyMon]

2
engine/evos_moves.asm
View file

@ -278,7 +278,7 @@ RenameEvolvedMon: ; 3aef7 (e:6ef7)
cp "@"
jr nz, .compareNamesLoop
ld a, [wWhichPokemon]
ld bc, 11
ld bc, NAME_LENGTH
ld hl, wPartyMonNicks
call AddNTimes
push hl

2
engine/hall_of_fame.asm
View file

@ -276,7 +276,7 @@ HoFRecordMonInfo: ; 70404 (1c:4404)
ld e, l
ld d, h
ld hl, wcd6d
ld bc, $b
ld bc, NAME_LENGTH
jp CopyData
HoFFadeOutScreenAndMusic: ; 70423 (1c:4423)

16
engine/in_game_trades.asm
View file

@ -17,7 +17,7 @@ DoInGameTradeDialogue: ; 71ad9 (1c:5ad9)
ld a,[hli]
push af
ld de,wInGameTradeMonNick
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
pop af
ld l,a
@ -81,7 +81,7 @@ InGameTrade_GetMonName: ; 71b6a (1c:5b6a)
call GetMonName
ld hl,wcd6d
pop de
ld bc, 11
ld bc, NAME_LENGTH
jp CopyData
INCLUDE "data/trades.asm"
@ -168,11 +168,11 @@ InGameTrade_PrepareTradeData: ; 71cc1 (1c:5cc1)
ld a, [wInGameTradeReceiveMonSpecies]
ld [hl], a ; wTradedEnemyMonSpecies
ld hl, wPartyMonOT
ld bc, 11
ld bc, NAME_LENGTH
ld a, [wWhichPokemon]
call AddNTimes
ld de, wTradedPlayerMonOT
ld bc, 11
ld bc, NAME_LENGTH
call InGameTrade_CopyData
ld hl, InGameTrade_TrainerString
ld de, wTradedEnemyMonOT
@ -201,16 +201,16 @@ InGameTrade_CopyData: ; 71d11 (1c:5d11)
InGameTrade_CopyDataToReceivedMon: ; 71d19 (1c:5d19)
ld hl, wPartyMonNicks
ld bc, 11
ld bc, NAME_LENGTH
call InGameTrade_GetReceivedMonPointer
ld hl, wInGameTradeMonNick
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, wPartyMonOT
ld bc, 11
ld bc, NAME_LENGTH
call InGameTrade_GetReceivedMonPointer
ld hl, InGameTrade_TrainerString
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, wPartyMon1OTID
ld bc, wPartyMon2 - wPartyMon1

20
engine/items/items.asm
View file

@ -142,7 +142,7 @@ ItemUseBall: ; d687 (3:5687)
.oldManBattle
ld hl,W_GRASSRATE
ld de,wPlayerName
ld bc,11
ld bc,NAME_LENGTH
call CopyData ; save the player's name in the Wild Monster data (part of the Cinnabar Island Missingno glitch)
jp .BallSuccess
.notOldManBattle
@ -2573,14 +2573,14 @@ SendNewMonToBox: ; e7a4 (3:67a4)
jr nz, .asm_e7b1
call GetMonHeader
ld hl, wBoxMonOT
ld bc, 11
ld bc, NAME_LENGTH
ld a, [W_NUMINBOX]
dec a
jr z, .asm_e7ee
dec a
call AddNTimes
push hl
ld bc, 11
ld bc, NAME_LENGTH
add hl, bc
ld d, h
ld e, l
@ -2591,12 +2591,12 @@ SendNewMonToBox: ; e7a4 (3:67a4)
.asm_e7db
push bc
push hl
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
pop hl
ld d, h
ld e, l
ld bc, -$b
ld bc, -NAME_LENGTH
add hl, bc
pop bc
dec b
@ -2604,17 +2604,17 @@ SendNewMonToBox: ; e7a4 (3:67a4)
.asm_e7ee
ld hl, wPlayerName
ld de, wBoxMonOT
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld a, [W_NUMINBOX]
dec a
jr z, .asm_e82a
ld hl, wBoxMonNicks
ld bc, 11
ld bc, NAME_LENGTH
dec a
call AddNTimes
push hl
ld bc, 11
ld bc, NAME_LENGTH
add hl, bc
ld d, h
ld e, l
@ -2625,12 +2625,12 @@ SendNewMonToBox: ; e7a4 (3:67a4)
.asm_e817
push bc
push hl
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
pop hl
ld d, h
ld e, l
ld bc, -$b
ld bc, -NAME_LENGTH
add hl, bc
pop bc
dec b

2
engine/learn_move.asm
View file

@ -5,7 +5,7 @@ LearnMove: ; 6e43 (1:6e43)
call GetPartyMonName
ld hl, wcd6d
ld de, wd036
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
DontAbandonLearning: ; 6e5b (1:6e5b)

2
engine/menu/league_pc.asm
View file

@ -90,7 +90,7 @@ LeaguePCShowMon: ; 76610 (1d:6610)
ld a, [hli]
ld [wHoFMonLevel], a
ld de, wcd6d
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld b, $0B
ld c, 0

2
engine/menu/main_menu.asm
View file

@ -689,7 +689,7 @@ CheckForPlayerNameInSRAM: ; 609e (1:609e)
ld a, $1
ld [MBC1SRamBankingMode], a
ld [MBC1SRamBank], a
ld b, $b
ld b, NAME_LENGTH
ld hl, sPlayerName
.loop
ld a, [hli]

8
engine/menu/naming_screen.asm
View file

@ -46,7 +46,7 @@ AskName: ; 64eb (1:64eb)
ld d, h
ld e, l
ld hl, wcd6d
ld bc, 11
ld bc, NAME_LENGTH
jp CopyData
DoYouWantToNicknameText: ; 0x6557
@ -67,13 +67,13 @@ DisplayNameRaterScreen: ; 655c (1:655c)
cp "@"
jr z, .playerCancelled
ld hl, wPartyMonNicks
ld bc, 11
ld bc, NAME_LENGTH
ld a, [wWhichPokemon]
call AddNTimes
ld e, l
ld d, h
ld hl, wBuffer
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
and a
ret
@ -158,7 +158,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
.submitNickname
pop de
ld hl, wcf4b
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
call GBPalWhiteOutWithDelay3
call ClearScreen

12
engine/menu/start_sub_menus.asm
View file

@ -813,36 +813,36 @@ SwitchPartyMon_InitVarOrSwapData: ; 13653 (4:7653)
call SkipFixedLengthTextEntries
push hl
ld de, wSwitchPartyMonTempBuffer
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, wPartyMonOT
ld a, [wMenuItemToSwap]
call SkipFixedLengthTextEntries
pop de
push hl
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
pop de
ld hl, wSwitchPartyMonTempBuffer
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, wPartyMonNicks
ld a, [wCurrentMenuItem]
call SkipFixedLengthTextEntries
push hl
ld de, wSwitchPartyMonTempBuffer
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, wPartyMonNicks
ld a, [wMenuItemToSwap]
call SkipFixedLengthTextEntries
pop de
push hl
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
pop de
ld hl, wSwitchPartyMonTempBuffer
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld a, [wMenuItemToSwap]
ld [wSwappedMenuItem], a

4
engine/oak_speech.asm
View file

@ -24,11 +24,11 @@ SetDefaultNames: ; 60ca (1:60ca)
call z, InitOptions
ld hl, NintenText
ld de, wPlayerName
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, SonyText
ld de, W_RIVALNAME
ld bc, 11
ld bc, NAME_LENGTH
jp CopyData
OakSpeech: ; 6115 (1:6115)

2
engine/oak_speech2.asm
View file

@ -73,7 +73,7 @@ OakSpeechSlidePicLeft: ; 69ec (1:69ec)
call DelayFrames
pop de
ld hl, wcd6d
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
call Delay3
coord hl, 12, 4

4
engine/save.asm
View file

@ -57,7 +57,7 @@ LoadSAV0: ; 73623 (1c:7623)
.checkSumsMatched
ld hl, sPlayerName
ld de, wPlayerName
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, sMainData
ld de, wMainDataStart
@ -203,7 +203,7 @@ SaveSAVtoSRAM0: ; 7378c (1c:778c)
ld [MBC1SRamBank], a
ld hl, wPlayerName
ld de, sPlayerName
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, wMainDataStart
ld de, sMainData

4
engine/titlescreen.asm
View file

@ -1,6 +1,6 @@
; copy text of fixed length $b (like player name, rival name, mon names, ...)
; copy text of fixed length NAME_LENGTH (like player name, rival name, mon names, ...)
CopyFixedLengthText: ; 42b1 (1:42b1)
ld bc, 11
ld bc, NAME_LENGTH
jp CopyData
SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7)

8
engine/trade.asm
View file

@ -190,7 +190,7 @@ LoadTradingGFXAndMonNames: ; 411a1 (10:51a1)
call GetMonName
ld hl, wcd6d
ld de, wcf4b
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld a, [wTradedEnemyMonSpecies]
ld [wd11e], a
@ -204,15 +204,15 @@ Trade_LoadMonPartySpriteGfx: ; 4120b (10:520b)
Trade_SwapNames: ; 41217 (10:5217)
ld hl, wPlayerName
ld de, wBuffer
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, wLinkEnemyTrainerName
ld de, wPlayerName
ld bc, 11
ld bc, NAME_LENGTH
call CopyData
ld hl, wBuffer
ld de, wLinkEnemyTrainerName
ld bc, 11
ld bc, NAME_LENGTH
jp CopyData
Trade_Cleanup: ; 4123b (10:523b)