ref: 3cddafc519877869e76868f6acd54a19e5cfb2be
parent: 07a9c899b1a813d03af99e9e4d9a68784086ebea
parent: 40b8729cd5967f21ed324d8e3353322f89fdfcf3
author: Sanky <gsanky@gmail.com>
date: Tue Mar 6 18:52:51 EST 2012
Specified python2 executable. (Some systems default to Python 3.) hg-commit-id: a28f903ec455
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
${CC} -o $@ $>.asm.tx:
- python textpre.py < $< > $@
+ python2 textpre.py < $< > $@
pokered.gbc: pokered.o
rgblink -o $@ $<
binary files /dev/null b/gfx/font.1bpp differ
binary files /dev/null b/gfx/hp_bar_and_status.2bpp differ
binary files /dev/null b/gfx/p_tile.1bpp differ
binary files /dev/null b/gfx/pokemon_logo.2bpp differ
binary files /dev/null b/gfx/text_box.2bpp differ
--- a/main.asm
+++ b/main.asm
@@ -6846,15 +6846,15 @@
bit 7,a ; is the LCD enabled?
jr nz,.lcdEnabled\@
.lcdDisabled\@
- ld hl,$5a80
+ ld hl,FontGraphics
ld de,$8800
- ld bc,$0400
+ ld bc,(BANK(FontGraphics) << 8 | $00)
ld a,$04
jp FarCopyDataDouble ; if LCD is off, transfer all at once
.lcdEnabled\@
- ld de,$5a80
+ ld de,FontGraphics
ld hl,$8800
- ld bc,$0480
+ ld bc,(BANK(FontGraphics) << 8 | $80)
jp CopyVideoDataDouble ; if LCD is on, transfer during V-blank
; copies the text box tile patterns into VRAM
@@ -6863,15 +6863,15 @@
bit 7,a ; is the LCD enabled?
jr nz,.lcdEnabled\@
.lcdDisabled\@
- ld hl,$6288
+ ld hl,TextBoxGraphics
ld de,$9600
ld bc,$0200
- ld a,$04
+ ld a,BANK(TextBoxGraphics)
jp FarCopyData2 ; if LCD is off, transfer all at once
.lcdEnabled\@
- ld de,$6288
+ ld de,TextBoxGraphics
ld hl,$9600
- ld bc,$0420
+ ld bc,(BANK(TextBoxGraphics) << 8 | $20)
jp CopyVideoData ; if LCD is on, transfer during V-blank
; copies HP bar and status display tile patterns into VRAM
@@ -6880,15 +6880,15 @@
bit 7,a ; is the LCD enabled?
jr nz,.lcdEnabled\@
.lcdDisabled\@
- ld hl,$5ea0
+ ld hl,HpBarAndStatusGraphics
ld de,$9620
ld bc,$01e0
- ld a,$04
+ ld a,BANK(HpBarAndStatusGraphics)
jp FarCopyData2 ; if LCD is off, transfer all at once
.lcdEnabled\@
- ld de,$5ea0
+ ld de,HpBarAndStatusGraphics
ld hl,$9620
- ld bc,$041e
+ ld bc,(BANK(HpBarAndStatusGraphics) << 8 | $1e)
jp CopyVideoData ; if LCD is on, transfer during V-blank
INCBIN "baserom.gbc",$36E0,$3739 - $36E0
@@ -18427,9 +18427,24 @@
INCBIN "gfx/sprites/old_amber.2bpp" ; was $11300
LyingOldManSprite: ; 0x11340
INCBIN "gfx/sprites/lying_old_man.2bpp" ; was $11340
+
+PokemonLogoGraphics: ; 0x11380
+ INCBIN "gfx/pokemon_logo.2bpp"
+FontGraphics: ; 0x11a80
+ INCBIN "gfx/font.1bpp"
-INCBIN "baserom.gbc",$11380,$12953 - $11380
+INCBIN "baserom.gbc",$11e80,$11ea0 - $11e80
+HpBarAndStatusGraphics: ; 0x11ea0
+ INCBIN "gfx/hp_bar_and_status.2bpp"
+
+INCBIN "baserom.gbc",$12080,$12288 - $12080 ; FIXME
+
+TextBoxGraphics: ; 0x12288
+ INCBIN "gfx/text_box.2bpp"
+
+INCBIN "baserom.gbc",$12488,$12953 - $12488
+
; Predef 0x37
StatusScreen: ; 0x12953
call LoadMonData
@@ -18614,7 +18629,7 @@
ret
PTile: ; This is a single 1bpp "P" tile
-INCBIN "baserom.gbc",$12adc,$12ae4 - $12adc
+ INCBIN "gfx/p_tile.1bpp"
PrintStatsBox: ; 12ae4
ld a, d
--- a/textpre.py
+++ b/textpre.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# -*- coding: utf-8 -*-
import sys