summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-04-09 18:27:29 -0400
committeryenatch <yenatch@gmail.com>2014-04-09 18:27:29 -0400
commit0eb49d59416030cfa584b9b1e823b31ea854f46a (patch)
tree146429d5d58a801424f89e5e5e66ec2861accce9
parent5153360215b01362bf699ecba38f9554bee8e6e7 (diff)
downloadpokecrystal-0eb49d59416030cfa584b9b1e823b31ea854f46a.tar.gz
pokecrystal-0eb49d59416030cfa584b9b1e823b31ea854f46a.zip
Fix a title screen label that accidentally made its way into bank 1.
Somehow, a title screen (bank 0x43) function had its label put in bank 1. This caused changes to either bank to break the compiled rom. fixes 61a3d145
-rw-r--r--engine/title.asm12
-rw-r--r--main.asm17
2 files changed, 12 insertions, 17 deletions
diff --git a/engine/title.asm b/engine/title.asm
index 39025b2f..6c3f7fee 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -119,14 +119,14 @@ _TitleScreen: ; 10ed67
ld bc, $0714 ; 20x7
ld d, $80
ld e, $14
- call DrawGraphic
+ call DrawTitleGraphic
; Draw copyright text
ld hl, $9c03 ; BGMap1(3,0)
ld bc, $010d ; 13x1
ld d, $c
ld e, $10
- call DrawGraphic
+ call DrawTitleGraphic
; Initialize running Suicune?
ld d, $0
@@ -286,7 +286,13 @@ Function10eed2: ; 10eed2
ret
; 10eeef
-Function10eeef: ; 10eeef
+DrawTitleGraphic: ; 10eeef
+; input:
+; hl: draw location
+; b: height
+; c: width
+; d: tile to start drawing from
+; e: number of tiles to advance for each row
.asm_10eeef
push de
push bc
diff --git a/main.asm b/main.asm
index efe74a03..f7fb3802 100644
--- a/main.asm
+++ b/main.asm
@@ -5809,27 +5809,16 @@ Function6ec1: ; 6ec1
.asm_6ee9
bit 6, [hl]
- jr nz, Function6ef5
+ jr nz, .asm_6ef5
+
push hl
push bc
- ; fallthrough
-; 6eef
-
-DrawGraphic: ; 6eef
-; input:
-; hl: draw location
-; b: height
-; c: width
-; d: tile to start drawing from
-; e: number of tiles to advance for each row
call Function7009
pop bc
pop hl
ret c
- ; fallthrough
-; 6ef5
-Function6ef5: ; 6ef5
+.asm_6ef5
bit 5, [hl]
jr nz, .asm_6f05
push hl