diff options
| -rwxr-xr-x | engine/menu/main_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | gfx/font.png | bin | 625 -> 1797 bytes | |||
| -rwxr-xr-x | gfx/tilesets/overworld.t7.png | bin | 0 -> 3062 bytes | |||
| -rw-r--r-- | home.asm | 12 | ||||
| -rw-r--r-- | home/overworld.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 8 |
7 files changed, 14 insertions, 11 deletions
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 Binary files differindex 34e86b4a..eb8431da 100644..100755 --- a/gfx/font.png +++ b/gfx/font.png diff --git a/gfx/tilesets/overworld.t7.png b/gfx/tilesets/overworld.t7.png Binary files differnew file mode 100755 index 00000000..f74692e5 --- /dev/null +++ b/gfx/tilesets/overworld.t7.png @@ -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 @@ -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" |
