fix some constants

7 files changed, 14 insertions, 13 deletions

diff --git a/audio.asm b/audio.asm
index 07c5d7fd..ec41b356 100644
--- a/audio.asm
+++ b/audio.asm
@@ -436,11 +436,11 @@ PlayBattleMusic::
 	ld [wLowHealthAlarm], a
 	call StopAllMusic
 	call DelayFrame
-	ld c, $8 ; BANK(Music_GymLeaderBattle)
+	ld c, BANK(Music_GymLeaderBattle)
 	ld a, [wGymLeaderNo]
 	and a
 	jr z, .notGymLeaderBattle
-	ld a, $ea ; MUSIC_GYM_LEADER_BATTLE
+	ld a, MUSIC_GYM_LEADER_BATTLE
 	jr .playSong
 .notGymLeaderBattle
 	ld a, [wCurOpponent]
@@ -450,16 +450,16 @@ PlayBattleMusic::
 	jr z, .finalBattle
 	cp OPP_LANCE
 	jr nz, .normalTrainerBattle
-	ld a, $ea ; MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme
+	ld a, MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme
 	jr .playSong
 .normalTrainerBattle
-	ld a, $ed ; MUSIC_TRAINER_BATTLE
+	ld a, MUSIC_TRAINER_BATTLE
 	jr .playSong
 .finalBattle
-	ld a, $f3 ; MUSIC_FINAL_BATTLE
+	ld a, MUSIC_FINAL_BATTLE
 	jr .playSong
 .wildBattle
-	ld a, $f0 ; MUSIC_WILD_BATTLE
+	ld a, MUSIC_WILD_BATTLE
 .playSong
 	jp PlayMusic
 
@@ -515,7 +515,7 @@ Music_Cities1AlternateTempo::
 	ld c, 100
 	call DelayFrames ; wait for the fade-out to finish
 	ld c, BANK(Music_Cities1)
-	ld a, $c3 ; MUSIC_CITIES1
+	ld a, MUSIC_CITIES1
 	call PlayMusic
 	ld hl, wChannelCommandPointers
 	ld de, Music_Cities1_branch_aa6f
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index 79b5e858..7ff5fda1 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -831,7 +831,7 @@ TradeCenter_Trade:
 	ld [wTradedEnemyMonSpecies], a
 	ld a, 10
 	ld [wAudioFadeOutControl], a
-	ld a, $2
+	ld a, BANK(Music_SafariZone)
 	ld [wAudioSavedROMBank], a
 	ld a, MUSIC_SAFARI_ZONE
 	ld [wNewSoundID], a
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index eddccc29..cbeffcf0 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -594,5 +594,5 @@ JustAMomentText::
 	tx_pre_jump OpenBillsPCText
 
 OpenBillsPCText::
-	db $FD ; FuncTX_BillsPC
+	TX_BILLS_PC
 
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index ed733d7d..e5ba004e 100755
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -34,7 +34,7 @@ AnimateHealingMachine:
 	dec b
 	jr nz, .partyLoop
 	ld a, [wAudioROMBank]
-	cp $1f
+	cp BANK(AudioEngine3)
 	ld [wAudioSavedROMBank], a
 	jr nz, .next
 	call StopAllMusic
diff --git a/engine/save.asm b/engine/save.asm
index bb2193a2..c28ba1f6 100755
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -158,7 +158,7 @@ SaveSAV:
 	call PrintText
 	ld c,10
 	call DelayFrames
-	ld a, $b6 ; SFX_SAVE
+	ld a, SFX_SAVE
 	call PlaySoundWaitForCurrent
 	call WaitForSoundToFinish
 	ld c,30
diff --git a/home/init.asm b/home/init.asm
index da354aa6..a2f7f786 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -128,7 +128,7 @@ ClearVram:
 
 
 StopAllSounds::
-	ld a, $2
+	ld a, BANK(AudioEngine1)
 	ld [wAudioROMBank], a
 	ld [wAudioSavedROMBank], a
 	xor a
diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm
index e86d6d37..aaa29825 100755
--- a/scripts/mtmoon3.asm
+++ b/scripts/mtmoon3.asm
@@ -493,7 +493,8 @@ MtMoon3Text1:
 	TX_ASM
 	CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	jr z, .asm_4a02f
-	and $81 ; CheckEitherEventSetReuseA EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL
+	; CheckEitherEventSetReuseA EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL
+	and (1 << (EVENT_GOT_DOME_FOSSIL % 8)) | (1 << (EVENT_GOT_HELIX_FOSSIL % 8))
 	jr nz, .asm_4a057
 	ld hl, MtMoon3Text_4a116
 	call PrintText