more bug fixes

README.md

@@ -24,6 +24,10 @@ May non-multiplayer, non-battle related bugs have been fixed. The aforementioned
 - 2 invisible stars that show on the title screen are cut off; also, the "presents" logo from RG is re-used!
 - The healing machine animates correctly! 
 - Using Minimize or Substitute, looking at the Pokedex, and then battling won't cause sprite corruption.
+- OAM Updates can no longer be interrupted by V-Blank, avoiding some sprite corruption.
+- Trainer Card transition no longer shows weird garbage on DMGs; this was due to not having enough time to load properly.
+- Battle victory music plays at the right time; there were some situations where it would happen when you lost.
+- Music in Oak's Lab is delayed a frame so it always plays with the correct channels; V-Blank could otherwise interrupt it.
 and more!
 
 Credits

engine/battle/core.asm

@@ -780,6 +780,10 @@ FaintEnemyPokemon:
 	hlcoord 0, 0
 	lb bc, 4, 11
 	call ClearScreenArea
+	call AnyPartyAlive ; this fixes victory music playing at the wrong time ; PvK
+	ld a, d
+	and a
+	push af
 	ld a, [wIsInBattle]
 	dec a
 	jr z, .wild_win
@@ -798,11 +802,14 @@ FaintEnemyPokemon:
 	jr .sfxplayed
 .wild_win
 	call EndLowHealthAlarm
+	pop af
+	push af
 	ld a, MUSIC_DEFEATED_WILD_MON
-	call PlayBattleVictoryMusic
+	call nz, PlayBattleVictoryMusic
 .sfxplayed
 ; bug: win sfx is played for wild battles before checking for player mon HP
 ; this can lead to odd scenarios where both player and enemy faint, as the win sfx plays yet the player never won the battle
+; kep fixes this - PvK
 	ld hl, wBattleMonHP
 	ld a, [hli]
 	or [hl]
@@ -812,9 +819,7 @@ FaintEnemyPokemon:
 	jr nz, .playermonnotfaint ; if so, don't call RemoveFaintedPlayerMon twice
 	call RemoveFaintedPlayerMon
 .playermonnotfaint
-	call AnyPartyAlive
+	pop af
-	ld a, d
-	and a
 	ret z
 	ld hl, EnemyMonFaintedText
 	call PrintText

engine/menus/start_sub_menus.asm

@@ -462,6 +462,9 @@ StartMenu_TrainerInfo::
 	predef DrawBadges ; draw badges
 	ld b, SET_PAL_TRAINER_CARD
 	call RunPaletteCommand
+	ld a, [wOnSGB] ; this fixes garbage on dmgs
+	and a
+	call z, Delay3
 	call GBPalNormal
 	call WaitForTextScrollButtonPress ; wait for button press
 	call GBPalWhiteOut
@@ -469,6 +472,9 @@ StartMenu_TrainerInfo::
 	call LoadScreenTilesFromBuffer2 ; restore saved screen
 	call RunDefaultPaletteCommand
 	call ReloadMapData
+	ld a, [wOnSGB] ; this fixes garbage on dmgs
+	and a
+	call z, Delay3
 	call LoadGBPal
 	pop af
 	ldh [hTileAnimations], a

home/update_sprites.asm

@@ -2,5 +2,9 @@ UpdateSprites::
 	ld a, [wUpdateSpritesEnabled]
 	dec a
 	ret nz
+	ld hl, hSkipOAMUpdates
+	set 0, [hl]
 	homecall _UpdateSprites
+	ld hl, hSkipOAMUpdates
+	res 0, [hl] ; this prevents v-blank interference - PvK
 	ret

home/vblank.asm

@@ -26,11 +26,15 @@ VBlank::
 	call VBlankCopy
 	call VBlankCopyDouble
 	call UpdateMovingBgTiles
-	call hDMARoutine
+	ld a, [hSkipOAMUpdates]
+	bit 0, a
+	jr nz, .skipOAM
+	call hDMARoutine ; this prevents v-blank interference - PvK
 	ld a, BANK(PrepareOAMData)
 	ldh [hLoadedROMBank], a
 	ld [MBC1RomBank], a
 	call PrepareOAMData
+.skipOAM
 
 	; VBlank-sensitive operations end.
 

ram/hram.asm

@@ -387,7 +387,7 @@ hWhoseTurn:: db ; 0 on player's turn, 1 on enemy's turn
 
 hClearLetterPrintingDelayFlags:: db
 
-	ds 1
+hSkipOAMUpdates:: db ; this prevents v-blank interference - PvK
 
 ; bit 0: draw HP fraction to the right of bar instead of below (for party menu)
 ; bit 1: menu is double spaced

scripts/OaksLab.asm

@@ -118,6 +118,7 @@ OaksLabScript4:
 	call UpdateSprites
 	ld hl, wFlags_D733
 	res 1, [hl]
+	call DelayFrame
 	call PlayDefaultMusic
 
 	ld a, $5