diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/ai/items.asm | 4 | ||||
| -rwxr-xr-x | battle/ai/move.asm | 4 | ||||
| -rw-r--r-- | battle/ai/scoring.asm | 52 | ||||
| -rw-r--r-- | battle/anim_commands.asm | 6 | ||||
| -rw-r--r-- | battle/bg_effects.asm | 8 | ||||
| -rw-r--r-- | battle/core.asm | 16 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 20 | ||||
| -rwxr-xr-x | battle/trainer_huds.asm | 8 |
8 files changed, 59 insertions, 59 deletions
diff --git a/battle/ai/items.asm b/battle/ai/items.asm index bd7f2d8d2..ae367c83c 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -196,9 +196,9 @@ AI_TryItem: ; 38105 jr z, .has_item dec de -rept 3 inc hl -endr + inc hl + inc hl jr .loop .has_item diff --git a/battle/ai/move.asm b/battle/ai/move.asm index a267cad8c..6e5aca358 100755 --- a/battle/ai/move.asm +++ b/battle/ai/move.asm @@ -19,9 +19,9 @@ AIChooseMove: ; 440ce ; The default score is 20. Unusable moves are given a score of 80. ld a, 20 ld hl, Buffer1 -rept 3 ld [hli], a -endr + ld [hli], a + ld [hli], a ld [hl], a ; Don't pick disabled moves. diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 9f568e9fd..3091697e5 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -596,9 +596,9 @@ AI_Smart_Explosion: ; 388a6 ret c .asm_388c6 -rept 3 inc [hl] -endr + inc [hl] + inc [hl] ret ; 388ca @@ -610,9 +610,9 @@ AI_Smart_DreamEater: ; 388ca call Random cp 25 ret c -rept 3 dec [hl] -endr + dec [hl] + dec [hl] ret ; 388d4 @@ -1208,9 +1208,9 @@ AI_Smart_Fly: ; 38b12 call AICompareSpeed ret nc -rept 3 dec [hl] -endr + dec [hl] + dec [hl] ret ; 38b20 @@ -1515,9 +1515,9 @@ AI_Smart_Encore: ; 38c3b ret .asm_38c81 -rept 3 inc [hl] -endr + inc [hl] + inc [hl] ret .EncoreMoves: @@ -1587,15 +1587,15 @@ AI_Smart_SleepTalk: ; 38cba cp $1 jr z, .asm_38cc7 -rept 3 dec [hl] -endr + dec [hl] + dec [hl] ret .asm_38cc7 -rept 3 inc [hl] -endr + inc [hl] + inc [hl] ret ; 38ccb @@ -1607,9 +1607,9 @@ AI_Smart_DefrostOpponent: ; 38ccb ld a, [EnemyMonStatus] and $20 ret z -rept 3 dec [hl] -endr + dec [hl] + dec [hl] ret ; 38cd5 @@ -1708,9 +1708,9 @@ AI_Smart_HealBell: ; 38d1f jr z, .next ; status -rept 3 dec hl -endr + dec hl + dec hl ld a, [hl] or c ld c, a @@ -1774,9 +1774,9 @@ AI_Smart_PriorityHit: ; 38d5a ld a, [BattleMonHP] sbc b ret nc -rept 3 dec [hl] -endr + dec [hl] + dec [hl] ret ; 38d93 @@ -1900,9 +1900,9 @@ AI_Smart_MeanLook: ; 38dfb .asm_38e26 call AI_80_20 ret c -rept 3 dec [hl] -endr + dec [hl] + dec [hl] ret ; 38e2e @@ -2233,9 +2233,9 @@ AI_Smart_Endure: ; 38fac call AI_80_20 ret c -rept 3 dec [hl] -endr + dec [hl] + dec [hl] ret .asm_38fcb @@ -2274,9 +2274,9 @@ AI_Smart_FuryCutter: ; 38fdb cp 3 jr c, .end -rept 3 dec [hl] -endr + dec [hl] + dec [hl] .end @@ -2579,9 +2579,9 @@ AI_Smart_WeatherMove: ; 3910d ; 3911e AIBadWeatherType: ; 3911e -rept 3 inc [hl] -endr + inc [hl] + inc [hl] ret ; 39122 diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 352dc77a7..957b2a066 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -108,7 +108,7 @@ RunBattleAnimScript: ; cc163 call RunBattleAnimCommand call _ExecuteBGEffects call BattleAnim_UpdateOAM_All - call Function3b0c + call PushLYOverrides call BattleAnimRequestPals ; Speed up Rollout's animation. @@ -265,9 +265,9 @@ BattleAnim_ClearCGB_OAMFlags: ; cc23d ld a, [hl] and $f0 ld [hli], a -rept 3 inc hl -endr + inc hl + inc hl dec c jr nz, .loop ret diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index 0aae0c5f3..d3253eb97 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -738,9 +738,9 @@ BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed) ld l, a ld a, [wBattleAnimTemp2] ld h, a -rept 3 add hl, de -endr + add hl, de + add hl, de ld a, [hl] cp -1 jr z, .end @@ -805,9 +805,9 @@ endr ld e, [hl] ld d, 0 ld hl, .BGSquares -rept 3 add hl, de -endr + add hl, de + add hl, de ld a, [hli] ld b, a and $f diff --git a/battle/core.asm b/battle/core.asm index 91c1fe509..39d4dfaee 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -4080,9 +4080,9 @@ InitBattleMon: ; 3da0d ld de, BattleMonDVs ld bc, MON_PKRUS - MON_DVS call CopyBytes -rept 3 inc hl -endr + inc hl + inc hl ld de, BattleMonLevel ld bc, PARTYMON_STRUCT_LENGTH - MON_LEVEL call CopyBytes @@ -4172,9 +4172,9 @@ InitEnemyMon: ; 3dabd ld de, EnemyMonDVs ld bc, MON_PKRUS - MON_DVS call CopyBytes -rept 3 inc hl -endr + inc hl + inc hl ld de, EnemyMonLevel ld bc, PARTYMON_STRUCT_LENGTH - MON_LEVEL call CopyBytes @@ -4302,9 +4302,9 @@ rept 4 endr ld [hl], a ld hl, PlayerUsedMoves -rept 3 ld [hli], a -endr + ld [hli], a + ld [hli], a ld [hl], a ld [PlayerDisableCount], a ld [PlayerFuryCutterCount], a @@ -6637,9 +6637,9 @@ LoadEnemyMon: ; 3e8eb xor a ld h, d ld l, e -rept 3 ld [hli], a -endr + ld [hli], a + ld [hli], a ld [hl], a ; Make sure the predef knows this isn't a partymon ld [MagikarpLength], a diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 32d247e8c..6cc4db94e 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -3402,9 +3402,9 @@ HitSelfInConfusion: ; 355dd sla c rl b .mimic_screen -rept 3 dec hl -endr + dec hl + dec hl ld a, [hli] ld l, [hl] ld h, a @@ -3948,9 +3948,9 @@ BattleCommand_Encore: ; 35864 set SUBSTATUS_ENCORED, [hl] call BattleRandom and $3 -rept 3 inc a -endr + inc a + inc a ld [de], a call CheckOpponentWentFirst jr nz, .finish_move @@ -4089,12 +4089,12 @@ BattleCommand_PainSplit: ; 35926 ld a, [CurDamage + 1] rr a ld [CurDamage + 1], a -rept 3 inc hl -endr -rept 3 + inc hl + inc hl + inc de + inc de inc de -endr .EnemyShareHP: ; 359ac ld c, [hl] @@ -7442,9 +7442,9 @@ BattleCommand_TrapTarget: ; 36c2d ret nz call BattleRandom and 3 -rept 3 inc a -endr + inc a + inc a ld [hl], a ld a, BATTLE_VARS_MOVE_ANIM call GetBattleVar diff --git a/battle/trainer_huds.asm b/battle/trainer_huds.asm index ad32df1cd..9a72700cc 100755 --- a/battle/trainer_huds.asm +++ b/battle/trainer_huds.asm @@ -81,9 +81,9 @@ StageBallTilesData: ; 2c059 jr z, .fainted .got_hp -rept 3 dec hl -endr + dec hl + dec hl ld a, [hl] and a ld b, $32 ; statused @@ -92,9 +92,9 @@ endr jr .load .fainted -rept 3 dec hl -endr + dec hl + dec hl .load ld a, b |