Merge branch 'mistress' into renewables

2026-02-20 22:28:41 +13:00 · 2025-09-13 16:31:16 +10:00 · 2025-09-13 16:31:16 +10:00 · 684a075631
commit 684a075631
parent 02536e80ac 5a7c8fff16
52 changed files with 300 additions and 98 deletions
--- a/data/events/hidden_objects.asm
+++ b/data/events/hidden_objects.asm
@ -58,6 +58,7 @@ HiddenObjectMaps:
 	db VICTORY_ROAD_2F
 	db BILLS_HOUSE
 	db VIRIDIAN_CITY
+	db SAFARI_ZONE_CENTER_REST_HOUSE
 	db SAFARI_ZONE_WEST_REST_HOUSE
 	db SAFARI_ZONE_EAST_REST_HOUSE
 	db SAFARI_ZONE_NORTH_REST_HOUSE
@ -153,6 +154,7 @@ HiddenObjectPointers:
 	dw VictoryRoad2HiddenObjects
 	dw BillsHouseHiddenObjects
 	dw ViridianCityHiddenObjects
+	dw SafariZoneRestHouse1HiddenObjects
 	dw SafariZoneRestHouse2HiddenObjects
 	dw SafariZoneRestHouse3HiddenObjects
 	dw SafariZoneRestHouse4HiddenObjects
@ -535,19 +537,13 @@ ViridianCityHiddenObjects:
 	hidden_object 14,  4, POTION, HiddenItems
 	db -1 ; end

+; Moved these to the same slot to save bytes.
+SafariZoneRestHouse1HiddenObjects:
 SafariZoneRestHouse2HiddenObjects:
-	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
-	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
-	db -1 ; end
-
 SafariZoneRestHouse3HiddenObjects:
-	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
-	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
-	db -1 ; end
-
 SafariZoneRestHouse4HiddenObjects:
-	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
-	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText ; still unused
+	hidden_object  4,  1, SPRITE_FACING_UP, OpenPokemonCenterPC
 	db -1 ; end

 Route15GateUpstairsHiddenObjects:
--- a/data/maps/headers/SafariZoneCenterRestHouse.asm
+++ b/data/maps/headers/SafariZoneCenterRestHouse.asm
@ -1,2 +1,2 @@
-	map_header SafariZoneCenterRestHouse, SAFARI_ZONE_CENTER_REST_HOUSE, GATE, 0
+	map_header SafariZoneCenterRestHouse, SAFARI_ZONE_CENTER_REST_HOUSE, HOUSE, 0
 	end_map_header
--- a/data/maps/headers/SafariZoneEastRestHouse.asm
+++ b/data/maps/headers/SafariZoneEastRestHouse.asm
@ -1,2 +1,2 @@
-	map_header SafariZoneEastRestHouse, SAFARI_ZONE_EAST_REST_HOUSE, GATE, 0
+	map_header SafariZoneEastRestHouse, SAFARI_ZONE_EAST_REST_HOUSE, HOUSE, 0
 	end_map_header
--- a/data/maps/headers/SafariZoneNorthRestHouse.asm
+++ b/data/maps/headers/SafariZoneNorthRestHouse.asm
@ -1,2 +1,2 @@
-	map_header SafariZoneNorthRestHouse, SAFARI_ZONE_NORTH_REST_HOUSE, GATE, 0
+	map_header SafariZoneNorthRestHouse, SAFARI_ZONE_NORTH_REST_HOUSE, HOUSE, 0
 	end_map_header
--- a/data/maps/headers/SafariZoneWestRestHouse.asm
+++ b/data/maps/headers/SafariZoneWestRestHouse.asm
@ -1,2 +1,2 @@
-	map_header SafariZoneWestRestHouse, SAFARI_ZONE_WEST_REST_HOUSE, GATE, 0
+	map_header SafariZoneWestRestHouse, SAFARI_ZONE_WEST_REST_HOUSE, HOUSE, 0
 	end_map_header
--- a/data/maps/objects/SafariZoneCenterRestHouse.asm
+++ b/data/maps/objects/SafariZoneCenterRestHouse.asm
@ -8,7 +8,7 @@ SafariZoneCenterRestHouse_Object:
 	def_bg_events

 	def_object_events
-	object_event  3,  2, SPRITE_GIRL, STAY, DOWN, 1 ; person
-	object_event  1,  4, SPRITE_SCIENTIST, WALK, UP_DOWN, 2 ; person
+	object_event  3,  3, SPRITE_GIRL, STAY, LEFT, 1 ; person
+	object_event  5,  6, SPRITE_SCIENTIST, WALK, UP_DOWN, 2 ; person

 	def_warps_to SAFARI_ZONE_CENTER_REST_HOUSE
--- a/data/maps/objects/SafariZoneEastRestHouse.asm
+++ b/data/maps/objects/SafariZoneEastRestHouse.asm
@ -8,9 +8,9 @@ SafariZoneEastRestHouse_Object:
 	def_bg_events

 	def_object_events
-	object_event  2,  3, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person
-	object_event  0,  2, SPRITE_ROCKER, STAY, NONE, 2 ; person
-	object_event  5,  2, SPRITE_SILPH_WORKER, STAY, NONE, 3 ; person
-	object_event  6,  2, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person
+	object_event  5,  5, SPRITE_SCIENTIST, WALK, UP_DOWN, 1 ; person
+	object_event  0,  4, SPRITE_ROCKER, STAY, RIGHT, 2 ; person
+	object_event  3,  3, SPRITE_SILPH_WORKER, STAY, LEFT, 3 ; person
+	object_event  3,  4, SPRITE_SILPH_WORKER, STAY, LEFT, 4 ; person

 	def_warps_to SAFARI_ZONE_EAST_REST_HOUSE
--- a/data/maps/objects/SafariZoneNorthRestHouse.asm
+++ b/data/maps/objects/SafariZoneNorthRestHouse.asm
@ -9,7 +9,7 @@ SafariZoneNorthRestHouse_Object:

 	def_object_events
 	object_event  6,  3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person
-	object_event  3,  4, SPRITE_SAFARI_ZONE_WORKER, STAY, NONE, 2 ; person
+	object_event  3,  4, SPRITE_SAFARI_ZONE_WORKER, LEFT, NONE, 2 ; person
 	object_event  1,  5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 3 ; person

 	def_warps_to SAFARI_ZONE_NORTH_REST_HOUSE
--- a/data/maps/objects/SafariZoneWestRestHouse.asm
+++ b/data/maps/objects/SafariZoneWestRestHouse.asm
@ -8,8 +8,8 @@ SafariZoneWestRestHouse_Object:
 	def_bg_events

 	def_object_events
-	object_event  4,  4, SPRITE_SCIENTIST, WALK, ANY_DIR, 1 ; person
-	object_event  0,  2, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2 ; person
-	object_event  6,  2, SPRITE_ERIKA, STAY, DOWN, 3 ; person
+	object_event  5,  3, SPRITE_SCIENTIST, WALK, ANY_DIR, 1 ; person
+	object_event  0,  3, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2 ; person
+	object_event  3,  4, SPRITE_ERIKA, STAY, LEFT, 3 ; person

 	def_warps_to SAFARI_ZONE_WEST_REST_HOUSE
--- a/data/player_names.asm
+++ b/data/player_names.asm
@ -11,6 +11,13 @@ DefaultNamesGirl:
 	next "LEAF"
 	next "ELAINE"
 	db   "@"
+	
+DefaultNamesEnby:
+	db   "NEW NAME"
+	next "PINK"
+	next "QUARTZ"
+	next "JAY"
+	db   "@"

 DefaultNamesRival:
 	db   "NEW NAME"
--- a/data/player_names_list.asm
+++ b/data/player_names_list.asm
@ -9,6 +9,12 @@ DefaultNamesGirlList:
 	db "GREEN@"
 	db "LEAF@"
 	db "ELAINE@"
+	
+DefaultNamesEnbyList:
+	db "NEW NAME@"
+	db "PINK@"
+	db "QUARTZ@"
+	db "JAY@"

 DefaultNamesRivalList:
 	db "NEW NAME@"
--- a/data/text/unused_names.asm
+++ b/data/text/unused_names.asm
@ -1,22 +1,22 @@
 UnusedBadgeNames::
-	db "かみなりバッヂ@" ; THUNDER BADGE
-	db "かいがらバッヂ@" ; SHELL BADGE
-	db "おじぞうバッヂ@" ; JIZOU BADGE
-	db "はやぶさバッヂ@" ; FALCON BADGE
-	db "ひんやりバッヂ@" ; CHILL BADGE
-	db "なかよしバッヂ@" ; FRIENDSHIP BADGE
-	db "バラバッヂ@" ; ROSE BADGE
-	db "ひのたまバッヂ@" ; FIREBALL BADGE
-	db "ゴールドバッヂ@" ; GOLD BADGE
+;	db "かみなりバッヂ@" ; THUNDER BADGE
+;	db "かいがらバッヂ@" ; SHELL BADGE
+;	db "おじぞうバッヂ@" ; JIZOU BADGE
+;	db "はやぶさバッヂ@" ; FALCON BADGE
+;	db "ひんやりバッヂ@" ; CHILL BADGE
+;	db "なかよしバッヂ@" ; FRIENDSHIP BADGE
+;	db "バラバッヂ@" ; ROSE BADGE
+;	db "ひのたまバッヂ@" ; FIREBALL BADGE
+;	db "ゴールドバッヂ@" ; GOLD BADGE

 UnusedRankingNames:
-	db "たまご@" ; EGG
-	db "ひよこ@" ; CHICK
-	db "ブロンズ@" ; BRONZE
-	db "シルバー@" ; SILVER
-	db "ゴールド@" ; GOLD
-	db "プチキャプテン@" ; PETIT CAPTAIN
-	db "キャプテン@" ; CAPTAIN
-	db "プチマスター@" ; PETIT MASTER
-	db "マスター@" ; MASTER
-	db "エクセレント" ; EXCELLENT
+;	db "たまご@" ; EGG
+;	db "ひよこ@" ; CHICK
+;	db "ブロンズ@" ; BRONZE
+;	db "シルバー@" ; SILVER
+;	db "ゴールド@" ; GOLD
+;	db "プチキャプテン@" ; PETIT CAPTAIN
+;	db "キャプテン@" ; CAPTAIN
+;	db "プチマスター@" ; PETIT MASTER
+;	db "マスター@" ; MASTER
+;	db "エクセレント" ; EXCELLENT
--- a/data/text_boxes.asm
+++ b/data/text_boxes.asm
@ -33,7 +33,7 @@ TextBoxTextAndCoordTable:
 	text_box_text SWITCH_STATS_CANCEL_MENU_TEMPLATE, 11, 11, 19, 17, SwitchStatsCancelText,   13, 12
 	text_box_text BUY_SELL_QUIT_MENU_TEMPLATE,        0,  0, 10,  6, BuySellQuitText,          2,  1
 	text_box_text MONEY_BOX_TEMPLATE,                11,  0, 19,  2, MoneyText,               13,  0
-	text_box_text JP_AH_MENU_TEMPLATE,                7,  6, 11, 10, JapaneseAhText,           8,  8
+	text_box_text BOY_GIRL_NO,                       12,  6, 19, 12, BoyGirlNoText,           14,  7
 	text_box_text JP_POKEDEX_MENU_TEMPLATE,          11,  8, 19, 17, JapanesePokedexMenu,     12, 10

 BuySellQuitText:
@ -80,8 +80,10 @@ SwitchStatsCancelText:
 	next "STATS"
 	next "CANCEL@"

-JapaneseAhText:
-	db "アッ！@"
+BoyGirlNoText:
+	db   "RED"
+	next "GREEN"
+	next "PINK@"

 JapanesePokedexMenu:
 	db   "データをみる"