mirror of
https://github.com/zeldaret/mm.git
synced 2026-09-02 09:51:44 -04:00
Misc fixes (#1800)
* disasm_fix * dtor * Fault_LogThreadContext * rearrange microcode * sGfxPrintFont size of 0x800 * Move (null) to stackcheck * vimgr bss * sfx * Remove code_801D1E80 * z_en_hy_code * Fix assembler messages with endlabels and dlabels * xlitob data * Move skin unused bss pad to rumble
This commit is contained in:
@@ -1,7 +1,28 @@
|
||||
.include "macro.inc"
|
||||
|
||||
.section .text
|
||||
|
||||
.balign 16
|
||||
|
||||
glabel aspMainTextStart
|
||||
.incbin "incbin/aspMainText"
|
||||
endlabel aspMainTextStart
|
||||
dlabel aspMainTextEnd
|
||||
|
||||
glabel gspS2DEX2_fifoTextStart
|
||||
.incbin "incbin/gspS2DEX2_fifoText"
|
||||
endlabel gspS2DEX2_fifoTextStart
|
||||
dlabel gspS2DEX2_fifoTextEnd
|
||||
|
||||
glabel njpgdspMainTextStart
|
||||
.incbin "incbin/njpgdspMainText"
|
||||
endlabel njpgdspMainTextStart
|
||||
dlabel njpgdspMainTextEnd
|
||||
|
||||
.section .rodata
|
||||
|
||||
.balign 16
|
||||
|
||||
dlabel aspMainDataStart
|
||||
.incbin "incbin/aspMainData"
|
||||
dlabel aspMainDataEnd
|
||||
@@ -1,15 +0,0 @@
|
||||
.include "macro.inc"
|
||||
|
||||
.section .data
|
||||
|
||||
dlabel aspMainTextStart
|
||||
.incbin "incbin/aspMainText"
|
||||
dlabel aspMainTextEnd
|
||||
|
||||
dlabel gspS2DEX2_fifoTextStart
|
||||
.incbin "incbin/gspS2DEX2_fifoText"
|
||||
dlabel gspS2DEX2_fifoTextEnd
|
||||
|
||||
dlabel njpgdspMainTextStart
|
||||
.incbin "incbin/njpgdspMainText"
|
||||
dlabel njpgdspMainTextEnd
|
||||
@@ -10,6 +10,9 @@
|
||||
#include "global.h"
|
||||
#include "z64rumble.h"
|
||||
|
||||
#pragma increment_block_number "n64-us:128"
|
||||
|
||||
static s32 sBssPad[4];
|
||||
RumbleManager gRumbleMgr;
|
||||
|
||||
void Rumble_Update(void* arg0) {
|
||||
|
||||
@@ -10,8 +10,6 @@
|
||||
// 60 is an arbitrary number which specifies the max amount of limbs per skeleton this system supports
|
||||
MtxF gSkinLimbMatrices[60];
|
||||
|
||||
static s32 sBssPad;
|
||||
|
||||
void Skin_UpdateVertices(MtxF* mtx, SkinVertex* skinVertices, SkinLimbModif* modifEntry, Vtx* vtxBuf, Vec3f* pos) {
|
||||
SkinVertex* vertexEntry;
|
||||
Vtx* vtx;
|
||||
|
||||
Reference in New Issue
Block a user