diff --git a/README.md b/README.md index ff7c56a1..37b76817 100644 --- a/README.md +++ b/README.md @@ -200,6 +200,7 @@ QoL Enhancements - Traded Pokemon ("Outsiders") can now be nicknamed at the Name Rater's House. - HP bar has been doubled in speed, having a 1 frame delay per pixel rather than 2. - The blinking animation when hit by moves like Tackle now repeats 4 instead of 6 times, speeding up battles by a bit while not sacrificing impact. +- The Safari Zone Rest Houses now have PCs in them, so if the box is full, you can still change boxes to continue catching Pokemon. - The Rock in the Safari Zone now only raises the flee chance by 1.5x, rather than 2x, opening up new strategies. - PP symbol is displayed in the battle menu. PP displayed before, it just looks nicer now. Done by changing a straggler Japanese character. - Lorelei, Bruno, and Agatha now play the Gym Leader Battle theme. diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index 865d85dc..31091174 100644 --- 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: diff --git a/data/maps/headers/SafariZoneCenterRestHouse.asm b/data/maps/headers/SafariZoneCenterRestHouse.asm index c80abea0..e8880a49 100644 --- 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 diff --git a/data/maps/headers/SafariZoneEastRestHouse.asm b/data/maps/headers/SafariZoneEastRestHouse.asm index 94964754..5227a3aa 100644 --- 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 diff --git a/data/maps/headers/SafariZoneNorthRestHouse.asm b/data/maps/headers/SafariZoneNorthRestHouse.asm index 7f9d5dbc..f324dd72 100644 --- 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 diff --git a/data/maps/headers/SafariZoneWestRestHouse.asm b/data/maps/headers/SafariZoneWestRestHouse.asm index 3d3bef71..4d572b1c 100644 --- 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 diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm index ff48d19c..557b3bbc 100644 --- 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 diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm index f79a5cfc..62742229 100644 --- 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 diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm index 8fbacd81..7aeaf327 100644 --- 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 diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm index c63886b7..a5f6bbaf 100644 --- 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 diff --git a/gfx/blocksets/house.bst b/gfx/blocksets/house.bst index 7f462f80..0ed306da 100644 Binary files a/gfx/blocksets/house.bst and b/gfx/blocksets/house.bst differ diff --git a/maps/SafariZoneCenterRestHouse.blk b/maps/SafariZoneCenterRestHouse.blk index 625b41b6..11643254 100644 Binary files a/maps/SafariZoneCenterRestHouse.blk and b/maps/SafariZoneCenterRestHouse.blk differ diff --git a/maps/SafariZoneEastRestHouse.blk b/maps/SafariZoneEastRestHouse.blk index 625b41b6..9f144c22 100644 Binary files a/maps/SafariZoneEastRestHouse.blk and b/maps/SafariZoneEastRestHouse.blk differ diff --git a/maps/SafariZoneNorthRestHouse.blk b/maps/SafariZoneNorthRestHouse.blk index 625b41b6..2683df7b 100644 Binary files a/maps/SafariZoneNorthRestHouse.blk and b/maps/SafariZoneNorthRestHouse.blk differ diff --git a/maps/SafariZoneSecretHouse.blk b/maps/SafariZoneSecretHouse.blk index d5dbe9e1..cd0dbdfb 100644 --- a/maps/SafariZoneSecretHouse.blk +++ b/maps/SafariZoneSecretHouse.blk @@ -1 +1 @@ -  \ No newline at end of file +  \ No newline at end of file diff --git a/maps/SafariZoneWestRestHouse.blk b/maps/SafariZoneWestRestHouse.blk index 625b41b6..11643254 100644 Binary files a/maps/SafariZoneWestRestHouse.blk and b/maps/SafariZoneWestRestHouse.blk differ diff --git a/text/SafariZoneGate.asm b/text/SafariZoneGate.asm index 6cfeb17c..57afe554 100644 --- a/text/SafariZoneGate.asm +++ b/text/SafariZoneGate.asm @@ -84,11 +84,11 @@ _SafariZoneEntranceText_753eb:: cont "BALLs, it's game" cont "over for you!" - para "Before you go," - line "open an unused" - cont "#MON BOX so" - cont "there's room for" - cont "new #MON!" + para "It's ok if the" + line "#MON BOX is" + cont "full: Go to a" + cont "REST HOUSE and" + cont "switch!" done _SafariZoneEntranceText_753f0::