Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm
This commit is contained in:
Rangi
2018-02-25 20:39:54 -05:00
parent 10173f2a62 f44f306cfd
commit 335c2699f0
98 changed files with 1274 additions and 1227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/pack.asm
View File

@@ -494,7 +494,7 @@ UseItem: ; 10311
ret
.NoPokemon:
ld hl, TextJump_YouDontHaveAPkmn
ld hl, TextJump_YouDontHaveAMon
call Pack_PrintTextNoScroll
ret
@@ -648,7 +648,7 @@ GiveItem: ; 103fd
ret
.NoPokemon: ; 10486 (4:4486)
ld hl, TextJump_YouDontHaveAPkmn
ld hl, TextJump_YouDontHaveAMon
call Pack_PrintTextNoScroll
ret
; 1048d (4:448d)
@@ -1668,9 +1668,9 @@ Text_ThisIsntTheTime: ; 0x10af3
db "@"
; 0x10af8
TextJump_YouDontHaveAPkmn: ; 0x10af8
TextJump_YouDontHaveAMon: ; 0x10af8
; You don't have a #MON!
text_jump Text_YouDontHaveAPkmn
text_jump Text_YouDontHaveAMon
db "@"
; 0x10afd