mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-04-04 02:21:43 +13:00
Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>". Label overleads are still an issue.
This commit is contained in:
yenatch
parent
52ba96f5f4
commit
40c17c906b
290 changed files with 8262 additions and 7759 deletions
|
|
@ -2,13 +2,13 @@ Func_213c8:: ; 213c8 (8:53c8)
|
|||
xor a
|
||||
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
|
||||
call SaveScreenTilesToBuffer2
|
||||
ld a, [$d5a2]
|
||||
ld a, [wd5a2]
|
||||
and a
|
||||
jr nz, .asm_213f3
|
||||
ld a, [$d74b]
|
||||
ld a, [wd74b]
|
||||
bit 5, a
|
||||
jr z, .asm_213ea
|
||||
ld a, [$d5a2]
|
||||
ld a, [wd5a2]
|
||||
and a
|
||||
jr nz, .asm_213f3
|
||||
ld hl, wTileMap
|
||||
|
|
@ -28,70 +28,70 @@ Func_213c8:: ; 213c8 (8:53c8)
|
|||
call TextBoxBorder
|
||||
call UpdateSprites
|
||||
ld a, $3
|
||||
ld [wMaxMenuItem], a ; $cc28
|
||||
ld a, [$d7f1]
|
||||
ld [wMaxMenuItem], a ; wMaxMenuItem
|
||||
ld a, [wd7f1]
|
||||
bit 0, a
|
||||
jr nz, .asm_21414
|
||||
FuncCoord 2, 2 ; $c3ca
|
||||
FuncCoord 2, 2
|
||||
ld hl, Coord
|
||||
ld de, SomeonesPCText ; $548b
|
||||
jr .asm_2141a
|
||||
.asm_21414
|
||||
FuncCoord 2, 2 ; $c3ca
|
||||
FuncCoord 2, 2
|
||||
ld hl, Coord
|
||||
ld de, BillsPCText ; $5497
|
||||
.asm_2141a
|
||||
call PlaceString
|
||||
FuncCoord 2, 4 ; $c3f2
|
||||
FuncCoord 2, 4
|
||||
ld hl, Coord
|
||||
ld de, W_PLAYERNAME ; $d158
|
||||
ld de, W_PLAYERNAME ; wd158
|
||||
call PlaceString
|
||||
ld l, c
|
||||
ld h, b
|
||||
ld de, PlayersPCText ; $54a0
|
||||
call PlaceString
|
||||
ld a, [$d74b]
|
||||
ld a, [wd74b]
|
||||
bit 5, a
|
||||
jr z, .asm_21462
|
||||
FuncCoord 2, 6 ; $c41a
|
||||
FuncCoord 2, 6
|
||||
ld hl, Coord
|
||||
ld de, OaksPCText ; $54a5
|
||||
call PlaceString
|
||||
ld a, [$d5a2]
|
||||
ld a, [wd5a2]
|
||||
and a
|
||||
jr z, .asm_2145a
|
||||
ld a, $4
|
||||
ld [wMaxMenuItem], a ; $cc28
|
||||
FuncCoord 2, 8 ; $c442
|
||||
ld [wMaxMenuItem], a ; wMaxMenuItem
|
||||
FuncCoord 2, 8
|
||||
ld hl, Coord
|
||||
ld de, PKMNLeaguePCText ; $54b2
|
||||
call PlaceString
|
||||
FuncCoord 2, 10 ; $c46a
|
||||
FuncCoord 2, 10
|
||||
ld hl, Coord
|
||||
ld de, LogOffPCText ; $54ba
|
||||
jr .asm_2146d
|
||||
.asm_2145a
|
||||
FuncCoord 2, 8 ; $c442
|
||||
FuncCoord 2, 8
|
||||
ld hl, Coord
|
||||
ld de, LogOffPCText ; $54ba
|
||||
jr .asm_2146d
|
||||
.asm_21462
|
||||
ld a, $2
|
||||
ld [wMaxMenuItem], a ; $cc28
|
||||
FuncCoord 2, 6 ; $c41a
|
||||
ld [wMaxMenuItem], a ; wMaxMenuItem
|
||||
FuncCoord 2, 6
|
||||
ld hl, Coord
|
||||
ld de, LogOffPCText ; $54ba
|
||||
.asm_2146d
|
||||
call PlaceString
|
||||
ld a, $3
|
||||
ld [wMenuWatchedKeys], a ; $cc29
|
||||
ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
|
||||
ld a, $2
|
||||
ld [wTopMenuItemY], a ; $cc24
|
||||
ld [wTopMenuItemY], a ; wTopMenuItemY
|
||||
ld a, $1
|
||||
ld [wTopMenuItemX], a ; $cc25
|
||||
ld [wTopMenuItemX], a ; wTopMenuItemX
|
||||
xor a
|
||||
ld [wCurrentMenuItem], a ; $cc26
|
||||
ld [wLastMenuItem], a ; $cc2a
|
||||
ld [wCurrentMenuItem], a ; wCurrentMenuItem
|
||||
ld [wLastMenuItem], a ; wLastMenuItem
|
||||
ld a, $1
|
||||
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
|
||||
ret
|
||||
|
|
@ -116,14 +116,14 @@ LogOffPCText: ; 214ba (8:54ba)
|
|||
|
||||
Func_214c2:: ; 214c2 (8:54c2)
|
||||
BillsPC_:: ; 0x214c2
|
||||
ld hl, $d730
|
||||
ld hl, wd730
|
||||
set 6, [hl]
|
||||
xor a
|
||||
ld [$ccd3], a
|
||||
ld [wccd3], a
|
||||
inc a ; MONSTER_NAME
|
||||
ld [W_LISTTYPE], a
|
||||
call LoadHpBarAndStatusTilePatterns
|
||||
ld a, [wListScrollOffset] ; $cc36
|
||||
ld a, [wListScrollOffset] ; wcc36
|
||||
push af
|
||||
ld a, [wFlags_0xcd60]
|
||||
bit 3, a
|
||||
|
|
@ -135,8 +135,8 @@ BillsPC_:: ; 0x214c2
|
|||
|
||||
Func_214e8: ; 214e8 (8:54e8)
|
||||
BillsPCMenu:
|
||||
ld a, [$ccd3]
|
||||
ld [wCurrentMenuItem], a ; $cc26
|
||||
ld a, [wccd3]
|
||||
ld [wCurrentMenuItem], a ; wCurrentMenuItem
|
||||
ld hl, $9780
|
||||
ld de, PokeballTileGraphics ; $697e
|
||||
ld bc, (BANK(PokeballTileGraphics) << 8) + $01
|
||||
|
|
@ -146,11 +146,11 @@ BillsPCMenu:
|
|||
ld b, $a
|
||||
ld c, $c
|
||||
call TextBoxBorder
|
||||
FuncCoord 2, 2 ; $c3ca
|
||||
FuncCoord 2, 2
|
||||
ld hl, Coord
|
||||
ld de, BillsPCMenuText ; $56e1
|
||||
call PlaceString
|
||||
ld hl, wTopMenuItemY ; $cc24
|
||||
ld hl, wTopMenuItemY ; wTopMenuItemY
|
||||
ld a, $2
|
||||
ld [hli], a
|
||||
dec a
|
||||
|
|
@ -164,23 +164,23 @@ BillsPCMenu:
|
|||
xor a
|
||||
ld [hli], a
|
||||
ld [hli], a
|
||||
ld hl, wListScrollOffset ; $cc36
|
||||
ld hl, wListScrollOffset ; wcc36
|
||||
ld [hli], a
|
||||
ld [hl], a
|
||||
ld [wPlayerMonNumber], a ; $cc2f
|
||||
ld [wPlayerMonNumber], a ; wPlayerMonNumber
|
||||
ld hl, WhatText
|
||||
call PrintText
|
||||
FuncCoord 9, 14 ; $c4c1
|
||||
FuncCoord 9, 14
|
||||
ld hl, Coord
|
||||
ld b, $2
|
||||
ld c, $9
|
||||
call TextBoxBorder
|
||||
ld a, [$d5a0]
|
||||
ld a, [wd5a0]
|
||||
and $7f
|
||||
cp $9
|
||||
jr c, .asm_2154f
|
||||
sub $9
|
||||
FuncCoord 17, 16 ; $c4f1
|
||||
FuncCoord 17, 16
|
||||
ld hl, Coord
|
||||
ld [hl], $f7
|
||||
add $f6
|
||||
|
|
@ -188,9 +188,9 @@ BillsPCMenu:
|
|||
.asm_2154f
|
||||
add $f7
|
||||
.asm_21551
|
||||
FuncCoord 18, 16 ; $c4f2
|
||||
FuncCoord 18, 16
|
||||
ld [Coord], a
|
||||
FuncCoord 10, 16 ; $c4ea
|
||||
FuncCoord 10, 16
|
||||
ld hl, Coord
|
||||
ld de, BoxNoPCText ; $5713
|
||||
call PlaceString
|
||||
|
|
@ -201,8 +201,8 @@ BillsPCMenu:
|
|||
bit 1, a
|
||||
jp nz, Func_21588 ; b button
|
||||
call PlaceUnfilledArrowMenuCursor
|
||||
ld a, [wCurrentMenuItem] ; $cc26
|
||||
ld [$ccd3], a
|
||||
ld a, [wCurrentMenuItem] ; wCurrentMenuItem
|
||||
ld [wccd3], a
|
||||
and a
|
||||
jp z, Func_21618 ; withdraw
|
||||
cp $1
|
||||
|
|
@ -225,44 +225,44 @@ Func_21588: ; 21588 (8:5588)
|
|||
res 5, [hl]
|
||||
call LoadScreenTilesFromBuffer2
|
||||
pop af
|
||||
ld [wListScrollOffset], a ; $cc36
|
||||
ld hl, $d730
|
||||
ld [wListScrollOffset], a ; wcc36
|
||||
ld hl, wd730
|
||||
res 6, [hl]
|
||||
ret
|
||||
|
||||
Func_215ac: ; 215ac (8:55ac)
|
||||
BillsPCDeposit:
|
||||
ld a, [W_NUMINPARTY] ; $d163
|
||||
ld a, [W_NUMINPARTY] ; W_NUMINPARTY
|
||||
dec a
|
||||
jr nz, .asm_215bb
|
||||
ld hl, CantDepositLastMonText
|
||||
call PrintText
|
||||
jp BillsPCMenu
|
||||
.asm_215bb
|
||||
ld a, [W_NUMINBOX] ; $da80
|
||||
ld a, [W_NUMINBOX] ; wda80
|
||||
cp $14
|
||||
jr nz, .asm_215cb
|
||||
ld hl, BoxFullText ; $5802
|
||||
call PrintText
|
||||
jp BillsPCMenu
|
||||
.asm_215cb
|
||||
ld hl, W_NUMINPARTY ; $d163
|
||||
ld hl, W_NUMINPARTY ; W_NUMINPARTY
|
||||
call Func_216be
|
||||
jp c, BillsPCMenu
|
||||
call Func_2174b
|
||||
jp nc, BillsPCMenu
|
||||
ld a, [$cf91]
|
||||
ld a, [wcf91]
|
||||
call GetCryData
|
||||
call PlaySoundWaitForCurrent
|
||||
ld a, $1
|
||||
ld [$cf95], a
|
||||
ld [wcf95], a
|
||||
call Func_3a68
|
||||
xor a
|
||||
ld [$cf95], a
|
||||
ld [wcf95], a
|
||||
call RemovePokemon
|
||||
call WaitForSoundToFinish
|
||||
ld hl, wWhichTrade ; $cd3d
|
||||
ld a, [$d5a0]
|
||||
ld hl, wWhichTrade ; wWhichTrade
|
||||
ld a, [wd5a0]
|
||||
and $7f
|
||||
cp $9
|
||||
jr c, .asm_2160a
|
||||
|
|
@ -281,36 +281,36 @@ BillsPCDeposit:
|
|||
jp BillsPCMenu
|
||||
|
||||
Func_21618: ; 21618 (8:5618)
|
||||
ld a, [W_NUMINBOX] ; $da80
|
||||
ld a, [W_NUMINBOX] ; wda80
|
||||
and a
|
||||
jr nz, .asm_21627
|
||||
ld hl, NoMonText ; $580c
|
||||
call PrintText
|
||||
jp Func_214e8
|
||||
.asm_21627
|
||||
ld a, [W_NUMINPARTY] ; $d163
|
||||
ld a, [W_NUMINPARTY] ; W_NUMINPARTY
|
||||
cp $6
|
||||
jr nz, .asm_21637
|
||||
ld hl, CantTakeMonText ; $5811
|
||||
call PrintText
|
||||
jp Func_214e8
|
||||
.asm_21637
|
||||
ld hl, W_NUMINBOX ; $da80
|
||||
ld hl, W_NUMINBOX ; wda80
|
||||
call Func_216be
|
||||
jp c, Func_214e8
|
||||
call Func_2174b
|
||||
jp nc, Func_214e8
|
||||
ld a, [wWhichPokemon] ; $cf92
|
||||
ld hl, $de06
|
||||
ld a, [wWhichPokemon] ; wWhichPokemon
|
||||
ld hl, W_BOXMON1NAME
|
||||
call GetPartyMonName
|
||||
ld a, [$cf91]
|
||||
ld a, [wcf91]
|
||||
call GetCryData
|
||||
call PlaySoundWaitForCurrent
|
||||
xor a
|
||||
ld [$cf95], a
|
||||
ld [wcf95], a
|
||||
call Func_3a68
|
||||
ld a, $1
|
||||
ld [$cf95], a
|
||||
ld [wcf95], a
|
||||
call RemovePokemon
|
||||
call WaitForSoundToFinish
|
||||
ld hl, MonIsTakenOutText ; $5807
|
||||
|
|
@ -318,27 +318,27 @@ Func_21618: ; 21618 (8:5618)
|
|||
jp Func_214e8
|
||||
|
||||
Func_21673: ; 21673 (8:5673)
|
||||
ld a, [W_NUMINBOX] ; $da80
|
||||
ld a, [W_NUMINBOX] ; wda80
|
||||
and a
|
||||
jr nz, .asm_21682
|
||||
ld hl, NoMonText ; $580c
|
||||
call PrintText
|
||||
jp Func_214e8
|
||||
.asm_21682
|
||||
ld hl, W_NUMINBOX ; $da80
|
||||
ld hl, W_NUMINBOX ; wda80
|
||||
call Func_216be
|
||||
jp c, Func_214e8
|
||||
ld hl, OnceReleasedText ; $581b
|
||||
call PrintText
|
||||
call YesNoChoice
|
||||
ld a, [wCurrentMenuItem] ; $cc26
|
||||
ld a, [wCurrentMenuItem] ; wCurrentMenuItem
|
||||
and a
|
||||
jr nz, .asm_21682
|
||||
inc a
|
||||
ld [$cf95], a
|
||||
ld [wcf95], a
|
||||
call RemovePokemon
|
||||
call WaitForSoundToFinish
|
||||
ld a, [$cf91]
|
||||
ld a, [wcf91]
|
||||
call PlayCry
|
||||
ld hl, MonWasReleasedText ; $5820
|
||||
call PrintText
|
||||
|
|
@ -350,19 +350,19 @@ Func_216b3: ; 216b3 (8:56b3)
|
|||
|
||||
Func_216be: ; 216be (8:56be)
|
||||
ld a, l
|
||||
ld [$cf8b], a
|
||||
ld [wcf8b], a
|
||||
ld a, h
|
||||
ld [$cf8c], a
|
||||
ld [wcf8c], a
|
||||
xor a
|
||||
ld [$cf93], a
|
||||
ld [wListMenuID], a ; $cf94
|
||||
ld [wcf93], a
|
||||
ld [wListMenuID], a ; wListMenuID
|
||||
inc a ; MONSTER_NAME
|
||||
ld [W_LISTTYPE], a
|
||||
ld a, [$cc2b]
|
||||
ld [wCurrentMenuItem], a ; $cc26
|
||||
ld a, [wcc2b]
|
||||
ld [wCurrentMenuItem], a ; wCurrentMenuItem
|
||||
call DisplayListMenuID
|
||||
ld a, [wCurrentMenuItem] ; $cc26
|
||||
ld [$cc2b], a
|
||||
ld a, [wCurrentMenuItem] ; wCurrentMenuItem
|
||||
ld [wcc2b], a
|
||||
ret
|
||||
|
||||
BillsPCMenuText: ; 216e1 (8:56e1)
|
||||
|
|
@ -372,13 +372,13 @@ BoxNoPCText: ; 21713 (8:5713)
|
|||
db "BOX No.@"
|
||||
|
||||
Func_2171b:: ; 2171b (8:571b)
|
||||
ld hl, $d173
|
||||
ld hl, W_PARTYMON1_MOVE1
|
||||
ld bc, $002c
|
||||
jr .asm_21729 ; 0x21721 $6
|
||||
ld hl, $da9e
|
||||
ld hl, wda9e
|
||||
ld bc, $0021
|
||||
.asm_21729
|
||||
ld a, [$cf92]
|
||||
ld a, [wWhichPokemon]
|
||||
call AddNTimes
|
||||
ld b, $4
|
||||
.asm_21731
|
||||
|
|
@ -405,25 +405,25 @@ HMMoveArray: ; 21745 (8:5745)
|
|||
db $ff
|
||||
|
||||
Func_2174b: ; 2174b (8:574b)
|
||||
FuncCoord 9, 10 ; $c471
|
||||
FuncCoord 9, 10
|
||||
ld hl, Coord
|
||||
ld b, $6
|
||||
ld c, $9
|
||||
call TextBoxBorder
|
||||
ld a, [$ccd3]
|
||||
ld a, [wccd3]
|
||||
and a
|
||||
ld de, DepositPCText ; $57cb
|
||||
jr nz, .asm_21761
|
||||
ld de, WithdrawPCText ; $57d3
|
||||
.asm_21761
|
||||
FuncCoord 11, 12 ; $c49b
|
||||
FuncCoord 11, 12
|
||||
ld hl, Coord
|
||||
call PlaceString
|
||||
FuncCoord 11, 14 ; $c4c3
|
||||
FuncCoord 11, 14
|
||||
ld hl, Coord
|
||||
ld de, StatsCancelPCText ; $57dc
|
||||
call PlaceString
|
||||
ld hl, wTopMenuItemY ; $cc24
|
||||
ld hl, wTopMenuItemY ; wTopMenuItemY
|
||||
ld a, $c
|
||||
ld [hli], a
|
||||
ld a, $a
|
||||
|
|
@ -437,16 +437,16 @@ Func_2174b: ; 2174b (8:574b)
|
|||
ld [hli], a
|
||||
xor a
|
||||
ld [hl], a
|
||||
ld hl, wListScrollOffset ; $cc36
|
||||
ld hl, wListScrollOffset ; wcc36
|
||||
ld [hli], a
|
||||
ld [hl], a
|
||||
ld [wPlayerMonNumber], a ; $cc2f
|
||||
ld [$cc2b], a
|
||||
ld [wPlayerMonNumber], a ; wPlayerMonNumber
|
||||
ld [wcc2b], a
|
||||
.asm_2178f
|
||||
call HandleMenuInput
|
||||
bit 1, a
|
||||
jr nz, .asm_2179f
|
||||
ld a, [wCurrentMenuItem] ; $cc26
|
||||
ld a, [wCurrentMenuItem] ; wCurrentMenuItem
|
||||
and a
|
||||
jr z, .asm_217a1
|
||||
dec a
|
||||
|
|
@ -459,13 +459,13 @@ Func_2174b: ; 2174b (8:574b)
|
|||
ret
|
||||
.asm_217a3
|
||||
call SaveScreenTilesToBuffer1
|
||||
ld a, [$ccd3]
|
||||
ld a, [wccd3]
|
||||
and a
|
||||
ld a, $0
|
||||
jr nz, .asm_217b0
|
||||
ld a, $2
|
||||
.asm_217b0
|
||||
ld [$cc49], a
|
||||
ld [wcc49], a
|
||||
ld a, $36
|
||||
call Predef ; indirect jump to StatusScreen (12953 (4:6953))
|
||||
ld a, $37
|
||||
|
|
@ -537,16 +537,16 @@ PrintJustAMomentText1:: ; 5824 (8:5825)
|
|||
ld a, [$ffaa]
|
||||
cp $1
|
||||
ret z
|
||||
ld a, [$c109]
|
||||
ld a, [wSpriteStateData1 + 9]
|
||||
cp $c
|
||||
ret nz
|
||||
ld a, [$d35e]
|
||||
ld a, [W_CURMAP]
|
||||
cp $ef
|
||||
ld a, $2
|
||||
jr z, .asm_2183a
|
||||
inc a
|
||||
.asm_2183a
|
||||
ld [$d12b], a
|
||||
ld [W_ISLINKBATTLE], a
|
||||
call EnableAutoTextBoxDrawing
|
||||
ld a, $22
|
||||
jp PrintPredefTextID
|
||||
|
|
@ -555,16 +555,16 @@ PrintJustAMomentText2:: ; 5845 (8:5845)
|
|||
ld a, [$ffaa]
|
||||
cp $2
|
||||
ret z
|
||||
ld a, [$c109]
|
||||
ld a, [wSpriteStateData1 + 9]
|
||||
cp $8
|
||||
ret nz
|
||||
ld a, [$d35e]
|
||||
ld a, [W_CURMAP]
|
||||
cp $ef
|
||||
ld a, $2
|
||||
jr z, .asm_2185a
|
||||
inc a
|
||||
.asm_2185a
|
||||
ld [$d12b], a
|
||||
ld [W_ISLINKBATTLE], a
|
||||
call EnableAutoTextBoxDrawing
|
||||
ld a, $22
|
||||
jp PrintPredefTextID
|
||||
|
|
@ -573,7 +573,7 @@ JustAMomentText:: ; 21865 (8:5865)
|
|||
TX_FAR _JustAMomentText
|
||||
db "@"
|
||||
|
||||
ld a, [$c109]
|
||||
ld a, [wSpriteStateData1 + 9]
|
||||
cp $4
|
||||
ret nz
|
||||
call EnableAutoTextBoxDrawing
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue