Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rocket Hideout #986

Merged
merged 33 commits into from
Jan 26, 2025
Merged

Rocket Hideout #986

merged 33 commits into from
Jan 26, 2025

Conversation

vulcandth
Copy link
Collaborator

@vulcandth vulcandth commented Dec 24, 2024

NOTICE: This causes a minor save break due to adding an additional key item and shifting a some ram. This will be merged into bloodmoon-ursaluna aka 3.1.0.. and be save-patched.

Some Todos:

  • Replace RARE_CANDY placeholder items
  • Better Dialogue (some of its fine, a lot of its barely better than placeholder text)
  • Actually implement the CherryGroveBay events.
  • Review pickup items for alternate choices.
  • New names for NPCs; search for ; TODO: replace placeholder name
  • Fix Sparks Pikachu animation
  • Add grunt outside in front of a poster switch
  • Final dialogue review
  • Determine if we should remove the pGO leaders from shamouti island (for now)

@Rangi42
Copy link
Owner

Rangi42 commented Dec 28, 2024

@vulcandth @SoupPotato Thank you both so much for tackling this unfinished content! As I review/playtest it, I'll be making some notes here on what could be updated -- not necessarily by either of you, and not generally blockers for merging, just ideas.

  • The RBY hideout music could instead be a PGo remix of something. (I'm not sure what already exists, or who's still in the scene making new ones.)
  • The stairs should be hidden requiring a poster switch (and beating a grunt in front of it first, who would clue the player into the whole "PGo teams are hiding down here" thing). (Keep in mind how obviously telegraphed the RBY Rocket hideout was -- it's good design for ten-year-olds, and also for fast-forwarding players with the attention of ten-year-olds. :P )

data/trainers/parties.asm Outdated Show resolved Hide resolved
data/trainers/parties.asm Outdated Show resolved Hide resolved
data/trainers/parties.asm Outdated Show resolved Hide resolved
constants/trainer_constants.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB1F.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB1F.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB1F.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB1F.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB2F.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB3F.asm Outdated Show resolved Hide resolved
@vulcandth vulcandth changed the base branch from 9bit to bloodmoon-ursaluna January 2, 2025 18:12
Copy link
Owner

@Rangi42 Rangi42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, I love your work here. The hideout is complete, the leaders can be battled, and the birds can be captured. I just left comments here based on a playthrough, haven't inspected the code changes, but it's looking really good!

maps/CeladonGameCorner.asm Show resolved Hide resolved
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was fast-forwarding in BGB through a battle with VGrunt1, after exploring the various floors but not yet fighting the leaders, and when it exited the hideout BGM got silent. Not sure what the conditions are to reproduce -- it could be a problem with the hideout music itself, being ported from RBY.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed the music not stopping.. but.. there is still an audio hiccup... Its mild enough that its not a blocker.. but not sure how to fix it right now.

1. Music resumes after battle
2. refresh/reload map causes music to stop for an unknown reason
3. Manually restart music
This causes the music to start playing briefly before restarting... but if I don't manually restart the music it goes silent.

maps/RocketHideoutB3F.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB4F.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB4F.asm Show resolved Hide resolved
maps/RocketHideoutB4F.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB4F.asm Show resolved Hide resolved
maps/CherrygroveBay.asm Outdated Show resolved Hide resolved
maps/CherrygroveBay.asm Show resolved Hide resolved
maps/CherrygroveBay.asm Show resolved Hide resolved
maps/CherrygroveBay.asm Outdated Show resolved Hide resolved
@vulcandth vulcandth marked this pull request as ready for review January 12, 2025 05:37
@vulcandth vulcandth requested a review from Rangi42 January 12, 2025 05:37
data/battle_tower/classes.asm Show resolved Hide resolved
data/battle_tower/classes.asm Show resolved Hide resolved
constants/event_flags.asm Outdated Show resolved Hide resolved
constants/event_flags.asm Outdated Show resolved Hide resolved
data/trainers/attributes.asm Outdated Show resolved Hide resolved
data/trainers/dvs.asm Outdated Show resolved Hide resolved
data/trainers/parties.asm Outdated Show resolved Hide resolved
maps/CeladonUniversityClassroom3.asm Outdated Show resolved Hide resolved
maps/CherrygroveBay.asm Outdated Show resolved Hide resolved
maps/CherrygroveBay.asm Outdated Show resolved Hide resolved
maps/CherrygroveBay.asm Outdated Show resolved Hide resolved
maps/CherrygroveBay.asm Outdated Show resolved Hide resolved
maps/CherrygroveBay.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB4F.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB4F.asm Outdated Show resolved Hide resolved
maps/RocketHideoutB4F.asm Outdated Show resolved Hide resolved
@vulcandth vulcandth added this to the 3.1.0 milestone Jan 24, 2025
Copy link
Owner

@Rangi42 Rangi42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent work! Thank you so much for getting PC this much closer to 100% content <3

@Rangi42 Rangi42 merged commit e6d4f85 into Rangi42:bloodmoon-ursaluna Jan 26, 2025
@vulcandth vulcandth deleted the pGO-hideout branch January 26, 2025 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants