From 7eafe495fb01b100b93ccf043500383ca10f3fca Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Wed, 28 Aug 2013 16:05:18 -0400
Subject: Add titlescreen copyright tilemap

---
 main.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 44dc3e0e..9e7df95d 100644
--- a/main.asm
+++ b/main.asm
@@ -11017,7 +11017,7 @@ ENDC
 	ld [hl], a
 	FuncCoord 2, 17 ; $c4f6
 	ld hl, Coord
-	ld de, .unknown_437f ; $437f
+	ld de, .titlescreenTilemap ; $437f
 	ld b, $10
 .asm_4377
 	ld a, [de]
@@ -11027,8 +11027,8 @@ ENDC
 	jr nz, .asm_4377
 	jr .asm_438f
 
-.unknown_437f ; 437f (1:437f)
-INCBIN "baserom.gbc",$437f,$438f - $437f
+.titlescreenTilemap ; 437f (1:437f)
+db $41,$42,$43,$42,$44,$42,$45,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©'95.'96.'98 GAME FREAK inc.
 
 .asm_438f
 	call SaveScreenTilesToBuffer2
-- 
cgit v1.3.1-sl0p


From 66e0602dc44c71b7a437114080e84910f75431a4 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 31 Aug 2013 18:26:39 -0500
Subject: fix capitalization on a SECTION

---
 main.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 44dc3e0e..a49708f2 100644
--- a/main.asm
+++ b/main.asm
@@ -106,7 +106,7 @@ SECTION "romheader",ROM0[$100]
 nop
 jp Start
 
-Section "start",ROM0[$150]
+SECTION "start",ROM0[$150]
 Start: ; 0150 (0:0150)
 	cp $11 ; value that indicates Gameboy Color
 	jr z,.gbcDetected
-- 
cgit v1.3.1-sl0p


From 418a6bdfb0490df6647b7dec45ed320666f5ecd3 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Sun, 1 Sep 2013 10:52:21 -0400
Subject: Add vending machine prices

---
 main.asm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 9e7df95d..83546b2a 100644
--- a/main.asm
+++ b/main.asm
@@ -104948,7 +104948,7 @@ UnnamedText_74fe2: ; 74fe2 (1d:4fe2)
 ; 0x74fe2 + 5 bytes
 
 Unknown_74fe7: ; 74fe7 (1d:4fe7)
-	ld hl, Unknown_75000
+	ld hl, VendingPrices
 	ld a, [$cc26]
 	add a
 	add a
@@ -104964,10 +104964,11 @@ Unknown_74fe7: ; 74fe7 (1d:4fe7)
 	ld a, [hl]
 	ld [$ff00+$de], a
 	ret
-; 0x75000
 
-Unknown_75000: ; 75000 (1d:5000)
-INCBIN "baserom.gbc",$75000,$7500c - $75000
+VendingPrices: ; 75000 (1d:5000)
+	db FRESH_WATER,$00,$02,$00
+	db SODA_POP,   $00,$03,$00
+	db LEMONADE,   $00,$03,$50
 
 FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153)
 	db $08 ; tileset
-- 
cgit v1.3.1-sl0p


From c660927cc3b56c69ded63a6efd3d37275ea0b0b4 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Sun, 1 Sep 2013 12:12:05 -0400
Subject: Add copyright text string

---
 main.asm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 83546b2a..6c6132dd 100644
--- a/main.asm
+++ b/main.asm
@@ -11283,11 +11283,13 @@ Func_4541: ; 4541 (1:4541)
 	call CopyVideoData
 	FuncCoord 2, 7 ; $c42e
 	ld hl, Coord
-	ld de, Unknown_4556 ; $4556
+	ld de, CopyrightTextString ; $4556
 	jp PlaceString
 
-Unknown_4556: ; 4556 (1:4556)
-INCBIN "baserom.gbc",$4556,$4588 - $4556
+CopyrightTextString: ; 4556 (1:4556)
+	db $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A,$4E             ; ©'95.'96.'98 Nintendo
+	db $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72,$4E     ; ©'95.'96.'98 Creatures inc.
+	db $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B,"@" ; ©'95.'96.'98 GAME FREAK inc.
 
 TitleMons: ; 4588 (1:4588)
 ; mons on the title screen are randomly chosen from here
-- 
cgit v1.3.1-sl0p


From e4766e18d75e32279eecd841aaaa397cbe914645 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Sun, 1 Sep 2013 16:34:39 -0400
Subject: Add waiting...! text string

---
 main.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 6c6132dd..a53d53ab 100644
--- a/main.asm
+++ b/main.asm
@@ -11837,13 +11837,13 @@ Func_4c05: ; 4c05 (1:4c05)
 .asm_4c1a
 	FuncCoord 4, 11 ; $c480
 	ld hl, Coord
-	ld de, Unknown_4c28 ; $4c28
+	ld de, WaitingText ; $4c28
 	call PlaceString
 	ld c, $32
 	jp DelayFrames
 
-Unknown_4c28: ; 4c28 (1:4c28)
-INCBIN "baserom.gbc",$4c28,$4c34 - $4c28
+WaitingText: ; 4c28 (1:4c28)
+	db "Waiting...!@"
 
 ; known jump sources: 2438 (0:2438)
 _UpdateSprites: ; 4c34 (1:4c34)
-- 
cgit v1.3.1-sl0p


From b47c79b74623953426f71a22d323c55c993406dd Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Sun, 1 Sep 2013 16:38:01 -0400
Subject: Add PLEASE WAIT! text string

---
 main.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index a53d53ab..a46fc56c 100644
--- a/main.asm
+++ b/main.asm
@@ -13041,7 +13041,7 @@ Func_5317: ; 5317 (1:5317)
 	call Func_5ab3
 	FuncCoord 4, 10 ; $c46c
 	ld hl, Coord
-	ld de, .unknown_550f ; $550f
+	ld de, .pleaseWait ; $550f
 	call PlaceString
 	ld hl, W_NUMHITS ; $d074
 	xor a
@@ -13310,8 +13310,8 @@ Func_5317: ; 5317 (1:5317)
 	call PlayMusic
 	jr .asm_551c
 
-.unknown_550f: ; 550f (1:550f)
-INCBIN "baserom.gbc",$550f,$551c - $550f
+.pleaseWait: ; 550f (1:550f)
+	db "PLEASE WAIT!@"
 
 .asm_551c
 	ld hl, Unknown_5a5b ; $5a5b
-- 
cgit v1.3.1-sl0p


From 8e359308216da1d942bf14e2b03ee60232e66d8c Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Sun, 1 Sep 2013 16:53:18 -0400
Subject: Add trade text strings

---
 main.asm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index a46fc56c..fc0fbcfe 100644
--- a/main.asm
+++ b/main.asm
@@ -13358,7 +13358,8 @@ SSAnne8AfterBattleText2: ; 5a24 (1:5a24)
 	db $50
 ; 0x5a24 + 5 bytes
 
-INCBIN "baserom.gbc",$5a29,$5a5b - $5a29
+	db "Trade completed!@"
+	db "Too bad! The trade",$4E,"was canceled!@"
 
 Unknown_5a5b: ; 5a5b (1:5a5b)
 INCBIN "baserom.gbc",$5a5b,$5a5f - $5a5b
-- 
cgit v1.3.1-sl0p


From 4793cf636ce68898b39c13057f0c80f170f58d18 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 10:40:37 -0400
Subject: Disassemble chunks of bank 1 near 5530

---
 main.asm | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 279 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index fc0fbcfe..58670b4a 100644
--- a/main.asm
+++ b/main.asm
@@ -13326,8 +13326,274 @@ Func_5317: ; 5317 (1:5317)
 	ld h, [hl]
 	ld l, a
 	jp [hl]
-
-INCBIN "baserom.gbc",$5530,$577d - $5530
+.asm_5530
+	call ClearScreen
+	call Func_5ae6
+	call Func_57f2
+	call Func_57a2
+	xor a
+	ld hl, $cc3d
+	ld [hli], a
+	ld [hli], a
+	ld [hli], a
+	ld [hl], a
+	ld [$cc37], a
+	ld [$cc26], a
+	ld [$cc2a], a
+	ld [$cc34], a
+	inc a
+	ld [$cc42], a
+	jp .asm_55dc
+.asm_5557
+	xor a
+	ld [$cc37], a
+	inc a
+	ld [$cc49], a
+	ld a, $a1
+	ld [$cc29], a
+	ld a, [$d89c]
+	ld [$cc28], a
+	ld a, $9
+	ld [$cc24], a
+	ld a, $1
+	ld [$cc25], a
+.asm_5574
+	ld hl, $fff6
+	set 1, [hl]
+	call HandleMenuInput
+	ld hl, $fff6
+	res 1, [hl]
+	and a
+	jp z, .asm_565b
+	bit 0, a
+	jr z, .asm_55b0 ; 0x5587 $27
+	ld a, [$cc28]
+	ld c, a
+	ld a, [$cc26]
+	cp c
+	jr c, .asm_559a ; 0x5591 $7
+	ld a, [$cc28]
+	dec a
+	ld [$cc26], a
+.asm_559a
+	ld a, $1
+	ld [$d11b], a
+	ld hl, Func_39bd5
+	ld b, $e
+	call Bankswitch
+	ld hl, $d8a4
+	call Func_57d6
+	jp .asm_565b
+.asm_55b0
+	bit 5, a
+	jr z, .asm_55d4 ; 0x55b2 $20
+	xor a
+	ld [$cc49], a
+	ld a, [$cc30]
+	ld l, a
+	ld a, [$cc31]
+	ld h, a
+	ld a, [$cc27]
+	ld [hl], a
+	ld a, [$cc26]
+	ld b, a
+	ld a, [$d163]
+	dec a
+	cp b
+	jr nc, .asm_55dc ; 0x55cd $d
+	ld [$cc26], a
+	jr .asm_55dc ; 0x55d2 $8
+.asm_55d4
+	bit 7, a
+	jp z, .asm_565b
+	jp .asm_572f
+.asm_55dc
+	xor a
+	ld [$cc49], a
+	ld [$cc37], a
+	ld a, $91
+	ld [$cc29], a
+	ld a, [$d163]
+	ld [$cc28], a
+	ld a, $1
+	ld [$cc24], a
+	ld a, $1
+	ld [$cc25], a
+	ld hl, $c3b5
+	ld bc, $0601
+	call ClearScreenArea
+.asm_5601
+	ld hl, $fff6
+	set 1, [hl]
+	call HandleMenuInput
+	ld hl, $fff6
+	res 1, [hl]
+	and a
+	jr nz, .asm_5614 ; 0x560f $3
+	jp .asm_565b
+.asm_5614
+	bit 0, a
+	jr z, .asm_562e ; 0x5616 $16
+	jp .asm_5665
+	ld a, $4
+	ld [$d11b], a
+	ld hl, Func_39bd5
+	ld b, $e
+	call Bankswitch
+	call Func_57d6
+	jp .asm_565b
+.asm_562e
+	bit 4, a
+	jr z, .asm_5654 ; 0x5630 $22
+	ld a, $1
+	ld [$cc49], a
+	ld a, [$cc30]
+	ld l, a
+	ld a, [$cc31]
+	ld h, a
+	ld a, [$cc27]
+	ld [hl], a
+	ld a, [$cc26]
+	ld b, a
+	ld a, [$d89c]
+	dec a
+	cp b
+	jr nc, .asm_5651 ; 0x564c $3
+	ld [$cc26], a
+.asm_5651
+	jp .asm_5557
+.asm_5654
+	bit 7, a
+	jr z, .asm_565b ; 0x5656 $3
+	jp .asm_572f
+.asm_565b
+	ld a, [$cc49]
+	and a
+	jp z, .asm_5601
+	jp .asm_5574
+.asm_5665
+	call SaveScreenTilesToBuffer1
+	call PlaceUnfilledArrowMenuCursor
+	ld a, [$cc28]
+	ld c, a
+	ld a, [$cc26]
+	cp c
+	jr c, .asm_5679 ; 0x5673 $4
+	ld a, [$cc28]
+	dec a
+.asm_5679
+	push af
+	ld hl, $c4b8
+	ld b, $2
+	ld c, $12
+	call Func_5ab3
+	ld hl, $c4e2
+	ld de, .statsTrade
+	call PlaceString
+	xor a
+	ld [$cc26], a
+	ld [$cc2a], a
+	ld [$cc34], a
+	ld [$cc28], a
+	ld a, $10
+	ld [$cc24], a
+.asm_569f
+	ld a, $7f
+	ld [$c4eb], a
+	ld a, $13
+	ld [$cc29], a
+	ld a, $1
+	ld [$cc25], a
+	call HandleMenuInput
+	bit 4, a
+	jr nz, .asm_56c3 ; 0x56b3 $e
+	bit 1, a
+	jr z, .asm_56df ; 0x56b7 $26
+.asm_56b9
+	pop af
+	ld [$cc26], a
+	call LoadScreenTilesFromBuffer1
+	jp .asm_55dc
+.asm_56c3
+	ld a, $7f
+	ld [$c4e1], a
+	ld a, $23
+	ld [$cc29], a
+	ld a, $b
+	ld [$cc25], a
+	call HandleMenuInput
+	bit 5, a
+	jr nz, .asm_569f ; 0x56d7 $c6
+	bit 1, a
+	jr nz, .asm_56b9 ; 0x56db $dc
+	jr .asm_56f9 ; 0x56dd $1a
+.asm_56df
+	pop af
+	ld [$cc26], a
+	ld a, $4
+	ld [$d11b], a
+	ld hl, Func_39bd5
+	ld b, $e
+	call Bankswitch
+	call Func_57d6
+	call LoadScreenTilesFromBuffer1
+	jp .asm_55dc
+.asm_56f9
+	call PlaceUnfilledArrowMenuCursor
+	pop af
+	ld [$cc26], a
+	ld [$cd3d], a
+	ld [$cc42], a
+	call Func_226e
+	ld a, [$cc3d]
+	cp $f
+	jp z, .asm_551c
+	ld [$cd3e], a
+	call Func_57c7
+	ld a, $1
+	ld [$cc38], a
+	jp .asm_551c
+.statsTrade
+	db "STATS     TRADE@"
+.asm_572f
+	ld a, [$cc26]
+	ld b, a
+	ld a, [$cc28]
+	cp b
+	jp nz, .asm_565b
+	ld a, [$cc30]
+	ld l, a
+	ld a, [$cc31]
+	ld h, a
+	ld a, $7f
+	ld [hl], a
+.asm_5745
+	ld a, $ed
+	ld [$c4e1], a
+.asm_574a
+	call GetJoypadStateLowSensitivity
+	ld a, [$ff00+$b5]
+	and a
+	jr z, .asm_574a ; 0x5750 $f8
+	bit 0, a
+	jr nz, .asm_5769 ; 0x5754 $13
+	bit 6, a
+	jr z, .asm_574a ; 0x5758 $f0
+	ld a, $7f
+	ld [$c4e1], a
+	ld a, [$d163]
+	dec a
+	ld [$cc26], a
+	jp .asm_55dc
+.asm_5769
+	ld a, $ec
+	ld [$c4e1], a
+	ld a, $f
+	ld [$cc42], a
+	call Func_226e
+	ld a, [$cc3d]
+	cp $f
+	jr nz, .asm_5745 ; 0x577b $c8
 
 ; known jump sources: 5503 (1:5503)
 Func_577d: ; 577d (1:577d)
@@ -13351,7 +13617,17 @@ Func_577d: ; 577d (1:577d)
 	call GBFadeIn2
 	ret
 
-INCBIN "baserom.gbc",$57a2,$5a24 - $57a2
+Func_57a2:
+INCBIN "baserom.gbc",$57a2,$57c7 - $57a2
+
+Func_57c7:
+INCBIN "baserom.gbc",$57c7,$57d6 - $57c7
+
+Func_57d6:
+INCBIN "baserom.gbc",$57d6,$57f2 - $57d6
+
+Func_57f2:
+INCBIN "baserom.gbc",$57f2,$5a24 - $57f2
 
 SSAnne8AfterBattleText2: ; 5a24 (1:5a24)
 	TX_FAR _SSAnne8AfterBattleText2
-- 
cgit v1.3.1-sl0p


From 1f90be21c1d7e8109cc361d00dd2e7d8720439aa Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 10:50:43 -0400
Subject: Add CANCEL text string and function

---
 main.asm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 58670b4a..89b0625a 100644
--- a/main.asm
+++ b/main.asm
@@ -13618,7 +13618,20 @@ Func_577d: ; 577d (1:577d)
 	ret
 
 Func_57a2:
-INCBIN "baserom.gbc",$57a2,$57c7 - $57a2
+	ld hl, $c4d7
+	ld a, $7e
+	ld bc, $0031
+	call FillMemory
+	ld hl, $c4cc
+	ld b, $1
+	ld c, $9
+	call Func_5ab3
+	ld hl, $c4e2
+	ld de, CancelTextString
+	jp PlaceString
+	
+CancelTextString:
+	db "CANCEL@"
 
 Func_57c7:
 INCBIN "baserom.gbc",$57c7,$57d6 - $57c7
-- 
cgit v1.3.1-sl0p


From 862bad8af8561f54980a616d84977b81902ca1ed Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 10:53:04 -0400
Subject: Add Func_57c7

---
 main.asm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 89b0625a..4478739d 100644
--- a/main.asm
+++ b/main.asm
@@ -13634,7 +13634,12 @@ CancelTextString:
 	db "CANCEL@"
 
 Func_57c7:
-INCBIN "baserom.gbc",$57c7,$57d6 - $57c7
+	ld a, [$cc3d]
+	ld hl, $c455
+	ld bc, $0014
+	call AddNTimes
+	ld [hl], $ec
+	ret
 
 Func_57d6:
 INCBIN "baserom.gbc",$57d6,$57f2 - $57d6
-- 
cgit v1.3.1-sl0p


From 4894b90f6ad332890645178da67ff8de78d5c6a4 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 10:55:52 -0400
Subject: Add Func_57d6

---
 main.asm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 4478739d..81a14b9f 100644
--- a/main.asm
+++ b/main.asm
@@ -13642,7 +13642,16 @@ Func_57c7:
 	ret
 
 Func_57d6:
-INCBIN "baserom.gbc",$57d6,$57f2 - $57d6
+	ld a, [$cc26]
+	ld [$cf92], a
+	ld a, $36
+	call Predef
+	ld a, $37
+	call Predef
+	call GBPalNormal
+	call Func_5ae6
+	call Func_57f2
+	jp Func_57a2
 
 Func_57f2:
 INCBIN "baserom.gbc",$57f2,$5a24 - $57f2
-- 
cgit v1.3.1-sl0p


From 21ded624c8ae40f5bb1a728c6d6955631a24582b Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 11:27:06 -0400
Subject: Add Func_57f2

---
 main.asm | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 238 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 81a14b9f..e59439ce 100644
--- a/main.asm
+++ b/main.asm
@@ -13654,14 +13654,251 @@ Func_57d6:
 	jp Func_57a2
 
 Func_57f2:
-INCBIN "baserom.gbc",$57f2,$5a24 - $57f2
+	ld hl, $c3a0
+	ld b, $6
+	ld c, $12
+	call Func_5ab3
+	ld hl, $c440
+	ld b, $6
+	ld c, $12
+	call Func_5ab3
+	ld hl, $c3a5
+	ld de, $d158
+	call PlaceString
+	ld hl, $c445
+	ld de, $d887
+	call PlaceString
+	ld hl, $c3b6
+	ld de, $d164
+	call $5827
+	ld hl, $c456
+	ld de, $d89d
+	ld c, $0
+.asm_5829
+	ld a, [de]
+	cp $ff
+	ret z
+	ld [$d11e], a
+	push bc
+	push hl
+	push de
+	push hl
+	ld a, c
+	ld [$ff00+$95], a
+	call GetMonName
+	pop hl
+	call PlaceString
+	pop de
+	inc de
+	pop hl
+	ld bc, $0014
+	add hl, bc
+	pop bc
+	inc c
+	jr .asm_5829 ; 0x5847 $e0
+	ld c, $64
+	call DelayFrames
+	xor a
+	ld [$cc43], a
+	ld [$cc3e], a
+	ld [$cc37], a
+	ld [$cc34], a
+	ld hl, $c490
+	ld b, $4
+	ld c, $12
+	call Func_5ab3
+	ld a, [$cd3d]
+	ld hl, $d164
+	ld c, a
+	ld b, $0
+	add hl, bc
+	ld a, [hl]
+	ld [$d11e], a
+	call GetMonName
+	ld hl, $cd6d
+	ld de, $cd3f
+	ld bc, $000b
+	call CopyData
+	ld a, [$cd3e]
+	ld hl, $d89d
+	ld c, a
+	ld b, $0
+	add hl, bc
+	ld a, [hl]
+	ld [$d11e], a
+	call GetMonName
+	ld hl, SSAnne8AfterBattleText2
+	ld bc, $c4b9
+	call TextCommandProcessor
+	call SaveScreenTilesToBuffer1
+	ld hl, $c436
+	ld bc, $080b
+	ld a, $5
+	ld [$d12c], a
+	ld a, $14
+	ld [$d125], a
+	call DisplayTextBoxID
+	call LoadScreenTilesFromBuffer1
+	ld a, [$cc26]
+	and a
+	jr z, .asm_58d9 ; 0x58b9 $1e
+	ld a, $1
+	ld [$cc42], a
+	ld hl, $c490
+	ld b, $4
+	ld c, $12
+	call Func_5ab3
+	ld hl, $c4b9
+	ld de, TradeCanceled
+	call PlaceString
+	call Func_226e
+	jp Func_5a18
+.asm_58d9
+	ld a, $2
+	ld [$cc42], a
+	call Func_226e
+	ld a, [$cc3d]
+	dec a
+	jr nz, .asm_58fd ; 0x58e5 $16
+	ld hl, $c490
+	ld b, $4
+	ld c, $12
+	call Func_5ab3
+	ld hl, $c4b9
+	ld de, TradeCanceled
+	call PlaceString
+	jp Func_5a18
+.asm_58fd
+	ld a, [$cd3d]
+	ld hl, $d273
+	call SkipFixedLengthTextEntries
+	ld de, $cd41
+	ld bc, $000b
+	call CopyData
+	ld hl, $d16b
+	ld a, [$cd3d]
+	ld bc, $002c
+	call AddNTimes
+	ld bc, $000c
+	add hl, bc
+	ld a, [hli]
+	ld [$cd4c], a
+	ld a, [hl]
+	ld [$cd4d], a
+	ld a, [$cd3e]
+	ld hl, $d9ac
+	call SkipFixedLengthTextEntries
+	ld de, $cd4e
+	ld bc, $000b
+	call CopyData
+	ld hl, $d8a4
+	ld a, [$cd3e]
+	ld bc, $002c
+	call AddNTimes
+	ld bc, $000c
+	add hl, bc
+	ld a, [hli]
+	ld [$cd59], a
+	ld a, [hl]
+	ld [$cd5a], a
+	ld a, [$cd3d]
+	ld [$cf92], a
+	ld hl, $d164
+	ld b, $0
+	ld c, a
+	add hl, bc
+	ld a, [hl]
+	ld [$cd3d], a
+	xor a
+	ld [$cf95], a
+	call RemovePokemon
+	ld a, [$cd3e]
+	ld c, a
+	ld [$cf92], a
+	ld hl, $d89d
+	ld d, $0
+	ld e, a
+	add hl, de
+	ld a, [hl]
+	ld [$cf91], a
+	ld hl, $d8a4
+	ld a, c
+	ld bc, $002c
+	call AddNTimes
+	ld de, $cf98
+	ld bc, $002c
+	call CopyData
+	call AddEnemyMonToPlayerParty
+	ld a, [$d163]
+	dec a
+	ld [$cf92], a
+	ld a, $1
+	ld [$ccd4], a
+	ld a, [$cd3e]
+	ld hl, $d89d
+	ld b, $0
+	ld c, a
+	add hl, bc
+	ld a, [hl]
+	ld [$cd3e], a
+	ld a, $a
+	ld [$cfc7], a
+	ld a, $2
+	ld [$c0f0], a
+	ld a, $e5
+	ld [$c0ee], a
+	call PlaySound
+	ld c, $64
+	call DelayFrames
+	call ClearScreen
+	call LoadHpBarAndStatusTilePatterns
+	xor a
+	ld [$cc5b], a
+	ld a, [$ff00+$aa]
+	cp $1
+	jr z, .asm_59d9 ; 0x59d0 $7
+	ld a, $38
+	call Predef
+	jr .asm_59de ; 0x59d7 $5
+.asm_59d9
+	ld a, $2f
+	call Predef
+.asm_59de
+	ld hl, $6d0e
+	ld b, $e
+	call Bankswitch
+	call ClearScreen
+	call Func_5ae6
+	call Func_226e
+	ld c, $28
+	call DelayFrames
+	ld hl, $c490
+	ld b, $4
+	ld c, $12
+	call Func_5ab3
+	ld hl, $c4b9
+	ld de, TradeCompleted
+	call PlaceString
+	ld a, $50
+	call Predef
+	ld c, $32
+	call DelayFrames
+	xor a
+	ld [$cc38], a
+	jp $5345
+
+Func_5a18:
+INCBIN "baserom.gbc",$5a18,$5a24 - $5a18
 
 SSAnne8AfterBattleText2: ; 5a24 (1:5a24)
 	TX_FAR _SSAnne8AfterBattleText2
 	db $50
 ; 0x5a24 + 5 bytes
 
+TradeCompleted:
 	db "Trade completed!@"
+
+TradeCanceled:
 	db "Too bad! The trade",$4E,"was canceled!@"
 
 Unknown_5a5b: ; 5a5b (1:5a5b)
-- 
cgit v1.3.1-sl0p


From 62c0264512162680d5a7e695bd551f5782b3ff01 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 11:31:34 -0400
Subject: Add Func_5a18

---
 main.asm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index e59439ce..350d02fa 100644
--- a/main.asm
+++ b/main.asm
@@ -13888,7 +13888,11 @@ Func_57f2:
 	jp $5345
 
 Func_5a18:
-INCBIN "baserom.gbc",$5a18,$5a24 - $5a18
+	ld c, $64
+	call DelayFrames
+	xor a
+	ld [$cc38], a
+	jp $551c
 
 SSAnne8AfterBattleText2: ; 5a24 (1:5a24)
 	TX_FAR _SSAnne8AfterBattleText2
-- 
cgit v1.3.1-sl0p


From 7c8a4cca6dfb18ad80a273db9fb2a04bf16627a9 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 11:44:26 -0400
Subject: Add PointerTable: and organize labels

---
 main.asm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 350d02fa..13680187 100644
--- a/main.asm
+++ b/main.asm
@@ -13308,13 +13308,13 @@ Func_5317: ; 5317 (1:5317)
 	ld c, $1f
 	ld a, $d9
 	call PlayMusic
-	jr .asm_551c
+	jr Func_551c
 
 .pleaseWait: ; 550f (1:550f)
 	db "PLEASE WAIT!@"
 
-.asm_551c
-	ld hl, Unknown_5a5b ; $5a5b
+Func_551c:
+	ld hl, PointerTable ; $5a5b
 	ld b, $0
 	ld a, [$cc38]
 	cp $ff
@@ -13326,7 +13326,8 @@ Func_5317: ; 5317 (1:5317)
 	ld h, [hl]
 	ld l, a
 	jp [hl]
-.asm_5530
+	
+Func_5530
 	call ClearScreen
 	call Func_5ae6
 	call Func_57f2
@@ -13547,12 +13548,12 @@ Func_5317: ; 5317 (1:5317)
 	call Func_226e
 	ld a, [$cc3d]
 	cp $f
-	jp z, .asm_551c
+	jp z, Func_551c
 	ld [$cd3e], a
 	call Func_57c7
 	ld a, $1
 	ld [$cc38], a
-	jp .asm_551c
+	jp Func_551c
 .statsTrade
 	db "STATS     TRADE@"
 .asm_572f
@@ -13696,6 +13697,8 @@ Func_57f2:
 	pop bc
 	inc c
 	jr .asm_5829 ; 0x5847 $e0
+
+Func_5849:
 	ld c, $64
 	call DelayFrames
 	xor a
@@ -13905,8 +13908,9 @@ TradeCompleted:
 TradeCanceled:
 	db "Too bad! The trade",$4E,"was canceled!@"
 
-Unknown_5a5b: ; 5a5b (1:5a5b)
-INCBIN "baserom.gbc",$5a5b,$5a5f - $5a5b
+PointerTable: ; 5a5b (1:5a5b)
+	dw Func_5530
+	dw Func_5849
 
 ; known jump sources: 3888 (0:3888)
 Func_5a5f: ; 5a5f (1:5a5f)
-- 
cgit v1.3.1-sl0p


From 9412cebafd95f2ef8f496fccd38047f272557374 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 12:10:03 -0400
Subject: Add Unknown_5ab0

---
 main.asm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 13680187..3120b5bf 100644
--- a/main.asm
+++ b/main.asm
@@ -13955,7 +13955,8 @@ Func_5a5f: ; 5a5f (1:5a5f)
 Func_5aaf: ; 5aaf (1:5aaf)
 	ret
 
-INCBIN "baserom.gbc",$5ab0,$5ab3 - $5ab0
+Unknown_5ab0:
+	call Load16BitRegisters
 
 ; known jump sources: 4c17 (1:4c17), 5332 (1:5332), 75b4 (1:75b4)
 Func_5ab3: ; 5ab3 (1:5ab3)
-- 
cgit v1.3.1-sl0p


From 9a070844cdf1c21838b79750f1e5abef3ac66538 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 12:21:29 -0400
Subject: Add main menu text strings

---
 main.asm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 3120b5bf..3e05aed3 100644
--- a/main.asm
+++ b/main.asm
@@ -14049,7 +14049,7 @@ MainMenu: ; 5af2 (1:5af2)
 	call TextBoxBorder
 	FuncCoord 2,2
 	ld hl,Coord
-	ld de,Unknown_5d7e ; $5d7e
+	ld de,ContinueText ; $5d7e
 	call PlaceString
 	jr .next2
 .next1
@@ -14060,7 +14060,7 @@ MainMenu: ; 5af2 (1:5af2)
 	call TextBoxBorder
 	FuncCoord 2,2
 	ld hl,Coord
-	ld de,Unknown_5d87 ; $5d87
+	ld de,NewGameText ; $5d87
 	call PlaceString
 .next2
 	ld hl,$D730
@@ -14161,7 +14161,7 @@ Func_5c0a: ; 5c0a (1:5c0a)
 	call UpdateSprites
 	FuncCoord 7, 7 ; $c433
 	ld hl, Coord
-	ld de, Unknown_5d97 ; $5d97
+	ld de, TradeCenterText ; $5d97
 	call PlaceString
 	xor a
 	ld [$cd37], a
@@ -14344,14 +14344,14 @@ Func_5d5f: ; 5d5f (1:5d5f)
 	ret nz
 	jp EnterMap
 
-Unknown_5d7e: ; 5d7e (1:5d7e)
-INCBIN "baserom.gbc",$5d7e,$5d87 - $5d7e
+ContinueText: ; 5d7e (1:5d7e)
+	db "CONTINUE",$4e
 
-Unknown_5d87: ; 5d87 (1:5d87)
-INCBIN "baserom.gbc",$5d87,$5d97 - $5d87
+NewGameText: ; 5d87 (1:5d87)
+	db "NEW GAME",$4e,"OPTION@"
 
-Unknown_5d97: ; 5d97 (1:5d97)
-INCBIN "baserom.gbc",$5d97,$5db5 - $5d97
+TradeCenterText: ; 5d97 (1:5d97)
+	db "TRADE CENTER",$4e,"COLOSSEUM",$4e,"CANCEL@"
 
 ; known jump sources: 5bb2 (1:5bb2)
 Func_5db5: ; 5db5 (1:5db5)
-- 
cgit v1.3.1-sl0p


From 2e0cecac8f03d709b7191676dc48145b8e953733 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 12:22:47 -0400
Subject: Add player info text strings

---
 main.asm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 3e05aed3..981ccab8 100644
--- a/main.asm
+++ b/main.asm
@@ -14364,7 +14364,7 @@ Func_5db5: ; 5db5 (1:5db5)
 	call TextBoxBorder
 	FuncCoord 5, 9 ; $c459
 	ld hl, Coord
-	ld de, Unknown_5e6a ; $5e6a
+	ld de, PlayerInfoText ; $5e6a
 	call PlaceString
 	FuncCoord 12, 9 ; $c460
 	ld hl, Coord
@@ -14419,8 +14419,11 @@ Func_5e55: ; 5e55 (1:5e55)
 	ld bc, $8102
 	jp PrintNumber
 
-Unknown_5e6a: ; 5e6a (1:5e6a)
-INCBIN "baserom.gbc",$5e6a,$5e8a - $5e6a
+PlayerInfoText: ; 5e6a (1:5e6a)
+	db "PLAYER",$4e
+	db "BADGES    ",$4e
+	db "#DEX    ",$4e
+	db "TIME@"
 
 DisplayOptionMenu: ; 5e8a (1:5e8a)
 	FuncCoord 0,0
-- 
cgit v1.3.1-sl0p


From 8f2e4958fe0f56471d6eae8d35904f767cf53748 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 12:35:30 -0400
Subject: Add nicknaming alphabet text strings

---
 main.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 981ccab8..c3d7587c 100644
--- a/main.asm
+++ b/main.asm
@@ -15523,9 +15523,9 @@ Func_676f: ; 676f (1:676f)
 	ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
 	ld a, [$ceeb]
 	and a
-	ld de, Unknown_679e ; $679e
+	ld de, LowerCaseAlphabet ; $679e
 	jr nz, .asm_677e
-	ld de, Unknown_67d6 ; $67d6
+	ld de, UpperCaseAlphabet ; $67d6
 .asm_677e
 	FuncCoord 2, 5 ; $c406
 	ld hl, Coord
@@ -15549,11 +15549,11 @@ Func_676f: ; 676f (1:676f)
 	ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
 	jp Delay3
 
-Unknown_679e: ; 679e (1:679e)
-INCBIN "baserom.gbc",$679e,$67d6 - $679e
+LowerCaseAlphabet: ; 679e (1:679e)
+	db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥UPPER CASE@"
 
-Unknown_67d6: ; 67d6 (1:67d6)
-INCBIN "baserom.gbc",$67d6,$680e - $67d6
+UpperCaseAlphabet: ; 67d6 (1:67d6)
+	db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/",$f2,",¥lower case@"
 
 ; known jump sources: 65f9 (1:65f9)
 Func_680e: ; 680e (1:680e)
-- 
cgit v1.3.1-sl0p


From b2ce2518c07ee2f83a5dbe7bdc9f9f0213cee2a3 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 12:42:33 -0400
Subject: Add nickname text strings

---
 main.asm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index c3d7587c..3cc833be 100644
--- a/main.asm
+++ b/main.asm
@@ -15650,10 +15650,10 @@ Func_68f8: ; 68f8 (1:68f8)
 	FuncCoord 0, 1 ; $c3b4
 	ld hl, Coord
 	ld a, [$d07d]
-	ld de, Unknown_693f ; $693f
+	ld de, YourTextString ; $693f
 	and a
 	jr z, .asm_6934
-	ld de, Unknown_6945 ; $6945
+	ld de, RivalsTextString ; $6945
 	dec a
 	jr z, .asm_6934
 	ld a, [$cf91]
@@ -15673,27 +15673,27 @@ Func_68f8: ; 68f8 (1:68f8)
 	ld [hl], $c9
 	FuncCoord 1, 3 ; $c3dd
 	ld hl, Coord
-	ld de, Unknown_6953 ; $6953
+	ld de, NicknameTextString ; $6953
 	jr .asm_693c
 .asm_6934
 	call PlaceString
 	ld l, c
 	ld h, b
-	ld de, Unknown_694d ; $694d
+	ld de, NameTextString ; $694d
 .asm_693c
 	jp PlaceString
 
-Unknown_693f: ; 693f (1:693f)
-INCBIN "baserom.gbc",$693f,$6945 - $693f
+YourTextString: ; 693f (1:693f)
+	db "YOUR @"
 
-Unknown_6945: ; 6945 (1:6945)
-INCBIN "baserom.gbc",$6945,$694d - $6945
+RivalsTextString: ; 6945 (1:6945)
+	db "RIVAL's @"
 
-Unknown_694d: ; 694d (1:694d)
-INCBIN "baserom.gbc",$694d,$6953 - $694d
+NameTextString: ; 694d (1:694d)
+	db "NAME?@"
 
-Unknown_6953: ; 6953 (1:6953)
-INCBIN "baserom.gbc",$6953,$695d - $6953
+NicknameTextString: ; 6953 (1:6953)
+	db "NICKNAME?@"
 
 ; known jump sources: 619e (1:619e)
 Func_695d: ; 695d (1:695d)
-- 
cgit v1.3.1-sl0p


From 696578ce4d77c07f14f9fc5f6af056699394a3c4 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 13:02:40 -0400
Subject: Add Win/Lose text and improve SaveScreenInfoText label

---
 main.asm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 3cc833be..b6ffff99 100644
--- a/main.asm
+++ b/main.asm
@@ -14364,7 +14364,7 @@ Func_5db5: ; 5db5 (1:5db5)
 	call TextBoxBorder
 	FuncCoord 5, 9 ; $c459
 	ld hl, Coord
-	ld de, PlayerInfoText ; $5e6a
+	ld de, SaveScreenInfoText ; $5e6a
 	call PlaceString
 	FuncCoord 12, 9 ; $c460
 	ld hl, Coord
@@ -14419,7 +14419,7 @@ Func_5e55: ; 5e55 (1:5e55)
 	ld bc, $8102
 	jp PrintNumber
 
-PlayerInfoText: ; 5e6a (1:5e6a)
+SaveScreenInfoText: ; 5e6a (1:5e6a)
 	db "PLAYER",$4e
 	db "BADGES    ",$4e
 	db "#DEX    ",$4e
@@ -31500,11 +31500,11 @@ Func_137aa: ; 137aa (4:77aa)
 	call Bankswitch ; indirect jump to Func_372d6 (372d6 (d:72d6))
 	ld a, [$cf0b]
 	cp $1
-	ld de, Unknown_13853 ; $7853
+	ld de, YouWinText ; $7853
 	jr c, .asm_137de
-	ld de, Unknown_1385b ; $785b
+	ld de, YouLoseText ; $785b
 	jr z, .asm_137de
-	ld de, Unknown_13864 ; $7864
+	ld de, DrawText ; $7864
 .asm_137de
 	FuncCoord 6, 8 ; $c446
 	ld hl, Coord
@@ -31564,14 +31564,14 @@ Func_137aa: ; 137aa (4:77aa)
 	ld [$d42f], a
 	ret
 
-Unknown_13853: ; 13853 (4:7853)
-INCBIN "baserom.gbc",$13853,$1385b - $13853
+YouWinText: ; 13853 (4:7853)
+	db "YOU WIN@"
 
-Unknown_1385b: ; 1385b (4:785b)
-INCBIN "baserom.gbc",$1385b,$13864 - $1385b
+YouLoseText: ; 1385b (4:785b)
+	db "YOU LOSE@"
 
-Unknown_13864: ; 13864 (4:7864)
-INCBIN "baserom.gbc",$13864,$1386b - $13864
+DrawText: ; 13864 (4:7864)
+	db "  DRAW@"
 
 UnnamedText_1386b: ; 1386b (4:786b)
 	TX_FAR _UnnamedText_1386b
-- 
cgit v1.3.1-sl0p


From f298df2447f143fd623860039f4218276439eaba Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 13:19:25 -0400
Subject: Add Bill's mon list text

---
 main.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index b6ffff99..269d8b8f 100644
--- a/main.asm
+++ b/main.asm
@@ -42208,7 +42208,7 @@ UnnamedText_1ec7f: ; 1ec7f (7:6c7f)
 	db $50
 ; 0x1ec7f + 5 bytes
 
-INCBIN "baserom.gbc",$1ec84,$1ecaa - $1ec84
+	db "EEVEE",$4e,"FLAREON",$4e,"JOLTEON",$4e,"VAPOREON",$4e,"CANCEL@"
 
 UnnamedText_1ecaa: ; 1ecaa (7:6caa)
 	TX_FAR _UnnamedText_1ecaa
-- 
cgit v1.3.1-sl0p


From 55cd82e53f53629da4767a6a5763bc66189fa669 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 13:26:12 -0400
Subject: Add Unknown_1ecaf

---
 main.asm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 269d8b8f..2c2b4702 100644
--- a/main.asm
+++ b/main.asm
@@ -42215,7 +42215,13 @@ UnnamedText_1ecaa: ; 1ecaa (7:6caa)
 	db $50
 ; 0x1ecaa + 5 bytes
 
-INCBIN "baserom.gbc",$1ecaf,$1ecbd - $1ecaf
+Unknown_1ecaf
+	ld a, [$c109]
+	cp $4
+	ret nz
+	call EnableAutoTextBoxDrawing
+	ld a, $8
+	jp Func_3ef5
 
 UnnamedText_1ecbd: ; 1ecbd (7:6cbd)
 	TX_FAR _UnnamedText_1ecbd
-- 
cgit v1.3.1-sl0p


From 69a8e4d80fd3d1f3b80f0971976e3967093db17b Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 13:41:21 -0400
Subject: Add PC text strings

---
 main.asm | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 2c2b4702..21acd023 100644
--- a/main.asm
+++ b/main.asm
@@ -42337,12 +42337,12 @@ Func_213c8: ; 213c8 (8:53c8)
 	jr nz, .asm_21414
 	FuncCoord 2, 2 ; $c3ca
 	ld hl, Coord
-	ld de, Unknown_2148b ; $548b
+	ld de, SomeonesPCText ; $548b
 	jr .asm_2141a
 .asm_21414
 	FuncCoord 2, 2 ; $c3ca
 	ld hl, Coord
-	ld de, Unknown_21497 ; $5497
+	ld de, BillsPCText ; $5497
 .asm_2141a
 	call PlaceString
 	FuncCoord 2, 4 ; $c3f2
@@ -42351,14 +42351,14 @@ Func_213c8: ; 213c8 (8:53c8)
 	call PlaceString
 	ld l, c
 	ld h, b
-	ld de, Unknown_214a0 ; $54a0
+	ld de, PlayersPCText ; $54a0
 	call PlaceString
 	ld a, [$d74b]
 	bit 5, a
 	jr z, .asm_21462
 	FuncCoord 2, 6 ; $c41a
 	ld hl, Coord
-	ld de, Unknown_214a5 ; $54a5
+	ld de, OaksPCText ; $54a5
 	call PlaceString
 	ld a, [$d5a2]
 	and a
@@ -42367,23 +42367,23 @@ Func_213c8: ; 213c8 (8:53c8)
 	ld [W_MAXMENUITEMID], a ; $cc28
 	FuncCoord 2, 8 ; $c442
 	ld hl, Coord
-	ld de, Unknown_214b2 ; $54b2
+	ld de, PKMNLeaguePCText ; $54b2
 	call PlaceString
 	FuncCoord 2, 10 ; $c46a
 	ld hl, Coord
-	ld de, Unknown_214ba ; $54ba
+	ld de, LogOffPCText ; $54ba
 	jr .asm_2146d
 .asm_2145a
 	FuncCoord 2, 8 ; $c442
 	ld hl, Coord
-	ld de, Unknown_214ba ; $54ba
+	ld de, LogOffPCText ; $54ba
 	jr .asm_2146d
 .asm_21462
 	ld a, $2
 	ld [W_MAXMENUITEMID], a ; $cc28
 	FuncCoord 2, 6 ; $c41a
 	ld hl, Coord
-	ld de, Unknown_214ba ; $54ba
+	ld de, LogOffPCText ; $54ba
 .asm_2146d
 	call PlaceString
 	ld a, $3
@@ -42399,23 +42399,23 @@ Func_213c8: ; 213c8 (8:53c8)
 	ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
 	ret
 
-Unknown_2148b: ; 2148b (8:548b)
-INCBIN "baserom.gbc",$2148b,$21497 - $2148b
+SomeonesPCText: ; 2148b (8:548b)
+	db "SOMEONE's PC@"
 
-Unknown_21497: ; 21497 (8:5497)
-INCBIN "baserom.gbc",$21497,$214a0 - $21497
+BillsPCText: ; 21497 (8:5497)
+	db "BILL's PC@"
 
-Unknown_214a0: ; 214a0 (8:54a0)
-INCBIN "baserom.gbc",$214a0,$214a5 - $214a0
+PlayersPCText: ; 214a0 (8:54a0)
+	db "'s PC@"
 
-Unknown_214a5: ; 214a5 (8:54a5)
-INCBIN "baserom.gbc",$214a5,$214b2 - $214a5
+OaksPCText: ; 214a5 (8:54a5)
+	db "PROF.OAK's PC@"
 
-Unknown_214b2: ; 214b2 (8:54b2)
-INCBIN "baserom.gbc",$214b2,$214ba - $214b2
+PKMNLeaguePCText: ; 214b2 (8:54b2)
+	db $4a,"LEAGUE@"
 
-Unknown_214ba: ; 214ba (8:54ba)
-INCBIN "baserom.gbc",$214ba,$214c2 - $214ba
+LogOffPCText: ; 214ba (8:54ba)
+	db "LOG OFF@"
 
 ; known jump sources: 17f03 (5:7f03)
 Func_214c2: ; 214c2 (8:54c2)
-- 
cgit v1.3.1-sl0p


From c176c8e66b215dd204fde136a7290bb36e26e88f Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 13:49:41 -0400
Subject: Add Bill's PC menu text

---
 main.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 21acd023..878fef34 100644
--- a/main.asm
+++ b/main.asm
@@ -42451,7 +42451,7 @@ Func_214e8: ; 214e8 (8:54e8)
 	call TextBoxBorder
 	FuncCoord 2, 2 ; $c3ca
 	ld hl, Coord
-	ld de, Unknown_216e1 ; $56e1
+	ld de, BillsPCMenuText ; $56e1
 	call PlaceString
 	ld hl, W_TOPMENUITEMY ; $cc24
 	ld a, $2
@@ -42675,8 +42675,8 @@ Func_216be: ; 216be (8:56be)
 	ld [$cc2b], a
 	ret
 
-Unknown_216e1: ; 216e1 (8:56e1)
-INCBIN "baserom.gbc",$216e1,$21713 - $216e1
+BillsPCMenuText: ; 216e1 (8:56e1)
+	db "WITHDRAW ",$4a,$4e,"DEPOSIT ",$4a,$4e,"RELEASE ",$4a,$4e,"CHANGE BOX",$4e,"SEE YA!@"
 
 Unknown_21713: ; 21713 (8:5713)
 INCBIN "baserom.gbc",$21713,$2171b - $21713
-- 
cgit v1.3.1-sl0p


From 5e6f840bbda444c2ef79b1eb6ac56b425740f2c2 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 13:51:41 -0400
Subject: Add Box No. PC text

---
 main.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 878fef34..d295d88c 100644
--- a/main.asm
+++ b/main.asm
@@ -42495,7 +42495,7 @@ Func_214e8: ; 214e8 (8:54e8)
 	ld [Coord], a
 	FuncCoord 10, 16 ; $c4ea
 	ld hl, Coord
-	ld de, Unknown_21713 ; $5713
+	ld de, BoxNoPCText ; $5713
 	call PlaceString
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
@@ -42678,8 +42678,8 @@ Func_216be: ; 216be (8:56be)
 BillsPCMenuText: ; 216e1 (8:56e1)
 	db "WITHDRAW ",$4a,$4e,"DEPOSIT ",$4a,$4e,"RELEASE ",$4a,$4e,"CHANGE BOX",$4e,"SEE YA!@"
 
-Unknown_21713: ; 21713 (8:5713)
-INCBIN "baserom.gbc",$21713,$2171b - $21713
+BoxNoPCText: ; 21713 (8:5713)
+	db "BOX No.@"
 
 Func_2171b: ; 2171b (8:571b)
 	ld hl, $d173
-- 
cgit v1.3.1-sl0p


From 1aa40c567e43e8a79f34e20d99234e2085087018 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 13:56:35 -0400
Subject: Add Deposit/Withdraw PC text

---
 main.asm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index d295d88c..d5f1bfb0 100644
--- a/main.asm
+++ b/main.asm
@@ -42719,16 +42719,16 @@ Func_2174b: ; 2174b (8:574b)
 	call TextBoxBorder
 	ld a, [$ccd3]
 	and a
-	ld de, Unknown_217cb ; $57cb
+	ld de, DepositPCText ; $57cb
 	jr nz, .asm_21761
-	ld de, Unknown_217d3 ; $57d3
+	ld de, WithdrawPCText ; $57d3
 .asm_21761
 	FuncCoord 11, 12 ; $c49b
 	ld hl, Coord
 	call PlaceString
 	FuncCoord 11, 14 ; $c4c3
 	ld hl, Coord
-	ld de, Unknown_217dc ; $57dc
+	ld de, StatsCancelPCText ; $57dc
 	call PlaceString
 	ld hl, W_TOPMENUITEMY ; $cc24
 	ld a, $c
@@ -42783,14 +42783,14 @@ Func_2174b: ; 2174b (8:574b)
 	call LoadGBPal
 	jr .asm_2178f
 
-Unknown_217cb: ; 217cb (8:57cb)
-INCBIN "baserom.gbc",$217cb,$217d3 - $217cb
+DepositPCText: ; 217cb (8:57cb)
+	db "DEPOSIT@"
 
-Unknown_217d3: ; 217d3 (8:57d3)
-INCBIN "baserom.gbc",$217d3,$217dc - $217d3
+WithdrawPCText: ; 217d3 (8:57d3)
+	db "WITHDRAW@"
 
-Unknown_217dc: ; 217dc (8:57dc)
-INCBIN "baserom.gbc",$217dc,$217e9 - $217dc
+StatsCancelPCText: ; 217dc (8:57dc)
+	db "STATS",$4e,"CANCEL@"
 
 UnnamedText_217e9: ; 217e9 (8:57e9)
 	TX_FAR _UnnamedText_217e9
-- 
cgit v1.3.1-sl0p


From 8c5a007911d9ade56beb48133e105a53b1066917 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 14:41:23 -0400
Subject: Add slot machine reward values

---
 main.asm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index d5f1bfb0..54265045 100644
--- a/main.asm
+++ b/main.asm
@@ -45933,7 +45933,10 @@ UnnamedText_37673: ; 37673 (d:7673)
 	db $50
 ; 0x37673 + 5 bytes
 
-INCBIN "baserom.gbc",$37678,$3769d - $37678
+INCBIN "baserom.gbc",$37678,$37690 - $37678
+
+SlotRewardValues:
+	db "300@100@8@15@"
 
 UnnamedText_3769d: ; 3769d (d:769d)
 	TX_FAR _UnnamedText_3769d
-- 
cgit v1.3.1-sl0p


From d183f6047e8adebbc2b7e442e21704cbd8864e9a Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 14:47:13 -0400
Subject: Add disabled and type text

---
 main.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 54265045..1cd80a01 100644
--- a/main.asm
+++ b/main.asm
@@ -60376,7 +60376,7 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
 	jr nz, .asm_3d4df
 	FuncCoord 1, 10 ; $c469
 	ld hl, Coord
-	ld de, Unknown_3d555 ; $5555
+	ld de, DisabledText ; $5555
 	call PlaceString
 	jr .asm_3d54e
 .asm_3d4df
@@ -60409,7 +60409,7 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
 	ld [$cd6d], a
 	FuncCoord 1, 9 ; $c455
 	ld hl, Coord
-	ld de, Unknown_3d55f ; $555f
+	ld de, TypeText ; $555f
 	call PlaceString
 	FuncCoord 7, 11 ; $c483
 	ld hl, Coord
@@ -60437,11 +60437,11 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
 	ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
 	jp Delay3
 
-Unknown_3d555: ; 3d555 (f:5555)
-INCBIN "baserom.gbc",$3d555,$3d55f - $3d555
+DisabledText: ; 3d555 (f:5555)
+	db "disabled!@"
 
-Unknown_3d55f: ; 3d55f (f:555f)
-INCBIN "baserom.gbc",$3d55f,$3d564 - $3d55f
+TypeText: ; 3d55f (f:555f)
+	db "TYPE@"
 
 SelectEnemyMove: ; 3d564 (f:5564)
 	ld a, [W_ISLINKBATTLE]
-- 
cgit v1.3.1-sl0p


From fad58816a8d46fd06d708f27da49e5cc58f65686 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 14:53:41 -0400
Subject: Add stats text strings

---
 main.asm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 1cd80a01..84e9d65b 100644
--- a/main.asm
+++ b/main.asm
@@ -65311,7 +65311,7 @@ UnnamedText_3f683: ; 3f683 (f:7683)
 
 ; known jump sources: 3f4cc (f:74cc), 3f62f (f:762f)
 Func_3f688: ; 3f688 (f:7688)
-	ld hl, Unknown_3f69f ; $769f
+	ld hl, StatsTextStrings ; $769f
 	ld c, $50
 .asm_3f68d
 	dec b
@@ -65326,8 +65326,13 @@ Func_3f688: ; 3f688 (f:7688)
 	ld bc, $a
 	jp CopyData
 
-Unknown_3f69f: ; 3f69f (f:769f)
-INCBIN "baserom.gbc",$3f69f,$3f6cb - $3f69f
+StatsTextStrings: ; 3f69f (f:769f)
+	db "ATTACK@"
+	db "DEFENSE@"
+	db "SPEED@"
+	db "SPECIAL@"
+	db "ACCURACY@"
+	db "EVADE@"
 
 Unknown_3f6cb: ; 3f6cb (f:76cb)
 INCBIN "baserom.gbc",$3f6cb,$3f717 - $3f6cb
-- 
cgit v1.3.1-sl0p


From a38d122f8732bddf8a6550df467bfdd8f1cd6b0a Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 15:46:07 -0400
Subject: Fix typo: Unknown4445D -> Unknown_4045D

---
 main.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 84e9d65b..9389380b 100644
--- a/main.asm
+++ b/main.asm
@@ -66564,7 +66564,7 @@ HeightWeightText: ; 40448 (10:4448)
 	db "HT  ?",$60,"??",$61,$4E,"WT   ???lb@"
 
 ; XXX does anything point to this?
-Unknown4445D: ; 4045d (10:445d)
+Unknown_4045D: ; 4045d (10:445d)
 	db $54,$50
 
 ; horizontal line that divides the pokedex text description from the rest of the data
-- 
cgit v1.3.1-sl0p


From 0d354b9de6d27a3efb54c7cff21c56ca7dccb9f0 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 16:04:56 -0400
Subject: Add Celadon Gym city and leader text

---
 main.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 9389380b..0f021f5c 100644
--- a/main.asm
+++ b/main.asm
@@ -74701,15 +74701,15 @@ CeladonGymScript: ; 4890a (12:490a)
 ; 0x48927
 
 CeladonGymScript_Unknown48927: ; 48927 (12:4927)
-	ld hl, Unknown_48930 ; $4930
-	ld de, Unknown_4893d ; $493d
+	ld hl, CeladonGymCity ; $4930
+	ld de, CeladonGymLeader ; $493d
 	jp LoadGymLeaderAndCityName
 
-Unknown_48930: ; 48930 (12:4930)
-INCBIN "baserom.gbc",$48930,$4893d - $48930
+CeladonGymCity: ; 48930 (12:4930)
+	db "CELADON CITY@"
 
-Unknown_4893d: ; 4893d (12:493d)
-INCBIN "baserom.gbc",$4893d,$48943 - $4893d
+CeladonGymLeader: ; 4893d (12:493d)
+	db "ERIKA@"
 
 ; known jump sources: 4895b (12:495b), 489a3 (12:49a3)
 Func_48943: ; 48943 (12:4943)
-- 
cgit v1.3.1-sl0p


From 45c1c12750b2660a2be885e1e82b9880dfdbaa97 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 16:10:41 -0400
Subject: Add Game Corner coin-purchasing text strings

---
 main.asm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 0f021f5c..81be937f 100644
--- a/main.asm
+++ b/main.asm
@@ -75523,11 +75523,11 @@ Func_48f1e: ; 48f1e (12:4f1e)
 	call ClearScreenArea
 	FuncCoord 12, 2 ; $c3d4
 	ld hl, Coord
-	ld de, Unknown_48f7a ; $4f7a
+	ld de, GameCornerMoneyText ; $4f7a
 	call PlaceString
 	FuncCoord 12, 3 ; $c3e8
 	ld hl, Coord
-	ld de, Unknown_48f85 ; $4f85
+	ld de, GameCornerBlankText1 ; $4f85
 	call PlaceString
 	FuncCoord 12, 3 ; $c3e8
 	ld hl, Coord
@@ -75536,11 +75536,11 @@ Func_48f1e: ; 48f1e (12:4f1e)
 	call PrintBCDNumber
 	FuncCoord 12, 4 ; $c3fc
 	ld hl, Coord
-	ld de, Unknown_48f80 ; $4f80
+	ld de, GameCornerCoinText ; $4f80
 	call PlaceString
 	FuncCoord 12, 5 ; $c410
 	ld hl, Coord
-	ld de, Unknown_48f8d ; $4f8d
+	ld de, GameCornerBlankText2 ; $4f8d
 	call PlaceString
 	FuncCoord 15, 5 ; $c413
 	ld hl, Coord
@@ -75552,17 +75552,17 @@ Func_48f1e: ; 48f1e (12:4f1e)
 	ret
 ; 0x48f7a
 
-Unknown_48f7a: ; 48f7a (12:4f7a)
-INCBIN "baserom.gbc",$48f7a,$48f80 - $48f7a
+GameCornerMoneyText: ; 48f7a (12:4f7a)
+	db "MONEY@"
 
-Unknown_48f80: ; 48f80 (12:4f80)
-INCBIN "baserom.gbc",$48f80,$48f85 - $48f80
+GameCornerCoinText: ; 48f80 (12:4f80)
+	db "COIN@"
 
-Unknown_48f85: ; 48f85 (12:4f85)
-INCBIN "baserom.gbc",$48f85,$48f8d - $48f85
+GameCornerBlankText1: ; 48f85 (12:4f85)
+	db "       @"
 
-Unknown_48f8d: ; 48f8d (12:4f8d)
-INCBIN "baserom.gbc",$48f8d,$48f95 - $48f8d
+GameCornerBlankText2: ; 48f8d (12:4f8d)
+	db "       @"
 
 Has9990Coins: ; 48f95 (12:4f95)
 	ld a, $99
-- 
cgit v1.3.1-sl0p


From 05bfc906e7084b734d2af68d14f05bbd8a53ff17 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 16:32:37 -0400
Subject: Add badge text string list

---
 main.asm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 81be937f..8902cbe3 100644
--- a/main.asm
+++ b/main.asm
@@ -79609,7 +79609,16 @@ Func_5125d: ; 5125d (14:525d)
 	ret
 
 Unknown_51276: ; 51276 (14:5276)
-INCBIN "baserom.gbc",$51276,$512d8 - $51276
+INCBIN "baserom.gbc",$51276,$51284 - $51276
+
+BadgeList: ; 51284 (14:5284)
+	db "EARTHBADGE@"
+	db "VOLCANOBADGE@"
+	db "MARSHBADGE@"
+	db "SOULBADGE@"
+	db "RAINBOWBADGE@"
+	db "THUNDERBADGE@"
+	db "CASCADEBADGE@"
 
 ; known jump sources: 51365 (14:5365)
 Func_512d8: ; 512d8 (14:52d8)
-- 
cgit v1.3.1-sl0p


From 797b00d0614d5192a720c28e054fb25551d7ac55 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 16:51:58 -0400
Subject: Add diploma text strings and coords

---
 main.asm | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 8902cbe3..763ee3fd 100644
--- a/main.asm
+++ b/main.asm
@@ -86491,7 +86491,7 @@ DisplayDiploma: ; 566e2 (15:66e2)
 	ld bc, $1012
 	ld a, $27
 	call Predef
-	ld hl, Unknown_56784 ; $6784
+	ld hl, DiplomaTextPointersAndCoords ; $6784
 	ld c, $5
 .asm_56715
 	push bc
@@ -86557,8 +86557,32 @@ Func_56777: ; 56777 (15:6777)
 	dec c
 	jr .asm_5677d ; 0x56782 $f9
 
-Unknown_56784: ; 56784 (15:6784)
-INCBIN "baserom.gbc",$56784,$567f9 - $56784
+DiplomaTextPointersAndCoords: ; 56784 (15:6784)
+	dw DiplomaText
+	dw $c3cd
+	dw DiplomaPlayer
+	dw $c3f3
+	dw DiplomaEmptyText
+	dw $c3ff
+	dw DiplomaCongrats
+	dw $c41a
+	dw DiplomaGameFreak
+	dw $c4e9
+
+DiplomaText:
+	db $70,"Diploma",$70,"@"
+	
+DiplomaPlayer:
+	db "Player@"
+	
+DiplomaEmptyText:
+	db "@"
+	
+DiplomaCongrats:
+	db "Congrats! This",$4e,"diploma certifies",$4e,"that you have",$4e,"completed your",$4e,"#DEX.@"
+	
+DiplomaGameFreak:
+	db "GAME FREAK@"
 
 ; known jump sources: 3303 (0:3303)
 Func_567f9: ; 567f9 (15:67f9)
-- 
cgit v1.3.1-sl0p


From 04fd3dbc57c3aecbe2bdaa5f84428e0f36d0a430 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 16:56:09 -0400
Subject: Add Pewter Gym city and leader text

---
 main.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 763ee3fd..c6e042ca 100644
--- a/main.asm
+++ b/main.asm
@@ -91612,15 +91612,15 @@ PewterGymScript: ; 5c387 (17:4387)
 ; 0x5c3a4
 
 PewterGymScript_Unknown5c3a4: ; 5c3a4 (17:43a4)
-	ld hl, Unknown_5c3ad ; $43ad
-	ld de, Unknown_5c3b9 ; $43b9
+	ld hl, PewterGymCity ; $43ad
+	ld de, PewterGymLeader ; $43b9
 	jp LoadGymLeaderAndCityName
 
-Unknown_5c3ad: ; 5c3ad (17:43ad)
-INCBIN "baserom.gbc",$5c3ad,$5c3b9 - $5c3ad
+PewterGymCity: ; 5c3ad (17:43ad)
+	db "PEWTER CITY@"
 
-Unknown_5c3b9: ; 5c3b9 (17:43b9)
-INCBIN "baserom.gbc",$5c3b9,$5c3bf - $5c3b9
+PewterGymLeader: ; 5c3b9 (17:43b9)
+	db "BROCK@"
 
 ; known jump sources: 5c3d7 (17:43d7), 5c432 (17:4432)
 Func_5c3bf: ; 5c3bf (17:43bf)
-- 
cgit v1.3.1-sl0p


From 9e5059ea56027939e1510958fa2d1a3db96bcfd5 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 16:58:47 -0400
Subject: Add Cerulean Gym city and leader text

---
 main.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index c6e042ca..b4f78f3c 100644
--- a/main.asm
+++ b/main.asm
@@ -92036,15 +92036,15 @@ CeruleanGymScript: ; 5c6b3 (17:46b3)
 ; 0x5c6d0
 
 CeruleanGymScript_Unknown5c6d0: ; 5c6d0 (17:46d0)
-	ld hl, Unknown_5c6d9 ; $46d9
-	ld de, Unknown_5c6e7 ; $46e7
+	ld hl, CeruleanGymCity ; $46d9
+	ld de, CeruleanGymLeader ; $46e7
 	jp LoadGymLeaderAndCityName
 
-Unknown_5c6d9: ; 5c6d9 (17:46d9)
-INCBIN "baserom.gbc",$5c6d9,$5c6e7 - $5c6d9
+CeruleanGymCity: ; 5c6d9 (17:46d9)
+	db "CERULEAN CITY@"
 
-Unknown_5c6e7: ; 5c6e7 (17:46e7)
-INCBIN "baserom.gbc",$5c6e7,$5c6ed - $5c6e7
+CeruleanGymLeader: ; 5c6e7 (17:46e7)
+	db "MISTY@"
 
 ; known jump sources: 5c705 (17:4705), 5c747 (17:4747)
 Func_5c6ed: ; 5c6ed (17:46ed)
-- 
cgit v1.3.1-sl0p


From 28514b5ebefa555e478c51c37b00bb4aed667e42 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 17:01:15 -0400
Subject: Add Vermilion Gym city and leader text

---
 main.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index b4f78f3c..1a4624da 100644
--- a/main.asm
+++ b/main.asm
@@ -92542,15 +92542,15 @@ VermilionGymScript: ; 5ca26 (17:4a26)
 ; 0x5ca4c
 
 VermilionGymScript_Unknown5ca4c: ; 5ca4c (17:4a4c)
-	ld hl, Unknown_5ca55 ; $4a55
-	ld de, Unknown_5ca64 ; $4a64
+	ld hl, VermilionGymCity ; $4a55
+	ld de, VermilionGymLeader ; $4a64
 	jp LoadGymLeaderAndCityName
 
-Unknown_5ca55: ; 5ca55 (17:4a55)
-INCBIN "baserom.gbc",$5ca55,$5ca64 - $5ca55
+VermilionGymCity: ; 5ca55 (17:4a55)
+	db "VERMILION CITY@"
 
-Unknown_5ca64: ; 5ca64 (17:4a64)
-INCBIN "baserom.gbc",$5ca64,$5ca6d - $5ca64
+VermilionGymLeader: ; 5ca64 (17:4a64)
+	db "LT.SURGE@"
 
 ; known jump sources: 5ca36 (17:4a36)
 Func_5ca6d: ; 5ca6d (17:4a6d)
-- 
cgit v1.3.1-sl0p


From 8e263e84bf0a4a14a778b836cf3cb9f793c705e5 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 17:04:45 -0400
Subject: Add Saffron Gym city and leader text

---
 main.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 1a4624da..0f0f8c87 100644
--- a/main.asm
+++ b/main.asm
@@ -93301,15 +93301,15 @@ SaffronGymScript: ; 5d00d (17:500d)
 	ret
 ; 0x5d02a
 .extra
-	ld hl, Unknown_5d033 ; $5033
-	ld de, Unknown_5d040 ; $5040
+	ld hl, SaffronGymCity ; $5033
+	ld de, SaffronGymLeader ; $5040
 	jp LoadGymLeaderAndCityName
 
-Unknown_5d033: ; 5d033 (17:5033)
-INCBIN "baserom.gbc",$5d033,$5d040 - $5d033
+SaffronGymCity: ; 5d033 (17:5033)
+	db "SAFFRON CITY@"
 
-Unknown_5d040: ; 5d040 (17:5040)
-INCBIN "baserom.gbc",$5d040,$5d048 - $5d040
+SaffronGymLeader: ; 5d040 (17:5040)
+	db "SABRINA@"
 
 ; known jump sources: 5d060 (17:5060), 5d0a8 (17:50a8)
 Func_5d048: ; 5d048 (17:5048)
-- 
cgit v1.3.1-sl0p


From 470bebe68bdbc064d38b9ea3519aa093ebd49405 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 17:24:54 -0400
Subject: Add HowToLink text strings and pointer table

---
 main.asm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 70 insertions(+), 4 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 0f0f8c87..421f6688 100644
--- a/main.asm
+++ b/main.asm
@@ -13314,7 +13314,7 @@ Func_5317: ; 5317 (1:5317)
 	db "PLEASE WAIT!@"
 
 Func_551c:
-	ld hl, PointerTable ; $5a5b
+	ld hl, PointerTable5a5b ; $5a5b
 	ld b, $0
 	ld a, [$cc38]
 	cp $ff
@@ -13908,7 +13908,7 @@ TradeCompleted:
 TradeCanceled:
 	db "Too bad! The trade",$4E,"was canceled!@"
 
-PointerTable: ; 5a5b (1:5a5b)
+PointerTable5a5b: ; 5a5b (1:5a5b)
 	dw Func_5530
 	dw Func_5849
 
@@ -94746,7 +94746,67 @@ Func_5dbd9: ; 5dbd9 (17:5bd9)
 	ld [$FF00+$b0], a
 	ret
 
-INCBIN "baserom.gbc",$5dc1a,$5dc9e - $5dc1a
+Unknown_5dc1a: ; 5dc1a (17:5c1a)
+	call EnableAutoTextBoxDrawing
+	ld a, $1
+	ld [$cc3c], a
+	ld a, [$cd3d]
+	call Func_3ef5
+	ret
+
+INCBIN "baserom.gbc",$5dc29,$5dc2a - $5dc29
+
+Unknown_5dc2a: ; 5dc2a (17:5c2a)
+	call SaveScreenTilesToBuffer1
+	ld hl, UnnamedText_5dc9e
+	call PrintText
+	xor a
+	ld [$d07c], a
+	ld [$cc26], a
+	ld [$cc2a], a
+	ld a, $3
+	ld [$cc29], a
+	ld a, $3
+	ld [$cc28], a
+	ld a, $2
+	ld [$cc24], a
+	ld a, $1
+	ld [$cc25], a
+.asm_5c51
+	ld hl, $d730
+	set 6, [hl]
+	ld hl, $c3a0
+	ld b, $8
+	ld c, $d
+	call TextBoxBorder
+	ld hl, $c3ca
+	ld de, HowToLinkText
+	call PlaceString
+	ld hl, UnnamedText_5dca3
+	call PrintText
+	call HandleMenuInput
+	bit 1, a
+	jr nz, .asm_5dc93 ; 0x5dc74 $1d
+	ld a, [$cc26]
+	cp $3
+	jr z, .asm_5dc93 ; 0x5dc7b $16
+	ld hl, $d730
+	res 6, [hl]
+	ld hl, PointerTable5cd8
+	add a
+	ld d, $0
+	ld e, a
+	add hl, de
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	call PrintText
+	jp .asm_5c51
+.asm_5dc93
+	ld hl, $d730
+	res 6, [hl]
+	call LoadScreenTilesFromBuffer1
+	jp TextScriptEnd
 
 UnnamedText_5dc9e: ; 5dc9e (17:5c9e)
 	TX_FAR _UnnamedText_5dc9e
@@ -94758,7 +94818,13 @@ UnnamedText_5dca3: ; 5dca3 (17:5ca3)
 	db $50
 ; 0x5dca3 + 5 bytes
 
-INCBIN "baserom.gbc",$5dca8,$5dcde - $5dca8
+HowToLinkText: ; 5dca8 (17:5ca8)
+	db "HOW TO LINK",$4e,"COLOSSEUM",$4e,"TRADE CENTER",$4e,"STOP READING@"
+
+PointerTable5cd8: ; 5dcd8 (17:5cd8)
+	dw UnnamedText_5dcde
+	dw UnnamedText_5dce3
+	dw UnnamedText_5dce8
 
 UnnamedText_5dcde: ; 5dcde (17:5cde)
 	TX_FAR _UnnamedText_5dcde
-- 
cgit v1.3.1-sl0p


From 79c56d49dbaf4cea4a64e0fc722f14b8eb3e6a2f Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 17:32:43 -0400
Subject: Add status ailment text and PointerTable5dcc

---
 main.asm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 421f6688..c6d29517 100644
--- a/main.asm
+++ b/main.asm
@@ -94853,7 +94853,20 @@ UnnamedText_5dda7: ; 5dda7 (17:5da7)
 	db $50
 ; 0x5dda7 + 5 bytes
 
-INCBIN "baserom.gbc",$5ddac,$5ddd6 - $5ddac
+StatusAilmentText:
+	db " SLP",$4e
+	db " PSN",$4e
+	db " PAR@"
+	db " BRN",$4e
+	db " FRZ",$4e
+	db " QUIT@@"
+	
+PointerTable5dcc: ; 5ddcc (17:5ddc)
+	dw UnnamedText_5ddd6
+	dw UnnamedText_5dddb
+	dw UnnamedText_5dde0
+	dw UnnamedText_5dde5
+	dw UnnamedText_5ddea
 
 UnnamedText_5ddd6: ; 5ddd6 (17:5dd6)
 	TX_FAR _UnnamedText_5ddd6
-- 
cgit v1.3.1-sl0p


From aa15dd8fd4fe531c4a5a87d089125d1af5ac56e0 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 17:36:09 -0400
Subject: Add Unknown_5ddef

---
 main.asm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index c6d29517..17fb97aa 100644
--- a/main.asm
+++ b/main.asm
@@ -94893,7 +94893,10 @@ UnnamedText_5ddea: ; 5ddea (17:5dea)
 	db $50
 ; 0x5ddea + 5 bytes
 
-INCBIN "baserom.gbc",$5ddef,$5ddf7 - $5ddef
+Unknown_5ddef: ; 5ddef (17:5def)
+	call EnableAutoTextBoxDrawing
+	ld a, $26
+	jp Func_3ef5
 
 UnnamedText_5ddf7: ; 5ddf7 (17:5df7)
 	TX_FAR _UnnamedText_5ddf7
-- 
cgit v1.3.1-sl0p


From 4a29caf063ba03e0aaa3bfd05cb5b9a11cd8dc87 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 17:41:16 -0400
Subject: Add Hall of Fame text string

---
 main.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 17fb97aa..b1cfb1ae 100644
--- a/main.asm
+++ b/main.asm
@@ -99220,7 +99220,7 @@ Func_701a0: ; 701a0 (1c:41a0)
 	call TextBoxBorder
 	FuncCoord 4, 15 ; $c4d0
 	ld hl, Coord
-	ld de, Unknown_7026b ; $426b
+	ld de, HallOfFameText ; $426b
 	call PlaceString
 	ld c, $b4
 	call DelayFrames
@@ -99249,8 +99249,8 @@ Func_701a0: ; 701a0 (1c:41a0)
 	res 3, [hl]
 	ret
 
-Unknown_7026b: ; 7026b (1c:426b)
-INCBIN "baserom.gbc",$7026b,$70278 - $7026b
+HallOfFameText: ; 7026b (1c:426b)
+	db "HALL OF FAME@"
 
 ; known jump sources: 70217 (1c:4217), 70259 (1c:4259)
 Func_70278: ; 70278 (1c:4278)
-- 
cgit v1.3.1-sl0p


From 736db93fd898cbdc4883b3e9abbe7beb43bc6ce1 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 17:43:23 -0400
Subject: Add Hall of Fame mon info text strings

---
 main.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index b1cfb1ae..965c16e4 100644
--- a/main.asm
+++ b/main.asm
@@ -99324,7 +99324,7 @@ Func_702f0: ; 702f0 (1c:42f0)
 	call TextBoxBorder
 	FuncCoord 2, 6 ; $c41a
 	ld hl, Coord
-	ld de, Unknown_70329 ; $4329
+	ld de, HoFMonInfoText ; $4329
 	call PlaceString
 	FuncCoord 1, 4 ; $c3f1
 	ld hl, Coord
@@ -99343,8 +99343,8 @@ Func_702f0: ; 702f0 (1c:42f0)
 	ld a, [W_WHICHTRADE] ; $cd3d
 	jp PlayCry
 
-Unknown_70329: ; 70329 (1c:4329)
-INCBIN "baserom.gbc",$70329,$7033e - $70329
+HoFMonInfoText: ; 70329 (1c:4329)
+	db "LEVEL/",$4e,"TYPE1/",$4e,"TYPE2/@"
 
 ; known jump sources: 70298 (1c:4298)
 Func_7033e: ; 7033e (1c:433e)
-- 
cgit v1.3.1-sl0p


From 32f10d3788edb733b83461ddd65d85f0816f2b83 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 17:46:11 -0400
Subject: Add Hall of Fame player info text

---
 main.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 965c16e4..43c65d90 100644
--- a/main.asm
+++ b/main.asm
@@ -99396,7 +99396,7 @@ Func_70377: ; 70377 (1c:4377)
 	call PlaceString
 	FuncCoord 1, 6 ; $c419
 	ld hl, Coord
-	ld de, Unknown_703ea ; $43ea
+	ld de, HoFPlayTimeText ; $43ea
 	call PlaceString
 	FuncCoord 5, 7 ; $c431
 	ld hl, Coord
@@ -99410,7 +99410,7 @@ Func_70377: ; 70377 (1c:4377)
 	call PrintNumber
 	FuncCoord 1, 9 ; $c455
 	ld hl, Coord
-	ld de, Unknown_703f4 ; $43f4
+	ld de, HoFMoneyText ; $43f4
 	call PlaceString
 	FuncCoord 4, 10 ; $c46c
 	ld hl, Coord
@@ -99429,11 +99429,11 @@ Func_703e2: ; 703e2 (1c:43e2)
 	ld c, $78
 	jp DelayFrames
 
-Unknown_703ea: ; 703ea (1c:43ea)
-INCBIN "baserom.gbc",$703ea,$703f4 - $703ea
+HoFPlayTimeText: ; 703ea (1c:43ea)
+	db "PLAY TIME@"
 
-Unknown_703f4: ; 703f4 (1c:43f4)
-INCBIN "baserom.gbc",$703f4,$703fa - $703f4
+HoFMoneyText: ; 703f4 (1c:43f4)
+	db "MONEY@"
 
 UnnamedText_703fa: ; 703fa (1c:43fa)
 	TX_FAR _UnnamedText_703fa
-- 
cgit v1.3.1-sl0p


From 39f7cc24373e89609d7707dde26ffa1ff55cafe2 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 17:51:14 -0400
Subject: Add Area Unknown text

---
 main.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 43c65d90..d80e05ef 100644
--- a/main.asm
+++ b/main.asm
@@ -101222,7 +101222,7 @@ Func_711ef: ; 711ef (1c:51ef)
 	call TextBoxBorder
 	FuncCoord 2, 9 ; $c456
 	ld hl, Coord
-	ld de, Unknown_7124a ; $524a
+	ld de, AreaUnknownText ; $524a
 	call PlaceString
 	jr .asm_7123e
 .asm_71236
@@ -101235,8 +101235,8 @@ Func_711ef: ; 711ef (1c:51ef)
 	ld bc, $a0
 	jp CopyData
 
-Unknown_7124a: ; 7124a (1c:524a)
-INCBIN "baserom.gbc",$7124a,$71258 - $7124a
+AreaUnknownText: ; 7124a (1c:524a)
+	db " AREA UNKNOWN@"
 
 ; known jump sources: 70e9a (1c:4e9a), 711d2 (1c:51d2), 71212 (1c:5212)
 Func_71258: ; 71258 (1c:5258)
-- 
cgit v1.3.1-sl0p


From b126cc2406ab2d01526f54a898bc0277ab07e488 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 19:06:35 -0400
Subject: Add box names and Box No. text

---
 main.asm | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index d80e05ef..ee0ef9b6 100644
--- a/main.asm
+++ b/main.asm
@@ -103785,7 +103785,7 @@ Func_7393f: ; 7393f (1c:793f)
 	call TextBoxBorder
 	ld hl, $fff6
 	set 2, [hl]
-	ld de, Unknown_739d9 ; $79d9
+	ld de, BoxNumbersText ; $79d9
 	FuncCoord 13, 1 ; $c3c1
 	ld hl, Coord
 	call PlaceString
@@ -103808,7 +103808,7 @@ Func_7393f: ; 7393f (1c:793f)
 	ld [Coord], a
 	FuncCoord 1, 2 ; $c3c9
 	ld hl, Coord
-	ld de, Unknown_73a21 ; $7a21
+	ld de, BoxNoText ; $7a21
 	call PlaceString
 	call Func_73a84
 	FuncCoord 18, 1 ; $c3c6
@@ -103837,11 +103837,22 @@ UnnamedText_739d4: ; 739d4 (1c:79d4)
 	db $50
 ; 0x739d4 + 5 bytes
 
-Unknown_739d9: ; 739d9 (1c:79d9)
-INCBIN "baserom.gbc",$739d9,$73a21 - $739d9
-
-Unknown_73a21: ; 73a21 (1c:7a21)
-INCBIN "baserom.gbc",$73a21,$73a29 - $73a21
+BoxNumbersText: ; 739d9 (1c:79d9)
+	db "BOX 1",$4e
+	db "BOX 2",$4e
+	db "BOX 3",$4e
+	db "BOX 4",$4e
+	db "BOX 5",$4e
+	db "BOX 6",$4e
+	db "BOX 7",$4e
+	db "BOX 8",$4e
+	db "BOX 9",$4e
+	db "BOX10",$4e
+	db "BOX11",$4e
+	db "BOX12@"
+
+BoxNoText: ; 73a21 (1c:7a21)
+	db "BOX No.@"
 
 ; known jump sources: 738b4 (1c:78b4)
 Func_73a29: ; 73a29 (1c:7a29)
-- 
cgit v1.3.1-sl0p


From 6e024a5f384444fd6b8ead21843813ccce38a0a1 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 2 Sep 2013 19:19:48 -0400
Subject: Update labels for consistency

---
 main.asm | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index ee0ef9b6..98eeba2d 100644
--- a/main.asm
+++ b/main.asm
@@ -74701,14 +74701,14 @@ CeladonGymScript: ; 4890a (12:490a)
 ; 0x48927
 
 CeladonGymScript_Unknown48927: ; 48927 (12:4927)
-	ld hl, CeladonGymCity ; $4930
-	ld de, CeladonGymLeader ; $493d
+	ld hl, Gym4CityName ; $4930
+	ld de, Gym4LeaderName ; $493d
 	jp LoadGymLeaderAndCityName
 
-CeladonGymCity: ; 48930 (12:4930)
+Gym4CityName: ; 48930 (12:4930)
 	db "CELADON CITY@"
 
-CeladonGymLeader: ; 4893d (12:493d)
+Gym4LeaderName: ; 4893d (12:493d)
 	db "ERIKA@"
 
 ; known jump sources: 4895b (12:495b), 489a3 (12:49a3)
@@ -91612,14 +91612,14 @@ PewterGymScript: ; 5c387 (17:4387)
 ; 0x5c3a4
 
 PewterGymScript_Unknown5c3a4: ; 5c3a4 (17:43a4)
-	ld hl, PewterGymCity ; $43ad
-	ld de, PewterGymLeader ; $43b9
+	ld hl, Gym1CityName ; $43ad
+	ld de, Gym1LeaderName ; $43b9
 	jp LoadGymLeaderAndCityName
 
-PewterGymCity: ; 5c3ad (17:43ad)
+Gym1CityName: ; 5c3ad (17:43ad)
 	db "PEWTER CITY@"
 
-PewterGymLeader: ; 5c3b9 (17:43b9)
+Gym1LeaderName: ; 5c3b9 (17:43b9)
 	db "BROCK@"
 
 ; known jump sources: 5c3d7 (17:43d7), 5c432 (17:4432)
@@ -92036,14 +92036,14 @@ CeruleanGymScript: ; 5c6b3 (17:46b3)
 ; 0x5c6d0
 
 CeruleanGymScript_Unknown5c6d0: ; 5c6d0 (17:46d0)
-	ld hl, CeruleanGymCity ; $46d9
-	ld de, CeruleanGymLeader ; $46e7
+	ld hl, Gym2CityName ; $46d9
+	ld de, Gym2LeaderName ; $46e7
 	jp LoadGymLeaderAndCityName
 
-CeruleanGymCity: ; 5c6d9 (17:46d9)
+Gym2CityName: ; 5c6d9 (17:46d9)
 	db "CERULEAN CITY@"
 
-CeruleanGymLeader: ; 5c6e7 (17:46e7)
+Gym2LeaderName: ; 5c6e7 (17:46e7)
 	db "MISTY@"
 
 ; known jump sources: 5c705 (17:4705), 5c747 (17:4747)
@@ -92542,14 +92542,14 @@ VermilionGymScript: ; 5ca26 (17:4a26)
 ; 0x5ca4c
 
 VermilionGymScript_Unknown5ca4c: ; 5ca4c (17:4a4c)
-	ld hl, VermilionGymCity ; $4a55
-	ld de, VermilionGymLeader ; $4a64
+	ld hl, Gym3CityName ; $4a55
+	ld de, Gym3LeaderName ; $4a64
 	jp LoadGymLeaderAndCityName
 
-VermilionGymCity: ; 5ca55 (17:4a55)
+Gym3CityName: ; 5ca55 (17:4a55)
 	db "VERMILION CITY@"
 
-VermilionGymLeader: ; 5ca64 (17:4a64)
+Gym3LeaderName: ; 5ca64 (17:4a64)
 	db "LT.SURGE@"
 
 ; known jump sources: 5ca36 (17:4a36)
@@ -93301,14 +93301,14 @@ SaffronGymScript: ; 5d00d (17:500d)
 	ret
 ; 0x5d02a
 .extra
-	ld hl, SaffronGymCity ; $5033
-	ld de, SaffronGymLeader ; $5040
+	ld hl, Gym6CityName ; $5033
+	ld de, Gym6LeaderName ; $5040
 	jp LoadGymLeaderAndCityName
 
-SaffronGymCity: ; 5d033 (17:5033)
+Gym6CityName: ; 5d033 (17:5033)
 	db "SAFFRON CITY@"
 
-SaffronGymLeader: ; 5d040 (17:5040)
+Gym6LeaderName: ; 5d040 (17:5040)
 	db "SABRINA@"
 
 ; known jump sources: 5d060 (17:5060), 5d0a8 (17:50a8)
@@ -103785,7 +103785,7 @@ Func_7393f: ; 7393f (1c:793f)
 	call TextBoxBorder
 	ld hl, $fff6
 	set 2, [hl]
-	ld de, BoxNumbersText ; $79d9
+	ld de, BoxNames ; $79d9
 	FuncCoord 13, 1 ; $c3c1
 	ld hl, Coord
 	call PlaceString
@@ -103837,7 +103837,7 @@ UnnamedText_739d4: ; 739d4 (1c:79d4)
 	db $50
 ; 0x739d4 + 5 bytes
 
-BoxNumbersText: ; 739d9 (1c:79d9)
+BoxNames: ; 739d9 (1c:79d9)
 	db "BOX 1",$4e
 	db "BOX 2",$4e
 	db "BOX 3",$4e
-- 
cgit v1.3.1-sl0p


From 288ba5a50fc5db1df1c9ec65aae40c8a23f3f50b Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 3 Sep 2013 14:22:34 -0400
Subject: Add Game Freak intro OAM data

---
 main.asm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 98eeba2d..ceaed3a5 100644
--- a/main.asm
+++ b/main.asm
@@ -98998,11 +98998,11 @@ Func_70000: ; 70000 (1c:4000)
 	ld hl, $8a20
 	ld bc, (BANK(FallingStar) << 8) + $01
 	call CopyVideoData
-	ld hl, Unknown_70140 ; $4140
+	ld hl, GameFreakLogoOAMData ; $4140
 	ld de, $c360
 	ld bc, $40
 	call CopyData
-	ld hl, Unknown_70180 ; $4180
+	ld hl, GameFreakShootingStarOAMData ; $4180
 	ld de, W_OAMBUFFER
 	ld bc, $10
 	jp CopyData
@@ -99144,11 +99144,14 @@ Func_7011f: ; 7011f (1c:411f)
 	jr nz, .asm_70121
 	ret
 
-Unknown_70140: ; 70140 (1c:4140)
-INCBIN "baserom.gbc",$70140,$70180 - $70140
+GameFreakLogoOAMData: ; 70140 (1c:4140)
+	db $48,$50,$8D,$00,$48,$58,$8E,$00,$50,$50,$8F,$00,$50,$58,$90,$00
+	db $58,$50,$91,$00,$58,$58,$92,$00,$60,$30,$80,$00,$60,$38,$81,$00
+	db $60,$40,$82,$00,$60,$48,$83,$00,$60,$50,$93,$00,$60,$58,$84,$00
+	db $60,$60,$85,$00,$60,$68,$83,$00,$60,$70,$81,$00,$60,$78,$86,$00
 
-Unknown_70180: ; 70180 (1c:4180)
-INCBIN "baserom.gbc",$70180,$70190 - $70180
+GameFreakShootingStarOAMData: ; 70180 (1c:4180)
+	db $00,$A0,$A0,$10,$00,$A8,$A0,$30,$08,$A0,$A1,$10,$08,$A8,$A1,$30
 
 FallingStar: ; 70190 (1c:4190)
 INCBIN "gfx/falling_star.2bpp"
-- 
cgit v1.3.1-sl0p


From d265d52c1e13a32cac2eb6b8be398d876bf66d32 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Wed, 4 Sep 2013 21:39:02 -0400
Subject: Add two safari text strings

---
 main.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index ceaed3a5..8ea26d0d 100644
--- a/main.asm
+++ b/main.asm
@@ -19126,11 +19126,11 @@ Func_c52f: ; c52f (3:452f)
 	call PrintNumber
 	FuncCoord 4, 1 ; $c3b8
 	ld hl, Coord
-	ld de, Unknown_c579 ; $4579
+	ld de, SafariSteps ; $4579
 	call PlaceString
 	FuncCoord 1, 3 ; $c3dd
 	ld hl, Coord
-	ld de, Unknown_c57e ; $457e
+	ld de, SafariBallText ; $457e
 	call PlaceString
 	ld a, [W_NUMSAFARIBALLS] ; $da47
 	cp $a
@@ -19146,11 +19146,11 @@ Func_c52f: ; c52f (3:452f)
 	ld bc, $102
 	jp PrintNumber
 
-Unknown_c579: ; c579 (3:4579)
-INCBIN "baserom.gbc",$c579,$c57e - $c579
+SafariSteps: ; c579 (3:4579)
+	db "/500@"
 
-Unknown_c57e: ; c57e (3:457e)
-INCBIN "baserom.gbc",$c57e,$c586 - $c57e
+SafariBallText: ; c57e (3:457e)
+	db "BALL×× @"
 
 ; known jump sources: 47f (0:47f), b2e (0:b2e), b5a (0:b5a), c12 (0:c12), c2d (0:c2d), fd3 (0:fd3), 1a67f (6:667f), 52683 (14:6683)
 Func_c586: ; c586 (3:4586)
-- 
cgit v1.3.1-sl0p


From 7ed5d291f126499188ed3daab6ef8c436094d652 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Thu, 5 Sep 2013 01:05:58 -0400
Subject: Add mon's nest text string

---
 main.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 8ea26d0d..54c86d34 100644
--- a/main.asm
+++ b/main.asm
@@ -100932,7 +100932,7 @@ Func_70f60: ; 70f60 (1c:4f60)
 	call PlaceString
 	ld h, b
 	ld l, c
-	ld de, Unknown_70f89 ; $4f89
+	ld de, MonsNestText ; $4f89
 	call PlaceString
 	call WaitForTextScrollButtonPress
 	call Func_711ab
@@ -100941,8 +100941,8 @@ Func_70f60: ; 70f60 (1c:4f60)
 	ld [hl], a
 	ret
 
-Unknown_70f89: ; 70f89 (1c:4f89)
-INCBIN "baserom.gbc",$70f89,$70f90 - $70f89
+MonsNestText: ; 70f89 (1c:4f89)
+	db "'s NEST@"
 
 ; known jump sources: 30b3 (0:30b3)
 Func_70f90: ; 70f90 (1c:4f90)
-- 
cgit v1.3.1-sl0p


From 923494507423786f43ab6b14959504729508e28b Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Fri, 6 Sep 2013 14:26:50 -0400
Subject: Organize Game Freak OAM data

---
 main.asm | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 54c86d34..f5f54159 100644
--- a/main.asm
+++ b/main.asm
@@ -99145,13 +99145,28 @@ Func_7011f: ; 7011f (1c:411f)
 	ret
 
 GameFreakLogoOAMData: ; 70140 (1c:4140)
-	db $48,$50,$8D,$00,$48,$58,$8E,$00,$50,$50,$8F,$00,$50,$58,$90,$00
-	db $58,$50,$91,$00,$58,$58,$92,$00,$60,$30,$80,$00,$60,$38,$81,$00
-	db $60,$40,$82,$00,$60,$48,$83,$00,$60,$50,$93,$00,$60,$58,$84,$00
-	db $60,$60,$85,$00,$60,$68,$83,$00,$60,$70,$81,$00,$60,$78,$86,$00
+	db $48,$50,$8D,$00
+	db $48,$58,$8E,$00
+	db $50,$50,$8F,$00
+	db $50,$58,$90,$00
+	db $58,$50,$91,$00
+	db $58,$58,$92,$00
+	db $60,$30,$80,$00
+	db $60,$38,$81,$00
+	db $60,$40,$82,$00
+	db $60,$48,$83,$00
+	db $60,$50,$93,$00
+	db $60,$58,$84,$00
+	db $60,$60,$85,$00
+	db $60,$68,$83,$00
+	db $60,$70,$81,$00
+	db $60,$78,$86,$00
 
 GameFreakShootingStarOAMData: ; 70180 (1c:4180)
-	db $00,$A0,$A0,$10,$00,$A8,$A0,$30,$08,$A0,$A1,$10,$08,$A8,$A1,$30
+	db $00,$A0,$A0,$10
+	db $00,$A8,$A0,$30
+	db $08,$A0,$A1,$10
+	db $08,$A8,$A1,$30
 
 FallingStar: ; 70190 (1c:4190)
 INCBIN "gfx/falling_star.2bpp"
-- 
cgit v1.3.1-sl0p


From ab5a944c3ebff1465c4e5621979be56f7abdfda2 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Fri, 6 Sep 2013 16:56:22 -0400
Subject: Add spaces text string

---
 main.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index f5f54159..c4655e70 100644
--- a/main.asm
+++ b/main.asm
@@ -58705,7 +58705,7 @@ Func_3c893: ; 3c893 (f:4893)
 	jr nz, .asm_3c8a3
 	ld bc, $14
 	add hl, bc
-	ld de, Unknown_3c8d7 ; $48d7
+	ld de, SevenSpacesText ; $48d7
 	call PlaceString
 	ld c, $2
 	call DelayFrames
@@ -58718,8 +58718,8 @@ Func_3c893: ; 3c893 (f:4893)
 	ld [$d730], a
 	ret
 
-Unknown_3c8d7: ; 3c8d7 (f:48d7)
-INCBIN "baserom.gbc",$3c8d7,$3c8df - $3c8d7
+SevenSpacesText: ; 3c8d7 (f:48d7)
+	db "       @"
 
 ; known jump sources: 3c1d9 (f:41d9), 3c94f (f:494f)
 Func_3c8df: ; 3c8df (f:48df)
-- 
cgit v1.3.1-sl0p


From 068cb7d7368bce846e0f93ff4b1745f3e6935fde Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Fri, 6 Sep 2013 17:02:31 -0400
Subject: Add To text string

---
 main.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index c4655e70..b5456792 100644
--- a/main.asm
+++ b/main.asm
@@ -100980,7 +100980,7 @@ Func_70f90: ; 70f90 (1c:4f90)
 	ld [hl], $ff
 	push hl
 	ld hl, W_SCREENTILESBUFFER
-	ld de, Unknown_7106d ; $506d
+	ld de, ToText ; $506d
 	call PlaceString
 	ld a, [W_CURMAP] ; $d35e
 	ld b, $0
@@ -101078,8 +101078,8 @@ Func_70fd6: ; 70fd6 (1c:4fd6)
 	ld hl, $cd49
 	jr .asm_71058
 
-Unknown_7106d: ; 7106d (1c:506d)
-INCBIN "baserom.gbc",$7106d,$71070 - $7106d
+ToText: ; 7106d (1c:506d)
+	db "To@"
 
 ; known jump sources: 70fb4 (1c:4fb4)
 Func_71070: ; 71070 (1c:5070)
-- 
cgit v1.3.1-sl0p


From 52e7b42e892357d4bd31027581d61823ebe2fc94 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Fri, 6 Sep 2013 17:08:11 -0400
Subject: Add UnknownText_74229

---
 main.asm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index b5456792..07ac9d0c 100644
--- a/main.asm
+++ b/main.asm
@@ -104358,7 +104358,7 @@ Func_7418e: ; 7418e (1d:418e)
 	call CopyVideoData
 	FuncCoord 4, 8 ; $c444
 	ld hl, Coord
-	ld de, Unknown_74229 ; $4229
+	ld de, UnknownText_74229 ; $4229
 	call PlaceString
 	FuncCoord 4, 9 ; $c458
 	ld hl, Coord
@@ -104366,8 +104366,9 @@ Func_7418e: ; 7418e (1d:418e)
 	call PlaceString
 	jp Func_740ba
 
-Unknown_74229: ; 74229 (1d:4229)
-INCBIN "baserom.gbc",$74229,$74243 - $74229
+UnknownText_74229: ; 74229 (1d:4229)
+	db $60," ",$62," ",$64,"  ",$64," ",$66," ",$68,"@"
+	db $61," ",$63," ",$65,"  ",$65," ",$67," ",$69,"@"
 
 Unknown_74243: ; 74243 (1d:4243)
 INCBIN "baserom.gbc",$74243,$742c3 - $74243
-- 
cgit v1.3.1-sl0p


From 1b19d68671542dbd1b0d0ca76aae4b0cc3a9b2d2 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Fri, 6 Sep 2013 18:26:20 -0400
Subject: Add bank 1C palette packets

---
 main.asm | 110 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 59 insertions(+), 51 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 07ac9d0c..9e8386ec 100644
--- a/main.asm
+++ b/main.asm
@@ -102327,10 +102327,10 @@ Func_71ddf: ; 71ddf (1c:5ddf)
 	ld de, Func_72156 ; $6156
 	push de
 	jp [hl]
-	ld hl, Unknown_72448 ; $6448
+	ld hl, PalPacket_72448 ; $6448
 	ld de, Unknown_721b5 ; $61b5
 	ret
-	ld hl, Unknown_72428 ; $6428
+	ld hl, PalPacket_72428 ; $6428
 	ld de, $cf2d
 	ld bc, $10
 	call CopyData
@@ -102363,10 +102363,10 @@ Func_71ddf: ; 71ddf (1c:5ddf)
 	ld a, $1
 	ld [$cf1c], a
 	ret
-	ld hl, Unknown_72458 ; $6458
+	ld hl, PalPacket_72458 ; $6458
 	ld de, Unknown_7219e ; $619e
 	ret
-	ld hl, Unknown_72428 ; $6428
+	ld hl, PalPacket_72428 ; $6428
 	ld de, $cf2d
 	ld bc, $10
 	call CopyData
@@ -102387,10 +102387,10 @@ Func_71ddf: ; 71ddf (1c:5ddf)
 	ld hl, $cf2d
 	ld de, Unknown_721fa ; $61fa
 	ret
-	ld hl, Unknown_72438 ; $6438
+	ld hl, PalPacket_72438 ; $6438
 	ld de, $cf2e
 	ret
-	ld hl, Unknown_72468 ; $6468
+	ld hl, PalPacket_72468 ; $6468
 	ld de, $cf2d
 	ld bc, $10
 	call CopyData
@@ -102403,21 +102403,21 @@ Func_71ddf: ; 71ddf (1c:5ddf)
 	ret
 
 INCBIN "baserom.gbc",$71e9f,$71ea6 - $71e9f
-	ld hl, Unknown_72488 ; $6488
+	ld hl, PalPacket_72488 ; $6488
 	ld de, Unknown_7228e ; $628e
 	ret
-	ld hl, Unknown_724a8 ; $64a8
+	ld hl, PalPacket_724a8 ; $64a8
 	ld de, Unknown_7219e ; $619e
 	ret
-	ld hl, Unknown_724b8 ; $64b8
+	ld hl, PalPacket_724b8 ; $64b8
 	ld de, Unknown_722c1 ; $62c1
 	ret
-	ld hl, Unknown_724c8 ; $64c8
+	ld hl, PalPacket_724c8 ; $64c8
 	ld de, Unknown_723dd ; $63dd
 	ld a, $8
 	ld [$cf1c], a
 	ret
-	ld hl, Unknown_72428 ; $6428
+	ld hl, PalPacket_72428 ; $6428
 	ld de, $cf2d
 	ld bc, $10
 	call CopyData
@@ -102461,7 +102461,7 @@ INCBIN "baserom.gbc",$71e9f,$71ea6 - $71e9f
 	xor a
 	jr .asm_71efe
 	push bc
-	ld hl, Unknown_72428 ; $6428
+	ld hl, PalPacket_72428 ; $6428
 	ld de, $cf2d
 	ld bc, $10
 	call CopyData
@@ -102510,7 +102510,7 @@ INCBIN "baserom.gbc",$71e9f,$71ea6 - $71e9f
 	inc de
 	dec c
 	jr nz, .asm_71f52
-	ld hl, Unknown_72498 ; $6498
+	ld hl, PalPacket_72498 ; $6498
 	ld de, $cc5b
 	ret
 
@@ -102661,21 +102661,21 @@ Func_7202b: ; 7202b (1c:602b)
 	ei
 	ld a, $1
 	ld [$cf2d], a
-	ld de, Unknown_72508 ; $6508
+	ld de, PalPacket_72508 ; $6508
 	ld hl, SGBBorderGraphics ; $6fe8
 	call Func_7210b
 	xor a
 	ld [$cf2d], a
-	ld de, Unknown_72518 ; $6518
+	ld de, PalPacket_72518 ; $6518
 	ld hl, BorderPalettes ; $6788
 	call Func_7210b
 	xor a
 	ld [$cf2d], a
-	ld de, Unknown_724d8 ; $64d8
+	ld de, PalPacket_724d8 ; $64d8
 	ld hl, SuperPalettes ; $6660
 	call Func_7210b
 	call ZeroVram
-	ld hl, Unknown_72538 ; $6538
+	ld hl, PalPacket_72538 ; $6538
 	jp SendSGBPacket
 
 ; known jump sources: 72040 (1c:6040)
@@ -102701,7 +102701,7 @@ INCBIN "baserom.gbc",$72089,$7209b - $72089
 
 ; known jump sources: 7202f (1c:602f)
 Func_7209b: ; 7209b (1c:609b)
-	ld hl, Unknown_724f8 ; $64f8
+	ld hl, PalPacket_724f8 ; $64f8
 	di
 	call SendSGBPacket
 	ld a, $1
@@ -102753,7 +102753,7 @@ Func_7209b: ; 7209b (1c:609b)
 
 ; known jump sources: 720f8 (1c:60f8), 720fd (1c:60fd)
 Func_72102: ; 72102 (1c:6102)
-	ld hl, Unknown_724e8 ; $64e8
+	ld hl, PalPacket_724e8 ; $64e8
 	call SendSGBPacket
 	jp Wait7000
 
@@ -102902,53 +102902,61 @@ INCBIN "baserom.gbc",$72360,$723dd - $72360
 Unknown_723dd: ; 723dd (1c:63dd)
 INCBIN "baserom.gbc",$723dd,$72428 - $723dd
 
-Unknown_72428: ; 72428 (1c:6428)
-INCBIN "baserom.gbc",$72428,$72438 - $72428
+PalPacket_72428: ; 72428 (1c:6428)
+	db $51,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 
 
-Unknown_72438: ; 72438 (1c:6438)
-INCBIN "baserom.gbc",$72438,$72448 - $72438
+PalPacket_72438: ; 72438 (1c:6438)
+	db $51,$10,$00,$1F,$00,$20,$00,$21,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_72448: ; 72448 (1c:6448)
-INCBIN "baserom.gbc",$72448,$72458 - $72448
+PalPacket_72448: ; 72448 (1c:6448)
+	db $51,$1E,$00,$1E,$00,$1E,$00,$1E,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_72458: ; 72458 (1c:6458)
-INCBIN "baserom.gbc",$72458,$72468 - $72458
+PalPacket_72458: ; 72458 (1c:6458)
+	db $51,$0C,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_72468: ; 72468 (1c:6468)
-INCBIN "baserom.gbc",$72468,$72488 - $72468
+PalPacket_72468: ; 72468 (1c:6468)
+	db $51,$15,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+	
+PalPacket_72478: ; 72478 (1c:6478)
+	db $51,$1A,$00,$1B,$00,$1C,$00,$1D,$00,$00,$00,$00,$00,$00,$00,$00
+
+PalPacket_72488: ; 72488 (1c:6488)
+	db $51,$0E,$00,$0D,$00,$10,$00,$14,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_72488: ; 72488 (1c:6488)
-INCBIN "baserom.gbc",$72488,$72498 - $72488
+PalPacket_72498: ; 72498 (1c:6498)
+	db $51,$10,$00,$22,$00,$12,$00,$18,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_72498: ; 72498 (1c:6498)
-INCBIN "baserom.gbc",$72498,$724a8 - $72498
+PalPacket_724a8: ; 724a8 (1c:64a8)
+	db $51,$10,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_724a8: ; 724a8 (1c:64a8)
-INCBIN "baserom.gbc",$724a8,$724b8 - $724a8
+PalPacket_724b8: ; 724b8 (1c:64b8)
+	db $51,$14,$00,$1E,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_724b8: ; 724b8 (1c:64b8)
-INCBIN "baserom.gbc",$724b8,$724c8 - $724b8
+PalPacket_724c8: ; 724c8 (1c:64c8)
+	db $51,$24,$00,$12,$00,$02,$00,$11,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_724c8: ; 724c8 (1c:64c8)
-INCBIN "baserom.gbc",$724c8,$724d8 - $724c8
+PalPacket_724d8: ; 724d8 (1c:64d8)
+	db $59,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_724d8: ; 724d8 (1c:64d8)
-INCBIN "baserom.gbc",$724d8,$724e8 - $724d8
+PalPacket_724e8: ; 724e8 (1c:64e8)
+	db $89,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_724e8: ; 724e8 (1c:64e8)
-INCBIN "baserom.gbc",$724e8,$724f8 - $724e8
+PalPacket_724f8: ; 724f8 (1c:64f8)
+	db $89,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_724f8: ; 724f8 (1c:64f8)
-INCBIN "baserom.gbc",$724f8,$72508 - $724f8
+PalPacket_72508: ; 72508 (1c:6508)
+	db $99,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_72508: ; 72508 (1c:6508)
-INCBIN "baserom.gbc",$72508,$72518 - $72508
+PalPacket_72518: ; 72518 (1c:6518)
+	db $A1,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
+	
+PalPacket_72528: ; 72528 (1c:6528)
+	db $B9,$01,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_72518: ; 72518 (1c:6518)
-INCBIN "baserom.gbc",$72518,$72538 - $72518
+PalPacket_72538: ; 72538 (1c:6538)
+	db $B9,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00
 
-Unknown_72538: ; 72538 (1c:6538)
-INCBIN "baserom.gbc",$72538,$725c8 - $72538
+INCBIN "baserom.gbc",$72548,$725c8 - $72548
 
 MonsterPalettes: ; 725c8 (1c:65c8)
 	db PAL_MEWMON    ; MISSINGNO
-- 
cgit v1.3.1-sl0p


From 7ef33f15f3e4728d92155d39f25fa41d19607bed Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 11:56:29 -0400
Subject: Add TownMapOrder

---
 main.asm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 9e8386ec..a6fe15a4 100644
--- a/main.asm
+++ b/main.asm
@@ -100853,7 +100853,7 @@ Func_70e7e: ; 70e7e (1c:4e7e)
 	ld hl, W_SCREENTILESBUFFER
 	ld bc, $114
 	call ClearScreenArea
-	ld hl, Unknown_70f11 ; $4f11
+	ld hl, TownMapOrder ; $4f11
 	ld a, [W_WHICHTRADE] ; $cd3d
 	ld c, a
 	ld b, $0
@@ -100926,8 +100926,54 @@ asm_70e92: ; 70e92 (1c:4e92)
 	ld [W_WHICHTRADE], a ; $cd3d
 	jp Func_70e7e
 
-Unknown_70f11: ; 70f11 (1c:4f11)
-INCBIN "baserom.gbc",$70f11,$70f40 - $70f11
+TownMapOrder: ; 70f11 (1c:4f11)
+	db PALLET_TOWN
+	db ROUTE_1
+	db VIRIDIAN_CITY
+	db ROUTE_2
+	db VIRIDIAN_FOREST
+	db DIGLETTS_CAVE
+	db PEWTER_CITY
+	db ROUTE_3
+	db MT_MOON_1
+	db ROUTE_4
+	db CERULEAN_CITY
+	db ROUTE_24
+	db ROUTE_25
+	db BILLS_HOUSE
+	db ROUTE_5
+	db ROUTE_6
+	db VERMILION_CITY
+	db SS_ANNE_1
+	db ROUTE_9
+	db ROCK_TUNNEL_POKECENTER
+	db ROUTE_10
+	db LAVENDER_TOWN
+	db POKEMONTOWER_2
+	db ROUTE_8
+	db ROUTE_7
+	db CELADON_CITY
+	db SAFFRON_CITY
+	db ROUTE_11
+	db ROUTE_12
+	db ROUTE_13
+	db ROUTE_14
+	db ROUTE_15
+	db ROUTE_16
+	db ROUTE_17
+	db ROUTE_18
+	db FUCHSIA_CITY
+	db SAFARI_ZONE_EAST
+	db ROUTE_19
+	db SEAFOAM_ISLANDS_2
+	db ROUTE_20
+	db CINNABAR_ISLAND
+	db ROUTE_21
+	db ROUTE_22
+	db ROUTE_23
+	db VICTORY_ROAD_3
+	db INDIGO_PLATEAU
+	db POWER_PLANT
 
 TownMapCursor: ; 70f40 (1c:4f40)
 INCBIN "gfx/town_map_cursor.1bpp"
-- 
cgit v1.3.1-sl0p


From 3bdb704dc4d46e170deaf9d3d3c7fa3dbacd3c98 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 12:46:57 -0400
Subject: Add UnnamedText_1cae8

---
 main.asm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index a6fe15a4..e7e9bcce 100644
--- a/main.asm
+++ b/main.asm
@@ -37149,7 +37149,7 @@ LedgeHoppingShadow: ; 1a708 (6:6708)
 INCBIN "gfx/ledge_hopping_shadow.1bpp"
 
 Unknown_1a710: ; 1a710 (6:6710)
-INCBIN "baserom.gbc",$1a710,$1bcc8 - $1a710
+INCBIN "baserom.gbc",$1a710,$1a718 - $1a710
 
 SECTION "bank7",ROMX,BANK[$7]
 
@@ -37659,7 +37659,7 @@ Route1Text1: ; 1cab8 (7:4ab8)
 	ld bc, (POTION << 8) | 1
 	call GiveItem
 	jr nc, .BagFull
-	ld hl, Unknown_1cae8 ; $4ae8
+	ld hl, UnnamedText_1cae8 ; $4ae8
 	jr .asm_46d43 ; 0x1cad3
 .BagFull
 	ld hl, UnnamedText_1caf3 ; $4af3
@@ -37675,8 +37675,9 @@ Route1ViridianMartSampleText: ; 1cae3 (7:4ae3)
 	db $50
 ; 0x1cae3 + 5 bytes
 
-Unknown_1cae8: ; 1cae8 (7:4ae8)
-INCBIN "baserom.gbc",$1cae8,$1caee - $1cae8
+UnnamedText_1cae8: ; 1cae8 (7:4ae8)
+	TX_FAR _UnnamedText_1cae8
+	db $0b,$50
 
 UnnamedText_1caee: ; 1caee (7:4aee)
 	TX_FAR _UnnamedText_1caee
@@ -119423,7 +119424,7 @@ _Route1ViridianMartSampleText: ; 8d5bf (23:55bf)
 	db "Here you go!", $58
 ; 0x8d5bf + 132 bytes
 
-UnknownText_8d643: ; 8d643 (23:5643)
+_UnnamedText_1cae8: ; 8d643 (23:5643)
 	db $0, $52, " got", $4f
 	db "@"
 ; 0x8d643 + 8 bytes
-- 
cgit v1.3.1-sl0p


From 6637f8a69a0429af3f3adae9aa5ec8cbafa8bb81 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 12:53:06 -0400
Subject: Add UnnamedText_1e940

---
 main.asm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index e7e9bcce..0d0b9eec 100644
--- a/main.asm
+++ b/main.asm
@@ -41814,7 +41814,7 @@ Func_1e915: ; 1e915 (7:6915)
 	ld a, $56
 	call Predef ; indirect jump to DisplayDexRating (44169 (11:4169))
 .asm_1e932
-	ld hl, Unknown_1e940 ; $6940
+	ld hl, UnnamedText_1e940 ; $6940
 	call PrintText
 	jp LoadScreenTilesFromBuffer2
 ; 1e93b (7:693b)
@@ -41823,8 +41823,9 @@ UnnamedText_1e93b: ; 1e93b (7:693b)
 	db $50
 ; 0x1e93b + 5 bytes
 
-Unknown_1e940: ; 1e940 (7:6940)
-INCBIN "baserom.gbc",$1e940,$1e946 - $1e940
+UnnamedText_1e940: ; 1e940 (7:6940)
+	TX_FAR _UnnamedText_1e940
+	db $0d,$50
 
 UnnamedText_1e946: ; 1e946 (7:6946)
 	TX_FAR _UnnamedText_1e946
@@ -118425,7 +118426,7 @@ _UnnamedText_1e93b: ; 8a35d (22:635d)
 	db "#DEX rated?", $57
 ; 0x8a35d + 30 bytes
 
-UnknownText_8a37b: ; 8a37b (22:637b)
+_UnnamedText_1e940: ; 8a37b (22:637b)
 	db $0, "Closed link to", $4f
 	db "PROF.OAK's PC.@@"
 ; 0x8a37b + 31 bytes
-- 
cgit v1.3.1-sl0p


From a1a33933175a2c96a043f801fd0496613dc32b15 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 13:00:53 -0400
Subject: un-incbin misc asm

---
 main.asm | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 0d0b9eec..523cf407 100644
--- a/main.asm
+++ b/main.asm
@@ -41832,21 +41832,35 @@ UnnamedText_1e946: ; 1e946 (7:6946)
 	db $50
 ; 0x1e946 + 5 bytes
 
-INCBIN "baserom.gbc",$1e94b,$1e953 - $1e94b
+	call EnableAutoTextBoxDrawing
+	ld a, $39
+	jp Func_3ef5
 
 UnnamedText_1e953: ; 1e953 (7:6953)
 	TX_FAR _UnnamedText_1e953
 	db $50
 ; 0x1e953 + 5 bytes
 
-INCBIN "baserom.gbc",$1e958,$1e960 - $1e958
+	call EnableAutoTextBoxDrawing
+	ld a, $05
+	jp Func_3ef5
 
 UnnamedText_1e960: ; 1e960 (7:6960)
 	TX_FAR _UnnamedText_1e960
 	db $50
 ; 0x1e960 + 5 bytes
 
-INCBIN "baserom.gbc",$1e965,$1e97e - $1e965
+	call EnableAutoTextBoxDrawing
+    ld hl, $d2f7
+    ld b, $13
+    call CountSetBits
+    ld a, [$d11e]
+    cp $2
+    ld a, $6
+    jr c, .asm_1e97b
+    ld a, $7
+.asm_1e97b
+    jp Func_3ef5
 
 UnnamedText_1e97e: ; 1e97e (7:697e)
 	TX_FAR _UnnamedText_1e97e
-- 
cgit v1.3.1-sl0p


From 3b3051ea0994465b423ef851fb337c5376fac1aa Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 13:13:45 -0400
Subject: Add PointerTable_1ea60 and organize PointerTable labels

---
 main.asm | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 523cf407..d9676591 100644
--- a/main.asm
+++ b/main.asm
@@ -13314,7 +13314,7 @@ Func_5317: ; 5317 (1:5317)
 	db "PLEASE WAIT!@"
 
 Func_551c:
-	ld hl, PointerTable5a5b ; $5a5b
+	ld hl, PointerTable_5a5b ; $5a5b
 	ld b, $0
 	ld a, [$cc38]
 	cp $ff
@@ -13908,7 +13908,7 @@ TradeCompleted:
 TradeCanceled:
 	db "Too bad! The trade",$4E,"was canceled!@"
 
-PointerTable5a5b: ; 5a5b (1:5a5b)
+PointerTable_5a5b: ; 5a5b (1:5a5b)
 	dw Func_5530
 	dw Func_5849
 
@@ -41983,7 +41983,7 @@ INCBIN "baserom.gbc",$1ea25,$1ea26 - $1ea25
 	add a
 	ld d, $0
 	ld e, a
-	ld hl, Unknown_1ea60 ; $6a60
+	ld hl, PointerTable_1ea60 ; $6a60
 	add hl, de
 	ld a, [hli]
 	ld h, [hl]
@@ -41999,8 +41999,13 @@ UnnamedText_1ea5b: ; 1ea5b (7:6a5b)
 	db $50
 ; 0x1ea5b + 5 bytes
 
-Unknown_1ea60: ; 1ea60 (7:6a60)
-INCBIN "baserom.gbc",$1ea60,$1ea6c - $1ea60
+PointerTable_1ea60: ; 1ea60 (7:6a60)
+	dw UnnamedText_1ea6c
+	dw UnnamedText_1ea71
+	dw UnnamedText_1ea76
+	dw UnnamedText_1ea7b
+	dw UnnamedText_1ea80
+	dw UnnamedText_1ea85
 
 UnnamedText_1ea6c: ; 1ea6c (7:6a6c)
 	TX_FAR _UnnamedText_1ea6c
@@ -94808,7 +94813,7 @@ Unknown_5dc2a: ; 5dc2a (17:5c2a)
 	jr z, .asm_5dc93 ; 0x5dc7b $16
 	ld hl, $d730
 	res 6, [hl]
-	ld hl, PointerTable5cd8
+	ld hl, PointerTable_5dcd8
 	add a
 	ld d, $0
 	ld e, a
@@ -94837,7 +94842,7 @@ UnnamedText_5dca3: ; 5dca3 (17:5ca3)
 HowToLinkText: ; 5dca8 (17:5ca8)
 	db "HOW TO LINK",$4e,"COLOSSEUM",$4e,"TRADE CENTER",$4e,"STOP READING@"
 
-PointerTable5cd8: ; 5dcd8 (17:5cd8)
+PointerTable_5dcd8: ; 5dcd8 (17:5cd8)
 	dw UnnamedText_5dcde
 	dw UnnamedText_5dce3
 	dw UnnamedText_5dce8
@@ -94877,7 +94882,7 @@ StatusAilmentText:
 	db " FRZ",$4e
 	db " QUIT@@"
 	
-PointerTable5dcc: ; 5ddcc (17:5ddc)
+PointerTable_5ddcc: ; 5ddcc (17:5ddc)
 	dw UnnamedText_5ddd6
 	dw UnnamedText_5dddb
 	dw UnnamedText_5dde0
@@ -109653,7 +109658,7 @@ PlaySubanimation: ; 78e53 (1e:4e53)
 	push hl
 	ld c,[hl] ; frame block ID
 	ld b,0
-	ld hl,PointerTable6F74
+	ld hl,PointerTable_7af74
 	add hl,bc
 	add hl,bc
 	ld a,[hli]
@@ -111601,7 +111606,7 @@ INCBIN "baserom.gbc",$7a76d,$7af6f - $7a76d
 Unknown_7af6f: ; 7af6f (1e:6f6f)
 INCBIN "baserom.gbc",$7af6f,$7af74 - $7af6f
 
-PointerTable6F74: ; 7af74 (1e:6f74)
+PointerTable_7af74: ; 7af74 (1e:6f74)
 	dw $7de7
 	dw $7068
 	dw $708d
-- 
cgit v1.3.1-sl0p


From 778dbb83baa41a31cee71b934eee6d7f080fc86a Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 13:20:10 -0400
Subject: Add UnnamedText_1eae3

---
 main.asm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index d9676591..97c6a877 100644
--- a/main.asm
+++ b/main.asm
@@ -42055,7 +42055,7 @@ Func_1ea92: ; 1ea92 (7:6a92)
 	set 5, [hl]
 	ld a, [$FF00+$db]
 	ld [$FF00+$e0], a
-	ld hl, Unknown_1eae3 ; $6ae3
+	ld hl, UnnamedText_1eae3 ; $6ae3
 	call PrintText
 	ld a, [$FF00+$e0]
 	ld c, a
@@ -42084,8 +42084,11 @@ Func_1ea92: ; 1ea92 (7:6a92)
 	ld [$da38], a
 	ret
 
-Unknown_1eae3: ; 1eae3 (7:6ae3)
-INCBIN "baserom.gbc",$1eae3,$1eaea - $1eae3
+UnnamedText_1eae3: ; 1eae3 (7:6ae3)
+	db $0b
+	TX_FAR _UnnamedText_1eae3
+	db $06,$08
+	
 	ld a, [$FF00+$e0]
 	ld c, a
 	ld b, $2
@@ -117219,7 +117222,7 @@ _UnnamedText_1ea85: ; 88949 (22:4949)
 	db "TOMBSTONER?", $57
 ; 0x88949 + 27 bytes
 
-UnnamedText_88964: ; 88964 (22:4964)
+_UnnamedText_1eae3: ; 88964 (22:4964)
 	db $0, "You're absolutely", $4f
 	db "correct!", $51
 	db "Go on through!@@"
-- 
cgit v1.3.1-sl0p


From e93809a84be39fc2490aa4518981c22adf9037a4 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 18:03:38 -0400
Subject: Add CinnabarGymGateCoords

---
 main.asm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 97c6a877..69269fe9 100644
--- a/main.asm
+++ b/main.asm
@@ -42118,7 +42118,7 @@ Func_1eb0a: ; 1eb0a (7:6b0a)
 	add a
 	ld d, $0
 	ld e, a
-	ld hl, Unknown_1eb48 ; $6b48
+	ld hl, CinnabarGymGateCoords ; $6b48
 	add hl, de
 	ld a, [hli]
 	ld b, [hl]
@@ -42149,8 +42149,20 @@ Func_1eb0a: ; 1eb0a (7:6b0a)
 	jr nz, .asm_1eb0e
 	ret
 
-Unknown_1eb48: ; 1eb48 (7:6b48)
-INCBIN "baserom.gbc",$1eb48,$1eb69 - $1eb48
+CinnabarGymGateCoords: ; 1eb48 (7:6b48)
+	; format: x-coord, y-coord, direction, buffer
+	; direction: $54 = horizontal gate, $5f = vertical gate
+	db $09,$03,$54,$00
+	db $06,$03,$54,$00
+	db $06,$06,$54,$00
+	db $03,$08,$5f,$00
+	db $02,$06,$54,$00
+	db $02,$03,$54,$00
+
+	call EnableAutoTextBoxDrawing
+    ld a, $30
+    call Func_3ef5
+    ret
 
 UnnamedText_1eb69: ; 1eb69 (7:6b69)
 	TX_FAR _UnnamedText_1eb69
-- 
cgit v1.3.1-sl0p


From 54a0478d9cd4cb6e684e3be87b66b8a005e23962 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 18:09:01 -0400
Subject: Add UnnamedText_1ebe2

---
 main.asm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 69269fe9..83880edf 100644
--- a/main.asm
+++ b/main.asm
@@ -42224,7 +42224,10 @@ UnnamedText_1ebdd: ; 1ebdd (7:6bdd)
 	db $50
 ; 0x1ebdd + 5 bytes
 
-INCBIN "baserom.gbc",$1ebe2,$1ebe8 - $1ebe2
+UnnamedText_1ebe2: ; 1ebe2 (7:6be2
+	TX_FAR _UnnamedText_1ebe2
+	db $06,$08
+	
 	ld a, $ff
 	ld [$c0ee], a
 	call PlaySound
@@ -117256,7 +117259,7 @@ _UnnamedText_1ebdd: ; 889cf (22:49cf)
 	db "PC monitor.", $57
 ; 0x889cf + 44 bytes
 
-UnnamedText_889fb: ; 889fb (22:49fb)
+_UnnamedText_1ebe2: ; 889fb (22:49fb)
 	db $0, $52, " initiated", $4f
 	db "TELEPORTER's Cell", $55
 	db "Separator!@@"
-- 
cgit v1.3.1-sl0p


From 7380b242b010ef74ab806224c699608592218fd2 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 18:24:04 -0400
Subject: Add misc asm

---
 main.asm | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 83880edf..32d3061d 100644
--- a/main.asm
+++ b/main.asm
@@ -42240,7 +42240,59 @@ UnnamedText_1ebe2: ; 1ebe2 (7:6be2
 	call DelayFrames
 	jp TextScriptEnd
 
-INCBIN "baserom.gbc",$1ec05,$1ec7f - $1ec05
+INCBIN "baserom.gbc",$1ec05,$1ec06 - $1ec05
+
+	call SaveScreenTilesToBuffer1
+	ld hl, $6c7f
+	call PrintText
+	xor a
+	ld [$d07c], a
+	ld [$cc26], a
+	ld [$cc2a], a
+	ld a, $3
+	ld [$cc29], a
+	ld a, $4
+	ld [$cc28], a
+	ld a, $2
+	ld [$cc24], a
+	ld a, $1
+	ld [$cc25], a
+.asm_1ec2d
+	ld hl, $d730
+	set 6, [hl]
+	ld hl, $c3a0
+	ld b, $a
+	ld c, $9
+	call TextBoxBorder
+	ld hl, $c3ca
+	ld de, $6c84
+	call PlaceString
+	ld hl, $6caa
+	call PrintText
+	call SaveScreenTilesToBuffer2
+	call HandleMenuInput
+	bit 1, a
+	jr nz, .asm_1ec74
+	ld a, [$cc26]
+	add $66
+	cp $66
+	jr z, .asm_1ec6c
+	cp $67
+	jr z, .asm_1ec6c
+	cp $68
+	jr z, .asm_1ec6c
+	cp $69
+	jr z, .asm_1ec6c
+	jr .asm_1ec74
+.asm_1ec6c
+	call DisplayPokedex
+	call LoadScreenTilesFromBuffer2
+	jr .asm_1ec2d
+.asm_1ec74
+	ld hl, $d730
+	res 6, [hl]
+	call LoadScreenTilesFromBuffer2
+	jp TextScriptEnd
 
 UnnamedText_1ec7f: ; 1ec7f (7:6c7f)
 	TX_FAR _UnnamedText_1ec7f
-- 
cgit v1.3.1-sl0p


From 6a589c327803fb9da01a5e4a9eebdd4be30f85b2 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 18:33:53 -0400
Subject: Add HMMoveArray

---
 main.asm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 32d3061d..5431c63e 100644
--- a/main.asm
+++ b/main.asm
@@ -42786,7 +42786,7 @@ Func_2171b: ; 2171b (8:571b)
 	ld a, [hli]
 	push hl
 	push bc
-	ld hl, Unknown_21745 ; $5745
+	ld hl, HMMoveArray ; $5745
 	ld de, $0001
 	call IsInArray
 	pop bc
@@ -42798,8 +42798,13 @@ Func_2171b: ; 2171b (8:571b)
 	ret
 ; 0x21745
 
-Unknown_21745: ; 21745 (8:5745)
-INCBIN "baserom.gbc",$21745,$2174b - $21745
+HMMoveArray: ; 21745 (8:5745)
+	db CUT
+	db FLY
+	db SURF
+	db STRENGTH
+	db FLASH
+	db $ff
 
 ; known jump sources: 215d4 (8:55d4), 21640 (8:5640)
 Func_2174b: ; 2174b (8:574b)
-- 
cgit v1.3.1-sl0p


From 89eba26278366dfca48650d442e0a047b33f6c4a Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 20:38:18 -0400
Subject: misc asm

---
 main.asm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 5431c63e..4e9d2342 100644
--- a/main.asm
+++ b/main.asm
@@ -42948,14 +42948,53 @@ UnnamedText_21820: ; 21820 (8:5820)
 	db $50
 ; 0x21820 + 5 bytes
 
-INCBIN "baserom.gbc",$21825,$21865 - $21825
+	ld a, [$ff00+$aa]
+	cp $1
+	ret z
+	ld a, [$c109]
+	cp $c
+	ret nz
+	ld a, [$d35e]
+	cp $ef
+	ld a, $2
+	jr z, .asm_2183a
+	inc a
+.asm_2183a
+	ld [$d12b], a
+	call EnableAutoTextBoxDrawing
+	ld a, $22
+	jp Func_3ef5
+
+	ld a, [$ff00+$aa]
+	cp $2
+	ret z
+	ld a, [$c109]
+	cp $8
+	ret nz
+	ld a, [$d35e]
+	cp $ef
+	ld a, $2
+	jr z, .asm_2185a
+	inc a
+.asm_2185a
+	ld [$d12b], a
+	call EnableAutoTextBoxDrawing
+	ld a, $22
+	jp Func_3ef5
 
 UnnamedText_21865: ; 21865 (8:5865)
 	TX_FAR _UnnamedText_21865
 	db $50
 ; 0x21865 + 5 bytes
 
-INCBIN "baserom.gbc",$2186a,$21879 - $2186a
+	ld a, [$c109]
+	cp $4
+	ret nz
+	call EnableAutoTextBoxDrawing
+	ld a, $23
+	jp Func_3ef5
+
+INCBIN "baserom.gbc",$21878,$21879 - $21878
 
 Func_21879: ; 21879 (8:5879)
 	ld c, $0
@@ -43861,7 +43900,18 @@ Func_21dcc: ; 21dcc (8:5dcc)
 .asm_21e18
 	ret
 
-INCBIN "baserom.gbc",$21e19,$21e2f - $21e19
+	ld a, c
+	cp $4
+	jr nz, .asm_21e2e ; 0x21e1c $10
+	ld a, [$d083]
+	bit 7, a
+	jr z, .asm_21e2e ; 0x21e23 $9
+	xor a
+	ld [$c0f1], a
+	ld a, $80
+	ld [$c0f2], a
+.asm_21e2e
+	ret
 
 ; known jump sources: 21cb4 (8:5cb4)
 Func_21e2f: ; 21e2f (8:5e2f)
-- 
cgit v1.3.1-sl0p


From 21ffdf684a73f34673f3f8aebfbee0742187f2f2 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 20:42:09 -0400
Subject: Include text command $0a in UnnamedText_27fb3

---
 main.asm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 4e9d2342..ac8c5960 100644
--- a/main.asm
+++ b/main.asm
@@ -45090,7 +45090,7 @@ Func_27f86: ; 27f86 (9:7f86)
 	ld hl, Func_3fba8
 	ld b, BANK(Func_3fba8)
 	call Bankswitch ; indirect jump to Func_3fba8 (3fba8 (f:7ba8))
-	ld hl, Unknown_27fb2 ; $7fb2
+	ld hl, UnnamedText_27fb3 ; $7fb2
 	jp PrintText
 .asm_27fa5
 	ld c, $32
@@ -45099,10 +45099,8 @@ Func_27f86: ; 27f86 (9:7f86)
 	ld b, BANK(Func_3fb53)
 	jp Bankswitch ; indirect jump to Func_3fb53 (3fb53 (f:7b53))
 
-Unknown_27fb2: ; 27fb2 (9:7fb2)
-INCBIN "baserom.gbc",$27fb2,$27fb3 - $27fb2
-
 UnnamedText_27fb3: ; 27fb3 (9:7fb3)
+	db $0a
 	TX_FAR _UnnamedText_27fb3
 	db $50
 ; 0x27fb3 + 5 bytes
-- 
cgit v1.3.1-sl0p


From 929dce66e4c49f665dd560d8bec3501225e4aad2 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 20:46:10 -0400
Subject: add misc asm

---
 main.asm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index ac8c5960..bd9f5081 100644
--- a/main.asm
+++ b/main.asm
@@ -45619,7 +45619,29 @@ UnnamedText_2ff04: ; 2ff04 (b:7f04)
 	db $50
 ; 0x2ff04 + 5 bytes
 
-INCBIN "baserom.gbc",$2ff09,$2ff32 - $2ff09
+	ld a, [$c102]
+	and $8
+	jr z, .asm_2ff2e
+	ld b, $45
+	ld a, $1c
+	call Predef
+	ld a, b
+	and a
+	ld b, $33
+	jr z, .asm_2ff26
+	ld hl, $d5a4
+	ld a, [hli]
+	or [hl]
+	jr nz, .asm_2ff2e
+	ld b, $32
+.asm_2ff26
+	call EnableAutoTextBoxDrawing
+	ld a, b
+	call Func_3ef5
+	xor a
+.asm_2ff2e
+	ld [$cd3d], a
+	ret
 
 UnnamedText_2ff32: ; 2ff32 (b:7f32)
 	TX_FAR _UnnamedText_2ff32
-- 
cgit v1.3.1-sl0p


From 351c48959a825b7b189e06cab9d691139dd8145a Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 20:51:45 -0400
Subject: Add misc asm

---
 main.asm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index bd9f5081..3755c8ec 100644
--- a/main.asm
+++ b/main.asm
@@ -45775,7 +45775,24 @@ RedPicBack: ; 33e0a (c:7e0a)
 OldManPic: ; 33e9a (c:7e9a)
 	INCBIN "pic/trainer/oldman.pic"
 
-INCBIN "baserom.gbc",$33f2b,$33f52 - $33f2b
+	ld hl, $d063
+	ld a, [$ff00+$f3]
+	and a
+	jr z, .asm_33f36
+	ld hl, $d068
+.asm_33f36
+	bit 1, [hl]
+	jr nz, .asm_33f4a
+	set 1, [hl]
+	ld hl, Func_3fba8
+	ld b, BANK(Func_3fba8)
+	call Bankswitch
+	ld hl, UnnamedText_33f52
+	jp PrintText
+.asm_33f4a
+	ld hl, Func_3fb53
+	ld b, BANK(Func_3fb53)
+	jp Bankswitch
 
 UnnamedText_33f52: ; 33f52 (c:7f52)
 	TX_FAR _UnnamedText_33f52
-- 
cgit v1.3.1-sl0p


From a684941cfcf88942cbecaecf997609acc3652a1a Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Sep 2013 20:57:44 -0400
Subject: Add labels to recently added asm

---
 main.asm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 3755c8ec..5f67b7a8 100644
--- a/main.asm
+++ b/main.asm
@@ -42243,7 +42243,7 @@ UnnamedText_1ebe2: ; 1ebe2 (7:6be2
 INCBIN "baserom.gbc",$1ec05,$1ec06 - $1ec05
 
 	call SaveScreenTilesToBuffer1
-	ld hl, $6c7f
+	ld hl, UnnamedText_1ec7f
 	call PrintText
 	xor a
 	ld [$d07c], a
@@ -42265,9 +42265,9 @@ INCBIN "baserom.gbc",$1ec05,$1ec06 - $1ec05
 	ld c, $9
 	call TextBoxBorder
 	ld hl, $c3ca
-	ld de, $6c84
+	ld de, BillsMonListText
 	call PlaceString
-	ld hl, $6caa
+	ld hl, UnnamedText_1ecaa
 	call PrintText
 	call SaveScreenTilesToBuffer2
 	call HandleMenuInput
@@ -42299,6 +42299,7 @@ UnnamedText_1ec7f: ; 1ec7f (7:6c7f)
 	db $50
 ; 0x1ec7f + 5 bytes
 
+BillsMonListText: ; 1ec84 (7:6c84)
 	db "EEVEE",$4e,"FLAREON",$4e,"JOLTEON",$4e,"VAPOREON",$4e,"CANCEL@"
 
 UnnamedText_1ecaa: ; 1ecaa (7:6caa)
-- 
cgit v1.3.1-sl0p