Merge branch 'master' of https://github.com/YamaArashi/pokered

engine/overworld/elevator.asm

@@ -33,7 +33,7 @@ ShakeElevator: ; 7bf15 (1e:7f15)
 	ld a, SFX_SAFARI_ZONE_PA
 	call PlayMusic
 .musicLoop
-	ld a, [wc02a]
+	ld a, [wChannelSoundIDs + CH4]
 	cp $b9
 	jr z, .musicLoop
 	call UpdateSprites

engine/overworld/healing_machine.asm

@@ -15,44 +15,44 @@ AnimateHealingMachine: ; 70433 (1c:4433)
 	ld hl, wOAMBuffer + $84
 	ld de, PokeCenterOAMData
 	call CopyHealingMachineOAM
-	ld a, $4
-	ld [wMusicHeaderPointer], a
+	ld a, 4
+	ld [wAudioFadeOutControl], a
 	ld a, $ff
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
-.asm_70464
-	ld a, [wMusicHeaderPointer]
-	and a
-	jr nz, .asm_70464
+.waitLoop
+	ld a, [wAudioFadeOutControl]
+	and a ; is fade-out finished?
+	jr nz, .waitLoop ; if not, check again
 	ld a, [wPartyCount]
 	ld b, a
-.asm_7046e
+.partyLoop
 	call CopyHealingMachineOAM
 	ld a, SFX_HEALING_MACHINE
 	call PlaySound
 	ld c, 30
 	call DelayFrames
 	dec b
-	jr nz, .asm_7046e
-	ld a, [wc0ef]
+	jr nz, .partyLoop
+	ld a, [wAudioROMBank]
 	cp BANK(Audio3_UpdateMusic)
-	ld [wc0f0], a
-	jr nz, .asm_70495
+	ld [wAudioSavedROMBank], a
+	jr nz, .next
 	ld a, $ff
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
 	ld a, BANK(Music_PkmnHealed)
-	ld [wc0ef], a
-.asm_70495
+	ld [wAudioROMBank], a
+.next
 	ld a, MUSIC_PKMN_HEALED
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
 	ld d, $28
 	call FlashSprite8Times
-.asm_704a2
-	ld a, [wc026]
-	cp MUSIC_PKMN_HEALED
-	jr z, .asm_704a2
+.waitLoop2
+	ld a, [wChannelSoundIDs]
+	cp MUSIC_PKMN_HEALED ; is the healed music still playing?
+	jr z, .waitLoop2 ; if so, check gain
 	ld c, 32
 	call DelayFrames
 	pop af

engine/overworld/npc_movement.asm

@@ -163,10 +163,10 @@ PewterMuseumGuyMovementScriptPointerTable: ; 1a510 (6:6510)
 
 PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514)
 	ld a, BANK(Music_MuseumGuy)
-	ld [wc0ef], a
-	ld [wc0f0], a
+	ld [wAudioROMBank], a
+	ld [wAudioSavedROMBank], a
 	ld a, MUSIC_MUSEUM_GUY
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
 	ld a, [wSpriteIndex]
 	swap a
@@ -219,10 +219,10 @@ PewterGymGuyMovementScriptPointerTable: ; 1a57d (6:657d)
 
 PewterMovementScript_WalkToGym: ; 1a581 (6:6581)
 	ld a, BANK(Music_MuseumGuy)
-	ld [wc0ef], a
-	ld [wc0f0], a
+	ld [wAudioROMBank], a
+	ld [wAudioSavedROMBank], a
 	ld a, MUSIC_MUSEUM_GUY
-	ld [wc0ee], a
+	ld [wNewSoundID], a
 	call PlaySound
 	ld a, [wSpriteIndex]
 	swap a

engine/overworld/oaks_aide.asm

@@ -4,45 +4,45 @@ OaksAideScript: ; 0x59035
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, .asm_59086
+	jr nz, .choseNo
 	ld hl, wPokedexOwned
 	ld b, wPokedexOwnedEnd - wPokedexOwned
 	call CountSetBits
-	ld a, [wd11e]
-	ld [$ffdd], a
+	ld a, [wNumSetBits]
+	ld [hOaksAideNumMonsOwned], a
 	ld b, a
-	ld a, [$ffdb]
+	ld a, [hOaksAideRequirement]
 	cp b
-	jr z, .asm_59059
-	jr nc, .asm_5907c
-.asm_59059
+	jr z, .giveItem
+	jr nc, .notEnoughOwnedMons
+.giveItem
 	ld hl, OaksAideHereYouGoText
 	call PrintText
-	ld a, [$ffdc]
+	ld a, [hOaksAideItemReward]
 	ld b, a
 	ld c, 1
 	call GiveItem
-	jr nc, .BagFull
+	jr nc, .bagFull
 	ld hl, OaksAideGotItemText
 	call PrintText
 	ld a, $1
-	jr .asm_5908e
-.BagFull
+	jr .done
+.bagFull
 	ld hl, OaksAideNoRoomText
 	call PrintText
 	xor a
-	jr .asm_5908e
-.asm_5907c
+	jr .done
+.notEnoughOwnedMons
 	ld hl, OaksAideUhOhText
 	call PrintText
 	ld a, $80
-	jr .asm_5908e
-.asm_59086
+	jr .done
+.choseNo
 	ld hl, OaksAideComeBackText
 	call PrintText
 	ld a, $ff
-.asm_5908e
-	ld [$ffdb], a
+.done
+	ld [hOaksAideResult], a
 	ret
 
 OaksAideHiText: ; 59091 (16:5091)

engine/overworld/pokecenter.asm

@@ -24,12 +24,12 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6)
 	predef HealParty
 	callba AnimateHealingMachine ; do the healing machine animation
 	xor a
-	ld [wMusicHeaderPointer], a
-	ld a, [wc0f0]
-	ld [wc0ef], a
-	ld a, [wd35b]
-	ld [wcfca], a
-	ld [wc0ee], a
+	ld [wAudioFadeOutControl], a
+	ld a, [wAudioSavedROMBank]
+	ld [wAudioROMBank], a
+	ld a, [wMapMusicSoundID]
+	ld [wLastMusicSoundID], a
+	ld [wNewSoundID], a
 	call PlaySound
 	ld hl, PokemonFightingFitText
 	call PrintText