mirror of https://github.com/n64decomp/mk64.git
Mips2c refresh (#159)
* Match 3 functions * Refresh a ton mips_2_c outputs * Add a header file for data_segment2 Update a couple mips_2_c outputs based on the contents of the new header file Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
GitHub
parent
64e8934b30
commit
aa47c86fe5
|
|
@ -1,34 +0,0 @@
|
|||
glabel func_80093C1C
|
||||
/* 09481C 80093C1C 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015
|
||||
/* 094820 80093C20 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298
|
||||
/* 094824 80093C24 8CA30000 */ lw $v1, ($a1)
|
||||
/* 094828 80093C28 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 09482C 80093C2C AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 094830 80093C30 3C180200 */ lui $t8, %hi(D_02007F18) # $t8, 0x200
|
||||
/* 094834 80093C34 246E0008 */ addiu $t6, $v1, 8
|
||||
/* 094838 80093C38 ACAE0000 */ sw $t6, ($a1)
|
||||
/* 09483C 80093C3C 27187F18 */ addiu $t8, %lo(D_02007F18) # addiu $t8, $t8, 0x7f18
|
||||
/* 094840 80093C40 3C0F0600 */ lui $t7, 0x600
|
||||
/* 094844 80093C44 AC6F0000 */ sw $t7, ($v1)
|
||||
/* 094848 80093C48 0C02729B */ jal func_8009CA6C
|
||||
/* 09484C 80093C4C AC780004 */ sw $t8, 4($v1)
|
||||
/* 094850 80093C50 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015
|
||||
/* 094854 80093C54 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298
|
||||
/* 094858 80093C58 8CA30000 */ lw $v1, ($a1)
|
||||
/* 09485C 80093C5C 3C090200 */ lui $t1, %hi(D_02007F48) # $t1, 0x200
|
||||
/* 094860 80093C60 25297F48 */ addiu $t1, %lo(D_02007F48) # addiu $t1, $t1, 0x7f48
|
||||
/* 094864 80093C64 24790008 */ addiu $t9, $v1, 8
|
||||
/* 094868 80093C68 ACB90000 */ sw $t9, ($a1)
|
||||
/* 09486C 80093C6C 3C080600 */ lui $t0, 0x600
|
||||
/* 094870 80093C70 AC680000 */ sw $t0, ($v1)
|
||||
/* 094874 80093C74 AC690004 */ sw $t1, 4($v1)
|
||||
/* 094878 80093C78 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 09487C 80093C7C 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
/* 094880 80093C80 03E00008 */ jr $ra
|
||||
/* 094884 80093C84 00000000 */ nop
|
||||
|
||||
/* 094888 80093C88 03E00008 */ jr $ra
|
||||
/* 09488C 80093C8C 00000000 */ nop
|
||||
|
||||
/* 094890 80093C90 03E00008 */ jr $ra
|
||||
/* 094894 80093C94 00000000 */ nop
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
glabel func_800AEE90
|
||||
/* 0AFA90 800AEE90 3C0E8019 */ lui $t6, %hi(D_8018EDEC) # $t6, 0x8019
|
||||
/* 0AFA94 800AEE94 81CEEDEC */ lb $t6, %lo(D_8018EDEC)($t6)
|
||||
/* 0AFA98 800AEE98 2401000B */ li $at, 11
|
||||
/* 0AFA9C 800AEE9C 240F0001 */ li $t7, 1
|
||||
/* 0AFAA0 800AEEA0 51C10004 */ beql $t6, $at, .L800AEEB4
|
||||
/* 0AFAA4 800AEEA4 A08F0015 */ sb $t7, 0x15($a0)
|
||||
/* 0AFAA8 800AEEA8 03E00008 */ jr $ra
|
||||
/* 0AFAAC 800AEEAC A0800015 */ sb $zero, 0x15($a0)
|
||||
|
||||
/* 0AFAB0 800AEEB0 A08F0015 */ sb $t7, 0x15($a0)
|
||||
.L800AEEB4:
|
||||
/* 0AFAB4 800AEEB4 03E00008 */ jr $ra
|
||||
/* 0AFAB8 800AEEB8 00000000 */ nop
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
glabel func_800AEEBC
|
||||
/* 0AFABC 800AEEBC 3C0E8019 */ lui $t6, %hi(D_8018EDEC) # $t6, 0x8019
|
||||
/* 0AFAC0 800AEEC0 81CEEDEC */ lb $t6, %lo(D_8018EDEC)($t6)
|
||||
/* 0AFAC4 800AEEC4 2401000C */ li $at, 12
|
||||
/* 0AFAC8 800AEEC8 240F0001 */ li $t7, 1
|
||||
/* 0AFACC 800AEECC 51C10004 */ beql $t6, $at, .L800AEEE0
|
||||
/* 0AFAD0 800AEED0 A08F0015 */ sb $t7, 0x15($a0)
|
||||
/* 0AFAD4 800AEED4 03E00008 */ jr $ra
|
||||
/* 0AFAD8 800AEED8 A0800015 */ sb $zero, 0x15($a0)
|
||||
|
||||
/* 0AFADC 800AEEDC A08F0015 */ sb $t7, 0x15($a0)
|
||||
.L800AEEE0:
|
||||
/* 0AFAE0 800AEEE0 03E00008 */ jr $ra
|
||||
/* 0AFAE4 800AEEE4 00000000 */ nop
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
glabel func_800AEEE8
|
||||
/* 0AFAE8 800AEEE8 3C0E8019 */ lui $t6, %hi(D_8018EDEC) # $t6, 0x8019
|
||||
/* 0AFAEC 800AEEEC 81CEEDEC */ lb $t6, %lo(D_8018EDEC)($t6)
|
||||
/* 0AFAF0 800AEEF0 2401000D */ li $at, 13
|
||||
/* 0AFAF4 800AEEF4 240F0001 */ li $t7, 1
|
||||
/* 0AFAF8 800AEEF8 51C10004 */ beql $t6, $at, .L800AEF0C
|
||||
/* 0AFAFC 800AEEFC A08F0015 */ sb $t7, 0x15($a0)
|
||||
/* 0AFB00 800AEF00 03E00008 */ jr $ra
|
||||
/* 0AFB04 800AEF04 A0800015 */ sb $zero, 0x15($a0)
|
||||
|
||||
/* 0AFB08 800AEF08 A08F0015 */ sb $t7, 0x15($a0)
|
||||
.L800AEF0C:
|
||||
/* 0AFB0C 800AEF0C 03E00008 */ jr $ra
|
||||
/* 0AFB10 800AEF10 00000000 */ nop
|
||||
9762
src/code_80091750.c
9762
src/code_80091750.c
File diff suppressed because it is too large
Load Diff
|
|
@ -76,6 +76,9 @@ void func_80093754(s32, s32, char*, s32, f32, f32);
|
|||
void print_text2(s32, s32, char*, s32, f32, f32, s32);
|
||||
void func_800939C8(s32, s32, char*, s32, f32, f32);
|
||||
void text_draw(s32, s32, char*, s32, f32, f32);
|
||||
void func_80093C1C(s32);
|
||||
void func_80093C88();
|
||||
void func_80093C90();
|
||||
void func_80093C98(s32);
|
||||
void func_80093E20();
|
||||
void func_80093E40();
|
||||
|
|
@ -145,7 +148,6 @@ void get_time_record_seconds(s32 , char*);
|
|||
void get_time_record_centiseconds(s32, char*);
|
||||
void func_800A8230();
|
||||
void func_800A8250();
|
||||
void func_800AB290(struct_8018D9E0_entry*);
|
||||
void func_800A86E8(struct_8018D9E0_entry*);
|
||||
void func_800A8E14(struct_8018D9E0_entry*);
|
||||
void func_800A8EC0(struct_8018D9E0_entry*);
|
||||
|
|
@ -157,7 +159,12 @@ struct_8018D9E0_entry *func_800AAEF4(s32);
|
|||
struct_8018D9E0_entry *func_800AAF30(s32);
|
||||
s32 func_800AAF70(s32);
|
||||
void func_800AAF94(struct_8018D9E0_entry*, s32);
|
||||
void func_800AB260(struct_8018D9E0_entry*);
|
||||
void func_800AB290(struct_8018D9E0_entry*);
|
||||
void func_800AC978(struct_8018D9E0_entry*);
|
||||
void func_800AEE90(struct_8018D9E0_entry*);
|
||||
void func_800AEEBC(struct_8018D9E0_entry*);
|
||||
void func_800AEEE8(struct_8018D9E0_entry*);
|
||||
void func_800AF480(struct_8018D9E0_entry*);
|
||||
void func_800AF4DC(struct_8018D9E0_entry*);
|
||||
void func_800AF740(struct_8018D9E0_entry*);
|
||||
|
|
@ -173,18 +180,6 @@ void func_80057CE4();
|
|||
|
||||
/* This is where I'd put my static data, if I had any */
|
||||
|
||||
extern Gfx D_02007650[];
|
||||
extern Gfx D_020076B0[];
|
||||
extern Gfx D_020077A8[];
|
||||
extern Gfx D_020077D8[];
|
||||
extern Gfx D_02007F18[];
|
||||
extern Gfx D_02007F48[];
|
||||
extern Gfx D_02007F60[];
|
||||
extern Gfx D_02007FC8[];
|
||||
extern Gfx D_02008008[];
|
||||
extern Gfx D_02008030[];
|
||||
extern Gfx D_02008058[];
|
||||
|
||||
extern Gfx D_06009410[];
|
||||
|
||||
extern s16 gGlyphDisplayWidth[]; // D_800EF690
|
||||
|
|
|
|||
|
|
@ -0,0 +1,80 @@
|
|||
#ifndef DATA_SEGMENT2_H
|
||||
#define DATA_SEGMENT2_H
|
||||
|
||||
extern s32 D_02007B38[];
|
||||
|
||||
extern Gfx D_02007650[];
|
||||
extern Gfx D_020076B0[];
|
||||
extern Gfx D_020076E0[];
|
||||
extern Gfx D_02007708[];
|
||||
extern Gfx D_02007728[];
|
||||
extern Gfx D_02007748[];
|
||||
extern Gfx D_02007768[];
|
||||
extern Gfx D_02007788[];
|
||||
extern Gfx D_020077A8[];
|
||||
extern Gfx D_020077D8[];
|
||||
extern Gfx D_020077F8[];
|
||||
extern Gfx D_02007818[];
|
||||
extern Gfx D_02007838[];
|
||||
extern Gfx D_02007858[];
|
||||
extern Gfx D_02007878[];
|
||||
extern Gfx D_02007898[];
|
||||
extern Gfx D_020078B8[];
|
||||
extern Gfx D_020078D8[];
|
||||
extern Gfx D_020078F8[];
|
||||
extern Gfx D_02007918[];
|
||||
extern Gfx D_02007938[];
|
||||
extern Gfx D_02007958[];
|
||||
extern Gfx D_02007978[];
|
||||
extern Gfx D_02007998[];
|
||||
extern Gfx D_020079B8[];
|
||||
extern Gfx D_020079D8[];
|
||||
extern Gfx D_020079F8[];
|
||||
extern Gfx D_02007A18[];
|
||||
extern Gfx D_02007A38[];
|
||||
extern Gfx D_02007A58[];
|
||||
extern Gfx D_02007A78[];
|
||||
extern Gfx D_02007A98[];
|
||||
extern Gfx D_02007AB8[];
|
||||
extern Gfx D_02007AD8[];
|
||||
extern Gfx D_02007AF8[];
|
||||
extern Gfx D_02007B18[];
|
||||
extern Gfx D_02007F18[];
|
||||
extern Gfx D_02007F48[];
|
||||
extern Gfx D_02007F60[];
|
||||
extern Gfx D_02007FC8[];
|
||||
extern Gfx D_02008008[];
|
||||
extern Gfx D_02008030[];
|
||||
extern Gfx D_02008058[];
|
||||
extern Gfx D_060093F8[];
|
||||
extern Gfx D_0D006940[];
|
||||
|
||||
extern mk_Vtx_Flag D_02007BB8[];
|
||||
extern mk_Vtx_Flag D_02007BD8[];
|
||||
extern mk_Vtx_Flag D_02007BF8[];
|
||||
extern mk_Vtx_Flag D_02007C18[];
|
||||
extern mk_Vtx_Flag D_02007C38[];
|
||||
extern mk_Vtx_Flag D_02007C58[];
|
||||
extern mk_Vtx_Flag D_02007C78[];
|
||||
extern mk_Vtx_Flag D_02007C98[];
|
||||
extern mk_Vtx_Flag D_02007CB8[];
|
||||
extern mk_Vtx_Flag D_02007CD8[];
|
||||
extern mk_Vtx_Flag D_02007CF8[];
|
||||
extern mk_Vtx_Flag D_02007D18[];
|
||||
extern mk_Vtx_Flag D_02007D38[];
|
||||
extern mk_Vtx_Flag D_02007D58[];
|
||||
extern mk_Vtx_Flag D_02007D78[];
|
||||
extern mk_Vtx_Flag D_02007D98[];
|
||||
extern mk_Vtx_Flag D_02007DB8[];
|
||||
extern mk_Vtx_Flag D_02007DD8[];
|
||||
extern mk_Vtx_Flag D_02007DF8[];
|
||||
extern mk_Vtx_Flag D_02007E18[];
|
||||
extern mk_Vtx_Flag D_02007E38[];
|
||||
extern mk_Vtx_Flag D_02007E58[];
|
||||
extern mk_Vtx_Flag D_02007E78[];
|
||||
extern mk_Vtx_Flag D_02007E98[];
|
||||
extern mk_Vtx_Flag D_02007EB8[];
|
||||
extern mk_Vtx_Flag D_02007ED8[];
|
||||
extern mk_Vtx_Flag D_02007EF8[];
|
||||
|
||||
#endif
|
||||
|
|
@ -2,39 +2,7 @@
|
|||
#include <types.h>
|
||||
#include <PR/ultratypes.h>
|
||||
#include <PR/gbi.h>
|
||||
|
||||
extern mk_Vtx_Flag D_02007BB8[];
|
||||
extern s32 D_800E84C0[];
|
||||
extern mk_Vtx_Flag D_02007BD8[];
|
||||
extern mk_Vtx_Flag D_02007BF8[];
|
||||
extern mk_Vtx_Flag D_02007C18[];
|
||||
extern mk_Vtx_Flag D_02007C38[];
|
||||
extern mk_Vtx_Flag D_02007C58[];
|
||||
extern mk_Vtx_Flag D_02007C78[];
|
||||
extern mk_Vtx_Flag D_02007C98[];
|
||||
extern mk_Vtx_Flag D_02007CB8[];
|
||||
extern mk_Vtx_Flag D_02007CD8[];
|
||||
extern mk_Vtx_Flag D_02007CF8[];
|
||||
extern mk_Vtx_Flag D_02007D18[];
|
||||
extern mk_Vtx_Flag D_02007D38[];
|
||||
extern mk_Vtx_Flag D_02007D58[];
|
||||
extern mk_Vtx_Flag D_02007D78[];
|
||||
extern mk_Vtx_Flag D_02007D98[];
|
||||
extern mk_Vtx_Flag D_02007DB8[];
|
||||
extern mk_Vtx_Flag D_02007DD8[];
|
||||
extern mk_Vtx_Flag D_02007DF8[];
|
||||
extern mk_Vtx_Flag D_02007E18[];
|
||||
extern mk_Vtx_Flag D_02007E38[];
|
||||
extern mk_Vtx_Flag D_02007E58[];
|
||||
extern mk_Vtx_Flag D_02007E78[];
|
||||
extern mk_Vtx_Flag D_02007E98[];
|
||||
extern mk_Vtx_Flag D_02007EB8[];
|
||||
extern mk_Vtx_Flag D_02007ED8[];
|
||||
extern mk_Vtx_Flag D_02007EF8[];
|
||||
|
||||
extern Gfx D_060093F8[];
|
||||
|
||||
extern Gfx D_0D006940[];
|
||||
#include "data_segment2.h"
|
||||
|
||||
Gfx D_02007650[] = {
|
||||
gsDPPipeSync(),
|
||||
|
|
@ -521,4 +489,4 @@ Gfx D_02008058[] = {
|
|||
gsDPPipeSync(),
|
||||
gsDPSetCycleType(G_CYC_1CYCLE),
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue