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

28
engine/battle/move_effects/encore.asm
View File

@@ -1,13 +1,13 @@
BattleCommand_Encore: ; 35864
; encore
ld hl, EnemyMonMoves
ld de, EnemyEncoreCount
ld hl, wEnemyMonMoves
ld de, wEnemyEncoreCount
ld a, [hBattleTurn]
and a
jr z, .ok
ld hl, BattleMonMoves
ld de, PlayerEncoreCount
ld hl, wBattleMonMoves
ld de, wPlayerEncoreCount
.ok
ld a, BATTLE_VARS_LAST_MOVE_OPP
call GetBattleVar
@@ -26,12 +26,12 @@ BattleCommand_Encore: ; 35864
cp b
jr nz, .got_move
ld bc, BattleMonPP - BattleMonMoves - 1
ld bc, wBattleMonPP - wBattleMonMoves - 1
add hl, bc
ld a, [hl]
and PP_MASK
jp z, .failed
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
jp nz, .failed
ld a, BATTLE_VARS_SUBSTATUS5_OPP
@@ -52,10 +52,10 @@ BattleCommand_Encore: ; 35864
jr z, .force_last_enemy_move
push hl
ld a, [LastPlayerMove]
ld a, [wLastPlayerMove]
ld b, a
ld c, 0
ld hl, BattleMonMoves
ld hl, wBattleMonMoves
.find_player_move
ld a, [hli]
cp b
@@ -73,9 +73,9 @@ BattleCommand_Encore: ; 35864
.got_player_move
pop hl
ld a, c
ld [CurMoveNum], a
ld [wCurMoveNum], a
ld a, b
ld [CurPlayerMove], a
ld [wCurPlayerMove], a
dec a
ld de, wPlayerMoveStruct
call GetMoveData
@@ -83,10 +83,10 @@ BattleCommand_Encore: ; 35864
.force_last_enemy_move
push hl
ld a, [LastEnemyMove]
ld a, [wLastEnemyMove]
ld b, a
ld c, 0
ld hl, EnemyMonMoves
ld hl, wEnemyMonMoves
.find_enemy_move
ld a, [hli]
cp b
@@ -104,9 +104,9 @@ BattleCommand_Encore: ; 35864
.got_enemy_move
pop hl
ld a, c
ld [CurEnemyMoveNum], a
ld [wCurEnemyMoveNum], a
ld a, b
ld [CurEnemyMove], a
ld [wCurEnemyMove], a
dec a
ld de, wEnemyMoveStruct
call GetMoveData