Skip to content

Fix cutscenes, syncing issues, and more (Yoshi!) #1109

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

Open
EmeraldLoc wants to merge 5 commits into
base: dev
Choose a base branch
from
+284 −177
Open

Fix cutscenes, syncing issues, and more (Yoshi!) #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
336ee34
Fixes
EmeraldLoc Feb 8, 2026
f5011dc
Lots more changes
EmeraldLoc Feb 9, 2026
64b5438
Yoshi :D
EmeraldLoc Feb 9, 2026
20cbce8
Remove some unecessary changes
EmeraldLoc Feb 9, 2026
bd2a609
Oops
EmeraldLoc Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion autogen/convert_structs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
}

override_field_version_excludes = {
"oCameraLakituUnk104": "VERSION_JP",
"oCameraLakituMusicPlayed": "VERSION_JP",
"oCoinUnk1B0": "VERSION_JP",
}

Expand Down
2 changes: 1 addition & 1 deletion autogen/lua_definitions/structs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1730,7 +1730,7 @@
--- @field public oCameraLakituSpeed number
--- @field public oCameraLakituCircleRadius number
--- @field public oCameraLakituFinishedDialog integer
--- @field public oCameraLakituUnk104 integer
--- @field public oCameraLakituMusicPlayed integer
--- @field public oCameraLakituPitchVel integer
--- @field public oCameraLakituYawVel integer
--- @field public oEnemyLakituNumSpinies integer
Expand Down
2 changes: 1 addition & 1 deletion data/dynos_bin_behavior.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,7 +1374,7 @@ s64 DynOS_Bhv_ParseBehaviorScriptConstants(const String &_Arg, bool *found) {
bhv_constant(oCameraLakituCircleRadius);
bhv_constant(oCameraLakituFinishedDialog);
#ifndef VERSION_JP
bhv_constant(oCameraLakituUnk104);
bhv_constant(oCameraLakituMusicPlayed);
#endif
bhv_constant(oCameraLakituPitchVel);
bhv_constant(oCameraLakituYawVel);
Expand Down
2 changes: 1 addition & 1 deletion docs/lua/structs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2336,7 +2336,7 @@
| oCameraLakituSpeed | `number` | |
| oCameraLakituCircleRadius | `number` | |
| oCameraLakituFinishedDialog | `integer` | |
| oCameraLakituUnk104 | `integer` | |
| oCameraLakituMusicPlayed | `integer` | |
| oCameraLakituPitchVel | `integer` | |
| oCameraLakituYawVel | `integer` | |
| oEnemyLakituNumSpinies | `integer` | |
Expand Down
4 changes: 3 additions & 1 deletion include/object_constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
/* oAction */
#define FISH_SPAWNER_ACT_SPAWN 0
#define FISH_SPAWNER_ACT_IDLE 1
#define FISH_SPAWNER_ACT_RESPAWN 2
#define FISH_SPAWNER_ACT_RESPAWN 2
/* oBehParams2ndByte */
#define FISH_SPAWNER_BP_MANY_BLUE 0
#define FISH_SPAWNER_BP_FEW_BLUE 1
Expand Down Expand Up @@ -437,6 +437,8 @@
#define YOSHI_ACT_WALK_JUMP_OFF_ROOF 3
#define YOSHI_ACT_FINISH_JUMPING_AND_DESPAWN 4
#define YOSHI_ACT_GIVE_PRESENT 5
#define YOSHI_ACT_GONE 6
#define YOSHI_ACT_REAPPEAR 7
#define YOSHI_ACT_CREDITS 10

/* Koopa */
Expand Down
2 changes: 1 addition & 1 deletion include/object_fields.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@
#define /*0x0FC*/ oCameraLakituCircleRadius OBJECT_FIELD_F32(0x1D)
#define /*0x100*/ oCameraLakituFinishedDialog OBJECT_FIELD_S32(0x1E)
#ifndef VERSION_JP
#define /*0x104*/ oCameraLakituUnk104 OBJECT_FIELD_S32(0x1F)
#define /*0x104*/ oCameraLakituMusicPlayed OBJECT_FIELD_S32(0x1F)
#endif
#define /*0x1AC*/ oCameraLakituPitchVel OBJECT_FIELD_S16(0x49, 0)
#define /*0x1AE*/ oCameraLakituYawVel OBJECT_FIELD_S16(0x49, + 1)
Expand Down
Loading