foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-23 15:08:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
pokered/engine/menu/bills_pc.asm

568 lines
9.6 KiB
NASM
Raw Normal View History

Get rid of globals.asm. Use ::s to export labels between objects. globals.asm was a hack that: - gave rgbasm an extra 100k lines to read - increased reliance on the python preprocessor - made the makefile a mess - gave object creation an extra step - wasn't even necessary This speeds up build time by at least a third.
2014-01-27 21:22:41 +00:00
Func_213c8:: ; 213c8 (8:53c8)
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
xor a
Stop using [$ff00+$xx] syntax. rgbasm treats $ffxx loads the same. This is more consistent and avoids confusion with $ff00+c,
2014-03-30 23:30:30 +00:00
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call SaveScreenTilesToBuffer2
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wd5a2]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and a
jr nz, .asm_213f3
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wd74b]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
bit 5, a
jr z, .asm_213ea
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wd5a2]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and a
jr nz, .asm_213f3
ld hl, wTileMap
ld b, $8
ld c, $e
jr .asm_213fa
.asm_213ea
ld hl, wTileMap
ld b, $6
ld c, $e
jr .asm_213fa
.asm_213f3
ld hl, wTileMap
ld b, $a
ld c, $e
.asm_213fa
call TextBoxBorder
call UpdateSprites
ld a, $3
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wMaxMenuItem], a ; wMaxMenuItem
ld a, [wd7f1]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
bit 0, a
jr nz, .asm_21414
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 2, 2
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld de, SomeonesPCText ; $548b
jr .asm_2141a
.asm_21414
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 2, 2
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld de, BillsPCText ; $5497
.asm_2141a
call PlaceString
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 2, 4
Use monster struct macros in wram. Rename related labels for consistency.
2014-06-14 11:12:40 +00:00
ld de, wPlayerName ; wd158
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call PlaceString
ld l, c
ld h, b
ld de, PlayersPCText ; $54a0
call PlaceString
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wd74b]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
bit 5, a
jr z, .asm_21462
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 2, 6
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld de, OaksPCText ; $54a5
call PlaceString
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wd5a2]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and a
jr z, .asm_2145a
ld a, $4
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wMaxMenuItem], a ; wMaxMenuItem
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 2, 8
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld de, PKMNLeaguePCText ; $54b2
call PlaceString
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 2, 10
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld de, LogOffPCText ; $54ba
jr .asm_2146d
.asm_2145a
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 2, 8
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld de, LogOffPCText ; $54ba
jr .asm_2146d
.asm_21462
ld a, $2
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wMaxMenuItem], a ; wMaxMenuItem
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 2, 6
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld de, LogOffPCText ; $54ba
.asm_2146d
call PlaceString
ld a, $3
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld a, $2
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wTopMenuItemY], a ; wTopMenuItemY
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld a, $1
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wTopMenuItemX], a ; wTopMenuItemX
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
xor a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wCurrentMenuItem], a ; wCurrentMenuItem
ld [wLastMenuItem], a ; wLastMenuItem
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld a, $1
Stop using [$ff00+$xx] syntax. rgbasm treats $ffxx loads the same. This is more consistent and avoids confusion with $ff00+c,
2014-03-30 23:30:30 +00:00
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ret
SomeonesPCText: ; 2148b (8:548b)
db "SOMEONE's PC@"
BillsPCText: ; 21497 (8:5497)
db "BILL's PC@"
PlayersPCText: ; 214a0 (8:54a0)
db "'s PC@"
OaksPCText: ; 214a5 (8:54a5)
db "PROF.OAK's PC@"
PKMNLeaguePCText: ; 214b2 (8:54b2)
db $4a,"LEAGUE@"
LogOffPCText: ; 214ba (8:54ba)
db "LOG OFF@"
Get rid of globals.asm. Use ::s to export labels between objects. globals.asm was a hack that: - gave rgbasm an extra 100k lines to read - increased reliance on the python preprocessor - made the makefile a mess - gave object creation an extra step - wasn't even necessary This speeds up build time by at least a third.
2014-01-27 21:22:41 +00:00
Func_214c2:: ; 214c2 (8:54c2)
BillsPC_:: ; 0x214c2
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld hl, wd730
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
set 6, [hl]
xor a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wccd3], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
inc a ; MONSTER_NAME
ld [W_LISTTYPE], a
call LoadHpBarAndStatusTilePatterns
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wListScrollOffset] ; wcc36
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
push af
ld a, [wFlags_0xcd60]
bit 3, a
jr nz, BillsPCMenu
ld a, $99
call PlaySound
ld hl, SwitchOnText
call PrintText
Func_214e8: ; 214e8 (8:54e8)
BillsPCMenu:
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wccd3]
ld [wCurrentMenuItem], a ; wCurrentMenuItem
Use VRAM constants where applicable.
2014-05-29 08:31:46 +00:00
ld hl, vChars2 + $780
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld de, PokeballTileGraphics ; $697e
ld bc, (BANK(PokeballTileGraphics) << 8) + $01
call CopyVideoData
call LoadScreenTilesFromBuffer2DisableBGTransfer
ld hl, wTileMap
ld b, $a
ld c, $c
call TextBoxBorder
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 2, 2
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld de, BillsPCMenuText ; $56e1
call PlaceString
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld hl, wTopMenuItemY ; wTopMenuItemY
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld a, $2
ld [hli], a
dec a
ld [hli], a
inc hl
inc hl
ld a, $4
ld [hli], a
ld a, $3
ld [hli], a
xor a
ld [hli], a
ld [hli], a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld hl, wListScrollOffset ; wcc36
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld [hli], a
ld [hl], a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wPlayerMonNumber], a ; wPlayerMonNumber
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld hl, WhatText
call PrintText
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 9, 14
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld b, $2
ld c, $9
call TextBoxBorder
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wd5a0]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and $7f
cp $9
jr c, .asm_2154f
sub $9
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 17, 16
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld [hl], $f7
add $f6
jr .asm_21551
.asm_2154f
add $f7
.asm_21551
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
Coorda 18, 16
hlCoord 10, 16
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld de, BoxNoPCText ; $5713
call PlaceString
ld a, $1
Stop using [$ff00+$xx] syntax. rgbasm treats $ffxx loads the same. This is more consistent and avoids confusion with $ff00+c,
2014-03-30 23:30:30 +00:00
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call Delay3
call HandleMenuInput
bit 1, a
jp nz, Func_21588 ; b button
call PlaceUnfilledArrowMenuCursor
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld [wccd3], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and a
jp z, Func_21618 ; withdraw
cp $1
jp z, Func_215ac ; deposit
cp $2
jp z, Func_21673 ; release
cp $3
jp z, Func_216b3 ; change box
Func_21588: ; 21588 (8:5588)
ld a, [wFlags_0xcd60]
bit 3, a
jr nz, .asm_2159a
call LoadTextBoxTilePatterns
ld a, $9a
call PlaySound
call WaitForSoundToFinish
.asm_2159a
ld hl, wFlags_0xcd60
res 5, [hl]
call LoadScreenTilesFromBuffer2
pop af
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wListScrollOffset], a ; wcc36
ld hl, wd730
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
res 6, [hl]
ret
Func_215ac: ; 215ac (8:55ac)
BillsPCDeposit:
Use monster struct macros in wram. Rename related labels for consistency.
2014-06-14 11:12:40 +00:00
ld a, [wPartyCount] ; wPartyCount
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
dec a
jr nz, .asm_215bb
ld hl, CantDepositLastMonText
call PrintText
jp BillsPCMenu
.asm_215bb
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [W_NUMINBOX] ; wda80
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
cp $14
jr nz, .asm_215cb
ld hl, BoxFullText ; $5802
call PrintText
jp BillsPCMenu
.asm_215cb
Use monster struct macros in wram. Rename related labels for consistency.
2014-06-14 11:12:40 +00:00
ld hl, wPartyCount ; wPartyCount
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call Func_216be
jp c, BillsPCMenu
call Func_2174b
jp nc, BillsPCMenu
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wcf91]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call GetCryData
call PlaySoundWaitForCurrent
ld a, $1
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcf95], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call Func_3a68
xor a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcf95], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call RemovePokemon
call WaitForSoundToFinish
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld hl, wWhichTrade ; wWhichTrade
ld a, [wd5a0]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and $7f
cp $9
jr c, .asm_2160a
sub $9
ld [hl], $f7
inc hl
add $f6
jr .asm_2160c
.asm_2160a
add $f7
.asm_2160c
ld [hli], a
ld [hl], $50
ld hl, MonWasStoredText ; $57f8
call PrintText
jp BillsPCMenu
Func_21618: ; 21618 (8:5618)
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [W_NUMINBOX] ; wda80
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and a
jr nz, .asm_21627
ld hl, NoMonText ; $580c
call PrintText
jp Func_214e8
.asm_21627
Use monster struct macros in wram. Rename related labels for consistency.
2014-06-14 11:12:40 +00:00
ld a, [wPartyCount] ; wPartyCount
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
cp $6
jr nz, .asm_21637
ld hl, CantTakeMonText ; $5811
call PrintText
jp Func_214e8
.asm_21637
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld hl, W_NUMINBOX ; wda80
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call Func_216be
jp c, Func_214e8
call Func_2174b
jp nc, Func_214e8
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wWhichPokemon] ; wWhichPokemon
Use monster struct macros in wram. Rename related labels for consistency.
2014-06-14 11:12:40 +00:00
ld hl, wBoxMonNicks
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call GetPartyMonName
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wcf91]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call GetCryData
call PlaySoundWaitForCurrent
xor a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcf95], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call Func_3a68
ld a, $1
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcf95], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call RemovePokemon
call WaitForSoundToFinish
ld hl, MonIsTakenOutText ; $5807
call PrintText
jp Func_214e8
Func_21673: ; 21673 (8:5673)
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [W_NUMINBOX] ; wda80
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and a
jr nz, .asm_21682
ld hl, NoMonText ; $580c
call PrintText
jp Func_214e8
.asm_21682
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld hl, W_NUMINBOX ; wda80
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call Func_216be
jp c, Func_214e8
ld hl, OnceReleasedText ; $581b
call PrintText
call YesNoChoice
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wCurrentMenuItem] ; wCurrentMenuItem
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and a
jr nz, .asm_21682
inc a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcf95], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call RemovePokemon
call WaitForSoundToFinish
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wcf91]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call PlayCry
ld hl, MonWasReleasedText ; $5820
call PrintText
jp Func_214e8
Func_216b3: ; 216b3 (8:56b3)
Use callba/callab macros for cross-bank calls.
2014-04-22 21:14:11 +00:00
callba Func_738a1
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
jp Func_214e8
Func_216be: ; 216be (8:56be)
ld a, l
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcf8b], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld a, h
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcf8c], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
xor a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcf93], a
ld [wListMenuID], a ; wListMenuID
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
inc a ; MONSTER_NAME
ld [W_LISTTYPE], a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wcc2b]
ld [wCurrentMenuItem], a ; wCurrentMenuItem
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call DisplayListMenuID
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld [wcc2b], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ret
BillsPCMenuText: ; 216e1 (8:56e1)
db "WITHDRAW ",$4a,$4e,"DEPOSIT ",$4a,$4e,"RELEASE ",$4a,$4e,"CHANGE BOX",$4e,"SEE YA!@"
BoxNoPCText: ; 21713 (8:5713)
db "BOX No.@"
Get rid of globals.asm. Use ::s to export labels between objects. globals.asm was a hack that: - gave rgbasm an extra 100k lines to read - increased reliance on the python preprocessor - made the makefile a mess - gave object creation an extra step - wasn't even necessary This speeds up build time by at least a third.
2014-01-27 21:22:41 +00:00
Func_2171b:: ; 2171b (8:571b)
Use monster struct macros in wram. Rename related labels for consistency.
2014-06-14 11:12:40 +00:00
ld hl, wPartyMon1Moves
ld bc, wPartyMon2 - wPartyMon1
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
jr .asm_21729 ; 0x21721 $6
Use monster struct macros in wram. Rename related labels for consistency.
2014-06-14 11:12:40 +00:00
ld hl, wBoxMon1Moves
ld bc, wBoxMon2 - wBoxMon1
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
.asm_21729
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wWhichPokemon]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call AddNTimes
Use monster struct macros in wram. Rename related labels for consistency.
2014-06-14 11:12:40 +00:00
ld b, NUM_MOVES
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
.asm_21731
ld a, [hli]
push hl
push bc
ld hl, HMMoveArray ; $5745
Use monster struct macros in wram. Rename related labels for consistency.
2014-06-14 11:12:40 +00:00
ld de, 1
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call IsInArray
pop bc
pop hl
ret c
dec b
jr nz, .asm_21731 ; 0x21741 $ee
and a
ret
HMMoveArray: ; 21745 (8:5745)
db CUT
db FLY
db SURF
db STRENGTH
db FLASH
db $ff
Func_2174b: ; 2174b (8:574b)
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 9, 10
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld b, $6
ld c, $9
call TextBoxBorder
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wccd3]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and a
ld de, DepositPCText ; $57cb
jr nz, .asm_21761
ld de, WithdrawPCText ; $57d3
.asm_21761
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 11, 12
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call PlaceString
Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to avoid static addresses
2014-06-25 20:58:27 +00:00
hlCoord 11, 14
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld de, StatsCancelPCText ; $57dc
call PlaceString
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld hl, wTopMenuItemY ; wTopMenuItemY
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld a, $c
ld [hli], a
ld a, $a
ld [hli], a
xor a
ld [hli], a
inc hl
ld a, $2
ld [hli], a
ld a, $3
ld [hli], a
xor a
ld [hl], a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld hl, wListScrollOffset ; wcc36
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
ld [hli], a
ld [hl], a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wPlayerMonNumber], a ; wPlayerMonNumber
ld [wcc2b], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
.asm_2178f
call HandleMenuInput
bit 1, a
jr nz, .asm_2179f
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wCurrentMenuItem] ; wCurrentMenuItem
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and a
jr z, .asm_217a1
dec a
jr z, .asm_217a3
.asm_2179f
and a
ret
.asm_217a1
scf
ret
.asm_217a3
call SaveScreenTilesToBuffer1
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wccd3]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
and a
ld a, $0
jr nz, .asm_217b0
ld a, $2
.asm_217b0
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [wcc49], a
Use macros for predef calls/jumps instead of static ids.
2014-06-16 20:57:26 +00:00
predef StatusScreen
predef StatusScreen2
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call LoadScreenTilesFromBuffer1
call ReloadTilesetTilePatterns
call GoPAL_SET_CF1C
call LoadGBPal
jr .asm_2178f
DepositPCText: ; 217cb (8:57cb)
db "DEPOSIT@"
WithdrawPCText: ; 217d3 (8:57d3)
db "WITHDRAW@"
StatsCancelPCText: ; 217dc (8:57dc)
db "STATS",$4e,"CANCEL@"
SwitchOnText: ; 0x217e9
TX_FAR _SwitchOnText
db "@"
WhatText: ; 0x217ee
TX_FAR _WhatText
db "@"
DepositWhichMonText: ; 0x217f3
TX_FAR _DepositWhichMonText
db "@"
MonWasStoredText: ; 0x217f8
TX_FAR _MonWasStoredText
db "@"
CantDepositLastMonText: ; 0x217fd
TX_FAR _CantDepositLastMonText
db "@"
BoxFullText: ; 0x21802
TX_FAR _BoxFullText
db "@"
MonIsTakenOutText: ; 0x21807
TX_FAR _MonIsTakenOutText
db "@"
NoMonText: ; 0x2180c
TX_FAR _NoMonText
db "@"
CantTakeMonText: ; 0x21811
TX_FAR _CantTakeMonText
db "@"
ReleaseWhichMonText: ; 0x21816
TX_FAR _ReleaseWhichMonText
db "@"
OnceReleasedText: ; 0x2181b
TX_FAR _OnceReleasedText
db "@"
MonWasReleasedText: ; 0x21820
TX_FAR _MonWasReleasedText
db "@"
Name hidden object routines
2014-05-21 23:08:32 +00:00
PrintJustAMomentText1:: ; 5824 (8:5825)
Stop using [$ff00+$xx] syntax. rgbasm treats $ffxx loads the same. This is more consistent and avoids confusion with $ff00+c,
2014-03-30 23:30:30 +00:00
ld a, [$ffaa]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
cp $1
ret z
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wSpriteStateData1 + 9]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
cp $c
ret nz
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [W_CURMAP]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
cp $ef
ld a, $2
jr z, .asm_2183a
inc a
.asm_2183a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [W_ISLINKBATTLE], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call EnableAutoTextBoxDrawing
ld a, $22
More misc relabelling
2014-05-21 17:10:07 +00:00
jp PrintPredefTextID
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
Name hidden object routines
2014-05-21 23:08:32 +00:00
PrintJustAMomentText2:: ; 5845 (8:5845)
Stop using [$ff00+$xx] syntax. rgbasm treats $ffxx loads the same. This is more consistent and avoids confusion with $ff00+c,
2014-03-30 23:30:30 +00:00
ld a, [$ffaa]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
cp $2
ret z
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wSpriteStateData1 + 9]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
cp $8
ret nz
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [W_CURMAP]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
cp $ef
ld a, $2
jr z, .asm_2185a
inc a
.asm_2185a
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld [W_ISLINKBATTLE], a
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
call EnableAutoTextBoxDrawing
ld a, $22
More misc relabelling
2014-05-21 17:10:07 +00:00
jp PrintPredefTextID
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
Label a lot of unnamed text
2014-05-15 23:58:24 +00:00
JustAMomentText:: ; 21865 (8:5865)
TX_FAR _JustAMomentText
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
db "@"
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
2014-05-26 21:04:56 +00:00
ld a, [wSpriteStateData1 + 9]
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
cp $4
ret nz
call EnableAutoTextBoxDrawing
ld a, $23
More misc relabelling
2014-05-21 17:10:07 +00:00
jp PrintPredefTextID
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
More misc relabelling
2014-05-21 17:10:07 +00:00
PredefText23:: ; 21878 (8:5878)
Name hidden object routines
2014-05-21 23:08:32 +00:00
db $FD ; FuncTX_BillsPC
split audio components into audio_red.o and audio_blue.o
2014-01-09 07:59:53 +00:00
Reference in a new issue Copy permalink