From e51fa8ba7aefc6319a3947f8d053776c734d5c5a Mon Sep 17 00:00:00 2001
From: dannye <corrnondacqb@yahoo.com>
Date: Fri, 6 Jan 2017 21:28:03 -0600
Subject: Expand ow tileset by 25 tiles

---
 engine/menu/main_menu.asm       |   2 +-
 engine/menu/start_sub_menus.asm |   1 +
 gfx/font.png                    | Bin 625 -> 1797 bytes
 gfx/tilesets/overworld.t7.png   | Bin 0 -> 3062 bytes
 home.asm                        |  12 ++++++------
 home/overworld.asm              |   2 +-
 main.asm                        |   8 +++++---
 7 files changed, 14 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 gfx/font.png
 create mode 100755 gfx/tilesets/overworld.t7.png

diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index cd4198b6..5e4c6cee 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -414,7 +414,7 @@ PrintPlayTime:
 	ld de, wPlayTimeHours
 	lb bc, 1, 3
 	call PrintNumber
-	ld [hl], $6d
+	ld [hl], $e9
 	inc hl
 	ld de, wPlayTimeMinutes
 	lb bc, LEADING_ZEROES | 1, 2
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index 251d7ae4..35071d79 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -27,6 +27,7 @@ StartMenu_Pokemon:
 	call GBPalWhiteOutWithDelay3
 	call RestoreScreenTilesAndReloadTilePatterns
 	call LoadGBPal
+	call ReloadMapData
 	jp RedisplayStartMenu
 .chosePokemon
 	call SaveScreenTilesToBuffer1
diff --git a/gfx/font.png b/gfx/font.png
old mode 100644
new mode 100755
index 34e86b4a..eb8431da
Binary files a/gfx/font.png and b/gfx/font.png differ
diff --git a/gfx/tilesets/overworld.t7.png b/gfx/tilesets/overworld.t7.png
new file mode 100755
index 00000000..f74692e5
Binary files /dev/null and b/gfx/tilesets/overworld.t7.png differ
diff --git a/home.asm b/home.asm
index def6200a..8b64d2ef 100644
--- a/home.asm
+++ b/home.asm
@@ -3103,15 +3103,15 @@ LoadTextBoxTilePatterns::
 	bit 7, a ; is the LCD enabled?
 	jr nz, .on
 .off
-	ld hl, TextBoxGraphics
-	ld de, vChars2 + $600
-	ld bc, TextBoxGraphicsEnd - TextBoxGraphics
+	ld hl, TextBoxGraphics + $190
+	ld de, vChars2 + $790
+	ld bc, TextBoxGraphicsEnd - TextBoxGraphics - $190
 	ld a, BANK(TextBoxGraphics)
 	jp FarCopyData2 ; if LCD is off, transfer all at once
 .on
-	ld de, TextBoxGraphics
-	ld hl, vChars2 + $600
-	lb bc, BANK(TextBoxGraphics), (TextBoxGraphicsEnd - TextBoxGraphics) / $10
+	ld de, TextBoxGraphics + $190
+	ld hl, vChars2 + $790
+	lb bc, BANK(TextBoxGraphics), (TextBoxGraphicsEnd - TextBoxGraphics) / $10 - $19
 	jp CopyVideoData ; if LCD is on, transfer during V-blank
 
 LoadHpBarAndStatusTilePatterns::
diff --git a/home/overworld.asm b/home/overworld.asm
index fe763b43..99d51086 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -876,7 +876,7 @@ LoadTilesetTilePatternData::
 	ld a,[wTilesetGfxPtr + 1]
 	ld h,a
 	ld de,vTileset
-	ld bc,$600
+	ld bc,$790
 	ld a,[wTilesetBank]
 	jp FarCopyData2
 
diff --git a/main.asm b/main.asm
index 15c7f8dc..10422021 100755
--- a/main.asm
+++ b/main.asm
@@ -4506,9 +4506,6 @@ INCLUDE "engine/hidden_object_functions18.asm"
 
 SECTION "bank19",ROMX,BANK[$19]
 
-Overworld_GFX:     INCBIN "gfx/tilesets/overworld.t2.2bpp"
-Overworld_Block:   INCBIN "gfx/blocksets/overworld.bst"
-
 RedsHouse1_GFX:
 RedsHouse2_GFX:    INCBIN "gfx/tilesets/reds_house.t7.2bpp"
 RedsHouse1_Block:
@@ -4747,3 +4744,8 @@ INCLUDE "engine/evolution.asm"
 INCLUDE "engine/overworld/elevator.asm"
 
 INCLUDE "engine/items/tm_prices.asm"
+
+SECTION "bank2d",ROMX,BANK[$2d]
+
+Overworld_GFX:     INCBIN "gfx/tilesets/overworld.t7.2bpp"
+Overworld_Block:   INCBIN "gfx/blocksets/overworld.bst"
-- 
cgit v1.2.3