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 /mobile | |
| 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 'mobile')
| -rw-r--r-- | mobile/mobile_40.asm | 2 | ||||
| -rwxr-xr-x | mobile/mobile_46.asm | 10 | ||||
| -rwxr-xr-x | mobile/mobile_5c.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_5f.asm | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index dbb682b56..a4cc4ccb8 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -5410,7 +5410,7 @@ Function1023c6: ; 1023c6 ld a, [wcd4c] dec a ld [wCurPartyMon], a - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox ld hl, wPartyCount diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 03f0a2380..5ee3ea1e8 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -7143,8 +7143,8 @@ Function11b483: ; 11b483 add hl, de pop de push de - ld b, OTPARTYMON - predef CalcPkmnStats + ld b, TRUE + predef CalcMonStats pop de ld h, d ld l, e @@ -7321,7 +7321,7 @@ Function11b5c0: ; 11b5c0 ld a, [wcd82] dec a ld [wCurPartyMon], a - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox farcall Function170807 @@ -7562,8 +7562,8 @@ Function11b6b4: ; 11b6b4 ld hl, $c60d + MON_STAT_EXP - 1 ld de, $c60d + MON_MAXHP - ld b, $1 - predef CalcPkmnStats + ld b, TRUE + predef CalcMonStats ld de, $c60d + MON_MAXHP ld hl, $c60d + MON_HP ld a, [de] diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 3f7dcbc43..86cb67b71 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -220,7 +220,7 @@ Function170c8b: ; 170c8b CheckBTMonMovesForErrors: ; 170c98 ld c, BATTLETOWER_PARTY_LENGTH - ld hl, wBT_OTTempPkmn1Moves + ld hl, wBT_OTTempMon1Moves .loop push hl ld a, [hl] diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index fc32032c0..9157353b0 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -2441,8 +2441,8 @@ Function17ded9: ; 17ded9 ld d, h ld e, l push hl - ld b, $0 - farcall CalcPkmnStats + ld b, FALSE + farcall CalcMonStats ld a, [wPartyCount] dec a ld hl, wPartyMon1HP @@ -2531,7 +2531,7 @@ Function17e026: ; 17e026 push bc push hl farcall LoadEnemyMon - farcall SendPkmnIntoBox + farcall SendMonIntoBox farcall SetBoxMonCaughtData pop hl pop bc |