pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

asm update

Browse Source
This commit is contained in:
Ethan Roseman 2020-12-10 08:58:58 +09:00
parent 8243e81b2e
commit f9d084937f
17 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/boot.s
View File

@ -231,12 +231,12 @@ glabel func_A4000040
/* 37C A400037C 01324825 */ or $t1, $t1, $s2 /* 37C A400037C 01324825 */ or $t1, $t1, $s2
/* 380 A4000380 AD490010 */ sw $t1, %lo(D_A4700010)($t2) /* 380 A4000380 AD490010 */ sw $t1, %lo(D_A4700010)($t2)
/* 384 A4000384 8D490010 */ lw $t1, 0x10($t2) /* 384 A4000384 8D490010 */ lw $t1, 0x10($t2)
/* 388 A4000388 3C08A000 */ lui $t0, %hi(D_A0000018) /* 388 A4000388 3C08A000 */ lui $t0, 0xa000
/* 38C A400038C 35080300 */ ori $t0, $t0, 0x300 /* 38C A400038C 35080300 */ ori $t0, $t0, 0x300
/* 390 A4000390 3C090FFF */ lui $t1, 0xfff /* 390 A4000390 3C090FFF */ lui $t1, 0xfff
/* 394 A4000394 3529FFFF */ ori $t1, $t1, 0xffff /* 394 A4000394 3529FFFF */ ori $t1, $t1, 0xffff
/* 398 A4000398 02C9B024 */ and $s6, $s6, $t1 /* 398 A4000398 02C9B024 */ and $s6, $s6, $t1
/* 39C A400039C AD160018 */ sw $s6, %lo(D_A0000018)($t0) /* 39C A400039C AD160018 */ sw $s6, 0x18($t0)
/* 3A0 A40003A0 03C0E825 */ or $sp, $fp, $zero /* 3A0 A40003A0 03C0E825 */ or $sp, $fp, $zero
/* 3A4 A40003A4 27BD0048 */ addiu $sp, $sp, 0x48 /* 3A4 A40003A4 27BD0048 */ addiu $sp, $sp, 0x48
/* 3A8 A40003A8 8FB30000 */ lw $s3, ($sp) /* 3A8 A40003A8 8FB30000 */ lw $s3, ($sp)
@ -459,10 +459,10 @@ glabel func_A40004C0
/* 6C4 A40006C4 24090002 */ addiu $t1, $zero, 2 /* 6C4 A40006C4 24090002 */ addiu $t1, $zero, 2
/* 6C8 A40006C8 3C01A460 */ lui $at, %hi(D_A4600010) /* 6C8 A40006C8 3C01A460 */ lui $at, %hi(D_A4600010)
/* 6CC A40006CC AC290010 */ sw $t1, %lo(D_A4600010)($at) /* 6CC A40006CC AC290010 */ sw $t1, %lo(D_A4600010)($at)
/* 6D0 A40006D0 3C08A000 */ lui $t0, %hi(D_A0000010) /* 6D0 A40006D0 3C08A000 */ lui $t0, 0xa000
/* 6D4 A40006D4 35080300 */ ori $t0, $t0, 0x300 /* 6D4 A40006D4 35080300 */ ori $t0, $t0, 0x300
/* 6D8 A40006D8 240917D7 */ addiu $t1, $zero, 0x17d7 /* 6D8 A40006D8 240917D7 */ addiu $t1, $zero, 0x17d7
/* 6DC A40006DC AD090010 */ sw $t1, %lo(D_A0000010)($t0) /* 6DC A40006DC AD090010 */ sw $t1, 0x10($t0)
/* 6E0 A40006E0 AD140000 */ sw $s4, ($t0) /* 6E0 A40006E0 AD140000 */ sw $s4, ($t0)
/* 6E4 A40006E4 AD130004 */ sw $s3, 4($t0) /* 6E4 A40006E4 AD130004 */ sw $s3, 4($t0)
/* 6E8 A40006E8 AD15000C */ sw $s5, 0xc($t0) /* 6E8 A40006E8 AD15000C */ sw $s5, 0xc($t0)

2
asm/data/code_1000_len_60.data.s
View File

@ -266,7 +266,7 @@ glabel nuAuPreNMIFunc
glabel D_80078178 glabel D_80078178
.word 0x00000000 .word 0x00000000
glabel D_8007817C glabel nuAuFrameCounter
.word 0x00000000 .word 0x00000000
glabel D_80078180 glabel D_80078180

4
asm/nonmatchings/code_18C790/func_8025E190.s
View File

@ -303,14 +303,14 @@ glabel func_8025E190
/* 18CEE8 8025E608 24C61000 */ addiu $a2, $a2, %lo(D_802A1000) /* 18CEE8 8025E608 24C61000 */ addiu $a2, $a2, %lo(D_802A1000)
/* 18CEEC 8025E60C 0C00A5CF */ jal dma_copy /* 18CEEC 8025E60C 0C00A5CF */ jal dma_copy
/* 18CEF0 8025E610 00000000 */ nop /* 18CEF0 8025E610 00000000 */ nop
/* 18CEF4 8025E614 3C048000 */ lui $a0, %hi(D_80004880) /* 18CEF4 8025E614 3C048000 */ lui $a0, 0x8000
/* 18CEF8 8025E618 0C05272D */ jal play_sound /* 18CEF8 8025E618 0C05272D */ jal play_sound
/* 18CEFC 8025E61C 34840008 */ ori $a0, $a0, 8 /* 18CEFC 8025E61C 34840008 */ ori $a0, $a0, 8
/* 18CF00 8025E620 24020005 */ addiu $v0, $zero, 5 /* 18CF00 8025E620 24020005 */ addiu $v0, $zero, 5
/* 18CF04 8025E624 08097FD0 */ j .L8025FF40 /* 18CF04 8025E624 08097FD0 */ j .L8025FF40
/* 18CF08 8025E628 AE000000 */ sw $zero, ($s0) /* 18CF08 8025E628 AE000000 */ sw $zero, ($s0)
/* 18CF0C 8025E62C 3C048028 */ lui $a0, %hi(D_80284880) /* 18CF0C 8025E62C 3C048028 */ lui $a0, %hi(D_80284880)
/* 18CF10 8025E630 24844880 */ addiu $a0, $a0, %lo(D_80004880) /* 18CF10 8025E630 24844880 */ addiu $a0, $a0, %lo(D_80284880)
/* 18CF14 8025E634 2405000A */ addiu $a1, $zero, 0xa /* 18CF14 8025E634 2405000A */ addiu $a1, $zero, 0xa
/* 18CF18 8025E638 0C0B0CF8 */ jal start_script /* 18CF18 8025E638 0C0B0CF8 */ jal start_script
/* 18CF1C 8025E63C 0000302D */ daddu $a2, $zero, $zero /* 18CF1C 8025E63C 0000302D */ daddu $a2, $zero, $zero

6
asm/nonmatchings/code_25f00_len_940/func_8004AB00.s
View File

@ -39,14 +39,14 @@ glabel func_8004AB00
/* 25F88 8004AB88 26523510 */ addiu $s2, $s2, %lo(D_800A3510) /* 25F88 8004AB88 26523510 */ addiu $s2, $s2, %lo(D_800A3510)
/* 25F8C 8004AB8C AFA20020 */ sw $v0, 0x20($sp) /* 25F8C 8004AB8C AFA20020 */ sw $v0, 0x20($sp)
/* 25F90 8004AB90 00001810 */ mfhi $v1 /* 25F90 8004AB90 00001810 */ mfhi $v1
/* 25F94 8004AB94 3C02B216 */ lui $v0, %hi(D_B215B224) /* 25F94 8004AB94 3C02B216 */ lui $v0, 0xb216
/* 25F98 8004AB98 344242C9 */ ori $v0, $v0, 0x42c9 /* 25F98 8004AB98 344242C9 */ ori $v0, $v0, 0x42c9
/* 25F9C 8004AB9C 00031942 */ srl $v1, $v1, 5 /* 25F9C 8004AB9C 00031942 */ srl $v1, $v1, 5
/* 25FA0 8004ABA0 00620019 */ multu $v1, $v0 /* 25FA0 8004ABA0 00620019 */ multu $v1, $v0
/* 25FA4 8004ABA4 A3A00024 */ sb $zero, 0x24($sp) /* 25FA4 8004ABA4 A3A00024 */ sb $zero, 0x24($sp)
/* 25FA8 8004ABA8 AFB0002C */ sw $s0, 0x2c($sp) /* 25FA8 8004ABA8 AFB0002C */ sw $s0, 0x2c($sp)
/* 25FAC 8004ABAC 3C028005 */ lui $v0, %hi(nuAuDmaNew) /* 25FAC 8004ABAC 3C028005 */ lui $v0, %hi(nuAuDmaNew)
/* 25FB0 8004ABB0 2442B224 */ addiu $v0, $v0, %lo(D_B215B224) /* 25FB0 8004ABB0 2442B224 */ addiu $v0, $v0, %lo(nuAuDmaNew)
/* 25FB4 8004ABB4 AFA20028 */ sw $v0, 0x28($sp) /* 25FB4 8004ABB4 AFA20028 */ sw $v0, 0x28($sp)
/* 25FB8 8004ABB8 00001810 */ mfhi $v1 /* 25FB8 8004ABB8 00001810 */ mfhi $v1
/* 25FBC 8004ABBC 000319C2 */ srl $v1, $v1, 7 /* 25FBC 8004ABBC 000319C2 */ srl $v1, $v1, 7
@ -164,7 +164,7 @@ glabel func_8004AB00
/* 2616C 8004AD6C 27A50018 */ addiu $a1, $sp, 0x18 /* 2616C 8004AD6C 27A50018 */ addiu $a1, $sp, 0x18
/* 26170 8004AD70 8FA40020 */ lw $a0, 0x20($sp) /* 26170 8004AD70 8FA40020 */ lw $a0, 0x20($sp)
/* 26174 8004AD74 0C014B97 */ jal func_80052E5C /* 26174 8004AD74 0C014B97 */ jal func_80052E5C
/* 26178 8004AD78 00000000 */ nop /* 26178 8004AD78 00000000 */ nop
/* 2617C 8004AD7C 3C10800A */ lui $s0, %hi(D_800A0F58) /* 2617C 8004AD7C 3C10800A */ lui $s0, %hi(D_800A0F58)
/* 26180 8004AD80 26100F58 */ addiu $s0, $s0, %lo(D_800A0F58) /* 26180 8004AD80 26100F58 */ addiu $s0, $s0, %lo(D_800A0F58)
/* 26184 8004AD84 0200202D */ daddu $a0, $s0, $zero /* 26184 8004AD84 0200202D */ daddu $a0, $s0, $zero

12
asm/nonmatchings/code_25f00_len_940/func_8004AE08.s
View File

@ -95,14 +95,14 @@ glabel func_8004AE08
/* 2635C 8004AF5C 0000902D */ daddu $s2, $zero, $zero /* 2635C 8004AF5C 0000902D */ daddu $s2, $zero, $zero
.L8004AF60: .L8004AF60:
/* 26360 8004AF60 0C018554 */ jal osAiGetStatus /* 26360 8004AF60 0C018554 */ jal osAiGetStatus
/* 26364 8004AF64 00000000 */ nop /* 26364 8004AF64 00000000 */ nop
/* 26368 8004AF68 04410003 */ bgez $v0, .L8004AF78 /* 26368 8004AF68 04410003 */ bgez $v0, .L8004AF78
/* 2636C 8004AF6C 00000000 */ nop /* 2636C 8004AF6C 00000000 */ nop
/* 26370 8004AF70 08012BA8 */ j .L8004AEA0 /* 26370 8004AF70 08012BA8 */ j .L8004AEA0
/* 26374 8004AF74 0000B02D */ daddu $s6, $zero, $zero /* 26374 8004AF74 0000B02D */ daddu $s6, $zero, $zero
.L8004AF78: .L8004AF78:
/* 26378 8004AF78 0C018550 */ jal osAiGetLength /* 26378 8004AF78 0C018550 */ jal osAiGetLength
/* 2637C 8004AF7C 00000000 */ nop /* 2637C 8004AF7C 00000000 */ nop
/* 26380 8004AF80 8FA30078 */ lw $v1, 0x78($sp) /* 26380 8004AF80 8FA30078 */ lw $v1, 0x78($sp)
/* 26384 8004AF84 10600011 */ beqz $v1, .L8004AFCC /* 26384 8004AF84 10600011 */ beqz $v1, .L8004AFCC
/* 26388 8004AF88 00028082 */ srl $s0, $v0, 2 /* 26388 8004AF88 00028082 */ srl $s0, $v0, 2
@ -126,7 +126,7 @@ glabel func_8004AE08
/* 263CC 8004AFCC 2A0200B8 */ slti $v0, $s0, 0xb8 /* 263CC 8004AFCC 2A0200B8 */ slti $v0, $s0, 0xb8
.L8004AFD0: .L8004AFD0:
/* 263D0 8004AFD0 14400003 */ bnez $v0, .L8004AFE0 /* 263D0 8004AFD0 14400003 */ bnez $v0, .L8004AFE0
/* 263D4 8004AFD4 00000000 */ nop /* 263D4 8004AFD4 00000000 */ nop
/* 263D8 8004AFD8 12C00005 */ beqz $s6, .L8004AFF0 /* 263D8 8004AFD8 12C00005 */ beqz $s6, .L8004AFF0
/* 263DC 8004AFDC 24160001 */ addiu $s6, $zero, 1 /* 263DC 8004AFDC 24160001 */ addiu $s6, $zero, 1
.L8004AFE0: .L8004AFE0:
@ -156,12 +156,12 @@ glabel func_8004AE08
/* 26434 8004B034 0060F809 */ jalr $v1 /* 26434 8004B034 0060F809 */ jalr $v1
/* 26438 8004B038 24040001 */ addiu $a0, $zero, 1 /* 26438 8004B038 24040001 */ addiu $a0, $zero, 1
/* 2643C 8004B03C 08012C19 */ j .L8004B064 /* 2643C 8004B03C 08012C19 */ j .L8004B064
/* 26440 8004B040 00000000 */ nop /* 26440 8004B040 00000000 */ nop
.L8004B044: .L8004B044:
/* 26444 8004B044 3C028008 */ lui $v0, %hi(nuAuPreNMIFunc) /* 26444 8004B044 3C028008 */ lui $v0, %hi(nuAuPreNMIFunc)
/* 26448 8004B048 8C428174 */ lw $v0, %lo(nuAuPreNMIFunc)($v0) /* 26448 8004B048 8C428174 */ lw $v0, %lo(nuAuPreNMIFunc)($v0)
/* 2644C 8004B04C 10400005 */ beqz $v0, .L8004B064 /* 2644C 8004B04C 10400005 */ beqz $v0, .L8004B064
/* 26450 8004B050 00000000 */ nop /* 26450 8004B050 00000000 */ nop
/* 26454 8004B054 3C058008 */ lui $a1, %hi(D_80078170) /* 26454 8004B054 3C058008 */ lui $a1, %hi(D_80078170)
/* 26458 8004B058 90A58170 */ lbu $a1, %lo(D_80078170)($a1) /* 26458 8004B058 90A58170 */ lbu $a1, %lo(D_80078170)($a1)
/* 2645C 8004B05C 0040F809 */ jalr $v0 /* 2645C 8004B05C 0040F809 */ jalr $v0

4
asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s
View File

@ -28,12 +28,12 @@ glabel func_800E2BB0
/* 7C0BC 800E2C0C 00000000 */ nop /* 7C0BC 800E2C0C 00000000 */ nop
/* 7C0C0 800E2C10 45000004 */ bc1f .L800E2C24 /* 7C0C0 800E2C10 45000004 */ bc1f .L800E2C24
/* 7C0C4 800E2C14 00000000 */ nop /* 7C0C4 800E2C14 00000000 */ nop
/* 7C0C8 800E2C18 3C01BEF0 */ lui $at, %hi(D_BEEFBD88) /* 7C0C8 800E2C18 3C01BEF0 */ lui $at, 0xbef0
/* 7C0CC 800E2C1C 3421A3D7 */ ori $at, $at, 0xa3d7 /* 7C0CC 800E2C1C 3421A3D7 */ ori $at, $at, 0xa3d7
/* 7C0D0 800E2C20 44813000 */ mtc1 $at, $f6 /* 7C0D0 800E2C20 44813000 */ mtc1 $at, $f6
.L800E2C24: .L800E2C24:
/* 7C0D4 800E2C24 3C018011 */ lui $at, %hi(D_8010BD88) /* 7C0D4 800E2C24 3C018011 */ lui $at, %hi(D_8010BD88)
/* 7C0D8 800E2C28 D422BD88 */ ldc1 $f2, %lo(D_BEEFBD88)($at) /* 7C0D8 800E2C28 D422BD88 */ ldc1 $f2, %lo(D_8010BD88)($at)
/* 7C0DC 800E2C2C 46003021 */ cvt.d.s $f0, $f6 /* 7C0DC 800E2C2C 46003021 */ cvt.d.s $f0, $f6
/* 7C0E0 800E2C30 4620103C */ c.lt.d $f2, $f0 /* 7C0E0 800E2C30 4620103C */ c.lt.d $f2, $f0
/* 7C0E4 800E2C34 00000000 */ nop /* 7C0E4 800E2C34 00000000 */ nop

4
asm/nonmatchings/code_de740_len_23f0/func_801489B8.s
View File

@ -476,7 +476,7 @@ glabel func_801489B8
/* DF7D4 801490D4 3463F438 */ ori $v1, $v1, 0xf438 /* DF7D4 801490D4 3463F438 */ ori $v1, $v1, 0xf438
.L801490D8: .L801490D8:
/* DF7D8 801490D8 34843480 */ ori $a0, $a0, 0x3480 /* DF7D8 801490D8 34843480 */ ori $a0, $a0, 0x3480
/* DF7DC 801490DC 3C03F5FF */ lui $v1, %hi(D_F5FEA66C) /* DF7DC 801490DC 3C03F5FF */ lui $v1, 0xf5ff
/* DF7E0 801490E0 3463FE38 */ ori $v1, $v1, 0xfe38 /* DF7E0 801490E0 3463FE38 */ ori $v1, $v1, 0xfe38
.L801490E4: .L801490E4:
/* DF7E4 801490E4 25420050 */ addiu $v0, $t2, 0x50 /* DF7E4 801490E4 25420050 */ addiu $v0, $t2, 0x50
@ -484,7 +484,7 @@ glabel func_801489B8
/* DF7EC 801490EC AD440048 */ sw $a0, 0x48($t2) /* DF7EC 801490EC AD440048 */ sw $a0, 0x48($t2)
/* DF7F0 801490F0 AD43004C */ sw $v1, 0x4c($t2) /* DF7F0 801490F0 AD43004C */ sw $v1, 0x4c($t2)
/* DF7F4 801490F4 3C03800A */ lui $v1, %hi(D_8009A66C) /* DF7F4 801490F4 3C03800A */ lui $v1, %hi(D_8009A66C)
/* DF7F8 801490F8 2463A66C */ addiu $v1, $v1, %lo(D_F5FEA66C) /* DF7F8 801490F8 2463A66C */ addiu $v1, $v1, %lo(D_8009A66C)
/* DF7FC 801490FC 8C620000 */ lw $v0, ($v1) /* DF7FC 801490FC 8C620000 */ lw $v0, ($v1)
/* DF800 80149100 461ED002 */ mul.s $f0, $f26, $f30 /* DF800 80149100 461ED002 */ mul.s $f0, $f26, $f30
/* DF804 80149104 00000000 */ nop /* DF804 80149104 00000000 */ nop

8
asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s
View File

@ -164,13 +164,13 @@ glabel func_802DC008
/* FF374 802DC284 80630070 */ lb $v1, 0x70($v1) /* FF374 802DC284 80630070 */ lb $v1, 0x70($v1)
/* FF378 802DC288 24020002 */ addiu $v0, $zero, 2 /* FF378 802DC288 24020002 */ addiu $v0, $zero, 2
/* FF37C 802DC28C 14620009 */ bne $v1, $v0, .L802DC2B4 /* FF37C 802DC28C 14620009 */ bne $v1, $v0, .L802DC2B4
/* FF380 802DC290 3C02DC08 */ lui $v0, %hi(D_DC07F3E0) /* FF380 802DC290 3C02DC08 */ lui $v0, 0xdc08
/* FF384 802DC294 34420008 */ ori $v0, $v0, 8 /* FF384 802DC294 34420008 */ ori $v0, $v0, 8
/* FF388 802DC298 25630080 */ addiu $v1, $t3, 0x80 /* FF388 802DC298 25630080 */ addiu $v1, $t3, 0x80
/* FF38C 802DC29C AD830000 */ sw $v1, ($t4) /* FF38C 802DC29C AD830000 */ sw $v1, ($t4)
/* FF390 802DC2A0 AD620078 */ sw $v0, 0x78($t3) /* FF390 802DC2A0 AD620078 */ sw $v0, 0x78($t3)
/* FF394 802DC2A4 3C02802E */ lui $v0, %hi(D_802DF3E0) /* FF394 802DC2A4 3C02802E */ lui $v0, %hi(D_802DF3E0)
/* FF398 802DC2A8 2442F3E0 */ addiu $v0, $v0, %lo(D_DC07F3E0) /* FF398 802DC2A8 2442F3E0 */ addiu $v0, $v0, %lo(D_802DF3E0)
/* FF39C 802DC2AC 080B70B3 */ j .L802DC2CC /* FF39C 802DC2AC 080B70B3 */ j .L802DC2CC
/* FF3A0 802DC2B0 AD62007C */ sw $v0, 0x7c($t3) /* FF3A0 802DC2B0 AD62007C */ sw $v0, 0x7c($t3)
.L802DC2B4: .L802DC2B4:
@ -379,13 +379,13 @@ glabel func_802DC008
/* FF694 802DC5A4 80630070 */ lb $v1, 0x70($v1) /* FF694 802DC5A4 80630070 */ lb $v1, 0x70($v1)
/* FF698 802DC5A8 24020002 */ addiu $v0, $zero, 2 /* FF698 802DC5A8 24020002 */ addiu $v0, $zero, 2
/* FF69C 802DC5AC 14620009 */ bne $v1, $v0, .L802DC5D4 /* FF69C 802DC5AC 14620009 */ bne $v1, $v0, .L802DC5D4
/* FF6A0 802DC5B0 3C02DC08 */ lui $v0, %hi(D_DC07F3E0) /* FF6A0 802DC5B0 3C02DC08 */ lui $v0, 0xdc08
/* FF6A4 802DC5B4 34420008 */ ori $v0, $v0, 8 /* FF6A4 802DC5B4 34420008 */ ori $v0, $v0, 8
/* FF6A8 802DC5B8 24C30018 */ addiu $v1, $a2, 0x18 /* FF6A8 802DC5B8 24C30018 */ addiu $v1, $a2, 0x18
/* FF6AC 802DC5BC ACE30000 */ sw $v1, ($a3) /* FF6AC 802DC5BC ACE30000 */ sw $v1, ($a3)
/* FF6B0 802DC5C0 ACC20010 */ sw $v0, 0x10($a2) /* FF6B0 802DC5C0 ACC20010 */ sw $v0, 0x10($a2)
/* FF6B4 802DC5C4 3C02802E */ lui $v0, %hi(D_802DF3E0) /* FF6B4 802DC5C4 3C02802E */ lui $v0, %hi(D_802DF3E0)
/* FF6B8 802DC5C8 2442F3E0 */ addiu $v0, $v0, %lo(D_DC07F3E0) /* FF6B8 802DC5C8 2442F3E0 */ addiu $v0, $v0, %lo(D_802DF3E0)
/* FF6BC 802DC5CC 080B717B */ j .L802DC5EC /* FF6BC 802DC5CC 080B717B */ j .L802DC5EC
/* FF6C0 802DC5D0 ACC20014 */ sw $v0, 0x14($a2) /* FF6C0 802DC5D0 ACC20014 */ sw $v0, 0x14($a2)
.L802DC5D4: .L802DC5D4:

4
asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s
View File

@ -73,14 +73,14 @@ glabel func_802416FC_96A8BC
/* 96A9CC 8024180C 0C04EAA7 */ jal func_8013AA9C /* 96A9CC 8024180C 0C04EAA7 */ jal func_8013AA9C
/* 96A9D0 80241810 AFB00018 */ sw $s0, 0x18($sp) /* 96A9D0 80241810 AFB00018 */ sw $s0, 0x18($sp)
/* 96A9D4 80241814 0240202D */ daddu $a0, $s2, $zero /* 96A9D4 80241814 0240202D */ daddu $a0, $s2, $zero
/* 96A9D8 80241818 3C05F4AC */ lui $a1, %hi(D_F4AC2EAC) /* 96A9D8 80241818 3C05F4AC */ lui $a1, 0xf4ac
/* 96A9DC 8024181C 34A5D483 */ ori $a1, $a1, 0xd483 /* 96A9DC 8024181C 34A5D483 */ ori $a1, $a1, 0xd483
/* 96A9E0 80241820 0C0B2026 */ jal set_variable /* 96A9E0 80241820 0C0B2026 */ jal set_variable
/* 96A9E4 80241824 0260302D */ daddu $a2, $s3, $zero /* 96A9E4 80241824 0260302D */ daddu $a2, $s3, $zero
/* 96A9E8 80241828 3C048024 */ lui $a0, %hi(D_8024240C) /* 96A9E8 80241828 3C048024 */ lui $a0, %hi(D_8024240C)
/* 96A9EC 8024182C 2484240C */ addiu $a0, $a0, %lo(D_8024240C) /* 96A9EC 8024182C 2484240C */ addiu $a0, $a0, %lo(D_8024240C)
/* 96A9F0 80241830 3C058024 */ lui $a1, %hi(D_80242EAC) /* 96A9F0 80241830 3C058024 */ lui $a1, %hi(D_80242EAC)
/* 96A9F4 80241834 24A52EAC */ addiu $a1, $a1, %lo(D_F4AC2EAC) /* 96A9F4 80241834 24A52EAC */ addiu $a1, $a1, %lo(D_80242EAC)
/* 96A9F8 80241838 0C048C56 */ jal bind_dynamic_entity_3 /* 96A9F8 80241838 0C048C56 */ jal bind_dynamic_entity_3
/* 96A9FC 8024183C 00000000 */ nop /* 96A9FC 8024183C 00000000 */ nop
/* 96AA00 80241840 0240202D */ daddu $a0, $s2, $zero /* 96AA00 80241840 0240202D */ daddu $a0, $s2, $zero

4
asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F30_A2B170.s
View File

@ -3,12 +3,12 @@
glabel func_80240F30_A2B170 glabel func_80240F30_A2B170
/* A2B170 80240F30 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A2B170 80240F30 27BDFFE8 */ addiu $sp, $sp, -0x18
/* A2B174 80240F34 3C05F4AC */ lui $a1, %hi(D_F4AB95DC) /* A2B174 80240F34 3C05F4AC */ lui $a1, 0xf4ac
/* A2B178 80240F38 AFBF0010 */ sw $ra, 0x10($sp) /* A2B178 80240F38 AFBF0010 */ sw $ra, 0x10($sp)
/* A2B17C 80240F3C 0C0B1EAF */ jal get_variable /* A2B17C 80240F3C 0C0B1EAF */ jal get_variable
/* A2B180 80240F40 34A5D480 */ ori $a1, $a1, 0xd480 /* A2B180 80240F40 34A5D480 */ ori $a1, $a1, 0xd480
/* A2B184 80240F44 3C058025 */ lui $a1, %hi(D_802495DC) /* A2B184 80240F44 3C058025 */ lui $a1, %hi(D_802495DC)
/* A2B188 80240F48 24A595DC */ addiu $a1, $a1, %lo(D_F4AB95DC) /* A2B188 80240F48 24A595DC */ addiu $a1, $a1, %lo(D_802495DC)
/* A2B18C 80240F4C 8CA40000 */ lw $a0, ($a1) /* A2B18C 80240F4C 8CA40000 */ lw $a0, ($a1)
/* A2B190 80240F50 8C42000C */ lw $v0, 0xc($v0) /* A2B190 80240F50 8C42000C */ lw $v0, 0xc($v0)
/* A2B194 80240F54 00041840 */ sll $v1, $a0, 1 /* A2B194 80240F54 00041840 */ sll $v1, $a0, 1

4
asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F88_A2B1C8.s
View File

@ -3,12 +3,12 @@
glabel func_80240F88_A2B1C8 glabel func_80240F88_A2B1C8
/* A2B1C8 80240F88 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A2B1C8 80240F88 27BDFFE8 */ addiu $sp, $sp, -0x18
/* A2B1CC 80240F8C 3C05F4AC */ lui $a1, %hi(D_F4AB95E0) /* A2B1CC 80240F8C 3C05F4AC */ lui $a1, 0xf4ac
/* A2B1D0 80240F90 AFBF0010 */ sw $ra, 0x10($sp) /* A2B1D0 80240F90 AFBF0010 */ sw $ra, 0x10($sp)
/* A2B1D4 80240F94 0C0B1EAF */ jal get_variable /* A2B1D4 80240F94 0C0B1EAF */ jal get_variable
/* A2B1D8 80240F98 34A5D480 */ ori $a1, $a1, 0xd480 /* A2B1D8 80240F98 34A5D480 */ ori $a1, $a1, 0xd480
/* A2B1DC 80240F9C 3C058025 */ lui $a1, %hi(D_802495E0) /* A2B1DC 80240F9C 3C058025 */ lui $a1, %hi(D_802495E0)
/* A2B1E0 80240FA0 24A595E0 */ addiu $a1, $a1, %lo(D_F4AB95E0) /* A2B1E0 80240FA0 24A595E0 */ addiu $a1, $a1, %lo(D_802495E0)
/* A2B1E4 80240FA4 8CA40000 */ lw $a0, ($a1) /* A2B1E4 80240FA4 8CA40000 */ lw $a0, ($a1)
/* A2B1E8 80240FA8 8C42000C */ lw $v0, 0xc($v0) /* A2B1E8 80240FA8 8C42000C */ lw $v0, 0xc($v0)
/* A2B1EC 80240FAC 00041840 */ sll $v1, $a0, 1 /* A2B1EC 80240FAC 00041840 */ sll $v1, $a0, 1

4
asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s
View File

@ -9,13 +9,13 @@ glabel func_80240B4C_9001BC
/* 9001CC 80240B5C 0C00AB39 */ jal heap_malloc /* 9001CC 80240B5C 0C00AB39 */ jal heap_malloc
/* 9001D0 80240B60 24040780 */ addiu $a0, $zero, 0x780 /* 9001D0 80240B60 24040780 */ addiu $a0, $zero, 0x780
/* 9001D4 80240B64 0200202D */ daddu $a0, $s0, $zero /* 9001D4 80240B64 0200202D */ daddu $a0, $s0, $zero
/* 9001D8 80240B68 3C05FD05 */ lui $a1, %hi(D_FD050B00) /* 9001D8 80240B68 3C05FD05 */ lui $a1, 0xfd05
/* 9001DC 80240B6C 34A50F80 */ ori $a1, $a1, 0xf80 /* 9001DC 80240B6C 34A50F80 */ ori $a1, $a1, 0xf80
/* 9001E0 80240B70 0C0B2026 */ jal set_variable /* 9001E0 80240B70 0C0B2026 */ jal set_variable
/* 9001E4 80240B74 0040302D */ daddu $a2, $v0, $zero /* 9001E4 80240B74 0040302D */ daddu $a2, $v0, $zero
/* 9001E8 80240B78 2402FFFF */ addiu $v0, $zero, -1 /* 9001E8 80240B78 2402FFFF */ addiu $v0, $zero, -1
/* 9001EC 80240B7C 3C058024 */ lui $a1, %hi(D_80240B00) /* 9001EC 80240B7C 3C058024 */ lui $a1, %hi(D_80240B00)
/* 9001F0 80240B80 24A50B00 */ addiu $a1, $a1, %lo(D_FD050B00) /* 9001F0 80240B80 24A50B00 */ addiu $a1, $a1, %lo(D_80240B00)
/* 9001F4 80240B84 3C018025 */ lui $at, %hi(D_802483D0) /* 9001F4 80240B84 3C018025 */ lui $at, %hi(D_802483D0)
/* 9001F8 80240B88 AC2283D0 */ sw $v0, %lo(D_802483D0)($at) /* 9001F8 80240B88 AC2283D0 */ sw $v0, %lo(D_802483D0)($at)
/* 9001FC 80240B8C 0C048C56 */ jal bind_dynamic_entity_3 /* 9001FC 80240B8C 0C048C56 */ jal bind_dynamic_entity_3

4
asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D14_908744.s
View File

@ -3,14 +3,14 @@
glabel func_80240D14_908744 glabel func_80240D14_908744
/* 908744 80240D14 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 908744 80240D14 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 908748 80240D18 3C05FD05 */ lui $a1, %hi(D_FD04A650) /* 908748 80240D18 3C05FD05 */ lui $a1, 0xfd05
/* 90874C 80240D1C 34A50F80 */ ori $a1, $a1, 0xf80 /* 90874C 80240D1C 34A50F80 */ ori $a1, $a1, 0xf80
/* 908750 80240D20 AFBF0010 */ sw $ra, 0x10($sp) /* 908750 80240D20 AFBF0010 */ sw $ra, 0x10($sp)
/* 908754 80240D24 0C0B1EAF */ jal get_variable /* 908754 80240D24 0C0B1EAF */ jal get_variable
/* 908758 80240D28 0000202D */ daddu $a0, $zero, $zero /* 908758 80240D28 0000202D */ daddu $a0, $zero, $zero
/* 90875C 80240D2C 24030001 */ addiu $v1, $zero, 1 /* 90875C 80240D2C 24030001 */ addiu $v1, $zero, 1
/* 908760 80240D30 3C05800A */ lui $a1, %hi(D_8009A650) /* 908760 80240D30 3C05800A */ lui $a1, %hi(D_8009A650)
/* 908764 80240D34 24A5A650 */ addiu $a1, $a1, %lo(D_FD04A650) /* 908764 80240D34 24A5A650 */ addiu $a1, $a1, %lo(D_8009A650)
/* 908768 80240D38 A443001E */ sh $v1, 0x1e($v0) /* 908768 80240D38 A443001E */ sh $v1, 0x1e($v0)
/* 90876C 80240D3C 8CA30000 */ lw $v1, ($a1) /* 90876C 80240D3C 8CA30000 */ lw $v1, ($a1)
/* 908770 80240D40 3C040010 */ lui $a0, 0x10 /* 908770 80240D40 3C040010 */ lui $a0, 0x10

4
asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s
View File

@ -9,13 +9,13 @@ glabel func_8024140C_C8EFBC
/* C8EFCC 8024141C 0C00AB39 */ jal heap_malloc /* C8EFCC 8024141C 0C00AB39 */ jal heap_malloc
/* C8EFD0 80241420 24040780 */ addiu $a0, $zero, 0x780 /* C8EFD0 80241420 24040780 */ addiu $a0, $zero, 0x780
/* C8EFD4 80241424 0200202D */ daddu $a0, $s0, $zero /* C8EFD4 80241424 0200202D */ daddu $a0, $s0, $zero
/* C8EFD8 80241428 3C05FD05 */ lui $a1, %hi(D_FD0513C0) /* C8EFD8 80241428 3C05FD05 */ lui $a1, 0xfd05
/* C8EFDC 8024142C 34A50F80 */ ori $a1, $a1, 0xf80 /* C8EFDC 8024142C 34A50F80 */ ori $a1, $a1, 0xf80
/* C8EFE0 80241430 0C0B2026 */ jal set_variable /* C8EFE0 80241430 0C0B2026 */ jal set_variable
/* C8EFE4 80241434 0040302D */ daddu $a2, $v0, $zero /* C8EFE4 80241434 0040302D */ daddu $a2, $v0, $zero
/* C8EFE8 80241438 2402FFFF */ addiu $v0, $zero, -1 /* C8EFE8 80241438 2402FFFF */ addiu $v0, $zero, -1
/* C8EFEC 8024143C 3C058024 */ lui $a1, %hi(D_802413C0) /* C8EFEC 8024143C 3C058024 */ lui $a1, %hi(D_802413C0)
/* C8EFF0 80241440 24A513C0 */ addiu $a1, $a1, %lo(D_FD0513C0) /* C8EFF0 80241440 24A513C0 */ addiu $a1, $a1, %lo(D_802413C0)
/* C8EFF4 80241444 3C018025 */ lui $at, %hi(D_80248380) /* C8EFF4 80241444 3C018025 */ lui $at, %hi(D_80248380)
/* C8EFF8 80241448 AC228380 */ sw $v0, %lo(D_80248380)($at) /* C8EFF8 80241448 AC228380 */ sw $v0, %lo(D_80248380)($at)
/* C8EFFC 8024144C 0C048C56 */ jal bind_dynamic_entity_3 /* C8EFFC 8024144C 0C048C56 */ jal bind_dynamic_entity_3

2
tools/n64splat

@ -1 +1 @@
Subproject commit 09eca0b28586d9ae2db3708985a9b5a4da5850d4 Subproject commit 5c39b85f817ad174f0c562811c183c88bf565f8f

1
tools/symbol_addrs.txt
View File

@ -563,6 +563,7 @@ load_demo_battle = 0x80072E14;
EnemyNpcHit = 0x80077F70; EnemyNpcHit = 0x80077F70;
EnemyNpcDefeat = 0x8007809C; EnemyNpcDefeat = 0x8007809C;
nuAuPreNMIFunc = 0x80078174; nuAuPreNMIFunc = 0x80078174;
nuAuFrameCounter = 0x8007817C;
D_80078DB0 = 0x80078DB0; D_80078DB0 = 0x80078DB0;
D_80078DB4 = 0x80078DB4; D_80078DB4 = 0x80078DB4;
gEffectTable = 0x8007F214; gEffectTable = 0x8007F214;

14
undefined_syms_auto.txt
View File

@ -16,7 +16,6 @@ D_800006A4 = 0x800006A4;
D_800006A8 = 0x800006A8; D_800006A8 = 0x800006A8;
D_80001D80 = 0x80001D80; D_80001D80 = 0x80001D80;
D_8000419C = 0x8000419C; D_8000419C = 0x8000419C;
D_80004880 = 0x80004880;
D_80007410 = 0x80007410; D_80007410 = 0x80007410;
D_80025D74 = 0x80025D74; D_80025D74 = 0x80025D74;
D_80026AC7 = 0x80026AC7; D_80026AC7 = 0x80026AC7;
@ -4750,8 +4749,6 @@ D_802F39D0 = 0x802F39D0;
D_802F4560 = 0x802F4560; D_802F4560 = 0x802F4560;
D_8034F800 = 0x8034F800; D_8034F800 = 0x8034F800;
D_A0000000 = 0xA0000000; D_A0000000 = 0xA0000000;
D_A0000010 = 0xA0000010;
D_A0000018 = 0xA0000018;
D_A0000C7C = 0xA0000C7C; D_A0000C7C = 0xA0000C7C;
D_A0006A70 = 0xA0006A70; D_A0006A70 = 0xA0006A70;
D_A4000000 = 0xA4000000; D_A4000000 = 0xA4000000;
@ -4775,8 +4772,6 @@ D_A6000000 = 0xA6000000;
D_B0000000 = 0xB0000000; D_B0000000 = 0xB0000000;
D_B0000008 = 0xB0000008; D_B0000008 = 0xB0000008;
D_B0000010 = 0xB0000010; D_B0000010 = 0xB0000010;
D_B215B224 = 0xB215B224;
D_BEEFBD88 = 0xBEEFBD88;
D_BF804254 = 0xBF804254; D_BF804254 = 0xBF804254;
D_BF806900 = 0xBF806900; D_BF806900 = 0xBF806900;
D_BFDFB110 = 0xBFDFB110; D_BFDFB110 = 0xBFDFB110;
@ -4797,7 +4792,6 @@ D_D9FCFFFF = 0xD9FCFFFF;
D_DA37A674 = 0xDA37A674; D_DA37A674 = 0xDA37A674;
D_DA380060 = 0xDA380060; D_DA380060 = 0xDA380060;
D_DB01C270 = 0xDB01C270; D_DB01C270 = 0xDB01C270;
D_DC07F3E0 = 0xDC07F3E0;
D_DDFF8100 = 0xDDFF8100; D_DDFF8100 = 0xDDFF8100;
D_DDFF9710 = 0xDDFF9710; D_DDFF9710 = 0xDDFF9710;
D_DDFF97D8 = 0xDDFF97D8; D_DDFF97D8 = 0xDDFF97D8;
@ -5481,12 +5475,7 @@ D_F1000008 = 0xF1000008;
D_F1000040 = 0xF1000040; D_F1000040 = 0xF1000040;
D_F1FFFFFF = 0xF1FFFFFF; D_F1FFFFFF = 0xF1FFFFFF;
D_F4000008 = 0xF4000008; D_F4000008 = 0xF4000008;
D_F4AB95DC = 0xF4AB95DC;
D_F4AB95E0 = 0xF4AB95E0;
D_F4AC2EAC = 0xF4AC2EAC;
D_F5000007 = 0xF5000007; D_F5000007 = 0xF5000007;
D_F5DDF120 = 0xF5DDF120;
D_F5FEA66C = 0xF5FEA66C;
D_F79DDD0F = 0xF79DDD0F; D_F79DDD0F = 0xF79DDD0F;
D_F7FEC070 = 0xF7FEC070; D_F7FEC070 = 0xF7FEC070;
D_F7FF4EBC = 0xF7FF4EBC; D_F7FF4EBC = 0xF7FF4EBC;
@ -5504,9 +5493,6 @@ D_FA0015A8 = 0xFA0015A8;
D_FA006078 = 0xFA006078; D_FA006078 = 0xFA006078;
D_FAFFB763 = 0xFAFFB763; D_FAFFB763 = 0xFAFFB763;
D_FB000002 = 0xFB000002; D_FB000002 = 0xFB000002;
D_FD04A650 = 0xFD04A650;
D_FD050B00 = 0xFD050B00;
D_FD0513C0 = 0xFD0513C0;
D_FD0F93A0 = 0xFD0F93A0; D_FD0F93A0 = 0xFD0F93A0;
D_FD0FF038 = 0xFD0FF038; D_FD0FF038 = 0xFD0FF038;
D_FD100008 = 0xFD100008; D_FD100008 = 0xFD100008;