Skip to content

SMB1-style timer mod #11

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
camthehaxman wants to merge 12 commits into
base: master
Choose a base branch
from
Open

SMB1-style timer mod #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
044c84d
WIP SMB1 timer mod
camthehaxman Feb 7, 2024
bc1e219
delete assets, and load timer sprites from modified bmp_nml.tpl
camthehaxman Feb 8, 2024
53a989d
fuse now changes length
camthehaxman Feb 21, 2024
c8faae9
reposition life icon to left side
camthehaxman Feb 21, 2024
7c14a84
update with new SMB1 decomp labels and clean up
camthehaxman Feb 21, 2024
9842155
sprites compatible with widescreen
camthehaxman Feb 21, 2024
9d22c96
make bomb fuse work properly with widescreen
camthehaxman Feb 21, 2024
18efb79
use para2 instead of the ugly type punning that SMB1 does
camthehaxman Feb 21, 2024
3bd366c
fix typo
camthehaxman Feb 21, 2024
08bfe3a
tabs to spaces
camthehaxman Feb 21, 2024
7611b10
oops
camthehaxman Feb 21, 2024
aca1fb2
make numbers fade out on timeover
camthehaxman Feb 21, 2024
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
1 change: 1 addition & 0 deletions configs/default-config.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
four-digit-banana-counter: disabled
fix-minimap-color: disabled
fix-widescreen: disabled
smb1-timer: disabled
}

// Toggles which party games are accessible from the party game menu.
Expand Down
4 changes: 2 additions & 2 deletions src/mkb/mkb2_ghidra.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6762,7 +6762,7 @@ extern "C" {
void PSMTXScale(double param_1, double param_2, double param_3, float * param_4);
void C_MTXLookAt(Mtx * mtx, struct Vec * cam_pos, struct Vec * cam_up, struct Vec * target);
void C_MTXFrustum(double param_1, double param_2, double param_3, double param_4, double param_5, double param_6, float * param_7);
void C_MTXPerspective(Mtx44 * m, double fovy, double aspect, double n, double f);
void C_MTXPerspective(Mtx44 m, double fovy, double aspect, double n, double f);
void C_MTXOrtho(double param_1, double param_2, double param_3, double param_4, double param_5, double param_6, float * m);
void PSVECAdd(float * param_1, float * param_2, float * param_3);
void PSVECSubtract(float * param_1, float * param_2, float * param_3);
Expand Down Expand Up @@ -7195,7 +7195,7 @@ extern "C" {
void GXBeginDisplayList(void * list, u32 size);
u32 GXEndDisplayList(void);
void GXCallDisplayList(void * list, u32 nbytes);
void GXSetProjection(f32 mtx[4][4], GXProjectionType type);
void GXSetProjection(Mtx44 mtx, GXProjectionType type);
void GXSetProjectionv(f32 * ptr);
void GXGetProjectionv(float * ptr);
undefined8 WriteMTXPS4x3(float * param_1, float * param_2);
Expand Down
Loading