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.

Sign up for GitHub

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

Jump to bottom

Merrp merge (12th of February) #6244

Merged
merged 22 commits into from
Feb 13, 2025
Merged

Merrp merge (12th of February) #6244

merged 22 commits into from
Feb 13, 2025

Conversation

hedara90
Copy link
Collaborator

@hedara90 hedara90 commented Feb 12, 2025 •
edited by Bassoonian
Loading

DO NOT SQUASH

Description

Conflicts

.github/workflows/build.yml
.gitignore
Makefile
README.md
asm/macros/event.inc
data/script_cmd_table.inc
data/scripts/pkmn_center_nurse.inc
include/constants/event_objects.h
src/battle_controller_player.c
src/event_object_movement.c
src/scrcmd.c

Things to note in the release changelog:

Discord contact info

hedara

aarant and others added 17 commits October 20, 2024 23:55
@aarant
feat: improved follower handling during scripted movements
4056804
@aarant
Merge branch 'followers' into followers-expanded-id
0f706ac
@aarant
fix: gave MOVEMENT_TYPE_FOLLOW_PLAYER an initial facing direction
d12a24a
@aarant
fix: made slitherTracks_Transitions a proper 2D array. Credit: jaizu
5536a55
@aarant
feat: make follower sidestep or backstep with player during scripts
57a198b
@aarant
feat: added configuration to restrict following pokemon. Closes rh-hi…
3fffb9f 
…deout#42
@aarant
meta: updated README with new config settings
9e2057a
@aarant
Unfreeze follower object during lockall (if safe movement flag set).
01335fa 
MSGBOX_SIGN no longer freezes follower.
@aarant
Merge branch 'followers' into followers-expanded-id
a6ef9c7
@aarant
fix: follower field movements after scripted movement update
c492bb3
@aarant
fix: non-following pokemon using slide-in battle animation
ce9f3b9
@aarant
fix: treat 1-tile jumps as slow copyable movement for follower pokemon
d73167e
@aarant
Merge branch 'followers' into followers-expanded-id
8933b84
@aarant
fix: fixed compilation error when OW_GFX_COMPRESS is FALSE
bc42174
@aarant
Merge remote-tracking branch 'upstream/master' into followers
ef05bbf
@aarant
Merge branch 'followers' into followers-expanded-id
c8fb56d
Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp…
7426a98 
…-merge
@hedara90 hedara90 added the type: feature branch merge Update from feature branches label Feb 12, 2025
AsparagusEduardo
AsparagusEduardo previously requested changes Feb 12, 2025
View reviewed changes
Copy link

@AsparagusEduardo AsparagusEduardo left a comment

Choose a reason for hiding this comment

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

Code-only review done while Jasper is busy

@hedara90
Copy link
Collaborator Author

Review comments addressed

Bassoonian
Bassoonian requested changes Feb 12, 2025
View reviewed changes
Copy link
Collaborator

@Bassoonian Bassoonian left a comment

Choose a reason for hiding this comment

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

Only a code review for now, haven't had the time to test the new features yet

@Bassoonian Bassoonian changed the title Merrp merge 2025-02-12 Merrp merge (12th of February) Feb 12, 2025
@hedara90
Copy link
Collaborator Author

Review comments addressed

Bassoonian
Bassoonian reviewed Feb 13, 2025
View reviewed changes
Copy link
Collaborator

@Bassoonian Bassoonian left a comment

Choose a reason for hiding this comment

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

Missed this one, so I'll commit it for you. Ready to go other than that

@AsparagusEduardo AsparagusEduardo dismissed their stale review February 13, 2025 14:16

Jasper should be able to handle this

@Bassoonian Bassoonian merged commit 5aeeb33 into rh-hideout:master Feb 13, 2025
1 check passed
@Bassoonian Bassoonian mentioned this pull request Feb 13, 2025
Closed
@hedara90 hedara90 added the category: overworld Pertains to out-of-battle mechanics label Feb 26, 2025
@hedara90 hedara90 deleted the merrp-merge branch March 1, 2025 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Bassoonian Bassoonian Bassoonian approved these changes

@AsparagusEduardo AsparagusEduardo AsparagusEduardo left review comments

Assignees
No one assigned
Labels
category: overworld Pertains to out-of-battle mechanics type: feature branch merge Update from feature branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hedara90 @AsparagusEduardo @Bassoonian @aarant