Merge pull request #437 from roukaour/master

Reorganize battle/; rename most "header" misnomers; gfx/pics → gfx/pokemon

1 files changed, 0 insertions, 99 deletions

diff --git a/battle/effects/rollout.asm b/battle/effects/rollout.asm
deleted file mode 100644
index 4ce9ab3d8..000000000
--- a/battle/effects/rollout.asm
+++ /dev/null
@@ -1,99 +0,0 @@
-MAX_ROLLOUT_COUNT EQU 5
-
-
-BattleCommand_CheckCurl: ; 37718
-; checkcurl
-
-	ld de, PlayerRolloutCount
-	ld a, [hBattleTurn]
-	and a
-	jr z, .ok
-	ld de, EnemyRolloutCount
-.ok
-	ld a, BATTLE_VARS_SUBSTATUS1
-	call GetBattleVar
-	bit SUBSTATUS_ROLLOUT, a
-	jr z, .reset
-
-	ld b, $4 ; doturn
-	jp SkipToBattleCommand
-
-.reset
-	xor a
-	ld [de], a
-	ret
-; 37734
-
-
-BattleCommand_RolloutPower: ; 37734
-; rolloutpower
-
-	ld a, BATTLE_VARS_STATUS
-	call GetBattleVar
-	and SLP
-	ret nz
-
-	ld hl, PlayerRolloutCount
-	ld a, [hBattleTurn]
-	and a
-	jr z, .got_rollout_count
-	ld hl, EnemyRolloutCount
-
-.got_rollout_count
-	ld a, [hl]
-	and a
-	jr nz, .skip_set_rampage
-	ld a, 1
-	ld [wSomeoneIsRampaging], a
-
-.skip_set_rampage
-	ld a, [AttackMissed]
-	and a
-	jr z, .hit
-
-	ld a, BATTLE_VARS_SUBSTATUS1
-	call GetBattleVarAddr
-	res 6, [hl]
-	ret
-
-.hit
-	inc [hl]
-	ld a, [hl]
-	ld b, a
-	cp MAX_ROLLOUT_COUNT
-	jr c, .not_done_with_rollout
-
-	ld a, BATTLE_VARS_SUBSTATUS1
-	call GetBattleVarAddr
-	res SUBSTATUS_ROLLOUT, [hl]
-	jr .done_with_substatus_flag
-
-.not_done_with_rollout
-	ld a, BATTLE_VARS_SUBSTATUS1
-	call GetBattleVarAddr
-	set SUBSTATUS_ROLLOUT, [hl]
-
-.done_with_substatus_flag
-	ld a, BATTLE_VARS_SUBSTATUS2
-	call GetBattleVar
-	bit SUBSTATUS_CURLED, a
-	jr z, .not_curled
-	inc b
-.not_curled
-.loop
-	dec b
-	jr z, .done_damage
-
-	ld hl, CurDamage + 1
-	sla [hl]
-	dec hl
-	rl [hl]
-	jr nc, .loop
-
-	ld a, $ff
-	ld [hli], a
-	ld [hl], a
-
-.done_damage
-	ret
-; 37791