Hidden Power adjustment part 3

Info text, this time
SoupPotato · Nov 5, 2024 · 1d474c8 · 1d474c8
1 parent 3c6a6de
commit 1d474c8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 13 deletions.
diff --git a/engine/pokemon/types.asm b/engine/pokemon/types.asm
@@ -120,21 +120,40 @@ HiddenPowerType:
 	add a
 	or b
 
-; Skip Normal
-	inc a
-
-; Skip Bird
-	cp BIRD
-	jr c, .done
-	inc a
+; duplicated in ../battle/hidden_power.asm
+; Map to vanilla types
+	ld hl, .VanillaTypeRemapping
+; hl <- .VanillaTypeRemapping + a
+	add l
+	ld l, a
+	ld a, h
+	adc 0
+	ld h, a
+; get the entry
+	ld a, [hl]
 
-; Skip unused types
-	cp UNUSED_TYPES
-	jr c, .done
-	add UNUSED_TYPES_END - UNUSED_TYPES
-.done
 	ret
 
+.VanillaTypeRemapping:
+	table_width 1, HiddenPowerType.VanillaTypeRemapping
+	db FIGHTING
+	db FLYING
+	db POISON
+	db GROUND
+	db ROCK
+	db BUG
+	db GHOST
+	db STEEL
+	db FIRE
+	db WATER
+	db GRASS
+	db ELECTRIC
+	db PSYCHIC_TYPE
+	db ICE
+	db DRAGON
+	db DARK
+	assert_table_length 16
+
 PrintBattleMoveType:
 ; Print the type of move b at hl.
 	push hl

diff --git a/main.asm b/main.asm
@@ -267,7 +267,7 @@ INCLUDE "engine/pokemon/switchpartymons.asm"
 INCLUDE "engine/gfx/load_pics.asm"
 INCLUDE "data/pokemon/base_stats.asm"
 INCLUDE "data/pokemon/names.asm"
-INCLUDE "data/pokemon/unused_pic_banks.asm"
+; INCLUDE "data/pokemon/unused_pic_banks.asm"
 
 
 SECTION "Crystal Phone Text", ROMX