Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v4

- name: Retrieve required files
run: curl -L "https://drive.google.com/uc?export=download&id=1q4wA2GaeALgVH4e-lgyos0MA6nWNRWRk" > baserom.jp.z64
run: curl -L "https://drive.google.com/uc?export=download&id=1mjwPwFgGhM-pSNwWu0lMbwG-e1doYrPx" > baserom.jp.z64

- name: Build the Docker image
run: docker build . --file Dockerfile --tag sm64
Expand Down
8 changes: 4 additions & 4 deletions src/game/camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -541,19 +541,19 @@ void set_environmental_camera_shake(s16 shake) {
void set_camera_shake_from_point(s16 shake, f32 posX, f32 posY, f32 posZ) {
switch (shake) {
case SHAKE_POS_BOWLING_BALL:
set_pitch_shake_from_point(0x28, 0x9, 0x4000, 2000.f, posX, posY, posZ);
set_pitch_shake_from_point(0x28, 0x8, 0x4000, 2000.f, posX, posY, posZ);
break;

case SHAKE_POS_SMALL:
set_pitch_shake_from_point(0x80, 0x9, 0x4000, 4000.f, posX, posY, posZ);
set_pitch_shake_from_point(0x80, 0x8, 0x4000, 4000.f, posX, posY, posZ);
break;

case SHAKE_POS_MEDIUM:
set_pitch_shake_from_point(0xC0, 0x9, 0x4000, 6000.f, posX, posY, posZ);
set_pitch_shake_from_point(0xC0, 0x8, 0x4000, 6000.f, posX, posY, posZ);
break;

case SHAKE_POS_LARGE:
set_pitch_shake_from_point(0x100, 0x9, 0x3000, 8000.f, posX, posY, posZ);
set_pitch_shake_from_point(0x100, 0x8, 0x3000, 8000.f, posX, posY, posZ);
break;
}
}
Expand Down