foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-23 06:58:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge in sawakita's $24d7 work.

Browse source 
hg-commit-id: d4536dd735de
This commit is contained in:
Bryan Bishop 2012-01-12 15:35:39 -06:00
commit 9d23949741
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pokered.asm
View file

@ -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