diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/ai/items.asm | 2 | ||||
| -rw-r--r-- | battle/anims.asm | 4 | ||||
| -rw-r--r-- | battle/bg_effects.asm | 26 | ||||
| -rw-r--r-- | battle/core.asm | 2 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 12 | ||||
| -rwxr-xr-x | battle/sliding_intro.asm | 10 | ||||
| -rwxr-xr-x | battle/trainer_huds.asm | 2 |
7 files changed, 29 insertions, 29 deletions
diff --git a/battle/ai/items.asm b/battle/ai/items.asm index 90bfb840d..16511de79 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -416,7 +416,7 @@ AI_Items: ; 39196 jp .Use ; 382ae -.asm_382ae: ; This appears to be unused +.asm_382ae ; This appears to be unused callab AICheckEnemyMaxHP jr c, .dont_use push bc diff --git a/battle/anims.asm b/battle/anims.asm index 3d7525ec5..7a4e8459c 100644 --- a/battle/anims.asm +++ b/battle/anims.asm @@ -3550,7 +3550,7 @@ BattleAnim_CottonSpore: ; cae84 anim_obp0 $54 anim_1gfx ANIM_GFX_MISC anim_sound 0, 1, SFX_POWDER -.loop: ; cae8b +.loop ; cae8b anim_obj ANIM_OBJ_81, -16, 4, 4, 0, $0 anim_wait 8 anim_loop 5, .loop @@ -3592,7 +3592,7 @@ BattleAnim_Spite: ; caed6 BattleAnim_PowderSnow: ; caee2 anim_1gfx ANIM_GFX_ICE -.loop: ; caee4 +.loop ; caee4 anim_sound 6, 2, SFX_SHINE anim_obj ANIM_OBJ_8F, 8, 0, 11, 0, $23 anim_wait 2 diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index f2ddde3e0..52917b61f 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -2218,7 +2218,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61) dw .one -.zero: ; c8c68 (32:4c68) +.zero ; c8c68 (32:4c68) call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides ld a, $43 @@ -2234,7 +2234,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61) ld [hl], $20 ret -.one: ; c8c85 (32:4c85) +.one ; c8c85 (32:4c85) ld hl, BG_EFFECT_STRUCT_03 add hl, bc ld a, [hl] @@ -2264,7 +2264,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2) dw .two -.zero: ; c8cab (32:4cab) +.zero ; c8cab (32:4cab) call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides ld a, $43 @@ -2278,7 +2278,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2) ld [hl], $0 ret -.one: ; c8cc3 (32:4cc3) +.one ; c8cc3 (32:4cc3) ld hl, BG_EFFECT_STRUCT_03 add hl, bc ld a, [hl] @@ -2294,7 +2294,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2) ld [hl], a ret -.two: ; c8cdd (32:4cdd) +.two ; c8cdd (32:4cdd) call BattleAnim_ResetLCDStatCustom ret @@ -2429,7 +2429,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) dw .two_dmg -.zero_dmg: ; c8d8b (32:4d8b) +.zero_dmg ; c8d8b (32:4d8b) call BattleBGEffects_IncrementJumptable ld a, $e4 call BattleBGEffects_SetLYOverrides @@ -2447,7 +2447,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) ld [hl], a ret -.one_dmg: ; c8daa (32:4daa) +.one_dmg ; c8daa (32:4daa) ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ld a, [hl] @@ -2472,7 +2472,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) dec [hl] ret -.two_dmg: ; c8dc9 (32:4dc9) +.two_dmg ; c8dc9 (32:4dc9) call BattleBGEffects_ResetVideoHRAM ld a, %11100100 ld [rBGP], a @@ -2494,7 +2494,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) dw .four_cgb -.zero_cgb: ; c8de7 (32:4de7) +.zero_cgb ; c8de7 (32:4de7) call BGEffect_CheckBattleTurn jr nz, .player_turn_cgb call BattleBGEffects_IncrementJumptable @@ -2510,7 +2510,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) ld [hl], a ret -.one_cgb: ; c8e02 (32:4e02) +.one_cgb ; c8e02 (32:4e02) ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ld a, [hl] @@ -2535,13 +2535,13 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) dec [hl] ret -.two_cgb: ; c8e21 (32:4e21) +.two_cgb ; c8e21 (32:4e21) ld a, $e4 call BGEffects_LoadBGPal0_OBPal1 call EndBattleBGEffect ret -.three_cgb: ; c8e2a (32:4e2a) +.three_cgb ; c8e2a (32:4e2a) ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ld a, [hl] @@ -2566,7 +2566,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) dec [hl] ret -.four_cgb: ; c8e49 (32:4e49) +.four_cgb ; c8e49 (32:4e49) ld a, $e4 call BGEffects_LoadBGPal1_OBPal0 call EndBattleBGEffect diff --git a/battle/core.asm b/battle/core.asm index 4a8d37997..eb73f77a2 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -565,7 +565,7 @@ DetermineMoveOrder: ; 3c314 ret ; 3c3f3 -.enemy_first: ; 3c3f3 +.enemy_first ; 3c3f3 and a ret ; 3c3f5 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index c791e9947..5c1214cb7 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -3337,7 +3337,7 @@ BattleCommand_BeatUp: ; 35461 ; 355b0 -.beatup_fail: ; 355b0 +.beatup_fail ; 355b0 ld b, buildopponentrage_command jp SkipToBattleCommand @@ -5188,7 +5188,7 @@ BattleCommand_Poison: ; 35f2c ; 35fc0 -.apply_poison: ; 35fc0 +.apply_poison ; 35fc0 call AnimateCurrentMove call PoisonOpponent jp RefreshBattleHuds @@ -5196,7 +5196,7 @@ BattleCommand_Poison: ; 35f2c ; 35fc9 -.check_toxic: ; 35fc9 +.check_toxic ; 35fc9 ld a, BATTLE_VARS_SUBSTATUS5_OPP call GetBattleVarAddr ld a, [hBattleTurn] @@ -5671,14 +5671,14 @@ CheckIfStatCanBeRaised: ; 361ef ; 3626e -.stats_already_max: ; 3626e +.stats_already_max ; 3626e pop hl dec [hl] ; fallthrough ; 36270 -.cant_raise_stat: ; 36270 +.cant_raise_stat ; 36270 ld a, $2 ld [FailedMessage], a ld a, $1 @@ -5688,7 +5688,7 @@ CheckIfStatCanBeRaised: ; 361ef ; 3627b -.stat_raise_failed: ; 3627b +.stat_raise_failed ; 3627b ld a, $1 ld [FailedMessage], a ret diff --git a/battle/sliding_intro.asm b/battle/sliding_intro.asm index 6361f7fa7..194a4cd1b 100755 --- a/battle/sliding_intro.asm +++ b/battle/sliding_intro.asm @@ -14,7 +14,7 @@ BattleIntroSlidingPics: ; 4e980 ret ; 4e998 -.subfunction1: ; 4e998 +.subfunction1 ; 4e998 call .subfunction4 ld a, $90 ld [hSCX], a @@ -25,7 +25,7 @@ BattleIntroSlidingPics: ; 4e980 ret ; 4e9ab -.subfunction2: ; 4e9ab +.subfunction2 ; 4e9ab ld d, $90 ld e, $72 ld a, $48 @@ -61,7 +61,7 @@ endr ret ; 4e9d6 -.subfunction3: ; 4e9d6 +.subfunction3 ; 4e9d6 ld hl, Sprites + 1 ; x pixel ld c, $12 ; 18 ld de, $4 @@ -75,7 +75,7 @@ endr ret ; 4e9e5 -.subfunction4: ; 4e9e5 +.subfunction4 ; 4e9e5 ld hl, LYOverrides ld a, $90 ld bc, SCREEN_HEIGHT_PX @@ -83,7 +83,7 @@ endr ret ; 4e9f1 -.subfunction5: ; 4e9f1 +.subfunction5 ; 4e9f1 ld hl, LYOverrides ld a, d ld c, $3e ; 62 diff --git a/battle/trainer_huds.asm b/battle/trainer_huds.asm index 7a5e17bdd..ad32df1cd 100755 --- a/battle/trainer_huds.asm +++ b/battle/trainer_huds.asm @@ -238,7 +238,7 @@ LoadBallIconGFX: ; 2c165 ret ; 2c172 -.gfx: ; 2c172 +.gfx ; 2c172 INCBIN "gfx/battle/balls.2bpp" ; 2c1b2 |