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:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
This commit is contained in:
Rangi
2018-02-03 18:21:53 -05:00
parent 6ff2cb20e6 b35eb72290
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
engine/radio.asm
View File

@@ -269,9 +269,9 @@ endr
ld a, BANK(JohtoGrassWildMons)
call GetFarByte
ld [wNamedObjectIndexBuffer], a
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
call GetPokemonName
ld hl, StringBuffer1
ld hl, wStringBuffer1
ld de, wMonOrItemNameBuffer
ld bc, MON_NAME_LENGTH
call CopyBytes
@@ -335,7 +335,7 @@ OPT_OakText3:
db "@"
OaksPkmnTalk7:
ld a, [CurPartySpecies]
ld a, [wCurPartySpecies]
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, OPT_MaryText1
@@ -688,7 +688,7 @@ ClearBottomLine:
PokedexShow_GetDexEntryBank:
push hl
push de
ld a, [CurPartySpecies]
ld a, [wCurPartySpecies]
dec a
rlca
rlca
@@ -722,7 +722,7 @@ PokedexShow1:
jr z, .loop
inc c
ld a, c
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, PokedexShowText
@@ -730,7 +730,7 @@ PokedexShow1:
jp NextRadioLine
PokedexShow2:
ld a, [CurPartySpecies]
ld a, [wCurPartySpecies]
dec a
ld hl, PokedexDataPointerTable
ld c, a
@@ -1011,12 +1011,12 @@ LuckyNumberShow7:
jp NextRadioLine
LuckyNumberShow8:
ld hl, StringBuffer1
ld hl, wStringBuffer1
ld de, wLuckyIDNumber
lb bc, PRINTNUM_LEADINGZEROS | 2, 5
call PrintNum
ld a, "@"
ld [StringBuffer1 + 5], a
ld [wStringBuffer1 + 5], a
ld hl, LC_Text8
ld a, LUCKY_NUMBER_SHOW_9
jp NextRadioLine
@@ -1188,7 +1188,7 @@ PeoplePlaces4: ; People
jr c, PeoplePlaces4
push bc
callfar GetTrainerClassName
ld de, StringBuffer1
ld de, wStringBuffer1
call CopyName1
pop bc
ld b, 1
@@ -1669,16 +1669,16 @@ GetBuenasPassword:
jr nz, .read_loop
dec c
jr nz, .read_loop
; ... and copy it into StringBuffer1.
; ... and copy it into wStringBuffer1.
.skip
ld hl, StringBuffer1
ld hl, wStringBuffer1
.copy_loop
ld a, [de]
inc de
ld [hli], a
cp "@"
jr nz, .copy_loop
ld de, StringBuffer1
ld de, wStringBuffer1
ret
INCLUDE "data/radio/buenas_passwords.asm"