From c140af9e598c42492de4420c5a2f107b772b98a9 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sat, 21 Dec 2013 03:02:59 -0500
Subject: [PATCH] some mobile stat screen icons

---
 gfx/mobile/hp.1bpp   | Bin 0 -> 8 bytes
 gfx/mobile/lv.1bpp   | Bin 0 -> 8 bytes
 gfx/stats/shiny.2bpp |   1 +
 main.asm             |  70 ++++++++++++++++++++++++++++++++-----------
 4 files changed, 54 insertions(+), 17 deletions(-)
 create mode 100644 gfx/mobile/hp.1bpp
 create mode 100644 gfx/mobile/lv.1bpp
 create mode 100644 gfx/stats/shiny.2bpp

diff --git a/gfx/mobile/hp.1bpp b/gfx/mobile/hp.1bpp
new file mode 100644
index 0000000000000000000000000000000000000000..6ba57017b89968c2076e76607a4f4c480ecea809
GIT binary patch
literal 8
PcmZQzShwokiWLk14sHXN

literal 0
HcmV?d00001

diff --git a/gfx/mobile/lv.1bpp b/gfx/mobile/lv.1bpp
new file mode 100644
index 0000000000000000000000000000000000000000..467a12dea2ed7795d16d92f05b5474ba8481442b
GIT binary patch
literal 8
PcmZQzXz1$ddcptz3rGV4

literal 0
HcmV?d00001

diff --git a/gfx/stats/shiny.2bpp b/gfx/stats/shiny.2bpp
new file mode 100644
index 000000000..cfe4e8f9e
--- /dev/null
+++ b/gfx/stats/shiny.2bpp
@@ -0,0 +1 @@
+@@ààBB88
\ No newline at end of file
diff --git a/main.asm b/main.asm
index 63313a7c0..c480cf00a 100644
--- a/main.asm
+++ b/main.asm
@@ -80578,13 +80578,18 @@ INCBIN "gfx/frames/8.1bpp"
 INCBIN "gfx/frames/9.1bpp"
 ; f89b0
 
-INCBIN "baserom.gbc",$f89b0,$f8ba0 - $f89b0
+INCBIN "baserom.gbc", $f89b0, $f8a90 - $f89b0
+
+ShinyIcon: ; f8a90
+INCBIN "gfx/stats/shiny.2bpp"
+
+INCBIN "baserom.gbc", $f8aa0, $f8ba0 - $f8aa0
 
 TownMapGFX: ; f8ba0
 INCBIN "gfx/misc/town_map.lz"
 ; f8ea3
 
-INCBIN "baserom.gbc",$f8ea3,$fb449 - $f8ea3
+INCBIN "baserom.gbc", $f8ea3, $fb449 - $f8ea3
 
 
 Functionfb449: ; fb449
@@ -99360,18 +99365,22 @@ Function1dc381: ; 1dc381
 	xor a
 	ld [hBGMapMode], a
 	call Functione58
-	ld de, $4591
+
+	ld de, MobileHPIcon
 	ld hl, $9710
-	ld bc, $7701
+	lb bc, BANK(MobileHPIcon), 1
 	call Request1bpp
-	ld de, $4599
+
+	ld de, MobileLvIcon
 	ld hl, $96e0
-	ld bc, $7701
+	lb bc, BANK(MobileLvIcon), 1
 	call Request1bpp
-	ld de, $4a90
+
+	ld de, ShinyIcon
 	ld hl, $93f0
-	ld bc, $3e01
+	lb bc, BANK(ShinyIcon), 1
 	call Get2bpp
+
 	xor a
 	ld [MonType], a
 	callba Function5084a
@@ -99409,21 +99418,21 @@ Function1dc381: ; 1dc381
 	ld bc, $8103
 	call PrintNum
 	ld hl, $c555
-	ld de, $4550
+	ld de, String1dc550
 	call PlaceString
 	ld hl, PartyMon1OT
 	call Function1dc50e
 	ld hl, $c558
 	call PlaceString
 	ld hl, $c57d
-	ld de, $4559
+	ld de, String1dc559
 	call PlaceString
 	ld hl, $c580
 	ld de, TempMonID
 	ld bc, $8205
 	call PrintNum
 	ld hl, $c5b9
-	ld de, $4554
+	ld de, String1dc554
 	call PlaceString
 	ld hl, $c5bf
 	ld a, [TempMonMove1]
@@ -99461,10 +99470,10 @@ Function1dc47b: ; 1dc47b
 	ld [MonType], a
 	callba Function5084a
 	ld hl, TileMap
-	ld b, $f
-	ld c, $12
+	ld b, 15
+	ld c, 18
 	call TextBox
-	ld bc, $0014
+	ld bc, SCREEN_WIDTH
 	ld de, TileMap
 	ld hl, $c4b4
 	call CopyBytes
@@ -99478,7 +99487,7 @@ Function1dc47b: ; 1dc47b
 	ld a, [TempMonMove4]
 	call Function1dc51a
 	ld hl, $c533
-	ld de, $455d
+	ld de, String1dc55d
 	call PlaceString
 	ld hl, $c53c
 	ld de, TempMonAtk
@@ -99520,12 +99529,13 @@ Function1dc50e: ; 1dc50e
 Function1dc51a: ; 1dc51a
 	and a
 	jr z, .asm_1dc525
+
 	ld [$d265], a
 	call GetMoveName
 	jr .asm_1dc528
 
 .asm_1dc525
-	ld de, $4584
+	ld de, String1dc584
 
 .asm_1dc528
 	call PlaceString
@@ -99551,10 +99561,36 @@ Function1dc52c: ; 1dc52c
 	ret
 ; 1dc550
 
-INCBIN "baserom.gbc",$1dc550,$1dc5a1 - $1dc550
+String1dc550: ; 1dc550
+	db "OT/@"
+
+String1dc554: ; 1dc554
+	db "MOVE@"
+
+String1dc559: ; 1dc559
+	db $73, "â„–.@"
+
+String1dc55d: ; 1dc55d
+	db "ATTACK", $4e
+	db "DEFENSE", $4e
+	db "SPCL.ATK", $4e
+	db "SPCL.DEF", $4e
+	db "SPEED@"
+
+String1dc584: ; 1dc584
+	db "------------@"
+; 1dc591
+
+MobileHPIcon: ; 1dc591
+INCBIN "gfx/mobile/hp.1bpp"
+
+MobileLvIcon: ; 1dc599
+INCBIN "gfx/mobile/lv.1bpp"
+
 
 INCLUDE "tilesets/data_7.asm"
 
+
 INCBIN "baserom.gbc",$1dd6a9,$1dd6bb - $1dd6a9
 
 ; no known jump sources