mirror of https://github.com/pmret/papermario.git
asm refresh + new splat / symbol_addrs format
This commit is contained in:
Ethan Roseman
parent
9151bf2fe4
commit
b6bc2fb604
|
|
@ -48,8 +48,8 @@ glabel func_800533D0
|
|||
/* 2E874 80053474 AE22003C */ sw $v0, 0x3c($s1)
|
||||
/* 2E878 80053478 A62200BA */ sh $v0, 0xba($s1)
|
||||
.L8005347C:
|
||||
/* 2E87C 8005347C 3C118008 */ lui $s1, 0x8008
|
||||
/* 2E880 80053480 26318DB0 */ addiu $s1, $s1, -0x7250
|
||||
/* 2E87C 8005347C 3C118008 */ lui $s1, %hi(D_80078DB0)
|
||||
/* 2E880 80053480 26318DB0 */ addiu $s1, $s1, %lo(D_80078DB0)
|
||||
/* 2E884 80053484 8E220000 */ lw $v0, ($s1)
|
||||
/* 2E888 80053488 14400045 */ bnez $v0, .L800535A0
|
||||
/* 2E88C 8005348C 00000000 */ nop
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ glabel func_80055068
|
|||
/* 3046C 8005506C AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* 30470 80055070 0080802D */ daddu $s0, $a0, $zero
|
||||
/* 30474 80055074 3203000F */ andi $v1, $s0, 0xf
|
||||
/* 30478 80055078 3C048008 */ lui $a0, 0x8008
|
||||
/* 3047C 8005507C 94848DB4 */ lhu $a0, -0x724c($a0)
|
||||
/* 30478 80055078 3C048008 */ lui $a0, %hi(D_80078DB4)
|
||||
/* 3047C 8005507C 94848DB4 */ lhu $a0, %lo(D_80078DB4)($a0)
|
||||
/* 30480 80055080 24020001 */ addiu $v0, $zero, 1
|
||||
/* 30484 80055084 1482001E */ bne $a0, $v0, .L80055100
|
||||
/* 30488 80055088 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
glabel func_8005591C
|
||||
/* 30D1C 8005591C 27BDFFC8 */ addiu $sp, $sp, -0x38
|
||||
/* 30D20 80055920 AFB00030 */ sw $s0, 0x30($sp)
|
||||
/* 30D24 80055924 3C108008 */ lui $s0, 0x8008
|
||||
/* 30D28 80055928 26108DB0 */ addiu $s0, $s0, -0x7250
|
||||
/* 30D24 80055924 3C108008 */ lui $s0, %hi(D_80078DB0)
|
||||
/* 30D28 80055928 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0)
|
||||
/* 30D2C 8005592C 24020001 */ addiu $v0, $zero, 1
|
||||
/* 30D30 80055930 AFBF0034 */ sw $ra, 0x34($sp)
|
||||
/* 30D34 80055934 AE020000 */ sw $v0, ($s0)
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
glabel func_80055970
|
||||
/* 30D70 80055970 27BDFFC8 */ addiu $sp, $sp, -0x38
|
||||
/* 30D74 80055974 AFB00030 */ sw $s0, 0x30($sp)
|
||||
/* 30D78 80055978 3C108008 */ lui $s0, 0x8008
|
||||
/* 30D7C 8005597C 26108DB0 */ addiu $s0, $s0, -0x7250
|
||||
/* 30D78 80055978 3C108008 */ lui $s0, %hi(D_80078DB0)
|
||||
/* 30D7C 8005597C 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0)
|
||||
/* 30D80 80055980 24020001 */ addiu $v0, $zero, 1
|
||||
/* 30D84 80055984 AFBF0034 */ sw $ra, 0x34($sp)
|
||||
/* 30D88 80055988 AE020000 */ sw $v0, ($s0)
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
glabel func_80055A18
|
||||
/* 30E18 80055A18 27BDFFC8 */ addiu $sp, $sp, -0x38
|
||||
/* 30E1C 80055A1C AFB00030 */ sw $s0, 0x30($sp)
|
||||
/* 30E20 80055A20 3C108008 */ lui $s0, 0x8008
|
||||
/* 30E24 80055A24 26108DB0 */ addiu $s0, $s0, -0x7250
|
||||
/* 30E20 80055A20 3C108008 */ lui $s0, %hi(D_80078DB0)
|
||||
/* 30E24 80055A24 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0)
|
||||
/* 30E28 80055A28 8FA30048 */ lw $v1, 0x48($sp)
|
||||
/* 30E2C 80055A2C 24020001 */ addiu $v0, $zero, 1
|
||||
/* 30E30 80055A30 AFBF0034 */ sw $ra, 0x34($sp)
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
glabel func_80055A6C
|
||||
/* 30E6C 80055A6C 27BDFFC8 */ addiu $sp, $sp, -0x38
|
||||
/* 30E70 80055A70 AFB00030 */ sw $s0, 0x30($sp)
|
||||
/* 30E74 80055A74 3C108008 */ lui $s0, 0x8008
|
||||
/* 30E78 80055A78 26108DB0 */ addiu $s0, $s0, -0x7250
|
||||
/* 30E74 80055A74 3C108008 */ lui $s0, %hi(D_80078DB0)
|
||||
/* 30E78 80055A78 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0)
|
||||
/* 30E7C 80055A7C 24020001 */ addiu $v0, $zero, 1
|
||||
/* 30E80 80055A80 AFBF0034 */ sw $ra, 0x34($sp)
|
||||
/* 30E84 80055A84 AE020000 */ sw $v0, ($s0)
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
glabel func_80055B28
|
||||
/* 30F28 80055B28 27BDFFC8 */ addiu $sp, $sp, -0x38
|
||||
/* 30F2C 80055B2C AFB00030 */ sw $s0, 0x30($sp)
|
||||
/* 30F30 80055B30 3C108008 */ lui $s0, 0x8008
|
||||
/* 30F34 80055B34 26108DB0 */ addiu $s0, $s0, -0x7250
|
||||
/* 30F30 80055B30 3C108008 */ lui $s0, %hi(D_80078DB0)
|
||||
/* 30F34 80055B34 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0)
|
||||
/* 30F38 80055B38 24030001 */ addiu $v1, $zero, 1
|
||||
/* 30F3C 80055B3C 240207D0 */ addiu $v0, $zero, 0x7d0
|
||||
/* 30F40 80055B40 AFBF0034 */ sw $ra, 0x34($sp)
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ glabel get_map_IDs_by_name
|
|||
/* 36008 8005AC08 00A0B02D */ daddu $s6, $a1, $zero
|
||||
/* 3600C 8005AC0C AFB7002C */ sw $s7, 0x2c($sp)
|
||||
/* 36010 8005AC10 00C0B82D */ daddu $s7, $a2, $zero
|
||||
/* 36014 8005AC14 3C028009 */ lui $v0, 0x8009
|
||||
/* 36018 8005AC18 244234F0 */ addiu $v0, $v0, 0x34f0
|
||||
/* 36014 8005AC14 3C028009 */ lui $v0, %hi(gAreas)
|
||||
/* 36018 8005AC18 244234F0 */ addiu $v0, $v0, %lo(gAreas)
|
||||
/* 3601C 8005AC1C AFBF0030 */ sw $ra, 0x30($sp)
|
||||
/* 36020 8005AC20 AFB40020 */ sw $s4, 0x20($sp)
|
||||
/* 36024 8005AC24 AFB3001C */ sw $s3, 0x1c($sp)
|
||||
|
|
@ -26,8 +26,8 @@ glabel get_map_IDs_by_name
|
|||
/* 36048 8005AC48 8C420000 */ lw $v0, ($v0)
|
||||
/* 3604C 8005AC4C 18400012 */ blez $v0, .L8005AC98
|
||||
/* 36050 8005AC50 0000802D */ daddu $s0, $zero, $zero
|
||||
/* 36054 8005AC54 3C028009 */ lui $v0, 0x8009
|
||||
/* 36058 8005AC58 244234F0 */ addiu $v0, $v0, 0x34f0
|
||||
/* 36054 8005AC54 3C028009 */ lui $v0, %hi(gAreas)
|
||||
/* 36058 8005AC58 244234F0 */ addiu $v0, $v0, %lo(gAreas)
|
||||
/* 3605C 8005AC5C 02429821 */ addu $s3, $s2, $v0
|
||||
/* 36060 8005AC60 0080882D */ daddu $s1, $a0, $zero
|
||||
.L8005AC64:
|
||||
|
|
@ -50,8 +50,8 @@ glabel get_map_IDs_by_name
|
|||
/* 3609C 8005AC9C 3C048009 */ lui $a0, 0x8009
|
||||
/* 360A0 8005ACA0 00922021 */ addu $a0, $a0, $s2
|
||||
/* 360A4 8005ACA4 8C8434F4 */ lw $a0, 0x34f4($a0)
|
||||
/* 360A8 8005ACA8 3C028009 */ lui $v0, 0x8009
|
||||
/* 360AC 8005ACAC 244234F0 */ addiu $v0, $v0, 0x34f0
|
||||
/* 360A8 8005ACA8 3C028009 */ lui $v0, %hi(gAreas)
|
||||
/* 360AC 8005ACAC 244234F0 */ addiu $v0, $v0, %lo(gAreas)
|
||||
/* 360B0 8005ACB0 1480FFE4 */ bnez $a0, .L8005AC44
|
||||
/* 360B4 8005ACB4 26940001 */ addiu $s4, $s4, 1
|
||||
.L8005ACB8:
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
glabel func_8014A548
|
||||
/* E0C48 8014A548 27BDFFC8 */ addiu $sp, $sp, -0x38
|
||||
/* E0C4C 8014A54C AFB1001C */ sw $s1, 0x1c($sp)
|
||||
/* E0C50 8014A550 3C118016 */ lui $s1, 0x8016
|
||||
/* E0C54 8014A554 26319AF0 */ addiu $s1, $s1, -0x6510
|
||||
/* E0C50 8014A550 3C118016 */ lui $s1, %hi(gMusicPlayers)
|
||||
/* E0C54 8014A554 26319AF0 */ addiu $s1, $s1, %lo(gMusicPlayers)
|
||||
/* E0C58 8014A558 AFB20020 */ sw $s2, 0x20($sp)
|
||||
/* E0C5C 8014A55C 0000902D */ daddu $s2, $zero, $zero
|
||||
/* E0C60 8014A560 AFB30024 */ sw $s3, 0x24($sp)
|
||||
|
|
@ -126,8 +126,8 @@ glabel func_8014A548
|
|||
/* E0E08 8014A708 080529C8 */ j .L8014A720
|
||||
/* E0E0C 8014A70C A6220000 */ sh $v0, ($s1)
|
||||
.L8014A710:
|
||||
/* E0E10 8014A710 3C048016 */ lui $a0, 0x8016
|
||||
/* E0E14 8014A714 84849AE0 */ lh $a0, -0x6520($a0)
|
||||
/* E0E10 8014A710 3C048016 */ lui $a0, %hi(gMusicUnkVolume)
|
||||
/* E0E14 8014A714 84849AE0 */ lh $a0, %lo(gMusicUnkVolume)($a0)
|
||||
/* E0E18 8014A718 0C052B21 */ jal transition_music_volume_to
|
||||
/* E0E1C 8014A71C 00000000 */ nop
|
||||
.L8014A720:
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ glabel func_8014AC94
|
|||
/* E13E0 8014ACE0 54400001 */ bnel $v0, $zero, .L8014ACE8
|
||||
/* E13E4 8014ACE4 0060202D */ daddu $a0, $v1, $zero
|
||||
.L8014ACE8:
|
||||
/* E13E8 8014ACE8 3C058016 */ lui $a1, 0x8016
|
||||
/* E13EC 8014ACEC 24A59AE6 */ addiu $a1, $a1, -0x651a
|
||||
/* E13E8 8014ACE8 3C058016 */ lui $a1, %hi(gMusicCurrentVolume)
|
||||
/* E13EC 8014ACEC 24A59AE6 */ addiu $a1, $a1, %lo(gMusicCurrentVolume)
|
||||
/* E13F0 8014ACF0 00041400 */ sll $v0, $a0, 0x10
|
||||
/* E13F4 8014ACF4 00022403 */ sra $a0, $v0, 0x10
|
||||
/* E13F8 8014ACF8 84A20000 */ lh $v0, ($a1)
|
||||
|
|
@ -38,8 +38,8 @@ glabel func_8014AC94
|
|||
/* E1410 8014AD10 2462FFFF */ addiu $v0, $v1, -1
|
||||
.L8014AD14:
|
||||
/* E1414 8014AD14 A4A20000 */ sh $v0, ($a1)
|
||||
/* E1418 8014AD18 3C048016 */ lui $a0, 0x8016
|
||||
/* E141C 8014AD1C 84849AE6 */ lh $a0, -0x651a($a0)
|
||||
/* E1418 8014AD18 3C048016 */ lui $a0, %hi(gMusicCurrentVolume)
|
||||
/* E141C 8014AD1C 84849AE6 */ lh $a0, %lo(gMusicCurrentVolume)($a0)
|
||||
/* E1420 8014AD20 0C015869 */ jal func_800561A4
|
||||
/* E1424 8014AD24 00000000 */ nop
|
||||
/* E1428 8014AD28 24020003 */ addiu $v0, $zero, 3
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
glabel func_8014AD40
|
||||
/* E1440 8014AD40 27BDFFE0 */ addiu $sp, $sp, -0x20
|
||||
/* E1444 8014AD44 AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* E1448 8014AD48 3C108016 */ lui $s0, 0x8016
|
||||
/* E144C 8014AD4C 26109AF0 */ addiu $s0, $s0, -0x6510
|
||||
/* E1448 8014AD48 3C108016 */ lui $s0, %hi(gMusicPlayers)
|
||||
/* E144C 8014AD4C 26109AF0 */ addiu $s0, $s0, %lo(gMusicPlayers)
|
||||
/* E1450 8014AD50 AFB10014 */ sw $s1, 0x14($sp)
|
||||
/* E1454 8014AD54 0000882D */ daddu $s1, $zero, $zero
|
||||
/* E1458 8014AD58 AFBF0018 */ sw $ra, 0x18($sp)
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ glabel func_8014ADA4
|
|||
/* E14AC 8014ADAC 27BDFFE0 */ addiu $sp, $sp, -0x20
|
||||
/* E14B0 8014ADB0 AFBF0018 */ sw $ra, 0x18($sp)
|
||||
/* E14B4 8014ADB4 80420071 */ lb $v0, 0x71($v0)
|
||||
/* E14B8 8014ADB8 3C068016 */ lui $a2, 0x8016
|
||||
/* E14BC 8014ADBC 24C69AF0 */ addiu $a2, $a2, -0x6510
|
||||
/* E14B8 8014ADB8 3C068016 */ lui $a2, %hi(gMusicPlayers)
|
||||
/* E14BC 8014ADBC 24C69AF0 */ addiu $a2, $a2, %lo(gMusicPlayers)
|
||||
/* E14C0 8014ADC0 1440000A */ bnez $v0, .L8014ADEC
|
||||
/* E14C4 8014ADC4 24030008 */ addiu $v1, $zero, 8
|
||||
/* E14C8 8014ADC8 94C20000 */ lhu $v0, ($a2)
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ glabel func_8014ADF8
|
|||
/* E1504 8014AE04 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0)
|
||||
/* E1508 8014AE08 AFBF0018 */ sw $ra, 0x18($sp)
|
||||
/* E150C 8014AE0C 80420071 */ lb $v0, 0x71($v0)
|
||||
/* E1510 8014AE10 3C078016 */ lui $a3, 0x8016
|
||||
/* E1514 8014AE14 24E79AF0 */ addiu $a3, $a3, -0x6510
|
||||
/* E1510 8014AE10 3C078016 */ lui $a3, %hi(gMusicPlayers)
|
||||
/* E1514 8014AE14 24E79AF0 */ addiu $a3, $a3, %lo(gMusicPlayers)
|
||||
/* E1518 8014AE18 14400011 */ bnez $v0, .L8014AE60
|
||||
/* E151C 8014AE1C 00A0482D */ daddu $t1, $a1, $zero
|
||||
/* E1520 8014AE20 8CE40010 */ lw $a0, 0x10($a3)
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ glabel func_8014AE6C
|
|||
/* E1574 8014AE74 27BDFFE0 */ addiu $sp, $sp, -0x20
|
||||
/* E1578 8014AE78 AFBF0018 */ sw $ra, 0x18($sp)
|
||||
/* E157C 8014AE7C 80420071 */ lb $v0, 0x71($v0)
|
||||
/* E1580 8014AE80 3C068016 */ lui $a2, 0x8016
|
||||
/* E1584 8014AE84 24C69AF0 */ addiu $a2, $a2, -0x6510
|
||||
/* E1580 8014AE80 3C068016 */ lui $a2, %hi(gMusicPlayers)
|
||||
/* E1584 8014AE84 24C69AF0 */ addiu $a2, $a2, %lo(gMusicPlayers)
|
||||
/* E1588 8014AE88 14400018 */ bnez $v0, .L8014AEEC
|
||||
/* E158C 8014AE8C 3C020002 */ lui $v0, 2
|
||||
/* E1590 8014AE90 3C04800A */ lui $a0, %hi(D_8009A650)
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ glabel func_8014AEF8
|
|||
/* E1604 8014AF04 AFBF001C */ sw $ra, 0x1c($sp)
|
||||
/* E1608 8014AF08 AFB00018 */ sw $s0, 0x18($sp)
|
||||
/* E160C 8014AF0C 80420071 */ lb $v0, 0x71($v0)
|
||||
/* E1610 8014AF10 3C108016 */ lui $s0, 0x8016
|
||||
/* E1614 8014AF14 26109AF0 */ addiu $s0, $s0, -0x6510
|
||||
/* E1610 8014AF10 3C108016 */ lui $s0, %hi(gMusicPlayers)
|
||||
/* E1614 8014AF14 26109AF0 */ addiu $s0, $s0, %lo(gMusicPlayers)
|
||||
/* E1618 8014AF18 14400018 */ bnez $v0, .L8014AF7C
|
||||
/* E161C 8014AF1C 3C030002 */ lui $v1, 2
|
||||
/* E1620 8014AF20 3C02800A */ lui $v0, %hi(D_8009A650)
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ glabel func_802D5EE0
|
|||
/* FA898 802D5EE8 8C82000C */ lw $v0, 0xc($a0)
|
||||
/* FA89C 802D5EEC 0C0B1EAF */ jal get_variable
|
||||
/* FA8A0 802D5EF0 8C450000 */ lw $a1, ($v0)
|
||||
/* FA8A4 802D5EF4 3C048016 */ lui $a0, 0x8016
|
||||
/* FA8A8 802D5EF8 24849AF0 */ addiu $a0, $a0, -0x6510
|
||||
/* FA8A4 802D5EF4 3C048016 */ lui $a0, %hi(gMusicPlayers)
|
||||
/* FA8A8 802D5EF8 24849AF0 */ addiu $a0, $a0, %lo(gMusicPlayers)
|
||||
/* FA8AC 802D5EFC 00021840 */ sll $v1, $v0, 1
|
||||
/* FA8B0 802D5F00 00621821 */ addu $v1, $v1, $v0
|
||||
/* FA8B4 802D5F04 00031900 */ sll $v1, $v1, 4
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_802428C0_E07C20
|
||||
/* E07C20 802428C0 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* E07C24 802428C4 2404005B */ addiu $a0, $zero, 0x5b
|
||||
/* E07C28 802428C8 2405FFFF */ addiu $a1, $zero, -1
|
||||
/* E07C2C 802428CC 24060001 */ addiu $a2, $zero, 1
|
||||
/* E07C30 802428D0 AFBF0010 */ sw $ra, 0x10($sp)
|
||||
/* E07C34 802428D4 0C046E54 */ jal func_8011B950
|
||||
/* E07C38 802428D8 0000382D */ daddu $a3, $zero, $zero
|
||||
/* E07C3C 802428DC 0000202D */ daddu $a0, $zero, $zero
|
||||
/* E07C40 802428E0 0080282D */ daddu $a1, $a0, $zero
|
||||
/* E07C44 802428E4 0080302D */ daddu $a2, $a0, $zero
|
||||
/* E07C48 802428E8 0C046F97 */ jal set_background_color_blend
|
||||
/* E07C4C 802428EC 240700FF */ addiu $a3, $zero, 0xff
|
||||
/* E07C50 802428F0 8FBF0010 */ lw $ra, 0x10($sp)
|
||||
/* E07C54 802428F4 24020002 */ addiu $v0, $zero, 2
|
||||
/* E07C58 802428F8 03E00008 */ jr $ra
|
||||
/* E07C5C 802428FC 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80242900_E07C60
|
||||
/* E07C60 80242900 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* E07C64 80242904 AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* E07C68 80242908 0080802D */ daddu $s0, $a0, $zero
|
||||
/* E07C6C 8024290C 10A00003 */ beqz $a1, .L8024291C
|
||||
/* E07C70 80242910 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* E07C74 80242914 240200FF */ addiu $v0, $zero, 0xff
|
||||
/* E07C78 80242918 AE020074 */ sw $v0, 0x74($s0)
|
||||
.L8024291C:
|
||||
/* E07C7C 8024291C 8E020074 */ lw $v0, 0x74($s0)
|
||||
/* E07C80 80242920 2442FFF6 */ addiu $v0, $v0, -0xa
|
||||
/* E07C84 80242924 04410002 */ bgez $v0, .L80242930
|
||||
/* E07C88 80242928 AE020074 */ sw $v0, 0x74($s0)
|
||||
/* E07C8C 8024292C AE000074 */ sw $zero, 0x74($s0)
|
||||
.L80242930:
|
||||
/* E07C90 80242930 0000202D */ daddu $a0, $zero, $zero
|
||||
/* E07C94 80242934 0080282D */ daddu $a1, $a0, $zero
|
||||
/* E07C98 80242938 92070077 */ lbu $a3, 0x77($s0)
|
||||
/* E07C9C 8024293C 0C046F97 */ jal set_background_color_blend
|
||||
/* E07CA0 80242940 0080302D */ daddu $a2, $a0, $zero
|
||||
/* E07CA4 80242944 8E020074 */ lw $v0, 0x74($s0)
|
||||
/* E07CA8 80242948 14400007 */ bnez $v0, .L80242968
|
||||
/* E07CAC 8024294C 0000102D */ daddu $v0, $zero, $zero
|
||||
/* E07CB0 80242950 2404005B */ addiu $a0, $zero, 0x5b
|
||||
/* E07CB4 80242954 2405FFFF */ addiu $a1, $zero, -1
|
||||
/* E07CB8 80242958 0000302D */ daddu $a2, $zero, $zero
|
||||
/* E07CBC 8024295C 0C046E54 */ jal func_8011B950
|
||||
/* E07CC0 80242960 00C0382D */ daddu $a3, $a2, $zero
|
||||
/* E07CC4 80242964 24020002 */ addiu $v0, $zero, 2
|
||||
.L80242968:
|
||||
/* E07CC8 80242968 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* E07CCC 8024296C 8FB00010 */ lw $s0, 0x10($sp)
|
||||
/* E07CD0 80242970 03E00008 */ jr $ra
|
||||
/* E07CD4 80242974 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80242978_E07CD8
|
||||
/* E07CD8 80242978 27BDFFD0 */ addiu $sp, $sp, -0x30
|
||||
/* E07CDC 8024297C AFB20020 */ sw $s2, 0x20($sp)
|
||||
/* E07CE0 80242980 AFBF0024 */ sw $ra, 0x24($sp)
|
||||
/* E07CE4 80242984 AFB1001C */ sw $s1, 0x1c($sp)
|
||||
/* E07CE8 80242988 AFB00018 */ sw $s0, 0x18($sp)
|
||||
/* E07CEC 8024298C F7B40028 */ sdc1 $f20, 0x28($sp)
|
||||
/* E07CF0 80242990 10A00006 */ beqz $a1, .L802429AC
|
||||
/* E07CF4 80242994 0080902D */ daddu $s2, $a0, $zero
|
||||
/* E07CF8 80242998 8E4400AC */ lw $a0, 0xac($s2)
|
||||
/* E07CFC 8024299C 0C00EAD2 */ jal get_npc_safe
|
||||
/* E07D00 802429A0 00000000 */ nop
|
||||
/* E07D04 802429A4 AE420078 */ sw $v0, 0x78($s2)
|
||||
/* E07D08 802429A8 AE400070 */ sw $zero, 0x70($s2)
|
||||
.L802429AC:
|
||||
/* E07D0C 802429AC 3C05444A */ lui $a1, 0x444a
|
||||
/* E07D10 802429B0 34A58000 */ ori $a1, $a1, 0x8000
|
||||
/* E07D14 802429B4 8E510078 */ lw $s1, 0x78($s2)
|
||||
/* E07D18 802429B8 4480A000 */ mtc1 $zero, $f20
|
||||
/* E07D1C 802429BC 2410002D */ addiu $s0, $zero, 0x2d
|
||||
/* E07D20 802429C0 AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* E07D24 802429C4 8E470070 */ lw $a3, 0x70($s2)
|
||||
/* E07D28 802429C8 4406A000 */ mfc1 $a2, $f20
|
||||
/* E07D2C 802429CC 0C00A8ED */ jal update_lerp
|
||||
/* E07D30 802429D0 24040004 */ addiu $a0, $zero, 4
|
||||
/* E07D34 802429D4 4405A000 */ mfc1 $a1, $f20
|
||||
/* E07D38 802429D8 3C06437F */ lui $a2, 0x437f
|
||||
/* E07D3C 802429DC E6200048 */ swc1 $f0, 0x48($s1)
|
||||
/* E07D40 802429E0 AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* E07D44 802429E4 8E470070 */ lw $a3, 0x70($s2)
|
||||
/* E07D48 802429E8 0C00A8ED */ jal update_lerp
|
||||
/* E07D4C 802429EC 24040004 */ addiu $a0, $zero, 4
|
||||
/* E07D50 802429F0 3C014F00 */ lui $at, 0x4f00
|
||||
/* E07D54 802429F4 44811000 */ mtc1 $at, $f2
|
||||
/* E07D58 802429F8 00000000 */ nop
|
||||
/* E07D5C 802429FC 4600103E */ c.le.s $f2, $f0
|
||||
/* E07D60 80242A00 00000000 */ nop
|
||||
/* E07D64 80242A04 45010005 */ bc1t .L80242A1C
|
||||
/* E07D68 80242A08 263100AC */ addiu $s1, $s1, 0xac
|
||||
/* E07D6C 80242A0C 4600010D */ trunc.w.s $f4, $f0
|
||||
/* E07D70 80242A10 44032000 */ mfc1 $v1, $f4
|
||||
/* E07D74 80242A14 08090A8E */ j .L80242A38
|
||||
/* E07D78 80242A18 A2230000 */ sb $v1, ($s1)
|
||||
.L80242A1C:
|
||||
/* E07D7C 80242A1C 46020001 */ sub.s $f0, $f0, $f2
|
||||
/* E07D80 80242A20 3C028000 */ lui $v0, 0x8000
|
||||
/* E07D84 80242A24 4600010D */ trunc.w.s $f4, $f0
|
||||
/* E07D88 80242A28 44032000 */ mfc1 $v1, $f4
|
||||
/* E07D8C 80242A2C 00000000 */ nop
|
||||
/* E07D90 80242A30 00621825 */ or $v1, $v1, $v0
|
||||
/* E07D94 80242A34 A2230000 */ sb $v1, ($s1)
|
||||
.L80242A38:
|
||||
/* E07D98 80242A38 8E430070 */ lw $v1, 0x70($s2)
|
||||
/* E07D9C 80242A3C 24630001 */ addiu $v1, $v1, 1
|
||||
/* E07DA0 80242A40 2862002E */ slti $v0, $v1, 0x2e
|
||||
/* E07DA4 80242A44 AE430070 */ sw $v1, 0x70($s2)
|
||||
/* E07DA8 80242A48 8FBF0024 */ lw $ra, 0x24($sp)
|
||||
/* E07DAC 80242A4C 8FB20020 */ lw $s2, 0x20($sp)
|
||||
/* E07DB0 80242A50 8FB1001C */ lw $s1, 0x1c($sp)
|
||||
/* E07DB4 80242A54 8FB00018 */ lw $s0, 0x18($sp)
|
||||
/* E07DB8 80242A58 D7B40028 */ ldc1 $f20, 0x28($sp)
|
||||
/* E07DBC 80242A5C 38420001 */ xori $v0, $v0, 1
|
||||
/* E07DC0 80242A60 03E00008 */ jr $ra
|
||||
/* E07DC4 80242A64 27BD0030 */ addiu $sp, $sp, 0x30
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80242A68_E07DC8
|
||||
/* E07DC8 80242A68 27BDFFE0 */ addiu $sp, $sp, -0x20
|
||||
/* E07DCC 80242A6C AFB10014 */ sw $s1, 0x14($sp)
|
||||
/* E07DD0 80242A70 0080882D */ daddu $s1, $a0, $zero
|
||||
/* E07DD4 80242A74 AFBF0018 */ sw $ra, 0x18($sp)
|
||||
/* E07DD8 80242A78 AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* E07DDC 80242A7C 8E22000C */ lw $v0, 0xc($s1)
|
||||
/* E07DE0 80242A80 00A0802D */ daddu $s0, $a1, $zero
|
||||
/* E07DE4 80242A84 0C0B1EAF */ jal get_variable
|
||||
/* E07DE8 80242A88 8C450000 */ lw $a1, ($v0)
|
||||
/* E07DEC 80242A8C 1200000C */ beqz $s0, .L80242AC0
|
||||
/* E07DF0 80242A90 0220202D */ daddu $a0, $s1, $zero
|
||||
/* E07DF4 80242A94 0C0B36B0 */ jal resolve_npc
|
||||
/* E07DF8 80242A98 0040282D */ daddu $a1, $v0, $zero
|
||||
/* E07DFC 80242A9C AE220074 */ sw $v0, 0x74($s1)
|
||||
/* E07E00 80242AA0 C4420038 */ lwc1 $f2, 0x38($v0)
|
||||
/* E07E04 80242AA4 3C014334 */ lui $at, 0x4334
|
||||
/* E07E08 80242AA8 44810000 */ mtc1 $at, $f0
|
||||
/* E07E0C 80242AAC 24020048 */ addiu $v0, $zero, 0x48
|
||||
/* E07E10 80242AB0 AE220070 */ sw $v0, 0x70($s1)
|
||||
/* E07E14 80242AB4 4600110D */ trunc.w.s $f4, $f2
|
||||
/* E07E18 80242AB8 E6240078 */ swc1 $f4, 0x78($s1)
|
||||
/* E07E1C 80242ABC E620007C */ swc1 $f0, 0x7c($s1)
|
||||
.L80242AC0:
|
||||
/* E07E20 80242AC0 C620007C */ lwc1 $f0, 0x7c($s1)
|
||||
/* E07E24 80242AC4 3C0140A0 */ lui $at, 0x40a0
|
||||
/* E07E28 80242AC8 44816000 */ mtc1 $at, $f12
|
||||
/* E07E2C 80242ACC 8E300074 */ lw $s0, 0x74($s1)
|
||||
/* E07E30 80242AD0 0C00A6C9 */ jal clamp_angle
|
||||
/* E07E34 80242AD4 460C0301 */ sub.s $f12, $f0, $f12
|
||||
/* E07E38 80242AD8 46000306 */ mov.s $f12, $f0
|
||||
/* E07E3C 80242ADC 0C00A8D4 */ jal cos_deg
|
||||
/* E07E40 80242AE0 E62C007C */ swc1 $f12, 0x7c($s1)
|
||||
/* E07E44 80242AE4 3C0140C0 */ lui $at, 0x40c0
|
||||
/* E07E48 80242AE8 44811000 */ mtc1 $at, $f2
|
||||
/* E07E4C 80242AEC 00000000 */ nop
|
||||
/* E07E50 80242AF0 46020002 */ mul.s $f0, $f0, $f2
|
||||
/* E07E54 80242AF4 00000000 */ nop
|
||||
/* E07E58 80242AF8 C6020038 */ lwc1 $f2, 0x38($s0)
|
||||
/* E07E5C 80242AFC 46001080 */ add.s $f2, $f2, $f0
|
||||
/* E07E60 80242B00 E6020038 */ swc1 $f2, 0x38($s0)
|
||||
/* E07E64 80242B04 0C00A8BB */ jal sin_deg
|
||||
/* E07E68 80242B08 C62C007C */ lwc1 $f12, 0x7c($s1)
|
||||
/* E07E6C 80242B0C 3C014020 */ lui $at, 0x4020
|
||||
/* E07E70 80242B10 44811000 */ mtc1 $at, $f2
|
||||
/* E07E74 80242B14 00000000 */ nop
|
||||
/* E07E78 80242B18 46020002 */ mul.s $f0, $f0, $f2
|
||||
/* E07E7C 80242B1C 00000000 */ nop
|
||||
/* E07E80 80242B20 C6020040 */ lwc1 $f2, 0x40($s0)
|
||||
/* E07E84 80242B24 46001080 */ add.s $f2, $f2, $f0
|
||||
/* E07E88 80242B28 3C014334 */ lui $at, 0x4334
|
||||
/* E07E8C 80242B2C 44816000 */ mtc1 $at, $f12
|
||||
/* E07E90 80242B30 E6020040 */ swc1 $f2, 0x40($s0)
|
||||
/* E07E94 80242B34 C620007C */ lwc1 $f0, 0x7c($s1)
|
||||
/* E07E98 80242B38 0C00A6C9 */ jal clamp_angle
|
||||
/* E07E9C 80242B3C 46006301 */ sub.s $f12, $f12, $f0
|
||||
/* E07EA0 80242B40 E6000034 */ swc1 $f0, 0x34($s0)
|
||||
/* E07EA4 80242B44 8E230070 */ lw $v1, 0x70($s1)
|
||||
/* E07EA8 80242B48 2463FFFF */ addiu $v1, $v1, -1
|
||||
/* E07EAC 80242B4C AE230070 */ sw $v1, 0x70($s1)
|
||||
/* E07EB0 80242B50 8FBF0018 */ lw $ra, 0x18($sp)
|
||||
/* E07EB4 80242B54 8FB10014 */ lw $s1, 0x14($sp)
|
||||
/* E07EB8 80242B58 8FB00010 */ lw $s0, 0x10($sp)
|
||||
/* E07EBC 80242B5C 2C620001 */ sltiu $v0, $v1, 1
|
||||
/* E07EC0 80242B60 03E00008 */ jr $ra
|
||||
/* E07EC4 80242B64 27BD0020 */ addiu $sp, $sp, 0x20
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80242B68_E07EC8
|
||||
/* E07EC8 80242B68 27BDFFE0 */ addiu $sp, $sp, -0x20
|
||||
/* E07ECC 80242B6C AFB10014 */ sw $s1, 0x14($sp)
|
||||
/* E07ED0 80242B70 0080882D */ daddu $s1, $a0, $zero
|
||||
/* E07ED4 80242B74 AFBF0018 */ sw $ra, 0x18($sp)
|
||||
/* E07ED8 80242B78 AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* E07EDC 80242B7C 8E22000C */ lw $v0, 0xc($s1)
|
||||
/* E07EE0 80242B80 00A0802D */ daddu $s0, $a1, $zero
|
||||
/* E07EE4 80242B84 0C0B1EAF */ jal get_variable
|
||||
/* E07EE8 80242B88 8C450000 */ lw $a1, ($v0)
|
||||
/* E07EEC 80242B8C 1200000C */ beqz $s0, .L80242BC0
|
||||
/* E07EF0 80242B90 0220202D */ daddu $a0, $s1, $zero
|
||||
/* E07EF4 80242B94 0C0B36B0 */ jal resolve_npc
|
||||
/* E07EF8 80242B98 0040282D */ daddu $a1, $v0, $zero
|
||||
/* E07EFC 80242B9C AE220074 */ sw $v0, 0x74($s1)
|
||||
/* E07F00 80242BA0 C4420038 */ lwc1 $f2, 0x38($v0)
|
||||
/* E07F04 80242BA4 3C014334 */ lui $at, 0x4334
|
||||
/* E07F08 80242BA8 44810000 */ mtc1 $at, $f0
|
||||
/* E07F0C 80242BAC 24020048 */ addiu $v0, $zero, 0x48
|
||||
/* E07F10 80242BB0 AE220070 */ sw $v0, 0x70($s1)
|
||||
/* E07F14 80242BB4 4600110D */ trunc.w.s $f4, $f2
|
||||
/* E07F18 80242BB8 E6240078 */ swc1 $f4, 0x78($s1)
|
||||
/* E07F1C 80242BBC E620007C */ swc1 $f0, 0x7c($s1)
|
||||
.L80242BC0:
|
||||
/* E07F20 80242BC0 C620007C */ lwc1 $f0, 0x7c($s1)
|
||||
/* E07F24 80242BC4 3C0140A0 */ lui $at, 0x40a0
|
||||
/* E07F28 80242BC8 44816000 */ mtc1 $at, $f12
|
||||
/* E07F2C 80242BCC 8E300074 */ lw $s0, 0x74($s1)
|
||||
/* E07F30 80242BD0 0C00A6C9 */ jal clamp_angle
|
||||
/* E07F34 80242BD4 460C0300 */ add.s $f12, $f0, $f12
|
||||
/* E07F38 80242BD8 46000306 */ mov.s $f12, $f0
|
||||
/* E07F3C 80242BDC 0C00A8D4 */ jal cos_deg
|
||||
/* E07F40 80242BE0 E62C007C */ swc1 $f12, 0x7c($s1)
|
||||
/* E07F44 80242BE4 3C0140C0 */ lui $at, 0x40c0
|
||||
/* E07F48 80242BE8 44811000 */ mtc1 $at, $f2
|
||||
/* E07F4C 80242BEC 00000000 */ nop
|
||||
/* E07F50 80242BF0 46020002 */ mul.s $f0, $f0, $f2
|
||||
/* E07F54 80242BF4 00000000 */ nop
|
||||
/* E07F58 80242BF8 C6020038 */ lwc1 $f2, 0x38($s0)
|
||||
/* E07F5C 80242BFC 46001080 */ add.s $f2, $f2, $f0
|
||||
/* E07F60 80242C00 E6020038 */ swc1 $f2, 0x38($s0)
|
||||
/* E07F64 80242C04 0C00A8BB */ jal sin_deg
|
||||
/* E07F68 80242C08 C62C007C */ lwc1 $f12, 0x7c($s1)
|
||||
/* E07F6C 80242C0C 3C014020 */ lui $at, 0x4020
|
||||
/* E07F70 80242C10 44811000 */ mtc1 $at, $f2
|
||||
/* E07F74 80242C14 00000000 */ nop
|
||||
/* E07F78 80242C18 46020002 */ mul.s $f0, $f0, $f2
|
||||
/* E07F7C 80242C1C 00000000 */ nop
|
||||
/* E07F80 80242C20 C6020040 */ lwc1 $f2, 0x40($s0)
|
||||
/* E07F84 80242C24 46001080 */ add.s $f2, $f2, $f0
|
||||
/* E07F88 80242C28 3C014334 */ lui $at, 0x4334
|
||||
/* E07F8C 80242C2C 44816000 */ mtc1 $at, $f12
|
||||
/* E07F90 80242C30 E6020040 */ swc1 $f2, 0x40($s0)
|
||||
/* E07F94 80242C34 C620007C */ lwc1 $f0, 0x7c($s1)
|
||||
/* E07F98 80242C38 0C00A6C9 */ jal clamp_angle
|
||||
/* E07F9C 80242C3C 46006301 */ sub.s $f12, $f12, $f0
|
||||
/* E07FA0 80242C40 E6000034 */ swc1 $f0, 0x34($s0)
|
||||
/* E07FA4 80242C44 8E230070 */ lw $v1, 0x70($s1)
|
||||
/* E07FA8 80242C48 2463FFFF */ addiu $v1, $v1, -1
|
||||
/* E07FAC 80242C4C AE230070 */ sw $v1, 0x70($s1)
|
||||
/* E07FB0 80242C50 8FBF0018 */ lw $ra, 0x18($sp)
|
||||
/* E07FB4 80242C54 8FB10014 */ lw $s1, 0x14($sp)
|
||||
/* E07FB8 80242C58 8FB00010 */ lw $s0, 0x10($sp)
|
||||
/* E07FBC 80242C5C 2C620001 */ sltiu $v0, $v1, 1
|
||||
/* E07FC0 80242C60 03E00008 */ jr $ra
|
||||
/* E07FC4 80242C64 27BD0020 */ addiu $sp, $sp, 0x20
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80242C68_E07FC8
|
||||
/* E07FC8 80242C68 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* E07FCC 80242C6C AFBF0010 */ sw $ra, 0x10($sp)
|
||||
/* E07FD0 80242C70 8C82000C */ lw $v0, 0xc($a0)
|
||||
/* E07FD4 80242C74 0C0B1EAF */ jal get_variable
|
||||
/* E07FD8 80242C78 8C450000 */ lw $a1, ($v0)
|
||||
/* E07FDC 80242C7C 8FBF0010 */ lw $ra, 0x10($sp)
|
||||
/* E07FE0 80242C80 3C018024 */ lui $at, 0x8024
|
||||
/* E07FE4 80242C84 AC225D34 */ sw $v0, 0x5d34($at)
|
||||
/* E07FE8 80242C88 24020002 */ addiu $v0, $zero, 2
|
||||
/* E07FEC 80242C8C 03E00008 */ jr $ra
|
||||
/* E07FF0 80242C90 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80242C94_E07FF4
|
||||
/* E07FF4 80242C94 3C06FC12 */ lui $a2, 0xfc12
|
||||
/* E07FF8 80242C98 34C64624 */ ori $a2, $a2, 0x4624
|
||||
/* E07FFC 80242C9C 3C05FF8F */ lui $a1, 0xff8f
|
||||
/* E08000 80242CA0 3C04800A */ lui $a0, 0x800a
|
||||
/* E08004 80242CA4 2484A66C */ addiu $a0, $a0, -0x5994
|
||||
/* E08008 80242CA8 8C820000 */ lw $v0, ($a0)
|
||||
/* E0800C 80242CAC 34A5FFFF */ ori $a1, $a1, 0xffff
|
||||
/* E08010 80242CB0 0040182D */ daddu $v1, $v0, $zero
|
||||
/* E08014 80242CB4 24420008 */ addiu $v0, $v0, 8
|
||||
/* E08018 80242CB8 AC820000 */ sw $v0, ($a0)
|
||||
/* E0801C 80242CBC AC660000 */ sw $a2, ($v1)
|
||||
/* E08020 80242CC0 AC650004 */ sw $a1, 4($v1)
|
||||
/* E08024 80242CC4 24430008 */ addiu $v1, $v0, 8
|
||||
/* E08028 80242CC8 AC830000 */ sw $v1, ($a0)
|
||||
/* E0802C 80242CCC 3C048024 */ lui $a0, 0x8024
|
||||
/* E08030 80242CD0 90845D37 */ lbu $a0, 0x5d37($a0)
|
||||
/* E08034 80242CD4 3C03FA00 */ lui $v1, 0xfa00
|
||||
/* E08038 80242CD8 AC430000 */ sw $v1, ($v0)
|
||||
/* E0803C 80242CDC 03E00008 */ jr $ra
|
||||
/* E08040 80242CE0 AC440004 */ sw $a0, 4($v0)
|
||||
/* E08044 80242CE4 00000000 */ nop
|
||||
/* E08048 80242CE8 00000000 */ nop
|
||||
/* E0804C 80242CEC 00000000 */ nop
|
||||
|
|
@ -47,17 +47,3 @@ INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802427E8_E07B48);
|
|||
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242840_E07BA0);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_8024289C_E07BFC);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802428C0_E07C20);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242900_E07C60);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242978_E07CD8);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242A68_E07DC8);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242B68_E07EC8);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C68_E07FC8);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C94_E07FF4);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
#include "end_01.h"
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_802428C0_E07C20);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242900_E07C60);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242978_E07CD8);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242A68_E07DC8);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242B68_E07EC8);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242C68_E07FC8);
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242C94_E07FF4);
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
#!/usr/bin/python3
|
||||
|
||||
from collections import OrderedDict
|
||||
import os
|
||||
import sys
|
||||
|
||||
script_dir = os.path.dirname(os.path.realpath(__file__))
|
||||
|
||||
syms = {}
|
||||
|
||||
file_path = os.path.join(script_dir, "symbol_addrs.txt")
|
||||
|
||||
with open(file_path) as f:
|
||||
symbol_lines = f.readlines()
|
||||
|
||||
for line in symbol_lines:
|
||||
addr_text = line.split(" = ")[1][:10]
|
||||
addr = int(addr_text, 0)
|
||||
if addr in syms:
|
||||
print("Duplicate address: " + addr_text)
|
||||
sys.exit(55)
|
||||
syms[addr] = line
|
||||
|
||||
with open("test.txt", newline="\n", mode="w") as f:
|
||||
for addr in sorted(syms):
|
||||
f.write(syms[addr])
|
||||
|
|
@ -488,7 +488,7 @@ segments:
|
|||
files:
|
||||
- [0x33E8C0, "c"]
|
||||
- [0x33efe0, "bin"]
|
||||
- [0x33D610, "bin"]
|
||||
- [0x33F210, "bin"]
|
||||
- type: code
|
||||
start: 0x33FE80
|
||||
vram: 0xE002C000
|
||||
|
|
@ -6436,6 +6436,7 @@ segments:
|
|||
- [0xE05360, "c"]
|
||||
- [0xE05370, "c"]
|
||||
- [0xE05390, "c"]
|
||||
- [0xE07C20, "c"]
|
||||
- [0xE08050, "c"]
|
||||
- [0xE08350, "bin"]
|
||||
- [0xE08470, "bin"]
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue