This commit is contained in:
Mittenshugg
2020-08-04 13:56:50 -05:00
71 changed files with 447 additions and 360 deletions
+4 -1
View File
@@ -10,4 +10,7 @@ assets/
!asm/assets/
# Linker file is automatically generated, so it should be ignored
dkr.ld
dkr.ld
# Misc stuff that should be ignored.
.*/
-6
View File
@@ -1,6 +0,0 @@
{
"files.associations": {
"macros.h": "c",
"libultra_internal.h": "c"
}
}
+4
View File
@@ -10,6 +10,10 @@ ifeq ($(wildcard ./assets/.*),)
$(error Error, /assets/ folder was not found. Did you run the ./setup.sh script?)
endif
#################### Generate linker file ####################
GENERATE_LD := $(shell ./generate_ld.sh)
################ Target Executable and Sources ###############
# BUILD_DIR is location where all build artifacts are placed
@@ -1,38 +0,0 @@
glabel func_800011E8
/* 001DE8 800011E8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 001DEC 800011EC 308700FF */ andi $a3, $a0, 0xff
/* 001DF0 800011F0 28E10010 */ slti $at, $a3, 0x10
/* 001DF4 800011F4 AFBF0014 */ sw $ra, 0x14($sp)
/* 001DF8 800011F8 AFA40018 */ sw $a0, 0x18($sp)
/* 001DFC 800011FC AFA5001C */ sw $a1, 0x1c($sp)
/* 001E00 80001200 10200005 */ beqz $at, .L80001218
/* 001E04 80001204 30A600FF */ andi $a2, $a1, 0xff
/* 001E08 80001208 3C04800E */ lui $a0, %hi(D_800DC630) # $a0, 0x800e
/* 001E0C 8000120C 8C84C630 */ lw $a0, %lo(D_800DC630)($a0)
/* 001E10 80001210 0C031E50 */ jal func_800C7940
/* 001E14 80001214 30E500FF */ andi $a1, $a3, 0xff
.L80001218:
/* 001E18 80001218 8FBF0014 */ lw $ra, 0x14($sp)
/* 001E1C 8000121C 27BD0018 */ addiu $sp, $sp, 0x18
/* 001E20 80001220 03E00008 */ jr $ra
/* 001E24 80001224 00000000 */ nop
/* 001E28 80001228 308500FF */ andi $a1, $a0, 0xff
/* 001E2C 8000122C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 001E30 80001230 28A10010 */ slti $at, $a1, 0x10
/* 001E34 80001234 AFBF0014 */ sw $ra, 0x14($sp)
/* 001E38 80001238 14200003 */ bnez $at, .L80001248
/* 001E3C 8000123C AFA40018 */ sw $a0, 0x18($sp)
/* 001E40 80001240 10000005 */ b .L80001258
/* 001E44 80001244 00001025 */ move $v0, $zero
.L80001248:
/* 001E48 80001248 3C04800E */ lui $a0, %hi(D_800DC630) # $a0, 0x800e
/* 001E4C 8000124C 8C84C630 */ lw $a0, %lo(D_800DC630)($a0)
/* 001E50 80001250 0C031E68 */ jal func_800C79A0
/* 001E54 80001254 00000000 */ nop
.L80001258:
/* 001E58 80001258 8FBF0014 */ lw $ra, 0x14($sp)
/* 001E5C 8000125C 27BD0018 */ addiu $sp, $sp, 0x18
/* 001E60 80001260 03E00008 */ jr $ra
/* 001E64 80001264 00000000 */ nop
@@ -1,9 +0,0 @@
glabel D_80063F94
/* 064B94 80063F94 24010001 */ li $at, 1
/* 064B98 80063F98 14A10002 */ bne $a1, $at, .L80063FA4
/* 064B9C 80063F9C 00000000 */ nop
/* 064BA0 80063FA0 AC860000 */ sw $a2, ($a0)
.L80063FA4:
/* 064BA4 80063FA4 03E00008 */ jr $ra
/* 064BA8 80063FA8 00001025 */ move $v0, $zero
@@ -1,43 +0,0 @@
glabel func_80064E54
/* 065A54 80064E54 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 065A58 80064E58 AFA5002C */ sw $a1, 0x2c($sp)
/* 065A5C 80064E5C AFBF0024 */ sw $ra, 0x24($sp)
/* 065A60 80064E60 AFB00020 */ sw $s0, 0x20($sp)
/* 065A64 80064E64 3C05800D */ lui $a1, %hi(D_800CA0D0) # $a1, 0x800d
/* 065A68 80064E68 3C06800D */ lui $a2, %hi(D_800CAA7C) # $a2, 0x800d
/* 065A6C 80064E6C 00808025 */ move $s0, $a0
/* 065A70 80064E70 24C6AA7C */ addiu $a2, %lo(D_800CAA7C) # addiu $a2, $a2, -0x5584
/* 065A74 80064E74 24A5A0D0 */ addiu $a1, %lo(D_800CA0D0) # addiu $a1, $a1, -0x5f30
/* 065A78 80064E78 0C03282C */ jal func_800CA0B0
/* 065A7C 80064E7C 24070004 */ li $a3, 4
/* 065A80 80064E80 8FA6002C */ lw $a2, 0x2c($sp)
/* 065A84 80064E84 240E0050 */ li $t6, 80
/* 065A88 80064E88 AFAE0010 */ sw $t6, 0x10($sp)
/* 065A8C 80064E8C 00002025 */ move $a0, $zero
/* 065A90 80064E90 00002825 */ move $a1, $zero
/* 065A94 80064E94 0C031DFC */ jal func_800C77F0
/* 065A98 80064E98 24070001 */ li $a3, 1
/* 065A9C 80064E9C 24030001 */ li $v1, 1
/* 065AA0 80064EA0 AE020014 */ sw $v0, 0x14($s0)
/* 065AA4 80064EA4 AE030038 */ sw $v1, 0x38($s0)
/* 065AA8 80064EA8 AE000048 */ sw $zero, 0x48($s0)
/* 065AAC 80064EAC A603001A */ sh $v1, 0x1a($s0)
/* 065AB0 80064EB0 A6030028 */ sh $v1, 0x28($s0)
/* 065AB4 80064EB4 A603002E */ sh $v1, 0x2e($s0)
/* 065AB8 80064EB8 A603001C */ sh $v1, 0x1c($s0)
/* 065ABC 80064EBC A603001E */ sh $v1, 0x1e($s0)
/* 065AC0 80064EC0 A6000020 */ sh $zero, 0x20($s0)
/* 065AC4 80064EC4 A6000022 */ sh $zero, 0x22($s0)
/* 065AC8 80064EC8 A6030026 */ sh $v1, 0x26($s0)
/* 065ACC 80064ECC A6000024 */ sh $zero, 0x24($s0)
/* 065AD0 80064ED0 AE000030 */ sw $zero, 0x30($s0)
/* 065AD4 80064ED4 AE000034 */ sw $zero, 0x34($s0)
/* 065AD8 80064ED8 A6000018 */ sh $zero, 0x18($s0)
/* 065ADC 80064EDC AE00003C */ sw $zero, 0x3c($s0)
/* 065AE0 80064EE0 AE000040 */ sw $zero, 0x40($s0)
/* 065AE4 80064EE4 AE000044 */ sw $zero, 0x44($s0)
/* 065AE8 80064EE8 8FBF0024 */ lw $ra, 0x24($sp)
/* 065AEC 80064EEC 8FB00020 */ lw $s0, 0x20($sp)
/* 065AF0 80064EF0 03E00008 */ jr $ra
/* 065AF4 80064EF4 27BD0028 */ addiu $sp, $sp, 0x28
@@ -1,43 +0,0 @@
glabel func_80064EF8
/* 065AF8 80064EF8 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 065AFC 80064EFC AFA5002C */ sw $a1, 0x2c($sp)
/* 065B00 80064F00 AFA60030 */ sw $a2, 0x30($sp)
/* 065B04 80064F04 AFBF0024 */ sw $ra, 0x24($sp)
/* 065B08 80064F08 AFB00020 */ sw $s0, 0x20($sp)
/* 065B0C 80064F0C 3C06800D */ lui $a2, %hi(D_800CB540) # $a2, 0x800d
/* 065B10 80064F10 3C05800D */ lui $a1, %hi(D_800CBBEC) # $a1, 0x800d
/* 065B14 80064F14 00808025 */ move $s0, $a0
/* 065B18 80064F18 24A5BBEC */ addiu $a1, %lo(D_800CBBEC) # addiu $a1, $a1, -0x4414
/* 065B1C 80064F1C 24C6B540 */ addiu $a2, %lo(D_800CB540) # addiu $a2, $a2, -0x4ac0
/* 065B20 80064F20 0C03282C */ jal func_800CA0B0
/* 065B24 80064F24 00003825 */ move $a3, $zero
/* 065B28 80064F28 8FA60030 */ lw $a2, 0x30($sp)
/* 065B2C 80064F2C 240E0020 */ li $t6, 32
/* 065B30 80064F30 AFAE0010 */ sw $t6, 0x10($sp)
/* 065B34 80064F34 00002025 */ move $a0, $zero
/* 065B38 80064F38 00002825 */ move $a1, $zero
/* 065B3C 80064F3C 0C031DFC */ jal func_800C77F0
/* 065B40 80064F40 24070001 */ li $a3, 1
/* 065B44 80064F44 AE020014 */ sw $v0, 0x14($s0)
/* 065B48 80064F48 8FA60030 */ lw $a2, 0x30($sp)
/* 065B4C 80064F4C 240F0020 */ li $t7, 32
/* 065B50 80064F50 AFAF0010 */ sw $t7, 0x10($sp)
/* 065B54 80064F54 00002025 */ move $a0, $zero
/* 065B58 80064F58 00002825 */ move $a1, $zero
/* 065B5C 80064F5C 0C031DFC */ jal func_800C77F0
/* 065B60 80064F60 24070001 */ li $a3, 1
/* 065B64 80064F64 AE020018 */ sw $v0, 0x18($s0)
/* 065B68 80064F68 8FB9002C */ lw $t9, 0x2c($sp)
/* 065B6C 80064F6C 26040034 */ addiu $a0, $s0, 0x34
/* 065B70 80064F70 0320F809 */ jalr $t9
/* 065B74 80064F74 00000000 */ nop
/* 065B78 80064F78 24180001 */ li $t8, 1
/* 065B7C 80064F7C AE020030 */ sw $v0, 0x30($s0)
/* 065B80 80064F80 AE00003C */ sw $zero, 0x3c($s0)
/* 065B84 80064F84 AE180040 */ sw $t8, 0x40($s0)
/* 065B88 80064F88 AE000044 */ sw $zero, 0x44($s0)
/* 065B8C 80064F8C 8FBF0024 */ lw $ra, 0x24($sp)
/* 065B90 80064F90 8FB00020 */ lw $s0, 0x20($sp)
/* 065B94 80064F94 03E00008 */ jr $ra
/* 065B98 80064F98 27BD0028 */ addiu $sp, $sp, 0x28
@@ -1,36 +0,0 @@
glabel func_80064F9C
/* 065B9C 80064F9C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 065BA0 80064FA0 AFA5002C */ sw $a1, 0x2c($sp)
/* 065BA4 80064FA4 AFBF0024 */ sw $ra, 0x24($sp)
/* 065BA8 80064FA8 AFB00020 */ sw $s0, 0x20($sp)
/* 065BAC 80064FAC 3C05800D */ lui $a1, %hi(D_800CC17C) # $a1, 0x800d
/* 065BB0 80064FB0 3C06800D */ lui $a2, %hi(D_800CC090) # $a2, 0x800d
/* 065BB4 80064FB4 00808025 */ move $s0, $a0
/* 065BB8 80064FB8 24C6C090 */ addiu $a2, %lo(D_800CC090) # addiu $a2, $a2, -0x3f70
/* 065BBC 80064FBC 24A5C17C */ addiu $a1, %lo(D_800CC17C) # addiu $a1, $a1, -0x3e84
/* 065BC0 80064FC0 0C03282C */ jal func_800CA0B0
/* 065BC4 80064FC4 24070001 */ li $a3, 1
/* 065BC8 80064FC8 8FA6002C */ lw $a2, 0x2c($sp)
/* 065BCC 80064FCC 240E0020 */ li $t6, 32
/* 065BD0 80064FD0 AFAE0010 */ sw $t6, 0x10($sp)
/* 065BD4 80064FD4 00002025 */ move $a0, $zero
/* 065BD8 80064FD8 00002825 */ move $a1, $zero
/* 065BDC 80064FDC 0C031DFC */ jal func_800C77F0
/* 065BE0 80064FE0 24070001 */ li $a3, 1
/* 065BE4 80064FE4 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 065BE8 80064FE8 44802000 */ mtc1 $zero, $f4
/* 065BEC 80064FEC 44813000 */ mtc1 $at, $f6
/* 065BF0 80064FF0 240F0001 */ li $t7, 1
/* 065BF4 80064FF4 AE020014 */ sw $v0, 0x14($s0)
/* 065BF8 80064FF8 AE0F0024 */ sw $t7, 0x24($s0)
/* 065BFC 80064FFC AE000030 */ sw $zero, 0x30($s0)
/* 065C00 80065000 AE00001C */ sw $zero, 0x1c($s0)
/* 065C04 80065004 AE000028 */ sw $zero, 0x28($s0)
/* 065C08 80065008 AE00002C */ sw $zero, 0x2c($s0)
/* 065C0C 8006500C E6040020 */ swc1 $f4, 0x20($s0)
/* 065C10 80065010 E6060018 */ swc1 $f6, 0x18($s0)
/* 065C14 80065014 8FBF0024 */ lw $ra, 0x24($sp)
/* 065C18 80065018 8FB00020 */ lw $s0, 0x20($sp)
/* 065C1C 8006501C 03E00008 */ jr $ra
/* 065C20 80065020 27BD0028 */ addiu $sp, $sp, 0x28
@@ -1,26 +0,0 @@
glabel func_80065024
/* 065C24 80065024 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 065C28 80065028 AFA5001C */ sw $a1, 0x1c($sp)
/* 065C2C 8006502C AFA60020 */ sw $a2, 0x20($sp)
/* 065C30 80065030 AFBF0014 */ sw $ra, 0x14($sp)
/* 065C34 80065034 3C068006 */ lui $a2, %hi(D_800659D4) # $a2, 0x8006
/* 065C38 80065038 3C058006 */ lui $a1, %hi(D_80065900) # $a1, 0x8006
/* 065C3C 8006503C 24A55900 */ addiu $a1, %lo(D_80065900) # addiu $a1, $a1, 0x5900
/* 065C40 80065040 24C659D4 */ addiu $a2, %lo(D_800659D4) # addiu $a2, $a2, 0x59d4
/* 065C44 80065044 AFA40018 */ sw $a0, 0x18($sp)
/* 065C48 80065048 0C03282C */ jal func_800CA0B0
/* 065C4C 8006504C 24070006 */ li $a3, 6
/* 065C50 80065050 8FA40018 */ lw $a0, 0x18($sp)
/* 065C54 80065054 00000000 */ nop
/* 065C58 80065058 AC800014 */ sw $zero, 0x14($a0)
/* 065C5C 8006505C 8FAE0020 */ lw $t6, 0x20($sp)
/* 065C60 80065060 00000000 */ nop
/* 065C64 80065064 AC8E0018 */ sw $t6, 0x18($a0)
/* 065C68 80065068 8FAF001C */ lw $t7, 0x1c($sp)
/* 065C6C 8006506C 00000000 */ nop
/* 065C70 80065070 AC8F001C */ sw $t7, 0x1c($a0)
/* 065C74 80065074 8FBF0014 */ lw $ra, 0x14($sp)
/* 065C78 80065078 27BD0018 */ addiu $sp, $sp, 0x18
/* 065C7C 8006507C 03E00008 */ jr $ra
/* 065C80 80065080 00000000 */ nop
@@ -1,26 +0,0 @@
glabel func_80065084
/* 065C84 80065084 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 065C88 80065088 AFA5001C */ sw $a1, 0x1c($sp)
/* 065C8C 8006508C AFA60020 */ sw $a2, 0x20($sp)
/* 065C90 80065090 AFBF0014 */ sw $ra, 0x14($sp)
/* 065C94 80065094 3C06800D */ lui $a2, %hi(D_800CC390) # $a2, 0x800d
/* 065C98 80065098 3C05800D */ lui $a1, %hi(D_800CC3C0) # $a1, 0x800d
/* 065C9C 8006509C 24A5C3C0 */ addiu $a1, %lo(D_800CC3C0) # addiu $a1, $a1, -0x3c40
/* 065CA0 800650A0 24C6C390 */ addiu $a2, %lo(D_800CC390) # addiu $a2, $a2, -0x3c70
/* 065CA4 800650A4 AFA40018 */ sw $a0, 0x18($sp)
/* 065CA8 800650A8 0C03282C */ jal func_800CA0B0
/* 065CAC 800650AC 24070007 */ li $a3, 7
/* 065CB0 800650B0 8FA40018 */ lw $a0, 0x18($sp)
/* 065CB4 800650B4 00000000 */ nop
/* 065CB8 800650B8 AC800014 */ sw $zero, 0x14($a0)
/* 065CBC 800650BC 8FAE0020 */ lw $t6, 0x20($sp)
/* 065CC0 800650C0 00000000 */ nop
/* 065CC4 800650C4 AC8E0018 */ sw $t6, 0x18($a0)
/* 065CC8 800650C8 8FAF001C */ lw $t7, 0x1c($sp)
/* 065CCC 800650CC 00000000 */ nop
/* 065CD0 800650D0 AC8F001C */ sw $t7, 0x1c($a0)
/* 065CD4 800650D4 8FBF0014 */ lw $ra, 0x14($sp)
/* 065CD8 800650D8 27BD0018 */ addiu $sp, $sp, 0x18
/* 065CDC 800650DC 03E00008 */ jr $ra
/* 065CE0 800650E0 00000000 */ nop
@@ -1,22 +0,0 @@
glabel func_800650E4
/* 065CE4 800650E4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 065CE8 800650E8 AFBF0014 */ sw $ra, 0x14($sp)
/* 065CEC 800650EC 3C05800D */ lui $a1, %hi(D_800CC514) # $a1, 0x800d
/* 065CF0 800650F0 3C06800D */ lui $a2, %hi(D_800CC4E0) # $a2, 0x800d
/* 065CF4 800650F4 24C6C4E0 */ addiu $a2, %lo(D_800CC4E0) # addiu $a2, $a2, -0x3b20
/* 065CF8 800650F8 24A5C514 */ addiu $a1, %lo(D_800CC514) # addiu $a1, $a1, -0x3aec
/* 065CFC 800650FC AFA40018 */ sw $a0, 0x18($sp)
/* 065D00 80065100 0C03282C */ jal func_800CA0B0
/* 065D04 80065104 24070003 */ li $a3, 3
/* 065D08 80065108 8FA40018 */ lw $a0, 0x18($sp)
/* 065D0C 8006510C 240E0001 */ li $t6, 1
/* 065D10 80065110 AC800014 */ sw $zero, 0x14($a0)
/* 065D14 80065114 AC8E0018 */ sw $t6, 0x18($a0)
/* 065D18 80065118 8FBF0014 */ lw $ra, 0x14($sp)
/* 065D1C 8006511C 27BD0018 */ addiu $sp, $sp, 0x18
/* 065D20 80065120 03E00008 */ jr $ra
/* 065D24 80065124 00000000 */ nop
/* 065D28 80065128 00000000 */ nop
/* 065D2C 8006512C 00000000 */ nop
@@ -1,6 +0,0 @@
glabel func_80072708
/* 073308 80072708 240E0003 */ li $t6, 3
/* 07330C 8007270C 3C01800E */ lui $at, 0x800e
/* 073310 80072710 03E00008 */ jr $ra
/* 073314 80072714 AC2EE48C */ sw $t6, -0x1b74($at)
@@ -1,4 +0,0 @@
glabel func_80073C4C
/* 07484C 80073C4C 03E00008 */ jr $ra
/* 074850 80073C50 24020100 */ li $v0, 256
@@ -1,4 +0,0 @@
glabel func_80073C54
/* 074854 80073C54 03E00008 */ jr $ra
/* 074858 80073C58 24020200 */ li $v0, 512
@@ -1,13 +0,0 @@
glabel func_80075AEC
/* 0766EC 80075AEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0766F0 80075AF0 AFA40018 */ sw $a0, 0x18($sp)
/* 0766F4 80075AF4 3C048012 */ lui $a0, %hi(D_80124010) # $a0, 0x8012
/* 0766F8 80075AF8 AFBF0014 */ sw $ra, 0x14($sp)
/* 0766FC 80075AFC 8C844010 */ lw $a0, %lo(D_80124010)($a0)
/* 076700 80075B00 0C0333F8 */ jal func_800CCFE0
/* 076704 80075B04 00000000 */ nop
/* 076708 80075B08 8FBF0014 */ lw $ra, 0x14($sp)
/* 07670C 80075B0C 27BD0018 */ addiu $sp, $sp, 0x18
/* 076710 80075B10 03E00008 */ jr $ra
/* 076714 80075B14 00001025 */ move $v0, $zero
@@ -1,15 +0,0 @@
glabel func_80076164
/* 076D64 80076164 3C04800E */ lui $a0, %hi(D_800DE440) # $a0, 0x800e
/* 076D68 80076168 8C84E440 */ lw $a0, %lo(D_800DE440)($a0)
/* 076D6C 8007616C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 076D70 80076170 10800003 */ beqz $a0, .L80076180
/* 076D74 80076174 AFBF0014 */ sw $ra, 0x14($sp)
/* 076D78 80076178 0C01C450 */ jal func_80071140
/* 076D7C 8007617C 00000000 */ nop
.L80076180:
/* 076D80 80076180 8FBF0014 */ lw $ra, 0x14($sp)
/* 076D84 80076184 3C01800E */ lui $at, %hi(D_800DE440) # $at, 0x800e
/* 076D88 80076188 AC20E440 */ sw $zero, %lo(D_800DE440)($at)
/* 076D8C 8007618C 03E00008 */ jr $ra
/* 076D90 80076190 27BD0018 */ addiu $sp, $sp, 0x18
+1 -1
View File
@@ -11,4 +11,4 @@ glabel func_80070B04
/* 071724 80070B24 00000000 */ nop
/* 071728 80070B28 00000000 */ nop
/* 07172C 80070B2C 00000000 */ nop
/* 07172C 80070B2C 00000000 */ nop
+1 -1
View File
@@ -177,4 +177,4 @@ extern void osSetEventMesg(OSEvent, OSMesgQueue *, OSMesg);
}
#endif
#endif /* !_OS_MESSAGE_H_ */
#endif /* !_OS_MESSAGE_H_ */
+1 -1
View File
@@ -111,4 +111,4 @@ void osViSwapBuffer(void *vaddr);
extern OSViMode osViModeTable[]; /* Global VI mode table */
#endif
#endif
+16
View File
@@ -0,0 +1,16 @@
/* The comment below is needed for this file to be picked up by generate_ld */
/* RAM_POS: 0x800D4570 */
.include "globals.inc"
.include "macros.inc"
.set noat # allow manual use of $at
.set noreorder # dont insert nops after branches
.set gp=64 # 64-bit instructions are used
glabel __osGetSR
/* 0D5170 800D4570 40026000 */ mfc0 $v0, $12
/* 0D5174 800D4574 03E00008 */ jr $ra
/* 0D5178 800D4578 00000000 */ nop
/* 0D517C 800D457C 00000000 */ nop

Some files were not shown because too many files have changed in this diff Show More