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

26
engine/battle/move_effects/baton_pass.asm
View File

@@ -90,7 +90,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
ret z
ld a, 1
ld [wPlayerAction], a
ld [wBattlePlayerAction], a
call LoadStandardMenuHeader
ld hl, LinkBattleSendReceiveAction
@@ -98,7 +98,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
call CloseWindow
xor a
ld [wPlayerAction], a
ld [wBattlePlayerAction], a
ret
; 37a82
@@ -113,7 +113,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
ld hl, LinkBattleSendReceiveAction
call CallBattleCore
ld a, [OTPartyCount]
ld a, [wOTPartyCount]
add BATTLEACTION_SWITCH1
ld b, a
ld a, [wBattleAction]
@@ -123,7 +123,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
jr c, .switch
.baton_pass
ld a, [CurOTMon]
ld a, [wCurOTMon]
add BATTLEACTION_SWITCH1
ld [wBattleAction], a
.switch
@@ -157,11 +157,11 @@ ResetBatonPassStatus: ; 37ab1
call ResetActorDisable
; Attraction isn't passed.
ld hl, PlayerSubStatus1
ld hl, wPlayerSubStatus1
res SUBSTATUS_IN_LOVE, [hl]
ld hl, EnemySubStatus1
ld hl, wEnemySubStatus1
res SUBSTATUS_IN_LOVE, [hl]
ld hl, PlayerSubStatus5
ld hl, wPlayerSubStatus5
ld a, BATTLE_VARS_SUBSTATUS5
call GetBattleVarAddr
@@ -182,10 +182,10 @@ ResetBatonPassStatus: ; 37ab1
CheckAnyOtherAlivePartyMons: ; 37ae9
ld hl, PartyMon1HP
ld a, [PartyCount]
ld hl, wPartyMon1HP
ld a, [wPartyCount]
ld d, a
ld a, [CurBattleMon]
ld a, [wCurBattleMon]
ld e, a
jr CheckAnyOtherAliveMons
@@ -193,10 +193,10 @@ CheckAnyOtherAlivePartyMons: ; 37ae9
CheckAnyOtherAliveEnemyMons: ; 37af6
ld hl, OTPartyMon1HP
ld a, [OTPartyCount]
ld hl, wOTPartyMon1HP
ld a, [wOTPartyCount]
ld d, a
ld a, [CurOTMon]
ld a, [wCurOTMon]
ld e, a
; fallthrough