diff options
author | Bryan Bishop <kanzure@gmail.com> | 2012-01-12 15:35:39 -0600 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2012-01-12 15:35:39 -0600 |
commit | 9d23949741e871c21aee274eeb2871c443f2d508 (patch) | |
tree | 320959d3e79c8d0cd862d2a92078c7cee578e74a | |
parent | fd2a88bbf797645bf21d0add131f5b7badcfeed5 (diff) | |
parent | 112b90ab0b9855101ddef0713b6d8f7ab59ffe00 (diff) |
Merge in sawakita's $24d7 work.
hg-commit-id: d4536dd735de
-rw-r--r-- | pokered.asm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pokered.asm b/pokered.asm index c6c3fae0..c7483281 100644 --- a/pokered.asm +++ b/pokered.asm @@ -1032,7 +1032,13 @@ IndigoPlateauLobbyText4: db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL db REVIVE,MAX_REPEL,$FF -INCBIN "baserom.gbc",$24d6,$24e5 - $24d6 +TextScriptEndingChar: + db "@" +TextScriptEnd: + ld hl,TextScriptEndingChar + ret + +INCBIN "baserom.gbc",$24DB,$24E5 - $24DB VictoryRoad3Text10: VictoryRoad3Text9: @@ -1324,7 +1330,7 @@ LoadTrainerHeader: ; 0x31cc jr z, .asm_c2964 ; 0x31e3 $8 ld a, $6 call $3193 - jp $3c49 + jp PrintText .asm_c2964 ; 0x31ed ld a, $4 call $3193 @@ -1638,7 +1644,8 @@ PrintText: ; 3C49 call $2429 call Delay3 pop hl - ld bc,$C4B9 + FuncCoord 1,14 + ld bc,Coord ;$C4B9 jp $1B40 Func3C5F: ; 3C5F |