diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 20:39:54 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 20:39:54 -0500 |
| commit | 335c2699f0b965be90c13bd3613b1df49f32af8b (patch) | |
| tree | 7738a0c52a558fceec0d7977843d5dede30ddae7 /engine/stats_screen.asm | |
| parent | 10173f2a6293542f8976cc5dccc9d2080a52caa7 (diff) | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# 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
Diffstat (limited to 'engine/stats_screen.asm')
| -rwxr-xr-x | engine/stats_screen.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index d4af8a8ac..59d96999f 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -230,7 +230,7 @@ StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2) ld a, [wMonType] cp TEMPMON jr nz, .breedmon - ld a, [wBufferMon] + ld a, [wBufferMonSpecies] ld [wCurSpecies], a call GetBaseData ld hl, wBufferMon @@ -240,7 +240,7 @@ StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2) jr .done .breedmon - farcall CopyPkmnToTempMon + farcall CopyMonToTempMon ld a, [wCurPartySpecies] cp EGG jr z, .done |