Merge branch 'master' of https://github.com/pret/pokecrystal

predef/cgb.asm

@@ -37,7 +37,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59
 	dw _CGB_BattleColors
 	dw _CGB_PokegearPals
 	dw _CGB_StatsScreenHPPals
-	dw _CGB04
+	dw _CGB_Pokedex
 	dw _CGB_SlotMachine
 	dw _CGB06
 	dw _CGB07
@@ -49,13 +49,13 @@ Predef_LoadSGBLayoutCGB: ; 8d59
 	dw _CGB0d
 	dw _CGB0e
 	dw _CGB0f
-	dw _CGB10
+	dw _CGB_PokedexSearchOption
 	dw _CGB11
 	dw _CGB_Pokepic
 	dw _CGB13
 	dw _CGB_PackPals
 	dw _CGB_TrainerCard
-	dw _CGB16
+	dw _CGB_PokedexUnownMode
 	dw _CGB17
 	dw _CGB18
 	dw _CGB19
@@ -282,7 +282,7 @@ StatsScreenPals: ; 8f6a
 	RGB 17, 31, 31
 ; 8f70
 
-_CGB04: ; 8f70
+_CGB_Pokedex: ; 8f70
 	ld de, UnknBGPals
 	ld a, $1d
 	call GetPredefPal
@@ -389,7 +389,7 @@ Palette9036: ; 9036
 	RGB 00, 00, 00
 ; 903e
 
-_CGB16: ; 903e
+_CGB_PokedexUnownMode: ; 903e
 	ld de, UnknBGPals
 	ld a, $1d
 	call GetPredefPal
@@ -822,7 +822,7 @@ _CGB0f: ; 93a6
 	ret
 ; 93ba
 
-_CGB10: ; 93ba
+_CGB_PokedexSearchOption: ; 93ba
 	ld de, UnknBGPals
 	ld a, $1d
 	call GetPredefPal

predef/sgb.asm

@@ -28,7 +28,7 @@ Predef_LoadSGBLayout: ; 864c
 	dw .SGB_BattleColors
 	dw .SGB_PokegearPals
 	dw .SGB_StatsScreenHPPals
-	dw .SGB04
+	dw .SGB_Pokedex
 	dw .SGB_SlotMachine
 	dw .SGB06
 	dw .SGB07
@@ -40,13 +40,13 @@ Predef_LoadSGBLayout: ; 864c
 	dw .SGB0d
 	dw .SGB0e
 	dw .SGB0f
-	dw .SGB10
+	dw .SGB_PokedexSearchOption
 	dw .SGB11
 	dw .SGB12
 	dw .SGB13
 	dw .SGB_PackPals
 	dw .SGB_TrainerCard
-	dw .SGB16
+	dw .SGB_PokedexUnownMode
 	dw .SGB17
 	dw .SGB18
 	dw .SGB19
@@ -209,7 +209,7 @@ endr
 	ret
 ; 87b2
 
-.SGB04: ; 87b2
+.SGB_Pokedex: ; 87b2
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
 	ld bc, $10
@@ -266,13 +266,13 @@ endr
 	ret
 ; 8823
 
-.SGB16: ; 8823
-	call .SGB04
+.SGB_PokedexUnownMode: ; 8823
+	call .SGB_Pokedex
 	ld de, BlkPacket_9af6
 	ret
 ; 882a
 
-.SGB10: ; 882a
+.SGB_PokedexSearchOption: ; 882a
 	ld hl, PalPacket_9ce6
 	ld de, wSGBPals
 	ld bc, $10