summaryrefslogtreecommitdiff
path: root/engine/menu
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menu')
-rw-r--r--engine/menu/bills_pc.asm120
-rwxr-xr-xengine/menu/party_menu.asm2
-rwxr-xr-xengine/menu/players_pc.asm52
-rwxr-xr-xengine/menu/status_screen.asm2
4 files changed, 88 insertions, 88 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 9e8422c0..f4a40cf9 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -1,6 +1,6 @@
Func_213c8:: ; 213c8 (8:53c8)
xor a
- ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
+ ld [H_AUTOBGTRANSFERENABLED], a
call SaveScreenTilesToBuffer2
ld a, [wd5a2]
and a
@@ -28,64 +28,64 @@ Func_213c8:: ; 213c8 (8:53c8)
call TextBoxBorder
call UpdateSprites
ld a, $3
- ld [wMaxMenuItem], a ; wMaxMenuItem
+ ld [wMaxMenuItem], a
ld a, [wd7f1]
bit 0, a
jr nz, .asm_21414
hlCoord 2, 2
- ld de, SomeonesPCText ; $548b
+ ld de, SomeonesPCText
jr .asm_2141a
.asm_21414
hlCoord 2, 2
- ld de, BillsPCText ; $5497
+ ld de, BillsPCText
.asm_2141a
call PlaceString
hlCoord 2, 4
- ld de, wPlayerName ; wd158
+ ld de, wPlayerName
call PlaceString
ld l, c
ld h, b
- ld de, PlayersPCText ; $54a0
+ ld de, PlayersPCText
call PlaceString
ld a, [wd74b]
bit 5, a
jr z, .asm_21462
hlCoord 2, 6
- ld de, OaksPCText ; $54a5
+ ld de, OaksPCText
call PlaceString
ld a, [wd5a2]
and a
jr z, .asm_2145a
ld a, $4
- ld [wMaxMenuItem], a ; wMaxMenuItem
+ ld [wMaxMenuItem], a
hlCoord 2, 8
- ld de, PKMNLeaguePCText ; $54b2
+ ld de, PKMNLeaguePCText
call PlaceString
hlCoord 2, 10
- ld de, LogOffPCText ; $54ba
+ ld de, LogOffPCText
jr .asm_2146d
.asm_2145a
hlCoord 2, 8
- ld de, LogOffPCText ; $54ba
+ ld de, LogOffPCText
jr .asm_2146d
.asm_21462
ld a, $2
- ld [wMaxMenuItem], a ; wMaxMenuItem
+ ld [wMaxMenuItem], a
hlCoord 2, 6
- ld de, LogOffPCText ; $54ba
+ ld de, LogOffPCText
.asm_2146d
call PlaceString
ld a, $3
- ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
+ ld [wMenuWatchedKeys], a
ld a, $2
- ld [wTopMenuItemY], a ; wTopMenuItemY
+ ld [wTopMenuItemY], a
ld a, $1
- ld [wTopMenuItemX], a ; wTopMenuItemX
+ ld [wTopMenuItemX], a
xor a
- ld [wCurrentMenuItem], a ; wCurrentMenuItem
- ld [wLastMenuItem], a ; wLastMenuItem
+ ld [wCurrentMenuItem], a
+ ld [wLastMenuItem], a
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
+ ld [H_AUTOBGTRANSFERENABLED], a
ret
SomeonesPCText: db "SOMEONE's PC@"
@@ -103,7 +103,7 @@ BillsPC_:: ; 0x214c2
inc a ; MONSTER_NAME
ld [W_LISTTYPE], a
call LoadHpBarAndStatusTilePatterns
- ld a, [wListScrollOffset] ; wcc36
+ ld a, [wListScrollOffset]
push af
ld a, [wFlags_0xcd60]
bit 3, a
@@ -116,9 +116,9 @@ BillsPC_:: ; 0x214c2
Func_214e8: ; 214e8 (8:54e8)
BillsPCMenu:
ld a, [wccd3]
- ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wCurrentMenuItem], a
ld hl, vChars2 + $780
- ld de, PokeballTileGraphics ; $697e
+ ld de, PokeballTileGraphics
ld bc, (BANK(PokeballTileGraphics) << 8) + $01
call CopyVideoData
call LoadScreenTilesFromBuffer2DisableBGTransfer
@@ -127,9 +127,9 @@ BillsPCMenu:
ld c, $c
call TextBoxBorder
hlCoord 2, 2
- ld de, BillsPCMenuText ; $56e1
+ ld de, BillsPCMenuText
call PlaceString
- ld hl, wTopMenuItemY ; wTopMenuItemY
+ ld hl, wTopMenuItemY
ld a, $2
ld [hli], a
dec a
@@ -143,10 +143,10 @@ BillsPCMenu:
xor a
ld [hli], a
ld [hli], a
- ld hl, wListScrollOffset ; wcc36
+ ld hl, wListScrollOffset
ld [hli], a
ld [hl], a
- ld [wPlayerMonNumber], a ; wPlayerMonNumber
+ ld [wPlayerMonNumber], a
ld hl, WhatText
call PrintText
hlCoord 9, 14
@@ -167,16 +167,16 @@ BillsPCMenu:
.asm_21551
Coorda 18, 16
hlCoord 10, 16
- ld de, BoxNoPCText ; $5713
+ ld de, BoxNoPCText
call PlaceString
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
+ ld [H_AUTOBGTRANSFERENABLED], a
call Delay3
call HandleMenuInput
bit 1, a
jp nz, Func_21588 ; b button
call PlaceUnfilledArrowMenuCursor
- ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld a, [wCurrentMenuItem]
ld [wccd3], a
and a
jp z, Func_21618 ; withdraw
@@ -200,28 +200,28 @@ Func_21588: ; 21588 (8:5588)
res 5, [hl]
call LoadScreenTilesFromBuffer2
pop af
- ld [wListScrollOffset], a ; wcc36
+ ld [wListScrollOffset], a
ld hl, wd730
res 6, [hl]
ret
Func_215ac: ; 215ac (8:55ac)
BillsPCDeposit:
- ld a, [wPartyCount] ; wPartyCount
+ ld a, [wPartyCount]
dec a
jr nz, .asm_215bb
ld hl, CantDepositLastMonText
call PrintText
jp BillsPCMenu
.asm_215bb
- ld a, [W_NUMINBOX] ; wda80
+ ld a, [W_NUMINBOX]
cp MONS_PER_BOX
jr nz, .asm_215cb
- ld hl, BoxFullText ; $5802
+ ld hl, BoxFullText
call PrintText
jp BillsPCMenu
.asm_215cb
- ld hl, wPartyCount ; wPartyCount
+ ld hl, wPartyCount
call Func_216be
jp c, BillsPCMenu
call Func_2174b
@@ -236,7 +236,7 @@ BillsPCDeposit:
ld [wcf95], a
call RemovePokemon
call WaitForSoundToFinish
- ld hl, wWhichTrade ; wWhichTrade
+ ld hl, wWhichTrade
ld a, [wd5a0]
and $7f
cp 9
@@ -251,31 +251,31 @@ BillsPCDeposit:
.asm_2160c
ld [hli], a
ld [hl], $50
- ld hl, MonWasStoredText ; $57f8
+ ld hl, MonWasStoredText
call PrintText
jp BillsPCMenu
Func_21618: ; 21618 (8:5618)
- ld a, [W_NUMINBOX] ; wda80
+ ld a, [W_NUMINBOX]
and a
jr nz, .asm_21627
- ld hl, NoMonText ; $580c
+ ld hl, NoMonText
call PrintText
jp Func_214e8
.asm_21627
- ld a, [wPartyCount] ; wPartyCount
+ ld a, [wPartyCount]
cp PARTY_LENGTH
jr nz, .asm_21637
- ld hl, CantTakeMonText ; $5811
+ ld hl, CantTakeMonText
call PrintText
jp Func_214e8
.asm_21637
- ld hl, W_NUMINBOX ; wda80
+ ld hl, W_NUMINBOX
call Func_216be
jp c, Func_214e8
call Func_2174b
jp nc, Func_214e8
- ld a, [wWhichPokemon] ; wWhichPokemon
+ ld a, [wWhichPokemon]
ld hl, wBoxMonNicks
call GetPartyMonName
ld a, [wcf91]
@@ -288,25 +288,25 @@ Func_21618: ; 21618 (8:5618)
ld [wcf95], a
call RemovePokemon
call WaitForSoundToFinish
- ld hl, MonIsTakenOutText ; $5807
+ ld hl, MonIsTakenOutText
call PrintText
jp Func_214e8
Func_21673: ; 21673 (8:5673)
- ld a, [W_NUMINBOX] ; wda80
+ ld a, [W_NUMINBOX]
and a
jr nz, .asm_21682
- ld hl, NoMonText ; $580c
+ ld hl, NoMonText
call PrintText
jp Func_214e8
.asm_21682
- ld hl, W_NUMINBOX ; wda80
+ ld hl, W_NUMINBOX
call Func_216be
jp c, Func_214e8
- ld hl, OnceReleasedText ; $581b
+ ld hl, OnceReleasedText
call PrintText
call YesNoChoice
- ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_21682
inc a
@@ -315,7 +315,7 @@ Func_21673: ; 21673 (8:5673)
call WaitForSoundToFinish
ld a, [wcf91]
call PlayCry
- ld hl, MonWasReleasedText ; $5820
+ ld hl, MonWasReleasedText
call PrintText
jp Func_214e8
@@ -330,13 +330,13 @@ Func_216be: ; 216be (8:56be)
ld [wList + 1], a
xor a
ld [wcf93], a
- ld [wListMenuID], a ; wListMenuID
+ ld [wListMenuID], a
inc a ; MONSTER_NAME
ld [W_LISTTYPE], a
ld a, [wcc2b]
- ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wCurrentMenuItem], a
call DisplayListMenuID
- ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld a, [wCurrentMenuItem]
ld [wcc2b], a
ret
@@ -368,7 +368,7 @@ Func_2171b:: ; 2171b (8:571b)
ld a, [hli]
push hl
push bc
- ld hl, HMMoveArray ; $5745
+ ld hl, HMMoveArray
ld de, 1
call IsInArray
pop bc
@@ -394,16 +394,16 @@ Func_2174b: ; 2174b (8:574b)
call TextBoxBorder
ld a, [wccd3]
and a
- ld de, DepositPCText ; $57cb
+ ld de, DepositPCText
jr nz, .asm_21761
- ld de, WithdrawPCText ; $57d3
+ ld de, WithdrawPCText
.asm_21761
hlCoord 11, 12
call PlaceString
hlCoord 11, 14
- ld de, StatsCancelPCText ; $57dc
+ ld de, StatsCancelPCText
call PlaceString
- ld hl, wTopMenuItemY ; wTopMenuItemY
+ ld hl, wTopMenuItemY
ld a, $c
ld [hli], a
ld a, $a
@@ -417,16 +417,16 @@ Func_2174b: ; 2174b (8:574b)
ld [hli], a
xor a
ld [hl], a
- ld hl, wListScrollOffset ; wcc36
+ ld hl, wListScrollOffset
ld [hli], a
ld [hl], a
- ld [wPlayerMonNumber], a ; wPlayerMonNumber
+ ld [wPlayerMonNumber], a
ld [wcc2b], a
.asm_2178f
call HandleMenuInput
bit 1, a
jr nz, .asm_2179f
- ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld a, [wCurrentMenuItem]
and a
jr z, .asm_217a1
dec a
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index 86474be9..97e520c2 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -92,7 +92,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
set 0,a
ld [hFlags_0xFFF6],a
add hl,bc
- predef Func_128f6 ; draw HP bar and prints current / max HP
+ predef DrawHP2 ; draw HP bar and prints current / max HP
ld a,[hFlags_0xFFF6]
res 0,a
ld [hFlags_0xFFF6],a
diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm
index 5217befa..ad6c8140 100755
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -17,7 +17,7 @@ PlayerPC: ; 78e6 (1:78e6)
Func_790c: ; 790c (1:790c)
ld a, [wccd3]
- ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wCurrentMenuItem], a
ld hl, wFlags_0xcd60
set 5, [hl]
call LoadScreenTilesFromBuffer2
@@ -27,9 +27,9 @@ Func_790c: ; 790c (1:790c)
call TextBoxBorder
call UpdateSprites
hlCoord 2, 2
- ld de, PlayersPCMenuEntries ; $7af5
+ ld de, PlayersPCMenuEntries
call PlaceString
- ld hl, wTopMenuItemY ; wTopMenuItemY
+ ld hl, wTopMenuItemY
ld a, $2
ld [hli], a
dec a
@@ -42,17 +42,17 @@ Func_790c: ; 790c (1:790c)
ld [hli], a
xor a
ld [hl], a
- ld hl, wListScrollOffset ; wcc36
+ ld hl, wListScrollOffset
ld [hli], a
ld [hl], a
- ld [wPlayerMonNumber], a ; wPlayerMonNumber
+ ld [wPlayerMonNumber], a
ld hl, WhatDoYouWantText
call PrintText
call HandleMenuInput
bit 1, a
jp nz, Func_796d
call PlaceUnfilledArrowMenuCursor
- ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld a, [wCurrentMenuItem]
ld [wccd3], a
and a
jp z, Func_7a12
@@ -73,7 +73,7 @@ Func_796d: ; 796d (1:796d)
res 5, [hl]
call LoadScreenTilesFromBuffer2
xor a
- ld [wListScrollOffset], a ; wcc36
+ ld [wListScrollOffset], a
ld [wcc2c], a
ld hl, wd730
res 6, [hl]
@@ -83,9 +83,9 @@ Func_796d: ; 796d (1:796d)
Func_7995: ; 7995 (1:7995)
xor a
- ld [wCurrentMenuItem], a ; wCurrentMenuItem
- ld [wListScrollOffset], a ; wcc36
- ld a, [wNumBagItems] ; wNumBagItems
+ ld [wCurrentMenuItem], a
+ ld [wListScrollOffset], a
+ ld a, [wNumBagItems]
and a
jr nz, Func_79ab
ld hl, NothingToDepositText
@@ -95,7 +95,7 @@ Func_7995: ; 7995 (1:7995)
Func_79ab: ; 79ab (1:79ab)
ld hl, WhatToDepositText
call PrintText
- ld hl, wNumBagItems ; wNumBagItems
+ ld hl, wNumBagItems
ld a, l
ld [wList], a
ld a, h
@@ -103,7 +103,7 @@ Func_79ab: ; 79ab (1:79ab)
xor a
ld [wcf93], a
ld a, $3
- ld [wListMenuID], a ; wListMenuID
+ ld [wListMenuID], a
call DisplayListMenuID
jp c, Func_790c
call IsKeyItem
@@ -118,14 +118,14 @@ Func_79ab: ; 79ab (1:79ab)
cp $ff
jp z, Func_79ab
.asm_79e7
- ld hl, wNumBoxItems ; wNumBoxItems
+ ld hl, wNumBoxItems
call AddItemToInventory
jr c, .asm_79f8
ld hl, NoRoomToStoreText
call PrintText
jp Func_79ab
.asm_79f8
- ld hl, wNumBagItems ; wNumBagItems
+ ld hl, wNumBagItems
call RemoveItemFromInventory
call WaitForSoundToFinish
ld a, (SFX_02_55 - SFX_Headers_02) / 3
@@ -137,9 +137,9 @@ Func_79ab: ; 79ab (1:79ab)
Func_7a12: ; 7a12 (1:7a12)
xor a
- ld [wCurrentMenuItem], a ; wCurrentMenuItem
- ld [wListScrollOffset], a ; wcc36
- ld a, [wNumBoxItems] ; wNumBoxItems
+ ld [wCurrentMenuItem], a
+ ld [wListScrollOffset], a
+ ld a, [wNumBoxItems]
and a
jr nz, Func_7a28
ld hl, NothingStoredText
@@ -149,7 +149,7 @@ Func_7a12: ; 7a12 (1:7a12)
Func_7a28: ; 7a28 (1:7a28)
ld hl, WhatToWithdrawText
call PrintText
- ld hl, wNumBoxItems ; wNumBoxItems
+ ld hl, wNumBoxItems
ld a, l
ld [wList], a
ld a, h
@@ -157,7 +157,7 @@ Func_7a28: ; 7a28 (1:7a28)
xor a
ld [wcf93], a
ld a, $3
- ld [wListMenuID], a ; wListMenuID
+ ld [wListMenuID], a
call DisplayListMenuID
jp c, Func_790c
call IsKeyItem
@@ -172,14 +172,14 @@ Func_7a28: ; 7a28 (1:7a28)
cp $ff
jp z, Func_7a28
.asm_7a64
- ld hl, wNumBagItems ; wNumBagItems
+ ld hl, wNumBagItems
call AddItemToInventory
jr c, .asm_7a75
ld hl, CantCarryMoreText
call PrintText
jp Func_7a28
.asm_7a75
- ld hl, wNumBoxItems ; wNumBoxItems
+ ld hl, wNumBoxItems
call RemoveItemFromInventory
call WaitForSoundToFinish
ld a, (SFX_02_55 - SFX_Headers_02) / 3
@@ -191,9 +191,9 @@ Func_7a28: ; 7a28 (1:7a28)
Func_7a8f: ; 7a8f (1:7a8f)
xor a
- ld [wCurrentMenuItem], a ; wCurrentMenuItem
- ld [wListScrollOffset], a ; wcc36
- ld a, [wNumBoxItems] ; wNumBoxItems
+ ld [wCurrentMenuItem], a
+ ld [wListScrollOffset], a
+ ld a, [wNumBoxItems]
and a
jr nz, Func_7aa5
ld hl, NothingStoredText
@@ -203,7 +203,7 @@ Func_7a8f: ; 7a8f (1:7a8f)
Func_7aa5: ; 7aa5 (1:7aa5)
ld hl, WhatToTossText
call PrintText
- ld hl, wNumBoxItems ; wNumBoxItems
+ ld hl, wNumBoxItems
ld a, l
ld [wList], a
ld a, h
@@ -211,7 +211,7 @@ Func_7aa5: ; 7aa5 (1:7aa5)
xor a
ld [wcf93], a
ld a, $3
- ld [wListMenuID], a ; wListMenuID
+ ld [wListMenuID], a
push hl
call DisplayListMenuID
pop hl
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index 79daa0c0..685839cb 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -55,7 +55,7 @@ StatusScreen: ; 12953 (4:6953)
ld de, Type1Text
call PlaceString ; "TYPE1/"
hlCoord 11, 3
- predef DrawHP ; predef $5f
+ predef DrawHP
ld hl, wcf25
call GetHealthBarColor
ld b, $3
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 00:21:30 +0000