Merge branch 'master' of https://github.com/ZetaNull/jep-hack

2026-02-07 08:35:23 +13:00 · 2024-10-28 14:20:49 -04:00 · 2024-10-28 14:20:49 -04:00 · 3a43c2009f
commit 3a43c2009f
parent 1729f91f26 5d9cf1aac2
24 changed files with 533 additions and 46 deletions
--- a/data/events/engine_flags.asm
+++ b/data/events/engine_flags.asm
@ -117,6 +117,8 @@ EngineFlags:
 	engine_flag wVisitedSpawns, SPAWN_SEVEN_ISLAND
 	engine_flag wVisitedSpawns, SPAWN_SILENT_HILLS
 	engine_flag wVisitedSpawns, SPAWN_OLD_CITY
+	engine_flag wVisitedSpawns, SPAWN_SAVOY_CITY
+	engine_flag wVisitedSpawns, SPAWN_CORAL_CITY
 	engine_flag wVisitedSpawns, NUM_SPAWNS ; unused

 	engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F
--- a/data/maps/flypoints.asm
+++ b/data/maps/flypoints.asm
@ -39,4 +39,6 @@ Flypoints:
 ; Nihon
 	db LANDMARK_SILENT_HILLS,	  SPAWN_SILENT_HILLS
 	db LANDMARK_OLD_CITY,	 	  SPAWN_OLD_CITY
+	db LANDMARK_SAVOY_CITY,		  SPAWN_SAVOY_CITY
+	db LANDMARK_CORAL_CITY,		  SPAWN_CORAL_CITY
 	db -1 ; end
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@ -694,15 +694,15 @@ MapGroup_SilentHills:
 	map WinnersPath, TILESET_CAVE, CAVE, LANDMARK_WINNERS_PATH, MUSIC_VICTORY_ROAD, FALSE, PALETTE_NITE, FISHGROUP_DRATINI ; Sounds like a funny fishgroup
 	map WinnersPathOutside, TILESET_NIHON_01, ROUTE, LANDMARK_WINNERS_PATH, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_NONE
 	map Route66, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_66, MUSIC_NIHONTIME, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
-	map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, TRUE, PALETTE_AUTO, FISHGROUP_NONE
+	map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_NONE
 	map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_DEBUG_ROOM, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
 	map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	map QuietCave, TILESET_LUSHCAVE, FOREST, LANDMARK_QUIET_CAVE, MUSIC_NIHONTIME, TRUE, PALETTE_NITE, FISHGROUP_POND
 	map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_SILENTHILLS, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
 	map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
 	map Route49OldCityGate1F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, FALSE, PALETTE_DAY, FISHGROUP_NONE
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@ -331,9 +331,7 @@ IndigoGroupSprites:
 	db SPRITE_POKE_BALL
 	db SPRITE_BOULDER

-SavoyCityGroupSprites:	; Will have its own thing eventually
-CoralCityGroupSprites:	; Ditto
-BlueForestGroupSprites: ; Ditto
+BlueForestGroupSprites: ; Will have its own thing eventually
 WhiteCityGroupSprites:  ; Ditto
 NewBarkGroupSprites:
 	db SPRITE_SUICUNE
@ -753,3 +751,56 @@ OldCityGroupSprites:
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE

+SavoyCityGroupSprites:
+	; 12 non-walking filler sprites
+	db SPRITE_SUICUNE
+	db SPRITE_SILVER_TROPHY
+	db SPRITE_FAMICOM
+	db SPRITE_POKEDEX
+	db SPRITE_WILL
+	db SPRITE_ROCKER
+	db SPRITE_NURSE
+	db SPRITE_FISHER
+	db SPRITE_BIG_LAPRAS
+	db SPRITE_BIG_ONIX
+	db SPRITE_SUDOWOODO
+	db SPRITE_RIVAL
+	; 9 walking sprites
+	db SPRITE_LASS
+	db SPRITE_COOLTRAINER_F
+	db SPRITE_ROCKER
+	db SPRITE_SAILOR
+	db SPRITE_GENTLEMAN
+	db SPRITE_ROCKET
+	db SPRITE_FISHER
+	db SPRITE_FAIRY
+	; 2 non-walking sprites
+	db SPRITE_POKE_BALL
+	db SPRITE_FRUIT_TREE
+
+CoralCityGroupSprites:
+	; 12 non-walking filler sprites
+	db SPRITE_SUICUNE
+	db SPRITE_SILVER_TROPHY
+	db SPRITE_FAMICOM
+	db SPRITE_POKEDEX
+	db SPRITE_WILL
+	db SPRITE_ROCKER
+	db SPRITE_NURSE
+	db SPRITE_FISHER
+	db SPRITE_BIG_LAPRAS
+	db SPRITE_BIG_ONIX
+	db SPRITE_SUDOWOODO
+	db SPRITE_RIVAL
+	; 9 walking sprites
+	db SPRITE_RIVAL
+	db SPRITE_TWIN
+	db SPRITE_SAILOR
+	db SPRITE_POKEFAN_M
+	db SPRITE_SWIMMER_GUY
+	db SPRITE_SWIMMER_GIRL
+	db SPRITE_FISHER
+	db SPRITE_MONSTER
+	; 2 non-walking sprites
+	db SPRITE_POKE_BALL
+	db SPRITE_FRUIT_TREE
--- a/data/maps/spawn_points.asm
+++ b/data/maps/spawn_points.asm
@ -49,6 +49,8 @@ SpawnPoints:
 	
 	spawn SILENT_HILLS,				  13,  5
 	spawn OLD_CITY,				  	  27, 29
+	spawn SAVOY_CITY,				  25, 15
+	spawn CORAL_CITY,				  31, 11
 	
 	spawn N_A,                        -1, -1

--- a/data/pokemon/base_stats/barreau.asm
+++ b/data/pokemon/base_stats/barreau.asm
@ -1,6 +1,6 @@
 	db 0 ; species ID placeholder

-	db  60,  35,  60,  80,  75,  85
+	db  60,  45,  60,  80, 100,  80
 	;   hp  atk  def  spd  sat  sdf

 	db BUG, PSYCHIC_TYPE ; type
--- a/data/pokemon/base_stats/eucala.asm
+++ b/data/pokemon/base_stats/eucala.asm
@ -1,6 +1,6 @@
 	db 0 ; species ID placeholder

-	db 100, 100, 100, 100, 100, 100
+	db  79, 104,  64,  44,  79,  89
 	;   hp  atk  def  spd  sat  sdf

 	db NORMAL, NORMAL ; type
--- a/data/pokemon/base_stats/kiwooked.asm
+++ b/data/pokemon/base_stats/kiwooked.asm
@ -1,6 +1,6 @@
 	db 0 ; species ID placeholder

-	db  50,  95,  40, 105,  45,  60
+	db   71, 101,  83, 107,  43,  53
 	;   hp  atk  def  spd  sat  sdf

 	db GROUND, FLYING ; type
--- a/data/pokemon/base_stats/mimear.asm
+++ b/data/pokemon/base_stats/mimear.asm
@ -3,7 +3,7 @@
 	db  65,  70,  75, 100,  95,  80
 	;   hp  atk  def  spd  sat  sdf

-	db FAIRY, FAIRY ; type
+	db FAIRY, GRASS ; type
 	db 45 ; catch rate								; PLACEHOLDER
 	db 64 ; base exp								; PLACEHOLDER
 	db NO_ITEM, NO_ITEM ; items
@ -17,5 +17,5 @@
 	dn EGG_NONE, EGG_NONE ; egg groups

 	; tm/hm learnset
-	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, FLASH, THUNDERBOLT
+	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, FLASH, THUNDERBOLT, SOLARBEAM, GIGA_DRAIN
 	; end
--- a/data/pokemon/dex_entries/mimear.asm
+++ b/data/pokemon/dex_entries/mimear.asm
@ -1,10 +1,10 @@
-	db "HEARING@" ; species name
+	db "APPLE@" ; species name
 	dw 311, 191 ; height, weight - placeholder

-	db   "Flies using its"
-	next "ears. Its hearing"
-	next "is impeccable,"
+	db   "It glides across"
+	next "fields, leaving"
+	next "apple seeds as it"

-	page "so it's popular"
-	next "with detectives."
-	next "Loves sweets.@"
+	page "goes. The groves"
+	next "are considered"
+	next "sacred by many.@"
--- a/data/pokemon/dex_entries/rapidash.asm
+++ b/data/pokemon/dex_entries/rapidash.asm
@ -1,10 +1,15 @@
 	db "FIRE HORSE@" ; species name
 	dw 507, 2090 ; height, weight

-	db   "It just loves to"
-	next "gallop. The faster"
-	next "it goes, the long-"
+	db   "Native American"
+	next "myth tells of a"
+	next "greedy hunter wea-"

-	page "er the swaying"
-	next "flames of its mane"
-	next "will become.@"
+	page "ring the mane of"
+	next "RAPIDASH, and bei-"
+	next "ng shot by mistake.@"
+; Lore taken from the Pokemon DP design documents.
+; It doesn't seem to be based on any particular myth, but general philosophy.
+; TLDR a man of the east respects the Rapidash, a man of the west does not, and wears their pelt, only to end up being mistaken for one, and hunted down. 
+
+; https://tcrf.net/Development:Pok%C3%A9mon_Diamond_and_Pearl/Documents
--- a/data/pokemon/dex_entries/tauros.asm
+++ b/data/pokemon/dex_entries/tauros.asm
@ -1,10 +1,15 @@
 	db "WILD BULL@" ; species name
 	dw 407, 1950 ; height, weight

-	db   "These violent"
-	next "#MON fight"
-	next "with other mem-"
+	db   "Hunting tradition"
+	next "states that one" 
+	next "must cut off the"

-	page "bers of their herd"
-	next "in order to prove"
-	next "their strength.@"
+	page "horns of killed"
+	next "TAUROS and pray,"
+	next "or be punished.@"
+; Could be better-written.
+; Based on the DP development documents discussing hunting traditions towards Tauros.
+; Fits very well into a Pokedex entry!
+
+; https://tcrf.net/Development:Pok%C3%A9mon_Diamond_and_Pearl/Documents
--- a/data/pokemon/dex_entries/typhlosion.asm
+++ b/data/pokemon/dex_entries/typhlosion.asm
@ -1,10 +1,19 @@
 	db "VOLCANO@" ; species name
 	dw 507, 1750 ; height, weight

-	db   "When heat from its"
-	next "body causes the"
-	next "air around it to"
+	db   "Folklore tells of"
+	next "a shapeshifting"
+	next "TYPHLOSION that"

-	page "shimmer, this is a"
-	next "sign that it is"
-	next "ready to battle.@"
+	page "offered a young"
+	next "girl berries and"
+	next "taught her a song.@"
+
+; Extremely abridged version of the infamous Typhlosion story from the DP development docs.
+; Based on the Bear Mother story from Canadian First Nations mythology. I chose to blend it with the mythology of the very similar Mujina (貉).
+; I chose Typhlosion over Hisuian Typhlosion to be consistent with the time period in which the lore was devised.
+; However, as a dex entry, it's quite poor. I think this could be modified and tweaked.
+
+; https://en.wikipedia.org/wiki/Mujina
+; https://nativecanadianarts.com/gallery/the-bear-mother/
+; https://tcrf.net/Development:Pok%C3%A9mon_Diamond_and_Pearl/Documents
--- a/data/pokemon/egg_moves_johto.asm
+++ b/data/pokemon/egg_moves_johto.asm
@ -761,6 +761,7 @@ MimearEggMoves:
 	dw LOVELY_KISS
 	dw PRESENT
 	dw SWEET_KISS
+	dw BITE
 	dw -1 ;end 

 InoshikaEggMoves:
--- a/data/pokemon/evos_attacks_johto.asm
+++ b/data/pokemon/evos_attacks_johto.asm
@ -2734,16 +2734,19 @@ MimearEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, DISARMING_VOICE
 	dbw 1, GROWL
+	dbw 1, ABSORB
 	dbw 8, FAIRY_WIND
 	dbw 13, CHARM
-	dbw 19, QUICK_ATTACK
-	dbw 25, FORESIGHT
-	dbw 31, DRAINING_KISS
-	dbw 37, AMNESIA
+	dbw 18, LEECH_SEED
+	dbw 23, RAZOR_LEAF
+	dbw 28, UPROOT
+	dbw 32, DRAINING_KISS
+	dbw 37, SUNNY_DAY
 	dbw 43, MIRROR_COAT
 	dbw 49, SAFEGUARD
 	dbw 55, DAZZLING_GLEAM
-	dbw 60, MOONBLAST
+	dbw 61, SOLARBEAM
+	dbw 65, MOONBLAST
 	db 0 ; no more level-up moves

 InoshikaEvosAttacks:
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@ -375,7 +375,7 @@ PokemonNames::
 	db "KITSEN@@@@"
 	db "WISPIRIT@@"
 	db "COATL@@@@@"
-	db "MIMEAR@@@@"
+	db "AVALOP@@@@"
 	db "INOSHIKA@@"
 	db "RUDDERNAUT"
 	db "XYLODON@@@"