From 1d9a68dbdd0132035f1fc7b7ea8f7fdc24741507 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 24 Jun 2018 16:09:41 +0200 Subject: Remove all address comments --- engine/battle/misc.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engine/battle/misc.asm') diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index 581f5381e..1b6cb6783 100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm @@ -1,4 +1,4 @@ -_DisappearUser: ; fbd54 +_DisappearUser: xor a ld [hBGMapMode], a ld a, [hBattleTurn] @@ -12,14 +12,14 @@ _DisappearUser: ; fbd54 call ClearBox jr FinishAppearDisappearUser -_AppearUserRaiseSub: ; fbd69 (3e:7d69) +_AppearUserRaiseSub: farcall BattleCommand_RaiseSubNoAnim jr AppearUser -_AppearUserLowerSub: ; fbd71 (3e:7d71) +_AppearUserLowerSub: farcall BattleCommand_LowerSubNoAnim -AppearUser: ; fbd77 (3e:7d77) +AppearUser: xor a ld [hBGMapMode], a ld a, [hBattleTurn] @@ -34,23 +34,23 @@ AppearUser: ; fbd77 (3e:7d77) .okay ld [hGraphicStartTile], a predef PlaceGraphic -FinishAppearDisappearUser: ; fbd91 (3e:7d91) +FinishAppearDisappearUser: ld a, $1 ld [hBGMapMode], a ret -GetEnemyFrontpicCoords: ; fbd96 (3e:7d96) +GetEnemyFrontpicCoords: hlcoord 12, 0 lb bc, 7, 7 ret -GetPlayerBackpicCoords: ; fbd9d (3e:7d9d) +GetPlayerBackpicCoords: hlcoord 2, 6 lb bc, 6, 6 ret -DoWeatherModifiers: ; fbda4 +DoWeatherModifiers: ld de, WeatherTypeModifiers ld a, [wBattleWeather] @@ -148,7 +148,7 @@ DoWeatherModifiers: ; fbda4 INCLUDE "data/battle/weather_modifiers.asm" -DoBadgeTypeBoosts: ; fbe24 +DoBadgeTypeBoosts: ld a, [wLinkMode] and a ret nz -- cgit v1.2.3 From 67d1364c7acfd5e8e2256080e16a14cfa59a5abc Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 24 Jun 2018 23:22:50 -0400 Subject: Fix triple newlines left over from removing address comments --- engine/battle/misc.asm | 3 --- 1 file changed, 3 deletions(-) (limited to 'engine/battle/misc.asm') diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index 1b6cb6783..74b942743 100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm @@ -49,7 +49,6 @@ GetPlayerBackpicCoords: lb bc, 6, 6 ret - DoWeatherModifiers: ld de, WeatherTypeModifiers @@ -76,7 +75,6 @@ DoWeatherModifiers: inc de jr .CheckWeatherType - .done_weather_types ld de, WeatherMoveModifiers @@ -147,7 +145,6 @@ DoWeatherModifiers: INCLUDE "data/battle/weather_modifiers.asm" - DoBadgeTypeBoosts: ld a, [wLinkMode] and a -- cgit v1.2.3 From 1caa50a6474edd3896911409d548faa0731621b7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 25 Jun 2018 12:24:18 -0400 Subject: No space between labels and bodies --- engine/battle/misc.asm | 1 - 1 file changed, 1 deletion(-) (limited to 'engine/battle/misc.asm') diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index 74b942743..48062f643 100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm @@ -50,7 +50,6 @@ GetPlayerBackpicCoords: ret DoWeatherModifiers: - ld de, WeatherTypeModifiers ld a, [wBattleWeather] ld b, a -- cgit v1.2.3