diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-18 15:37:40 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-18 15:37:40 -0400 |
| commit | bb97b63af1fbeca208cb30a41f8195b4408821dc (patch) | |
| tree | 106b0bab693daa5335445b01c43a8cd4c851d231 /engine/menu | |
| parent | 35874024438c0a716ad3de8896207f02db56e7d1 (diff) | |
Complete documentation of bank3
Also: split out bcd predefs from yellow/main.asm, start removing traces
of W_
Diffstat (limited to 'engine/menu')
| -rw-r--r-- | engine/menu/bills_pc.asm | 10 | ||||
| -rwxr-xr-x | engine/menu/main_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/party_menu.asm | 8 | ||||
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 3f0db4ea..4a274871 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -218,7 +218,7 @@ BillsPCDeposit: ; 2156d (8:556d) call PrintText jp BillsPCMenu .partyLargeEnough - ld a, [W_NUMINBOX] + ld a, [wNumInBox] cp MONS_PER_BOX jr nz, .boxNotFull ld hl, BoxFullText @@ -279,7 +279,7 @@ SleepingPikachuText2: ; 2160e (8:560e) db "@" BillsPCWithdraw: ; 21613 (8:5613) - ld a, [W_NUMINBOX] + ld a, [wNumInBox] and a jr nz, .boxNotEmpty ld hl, NoMonText @@ -293,7 +293,7 @@ BillsPCWithdraw: ; 21613 (8:5613) call PrintText jp BillsPCMenu .partyNotFull - ld hl, W_NUMINBOX + ld hl, wNumInBox call DisplayMonListMenu jp c, BillsPCMenu call DisplayDepositWithdrawMenu @@ -322,14 +322,14 @@ BillsPCWithdraw: ; 21613 (8:5613) jp BillsPCMenu BillsPCRelease: ; 21690 (8:5690) - ld a, [W_NUMINBOX] + ld a, [wNumInBox] and a jr nz, .loop ld hl, NoMonText call PrintText jp BillsPCMenu .loop - ld hl, W_NUMINBOX + ld hl, wNumInBox call DisplayMonListMenu jp c, BillsPCMenu callab Func_fce0d diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 6c109cec..98f1efdd 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -392,7 +392,7 @@ PrintSaveScreenText: ; 5def (1:5def) PrintNumBadges: ; 5e2f (1:5e2f) push hl - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges ld b, $1 call CountSetBits pop hl diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index f3e1a138..293ed255 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -88,14 +88,14 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) pop hl push hl ld bc,20 + 1 ; down 1 row and right 1 column - ld a,[hFlags_0xFFF6] + ld a,[hFlags_0xFFFA] set 0,a - ld [hFlags_0xFFF6],a + ld [hFlags_0xFFFA],a add hl,bc predef DrawHP2 ; draw HP bar and prints current / max HP - ld a,[hFlags_0xFFF6] + ld a,[hFlags_0xFFFA] res 0,a - ld [hFlags_0xFFF6],a + ld [hFlags_0xFFFA],a call SetPartyMenuHPBarColor ; color the HP bar (on SGB) pop hl jr .printLevel diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index ab8c8756..dcbee277 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -117,7 +117,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) ld a,[hli] ld h,[hl] ld l,a - ld a,[W_OBTAINEDBADGES] ; badges obtained + ld a,[wObtainedBadges] ; badges obtained jp [hl] .outOfBattleMovePointers dw .cut diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index c91d5eda..8775a8d9 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -40,7 +40,7 @@ DrawHP_: ; 128fb (4:68fb) push hl call DrawHPBar pop hl - ld a, [hFlags_0xFFF6] + ld a, [hFlags_0xFFFA] bit 0, a jr z, .printFractionBelowBar ld bc, $9 ; right of bar |