summaryrefslogtreecommitdiff
path: root/engine/menu
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-02-07 16:24:16 -0800
committerYamaArashi <shadow962@live.com>2015-02-07 16:24:16 -0800
commit4fd7a42b235b68ffc11d4f02305b695c2ed05549 (patch)
treede8727d33beb886cb451a8d5e693ee46aafde55d /engine/menu
parent72265ab92abd235c2af6d26ae76dd0dcaecfd6ac (diff)
commented battle stuff
Diffstat (limited to 'engine/menu')
-rwxr-xr-xengine/menu/party_menu.asm8
-rwxr-xr-xengine/menu/status_screen.asm2
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index 10fc4182..a2c02481 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,[$FFF6]
+ ld a,[hFlags_0xFFF6]
set 0,a
- ld [$FFF6],a
+ ld [hFlags_0xFFF6],a
add hl,bc
predef Func_128f6 ; draw HP bar and prints current / max HP
- ld a,[$FFF6]
+ ld a,[hFlags_0xFFF6]
res 0,a
- ld [$FFF6],a
+ ld [hFlags_0xFFF6],a
call SetPartyMenuHealthBarColor ; color the HP bar (on SGB)
pop hl
jr .printLevel
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index f215fd0e..2fc5e713 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -82,7 +82,7 @@ StatusScreen: ; 12953 (4:6953)
ld bc, $8103 ; Zero-padded, 3
call PrintNumber ; Pokémon no.
hlCoord 11, 10
- predef Func_27d6b ; Prints the type (?)
+ predef PrintMonType
ld hl, NamePointers2 ; $6a9d
call .unk_12a7e
ld d, h