Game-Decompilation/kirby64
1
0
Fork 0
mirror of https://github.com/farisawan-2000/kirby64.git synced 2024-11-23 05:10:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Labeled all jump tables in ovl0, converted some .s files in data to .c, minor data cleanup

Browse Source
This commit is contained in:
Mr-Wiseguy 2020-10-08 22:38:15 -04:00
parent a53e1d4591
commit 04216fa5ae
32 changed files with 26715 additions and 38637 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/non_matchings/ovl0/ovl0_2_5/func_80008EC4.s
View File

@ -97,9 +97,9 @@ glabel func_80008EC4
/* 009C18 80009018 1020017B */ beqz $at, .L80009608_ovl0
/* 009C1C 8000901C A0430004 */ sb $v1, 4($v0)
/* 009C20 80009020 000F7880 */ sll $t7, $t7, 2
/* 009C24 80009024 3C018004 */ lui $at, 0x8004
/* 009C24 80009024 3C018004 */ lui $at, %hi(jtbl_8004050C)
/* 009C28 80009028 002F0821 */ addu $at, $at, $t7
/* 009C2C 8000902C 8C2F050C */ lw $t7, 0x50c($at)
/* 009C2C 8000902C 8C2F050C */ lw $t7, %lo(jtbl_8004050C)($at)
/* 009C30 80009030 01E00008 */ jr $t7
/* 009C34 80009034 00000000 */ nop
/* 009C38 80009038 3C0E8004 */ lui $t6, %hi(D_8003DEBC) # $t6, 0x8004

4
asm/non_matchings/ovl0/ovl0_2_5/func_80009658.s
View File

@ -33,9 +33,9 @@ glabel func_80009658
/* 00A2CC 800096CC AC890060 */ sw $t1, 0x60($a0)
/* 00A2D0 800096D0 1020003C */ beqz $at, .L800097C4_ovl0
/* 00A2D4 800096D4 A0450004 */ sb $a1, 4($v0)
/* 00A2D8 800096D8 3C018004 */ lui $at, 0x8004
/* 00A2D8 800096D8 3C018004 */ lui $at, %hi(jtbl_80040608)
/* 00A2DC 800096DC 002A0821 */ addu $at, $at, $t2
/* 00A2E0 800096E0 8C2A0608 */ lw $t2, 0x608($at)
/* 00A2E0 800096E0 8C2A0608 */ lw $t2, %lo(jtbl_80040608)($at)
/* 00A2E4 800096E4 01400008 */ jr $t2
/* 00A2E8 800096E8 00000000 */ nop
/* 00A2EC 800096EC 3C0B8004 */ lui $t3, %hi(D_8003DE58) # $t3, 0x8004

4
asm/non_matchings/ovl0/ovl0_3/func_8000D0AC.s
View File

@ -115,9 +115,9 @@ glabel func_8000D0AC
/* 00DE54 8000D254 2D21000A */ sltiu $at, $t1, 0xa
/* 00DE58 8000D258 10200028 */ beqz $at, .L8000D2FC_ovl0
/* 00DE5C 8000D25C 00094880 */ sll $t1, $t1, 2
/* 00DE60 8000D260 3C018004 */ lui $at, 0x8004
/* 00DE60 8000D260 3C018004 */ lui $at, %hi(jtbl_80040710)
/* 00DE64 8000D264 00290821 */ addu $at, $at, $t1
/* 00DE68 8000D268 8C290710 */ lw $t1, 0x710($at)
/* 00DE68 8000D268 8C290710 */ lw $t1, %lo(jtbl_80040710)($at)
/* 00DE6C 8000D26C 01200008 */ jr $t1
/* 00DE70 8000D270 00000000 */ nop
/* 00DE74 8000D274 10000021 */ b .L8000D2FC_ovl0

4
asm/non_matchings/ovl0/ovl0_3/func_8000D35C.s
View File

@ -126,9 +126,9 @@ glabel func_8000D35C
/* 00E120 8000D520 1020022F */ beqz $at, .L8000DDE0_ovl0
/* 00E124 8000D524 AFA40058 */ sw $a0, 0x58($sp)
/* 00E128 8000D528 00045880 */ sll $t3, $a0, 2
/* 00E12C 8000D52C 3C018004 */ lui $at, 0x8004
/* 00E12C 8000D52C 3C018004 */ lui $at, %hi(jtbl_8004074C)
/* 00E130 8000D530 002B0821 */ addu $at, $at, $t3
/* 00E134 8000D534 8C2B074C */ lw $t3, 0x74c($at)
/* 00E134 8000D534 8C2B074C */ lw $t3, %lo(jtbl_8004074C)($at)
/* 00E138 8000D538 01600008 */ jr $t3
/* 00E13C 8000D53C 00000000 */ nop
/* 00E140 8000D540 306C7FFF */ andi $t4, $v1, 0x7fff

8
asm/non_matchings/ovl0/ovl0_3/func_8000DE30.s
View File

@ -108,9 +108,9 @@ glabel func_8000DE30
.L8000DFC0_ovl0:
/* 00EBC0 8000DFC0 102000C4 */ beqz $at, .L8000E2D4_ovl0
/* 00EBC4 8000DFC4 000E7080 */ sll $t6, $t6, 2
/* 00EBC8 8000DFC8 3C018004 */ lui $at, 0x8004
/* 00EBC8 8000DFC8 3C018004 */ lui $at, %hi(jtbl_800407B4)
/* 00EBCC 8000DFCC 002E0821 */ addu $at, $at, $t6
/* 00EBD0 8000DFD0 8C2E07B4 */ lw $t6, 0x7b4($at)
/* 00EBD0 8000DFD0 8C2E07B4 */ lw $t6, %lo(jtbl_800407B4)($at)
/* 00EBD4 8000DFD4 01C00008 */ jr $t6
/* 00EBD8 8000DFD8 00000000 */ nop
/* 00EBDC 8000DFDC 444FF800 */ cfc1 $t7, $31
@ -297,9 +297,9 @@ glabel func_8000DE30
/* 00EE7C 8000E27C 2DA10005 */ sltiu $at, $t5, 5
/* 00EE80 8000E280 10200014 */ beqz $at, .L8000E2D4_ovl0
/* 00EE84 8000E284 000D6880 */ sll $t5, $t5, 2
/* 00EE88 8000E288 3C018004 */ lui $at, 0x8004
/* 00EE88 8000E288 3C018004 */ lui $at, %hi(jtbl_800407DC)
/* 00EE8C 8000E28C 002D0821 */ addu $at, $at, $t5
/* 00EE90 8000E290 8C2D07DC */ lw $t5, 0x7dc($at)
/* 00EE90 8000E290 8C2D07DC */ lw $t5, %lo(jtbl_800407DC)($at)
/* 00EE94 8000E294 01A00008 */ jr $t5
/* 00EE98 8000E298 00000000 */ nop
/* 00EE9C 8000E29C 8D580000 */ lw $t8, ($t2)

4
asm/non_matchings/ovl0/ovl0_3/func_8000E474.s
View File

@ -3,9 +3,9 @@ glabel func_8000E474
/* 00F078 8000E478 2DC1000A */ sltiu $at, $t6, 0xa
/* 00F07C 8000E47C 10200017 */ beqz $at, .L8000E4DC_ovl0
/* 00F080 8000E480 000E7080 */ sll $t6, $t6, 2
/* 00F084 8000E484 3C018004 */ lui $at, 0x8004
/* 00F084 8000E484 3C018004 */ lui $at, %hi(jtbl_800407F8)
/* 00F088 8000E488 002E0821 */ addu $at, $at, $t6
/* 00F08C 8000E48C 8C2E07F8 */ lw $t6, 0x7f8($at)
/* 00F08C 8000E48C 8C2E07F8 */ lw $t6, %lo(jtbl_800407F8)($at)
/* 00F090 8000E490 01C00008 */ jr $t6
/* 00F094 8000E494 00000000 */ nop
/* 00F098 8000E498 03E00008 */ jr $ra

4
asm/non_matchings/ovl0/ovl0_3/func_8000E4E4.s
View File

@ -3,9 +3,9 @@ glabel func_8000E4E4
/* 00F0E8 8000E4E8 2DC1000A */ sltiu $at, $t6, 0xa
/* 00F0EC 8000E4EC 10200017 */ beqz $at, .L8000E54C_ovl0
/* 00F0F0 8000E4F0 000E7080 */ sll $t6, $t6, 2
/* 00F0F4 8000E4F4 3C018004 */ lui $at, 0x8004
/* 00F0F4 8000E4F4 3C018004 */ lui $at, %hi(jtbl_80040820)
/* 00F0F8 8000E4F8 002E0821 */ addu $at, $at, $t6
/* 00F0FC 8000E4FC 8C2E0820 */ lw $t6, 0x820($at)
/* 00F0FC 8000E4FC 8C2E0820 */ lw $t6, %lo(jtbl_80040820)($at)
/* 00F100 8000E500 01C00008 */ jr $t6
/* 00F104 8000E504 00000000 */ nop
/* 00F108 8000E508 03E00008 */ jr $ra

4
asm/non_matchings/ovl0/ovl0_3/func_8000E818.s
View File

@ -8,9 +8,9 @@ glabel func_8000E818
/* 00F430 8000E830 1020000D */ beqz $at, .L8000E868_ovl0
/* 00F434 8000E834 AFA7004C */ sw $a3, 0x4c($sp)
/* 00F438 8000E838 000E7080 */ sll $t6, $t6, 2
/* 00F43C 8000E83C 3C018004 */ lui $at, 0x8004
/* 00F43C 8000E83C 3C018004 */ lui $at, %hi(jtbl_80040850)
/* 00F440 8000E840 002E0821 */ addu $at, $at, $t6
/* 00F444 8000E844 8C2E0850 */ lw $t6, 0x850($at)
/* 00F444 8000E844 8C2E0850 */ lw $t6, %lo(jtbl_80040850)($at)
/* 00F448 8000E848 01C00008 */ jr $t6
/* 00F44C 8000E84C 00000000 */ nop
/* 00F450 8000E850 10000005 */ b .L8000E868_ovl0

4
asm/non_matchings/ovl0/ovl0_3/func_8000F230.s
View File

@ -57,9 +57,9 @@ glabel func_8000F230
/* 00FF04 8000F304 2F21000A */ sltiu $at, $t9, 0xa
/* 00FF08 8000F308 10200020 */ beqz $at, .L8000F38C_ovl0
/* 00FF0C 8000F30C 0019C880 */ sll $t9, $t9, 2
/* 00FF10 8000F310 3C018004 */ lui $at, 0x8004
/* 00FF10 8000F310 3C018004 */ lui $at, %hi(jtbl_80040884)
/* 00FF14 8000F314 00390821 */ addu $at, $at, $t9
/* 00FF18 8000F318 8C390884 */ lw $t9, 0x884($at)
/* 00FF18 8000F318 8C390884 */ lw $t9, %lo(jtbl_80040884)($at)
/* 00FF1C 8000F31C 03200008 */ jr $t9
/* 00FF20 8000F320 00000000 */ nop
/* 00FF24 8000F324 C7A40084 */ lwc1 $f4, 0x84($sp)

4
asm/non_matchings/ovl0/ovl0_3/func_8000F754.s
View File

@ -14,9 +14,9 @@ glabel func_8000F754
/* 010384 8000F784 1020001C */ beqz $at, .L8000F7F8_ovl0
/* 010388 8000F788 00001825 */ move $v1, $zero
/* 01038C 8000F78C 000E7080 */ sll $t6, $t6, 2
/* 010390 8000F790 3C018004 */ lui $at, 0x8004
/* 010390 8000F790 3C018004 */ lui $at, %hi(jtbl_800408AC)
/* 010394 8000F794 002E0821 */ addu $at, $at, $t6
/* 010398 8000F798 8C2E08AC */ lw $t6, 0x8ac($at)
/* 010398 8000F798 8C2E08AC */ lw $t6, %lo(jtbl_800408AC)($at)
/* 01039C 8000F79C 01C00008 */ jr $t6
/* 0103A0 8000F7A0 00000000 */ nop
/* 0103A4 8000F7A4 10000014 */ b .L8000F7F8_ovl0

4
asm/non_matchings/ovl0/ovl0_3/func_8000FE64.s
View File

@ -117,9 +117,9 @@ glabel func_8000FE64
/* 010C04 80010004 102001BD */ beqz $at, .L800106FC_ovl0
/* 010C08 80010008 0080B825 */ move $s7, $a0
/* 010C0C 8001000C 00044080 */ sll $t0, $a0, 2
/* 010C10 80010010 3C018004 */ lui $at, 0x8004
/* 010C10 80010010 3C018004 */ lui $at, %hi(jtbl_800408F8)
/* 010C14 80010014 00280821 */ addu $at, $at, $t0
/* 010C18 80010018 8C2808F8 */ lw $t0, 0x8f8($at)
/* 010C18 80010018 8C2808F8 */ lw $t0, %lo(jtbl_800408F8)($at)
/* 010C1C 8001001C 01000008 */ jr $t0
/* 010C20 80010020 00000000 */ nop
/* 010C24 80010024 30697FFF */ andi $t1, $v1, 0x7fff

4
asm/non_matchings/ovl0/ovl0_3/func_8001074C.s
View File

@ -47,9 +47,9 @@ glabel func_8001074C
/* 0113F8 800107F8 2D21000A */ sltiu $at, $t1, 0xa
/* 0113FC 800107FC 1020004D */ beqz $at, .L80010934_ovl0
/* 011400 80010800 00094880 */ sll $t1, $t1, 2
/* 011404 80010804 3C018004 */ lui $at, 0x8004
/* 011404 80010804 3C018004 */ lui $at, %hi(jtbl_80040964)
/* 011408 80010808 00290821 */ addu $at, $at, $t1
/* 01140C 8001080C 8C290964 */ lw $t1, 0x964($at)
/* 01140C 8001080C 8C290964 */ lw $t1, %lo(jtbl_80040964)($at)
/* 011410 80010810 01200008 */ jr $t1
/* 011414 80010814 00000000 */ nop
/* 011418 80010818 0C0033E1 */ jal func_8000CF84

4
asm/non_matchings/ovl0/ovl0_3/func_800109B4.s
View File

@ -20,9 +20,9 @@ glabel func_800109B4
/* 0115EC 800109EC 5020FFFF */ beql $at, $zero, .L800109EC_ovl0
/* 0115F0 800109F0 2CC10012 */ sltiu $at, $a2, 0x12
/* 0115F4 800109F4 00067080 */ sll $t6, $a2, 2
/* 0115F8 800109F8 3C018004 */ lui $at, 0x8004
/* 0115F8 800109F8 3C018004 */ lui $at, %hi(jtbl_80040994)
/* 0115FC 800109FC 002E0821 */ addu $at, $at, $t6
/* 011600 80010A00 8C2E0994 */ lw $t6, 0x994($at)
/* 011600 80010A00 8C2E0994 */ lw $t6, %lo(jtbl_80040994)($at)
/* 011604 80010A04 01C00008 */ jr $t6
/* 011608 80010A08 00000000 */ nop
/* 01160C 80010A0C 30AF7FFF */ andi $t7, $a1, 0x7fff

12
asm/non_matchings/ovl0/ovl0_4/func_80011180.s
View File

@ -102,9 +102,9 @@ glabel func_80011180
/* 011EF0 800112F0 2DE10012 */ sltiu $at, $t7, 0x12
/* 011EF4 800112F4 1020000C */ beqz $at, .L80011328_ovl0
/* 011EF8 800112F8 000F7880 */ sll $t7, $t7, 2
/* 011EFC 800112FC 3C018004 */ lui $at, 0x8004
/* 011EFC 800112FC 3C018004 */ lui $at, %hi(jtbl_800409E0)
/* 011F00 80011300 002F0821 */ addu $at, $at, $t7
/* 011F04 80011304 8C2F09E0 */ lw $t7, 0x9e0($at)
/* 011F04 80011304 8C2F09E0 */ lw $t7, %lo(jtbl_800409E0)($at)
/* 011F08 80011308 01E00008 */ jr $t7
/* 011F0C 8001130C 00000000 */ nop
/* 011F10 80011310 3C038005 */ lui $v1, %hi(D_8004A3F8) # $v1, 0x8005
@ -149,9 +149,9 @@ glabel func_80011180
/* 011F9C 8001139C 2DE10012 */ sltiu $at, $t7, 0x12
/* 011FA0 800113A0 1020000C */ beqz $at, .L800113D4_ovl0
/* 011FA4 800113A4 000F7880 */ sll $t7, $t7, 2
/* 011FA8 800113A8 3C018004 */ lui $at, 0x8004
/* 011FA8 800113A8 3C018004 */ lui $at, %hi(jtbl_80040A28)
/* 011FAC 800113AC 002F0821 */ addu $at, $at, $t7
/* 011FB0 800113B0 8C2F0A28 */ lw $t7, 0xa28($at)
/* 011FB0 800113B0 8C2F0A28 */ lw $t7, %lo(jtbl_80040A28)($at)
/* 011FB4 800113B4 01E00008 */ jr $t7
/* 011FB8 800113B8 00000000 */ nop
/* 011FBC 800113BC 3C038005 */ lui $v1, %hi(D_8004A3F8) # $v1, 0x8005
@ -187,9 +187,9 @@ glabel func_80011180
/* 012024 80011424 2D21003F */ sltiu $at, $t1, 0x3f
/* 012028 80011428 10200725 */ beqz $at, .L800130C0_ovl0
/* 01202C 8001142C 00094880 */ sll $t1, $t1, 2
/* 012030 80011430 3C018004 */ lui $at, 0x8004
/* 012030 80011430 3C018004 */ lui $at, %hi(jtbl_80040A70)
/* 012034 80011434 00290821 */ addu $at, $at, $t1
/* 012038 80011438 8C290A70 */ lw $t1, 0xa70($at)
/* 012038 80011438 8C290A70 */ lw $t1, %lo(jtbl_80040A70)($at)
/* 01203C 8001143C 01200008 */ jr $t1
/* 012040 80011440 00000000 */ nop
/* 012044 80011444 1000073E */ b .L80013140_ovl0

12
asm/non_matchings/ovl0/ovl0_4/func_800171E0.s
View File

@ -53,9 +53,9 @@ glabel func_800171E0
/* 017EA4 800172A4 2D210011 */ sltiu $at, $t1, 0x11
/* 017EA8 800172A8 102000D9 */ beqz $at, .L80017610_ovl0
/* 017EAC 800172AC 00094880 */ sll $t1, $t1, 2
/* 017EB0 800172B0 3C018004 */ lui $at, 0x8004
/* 017EB0 800172B0 3C018004 */ lui $at, %hi(jtbl_80040B70)
/* 017EB4 800172B4 00290821 */ addu $at, $at, $t1
/* 017EB8 800172B8 8C290B70 */ lw $t1, 0xb70($at)
/* 017EB8 800172B8 8C290B70 */ lw $t1, %lo(jtbl_80040B70)($at)
/* 017EBC 800172BC 01200008 */ jr $t1
/* 017EC0 800172C0 00000000 */ nop
/* 017EC4 800172C4 100000E1 */ b .L8001764C_ovl0
@ -301,9 +301,9 @@ glabel func_800171E0
/* 01826C 8001766C 2DC10011 */ sltiu $at, $t6, 0x11
/* 018270 80017670 10200053 */ beqz $at, .L800177C0_ovl0
/* 018274 80017674 000E7080 */ sll $t6, $t6, 2
/* 018278 80017678 3C018004 */ lui $at, 0x8004
/* 018278 80017678 3C018004 */ lui $at, %hi(jtbl_80040BB4)
/* 01827C 8001767C 002E0821 */ addu $at, $at, $t6
/* 018280 80017680 8C2E0BB4 */ lw $t6, 0xbb4($at)
/* 018280 80017680 8C2E0BB4 */ lw $t6, %lo(jtbl_80040BB4)($at)
/* 018284 80017684 01C00008 */ jr $t6
/* 018288 80017688 00000000 */ nop
/* 01828C 8001768C 1000005B */ b .L800177FC_ovl0
@ -416,9 +416,9 @@ glabel func_800171E0
/* 018424 80017824 2F210008 */ sltiu $at, $t9, 8
/* 018428 80017828 1020001D */ beqz $at, .L800178A0_ovl0
/* 01842C 8001782C 0019C880 */ sll $t9, $t9, 2
/* 018430 80017830 3C018004 */ lui $at, 0x8004
/* 018430 80017830 3C018004 */ lui $at, %hi(jtbl_80040BF8)
/* 018434 80017834 00390821 */ addu $at, $at, $t9
/* 018438 80017838 8C390BF8 */ lw $t9, 0xbf8($at)
/* 018438 80017838 8C390BF8 */ lw $t9, %lo(jtbl_80040BF8)($at)
/* 01843C 8001783C 03200008 */ jr $t9
/* 018440 80017840 00000000 */ nop
/* 018444 80017844 10000016 */ b .L800178A0_ovl0

4
asm/ovl0/xprintf.s
View File

@ -23,9 +23,9 @@ glabel _Putfld
/* 03383C 80032C3C 2DE10034 */ sltiu $at, $t7, 0x34
/* 033840 80032C40 10200181 */ beqz $at, .L80033248_ovl0
/* 033844 80032C44 000F7880 */ sll $t7, $t7, 2
/* 033848 80032C48 3C018004 */ lui $at, 0x8004
/* 033848 80032C48 3C018004 */ lui $at, %hi(jtbl_80041B94)
/* 03384C 80032C4C 002F0821 */ addu $at, $at, $t7
/* 033850 80032C50 8C2F1B94 */ lw $t7, 0x1b94($at)
/* 033850 80032C50 8C2F1B94 */ lw $t7, %lo(jtbl_80041B94)($at)
/* 033854 80032C54 01E00008 */ jr $t7
/* 033858 80032C58 00000000 */ nop
.L80032C5C_ovl0:

20
data/banks/banks.c
View File

@ -1,11 +1,11 @@
#include <ultra64.h>
#include "data/banks/bank0.c"
#include "data/banks/bank1.c"
#include "data/banks/bank2.c"
#include "data/banks/bank3.c"
#include "data/banks/bank4.c"
#include "data/banks/bank5.c"
#include "data/banks/bank6.c"
#include <ultra64.h>
#include "data/banks/bank0.c"
#include "data/banks/bank1.c"
#include "data/banks/bank2.c"
#include "data/banks/bank3.c"
#include "data/banks/bank4.c"
#include "data/banks/bank5.c"
#include "data/banks/bank6.c"
#include "data/banks/bank7.c"

40
data/kirby.039DF0.2.01.c
View File

@ -26,7 +26,7 @@ u8 D_8004044C[] = "omGLinkObjDLCommon() : dl_link num over : dl_link = %d : id =
u8 D_80040490[] = "omGMoveObjDL() : dl_link num over : dl_link = %d : id = %d\n";
u8 D_800404CC[] = "omGMoveObjDLHead() : dl_link num over : dl_link = %d : id = %d\n";
u32 D_8004050C = 0x80009608;
u32 jtbl_8004050C = 0x80009608;
u32 D_80040510 = 0x80009608;
@ -152,7 +152,7 @@ u32 D_80040600 = 0x80009518;
u32 D_80040604 = 0x8000957C;
u32 D_80040608 = 0x800097C4;
u32 jtbl_80040608 = 0x800097C4;
u32 D_8004060C = 0x800097C4;
@ -271,7 +271,7 @@ f32 D_80040708 = -FLT_MAX;
f32 D_8004070C = -FLT_MAX / 3.0f;
u32 D_80040710 = 0x8000D274;
u32 jtbl_80040710 = 0x8000D274;
u32 D_80040714 = 0x8000D27C;
@ -301,7 +301,7 @@ f32 D_80040744 = -FLT_MAX / 2.0f;
f32 D_80040748 = -FLT_MAX / 3.0f;
u32 D_8004074C = 0x8000DAD8;
u32 jtbl_8004074C = 0x8000DAD8;
u32 D_80040750 = 0x8000DA34;
@ -353,7 +353,7 @@ f32 D_800407AC = -FLT_MAX;
f32 D_800407B0 = -FLT_MAX / 3.0f;
u32 D_800407B4 = 0x8000DFDC;
u32 jtbl_800407B4 = 0x8000DFDC;
u32 D_800407B8 = 0x8000E064;
@ -373,7 +373,7 @@ u32 D_800407D4 = 0x8000E11C;
u32 D_800407D8 = 0x8000E124;
u32 D_800407DC = 0x8000E29C;
u32 jtbl_800407DC = 0x8000E29C;
u32 D_800407E0 = 0x8000E2A8;
@ -387,7 +387,7 @@ f32 D_800407F0 = -FLT_MAX / 3.0f;
f32 D_800407F4 = -FLT_MAX;
u32 D_800407F8 = 0x8000E498;
u32 jtbl_800407F8 = 0x8000E498;
u32 D_800407FC = 0x8000E4A0;
@ -407,7 +407,7 @@ u32 D_80040818 = 0x8000E4D0;
u32 D_8004081C = 0x8000E4D8;
u32 D_80040820 = 0x8000E508;
u32 jtbl_80040820 = 0x8000E508;
u32 D_80040824 = 0x8000E510;
@ -431,7 +431,7 @@ f32 D_80040848 = -FLT_MAX / 3.0f;
f32 D_8004084C = -FLT_MAX / 3.0f;
u32 D_80040850 = 0x8000E850;
u32 jtbl_80040850 = 0x8000E850;
u32 D_80040854 = 0x8000E850;
@ -457,7 +457,7 @@ f32 D_8004087C = 2 * M_PI;
f32 D_80040880 = -FLT_MAX;
u32 D_80040884 = 0x8000F324;
u32 jtbl_80040884 = 0x8000F324;
u32 D_80040888 = 0x8000F330;
@ -477,7 +477,7 @@ u32 D_800408A4 = 0x8000F378;
u32 D_800408A8 = 0x8000F384;
u32 D_800408AC = 0x8000F7A4;
u32 jtbl_800408AC = 0x8000F7A4;
u32 D_800408B0 = 0x8000F7F8;
@ -515,7 +515,7 @@ f32 D_800408F0 = -FLT_MAX / 2.0f;
f32 D_800408F4 = -FLT_MAX / 3.0f;
u32 D_800408F8 = 0x8001064C;
u32 jtbl_800408F8 = 0x8001064C;
u32 D_800408FC = 0x80010514;
@ -569,7 +569,7 @@ f32 D_8004095C = -FLT_MAX;
f32 D_80040960 = -FLT_MAX / 3.0f;
u32 D_80040964 = 0x80010818;
u32 jtbl_80040964 = 0x80010818;
u32 D_80040968 = 0x80010828;
@ -593,7 +593,7 @@ f32 D_8004098C = -FLT_MAX / 3.0f;
f32 D_80040990 = -FLT_MAX;
u32 D_80040994 = 0x80010B04;
u32 jtbl_80040994 = 0x80010B04;
u32 D_80040998 = 0x80010B0C;
@ -631,7 +631,7 @@ u32 D_800409D8 = 0x80010AC4;
u32 D_800409DC = 0x00000000;
u32 D_800409E0 = 0x80011310;
u32 jtbl_800409E0 = 0x80011310;
u32 D_800409E4 = 0x80011310;
@ -667,7 +667,7 @@ u32 D_80040A20 = 0x80011310;
u32 D_80040A24 = 0x80011310;
u32 D_80040A28 = 0x800113BC;
u32 jtbl_80040A28 = 0x800113BC;
u32 D_80040A2C = 0x800113BC;
@ -703,7 +703,7 @@ u32 D_80040A68 = 0x800113BC;
u32 D_80040A6C = 0x800113BC;
u32 D_80040A70 = 0x80011444;
u32 jtbl_80040A70 = 0x80011444;
u32 D_80040A74 = 0x8001144C;
@ -831,7 +831,7 @@ u32 D_80040B68 = 0x80011A1C;
u32 D_80040B6C = 0x37800080;
u32 D_80040B70 = 0x800172C4;
u32 jtbl_80040B70 = 0x800172C4;
u32 D_80040B74 = 0x800172CC;
@ -865,7 +865,7 @@ u32 D_80040BAC = 0x800175A8;
u32 D_80040BB0 = 0x800175A8;
u32 D_80040BB4 = 0x8001768C;
u32 jtbl_80040BB4 = 0x8001768C;
u32 D_80040BB8 = 0x80017694;
@ -899,7 +899,7 @@ u32 D_80040BF0 = 0x80017700;
u32 D_80040BF4 = 0x80017760;
u32 D_80040BF8 = 0x80017844;
u32 jtbl_80040BF8 = 0x80017844;
u32 D_80040BFC = 0x8001784C;

2
data/kirby.039DF0.2.1.c
View File

@ -18,7 +18,7 @@ u32 D_80041B8C = 0x00000010;
u32 D_80041B90 = 0x00000000;
u32 D_80041B94 = 0x80032F68;
u32 jtbl_80041B94 = 0x80032F68;
u32 D_80041B98 = 0x80033248;

15
data/kirby.066630.c
View File

@ -177,17 +177,10 @@ u32 D_800BE540 = 0x00000000;
u32 D_800BE544 = 0x00000000;
u32 D_800BE548 = 0xB4B4B400;
u32 D_800BE54C = 0xB4B4B400;
u32 D_800BE550 = 0xFFFFFF00;
u32 D_800BE554 = 0xFFFFFF00;
u32 D_800BE558 = 0x323C2800;
u32 D_800BE55C = 0x00000000;
Lights1 D_800BE548 = gdSPDefLights1(
0xB4, 0xB4, 0xB4,
0xFF, 0xFF, 0xFF,
0x32, 0x3C, 0x28);
u32 D_800BE560 = 0x00000004;

9427
data/kirby.0AC900_1.c Normal file
View File

File diff suppressed because it is too large Load Diff

802
data/kirby.0AC900_1.h Normal file
View File

@ -0,0 +1,802 @@
#ifndef __KIRBY_0AC900_1_H__
#define __KIRBY_0AC900_1_H__
extern u32 gFrameBuffer;
extern u32 D_803DA800;
extern u32 D_8012EB00;
void func_800F6830_ovl2();
void func_800A73B0();
void func_800F6AB0_ovl2();
void func_800F64B0_ovl2();
void func_800F6830_ovl2();
void func_800A73B0();
void func_800F6AB0_ovl2();
void func_8000464C();
void func_800F64B0_ovl2();
extern u32 D_80124010;
extern u32 D_80124080;
extern u32 D_80124108;
extern u32 D_80124198;
extern u32 D_801241BC;
extern u32 D_80124238;
void func_801D0C60_ovl8();
extern u32 D_801E0908;
extern u32 D_801F49B4_ovl10;
void func_801B1E60();
void func_801B2AE0_ovl7();
void func_801B575C_ovl7();
void func_801B8F20();
extern u32 D_801D8DC0;
void func_801BA56C_ovl7();
extern u32 D_801D9558;
void func_801B4D50();
void func_800FCED8_ovl2();
void func_8022641C_ovl18();
void func_80225DE0_ovl18();
void func_802201C0_ovl18();
void func_80222510_ovl18();
void func_80222898_ovl18();
void func_80220728_ovl18();
void func_80222220_ovl18();
void func_80221288_ovl18();
void func_80223684_ovl18();
void func_80224AF4_ovl18();
void func_80224580_ovl18();
void func_802250EC_ovl18();
void func_802216C8_ovl18();
void func_80225418_ovl18();
void func_8022396C_ovl18();
void func_800FCED8_ovl2();
void func_801EC2A0_ovl10();
void func_801E3770_ovl10();
void func_801DBC00_ovl10();
extern u32 func_801DB1E0;
extern u32 func_801DB1E0;
extern u32 func_801DB1E0;
extern u32 func_801DB1E0;
extern u32 func_801DB1E0;
void func_801BD7C4_ovl7();
void func_801BD8AC_ovl7();
void func_801BD930_ovl7();
void func_801BD9B4_ovl7();
void func_801BDA38_ovl7();
void func_801BDADC_ovl7();
void func_801BDBFC_ovl7();
void func_801BE068_ovl7();
void func_801BF12C_ovl7();
void func_801F11A8_ovl10();
void func_801BF220();
void func_801BF448_ovl7();
void func_801BF448_ovl7();
void func_801BF448_ovl7();
void func_801BF448_ovl7();
void func_801BF448_ovl7();
void func_801BF448_ovl7();
void func_801BF448_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C07A8_ovl7();
void func_801C1F44_ovl7();
void func_801C1F44_ovl7();
void func_801C1F44_ovl7();
void func_801C1F44_ovl7();
void func_801C1F44_ovl7();
void func_801C1F44_ovl7();
void func_801C1F44_ovl7();
void func_801C1F44_ovl7();
void func_8021EF00_ovl19();
void func_8021F3B4_ovl19();
void func_8021FC7C_ovl19();
void func_8022023C_ovl19();
void func_802209A0_ovl19();
void func_80220F48_ovl19();
void func_8022170C_ovl19();
void func_80221DDC_ovl19();
void func_800FCF04_ovl2();
void func_802224BC_ovl19();
void func_80222A54_ovl18();
void func_800FD418_ovl2();
extern u32 D_80124830;
extern u32 D_80124870;
extern u32 D_80124890;
extern u32 D_8012C8D0;
extern u32 D_8012C8D8;
extern u32 D_8012C908;
extern u32 D_8012C948;
extern u32 D_8012CC18;
extern u32 D_8012CC58;
void func_80115AAC_ovl2();
void func_80115D38_ovl2();
void func_80115EAC_ovl2();
void func_80115EDC_ovl2();
void func_80115EFC_ovl2();
void func_801161D4_ovl2();
void func_80116218_ovl2();
void func_8011623C_ovl2();
void func_801162F4();
void func_80116438_ovl2();
void func_8011646C_ovl2();
void func_801164A0_ovl2();
void func_801164D4_ovl2();
void func_80116B68();
void func_80116CA0_ovl2();
void func_80116CC0_ovl2();
void func_80116CE0_ovl2();
void func_80116D00_ovl2();
void func_80116D20_ovl2();
void func_80116D40_ovl2();
void func_80116D60_ovl2();
void func_80116D80_ovl2();
void func_80116DA0_ovl2();
void func_80116DC0_ovl2();
void func_80116DE0_ovl2();
void func_80116E00_ovl2();
void func_80116E20_ovl2();
void func_80116E40_ovl2();
void func_80116E60_ovl2();
void func_80116E80_ovl2();
void func_80116EA0_ovl2();
void func_80118F70();
void func_80118F9C_ovl2();
void func_80116EC0_ovl2();
void func_80116EE0_ovl2();
void func_80116F00_ovl2();
void func_80116F20_ovl2();
void func_80116F40_ovl2();
void func_80116F60_ovl2();
void func_80117078_ovl2();
void func_80117098_ovl2();
void func_801170B8_ovl2();
void func_801170D8_ovl2();
void func_801170F8_ovl2();
void func_80117118_ovl2();
void func_80117138_ovl2();
void func_80117158_ovl2();
void func_801171F0_ovl2();
void func_80117698_ovl2();
void func_801176B8_ovl2();
void func_801176D8_ovl2();
void func_801176F8_ovl2();
void func_80117718_ovl2();
void func_80117738_ovl2();
void func_80117758_ovl2();
void func_80117784_ovl2();
void func_801177B0_ovl2();
void func_801177DC_ovl2();
void func_80117808_ovl2();
void func_80117D70();
void func_80117DA0_ovl2();
void func_80117DD8_ovl2();
void func_80117E10_ovl2();
void func_80117E38_ovl2();
void func_80117E60_ovl2();
void func_80117E88_ovl2();
void func_80117EB0_ovl2();
void func_80117ED8_ovl2();
void func_80117F00_ovl2();
void func_80118270_ovl2();
void func_8011829C_ovl2();
void func_801182C8_ovl2();
void func_801182F4_ovl2();
void func_80118498_ovl2();
void func_80118578_ovl2();
void func_80118598_ovl2();
void func_801185B8_ovl2();
void func_801185D8_ovl2();
void func_80118638_ovl2();
void func_801185F8_ovl2();
void func_80118618_ovl2();
void func_80118FC8_ovl2();
void func_80118FE8_ovl2();
void func_80119008_ovl2();
void func_80119028_ovl2();
void func_80119048_ovl2();
void func_80119068_ovl2();
void func_80119088_ovl2();
void func_80119090();
void func_801190B0_ovl2();
void func_801190DC_ovl2();
void func_80119108_ovl2();
void func_80119128_ovl2();
void func_80119148_ovl2();
void func_80119168_ovl2();
void func_80119188_ovl2();
void func_80119270_ovl2();
void func_80119290_ovl2();
void func_801192B0_ovl2();
void func_801192B8();
void func_801192C0();
void func_801192E0_ovl2();
void func_80119300_ovl2();
void func_801193CC_ovl2();
void func_801193EC_ovl2();
void func_8011940C_ovl2();
void func_8011942C_ovl2();
void func_8011944C_ovl2();
void func_8011946C_ovl2();
void func_8011948C_ovl2();
void func_801194AC_ovl2();
void func_801194CC_ovl2();
void func_801194EC_ovl2();
void func_8011950C_ovl2();
void func_8011952C_ovl2();
void func_8011954C_ovl2();
void func_8011956C_ovl2();
void func_8011958C_ovl2();
void func_801195AC_ovl2();
void func_801195CC_ovl2();
void func_801195EC_ovl2();
void func_8011960C_ovl2();
void func_8011962C_ovl2();
void func_8011964C_ovl2();
void func_8011966C_ovl2();
void func_8011968C_ovl2();
void func_801196AC_ovl2();
void func_801196CC_ovl2();
void func_801196EC_ovl2();
void func_8011970C_ovl2();
void func_8011972C_ovl2();
void func_8011974C_ovl2();
void func_8011976C_ovl2();
void func_8011982C_ovl2();
void func_8011988C_ovl2();
void func_801198AC_ovl2();
void func_801198CC_ovl2();
void func_801199E0_ovl2();
void func_80119A00_ovl2();
void func_80119A20_ovl2();
void func_80119A40_ovl2();
void func_80119A60_ovl2();
void func_80119A80_ovl2();
void func_80119AA0_ovl2();
void func_80119AC0_ovl2();
void func_80119AE0_ovl2();
void func_80119B00_ovl2();
void func_80119B20_ovl2();
void func_80119B40_ovl2();
void func_80119B80_ovl2();
void func_80119BA0_ovl2();
void func_80119BC0_ovl2();
void func_80119BE0_ovl2();
void func_80119C40_ovl2();
void func_80119C6C_ovl2();
void func_80119C98_ovl2();
void func_80119CC4_ovl2();
void func_801198EC_ovl2();
void func_8011990C_ovl2();
void func_80119DA0_ovl2();
void func_80119DC0_ovl2();
void func_80119DE0_ovl2();
void func_80119E00_ovl2();
void func_80119E20_ovl2();
void func_80119E40_ovl2();
void func_80119E60_ovl2();
void func_80119E80_ovl2();
void func_80119EA0_ovl2();
void func_80119EC0_ovl2();
void func_80119EE0_ovl2();
void func_80119F00_ovl2();
void func_80119F20_ovl2();
void func_80119F40_ovl2();
void func_80119F60_ovl2();
void func_80119F80_ovl2();
void func_80119FA0_ovl2();
void func_80119FC0_ovl2();
void func_80119FE0_ovl2();
void func_8011A000_ovl2();
void func_8011A020_ovl2();
void func_8011A040_ovl2();
void func_8011A178_ovl2();
void func_8011A214_ovl2();
void func_80119B60_ovl2();
void func_8011A234_ovl2();
void func_8011A254_ovl2();
void func_80119C00_ovl2();
void func_80119C20_ovl2();
void func_80119CF0_ovl2();
void func_8011A274_ovl2();
void func_8011A294_ovl2();
void func_8011A3B8_ovl2();
void func_8011A3D8_ovl2();
void func_8011A3F8_ovl2();
void func_8011A418_ovl2();
void func_8011A438_ovl2();
void func_8011A458_ovl2();
void func_8011A478_ovl2();
void func_8011A498_ovl2();
void func_8011A4C0_ovl2();
void func_8011A4E8_ovl2();
void func_8011A510_ovl2();
void func_8011A538_ovl2();
void func_8011A770_ovl2();
void func_8011A560_ovl2();
void func_8011A86C_ovl2();
void func_8011A88C_ovl2();
void func_8011A8AC_ovl2();
void func_8011A8CC_ovl2();
void func_8011A8EC_ovl2();
void func_8011A90C_ovl2();
void func_8011A92C_ovl2();
void func_8011A638_ovl2();
void func_8011A94C_ovl2();
void func_8011AB7C_ovl2();
void func_8011AB9C_ovl2();
void func_8011ABBC_ovl2();
void func_8011ABDC_ovl2();
void func_8011AC3C_ovl2();
void func_8011AC5C_ovl2();
void func_8011A96C_ovl2();
void func_8011A98C_ovl2();
void func_8011A9AC_ovl2();
void func_8011A9CC_ovl2();
void func_8011AC7C_ovl2();
void func_8011AC9C_ovl2();
void func_8011ACBC_ovl2();
void func_8011ACDC_ovl2();
void func_8011ACFC_ovl2();
void func_8011AD1C_ovl2();
void func_8011AD3C_ovl2();
void func_8011AD5C_ovl2();
void func_8011AD7C_ovl2();
void func_8011AD9C_ovl2();
void func_8011ADBC_ovl2();
void func_8011ADDC_ovl2();
void func_8011AFB0_ovl2();
void func_8011AFD0_ovl2();
void func_8011AFF0_ovl2();
void func_8011B010_ovl2();
void func_8011B030_ovl2();
void func_8011B328_ovl2();
void func_80119D1C_ovl2();
void func_80119D48_ovl2();
void func_80119D74_ovl2();
void func_8011ABFC_ovl2();
void func_8011AC1C_ovl2();
void func_8011B3B8_ovl2();
void func_8011B528_ovl2();
void func_8011B554_ovl2();
void func_8011B580_ovl2();
void func_8011B5AC_ovl2();
void func_8011B794_ovl2();
void func_8011B838_ovl2();
void func_80117F28_ovl2();
void func_801180B8();
void func_8011B858_ovl2();
void func_8011B944_ovl2();
void func_8011B964_ovl2();
void func_8011B984_ovl2();
void func_8011B9A4_ovl2();
void func_8011B9C4_ovl2();
void func_8011B9E4_ovl2();
void func_8011B5D8_ovl2();
void func_8011B5F8_ovl2();
void func_8011B618_ovl2();
void func_8011B638_ovl2();
void func_8011984C_ovl2();
void func_8011986C_ovl2();
void func_80118320_ovl2();
void func_80118340_ovl2();
void func_80118360_ovl2();
void func_80118380_ovl2();
void func_8011B658_ovl2();
void func_8011B678_ovl2();
void func_8011B698_ovl2();
void func_8011B6B8_ovl2();
extern u32 func_80112B4C;
void func_80115C4C_ovl2();
extern u32 func_80112B4C;
void func_8011591C_ovl2();
void func_80115888();
extern u32 func_80112B4C;
extern u32 D_80116118;
extern u32 D_80116118;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 func_80112B4C;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_8011591C_ovl2();
void func_80115888();
void func_8011591C_ovl2();
void func_80115888();
void func_8011591C_ovl2();
void func_80115888();
void func_8011591C_ovl2();
void func_80115888();
void func_8011591C_ovl2();
void func_80115888();
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_8011591C_ovl2();
void func_80115888();
void func_80116FF8_ovl2();
void func_8011591C_ovl2();
void func_80115888();
void func_8011591C_ovl2();
void func_80115888();
void func_8011591C_ovl2();
void func_80115888();
void func_8011591C_ovl2();
void func_80115888();
void func_8011591C_ovl2();
void func_80115888();
void func_8011591C_ovl2();
void func_80115888();
void func_8011591C_ovl2();
void func_80115888();
void func_80117178_ovl2();
extern u32 D_80117570;
extern u32 D_80117570;
extern u32 D_80117570;
extern u32 D_80117570;
extern u32 D_80117570;
extern u32 D_80117570;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
extern u32 D_800B4924;
void func_801181AC_ovl2();
void func_80118130_ovl2();
void func_801181AC_ovl2();
void func_80118130_ovl2();
void func_801181AC_ovl2();
void func_80118130_ovl2();
void func_801181AC_ovl2();
void func_80118130_ovl2();
void func_80118420_ovl2();
void func_801184B8_ovl2();
void func_801184B8_ovl2();
void func_801184B8_ovl2();
void func_801184B8_ovl2();
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_80119320_ovl2();
void func_80119320_ovl2();
void func_80119320_ovl2();
void func_80119320_ovl2();
void func_80119320_ovl2();
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_8011978C_ovl2();
void func_801151BC_ovl2();
extern u32 D_800B4924;
void func_801151BC_ovl2();
extern u32 D_800B4924;
void func_801151BC_ovl2();
extern u32 D_800B4924;
void func_801151BC_ovl2();
extern u32 D_800B4924;
void func_801151BC_ovl2();
extern u32 D_800B4924;
void func_801151BC_ovl2();
extern u32 D_800B4924;
void func_801151BC_ovl2();
extern u32 D_800B4924;
void func_801151BC_ovl2();
extern u32 D_800B4924;
void func_801151BC_ovl2();
extern u32 D_800B4924;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 D_800B4924;
void func_801151BC_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_80115270_ovl2();
extern u32 D_800B4924;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_8011A0FC();
extern u32 func_80112B4C;
void func_8011A198_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_8011A2F4_ovl2();
extern u32 func_80112B4C;
void func_8011A2F4_ovl2();
extern u32 func_80112B4C;
void func_8011A2F4_ovl2();
extern u32 func_80112B4C;
void func_8011A2F4_ovl2();
extern u32 func_80112B4C;
void func_8011A2F4_ovl2();
extern u32 func_80112B4C;
void func_8011A2F4_ovl2();
extern u32 func_80112B4C;
void func_8011A2F4_ovl2();
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_8011A678_ovl2();
extern u32 func_80112B4C;
void func_8011A7A8_ovl2();
extern u32 func_80112B4C;
void func_8011A7A8_ovl2();
extern u32 func_80112B4C;
void func_8011A7A8_ovl2();
extern u32 func_80112B4C;
void func_8011A7A8_ovl2();
extern u32 func_80112B4C;
void func_8011A7A8_ovl2();
extern u32 func_80112B4C;
void func_8011A7A8_ovl2();
extern u32 func_80112B4C;
void func_8011A7A8_ovl2();
extern u32 func_80112B4C;
void func_8011A588_ovl2();
extern u32 func_80112B4C;
void func_8011AA7C_ovl2();
void func_8011AA7C_ovl2();
void func_8011AA7C_ovl2();
void func_8011AA7C_ovl2();
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_801151BC_ovl2();
extern u32 func_80112B4C;
void func_8011AEF0_ovl2();
void func_8011AF50_ovl2();
void func_8011AEF0_ovl2();
void func_8011AF50_ovl2();
void func_8011AEF0_ovl2();
void func_8011B22C_ovl2();
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_8011AA7C_ovl2();
void func_8011AA7C_ovl2();
void func_8011B348_ovl2();
void func_8011B464_ovl2();
void func_8011B3F4_ovl2();
void func_8011B464_ovl2();
void func_8011B3F4_ovl2();
void func_8011B464_ovl2();
void func_8011B3F4_ovl2();
void func_8011B464_ovl2();
void func_8011B3F4_ovl2();
void func_8011B6D8_ovl2();
void func_8011B7CC_ovl2();
extern u32 D_800B4924;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_8011B464_ovl2();
extern u32 func_80112B4C;
void func_8011B464_ovl2();
extern u32 func_80112B4C;
void func_8011B464_ovl2();
extern u32 func_80112B4C;
void func_8011B464_ovl2();
extern u32 func_80112B4C;
extern u32 func_80112B4C;
extern u32 func_80112B4C;
void func_801181AC_ovl2();
extern u32 func_80112B4C;
void func_801181AC_ovl2();
extern u32 func_80112B4C;
void func_801181AC_ovl2();
extern u32 func_80112B4C;
void func_801181AC_ovl2();
extern u32 func_80112B4C;
void func_8011B464_ovl2();
extern u32 func_80112B4C;
void func_8011B464_ovl2();
extern u32 func_80112B4C;
void func_8011B464_ovl2();
extern u32 func_80112B4C;
void func_8011B464_ovl2();
extern u32 func_80112B4C;
void func_801181AC_ovl2();
extern u32 func_80112B4C;
void func_801181AC_ovl2();
extern u32 func_80112B4C;
void func_801181AC_ovl2();
extern u32 func_80112B4C;
void func_801181AC_ovl2();
extern u32 func_80112B4C;
extern u32 D_80128388;
extern u32 D_801283A8;
extern u32 D_801283C8;
#endif

14227
data/kirby.0AC900_1.s
View File

File diff suppressed because it is too large Load Diff

4962
data/kirby.1014F0.c Normal file
View File

File diff suppressed because it is too large Load Diff

5
data/kirby.1014F0.h Normal file
View File

@ -0,0 +1,5 @@
#ifndef __KIRBY_1014F0_H__
#define __KIRBY_1014F0_H__
#endif

7443
data/kirby.1014F0.s
View File

File diff suppressed because it is too large Load Diff

11196
data/kirby.139150.c Normal file
View File

File diff suppressed because it is too large Load Diff

205
data/kirby.139150.h Normal file
View File

@ -0,0 +1,205 @@
#ifndef __KIRBY_139150_H__
#define __KIRBY_139150_H__
void func_80152DB8();
void func_80152EA8();
void func_801532CC();
void func_801533C0();
void func_80153424();
void func_8015347C();
void func_801534A8();
void func_801534D4();
void func_80153530();
void func_8015358C();
void func_801535E8();
void func_80153670();
void func_801536A8();
void func_801536E0();
void func_8015370C();
void func_8015372C();
void func_80153A48();
void func_80153AA8();
void func_80153AF8();
void func_80153868();
void func_80153D10();
void func_80153C28();
void func_80153D6C();
void func_80153F00();
void func_8015403C();
void func_80154088();
void func_80154180();
void func_801541EC();
void func_80153644();
void func_80154214();
void func_80154258();
void func_8015405C();
void func_80154100();
void func_80154158();
extern u32 D_8012EB00;
void func_80151100();
void func_80154C08();
extern u32 D_8015A7D0;
void func_80154BA0();
void func_8000464C();
void func_80154B14();
extern u32 D_80158CB0;
extern u32 D_80158CB0;
extern u32 D_80154F30;
extern u32 D_80155178;
extern u32 D_80155258;
extern u32 D_80155488;
extern u32 D_80155658;
extern u32 D_801557D8;
extern u32 D_801559D8;
extern u32 D_80155BC0;
extern u32 D_80155E10;
extern u32 D_80155F70;
extern u32 D_80156258;
extern u32 D_80156428;
extern u32 D_80156780;
extern u32 D_80156A00;
extern u32 D_80156D98;
extern u32 D_80157068;
extern u32 D_801572C8;
extern u32 D_80157750;
extern u32 D_801579B0;
extern u32 D_80157D00;
extern u32 D_80157E20;
extern u32 D_80157EA0;
extern u32 D_80157F20;
extern u32 D_80157FD0;
extern u32 D_80158080;
extern u32 D_80158130;
extern u32 D_801581E0;
extern u32 D_801582D8;
extern u32 D_801583A0;
extern u32 D_80158438;
extern u32 D_801584D0;
extern u32 D_80158580;
extern u32 D_80158618;
extern u32 D_801586E0;
extern u32 D_80158838;
extern u32 D_80158968;
extern u32 D_801589E8;
extern u32 D_80158A68;
extern u32 D_80158B18;
extern u32 D_80158BB0;
extern u32 D_80158C30;
extern u32 D_80157750;
extern u32 D_801579B0;
extern u32 D_80158E60;
extern u32 D_80158E90;
extern u32 D_80157D90;
extern u32 D_80157E20;
extern u32 D_80157EA0;
extern u32 D_80157F20;
extern u32 D_80157FD0;
extern u32 D_80158080;
extern u32 D_80158130;
extern u32 D_801581E0;
extern u32 D_801582D8;
extern u32 D_801583A0;
extern u32 D_80158438;
extern u32 D_801584D0;
extern u32 D_80158580;
extern u32 D_80158618;
extern u32 D_801586E0;
extern u32 D_80158838;
extern u32 D_80158968;
extern u32 D_801589E8;
extern u32 D_80158A68;
extern u32 D_80158B18;
extern u32 D_80158BB0;
extern u32 D_80158C30;
extern u32 D_80154F30;
extern u32 D_80155178;
extern u32 D_80155258;
extern u32 D_80155488;
extern u32 D_80155658;
extern u32 D_801557D8;
extern u32 D_801559D8;
extern u32 D_80155BC0;
extern u32 D_80155E10;
extern u32 D_80155F70;
extern u32 D_80156258;
extern u32 D_80156428;
extern u32 D_80156780;
extern u32 D_80156A00;
extern u32 D_80156D98;
extern u32 D_80157068;
extern u32 D_801572C8;
extern u32 D_80157750;
extern u32 D_801579B0;
extern u32 D_80158E60;
extern u32 D_80158E90;
extern u32 D_80158E30;
extern u32 D_80158E90;
extern u32 D_80159188;
extern u32 D_801592A8;
extern u32 D_80159328;
extern u32 D_801593A8;
extern u32 D_80159458;
extern u32 D_80159508;
extern u32 D_801595B8;
extern u32 D_80159668;
extern u32 D_80159760;
extern u32 D_80159828;
extern u32 D_801598C0;
extern u32 D_80159958;
extern u32 D_80159A08;
extern u32 D_80159AA0;
extern u32 D_80159B68;
extern u32 D_80159CC0;
extern u32 D_80159DF0;
extern u32 D_80159E70;
extern u32 D_80159EF0;
extern u32 D_80159FA0;
extern u32 D_8015A038;
extern u32 D_8015A0B8;
extern u32 D_80159218;
extern u32 D_801592A8;
extern u32 D_80159328;
extern u32 D_801593A8;
extern u32 D_80159458;
extern u32 D_80159508;
extern u32 D_801595B8;
extern u32 D_80159668;
extern u32 D_80159760;
extern u32 D_80159828;
extern u32 D_801598C0;
extern u32 D_80159958;
extern u32 D_80159A08;
extern u32 D_80159AA0;
extern u32 D_80159B68;
extern u32 D_80159CC0;
extern u32 D_80159DF0;
extern u32 D_80159E70;
extern u32 D_80159EF0;
extern u32 D_80159FA0;
extern u32 D_8015A038;
extern u32 D_8015A0B8;
extern u32 D_8015A138;
extern void* D_8015A140;
extern void* D_8015A14C;
extern void* D_8015A154;
extern void* D_8015A15C;
extern void* D_8015A164;
extern void* D_8015A16C;
extern void* D_8015A174;
extern void* D_8015A17C;
extern void* D_8015A184;
extern void* D_8015A18C;
extern void* D_8015A198;
extern void* D_8015A1A0;
extern void* D_8015A1A8;
extern void* D_8015A1B0;
extern void* D_8015A1BC;
extern void* D_8015A2EC;
extern void* D_8015A294;
extern void* D_8015A220;
extern void* D_8015A22C;
extern void* D_8015A238;
extern void* D_8015A350;
extern void* D_8015A3AC;
#endif

16808
data/kirby.139150.s
View File

File diff suppressed because it is too large Load Diff

76
data/misc/kirby.066630.2.c
View File

@ -1,6 +1,7 @@
#include "types.h"
#include "segments.h"
#include "stages.h"
#include <PR/gs2dex.h>
u32 D_800D00C4 = 0x800D7C50;
@ -6251,65 +6252,24 @@ u32 D_800D4E90 = 0x00800040;
u32 D_800D4E94 = 0x00000000;
u32 D_800D4E98 = 0xE7000000;
u32 D_800D4E9C = 0x00000000;
u32 D_800D4EA0 = 0xE3000800;
u32 D_800D4EA4 = 0x00800000;
u32 D_800D4EA8 = 0xE3000F00;
u32 D_800D4EAC = 0x00000000;
u32 D_800D4EB0 = 0xE3001001;
u32 D_800D4EB4 = 0x00000000;
u32 D_800D4EB8 = 0xE3000D01;
u32 D_800D4EBC = 0x00000000;
u32 D_800D4EC0 = 0xE3000C00;
u32 D_800D4EC4 = 0x00000000;
u32 D_800D4EC8 = 0xE3001402;
u32 D_800D4ECC = 0x00000C00;
u32 D_800D4ED0 = 0xE3001700;
u32 D_800D4ED4 = 0x00000000;
u32 D_800D4ED8 = 0xE3001801;
u32 D_800D4EDC = 0x000000C0;
u32 D_800D4EE0 = 0xE2001E01;
u32 D_800D4EE4 = 0x00000001;
u32 D_800D4EE8 = 0xF9000000;
u32 D_800D4EEC = 0x00000008;
u32 D_800D4EF0 = 0xFCFFFFFF;
u32 D_800D4EF4 = 0xFFFCF279;
u32 D_800D4EF8 = 0xE3001201;
u32 D_800D4EFC = 0x00002000;
u32 D_800D4F00 = 0x0B000000;
u32 D_800D4F04 = 0x0000000C;
u32 D_800D4F08 = 0xDF000000;
u32 D_800D4F0C = 0x00000000;
Gfx D_800D4E98[] = {
gsDPPipeSync(),
gsDPPipelineMode(G_PM_1PRIMITIVE),
gsDPSetTextureLOD(G_TL_TILE),
gsDPSetTextureLUT(G_TT_NONE),
gsDPSetTextureDetail(G_TD_CLAMP),
gsDPSetTexturePersp(G_TP_NONE),
gsDPSetTextureConvert(G_TC_FILT),
gsDPSetCombineKey(G_CK_NONE),
gsDPSetColorDither(G_CD_DISABLE),
gsDPSetAlphaCompare(G_AC_THRESHOLD),
gsDPSetBlendColor(0x00, 0x00, 0x00, 0x08),
gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
gsDPSetTextureFilter(G_TF_BILERP),
gsSPObjRenderMode(G_OBJRM_ANTIALIAS | G_OBJRM_BILERP),
gsSPEndDisplayList(),
};
u32 D_800D4F10 = 0x800141D4;

36
src/ovl7/yakulib.c
View File

@ -245,17 +245,16 @@ extern Lights1 D_800BE548;
// _mostly_ regalloc left at this point
#ifdef NON_MATCHING
#if 0
void func_801BC978_ovl7(s32 *arg0) {
s32 pad[2];
Lights1 *temp_a2;
s32 temp_v0;
Lights1 *temp_a2;
temp_v0 = *arg0;
if ((D_800DD8D0[temp_v0] & 0x40) == 0) {
temp_a2 = D_800E0650[temp_v0];
switch (func_800AB0F4(temp_a2) - 0x13) {
case 0:
switch (func_800AB0F4(arg0)) {
case 13:
gSPSegment(gDisplayListHeads[0]++, 4, D_800DF4D0[temp_v0]);
if (temp_a2 != NULL) {
gSPSetLights1(gDisplayListHeads[0]++, (*temp_a2));
@ -263,7 +262,7 @@ void func_801BC978_ovl7(s32 *arg0) {
func_800AB120(arg0);
gSPSetLights1(gDisplayListHeads[0]++, D_800BE548);
break;
case 2:
case 15:
gSPSegment(gDisplayListHeads[0]++, 4, D_800DF4D0[temp_v0]);
if (temp_a2 != NULL) {
gSPSetLights1(gDisplayListHeads[0]++, (*temp_a2));
@ -279,8 +278,8 @@ void func_801BC978_ovl7(s32 *arg0) {
func_800AB2C0(arg0);
gSPSetLights1(gDisplayListHeads[0]++, D_800BE548);
break;
case 8:
case 10:
case 21:
case 23:
gSPSegment(gDisplayListHeads[0]++, 4, D_800DF4D0[temp_v0]);
if (temp_a2 != NULL) {
gSPSetLights1(gDisplayListHeads[0]++, (*temp_a2));
@ -288,18 +287,21 @@ void func_801BC978_ovl7(s32 *arg0) {
func_800AB3A0(arg0);
gSPSetLights1(gDisplayListHeads[0]++, D_800BE548);
break;
case 1:
case 14:
gSPSegment(gDisplayListHeads[0]++, 4, D_800DF4D0[temp_v0]);
gSPSegment(gDisplayListHeads[1]++, 4, D_800DF4D0[temp_v0]);
if (temp_a2 != NULL) {
gSPSetLights1(gDisplayListHeads[0]++, (*temp_a2));
gSPSetLights1(gDisplayListHeads[1]++, (*temp_a2));
}
func_800AB174(arg0);
gSPSetLights1(gDisplayListHeads[0]++, D_800BE548);
gSPSetLights1(gDisplayListHeads[1]++, D_800BE548);
gSPNumLights(gDisplayListHeads[0]++,NUMLIGHTS_1);
gSPLight(gDisplayListHeads[0]++, &D_800BE548.l[0], LIGHT_1);
gSPLight(gDisplayListHeads[0]++, &D_800BE548.a, LIGHT_2);
gSPNumLights(gDisplayListHeads[1]++,NUMLIGHTS_1);
gSPLight(gDisplayListHeads[1]++, &D_800BE548.l[0], LIGHT_1);
gSPLight(gDisplayListHeads[1]++, &D_800BE548.a, LIGHT_2);
break;
case 3:
case 16:
gSPSegment(gDisplayListHeads[0]++, 4, D_800DF4D0[temp_v0]);
gSPSegment(gDisplayListHeads[1]++, 4, D_800DF4D0[temp_v0]);
if (temp_a2 != NULL) {
@ -310,8 +312,8 @@ void func_801BC978_ovl7(s32 *arg0) {
gSPSetLights1(gDisplayListHeads[0]++, D_800BE548);
gSPSetLights1(gDisplayListHeads[1]++, D_800BE548);
break;
case 5:
case 7:
case 18:
case 20:
gSPSegment(gDisplayListHeads[0]++, 4, D_800DF4D0[temp_v0]);
gSPSegment(gDisplayListHeads[1]++, 4, D_800DF4D0[temp_v0]);
if (temp_a2 != 0) {
@ -322,8 +324,8 @@ void func_801BC978_ovl7(s32 *arg0) {
gSPSetLights1(gDisplayListHeads[0]++, D_800BE548);
gSPSetLights1(gDisplayListHeads[1]++, D_800BE548);
break;
case 9:
case 11:
case 22:
case 24:
gSPSegment(gDisplayListHeads[0]++, 4, D_800DF4D0[temp_v0]);
gSPSegment(gDisplayListHeads[1]++, 4, D_800DF4D0[temp_v0]);
if (temp_a2 != 0) {

4
undefined_syms.txt
View File

@ -3693,6 +3693,8 @@ func_800AA154_ovl4 = 0x800AA154;
D_8015C3E0 = 0x8015C3E0;
func_800208D4_ovl4 = 0x800208D4;
func_80020C88_ovl4 = 0x80020C88;
func_80151CC8_ovl4 = 0x80151CC8;
func_80151B08_ovl4 = 0x80151B08;
D_8015C410 = 0x8015C410;
D_8015C42C = 0x8015C42C;
func_800A8C40_ovl5 = 0x800A8C40;
@ -9699,6 +9701,7 @@ func_80002E48 = 0x80002E48;
/* why is this list getting bigger aaaaaaaaaaaaaa */
func_80102364 = 0x80102364;
D_80128446 = 0x80128446;
D_8012844E = 0x8012844E;
D_8012844C = 0x8012844C;
D_803D3F00 = 0x803D3F00;
@ -9724,6 +9727,7 @@ D_801D02AC = 0x801D02AC;
func_800E3910 = 0x800E3910;
D_800BE4F0 = 0x800BE4F0;
D_800BE550 = 0x800BE550; /* part of Lights1 at D_800BE548 */
D_800D6F34 = 0x800D6F34;
D_800E8920 = 0x800E8920;
D_800D6F10 = 0x800D6F10;