Add Makefile option for verbose sym/map; fix some label names.

6 files changed, 15 insertions, 15 deletions

diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm
index 9c9572c7..bf65c683 100644
--- a/engine/battle/ai/items.asm
+++ b/engine/battle/ai/items.asm
@@ -385,7 +385,7 @@ AI_Items:
 	call EnemyUsedPotion
 	jp .Use
 
-.asm_382ae ; This appears to be unused
+.asm_3829f ; This appears to be unused
 	callfar AICheckEnemyMaxHP
 	jr c, .dont_use
 	push bc
@@ -700,7 +700,7 @@ EnemyWithdrewText:
 	text_far _EnemyWithdrewText
 	text_end
 
-Function384d5: ; This appears to be unused
+Function384c7: ; This appears to be unused
 	call AIUsedItemSound
 	call AI_HealStatus
 	ld a, FULL_HEAL_RED ; X_SPEED
@@ -747,7 +747,7 @@ EnemyUsedDireHit:
 	ld a, DIRE_HIT
 	jp PrintText_UsedItemOn_AND_AIUpdateHUD
 
-Function3851e: ; This appears to be unused
+Function38510: ; This appears to be unused
 	ldh [hDivisor], a
 	ld hl, wEnemyMonMaxHP
 	ld a, [hli]
diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm
index 9a16b224..2ff0c2da 100644
--- a/engine/battle/ai/scoring.asm
+++ b/engine/battle/ai/scoring.asm
@@ -278,7 +278,7 @@ AI_Smart:
 	call AIGetEnemyMove
 
 	ld a, [wEnemyMoveStruct + MOVE_EFFECT]
-	ld hl, .table_386f2
+	ld hl, .table_386e4
 	ld de, 3
 	call IsInArray
 
@@ -305,7 +305,7 @@ AI_Smart:
 	inc hl
 	jr .checkmove
 
-.table_386f2
+.table_386e4
 	dbw EFFECT_SLEEP,            AI_Smart_Sleep
 	dbw EFFECT_LEECH_HIT,        AI_Smart_LeechHit
 	dbw EFFECT_SELFDESTRUCT,     AI_Smart_Selfdestruct
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 3814348d..07d486b3 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1910,14 +1910,14 @@ RestoreHP:
 	ld b, a
 	ld a, [hl]
 	sbc b
-	jr c, .asm_3cd2d
+	jr c, .asm_3ccd5
 	ld a, b
 	ld [hli], a
 	ld [wBuffer6], a
 	ld a, c
 	ld [hl], a
 	ld [wBuffer5], a
-.asm_3cd2d
+.asm_3ccd5
 
 	call SwitchTurnCore
 	call UpdateHPBarBattleHuds
@@ -5133,7 +5133,7 @@ MoveSelectionScreen:
 	dec a
 	jr nz, .interpret_joypad
 	hlcoord 11, 14
-	ld de, .string_3e61c
+	ld de, .string_3e448
 	call PlaceString
 	jr .interpret_joypad
 
@@ -5229,7 +5229,7 @@ MoveSelectionScreen:
 	call SafeLoadTempTilemapToTilemap
 	jp MoveSelectionScreen
 
-.string_3e61c
+.string_3e448
 	db "@"
 
 .pressed_up
diff --git a/engine/battle/move_effects/metronome.asm b/engine/battle/move_effects/metronome.asm
index 25197d7c..02766c16 100644
--- a/engine/battle/move_effects/metronome.asm
+++ b/engine/battle/move_effects/metronome.asm
@@ -3,7 +3,7 @@ BattleCommand_Metronome:
 
 	call ClearLastMove
 	call CheckUserIsCharging
-	jr nz, .asm_3742b
+	jr nz, .asm_3752a
 
 	ld a, [wKickCounter]
 	push af
@@ -11,7 +11,7 @@ BattleCommand_Metronome:
 	pop af
 	ld [wKickCounter], a
 
-.asm_3742b
+.asm_3752a
 	call LoadMoveAnim
 
 .GetMove:
diff --git a/engine/battle/move_effects/protect.asm b/engine/battle/move_effects/protect.asm
index e66bce44..9f3899a9 100644
--- a/engine/battle/move_effects/protect.asm
+++ b/engine/battle/move_effects/protect.asm
@@ -16,9 +16,9 @@ ProtectChance:
 	ld de, wPlayerProtectCount
 	ldh a, [hBattleTurn]
 	and a
-	jr z, .asm_37637
+	jr z, .asm_37736
 	ld de, wEnemyProtectCount
-.asm_37637
+.asm_37736
 
 	call CheckOpponentWentFirst
 	jr nz, .failed
diff --git a/engine/battle/move_effects/spikes.asm b/engine/battle/move_effects/spikes.asm
index 96163a68..06aa35e8 100644
--- a/engine/battle/move_effects/spikes.asm
+++ b/engine/battle/move_effects/spikes.asm
@@ -4,9 +4,9 @@ BattleCommand_Spikes:
 	ld hl, wEnemyScreens
 	ldh a, [hBattleTurn]
 	and a
-	jr z, .asm_3768e
+	jr z, .asm_3778d
 	ld hl, wPlayerScreens
-.asm_3768e
+.asm_3778d
 
 ; Fails if spikes are already down!