Merge branch 'Rangi42:master' into master

ShadowOne333 · Feb 18, 2025 · c355bca · c355bca
2 parents 8b09373 + dc95437
commit c355bca
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/data/pokemon/base_exp_exceptions.asm b/data/pokemon/base_exp_exceptions.asm
@@ -7,4 +7,5 @@ ENDM
 NewBaseExpExceptions:
 	base_exception CHANSEY, 395 ; BST x 87.7% as of gen V (unchanged in VIII)
 	base_exception BLISSEY, 635 ; BST x 117.5% as of gen VIII
+	base_exception HAPPINY, 110 ; BST x 50.0% as of gen V (unchanged in VIII)
 	dw -1
diff --git a/data/pokemon/base_stats/happiny.asm b/data/pokemon/base_stats/happiny.asm
@@ -1,3 +1,4 @@
+	; If you change the BST, update data/pokemon/base_exp_exceptions.asm
 	db 100,  05,  05,  30,  15,  65 ; 220 BST
 	;   hp  atk  def  spe  sat  sdf
 

diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm
@@ -1697,7 +1697,7 @@ Pokedex_Bio:
 	ld a, [wCurPartySpecies]
 	ld c, a
 	ld a, [wCurForm]
-	and EXTSPECIES_MASK
+	and SPECIESFORM_MASK
 	ld b, a
 	push bc
 	farcall _GetNewBaseExp

diff --git a/home/lcd.asm b/home/lcd.asm
@@ -1,5 +1,6 @@
 LCDGeneric::
-; At this point it's assumed we're in WRAM bank 5!
+; Unlike vanilla, it's *not* assume we're in BANK(wLYOverrides),
+; since interrupts can now occur during VBlank
 	ldh a, [rLY]
 	cp SCREEN_HEIGHT_PX
 	jr c, .continue
@@ -8,12 +9,18 @@ LCDGeneric::
 	push bc
 	ld c, a
 	ld b, HIGH(wLYOverrides)
+	ldh a, [rSVBK]
+	push af
+	ld a, BANK(wLYOverrides)
+	ldh [rSVBK], a
 	ld a, [bc]
 	ld b, a
 	ldh a, [hLCDCPointer]
 	ld c, a
 	ld a, b
 	ldh [c], a
+	pop af
+	ldh [rSVBK], a
 	pop bc
 	pop af
 	reti