ref: 14e0da51164d418b9eb347ed21a2a753393e8883
parent: d346664b148c7d10972f772f67ffd67e147f29ea
author: PikalaxALT <PikalaxALT@gmail.com>
date: Wed Nov 4 03:43:46 EST 2015
Status screen edits
--- a/macros/charmap.asm
+++ b/macros/charmap.asm
@@ -7,6 +7,7 @@
charmap "<RED>", $38
charmap "<GREEN>", $39
charmap "<ENEMY>", $3f
+ charmap "<SHINY>", $3f
charmap "<MOM>", $49
charmap "<PKMN>", $4a
charmap "<NEXT>", $4e
@@ -30,6 +31,7 @@
charmap "<DEXEND>", $5f
; Actual characters
+ charmap "_", $62
charmap "′", $6e
charmap "<LV>", $6e
charmap "″", $6f
@@ -36,6 +38,8 @@
charmap "<PO>", $70
charmap "<KE>", $71
+ charmap "◀", $71
+ charmap "<ID>", $73
charmap "№", $74
charmap "…", $75
--- a/main.asm
+++ b/main.asm
@@ -44323,7 +44323,7 @@
hlcoord 18, 0
call Function4df66
hlcoord 9, 4
- ld a, $f3
+ ld a, "/"
ld [hli], a
ld a, [CurBaseData] ; wd236 (aliases: BaseDexNo)
ld [wd265], a
@@ -44357,9 +44357,9 @@
pop hl
ret c
ld a, "♂"
- jr nz, .asm_4df75
+ jr nz, .got_gender
ld a, "♀"
-.asm_4df75
+.got_gender
ld [hl], a
ret
; 4df77 (13:5f77)
@@ -44373,32 +44373,32 @@
Function4df7f: ; 4df7f
hlcoord 7, 0
- ld bc, 20
- ld d, 18
-.asm_4df87
+ ld bc, SCREEN_WIDTH
+ ld d, SCREEN_HEIGHT
+.loop
ld a, $31
ld [hl], a
add hl, bc
dec d
- jr nz, .asm_4df87
+ jr nz, .loop
ret
; 4df8f
Function4df8f: ; 4df8f (13:5f8f)
hlcoord 0, 7
- ld b, 20
- ld a, $62
-.asm_4df96
+ ld b, SCREEN_WIDTH
+ ld a, "_"
+.loop
ld [hli], a
dec b
- jr nz, .asm_4df96
+ jr nz, .loop
ret
Function4df9b: ; 4df9b (13:5f9b)
hlcoord 12, 6
- ld [hl], $71
+ ld [hl], "◀"
hlcoord 19, 6
- ld [hl], $ed
+ ld [hl], "▶"
ret
Function4dfa6: ; 4dfa6 (13:5fa6)
@@ -44406,7 +44406,7 @@
callba CheckShininess
ret nc
hlcoord 19, 0
- ld [hl], $3f
+ ld [hl], "<SHINY>"
ret
Function4dfb6: ; 4dfb6 (13:5fb6)
@@ -44423,6 +44423,7 @@
jr nz, .asm_4dfd6
call SetPalettes
ret
+
.asm_4dfd6
call Function4e226
ret
@@ -81737,7 +81738,7 @@
Function1dc1b0: ; 1dc1b0
hlcoord 0, 0
ld de, wca90
- ld bc, $154
+ ld bc, 17 * SCREEN_WIDTH
call CopyBytes
ld hl, wcab5
ld a, $62
@@ -81789,7 +81790,7 @@
Function1dc213: ; 1dc213
ld hl, wca90
ld bc, $a0
- ld a, $7f
+ ld a, " "
call ByteFill
ld hl, wca90
ld a, $36
@@ -81895,14 +81896,14 @@
ld [MonType], a
callba CopyPkmnToTempMon
hlcoord 0, 7
- ld b, $9
- ld c, $12
+ ld b, 9
+ ld c, 18
call TextBox
hlcoord 8, 2
ld a, [TempMonLevel]
call Function383d
hlcoord 12, 2
- ld [hl], $71
+ ld [hl], "◀" ; Filled left triangle
inc hl
ld de, TempMonMaxHP
lb bc, 2, 3
@@ -81915,14 +81916,14 @@
hlcoord 8, 4
call PlaceString
hlcoord 9, 6
- ld [hl], $f3
+ ld [hl], "/"
call GetPokemonName
hlcoord 10, 6
call PlaceString
hlcoord 8, 0
- ld [hl], $74
+ ld [hl], "№"
inc hl
- ld [hl], $e8
+ ld [hl], "."
inc hl
ld de, wd265
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
@@ -82053,13 +82054,13 @@
Function1dc52c: ; 1dc52c
callba GetGender
- ld a, $7f
- jr c, .asm_1dc53c
- ld a, $ef
- jr nz, .asm_1dc53c
- ld a, $f5
+ ld a, " "
+ jr c, .got_gender
+ ld a, "♂"
+ jr nz, .got_gender
+ ld a, "♀"
-.asm_1dc53c
+.got_gender
hlcoord 17, 2
ld [hl], a
ld bc, TempMonDVs
@@ -82066,7 +82067,7 @@
callba CheckShininess
ret nc
hlcoord 18, 2
- ld [hl], $3f
+ ld [hl], "<SHINY>"
ret
; 1dc550
@@ -82077,7 +82078,7 @@
db "MOVE@"
String1dc559: ; 1dc559
- db $73, "№.@"
+ db "<ID>№.@"
String1dc55d: ; 1dc55d
db "ATTACK"