mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-11-11 07:44:47 +13:00
Fix static banks passed into GetName.
This appears to be the only other use of wPredefBank. Chances are there are more uncaught banks. Known cases are marked as "hardcoded" or similar.
This commit is contained in:
parent
8dd46620bc
commit
1cf79b6f15
|
|
@ -391,7 +391,7 @@ GetTrainerName_: ; 13a58 (4:7a58)
|
||||||
ld [wd0b5], a
|
ld [wd0b5], a
|
||||||
ld a, TRAINER_NAME
|
ld a, TRAINER_NAME
|
||||||
ld [W_LISTTYPE], a
|
ld [W_LISTTYPE], a
|
||||||
ld a, $e
|
ld a, BANK(TrainerNames)
|
||||||
ld [wPredefBank], a
|
ld [wPredefBank], a
|
||||||
call GetName
|
call GetName
|
||||||
ld hl, wcd6d
|
ld hl, wcd6d
|
||||||
|
|
|
||||||
|
|
@ -2184,7 +2184,9 @@ asm_3d00e: ; 3d00e (f:500e)
|
||||||
jr Func_3d03c
|
jr Func_3d03c
|
||||||
|
|
||||||
OldManItemList: ; 3d02d (f:502d)
|
OldManItemList: ; 3d02d (f:502d)
|
||||||
db $01, POKE_BALL, 50, $ff
|
db 1 ; # items
|
||||||
|
db POKE_BALL, 50
|
||||||
|
db -1
|
||||||
|
|
||||||
Func_3d031
|
Func_3d031
|
||||||
ld hl, wNumBagItems ; wNumBagItems
|
ld hl, wNumBagItems ; wNumBagItems
|
||||||
|
|
@ -5471,7 +5473,7 @@ asm_3e70b: ; 3e70b (f:670b)
|
||||||
res 6, [hl] ; no longer invulnerable to typcial attacks
|
res 6, [hl] ; no longer invulnerable to typcial attacks
|
||||||
ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
|
ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
|
||||||
ld [wd0b5], a
|
ld [wd0b5], a
|
||||||
ld a, $2c
|
ld a, BANK(MoveNames)
|
||||||
ld [wPredefBank], a
|
ld [wPredefBank], a
|
||||||
ld a, MOVE_NAME
|
ld a, MOVE_NAME
|
||||||
ld [W_LISTTYPE], a
|
ld [W_LISTTYPE], a
|
||||||
|
|
@ -5950,10 +5952,11 @@ GetCurrentMove: ; 3eabe (f:6abe)
|
||||||
call AddNTimes
|
call AddNTimes
|
||||||
ld a, BANK(Moves)
|
ld a, BANK(Moves)
|
||||||
call FarCopyData
|
call FarCopyData
|
||||||
ld a, $2c
|
|
||||||
|
ld a, BANK(MoveNames)
|
||||||
ld [wPredefBank], a
|
ld [wPredefBank], a
|
||||||
ld a, $2
|
ld a, MOVE_NAME
|
||||||
ld [W_LISTTYPE], a ; list type 2 = move name
|
ld [W_LISTTYPE], a
|
||||||
call GetName
|
call GetName
|
||||||
ld de, wcd6d
|
ld de, wcd6d
|
||||||
jp CopyStringToCF4B
|
jp CopyStringToCF4B
|
||||||
|
|
|
||||||
|
|
@ -587,7 +587,7 @@ Func_39b87: ; 39b87 (e:5b87)
|
||||||
jr z, .asm_39bc1
|
jr z, .asm_39bc1
|
||||||
push hl
|
push hl
|
||||||
ld [wd0b5], a
|
ld [wd0b5], a
|
||||||
ld a, $2c
|
ld a, BANK(MoveNames)
|
||||||
ld [wPredefBank], a
|
ld [wPredefBank], a
|
||||||
ld a, MOVE_NAME
|
ld a, MOVE_NAME
|
||||||
ld [W_LISTTYPE], a
|
ld [W_LISTTYPE], a
|
||||||
|
|
|
||||||
|
|
@ -135,7 +135,7 @@ Func_3ad71: ; 3ad71 (e:6d71)
|
||||||
ld [wHPBarMaxHP + 1], a
|
ld [wHPBarMaxHP + 1], a
|
||||||
ld a, MONSTER_NAME
|
ld a, MONSTER_NAME
|
||||||
ld [W_LISTTYPE], a
|
ld [W_LISTTYPE], a
|
||||||
ld a, $e
|
ld a, BANK(TrainerNames) ; bank is not used for monster names
|
||||||
ld [wPredefBank], a
|
ld [wPredefBank], a
|
||||||
call GetName
|
call GetName
|
||||||
push hl
|
push hl
|
||||||
|
|
|
||||||
8
home.asm
8
home.asm
|
|
@ -2044,7 +2044,7 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53)
|
||||||
.skipGettingQuantity
|
.skipGettingQuantity
|
||||||
ld a,[wcf91]
|
ld a,[wcf91]
|
||||||
ld [wd0b5],a
|
ld [wd0b5],a
|
||||||
ld a,$01
|
ld a,BANK(ItemNames)
|
||||||
ld [wPredefBank],a
|
ld [wPredefBank],a
|
||||||
call GetName
|
call GetName
|
||||||
jr .storeChosenEntry
|
jr .storeChosenEntry
|
||||||
|
|
@ -3782,7 +3782,7 @@ GetName:: ; 376b (0:376b)
|
||||||
; returns pointer to name in de
|
; returns pointer to name in de
|
||||||
ld a,[wd0b5]
|
ld a,[wd0b5]
|
||||||
ld [wd11e],a
|
ld [wd11e],a
|
||||||
cp a,$C4 ;it's TM/HM
|
cp HM_01
|
||||||
jp nc,GetMachineName
|
jp nc,GetMachineName
|
||||||
ld a,[H_LOADEDROMBANK]
|
ld a,[H_LOADEDROMBANK]
|
||||||
push af
|
push af
|
||||||
|
|
@ -3858,8 +3858,8 @@ GetItemPrice:: ; 37df (0:37df)
|
||||||
ld a, [H_LOADEDROMBANK]
|
ld a, [H_LOADEDROMBANK]
|
||||||
push af
|
push af
|
||||||
ld a, [wListMenuID] ; wListMenuID
|
ld a, [wListMenuID] ; wListMenuID
|
||||||
cp $1
|
cp MOVESLISTMENU
|
||||||
ld a, $1 ; hardcoded Bank
|
ld a, BANK(ItemPrices)
|
||||||
jr nz, .asm_37ed
|
jr nz, .asm_37ed
|
||||||
ld a, $f ; hardcoded Bank
|
ld a, $f ; hardcoded Bank
|
||||||
.asm_37ed
|
.asm_37ed
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue