summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-12 13:22:41 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-12 13:22:41 -0600
commitc1ad3c081e0654c2e567bcbcdae45ff9d8ada41a (patch)
tree633be69a8f3879644feee2d18895d2d32e3c3095
parent2c24aa3510d833f6d4bec31f8da50aac2d825e72 (diff)
insert $8 asm for Route11GateUpstairsText2
hg-commit-id: 152301ccc043
-rw-r--r--pokered.asm33
1 files changed, 32 insertions, 1 deletions
diff --git a/pokered.asm b/pokered.asm
index 1046f13c..bea6e23e 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -19692,9 +19692,40 @@ Route11GateUpstairsText1: ; 0x4945f
ld [W_WHICHTRADE], a
ld a, $54
call Predef
+asm_49469:
jp $24d7
-INCBIN "baserom.gbc",$4946c,$494a8 - $4946c
+Route11GateUpstairsText2: ; 0x4946c
+ db $8
+ ld a, [$d7d6]
+ add a
+ jr c, .asm_4949b ; 0x49471 $28
+ ld a, $1e
+ ld [$ff00+$db], a
+ ld a, $47
+ ld [$ff00+$dc], a
+ ld [$d11e], a
+ call $2fcf
+ ld h, d
+ ld l, e
+ ld de, $cc5b
+ ld bc, $000d
+ call CopyData
+ ld a, $62
+ call Predef
+ ld a, [$ff00+$db]
+ dec a
+ jr nz, .asm_494a1 ; 0x49494 $b
+ ld hl, $d7d6
+ set 7, [hl]
+.asm_4949b
+ ld hl, $54a3
+ call PrintText
+.asm_494a1
+ jr asm_49469 ; 0x494a1 $c6
+; 0x494a3
+
+INCBIN "baserom.gbc",$494a3,$5
Route11GateUpstairsText3: ; 0x494a8
db $08 ; asm