Merge branch 'ZetaNull:master' into master

2026-02-06 16:15:24 +13:00 · 2023-10-20 14:19:41 -04:00 · 2023-10-20 14:19:41 -04:00 · 2fad1a5e34
commit 2fad1a5e34
parent 7fd13172e0 5c9b80e1a8
39 changed files with 226 additions and 29 deletions
--- a/data/events/engine_flags.asm
+++ b/data/events/engine_flags.asm
@ -99,6 +99,7 @@ EngineFlags:
 	engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE
 	engine_flag wVisitedSpawns, SPAWN_BLACKTHORN
 	engine_flag wVisitedSpawns, SPAWN_MT_SILVER
+	engine_flag wVisitedSpawns, SPAWN_SILENT_HILLS
 	engine_flag wVisitedSpawns, NUM_SPAWNS ; unused

 	engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F
--- a/data/items/attributes.asm
+++ b/data/items/attributes.asm
@ -56,8 +56,8 @@ ItemAttributes:
 	item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; WATER_STONE
 	item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
-; ITEM_19
-	item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
+; FAIRY_FEATHER
+	item_attribute 1450, HELD_FAIRY_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
 ; HP_UP
 	item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
 ; PROTEIN
--- a/data/items/catch_rate_items.asm
+++ b/data/items/catch_rate_items.asm
@ -3,7 +3,7 @@
 ; item associated with the table entry is used instead.

 TimeCapsule_CatchRateItems:
-	db ITEM_19, LEFTOVERS
+	db FAIRY_FEATHER, LEFTOVERS
 	db ITEM_2D, BITTER_BERRY
 	db ITEM_32, GOLD_BERRY
 	db ITEM_5A, BERRY
--- a/data/items/descriptions.asm
+++ b/data/items/descriptions.asm
@ -25,7 +25,7 @@ ItemDescriptions:
 	dw FireStoneDesc
 	dw ThunderStoneDesc
 	dw WaterStoneDesc
-	dw QuestionMarkDesc
+	dw FairyFeatherDesc
 	dw HPUpDesc
 	dw ProteinDesc
 	dw IronDesc
@ -915,3 +915,7 @@ MusicMailDesc:
 MirageMailDesc:
 	db   "MEW-print MAIL."
 	next "(HOLD)@"
+
+FairyFeatherDesc:
+	db   "Powers up fairy-"
+ 	next "type moves. (HOLD)@"
--- a/data/items/names.asm
+++ b/data/items/names.asm
@ -24,7 +24,7 @@ ItemNames::
 	li "FIRE STONE"
 	li "THUNDERSTONE"
 	li "WATER STONE"
-	li "TERU-SAMA"
+	li "FAIRYFEATHER"
 	li "HP UP"
 	li "PROTEIN"
 	li "IRON"
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@ -695,3 +695,4 @@ ENDM
 	map_attributes Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0
 	map_attributes MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
 	map_attributes Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
+	map_attributes SilentHills, SILENT_HILLS, $00, 0 ; this is on its own for now. add connections to mt. silver later.
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@ -1045,3 +1045,6 @@ BetaBlank_Blocks: ; unreferenced

 GoldenrodDeptStoreRoof_Blocks:
 	INCBIN "maps/GoldenrodDeptStoreRoof.ablk"
+
+SilentHills_Blocks:
+	INCBIN "maps/SilentHills.ablk"
--- a/data/maps/flypoints.asm
+++ b/data/maps/flypoints.asm
@ -27,4 +27,6 @@ Flypoints:
 	db LANDMARK_FUCHSIA_CITY,     SPAWN_FUCHSIA
 	db LANDMARK_CINNABAR_ISLAND,  SPAWN_CINNABAR
 	db LANDMARK_INDIGO_PLATEAU,   SPAWN_INDIGO
+; Nihon
+	db LANDMARK_SILENT_HILLS,	  SPAWN_SILENT_HILLS
 	db -1 ; end
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@ -104,6 +104,8 @@ Landmarks:
 	landmark  12, 100, TohjoFallsName
 	landmark  20,  68, Route28Name
 	landmark 140, 116, FastShipName
+	assert_table_length NIHON_LANDMARK
+	landmark 100, 116, SilentHillsName
 	assert_table_length NUM_LANDMARKS

 NewBarkTownName:     db "NEW BARK¯TOWN@"
@ -208,3 +210,4 @@ TohjoFallsName:      db "TOHJO FALLS@"
 UndergroundName:     db "UNDERGROUND@"
 BattleTowerName:     db "BATTLE¯TOWER@"
 SpecialMapName:      db "SPECIAL@"
+SilentHillsName:	 db "SILENT¯HILLS@"
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@ -43,6 +43,7 @@ MapGroupPointers::
 	dw MapGroup_NewBark     ; 24
 	dw MapGroup_Saffron     ; 25
 	dw MapGroup_Cherrygrove ; 26
+	dw MapGroup_SilentHills ; 27
 	assert_table_length NUM_MAP_GROUPS

 MapGroup_Olivine:
@ -536,3 +537,8 @@ MapGroup_Cherrygrove:
 	map MrPokemonsHouse, TILESET_FACILITY, INDOOR, LANDMARK_ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map Route31VioletGate, TILESET_GATE, GATE, LANDMARK_ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	assert_table_length NUM_CHERRYGROVE_MAPS
+
+MapGroup_SilentHills:
+	table_width MAP_LENGTH, MapGroup_SilentHills
+	map SilentHills, TILESET_JOHTO, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
+	assert_table_length NUM_SILENT_HILLS_MAPS
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@ -30,6 +30,7 @@ OutdoorSprites:
 	dw NewBarkGroupSprites
 	dw SaffronGroupSprites
 	dw CherrygroveGroupSprites
+	dw SilentHillsGroupSprites
 	assert_table_length NUM_MAP_GROUPS

 PalletGroupSprites:
@ -307,6 +308,7 @@ IndigoGroupSprites:
 	db SPRITE_POKE_BALL
 	db SPRITE_BOULDER

+SilentHillsGroupSprites: ; Will have its own thing eventually
 NewBarkGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
--- a/data/maps/roofs.asm
+++ b/data/maps/roofs.asm
@ -38,6 +38,7 @@ MapGroupRoofs:
 	db ROOF_NEW_BARK  ; 24 (New Bark)
 	db -1             ; 25
 	db ROOF_NEW_BARK  ; 26 (Cherrygrove)
+	db ROOF_NEW_BARK  ; 27 (Silent Hills)
 	assert_table_length NUM_MAP_GROUPS + 1

 Roofs:
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@ -484,3 +484,4 @@ SECTION "Map Scripts 25", ROMX

 INCLUDE "maps/SilverCaveOutside.asm"
 INCLUDE "maps/Route10North.asm"
+INCLUDE "maps/SilentHills.asm"
--- a/data/maps/sgb_roof_pal_inds.asm
+++ b/data/maps/sgb_roof_pal_inds.asm
@ -30,4 +30,5 @@ MapGroupRoofSGBPalInds:
 	db PREDEFPAL_NEW_BARK
 	db PREDEFPAL_SAFFRON
 	db PREDEFPAL_CHERRYGROVE
+	db PREDEFPAL_SILENT_HILLS
 	assert_table_length NUM_MAP_GROUPS + 1
--- a/data/maps/spawn_points.asm
+++ b/data/maps/spawn_points.asm
@ -38,7 +38,9 @@ SpawnPoints:
 	spawn BLACKTHORN_CITY,            21, 30
 	spawn SILVER_CAVE_OUTSIDE,        23, 20
 	spawn FAST_SHIP_CABINS_SW_SSW_NW,  6,  2
-
+	
+	spawn SILENT_HILLS,				  10, 10
+	
 	spawn N_A,                        -1, -1

 	assert_table_length NUM_SPAWNS + 1
--- a/data/types/names.asm
+++ b/data/types/names.asm
@ -31,6 +31,7 @@ TypeNames:
 	dw Ice
 	dw Dragon
 	dw Dark
+	dw Fairy
 	assert_table_length TYPES_END

 Normal:    db "NORMAL@"
@ -52,3 +53,4 @@ Ghost:     db "GHOST@"
 Steel:     db "STEEL@"
 Dragon:    db "DRAGON@"
 Dark:      db "DARK@"
+Fairy:	   db "FAIRY@"
--- a/data/types/search_strings.asm
+++ b/data/types/search_strings.asm
@ -19,4 +19,5 @@ PokedexTypeSearchStrings:
 	db " DRAGON @"
 	db "  DARK  @"
 	db " STEEL  @"
+	db " FAIRY  @"
 	assert_table_length NUM_TYPES + 1
--- a/data/types/search_types.asm
+++ b/data/types/search_types.asm
@ -18,4 +18,5 @@ PokedexTypeSearchConversionTable:
 	db DRAGON
 	db DARK
 	db STEEL
+	db FAIRY
 	assert_table_length NUM_TYPES
--- a/data/types/type_boost_items.asm
+++ b/data/types/type_boost_items.asm
@ -16,4 +16,5 @@ TypeBoostItems:
 	db HELD_DRAGON_BOOST,   DRAGON       ; DRAGON_SCALE
 	db HELD_DARK_BOOST,     DARK         ; BLACKGLASSES
 	db HELD_STEEL_BOOST,    STEEL        ; METAL_COAT
+	db HELD_FAIRY_BOOST,	FAIRY		 ; FAIRY_FEATHER
 	db -1
--- a/data/types/type_matchups.asm
+++ b/data/types/type_matchups.asm
@ -49,12 +49,14 @@ TypeMatchups:
 	db FIGHTING,     ROCK,         SUPER_EFFECTIVE
 	db FIGHTING,     DARK,         SUPER_EFFECTIVE
 	db FIGHTING,     STEEL,        SUPER_EFFECTIVE
+	db FIGHTING,	 FAIRY,		   NOT_VERY_EFFECTIVE
 	db POISON,       GRASS,        SUPER_EFFECTIVE
 	db POISON,       POISON,       NOT_VERY_EFFECTIVE
 	db POISON,       GROUND,       NOT_VERY_EFFECTIVE
 	db POISON,       ROCK,         NOT_VERY_EFFECTIVE
 	db POISON,       GHOST,        NOT_VERY_EFFECTIVE
 	db POISON,       STEEL,        NO_EFFECT
+	db POISON,		 FAIRY, 	   SUPER_EFFECTIVE
 	db GROUND,       FIRE,         SUPER_EFFECTIVE
 	db GROUND,       ELECTRIC,     SUPER_EFFECTIVE
 	db GROUND,       GRASS,        NOT_VERY_EFFECTIVE
@ -83,6 +85,7 @@ TypeMatchups:
 	db BUG,          GHOST,        NOT_VERY_EFFECTIVE
 	db BUG,          DARK,         SUPER_EFFECTIVE
 	db BUG,          STEEL,        NOT_VERY_EFFECTIVE
+	db BUG,			 FAIRY,		   NOT_VERY_EFFECTIVE
 	db ROCK,         FIRE,         SUPER_EFFECTIVE
 	db ROCK,         ICE,          SUPER_EFFECTIVE
 	db ROCK,         FIGHTING,     NOT_VERY_EFFECTIVE
@ -97,17 +100,26 @@ TypeMatchups:
 	db GHOST,        GHOST,        SUPER_EFFECTIVE
 	db DRAGON,       DRAGON,       SUPER_EFFECTIVE
 	db DRAGON,       STEEL,        NOT_VERY_EFFECTIVE
+	db DRAGON,		 FAIRY,		   NO_EFFECT
 	db DARK,         FIGHTING,     NOT_VERY_EFFECTIVE
 	db DARK,         PSYCHIC_TYPE, SUPER_EFFECTIVE
 	db DARK,         GHOST,        SUPER_EFFECTIVE
 	db DARK,         DARK,         NOT_VERY_EFFECTIVE
 	db DARK,         STEEL,        NOT_VERY_EFFECTIVE
+	db DARK,		 FAIRY,		   NOT_VERY_EFFECTIVE
 	db STEEL,        FIRE,         NOT_VERY_EFFECTIVE
 	db STEEL,        WATER,        NOT_VERY_EFFECTIVE
 	db STEEL,        ELECTRIC,     NOT_VERY_EFFECTIVE
 	db STEEL,        ICE,          SUPER_EFFECTIVE
 	db STEEL,        ROCK,         SUPER_EFFECTIVE
 	db STEEL,        STEEL,        NOT_VERY_EFFECTIVE
+	db STEEL,     	 FAIRY,        SUPER_EFFECTIVE
+	db FAIRY,   	 FIRE,         NOT_VERY_EFFECTIVE
+	db FAIRY,	   	 FIGHTING,     SUPER_EFFECTIVE
+	db FAIRY,	     POISON,       NOT_VERY_EFFECTIVE
+	db FAIRY,	  	 DRAGON,       SUPER_EFFECTIVE
+	db FAIRY,	     DARK,         SUPER_EFFECTIVE
+	db FAIRY,	  	 STEEL,        NOT_VERY_EFFECTIVE

 	db -2 ; end (with Foresight)