mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-19 13:23:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some more bin2c calls from the Makefile (#286)

Browse Source 
* Remove some bin2c calls from the Makefile

* Found a way to make n64graphics use shared tluts

* Added an option that makes n64graphics operate in a mode where it
 takes an image and tlut (as pngs) and spits out the appropriate
 CI8 indices inc.c form

* Turns out all the TLUTs for Lakitu are kept in one place, far away
 from the textures that use them

* Names some textures and tluts

* Pretty helpful actually, helped identify where a few different
 objects types are initialized. Should be a little useful to
 whoever dives into the object stuff more deeply

* Minor cleanup in n64graphics

* Added some comments, gave more appropriate names to some
 variables.

* Leaving the new mode argument as `-Z` for now

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>

* Textures compile using makefile rules

* Patched n64 graphics memory leak and ci output

* Added memset16safe to initialize ci palettes to magic numbers (transparent pixels).

---------

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
Tyler McGavran
2023-02-07 00:52:34 -05:00
committed by GitHub
parent 533d035875
commit 3a99685c2f
39 changed files with 1442 additions and 1564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actors.c
+4 -3
View File
@@ -17,6 +17,7 @@
#include "code_8008C1D0.h"
#include <sounds.h>
#include "audio/external.h"
#include "common_textures.h"
s32 D_802BA050;
s32 D_802BA054;
@@ -374,7 +375,7 @@ void func_802977E4(Player *arg0) {
void func_80297818(void) {
s16 *phi_v0 = &D_802BA060[0];
s16 *phi_v1 = VIRTUAL_TO_PHYSICAL2(gSegmentTable[SEGMENT_NUMBER2(&D_0D004E38)] + SEGMENT_OFFSET(&D_0D004E38));
s16 *phi_v1 = VIRTUAL_TO_PHYSICAL2(gSegmentTable[SEGMENT_NUMBER2(gTLUTGreenShell)] + SEGMENT_OFFSET(gTLUTGreenShell));
s16 temp_a0, temp_a0_2, temp_a0_3, temp_a0_4, temp_a0_5;
s32 i;
for (i = 0; i < 256; i++) {
@@ -1253,7 +1254,7 @@ UNUSED s16 D_802B8810[] = {
};
void func_8029A690(Camera *arg0, Mat4 arg1, struct ShellActor *arg2) {
gDPLoadTLUT_pal256(gDisplayListHead++, &D_0D004E38);
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTGreenShell);
func_8029A3AC(arg0, arg1, arg2);
}
@@ -1264,7 +1265,7 @@ void func_8029A75C(Camera *arg0, Mat4 arg1, struct ShellActor *arg2) {
// Middle of a tlut access
void func_8029A828(Camera *arg0, Mat4 arg1, struct ShellActor *arg2) {
gDPLoadTLUT_pal256(gDisplayListHead++, &D_0D004E68[0x1D0]);
gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTBlueShell);
func_8029A3AC(arg0, arg1, arg2);
}