diff --git a/asm/game.s b/asm/game.s index 794d7972bb..ab36a4109d 100644 --- a/asm/game.s +++ b/asm/game.s @@ -411,11 +411,11 @@ glabel func_800C46EC /* B3B89C 800C46FC AFA50084 */ sw $a1, 0x84($sp) /* B3B8A0 800C4700 24C64D50 */ addiu $a2, %lo(D_80144D50) # addiu $a2, $a2, 0x4d50 /* B3B8A4 800C4704 27A40064 */ addiu $a0, $sp, 0x64 -/* B3B8A8 800C4708 0C031AB1 */ jal func_800C6AC4 +/* B3B8A8 800C4708 0C031AB1 */ jal Graph_OpenDisp /* B3B8AC 800C470C 240702EA */ li $a3, 746 /* B3B8B0 800C4710 8FAE0084 */ lw $t6, 0x84($sp) /* B3B8B4 800C4714 8DC402C0 */ lw $a0, 0x2c0($t6) -/* B3B8B8 800C4718 0C031B08 */ jal func_800C6C20 +/* B3B8B8 800C4718 0C031B08 */ jal Graph_GfxPlusOne /* B3B8BC 800C471C AFA40078 */ sw $a0, 0x78($sp) /* B3B8C0 800C4720 8FAF0084 */ lw $t7, 0x84($sp) /* B3B8C4 800C4724 AFA2007C */ sw $v0, 0x7c($sp) @@ -497,7 +497,7 @@ glabel func_800C46EC /* B3B9E4 800C4844 AD200004 */ sw $zero, 4($t1) /* B3B9E8 800C4848 AD2B0000 */ sw $t3, ($t1) /* B3B9EC 800C484C 8FA5007C */ lw $a1, 0x7c($sp) -/* B3B9F0 800C4850 0C031B0A */ jal func_800C6C28 +/* B3B9F0 800C4850 0C031B0A */ jal Graph_BranchDlist /* B3B9F4 800C4854 8FA40078 */ lw $a0, 0x78($sp) /* B3B9F8 800C4858 8FAC007C */ lw $t4, 0x7c($sp) /* B3B9FC 800C485C 8FAD0084 */ lw $t5, 0x84($sp) @@ -506,7 +506,7 @@ glabel func_800C46EC /* B3BA08 800C4868 ADAC02C0 */ sw $t4, 0x2c0($t5) /* B3BA0C 800C486C 8FA50084 */ lw $a1, 0x84($sp) /* B3BA10 800C4870 27A40064 */ addiu $a0, $sp, 0x64 -/* B3BA14 800C4874 0C031AD5 */ jal func_800C6B54 +/* B3BA14 800C4874 0C031AD5 */ jal Graph_CloseDisp /* B3BA18 800C4878 24070320 */ li $a3, 800 /* B3BA1C 800C487C 0C018F5F */ jal func_80063D7C /* B3BA20 800C4880 8FA40084 */ lw $a0, 0x84($sp) @@ -538,7 +538,7 @@ glabel func_800C48CC /* B3BA7C 800C48DC 24C64D98 */ addiu $a2, %lo(D_80144D98) # addiu $a2, $a2, 0x4d98 /* B3BA80 800C48E0 AFA50058 */ sw $a1, 0x58($sp) /* B3BA84 800C48E4 27A40044 */ addiu $a0, $sp, 0x44 -/* B3BA88 800C48E8 0C031AB1 */ jal func_800C6AC4 +/* B3BA88 800C48E8 0C031AB1 */ jal Graph_OpenDisp /* B3BA8C 800C48EC 2407032E */ li $a3, 814 /* B3BA90 800C48F0 8FA50058 */ lw $a1, 0x58($sp) /* B3BA94 800C48F4 3C06DB06 */ lui $a2, 0xdb06 @@ -599,7 +599,7 @@ glabel func_800C48CC /* B3BB70 800C49D0 ACB802B0 */ sw $t8, 0x2b0($a1) /* B3BB74 800C49D4 AC440004 */ sw $a0, 4($v0) /* B3BB78 800C49D8 27A40044 */ addiu $a0, $sp, 0x44 -/* B3BB7C 800C49DC 0C031AD5 */ jal func_800C6B54 +/* B3BB7C 800C49DC 0C031AD5 */ jal Graph_CloseDisp /* B3BB80 800C49E0 AC480000 */ sw $t0, ($v0) /* B3BB84 800C49E4 8FBF0014 */ lw $ra, 0x14($sp) /* B3BB88 800C49E8 27BD0058 */ addiu $sp, $sp, 0x58 @@ -615,11 +615,11 @@ glabel func_800C49F4 /* B3BBA8 800C4A08 24C64DB0 */ addiu $a2, %lo(D_80144DB0) # addiu $a2, $a2, 0x4db0 /* B3BBAC 800C4A0C 02002825 */ move $a1, $s0 /* B3BBB0 800C4A10 27A4002C */ addiu $a0, $sp, 0x2c -/* B3BBB4 800C4A14 0C031AB1 */ jal func_800C6AC4 +/* B3BBB4 800C4A14 0C031AB1 */ jal Graph_OpenDisp /* B3BBB8 800C4A18 2407034E */ li $a3, 846 /* B3BBBC 800C4A1C 8E0602C0 */ lw $a2, 0x2c0($s0) /* B3BBC0 800C4A20 00C02025 */ move $a0, $a2 -/* B3BBC4 800C4A24 0C031B08 */ jal func_800C6C20 +/* B3BBC4 800C4A24 0C031B08 */ jal Graph_GfxPlusOne /* B3BBC8 800C4A28 AFA60040 */ sw $a2, 0x40($sp) /* B3BBCC 800C4A2C 8E0402B0 */ lw $a0, 0x2b0($s0) /* B3BBD0 800C4A30 8FA60040 */ lw $a2, 0x40($sp) @@ -633,7 +633,7 @@ glabel func_800C49F4 /* B3BBF0 800C4A50 AC400004 */ sw $zero, 4($v0) /* B3BBF4 800C4A54 24450008 */ addiu $a1, $v0, 8 /* B3BBF8 800C4A58 AFA50044 */ sw $a1, 0x44($sp) -/* B3BBFC 800C4A5C 0C031B0A */ jal func_800C6C28 +/* B3BBFC 800C4A5C 0C031B0A */ jal Graph_BranchDlist /* B3BC00 800C4A60 00C02025 */ move $a0, $a2 /* B3BC04 800C4A64 8FA50044 */ lw $a1, 0x44($sp) /* B3BC08 800C4A68 3C068014 */ lui $a2, %hi(D_80144DBC) # $a2, 0x8014 @@ -641,7 +641,7 @@ glabel func_800C49F4 /* B3BC10 800C4A70 AE0502C0 */ sw $a1, 0x2c0($s0) /* B3BC14 800C4A74 02002825 */ move $a1, $s0 /* B3BC18 800C4A78 27A4002C */ addiu $a0, $sp, 0x2c -/* B3BC1C 800C4A7C 0C031AD5 */ jal func_800C6B54 +/* B3BC1C 800C4A7C 0C031AD5 */ jal Graph_CloseDisp /* B3BC20 800C4A80 24070361 */ li $a3, 865 /* B3BC24 800C4A84 8FBF001C */ lw $ra, 0x1c($sp) /* B3BC28 800C4A88 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/graph.s b/asm/graph.s deleted file mode 100644 index 4ca4e63c46..0000000000 --- a/asm/graph.s +++ /dev/null @@ -1,1381 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .text - -.align 4 - -glabel func_800C5850 -/* B3C9F0 800C5850 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B3C9F4 800C5854 AFBF0014 */ sw $ra, 0x14($sp) -/* B3C9F8 800C5858 0C0011D0 */ jal osViGetNextFramebuffer -/* B3C9FC 800C585C 00000000 */ nop -/* B3CA00 800C5860 AFA2001C */ sw $v0, 0x1c($sp) -/* B3CA04 800C5864 0C032942 */ jal SysCfb_GetFbPtr -/* B3CA08 800C5868 00002025 */ move $a0, $zero -/* B3CA0C 800C586C 8FAE001C */ lw $t6, 0x1c($sp) -/* B3CA10 800C5870 104E0005 */ beq $v0, $t6, .L800C5888 -/* B3CA14 800C5874 00000000 */ nop -/* B3CA18 800C5878 0C032942 */ jal SysCfb_GetFbPtr -/* B3CA1C 800C587C 00002025 */ move $a0, $zero -/* B3CA20 800C5880 10000004 */ b .L800C5894 -/* B3CA24 800C5884 00402025 */ move $a0, $v0 -.L800C5888: -/* B3CA28 800C5888 0C032942 */ jal SysCfb_GetFbPtr -/* B3CA2C 800C588C 24040001 */ li $a0, 1 -/* B3CA30 800C5890 00402025 */ move $a0, $v0 -.L800C5894: -/* B3CA34 800C5894 0C0019A4 */ jal osViSwapBuffer -/* B3CA38 800C5898 00000000 */ nop -/* B3CA3C 800C589C 0C035213 */ jal Fault_WaitForInput -/* B3CA40 800C58A0 00000000 */ nop -/* B3CA44 800C58A4 0C0019A4 */ jal osViSwapBuffer -/* B3CA48 800C58A8 8FA4001C */ lw $a0, 0x1c($sp) -/* B3CA4C 800C58AC 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CA50 800C58B0 27BD0020 */ addiu $sp, $sp, 0x20 -/* B3CA54 800C58B4 03E00008 */ jr $ra -/* B3CA58 800C58B8 00000000 */ nop - -glabel func_800C58BC -/* B3CA5C 800C58BC 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3CA60 800C58C0 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3CA64 800C58C4 8C430000 */ lw $v1, ($v0) -/* B3CA68 800C58C8 27BDFF08 */ addiu $sp, $sp, -0xf8 -/* B3CA6C 800C58CC AFBF0014 */ sw $ra, 0x14($sp) -/* B3CA70 800C58D0 AFA400F8 */ sw $a0, 0xf8($sp) -/* B3CA74 800C58D4 846E1074 */ lh $t6, 0x1074($v1) -/* B3CA78 800C58D8 24010007 */ li $at, 7 -/* B3CA7C 800C58DC 55C10071 */ bnel $t6, $at, .L800C5AA4 -/* B3CA80 800C58E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CA84 800C58E4 846F1076 */ lh $t7, 0x1076($v1) -/* B3CA88 800C58E8 51E0006E */ beql $t7, $zero, .L800C5AA4 -/* B3CA8C 800C58EC 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CA90 800C58F0 0C035FD7 */ jal func_800D7F5C -/* B3CA94 800C58F4 27A40020 */ addiu $a0, $sp, 0x20 -/* B3CA98 800C58F8 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3CA9C 800C58FC 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3CAA0 800C5900 8C580000 */ lw $t8, ($v0) -/* B3CAA4 800C5904 3C068013 */ lui $a2, %hi(D_8012D230) # $a2, 0x8013 -/* B3CAA8 800C5908 24C6D230 */ addiu $a2, %lo(D_8012D230) # addiu $a2, $a2, -0x2dd0 -/* B3CAAC 800C590C 8719107A */ lh $t9, 0x107a($t8) -/* B3CAB0 800C5910 27A40020 */ addiu $a0, $sp, 0x20 -/* B3CAB4 800C5914 24050003 */ li $a1, 3 -/* B3CAB8 800C5918 0C036B20 */ jal func_800DAC80 -/* B3CABC 800C591C AFB900DC */ sw $t9, 0xdc($sp) -/* B3CAC0 800C5920 3C058015 */ lui $a1, %hi(D_80155F50) # $a1, 0x8015 -/* B3CAC4 800C5924 24A55F50 */ addiu $a1, %lo(D_80155F50) # addiu $a1, $a1, 0x5f50 -/* B3CAC8 800C5928 0C036B24 */ jal func_800DAC90 -/* B3CACC 800C592C 27A40020 */ addiu $a0, $sp, 0x20 -/* B3CAD0 800C5930 27A40020 */ addiu $a0, $sp, 0x20 -/* B3CAD4 800C5934 0C036100 */ jal func_800D8400 -/* B3CAD8 800C5938 8FA500F8 */ lw $a1, 0xf8($sp) -/* B3CADC 800C593C 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3CAE0 800C5940 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3CAE4 800C5944 8C490000 */ lw $t1, ($v0) -/* B3CAE8 800C5948 8FA800AC */ lw $t0, 0xac($sp) -/* B3CAEC 800C594C 24010001 */ li $at, 1 -/* B3CAF0 800C5950 3C048014 */ lui $a0, %hi(D_80145180) # $a0, 0x8014 -/* B3CAF4 800C5954 A528108E */ sh $t0, 0x108e($t1) -/* B3CAF8 800C5958 8FAA00BC */ lw $t2, 0xbc($sp) -/* B3CAFC 800C595C 8FAE00C0 */ lw $t6, 0xc0($sp) -/* B3CB00 800C5960 8FAC00B8 */ lw $t4, 0xb8($sp) -/* B3CB04 800C5964 8FB900C4 */ lw $t9, 0xc4($sp) -/* B3CB08 800C5968 000A5840 */ sll $t3, $t2, 1 -/* B3CB0C 800C596C 8C490000 */ lw $t1, ($v0) -/* B3CB10 800C5970 000E7840 */ sll $t7, $t6, 1 -/* B3CB14 800C5974 016C6821 */ addu $t5, $t3, $t4 -/* B3CB18 800C5978 01AFC021 */ addu $t8, $t5, $t7 -/* B3CB1C 800C597C 03194021 */ addu $t0, $t8, $t9 -/* B3CB20 800C5980 A528107C */ sh $t0, 0x107c($t1) -/* B3CB24 800C5984 8C4B0000 */ lw $t3, ($v0) -/* B3CB28 800C5988 8FAA00B0 */ lw $t2, 0xb0($sp) -/* B3CB2C 800C598C 24845180 */ addiu $a0, %lo(D_80145180) # addiu $a0, $a0, 0x5180 -/* B3CB30 800C5990 A56A107E */ sh $t2, 0x107e($t3) -/* B3CB34 800C5994 8C4E0000 */ lw $t6, ($v0) -/* B3CB38 800C5998 8FAC00B4 */ lw $t4, 0xb4($sp) -/* B3CB3C 800C599C A5CC1080 */ sh $t4, 0x1080($t6) -/* B3CB40 800C59A0 8C4F0000 */ lw $t7, ($v0) -/* B3CB44 800C59A4 8FAD00B8 */ lw $t5, 0xb8($sp) -/* B3CB48 800C59A8 A5ED1082 */ sh $t5, 0x1082($t7) -/* B3CB4C 800C59AC 8C590000 */ lw $t9, ($v0) -/* B3CB50 800C59B0 8FB800BC */ lw $t8, 0xbc($sp) -/* B3CB54 800C59B4 A7381084 */ sh $t8, 0x1084($t9) -/* B3CB58 800C59B8 8C490000 */ lw $t1, ($v0) -/* B3CB5C 800C59BC 8FA800C0 */ lw $t0, 0xc0($sp) -/* B3CB60 800C59C0 A5281086 */ sh $t0, 0x1086($t1) -/* B3CB64 800C59C4 8C4B0000 */ lw $t3, ($v0) -/* B3CB68 800C59C8 8FAA00C4 */ lw $t2, 0xc4($sp) -/* B3CB6C 800C59CC A56A1088 */ sh $t2, 0x1088($t3) -/* B3CB70 800C59D0 8C4E0000 */ lw $t6, ($v0) -/* B3CB74 800C59D4 8FAC00D8 */ lw $t4, 0xd8($sp) -/* B3CB78 800C59D8 A5CC108A */ sh $t4, 0x108a($t6) -/* B3CB7C 800C59DC 8C4F0000 */ lw $t7, ($v0) -/* B3CB80 800C59E0 8FAD00C8 */ lw $t5, 0xc8($sp) -/* B3CB84 800C59E4 A5ED108C */ sh $t5, 0x108c($t7) -/* B3CB88 800C59E8 8C580000 */ lw $t8, ($v0) -/* B3CB8C 800C59EC 87031078 */ lh $v1, 0x1078($t8) -/* B3CB90 800C59F0 10610003 */ beq $v1, $at, .L800C5A00 -/* B3CB94 800C59F4 24010002 */ li $at, 2 -/* B3CB98 800C59F8 14610027 */ bne $v1, $at, .L800C5A98 -/* B3CB9C 800C59FC 00000000 */ nop -.L800C5A00: -/* B3CBA0 800C5A00 0C00084C */ jal osSyncPrintf -/* B3CBA4 800C5A04 8FA500B0 */ lw $a1, 0xb0($sp) -/* B3CBA8 800C5A08 3C048014 */ lui $a0, %hi(D_8014518C) # $a0, 0x8014 -/* B3CBAC 800C5A0C 2484518C */ addiu $a0, %lo(D_8014518C) # addiu $a0, $a0, 0x518c -/* B3CBB0 800C5A10 0C00084C */ jal osSyncPrintf -/* B3CBB4 800C5A14 8FA500B4 */ lw $a1, 0xb4($sp) -/* B3CBB8 800C5A18 3C048014 */ lui $a0, %hi(D_8014519C) # $a0, 0x8014 -/* B3CBBC 800C5A1C 2484519C */ addiu $a0, %lo(D_8014519C) # addiu $a0, $a0, 0x519c -/* B3CBC0 800C5A20 0C00084C */ jal osSyncPrintf -/* B3CBC4 800C5A24 8FA500B8 */ lw $a1, 0xb8($sp) -/* B3CBC8 800C5A28 3C048014 */ lui $a0, %hi(D_801451AC) # $a0, 0x8014 -/* B3CBCC 800C5A2C 248451AC */ addiu $a0, %lo(D_801451AC) # addiu $a0, $a0, 0x51ac -/* B3CBD0 800C5A30 0C00084C */ jal osSyncPrintf -/* B3CBD4 800C5A34 8FA500BC */ lw $a1, 0xbc($sp) -/* B3CBD8 800C5A38 3C048014 */ lui $a0, %hi(D_801451BC) # $a0, 0x8014 -/* B3CBDC 800C5A3C 248451BC */ addiu $a0, %lo(D_801451BC) # addiu $a0, $a0, 0x51bc -/* B3CBE0 800C5A40 0C00084C */ jal osSyncPrintf -/* B3CBE4 800C5A44 8FA500C0 */ lw $a1, 0xc0($sp) -/* B3CBE8 800C5A48 3C048014 */ lui $a0, %hi(D_801451CC) # $a0, 0x8014 -/* B3CBEC 800C5A4C 248451CC */ addiu $a0, %lo(D_801451CC) # addiu $a0, $a0, 0x51cc -/* B3CBF0 800C5A50 0C00084C */ jal osSyncPrintf -/* B3CBF4 800C5A54 8FA500C4 */ lw $a1, 0xc4($sp) -/* B3CBF8 800C5A58 3C048014 */ lui $a0, %hi(D_801451DC) # $a0, 0x8014 -/* B3CBFC 800C5A5C 248451DC */ addiu $a0, %lo(D_801451DC) # addiu $a0, $a0, 0x51dc -/* B3CC00 800C5A60 0C00084C */ jal osSyncPrintf -/* B3CC04 800C5A64 8FA500D8 */ lw $a1, 0xd8($sp) -/* B3CC08 800C5A68 3C048014 */ lui $a0, %hi(D_801451EC) # $a0, 0x8014 -/* B3CC0C 800C5A6C 248451EC */ addiu $a0, %lo(D_801451EC) # addiu $a0, $a0, 0x51ec -/* B3CC10 800C5A70 0C00084C */ jal osSyncPrintf -/* B3CC14 800C5A74 8FA500C8 */ lw $a1, 0xc8($sp) -/* B3CC18 800C5A78 3C048014 */ lui $a0, %hi(D_80145200) # $a0, 0x8014 -/* B3CC1C 800C5A7C 24845200 */ addiu $a0, %lo(D_80145200) # addiu $a0, $a0, 0x5200 -/* B3CC20 800C5A80 0C00084C */ jal osSyncPrintf -/* B3CC24 800C5A84 8FA500A8 */ lw $a1, 0xa8($sp) -/* B3CC28 800C5A88 3C048014 */ lui $a0, %hi(D_80145210) # $a0, 0x8014 -/* B3CC2C 800C5A8C 24845210 */ addiu $a0, %lo(D_80145210) # addiu $a0, $a0, 0x5210 -/* B3CC30 800C5A90 0C00084C */ jal osSyncPrintf -/* B3CC34 800C5A94 8FA500AC */ lw $a1, 0xac($sp) -.L800C5A98: -/* B3CC38 800C5A98 0C035FF1 */ jal func_800D7FC4 -/* B3CC3C 800C5A9C 27A40020 */ addiu $a0, $sp, 0x20 -/* B3CC40 800C5AA0 8FBF0014 */ lw $ra, 0x14($sp) -.L800C5AA4: -/* B3CC44 800C5AA4 27BD00F8 */ addiu $sp, $sp, 0xf8 -/* B3CC48 800C5AA8 03E00008 */ jr $ra -/* B3CC4C 800C5AAC 00000000 */ nop - -glabel func_800C5AB0 -/* B3CC50 800C5AB0 27BDFF10 */ addiu $sp, $sp, -0xf0 -/* B3CC54 800C5AB4 AFBF0014 */ sw $ra, 0x14($sp) -/* B3CC58 800C5AB8 AFA400F0 */ sw $a0, 0xf0($sp) -/* B3CC5C 800C5ABC 0C035FD7 */ jal func_800D7F5C -/* B3CC60 800C5AC0 27A40018 */ addiu $a0, $sp, 0x18 -/* B3CC64 800C5AC4 240E0001 */ li $t6, 1 -/* B3CC68 800C5AC8 3C068013 */ lui $a2, %hi(D_8012D248) # $a2, 0x8013 -/* B3CC6C 800C5ACC AFAE00D4 */ sw $t6, 0xd4($sp) -/* B3CC70 800C5AD0 24C6D248 */ addiu $a2, %lo(D_8012D248) # addiu $a2, $a2, -0x2db8 -/* B3CC74 800C5AD4 27A40018 */ addiu $a0, $sp, 0x18 -/* B3CC78 800C5AD8 0C036B20 */ jal func_800DAC80 -/* B3CC7C 800C5ADC 24050003 */ li $a1, 3 -/* B3CC80 800C5AE0 3C058015 */ lui $a1, %hi(D_80155F50) # $a1, 0x8015 -/* B3CC84 800C5AE4 24A55F50 */ addiu $a1, %lo(D_80155F50) # addiu $a1, $a1, 0x5f50 -/* B3CC88 800C5AE8 0C036B24 */ jal func_800DAC90 -/* B3CC8C 800C5AEC 27A40018 */ addiu $a0, $sp, 0x18 -/* B3CC90 800C5AF0 27A40018 */ addiu $a0, $sp, 0x18 -/* B3CC94 800C5AF4 0C036100 */ jal func_800D8400 -/* B3CC98 800C5AF8 8FA500F0 */ lw $a1, 0xf0($sp) -/* B3CC9C 800C5AFC 0C035FF1 */ jal func_800D7FC4 -/* B3CCA0 800C5B00 27A40018 */ addiu $a0, $sp, 0x18 -/* B3CCA4 800C5B04 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CCA8 800C5B08 27BD00F0 */ addiu $sp, $sp, 0xf0 -/* B3CCAC 800C5B0C 03E00008 */ jr $ra -/* B3CCB0 800C5B10 00000000 */ nop - -glabel func_800C5B14 -/* B3CCB4 800C5B14 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B3CCB8 800C5B18 AFBF001C */ sw $ra, 0x1c($sp) -/* B3CCBC 800C5B1C AFB10018 */ sw $s1, 0x18($sp) -/* B3CCC0 800C5B20 AFB00014 */ sw $s0, 0x14($sp) -/* B3CCC4 800C5B24 8C8E02D8 */ lw $t6, 0x2d8($a0) -/* B3CCC8 800C5B28 3C19801B */ lui $t9, %hi(gGfxPools) # $t9, 0x801b -/* B3CCCC 800C5B2C 273941C0 */ addiu $t9, %lo(gGfxPools) # addiu $t9, $t9, 0x41c0 -/* B3CCD0 800C5B30 31CF0001 */ andi $t7, $t6, 1 -/* B3CCD4 800C5B34 000FC0C0 */ sll $t8, $t7, 3 -/* B3CCD8 800C5B38 030FC021 */ addu $t8, $t8, $t7 -/* B3CCDC 800C5B3C 0018C0C0 */ sll $t8, $t8, 3 -/* B3CCE0 800C5B40 030FC021 */ addu $t8, $t8, $t7 -/* B3CCE4 800C5B44 0018C180 */ sll $t8, $t8, 6 -/* B3CCE8 800C5B48 030FC021 */ addu $t8, $t8, $t7 -/* B3CCEC 800C5B4C 0018C100 */ sll $t8, $t8, 4 -/* B3CCF0 800C5B50 03198821 */ addu $s1, $t8, $t9 -/* B3CCF4 800C5B54 24081234 */ li $t0, 4660 -/* B3CCF8 800C5B58 3C010001 */ lui $at, 1 -/* B3CCFC 800C5B5C A6280000 */ sh $t0, ($s1) -/* B3CD00 800C5B60 00310821 */ addu $at, $at, $s1 -/* B3CD04 800C5B64 24095678 */ li $t1, 22136 -/* B3CD08 800C5B68 00808025 */ move $s0, $a0 -/* B3CD0C 800C5B6C A4292408 */ sh $t1, 0x2408($at) -/* B3CD10 800C5B70 26250008 */ addiu $a1, $s1, 8 -/* B3CD14 800C5B74 AFA50030 */ sw $a1, 0x30($sp) -/* B3CD18 800C5B78 248402B8 */ addiu $a0, $a0, 0x2b8 -/* B3CD1C 800C5B7C 0C030E20 */ jal THGA_Ct -/* B3CD20 800C5B80 3406BF00 */ li $a2, 48896 -/* B3CD24 800C5B84 3401BF08 */ li $at, 48904 -/* B3CD28 800C5B88 02212821 */ addu $a1, $s1, $at -/* B3CD2C 800C5B8C AFA5002C */ sw $a1, 0x2c($sp) -/* B3CD30 800C5B90 260402C8 */ addiu $a0, $s0, 0x2c8 -/* B3CD34 800C5B94 0C030E20 */ jal THGA_Ct -/* B3CD38 800C5B98 24064000 */ li $a2, 16384 -/* B3CD3C 800C5B9C 3401FF08 */ li $at, 65288 -/* B3CD40 800C5BA0 02212821 */ addu $a1, $s1, $at -/* B3CD44 800C5BA4 AFA50028 */ sw $a1, 0x28($sp) -/* B3CD48 800C5BA8 260402A8 */ addiu $a0, $s0, 0x2a8 -/* B3CD4C 800C5BAC 0C030E20 */ jal THGA_Ct -/* B3CD50 800C5BB0 24062000 */ li $a2, 8192 -/* B3CD54 800C5BB4 3C010001 */ lui $at, (0x00011F08 >> 16) # lui $at, 1 -/* B3CD58 800C5BB8 34211F08 */ ori $at, (0x00011F08 & 0xFFFF) # ori $at, $at, 0x1f08 -/* B3CD5C 800C5BBC 02212821 */ addu $a1, $s1, $at -/* B3CD60 800C5BC0 AFA50024 */ sw $a1, 0x24($sp) -/* B3CD64 800C5BC4 260401B4 */ addiu $a0, $s0, 0x1b4 -/* B3CD68 800C5BC8 0C030E20 */ jal THGA_Ct -/* B3CD6C 800C5BCC 24060400 */ li $a2, 1024 -/* B3CD70 800C5BD0 8FAA0030 */ lw $t2, 0x30($sp) -/* B3CD74 800C5BD4 8FA50024 */ lw $a1, 0x24($sp) -/* B3CD78 800C5BD8 8E0402E8 */ lw $a0, 0x2e8($s0) -/* B3CD7C 800C5BDC AE0A0000 */ sw $t2, ($s0) -/* B3CD80 800C5BE0 8FAB002C */ lw $t3, 0x2c($sp) -/* B3CD84 800C5BE4 AE0B0004 */ sw $t3, 4($s0) -/* B3CD88 800C5BE8 8FAC0028 */ lw $t4, 0x28($sp) -/* B3CD8C 800C5BEC AE0501B0 */ sw $a1, 0x1b0($s0) -/* B3CD90 800C5BF0 AE0C0010 */ sw $t4, 0x10($s0) -/* B3CD94 800C5BF4 04810004 */ bgez $a0, .L800C5C08 -/* B3CD98 800C5BF8 30840001 */ andi $a0, $a0, 1 -/* B3CD9C 800C5BFC 10800002 */ beqz $a0, .L800C5C08 -/* B3CDA0 800C5C00 00000000 */ nop -/* B3CDA4 800C5C04 2484FFFE */ addiu $a0, $a0, -2 -.L800C5C08: -/* B3CDA8 800C5C08 0C032942 */ jal SysCfb_GetFbPtr -/* B3CDAC 800C5C0C 00000000 */ nop -/* B3CDB0 800C5C10 AE0202DC */ sw $v0, 0x2dc($s0) -/* B3CDB4 800C5C14 AE000014 */ sw $zero, 0x14($s0) -/* B3CDB8 800C5C18 8FBF001C */ lw $ra, 0x1c($sp) -/* B3CDBC 800C5C1C 8FB10018 */ lw $s1, 0x18($sp) -/* B3CDC0 800C5C20 8FB00014 */ lw $s0, 0x14($sp) -/* B3CDC4 800C5C24 03E00008 */ jr $ra -/* B3CDC8 800C5C28 27BD0038 */ addiu $sp, $sp, 0x38 - -glabel func_800C5C2C -/* B3CDCC 800C5C2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B3CDD0 800C5C30 AFBF0014 */ sw $ra, 0x14($sp) -/* B3CDD4 800C5C34 0C03151B */ jal func_800C546C -/* B3CDD8 800C5C38 00000000 */ nop -/* B3CDDC 800C5C3C 3C0E800C */ lui $t6, %hi(TitleSetup_Init) # $t6, 0x800c -/* B3CDE0 800C5C40 25CE4104 */ addiu $t6, %lo(TitleSetup_Init) # addiu $t6, $t6, 0x4104 -/* B3CDE4 800C5C44 144E0004 */ bne $v0, $t6, .L800C5C58 -/* B3CDE8 800C5C48 00403025 */ move $a2, $v0 -/* B3CDEC 800C5C4C 3C028012 */ lui $v0, %hi(D_8011F830) # $v0, 0x8012 -/* B3CDF0 800C5C50 10000029 */ b .L800C5CF8 -/* B3CDF4 800C5C54 2442F830 */ addiu $v0, %lo(D_8011F830) # addiu $v0, $v0, -0x7d0 -.L800C5C58: -/* B3CDF8 800C5C58 3C0F8080 */ lui $t7, %hi(func_80801E44) # $t7, 0x8080 -/* B3CDFC 800C5C5C 25EF1E44 */ addiu $t7, %lo(func_80801E44) # addiu $t7, $t7, 0x1e44 -/* B3CE00 800C5C60 144F0004 */ bne $v0, $t7, .L800C5C74 -/* B3CE04 800C5C64 3C188080 */ lui $t8, %hi(Title_Init) # $t8, 0x8080 -/* B3CE08 800C5C68 3C028012 */ lui $v0, %hi(D_8011F860) # $v0, 0x8012 -/* B3CE0C 800C5C6C 10000022 */ b .L800C5CF8 -/* B3CE10 800C5C70 2442F860 */ addiu $v0, %lo(D_8011F860) # addiu $v0, $v0, -0x7a0 -.L800C5C74: -/* B3CE14 800C5C74 27180878 */ addiu $t8, %lo(Title_Init) # addiu $t8, $t8, 0x878 -/* B3CE18 800C5C78 14580004 */ bne $v0, $t8, .L800C5C8C -/* B3CE1C 800C5C7C 3C19800C */ lui $t9, %hi(func_800BCA64) # $t9, 0x800c -/* B3CE20 800C5C80 3C028012 */ lui $v0, %hi(D_8011F890) # $v0, 0x8012 -/* B3CE24 800C5C84 1000001C */ b .L800C5CF8 -/* B3CE28 800C5C88 2442F890 */ addiu $v0, %lo(D_8011F890) # addiu $v0, $v0, -0x770 -.L800C5C8C: -/* B3CE2C 800C5C8C 2739CA64 */ addiu $t9, %lo(func_800BCA64) # addiu $t9, $t9, -0x359c -/* B3CE30 800C5C90 14590004 */ bne $v0, $t9, .L800C5CA4 -/* B3CE34 800C5C94 3C088080 */ lui $t0, %hi(Opening_Init) # $t0, 0x8080 -/* B3CE38 800C5C98 3C028012 */ lui $v0, %hi(D_8011F8C0) # $v0, 0x8012 -/* B3CE3C 800C5C9C 10000016 */ b .L800C5CF8 -/* B3CE40 800C5CA0 2442F8C0 */ addiu $v0, %lo(D_8011F8C0) # addiu $v0, $v0, -0x740 -.L800C5CA4: -/* B3CE44 800C5CA4 25083CAC */ addiu $t0, %lo(Opening_Init) # addiu $t0, $t0, 0x3cac -/* B3CE48 800C5CA8 14480004 */ bne $v0, $t0, .L800C5CBC -/* B3CE4C 800C5CAC 3C098081 */ lui $t1, %hi(func_80811A20) # $t1, 0x8081 -/* B3CE50 800C5CB0 3C028012 */ lui $v0, %hi(D_8011F8F0) # $v0, 0x8012 -/* B3CE54 800C5CB4 10000010 */ b .L800C5CF8 -/* B3CE58 800C5CB8 2442F8F0 */ addiu $v0, %lo(D_8011F8F0) # addiu $v0, $v0, -0x710 -.L800C5CBC: -/* B3CE5C 800C5CBC 25291A20 */ addiu $t1, %lo(func_80811A20) # addiu $t1, $t1, 0x1a20 -/* B3CE60 800C5CC0 14490004 */ bne $v0, $t1, .L800C5CD4 -/* B3CE64 800C5CC4 3C048014 */ lui $a0, %hi(D_8014521C) # $a0, 0x8014 -/* B3CE68 800C5CC8 3C028012 */ lui $v0, %hi(D_8011F920) # $v0, 0x8012 -/* B3CE6C 800C5CCC 1000000A */ b .L800C5CF8 -/* B3CE70 800C5CD0 2442F920 */ addiu $v0, %lo(D_8011F920) # addiu $v0, $v0, -0x6e0 -.L800C5CD4: -/* B3CE74 800C5CD4 2484521C */ addiu $a0, %lo(D_8014521C) # addiu $a0, $a0, 0x521c -/* B3CE78 800C5CD8 240502B8 */ li $a1, 696 -/* B3CE7C 800C5CDC 0C000B84 */ jal LogUtils_LogThreadId -/* B3CE80 800C5CE0 AFA6001C */ sw $a2, 0x1c($sp) -/* B3CE84 800C5CE4 3C048014 */ lui $a0, %hi(D_80145228) # $a0, 0x8014 -/* B3CE88 800C5CE8 24845228 */ addiu $a0, %lo(D_80145228) # addiu $a0, $a0, 0x5228 -/* B3CE8C 800C5CEC 0C00084C */ jal osSyncPrintf -/* B3CE90 800C5CF0 8FA5001C */ lw $a1, 0x1c($sp) -/* B3CE94 800C5CF4 00001025 */ move $v0, $zero -.L800C5CF8: -/* B3CE98 800C5CF8 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CE9C 800C5CFC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B3CEA0 800C5D00 03E00008 */ jr $ra -/* B3CEA4 800C5D04 00000000 */ nop - -glabel func_800C5D08 -/* B3CEA8 800C5D08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B3CEAC 800C5D0C AFBF0014 */ sw $ra, 0x14($sp) -/* B3CEB0 800C5D10 AFA40018 */ sw $a0, 0x18($sp) -/* B3CEB4 800C5D14 0C001114 */ jal bzero -/* B3CEB8 800C5D18 24050300 */ li $a1, 768 -/* B3CEBC 800C5D1C 8FA70018 */ lw $a3, 0x18($sp) -/* B3CEC0 800C5D20 3C0E8001 */ lui $t6, %hi(gViConfigFeatures) # $t6, 0x8001 -/* B3CEC4 800C5D24 3C018001 */ lui $at, %hi(gViConfigXScale) -/* B3CEC8 800C5D28 ACE002D8 */ sw $zero, 0x2d8($a3) -/* B3CECC 800C5D2C ACE002E8 */ sw $zero, 0x2e8($a3) -/* B3CED0 800C5D30 ACE00284 */ sw $zero, 0x284($a3) -/* B3CED4 800C5D34 8DCE943C */ lw $t6, %lo(gViConfigFeatures)($t6) -/* B3CED8 800C5D38 24060008 */ li $a2, 8 -/* B3CEDC 800C5D3C 24E4005C */ addiu $a0, $a3, 0x5c -/* B3CEE0 800C5D40 ACEE02E4 */ sw $t6, 0x2e4($a3) -/* B3CEE4 800C5D44 C4249440 */ lwc1 $f4, %lo(gViConfigXScale)($at) -/* B3CEE8 800C5D48 3C018001 */ lui $at, %hi(gViConfigYScale) -/* B3CEEC 800C5D4C 24E50038 */ addiu $a1, $a3, 0x38 -/* B3CEF0 800C5D50 E4E402F4 */ swc1 $f4, 0x2f4($a3) -/* B3CEF4 800C5D54 C4269444 */ lwc1 $f6, %lo(gViConfigYScale)($at) -/* B3CEF8 800C5D58 0C001874 */ jal osCreateMesgQueue -/* B3CEFC 800C5D5C E4E602F8 */ swc1 $f6, 0x2f8($a3) -/* B3CF00 800C5D60 0C034C7C */ jal func_800D31F0 -/* B3CF04 800C5D64 00000000 */ nop -/* B3CF08 800C5D68 3C048016 */ lui $a0, %hi(D_801665E0) # $a0, 0x8016 -/* B3CF0C 800C5D6C 3C05800C */ lui $a1, %hi(func_800C5850) # $a1, 0x800c -/* B3CF10 800C5D70 24A55850 */ addiu $a1, %lo(func_800C5850) # addiu $a1, $a1, 0x5850 -/* B3CF14 800C5D74 248465E0 */ addiu $a0, %lo(D_801665E0) # addiu $a0, $a0, 0x65e0 -/* B3CF18 800C5D78 00003025 */ move $a2, $zero -/* B3CF1C 800C5D7C 0C035077 */ jal Fault_AddClient -/* B3CF20 800C5D80 00003825 */ move $a3, $zero -/* B3CF24 800C5D84 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CF28 800C5D88 27BD0018 */ addiu $sp, $sp, 0x18 -/* B3CF2C 800C5D8C 03E00008 */ jr $ra -/* B3CF30 800C5D90 00000000 */ nop - -glabel func_800C5D94 -/* B3CF34 800C5D94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B3CF38 800C5D98 AFBF0014 */ sw $ra, 0x14($sp) -/* B3CF3C 800C5D9C 0C034C84 */ jal func_800D3210 -/* B3CF40 800C5DA0 AFA40018 */ sw $a0, 0x18($sp) -/* B3CF44 800C5DA4 3C048016 */ lui $a0, %hi(D_801665E0) # $a0, 0x8016 -/* B3CF48 800C5DA8 0C0350B0 */ jal Fault_RemoveClient -/* B3CF4C 800C5DAC 248465E0 */ addiu $a0, %lo(D_801665E0) # addiu $a0, $a0, 0x65e0 -/* B3CF50 800C5DB0 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CF54 800C5DB4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B3CF58 800C5DB8 03E00008 */ jr $ra -/* B3CF5C 800C5DBC 00000000 */ nop - -glabel func_800C5DC0 -/* B3CF60 800C5DC0 27BDFF68 */ addiu $sp, $sp, -0x98 -/* B3CF64 800C5DC4 AFBF002C */ sw $ra, 0x2c($sp) -/* B3CF68 800C5DC8 AFB10028 */ sw $s1, 0x28($sp) -/* B3CF6C 800C5DCC 00808825 */ move $s1, $a0 -/* B3CF70 800C5DD0 0C001A78 */ jal osGetTime -/* B3CF74 800C5DD4 AFB00024 */ sw $s0, 0x24($sp) -/* B3CF78 800C5DD8 3C0E8016 */ lui $t6, %hi(D_801665D8) # $t6, 0x8016 -/* B3CF7C 800C5DDC 3C0F8016 */ lui $t7, %hi(D_801665DC) # $t7, 0x8016 -/* B3CF80 800C5DE0 8DEF65DC */ lw $t7, %lo(D_801665DC)($t7) -/* B3CF84 800C5DE4 8DCE65D8 */ lw $t6, %lo(D_801665D8)($t6) -/* B3CF88 800C5DE8 3C108017 */ lui $s0, %hi(D_8016A558) # $s0, 0x8017 -/* B3CF8C 800C5DEC 2610A558 */ addiu $s0, %lo(D_8016A558) # addiu $s0, $s0, -0x5aa8 -/* B3CF90 800C5DF0 8E080000 */ lw $t0, ($s0) -/* B3CF94 800C5DF4 8E090004 */ lw $t1, 4($s0) -/* B3CF98 800C5DF8 006F082B */ sltu $at, $v1, $t7 -/* B3CF9C 800C5DFC 004EC023 */ subu $t8, $v0, $t6 -/* B3CFA0 800C5E00 0301C023 */ subu $t8, $t8, $at -/* B3CFA4 800C5E04 006FC823 */ subu $t9, $v1, $t7 -/* B3CFA8 800C5E08 3C0C8017 */ lui $t4, %hi(D_8016A528) # $t4, 0x8017 -/* B3CFAC 800C5E0C 03085023 */ subu $t2, $t8, $t0 -/* B3CFB0 800C5E10 0329082B */ sltu $at, $t9, $t1 -/* B3CFB4 800C5E14 01415023 */ subu $t2, $t2, $at -/* B3CFB8 800C5E18 258CA528 */ addiu $t4, %lo(D_8016A528) # addiu $t4, $t4, -0x5ad8 -/* B3CFBC 800C5E1C AD8A0000 */ sw $t2, ($t4) -/* B3CFC0 800C5E20 03295823 */ subu $t3, $t9, $t1 -/* B3CFC4 800C5E24 AD8B0004 */ sw $t3, 4($t4) -/* B3CFC8 800C5E28 240F0000 */ li $t7, 0 -/* B3CFCC 800C5E2C 240E0000 */ li $t6, 0 -/* B3CFD0 800C5E30 3C070861 */ lui $a3, (0x0861C468 >> 16) # lui $a3, 0x861 -/* B3CFD4 800C5E34 2625005C */ addiu $a1, $s1, 0x5c -/* B3CFD8 800C5E38 240D029A */ li $t5, 666 -/* B3CFDC 800C5E3C AFAD001C */ sw $t5, 0x1c($sp) -/* B3CFE0 800C5E40 AFA50018 */ sw $a1, 0x18($sp) -/* B3CFE4 800C5E44 AFA50038 */ sw $a1, 0x38($sp) -/* B3CFE8 800C5E48 34E7C468 */ ori $a3, (0x0861C468 & 0xFFFF) # ori $a3, $a3, 0xc468 -/* B3CFEC 800C5E4C AFAE0010 */ sw $t6, 0x10($sp) -/* B3CFF0 800C5E50 AFAF0014 */ sw $t7, 0x14($sp) -/* B3CFF4 800C5E54 27A40070 */ addiu $a0, $sp, 0x70 -/* B3CFF8 800C5E58 0C0418B8 */ jal osSetTimer -/* B3CFFC 800C5E5C 24060000 */ li $a2, 0 -/* B3D000 800C5E60 8FA40038 */ lw $a0, 0x38($sp) -/* B3D004 800C5E64 27A5006C */ addiu $a1, $sp, 0x6c -/* B3D008 800C5E68 0C000CA0 */ jal osRecvMesg -/* B3D00C 800C5E6C 24060001 */ li $a2, 1 -/* B3D010 800C5E70 0C0408CC */ jal osStopTimer -/* B3D014 800C5E74 27A40070 */ addiu $a0, $sp, 0x70 -/* B3D018 800C5E78 8FB8006C */ lw $t8, 0x6c($sp) -/* B3D01C 800C5E7C 2401029A */ li $at, 666 -/* B3D020 800C5E80 1701002C */ bne $t8, $at, .L800C5F34 -/* B3D024 800C5E84 3C048014 */ lui $a0, %hi(D_80145240) # $a0, 0x8014 -/* B3D028 800C5E88 0C00084C */ jal osSyncPrintf -/* B3D02C 800C5E8C 24845240 */ addiu $a0, %lo(D_80145240) # addiu $a0, $a0, 0x5240 -/* B3D030 800C5E90 3C048014 */ lui $a0, %hi(D_80145248) # $a0, 0x8014 -/* B3D034 800C5E94 0C00084C */ jal osSyncPrintf -/* B3D038 800C5E98 24845248 */ addiu $a0, %lo(D_80145248) # addiu $a0, $a0, 0x5248 -/* B3D03C 800C5E9C 3C048014 */ lui $a0, %hi(D_80145264) # $a0, 0x8014 -/* B3D040 800C5EA0 0C00084C */ jal osSyncPrintf -/* B3D044 800C5EA4 24845264 */ addiu $a0, %lo(D_80145264) # addiu $a0, $a0, 0x5264 -/* B3D048 800C5EA8 3C04A404 */ lui $a0, 0xa404 -/* B3D04C 800C5EAC 0C000AC4 */ jal LogUtils_LogHexDump -/* B3D050 800C5EB0 24050020 */ li $a1, 32 -/* B3D054 800C5EB4 3C04A410 */ lui $a0, 0xa410 -/* B3D058 800C5EB8 0C000AC4 */ jal LogUtils_LogHexDump -/* B3D05C 800C5EBC 24050020 */ li $a1, 32 -/* B3D060 800C5EC0 3C04801B */ lui $a0, %hi(gGfxSPTaskYieldBuffer) # $a0, 0x801b -/* B3D064 800C5EC4 248431C0 */ addiu $a0, %lo(gGfxSPTaskYieldBuffer) # addiu $a0, $a0, 0x31c0 -/* B3D068 800C5EC8 0C000AC4 */ jal LogUtils_LogHexDump -/* B3D06C 800C5ECC 24050C00 */ li $a1, 3072 -/* B3D070 800C5ED0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3D074 800C5ED4 3C048013 */ lui $a0, %hi(D_8012D260) # $a0, 0x8013 -/* B3D078 800C5ED8 8C84D260 */ lw $a0, %lo(D_8012D260)($a0) -/* B3D07C 800C5EDC 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3D080 800C5EE0 8C480000 */ lw $t0, ($v0) -/* B3D084 800C5EE4 2419FFFF */ li $t9, -1 -/* B3D088 800C5EE8 1080000D */ beqz $a0, .L800C5F20 -/* B3D08C 800C5EEC A51900E0 */ sh $t9, 0xe0($t0) -/* B3D090 800C5EF0 8C4A0000 */ lw $t2, ($v0) -/* B3D094 800C5EF4 24090007 */ li $t1, 7 -/* B3D098 800C5EF8 240B0001 */ li $t3, 1 -/* B3D09C 800C5EFC A5491074 */ sh $t1, 0x1074($t2) -/* B3D0A0 800C5F00 8C4C0000 */ lw $t4, ($v0) -/* B3D0A4 800C5F04 240E0002 */ li $t6, 2 -/* B3D0A8 800C5F08 3C018013 */ lui $at, %hi(D_8012D260) # $at, 0x8013 -/* B3D0AC 800C5F0C A58B1076 */ sh $t3, 0x1076($t4) -/* B3D0B0 800C5F10 8C4F0000 */ lw $t7, ($v0) -/* B3D0B4 800C5F14 A5EE107A */ sh $t6, 0x107a($t7) -/* B3D0B8 800C5F18 0C03162F */ jal func_800C58BC -/* B3D0BC 800C5F1C AC24D260 */ sw $a0, %lo(D_8012D260)($at) -.L800C5F20: -/* B3D0C0 800C5F20 3C048014 */ lui $a0, %hi(D_80145268) # $a0, 0x8014 -/* B3D0C4 800C5F24 3C058014 */ lui $a1, %hi(D_8014527C) # $a1, 0x8014 -/* B3D0C8 800C5F28 24A5527C */ addiu $a1, %lo(D_8014527C) # addiu $a1, $a1, 0x527c -/* B3D0CC 800C5F2C 0C0359AD */ jal Fault_AddHungupAndCrashImpl -/* B3D0D0 800C5F30 24845268 */ addiu $a0, %lo(D_80145268) # addiu $a0, $a0, 0x5268 -.L800C5F34: -/* B3D0D4 800C5F34 8FA40038 */ lw $a0, 0x38($sp) -/* B3D0D8 800C5F38 27A5006C */ addiu $a1, $sp, 0x6c -/* B3D0DC 800C5F3C 0C000CA0 */ jal osRecvMesg -/* B3D0E0 800C5F40 00003025 */ move $a2, $zero -/* B3D0E4 800C5F44 8E2602EC */ lw $a2, 0x2ec($s1) -/* B3D0E8 800C5F48 8E2401B0 */ lw $a0, 0x1b0($s1) -/* B3D0EC 800C5F4C 3C018013 */ lui $at, %hi(D_8012D260) # $at, 0x8013 -/* B3D0F0 800C5F50 10C00004 */ beqz $a2, .L800C5F64 -/* B3D0F4 800C5F54 AC24D260 */ sw $a0, %lo(D_8012D260)($at) -/* B3D0F8 800C5F58 02202025 */ move $a0, $s1 -/* B3D0FC 800C5F5C 00C0F809 */ jalr $a2 -/* B3D100 800C5F60 8E2502F0 */ lw $a1, 0x2f0($s1) -.L800C5F64: -/* B3D104 800C5F64 0C001A78 */ jal osGetTime -/* B3D108 800C5F68 00000000 */ nop -/* B3D10C 800C5F6C 3C048017 */ lui $a0, %hi(D_8016A550) # $a0, 0x8017 -/* B3D110 800C5F70 2484A550 */ addiu $a0, %lo(D_8016A550) # addiu $a0, $a0, -0x5ab0 -/* B3D114 800C5F74 8C980000 */ lw $t8, ($a0) -/* B3D118 800C5F78 8C990004 */ lw $t9, 4($a0) -/* B3D11C 800C5F7C 57000004 */ bnezl $t8, .L800C5F90 -/* B3D120 800C5F80 8E080000 */ lw $t0, ($s0) -/* B3D124 800C5F84 53200012 */ beql $t9, $zero, .L800C5FD0 -/* B3D128 800C5F88 8E180000 */ lw $t8, ($s0) -/* B3D12C 800C5F8C 8E080000 */ lw $t0, ($s0) -.L800C5F90: -/* B3D130 800C5F90 8E090004 */ lw $t1, 4($s0) -/* B3D134 800C5F94 8C8C0000 */ lw $t4, ($a0) -/* B3D138 800C5F98 8C8D0004 */ lw $t5, 4($a0) -/* B3D13C 800C5F9C 01235821 */ addu $t3, $t1, $v1 -/* B3D140 800C5FA0 0163082B */ sltu $at, $t3, $v1 -/* B3D144 800C5FA4 00285021 */ addu $t2, $at, $t0 -/* B3D148 800C5FA8 01425021 */ addu $t2, $t2, $v0 -/* B3D14C 800C5FAC 014C7023 */ subu $t6, $t2, $t4 -/* B3D150 800C5FB0 016D082B */ sltu $at, $t3, $t5 -/* B3D154 800C5FB4 01C17023 */ subu $t6, $t6, $at -/* B3D158 800C5FB8 AE0E0000 */ sw $t6, ($s0) -/* B3D15C 800C5FBC 016D7823 */ subu $t7, $t3, $t5 -/* B3D160 800C5FC0 AE0F0004 */ sw $t7, 4($s0) -/* B3D164 800C5FC4 AC820000 */ sw $v0, ($a0) -/* B3D168 800C5FC8 AC830004 */ sw $v1, 4($a0) -/* B3D16C 800C5FCC 8E180000 */ lw $t8, ($s0) -.L800C5FD0: -/* B3D170 800C5FD0 8E190004 */ lw $t9, 4($s0) -/* B3D174 800C5FD4 3C088017 */ lui $t0, %hi(D_8016A520) # $t0, 0x8017 -/* B3D178 800C5FD8 2508A520 */ addiu $t0, %lo(D_8016A520) # addiu $t0, $t0, -0x5ae0 -/* B3D17C 800C5FDC AD180000 */ sw $t8, ($t0) -/* B3D180 800C5FE0 240A0000 */ li $t2, 0 -/* B3D184 800C5FE4 AD190004 */ sw $t9, 4($t0) -/* B3D188 800C5FE8 AE0A0000 */ sw $t2, ($s0) -/* B3D18C 800C5FEC 240B0000 */ li $t3, 0 -/* B3D190 800C5FF0 0C001A78 */ jal osGetTime -/* B3D194 800C5FF4 AE0B0004 */ sw $t3, 4($s0) -/* B3D198 800C5FF8 3C018016 */ lui $at, %hi(D_801665DC) # $at, 0x8016 -/* B3D19C 800C5FFC AC2265D8 */ sw $v0, %lo(D_801665D8)($at) -/* B3D1A0 800C6000 AC2365DC */ sw $v1, %lo(D_801665DC)($at) -/* B3D1A4 800C6004 26300088 */ addiu $s0, $s1, 0x88 -/* B3D1A8 800C6008 24090001 */ li $t1, 1 -/* B3D1AC 800C600C 240C0004 */ li $t4, 4 -/* B3D1B0 800C6010 AE090000 */ sw $t1, ($s0) -/* B3D1B4 800C6014 0C034B7C */ jal SysUcode_GetUCodeBoot -/* B3D1B8 800C6018 AE0C0004 */ sw $t4, 4($s0) -/* B3D1BC 800C601C 0C034B7F */ jal SysUcode_GetUcodeBootSize -/* B3D1C0 800C6020 AE020008 */ sw $v0, 8($s0) -/* B3D1C4 800C6024 0C034B85 */ jal SysUcode_GetUcode -/* B3D1C8 800C6028 AE02000C */ sw $v0, 0xc($s0) -/* B3D1CC 800C602C 0C034B88 */ jal SysUcode_GetUcodeData -/* B3D1D0 800C6030 AE020010 */ sw $v0, 0x10($s0) -/* B3D1D4 800C6034 3C0F801B */ lui $t7, %hi(gGfxSPTaskStack) # $t7, 0x801b -/* B3D1D8 800C6038 3C19801A */ lui $t9, %hi(gGfxSPTaskOutputBuffer) # $t9, 0x801a -/* B3D1DC 800C603C 3C08801B */ lui $t0, %hi(gGfxSPTaskYieldBuffer) # $t0, 0x801b -/* B3D1E0 800C6040 240D1000 */ li $t5, 4096 -/* B3D1E4 800C6044 240E0800 */ li $t6, 2048 -/* B3D1E8 800C6048 25EF3DC0 */ addiu $t7, %lo(gGfxSPTaskStack) # addiu $t7, $t7, 0x3dc0 -/* B3D1EC 800C604C 24180400 */ li $t8, 1024 -/* B3D1F0 800C6050 2739B1C0 */ addiu $t9, %lo(gGfxSPTaskOutputBuffer) # addiu $t9, $t9, -0x4e40 -/* B3D1F4 800C6054 250831C0 */ addiu $t0, %lo(gGfxSPTaskYieldBuffer) # addiu $t0, $t0, 0x31c0 -/* B3D1F8 800C6058 AE020018 */ sw $v0, 0x18($s0) -/* B3D1FC 800C605C AE0D0014 */ sw $t5, 0x14($s0) -/* B3D200 800C6060 AE0E001C */ sw $t6, 0x1c($s0) -/* B3D204 800C6064 AE0F0020 */ sw $t7, 0x20($s0) -/* B3D208 800C6068 AE180024 */ sw $t8, 0x24($s0) -/* B3D20C 800C606C AE190028 */ sw $t9, 0x28($s0) -/* B3D210 800C6070 AE08002C */ sw $t0, 0x2c($s0) -/* B3D214 800C6074 8E2A01B0 */ lw $t2, 0x1b0($s1) -/* B3D218 800C6078 3C068014 */ lui $a2, %hi(D_8014528C) # $a2, 0x8014 -/* B3D21C 800C607C 24C6528C */ addiu $a2, %lo(D_8014528C) # addiu $a2, $a2, 0x528c -/* B3D220 800C6080 27A40048 */ addiu $a0, $sp, 0x48 -/* B3D224 800C6084 02202825 */ move $a1, $s1 -/* B3D228 800C6088 2407033C */ li $a3, 828 -/* B3D22C 800C608C 0C031AB1 */ jal func_800C6AC4 -/* B3D230 800C6090 AE0A0030 */ sw $t2, 0x30($s0) -/* B3D234 800C6094 8E2B01BC */ lw $t3, 0x1bc($s1) -/* B3D238 800C6098 8E2901B0 */ lw $t1, 0x1b0($s1) -/* B3D23C 800C609C 3C068014 */ lui $a2, %hi(D_80145298) # $a2, 0x8014 -/* B3D240 800C60A0 24C65298 */ addiu $a2, %lo(D_80145298) # addiu $a2, $a2, 0x5298 -/* B3D244 800C60A4 01696023 */ subu $t4, $t3, $t1 -/* B3D248 800C60A8 AE0C0034 */ sw $t4, 0x34($s0) -/* B3D24C 800C60AC 27A40048 */ addiu $a0, $sp, 0x48 -/* B3D250 800C60B0 02202825 */ move $a1, $s1 -/* B3D254 800C60B4 0C031AD5 */ jal func_800C6B54 -/* B3D258 800C60B8 2407033E */ li $a3, 830 -/* B3D25C 800C60BC 3C0D801B */ lui $t5, %hi(gGfxSPTaskYieldBuffer) # $t5, 0x801b -/* B3D260 800C60C0 25AD31C0 */ addiu $t5, %lo(gGfxSPTaskYieldBuffer) # addiu $t5, $t5, 0x31c0 -/* B3D264 800C60C4 240E0C00 */ li $t6, 3072 -/* B3D268 800C60C8 AE0D0038 */ sw $t5, 0x38($s0) -/* B3D26C 800C60CC AE0E003C */ sw $t6, 0x3c($s0) -/* B3D270 800C60D0 26250078 */ addiu $a1, $s1, 0x78 -/* B3D274 800C60D4 240F0063 */ li $t7, 99 -/* B3D278 800C60D8 ACA00000 */ sw $zero, ($a1) -/* B3D27C 800C60DC ACAF0008 */ sw $t7, 8($a1) -/* B3D280 800C60E0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3D284 800C60E4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3D288 800C60E8 3C0E8016 */ lui $t6, %hi(D_801665F0) # $t6, 0x8016 -/* B3D28C 800C60EC 25CE65F0 */ addiu $t6, %lo(D_801665F0) # addiu $t6, $t6, 0x65f0 -/* B3D290 800C60F0 84430116 */ lh $v1, 0x116($v0) -/* B3D294 800C60F4 30780001 */ andi $t8, $v1, 1 -/* B3D298 800C60F8 13000009 */ beqz $t8, .L800C6120 -/* B3D29C 800C60FC 3079FFFE */ andi $t9, $v1, 0xfffe -/* B3D2A0 800C6100 A4590116 */ sh $t9, 0x116($v0) -/* B3D2A4 800C6104 8CA80008 */ lw $t0, 8($a1) -/* B3D2A8 800C6108 2401FFBF */ li $at, -65 -/* B3D2AC 800C610C 01015024 */ and $t2, $t0, $at -/* B3D2B0 800C6110 ACAA0008 */ sw $t2, 8($a1) -/* B3D2B4 800C6114 8E2B02E8 */ lw $t3, 0x2e8($s1) -/* B3D2B8 800C6118 2569FFFF */ addiu $t1, $t3, -1 -/* B3D2BC 800C611C AE2902E8 */ sw $t1, 0x2e8($s1) -.L800C6120: -/* B3D2C0 800C6120 3C038013 */ lui $v1, %hi(D_8012D264) # $v1, 0x8013 -/* B3D2C4 800C6124 8C63D264 */ lw $v1, %lo(D_8012D264)($v1) -/* B3D2C8 800C6128 24010003 */ li $at, 3 -/* B3D2CC 800C612C 8FAC0038 */ lw $t4, 0x38($sp) -/* B3D2D0 800C6130 000368C0 */ sll $t5, $v1, 3 -/* B3D2D4 800C6134 01A36823 */ subu $t5, $t5, $v1 -/* B3D2D8 800C6138 24630001 */ addiu $v1, $v1, 1 -/* B3D2DC 800C613C 0061001A */ div $zero, $v1, $at -/* B3D2E0 800C6140 ACA00054 */ sw $zero, 0x54($a1) -/* B3D2E4 800C6144 ACAC0050 */ sw $t4, 0x50($a1) -/* B3D2E8 800C6148 8E2F02DC */ lw $t7, 0x2dc($s1) -/* B3D2EC 800C614C 000D6880 */ sll $t5, $t5, 2 -/* B3D2F0 800C6150 01AE1021 */ addu $v0, $t5, $t6 -/* B3D2F4 800C6154 AC4F0000 */ sw $t7, ($v0) -/* B3D2F8 800C6158 8E3802DC */ lw $t8, 0x2dc($s1) -/* B3D2FC 800C615C 3C0A8016 */ lui $t2, %hi(gGameInfo) # $t2, 0x8016 -/* B3D300 800C6160 00001810 */ mfhi $v1 -/* B3D304 800C6164 AC580004 */ sw $t8, 4($v0) -/* B3D308 800C6168 8E390284 */ lw $t9, 0x284($s1) -/* B3D30C 800C616C 3C018013 */ lui $at, %hi(D_8012D264) # $at, 0x8013 -/* B3D310 800C6170 3C048016 */ lui $a0, %hi(gSchedContext+0x38) # $a0, 0x8016 -/* B3D314 800C6174 AC590008 */ sw $t9, 8($v0) -/* B3D318 800C6178 8E2802E4 */ lw $t0, 0x2e4($s1) -/* B3D31C 800C617C 248466A0 */ addiu $a0, %lo(gSchedContext+0x38) # addiu $a0, $a0, 0x66a0 -/* B3D320 800C6180 24060001 */ li $a2, 1 -/* B3D324 800C6184 AC48000C */ sw $t0, 0xc($v0) -/* B3D328 800C6188 C62402F4 */ lwc1 $f4, 0x2f4($s1) -/* B3D32C 800C618C E4440014 */ swc1 $f4, 0x14($v0) -/* B3D330 800C6190 C62602F8 */ lwc1 $f6, 0x2f8($s1) -/* B3D334 800C6194 A0400010 */ sb $zero, 0x10($v0) -/* B3D338 800C6198 E4460018 */ swc1 $f6, 0x18($v0) -/* B3D33C 800C619C 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) -/* B3D340 800C61A0 854B0110 */ lh $t3, 0x110($t2) -/* B3D344 800C61A4 A04B0011 */ sb $t3, 0x11($v0) -/* B3D348 800C61A8 ACA2000C */ sw $v0, 0xc($a1) -/* B3D34C 800C61AC AC23D264 */ sw $v1, %lo(D_8012D264)($at) -/* B3D350 800C61B0 0C000C18 */ jal osSendMesg -/* B3D354 800C61B4 AE240058 */ sw $a0, 0x58($s1) -/* B3D358 800C61B8 3C048016 */ lui $a0, %hi(gSchedContext) # $a0, 0x8016 -/* B3D35C 800C61BC 0C03257E */ jal func_800C95F8 -/* B3D360 800C61C0 24846668 */ addiu $a0, %lo(gSchedContext) # addiu $a0, $a0, 0x6668 -/* B3D364 800C61C4 8FBF002C */ lw $ra, 0x2c($sp) -/* B3D368 800C61C8 8FB00024 */ lw $s0, 0x24($sp) -/* B3D36C 800C61CC 8FB10028 */ lw $s1, 0x28($sp) -/* B3D370 800C61D0 03E00008 */ jr $ra -/* B3D374 800C61D4 27BD0098 */ addiu $sp, $sp, 0x98 - -glabel func_800C61D8 -/* B3D378 800C61D8 27BDFF38 */ addiu $sp, $sp, -0xc8 -/* B3D37C 800C61DC AFBF001C */ sw $ra, 0x1c($sp) -/* B3D380 800C61E0 AFB00018 */ sw $s0, 0x18($sp) -/* B3D384 800C61E4 AFA500CC */ sw $a1, 0xcc($sp) -/* B3D388 800C61E8 00808025 */ move $s0, $a0 -/* B3D38C 800C61EC 0C0316C5 */ jal func_800C5B14 -/* B3D390 800C61F0 ACA000A0 */ sw $zero, 0xa0($a1) -/* B3D394 800C61F4 3C068014 */ lui $a2, %hi(D_801452A4) # $a2, 0x8014 -/* B3D398 800C61F8 24C652A4 */ addiu $a2, %lo(D_801452A4) # addiu $a2, $a2, 0x52a4 -/* B3D39C 800C61FC 27A400B0 */ addiu $a0, $sp, 0xb0 -/* B3D3A0 800C6200 02002825 */ move $a1, $s0 -/* B3D3A4 800C6204 0C031AB1 */ jal func_800C6AC4 -/* B3D3A8 800C6208 240703C6 */ li $a3, 966 -/* B3D3AC 800C620C 8E0201BC */ lw $v0, 0x1bc($s0) -/* B3D3B0 800C6210 3C188014 */ lui $t8, %hi(D_801452B0) # $t8, 0x8014 -/* B3D3B4 800C6214 271852B0 */ addiu $t8, %lo(D_801452B0) # addiu $t8, $t8, 0x52b0 -/* B3D3B8 800C6218 244F0008 */ addiu $t7, $v0, 8 -/* B3D3BC 800C621C AE0F01BC */ sw $t7, 0x1bc($s0) -/* B3D3C0 800C6220 3C080002 */ lui $t0, 2 -/* B3D3C4 800C6224 AC480000 */ sw $t0, ($v0) -/* B3D3C8 800C6228 AC580004 */ sw $t8, 4($v0) -/* B3D3CC 800C622C 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B3D3D0 800C6230 3C098014 */ lui $t1, %hi(D_801452C0) # $t1, 0x8014 -/* B3D3D4 800C6234 252952C0 */ addiu $t1, %lo(D_801452C0) # addiu $t1, $t1, 0x52c0 -/* B3D3D8 800C6238 24590008 */ addiu $t9, $v0, 8 -/* B3D3DC 800C623C AE1902C0 */ sw $t9, 0x2c0($s0) -/* B3D3E0 800C6240 AC490004 */ sw $t1, 4($v0) -/* B3D3E4 800C6244 AC480000 */ sw $t0, ($v0) -/* B3D3E8 800C6248 8E0202D0 */ lw $v0, 0x2d0($s0) -/* B3D3EC 800C624C 3C0B8014 */ lui $t3, %hi(D_801452D4) # $t3, 0x8014 -/* B3D3F0 800C6250 256B52D4 */ addiu $t3, %lo(D_801452D4) # addiu $t3, $t3, 0x52d4 -/* B3D3F4 800C6254 244A0008 */ addiu $t2, $v0, 8 -/* B3D3F8 800C6258 AE0A02D0 */ sw $t2, 0x2d0($s0) -/* B3D3FC 800C625C AC4B0004 */ sw $t3, 4($v0) -/* B3D400 800C6260 AC480000 */ sw $t0, ($v0) -/* B3D404 800C6264 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B3D408 800C6268 3C0D8014 */ lui $t5, %hi(D_801452E8) # $t5, 0x8014 -/* B3D40C 800C626C 25AD52E8 */ addiu $t5, %lo(D_801452E8) # addiu $t5, $t5, 0x52e8 -/* B3D410 800C6270 244C0008 */ addiu $t4, $v0, 8 -/* B3D414 800C6274 AE0C02B0 */ sw $t4, 0x2b0($s0) -/* B3D418 800C6278 3C068014 */ lui $a2, %hi(D_801452FC) # $a2, 0x8014 -/* B3D41C 800C627C 24C652FC */ addiu $a2, %lo(D_801452FC) # addiu $a2, $a2, 0x52fc -/* B3D420 800C6280 27A400B0 */ addiu $a0, $sp, 0xb0 -/* B3D424 800C6284 02002825 */ move $a1, $s0 -/* B3D428 800C6288 240703CF */ li $a3, 975 -/* B3D42C 800C628C AC4D0004 */ sw $t5, 4($v0) -/* B3D430 800C6290 0C031AD5 */ jal func_800C6B54 -/* B3D434 800C6294 AC480000 */ sw $t0, ($v0) -/* B3D438 800C6298 0C0312A6 */ jal func_800C4A98 -/* B3D43C 800C629C 8FA400CC */ lw $a0, 0xcc($sp) -/* B3D440 800C62A0 0C0312B2 */ jal func_800C4AC8 -/* B3D444 800C62A4 8FA400CC */ lw $a0, 0xcc($sp) -/* B3D448 800C62A8 3C068014 */ lui $a2, %hi(D_80145308) # $a2, 0x8014 -/* B3D44C 800C62AC 24C65308 */ addiu $a2, %lo(D_80145308) # addiu $a2, $a2, 0x5308 -/* B3D450 800C62B0 27A4008C */ addiu $a0, $sp, 0x8c -/* B3D454 800C62B4 02002825 */ move $a1, $s0 -/* B3D458 800C62B8 0C031AB1 */ jal func_800C6AC4 -/* B3D45C 800C62BC 240703DB */ li $a3, 987 -/* B3D460 800C62C0 8E0201BC */ lw $v0, 0x1bc($s0) -/* B3D464 800C62C4 3C0F8014 */ lui $t7, %hi(D_80145314) # $t7, 0x8014 -/* B3D468 800C62C8 3C080002 */ lui $t0, 2 -/* B3D46C 800C62CC 244E0008 */ addiu $t6, $v0, 8 -/* B3D470 800C62D0 AE0E01BC */ sw $t6, 0x1bc($s0) -/* B3D474 800C62D4 25EF5314 */ addiu $t7, %lo(D_80145314) # addiu $t7, $t7, 0x5314 -/* B3D478 800C62D8 AC4F0004 */ sw $t7, 4($v0) -/* B3D47C 800C62DC AC480000 */ sw $t0, ($v0) -/* B3D480 800C62E0 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B3D484 800C62E4 3C198014 */ lui $t9, %hi(D_80145324) # $t9, 0x8014 -/* B3D488 800C62E8 27395324 */ addiu $t9, %lo(D_80145324) # addiu $t9, $t9, 0x5324 -/* B3D48C 800C62EC 24580008 */ addiu $t8, $v0, 8 -/* B3D490 800C62F0 AE1802C0 */ sw $t8, 0x2c0($s0) -/* B3D494 800C62F4 AC590004 */ sw $t9, 4($v0) -/* B3D498 800C62F8 AC480000 */ sw $t0, ($v0) -/* B3D49C 800C62FC 8E0202D0 */ lw $v0, 0x2d0($s0) -/* B3D4A0 800C6300 3C0A8014 */ lui $t2, %hi(D_80145338) # $t2, 0x8014 -/* B3D4A4 800C6304 254A5338 */ addiu $t2, %lo(D_80145338) # addiu $t2, $t2, 0x5338 -/* B3D4A8 800C6308 24490008 */ addiu $t1, $v0, 8 -/* B3D4AC 800C630C AE0902D0 */ sw $t1, 0x2d0($s0) -/* B3D4B0 800C6310 AC4A0004 */ sw $t2, 4($v0) -/* B3D4B4 800C6314 AC480000 */ sw $t0, ($v0) -/* B3D4B8 800C6318 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B3D4BC 800C631C 3C0C8014 */ lui $t4, %hi(D_8014534C) # $t4, 0x8014 -/* B3D4C0 800C6320 258C534C */ addiu $t4, %lo(D_8014534C) # addiu $t4, $t4, 0x534c -/* B3D4C4 800C6324 244B0008 */ addiu $t3, $v0, 8 -/* B3D4C8 800C6328 AE0B02B0 */ sw $t3, 0x2b0($s0) -/* B3D4CC 800C632C 3C068014 */ lui $a2, %hi(D_80145360) # $a2, 0x8014 -/* B3D4D0 800C6330 24C65360 */ addiu $a2, %lo(D_80145360) # addiu $a2, $a2, 0x5360 -/* B3D4D4 800C6334 27A4008C */ addiu $a0, $sp, 0x8c -/* B3D4D8 800C6338 02002825 */ move $a1, $s0 -/* B3D4DC 800C633C 240703E4 */ li $a3, 996 -/* B3D4E0 800C6340 AC4C0004 */ sw $t4, 4($v0) -/* B3D4E4 800C6344 0C031AD5 */ jal func_800C6B54 -/* B3D4E8 800C6348 AC480000 */ sw $t0, ($v0) -/* B3D4EC 800C634C 3C068014 */ lui $a2, %hi(D_8014536C) # $a2, 0x8014 -/* B3D4F0 800C6350 24C6536C */ addiu $a2, %lo(D_8014536C) # addiu $a2, $a2, 0x536c -/* B3D4F4 800C6354 27A40068 */ addiu $a0, $sp, 0x68 -/* B3D4F8 800C6358 02002825 */ move $a1, $s0 -/* B3D4FC 800C635C 0C031AB1 */ jal func_800C6AC4 -/* B3D500 800C6360 240703E7 */ li $a3, 999 -/* B3D504 800C6364 8E0201BC */ lw $v0, 0x1bc($s0) -/* B3D508 800C6368 3C04DE01 */ lui $a0, 0xde01 -/* B3D50C 800C636C 3C0BE700 */ lui $t3, 0xe700 -/* B3D510 800C6370 244D0008 */ addiu $t5, $v0, 8 -/* B3D514 800C6374 AE0D01BC */ sw $t5, 0x1bc($s0) -/* B3D518 800C6378 AC440000 */ sw $a0, ($v0) -/* B3D51C 800C637C 8E0E0000 */ lw $t6, ($s0) -/* B3D520 800C6380 3C0DE900 */ lui $t5, 0xe900 -/* B3D524 800C6384 3C068014 */ lui $a2, %hi(D_80145378) # $a2, 0x8014 -/* B3D528 800C6388 AC4E0004 */ sw $t6, 4($v0) -/* B3D52C 800C638C 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B3D530 800C6390 24C65378 */ addiu $a2, %lo(D_80145378) # addiu $a2, $a2, 0x5378 -/* B3D534 800C6394 02002825 */ move $a1, $s0 -/* B3D538 800C6398 244F0008 */ addiu $t7, $v0, 8 -/* B3D53C 800C639C AE0F02C0 */ sw $t7, 0x2c0($s0) -/* B3D540 800C63A0 AC440000 */ sw $a0, ($v0) -/* B3D544 800C63A4 8E180004 */ lw $t8, 4($s0) -/* B3D548 800C63A8 3C0FDF00 */ lui $t7, 0xdf00 -/* B3D54C 800C63AC 24070404 */ li $a3, 1028 -/* B3D550 800C63B0 AC580004 */ sw $t8, 4($v0) -/* B3D554 800C63B4 8E0202D0 */ lw $v0, 0x2d0($s0) -/* B3D558 800C63B8 24590008 */ addiu $t9, $v0, 8 -/* B3D55C 800C63BC AE1902D0 */ sw $t9, 0x2d0($s0) -/* B3D560 800C63C0 AC440000 */ sw $a0, ($v0) -/* B3D564 800C63C4 8E090010 */ lw $t1, 0x10($s0) -/* B3D568 800C63C8 27A40068 */ addiu $a0, $sp, 0x68 -/* B3D56C 800C63CC AC490004 */ sw $t1, 4($v0) -/* B3D570 800C63D0 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B3D574 800C63D4 244A0008 */ addiu $t2, $v0, 8 -/* B3D578 800C63D8 AE0A02B0 */ sw $t2, 0x2b0($s0) -/* B3D57C 800C63DC AC400004 */ sw $zero, 4($v0) -/* B3D580 800C63E0 AC4B0000 */ sw $t3, ($v0) -/* B3D584 800C63E4 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B3D588 800C63E8 244C0008 */ addiu $t4, $v0, 8 -/* B3D58C 800C63EC AE0C02B0 */ sw $t4, 0x2b0($s0) -/* B3D590 800C63F0 AC400004 */ sw $zero, 4($v0) -/* B3D594 800C63F4 AC4D0000 */ sw $t5, ($v0) -/* B3D598 800C63F8 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B3D59C 800C63FC 244E0008 */ addiu $t6, $v0, 8 -/* B3D5A0 800C6400 AE0E02B0 */ sw $t6, 0x2b0($s0) -/* B3D5A4 800C6404 AC400004 */ sw $zero, 4($v0) -/* B3D5A8 800C6408 0C031AD5 */ jal func_800C6B54 -/* B3D5AC 800C640C AC4F0000 */ sw $t7, ($v0) -/* B3D5B0 800C6410 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 -/* B3D5B4 800C6414 2508FA90 */ addiu $t0, %lo(gGameInfo) # addiu $t0, $t0, -0x570 -/* B3D5B8 800C6418 8D020000 */ lw $v0, ($t0) -/* B3D5BC 800C641C 2401000A */ li $at, 10 -/* B3D5C0 800C6420 84431074 */ lh $v1, 0x1074($v0) -/* B3D5C4 800C6424 54610010 */ bnel $v1, $at, .L800C6468 -/* B3D5C8 800C6428 24010007 */ li $at, 7 -/* B3D5CC 800C642C 8458108E */ lh $t8, 0x108e($v0) -/* B3D5D0 800C6430 24010002 */ li $at, 2 -/* B3D5D4 800C6434 24190007 */ li $t9, 7 -/* B3D5D8 800C6438 5701000B */ bnel $t8, $at, .L800C6468 -/* B3D5DC 800C643C 24010007 */ li $at, 7 -/* B3D5E0 800C6440 A4591074 */ sh $t9, 0x1074($v0) -/* B3D5E4 800C6444 8D0A0000 */ lw $t2, ($t0) -/* B3D5E8 800C6448 2409FFFF */ li $t1, -1 -/* B3D5EC 800C644C A5491076 */ sh $t1, 0x1076($t2) -/* B3D5F0 800C6450 8D020000 */ lw $v0, ($t0) -/* B3D5F4 800C6454 844B108C */ lh $t3, 0x108c($v0) -/* B3D5F8 800C6458 A44B107A */ sh $t3, 0x107a($v0) -/* B3D5FC 800C645C 8D020000 */ lw $v0, ($t0) -/* B3D600 800C6460 84431074 */ lh $v1, 0x1074($v0) -/* B3D604 800C6464 24010007 */ li $at, 7 -.L800C6468: -/* B3D608 800C6468 5461002D */ bnel $v1, $at, .L800C6520 -/* B3D60C 800C646C AFA000C4 */ sw $zero, 0xc4($sp) -/* B3D610 800C6470 844C1076 */ lh $t4, 0x1076($v0) -/* B3D614 800C6474 5180002A */ beql $t4, $zero, .L800C6520 -/* B3D618 800C6478 AFA000C4 */ sw $zero, 0xc4($sp) -/* B3D61C 800C647C 844D1078 */ lh $t5, 0x1078($v0) -/* B3D620 800C6480 24010003 */ li $at, 3 -/* B3D624 800C6484 3C048016 */ lui $a0, %hi(D_80166648) # $a0, 0x8016 -/* B3D628 800C6488 15A10007 */ bne $t5, $at, .L800C64A8 -/* B3D62C 800C648C 24846648 */ addiu $a0, %lo(D_80166648) # addiu $a0, $a0, 0x6648 -/* B3D630 800C6490 3C05800C */ lui $a1, %hi(func_800C5AB0) # $a1, 0x800c -/* B3D634 800C6494 3C078014 */ lui $a3, %hi(D_80145384) # $a3, 0x8014 -/* B3D638 800C6498 24E75384 */ addiu $a3, %lo(D_80145384) # addiu $a3, $a3, 0x5384 -/* B3D63C 800C649C 24A55AB0 */ addiu $a1, %lo(func_800C5AB0) # addiu $a1, $a1, 0x5ab0 -/* B3D640 800C64A0 0C035077 */ jal Fault_AddClient -/* B3D644 800C64A4 8E0601B0 */ lw $a2, 0x1b0($s0) -.L800C64A8: -/* B3D648 800C64A8 0C03162F */ jal func_800C58BC -/* B3D64C 800C64AC 8E0401B0 */ lw $a0, 0x1b0($s0) -/* B3D650 800C64B0 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 -/* B3D654 800C64B4 2508FA90 */ addiu $t0, %lo(gGameInfo) # addiu $t0, $t0, -0x570 -/* B3D658 800C64B8 8D020000 */ lw $v0, ($t0) -/* B3D65C 800C64BC 24010003 */ li $at, 3 -/* B3D660 800C64C0 3C048016 */ lui $a0, %hi(D_80166648) # $a0, 0x8016 -/* B3D664 800C64C4 844E1078 */ lh $t6, 0x1078($v0) -/* B3D668 800C64C8 55C10006 */ bnel $t6, $at, .L800C64E4 -/* B3D66C 800C64CC 84431076 */ lh $v1, 0x1076($v0) -/* B3D670 800C64D0 0C0350B0 */ jal Fault_RemoveClient -/* B3D674 800C64D4 24846648 */ addiu $a0, %lo(D_80166648) # addiu $a0, $a0, 0x6648 -/* B3D678 800C64D8 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3D67C 800C64DC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3D680 800C64E0 84431076 */ lh $v1, 0x1076($v0) -.L800C64E4: -/* B3D684 800C64E4 3C04A404 */ lui $a0, 0xa404 -/* B3D688 800C64E8 04610009 */ bgez $v1, .L800C6510 -/* B3D68C 800C64EC 00000000 */ nop -/* B3D690 800C64F0 0C000AC4 */ jal LogUtils_LogHexDump -/* B3D694 800C64F4 24050020 */ li $a1, 32 -/* B3D698 800C64F8 3C04A410 */ lui $a0, 0xa410 -/* B3D69C 800C64FC 0C000AC4 */ jal LogUtils_LogHexDump -/* B3D6A0 800C6500 24050020 */ li $a1, 32 -/* B3D6A4 800C6504 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3D6A8 800C6508 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3D6AC 800C650C 84431076 */ lh $v1, 0x1076($v0) -.L800C6510: -/* B3D6B0 800C6510 04630003 */ bgezl $v1, .L800C6520 -/* B3D6B4 800C6514 AFA000C4 */ sw $zero, 0xc4($sp) -/* B3D6B8 800C6518 A4401076 */ sh $zero, 0x1076($v0) -/* B3D6BC 800C651C AFA000C4 */ sw $zero, 0xc4($sp) -.L800C6520: -/* B3D6C0 800C6520 8E0F02D8 */ lw $t7, 0x2d8($s0) -/* B3D6C4 800C6524 3C09801B */ lui $t1, %hi(gGfxPools) # $t1, 0x801b -/* B3D6C8 800C6528 252941C0 */ addiu $t1, %lo(gGfxPools) # addiu $t1, $t1, 0x41c0 -/* B3D6CC 800C652C 31F80001 */ andi $t8, $t7, 1 -/* B3D6D0 800C6530 0018C8C0 */ sll $t9, $t8, 3 -/* B3D6D4 800C6534 0338C821 */ addu $t9, $t9, $t8 -/* B3D6D8 800C6538 0019C8C0 */ sll $t9, $t9, 3 -/* B3D6DC 800C653C 0338C821 */ addu $t9, $t9, $t8 -/* B3D6E0 800C6540 0019C980 */ sll $t9, $t9, 6 -/* B3D6E4 800C6544 0338C821 */ addu $t9, $t9, $t8 -/* B3D6E8 800C6548 0019C900 */ sll $t9, $t9, 4 -/* B3D6EC 800C654C 03295021 */ addu $t2, $t9, $t1 -/* B3D6F0 800C6550 AFAA004C */ sw $t2, 0x4c($sp) -/* B3D6F4 800C6554 954B0000 */ lhu $t3, ($t2) -/* B3D6F8 800C6558 24011234 */ li $at, 4660 -/* B3D6FC 800C655C 1161000B */ beq $t3, $at, .L800C658C -/* B3D700 800C6560 3C048014 */ lui $a0, %hi(D_80145394) # $a0, 0x8014 -/* B3D704 800C6564 24845394 */ addiu $a0, %lo(D_80145394) # addiu $a0, $a0, 0x5394 -/* B3D708 800C6568 0C00084C */ jal osSyncPrintf -/* B3D70C 800C656C 24050007 */ li $a1, 7 -/* B3D710 800C6570 3C048014 */ lui $a0, %hi(D_80145398) # $a0, 0x8014 -/* B3D714 800C6574 0C00084C */ jal osSyncPrintf -/* B3D718 800C6578 24845398 */ addiu $a0, %lo(D_80145398) # addiu $a0, $a0, 0x5398 -/* B3D71C 800C657C 3C048014 */ lui $a0, %hi(D_801453CC) # $a0, 0x8014 -/* B3D720 800C6580 248453CC */ addiu $a0, %lo(D_801453CC) # addiu $a0, $a0, 0x53cc -/* B3D724 800C6584 0C0359C3 */ jal Fault_AddHungupAndCrash -/* B3D728 800C6588 2405042E */ li $a1, 1070 -.L800C658C: -/* B3D72C 800C658C 8FAC004C */ lw $t4, 0x4c($sp) -/* B3D730 800C6590 3C0D0001 */ lui $t5, 1 -/* B3D734 800C6594 24015678 */ li $at, 22136 -/* B3D738 800C6598 01AC6821 */ addu $t5, $t5, $t4 -/* B3D73C 800C659C 95AD2408 */ lhu $t5, 0x2408($t5) -/* B3D740 800C65A0 11A1000D */ beq $t5, $at, .L800C65D8 -/* B3D744 800C65A4 240E0001 */ li $t6, 1 -/* B3D748 800C65A8 3C048014 */ lui $a0, %hi(D_801453D8) # $a0, 0x8014 -/* B3D74C 800C65AC AFAE00C4 */ sw $t6, 0xc4($sp) -/* B3D750 800C65B0 248453D8 */ addiu $a0, %lo(D_801453D8) # addiu $a0, $a0, 0x53d8 -/* B3D754 800C65B4 0C00084C */ jal osSyncPrintf -/* B3D758 800C65B8 24050007 */ li $a1, 7 -/* B3D75C 800C65BC 3C048014 */ lui $a0, %hi(D_801453DC) # $a0, 0x8014 -/* B3D760 800C65C0 0C00084C */ jal osSyncPrintf -/* B3D764 800C65C4 248453DC */ addiu $a0, %lo(D_801453DC) # addiu $a0, $a0, 0x53dc -/* B3D768 800C65C8 3C048014 */ lui $a0, %hi(D_80145410) # $a0, 0x8014 -/* B3D76C 800C65CC 24845410 */ addiu $a0, %lo(D_80145410) # addiu $a0, $a0, 0x5410 -/* B3D770 800C65D0 0C0359C3 */ jal Fault_AddHungupAndCrash -/* B3D774 800C65D4 24050434 */ li $a1, 1076 -.L800C65D8: -/* B3D778 800C65D8 0C030E30 */ jal THGA_IsCrash -/* B3D77C 800C65DC 260402B8 */ addiu $a0, $s0, 0x2b8 -/* B3D780 800C65E0 10400009 */ beqz $v0, .L800C6608 -/* B3D784 800C65E4 240F0001 */ li $t7, 1 -/* B3D788 800C65E8 3C048014 */ lui $a0, %hi(D_8014541C) # $a0, 0x8014 -/* B3D78C 800C65EC AFAF00C4 */ sw $t7, 0xc4($sp) -/* B3D790 800C65F0 2484541C */ addiu $a0, %lo(D_8014541C) # addiu $a0, $a0, 0x541c -/* B3D794 800C65F4 0C00084C */ jal osSyncPrintf -/* B3D798 800C65F8 24050007 */ li $a1, 7 -/* B3D79C 800C65FC 3C048014 */ lui $a0, %hi(D_80145420) # $a0, 0x8014 -/* B3D7A0 800C6600 0C00084C */ jal osSyncPrintf -/* B3D7A4 800C6604 24845420 */ addiu $a0, %lo(D_80145420) # addiu $a0, $a0, 0x5420 -.L800C6608: -/* B3D7A8 800C6608 0C030E30 */ jal THGA_IsCrash -/* B3D7AC 800C660C 260402C8 */ addiu $a0, $s0, 0x2c8 -/* B3D7B0 800C6610 10400009 */ beqz $v0, .L800C6638 -/* B3D7B4 800C6614 24180001 */ li $t8, 1 -/* B3D7B8 800C6618 3C048014 */ lui $a0, %hi(D_8014545C) # $a0, 0x8014 -/* B3D7BC 800C661C AFB800C4 */ sw $t8, 0xc4($sp) -/* B3D7C0 800C6620 2484545C */ addiu $a0, %lo(D_8014545C) # addiu $a0, $a0, 0x545c -/* B3D7C4 800C6624 0C00084C */ jal osSyncPrintf -/* B3D7C8 800C6628 24050007 */ li $a1, 7 -/* B3D7CC 800C662C 3C048014 */ lui $a0, %hi(D_80145460) # $a0, 0x8014 -/* B3D7D0 800C6630 0C00084C */ jal osSyncPrintf -/* B3D7D4 800C6634 24845460 */ addiu $a0, %lo(D_80145460) # addiu $a0, $a0, 0x5460 -.L800C6638: -/* B3D7D8 800C6638 0C030E30 */ jal THGA_IsCrash -/* B3D7DC 800C663C 260402A8 */ addiu $a0, $s0, 0x2a8 -/* B3D7E0 800C6640 10400009 */ beqz $v0, .L800C6668 -/* B3D7E4 800C6644 24190001 */ li $t9, 1 -/* B3D7E8 800C6648 3C048014 */ lui $a0, %hi(D_8014549C) # $a0, 0x8014 -/* B3D7EC 800C664C AFB900C4 */ sw $t9, 0xc4($sp) -/* B3D7F0 800C6650 2484549C */ addiu $a0, %lo(D_8014549C) # addiu $a0, $a0, 0x549c -/* B3D7F4 800C6654 0C00084C */ jal osSyncPrintf -/* B3D7F8 800C6658 24050007 */ li $a1, 7 -/* B3D7FC 800C665C 3C048014 */ lui $a0, %hi(D_801454A0) # $a0, 0x8014 -/* B3D800 800C6660 0C00084C */ jal osSyncPrintf -/* B3D804 800C6664 248454A0 */ addiu $a0, %lo(D_801454A0) # addiu $a0, $a0, 0x54a0 -.L800C6668: -/* B3D808 800C6668 8FA900C4 */ lw $t1, 0xc4($sp) -/* B3D80C 800C666C 15200009 */ bnez $t1, .L800C6694 -/* B3D810 800C6670 00000000 */ nop -/* B3D814 800C6674 0C031770 */ jal func_800C5DC0 -/* B3D818 800C6678 02002025 */ move $a0, $s0 -/* B3D81C 800C667C 8E0A02D8 */ lw $t2, 0x2d8($s0) -/* B3D820 800C6680 8E0C02E8 */ lw $t4, 0x2e8($s0) -/* B3D824 800C6684 254B0001 */ addiu $t3, $t2, 1 -/* B3D828 800C6688 258D0001 */ addiu $t5, $t4, 1 -/* B3D82C 800C668C AE0B02D8 */ sw $t3, 0x2d8($s0) -/* B3D830 800C6690 AE0D02E8 */ sw $t5, 0x2e8($s0) -.L800C6694: -/* B3D834 800C6694 0C03CC15 */ jal func_800F3054 -/* B3D838 800C6698 00000000 */ nop -/* B3D83C 800C669C 0C001A78 */ jal osGetTime -/* B3D840 800C66A0 00000000 */ nop -/* B3D844 800C66A4 3C048017 */ lui $a0, %hi(D_8016A568) # $a0, 0x8017 -/* B3D848 800C66A8 2484A568 */ addiu $a0, %lo(D_8016A568) # addiu $a0, $a0, -0x5a98 -/* B3D84C 800C66AC 8C8E0000 */ lw $t6, ($a0) -/* B3D850 800C66B0 8C8F0004 */ lw $t7, 4($a0) -/* B3D854 800C66B4 3C188017 */ lui $t8, %hi(D_8016A538) # $t8, 0x8017 -/* B3D858 800C66B8 2718A538 */ addiu $t8, %lo(D_8016A538) # addiu $t8, $t8, -0x5ac8 -/* B3D85C 800C66BC 3C058017 */ lui $a1, %hi(D_8016A560) # $a1, 0x8017 -/* B3D860 800C66C0 AF0E0000 */ sw $t6, ($t8) -/* B3D864 800C66C4 24A5A560 */ addiu $a1, %lo(D_8016A560) # addiu $a1, $a1, -0x5aa0 -/* B3D868 800C66C8 AF0F0004 */ sw $t7, 4($t8) -/* B3D86C 800C66CC 8CAA0000 */ lw $t2, ($a1) -/* B3D870 800C66D0 8CAB0004 */ lw $t3, 4($a1) -/* B3D874 800C66D4 3C198017 */ lui $t9, %hi(D_8016A530) # $t9, 0x8017 -/* B3D878 800C66D8 2739A530 */ addiu $t9, %lo(D_8016A530) # addiu $t9, $t9, -0x5ad0 -/* B3D87C 800C66DC 3C068017 */ lui $a2, %hi(D_8016A580) # $a2, 0x8017 -/* B3D880 800C66E0 AF2A0000 */ sw $t2, ($t9) -/* B3D884 800C66E4 24C6A580 */ addiu $a2, %lo(D_8016A580) # addiu $a2, $a2, -0x5a80 -/* B3D888 800C66E8 AF2B0004 */ sw $t3, 4($t9) -/* B3D88C 800C66EC 8CCC0000 */ lw $t4, ($a2) -/* B3D890 800C66F0 8CCD0004 */ lw $t5, 4($a2) -/* B3D894 800C66F4 3C098017 */ lui $t1, %hi(D_8016A540) # $t1, 0x8017 -/* B3D898 800C66F8 2529A540 */ addiu $t1, %lo(D_8016A540) # addiu $t1, $t1, -0x5ac0 -/* B3D89C 800C66FC AD2C0000 */ sw $t4, ($t1) -/* B3D8A0 800C6700 AD2D0004 */ sw $t5, 4($t1) -/* B3D8A4 800C6704 240E0000 */ li $t6, 0 -/* B3D8A8 800C6708 AC8E0000 */ sw $t6, ($a0) -/* B3D8AC 800C670C 240F0000 */ li $t7, 0 -/* B3D8B0 800C6710 AC8F0004 */ sw $t7, 4($a0) -/* B3D8B4 800C6714 24180000 */ li $t8, 0 -/* B3D8B8 800C6718 ACB80000 */ sw $t8, ($a1) -/* B3D8BC 800C671C 24190000 */ li $t9, 0 -/* B3D8C0 800C6720 ACB90004 */ sw $t9, 4($a1) -/* B3D8C4 800C6724 240A0000 */ li $t2, 0 -/* B3D8C8 800C6728 ACCA0000 */ sw $t2, ($a2) -/* B3D8CC 800C672C 240B0000 */ li $t3, 0 -/* B3D8D0 800C6730 ACCB0004 */ sw $t3, 4($a2) -/* B3D8D4 800C6734 3C0C8016 */ lui $t4, %hi(D_801665D0) # $t4, 0x8016 -/* B3D8D8 800C6738 8D8C65D0 */ lw $t4, %lo(D_801665D0)($t4) -/* B3D8DC 800C673C 3C0D8016 */ lui $t5, %hi(D_801665D4) # $t5, 0x8016 -/* B3D8E0 800C6740 8DAD65D4 */ lw $t5, %lo(D_801665D4)($t5) -/* B3D8E4 800C6744 AFAC0020 */ sw $t4, 0x20($sp) -/* B3D8E8 800C6748 15800002 */ bnez $t4, .L800C6754 -/* B3D8EC 800C674C AFAD0024 */ sw $t5, 0x24($sp) -/* B3D8F0 800C6750 11A00008 */ beqz $t5, .L800C6774 -.L800C6754: -/* B3D8F4 800C6754 006D082B */ sltu $at, $v1, $t5 -/* B3D8F8 800C6758 004C7023 */ subu $t6, $v0, $t4 -/* B3D8FC 800C675C 3C098017 */ lui $t1, %hi(D_8016A548) # $t1, 0x8017 -/* B3D900 800C6760 2529A548 */ addiu $t1, %lo(D_8016A548) # addiu $t1, $t1, -0x5ab8 -/* B3D904 800C6764 01C17023 */ subu $t6, $t6, $at -/* B3D908 800C6768 AD2E0000 */ sw $t6, ($t1) -/* B3D90C 800C676C 006D7823 */ subu $t7, $v1, $t5 -/* B3D910 800C6770 AD2F0004 */ sw $t7, 4($t1) -.L800C6774: -/* B3D914 800C6774 3C048013 */ lui $a0, %hi(D_8012DBC0) # $a0, 0x8013 -/* B3D918 800C6778 8C84DBC0 */ lw $a0, %lo(D_8012DBC0)($a0) -/* B3D91C 800C677C 3C018016 */ lui $at, %hi(D_801665D4) # $at, 0x8016 -/* B3D920 800C6780 AC2265D0 */ sw $v0, %lo(D_801665D0)($at) -/* B3D924 800C6784 10800015 */ beqz $a0, .L800C67DC -/* B3D928 800C6788 AC2365D4 */ sw $v1, %lo(D_801665D4)($at) -/* B3D92C 800C678C 8FA200CC */ lw $v0, 0xcc($sp) -/* B3D930 800C6790 2401DFFF */ li $at, -8193 -/* B3D934 800C6794 94580020 */ lhu $t8, 0x20($v0) -/* B3D938 800C6798 0301C827 */ nor $t9, $t8, $at -/* B3D93C 800C679C 1720000F */ bnez $t9, .L800C67DC -/* B3D940 800C67A0 00000000 */ nop -/* B3D944 800C67A4 944A0014 */ lhu $t2, 0x14($v0) -/* B3D948 800C67A8 2401FFCF */ li $at, -49 -/* B3D94C 800C67AC 3C0C8080 */ lui $t4, %hi(func_80801E44) # $t4, 0x8080 -/* B3D950 800C67B0 01415827 */ nor $t3, $t2, $at -/* B3D954 800C67B4 15600009 */ bnez $t3, .L800C67DC -/* B3D958 800C67B8 3C018016 */ lui $at, %hi(gSaveContext+0x135c) # $at, 0x8016 -/* B3D95C 800C67BC AC20F9BC */ sw $zero, %lo(gSaveContext+0x135c)($at) -/* B3D960 800C67C0 258C1E44 */ addiu $t4, %lo(func_80801E44) # addiu $t4, $t4, 0x1e44 -/* B3D964 800C67C4 240D0240 */ li $t5, 576 -/* B3D968 800C67C8 AC4D0010 */ sw $t5, 0x10($v0) -/* B3D96C 800C67CC AC4C000C */ sw $t4, 0xc($v0) -/* B3D970 800C67D0 AC400098 */ sw $zero, 0x98($v0) -/* B3D974 800C67D4 3C048013 */ lui $a0, %hi(D_8012DBC0) # $a0, 0x8013 -/* B3D978 800C67D8 8C84DBC0 */ lw $a0, %lo(D_8012DBC0)($a0) -.L800C67DC: -/* B3D97C 800C67DC 10800014 */ beqz $a0, .L800C6830 -/* B3D980 800C67E0 3C048016 */ lui $a0, %hi(gAppNmiBufferPtr) # $a0, 0x8016 -/* B3D984 800C67E4 0C01EFC2 */ jal PreNmiBuff_IsResetting -/* B3D988 800C67E8 8C846660 */ lw $a0, %lo(gAppNmiBufferPtr)($a0) -/* B3D98C 800C67EC 10400010 */ beqz $v0, .L800C6830 -/* B3D990 800C67F0 8FAE00CC */ lw $t6, 0xcc($sp) -/* B3D994 800C67F4 8DCF00A0 */ lw $t7, 0xa0($t6) -/* B3D998 800C67F8 3C048014 */ lui $a0, %hi(D_801454DC) # $a0, 0x8014 -/* B3D99C 800C67FC 55E0000D */ bnezl $t7, .L800C6834 -/* B3D9A0 800C6800 8FBF001C */ lw $ra, 0x1c($sp) -/* B3D9A4 800C6804 0C00084C */ jal osSyncPrintf -/* B3D9A8 800C6808 248454DC */ addiu $a0, %lo(D_801454DC) # addiu $a0, $a0, 0x54dc -/* B3D9AC 800C680C 8FB800CC */ lw $t8, 0xcc($sp) -/* B3D9B0 800C6810 3C098009 */ lui $t1, %hi(PreNMI_Init) # $t1, 0x8009 -/* B3D9B4 800C6814 252924B8 */ addiu $t1, %lo(PreNMI_Init) # addiu $t1, $t1, 0x24b8 -/* B3D9B8 800C6818 AF09000C */ sw $t1, 0xc($t8) -/* B3D9BC 800C681C 8FAA00CC */ lw $t2, 0xcc($sp) -/* B3D9C0 800C6820 241900AC */ li $t9, 172 -/* B3D9C4 800C6824 AD590010 */ sw $t9, 0x10($t2) -/* B3D9C8 800C6828 8FAB00CC */ lw $t3, 0xcc($sp) -/* B3D9CC 800C682C AD600098 */ sw $zero, 0x98($t3) -.L800C6830: -/* B3D9D0 800C6830 8FBF001C */ lw $ra, 0x1c($sp) -.L800C6834: -/* B3D9D4 800C6834 8FB00018 */ lw $s0, 0x18($sp) -/* B3D9D8 800C6838 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* B3D9DC 800C683C 03E00008 */ jr $ra -/* B3D9E0 800C6840 00000000 */ nop - -glabel Graph_ThreadEntry -/* B3D9E4 800C6844 27BDFC60 */ addiu $sp, $sp, -0x3a0 -/* B3D9E8 800C6848 AFB00018 */ sw $s0, 0x18($sp) -/* B3D9EC 800C684C 3C108012 */ lui $s0, %hi(D_8011F830) # $s0, 0x8012 -/* B3D9F0 800C6850 AFA403A0 */ sw $a0, 0x3a0($sp) -/* B3D9F4 800C6854 2610F830 */ addiu $s0, %lo(D_8011F830) # addiu $s0, $s0, -0x7d0 -/* B3D9F8 800C6858 AFBF003C */ sw $ra, 0x3c($sp) -/* B3D9FC 800C685C AFB30024 */ sw $s3, 0x24($sp) -/* B3DA00 800C6860 3C048014 */ lui $a0, %hi(D_80145510) # $a0, 0x8014 -/* B3DA04 800C6864 AFBE0038 */ sw $fp, 0x38($sp) -/* B3DA08 800C6868 AFB70034 */ sw $s7, 0x34($sp) -/* B3DA0C 800C686C AFB60030 */ sw $s6, 0x30($sp) -/* B3DA10 800C6870 AFB5002C */ sw $s5, 0x2c($sp) -/* B3DA14 800C6874 AFB40028 */ sw $s4, 0x28($sp) -/* B3DA18 800C6878 AFB20020 */ sw $s2, 0x20($sp) -/* B3DA1C 800C687C AFB1001C */ sw $s1, 0x1c($sp) -/* B3DA20 800C6880 02009825 */ move $s3, $s0 -/* B3DA24 800C6884 0C00084C */ jal osSyncPrintf -/* B3DA28 800C6888 24845510 */ addiu $a0, %lo(D_80145510) # addiu $a0, $a0, 0x5510 -/* B3DA2C 800C688C 27B200A0 */ addiu $s2, $sp, 0xa0 -/* B3DA30 800C6890 0C031742 */ jal func_800C5D08 -/* B3DA34 800C6894 02402025 */ move $a0, $s2 -/* B3DA38 800C6898 1200003B */ beqz $s0, .L800C6988 -/* B3DA3C 800C689C 3C178014 */ lui $s7, %hi(D_80145548) # $s7, 0x8014 -/* B3DA40 800C68A0 3C1E8014 */ lui $fp, %hi(D_80145554) # $fp, 0x8014 -/* B3DA44 800C68A4 3C168014 */ lui $s6, %hi(D_80145530) # $s6, 0x8014 -/* B3DA48 800C68A8 26D65530 */ addiu $s6, %lo(D_80145530) # addiu $s6, $s6, 0x5530 -/* B3DA4C 800C68AC 27DE5554 */ addiu $fp, %lo(D_80145554) # addiu $fp, $fp, 0x5554 -/* B3DA50 800C68B0 26F75548 */ addiu $s7, %lo(D_80145548) # addiu $s7, $s7, 0x5548 -/* B3DA54 800C68B4 27B50040 */ addiu $s5, $sp, 0x40 -/* B3DA58 800C68B8 0260A025 */ move $s4, $s3 -.L800C68BC: -/* B3DA5C 800C68BC 0C00ABC0 */ jal Overlay_LoadGameState -/* B3DA60 800C68C0 02602025 */ move $a0, $s3 -/* B3DA64 800C68C4 8E71002C */ lw $s1, 0x2c($s3) -/* B3DA68 800C68C8 02C02025 */ move $a0, $s6 -/* B3DA6C 800C68CC 0C00084C */ jal osSyncPrintf -/* B3DA70 800C68D0 02202825 */ move $a1, $s1 -/* B3DA74 800C68D4 02202025 */ move $a0, $s1 -/* B3DA78 800C68D8 02E02825 */ move $a1, $s7 -/* B3DA7C 800C68DC 0C03F570 */ jal SystemArena_MallocDebug -/* B3DA80 800C68E0 240604AC */ li $a2, 1196 -/* B3DA84 800C68E4 1440000C */ bnez $v0, .L800C6918 -/* B3DA88 800C68E8 00408025 */ move $s0, $v0 -/* B3DA8C 800C68EC 0C00084C */ jal osSyncPrintf -/* B3DA90 800C68F0 03C02025 */ move $a0, $fp -/* B3DA94 800C68F4 3C058014 */ lui $a1, %hi(D_80145560) # $a1, 0x8014 -/* B3DA98 800C68F8 24A55560 */ addiu $a1, %lo(D_80145560) # addiu $a1, $a1, 0x5560 -/* B3DA9C 800C68FC 02A02025 */ move $a0, $s5 -/* B3DAA0 800C6900 0C000BD1 */ jal sprintf -/* B3DAA4 800C6904 02203025 */ move $a2, $s1 -/* B3DAA8 800C6908 3C048014 */ lui $a0, %hi(D_80145578) # $a0, 0x8014 -/* B3DAAC 800C690C 24845578 */ addiu $a0, %lo(D_80145578) # addiu $a0, $a0, 0x5578 -/* B3DAB0 800C6910 0C0359AD */ jal Fault_AddHungupAndCrashImpl -/* B3DAB4 800C6914 02A02825 */ move $a1, $s5 -.L800C6918: -/* B3DAB8 800C6918 02002025 */ move $a0, $s0 -/* B3DABC 800C691C 8E650018 */ lw $a1, 0x18($s3) -/* B3DAC0 800C6920 0C031420 */ jal func_800C5080 -/* B3DAC4 800C6924 02403025 */ move $a2, $s2 -/* B3DAC8 800C6928 0C03151F */ jal func_800C547C -/* B3DACC 800C692C 02002025 */ move $a0, $s0 -/* B3DAD0 800C6930 10400007 */ beqz $v0, .L800C6950 -/* B3DAD4 800C6934 02402025 */ move $a0, $s2 -.L800C6938: -/* B3DAD8 800C6938 0C031876 */ jal func_800C61D8 -/* B3DADC 800C693C 02002825 */ move $a1, $s0 -/* B3DAE0 800C6940 0C03151F */ jal func_800C547C -/* B3DAE4 800C6944 02002025 */ move $a0, $s0 -/* B3DAE8 800C6948 5440FFFB */ bnezl $v0, .L800C6938 -/* B3DAEC 800C694C 02402025 */ move $a0, $s2 -.L800C6950: -/* B3DAF0 800C6950 0C03170B */ jal func_800C5C2C -/* B3DAF4 800C6954 02002025 */ move $a0, $s0 -/* B3DAF8 800C6958 00409825 */ move $s3, $v0 -/* B3DAFC 800C695C 0C0314D8 */ jal func_800C5360 -/* B3DB00 800C6960 02002025 */ move $a0, $s0 -/* B3DB04 800C6964 3C058014 */ lui $a1, %hi(D_80145594) # $a1, 0x8014 -/* B3DB08 800C6968 24A55594 */ addiu $a1, %lo(D_80145594) # addiu $a1, $a1, 0x5594 -/* B3DB0C 800C696C 02002025 */ move $a0, $s0 -/* B3DB10 800C6970 0C03F5ED */ jal SystemArena_FreeDebug -/* B3DB14 800C6974 240604CB */ li $a2, 1227 -/* B3DB18 800C6978 0C00AC2A */ jal Overlay_FreeGameState -/* B3DB1C 800C697C 02802025 */ move $a0, $s4 -/* B3DB20 800C6980 5660FFCE */ bnezl $s3, .L800C68BC -/* B3DB24 800C6984 0260A025 */ move $s4, $s3 -.L800C6988: -/* B3DB28 800C6988 0C031765 */ jal func_800C5D94 -/* B3DB2C 800C698C 02402025 */ move $a0, $s2 -/* B3DB30 800C6990 3C048014 */ lui $a0, %hi(D_801455A0) # $a0, 0x8014 -/* B3DB34 800C6994 0C00084C */ jal osSyncPrintf -/* B3DB38 800C6998 248455A0 */ addiu $a0, %lo(D_801455A0) # addiu $a0, $a0, 0x55a0 -/* B3DB3C 800C699C 8FBF003C */ lw $ra, 0x3c($sp) -/* B3DB40 800C69A0 8FB00018 */ lw $s0, 0x18($sp) -/* B3DB44 800C69A4 8FB1001C */ lw $s1, 0x1c($sp) -/* B3DB48 800C69A8 8FB20020 */ lw $s2, 0x20($sp) -/* B3DB4C 800C69AC 8FB30024 */ lw $s3, 0x24($sp) -/* B3DB50 800C69B0 8FB40028 */ lw $s4, 0x28($sp) -/* B3DB54 800C69B4 8FB5002C */ lw $s5, 0x2c($sp) -/* B3DB58 800C69B8 8FB60030 */ lw $s6, 0x30($sp) -/* B3DB5C 800C69BC 8FB70034 */ lw $s7, 0x34($sp) -/* B3DB60 800C69C0 8FBE0038 */ lw $fp, 0x38($sp) -/* B3DB64 800C69C4 03E00008 */ jr $ra -/* B3DB68 800C69C8 27BD03A0 */ addiu $sp, $sp, 0x3a0 - -glabel Graph_Alloc -/* B3DB6C 800C69CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B3DB70 800C69D0 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* B3DB74 800C69D4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B3DB78 800C69D8 AFBF001C */ sw $ra, 0x1c($sp) -/* B3DB7C 800C69DC AFA40020 */ sw $a0, 0x20($sp) -/* B3DB80 800C69E0 AFA50024 */ sw $a1, 0x24($sp) -/* B3DB84 800C69E4 85CF104A */ lh $t7, 0x104a($t6) -/* B3DB88 800C69E8 8FA20020 */ lw $v0, 0x20($sp) -/* B3DB8C 800C69EC 24010001 */ li $at, 1 -/* B3DB90 800C69F0 15E1000A */ bne $t7, $at, .L800C6A1C -/* B3DB94 800C69F4 244202B8 */ addiu $v0, $v0, 0x2b8 -/* B3DB98 800C69F8 8C580008 */ lw $t8, 8($v0) -/* B3DB9C 800C69FC 8C460000 */ lw $a2, ($v0) -/* B3DBA0 800C6A00 8C470004 */ lw $a3, 4($v0) -/* B3DBA4 800C6A04 AFB80010 */ sw $t8, 0x10($sp) -/* B3DBA8 800C6A08 8C59000C */ lw $t9, 0xc($v0) -/* B3DBAC 800C6A0C 3C048014 */ lui $a0, %hi(D_801455C0) # $a0, 0x8014 -/* B3DBB0 800C6A10 248455C0 */ addiu $a0, %lo(D_801455C0) # addiu $a0, $a0, 0x55c0 -/* B3DBB4 800C6A14 0C00084C */ jal osSyncPrintf -/* B3DBB8 800C6A18 AFB90014 */ sw $t9, 0x14($sp) -.L800C6A1C: -/* B3DBBC 800C6A1C 8FA50024 */ lw $a1, 0x24($sp) -/* B3DBC0 800C6A20 8FA40020 */ lw $a0, 0x20($sp) -/* B3DBC4 800C6A24 2401FFF0 */ li $at, -16 -/* B3DBC8 800C6A28 24A5000F */ addiu $a1, $a1, 0xf -/* B3DBCC 800C6A2C 00A12824 */ and $a1, $a1, $at -/* B3DBD0 800C6A30 0C030E78 */ jal THGA_AllocEnd -/* B3DBD4 800C6A34 248402B8 */ addiu $a0, $a0, 0x2b8 -/* B3DBD8 800C6A38 8FBF001C */ lw $ra, 0x1c($sp) -/* B3DBDC 800C6A3C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B3DBE0 800C6A40 03E00008 */ jr $ra -/* B3DBE4 800C6A44 00000000 */ nop - -glabel func_800C6A48 -/* B3DBE8 800C6A48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B3DBEC 800C6A4C 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* B3DBF0 800C6A50 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B3DBF4 800C6A54 AFBF001C */ sw $ra, 0x1c($sp) -/* B3DBF8 800C6A58 AFA40020 */ sw $a0, 0x20($sp) -/* B3DBFC 800C6A5C AFA50024 */ sw $a1, 0x24($sp) -/* B3DC00 800C6A60 85CF104A */ lh $t7, 0x104a($t6) -/* B3DC04 800C6A64 8FA20020 */ lw $v0, 0x20($sp) -/* B3DC08 800C6A68 24010001 */ li $at, 1 -/* B3DC0C 800C6A6C 15E1000A */ bne $t7, $at, .L800C6A98 -/* B3DC10 800C6A70 244202B8 */ addiu $v0, $v0, 0x2b8 -/* B3DC14 800C6A74 8C580008 */ lw $t8, 8($v0) -/* B3DC18 800C6A78 8C460000 */ lw $a2, ($v0) -/* B3DC1C 800C6A7C 8C470004 */ lw $a3, 4($v0) -/* B3DC20 800C6A80 AFB80010 */ sw $t8, 0x10($sp) -/* B3DC24 800C6A84 8C59000C */ lw $t9, 0xc($v0) -/* B3DC28 800C6A88 3C048014 */ lui $a0, %hi(D_80145604) # $a0, 0x8014 -/* B3DC2C 800C6A8C 24845604 */ addiu $a0, %lo(D_80145604) # addiu $a0, $a0, 0x5604 -/* B3DC30 800C6A90 0C00084C */ jal osSyncPrintf -/* B3DC34 800C6A94 AFB90014 */ sw $t9, 0x14($sp) -.L800C6A98: -/* B3DC38 800C6A98 8FA50024 */ lw $a1, 0x24($sp) -/* B3DC3C 800C6A9C 8FA40020 */ lw $a0, 0x20($sp) -/* B3DC40 800C6AA0 2401FFF0 */ li $at, -16 -/* B3DC44 800C6AA4 24A5000F */ addiu $a1, $a1, 0xf -/* B3DC48 800C6AA8 00A12824 */ and $a1, $a1, $at -/* B3DC4C 800C6AAC 0C030E78 */ jal THGA_AllocEnd -/* B3DC50 800C6AB0 248402B8 */ addiu $a0, $a0, 0x2b8 -/* B3DC54 800C6AB4 8FBF001C */ lw $ra, 0x1c($sp) -/* B3DC58 800C6AB8 27BD0020 */ addiu $sp, $sp, 0x20 -/* B3DC5C 800C6ABC 03E00008 */ jr $ra -/* B3DC60 800C6AC0 00000000 */ nop - -glabel func_800C6AC4 -/* B3DC64 800C6AC4 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3DC68 800C6AC8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3DC6C 800C6ACC 24010007 */ li $at, 7 -/* B3DC70 800C6AD0 844E1074 */ lh $t6, 0x1074($v0) -/* B3DC74 800C6AD4 15C1001D */ bne $t6, $at, .L800C6B4C -/* B3DC78 800C6AD8 00000000 */ nop -/* B3DC7C 800C6ADC 844F1078 */ lh $t7, 0x1078($v0) -/* B3DC80 800C6AE0 24010004 */ li $at, 4 -/* B3DC84 800C6AE4 11E10019 */ beq $t7, $at, .L800C6B4C -/* B3DC88 800C6AE8 00000000 */ nop -/* B3DC8C 800C6AEC 8CB802C0 */ lw $t8, 0x2c0($a1) -/* B3DC90 800C6AF0 3C010007 */ lui $at, 7 -/* B3DC94 800C6AF4 AC980000 */ sw $t8, ($a0) -/* B3DC98 800C6AF8 8CB902D0 */ lw $t9, 0x2d0($a1) -/* B3DC9C 800C6AFC AC990004 */ sw $t9, 4($a0) -/* B3DCA0 800C6B00 8CA802B0 */ lw $t0, 0x2b0($a1) -/* B3DCA4 800C6B04 AC880008 */ sw $t0, 8($a0) -/* B3DCA8 800C6B08 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B3DCAC 800C6B0C 30E4FFFF */ andi $a0, $a3, 0xffff -/* B3DCB0 800C6B10 00812025 */ or $a0, $a0, $at -/* B3DCB4 800C6B14 24490008 */ addiu $t1, $v0, 8 -/* B3DCB8 800C6B18 ACA902C0 */ sw $t1, 0x2c0($a1) -/* B3DCBC 800C6B1C AC460004 */ sw $a2, 4($v0) -/* B3DCC0 800C6B20 AC440000 */ sw $a0, ($v0) -/* B3DCC4 800C6B24 8CA202D0 */ lw $v0, 0x2d0($a1) -/* B3DCC8 800C6B28 244A0008 */ addiu $t2, $v0, 8 -/* B3DCCC 800C6B2C ACAA02D0 */ sw $t2, 0x2d0($a1) -/* B3DCD0 800C6B30 AC460004 */ sw $a2, 4($v0) -/* B3DCD4 800C6B34 AC440000 */ sw $a0, ($v0) -/* B3DCD8 800C6B38 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B3DCDC 800C6B3C 244B0008 */ addiu $t3, $v0, 8 -/* B3DCE0 800C6B40 ACAB02B0 */ sw $t3, 0x2b0($a1) -/* B3DCE4 800C6B44 AC460004 */ sw $a2, 4($v0) -/* B3DCE8 800C6B48 AC440000 */ sw $a0, ($v0) -.L800C6B4C: -/* B3DCEC 800C6B4C 03E00008 */ jr $ra -/* B3DCF0 800C6B50 00000000 */ nop - -glabel func_800C6B54 -/* B3DCF4 800C6B54 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3DCF8 800C6B58 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3DCFC 800C6B5C 24010007 */ li $at, 7 -/* B3DD00 800C6B60 844E1074 */ lh $t6, 0x1074($v0) -/* B3DD04 800C6B64 15C1002C */ bne $t6, $at, .L800C6C18 -/* B3DD08 800C6B68 00000000 */ nop -/* B3DD0C 800C6B6C 844F1078 */ lh $t7, 0x1078($v0) -/* B3DD10 800C6B70 24010004 */ li $at, 4 -/* B3DD14 800C6B74 11E10028 */ beq $t7, $at, .L800C6C18 -/* B3DD18 800C6B78 00000000 */ nop -/* B3DD1C 800C6B7C 8C830000 */ lw $v1, ($a0) -/* B3DD20 800C6B80 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B3DD24 800C6B84 30E9FFFF */ andi $t1, $a3, 0xffff -/* B3DD28 800C6B88 24780008 */ addiu $t8, $v1, 8 -/* B3DD2C 800C6B8C 14580003 */ bne $v0, $t8, .L800C6B9C -/* B3DD30 800C6B90 24590008 */ addiu $t9, $v0, 8 -/* B3DD34 800C6B94 10000006 */ b .L800C6BB0 -/* B3DD38 800C6B98 ACA302C0 */ sw $v1, 0x2c0($a1) -.L800C6B9C: -/* B3DD3C 800C6B9C ACB902C0 */ sw $t9, 0x2c0($a1) -/* B3DD40 800C6BA0 3C010008 */ lui $at, 8 -/* B3DD44 800C6BA4 01215025 */ or $t2, $t1, $at -/* B3DD48 800C6BA8 AC4A0000 */ sw $t2, ($v0) -/* B3DD4C 800C6BAC AC460004 */ sw $a2, 4($v0) -.L800C6BB0: -/* B3DD50 800C6BB0 8C820004 */ lw $v0, 4($a0) -/* B3DD54 800C6BB4 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B3DD58 800C6BB8 3C010008 */ lui $at, 8 -/* B3DD5C 800C6BBC 244B0008 */ addiu $t3, $v0, 8 -/* B3DD60 800C6BC0 146B0003 */ bne $v1, $t3, .L800C6BD0 -/* B3DD64 800C6BC4 246C0008 */ addiu $t4, $v1, 8 -/* B3DD68 800C6BC8 10000006 */ b .L800C6BE4 -/* B3DD6C 800C6BCC ACA202D0 */ sw $v0, 0x2d0($a1) -.L800C6BD0: -/* B3DD70 800C6BD0 30E2FFFF */ andi $v0, $a3, 0xffff -/* B3DD74 800C6BD4 ACAC02D0 */ sw $t4, 0x2d0($a1) -/* B3DD78 800C6BD8 00411025 */ or $v0, $v0, $at -/* B3DD7C 800C6BDC AC620000 */ sw $v0, ($v1) -/* B3DD80 800C6BE0 AC660004 */ sw $a2, 4($v1) -.L800C6BE4: -/* B3DD84 800C6BE4 8C820008 */ lw $v0, 8($a0) -/* B3DD88 800C6BE8 8CA302B0 */ lw $v1, 0x2b0($a1) -/* B3DD8C 800C6BEC 3C010008 */ lui $at, 8 -/* B3DD90 800C6BF0 244D0008 */ addiu $t5, $v0, 8 -/* B3DD94 800C6BF4 146D0003 */ bne $v1, $t5, .L800C6C04 -/* B3DD98 800C6BF8 246E0008 */ addiu $t6, $v1, 8 -/* B3DD9C 800C6BFC 03E00008 */ jr $ra -/* B3DDA0 800C6C00 ACA202B0 */ sw $v0, 0x2b0($a1) - -.L800C6C04: -/* B3DDA4 800C6C04 30E2FFFF */ andi $v0, $a3, 0xffff -/* B3DDA8 800C6C08 ACAE02B0 */ sw $t6, 0x2b0($a1) -/* B3DDAC 800C6C0C 00411025 */ or $v0, $v0, $at -/* B3DDB0 800C6C10 AC620000 */ sw $v0, ($v1) -/* B3DDB4 800C6C14 AC660004 */ sw $a2, 4($v1) -.L800C6C18: -/* B3DDB8 800C6C18 03E00008 */ jr $ra -/* B3DDBC 800C6C1C 00000000 */ nop - -glabel func_800C6C20 -/* B3DDC0 800C6C20 03E00008 */ jr $ra -/* B3DDC4 800C6C24 24820008 */ addiu $v0, $a0, 8 - -glabel func_800C6C28 -/* B3DDC8 800C6C28 3C0EDE01 */ lui $t6, 0xde01 -/* B3DDCC 800C6C2C AC8E0000 */ sw $t6, ($a0) -/* B3DDD0 800C6C30 AC850004 */ sw $a1, 4($a0) -/* B3DDD4 800C6C34 03E00008 */ jr $ra -/* B3DDD8 800C6C38 00A01025 */ move $v0, $a1 - -glabel func_800C6C3C -/* B3DDDC 800C6C3C 8C820000 */ lw $v0, ($a0) -/* B3DDE0 800C6C40 24A50007 */ addiu $a1, $a1, 7 -/* B3DDE4 800C6C44 2401FFF8 */ li $at, -8 -/* B3DDE8 800C6C48 00A12824 */ and $a1, $a1, $at -/* B3DDEC 800C6C4C 24430008 */ addiu $v1, $v0, 8 -/* B3DDF0 800C6C50 00653021 */ addu $a2, $v1, $a1 -/* B3DDF4 800C6C54 3C0EDE01 */ lui $t6, 0xde01 -/* B3DDF8 800C6C58 AC4E0000 */ sw $t6, ($v0) -/* B3DDFC 800C6C5C AC460004 */ sw $a2, 4($v0) -/* B3DE00 800C6C60 AC860000 */ sw $a2, ($a0) -/* B3DE04 800C6C64 03E00008 */ jr $ra -/* B3DE08 800C6C68 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/code/flg_set/func_8002AAB0.s b/asm/non_matchings/code/flg_set/func_8002AAB0.s index 3041f253bc..f3c3428986 100644 --- a/asm/non_matchings/code/flg_set/func_8002AAB0.s +++ b/asm/non_matchings/code/flg_set/func_8002AAB0.s @@ -153,11 +153,11 @@ glabel func_8002AAB0 /* AA1CA8 8002AB08 27A40074 */ addiu $a0, $sp, 0x74 /* AA1CAC 8002AB0C 24070083 */ li $a3, 131 /* AA1CB0 8002AB10 8D650000 */ lw $a1, ($t3) -/* AA1CB4 8002AB14 0C031AB1 */ jal func_800C6AC4 +/* AA1CB4 8002AB14 0C031AB1 */ jal Graph_OpenDisp /* AA1CB8 8002AB18 AFA50094 */ sw $a1, 0x94($sp) /* AA1CBC 8002AB1C 8FAC0094 */ lw $t4, 0x94($sp) /* AA1CC0 8002AB20 8D8402C0 */ lw $a0, 0x2c0($t4) -/* AA1CC4 8002AB24 0C031B08 */ jal func_800C6C20 +/* AA1CC4 8002AB24 0C031B08 */ jal Graph_GfxPlusOne /* AA1CC8 8002AB28 AFA40088 */ sw $a0, 0x88($sp) /* AA1CCC 8002AB2C 8FA60094 */ lw $a2, 0x94($sp) /* AA1CD0 8002AB30 3C0ADE00 */ lui $t2, 0xde00 @@ -394,7 +394,7 @@ glabel func_8002AAB0 /* AA2024 8002AE84 24A50008 */ addiu $a1, $a1, 8 /* AA2028 8002AE88 AFA5008C */ sw $a1, 0x8c($sp) /* AA202C 8002AE8C 8FA40088 */ lw $a0, 0x88($sp) -/* AA2030 8002AE90 0C031B0A */ jal func_800C6C28 +/* AA2030 8002AE90 0C031B0A */ jal Graph_BranchDlist /* AA2034 8002AE94 AFA70034 */ sw $a3, 0x34($sp) /* AA2038 8002AE98 8FA5008C */ lw $a1, 0x8c($sp) /* AA203C 8002AE9C 8FAA0094 */ lw $t2, 0x94($sp) @@ -413,7 +413,7 @@ glabel func_8002AAB0 /* AA2070 8002AED0 A4200936 */ sh $zero, 0x936($at) .L8002AED4: /* AA2074 8002AED4 8FA50094 */ lw $a1, 0x94($sp) -/* AA2078 8002AED8 0C031AD5 */ jal func_800C6B54 +/* AA2078 8002AED8 0C031AD5 */ jal Graph_CloseDisp /* AA207C 8002AEDC 240700F1 */ li $a3, 241 /* AA2080 8002AEE0 8FBF0024 */ lw $ra, 0x24($sp) /* AA2084 8002AEE4 8FB00020 */ lw $s0, 0x20($sp) diff --git a/asm/non_matchings/code/graph/Graph_TaskSet00.s b/asm/non_matchings/code/graph/Graph_TaskSet00.s new file mode 100644 index 0000000000..a7bca9ab9c --- /dev/null +++ b/asm/non_matchings/code/graph/Graph_TaskSet00.s @@ -0,0 +1,300 @@ +.rdata +glabel D_80145240 + .asciz "\x1b[31m" + .balign 4 + +glabel D_80145248 + .asciz "RCPが帰ってきませんでした。" + .balign 4 + +glabel D_80145264 + .asciz "\x1b[m" + .balign 4 + +glabel D_80145268 + .asciz "RCP is HUNG UP!!" + .balign 4 + +glabel D_8014527C + .asciz "Oh! MY GOD!!" + .balign 4 + +glabel D_8014528C + .asciz "../graph.c" + .balign 4 + +glabel D_80145298 + .asciz "../graph.c" + .balign 4 + + +.text +glabel Graph_TaskSet00 +/* B3CF60 800C5DC0 27BDFF68 */ addiu $sp, $sp, -0x98 +/* B3CF64 800C5DC4 AFBF002C */ sw $ra, 0x2c($sp) +/* B3CF68 800C5DC8 AFB10028 */ sw $s1, 0x28($sp) +/* B3CF6C 800C5DCC 00808825 */ move $s1, $a0 +/* B3CF70 800C5DD0 0C001A78 */ jal osGetTime +/* B3CF74 800C5DD4 AFB00024 */ sw $s0, 0x24($sp) +/* B3CF78 800C5DD8 3C0E8016 */ lui $t6, %hi(sGraphSetTaskTime) # $t6, 0x8016 +/* B3CF7C 800C5DDC 3C0F8016 */ lui $t7, %hi(sGraphSetTaskTime+4) # $t7, 0x8016 +/* B3CF80 800C5DE0 8DEF65DC */ lw $t7, %lo(sGraphSetTaskTime+4)($t7) +/* B3CF84 800C5DE4 8DCE65D8 */ lw $t6, %lo(sGraphSetTaskTime)($t6) +/* B3CF88 800C5DE8 3C108017 */ lui $s0, %hi(D_8016A558) # $s0, 0x8017 +/* B3CF8C 800C5DEC 2610A558 */ addiu $s0, %lo(D_8016A558) # addiu $s0, $s0, -0x5aa8 +/* B3CF90 800C5DF0 8E080000 */ lw $t0, ($s0) +/* B3CF94 800C5DF4 8E090004 */ lw $t1, 4($s0) +/* B3CF98 800C5DF8 006F082B */ sltu $at, $v1, $t7 +/* B3CF9C 800C5DFC 004EC023 */ subu $t8, $v0, $t6 +/* B3CFA0 800C5E00 0301C023 */ subu $t8, $t8, $at +/* B3CFA4 800C5E04 006FC823 */ subu $t9, $v1, $t7 +/* B3CFA8 800C5E08 3C0C8017 */ lui $t4, %hi(D_8016A528) # $t4, 0x8017 +/* B3CFAC 800C5E0C 03085023 */ subu $t2, $t8, $t0 +/* B3CFB0 800C5E10 0329082B */ sltu $at, $t9, $t1 +/* B3CFB4 800C5E14 01415023 */ subu $t2, $t2, $at +/* B3CFB8 800C5E18 258CA528 */ addiu $t4, %lo(D_8016A528) # addiu $t4, $t4, -0x5ad8 +/* B3CFBC 800C5E1C AD8A0000 */ sw $t2, ($t4) +/* B3CFC0 800C5E20 03295823 */ subu $t3, $t9, $t1 +/* B3CFC4 800C5E24 AD8B0004 */ sw $t3, 4($t4) +/* B3CFC8 800C5E28 240F0000 */ li $t7, 0 +/* B3CFCC 800C5E2C 240E0000 */ li $t6, 0 +/* B3CFD0 800C5E30 3C070861 */ lui $a3, (0x0861C468 >> 16) # lui $a3, 0x861 +/* B3CFD4 800C5E34 2625005C */ addiu $a1, $s1, 0x5c +/* B3CFD8 800C5E38 240D029A */ li $t5, 666 +/* B3CFDC 800C5E3C AFAD001C */ sw $t5, 0x1c($sp) +/* B3CFE0 800C5E40 AFA50018 */ sw $a1, 0x18($sp) +/* B3CFE4 800C5E44 AFA50038 */ sw $a1, 0x38($sp) +/* B3CFE8 800C5E48 34E7C468 */ ori $a3, (0x0861C468 & 0xFFFF) # ori $a3, $a3, 0xc468 +/* B3CFEC 800C5E4C AFAE0010 */ sw $t6, 0x10($sp) +/* B3CFF0 800C5E50 AFAF0014 */ sw $t7, 0x14($sp) +/* B3CFF4 800C5E54 27A40070 */ addiu $a0, $sp, 0x70 +/* B3CFF8 800C5E58 0C0418B8 */ jal osSetTimer +/* B3CFFC 800C5E5C 24060000 */ li $a2, 0 +/* B3D000 800C5E60 8FA40038 */ lw $a0, 0x38($sp) +/* B3D004 800C5E64 27A5006C */ addiu $a1, $sp, 0x6c +/* B3D008 800C5E68 0C000CA0 */ jal osRecvMesg +/* B3D00C 800C5E6C 24060001 */ li $a2, 1 +/* B3D010 800C5E70 0C0408CC */ jal osStopTimer +/* B3D014 800C5E74 27A40070 */ addiu $a0, $sp, 0x70 +/* B3D018 800C5E78 8FB8006C */ lw $t8, 0x6c($sp) +/* B3D01C 800C5E7C 2401029A */ li $at, 666 +/* B3D020 800C5E80 1701002C */ bne $t8, $at, .L800C5F34 +/* B3D024 800C5E84 3C048014 */ lui $a0, %hi(D_80145240) # $a0, 0x8014 +/* B3D028 800C5E88 0C00084C */ jal osSyncPrintf +/* B3D02C 800C5E8C 24845240 */ addiu $a0, %lo(D_80145240) # addiu $a0, $a0, 0x5240 +/* B3D030 800C5E90 3C048014 */ lui $a0, %hi(D_80145248) # $a0, 0x8014 +/* B3D034 800C5E94 0C00084C */ jal osSyncPrintf +/* B3D038 800C5E98 24845248 */ addiu $a0, %lo(D_80145248) # addiu $a0, $a0, 0x5248 +/* B3D03C 800C5E9C 3C048014 */ lui $a0, %hi(D_80145264) # $a0, 0x8014 +/* B3D040 800C5EA0 0C00084C */ jal osSyncPrintf +/* B3D044 800C5EA4 24845264 */ addiu $a0, %lo(D_80145264) # addiu $a0, $a0, 0x5264 +/* B3D048 800C5EA8 3C04A404 */ lui $a0, 0xa404 +/* B3D04C 800C5EAC 0C000AC4 */ jal LogUtils_LogHexDump +/* B3D050 800C5EB0 24050020 */ li $a1, 32 +/* B3D054 800C5EB4 3C04A410 */ lui $a0, 0xa410 +/* B3D058 800C5EB8 0C000AC4 */ jal LogUtils_LogHexDump +/* B3D05C 800C5EBC 24050020 */ li $a1, 32 +/* B3D060 800C5EC0 3C04801B */ lui $a0, %hi(gGfxSPTaskYieldBuffer) # $a0, 0x801b +/* B3D064 800C5EC4 248431C0 */ addiu $a0, %lo(gGfxSPTaskYieldBuffer) # addiu $a0, $a0, 0x31c0 +/* B3D068 800C5EC8 0C000AC4 */ jal LogUtils_LogHexDump +/* B3D06C 800C5ECC 24050C00 */ li $a1, 3072 +/* B3D070 800C5ED0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 +/* B3D074 800C5ED4 3C048013 */ lui $a0, %hi(D_8012D260) # $a0, 0x8013 +/* B3D078 800C5ED8 8C84D260 */ lw $a0, %lo(D_8012D260)($a0) +/* B3D07C 800C5EDC 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 +/* B3D080 800C5EE0 8C480000 */ lw $t0, ($v0) +/* B3D084 800C5EE4 2419FFFF */ li $t9, -1 +/* B3D088 800C5EE8 1080000D */ beqz $a0, .L800C5F20 +/* B3D08C 800C5EEC A51900E0 */ sh $t9, 0xe0($t0) +/* B3D090 800C5EF0 8C4A0000 */ lw $t2, ($v0) +/* B3D094 800C5EF4 24090007 */ li $t1, 7 +/* B3D098 800C5EF8 240B0001 */ li $t3, 1 +/* B3D09C 800C5EFC A5491074 */ sh $t1, 0x1074($t2) +/* B3D0A0 800C5F00 8C4C0000 */ lw $t4, ($v0) +/* B3D0A4 800C5F04 240E0002 */ li $t6, 2 +/* B3D0A8 800C5F08 3C018013 */ lui $at, %hi(D_8012D260) # $at, 0x8013 +/* B3D0AC 800C5F0C A58B1076 */ sh $t3, 0x1076($t4) +/* B3D0B0 800C5F10 8C4F0000 */ lw $t7, ($v0) +/* B3D0B4 800C5F14 A5EE107A */ sh $t6, 0x107a($t7) +/* B3D0B8 800C5F18 0C03162F */ jal Graph_DisassembleUCode +/* B3D0BC 800C5F1C AC24D260 */ sw $a0, %lo(D_8012D260)($at) +.L800C5F20: +/* B3D0C0 800C5F20 3C048014 */ lui $a0, %hi(D_80145268) # $a0, 0x8014 +/* B3D0C4 800C5F24 3C058014 */ lui $a1, %hi(D_8014527C) # $a1, 0x8014 +/* B3D0C8 800C5F28 24A5527C */ addiu $a1, %lo(D_8014527C) # addiu $a1, $a1, 0x527c +/* B3D0CC 800C5F2C 0C0359AD */ jal Fault_AddHungupAndCrashImpl +/* B3D0D0 800C5F30 24845268 */ addiu $a0, %lo(D_80145268) # addiu $a0, $a0, 0x5268 +.L800C5F34: +/* B3D0D4 800C5F34 8FA40038 */ lw $a0, 0x38($sp) +/* B3D0D8 800C5F38 27A5006C */ addiu $a1, $sp, 0x6c +/* B3D0DC 800C5F3C 0C000CA0 */ jal osRecvMesg +/* B3D0E0 800C5F40 00003025 */ move $a2, $zero +/* B3D0E4 800C5F44 8E2602EC */ lw $a2, 0x2ec($s1) +/* B3D0E8 800C5F48 8E2401B0 */ lw $a0, 0x1b0($s1) +/* B3D0EC 800C5F4C 3C018013 */ lui $at, %hi(D_8012D260) # $at, 0x8013 +/* B3D0F0 800C5F50 10C00004 */ beqz $a2, .L800C5F64 +/* B3D0F4 800C5F54 AC24D260 */ sw $a0, %lo(D_8012D260)($at) +/* B3D0F8 800C5F58 02202025 */ move $a0, $s1 +/* B3D0FC 800C5F5C 00C0F809 */ jalr $a2 +/* B3D100 800C5F60 8E2502F0 */ lw $a1, 0x2f0($s1) +.L800C5F64: +/* B3D104 800C5F64 0C001A78 */ jal osGetTime +/* B3D108 800C5F68 00000000 */ nop +/* B3D10C 800C5F6C 3C048017 */ lui $a0, %hi(D_8016A550) # $a0, 0x8017 +/* B3D110 800C5F70 2484A550 */ addiu $a0, %lo(D_8016A550) # addiu $a0, $a0, -0x5ab0 +/* B3D114 800C5F74 8C980000 */ lw $t8, ($a0) +/* B3D118 800C5F78 8C990004 */ lw $t9, 4($a0) +/* B3D11C 800C5F7C 57000004 */ bnezl $t8, .L800C5F90 +/* B3D120 800C5F80 8E080000 */ lw $t0, ($s0) +/* B3D124 800C5F84 53200012 */ beql $t9, $zero, .L800C5FD0 +/* B3D128 800C5F88 8E180000 */ lw $t8, ($s0) +/* B3D12C 800C5F8C 8E080000 */ lw $t0, ($s0) +.L800C5F90: +/* B3D130 800C5F90 8E090004 */ lw $t1, 4($s0) +/* B3D134 800C5F94 8C8C0000 */ lw $t4, ($a0) +/* B3D138 800C5F98 8C8D0004 */ lw $t5, 4($a0) +/* B3D13C 800C5F9C 01235821 */ addu $t3, $t1, $v1 +/* B3D140 800C5FA0 0163082B */ sltu $at, $t3, $v1 +/* B3D144 800C5FA4 00285021 */ addu $t2, $at, $t0 +/* B3D148 800C5FA8 01425021 */ addu $t2, $t2, $v0 +/* B3D14C 800C5FAC 014C7023 */ subu $t6, $t2, $t4 +/* B3D150 800C5FB0 016D082B */ sltu $at, $t3, $t5 +/* B3D154 800C5FB4 01C17023 */ subu $t6, $t6, $at +/* B3D158 800C5FB8 AE0E0000 */ sw $t6, ($s0) +/* B3D15C 800C5FBC 016D7823 */ subu $t7, $t3, $t5 +/* B3D160 800C5FC0 AE0F0004 */ sw $t7, 4($s0) +/* B3D164 800C5FC4 AC820000 */ sw $v0, ($a0) +/* B3D168 800C5FC8 AC830004 */ sw $v1, 4($a0) +/* B3D16C 800C5FCC 8E180000 */ lw $t8, ($s0) +.L800C5FD0: +/* B3D170 800C5FD0 8E190004 */ lw $t9, 4($s0) +/* B3D174 800C5FD4 3C088017 */ lui $t0, %hi(D_8016A520) # $t0, 0x8017 +/* B3D178 800C5FD8 2508A520 */ addiu $t0, %lo(D_8016A520) # addiu $t0, $t0, -0x5ae0 +/* B3D17C 800C5FDC AD180000 */ sw $t8, ($t0) +/* B3D180 800C5FE0 240A0000 */ li $t2, 0 +/* B3D184 800C5FE4 AD190004 */ sw $t9, 4($t0) +/* B3D188 800C5FE8 AE0A0000 */ sw $t2, ($s0) +/* B3D18C 800C5FEC 240B0000 */ li $t3, 0 +/* B3D190 800C5FF0 0C001A78 */ jal osGetTime +/* B3D194 800C5FF4 AE0B0004 */ sw $t3, 4($s0) +/* B3D198 800C5FF8 3C018016 */ lui $at, %hi(sGraphSetTaskTime+4) # $at, 0x8016 +/* B3D19C 800C5FFC AC2265D8 */ sw $v0, %lo(sGraphSetTaskTime)($at) +/* B3D1A0 800C6000 AC2365DC */ sw $v1, %lo(sGraphSetTaskTime+4)($at) +/* B3D1A4 800C6004 26300088 */ addiu $s0, $s1, 0x88 +/* B3D1A8 800C6008 24090001 */ li $t1, 1 +/* B3D1AC 800C600C 240C0004 */ li $t4, 4 +/* B3D1B0 800C6010 AE090000 */ sw $t1, ($s0) +/* B3D1B4 800C6014 0C034B7C */ jal SysUcode_GetUCodeBoot +/* B3D1B8 800C6018 AE0C0004 */ sw $t4, 4($s0) +/* B3D1BC 800C601C 0C034B7F */ jal SysUcode_GetUcodeBootSize +/* B3D1C0 800C6020 AE020008 */ sw $v0, 8($s0) +/* B3D1C4 800C6024 0C034B85 */ jal SysUcode_GetUcode +/* B3D1C8 800C6028 AE02000C */ sw $v0, 0xc($s0) +/* B3D1CC 800C602C 0C034B88 */ jal SysUcode_GetUcodeData +/* B3D1D0 800C6030 AE020010 */ sw $v0, 0x10($s0) +/* B3D1D4 800C6034 3C0F801B */ lui $t7, %hi(gGfxSPTaskStack) # $t7, 0x801b +/* B3D1D8 800C6038 3C19801A */ lui $t9, %hi(gGfxSPTaskOutputBuffer) # $t9, 0x801a +/* B3D1DC 800C603C 3C08801B */ lui $t0, %hi(gGfxSPTaskYieldBuffer) # $t0, 0x801b +/* B3D1E0 800C6040 240D1000 */ li $t5, 4096 +/* B3D1E4 800C6044 240E0800 */ li $t6, 2048 +/* B3D1E8 800C6048 25EF3DC0 */ addiu $t7, %lo(gGfxSPTaskStack) # addiu $t7, $t7, 0x3dc0 +/* B3D1EC 800C604C 24180400 */ li $t8, 1024 +/* B3D1F0 800C6050 2739B1C0 */ addiu $t9, %lo(gGfxSPTaskOutputBuffer) # addiu $t9, $t9, -0x4e40 +/* B3D1F4 800C6054 250831C0 */ addiu $t0, %lo(gGfxSPTaskYieldBuffer) # addiu $t0, $t0, 0x31c0 +/* B3D1F8 800C6058 AE020018 */ sw $v0, 0x18($s0) +/* B3D1FC 800C605C AE0D0014 */ sw $t5, 0x14($s0) +/* B3D200 800C6060 AE0E001C */ sw $t6, 0x1c($s0) +/* B3D204 800C6064 AE0F0020 */ sw $t7, 0x20($s0) +/* B3D208 800C6068 AE180024 */ sw $t8, 0x24($s0) +/* B3D20C 800C606C AE190028 */ sw $t9, 0x28($s0) +/* B3D210 800C6070 AE08002C */ sw $t0, 0x2c($s0) +/* B3D214 800C6074 8E2A01B0 */ lw $t2, 0x1b0($s1) +/* B3D218 800C6078 3C068014 */ lui $a2, %hi(D_8014528C) # $a2, 0x8014 +/* B3D21C 800C607C 24C6528C */ addiu $a2, %lo(D_8014528C) # addiu $a2, $a2, 0x528c +/* B3D220 800C6080 27A40048 */ addiu $a0, $sp, 0x48 +/* B3D224 800C6084 02202825 */ move $a1, $s1 +/* B3D228 800C6088 2407033C */ li $a3, 828 +/* B3D22C 800C608C 0C031AB1 */ jal Graph_OpenDisp +/* B3D230 800C6090 AE0A0030 */ sw $t2, 0x30($s0) +/* B3D234 800C6094 8E2B01BC */ lw $t3, 0x1bc($s1) +/* B3D238 800C6098 8E2901B0 */ lw $t1, 0x1b0($s1) +/* B3D23C 800C609C 3C068014 */ lui $a2, %hi(D_80145298) # $a2, 0x8014 +/* B3D240 800C60A0 24C65298 */ addiu $a2, %lo(D_80145298) # addiu $a2, $a2, 0x5298 +/* B3D244 800C60A4 01696023 */ subu $t4, $t3, $t1 +/* B3D248 800C60A8 AE0C0034 */ sw $t4, 0x34($s0) +/* B3D24C 800C60AC 27A40048 */ addiu $a0, $sp, 0x48 +/* B3D250 800C60B0 02202825 */ move $a1, $s1 +/* B3D254 800C60B4 0C031AD5 */ jal Graph_CloseDisp +/* B3D258 800C60B8 2407033E */ li $a3, 830 +/* B3D25C 800C60BC 3C0D801B */ lui $t5, %hi(gGfxSPTaskYieldBuffer) # $t5, 0x801b +/* B3D260 800C60C0 25AD31C0 */ addiu $t5, %lo(gGfxSPTaskYieldBuffer) # addiu $t5, $t5, 0x31c0 +/* B3D264 800C60C4 240E0C00 */ li $t6, 3072 +/* B3D268 800C60C8 AE0D0038 */ sw $t5, 0x38($s0) +/* B3D26C 800C60CC AE0E003C */ sw $t6, 0x3c($s0) +/* B3D270 800C60D0 26250078 */ addiu $a1, $s1, 0x78 +/* B3D274 800C60D4 240F0063 */ li $t7, 99 +/* B3D278 800C60D8 ACA00000 */ sw $zero, ($a1) +/* B3D27C 800C60DC ACAF0008 */ sw $t7, 8($a1) +/* B3D280 800C60E0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 +/* B3D284 800C60E4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) +/* B3D288 800C60E8 3C0E8016 */ lui $t6, %hi(sGraphCfbInfos) # $t6, 0x8016 +/* B3D28C 800C60EC 25CE65F0 */ addiu $t6, %lo(sGraphCfbInfos) # addiu $t6, $t6, 0x65f0 +/* B3D290 800C60F0 84430116 */ lh $v1, 0x116($v0) +/* B3D294 800C60F4 30780001 */ andi $t8, $v1, 1 +/* B3D298 800C60F8 13000009 */ beqz $t8, .L800C6120 +/* B3D29C 800C60FC 3079FFFE */ andi $t9, $v1, 0xfffe +/* B3D2A0 800C6100 A4590116 */ sh $t9, 0x116($v0) +/* B3D2A4 800C6104 8CA80008 */ lw $t0, 8($a1) +/* B3D2A8 800C6108 2401FFBF */ li $at, -65 +/* B3D2AC 800C610C 01015024 */ and $t2, $t0, $at +/* B3D2B0 800C6110 ACAA0008 */ sw $t2, 8($a1) +/* B3D2B4 800C6114 8E2B02E8 */ lw $t3, 0x2e8($s1) +/* B3D2B8 800C6118 2569FFFF */ addiu $t1, $t3, -1 +/* B3D2BC 800C611C AE2902E8 */ sw $t1, 0x2e8($s1) +.L800C6120: +/* B3D2C0 800C6120 3C038013 */ lui $v1, %hi(sGraphCfbInfoIdx) # $v1, 0x8013 +/* B3D2C4 800C6124 8C63D264 */ lw $v1, %lo(sGraphCfbInfoIdx)($v1) +/* B3D2C8 800C6128 24010003 */ li $at, 3 +/* B3D2CC 800C612C 8FAC0038 */ lw $t4, 0x38($sp) +/* B3D2D0 800C6130 000368C0 */ sll $t5, $v1, 3 +/* B3D2D4 800C6134 01A36823 */ subu $t5, $t5, $v1 +/* B3D2D8 800C6138 24630001 */ addiu $v1, $v1, 1 +/* B3D2DC 800C613C 0061001A */ div $zero, $v1, $at +/* B3D2E0 800C6140 ACA00054 */ sw $zero, 0x54($a1) +/* B3D2E4 800C6144 ACAC0050 */ sw $t4, 0x50($a1) +/* B3D2E8 800C6148 8E2F02DC */ lw $t7, 0x2dc($s1) +/* B3D2EC 800C614C 000D6880 */ sll $t5, $t5, 2 +/* B3D2F0 800C6150 01AE1021 */ addu $v0, $t5, $t6 +/* B3D2F4 800C6154 AC4F0000 */ sw $t7, ($v0) +/* B3D2F8 800C6158 8E3802DC */ lw $t8, 0x2dc($s1) +/* B3D2FC 800C615C 3C0A8016 */ lui $t2, %hi(gGameInfo) # $t2, 0x8016 +/* B3D300 800C6160 00001810 */ mfhi $v1 +/* B3D304 800C6164 AC580004 */ sw $t8, 4($v0) +/* B3D308 800C6168 8E390284 */ lw $t9, 0x284($s1) +/* B3D30C 800C616C 3C018013 */ lui $at, %hi(sGraphCfbInfoIdx) # $at, 0x8013 +/* B3D310 800C6170 3C048016 */ lui $a0, %hi(gSchedContext+0x38) # $a0, 0x8016 +/* B3D314 800C6174 AC590008 */ sw $t9, 8($v0) +/* B3D318 800C6178 8E2802E4 */ lw $t0, 0x2e4($s1) +/* B3D31C 800C617C 248466A0 */ addiu $a0, %lo(gSchedContext+0x38) # addiu $a0, $a0, 0x66a0 +/* B3D320 800C6180 24060001 */ li $a2, 1 +/* B3D324 800C6184 AC48000C */ sw $t0, 0xc($v0) +/* B3D328 800C6188 C62402F4 */ lwc1 $f4, 0x2f4($s1) +/* B3D32C 800C618C E4440014 */ swc1 $f4, 0x14($v0) +/* B3D330 800C6190 C62602F8 */ lwc1 $f6, 0x2f8($s1) +/* B3D334 800C6194 A0400010 */ sb $zero, 0x10($v0) +/* B3D338 800C6198 E4460018 */ swc1 $f6, 0x18($v0) +/* B3D33C 800C619C 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) +/* B3D340 800C61A0 854B0110 */ lh $t3, 0x110($t2) +/* B3D344 800C61A4 A04B0011 */ sb $t3, 0x11($v0) +/* B3D348 800C61A8 ACA2000C */ sw $v0, 0xc($a1) +/* B3D34C 800C61AC AC23D264 */ sw $v1, %lo(sGraphCfbInfoIdx)($at) +/* B3D350 800C61B0 0C000C18 */ jal osSendMesg +/* B3D354 800C61B4 AE240058 */ sw $a0, 0x58($s1) +/* B3D358 800C61B8 3C048016 */ lui $a0, %hi(gSchedContext) # $a0, 0x8016 +/* B3D35C 800C61BC 0C03257E */ jal func_800C95F8 +/* B3D360 800C61C0 24846668 */ addiu $a0, %lo(gSchedContext) # addiu $a0, $a0, 0x6668 +/* B3D364 800C61C4 8FBF002C */ lw $ra, 0x2c($sp) +/* B3D368 800C61C8 8FB00024 */ lw $s0, 0x24($sp) +/* B3D36C 800C61CC 8FB10028 */ lw $s1, 0x28($sp) +/* B3D370 800C61D0 03E00008 */ jr $ra +/* B3D374 800C61D4 27BD0098 */ addiu $sp, $sp, 0x98 \ No newline at end of file diff --git a/asm/non_matchings/code/graph/Graph_Update.s b/asm/non_matchings/code/graph/Graph_Update.s new file mode 100644 index 0000000000..b2800e4c62 --- /dev/null +++ b/asm/non_matchings/code/graph/Graph_Update.s @@ -0,0 +1,557 @@ +.rdata +glabel D_801452A4 + .asciz "../graph.c" + .balign 4 + +glabel D_801452B0 + .asciz "WORK_DISP 開始" + # EUC-JP: 開始 | Start + .balign 4 + +glabel D_801452C0 + .asciz "POLY_OPA_DISP 開始" + # EUC-JP: 開始 | Start + .balign 4 + +glabel D_801452D4 + .asciz "POLY_XLU_DISP 開始" + # EUC-JP: 開始 | Start + .balign 4 + +glabel D_801452E8 + .asciz "OVERLAY_DISP 開始" + # EUC-JP: 開始 | Start + .balign 4 + +glabel D_801452FC + .asciz "../graph.c" + .balign 4 + +glabel D_80145308 + .asciz "../graph.c" + .balign 4 + +glabel D_80145314 + .asciz "WORK_DISP 終了" + # EUC-JP: 終了 | End + .balign 4 + +glabel D_80145324 + .asciz "POLY_OPA_DISP 終了" + # EUC-JP: 終了 | End + .balign 4 + +glabel D_80145338 + .asciz "POLY_XLU_DISP 終了" + # EUC-JP: 終了 | End + .balign 4 + +glabel D_8014534C + .asciz "OVERLAY_DISP 終了" + # EUC-JP: 終了 | End + .balign 4 + +glabel D_80145360 + .asciz "../graph.c" + .balign 4 + +glabel D_8014536C + .asciz "../graph.c" + .balign 4 + +glabel D_80145378 + .asciz "../graph.c" + .balign 4 + +glabel D_80145384 + .asciz "do_count_fault" + .balign 4 + +glabel D_80145394 + .asciz "%c" + .balign 4 + +glabel D_80145398 + .asciz "\x1b[41;37mダイナミック領域先頭が破壊されています\n\x1b[m" + #ダイナミック領域先頭が破壊されています | Dynamic area head is destroyed + .balign 4 + +glabel D_801453CC + .asciz "../graph.c" + .balign 4 + +glabel D_801453D8 + .asciz "%c" + .balign 4 + +glabel D_801453DC + .asciz "\x1b[41;37mダイナミック領域末尾が破壊されています\n\x1b[m" + # EUC-JP: ダイナミック領域末尾が破壊されています | Dynamic region tail is destroyed + .balign 4 + +glabel D_80145410 + .asciz "../graph.c" + .balign 4 + +glabel D_8014541C + .asciz "%c" + .balign 4 + +glabel D_80145420 + .asciz "\x1b[41;37mゼルダ0は死んでしまった(graph_alloc is empty)\n\x1b[m" + # EUC-JP: ゼルダ0は死んでしまった | 'Zelda 0 is dead'? + .balign 4 + +glabel D_8014545C + .asciz "%c" + .balign 4 + +glabel D_80145460 + .asciz "\x1b[41;37mゼルダ1は死んでしまった(graph_alloc is empty)\n\x1b[m" + # EUC-JP: ゼルダ1は死んでしまった | 'Zelda 1 is dead'? + .balign 4 + +glabel D_8014549C + .asciz "%c" + .balign 4 + +glabel D_801454A0 + .asciz "\x1b[41;37mゼルダ4は死んでしまった(graph_alloc is empty)\n\x1b[m" + # EUC-JP: ゼルダ4は死んでしまった | 'Zelda 4 is dead'? + .balign 4 + +glabel D_801454DC + .asciz "\x1b[43;30mPRE-NMIによりリセットモードに移行します\n\x1b[m" + # EUC-JP: によりリセットモードに移行します | To reset mode + .balign 4 + +.text + +glabel Graph_Update +/* B3D378 800C61D8 27BDFF38 */ addiu $sp, $sp, -0xc8 +/* B3D37C 800C61DC AFBF001C */ sw $ra, 0x1c($sp) +/* B3D380 800C61E0 AFB00018 */ sw $s0, 0x18($sp) +/* B3D384 800C61E4 AFA500CC */ sw $a1, 0xcc($sp) +/* B3D388 800C61E8 00808025 */ move $s0, $a0 +/* B3D38C 800C61EC 0C0316C5 */ jal Graph_InitTHGA +/* B3D390 800C61F0 ACA000A0 */ sw $zero, 0xa0($a1) +/* B3D394 800C61F4 3C068014 */ lui $a2, %hi(D_801452A4) # $a2, 0x8014 +/* B3D398 800C61F8 24C652A4 */ addiu $a2, %lo(D_801452A4) # addiu $a2, $a2, 0x52a4 +/* B3D39C 800C61FC 27A400B0 */ addiu $a0, $sp, 0xb0 +/* B3D3A0 800C6200 02002825 */ move $a1, $s0 +/* B3D3A4 800C6204 0C031AB1 */ jal Graph_OpenDisp +/* B3D3A8 800C6208 240703C6 */ li $a3, 966 +/* B3D3AC 800C620C 8E0201BC */ lw $v0, 0x1bc($s0) +/* B3D3B0 800C6210 3C188014 */ lui $t8, %hi(D_801452B0) # $t8, 0x8014 +/* B3D3B4 800C6214 271852B0 */ addiu $t8, %lo(D_801452B0) # addiu $t8, $t8, 0x52b0 +/* B3D3B8 800C6218 244F0008 */ addiu $t7, $v0, 8 +/* B3D3BC 800C621C AE0F01BC */ sw $t7, 0x1bc($s0) +/* B3D3C0 800C6220 3C080002 */ lui $t0, 2 +/* B3D3C4 800C6224 AC480000 */ sw $t0, ($v0) +/* B3D3C8 800C6228 AC580004 */ sw $t8, 4($v0) +/* B3D3CC 800C622C 8E0202C0 */ lw $v0, 0x2c0($s0) +/* B3D3D0 800C6230 3C098014 */ lui $t1, %hi(D_801452C0) # $t1, 0x8014 +/* B3D3D4 800C6234 252952C0 */ addiu $t1, %lo(D_801452C0) # addiu $t1, $t1, 0x52c0 +/* B3D3D8 800C6238 24590008 */ addiu $t9, $v0, 8 +/* B3D3DC 800C623C AE1902C0 */ sw $t9, 0x2c0($s0) +/* B3D3E0 800C6240 AC490004 */ sw $t1, 4($v0) +/* B3D3E4 800C6244 AC480000 */ sw $t0, ($v0) +/* B3D3E8 800C6248 8E0202D0 */ lw $v0, 0x2d0($s0) +/* B3D3EC 800C624C 3C0B8014 */ lui $t3, %hi(D_801452D4) # $t3, 0x8014 +/* B3D3F0 800C6250 256B52D4 */ addiu $t3, %lo(D_801452D4) # addiu $t3, $t3, 0x52d4 +/* B3D3F4 800C6254 244A0008 */ addiu $t2, $v0, 8 +/* B3D3F8 800C6258 AE0A02D0 */ sw $t2, 0x2d0($s0) +/* B3D3FC 800C625C AC4B0004 */ sw $t3, 4($v0) +/* B3D400 800C6260 AC480000 */ sw $t0, ($v0) +/* B3D404 800C6264 8E0202B0 */ lw $v0, 0x2b0($s0) +/* B3D408 800C6268 3C0D8014 */ lui $t5, %hi(D_801452E8) # $t5, 0x8014 +/* B3D40C 800C626C 25AD52E8 */ addiu $t5, %lo(D_801452E8) # addiu $t5, $t5, 0x52e8 +/* B3D410 800C6270 244C0008 */ addiu $t4, $v0, 8 +/* B3D414 800C6274 AE0C02B0 */ sw $t4, 0x2b0($s0) +/* B3D418 800C6278 3C068014 */ lui $a2, %hi(D_801452FC) # $a2, 0x8014 +/* B3D41C 800C627C 24C652FC */ addiu $a2, %lo(D_801452FC) # addiu $a2, $a2, 0x52fc +/* B3D420 800C6280 27A400B0 */ addiu $a0, $sp, 0xb0 +/* B3D424 800C6284 02002825 */ move $a1, $s0 +/* B3D428 800C6288 240703CF */ li $a3, 975 +/* B3D42C 800C628C AC4D0004 */ sw $t5, 4($v0) +/* B3D430 800C6290 0C031AD5 */ jal Graph_CloseDisp +/* B3D434 800C6294 AC480000 */ sw $t0, ($v0) +/* B3D438 800C6298 0C0312A6 */ jal func_800C4A98 +/* B3D43C 800C629C 8FA400CC */ lw $a0, 0xcc($sp) +/* B3D440 800C62A0 0C0312B2 */ jal func_800C4AC8 +/* B3D444 800C62A4 8FA400CC */ lw $a0, 0xcc($sp) +/* B3D448 800C62A8 3C068014 */ lui $a2, %hi(D_80145308) # $a2, 0x8014 +/* B3D44C 800C62AC 24C65308 */ addiu $a2, %lo(D_80145308) # addiu $a2, $a2, 0x5308 +/* B3D450 800C62B0 27A4008C */ addiu $a0, $sp, 0x8c +/* B3D454 800C62B4 02002825 */ move $a1, $s0 +/* B3D458 800C62B8 0C031AB1 */ jal Graph_OpenDisp +/* B3D45C 800C62BC 240703DB */ li $a3, 987 +/* B3D460 800C62C0 8E0201BC */ lw $v0, 0x1bc($s0) +/* B3D464 800C62C4 3C0F8014 */ lui $t7, %hi(D_80145314) # $t7, 0x8014 +/* B3D468 800C62C8 3C080002 */ lui $t0, 2 +/* B3D46C 800C62CC 244E0008 */ addiu $t6, $v0, 8 +/* B3D470 800C62D0 AE0E01BC */ sw $t6, 0x1bc($s0) +/* B3D474 800C62D4 25EF5314 */ addiu $t7, %lo(D_80145314) # addiu $t7, $t7, 0x5314 +/* B3D478 800C62D8 AC4F0004 */ sw $t7, 4($v0) +/* B3D47C 800C62DC AC480000 */ sw $t0, ($v0) +/* B3D480 800C62E0 8E0202C0 */ lw $v0, 0x2c0($s0) +/* B3D484 800C62E4 3C198014 */ lui $t9, %hi(D_80145324) # $t9, 0x8014 +/* B3D488 800C62E8 27395324 */ addiu $t9, %lo(D_80145324) # addiu $t9, $t9, 0x5324 +/* B3D48C 800C62EC 24580008 */ addiu $t8, $v0, 8 +/* B3D490 800C62F0 AE1802C0 */ sw $t8, 0x2c0($s0) +/* B3D494 800C62F4 AC590004 */ sw $t9, 4($v0) +/* B3D498 800C62F8 AC480000 */ sw $t0, ($v0) +/* B3D49C 800C62FC 8E0202D0 */ lw $v0, 0x2d0($s0) +/* B3D4A0 800C6300 3C0A8014 */ lui $t2, %hi(D_80145338) # $t2, 0x8014 +/* B3D4A4 800C6304 254A5338 */ addiu $t2, %lo(D_80145338) # addiu $t2, $t2, 0x5338 +/* B3D4A8 800C6308 24490008 */ addiu $t1, $v0, 8 +/* B3D4AC 800C630C AE0902D0 */ sw $t1, 0x2d0($s0) +/* B3D4B0 800C6310 AC4A0004 */ sw $t2, 4($v0) +/* B3D4B4 800C6314 AC480000 */ sw $t0, ($v0) +/* B3D4B8 800C6318 8E0202B0 */ lw $v0, 0x2b0($s0) +/* B3D4BC 800C631C 3C0C8014 */ lui $t4, %hi(D_8014534C) # $t4, 0x8014 +/* B3D4C0 800C6320 258C534C */ addiu $t4, %lo(D_8014534C) # addiu $t4, $t4, 0x534c +/* B3D4C4 800C6324 244B0008 */ addiu $t3, $v0, 8 +/* B3D4C8 800C6328 AE0B02B0 */ sw $t3, 0x2b0($s0) +/* B3D4CC 800C632C 3C068014 */ lui $a2, %hi(D_80145360) # $a2, 0x8014 +/* B3D4D0 800C6330 24C65360 */ addiu $a2, %lo(D_80145360) # addiu $a2, $a2, 0x5360 +/* B3D4D4 800C6334 27A4008C */ addiu $a0, $sp, 0x8c +/* B3D4D8 800C6338 02002825 */ move $a1, $s0 +/* B3D4DC 800C633C 240703E4 */ li $a3, 996 +/* B3D4E0 800C6340 AC4C0004 */ sw $t4, 4($v0) +/* B3D4E4 800C6344 0C031AD5 */ jal Graph_CloseDisp +/* B3D4E8 800C6348 AC480000 */ sw $t0, ($v0) +/* B3D4EC 800C634C 3C068014 */ lui $a2, %hi(D_8014536C) # $a2, 0x8014 +/* B3D4F0 800C6350 24C6536C */ addiu $a2, %lo(D_8014536C) # addiu $a2, $a2, 0x536c +/* B3D4F4 800C6354 27A40068 */ addiu $a0, $sp, 0x68 +/* B3D4F8 800C6358 02002825 */ move $a1, $s0 +/* B3D4FC 800C635C 0C031AB1 */ jal Graph_OpenDisp +/* B3D500 800C6360 240703E7 */ li $a3, 999 +/* B3D504 800C6364 8E0201BC */ lw $v0, 0x1bc($s0) +/* B3D508 800C6368 3C04DE01 */ lui $a0, 0xde01 +/* B3D50C 800C636C 3C0BE700 */ lui $t3, 0xe700 +/* B3D510 800C6370 244D0008 */ addiu $t5, $v0, 8 +/* B3D514 800C6374 AE0D01BC */ sw $t5, 0x1bc($s0) +/* B3D518 800C6378 AC440000 */ sw $a0, ($v0) +/* B3D51C 800C637C 8E0E0000 */ lw $t6, ($s0) +/* B3D520 800C6380 3C0DE900 */ lui $t5, 0xe900 +/* B3D524 800C6384 3C068014 */ lui $a2, %hi(D_80145378) # $a2, 0x8014 +/* B3D528 800C6388 AC4E0004 */ sw $t6, 4($v0) +/* B3D52C 800C638C 8E0202C0 */ lw $v0, 0x2c0($s0) +/* B3D530 800C6390 24C65378 */ addiu $a2, %lo(D_80145378) # addiu $a2, $a2, 0x5378 +/* B3D534 800C6394 02002825 */ move $a1, $s0 +/* B3D538 800C6398 244F0008 */ addiu $t7, $v0, 8 +/* B3D53C 800C639C AE0F02C0 */ sw $t7, 0x2c0($s0) +/* B3D540 800C63A0 AC440000 */ sw $a0, ($v0) +/* B3D544 800C63A4 8E180004 */ lw $t8, 4($s0) +/* B3D548 800C63A8 3C0FDF00 */ lui $t7, 0xdf00 +/* B3D54C 800C63AC 24070404 */ li $a3, 1028 +/* B3D550 800C63B0 AC580004 */ sw $t8, 4($v0) +/* B3D554 800C63B4 8E0202D0 */ lw $v0, 0x2d0($s0) +/* B3D558 800C63B8 24590008 */ addiu $t9, $v0, 8 +/* B3D55C 800C63BC AE1902D0 */ sw $t9, 0x2d0($s0) +/* B3D560 800C63C0 AC440000 */ sw $a0, ($v0) +/* B3D564 800C63C4 8E090010 */ lw $t1, 0x10($s0) +/* B3D568 800C63C8 27A40068 */ addiu $a0, $sp, 0x68 +/* B3D56C 800C63CC AC490004 */ sw $t1, 4($v0) +/* B3D570 800C63D0 8E0202B0 */ lw $v0, 0x2b0($s0) +/* B3D574 800C63D4 244A0008 */ addiu $t2, $v0, 8 +/* B3D578 800C63D8 AE0A02B0 */ sw $t2, 0x2b0($s0) +/* B3D57C 800C63DC AC400004 */ sw $zero, 4($v0) +/* B3D580 800C63E0 AC4B0000 */ sw $t3, ($v0) +/* B3D584 800C63E4 8E0202B0 */ lw $v0, 0x2b0($s0) +/* B3D588 800C63E8 244C0008 */ addiu $t4, $v0, 8 +/* B3D58C 800C63EC AE0C02B0 */ sw $t4, 0x2b0($s0) +/* B3D590 800C63F0 AC400004 */ sw $zero, 4($v0) +/* B3D594 800C63F4 AC4D0000 */ sw $t5, ($v0) +/* B3D598 800C63F8 8E0202B0 */ lw $v0, 0x2b0($s0) +/* B3D59C 800C63FC 244E0008 */ addiu $t6, $v0, 8 +/* B3D5A0 800C6400 AE0E02B0 */ sw $t6, 0x2b0($s0) +/* B3D5A4 800C6404 AC400004 */ sw $zero, 4($v0) +/* B3D5A8 800C6408 0C031AD5 */ jal Graph_CloseDisp +/* B3D5AC 800C640C AC4F0000 */ sw $t7, ($v0) +/* B3D5B0 800C6410 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 +/* B3D5B4 800C6414 2508FA90 */ addiu $t0, %lo(gGameInfo) # addiu $t0, $t0, -0x570 +/* B3D5B8 800C6418 8D020000 */ lw $v0, ($t0) +/* B3D5BC 800C641C 2401000A */ li $at, 10 +/* B3D5C0 800C6420 84431074 */ lh $v1, 0x1074($v0) +/* B3D5C4 800C6424 54610010 */ bnel $v1, $at, .L800C6468 +/* B3D5C8 800C6428 24010007 */ li $at, 7 +/* B3D5CC 800C642C 8458108E */ lh $t8, 0x108e($v0) +/* B3D5D0 800C6430 24010002 */ li $at, 2 +/* B3D5D4 800C6434 24190007 */ li $t9, 7 +/* B3D5D8 800C6438 5701000B */ bnel $t8, $at, .L800C6468 +/* B3D5DC 800C643C 24010007 */ li $at, 7 +/* B3D5E0 800C6440 A4591074 */ sh $t9, 0x1074($v0) +/* B3D5E4 800C6444 8D0A0000 */ lw $t2, ($t0) +/* B3D5E8 800C6448 2409FFFF */ li $t1, -1 +/* B3D5EC 800C644C A5491076 */ sh $t1, 0x1076($t2) +/* B3D5F0 800C6450 8D020000 */ lw $v0, ($t0) +/* B3D5F4 800C6454 844B108C */ lh $t3, 0x108c($v0) +/* B3D5F8 800C6458 A44B107A */ sh $t3, 0x107a($v0) +/* B3D5FC 800C645C 8D020000 */ lw $v0, ($t0) +/* B3D600 800C6460 84431074 */ lh $v1, 0x1074($v0) +/* B3D604 800C6464 24010007 */ li $at, 7 +.L800C6468: +/* B3D608 800C6468 5461002D */ bnel $v1, $at, .L800C6520 +/* B3D60C 800C646C AFA000C4 */ sw $zero, 0xc4($sp) +/* B3D610 800C6470 844C1076 */ lh $t4, 0x1076($v0) +/* B3D614 800C6474 5180002A */ beql $t4, $zero, .L800C6520 +/* B3D618 800C6478 AFA000C4 */ sw $zero, 0xc4($sp) +/* B3D61C 800C647C 844D1078 */ lh $t5, 0x1078($v0) +/* B3D620 800C6480 24010003 */ li $at, 3 +/* B3D624 800C6484 3C048016 */ lui $a0, %hi(sGraphUcodeFaultClient) # $a0, 0x8016 +/* B3D628 800C6488 15A10007 */ bne $t5, $at, .L800C64A8 +/* B3D62C 800C648C 24846648 */ addiu $a0, %lo(sGraphUcodeFaultClient) # addiu $a0, $a0, 0x6648 +/* B3D630 800C6490 3C05800C */ lui $a1, %hi(Graph_UCodeFaultClient) # $a1, 0x800c +/* B3D634 800C6494 3C078014 */ lui $a3, %hi(D_80145384) # $a3, 0x8014 +/* B3D638 800C6498 24E75384 */ addiu $a3, %lo(D_80145384) # addiu $a3, $a3, 0x5384 +/* B3D63C 800C649C 24A55AB0 */ addiu $a1, %lo(Graph_UCodeFaultClient) # addiu $a1, $a1, 0x5ab0 +/* B3D640 800C64A0 0C035077 */ jal Fault_AddClient +/* B3D644 800C64A4 8E0601B0 */ lw $a2, 0x1b0($s0) +.L800C64A8: +/* B3D648 800C64A8 0C03162F */ jal Graph_DisassembleUCode +/* B3D64C 800C64AC 8E0401B0 */ lw $a0, 0x1b0($s0) +/* B3D650 800C64B0 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 +/* B3D654 800C64B4 2508FA90 */ addiu $t0, %lo(gGameInfo) # addiu $t0, $t0, -0x570 +/* B3D658 800C64B8 8D020000 */ lw $v0, ($t0) +/* B3D65C 800C64BC 24010003 */ li $at, 3 +/* B3D660 800C64C0 3C048016 */ lui $a0, %hi(sGraphUcodeFaultClient) # $a0, 0x8016 +/* B3D664 800C64C4 844E1078 */ lh $t6, 0x1078($v0) +/* B3D668 800C64C8 55C10006 */ bnel $t6, $at, .L800C64E4 +/* B3D66C 800C64CC 84431076 */ lh $v1, 0x1076($v0) +/* B3D670 800C64D0 0C0350B0 */ jal Fault_RemoveClient +/* B3D674 800C64D4 24846648 */ addiu $a0, %lo(sGraphUcodeFaultClient) # addiu $a0, $a0, 0x6648 +/* B3D678 800C64D8 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 +/* B3D67C 800C64DC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) +/* B3D680 800C64E0 84431076 */ lh $v1, 0x1076($v0) +.L800C64E4: +/* B3D684 800C64E4 3C04A404 */ lui $a0, 0xa404 +/* B3D688 800C64E8 04610009 */ bgez $v1, .L800C6510 +/* B3D68C 800C64EC 00000000 */ nop +/* B3D690 800C64F0 0C000AC4 */ jal LogUtils_LogHexDump +/* B3D694 800C64F4 24050020 */ li $a1, 32 +/* B3D698 800C64F8 3C04A410 */ lui $a0, 0xa410 +/* B3D69C 800C64FC 0C000AC4 */ jal LogUtils_LogHexDump +/* B3D6A0 800C6500 24050020 */ li $a1, 32 +/* B3D6A4 800C6504 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 +/* B3D6A8 800C6508 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) +/* B3D6AC 800C650C 84431076 */ lh $v1, 0x1076($v0) +.L800C6510: +/* B3D6B0 800C6510 04630003 */ bgezl $v1, .L800C6520 +/* B3D6B4 800C6514 AFA000C4 */ sw $zero, 0xc4($sp) +/* B3D6B8 800C6518 A4401076 */ sh $zero, 0x1076($v0) +/* B3D6BC 800C651C AFA000C4 */ sw $zero, 0xc4($sp) +.L800C6520: +/* B3D6C0 800C6520 8E0F02D8 */ lw $t7, 0x2d8($s0) +/* B3D6C4 800C6524 3C09801B */ lui $t1, %hi(gGfxPools) # $t1, 0x801b +/* B3D6C8 800C6528 252941C0 */ addiu $t1, %lo(gGfxPools) # addiu $t1, $t1, 0x41c0 +/* B3D6CC 800C652C 31F80001 */ andi $t8, $t7, 1 +/* B3D6D0 800C6530 0018C8C0 */ sll $t9, $t8, 3 +/* B3D6D4 800C6534 0338C821 */ addu $t9, $t9, $t8 +/* B3D6D8 800C6538 0019C8C0 */ sll $t9, $t9, 3 +/* B3D6DC 800C653C 0338C821 */ addu $t9, $t9, $t8 +/* B3D6E0 800C6540 0019C980 */ sll $t9, $t9, 6 +/* B3D6E4 800C6544 0338C821 */ addu $t9, $t9, $t8 +/* B3D6E8 800C6548 0019C900 */ sll $t9, $t9, 4 +/* B3D6EC 800C654C 03295021 */ addu $t2, $t9, $t1 +/* B3D6F0 800C6550 AFAA004C */ sw $t2, 0x4c($sp) +/* B3D6F4 800C6554 954B0000 */ lhu $t3, ($t2) +/* B3D6F8 800C6558 24011234 */ li $at, 4660 +/* B3D6FC 800C655C 1161000B */ beq $t3, $at, .L800C658C +/* B3D700 800C6560 3C048014 */ lui $a0, %hi(D_80145394) # $a0, 0x8014 +/* B3D704 800C6564 24845394 */ addiu $a0, %lo(D_80145394) # addiu $a0, $a0, 0x5394 +/* B3D708 800C6568 0C00084C */ jal osSyncPrintf +/* B3D70C 800C656C 24050007 */ li $a1, 7 +/* B3D710 800C6570 3C048014 */ lui $a0, %hi(D_80145398) # $a0, 0x8014 +/* B3D714 800C6574 0C00084C */ jal osSyncPrintf +/* B3D718 800C6578 24845398 */ addiu $a0, %lo(D_80145398) # addiu $a0, $a0, 0x5398 +/* B3D71C 800C657C 3C048014 */ lui $a0, %hi(D_801453CC) # $a0, 0x8014 +/* B3D720 800C6580 248453CC */ addiu $a0, %lo(D_801453CC) # addiu $a0, $a0, 0x53cc +/* B3D724 800C6584 0C0359C3 */ jal Fault_AddHungupAndCrash +/* B3D728 800C6588 2405042E */ li $a1, 1070 +.L800C658C: +/* B3D72C 800C658C 8FAC004C */ lw $t4, 0x4c($sp) +/* B3D730 800C6590 3C0D0001 */ lui $t5, 1 +/* B3D734 800C6594 24015678 */ li $at, 22136 +/* B3D738 800C6598 01AC6821 */ addu $t5, $t5, $t4 +/* B3D73C 800C659C 95AD2408 */ lhu $t5, 0x2408($t5) +/* B3D740 800C65A0 11A1000D */ beq $t5, $at, .L800C65D8 +/* B3D744 800C65A4 240E0001 */ li $t6, 1 +/* B3D748 800C65A8 3C048014 */ lui $a0, %hi(D_801453D8) # $a0, 0x8014 +/* B3D74C 800C65AC AFAE00C4 */ sw $t6, 0xc4($sp) +/* B3D750 800C65B0 248453D8 */ addiu $a0, %lo(D_801453D8) # addiu $a0, $a0, 0x53d8 +/* B3D754 800C65B4 0C00084C */ jal osSyncPrintf +/* B3D758 800C65B8 24050007 */ li $a1, 7 +/* B3D75C 800C65BC 3C048014 */ lui $a0, %hi(D_801453DC) # $a0, 0x8014 +/* B3D760 800C65C0 0C00084C */ jal osSyncPrintf +/* B3D764 800C65C4 248453DC */ addiu $a0, %lo(D_801453DC) # addiu $a0, $a0, 0x53dc +/* B3D768 800C65C8 3C048014 */ lui $a0, %hi(D_80145410) # $a0, 0x8014 +/* B3D76C 800C65CC 24845410 */ addiu $a0, %lo(D_80145410) # addiu $a0, $a0, 0x5410 +/* B3D770 800C65D0 0C0359C3 */ jal Fault_AddHungupAndCrash +/* B3D774 800C65D4 24050434 */ li $a1, 1076 +.L800C65D8: +/* B3D778 800C65D8 0C030E30 */ jal THGA_IsCrash +/* B3D77C 800C65DC 260402B8 */ addiu $a0, $s0, 0x2b8 +/* B3D780 800C65E0 10400009 */ beqz $v0, .L800C6608 +/* B3D784 800C65E4 240F0001 */ li $t7, 1 +/* B3D788 800C65E8 3C048014 */ lui $a0, %hi(D_8014541C) # $a0, 0x8014 +/* B3D78C 800C65EC AFAF00C4 */ sw $t7, 0xc4($sp) +/* B3D790 800C65F0 2484541C */ addiu $a0, %lo(D_8014541C) # addiu $a0, $a0, 0x541c +/* B3D794 800C65F4 0C00084C */ jal osSyncPrintf +/* B3D798 800C65F8 24050007 */ li $a1, 7 +/* B3D79C 800C65FC 3C048014 */ lui $a0, %hi(D_80145420) # $a0, 0x8014 +/* B3D7A0 800C6600 0C00084C */ jal osSyncPrintf +/* B3D7A4 800C6604 24845420 */ addiu $a0, %lo(D_80145420) # addiu $a0, $a0, 0x5420 +.L800C6608: +/* B3D7A8 800C6608 0C030E30 */ jal THGA_IsCrash +/* B3D7AC 800C660C 260402C8 */ addiu $a0, $s0, 0x2c8 +/* B3D7B0 800C6610 10400009 */ beqz $v0, .L800C6638 +/* B3D7B4 800C6614 24180001 */ li $t8, 1 +/* B3D7B8 800C6618 3C048014 */ lui $a0, %hi(D_8014545C) # $a0, 0x8014 +/* B3D7BC 800C661C AFB800C4 */ sw $t8, 0xc4($sp) +/* B3D7C0 800C6620 2484545C */ addiu $a0, %lo(D_8014545C) # addiu $a0, $a0, 0x545c +/* B3D7C4 800C6624 0C00084C */ jal osSyncPrintf +/* B3D7C8 800C6628 24050007 */ li $a1, 7 +/* B3D7CC 800C662C 3C048014 */ lui $a0, %hi(D_80145460) # $a0, 0x8014 +/* B3D7D0 800C6630 0C00084C */ jal osSyncPrintf +/* B3D7D4 800C6634 24845460 */ addiu $a0, %lo(D_80145460) # addiu $a0, $a0, 0x5460 +.L800C6638: +/* B3D7D8 800C6638 0C030E30 */ jal THGA_IsCrash +/* B3D7DC 800C663C 260402A8 */ addiu $a0, $s0, 0x2a8 +/* B3D7E0 800C6640 10400009 */ beqz $v0, .L800C6668 +/* B3D7E4 800C6644 24190001 */ li $t9, 1 +/* B3D7E8 800C6648 3C048014 */ lui $a0, %hi(D_8014549C) # $a0, 0x8014 +/* B3D7EC 800C664C AFB900C4 */ sw $t9, 0xc4($sp) +/* B3D7F0 800C6650 2484549C */ addiu $a0, %lo(D_8014549C) # addiu $a0, $a0, 0x549c +/* B3D7F4 800C6654 0C00084C */ jal osSyncPrintf +/* B3D7F8 800C6658 24050007 */ li $a1, 7 +/* B3D7FC 800C665C 3C048014 */ lui $a0, %hi(D_801454A0) # $a0, 0x8014 +/* B3D800 800C6660 0C00084C */ jal osSyncPrintf +/* B3D804 800C6664 248454A0 */ addiu $a0, %lo(D_801454A0) # addiu $a0, $a0, 0x54a0 +.L800C6668: +/* B3D808 800C6668 8FA900C4 */ lw $t1, 0xc4($sp) +/* B3D80C 800C666C 15200009 */ bnez $t1, .L800C6694 +/* B3D810 800C6670 00000000 */ nop +/* B3D814 800C6674 0C031770 */ jal Graph_TaskSet00 +/* B3D818 800C6678 02002025 */ move $a0, $s0 +/* B3D81C 800C667C 8E0A02D8 */ lw $t2, 0x2d8($s0) +/* B3D820 800C6680 8E0C02E8 */ lw $t4, 0x2e8($s0) +/* B3D824 800C6684 254B0001 */ addiu $t3, $t2, 1 +/* B3D828 800C6688 258D0001 */ addiu $t5, $t4, 1 +/* B3D82C 800C668C AE0B02D8 */ sw $t3, 0x2d8($s0) +/* B3D830 800C6690 AE0D02E8 */ sw $t5, 0x2e8($s0) +.L800C6694: +/* B3D834 800C6694 0C03CC15 */ jal func_800F3054 +/* B3D838 800C6698 00000000 */ nop +/* B3D83C 800C669C 0C001A78 */ jal osGetTime +/* B3D840 800C66A0 00000000 */ nop +/* B3D844 800C66A4 3C048017 */ lui $a0, %hi(D_8016A568) # $a0, 0x8017 +/* B3D848 800C66A8 2484A568 */ addiu $a0, %lo(D_8016A568) # addiu $a0, $a0, -0x5a98 +/* B3D84C 800C66AC 8C8E0000 */ lw $t6, ($a0) +/* B3D850 800C66B0 8C8F0004 */ lw $t7, 4($a0) +/* B3D854 800C66B4 3C188017 */ lui $t8, %hi(D_8016A538) # $t8, 0x8017 +/* B3D858 800C66B8 2718A538 */ addiu $t8, %lo(D_8016A538) # addiu $t8, $t8, -0x5ac8 +/* B3D85C 800C66BC 3C058017 */ lui $a1, %hi(D_8016A560) # $a1, 0x8017 +/* B3D860 800C66C0 AF0E0000 */ sw $t6, ($t8) +/* B3D864 800C66C4 24A5A560 */ addiu $a1, %lo(D_8016A560) # addiu $a1, $a1, -0x5aa0 +/* B3D868 800C66C8 AF0F0004 */ sw $t7, 4($t8) +/* B3D86C 800C66CC 8CAA0000 */ lw $t2, ($a1) +/* B3D870 800C66D0 8CAB0004 */ lw $t3, 4($a1) +/* B3D874 800C66D4 3C198017 */ lui $t9, %hi(D_8016A530) # $t9, 0x8017 +/* B3D878 800C66D8 2739A530 */ addiu $t9, %lo(D_8016A530) # addiu $t9, $t9, -0x5ad0 +/* B3D87C 800C66DC 3C068017 */ lui $a2, %hi(D_8016A580) # $a2, 0x8017 +/* B3D880 800C66E0 AF2A0000 */ sw $t2, ($t9) +/* B3D884 800C66E4 24C6A580 */ addiu $a2, %lo(D_8016A580) # addiu $a2, $a2, -0x5a80 +/* B3D888 800C66E8 AF2B0004 */ sw $t3, 4($t9) +/* B3D88C 800C66EC 8CCC0000 */ lw $t4, ($a2) +/* B3D890 800C66F0 8CCD0004 */ lw $t5, 4($a2) +/* B3D894 800C66F4 3C098017 */ lui $t1, %hi(D_8016A540) # $t1, 0x8017 +/* B3D898 800C66F8 2529A540 */ addiu $t1, %lo(D_8016A540) # addiu $t1, $t1, -0x5ac0 +/* B3D89C 800C66FC AD2C0000 */ sw $t4, ($t1) +/* B3D8A0 800C6700 AD2D0004 */ sw $t5, 4($t1) +/* B3D8A4 800C6704 240E0000 */ li $t6, 0 +/* B3D8A8 800C6708 AC8E0000 */ sw $t6, ($a0) +/* B3D8AC 800C670C 240F0000 */ li $t7, 0 +/* B3D8B0 800C6710 AC8F0004 */ sw $t7, 4($a0) +/* B3D8B4 800C6714 24180000 */ li $t8, 0 +/* B3D8B8 800C6718 ACB80000 */ sw $t8, ($a1) +/* B3D8BC 800C671C 24190000 */ li $t9, 0 +/* B3D8C0 800C6720 ACB90004 */ sw $t9, 4($a1) +/* B3D8C4 800C6724 240A0000 */ li $t2, 0 +/* B3D8C8 800C6728 ACCA0000 */ sw $t2, ($a2) +/* B3D8CC 800C672C 240B0000 */ li $t3, 0 +/* B3D8D0 800C6730 ACCB0004 */ sw $t3, 4($a2) +/* B3D8D4 800C6734 3C0C8016 */ lui $t4, %hi(sGraph_UpdateTime) # $t4, 0x8016 +/* B3D8D8 800C6738 8D8C65D0 */ lw $t4, %lo(sGraph_UpdateTime)($t4) +/* B3D8DC 800C673C 3C0D8016 */ lui $t5, %hi(sGraph_UpdateTime+4) # $t5, 0x8016 +/* B3D8E0 800C6740 8DAD65D4 */ lw $t5, %lo(sGraph_UpdateTime+4)($t5) +/* B3D8E4 800C6744 AFAC0020 */ sw $t4, 0x20($sp) +/* B3D8E8 800C6748 15800002 */ bnez $t4, .L800C6754 +/* B3D8EC 800C674C AFAD0024 */ sw $t5, 0x24($sp) +/* B3D8F0 800C6750 11A00008 */ beqz $t5, .L800C6774 +.L800C6754: +/* B3D8F4 800C6754 006D082B */ sltu $at, $v1, $t5 +/* B3D8F8 800C6758 004C7023 */ subu $t6, $v0, $t4 +/* B3D8FC 800C675C 3C098017 */ lui $t1, %hi(D_8016A548) # $t1, 0x8017 +/* B3D900 800C6760 2529A548 */ addiu $t1, %lo(D_8016A548) # addiu $t1, $t1, -0x5ab8 +/* B3D904 800C6764 01C17023 */ subu $t6, $t6, $at +/* B3D908 800C6768 AD2E0000 */ sw $t6, ($t1) +/* B3D90C 800C676C 006D7823 */ subu $t7, $v1, $t5 +/* B3D910 800C6770 AD2F0004 */ sw $t7, 4($t1) +.L800C6774: +/* B3D914 800C6774 3C048013 */ lui $a0, %hi(D_8012DBC0) # $a0, 0x8013 +/* B3D918 800C6778 8C84DBC0 */ lw $a0, %lo(D_8012DBC0)($a0) +/* B3D91C 800C677C 3C018016 */ lui $at, %hi(sGraph_UpdateTime+4) # $at, 0x8016 +/* B3D920 800C6780 AC2265D0 */ sw $v0, %lo(sGraph_UpdateTime)($at) +/* B3D924 800C6784 10800015 */ beqz $a0, .L800C67DC +/* B3D928 800C6788 AC2365D4 */ sw $v1, %lo(sGraph_UpdateTime+4)($at) +/* B3D92C 800C678C 8FA200CC */ lw $v0, 0xcc($sp) +/* B3D930 800C6790 2401DFFF */ li $at, -8193 +/* B3D934 800C6794 94580020 */ lhu $t8, 0x20($v0) +/* B3D938 800C6798 0301C827 */ nor $t9, $t8, $at +/* B3D93C 800C679C 1720000F */ bnez $t9, .L800C67DC +/* B3D940 800C67A0 00000000 */ nop +/* B3D944 800C67A4 944A0014 */ lhu $t2, 0x14($v0) +/* B3D948 800C67A8 2401FFCF */ li $at, -49 +/* B3D94C 800C67AC 3C0C8080 */ lui $t4, %hi(func_80801E44) # $t4, 0x8080 +/* B3D950 800C67B0 01415827 */ nor $t3, $t2, $at +/* B3D954 800C67B4 15600009 */ bnez $t3, .L800C67DC +/* B3D958 800C67B8 3C018016 */ lui $at, %hi(gSaveContext+0x135c) # $at, 0x8016 +/* B3D95C 800C67BC AC20F9BC */ sw $zero, %lo(gSaveContext+0x135c)($at) +/* B3D960 800C67C0 258C1E44 */ addiu $t4, %lo(func_80801E44) # addiu $t4, $t4, 0x1e44 +/* B3D964 800C67C4 240D0240 */ li $t5, 576 +/* B3D968 800C67C8 AC4D0010 */ sw $t5, 0x10($v0) +/* B3D96C 800C67CC AC4C000C */ sw $t4, 0xc($v0) +/* B3D970 800C67D0 AC400098 */ sw $zero, 0x98($v0) +/* B3D974 800C67D4 3C048013 */ lui $a0, %hi(D_8012DBC0) # $a0, 0x8013 +/* B3D978 800C67D8 8C84DBC0 */ lw $a0, %lo(D_8012DBC0)($a0) +.L800C67DC: +/* B3D97C 800C67DC 10800014 */ beqz $a0, .L800C6830 +/* B3D980 800C67E0 3C048016 */ lui $a0, %hi(gAppNmiBufferPtr) # $a0, 0x8016 +/* B3D984 800C67E4 0C01EFC2 */ jal PreNmiBuff_IsResetting +/* B3D988 800C67E8 8C846660 */ lw $a0, %lo(gAppNmiBufferPtr)($a0) +/* B3D98C 800C67EC 10400010 */ beqz $v0, .L800C6830 +/* B3D990 800C67F0 8FAE00CC */ lw $t6, 0xcc($sp) +/* B3D994 800C67F4 8DCF00A0 */ lw $t7, 0xa0($t6) +/* B3D998 800C67F8 3C048014 */ lui $a0, %hi(D_801454DC) # $a0, 0x8014 +/* B3D99C 800C67FC 55E0000D */ bnezl $t7, .L800C6834 +/* B3D9A0 800C6800 8FBF001C */ lw $ra, 0x1c($sp) +/* B3D9A4 800C6804 0C00084C */ jal osSyncPrintf +/* B3D9A8 800C6808 248454DC */ addiu $a0, %lo(D_801454DC) # addiu $a0, $a0, 0x54dc +/* B3D9AC 800C680C 8FB800CC */ lw $t8, 0xcc($sp) +/* B3D9B0 800C6810 3C098009 */ lui $t1, %hi(PreNMI_Init) # $t1, 0x8009 +/* B3D9B4 800C6814 252924B8 */ addiu $t1, %lo(PreNMI_Init) # addiu $t1, $t1, 0x24b8 +/* B3D9B8 800C6818 AF09000C */ sw $t1, 0xc($t8) +/* B3D9BC 800C681C 8FAA00CC */ lw $t2, 0xcc($sp) +/* B3D9C0 800C6820 241900AC */ li $t9, 172 +/* B3D9C4 800C6824 AD590010 */ sw $t9, 0x10($t2) +/* B3D9C8 800C6828 8FAB00CC */ lw $t3, 0xcc($sp) +/* B3D9CC 800C682C AD600098 */ sw $zero, 0x98($t3) +.L800C6830: +/* B3D9D0 800C6830 8FBF001C */ lw $ra, 0x1c($sp) +.L800C6834: +/* B3D9D4 800C6834 8FB00018 */ lw $s0, 0x18($sp) +/* B3D9D8 800C6838 27BD00C8 */ addiu $sp, $sp, 0xc8 +/* B3D9DC 800C683C 03E00008 */ jr $ra +/* B3D9E0 800C6840 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/speed_meter/func_800C99C4.s b/asm/non_matchings/code/speed_meter/func_800C99C4.s index aef1b548a8..ac1e34b104 100644 --- a/asm/non_matchings/code/speed_meter/func_800C99C4.s +++ b/asm/non_matchings/code/speed_meter/func_800C99C4.s @@ -23,7 +23,7 @@ glabel func_800C99C4 /* B40B90 800C99F0 27A400B4 */ addiu $a0, $sp, 0xb4 /* B40B94 800C99F4 240700E1 */ li $a3, 225 /* B40B98 800C99F8 AFA20208 */ sw $v0, 0x208($sp) -/* B40B9C 800C99FC 0C031AB1 */ jal func_800C6AC4 +/* B40B9C 800C99FC 0C031AB1 */ jal Graph_OpenDisp /* B40BA0 800C9A00 24520002 */ addiu $s2, $v0, 2 /* B40BA4 800C9A04 3C0E8013 */ lui $t6, %hi(sIrqMgrRetraceTime) # $t6, 0x8013 /* B40BA8 800C9A08 25CEDBE0 */ addiu $t6, %lo(sIrqMgrRetraceTime) # addiu $t6, $t6, -0x2420 @@ -275,7 +275,7 @@ glabel func_800C99C4 /* B40F74 800C9DD4 3C068014 */ lui $a2, %hi(D_80146260) # $a2, 0x8014 /* B40F78 800C9DD8 24C66260 */ addiu $a2, %lo(D_80146260) # addiu $a2, $a2, 0x6260 /* B40F7C 800C9DDC AF3802B0 */ sw $t8, 0x2b0($t9) -/* B40F80 800C9DE0 0C031AD5 */ jal func_800C6B54 +/* B40F80 800C9DE0 0C031AD5 */ jal Graph_CloseDisp /* B40F84 800C9DE4 8FA50224 */ lw $a1, 0x224($sp) .L800C9DE8: /* B40F88 800C9DE8 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/code/speed_meter/func_800C9E44.s b/asm/non_matchings/code/speed_meter/func_800C9E44.s index bb8e80ec79..7d08034b24 100644 --- a/asm/non_matchings/code/speed_meter/func_800C9E44.s +++ b/asm/non_matchings/code/speed_meter/func_800C9E44.s @@ -53,7 +53,7 @@ glabel func_800C9E44 .L800C9EA8: /* B41048 800C9EA8 3C068014 */ lui $a2, %hi(D_801462A8) # $a2, 0x8014 /* B4104C 800C9EAC 24C662A8 */ addiu $a2, %lo(D_801462A8) # addiu $a2, $a2, 0x62a8 -/* B41050 800C9EB0 0C031AB1 */ jal func_800C6AC4 +/* B41050 800C9EB0 0C031AB1 */ jal Graph_OpenDisp /* B41054 800C9EB4 2407013E */ li $a3, 318 /* B41058 800C9EB8 27A40080 */ addiu $a0, $sp, 0x80 /* B4105C 800C9EBC 0C02A89E */ jal func_800AA278 @@ -197,7 +197,7 @@ glabel func_800C9E44 /* B4127C 800CA0DC 8FAF01B4 */ lw $t7, 0x1b4($sp) /* B41280 800CA0E0 8FB8007C */ lw $t8, 0x7c($sp) /* B41284 800CA0E4 ADF802B0 */ sw $t8, 0x2b0($t7) -/* B41288 800CA0E8 0C031AD5 */ jal func_800C6B54 +/* B41288 800CA0E8 0C031AD5 */ jal Graph_CloseDisp /* B4128C 800CA0EC 8FA501B4 */ lw $a1, 0x1b4($sp) /* B41290 800CA0F0 8FBF001C */ lw $ra, 0x1c($sp) .L800CA0F4: diff --git a/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s b/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s index 6f22eb5b34..f29309f12a 100644 --- a/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s +++ b/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s @@ -141,7 +141,7 @@ glabel ActorShadow_DrawFunc_Teardrop /* AA2C1C 8002BA7C 8E850000 */ lw $a1, ($s4) /* AA2C20 8002BA80 240706CD */ li $a3, 1741 /* AA2C24 8002BA84 26D6FFFE */ addiu $s6, $s6, -2 -/* AA2C28 8002BA88 0C031AB1 */ jal func_800C6AC4 +/* AA2C28 8002BA88 0C031AB1 */ jal Graph_OpenDisp /* AA2C2C 8002BA8C 00A08025 */ move $s0, $a1 /* AA2C30 8002BA90 8E0402C0 */ lw $a0, 0x2c0($s0) /* AA2C34 8002BA94 0C024DDD */ jal Gfx_CallSetupDL @@ -340,7 +340,7 @@ glabel ActorShadow_DrawFunc_Teardrop .L8002BD5C: /* AA2EFC 8002BD5C 8E850000 */ lw $a1, ($s4) .L8002BD60: -/* AA2F00 8002BD60 0C031AD5 */ jal func_800C6B54 +/* AA2F00 8002BD60 0C031AD5 */ jal Graph_CloseDisp /* AA2F04 8002BD64 24070727 */ li $a3, 1831 .L8002BD68: /* AA2F08 8002BD68 8FBF007C */ lw $ra, 0x7c($sp) diff --git a/asm/non_matchings/code/z_actor/func_8002C124.s b/asm/non_matchings/code/z_actor/func_8002C124.s index 6d92e637eb..ac67ac1261 100644 --- a/asm/non_matchings/code/z_actor/func_8002C124.s +++ b/asm/non_matchings/code/z_actor/func_8002C124.s @@ -57,7 +57,7 @@ glabel func_8002C124 /* AA3318 8002C178 24C66110 */ addiu $a2, %lo(D_80136110) # addiu $a2, $a2, 0x6110 /* AA331C 8002C17C 27A400D8 */ addiu $a0, $sp, 0xd8 /* AA3320 8002C180 240707ED */ li $a3, 2029 -/* AA3324 8002C184 0C031AB1 */ jal func_800C6AC4 +/* AA3324 8002C184 0C031AB1 */ jal Graph_OpenDisp /* AA3328 8002C188 00A09825 */ move $s3, $a1 /* AA332C 8002C18C 8FA300F0 */ lw $v1, 0xf0($sp) /* AA3330 8002C190 8FB800F4 */ lw $t8, 0xf4($sp) @@ -458,7 +458,7 @@ glabel func_8002C124 /* AA3904 8002C764 24C66140 */ addiu $a2, %lo(D_80136140) # addiu $a2, $a2, 0x6140 /* AA3908 8002C768 27A400D8 */ addiu $a0, $sp, 0xd8 /* AA390C 8002C76C 2407086E */ li $a3, 2158 -/* AA3910 8002C770 0C031AD5 */ jal func_800C6B54 +/* AA3910 8002C770 0C031AD5 */ jal Graph_CloseDisp /* AA3914 8002C774 8D450000 */ lw $a1, ($t2) /* AA3918 8002C778 8FBF006C */ lw $ra, 0x6c($sp) /* AA391C 8002C77C D7B40020 */ ldc1 $f20, 0x20($sp) diff --git a/asm/non_matchings/code/z_actor/func_8002FBAC.s b/asm/non_matchings/code/z_actor/func_8002FBAC.s index 4f7f0fb034..59814e4f41 100644 --- a/asm/non_matchings/code/z_actor/func_8002FBAC.s +++ b/asm/non_matchings/code/z_actor/func_8002FBAC.s @@ -61,7 +61,7 @@ glabel func_8002FBAC /* AA6D60 8002FBC0 24C662BC */ addiu $a2, %lo(D_801362BC) # addiu $a2, $a2, 0x62bc /* AA6D64 8002FBC4 27A400DC */ addiu $a0, $sp, 0xdc /* AA6D68 8002FBC8 240714BC */ li $a3, 5308 -/* AA6D6C 8002FBCC 0C031AB1 */ jal func_800C6AC4 +/* AA6D6C 8002FBCC 0C031AB1 */ jal Graph_OpenDisp /* AA6D70 8002FBD0 AFA500EC */ sw $a1, 0xec($sp) /* AA6D74 8002FBD4 3C088016 */ lui $t0, %hi(gSaveContext) # $t0, 0x8016 /* AA6D78 8002FBD8 2508E660 */ addiu $t0, %lo(gSaveContext) # addiu $t0, $t0, -0x19a0 @@ -634,7 +634,7 @@ glabel func_8002FBAC /* AA7604 80030464 24C66304 */ addiu $a2, %lo(D_80136304) # addiu $a2, $a2, 0x6304 /* AA7608 80030468 27A400DC */ addiu $a0, $sp, 0xdc /* AA760C 8003046C 24071562 */ li $a3, 5474 -/* AA7610 80030470 0C031AD5 */ jal func_800C6B54 +/* AA7610 80030470 0C031AD5 */ jal Graph_CloseDisp /* AA7614 80030474 8DE50000 */ lw $a1, ($t7) .L80030478: /* AA7618 80030478 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/code/z_collision_check/func_8005B2AC.s b/asm/non_matchings/code/z_collision_check/func_8005B2AC.s index fa87864a7b..14b6716276 100644 --- a/asm/non_matchings/code/z_collision_check/func_8005B2AC.s +++ b/asm/non_matchings/code/z_collision_check/func_8005B2AC.s @@ -28,7 +28,7 @@ glabel func_8005B2AC /* AD246C 8005B2CC 24C6A5B0 */ addiu $a2, %lo(D_8013A5B0) # addiu $a2, $a2, -0x5a50 /* AD2470 8005B2D0 240702C9 */ li $a3, 713 /* AD2474 8005B2D4 02002825 */ move $a1, $s0 -/* AD2478 8005B2D8 0C031AB1 */ jal func_800C6AC4 +/* AD2478 8005B2D8 0C031AB1 */ jal Graph_OpenDisp /* AD247C 8005B2DC 27A40064 */ addiu $a0, $sp, 0x64 /* AD2480 8005B2E0 8E0202C0 */ lw $v0, 0x2c0($s0) /* AD2484 8005B2E4 3C0FDA38 */ lui $t7, (0xDA380003 >> 16) # lui $t7, 0xda38 @@ -250,7 +250,7 @@ glabel func_8005B2AC /* AD27D4 8005B634 02002825 */ move $a1, $s0 /* AD27D8 8005B638 240702F5 */ li $a3, 757 /* AD27DC 8005B63C AC400004 */ sw $zero, 4($v0) -/* AD27E0 8005B640 0C031AD5 */ jal func_800C6B54 +/* AD27E0 8005B640 0C031AD5 */ jal Graph_CloseDisp /* AD27E4 8005B644 AC4B0000 */ sw $t3, ($v0) /* AD27E8 8005B648 8FBF002C */ lw $ra, 0x2c($sp) /* AD27EC 8005B64C 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_80020FC0.s b/asm/non_matchings/code/z_eff_blure/func_80020FC0.s index 10585f1974..f1b5edf2b1 100644 --- a/asm/non_matchings/code/z_eff_blure/func_80020FC0.s +++ b/asm/non_matchings/code/z_eff_blure/func_80020FC0.s @@ -34,7 +34,7 @@ glabel func_80020FC0 /* A98184 80020FE4 AFB00024 */ sw $s0, 0x24($sp) /* A98188 80020FE8 24070346 */ li $a3, 838 /* A9818C 80020FEC 24C651A8 */ addiu $a2, %lo(D_801351A8) # addiu $a2, $a2, 0x51a8 -/* A98190 80020FF0 0C031AB1 */ jal func_800C6AC4 +/* A98190 80020FF0 0C031AB1 */ jal Graph_OpenDisp /* A98194 80020FF4 27A40040 */ addiu $a0, $sp, 0x40 /* A98198 80020FF8 8FA50098 */ lw $a1, 0x98($sp) /* A9819C 80020FFC 27A4006C */ addiu $a0, $sp, 0x6c @@ -343,7 +343,7 @@ glabel func_80020FC0 /* A98648 800214A8 24C651F8 */ addiu $a2, %lo(D_801351F8) # addiu $a2, $a2, 0x51f8 /* A9864C 800214AC 27A40040 */ addiu $a0, $sp, 0x40 /* A98650 800214B0 02202825 */ move $a1, $s1 -/* A98654 800214B4 0C031AD5 */ jal func_800C6B54 +/* A98654 800214B4 0C031AD5 */ jal Graph_CloseDisp /* A98658 800214B8 240703A4 */ li $a3, 932 /* A9865C 800214BC 8FBF002C */ lw $ra, 0x2c($sp) /* A98660 800214C0 8FB00024 */ lw $s0, 0x24($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_800214D0.s b/asm/non_matchings/code/z_eff_blure/func_800214D0.s index a1ecf65ae7..73bda35ca7 100644 --- a/asm/non_matchings/code/z_eff_blure/func_800214D0.s +++ b/asm/non_matchings/code/z_eff_blure/func_800214D0.s @@ -50,7 +50,7 @@ glabel func_800214D0 /* A986B4 80021514 F7B40028 */ sdc1 $f20, 0x28($sp) /* A986B8 80021518 240703CB */ li $a3, 971 /* A986BC 8002151C 24C6520C */ addiu $a2, %lo(D_8013520C) # addiu $a2, $a2, 0x520c -/* A986C0 80021520 0C031AB1 */ jal func_800C6AC4 +/* A986C0 80021520 0C031AB1 */ jal Graph_OpenDisp /* A986C4 80021524 27A40124 */ addiu $a0, $sp, 0x124 /* A986C8 80021528 27A40138 */ addiu $a0, $sp, 0x138 /* A986CC 8002152C 0C01DF97 */ jal Math_Vec3s_ToVec3f @@ -680,7 +680,7 @@ glabel func_800214D0 /* A99058 80021EB8 24C652B8 */ addiu $a2, %lo(D_801352B8) # addiu $a2, $a2, 0x52b8 /* A9905C 80021EBC 27A40124 */ addiu $a0, $sp, 0x124 /* A99060 80021EC0 8FA50204 */ lw $a1, 0x204($sp) -/* A99064 80021EC4 0C031AD5 */ jal func_800C6B54 +/* A99064 80021EC4 0C031AD5 */ jal Graph_CloseDisp /* A99068 80021EC8 240704A0 */ li $a3, 1184 /* A9906C 80021ECC 8FBF0064 */ lw $ra, 0x64($sp) /* A99070 80021ED0 D7B40028 */ ldc1 $f20, 0x28($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_80021F00.s b/asm/non_matchings/code/z_eff_blure/func_80021F00.s index e6ab79b812..068d1d1557 100644 --- a/asm/non_matchings/code/z_eff_blure/func_80021F00.s +++ b/asm/non_matchings/code/z_eff_blure/func_80021F00.s @@ -43,7 +43,7 @@ glabel func_80021F00 /* A990CC 80021F2C AFB00014 */ sw $s0, 0x14($sp) /* A990D0 80021F30 24C652CC */ addiu $a2, %lo(D_801352CC) # addiu $a2, $a2, 0x52cc /* A990D4 80021F34 27A40044 */ addiu $a0, $sp, 0x44 -/* A990D8 80021F38 0C031AB1 */ jal func_800C6AC4 +/* A990D8 80021F38 0C031AB1 */ jal Graph_OpenDisp /* A990DC 80021F3C 240704B1 */ li $a3, 1201 /* A990E0 80021F40 9284019E */ lbu $a0, 0x19e($s4) /* A990E4 80021F44 24120018 */ li $s2, 24 @@ -223,7 +223,7 @@ glabel func_80021F00 /* A99364 800221C4 24C652E0 */ addiu $a2, %lo(D_801352E0) # addiu $a2, $a2, 0x52e0 /* A99368 800221C8 27A40044 */ addiu $a0, $sp, 0x44 /* A9936C 800221CC 02A02825 */ move $a1, $s5 -/* A99370 800221D0 0C031AD5 */ jal func_800C6B54 +/* A99370 800221D0 0C031AD5 */ jal Graph_CloseDisp /* A99374 800221D4 240704EF */ li $a3, 1263 .L800221D8: /* A99378 800221D8 8FBF002C */ lw $ra, 0x2c($sp) @@ -246,7 +246,7 @@ glabel func_80021F00 /* A993B4 80022214 24C652F4 */ addiu $a2, %lo(D_801352F4) # addiu $a2, $a2, 0x52f4 /* A993B8 80022218 8FA50030 */ lw $a1, 0x30($sp) /* A993BC 8002221C 27A4001C */ addiu $a0, $sp, 0x1c -/* A993C0 80022220 0C031AB1 */ jal func_800C6AC4 +/* A993C0 80022220 0C031AB1 */ jal Graph_OpenDisp /* A993C4 80022224 24070500 */ li $a3, 1280 /* A993C8 80022228 8FAE0030 */ lw $t6, 0x30($sp) /* A993CC 8002222C 24050026 */ li $a1, 38 @@ -257,7 +257,7 @@ glabel func_80021F00 /* A993E0 80022240 24C65308 */ addiu $a2, %lo(D_80135308) # addiu $a2, $a2, 0x5308 /* A993E4 80022244 27A4001C */ addiu $a0, $sp, 0x1c /* A993E8 80022248 24070505 */ li $a3, 1285 -/* A993EC 8002224C 0C031AD5 */ jal func_800C6B54 +/* A993EC 8002224C 0C031AD5 */ jal Graph_CloseDisp /* A993F0 80022250 ACA202D0 */ sw $v0, 0x2d0($a1) /* A993F4 80022254 8FBF0014 */ lw $ra, 0x14($sp) /* A993F8 80022258 27BD0030 */ addiu $sp, $sp, 0x30 @@ -274,7 +274,7 @@ glabel func_80021F00 /* A99420 80022280 24C6531C */ addiu $a2, %lo(D_8013531C) # addiu $a2, $a2, 0x531c /* A99424 80022284 02002825 */ move $a1, $s0 /* A99428 80022288 27A4006C */ addiu $a0, $sp, 0x6c -/* A9942C 8002228C 0C031AB1 */ jal func_800C6AC4 +/* A9942C 8002228C 0C031AB1 */ jal Graph_OpenDisp /* A99430 80022290 2407050E */ li $a3, 1294 /* A99434 80022294 8E0202D0 */ lw $v0, 0x2d0($s0) /* A99438 80022298 3C07E700 */ lui $a3, 0xe700 @@ -421,7 +421,7 @@ glabel func_80021F00 /* A9966C 800224CC 3C068013 */ lui $a2, %hi(D_80135330) # $a2, 0x8013 /* A99670 800224D0 01E84825 */ or $t1, $t7, $t0 /* A99674 800224D4 24C65330 */ addiu $a2, %lo(D_80135330) # addiu $a2, $a2, 0x5330 -/* A99678 800224D8 0C031AD5 */ jal func_800C6B54 +/* A99678 800224D8 0C031AD5 */ jal Graph_CloseDisp /* A9967C 800224DC AC490004 */ sw $t1, 4($v0) /* A99680 800224E0 8FBF001C */ lw $ra, 0x1c($sp) /* A99684 800224E4 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_800224F4.s b/asm/non_matchings/code/z_eff_blure/func_800224F4.s index 6f46437075..7be0a8dbe6 100644 --- a/asm/non_matchings/code/z_eff_blure/func_800224F4.s +++ b/asm/non_matchings/code/z_eff_blure/func_800224F4.s @@ -38,7 +38,7 @@ glabel func_800224F4 /* A996D8 80022538 24C65344 */ addiu $a2, %lo(D_80135344) # addiu $a2, $a2, 0x5344 /* A996DC 8002253C 02002825 */ move $a1, $s0 /* A996E0 80022540 27A401C0 */ addiu $a0, $sp, 0x1c0 -/* A996E4 80022544 0C031AB1 */ jal func_800C6AC4 +/* A996E4 80022544 0C031AB1 */ jal Graph_OpenDisp /* A996E8 80022548 2407054C */ li $a3, 1356 /* A996EC 8002254C 922E01A1 */ lbu $t6, 0x1a1($s1) /* A996F0 80022550 3C198011 */ lui $t9, %hi(D_80115780) @@ -340,7 +340,7 @@ glabel func_800224F4 /* A99B64 800229C4 24C653A4 */ addiu $a2, %lo(D_801353A4) # addiu $a2, $a2, 0x53a4 /* A99B68 800229C8 27A401C0 */ addiu $a0, $sp, 0x1c0 /* A99B6C 800229CC 02002825 */ move $a1, $s0 -/* A99B70 800229D0 0C031AD5 */ jal func_800C6B54 +/* A99B70 800229D0 0C031AD5 */ jal Graph_CloseDisp /* A99B74 800229D4 240705AC */ li $a3, 1452 /* A99B78 800229D8 8FBF0054 */ lw $ra, 0x54($sp) /* A99B7C 800229DC D7B40020 */ ldc1 $f20, 0x20($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_80022A10.s b/asm/non_matchings/code/z_eff_blure/func_80022A10.s index d84718541c..8ee661c6db 100644 --- a/asm/non_matchings/code/z_eff_blure/func_80022A10.s +++ b/asm/non_matchings/code/z_eff_blure/func_80022A10.s @@ -373,7 +373,7 @@ glabel func_80022A10 /* A9A0F8 80022F58 F7B40010 */ sdc1 $f20, 0x10($sp) /* A9A0FC 80022F5C 24C653E0 */ addiu $a2, %lo(D_801353E0) # addiu $a2, $a2, 0x53e0 /* A9A100 80022F60 27A40074 */ addiu $a0, $sp, 0x74 -/* A9A104 80022F64 0C031AB1 */ jal func_800C6AC4 +/* A9A104 80022F64 0C031AB1 */ jal Graph_OpenDisp /* A9A108 80022F68 2407063C */ li $a3, 1596 /* A9A10C 80022F6C 8EE602D0 */ lw $a2, 0x2d0($s7) /* A9A110 80022F70 3C0FDA38 */ lui $t7, (0xDA380003 >> 16) # lui $t7, 0xda38 @@ -691,7 +691,7 @@ glabel func_80022A10 /* A9A5A0 80023400 24C65418 */ addiu $a2, %lo(D_80135418) # addiu $a2, $a2, 0x5418 /* A9A5A4 80023404 27A40074 */ addiu $a0, $sp, 0x74 /* A9A5A8 80023408 02E02825 */ move $a1, $s7 -/* A9A5AC 8002340C 0C031AD5 */ jal func_800C6B54 +/* A9A5AC 8002340C 0C031AD5 */ jal Graph_CloseDisp /* A9A5B0 80023410 2407071F */ li $a3, 1823 /* A9A5B4 80023414 8FBF003C */ lw $ra, 0x3c($sp) /* A9A5B8 80023418 D7B40010 */ ldc1 $f20, 0x10($sp) diff --git a/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s b/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s index 7bc9434b55..b89cdd2249 100644 --- a/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s +++ b/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s @@ -33,7 +33,7 @@ glabel func_800245BC /* A9B7A0 80024600 F7B40018 */ sdc1 $f20, 0x18($sp) /* A9B7A4 80024604 24C65498 */ addiu $a2, %lo(D_80135498) # addiu $a2, $a2, 0x5498 /* A9B7A8 80024608 27A4018C */ addiu $a0, $sp, 0x18c -/* A9B7AC 8002460C 0C031AB1 */ jal func_800C6AC4 +/* A9B7AC 8002460C 0C031AB1 */ jal Graph_OpenDisp /* A9B7B0 80024610 24070110 */ li $a3, 272 /* A9B7B4 80024614 12A00124 */ beqz $s5, .L80024AA8 /* A9B7B8 80024618 24050026 */ li $a1, 38 @@ -335,7 +335,7 @@ glabel func_800245BC /* A9BC4C 80024AAC 24C654B4 */ addiu $a2, %lo(D_801354B4) # addiu $a2, $a2, 0x54b4 /* A9BC50 80024AB0 27A4018C */ addiu $a0, $sp, 0x18c /* A9BC54 80024AB4 02802825 */ move $a1, $s4 -/* A9BC58 80024AB8 0C031AD5 */ jal func_800C6B54 +/* A9BC58 80024AB8 0C031AD5 */ jal Graph_CloseDisp /* A9BC5C 80024ABC 24070167 */ li $a3, 359 /* A9BC60 80024AC0 8FBF005C */ lw $ra, 0x5c($sp) /* A9BC64 80024AC4 D7B40018 */ ldc1 $f20, 0x18($sp) diff --git a/asm/non_matchings/code/z_eff_spark/func_80025000.s b/asm/non_matchings/code/z_eff_spark/func_80025000.s index 044a876521..14775723fa 100644 --- a/asm/non_matchings/code/z_eff_spark/func_80025000.s +++ b/asm/non_matchings/code/z_eff_spark/func_80025000.s @@ -33,7 +33,7 @@ glabel func_80025000 /* A9C1E0 80025040 24C65548 */ addiu $a2, %lo(D_80135548) # addiu $a2, $a2, 0x5548 /* A9C1E4 80025044 27A401AC */ addiu $a0, $sp, 0x1ac /* A9C1E8 80025048 02C02825 */ move $a1, $s6 -/* A9C1EC 8002504C 0C031AB1 */ jal func_800C6AC4 +/* A9C1EC 8002504C 0C031AB1 */ jal Graph_OpenDisp /* A9C1F0 80025050 24070125 */ li $a3, 293 /* A9C1F4 80025054 12E00464 */ beqz $s7, .L800261E8 /* A9C1F8 80025058 3C0FDA38 */ lui $t7, (0xDA380003 >> 16) # lui $t7, 0xda38 @@ -1248,7 +1248,7 @@ glabel func_80025000 /* A9D38C 800261EC 24C65594 */ addiu $a2, %lo(D_80135594) # addiu $a2, $a2, 0x5594 /* A9D390 800261F0 27A401AC */ addiu $a0, $sp, 0x1ac /* A9D394 800261F4 02C02825 */ move $a1, $s6 -/* A9D398 800261F8 0C031AD5 */ jal func_800C6B54 +/* A9D398 800261F8 0C031AD5 */ jal Graph_CloseDisp /* A9D39C 800261FC 240701F2 */ li $a3, 498 /* A9D3A0 80026200 8FBF0034 */ lw $ra, 0x34($sp) /* A9D3A4 80026204 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026230.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026230.s index db5c8759bb..17e3932874 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026230.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026230.s @@ -25,7 +25,7 @@ glabel func_80026230 /* A9D3F4 80026254 24C655C0 */ addiu $a2, %lo(D_801355C0) # addiu $a2, $a2, 0x55c0 /* A9D3F8 80026258 27A40038 */ addiu $a0, $sp, 0x38 /* A9D3FC 8002625C 24070071 */ li $a3, 113 -/* A9D400 80026260 0C031AB1 */ jal func_800C6AC4 +/* A9D400 80026260 0C031AB1 */ jal Graph_OpenDisp /* A9D404 80026264 AFA50048 */ sw $a1, 0x48($sp) /* A9D408 80026268 87B80066 */ lh $t8, 0x66($sp) /* A9D40C 8002626C 34198000 */ li $t9, 32768 @@ -130,7 +130,7 @@ glabel func_80026230 .L800263DC: /* A9D57C 800263DC AD0502C0 */ sw $a1, 0x2c0($t0) /* A9D580 800263E0 8FB90058 */ lw $t9, 0x58($sp) -/* A9D584 800263E4 0C031AD5 */ jal func_800C6B54 +/* A9D584 800263E4 0C031AD5 */ jal Graph_CloseDisp /* A9D588 800263E8 8F250000 */ lw $a1, ($t9) /* A9D58C 800263EC 8FBF001C */ lw $ra, 0x1c($sp) /* A9D590 800263F0 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026400.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026400.s index d39b44f281..c2b0d5cb9a 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026400.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026400.s @@ -22,7 +22,7 @@ glabel func_80026400 /* A9D5C8 80026428 24C655E8 */ addiu $a2, %lo(D_801355E8) # addiu $a2, $a2, 0x55e8 /* A9D5CC 8002642C 27A40034 */ addiu $a0, $sp, 0x34 /* A9D5D0 80026430 2407008D */ li $a3, 141 -/* A9D5D4 80026434 0C031AB1 */ jal func_800C6AC4 +/* A9D5D4 80026434 0C031AB1 */ jal Graph_OpenDisp /* A9D5D8 80026438 AFA50044 */ sw $a1, 0x44($sp) /* A9D5DC 8002643C 87B8005E */ lh $t8, 0x5e($sp) /* A9D5E0 80026440 24194000 */ li $t9, 16384 @@ -142,7 +142,7 @@ glabel func_80026400 /* A9D784 800265E4 3C068013 */ lui $a2, %hi(D_801355FC) # $a2, 0x8013 /* A9D788 800265E8 24C655FC */ addiu $a2, %lo(D_801355FC) # addiu $a2, $a2, 0x55fc /* A9D78C 800265EC 27A40034 */ addiu $a0, $sp, 0x34 -/* A9D790 800265F0 0C031AD5 */ jal func_800C6B54 +/* A9D790 800265F0 0C031AD5 */ jal Graph_CloseDisp /* A9D794 800265F4 8DE50000 */ lw $a1, ($t7) .L800265F8: /* A9D798 800265F8 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026608.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026608.s index 7dc11dcf3d..01bba26d25 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026608.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026608.s @@ -17,7 +17,7 @@ glabel func_80026608 /* A9D7BC 8002661C 24C65610 */ addiu $a2, %lo(D_80135610) # addiu $a2, $a2, 0x5610 /* A9D7C0 80026620 27A40020 */ addiu $a0, $sp, 0x20 /* A9D7C4 80026624 2407009F */ li $a3, 159 -/* A9D7C8 80026628 0C031AB1 */ jal func_800C6AC4 +/* A9D7C8 80026628 0C031AB1 */ jal Graph_OpenDisp /* A9D7CC 8002662C AFA50030 */ sw $a1, 0x30($sp) /* A9D7D0 80026630 8FA80030 */ lw $t0, 0x30($sp) /* A9D7D4 80026634 3C18E700 */ lui $t8, 0xe700 @@ -37,7 +37,7 @@ glabel func_80026608 /* A9D80C 8002666C 8FB90038 */ lw $t9, 0x38($sp) /* A9D810 80026670 27A40020 */ addiu $a0, $sp, 0x20 /* A9D814 80026674 240700A4 */ li $a3, 164 -/* A9D818 80026678 0C031AD5 */ jal func_800C6B54 +/* A9D818 80026678 0C031AD5 */ jal Graph_CloseDisp /* A9D81C 8002667C 8F250000 */ lw $a1, ($t9) /* A9D820 80026680 8FBF0014 */ lw $ra, 0x14($sp) /* A9D824 80026684 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026690.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026690.s index be57491478..368ded94f5 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026690.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026690.s @@ -25,7 +25,7 @@ glabel func_80026690 /* A9D854 800266B4 24C65638 */ addiu $a2, %lo(D_80135638) # addiu $a2, $a2, 0x5638 /* A9D858 800266B8 27A40038 */ addiu $a0, $sp, 0x38 /* A9D85C 800266BC 240700B2 */ li $a3, 178 -/* A9D860 800266C0 0C031AB1 */ jal func_800C6AC4 +/* A9D860 800266C0 0C031AB1 */ jal Graph_OpenDisp /* A9D864 800266C4 AFA50048 */ sw $a1, 0x48($sp) /* A9D868 800266C8 87B80066 */ lh $t8, 0x66($sp) /* A9D86C 800266CC 34198000 */ li $t9, 32768 @@ -130,7 +130,7 @@ glabel func_80026690 .L8002683C: /* A9D9DC 8002683C AD0502D0 */ sw $a1, 0x2d0($t0) /* A9D9E0 80026840 8FB90058 */ lw $t9, 0x58($sp) -/* A9D9E4 80026844 0C031AD5 */ jal func_800C6B54 +/* A9D9E4 80026844 0C031AD5 */ jal Graph_CloseDisp /* A9D9E8 80026848 8F250000 */ lw $a1, ($t9) /* A9D9EC 8002684C 8FBF001C */ lw $ra, 0x1c($sp) /* A9D9F0 80026850 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026860.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026860.s index f65218d29a..22ecf20a1d 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026860.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026860.s @@ -20,7 +20,7 @@ glabel func_80026860 /* A9DA20 80026880 24C65660 */ addiu $a2, %lo(D_80135660) # addiu $a2, $a2, 0x5660 /* A9DA24 80026884 27A40034 */ addiu $a0, $sp, 0x34 /* A9DA28 80026888 240700C9 */ li $a3, 201 -/* A9DA2C 8002688C 0C031AB1 */ jal func_800C6AC4 +/* A9DA2C 8002688C 0C031AB1 */ jal Graph_OpenDisp /* A9DA30 80026890 AFA50044 */ sw $a1, 0x44($sp) /* A9DA34 80026894 87B8005E */ lh $t8, 0x5e($sp) /* A9DA38 80026898 24194000 */ li $t9, 16384 @@ -143,7 +143,7 @@ glabel func_80026860 /* A9DBE8 80026A48 ADE302D0 */ sw $v1, 0x2d0($t7) /* A9DBEC 80026A4C 8FB90050 */ lw $t9, 0x50($sp) /* A9DBF0 80026A50 27A40034 */ addiu $a0, $sp, 0x34 -/* A9DBF4 80026A54 0C031AD5 */ jal func_800C6B54 +/* A9DBF4 80026A54 0C031AD5 */ jal Graph_CloseDisp /* A9DBF8 80026A58 8F250000 */ lw $a1, ($t9) /* A9DBFC 80026A5C 8FBF0014 */ lw $ra, 0x14($sp) /* A9DC00 80026A60 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s index edf3cbc293..0e0d0472ca 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s @@ -17,7 +17,7 @@ glabel func_80026A6C /* A9DC20 80026A80 24C65688 */ addiu $a2, %lo(D_80135688) # addiu $a2, $a2, 0x5688 /* A9DC24 80026A84 27A40020 */ addiu $a0, $sp, 0x20 /* A9DC28 80026A88 240700D9 */ li $a3, 217 -/* A9DC2C 80026A8C 0C031AB1 */ jal func_800C6AC4 +/* A9DC2C 80026A8C 0C031AB1 */ jal Graph_OpenDisp /* A9DC30 80026A90 AFA50030 */ sw $a1, 0x30($sp) /* A9DC34 80026A94 8FA80030 */ lw $t0, 0x30($sp) /* A9DC38 80026A98 3C18E700 */ lui $t8, 0xe700 @@ -37,7 +37,7 @@ glabel func_80026A6C /* A9DC70 80026AD0 8FB90038 */ lw $t9, 0x38($sp) /* A9DC74 80026AD4 27A40020 */ addiu $a0, $sp, 0x20 /* A9DC78 80026AD8 240700DE */ li $a3, 222 -/* A9DC7C 80026ADC 0C031AD5 */ jal func_800C6B54 +/* A9DC7C 80026ADC 0C031AD5 */ jal Graph_CloseDisp /* A9DC80 80026AE0 8F250000 */ lw $a1, ($t9) /* A9DC84 80026AE4 8FBF0014 */ lw $ra, 0x14($sp) /* A9DC88 80026AE8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s index 009c7b17d6..ce31e426f9 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s @@ -34,7 +34,7 @@ glabel func_80027F80 /* A9F168 80027FC8 27A40040 */ addiu $a0, $sp, 0x40 /* A9F16C 80027FCC 240700C4 */ li $a3, 196 /* A9F170 80027FD0 02002825 */ move $a1, $s0 -/* A9F174 80027FD4 0C031AB1 */ jal func_800C6AC4 +/* A9F174 80027FD4 0C031AB1 */ jal Graph_OpenDisp /* A9F178 80027FD8 AFA80054 */ sw $t0, 0x54($sp) /* A9F17C 80027FDC 86290042 */ lh $t1, 0x42($s1) /* A9F180 80027FE0 3C018013 */ lui $at, %hi(D_80135C48) @@ -161,7 +161,7 @@ glabel func_80027F80 /* A9F360 800281C0 24C65C24 */ addiu $a2, %lo(D_80135C24) # addiu $a2, $a2, 0x5c24 /* A9F364 800281C4 27A40040 */ addiu $a0, $sp, 0x40 /* A9F368 800281C8 02002825 */ move $a1, $s0 -/* A9F36C 800281CC 0C031AD5 */ jal func_800C6B54 +/* A9F36C 800281CC 0C031AD5 */ jal Graph_CloseDisp /* A9F370 800281D0 240700F3 */ li $a3, 243 /* A9F374 800281D4 8FBF001C */ lw $ra, 0x1c($sp) /* A9F378 800281D8 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s b/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s index 5f866e5482..48fde20646 100644 --- a/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s +++ b/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s @@ -55,7 +55,7 @@ glabel func_8006CBAC /* AE3DB4 8006CC14 24C6BA58 */ addiu $a2, %lo(D_8013BA58) # addiu $a2, $a2, -0x45a8 /* AE3DB8 8006CC18 27A40080 */ addiu $a0, $sp, 0x80 /* AE3DBC 8006CC1C 24070117 */ li $a3, 279 -/* AE3DC0 8006CC20 0C031AB1 */ jal func_800C6AC4 +/* AE3DC0 8006CC20 0C031AB1 */ jal Graph_OpenDisp /* AE3DC4 8006CC24 00A08025 */ move $s0, $a1 /* AE3DC8 8006CC28 0C034213 */ jal Matrix_Push /* AE3DCC 8006CC2C 00000000 */ nop @@ -268,7 +268,7 @@ glabel func_8006CBAC /* AE40E4 8006CF44 24C6BAFC */ addiu $a2, %lo(D_8013BAFC) # addiu $a2, $a2, -0x4504 /* AE40E8 8006CF48 27A40080 */ addiu $a0, $sp, 0x80 /* AE40EC 8006CF4C 24070173 */ li $a3, 371 -/* AE40F0 8006CF50 0C031AD5 */ jal func_800C6B54 +/* AE40F0 8006CF50 0C031AD5 */ jal Graph_CloseDisp /* AE40F4 8006CF54 8F250000 */ lw $a1, ($t9) /* AE40F8 8006CF58 8FBF002C */ lw $ra, 0x2c($sp) /* AE40FC 8006CF5C 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_80070C24.s b/asm/non_matchings/code/z_kankyo/func_80070C24.s index 61b0b48b9b..faa1fc87b1 100644 --- a/asm/non_matchings/code/z_kankyo/func_80070C24.s +++ b/asm/non_matchings/code/z_kankyo/func_80070C24.s @@ -236,11 +236,11 @@ glabel func_80070C24 /* AE8114 80070F74 8F250000 */ lw $a1, ($t9) /* AE8118 80070F78 E7AE0088 */ swc1 $f14, 0x88($sp) /* AE811C 80070F7C AFAA007C */ sw $t2, 0x7c($sp) -/* AE8120 80070F80 0C031AB1 */ jal func_800C6AC4 +/* AE8120 80070F80 0C031AB1 */ jal Graph_OpenDisp /* AE8124 80070F84 AFA5006C */ sw $a1, 0x6c($sp) /* AE8128 80070F88 8FAF006C */ lw $t7, 0x6c($sp) /* AE812C 80070F8C 8DE402C0 */ lw $a0, 0x2c0($t7) -/* AE8130 80070F90 0C031B08 */ jal func_800C6C20 +/* AE8130 80070F90 0C031B08 */ jal Graph_GfxPlusOne /* AE8134 80070F94 AFA40070 */ sw $a0, 0x70($sp) /* AE8138 80070F98 8FA6006C */ lw $a2, 0x6c($sp) /* AE813C 80070F9C AFA20074 */ sw $v0, 0x74($sp) @@ -269,7 +269,7 @@ glabel func_80070C24 /* AE8198 80070FF8 8FA50074 */ lw $a1, 0x74($sp) /* AE819C 80070FFC 8FA40070 */ lw $a0, 0x70($sp) /* AE81A0 80071000 AFAA007C */ sw $t2, 0x7c($sp) -/* AE81A4 80071004 0C031B0A */ jal func_800C6C28 +/* AE81A4 80071004 0C031B0A */ jal Graph_BranchDlist /* AE81A8 80071008 E7AE0088 */ swc1 $f14, 0x88($sp) /* AE81AC 8007100C 8FB90074 */ lw $t9, 0x74($sp) /* AE81B0 80071010 8FAF006C */ lw $t7, 0x6c($sp) @@ -283,7 +283,7 @@ glabel func_80070C24 /* AE81D0 80071030 27A4005C */ addiu $a0, $sp, 0x5c /* AE81D4 80071034 2407069A */ li $a3, 1690 /* AE81D8 80071038 AFAA007C */ sw $t2, 0x7c($sp) -/* AE81DC 8007103C 0C031AD5 */ jal func_800C6B54 +/* AE81DC 8007103C 0C031AD5 */ jal Graph_CloseDisp /* AE81E0 80071040 E7AE0088 */ swc1 $f14, 0x88($sp) /* AE81E4 80071044 3C0B8016 */ lui $t3, %hi(gGameInfo) # $t3, 0x8016 /* AE81E8 80071048 3C0D8016 */ lui $t5, %hi(gSaveContext) # $t5, 0x8016 diff --git a/asm/non_matchings/code/z_kankyo/func_800730DC.s b/asm/non_matchings/code/z_kankyo/func_800730DC.s index c17e2934ff..0ed9328396 100644 --- a/asm/non_matchings/code/z_kankyo/func_800730DC.s +++ b/asm/non_matchings/code/z_kankyo/func_800730DC.s @@ -9,7 +9,7 @@ glabel func_800730DC /* AEA298 800730F8 24C6C55C */ addiu $a2, %lo(D_8013C55C) # addiu $a2, $a2, -0x3aa4 /* AEA29C 800730FC 27A40060 */ addiu $a0, $sp, 0x60 /* AEA2A0 80073100 240708DA */ li $a3, 2266 -/* AEA2A4 80073104 0C031AB1 */ jal func_800C6AC4 +/* AEA2A4 80073104 0C031AB1 */ jal Graph_OpenDisp /* AEA2A8 80073108 00A08025 */ move $s0, $a1 /* AEA2AC 8007310C 922E1D6C */ lbu $t6, 0x1d6c($s1) /* AEA2B0 80073110 3C028016 */ lui $v0, %hi(gSaveContext+0xc) @@ -572,7 +572,7 @@ glabel func_800730DC /* AEAB00 80073960 24C6C58C */ addiu $a2, %lo(D_8013C58C) # addiu $a2, $a2, -0x3a74 /* AEAB04 80073964 27A40060 */ addiu $a0, $sp, 0x60 /* AEAB08 80073968 8E250000 */ lw $a1, ($s1) -/* AEAB0C 8007396C 0C031AD5 */ jal func_800C6B54 +/* AEAB0C 8007396C 0C031AD5 */ jal Graph_CloseDisp /* AEAB10 80073970 2407097D */ li $a3, 2429 /* AEAB14 80073974 8FBF0024 */ lw $ra, 0x24($sp) /* AEAB18 80073978 8FB0001C */ lw $s0, 0x1c($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_80073A5C.s b/asm/non_matchings/code/z_kankyo/func_80073A5C.s index e62a1f0225..311169c732 100644 --- a/asm/non_matchings/code/z_kankyo/func_80073A5C.s +++ b/asm/non_matchings/code/z_kankyo/func_80073A5C.s @@ -68,7 +68,7 @@ glabel func_80073A5C /* AEACFC 80073B5C 27A400B4 */ addiu $a0, $sp, 0xb4 /* AEAD00 80073B60 02002825 */ move $a1, $s0 /* AEAD04 80073B64 240709D4 */ li $a3, 2516 -/* AEAD08 80073B68 0C031AB1 */ jal func_800C6AC4 +/* AEAD08 80073B68 0C031AB1 */ jal Graph_OpenDisp /* AEAD0C 80073B6C AF090000 */ sw $t1, ($t8) /* AEAD10 80073B70 27A401C0 */ addiu $a0, $sp, 0x1c0 /* AEAD14 80073B74 0C032D9E */ jal func_800CB678 @@ -829,7 +829,7 @@ glabel func_80073A5C /* AEB840 800746A0 24C6C5BC */ addiu $a2, %lo(D_8013C5BC) # addiu $a2, $a2, -0x3a44 /* AEB844 800746A4 27A400B4 */ addiu $a0, $sp, 0xb4 /* AEB848 800746A8 02002825 */ move $a1, $s0 -/* AEB84C 800746AC 0C031AD5 */ jal func_800C6B54 +/* AEB84C 800746AC 0C031AD5 */ jal Graph_CloseDisp /* AEB850 800746B0 24070ABE */ li $a3, 2750 /* AEB854 800746B4 8FBF004C */ lw $ra, 0x4c($sp) /* AEB858 800746B8 D7B40020 */ ldc1 $f20, 0x20($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_80074704.s b/asm/non_matchings/code/z_kankyo/func_80074704.s index db4ca97035..25cc89e9e3 100644 --- a/asm/non_matchings/code/z_kankyo/func_80074704.s +++ b/asm/non_matchings/code/z_kankyo/func_80074704.s @@ -50,7 +50,7 @@ glabel func_80074704 /* AEB964 800747C4 15E00136 */ bnez $t7, .L80074CA0 /* AEB968 800747C8 27A400B8 */ addiu $a0, $sp, 0xb8 /* AEB96C 800747CC 24C6C5CC */ addiu $a2, %lo(D_8013C5CC) # addiu $a2, $a2, -0x3a34 -/* AEB970 800747D0 0C031AB1 */ jal func_800C6AC4 +/* AEB970 800747D0 0C031AB1 */ jal Graph_OpenDisp /* AEB974 800747D4 24070AEF */ li $a3, 2799 /* AEB978 800747D8 C6C20028 */ lwc1 $f2, 0x28($s6) /* AEB97C 800747DC C6C40034 */ lwc1 $f4, 0x34($s6) @@ -367,7 +367,7 @@ glabel func_80074704 /* AEBE2C 80074C8C 24C6C5FC */ addiu $a2, %lo(D_8013C5FC) # addiu $a2, $a2, -0x3a04 /* AEBE30 80074C90 27A400B8 */ addiu $a0, $sp, 0xb8 /* AEBE34 80074C94 02202825 */ move $a1, $s1 -/* AEBE38 80074C98 0C031AD5 */ jal func_800C6B54 +/* AEBE38 80074C98 0C031AD5 */ jal Graph_CloseDisp /* AEBE3C 80074C9C 24070B82 */ li $a3, 2946 .L80074CA0: /* AEBE40 80074CA0 8FBF006C */ lw $ra, 0x6c($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_80074D6C.s b/asm/non_matchings/code/z_kankyo/func_80074D6C.s index 5a7fe47b01..d710e559b9 100644 --- a/asm/non_matchings/code/z_kankyo/func_80074D6C.s +++ b/asm/non_matchings/code/z_kankyo/func_80074D6C.s @@ -22,7 +22,7 @@ glabel func_80074D6C /* AEBF54 80074DB4 AFA90028 */ sw $t1, 0x28($sp) /* AEBF58 80074DB8 27A40050 */ addiu $a0, $sp, 0x50 /* AEBF5C 80074DBC 24070BD8 */ li $a3, 3032 -/* AEBF60 80074DC0 0C031AB1 */ jal func_800C6AC4 +/* AEBF60 80074DC0 0C031AB1 */ jal Graph_OpenDisp /* AEBF64 80074DC4 AFA50060 */ sw $a1, 0x60($sp) /* AEBF68 80074DC8 0C024E2D */ jal func_800938B4 /* AEBF6C 80074DCC 8E040000 */ lw $a0, ($s0) @@ -117,7 +117,7 @@ glabel func_80074D6C /* AEC0BC 80074F1C AC600004 */ sw $zero, 4($v1) /* AEC0C0 80074F20 AC6B0000 */ sw $t3, ($v1) /* AEC0C4 80074F24 8E050000 */ lw $a1, ($s0) -/* AEC0C8 80074F28 0C031AD5 */ jal func_800C6B54 +/* AEC0C8 80074F28 0C031AD5 */ jal Graph_CloseDisp /* AEC0CC 80074F2C AFA90028 */ sw $t1, 0x28($sp) /* AEC0D0 80074F30 8FA90028 */ lw $t1, 0x28($sp) /* AEC0D4 80074F34 912E0B0D */ lbu $t6, 0xb0d($t1) @@ -129,7 +129,7 @@ glabel func_80074D6C /* AEC0E8 80074F48 8E050000 */ lw $a1, ($s0) /* AEC0EC 80074F4C AFA90028 */ sw $t1, 0x28($sp) /* AEC0F0 80074F50 24070BE8 */ li $a3, 3048 -/* AEC0F4 80074F54 0C031AB1 */ jal func_800C6AC4 +/* AEC0F4 80074F54 0C031AB1 */ jal Graph_OpenDisp /* AEC0F8 80074F58 AFA50044 */ sw $a1, 0x44($sp) /* AEC0FC 80074F5C 0C024E2D */ jal func_800938B4 /* AEC100 80074F60 8E040000 */ lw $a0, ($s0) @@ -162,7 +162,7 @@ glabel func_80074D6C /* AEC16C 80074FCC AC6E0000 */ sw $t6, ($v1) /* AEC170 80074FD0 8E050000 */ lw $a1, ($s0) /* AEC174 80074FD4 27A40034 */ addiu $a0, $sp, 0x34 -/* AEC178 80074FD8 0C031AD5 */ jal func_800C6B54 +/* AEC178 80074FD8 0C031AD5 */ jal Graph_CloseDisp /* AEC17C 80074FDC 24070BF0 */ li $a3, 3056 .L80074FE0: /* AEC180 80074FE0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_80074FF4.s b/asm/non_matchings/code/z_kankyo/func_80074FF4.s index 724f06cc96..2c887fe30f 100644 --- a/asm/non_matchings/code/z_kankyo/func_80074FF4.s +++ b/asm/non_matchings/code/z_kankyo/func_80074FF4.s @@ -10,7 +10,7 @@ glabel func_80074FF4 /* AEC1B4 80075014 24C6C64C */ addiu $a2, %lo(D_8013C64C) # addiu $a2, $a2, -0x39b4 /* AEC1B8 80075018 27A40024 */ addiu $a0, $sp, 0x24 /* AEC1BC 8007501C 24070BFD */ li $a3, 3069 -/* AEC1C0 80075020 0C031AB1 */ jal func_800C6AC4 +/* AEC1C0 80075020 0C031AB1 */ jal Graph_OpenDisp /* AEC1C4 80075024 AFA50034 */ sw $a1, 0x34($sp) /* AEC1C8 80075028 8FAF0038 */ lw $t7, 0x38($sp) /* AEC1CC 8007502C 0C024E2D */ jal func_800938B4 @@ -44,7 +44,7 @@ glabel func_80074FF4 /* AEC23C 8007509C AC780000 */ sw $t8, ($v1) /* AEC240 800750A0 8FB90038 */ lw $t9, 0x38($sp) /* AEC244 800750A4 24070C07 */ li $a3, 3079 -/* AEC248 800750A8 0C031AD5 */ jal func_800C6B54 +/* AEC248 800750A8 0C031AD5 */ jal Graph_CloseDisp /* AEC24C 800750AC 8F250000 */ lw $a1, ($t9) /* AEC250 800750B0 8FBF0014 */ lw $ra, 0x14($sp) /* AEC254 800750B4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code/z_kankyo/func_8007542C.s b/asm/non_matchings/code/z_kankyo/func_8007542C.s index ce5ff06bc3..547e425190 100644 --- a/asm/non_matchings/code/z_kankyo/func_8007542C.s +++ b/asm/non_matchings/code/z_kankyo/func_8007542C.s @@ -40,7 +40,7 @@ glabel func_8007542C /* AEC664 800754C4 24C6C66C */ addiu $a2, %lo(D_8013C66C) # addiu $a2, $a2, -0x3994 /* AEC668 800754C8 27A40098 */ addiu $a0, $sp, 0x98 /* AEC66C 800754CC 24070CB5 */ li $a3, 3253 -/* AEC670 800754D0 0C031AB1 */ jal func_800C6AC4 +/* AEC670 800754D0 0C031AB1 */ jal Graph_OpenDisp /* AEC674 800754D4 00A09025 */ move $s2, $a1 /* AEC678 800754D8 3C018014 */ lui $at, %hi(D_8013C800) /* AEC67C 800754DC C43EC800 */ lwc1 $f30, %lo(D_8013C800)($at) @@ -277,7 +277,7 @@ glabel func_8007542C /* AEC9F4 80075854 24C6C68C */ addiu $a2, %lo(D_8013C68C) # addiu $a2, $a2, -0x3974 /* AEC9F8 80075858 27A40098 */ addiu $a0, $sp, 0x98 /* AEC9FC 8007585C 8E650000 */ lw $a1, ($s3) -/* AECA00 80075860 0C031AD5 */ jal func_800C6B54 +/* AECA00 80075860 0C031AD5 */ jal Graph_CloseDisp /* AECA04 80075864 24070D19 */ li $a3, 3353 /* AECA08 80075868 8FBF0064 */ lw $ra, 0x64($sp) /* AECA0C 8007586C D7B40010 */ ldc1 $f20, 0x10($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_8007672C.s b/asm/non_matchings/code/z_kankyo/func_8007672C.s index 25aaf51c04..4df36fcb3b 100644 --- a/asm/non_matchings/code/z_kankyo/func_8007672C.s +++ b/asm/non_matchings/code/z_kankyo/func_8007672C.s @@ -12,7 +12,7 @@ glabel func_8007672C /* AED8F4 80076754 24C6C750 */ addiu $a2, %lo(D_8013C750) # addiu $a2, $a2, -0x38b0 /* AED8F8 80076758 27A4004C */ addiu $a0, $sp, 0x4c /* AED8FC 8007675C 02002825 */ move $a1, $s0 -/* AED900 80076760 0C031AB1 */ jal func_800C6AC4 +/* AED900 80076760 0C031AB1 */ jal Graph_OpenDisp /* AED904 80076764 24070EFB */ li $a3, 3835 /* AED908 80076768 93A50077 */ lbu $a1, 0x77($sp) /* AED90C 8007676C 30AF0001 */ andi $t7, $a1, 1 @@ -125,7 +125,7 @@ glabel func_8007672C /* AEDAAC 8007690C 24C6C760 */ addiu $a2, %lo(D_8013C760) # addiu $a2, $a2, -0x38a0 /* AEDAB0 80076910 27A4004C */ addiu $a0, $sp, 0x4c /* AEDAB4 80076914 02002825 */ move $a1, $s0 -/* AEDAB8 80076918 0C031AD5 */ jal func_800C6B54 +/* AEDAB8 80076918 0C031AD5 */ jal Graph_CloseDisp /* AEDABC 8007691C 24070F17 */ li $a3, 3863 .L80076920: /* AEDAC0 80076920 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_80076934.s b/asm/non_matchings/code/z_kankyo/func_80076934.s index e63fc83245..236822d3fa 100644 --- a/asm/non_matchings/code/z_kankyo/func_80076934.s +++ b/asm/non_matchings/code/z_kankyo/func_80076934.s @@ -591,7 +591,7 @@ glabel func_80076934 /* AEE330 80077190 A3AB00A2 */ sb $t3, 0xa2($sp) /* AEE334 80077194 A3AA00A1 */ sb $t2, 0xa1($sp) /* AEE338 80077198 A3A900A0 */ sb $t1, 0xa0($sp) -/* AEE33C 8007719C 0C031AB1 */ jal func_800C6AC4 +/* AEE33C 8007719C 0C031AB1 */ jal Graph_OpenDisp /* AEE340 800771A0 AFA5008C */ sw $a1, 0x8c($sp) /* AEE344 800771A4 8FA3008C */ lw $v1, 0x8c($sp) /* AEE348 800771A8 0C024FCD */ jal func_80093F34 @@ -708,7 +708,7 @@ glabel func_80076934 /* AEE504 80077364 8F250000 */ lw $a1, ($t9) /* AEE508 80077368 27A4007C */ addiu $a0, $sp, 0x7c /* AEE50C 8007736C 24070FE4 */ li $a3, 4068 -/* AEE510 80077370 0C031AD5 */ jal func_800C6B54 +/* AEE510 80077370 0C031AD5 */ jal Graph_CloseDisp /* AEE514 80077374 E7AE0098 */ swc1 $f14, 0x98($sp) /* AEE518 80077378 C7AE0098 */ lwc1 $f14, 0x98($sp) /* AEE51C 8007737C 3C028016 */ lui $v0, %hi(D_8015FDB0) # $v0, 0x8016 diff --git a/asm/non_matchings/code/z_lights/func_80079EFC.s b/asm/non_matchings/code/z_lights/func_80079EFC.s index 86d869c50a..2f210ef613 100644 --- a/asm/non_matchings/code/z_lights/func_80079EFC.s +++ b/asm/non_matchings/code/z_lights/func_80079EFC.s @@ -18,7 +18,7 @@ glabel func_80079EFC /* AF10B4 80079F14 00A08025 */ move $s0, $a1 /* AF10B8 80079F18 24C6C8A0 */ addiu $a2, %lo(D_8013C8A0) # addiu $a2, $a2, -0x3760 /* AF10BC 80079F1C 27A4004C */ addiu $a0, $sp, 0x4c -/* AF10C0 80079F20 0C031AB1 */ jal func_800C6AC4 +/* AF10C0 80079F20 0C031AB1 */ jal Graph_OpenDisp /* AF10C4 80079F24 24070153 */ li $a3, 339 /* AF10C8 80079F28 8E0302C0 */ lw $v1, 0x2c0($s0) /* AF10CC 80079F2C 3C04DB02 */ lui $a0, 0xdb02 @@ -104,7 +104,7 @@ glabel func_80079EFC /* AF11FC 8007A05C 3C068014 */ lui $a2, %hi(D_8013C8B0) # $a2, 0x8014 /* AF1200 8007A060 AC640004 */ sw $a0, 4($v1) /* AF1204 8007A064 27A4004C */ addiu $a0, $sp, 0x4c -/* AF1208 8007A068 0C031AD5 */ jal func_800C6B54 +/* AF1208 8007A068 0C031AD5 */ jal Graph_CloseDisp /* AF120C 8007A06C 24C6C8B0 */ addiu $a2, %lo(D_8013C8B0) # addiu $a2, $a2, -0x3750 /* AF1210 8007A070 8FBF001C */ lw $ra, 0x1c($sp) /* AF1214 8007A074 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/code/z_lights/func_8007ABBC.s b/asm/non_matchings/code/z_lights/func_8007ABBC.s index 08643edfd6..7dfa5b9492 100644 --- a/asm/non_matchings/code/z_lights/func_8007ABBC.s +++ b/asm/non_matchings/code/z_lights/func_8007ABBC.s @@ -38,7 +38,7 @@ glabel func_8007ABBC /* AF1DA4 8007AC04 AFB000B0 */ sw $s0, 0xb0($sp) /* AF1DA8 8007AC08 27A40094 */ addiu $a0, $sp, 0x94 /* AF1DAC 8007AC0C 24070377 */ li $a3, 887 -/* AF1DB0 8007AC10 0C031AB1 */ jal func_800C6AC4 +/* AF1DB0 8007AC10 0C031AB1 */ jal Graph_OpenDisp /* AF1DB4 8007AC14 00A08825 */ move $s1, $a1 /* AF1DB8 8007AC18 8E2702D0 */ lw $a3, 0x2d0($s1) /* AF1DBC 8007AC1C 24EE0008 */ addiu $t6, $a3, 8 @@ -150,7 +150,7 @@ glabel func_8007ABBC /* AF1F58 8007ADB8 24C6C8E0 */ addiu $a2, %lo(D_8013C8E0) # addiu $a2, $a2, -0x3720 /* AF1F5C 8007ADBC 27A40094 */ addiu $a0, $sp, 0x94 /* AF1F60 8007ADC0 2407039F */ li $a3, 927 -/* AF1F64 8007ADC4 0C031AD5 */ jal func_800C6B54 +/* AF1F64 8007ADC4 0C031AD5 */ jal Graph_CloseDisp /* AF1F68 8007ADC8 8D850000 */ lw $a1, ($t4) /* AF1F6C 8007ADCC 8FBF004C */ lw $ra, 0x4c($sp) /* AF1F70 8007ADD0 D7B40018 */ ldc1 $f20, 0x18($sp) diff --git a/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s b/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s index 19968b867b..792257cadd 100644 --- a/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s +++ b/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s @@ -59,7 +59,7 @@ glabel Interface_DrawMinimap /* AF88A0 80081700 24C6D958 */ addiu $a2, %lo(D_8013D958) # addiu $a2, $a2, -0x26a8 /* AF88A4 80081704 27A400EC */ addiu $a0, $sp, 0xec /* AF88A8 80081708 24070272 */ li $a3, 626 -/* AF88AC 8008170C 0C031AB1 */ jal func_800C6AC4 +/* AF88AC 8008170C 0C031AB1 */ jal Graph_OpenDisp /* AF88B0 80081710 AFA500FC */ sw $a1, 0xfc($sp) /* AF88B4 80081714 8FB80110 */ lw $t8, 0x110($sp) /* AF88B8 80081718 3C190001 */ lui $t9, 1 @@ -798,7 +798,7 @@ glabel L80081AA0 /* AF93C4 80082224 24C6D988 */ addiu $a2, %lo(D_8013D988) # addiu $a2, $a2, -0x2678 /* AF93C8 80082228 27A400EC */ addiu $a0, $sp, 0xec /* AF93CC 8008222C 2407030E */ li $a3, 782 -/* AF93D0 80082230 0C031AD5 */ jal func_800C6B54 +/* AF93D0 80082230 0C031AD5 */ jal Graph_CloseDisp /* AF93D4 80082234 8DE50000 */ lw $a1, ($t7) /* AF93D8 80082238 8FBF001C */ lw $ra, 0x1c($sp) /* AF93DC 8008223C 27BD0110 */ addiu $sp, $sp, 0x110 diff --git a/asm/non_matchings/code/z_map_exp/func_80081240.s b/asm/non_matchings/code/z_map_exp/func_80081240.s index 415a87f32e..86d95373e1 100644 --- a/asm/non_matchings/code/z_map_exp/func_80081240.s +++ b/asm/non_matchings/code/z_map_exp/func_80081240.s @@ -35,7 +35,7 @@ glabel func_80081240 /* AF8400 80081260 8C850000 */ lw $a1, ($a0) /* AF8404 80081264 27A40050 */ addiu $a0, $sp, 0x50 /* AF8408 80081268 24070235 */ li $a3, 565 -/* AF840C 8008126C 0C031AB1 */ jal func_800C6AC4 +/* AF840C 8008126C 0C031AB1 */ jal Graph_OpenDisp /* AF8410 80081270 00A08025 */ move $s0, $a1 /* AF8414 80081274 8FA20070 */ lw $v0, 0x70($sp) /* AF8418 80081278 3C180001 */ lui $t8, 1 @@ -323,7 +323,7 @@ glabel func_80081240 /* AF8858 800816B8 24C6D948 */ addiu $a2, %lo(D_8013D948) # addiu $a2, $a2, -0x26b8 /* AF885C 800816BC 27A40050 */ addiu $a0, $sp, 0x50 /* AF8860 800816C0 8C450000 */ lw $a1, ($v0) -/* AF8864 800816C4 0C031AD5 */ jal func_800C6B54 +/* AF8864 800816C4 0C031AD5 */ jal Graph_CloseDisp /* AF8868 800816C8 2407025F */ li $a3, 607 /* AF886C 800816CC 8FBF001C */ lw $ra, 0x1c($sp) /* AF8870 800816D0 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s b/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s index f475f3fe36..fe61e346b9 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s @@ -6,7 +6,7 @@ glabel func_8010F2CC /* B8647C 8010F2DC 24C64984 */ addiu $a2, %lo(D_80154984) # addiu $a2, $a2, 0x4984 /* B86480 8010F2E0 27A40050 */ addiu $a0, $sp, 0x50 /* B86484 8010F2E4 AFA5006C */ sw $a1, 0x6c($sp) -/* B86488 8010F2E8 0C031AB1 */ jal func_800C6AC4 +/* B86488 8010F2E8 0C031AB1 */ jal Graph_OpenDisp /* B8648C 8010F2EC 24070D9D */ li $a3, 3485 /* B86490 8010F2F0 8FAE0068 */ lw $t6, 0x68($sp) /* B86494 8010F2F4 3C0F8015 */ lui $t7, %hi(D_80153CF8) # $t7, 0x8015 @@ -109,7 +109,7 @@ glabel func_8010F2CC /* B86610 8010F470 3C068015 */ lui $a2, %hi(D_80154998) # $a2, 0x8015 /* B86614 8010F474 24C64998 */ addiu $a2, %lo(D_80154998) # addiu $a2, $a2, 0x4998 /* B86618 8010F478 27A40050 */ addiu $a0, $sp, 0x50 -/* B8661C 8010F47C 0C031AD5 */ jal func_800C6B54 +/* B8661C 8010F47C 0C031AD5 */ jal Graph_CloseDisp /* B86620 8010F480 24070DB9 */ li $a3, 3513 /* B86624 8010F484 8FBF0014 */ lw $ra, 0x14($sp) /* B86628 8010F488 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/non_matchings/code/z_message_PAL/func_8010F58C.s b/asm/non_matchings/code/z_message_PAL/func_8010F58C.s index 9a76f1e394..c384e94679 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010F58C.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010F58C.s @@ -9,7 +9,7 @@ glabel func_8010F58C /* B86748 8010F5A8 24C649C4 */ addiu $a2, %lo(D_801549C4) # addiu $a2, $a2, 0x49c4 /* B8674C 8010F5AC 27A40038 */ addiu $a0, $sp, 0x38 /* B86750 8010F5B0 24070DE2 */ li $a3, 3554 -/* B86754 8010F5B4 0C031AB1 */ jal func_800C6AC4 +/* B86754 8010F5B4 0C031AB1 */ jal Graph_OpenDisp /* B86758 8010F5B8 00A08025 */ move $s0, $a1 /* B8675C 8010F5BC 3C0E8016 */ lui $t6, %hi(gSaveContext+0xf40) # $t6, 0x8016 /* B86760 8010F5C0 91CEF5A0 */ lbu $t6, %lo(gSaveContext+0xf40)($t6) @@ -28,7 +28,7 @@ glabel func_8010F58C /* B86794 8010F5F4 5320001B */ beql $t9, $zero, .L8010F664 /* B86798 8010F5F8 8E0402C0 */ lw $a0, 0x2c0($s0) /* B8679C 8010F5FC 8E0402C0 */ lw $a0, 0x2c0($s0) -/* B867A0 8010F600 0C031B08 */ jal func_800C6C20 +/* B867A0 8010F600 0C031B08 */ jal Graph_GfxPlusOne /* B867A4 8010F604 AFA40050 */ sw $a0, 0x50($sp) /* B867A8 8010F608 AFA20054 */ sw $v0, 0x54($sp) /* B867AC 8010F60C 8E0302B0 */ lw $v1, 0x2b0($s0) @@ -48,13 +48,13 @@ glabel func_8010F58C /* B867E4 8010F644 AD600004 */ sw $zero, 4($t3) /* B867E8 8010F648 AD6D0000 */ sw $t5, ($t3) /* B867EC 8010F64C 8FA50054 */ lw $a1, 0x54($sp) -/* B867F0 8010F650 0C031B0A */ jal func_800C6C28 +/* B867F0 8010F650 0C031B0A */ jal Graph_BranchDlist /* B867F4 8010F654 8FA40050 */ lw $a0, 0x50($sp) /* B867F8 8010F658 8FAE0054 */ lw $t6, 0x54($sp) /* B867FC 8010F65C AE0E02C0 */ sw $t6, 0x2c0($s0) /* B86800 8010F660 8E0402C0 */ lw $a0, 0x2c0($s0) .L8010F664: -/* B86804 8010F664 0C031B08 */ jal func_800C6C20 +/* B86804 8010F664 0C031B08 */ jal Graph_GfxPlusOne /* B86808 8010F668 AFA40050 */ sw $a0, 0x50($sp) /* B8680C 8010F66C AFA20054 */ sw $v0, 0x54($sp) /* B86810 8010F670 8E0302B0 */ lw $v1, 0x2b0($s0) @@ -74,7 +74,7 @@ glabel func_8010F58C /* B86848 8010F6A8 AD000004 */ sw $zero, 4($t0) /* B8684C 8010F6AC AD0A0000 */ sw $t2, ($t0) /* B86850 8010F6B0 8FA50054 */ lw $a1, 0x54($sp) -/* B86854 8010F6B4 0C031B0A */ jal func_800C6C28 +/* B86854 8010F6B4 0C031B0A */ jal Graph_BranchDlist /* B86858 8010F6B8 8FA40050 */ lw $a0, 0x50($sp) /* B8685C 8010F6BC 8FAB0054 */ lw $t3, 0x54($sp) /* B86860 8010F6C0 3C068015 */ lui $a2, %hi(D_801549D8) # $a2, 0x8015 @@ -82,7 +82,7 @@ glabel func_8010F58C /* B86868 8010F6C8 AE0B02C0 */ sw $t3, 0x2c0($s0) /* B8686C 8010F6CC 8E250000 */ lw $a1, ($s1) /* B86870 8010F6D0 27A40038 */ addiu $a0, $sp, 0x38 -/* B86874 8010F6D4 0C031AD5 */ jal func_800C6B54 +/* B86874 8010F6D4 0C031AD5 */ jal Graph_CloseDisp /* B86878 8010F6D8 24070DFE */ li $a3, 3582 /* B8687C 8010F6DC 8FBF001C */ lw $ra, 0x1c($sp) /* B86880 8010F6E0 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/code/z_parameter/Interface_Draw.s b/asm/non_matchings/code/z_parameter/Interface_Draw.s index 8f1ca439b0..f1cb96cda4 100644 --- a/asm/non_matchings/code/z_parameter/Interface_Draw.s +++ b/asm/non_matchings/code/z_parameter/Interface_Draw.s @@ -92,7 +92,7 @@ glabel Interface_Draw /* B01BB4 8008AA14 27A40260 */ addiu $a0, $sp, 0x260 /* B01BB8 8008AA18 24C6E38C */ addiu $a2, %lo(D_8013E38C) # addiu $a2, $a2, -0x1c74 /* B01BBC 8008AA1C 24070D4D */ li $a3, 3405 -/* B01BC0 8008AA20 0C031AB1 */ jal func_800C6AC4 +/* B01BC0 8008AA20 0C031AB1 */ jal Graph_OpenDisp /* B01BC4 8008AA24 00A0A025 */ move $s4, $a1 /* B01BC8 8008AA28 8E8702B0 */ lw $a3, 0x2b0($s4) /* B01BCC 8008AA2C 3C18DB06 */ lui $t8, (0xDB060008 >> 16) # lui $t8, 0xdb06 @@ -3065,7 +3065,7 @@ glabel L8008D1EC /* B04780 8008D5E0 ACEA0000 */ sw $t2, ($a3) .L8008D5E4: /* B04784 8008D5E4 8EE50000 */ lw $a1, ($s7) -/* B04788 8008D5E8 0C031AD5 */ jal func_800C6B54 +/* B04788 8008D5E8 0C031AD5 */ jal Graph_CloseDisp /* B0478C 8008D5EC 240710AD */ li $a3, 4269 /* B04790 8008D5F0 8FBF004C */ lw $ra, 0x4c($sp) /* B04794 8008D5F4 8FB0002C */ lw $s0, 0x2c($sp) diff --git a/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s b/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s index da9c006fc2..eddb062f50 100644 --- a/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s +++ b/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s @@ -19,7 +19,7 @@ glabel Interface_DrawItemButtons /* AFFE78 80088CD8 8C850000 */ lw $a1, ($a0) /* AFFE7C 80088CDC 27A40130 */ addiu $a0, $sp, 0x130 /* AFFE80 80088CE0 24070B54 */ li $a3, 2900 -/* AFFE84 80088CE4 0C031AB1 */ jal func_800C6AC4 +/* AFFE84 80088CE4 0C031AB1 */ jal Graph_OpenDisp /* AFFE88 80088CE8 AFA50140 */ sw $a1, 0x140($sp) /* AFFE8C 80088CEC 8FAA0140 */ lw $t2, 0x140($sp) /* AFFE90 80088CF0 3C19E700 */ lui $t9, 0xe700 @@ -931,7 +931,7 @@ glabel Interface_DrawItemButtons /* B00C7C 80089ADC 24C6E2EC */ addiu $a2, %lo(D_8013E2EC) # addiu $a2, $a2, -0x1d14 /* B00C80 80089AE0 27A40130 */ addiu $a0, $sp, 0x130 /* B00C84 80089AE4 24070BFF */ li $a3, 3071 -/* B00C88 80089AE8 0C031AD5 */ jal func_800C6B54 +/* B00C88 80089AE8 0C031AD5 */ jal Graph_CloseDisp /* B00C8C 80089AEC 8DC50000 */ lw $a1, ($t6) /* B00C90 80089AF0 8FBF002C */ lw $ra, 0x2c($sp) /* B00C94 80089AF4 27BD0158 */ addiu $sp, $sp, 0x158 diff --git a/asm/non_matchings/code/z_play/func_800BEDD8.s b/asm/non_matchings/code/z_play/func_800BEDD8.s index 1be2fffa21..2644ee2581 100644 --- a/asm/non_matchings/code/z_play/func_800BEDD8.s +++ b/asm/non_matchings/code/z_play/func_800BEDD8.s @@ -23,7 +23,7 @@ glabel func_800BEDD8 /* B35F94 800BEDF4 24C64720 */ addiu $a2, %lo(D_80144720) # addiu $a2, $a2, 0x4720 /* B35F98 800BEDF8 27A40208 */ addiu $a0, $sp, 0x208 /* B35F9C 800BEDFC 24070F43 */ li $a3, 3907 -/* B35FA0 800BEE00 0C031AB1 */ jal func_800C6AC4 +/* B35FA0 800BEE00 0C031AB1 */ jal Graph_OpenDisp /* B35FA4 800BEE04 02202825 */ move $a1, $s1 /* B35FA8 800BEE08 3C040001 */ lui $a0, 1 /* B35FAC 800BEE0C 02044021 */ addu $t0, $s0, $a0 @@ -258,7 +258,7 @@ glabel func_800BEDD8 /* B3633C 800BF19C 00000000 */ nop /* B36340 800BF1A0 8E2402C0 */ lw $a0, 0x2c0($s1) .L800BF1A4: -/* B36344 800BF1A4 0C031B08 */ jal func_800C6C20 +/* B36344 800BF1A4 0C031B08 */ jal Graph_GfxPlusOne /* B36348 800BF1A8 AFA401CC */ sw $a0, 0x1cc($sp) /* B3634C 800BF1AC AFA201D0 */ sw $v0, 0x1d0($sp) /* B36350 800BF1B0 8E2202B0 */ lw $v0, 0x2b0($s1) @@ -331,7 +331,7 @@ glabel func_800BEDD8 /* B36450 800BF2B0 AD800004 */ sw $zero, 4($t4) /* B36454 800BF2B4 AD8E0000 */ sw $t6, ($t4) /* B36458 800BF2B8 8FA501D0 */ lw $a1, 0x1d0($sp) -/* B3645C 800BF2BC 0C031B0A */ jal func_800C6C28 +/* B3645C 800BF2BC 0C031B0A */ jal Graph_BranchDlist /* B36460 800BF2C0 8FA401CC */ lw $a0, 0x1cc($sp) /* B36464 800BF2C4 8FAF01D0 */ lw $t7, 0x1d0($sp) /* B36468 800BF2C8 AE2F02C0 */ sw $t7, 0x2c0($s1) @@ -895,7 +895,7 @@ glabel func_800BEDD8 /* B36C5C 800BFABC 24C64738 */ addiu $a2, %lo(D_80144738) # addiu $a2, $a2, 0x4738 /* B36C60 800BFAC0 27A40208 */ addiu $a0, $sp, 0x208 /* B36C64 800BFAC4 02202825 */ move $a1, $s1 -/* B36C68 800BFAC8 0C031AD5 */ jal func_800C6B54 +/* B36C68 800BFAC8 0C031AD5 */ jal Graph_CloseDisp /* B36C6C 800BFACC 2407119C */ li $a3, 4508 /* B36C70 800BFAD0 8FBF002C */ lw $ra, 0x2c($sp) /* B36C74 800BFAD4 8FB00024 */ lw $s0, 0x24($sp) diff --git a/asm/non_matchings/code/z_player_lib/func_8008F470.s b/asm/non_matchings/code/z_player_lib/func_8008F470.s index cf9a6fec69..d85c921802 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008F470.s +++ b/asm/non_matchings/code/z_player_lib/func_8008F470.s @@ -27,7 +27,7 @@ glabel func_8008F470 /* B0664C 8008F4AC 24C6E770 */ addiu $a2, %lo(D_8013E770) # addiu $a2, $a2, -0x1890 /* B06650 8008F4B0 27A40068 */ addiu $a0, $sp, 0x68 /* B06654 8008F4B4 240706B9 */ li $a3, 1721 -/* B06658 8008F4B8 0C031AB1 */ jal func_800C6AC4 +/* B06658 8008F4B8 0C031AB1 */ jal Graph_OpenDisp /* B0665C 8008F4BC AFA50078 */ sw $a1, 0x78($sp) /* B06660 8008F4C0 8FA90080 */ lw $t1, 0x80($sp) /* B06664 8008F4C4 8FA80078 */ lw $t0, 0x78($sp) @@ -272,7 +272,7 @@ glabel func_8008F470 /* B069F8 8008F858 24C6E784 */ addiu $a2, %lo(D_8013E784) # addiu $a2, $a2, -0x187c /* B069FC 8008F85C 27A40068 */ addiu $a0, $sp, 0x68 /* B06A00 8008F860 2407070B */ li $a3, 1803 -/* B06A04 8008F864 0C031AD5 */ jal func_800C6B54 +/* B06A04 8008F864 0C031AD5 */ jal Graph_CloseDisp /* B06A08 8008F868 8F050000 */ lw $a1, ($t8) /* B06A0C 8008F86C 8FBF0024 */ lw $ra, 0x24($sp) /* B06A10 8008F870 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/non_matchings/code/z_player_lib/func_800907E4.s b/asm/non_matchings/code/z_player_lib/func_800907E4.s index f8dea9f2f4..b95833c742 100644 --- a/asm/non_matchings/code/z_player_lib/func_800907E4.s +++ b/asm/non_matchings/code/z_player_lib/func_800907E4.s @@ -41,7 +41,7 @@ glabel func_800907E4 /* B079D4 80090834 24C6E798 */ addiu $a2, %lo(D_8013E798) # addiu $a2, $a2, -0x1868 /* B079D8 80090838 8DE50000 */ lw $a1, ($t7) /* B079DC 8009083C 24070961 */ li $a3, 2401 -/* B079E0 80090840 0C031AB1 */ jal func_800C6AC4 +/* B079E0 80090840 0C031AB1 */ jal Graph_OpenDisp /* B079E4 80090844 AFA50048 */ sw $a1, 0x48($sp) /* B079E8 80090848 8E1801B0 */ lw $t8, 0x1b0($s0) /* B079EC 8009084C 3C018000 */ lui $at, 0x8000 @@ -127,7 +127,7 @@ glabel func_800907E4 /* B07B2C 8009098C 24C6E7AC */ addiu $a2, %lo(D_8013E7AC) # addiu $a2, $a2, -0x1854 /* B07B30 80090990 27A40038 */ addiu $a0, $sp, 0x38 /* B07B34 80090994 24070975 */ li $a3, 2421 -/* B07B38 80090998 0C031AD5 */ jal func_800C6B54 +/* B07B38 80090998 0C031AD5 */ jal Graph_CloseDisp /* B07B3C 8009099C 8F050000 */ lw $a1, ($t8) /* B07B40 800909A0 8FBF001C */ lw $ra, 0x1c($sp) /* B07B44 800909A4 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_player_lib/func_80090AFC.s b/asm/non_matchings/code/z_player_lib/func_80090AFC.s index c2f1b107b3..c95c98dd9a 100644 --- a/asm/non_matchings/code/z_player_lib/func_80090AFC.s +++ b/asm/non_matchings/code/z_player_lib/func_80090AFC.s @@ -65,7 +65,7 @@ glabel func_80090AFC /* B07D44 80090BA4 24C6E7C0 */ addiu $a2, %lo(D_8013E7C0) # addiu $a2, $a2, -0x1840 /* B07D48 80090BA8 27A4004C */ addiu $a0, $sp, 0x4c /* B07D4C 80090BAC 24070A0C */ li $a3, 2572 -/* B07D50 80090BB0 0C031AB1 */ jal func_800C6AC4 +/* B07D50 80090BB0 0C031AB1 */ jal Graph_OpenDisp /* B07D54 80090BB4 00A08025 */ move $s0, $a1 /* B07D58 80090BB8 8E0402B0 */ lw $a0, 0x2b0($s0) /* B07D5C 80090BBC 0C024DDD */ jal Gfx_CallSetupDL @@ -152,7 +152,7 @@ glabel func_80090AFC /* B07E98 80090CF8 AC4E0004 */ sw $t6, 4($v0) /* B07E9C 80090CFC AC4D0000 */ sw $t5, ($v0) /* B07EA0 80090D00 8FAF00A0 */ lw $t7, 0xa0($sp) -/* B07EA4 80090D04 0C031AD5 */ jal func_800C6B54 +/* B07EA4 80090D04 0C031AD5 */ jal Graph_CloseDisp /* B07EA8 80090D08 8DE50000 */ lw $a1, ($t7) .L80090D0C: /* B07EAC 80090D0C 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/code/z_player_lib/func_80090D20.s b/asm/non_matchings/code/z_player_lib/func_80090D20.s index bfaf2a2470..d2148ae1f5 100644 --- a/asm/non_matchings/code/z_player_lib/func_80090D20.s +++ b/asm/non_matchings/code/z_player_lib/func_80090D20.s @@ -95,7 +95,7 @@ glabel func_80090D20 /* B07F34 80090D94 3C068014 */ lui $a2, %hi(D_8013E7FC) /* B07F38 80090D98 24C6E7FC */ addiu $a2, %lo(D_8013E7FC) # addiu $a2, $a2, -0x1804 /* B07F3C 80090D9C 24070A49 */ li $a3, 2633 -/* B07F40 80090DA0 0C031AB1 */ jal func_800C6AC4 +/* B07F40 80090DA0 0C031AB1 */ jal Graph_OpenDisp /* B07F44 80090DA4 AFA50120 */ sw $a1, 0x120($sp) /* B07F48 80090DA8 C6040054 */ lwc1 $f4, 0x54($s0) /* B07F4C 80090DAC 44803000 */ mtc1 $zero, $f6 @@ -175,7 +175,7 @@ glabel func_80090D20 /* B0806C 80090ECC AC580000 */ sw $t8, ($v0) /* B08070 80090ED0 8FAA0190 */ lw $t2, 0x190($sp) /* B08074 80090ED4 24070A60 */ li $a3, 2656 -/* B08078 80090ED8 0C031AD5 */ jal func_800C6B54 +/* B08078 80090ED8 0C031AD5 */ jal Graph_CloseDisp /* B0807C 80090EDC 8D450000 */ lw $a1, ($t2) /* B08080 80090EE0 10000072 */ b .L800910AC /* B08084 80090EE4 C6000054 */ lwc1 $f0, 0x54($s0) @@ -239,7 +239,7 @@ glabel func_80090D20 /* B0815C 80090FBC AFA900E0 */ sw $t1, 0xe0($sp) /* B08160 80090FC0 27A400CC */ addiu $a0, $sp, 0xcc /* B08164 80090FC4 24070A96 */ li $a3, 2710 -/* B08168 80090FC8 0C031AB1 */ jal func_800C6AC4 +/* B08168 80090FC8 0C031AB1 */ jal Graph_OpenDisp /* B0816C 80090FCC AFA500DC */ sw $a1, 0xdc($sp) /* B08170 80090FD0 8FA800DC */ lw $t0, 0xdc($sp) /* B08174 80090FD4 8FA900E0 */ lw $t1, 0xe0($sp) @@ -293,7 +293,7 @@ glabel func_80090D20 /* B08234 80091094 24070A9D */ li $a3, 2717 /* B08238 80091098 AC4E0004 */ sw $t6, 4($v0) /* B0823C 8009109C 8FB80190 */ lw $t8, 0x190($sp) -/* B08240 800910A0 0C031AD5 */ jal func_800C6B54 +/* B08240 800910A0 0C031AD5 */ jal Graph_CloseDisp /* B08244 800910A4 8F050000 */ lw $a1, ($t8) /* B08248 800910A8 C6000054 */ lwc1 $f0, 0x54($s0) .L800910AC: @@ -416,7 +416,7 @@ glabel func_80090D20 /* B08400 80091260 24C6E874 */ addiu $a2, %lo(D_8013E874) # addiu $a2, $a2, -0x178c /* B08404 80091264 27A4009C */ addiu $a0, $sp, 0x9c /* B08408 80091268 24070ADF */ li $a3, 2783 -/* B0840C 8009126C 0C031AB1 */ jal func_800C6AC4 +/* B0840C 8009126C 0C031AB1 */ jal Graph_OpenDisp /* B08410 80091270 AFA500AC */ sw $a1, 0xac($sp) /* B08414 80091274 0C034213 */ jal Matrix_Push /* B08418 80091278 00000000 */ nop @@ -525,7 +525,7 @@ glabel func_80090D20 /* B085A0 80091400 24C6E89C */ addiu $a2, %lo(D_8013E89C) # addiu $a2, $a2, -0x1764 /* B085A4 80091404 27A4009C */ addiu $a0, $sp, 0x9c /* B085A8 80091408 24070AF9 */ li $a3, 2809 -/* B085AC 8009140C 0C031AD5 */ jal func_800C6B54 +/* B085AC 8009140C 0C031AD5 */ jal Graph_CloseDisp /* B085B0 80091410 8DC50000 */ lw $a1, ($t6) /* B085B4 80091414 10000013 */ b .L80091464 /* B085B8 80091418 C6000054 */ lwc1 $f0, 0x54($s0) diff --git a/asm/non_matchings/code/z_player_lib/func_80091A24.s b/asm/non_matchings/code/z_player_lib/func_80091A24.s index 3a32f0a6ba..cce3fdff9e 100644 --- a/asm/non_matchings/code/z_player_lib/func_80091A24.s +++ b/asm/non_matchings/code/z_player_lib/func_80091A24.s @@ -30,7 +30,7 @@ glabel func_80091A24 /* B08C0C 80091A6C 24C6E8D8 */ addiu $a2, %lo(D_8013E8D8) # addiu $a2, $a2, -0x1728 /* B08C10 80091A70 27A40104 */ addiu $a0, $sp, 0x104 /* B08C14 80091A74 24070C39 */ li $a3, 3129 -/* B08C18 80091A78 0C031AB1 */ jal func_800C6AC4 +/* B08C18 80091A78 0C031AB1 */ jal Graph_OpenDisp /* B08C1C 80091A7C AFA50114 */ sw $a1, 0x114($sp) /* B08C20 80091A80 8FA30114 */ lw $v1, 0x114($sp) /* B08C24 80091A84 3C05DE00 */ lui $a1, 0xde00 @@ -461,7 +461,7 @@ glabel func_80091A24 /* B092C8 80092128 AC8F0004 */ sw $t7, 4($a0) /* B092CC 8009212C 8FAE0130 */ lw $t6, 0x130($sp) /* B092D0 80092130 27A40104 */ addiu $a0, $sp, 0x104 -/* B092D4 80092134 0C031AD5 */ jal func_800C6B54 +/* B092D4 80092134 0C031AD5 */ jal Graph_CloseDisp /* B092D8 80092138 8DC50000 */ lw $a1, ($t6) /* B092DC 8009213C 8FBF0034 */ lw $ra, 0x34($sp) /* B092E0 80092140 27BD0130 */ addiu $sp, $sp, 0x130 diff --git a/asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s b/asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s index a793df5f00..7885189604 100644 --- a/asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s +++ b/asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s @@ -4,7 +4,7 @@ glabel Gfx_BranchTexScroll /* B0BF60 80094DC0 AFA5001C */ sw $a1, 0x1c($sp) /* B0BF64 80094DC4 AFA60020 */ sw $a2, 0x20($sp) /* B0BF68 80094DC8 AFA70024 */ sw $a3, 0x24($sp) -/* B0BF6C 80094DCC 0C031B0F */ jal func_800C6C3C +/* B0BF6C 80094DCC 0C031B0F */ jal Graph_DlistAlloc /* B0BF70 80094DD0 24050018 */ li $a1, 24 /* B0BF74 80094DD4 8FA4001C */ lw $a0, 0x1c($sp) /* B0BF78 80094DD8 8FA50020 */ lw $a1, 0x20($sp) diff --git a/asm/non_matchings/code/z_room/func_80095D04.s b/asm/non_matchings/code/z_room/func_80095D04.s index a073b50d99..588145d644 100644 --- a/asm/non_matchings/code/z_room/func_80095D04.s +++ b/asm/non_matchings/code/z_room/func_80095D04.s @@ -31,7 +31,7 @@ glabel func_80095D04 /* B0CED0 80095D30 AFA000B4 */ sw $zero, 0xb4($sp) /* B0CED4 80095D34 27A4005C */ addiu $a0, $sp, 0x5c /* B0CED8 80095D38 2407011F */ li $a3, 287 -/* B0CEDC 80095D3C 0C031AB1 */ jal func_800C6AC4 +/* B0CEDC 80095D3C 0C031AB1 */ jal Graph_OpenDisp /* B0CEE0 80095D40 AFA5006C */ sw $a1, 0x6c($sp) /* B0CEE4 80095D44 32110001 */ andi $s1, $s0, 1 /* B0CEE8 80095D48 8FA9006C */ lw $t1, 0x6c($sp) @@ -367,7 +367,7 @@ glabel func_80095D04 /* B0D3B0 80096210 24C6EF80 */ addiu $a2, %lo(D_8013EF80) # addiu $a2, $a2, -0x1080 /* B0D3B4 80096214 27A4005C */ addiu $a0, $sp, 0x5c /* B0D3B8 80096218 240701AE */ li $a3, 430 -/* B0D3BC 8009621C 0C031AD5 */ jal func_800C6B54 +/* B0D3BC 8009621C 0C031AD5 */ jal Graph_CloseDisp /* B0D3C0 80096220 8DC50000 */ lw $a1, ($t6) /* B0D3C4 80096224 8FBF001C */ lw $ra, 0x1c($sp) /* B0D3C8 80096228 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/code/z_room/func_80096B6C.s b/asm/non_matchings/code/z_room/func_80096B6C.s index d4ecbeac47..14941c2446 100644 --- a/asm/non_matchings/code/z_room/func_80096B6C.s +++ b/asm/non_matchings/code/z_room/func_80096B6C.s @@ -33,7 +33,7 @@ glabel func_80096B6C /* B0DD2C 80096B8C 24C6F0FC */ addiu $a2, %lo(D_8013F0FC) # addiu $a2, $a2, -0xf04 /* B0DD30 80096B90 27A40078 */ addiu $a0, $sp, 0x78 /* B0DD34 80096B94 240702F0 */ li $a3, 752 -/* B0DD38 80096B98 0C031AB1 */ jal func_800C6AC4 +/* B0DD38 80096B98 0C031AB1 */ jal Graph_OpenDisp /* B0DD3C 80096B9C 00A08025 */ move $s0, $a1 /* B0DD40 80096BA0 8FA500B0 */ lw $a1, 0xb0($sp) /* B0DD44 80096BA4 8FAC00B4 */ lw $t4, 0xb4($sp) @@ -279,7 +279,7 @@ glabel func_80096B6C /* B0E0E4 80096F44 24C6F108 */ addiu $a2, %lo(D_8013F108) # addiu $a2, $a2, -0xef8 /* B0E0E8 80096F48 27A40078 */ addiu $a0, $sp, 0x78 /* B0E0EC 80096F4C 24070333 */ li $a3, 819 -/* B0E0F0 80096F50 0C031AD5 */ jal func_800C6B54 +/* B0E0F0 80096F50 0C031AD5 */ jal Graph_CloseDisp /* B0E0F4 80096F54 8F250000 */ lw $a1, ($t9) /* B0E0F8 80096F58 8FBF003C */ lw $ra, 0x3c($sp) /* B0E0FC 80096F5C 8FB00038 */ lw $s0, 0x38($sp) diff --git a/asm/non_matchings/code/z_sample/Sample_Draw.s b/asm/non_matchings/code/z_sample/Sample_Draw.s index 304b7b5228..2dbef33248 100644 --- a/asm/non_matchings/code/z_sample/Sample_Draw.s +++ b/asm/non_matchings/code/z_sample/Sample_Draw.s @@ -18,7 +18,7 @@ glabel Sample_Draw /* B0E7BC 8009761C 24C6F2C0 */ addiu $a2, %lo(D_8013F2C0) # addiu $a2, $a2, -0xd40 /* B0E7C0 80097620 27A40054 */ addiu $a0, $sp, 0x54 /* B0E7C4 80097624 2407003E */ li $a3, 62 -/* B0E7C8 80097628 0C031AB1 */ jal func_800C6AC4 +/* B0E7C8 80097628 0C031AB1 */ jal Graph_OpenDisp /* B0E7CC 8009762C 02002825 */ move $a1, $s0 /* B0E7D0 80097630 8E0202C0 */ lw $v0, 0x2c0($s0) /* B0E7D4 80097634 3C18DB06 */ lui $t8, 0xdb06 @@ -137,7 +137,7 @@ glabel Sample_Draw /* B0E998 800977F8 02002825 */ move $a1, $s0 /* B0E99C 800977FC 2407006F */ li $a3, 111 /* B0E9A0 80097800 AC4B0004 */ sw $t3, 4($v0) -/* B0E9A4 80097804 0C031AD5 */ jal func_800C6B54 +/* B0E9A4 80097804 0C031AD5 */ jal Graph_CloseDisp /* B0E9A8 80097808 AC4A0000 */ sw $t2, ($v0) /* B0E9AC 8009780C 8FBF002C */ lw $ra, 0x2c($sp) /* B0E9B0 80097810 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/non_matchings/code/z_scene_table/func_8009FE58.s b/asm/non_matchings/code/z_scene_table/func_8009FE58.s index 045b22b4cf..71c80969c4 100644 --- a/asm/non_matchings/code/z_scene_table/func_8009FE58.s +++ b/asm/non_matchings/code/z_scene_table/func_8009FE58.s @@ -53,7 +53,7 @@ glabel func_8009FE58 /* B17010 8009FE70 24C6FE60 */ addiu $a2, %lo(D_8013FE60) # addiu $a2, $a2, -0x1a0 /* B17014 8009FE74 27A4007C */ addiu $a0, $sp, 0x7c /* B17018 8009FE78 24071E20 */ li $a3, 7712 -/* B1701C 8009FE7C 0C031AB1 */ jal func_800C6AC4 +/* B1701C 8009FE7C 0C031AB1 */ jal Graph_OpenDisp /* B17020 8009FE80 00A08025 */ move $s0, $a1 /* B17024 8009FE84 8FAA0098 */ lw $t2, 0x98($sp) /* B17028 8009FE88 3C010001 */ lui $at, 1 @@ -359,7 +359,7 @@ glabel func_8009FE58 /* B174AC 800A030C 8FAE0098 */ lw $t6, 0x98($sp) /* B174B0 800A0310 27A4007C */ addiu $a0, $sp, 0x7c /* B174B4 800A0314 24071E83 */ li $a3, 7811 -/* B174B8 800A0318 0C031AD5 */ jal func_800C6B54 +/* B174B8 800A0318 0C031AD5 */ jal Graph_CloseDisp /* B174BC 800A031C 8DC50000 */ lw $a1, ($t6) /* B174C0 800A0320 8FBF003C */ lw $ra, 0x3c($sp) /* B174C4 800A0324 8FB00038 */ lw $s0, 0x38($sp) diff --git a/asm/non_matchings/code/z_skin/func_800A598C.s b/asm/non_matchings/code/z_skin/func_800A598C.s index 2c561b7a29..78c8b55f52 100644 --- a/asm/non_matchings/code/z_skin/func_800A598C.s +++ b/asm/non_matchings/code/z_skin/func_800A598C.s @@ -38,7 +38,7 @@ glabel func_800A598C /* B1CB84 800A59E4 24C60680 */ addiu $a2, %lo(D_80140680) # addiu $a2, $a2, 0x680 /* B1CB88 800A59E8 240700FE */ li $a3, 254 /* B1CB8C 800A59EC 8FA50118 */ lw $a1, 0x118($sp) -/* B1CB90 800A59F0 0C031AB1 */ jal func_800C6AC4 +/* B1CB90 800A59F0 0C031AB1 */ jal Graph_OpenDisp /* B1CB94 800A59F4 27A400B8 */ addiu $a0, $sp, 0xb8 /* B1CB98 800A59F8 8E0E0000 */ lw $t6, ($s0) /* B1CB9C 800A59FC 3C0A8016 */ lui $t2, %hi(gSegments) # $t2, 0x8016 @@ -297,7 +297,7 @@ glabel func_800A598C /* B1CF70 800A5DD0 A1B80000 */ sb $t8, ($t5) /* B1CF74 800A5DD4 A1A00000 */ sb $zero, ($t5) .L800A5DD8: -/* B1CF78 800A5DD8 0C031AD5 */ jal func_800C6B54 +/* B1CF78 800A5DD8 0C031AD5 */ jal Graph_CloseDisp /* B1CF7C 800A5DDC 24070158 */ li $a3, 344 /* B1CF80 800A5DE0 8FBF0074 */ lw $ra, 0x74($sp) /* B1CF84 800A5DE4 D7B40020 */ ldc1 $f20, 0x20($sp) diff --git a/asm/non_matchings/code/z_skin/func_800A5E28.s b/asm/non_matchings/code/z_skin/func_800A5E28.s index ed6a2cde3b..45a41a4c96 100644 --- a/asm/non_matchings/code/z_skin/func_800A5E28.s +++ b/asm/non_matchings/code/z_skin/func_800A5E28.s @@ -20,7 +20,7 @@ glabel func_800A5E28 /* B1CFE8 800A5E48 24C60698 */ addiu $a2, %lo(D_80140698) # addiu $a2, $a2, 0x698 /* B1CFEC 800A5E4C 2407016C */ li $a3, 364 /* B1CFF0 800A5E50 02002825 */ move $a1, $s0 -/* B1CFF4 800A5E54 0C031AB1 */ jal func_800C6AC4 +/* B1CFF4 800A5E54 0C031AB1 */ jal Graph_OpenDisp /* B1CFF8 800A5E58 27A4002C */ addiu $a0, $sp, 0x2c /* B1CFFC 800A5E5C 8FAE004C */ lw $t6, 0x4c($sp) /* B1D000 800A5E60 3C068016 */ lui $a2, %hi(gSegments) # $a2, 0x8016 @@ -81,7 +81,7 @@ glabel func_800A5E28 /* B1D0D8 800A5F38 27A4002C */ addiu $a0, $sp, 0x2c /* B1D0DC 800A5F3C 02002825 */ move $a1, $s0 /* B1D0E0 800A5F40 24070179 */ li $a3, 377 -/* B1D0E4 800A5F44 0C031AD5 */ jal func_800C6B54 +/* B1D0E4 800A5F44 0C031AD5 */ jal Graph_CloseDisp /* B1D0E8 800A5F48 AC6D0004 */ sw $t5, 4($v1) /* B1D0EC 800A5F4C 8FBF001C */ lw $ra, 0x1c($sp) /* B1D0F0 800A5F50 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_skin/func_800A5F60.s b/asm/non_matchings/code/z_skin/func_800A5F60.s index 4debffede1..8ae03bee86 100644 --- a/asm/non_matchings/code/z_skin/func_800A5F60.s +++ b/asm/non_matchings/code/z_skin/func_800A5F60.s @@ -22,7 +22,7 @@ glabel func_800A5F60 /* B1D128 800A5F88 AFA80054 */ sw $t0, 0x54($sp) /* B1D12C 800A5F8C 2407018B */ li $a3, 395 /* B1D130 800A5F90 02002825 */ move $a1, $s0 -/* B1D134 800A5F94 0C031AB1 */ jal func_800C6AC4 +/* B1D134 800A5F94 0C031AB1 */ jal Graph_OpenDisp /* B1D138 800A5F98 27A40038 */ addiu $a0, $sp, 0x38 /* B1D13C 800A5F9C 8FAE005C */ lw $t6, 0x5c($sp) /* B1D140 800A5FA0 3C048016 */ lui $a0, %hi(gSegments) # $a0, 0x8016 @@ -98,7 +98,7 @@ glabel func_800A5F60 /* B1D250 800A60B0 24C606BC */ addiu $a2, %lo(D_801406BC) # addiu $a2, $a2, 0x6bc /* B1D254 800A60B4 27A40038 */ addiu $a0, $sp, 0x38 /* B1D258 800A60B8 02002825 */ move $a1, $s0 -/* B1D25C 800A60BC 0C031AD5 */ jal func_800C6B54 +/* B1D25C 800A60BC 0C031AD5 */ jal Graph_CloseDisp /* B1D260 800A60C0 240701B1 */ li $a3, 433 /* B1D264 800A60C4 8FBF001C */ lw $ra, 0x1c($sp) /* B1D268 800A60C8 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_skin/func_800A60D8.s b/asm/non_matchings/code/z_skin/func_800A60D8.s index 84adcf6aea..e07cbd7bcb 100644 --- a/asm/non_matchings/code/z_skin/func_800A60D8.s +++ b/asm/non_matchings/code/z_skin/func_800A60D8.s @@ -29,7 +29,7 @@ glabel func_800A60D8 /* B1D2BC 800A611C 24C606C8 */ addiu $a2, %lo(D_801406C8) # addiu $a2, $a2, 0x6c8 /* B1D2C0 800A6120 240701D7 */ li $a3, 471 /* B1D2C4 800A6124 27A40060 */ addiu $a0, $sp, 0x60 -/* B1D2C8 800A6128 0C031AB1 */ jal func_800C6AC4 +/* B1D2C8 800A6128 0C031AB1 */ jal Graph_OpenDisp /* B1D2CC 800A612C 02A02825 */ move $a1, $s5 /* B1D2D0 800A6130 8FB600A4 */ lw $s6, 0xa4($sp) /* B1D2D4 800A6134 3C058016 */ lui $a1, %hi(D_801600C0) # $a1, 0x8016 @@ -154,7 +154,7 @@ glabel func_800A60D8 /* B1D48C 800A62EC 24C606D4 */ addiu $a2, %lo(D_801406D4) # addiu $a2, $a2, 0x6d4 /* B1D490 800A62F0 27A40060 */ addiu $a0, $sp, 0x60 /* B1D494 800A62F4 02A02825 */ move $a1, $s5 -/* B1D498 800A62F8 0C031AD5 */ jal func_800C6B54 +/* B1D498 800A62F8 0C031AD5 */ jal Graph_CloseDisp /* B1D49C 800A62FC 24070216 */ li $a3, 534 /* B1D4A0 800A6300 8FBF0044 */ lw $ra, 0x44($sp) /* B1D4A4 800A6304 8FB00020 */ lw $s0, 0x20($sp) diff --git a/asm/non_matchings/code/z_view/func_800AA550.s b/asm/non_matchings/code/z_view/func_800AA550.s index 1b421d5978..9a38876a20 100644 --- a/asm/non_matchings/code/z_view/func_800AA550.s +++ b/asm/non_matchings/code/z_view/func_800AA550.s @@ -110,7 +110,7 @@ glabel func_800AA550 /* B217E0 800AA640 24C61110 */ addiu $a2, %lo(D_80141110) # addiu $a2, $a2, 0x1110 /* B217E4 800AA644 27A4003C */ addiu $a0, $sp, 0x3c /* B217E8 800AA648 02002825 */ move $a1, $s0 -/* B217EC 800AA64C 0C031AB1 */ jal func_800C6AC4 +/* B217EC 800AA64C 0C031AB1 */ jal Graph_OpenDisp /* B217F0 800AA650 240701CB */ li $a3, 459 /* B217F4 800AA654 8E0302C0 */ lw $v1, 0x2c0($s0) /* B217F8 800AA658 3C06E700 */ lui $a2, 0xe700 @@ -175,7 +175,7 @@ glabel func_800AA550 /* B218E4 800AA744 AC650004 */ sw $a1, 4($v1) /* B218E8 800AA748 AC640000 */ sw $a0, ($v1) /* B218EC 800AA74C 27A4003C */ addiu $a0, $sp, 0x3c -/* B218F0 800AA750 0C031AD5 */ jal func_800C6B54 +/* B218F0 800AA750 0C031AD5 */ jal Graph_CloseDisp /* B218F4 800AA754 02002825 */ move $a1, $s0 /* B218F8 800AA758 8FBF001C */ lw $ra, 0x1c($sp) /* B218FC 800AA75C 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_view/func_800AAA9C.s b/asm/non_matchings/code/z_view/func_800AAA9C.s index 8fa379b248..9101d2fdca 100644 --- a/asm/non_matchings/code/z_view/func_800AAA9C.s +++ b/asm/non_matchings/code/z_view/func_800AAA9C.s @@ -76,7 +76,7 @@ glabel func_800AAA9C /* B21C5C 800AAABC 24C61134 */ addiu $a2, %lo(D_80141134) # addiu $a2, $a2, 0x1134 /* B21C60 800AAAC0 27A40108 */ addiu $a0, $sp, 0x108 /* B21C64 800AAAC4 24070254 */ li $a3, 596 -/* B21C68 800AAAC8 0C031AB1 */ jal func_800C6AC4 +/* B21C68 800AAAC8 0C031AB1 */ jal Graph_OpenDisp /* B21C6C 800AAACC 02402825 */ move $a1, $s2 /* B21C70 800AAAD0 02402025 */ move $a0, $s2 /* B21C74 800AAAD4 0C031A73 */ jal Graph_Alloc @@ -453,7 +453,7 @@ glabel func_800AAA9C /* B22218 800AB078 3C068014 */ lui $a2, %hi(D_801411F4) # $a2, 0x8014 /* B2221C 800AB07C AC440000 */ sw $a0, ($v0) /* B22220 800AB080 27A40108 */ addiu $a0, $sp, 0x108 -/* B22224 800AB084 0C031AD5 */ jal func_800C6B54 +/* B22224 800AB084 0C031AD5 */ jal Graph_CloseDisp /* B22228 800AB088 24C611F4 */ addiu $a2, %lo(D_801411F4) # addiu $a2, $a2, 0x11f4 /* B2222C 800AB08C 8FBF004C */ lw $ra, 0x4c($sp) /* B22230 800AB090 8FB00040 */ lw $s0, 0x40($sp) diff --git a/asm/non_matchings/code/z_view/func_800AB0A8.s b/asm/non_matchings/code/z_view/func_800AB0A8.s index 3e8a0f2f80..11ab14f88f 100644 --- a/asm/non_matchings/code/z_view/func_800AB0A8.s +++ b/asm/non_matchings/code/z_view/func_800AB0A8.s @@ -36,7 +36,7 @@ glabel func_800AB0A8 /* B22268 800AB0C8 24C61200 */ addiu $a2, %lo(D_80141200) # addiu $a2, $a2, 0x1200 /* B2226C 800AB0CC 27A40050 */ addiu $a0, $sp, 0x50 /* B22270 800AB0D0 240702D6 */ li $a3, 726 -/* B22274 800AB0D4 0C031AB1 */ jal func_800C6AC4 +/* B22274 800AB0D4 0C031AB1 */ jal Graph_OpenDisp /* B22278 800AB0D8 02002825 */ move $a1, $s0 /* B2227C 800AB0DC 02002025 */ move $a0, $s0 /* B22280 800AB0E0 0C031A73 */ jal Graph_Alloc @@ -152,7 +152,7 @@ glabel func_800AB0A8 /* B22434 800AB294 AE1902D0 */ sw $t9, 0x2d0($s0) /* B22438 800AB298 AC640000 */ sw $a0, ($v1) /* B2243C 800AB29C 27A40050 */ addiu $a0, $sp, 0x50 -/* B22440 800AB2A0 0C031AD5 */ jal func_800C6B54 +/* B22440 800AB2A0 0C031AD5 */ jal Graph_CloseDisp /* B22444 800AB2A4 AC710004 */ sw $s1, 4($v1) /* B22448 800AB2A8 8FBF0034 */ lw $ra, 0x34($sp) /* B2244C 800AB2AC 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/non_matchings/code/z_view/func_800AB2C4.s b/asm/non_matchings/code/z_view/func_800AB2C4.s index ce239ec00d..e7c6a4a013 100644 --- a/asm/non_matchings/code/z_view/func_800AB2C4.s +++ b/asm/non_matchings/code/z_view/func_800AB2C4.s @@ -36,7 +36,7 @@ glabel func_800AB2C4 /* B22484 800AB2E4 24C61240 */ addiu $a2, %lo(D_80141240) # addiu $a2, $a2, 0x1240 /* B22488 800AB2E8 27A40050 */ addiu $a0, $sp, 0x50 /* B2248C 800AB2EC 24070309 */ li $a3, 777 -/* B22490 800AB2F0 0C031AB1 */ jal func_800C6AC4 +/* B22490 800AB2F0 0C031AB1 */ jal Graph_OpenDisp /* B22494 800AB2F4 02002825 */ move $a1, $s0 /* B22498 800AB2F8 02002025 */ move $a0, $s0 /* B2249C 800AB2FC 0C031A73 */ jal Graph_Alloc @@ -184,7 +184,7 @@ glabel func_800AB2C4 /* B226D0 800AB530 02002825 */ move $a1, $s0 /* B226D4 800AB534 24070321 */ li $a3, 801 /* B226D8 800AB538 AC510004 */ sw $s1, 4($v0) -/* B226DC 800AB53C 0C031AD5 */ jal func_800C6B54 +/* B226DC 800AB53C 0C031AD5 */ jal Graph_CloseDisp /* B226E0 800AB540 AC4A0000 */ sw $t2, ($v0) /* B226E4 800AB544 8FBF0034 */ lw $ra, 0x34($sp) /* B226E8 800AB548 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/non_matchings/code/z_view/func_800AB560.s b/asm/non_matchings/code/z_view/func_800AB560.s index 80e6dd3aeb..20252ba6c6 100644 --- a/asm/non_matchings/code/z_view/func_800AB560.s +++ b/asm/non_matchings/code/z_view/func_800AB560.s @@ -43,7 +43,7 @@ glabel func_800AB560 /* B2271C 800AB57C 24C61280 */ addiu $a2, %lo(D_80141280) # addiu $a2, $a2, 0x1280 /* B22720 800AB580 27A40060 */ addiu $a0, $sp, 0x60 /* B22724 800AB584 24070330 */ li $a3, 816 -/* B22728 800AB588 0C031AB1 */ jal func_800C6AC4 +/* B22728 800AB588 0C031AB1 */ jal Graph_OpenDisp /* B2272C 800AB58C 02202825 */ move $a1, $s1 /* B22730 800AB590 02202025 */ move $a0, $s1 /* B22734 800AB594 0C031A73 */ jal Graph_Alloc @@ -277,7 +277,7 @@ glabel func_800AB560 /* B22AB8 800AB918 AC440004 */ sw $a0, 4($v0) /* B22ABC 800AB91C 27A40060 */ addiu $a0, $sp, 0x60 /* B22AC0 800AB920 24070367 */ li $a3, 871 -/* B22AC4 800AB924 0C031AD5 */ jal func_800C6B54 +/* B22AC4 800AB924 0C031AD5 */ jal Graph_CloseDisp /* B22AC8 800AB928 AC4D0000 */ sw $t5, ($v0) /* B22ACC 800AB92C 8FBF0034 */ lw $ra, 0x34($sp) /* B22AD0 800AB930 8FB0002C */ lw $s0, 0x2c($sp) diff --git a/asm/non_matchings/code/z_view/func_800AB944.s b/asm/non_matchings/code/z_view/func_800AB944.s index b591def69b..58d8f7f36e 100644 --- a/asm/non_matchings/code/z_view/func_800AB944.s +++ b/asm/non_matchings/code/z_view/func_800AB944.s @@ -17,7 +17,7 @@ glabel func_800AB944 /* B22AF8 800AB958 24C612D4 */ addiu $a2, %lo(D_801412D4) # addiu $a2, $a2, 0x12d4 /* B22AFC 800AB95C 8E050004 */ lw $a1, 4($s0) /* B22B00 800AB960 27A4003C */ addiu $a0, $sp, 0x3c -/* B22B04 800AB964 0C031AB1 */ jal func_800C6AC4 +/* B22B04 800AB964 0C031AB1 */ jal Graph_OpenDisp /* B22B08 800AB968 2407036E */ li $a3, 878 /* B22B0C 800AB96C C60C0028 */ lwc1 $f12, 0x28($s0) /* B22B10 800AB970 C60E002C */ lwc1 $f14, 0x2c($s0) @@ -44,7 +44,7 @@ glabel func_800AB944 /* B22B64 800AB9C4 24C612E0 */ addiu $a2, %lo(D_801412E0) # addiu $a2, $a2, 0x12e0 /* B22B68 800AB9C8 27A4003C */ addiu $a0, $sp, 0x3c /* B22B6C 800AB9CC 8E050004 */ lw $a1, 4($s0) -/* B22B70 800AB9D0 0C031AD5 */ jal func_800C6B54 +/* B22B70 800AB9D0 0C031AD5 */ jal Graph_CloseDisp /* B22B74 800AB9D4 24070376 */ li $a3, 886 /* B22B78 800AB9D8 8FBF0034 */ lw $ra, 0x34($sp) /* B22B7C 800AB9DC 8FB00030 */ lw $s0, 0x30($sp) diff --git a/asm/non_matchings/code/z_vismono/func_800AD5C0.s b/asm/non_matchings/code/z_vismono/func_800AD5C0.s index 18133011e6..153daad0a5 100644 --- a/asm/non_matchings/code/z_vismono/func_800AD5C0.s +++ b/asm/non_matchings/code/z_vismono/func_800AD5C0.s @@ -54,7 +54,7 @@ glabel func_800AD5C0 /* B24788 800AD5E8 10000007 */ b .L800AD608 /* B2478C 800AD5EC AFA20058 */ sw $v0, 0x58($sp) .L800AD5F0: -/* B24790 800AD5F0 0C031B0F */ jal func_800C6C3C +/* B24790 800AD5F0 0C031B0F */ jal Graph_DlistAlloc /* B24794 800AD5F4 24050200 */ li $a1, 512 /* B24798 800AD5F8 AFA20058 */ sw $v0, 0x58($sp) /* B2479C 800AD5FC 8FA40060 */ lw $a0, 0x60($sp) @@ -69,7 +69,7 @@ glabel func_800AD5C0 /* B247BC 800AD61C 10000037 */ b .L800AD6FC /* B247C0 800AD620 AFA20054 */ sw $v0, 0x54($sp) .L800AD624: -/* B247C4 800AD624 0C031B0F */ jal func_800C6C3C +/* B247C4 800AD624 0C031B0F */ jal Graph_DlistAlloc /* B247C8 800AD628 24052338 */ li $a1, 9016 /* B247CC 800AD62C AFA20054 */ sw $v0, 0x54($sp) /* B247D0 800AD630 8FA40060 */ lw $a0, 0x60($sp) diff --git a/asm/non_matchings/code/z_vr_box_draw/func_800B10C4.s b/asm/non_matchings/code/z_vr_box_draw/func_800B10C4.s index b763944ee9..b08dadec7a 100644 --- a/asm/non_matchings/code/z_vr_box_draw/func_800B10C4.s +++ b/asm/non_matchings/code/z_vr_box_draw/func_800B10C4.s @@ -23,7 +23,7 @@ glabel func_800B10C4 /* B28280 800B10E0 00A08025 */ move $s0, $a1 /* B28284 800B10E4 24C62E94 */ addiu $a2, %lo(D_80142E94) # addiu $a2, $a2, 0x2e94 /* B28288 800B10E8 24070034 */ li $a3, 52 -/* B2828C 800B10EC 0C031AB1 */ jal func_800C6AC4 +/* B2828C 800B10EC 0C031AB1 */ jal Graph_OpenDisp /* B28290 800B10F0 27A400F4 */ addiu $a0, $sp, 0xf4 /* B28294 800B10F4 0C025168 */ jal func_800945A0 /* B28298 800B10F8 02002025 */ move $a0, $s0 @@ -426,7 +426,7 @@ glabel func_800B10C4 /* B288BC 800B171C 02002825 */ move $a1, $s0 /* B288C0 800B1720 27A400F4 */ addiu $a0, $sp, 0xf4 /* B288C4 800B1724 2407007D */ li $a3, 125 -/* B288C8 800B1728 0C031AD5 */ jal func_800C6B54 +/* B288C8 800B1728 0C031AD5 */ jal Graph_CloseDisp /* B288CC 800B172C AC400004 */ sw $zero, 4($v0) /* B288D0 800B1730 8FBF001C */ lw $ra, 0x1c($sp) /* B288D4 800B1734 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s index 05465187bb..01f8727454 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s @@ -17,7 +17,7 @@ glabel ArmsHook_Draw /* 0096C 8086586C AFA20084 */ sw $v0, 0x0084($sp) /* 00970 80865870 24C65BC0 */ addiu $a2, $a2, %lo(D_80865BC0) ## $a2 = 80865BC0 /* 00974 80865874 24070352 */ addiu $a3, $zero, 0x0352 ## $a3 = 00000352 -/* 00978 80865878 0C031AB1 */ jal func_800C6AC4 +/* 00978 80865878 0C031AB1 */ jal Graph_OpenDisp /* 0097C 8086587C AFA50054 */ sw $a1, 0x0054($sp) /* 00980 80865880 8E190214 */ lw $t9, 0x0214($s0) ## 00000214 /* 00984 80865884 3C088086 */ lui $t0, %hi(func_8086518C) ## $t0 = 80860000 @@ -166,7 +166,7 @@ glabel ArmsHook_Draw /* 00BB0 80865AB0 24C65BFC */ addiu $a2, $a2, %lo(D_80865BFC) ## $a2 = 80865BFC /* 00BB4 80865AB4 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFB4 /* 00BB8 80865AB8 24070391 */ addiu $a3, $zero, 0x0391 ## $a3 = 00000391 -/* 00BBC 80865ABC 0C031AD5 */ jal func_800C6B54 +/* 00BBC 80865ABC 0C031AD5 */ jal Graph_CloseDisp /* 00BC0 80865AC0 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 .L80865AC4: /* 00BC4 80865AC4 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s index b8ad045859..dee61acf18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s @@ -30,7 +30,7 @@ glabel ArrowFire_Draw /* 005EC 808662FC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 005F0 80866300 AFA20084 */ sw $v0, 0x0084($sp) /* 005F4 80866304 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 80866308 0C031AB1 */ jal func_800C6AC4 +/* 005F8 80866308 0C031AB1 */ jal Graph_OpenDisp /* 005FC 8086630C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00600 80866310 8FA20084 */ lw $v0, 0x0084($sp) /* 00604 80866314 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -271,7 +271,7 @@ glabel ArrowFire_Draw /* 009A4 808666B4 24C67B84 */ addiu $a2, $a2, %lo(D_80867B84) ## $a2 = 80867B84 /* 009A8 808666B8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 009AC 808666BC 240702AA */ addiu $a3, $zero, 0x02AA ## $a3 = 000002AA -/* 009B0 808666C0 0C031AD5 */ jal func_800C6B54 +/* 009B0 808666C0 0C031AD5 */ jal Graph_CloseDisp /* 009B4 808666C4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 .L808666C8: /* 009B8 808666C8 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s index d291189e7a..ef3b69c565 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s @@ -30,7 +30,7 @@ glabel ArrowIce_Draw /* 005EC 808682BC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 005F0 808682C0 AFA2008C */ sw $v0, 0x008C($sp) /* 005F4 808682C4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 808682C8 0C031AB1 */ jal func_800C6AC4 +/* 005F8 808682C8 0C031AB1 */ jal Graph_OpenDisp /* 005FC 808682CC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00600 808682D0 8FA2008C */ lw $v0, 0x008C($sp) /* 00604 808682D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -279,7 +279,7 @@ glabel ArrowIce_Draw /* 009C4 80868694 24C69B64 */ addiu $a2, $a2, %lo(D_80869B64) ## $a2 = 80869B64 /* 009C8 80868698 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 009CC 8086869C 240702A4 */ addiu $a3, $zero, 0x02A4 ## $a3 = 000002A4 -/* 009D0 808686A0 0C031AD5 */ jal func_800C6B54 +/* 009D0 808686A0 0C031AD5 */ jal Graph_CloseDisp /* 009D4 808686A4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 .L808686A8: /* 009D8 808686A8 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s index ef55bb9273..85f60f39de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s @@ -30,7 +30,7 @@ glabel ArrowLight_Draw /* 005EC 8086A29C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 005F0 8086A2A0 AFA20084 */ sw $v0, 0x0084($sp) /* 005F4 8086A2A4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 8086A2A8 0C031AB1 */ jal func_800C6AC4 +/* 005F8 8086A2A8 0C031AB1 */ jal Graph_OpenDisp /* 005FC 8086A2AC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00600 8086A2B0 8FA20084 */ lw $v0, 0x0084($sp) /* 00604 8086A2B4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -283,7 +283,7 @@ glabel ArrowLight_Draw /* 009D4 8086A684 24C6BB54 */ addiu $a2, $a2, %lo(D_8086BB54) ## $a2 = 8086BB54 /* 009D8 8086A688 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 009DC 8086A68C 24070298 */ addiu $a3, $zero, 0x0298 ## $a3 = 00000298 -/* 009E0 8086A690 0C031AD5 */ jal func_800C6B54 +/* 009E0 8086A690 0C031AD5 */ jal Graph_CloseDisp /* 009E4 8086A694 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 .L8086A698: /* 009E8 8086A698 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s index c88e8de3a1..a394613be0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s @@ -10,7 +10,7 @@ glabel BgBowlWall_Draw /* 00784 8086F8E4 24C6FAD4 */ addiu $a2, $a2, %lo(D_8086FAD4) ## $a2 = 8086FAD4 /* 00788 8086F8E8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0078C 8086F8EC 240701B9 */ addiu $a3, $zero, 0x01B9 ## $a3 = 000001B9 -/* 00790 8086F8F0 0C031AB1 */ jal func_800C6AC4 +/* 00790 8086F8F0 0C031AB1 */ jal Graph_OpenDisp /* 00794 8086F8F4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00798 8086F8F8 0C024F61 */ jal func_80093D84 /* 0079C 8086F8FC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -79,7 +79,7 @@ glabel BgBowlWall_Draw /* 00894 8086F9F4 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00898 8086F9F8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 .L8086F9FC: -/* 0089C 8086F9FC 0C031AD5 */ jal func_800C6B54 +/* 0089C 8086F9FC 0C031AD5 */ jal Graph_CloseDisp /* 008A0 8086FA00 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 008A4 8086FA04 8FBF0024 */ lw $ra, 0x0024($sp) /* 008A8 8086FA08 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s index 5436f44533..12584474d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s @@ -16,7 +16,7 @@ glabel func_808705D8 /* 00A30 80870610 3C068087 */ lui $a2, %hi(D_80870970) ## $a2 = 80870000 /* 00A34 80870614 24C60970 */ addiu $a2, $a2, %lo(D_80870970) ## $a2 = 80870970 /* 00A38 80870618 240702FF */ addiu $a3, $zero, 0x02FF ## $a3 = 000002FF -/* 00A3C 8087061C 0C031AB1 */ jal func_800C6AC4 +/* 00A3C 8087061C 0C031AB1 */ jal Graph_OpenDisp /* 00A40 80870620 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00A44 80870624 0C024F46 */ jal func_80093D18 /* 00A48 80870628 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -80,7 +80,7 @@ glabel func_808705D8 /* 00B24 80870704 24C60998 */ addiu $a2, $a2, %lo(D_80870998) ## $a2 = 80870998 /* 00B28 80870708 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 00B2C 8087070C 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 00B30 80870710 0C031AD5 */ jal func_800C6B54 +/* 00B30 80870710 0C031AD5 */ jal Graph_CloseDisp /* 00B34 80870714 24070336 */ addiu $a3, $zero, 0x0336 ## $a3 = 00000336 .L80870718: /* 00B38 80870718 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s index c634c301a3..669df0892c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s @@ -9,7 +9,7 @@ glabel BgDodoago_Draw /* 00A5C 8087245C 24C62650 */ addiu $a2, $a2, %lo(D_80872650) ## $a2 = 80872650 /* 00A60 80872460 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 00A64 80872464 240702A0 */ addiu $a3, $zero, 0x02A0 ## $a3 = 000002A0 -/* 00A68 80872468 0C031AB1 */ jal func_800C6AC4 +/* 00A68 80872468 0C031AB1 */ jal Graph_OpenDisp /* 00A6C 8087246C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00A70 80872470 0C00D6D3 */ jal Flags_GetEventChkInf @@ -47,7 +47,7 @@ glabel BgDodoago_Draw /* 00AEC 808724EC 24C62678 */ addiu $a2, $a2, %lo(D_80872678) ## $a2 = 80872678 /* 00AF0 808724F0 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 00AF4 808724F4 240702A9 */ addiu $a3, $zero, 0x02A9 ## $a3 = 000002A9 -/* 00AF8 808724F8 0C031AD5 */ jal func_800C6B54 +/* 00AF8 808724F8 0C031AD5 */ jal Graph_CloseDisp /* 00AFC 808724FC 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00B00 80872500 8FBF001C */ lw $ra, 0x001C($sp) /* 00B04 80872504 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s index f786982bac..365ceae7b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s @@ -10,7 +10,7 @@ glabel func_80874BE0 /* 023D0 80874C00 24C65608 */ addiu $a2, $a2, %lo(D_80875608) ## $a2 = 80875608 /* 023D4 80874C04 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 023D8 80874C08 24070649 */ addiu $a3, $zero, 0x0649 ## $a3 = 00000649 -/* 023DC 80874C0C 0C031AB1 */ jal func_800C6AC4 +/* 023DC 80874C0C 0C031AB1 */ jal Graph_OpenDisp /* 023E0 80874C10 AFA50050 */ sw $a1, 0x0050($sp) /* 023E4 80874C14 8E0F014C */ lw $t7, 0x014C($s0) ## 0000014C /* 023E8 80874C18 3C0E8087 */ lui $t6, %hi(func_80873E04) ## $t6 = 80870000 @@ -101,7 +101,7 @@ glabel func_80874BE0 /* 02538 80874D68 24C65620 */ addiu $a2, $a2, %lo(D_80875620) ## $a2 = 80875620 /* 0253C 80874D6C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02540 80874D70 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02544 80874D74 0C031AD5 */ jal func_800C6B54 +/* 02544 80874D74 0C031AD5 */ jal Graph_CloseDisp /* 02548 80874D78 2407065D */ addiu $a3, $zero, 0x065D ## $a3 = 0000065D /* 0254C 80874D7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02550 80874D80 0C21D468 */ jal func_808751A0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s index 751da434d8..70880839ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s @@ -19,7 +19,7 @@ glabel func_808751A0 /* 029B4 808751E4 24C65638 */ addiu $a2, $a2, %lo(D_80875638) ## $a2 = 80875638 /* 029B8 808751E8 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 029BC 808751EC 240706E7 */ addiu $a3, $zero, 0x06E7 ## $a3 = 000006E7 -/* 029C0 808751F0 0C031AB1 */ jal func_800C6AC4 +/* 029C0 808751F0 0C031AB1 */ jal Graph_OpenDisp /* 029C4 808751F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 029C8 808751F8 8FAF00A4 */ lw $t7, 0x00A4($sp) /* 029CC 808751FC 0C024F61 */ jal func_80093D84 @@ -153,7 +153,7 @@ glabel func_808751A0 /* 02BC0 808753F0 24C65668 */ addiu $a2, $a2, %lo(D_80875668) ## $a2 = 80875668 /* 02BC4 808753F4 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 02BC8 808753F8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02BCC 808753FC 0C031AD5 */ jal func_800C6B54 +/* 02BCC 808753FC 0C031AD5 */ jal Graph_CloseDisp /* 02BD0 80875400 2407071B */ addiu $a3, $zero, 0x071B ## $a3 = 0000071B /* 02BD4 80875404 8FBF0044 */ lw $ra, 0x0044($sp) /* 02BD8 80875408 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s index 6bb5d86eea..15948bec33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s @@ -27,7 +27,7 @@ glabel BgGanonOtyuka_Draw /* 00874 80876194 24C67F24 */ addiu $a2, $a2, %lo(D_80877F24) ## $a2 = 80877F24 /* 00878 80876198 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC8 /* 0087C 8087619C 240702BE */ addiu $a3, $zero, 0x02BE ## $a3 = 000002BE -/* 00880 808761A0 0C031AB1 */ jal func_800C6AC4 +/* 00880 808761A0 0C031AB1 */ jal Graph_OpenDisp /* 00884 808761A4 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 00888 808761A8 8FA300E4 */ lw $v1, 0x00E4($sp) /* 0088C 808761AC 240200E8 */ addiu $v0, $zero, 0x00E8 ## $v0 = 000000E8 @@ -596,7 +596,7 @@ glabel BgGanonOtyuka_Draw /* 010C8 808769E8 24C67F84 */ addiu $a2, $a2, %lo(D_80877F84) ## $a2 = 80877F84 /* 010CC 808769EC 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC8 /* 010D0 808769F0 24070359 */ addiu $a3, $zero, 0x0359 ## $a3 = 00000359 -/* 010D4 808769F4 0C031AD5 */ jal func_800C6B54 +/* 010D4 808769F4 0C031AD5 */ jal Graph_CloseDisp /* 010D8 808769F8 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 010DC 808769FC 8FBF006C */ lw $ra, 0x006C($sp) /* 010E0 80876A00 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s index e37157a044..110e13ecf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s @@ -58,7 +58,7 @@ glabel func_808791E8 /* 00680 808792B0 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00684 808792B4 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 00688 808792B8 2407017A */ addiu $a3, $zero, 0x017A ## $a3 = 0000017A -/* 0068C 808792BC 0C031AB1 */ jal func_800C6AC4 +/* 0068C 808792BC 0C031AB1 */ jal Graph_OpenDisp /* 00690 808792C0 AFA5003C */ sw $a1, 0x003C($sp) /* 00694 808792C4 8FA8003C */ lw $t0, 0x003C($sp) /* 00698 808792C8 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 @@ -77,7 +77,7 @@ glabel func_808791E8 /* 006CC 808792FC AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 006D0 80879300 8FA9004C */ lw $t1, 0x004C($sp) /* 006D4 80879304 2407017C */ addiu $a3, $zero, 0x017C ## $a3 = 0000017C -/* 006D8 80879308 0C031AD5 */ jal func_800C6B54 +/* 006D8 80879308 0C031AD5 */ jal Graph_CloseDisp /* 006DC 8087930C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 006E0 80879310 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 006E4 80879314 24A5BEC0 */ addiu $a1, $a1, 0xBEC0 ## $a1 = 0600BEC0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s index 021ad0d2ae..27406e680c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s @@ -8,7 +8,7 @@ glabel func_80879334 /* 0071C 8087934C 24C69410 */ addiu $a2, $a2, %lo(D_80879410) ## $a2 = 80879410 /* 00720 80879350 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 00724 80879354 24070187 */ addiu $a3, $zero, 0x0187 ## $a3 = 00000187 -/* 00728 80879358 0C031AB1 */ jal func_800C6AC4 +/* 00728 80879358 0C031AB1 */ jal Graph_OpenDisp /* 0072C 8087935C AFA50034 */ sw $a1, 0x0034($sp) /* 00730 80879360 8FA80034 */ lw $t0, 0x0034($sp) /* 00734 80879364 3C19C6CA */ lui $t9, 0xC6CA ## $t9 = C6CA0000 @@ -24,7 +24,7 @@ glabel func_80879334 /* 0075C 8087938C 24C69428 */ addiu $a2, $a2, %lo(D_80879428) ## $a2 = 80879428 /* 00760 80879390 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 00764 80879394 24070189 */ addiu $a3, $zero, 0x0189 ## $a3 = 00000189 -/* 00768 80879398 0C031AD5 */ jal func_800C6B54 +/* 00768 80879398 0C031AD5 */ jal Graph_CloseDisp /* 0076C 8087939C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 00770 808793A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00774 808793A4 24A5BEC0 */ addiu $a1, $a1, 0xBEC0 ## $a1 = 0600BEC0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s index 378f716f11..42d5831f3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s @@ -9,7 +9,7 @@ glabel BgGndFiremeiro_Draw /* 00448 80879908 24C699E0 */ addiu $a2, $a2, %lo(D_808799E0) ## $a2 = 808799E0 /* 0044C 8087990C 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 00450 80879910 24070118 */ addiu $a3, $zero, 0x0118 ## $a3 = 00000118 -/* 00454 80879914 0C031AB1 */ jal func_800C6AC4 +/* 00454 80879914 0C031AB1 */ jal Graph_OpenDisp /* 00458 80879918 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0045C 8087991C 8FAF0044 */ lw $t7, 0x0044($sp) /* 00460 80879920 0C0250F2 */ jal func_800943C8 @@ -42,7 +42,7 @@ glabel BgGndFiremeiro_Draw /* 004CC 8087998C 24C69A10 */ addiu $a2, $a2, %lo(D_80879A10) ## $a2 = 80879A10 /* 004D0 80879990 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 004D4 80879994 2407011D */ addiu $a3, $zero, 0x011D ## $a3 = 0000011D -/* 004D8 80879998 0C031AD5 */ jal func_800C6B54 +/* 004D8 80879998 0C031AD5 */ jal Graph_CloseDisp /* 004DC 8087999C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 004E0 808799A0 8FBF001C */ lw $ra, 0x001C($sp) /* 004E4 808799A4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s index 2b42b497fe..5d04ff58c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s @@ -21,7 +21,7 @@ glabel BgGndSoulmeiro_Draw /* 00654 8087B414 AFA80044 */ sw $t0, 0x0044($sp) /* 00658 8087B418 24C6B590 */ addiu $a2, $a2, %lo(D_8087B590) ## $a2 = 8087B590 /* 0065C 8087B41C 2407018E */ addiu $a3, $zero, 0x018E ## $a3 = 0000018E -/* 00660 8087B420 0C031AB1 */ jal func_800C6AC4 +/* 00660 8087B420 0C031AB1 */ jal Graph_OpenDisp /* 00664 8087B424 AFA50040 */ sw $a1, 0x0040($sp) /* 00668 8087B428 0C024F61 */ jal func_80093D84 /* 0066C 8087B42C 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 @@ -58,7 +58,7 @@ glabel BgGndSoulmeiro_Draw /* 006E8 8087B4A8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 006EC 8087B4AC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 006F0 8087B4B0 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 006F4 8087B4B4 0C031AD5 */ jal func_800C6B54 +/* 006F4 8087B4B4 0C031AD5 */ jal Graph_CloseDisp /* 006F8 8087B4B8 24070193 */ addiu $a3, $zero, 0x0193 ## $a3 = 00000193 /* 006FC 8087B4BC 1000000E */ beq $zero, $zero, .L8087B4F8 /* 00700 8087B4C0 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s index 120922e2a9..3292361b2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s @@ -10,7 +10,7 @@ glabel BgHaka_Draw /* 004F0 8087BBA0 24C6BD00 */ addiu $a2, $a2, %lo(D_8087BD00) ## $a2 = 8087BD00 /* 004F4 8087BBA4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 004F8 8087BBA8 24070191 */ addiu $a3, $zero, 0x0191 ## $a3 = 00000191 -/* 004FC 8087BBAC 0C031AB1 */ jal func_800C6AC4 +/* 004FC 8087BBAC 0C031AB1 */ jal Graph_OpenDisp /* 00500 8087BBB0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00504 8087BBB4 0C024F46 */ jal func_80093D18 /* 00508 8087BBB8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -75,7 +75,7 @@ glabel BgHaka_Draw /* 005F4 8087BCA4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 005F8 8087BCA8 24C6BD30 */ addiu $a2, $a2, %lo(D_8087BD30) ## $a2 = 8087BD30 /* 005FC 8087BCAC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC -/* 00600 8087BCB0 0C031AD5 */ jal func_800C6B54 +/* 00600 8087BCB0 0C031AD5 */ jal Graph_CloseDisp /* 00604 8087BCB4 240701A5 */ addiu $a3, $zero, 0x01A5 ## $a3 = 000001A5 /* 00608 8087BCB8 8FBF001C */ lw $ra, 0x001C($sp) /* 0060C 8087BCBC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s index 9aa0fbd8b6..2c3bad285c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s @@ -32,7 +32,7 @@ glabel BgHakaGate_Draw /* 00CF0 8087CAE0 24C6CD4C */ addiu $a2, $a2, %lo(D_8087CD4C) ## $a2 = 8087CD4C /* 00CF4 8087CAE4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 00CF8 8087CAE8 2407030D */ addiu $a3, $zero, 0x030D ## $a3 = 0000030D -/* 00CFC 8087CAEC 0C031AB1 */ jal func_800C6AC4 +/* 00CFC 8087CAEC 0C031AB1 */ jal Graph_OpenDisp /* 00D00 8087CAF0 00A08025 */ or $s0, $a1, $zero ## $s0 = 80880000 /* 00D04 8087CAF4 0C034236 */ jal Matrix_Get /* 00D08 8087CAF8 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFBC @@ -132,7 +132,7 @@ glabel BgHakaGate_Draw /* 00E80 8087CC70 24C6CD88 */ addiu $a2, $a2, %lo(D_8087CD88) ## $a2 = 8087CD88 /* 00E84 8087CC74 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 00E88 8087CC78 24070320 */ addiu $a3, $zero, 0x0320 ## $a3 = 00000320 -/* 00E8C 8087CC7C 0C031AD5 */ jal func_800C6B54 +/* 00E8C 8087CC7C 0C031AD5 */ jal Graph_CloseDisp /* 00E90 8087CC80 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 00E94 8087CC84 10000005 */ beq $zero, $zero, .L8087CC9C /* 00E98 8087CC88 8FA40090 */ lw $a0, 0x0090($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s index 83107208ca..874e378d2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s @@ -12,7 +12,7 @@ glabel func_8087C85C /* 00A94 8087C884 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00A98 8087C888 24C6CD10 */ addiu $a2, $a2, %lo(D_8087CD10) ## $a2 = 8087CD10 /* 00A9C 8087C88C 240702CC */ addiu $a3, $zero, 0x02CC ## $a3 = 000002CC -/* 00AA0 8087C890 0C031AB1 */ jal func_800C6AC4 +/* 00AA0 8087C890 0C031AB1 */ jal Graph_OpenDisp /* 00AA4 8087C894 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00AA8 8087C898 0C024F61 */ jal func_80093D84 /* 00AAC 8087C89C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -125,7 +125,7 @@ glabel func_8087C85C /* 00C58 8087CA48 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00C5C 8087CA4C 24C6CD38 */ addiu $a2, $a2, %lo(D_8087CD38) ## $a2 = 8087CD38 /* 00C60 8087CA50 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00C64 8087CA54 0C031AD5 */ jal func_800C6B54 +/* 00C64 8087CA54 0C031AD5 */ jal Graph_CloseDisp /* 00C68 8087CA58 240702ED */ addiu $a3, $zero, 0x02ED ## $a3 = 000002ED .L8087CA5C: /* 00C6C 8087CA5C 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s index b5e2f545ea..ebe4e5bc5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s @@ -9,7 +9,7 @@ glabel BgHakaShip_Draw /* 006D0 8087F7D0 24C6FAF8 */ addiu $a2, $a2, %lo(D_8087FAF8) ## $a2 = 8087FAF8 /* 006D4 8087F7D4 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 006D8 8087F7D8 24070210 */ addiu $a3, $zero, 0x0210 ## $a3 = 00000210 -/* 006DC 8087F7DC 0C031AB1 */ jal func_800C6AC4 +/* 006DC 8087F7DC 0C031AB1 */ jal Graph_OpenDisp /* 006E0 8087F7E0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 006E4 8087F7E4 8FAF007C */ lw $t7, 0x007C($sp) /* 006E8 8087F7E8 0C024F46 */ jal func_80093D18 @@ -148,7 +148,7 @@ glabel BgHakaShip_Draw /* 008F4 8087F9F4 24C6FB5C */ addiu $a2, $a2, %lo(D_8087FB5C) ## $a2 = 8087FB5C /* 008F8 8087F9F8 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 008FC 8087F9FC 24070238 */ addiu $a3, $zero, 0x0238 ## $a3 = 00000238 -/* 00900 8087FA00 0C031AD5 */ jal func_800C6B54 +/* 00900 8087FA00 0C031AD5 */ jal Graph_CloseDisp /* 00904 8087FA04 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 00908 8087FA08 8FA30078 */ lw $v1, 0x0078($sp) /* 0090C 8087FA0C 3C0E8088 */ lui $t6, %hi(func_8087F364) ## $t6 = 80880000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s index a8dfd34ae1..9195c6f719 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s @@ -9,7 +9,7 @@ glabel func_80881904 /* 006D0 80881920 24C61BD0 */ addiu $a2, $a2, %lo(D_80881BD0) ## $a2 = 80881BD0 /* 006D4 80881924 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 006D8 80881928 240701DC */ addiu $a3, $zero, 0x01DC ## $a3 = 000001DC -/* 006DC 8088192C 0C031AB1 */ jal func_800C6AC4 +/* 006DC 8088192C 0C031AB1 */ jal Graph_OpenDisp /* 006E0 80881930 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 006E4 80881934 8FAF0074 */ lw $t7, 0x0074($sp) /* 006E8 80881938 0C024F61 */ jal func_80093D84 @@ -118,7 +118,7 @@ glabel func_80881904 /* 00884 80881AD4 24C61BF8 */ addiu $a2, $a2, %lo(D_80881BF8) ## $a2 = 80881BF8 /* 00888 80881AD8 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 0088C 80881ADC 240701F5 */ addiu $a3, $zero, 0x01F5 ## $a3 = 000001F5 -/* 00890 80881AE0 0C031AD5 */ jal func_800C6B54 +/* 00890 80881AE0 0C031AD5 */ jal Graph_CloseDisp /* 00894 80881AE4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00898 80881AE8 8FBF003C */ lw $ra, 0x003C($sp) /* 0089C 80881AEC 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s index aef5184e53..8fb7541d2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s @@ -9,7 +9,7 @@ glabel BgHakaWater_Draw /* 003E0 808820E0 24C624C0 */ addiu $a2, $a2, %lo(D_808824C0) ## $a2 = 808824C0 /* 003E4 808820E4 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 003E8 808820E8 2407011F */ addiu $a3, $zero, 0x011F ## $a3 = 0000011F -/* 003EC 808820EC 0C031AB1 */ jal func_800C6AC4 +/* 003EC 808820EC 0C031AB1 */ jal Graph_OpenDisp /* 003F0 808820F0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003F4 808820F4 8FAF0094 */ lw $t7, 0x0094($sp) /* 003F8 808820F8 0C024F61 */ jal func_80093D84 @@ -244,7 +244,7 @@ glabel BgHakaWater_Draw /* 00768 80882468 24C62508 */ addiu $a2, $a2, %lo(D_80882508) ## $a2 = 80882508 /* 0076C 8088246C 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 00770 80882470 2407014C */ addiu $a3, $zero, 0x014C ## $a3 = 0000014C -/* 00774 80882474 0C031AD5 */ jal func_800C6B54 +/* 00774 80882474 0C031AD5 */ jal Graph_CloseDisp /* 00778 80882478 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 0077C 8088247C 8FBF003C */ lw $ra, 0x003C($sp) /* 00780 80882480 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s index 00718d6b40..694858f7c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s @@ -11,7 +11,7 @@ glabel BgHeavyBlock_Draw /* 014A0 80884C30 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 014A4 80884C34 24070388 */ addiu $a3, $zero, 0x0388 ## $a3 = 00000388 /* 014A8 80884C38 AFA20044 */ sw $v0, 0x0044($sp) -/* 014AC 80884C3C 0C031AB1 */ jal func_800C6AC4 +/* 014AC 80884C3C 0C031AB1 */ jal Graph_OpenDisp /* 014B0 80884C40 AFA50040 */ sw $a1, 0x0040($sp) /* 014B4 80884C44 8E030174 */ lw $v1, 0x0174($s0) ## 00000174 /* 014B8 80884C48 3C0F8088 */ lui $t7, %hi(func_808844D0) ## $t7 = 80880000 @@ -100,7 +100,7 @@ glabel BgHeavyBlock_Draw /* 015FC 80884D8C 24C64F90 */ addiu $a2, $a2, %lo(D_80884F90) ## $a2 = 80884F90 /* 01600 80884D90 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 01604 80884D94 240703A7 */ addiu $a3, $zero, 0x03A7 ## $a3 = 000003A7 -/* 01608 80884D98 0C031AD5 */ jal func_800C6B54 +/* 01608 80884D98 0C031AD5 */ jal Graph_CloseDisp /* 0160C 80884D9C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 01610 80884DA0 8FBF001C */ lw $ra, 0x001C($sp) /* 01614 80884DA4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s index 64168ee075..9991bde712 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s @@ -10,7 +10,7 @@ glabel BgHidanCurtain_Draw /* 0086C 80885A0C 24C65CCC */ addiu $a2, $a2, %lo(D_80885CCC) ## $a2 = 80885CCC /* 00870 80885A10 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 00874 80885A14 240702AD */ addiu $a3, $zero, 0x02AD ## $a3 = 000002AD -/* 00878 80885A18 0C031AB1 */ jal func_800C6AC4 +/* 00878 80885A18 0C031AB1 */ jal Graph_OpenDisp /* 0087C 80885A1C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00880 80885A20 0C024F61 */ jal func_80093D84 /* 00884 80885A24 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -89,7 +89,7 @@ glabel BgHidanCurtain_Draw /* 009A8 80885B48 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 009AC 80885B4C 24C65CFC */ addiu $a2, $a2, %lo(D_80885CFC) ## $a2 = 80885CFC /* 009B0 80885B50 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 009B4 80885B54 0C031AD5 */ jal func_800C6B54 +/* 009B4 80885B54 0C031AD5 */ jal Graph_CloseDisp /* 009B8 80885B58 240702BE */ addiu $a3, $zero, 0x02BE ## $a3 = 000002BE /* 009BC 80885B5C 8FBF003C */ lw $ra, 0x003C($sp) /* 009C0 80885B60 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s index 14876bc801..d89b35017a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s @@ -9,7 +9,7 @@ glabel func_80886B34 /* 004F0 80886B50 24C66D30 */ addiu $a2, $a2, %lo(D_80886D30) ## $a2 = 80886D30 /* 004F4 80886B54 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 004F8 80886B58 240701C0 */ addiu $a3, $zero, 0x01C0 ## $a3 = 000001C0 -/* 004FC 80886B5C 0C031AB1 */ jal func_800C6AC4 +/* 004FC 80886B5C 0C031AB1 */ jal Graph_OpenDisp /* 00500 80886B60 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00504 80886B64 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 00508 80886B68 0C024DDD */ jal Gfx_CallSetupDL @@ -84,7 +84,7 @@ glabel func_80886B34 /* 0061C 80886C7C 24C66D68 */ addiu $a2, $a2, %lo(D_80886D68) ## $a2 = 80886D68 /* 00620 80886C80 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00624 80886C84 240701CF */ addiu $a3, $zero, 0x01CF ## $a3 = 000001CF -/* 00628 80886C88 0C031AD5 */ jal func_800C6B54 +/* 00628 80886C88 0C031AD5 */ jal Graph_CloseDisp /* 0062C 80886C8C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 00630 80886C90 8FBF001C */ lw $ra, 0x001C($sp) /* 00634 80886C94 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s index e3fc4a758e..ca749b584c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s @@ -10,7 +10,7 @@ glabel BgHidanFwbig_Draw /* 00900 80887BF0 24C67F00 */ addiu $a2, $a2, %lo(D_80887F00) ## $a2 = 80887F00 /* 00904 80887BF4 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 00908 80887BF8 24070276 */ addiu $a3, $zero, 0x0276 ## $a3 = 00000276 -/* 0090C 80887BFC 0C031AB1 */ jal func_800C6AC4 +/* 0090C 80887BFC 0C031AB1 */ jal Graph_OpenDisp /* 00910 80887C00 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00914 80887C04 0C024F61 */ jal func_80093D84 /* 00918 80887C08 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -178,7 +178,7 @@ glabel BgHidanFwbig_Draw /* 00B94 80887E84 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00B98 80887E88 24C67F30 */ addiu $a2, $a2, %lo(D_80887F30) ## $a2 = 80887F30 /* 00B9C 80887E8C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 -/* 00BA0 80887E90 0C031AD5 */ jal func_800C6B54 +/* 00BA0 80887E90 0C031AD5 */ jal Graph_CloseDisp /* 00BA4 80887E94 24070298 */ addiu $a3, $zero, 0x0298 ## $a3 = 00000298 /* 00BA8 80887E98 8FBF003C */ lw $ra, 0x003C($sp) /* 00BAC 80887E9C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s index 548a5e6a01..0ed59c9460 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s @@ -9,7 +9,7 @@ glabel BgHidanHamstep_Draw /* 00C44 80888C84 24C68F84 */ addiu $a2, $a2, %lo(D_80888F84) ## $a2 = 80888F84 /* 00C48 80888C88 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00C4C 80888C8C 2407030E */ addiu $a3, $zero, 0x030E ## $a3 = 0000030E -/* 00C50 80888C90 0C031AB1 */ jal func_800C6AC4 +/* 00C50 80888C90 0C031AB1 */ jal Graph_OpenDisp /* 00C54 80888C94 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00C58 80888C98 8FAF004C */ lw $t7, 0x004C($sp) /* 00C5C 80888C9C 0C024F46 */ jal func_80093D18 @@ -58,7 +58,7 @@ glabel BgHidanHamstep_Draw .L80888D44: /* 00D04 80888D44 8FA8004C */ lw $t0, 0x004C($sp) /* 00D08 80888D48 2407031C */ addiu $a3, $zero, 0x031C ## $a3 = 0000031C -/* 00D0C 80888D4C 0C031AD5 */ jal func_800C6B54 +/* 00D0C 80888D4C 0C031AD5 */ jal Graph_CloseDisp /* 00D10 80888D50 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 00D14 80888D54 8FBF001C */ lw $ra, 0x001C($sp) /* 00D18 80888D58 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s index e9aa7155b3..34eea06268 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s @@ -9,7 +9,7 @@ glabel BgHidanKousi_Draw /* 00414 80889D74 24C69EEC */ addiu $a2, $a2, %lo(D_80889EEC) ## $a2 = 80889EEC /* 00418 80889D78 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 0041C 80889D7C 2407015E */ addiu $a3, $zero, 0x015E ## $a3 = 0000015E -/* 00420 80889D80 0C031AB1 */ jal func_800C6AC4 +/* 00420 80889D80 0C031AB1 */ jal Graph_OpenDisp /* 00424 80889D84 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00428 80889D88 8FAF0044 */ lw $t7, 0x0044($sp) /* 0042C 80889D8C 0C024F46 */ jal func_80093D18 @@ -47,7 +47,7 @@ glabel BgHidanKousi_Draw /* 004AC 80889E0C 8DEF9E84 */ lw $t7, %lo(D_80889E84)($t7) /* 004B0 80889E10 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 004B4 80889E14 8FB80044 */ lw $t8, 0x0044($sp) -/* 004B8 80889E18 0C031AD5 */ jal func_800C6B54 +/* 004B8 80889E18 0C031AD5 */ jal Graph_CloseDisp /* 004BC 80889E1C 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 004C0 80889E20 8FBF001C */ lw $ra, 0x001C($sp) /* 004C4 80889E24 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s index 0684b0b8eb..e0899f45f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s @@ -9,7 +9,7 @@ glabel BgHidanKowarerukabe_Draw /* 00CF8 8088AD18 24C6AF30 */ addiu $a2, $a2, %lo(D_8088AF30) ## $a2 = 8088AF30 /* 00CFC 8088AD1C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00D00 8088AD20 24070235 */ addiu $a3, $zero, 0x0235 ## $a3 = 00000235 -/* 00D04 8088AD24 0C031AB1 */ jal func_800C6AC4 +/* 00D04 8088AD24 0C031AB1 */ jal Graph_OpenDisp /* 00D08 8088AD28 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00D0C 8088AD2C 8FAF004C */ lw $t7, 0x004C($sp) /* 00D10 8088AD30 0C024F46 */ jal func_80093D18 @@ -50,7 +50,7 @@ glabel BgHidanKowarerukabe_Draw /* 00D9C 8088ADBC 24C6AF70 */ addiu $a2, $a2, %lo(D_8088AF70) ## $a2 = 8088AF70 /* 00DA0 8088ADC0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00DA4 8088ADC4 2407023D */ addiu $a3, $zero, 0x023D ## $a3 = 0000023D -/* 00DA8 8088ADC8 0C031AD5 */ jal func_800C6B54 +/* 00DA8 8088ADC8 0C031AD5 */ jal Graph_CloseDisp /* 00DAC 8088ADCC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 00DB0 8088ADD0 8FBF001C */ lw $ra, 0x001C($sp) /* 00DB4 8088ADD4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s index b33eadf6ab..1855f3a7bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s @@ -9,7 +9,7 @@ glabel func_8088BC40 /* 00BDC 8088BC5C 24C6BFF0 */ addiu $a2, $a2, %lo(D_8088BFF0) ## $a2 = 8088BFF0 /* 00BE0 8088BC60 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 00BE4 8088BC64 24070328 */ addiu $a3, $zero, 0x0328 ## $a3 = 00000328 -/* 00BE8 8088BC68 0C031AB1 */ jal func_800C6AC4 +/* 00BE8 8088BC68 0C031AB1 */ jal Graph_OpenDisp /* 00BEC 8088BC6C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00BF0 8088BC70 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 00BF4 8088BC74 0C024DDD */ jal Gfx_CallSetupDL @@ -139,7 +139,7 @@ glabel func_8088BC40 /* 00DDC 8088BE5C 24C6C020 */ addiu $a2, $a2, %lo(D_8088C020) ## $a2 = 8088C020 /* 00DE0 8088BE60 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 00DE4 8088BE64 24070359 */ addiu $a3, $zero, 0x0359 ## $a3 = 00000359 -/* 00DE8 8088BE68 0C031AD5 */ jal func_800C6B54 +/* 00DE8 8088BE68 0C031AD5 */ jal Graph_CloseDisp /* 00DEC 8088BE6C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00DF0 8088BE70 8FBF001C */ lw $ra, 0x001C($sp) /* 00DF4 8088BE74 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s index fec03f64bc..cc8949b2b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s @@ -14,7 +14,7 @@ glabel BgHidanRsekizou_Draw /* 0086C 8088CA6C 24C6CDBC */ addiu $a2, $a2, %lo(D_8088CDBC) ## $a2 = 8088CDBC /* 00870 8088CA70 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFA0 /* 00874 8088CA74 24070234 */ addiu $a3, $zero, 0x0234 ## $a3 = 00000234 -/* 00878 8088CA78 0C031AB1 */ jal func_800C6AC4 +/* 00878 8088CA78 0C031AB1 */ jal Graph_OpenDisp /* 0087C 8088CA7C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00880 8088CA80 0C024F46 */ jal func_80093D18 /* 00884 8088CA84 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -127,7 +127,7 @@ glabel BgHidanRsekizou_Draw /* 00A1C 8088CC1C 24C6CDF4 */ addiu $a2, $a2, %lo(D_8088CDF4) ## $a2 = 8088CDF4 /* 00A20 8088CC20 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFA0 /* 00A24 8088CC24 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 00A28 8088CC28 0C031AD5 */ jal func_800C6B54 +/* 00A28 8088CC28 0C031AD5 */ jal Graph_CloseDisp /* 00A2C 8088CC2C 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258 /* 00A30 8088CC30 8FBF0034 */ lw $ra, 0x0034($sp) /* 00A34 8088CC34 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s index f0d3981c14..5044f6d7de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s @@ -13,7 +13,7 @@ glabel BgHidanSekizou_Draw /* 01054 8088DF14 24C6E2B8 */ addiu $a2, $a2, %lo(D_8088E2B8) ## $a2 = 8088E2B8 /* 01058 8088DF18 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD0 /* 0105C 8088DF1C 2407033B */ addiu $a3, $zero, 0x033B ## $a3 = 0000033B -/* 01060 8088DF20 0C031AB1 */ jal func_800C6AC4 +/* 01060 8088DF20 0C031AB1 */ jal Graph_OpenDisp /* 01064 8088DF24 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 01068 8088DF28 0C024F46 */ jal func_80093D18 /* 0106C 8088DF2C 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -154,7 +154,7 @@ glabel BgHidanSekizou_Draw /* 0126C 8088E12C 24C6E2E8 */ addiu $a2, $a2, %lo(D_8088E2E8) ## $a2 = 8088E2E8 /* 01270 8088E130 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD0 /* 01274 8088E134 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 01278 8088E138 0C031AD5 */ jal func_800C6B54 +/* 01278 8088E138 0C031AD5 */ jal Graph_CloseDisp /* 0127C 8088E13C 24070383 */ addiu $a3, $zero, 0x0383 ## $a3 = 00000383 /* 01280 8088E140 8FBF0034 */ lw $ra, 0x0034($sp) /* 01284 8088E144 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s index 3fd372bf77..f000b65956 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s @@ -9,7 +9,7 @@ glabel BgHidanSima_Draw /* 00C54 8088F024 24C6F250 */ addiu $a2, $a2, %lo(D_8088F250) ## $a2 = 8088F250 /* 00C58 8088F028 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00C5C 8088F02C 24070281 */ addiu $a3, $zero, 0x0281 ## $a3 = 00000281 -/* 00C60 8088F030 0C031AB1 */ jal func_800C6AC4 +/* 00C60 8088F030 0C031AB1 */ jal Graph_OpenDisp /* 00C64 8088F034 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00C68 8088F038 8FAF0054 */ lw $t7, 0x0054($sp) /* 00C6C 8088F03C 0C024F46 */ jal func_80093D18 @@ -86,7 +86,7 @@ glabel BgHidanSima_Draw /* 00D80 8088F150 24C6F280 */ addiu $a2, $a2, %lo(D_8088F280) ## $a2 = 8088F280 /* 00D84 8088F154 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00D88 8088F158 2407029C */ addiu $a3, $zero, 0x029C ## $a3 = 0000029C -/* 00D8C 8088F15C 0C031AD5 */ jal func_800C6B54 +/* 00D8C 8088F15C 0C031AD5 */ jal Graph_CloseDisp /* 00D90 8088F160 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00D94 8088F164 8FBF001C */ lw $ra, 0x001C($sp) /* 00D98 8088F168 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s index 86b6c314ea..c38782f246 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s @@ -10,7 +10,7 @@ glabel BgIceShelter_Draw /* 00C9C 808913DC 24C61878 */ addiu $a2, $a2, %lo(D_80891878) ## $a2 = 80891878 /* 00CA0 808913E0 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 00CA4 808913E4 240702EC */ addiu $a3, $zero, 0x02EC ## $a3 = 000002EC -/* 00CA8 808913E8 0C031AB1 */ jal func_800C6AC4 +/* 00CA8 808913E8 0C031AB1 */ jal Graph_OpenDisp /* 00CAC 808913EC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00CB0 808913F0 0C024F61 */ jal func_80093D84 /* 00CB4 808913F4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -194,7 +194,7 @@ glabel L80891680 /* 00F64 808916A4 24C618A8 */ addiu $a2, $a2, %lo(D_808918A8) ## $a2 = 808918A8 /* 00F68 808916A8 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 00F6C 808916AC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00F70 808916B0 0C031AD5 */ jal func_800C6B54 +/* 00F70 808916B0 0C031AD5 */ jal Graph_CloseDisp /* 00F74 808916B4 2407032F */ addiu $a3, $zero, 0x032F ## $a3 = 0000032F /* 00F78 808916B8 8FBF003C */ lw $ra, 0x003C($sp) /* 00F7C 808916BC 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s index ab60bafdf2..35902f566c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s @@ -9,7 +9,7 @@ glabel BgIngate_Draw /* 0029C 808929DC 24C62AB0 */ addiu $a2, $a2, %lo(D_80892AB0) ## $a2 = 80892AB0 /* 002A0 808929E0 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 002A4 808929E4 240700F0 */ addiu $a3, $zero, 0x00F0 ## $a3 = 000000F0 -/* 002A8 808929E8 0C031AB1 */ jal func_800C6AC4 +/* 002A8 808929E8 0C031AB1 */ jal Graph_OpenDisp /* 002AC 808929EC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 002B0 808929F0 8FAF0044 */ lw $t7, 0x0044($sp) /* 002B4 808929F4 0C024F46 */ jal func_80093D18 @@ -42,7 +42,7 @@ glabel BgIngate_Draw /* 00320 80892A60 24C62AD8 */ addiu $a2, $a2, %lo(D_80892AD8) ## $a2 = 80892AD8 /* 00324 80892A64 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 00328 80892A68 240700FA */ addiu $a3, $zero, 0x00FA ## $a3 = 000000FA -/* 0032C 80892A6C 0C031AD5 */ jal func_800C6B54 +/* 0032C 80892A6C 0C031AD5 */ jal Graph_CloseDisp /* 00330 80892A70 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00334 80892A74 8FBF001C */ lw $ra, 0x001C($sp) /* 00338 80892A78 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s index d37c906641..873411b499 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s @@ -9,7 +9,7 @@ glabel func_80893C68 /* 005A4 80893C84 24C64030 */ addiu $a2, $a2, %lo(D_80894030) ## $a2 = 80894030 /* 005A8 80893C88 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 005AC 80893C8C 240701B3 */ addiu $a3, $zero, 0x01B3 ## $a3 = 000001B3 -/* 005B0 80893C90 0C031AB1 */ jal func_800C6AC4 +/* 005B0 80893C90 0C031AB1 */ jal Graph_OpenDisp /* 005B4 80893C94 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 005B8 80893C98 8FAF0054 */ lw $t7, 0x0054($sp) /* 005BC 80893C9C 0C024F61 */ jal func_80093D84 @@ -117,7 +117,7 @@ glabel func_80893C68 /* 00748 80893E28 24C64078 */ addiu $a2, $a2, %lo(D_80894078) ## $a2 = 80894078 /* 0074C 80893E2C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00750 80893E30 240701DC */ addiu $a3, $zero, 0x01DC ## $a3 = 000001DC -/* 00754 80893E34 0C031AD5 */ jal func_800C6B54 +/* 00754 80893E34 0C031AD5 */ jal Graph_CloseDisp /* 00758 80893E38 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 0075C 80893E3C 8FBF001C */ lw $ra, 0x001C($sp) /* 00760 80893E40 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s index 15edea8cf8..6ea93d12f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s @@ -9,7 +9,7 @@ glabel BgJyaBlock_Draw /* 00120 808942C0 24C64410 */ addiu $a2, $a2, %lo(D_80894410) ## $a2 = 80894410 /* 00124 808942C4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00128 808942C8 24070091 */ addiu $a3, $zero, 0x0091 ## $a3 = 00000091 -/* 0012C 808942CC 0C031AB1 */ jal func_800C6AC4 +/* 0012C 808942CC 0C031AB1 */ jal Graph_OpenDisp /* 00130 808942D0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00134 808942D4 8FAF004C */ lw $t7, 0x004C($sp) /* 00138 808942D8 0C024F46 */ jal func_80093D18 @@ -71,7 +71,7 @@ glabel BgJyaBlock_Draw /* 00218 808943B8 24C64438 */ addiu $a2, $a2, %lo(D_80894438) ## $a2 = 80894438 /* 0021C 808943BC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00220 808943C0 2407009E */ addiu $a3, $zero, 0x009E ## $a3 = 0000009E -/* 00224 808943C4 0C031AD5 */ jal func_800C6B54 +/* 00224 808943C4 0C031AD5 */ jal Graph_CloseDisp /* 00228 808943C8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 0022C 808943CC 8FBF001C */ lw $ra, 0x001C($sp) /* 00230 808943D0 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s index 0c2800424d..5249ad61a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894B04.s @@ -8,7 +8,7 @@ glabel func_80894B04 /* 0067C 80894B1C 24C64FF4 */ addiu $a2, $a2, %lo(D_80894FF4) ## $a2 = 80894FF4 /* 00680 80894B20 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 00684 80894B24 240701B4 */ addiu $a3, $zero, 0x01B4 ## $a3 = 000001B4 -/* 00688 80894B28 0C031AB1 */ jal func_800C6AC4 +/* 00688 80894B28 0C031AB1 */ jal Graph_OpenDisp /* 0068C 80894B2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00690 80894B30 8FAF0040 */ lw $t7, 0x0040($sp) /* 00694 80894B34 0C024F61 */ jal func_80093D84 @@ -41,7 +41,7 @@ glabel func_80894B04 /* 00700 80894BA0 24C6502C */ addiu $a2, $a2, %lo(D_8089502C) ## $a2 = 8089502C /* 00704 80894BA4 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 00708 80894BA8 240701BB */ addiu $a3, $zero, 0x01BB ## $a3 = 000001BB -/* 0070C 80894BAC 0C031AD5 */ jal func_800C6B54 +/* 0070C 80894BAC 0C031AD5 */ jal Graph_CloseDisp /* 00710 80894BB0 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00714 80894BB4 8FBF001C */ lw $ra, 0x001C($sp) /* 00718 80894BB8 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s index 622e9f64d2..75cfd9b7fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/func_80894BC8.s @@ -8,7 +8,7 @@ glabel func_80894BC8 /* 00740 80894BE0 24C65048 */ addiu $a2, $a2, %lo(D_80895048) ## $a2 = 80895048 /* 00744 80894BE4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 00748 80894BE8 240701C5 */ addiu $a3, $zero, 0x01C5 ## $a3 = 000001C5 -/* 0074C 80894BEC 0C031AB1 */ jal func_800C6AC4 +/* 0074C 80894BEC 0C031AB1 */ jal Graph_OpenDisp /* 00750 80894BF0 AFA50050 */ sw $a1, 0x0050($sp) /* 00754 80894BF4 8FAF005C */ lw $t7, 0x005C($sp) /* 00758 80894BF8 0C024F61 */ jal func_80093D84 @@ -166,7 +166,7 @@ glabel func_80894BC8 /* 00998 80894E38 AC490000 */ sw $t1, 0x0000($v0) ## 000000FF /* 0099C 80894E3C 8FB9005C */ lw $t9, 0x005C($sp) /* 009A0 80894E40 24C65080 */ addiu $a2, $a2, %lo(D_80895080) ## $a2 = 80895080 -/* 009A4 80894E44 0C031AD5 */ jal func_800C6B54 +/* 009A4 80894E44 0C031AD5 */ jal Graph_CloseDisp /* 009A8 80894E48 8F250000 */ lw $a1, 0x0000($t9) ## 000000A1 /* 009AC 80894E4C 8FBF0014 */ lw $ra, 0x0014($sp) /* 009B0 80894E50 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s index 3b1be6e2ed..0153e56cdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s @@ -8,7 +8,7 @@ glabel func_80896CB4 /* 013DC 80896CCC 24C67648 */ addiu $a2, $a2, %lo(D_80897648) ## $a2 = 80897648 /* 013E0 80896CD0 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 013E4 80896CD4 24070360 */ addiu $a3, $zero, 0x0360 ## $a3 = 00000360 -/* 013E8 80896CD8 0C031AB1 */ jal func_800C6AC4 +/* 013E8 80896CD8 0C031AB1 */ jal Graph_OpenDisp /* 013EC 80896CDC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 013F0 80896CE0 8FAF0040 */ lw $t7, 0x0040($sp) /* 013F4 80896CE4 0C024F61 */ jal func_80093D84 @@ -41,7 +41,7 @@ glabel func_80896CB4 /* 01460 80896D50 24C67670 */ addiu $a2, $a2, %lo(D_80897670) ## $a2 = 80897670 /* 01464 80896D54 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 01468 80896D58 24070368 */ addiu $a3, $zero, 0x0368 ## $a3 = 00000368 -/* 0146C 80896D5C 0C031AD5 */ jal func_800C6B54 +/* 0146C 80896D5C 0C031AD5 */ jal Graph_CloseDisp /* 01470 80896D60 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01474 80896D64 8FBF001C */ lw $ra, 0x001C($sp) /* 01478 80896D68 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s index 72a37fb5bc..badad224a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s @@ -10,7 +10,7 @@ glabel func_80896D78 /* 014A8 80896D98 24C67684 */ addiu $a2, $a2, %lo(D_80897684) ## $a2 = 80897684 /* 014AC 80896D9C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 014B0 80896DA0 2407039C */ addiu $a3, $zero, 0x039C ## $a3 = 0000039C -/* 014B4 80896DA4 0C031AB1 */ jal func_800C6AC4 +/* 014B4 80896DA4 0C031AB1 */ jal Graph_OpenDisp /* 014B8 80896DA8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 014BC 80896DAC 8FAF0054 */ lw $t7, 0x0054($sp) /* 014C0 80896DB0 0C024F61 */ jal func_80093D84 @@ -83,7 +83,7 @@ glabel func_80896D78 /* 015CC 80896EBC AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 015D0 80896EC0 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 015D4 80896EC4 8FB80054 */ lw $t8, 0x0054($sp) -/* 015D8 80896EC8 0C031AD5 */ jal func_800C6B54 +/* 015D8 80896EC8 0C031AD5 */ jal Graph_CloseDisp /* 015DC 80896ECC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 015E0 80896ED0 8FBF001C */ lw $ra, 0x001C($sp) /* 015E4 80896ED4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s index 2f7e14f464..86b5079d09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s @@ -12,7 +12,7 @@ glabel func_80896EE4 /* 0161C 80896F0C 24C676C0 */ addiu $a2, $a2, %lo(D_808976C0) ## $a2 = 808976C0 /* 01620 80896F10 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 01624 80896F14 240703C6 */ addiu $a3, $zero, 0x03C6 ## $a3 = 000003C6 -/* 01628 80896F18 0C031AB1 */ jal func_800C6AC4 +/* 01628 80896F18 0C031AB1 */ jal Graph_OpenDisp /* 0162C 80896F1C AFA5005C */ sw $a1, 0x005C($sp) /* 01630 80896F20 8FB9007C */ lw $t9, 0x007C($sp) /* 01634 80896F24 0C025011 */ jal func_80094044 @@ -173,7 +173,7 @@ glabel func_80896EE4 /* 01890 80897180 24C676E8 */ addiu $a2, $a2, %lo(D_808976E8) ## $a2 = 808976E8 /* 01894 80897184 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 01898 80897188 240703EE */ addiu $a3, $zero, 0x03EE ## $a3 = 000003EE -/* 0189C 8089718C 0C031AD5 */ jal func_800C6B54 +/* 0189C 8089718C 0C031AD5 */ jal Graph_CloseDisp /* 018A0 80897190 8F050000 */ lw $a1, 0x0000($t8) ## 00000008 /* 018A4 80897194 8FBF001C */ lw $ra, 0x001C($sp) /* 018A8 80897198 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s index 3efb2be832..1cb14ff7ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s @@ -9,7 +9,7 @@ glabel func_8089ABC8 /* 00AB4 8089ABE4 24C6B210 */ addiu $a2, $a2, %lo(D_8089B210) ## $a2 = 8089B210 /* 00AB8 8089ABE8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00ABC 8089ABEC 240702C2 */ addiu $a3, $zero, 0x02C2 ## $a3 = 000002C2 -/* 00AC0 8089ABF0 0C031AB1 */ jal func_800C6AC4 +/* 00AC0 8089ABF0 0C031AB1 */ jal Graph_OpenDisp /* 00AC4 8089ABF4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00AC8 8089ABF8 8FAF004C */ lw $t7, 0x004C($sp) /* 00ACC 8089ABFC 0C024F46 */ jal func_80093D18 @@ -88,7 +88,7 @@ glabel func_8089ABC8 /* 00BF0 8089AD20 24C6B240 */ addiu $a2, $a2, %lo(D_8089B240) ## $a2 = 8089B240 /* 00BF4 8089AD24 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00BF8 8089AD28 240702D0 */ addiu $a3, $zero, 0x02D0 ## $a3 = 000002D0 -/* 00BFC 8089AD2C 0C031AD5 */ jal func_800C6B54 +/* 00BFC 8089AD2C 0C031AD5 */ jal Graph_CloseDisp /* 00C00 8089AD30 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 00C04 8089AD34 8FBF001C */ lw $ra, 0x001C($sp) /* 00C08 8089AD38 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s index 45d11402d5..f7416c03f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s @@ -20,7 +20,7 @@ glabel func_8089AD48 /* 00C60 8089AD90 24C6B258 */ addiu $a2, $a2, %lo(D_8089B258) ## $a2 = 8089B258 /* 00C64 8089AD94 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 00C68 8089AD98 240702EA */ addiu $a3, $zero, 0x02EA ## $a3 = 000002EA -/* 00C6C 8089AD9C 0C031AB1 */ jal func_800C6AC4 +/* 00C6C 8089AD9C 0C031AB1 */ jal Graph_OpenDisp /* 00C70 8089ADA0 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 /* 00C74 8089ADA4 0C024F46 */ jal func_80093D18 /* 00C78 8089ADA8 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 @@ -114,7 +114,7 @@ glabel func_8089AD48 /* 00DD4 8089AF04 24C6B288 */ addiu $a2, $a2, %lo(D_8089B288) ## $a2 = 8089B288 /* 00DD8 8089AF08 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 00DDC 8089AF0C 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 00DE0 8089AF10 0C031AD5 */ jal func_800C6B54 +/* 00DE0 8089AF10 0C031AD5 */ jal Graph_CloseDisp /* 00DE4 8089AF14 2407030F */ addiu $a3, $zero, 0x030F ## $a3 = 0000030F /* 00DE8 8089AF18 8FBF0054 */ lw $ra, 0x0054($sp) /* 00DEC 8089AF1C D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s index 4b948c685e..2f308f124d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s @@ -10,7 +10,7 @@ glabel BgMenkuriEye_Draw /* 00290 8089BF00 24C6C0D0 */ addiu $a2, $a2, %lo(D_8089C0D0) ## $a2 = 8089C0D0 /* 00294 8089BF04 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00298 8089BF08 24070124 */ addiu $a3, $zero, 0x0124 ## $a3 = 00000124 -/* 0029C 8089BF0C 0C031AB1 */ jal func_800C6AC4 +/* 0029C 8089BF0C 0C031AB1 */ jal Graph_OpenDisp /* 002A0 8089BF10 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 002A4 8089BF14 8FAF005C */ lw $t7, 0x005C($sp) /* 002A8 8089BF18 0C024F61 */ jal func_80093D84 @@ -94,7 +94,7 @@ glabel BgMenkuriEye_Draw /* 003D0 8089C040 24C6C100 */ addiu $a2, $a2, %lo(D_8089C100) ## $a2 = 8089C100 /* 003D4 8089C044 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 003D8 8089C048 2407014F */ addiu $a3, $zero, 0x014F ## $a3 = 0000014F -/* 003DC 8089C04C 0C031AD5 */ jal func_800C6B54 +/* 003DC 8089C04C 0C031AD5 */ jal Graph_CloseDisp /* 003E0 8089C050 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 003E4 8089C054 8FBF001C */ lw $ra, 0x001C($sp) /* 003E8 8089C058 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s index 30a075ded0..1d56bb596a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s @@ -10,7 +10,7 @@ glabel BgMizuBwall_Draw /* 00F4C 8089D3CC 24C6DA14 */ addiu $a2, $a2, %lo(D_8089DA14) ## $a2 = 8089DA14 /* 00F50 8089D3D0 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00F54 8089D3D4 24070447 */ addiu $a3, $zero, 0x0447 ## $a3 = 00000447 -/* 00F58 8089D3D8 0C031AB1 */ jal func_800C6AC4 +/* 00F58 8089D3D8 0C031AB1 */ jal Graph_OpenDisp /* 00F5C 8089D3DC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00F60 8089D3E0 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 /* 00F64 8089D3E4 01D17021 */ addu $t6, $t6, $s1 @@ -181,7 +181,7 @@ glabel BgMizuBwall_Draw /* 011F8 8089D678 8F2802B8 */ lw $t0, 0x02B8($t9) ## 000002B8 /* 011FC 8089D67C AC480004 */ sw $t0, 0x0004($v0) ## 00000004 .L8089D680: -/* 01200 8089D680 0C031AD5 */ jal func_800C6B54 +/* 01200 8089D680 0C031AD5 */ jal Graph_CloseDisp /* 01204 8089D684 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01208 8089D688 8FBF004C */ lw $ra, 0x004C($sp) /* 0120C 8089D68C 8FB00044 */ lw $s0, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s index dd4831b4c3..91f7deb571 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s @@ -10,7 +10,7 @@ glabel BgMizuMovebg_Draw /* 00C20 8089E850 24C6EBC0 */ addiu $a2, $a2, %lo(D_8089EBC0) ## $a2 = 8089EBC0 /* 00C24 8089E854 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00C28 8089E858 240702F2 */ addiu $a3, $zero, 0x02F2 ## $a3 = 000002F2 -/* 00C2C 8089E85C 0C031AB1 */ jal func_800C6AC4 +/* 00C2C 8089E85C 0C031AB1 */ jal Graph_OpenDisp /* 00C30 8089E860 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00C34 8089E864 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 /* 00C38 8089E868 01D17021 */ addu $t6, $t6, $s1 @@ -181,7 +181,7 @@ glabel BgMizuMovebg_Draw /* 00ECC 8089EAFC 8F280180 */ lw $t0, 0x0180($t9) ## 00000180 /* 00ED0 8089EB00 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 .L8089EB04: -/* 00ED4 8089EB04 0C031AD5 */ jal func_800C6B54 +/* 00ED4 8089EB04 0C031AD5 */ jal Graph_CloseDisp /* 00ED8 8089EB08 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00EDC 8089EB0C 8FBF004C */ lw $ra, 0x004C($sp) /* 00EE0 8089EB10 8FB00044 */ lw $s0, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s index 57bf770a8b..c200ca5922 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s @@ -9,7 +9,7 @@ glabel BgMizuShutter_Draw /* 00614 8089F464 24C6F580 */ addiu $a2, $a2, %lo(D_8089F580) ## $a2 = 8089F580 /* 00618 8089F468 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 0061C 8089F46C 2407019A */ addiu $a3, $zero, 0x019A ## $a3 = 0000019A -/* 00620 8089F470 0C031AB1 */ jal func_800C6AC4 +/* 00620 8089F470 0C031AB1 */ jal Graph_OpenDisp /* 00624 8089F474 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00628 8089F478 8FAF004C */ lw $t7, 0x004C($sp) /* 0062C 8089F47C 0C024F46 */ jal func_80093D18 @@ -46,7 +46,7 @@ glabel BgMizuShutter_Draw /* 006A8 8089F4F8 8FAD004C */ lw $t5, 0x004C($sp) .L8089F4FC: /* 006AC 8089F4FC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 -/* 006B0 8089F500 0C031AD5 */ jal func_800C6B54 +/* 006B0 8089F500 0C031AD5 */ jal Graph_CloseDisp /* 006B4 8089F504 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 006B8 8089F508 8FBF001C */ lw $ra, 0x001C($sp) /* 006BC 8089F50C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s index d5650caaed..7a0b217df4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s @@ -10,7 +10,7 @@ glabel BgMizuWater_Draw /* 00B08 808A03B8 24C605A8 */ addiu $a2, $a2, %lo(D_808A05A8) ## $a2 = 808A05A8 /* 00B0C 808A03BC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 00B10 808A03C0 240702E2 */ addiu $a3, $zero, 0x02E2 ## $a3 = 000002E2 -/* 00B14 808A03C4 0C031AB1 */ jal func_800C6AC4 +/* 00B14 808A03C4 0C031AB1 */ jal Graph_OpenDisp /* 00B18 808A03C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00B1C 808A03CC 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 /* 00B20 808A03D0 00711821 */ addu $v1, $v1, $s1 @@ -84,7 +84,7 @@ glabel BgMizuWater_Draw /* 00C30 808A04E0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00C34 808A04E4 24C605D8 */ addiu $a2, $a2, %lo(D_808A05D8) ## $a2 = 808A05D8 /* 00C38 808A04E8 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00C3C 808A04EC 0C031AD5 */ jal func_800C6B54 +/* 00C3C 808A04EC 0C031AD5 */ jal Graph_CloseDisp /* 00C40 808A04F0 240702F4 */ addiu $a3, $zero, 0x02F4 ## $a3 = 000002F4 /* 00C44 808A04F4 8FBF003C */ lw $ra, 0x003C($sp) /* 00C48 808A04F8 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s index 8c2397602b..bc1aaa0119 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s @@ -10,7 +10,7 @@ glabel func_808A13B4 /* 00814 808A13D4 24C61668 */ addiu $a2, $a2, %lo(D_808A1668) ## $a2 = 808A1668 /* 00818 808A13D8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0081C 808A13DC 2407021D */ addiu $a3, $zero, 0x021D ## $a3 = 0000021D -/* 00820 808A13E0 0C031AB1 */ jal func_800C6AC4 +/* 00820 808A13E0 0C031AB1 */ jal Graph_OpenDisp /* 00824 808A13E4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00828 808A13E8 0C024F46 */ jal func_80093D18 /* 0082C 808A13EC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -56,7 +56,7 @@ glabel func_808A13B4 /* 008CC 808A148C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 008D0 808A1490 24C61698 */ addiu $a2, $a2, %lo(D_808A1698) ## $a2 = 808A1698 /* 008D4 808A1494 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 008D8 808A1498 0C031AD5 */ jal func_800C6B54 +/* 008D8 808A1498 0C031AD5 */ jal Graph_CloseDisp /* 008DC 808A149C 24070229 */ addiu $a3, $zero, 0x0229 ## $a3 = 00000229 /* 008E0 808A14A0 8FBF001C */ lw $ra, 0x001C($sp) /* 008E4 808A14A4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s index 0489344e20..7c45edc6e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s @@ -10,7 +10,7 @@ glabel func_808A210C /* 0092C 808A212C 24C6236C */ addiu $a2, $a2, %lo(D_808A236C) ## $a2 = 808A236C /* 00930 808A2130 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00934 808A2134 2407023F */ addiu $a3, $zero, 0x023F ## $a3 = 0000023F -/* 00938 808A2138 0C031AB1 */ jal func_800C6AC4 +/* 00938 808A2138 0C031AB1 */ jal Graph_OpenDisp /* 0093C 808A213C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00940 808A2140 0C024F46 */ jal func_80093D18 /* 00944 808A2144 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -56,7 +56,7 @@ glabel func_808A210C /* 009E4 808A21E4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 009E8 808A21E8 24C6239C */ addiu $a2, $a2, %lo(D_808A239C) ## $a2 = 808A239C /* 009EC 808A21EC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 009F0 808A21F0 0C031AD5 */ jal func_800C6B54 +/* 009F0 808A21F0 0C031AD5 */ jal Graph_CloseDisp /* 009F4 808A21F4 24070248 */ addiu $a3, $zero, 0x0248 ## $a3 = 00000248 /* 009F8 808A21F8 8FBF001C */ lw $ra, 0x001C($sp) /* 009FC 808A21FC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s index 13cc2f7519..48acb57d35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s @@ -8,7 +8,7 @@ glabel func_808A2C28 /* 006E0 808A2C40 24C62F28 */ addiu $a2, $a2, %lo(D_808A2F28) ## $a2 = 808A2F28 /* 006E4 808A2C44 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 006E8 808A2C48 24070204 */ addiu $a3, $zero, 0x0204 ## $a3 = 00000204 -/* 006EC 808A2C4C 0C031AB1 */ jal func_800C6AC4 +/* 006EC 808A2C4C 0C031AB1 */ jal Graph_OpenDisp /* 006F0 808A2C50 AFA50044 */ sw $a1, 0x0044($sp) /* 006F4 808A2C54 8FAF0054 */ lw $t7, 0x0054($sp) /* 006F8 808A2C58 0C024F46 */ jal func_80093D18 @@ -81,7 +81,7 @@ glabel func_808A2C28 /* 007F8 808A2D58 8FAE0054 */ lw $t6, 0x0054($sp) .L808A2D5C: /* 007FC 808A2D5C 24070213 */ addiu $a3, $zero, 0x0213 ## $a3 = 00000213 -/* 00800 808A2D60 0C031AD5 */ jal func_800C6B54 +/* 00800 808A2D60 0C031AD5 */ jal Graph_CloseDisp /* 00804 808A2D64 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00808 808A2D68 8FBF0014 */ lw $ra, 0x0014($sp) /* 0080C 808A2D6C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s index 76843a0b13..4678010b34 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s @@ -10,7 +10,7 @@ glabel func_808A3484 /* 00444 808A34A4 24C636A4 */ addiu $a2, $a2, %lo(D_808A36A4) ## $a2 = 808A36A4 /* 00448 808A34A8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0044C 808A34AC 24070153 */ addiu $a3, $zero, 0x0153 ## $a3 = 00000153 -/* 00450 808A34B0 0C031AB1 */ jal func_800C6AC4 +/* 00450 808A34B0 0C031AB1 */ jal Graph_OpenDisp /* 00454 808A34B4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00458 808A34B8 0C024F46 */ jal func_80093D18 /* 0045C 808A34BC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -60,7 +60,7 @@ glabel func_808A3484 /* 0050C 808A356C 01194021 */ addu $t0, $t0, $t9 /* 00510 808A3570 8D0835D0 */ lw $t0, %lo(D_808A35D0)($t0) /* 00514 808A3574 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 00518 808A3578 0C031AD5 */ jal func_800C6B54 +/* 00518 808A3578 0C031AD5 */ jal Graph_CloseDisp /* 0051C 808A357C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00520 808A3580 8FBF001C */ lw $ra, 0x001C($sp) /* 00524 808A3584 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s index 42e5bfc46b..ff92dfaec9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s @@ -9,7 +9,7 @@ glabel func_808A3F58 /* 007A4 808A3F74 24C64420 */ addiu $a2, $a2, %lo(D_808A4420) ## $a2 = 808A4420 /* 007A8 808A3F78 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFA4 /* 007AC 808A3F7C 24070263 */ addiu $a3, $zero, 0x0263 ## $a3 = 00000263 -/* 007B0 808A3F80 0C031AB1 */ jal func_800C6AC4 +/* 007B0 808A3F80 0C031AB1 */ jal Graph_OpenDisp /* 007B4 808A3F84 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 007B8 808A3F88 8FAF00B4 */ lw $t7, 0x00B4($sp) /* 007BC 808A3F8C 0C024F46 */ jal func_80093D18 @@ -290,7 +290,7 @@ glabel func_808A3F58 /* 00BDC 808A43AC 24C64498 */ addiu $a2, $a2, %lo(D_808A4498) ## $a2 = 808A4498 /* 00BE0 808A43B0 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFA4 /* 00BE4 808A43B4 240702C5 */ addiu $a3, $zero, 0x02C5 ## $a3 = 000002C5 -/* 00BE8 808A43B8 0C031AD5 */ jal func_800C6B54 +/* 00BE8 808A43B8 0C031AD5 */ jal Graph_CloseDisp /* 00BEC 808A43BC 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 00BF0 808A43C0 8FBF001C */ lw $ra, 0x001C($sp) /* 00BF4 808A43C4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s index 3828292705..7d48c580b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s @@ -14,7 +14,7 @@ glabel func_808A4A64 /* 00454 808A4A94 24C64CAC */ addiu $a2, $a2, %lo(D_808A4CAC) ## $a2 = 808A4CAC /* 00458 808A4A98 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 0045C 808A4A9C 24070164 */ addiu $a3, $zero, 0x0164 ## $a3 = 00000164 -/* 00460 808A4AA0 0C031AB1 */ jal func_800C6AC4 +/* 00460 808A4AA0 0C031AB1 */ jal Graph_OpenDisp /* 00464 808A4AA4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00468 808A4AA8 0C024F61 */ jal func_80093D84 /* 0046C 808A4AAC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -96,7 +96,7 @@ glabel func_808A4A64 /* 0059C 808A4BDC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 005A0 808A4BE0 24C64CDC */ addiu $a2, $a2, %lo(D_808A4CDC) ## $a2 = 808A4CDC /* 005A4 808A4BE4 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 -/* 005A8 808A4BE8 0C031AD5 */ jal func_800C6B54 +/* 005A8 808A4BE8 0C031AD5 */ jal Graph_CloseDisp /* 005AC 808A4BEC 2407017E */ addiu $a3, $zero, 0x017E ## $a3 = 0000017E /* 005B0 808A4BF0 8FBF003C */ lw $ra, 0x003C($sp) /* 005B4 808A4BF4 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s index b82d3e4472..66dfd51fce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s @@ -10,7 +10,7 @@ glabel func_808A52AC /* 0050C 808A52CC 24C6545C */ addiu $a2, $a2, %lo(D_808A545C) ## $a2 = 808A545C /* 00510 808A52D0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00514 808A52D4 2407015B */ addiu $a3, $zero, 0x015B ## $a3 = 0000015B -/* 00518 808A52D8 0C031AB1 */ jal func_800C6AC4 +/* 00518 808A52D8 0C031AB1 */ jal Graph_OpenDisp /* 0051C 808A52DC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00520 808A52E0 0C024F46 */ jal func_80093D18 /* 00524 808A52E4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -56,7 +56,7 @@ glabel func_808A52AC /* 005C4 808A5384 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 005C8 808A5388 24C65494 */ addiu $a2, $a2, %lo(D_808A5494) ## $a2 = 808A5494 /* 005CC 808A538C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 005D0 808A5390 0C031AD5 */ jal func_800C6B54 +/* 005D0 808A5390 0C031AD5 */ jal Graph_CloseDisp /* 005D4 808A5394 24070164 */ addiu $a3, $zero, 0x0164 ## $a3 = 00000164 /* 005D8 808A5398 8FBF001C */ lw $ra, 0x001C($sp) /* 005DC 808A539C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s index 4725175320..3ce392772c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s @@ -10,7 +10,7 @@ glabel func_808A5D60 /* 00810 808A5D80 24C65FF8 */ addiu $a2, $a2, %lo(D_808A5FF8) ## $a2 = 808A5FF8 /* 00814 808A5D84 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00818 808A5D88 240701F1 */ addiu $a3, $zero, 0x01F1 ## $a3 = 000001F1 -/* 0081C 808A5D8C 0C031AB1 */ jal func_800C6AC4 +/* 0081C 808A5D8C 0C031AB1 */ jal Graph_OpenDisp /* 00820 808A5D90 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00824 808A5D94 0C024F46 */ jal func_80093D18 /* 00828 808A5D98 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -56,7 +56,7 @@ glabel func_808A5D60 /* 008C8 808A5E38 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 008CC 808A5E3C 24C66030 */ addiu $a2, $a2, %lo(D_808A6030) ## $a2 = 808A6030 /* 008D0 808A5E40 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 008D4 808A5E44 0C031AD5 */ jal func_800C6B54 +/* 008D4 808A5E44 0C031AD5 */ jal Graph_CloseDisp /* 008D8 808A5E48 240701FA */ addiu $a3, $zero, 0x01FA ## $a3 = 000001FA /* 008DC 808A5E4C 8FBF001C */ lw $ra, 0x001C($sp) /* 008E0 808A5E50 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s index 951dcb93e2..7f61585ce3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s @@ -9,7 +9,7 @@ glabel BgPoEvent_Draw /* 01828 808A7A38 24C67DB0 */ addiu $a2, $a2, %lo(D_808A7DB0) ## $a2 = 808A7DB0 /* 0182C 808A7A3C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFC0 /* 01830 808A7A40 240705C9 */ addiu $a3, $zero, 0x05C9 ## $a3 = 000005C9 -/* 01834 808A7A44 0C031AB1 */ jal func_800C6AC4 +/* 01834 808A7A44 0C031AB1 */ jal Graph_OpenDisp /* 01838 808A7A48 AFA50040 */ sw $a1, 0x0040($sp) /* 0183C 808A7A4C 8FAF0074 */ lw $t7, 0x0074($sp) /* 01840 808A7A50 0C024F46 */ jal func_80093D18 @@ -80,7 +80,7 @@ glabel BgPoEvent_Draw /* 01934 808A7B44 240705E4 */ addiu $a3, $zero, 0x05E4 ## $a3 = 000005E4 /* 01938 808A7B48 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 0193C 808A7B4C 8FAC0074 */ lw $t4, 0x0074($sp) -/* 01940 808A7B50 0C031AD5 */ jal func_800C6B54 +/* 01940 808A7B50 0C031AD5 */ jal Graph_CloseDisp /* 01944 808A7B54 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01948 808A7B58 92020168 */ lbu $v0, 0x0168($s0) ## 00000168 /* 0194C 808A7B5C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s index c58fc822c1..3fbc65034c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s @@ -10,7 +10,7 @@ glabel BgPoSyokudai_Draw /* 003B0 808A8460 24C689D0 */ addiu $a2, $a2, %lo(D_808A89D0) ## $a2 = 808A89D0 /* 003B4 808A8464 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 003B8 808A8468 2407013B */ addiu $a3, $zero, 0x013B ## $a3 = 0000013B -/* 003BC 808A846C 0C031AB1 */ jal func_800C6AC4 +/* 003BC 808A846C 0C031AB1 */ jal Graph_OpenDisp /* 003C0 808A8470 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003C4 808A8474 0C024F46 */ jal func_80093D18 /* 003C8 808A8478 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -335,7 +335,7 @@ glabel BgPoSyokudai_Draw /* 00888 808A8938 24C68A18 */ addiu $a2, $a2, %lo(D_808A8A18) ## $a2 = 808A8A18 /* 0088C 808A893C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00890 808A8940 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00894 808A8944 0C031AD5 */ jal func_800C6B54 +/* 00894 808A8944 0C031AD5 */ jal Graph_CloseDisp /* 00898 808A8948 24070175 */ addiu $a3, $zero, 0x0175 ## $a3 = 00000175 /* 0089C 808A894C 8FBF003C */ lw $ra, 0x003C($sp) /* 008A0 808A8950 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s index 3c5ba4ab00..a576a6779c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s @@ -19,7 +19,7 @@ glabel BgSpot00Hanebasi_Draw /* 00E4C 808AA5CC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 00E50 808AA5D0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFD4 /* 00E54 808AA5D4 240702BA */ addiu $a3, $zero, 0x02BA ## $a3 = 000002BA -/* 00E58 808AA5D8 0C031AB1 */ jal func_800C6AC4 +/* 00E58 808AA5D8 0C031AB1 */ jal Graph_OpenDisp /* 00E5C 808AA5DC AFA50044 */ sw $a1, 0x0044($sp) /* 00E60 808AA5E0 8FAA0064 */ lw $t2, 0x0064($sp) /* 00E64 808AA5E4 0C024F46 */ jal func_80093D18 @@ -126,7 +126,7 @@ glabel BgSpot00Hanebasi_Draw /* 00FE4 808AA764 24C6A85C */ addiu $a2, $a2, %lo(D_808AA85C) ## $a2 = 808AA85C /* 00FE8 808AA768 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFD4 /* 00FEC 808AA76C 240702DD */ addiu $a3, $zero, 0x02DD ## $a3 = 000002DD -/* 00FF0 808AA770 0C031AD5 */ jal func_800C6B54 +/* 00FF0 808AA770 0C031AD5 */ jal Graph_CloseDisp /* 00FF4 808AA774 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00FF8 808AA778 8FBF001C */ lw $ra, 0x001C($sp) /* 00FFC 808AA77C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s index 585387b60c..e53ce37f8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s @@ -22,7 +22,7 @@ glabel func_808AA2B0 /* 00B80 808AA300 24C6A7D0 */ addiu $a2, $a2, %lo(D_808AA7D0) ## $a2 = 808AA7D0 /* 00B84 808AA304 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE0 /* 00B88 808AA308 24070279 */ addiu $a3, $zero, 0x0279 ## $a3 = 00000279 -/* 00B8C 808AA30C 0C031AB1 */ jal func_800C6AC4 +/* 00B8C 808AA30C 0C031AB1 */ jal Graph_OpenDisp /* 00B90 808AA310 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 00B94 808AA314 0C024F61 */ jal func_80093D84 /* 00B98 808AA318 8E640000 */ lw $a0, 0x0000($s3) ## 00000000 @@ -167,7 +167,7 @@ glabel func_808AA2B0 /* 00DB0 808AA530 24C6A808 */ addiu $a2, $a2, %lo(D_808AA808) ## $a2 = 808AA808 /* 00DB4 808AA534 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE0 /* 00DB8 808AA538 8E650000 */ lw $a1, 0x0000($s3) ## 00000000 -/* 00DBC 808AA53C 0C031AD5 */ jal func_800C6B54 +/* 00DBC 808AA53C 0C031AD5 */ jal Graph_CloseDisp /* 00DC0 808AA540 240702A9 */ addiu $a3, $zero, 0x02A9 ## $a3 = 000002A9 /* 00DC4 808AA544 8FBF0084 */ lw $ra, 0x0084($sp) /* 00DC8 808AA548 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s index de67ccb2dd..7b10b44d9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s @@ -9,7 +9,7 @@ glabel func_808AB700 /* 00A3C 808AB71C 24C6B938 */ addiu $a2, $a2, %lo(D_808AB938) ## $a2 = 808AB938 /* 00A40 808AB720 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00A44 808AB724 240702B1 */ addiu $a3, $zero, 0x02B1 ## $a3 = 000002B1 -/* 00A48 808AB728 0C031AB1 */ jal func_800C6AC4 +/* 00A48 808AB728 0C031AB1 */ jal Graph_OpenDisp /* 00A4C 808AB72C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00A50 808AB730 0C024F46 */ jal func_80093D18 /* 00A54 808AB734 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -42,7 +42,7 @@ glabel func_808AB700 /* 00AC0 808AB7A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00AC4 808AB7A4 240702C4 */ addiu $a3, $zero, 0x02C4 ## $a3 = 000002C4 /* 00AC8 808AB7A8 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 00ACC 808AB7AC 0C031AD5 */ jal func_800C6B54 +/* 00ACC 808AB7AC 0C031AD5 */ jal Graph_CloseDisp /* 00AD0 808AB7B0 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 00AD4 808AB7B4 8FBF001C */ lw $ra, 0x001C($sp) /* 00AD8 808AB7B8 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s index b811c85efb..72e4e989d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s @@ -10,7 +10,7 @@ glabel BgSpot01Idomizu_Draw /* 00198 808ABC78 24C6BDC0 */ addiu $a2, $a2, %lo(D_808ABDC0) ## $a2 = 808ABDC0 /* 0019C 808ABC7C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 001A0 808ABC80 240700E4 */ addiu $a3, $zero, 0x00E4 ## $a3 = 000000E4 -/* 001A4 808ABC84 0C031AB1 */ jal func_800C6AC4 +/* 001A4 808ABC84 0C031AB1 */ jal Graph_OpenDisp /* 001A8 808ABC88 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 001AC 808ABC8C 0C024F61 */ jal func_80093D84 /* 001B0 808ABC90 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -69,7 +69,7 @@ glabel BgSpot01Idomizu_Draw /* 00284 808ABD64 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00288 808ABD68 24C6BDF8 */ addiu $a2, $a2, %lo(D_808ABDF8) ## $a2 = 808ABDF8 /* 0028C 808ABD6C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 00290 808ABD70 0C031AD5 */ jal func_800C6B54 +/* 00290 808ABD70 0C031AD5 */ jal Graph_CloseDisp /* 00294 808ABD74 240700F4 */ addiu $a3, $zero, 0x00F4 ## $a3 = 000000F4 /* 00298 808ABD78 8FBF003C */ lw $ra, 0x003C($sp) /* 0029C 808ABD7C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s index 5aeff92ae8..509df34ece 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s @@ -10,7 +10,7 @@ glabel func_808ACCB8 /* 00678 808ACCD8 24C6D8C0 */ addiu $a2, $a2, %lo(D_808AD8C0) ## $a2 = 808AD8C0 /* 0067C 808ACCDC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 00680 808ACCE0 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258 -/* 00684 808ACCE4 0C031AB1 */ jal func_800C6AC4 +/* 00684 808ACCE4 0C031AB1 */ jal Graph_OpenDisp /* 00688 808ACCE8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0068C 808ACCEC 922E1D6C */ lbu $t6, 0x1D6C($s1) ## 00001D6C /* 00690 808ACCF0 11C001AD */ beq $t6, $zero, .L808AD3A8 @@ -472,7 +472,7 @@ glabel func_808ACCB8 /* 00D4C 808AD3AC 24C6D8F8 */ addiu $a2, $a2, %lo(D_808AD8F8) ## $a2 = 808AD8F8 /* 00D50 808AD3B0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 00D54 808AD3B4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00D58 808AD3B8 0C031AD5 */ jal func_800C6B54 +/* 00D58 808AD3B8 0C031AD5 */ jal Graph_CloseDisp /* 00D5C 808AD3BC 240702B4 */ addiu $a3, $zero, 0x02B4 ## $a3 = 000002B4 /* 00D60 808AD3C0 8FBF001C */ lw $ra, 0x001C($sp) /* 00D64 808AD3C4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s index acb15beece..480fdbd6d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s @@ -11,7 +11,7 @@ glabel func_808AD450 /* 00E14 808AD474 24C6D914 */ addiu $a2, $a2, %lo(D_808AD914) ## $a2 = 808AD914 /* 00E18 808AD478 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 00E1C 808AD47C 240702E0 */ addiu $a3, $zero, 0x02E0 ## $a3 = 000002E0 -/* 00E20 808AD480 0C031AB1 */ jal func_800C6AC4 +/* 00E20 808AD480 0C031AB1 */ jal Graph_OpenDisp /* 00E24 808AD484 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00E28 808AD488 922E1D6C */ lbu $t6, 0x1D6C($s1) ## 00001D6C /* 00E2C 808AD48C 11C000E4 */ beq $t6, $zero, .L808AD820 @@ -257,7 +257,7 @@ glabel func_808AD450 /* 011C4 808AD824 24C6D94C */ addiu $a2, $a2, %lo(D_808AD94C) ## $a2 = 808AD94C /* 011C8 808AD828 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 011CC 808AD82C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 011D0 808AD830 0C031AD5 */ jal func_800C6B54 +/* 011D0 808AD830 0C031AD5 */ jal Graph_CloseDisp /* 011D4 808AD834 24070332 */ addiu $a3, $zero, 0x0332 ## $a3 = 00000332 /* 011D8 808AD838 8FBF0044 */ lw $ra, 0x0044($sp) /* 011DC 808AD83C 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s index 89c9e784db..558219cf82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s @@ -9,7 +9,7 @@ glabel BgSpot03Taki_Draw /* 00620 808AE100 24C6E3C0 */ addiu $a2, $a2, %lo(D_808AE3C0) ## $a2 = 808AE3C0 /* 00624 808AE104 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 /* 00628 808AE108 24070141 */ addiu $a3, $zero, 0x0141 ## $a3 = 00000141 -/* 0062C 808AE10C 0C031AB1 */ jal func_800C6AC4 +/* 0062C 808AE10C 0C031AB1 */ jal Graph_OpenDisp /* 00630 808AE110 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00634 808AE114 8FA7008C */ lw $a3, 0x008C($sp) /* 00638 808AE118 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -147,7 +147,7 @@ glabel BgSpot03Taki_Draw /* 00840 808AE320 24C6E3F0 */ addiu $a2, $a2, %lo(D_808AE3F0) ## $a2 = 808AE3F0 /* 00844 808AE324 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 /* 00848 808AE328 24070166 */ addiu $a3, $zero, 0x0166 ## $a3 = 00000166 -/* 0084C 808AE32C 0C031AD5 */ jal func_800C6B54 +/* 0084C 808AE32C 0C031AD5 */ jal Graph_CloseDisp /* 00850 808AE330 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 00854 808AE334 8FA90088 */ lw $t1, 0x0088($sp) /* 00858 808AE338 912E0174 */ lbu $t6, 0x0174($t1) ## 00000174 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s index 3bc8186488..8eb410d093 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s @@ -11,7 +11,7 @@ glabel func_808AF524 /* 00DC8 808AF548 24C6F994 */ addiu $a2, $a2, %lo(D_808AF994) ## $a2 = 808AF994 /* 00DCC 808AF54C 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 00DD0 808AF550 2407034C */ addiu $a3, $zero, 0x034C ## $a3 = 0000034C -/* 00DD4 808AF554 0C031AB1 */ jal func_800C6AC4 +/* 00DD4 808AF554 0C031AB1 */ jal Graph_OpenDisp /* 00DD8 808AF558 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00DDC 808AF55C 0C024F61 */ jal func_80093D84 /* 00DE0 808AF560 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -126,7 +126,7 @@ glabel func_808AF524 /* 00F90 808AF710 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00F94 808AF714 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 .L808AF718: -/* 00F98 808AF718 0C031AD5 */ jal func_800C6B54 +/* 00F98 808AF718 0C031AD5 */ jal Graph_CloseDisp /* 00F9C 808AF71C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 00FA0 808AF720 8FBF0044 */ lw $ra, 0x0044($sp) /* 00FA4 808AF724 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s index f01ee38aba..64150658b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s @@ -9,7 +9,7 @@ glabel BgSpot07Taki_Draw /* 00124 808AFD54 24C60210 */ addiu $a2, $a2, %lo(D_808B0210) ## $a2 = 808B0210 /* 00128 808AFD58 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 0012C 808AFD5C 240700A9 */ addiu $a3, $zero, 0x00A9 ## $a3 = 000000A9 -/* 00130 808AFD60 0C031AB1 */ jal func_800C6AC4 +/* 00130 808AFD60 0C031AB1 */ jal Graph_OpenDisp /* 00134 808AFD64 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00138 808AFD68 8FA200A4 */ lw $v0, 0x00A4($sp) /* 0013C 808AFD6C 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 @@ -293,7 +293,7 @@ glabel BgSpot07Taki_Draw /* 0057C 808B01AC 24C60258 */ addiu $a2, $a2, %lo(D_808B0258) ## $a2 = 808B0258 /* 00580 808B01B0 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 00584 808B01B4 24070110 */ addiu $a3, $zero, 0x0110 ## $a3 = 00000110 -/* 00588 808B01B8 0C031AD5 */ jal func_800C6B54 +/* 00588 808B01B8 0C031AD5 */ jal Graph_CloseDisp /* 0058C 808B01BC 8D650000 */ lw $a1, 0x0000($t3) ## 06000BE0 /* 00590 808B01C0 8FBF003C */ lw $ra, 0x003C($sp) /* 00594 808B01C4 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s index bf0ab859a4..16910febe6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s @@ -14,7 +14,7 @@ glabel func_808B2CA8 /* 004E8 808B2CD8 24C62E70 */ addiu $a2, $a2, %lo(D_808B2E70) ## $a2 = 808B2E70 /* 004EC 808B2CDC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 004F0 808B2CE0 24070147 */ addiu $a3, $zero, 0x0147 ## $a3 = 00000147 -/* 004F4 808B2CE4 0C031AB1 */ jal func_800C6AC4 +/* 004F4 808B2CE4 0C031AB1 */ jal Graph_OpenDisp /* 004F8 808B2CE8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 004FC 808B2CEC 0C024F61 */ jal func_80093D84 /* 00500 808B2CF0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -73,7 +73,7 @@ glabel func_808B2CA8 /* 005D4 808B2DC4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 005D8 808B2DC8 24C62EA0 */ addiu $a2, $a2, %lo(D_808B2EA0) ## $a2 = 808B2EA0 /* 005DC 808B2DCC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 005E0 808B2DD0 0C031AD5 */ jal func_800C6B54 +/* 005E0 808B2DD0 0C031AD5 */ jal Graph_CloseDisp /* 005E4 808B2DD4 2407015A */ addiu $a3, $zero, 0x015A ## $a3 = 0000015A /* 005E8 808B2DD8 8FBF003C */ lw $ra, 0x003C($sp) /* 005EC 808B2DDC 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s index b92f474a12..29eb23a3fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s @@ -10,7 +10,7 @@ glabel BgSpot16Bombstone_Draw /* 01088 808B5CB8 24C661E4 */ addiu $a2, $a2, %lo(D_808B61E4) ## $a2 = 808B61E4 /* 0108C 808B5CBC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 01090 808B5CC0 240704E5 */ addiu $a3, $zero, 0x04E5 ## $a3 = 000004E5 -/* 01094 808B5CC4 0C031AB1 */ jal func_800C6AC4 +/* 01094 808B5CC4 0C031AB1 */ jal Graph_OpenDisp /* 01098 808B5CC8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0109C 808B5CCC 0C024F46 */ jal func_80093D18 /* 010A0 808B5CD0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -69,7 +69,7 @@ glabel BgSpot16Bombstone_Draw /* 01170 808B5DA0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 .L808B5DA4: /* 01174 808B5DA4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01178 808B5DA8 0C031AD5 */ jal func_800C6B54 +/* 01178 808B5DA8 0C031AD5 */ jal Graph_CloseDisp /* 0117C 808B5DAC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01180 808B5DB0 8FBF001C */ lw $ra, 0x001C($sp) /* 01184 808B5DB4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s index 0197cad22c..d279a53af9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s @@ -14,7 +14,7 @@ glabel BgSpot16Doughnut_Draw /* 002D8 808B6718 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 002DC 808B671C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 002E0 808B6720 240700D2 */ addiu $a3, $zero, 0x00D2 ## $a3 = 000000D2 -/* 002E4 808B6724 0C031AB1 */ jal func_800C6AC4 +/* 002E4 808B6724 0C031AB1 */ jal Graph_OpenDisp /* 002E8 808B6728 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 002EC 808B672C 8FB90084 */ lw $t9, 0x0084($sp) /* 002F0 808B6730 0C024F61 */ jal func_80093D84 @@ -118,7 +118,7 @@ glabel BgSpot16Doughnut_Draw /* 00470 808B68B0 24C66AA0 */ addiu $a2, $a2, %lo(D_808B6AA0) ## $a2 = 808B6AA0 /* 00474 808B68B4 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 00478 808B68B8 240700EE */ addiu $a3, $zero, 0x00EE ## $a3 = 000000EE -/* 0047C 808B68BC 0C031AD5 */ jal func_800C6B54 +/* 0047C 808B68BC 0C031AD5 */ jal Graph_CloseDisp /* 00480 808B68C0 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00484 808B68C4 8FBF003C */ lw $ra, 0x003C($sp) /* 00488 808B68C8 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s index 8a561c8912..578a5f1c6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s @@ -9,7 +9,7 @@ glabel func_808B68D8 /* 004B4 808B68F4 24C66ABC */ addiu $a2, $a2, %lo(D_808B6ABC) ## $a2 = 808B6ABC /* 004B8 808B68F8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 004BC 808B68FC 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 004C0 808B6900 0C031AB1 */ jal func_800C6AC4 +/* 004C0 808B6900 0C031AB1 */ jal Graph_OpenDisp /* 004C4 808B6904 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 004C8 808B6908 8FAF0054 */ lw $t7, 0x0054($sp) /* 004CC 808B690C 0C024F61 */ jal func_80093D84 @@ -59,7 +59,7 @@ glabel func_808B68D8 /* 0057C 808B69BC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00580 808B69C0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 00584 808B69C4 8FAB0054 */ lw $t3, 0x0054($sp) -/* 00588 808B69C8 0C031AD5 */ jal func_800C6B54 +/* 00588 808B69C8 0C031AD5 */ jal Graph_CloseDisp /* 0058C 808B69CC 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 00590 808B69D0 8FBF001C */ lw $ra, 0x001C($sp) /* 00594 808B69D4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s index 89ce173aa6..704a580282 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s @@ -41,7 +41,7 @@ glabel BgSpot17Bakudankabe_Draw /* 00518 808B70D8 24C672B0 */ addiu $a2, $a2, %lo(D_808B72B0) ## $a2 = 808B72B0 /* 0051C 808B70DC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 00520 808B70E0 2407010D */ addiu $a3, $zero, 0x010D ## $a3 = 0000010D -/* 00524 808B70E4 0C031AB1 */ jal func_800C6AC4 +/* 00524 808B70E4 0C031AB1 */ jal Graph_OpenDisp /* 00528 808B70E8 AFA5005C */ sw $a1, 0x005C($sp) /* 0052C 808B70EC 0C024F46 */ jal func_80093D18 /* 00530 808B70F0 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 @@ -95,14 +95,14 @@ glabel BgSpot17Bakudankabe_Draw /* 005F0 808B71B0 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 005F4 808B71B4 24C672F0 */ addiu $a2, $a2, %lo(D_808B72F0) ## $a2 = 808B72F0 /* 005F8 808B71B8 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 -/* 005FC 808B71BC 0C031AD5 */ jal func_800C6B54 +/* 005FC 808B71BC 0C031AD5 */ jal Graph_CloseDisp /* 00600 808B71C0 2407011B */ addiu $a3, $zero, 0x011B ## $a3 = 0000011B /* 00604 808B71C4 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 00608 808B71C8 3C06808B */ lui $a2, %hi(D_808B7310) ## $a2 = 808B0000 /* 0060C 808B71CC 24C67310 */ addiu $a2, $a2, %lo(D_808B7310) ## $a2 = 808B7310 /* 00610 808B71D0 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFC4 /* 00614 808B71D4 2407011E */ addiu $a3, $zero, 0x011E ## $a3 = 0000011E -/* 00618 808B71D8 0C031AB1 */ jal func_800C6AC4 +/* 00618 808B71D8 0C031AB1 */ jal Graph_OpenDisp /* 0061C 808B71DC AFA5003C */ sw $a1, 0x003C($sp) /* 00620 808B71E0 0C024F61 */ jal func_80093D84 /* 00624 808B71E4 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 @@ -134,7 +134,7 @@ glabel BgSpot17Bakudankabe_Draw /* 0068C 808B724C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 00690 808B7250 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00694 808B7254 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 00698 808B7258 0C031AD5 */ jal func_800C6B54 +/* 00698 808B7258 0C031AD5 */ jal Graph_CloseDisp /* 0069C 808B725C 24070127 */ addiu $a3, $zero, 0x0127 ## $a3 = 00000127 /* 006A0 808B7260 8FBF001C */ lw $ra, 0x001C($sp) /* 006A4 808B7264 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s index d77f1e7118..95b974eb49 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s @@ -10,7 +10,7 @@ glabel func_808B7478 /* 00098 808B7498 24C67654 */ addiu $a2, $a2, %lo(D_808B7654) ## $a2 = 808B7654 /* 0009C 808B749C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 000A0 808B74A0 24070099 */ addiu $a3, $zero, 0x0099 ## $a3 = 00000099 -/* 000A4 808B74A4 0C031AB1 */ jal func_800C6AC4 +/* 000A4 808B74A4 0C031AB1 */ jal Graph_OpenDisp /* 000A8 808B74A8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 000AC 808B74AC 0C024F61 */ jal func_80093D84 /* 000B0 808B74B0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -90,7 +90,7 @@ glabel func_808B7478 /* 001D8 808B75D8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 001DC 808B75DC 24C67684 */ addiu $a2, $a2, %lo(D_808B7684) ## $a2 = 808B7684 /* 001E0 808B75E0 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 001E4 808B75E4 0C031AD5 */ jal func_800C6B54 +/* 001E4 808B75E4 0C031AD5 */ jal Graph_CloseDisp /* 001E8 808B75E8 240700B0 */ addiu $a3, $zero, 0x00B0 ## $a3 = 000000B0 /* 001EC 808B75EC 8FBF003C */ lw $ra, 0x003C($sp) /* 001F0 808B75F0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s index 12842aef54..f1294b70ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s @@ -9,7 +9,7 @@ glabel BgSstFloor_Draw /* 00420 808B9D30 24C69E40 */ addiu $a2, $a2, %lo(D_808B9E40) ## $a2 = 808B9E40 /* 00424 808B9D34 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00428 808B9D38 24070115 */ addiu $a3, $zero, 0x0115 ## $a3 = 00000115 -/* 0042C 808B9D3C 0C031AB1 */ jal func_800C6AC4 +/* 0042C 808B9D3C 0C031AB1 */ jal Graph_OpenDisp /* 00430 808B9D40 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00434 808B9D44 8FAF004C */ lw $t7, 0x004C($sp) /* 00438 808B9D48 0C024F46 */ jal func_80093D18 @@ -55,7 +55,7 @@ glabel BgSstFloor_Draw /* 004D8 808B9DE8 24C69E68 */ addiu $a2, $a2, %lo(D_808B9E68) ## $a2 = 808B9E68 /* 004DC 808B9DEC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 004E0 808B9DF0 2407011F */ addiu $a3, $zero, 0x011F ## $a3 = 0000011F -/* 004E4 808B9DF4 0C031AD5 */ jal func_800C6B54 +/* 004E4 808B9DF4 0C031AD5 */ jal Graph_CloseDisp /* 004E8 808B9DF8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 004EC 808B9DFC 8FBF001C */ lw $ra, 0x001C($sp) /* 004F0 808B9E00 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s index 6f85c90312..0ed88386cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s @@ -10,7 +10,7 @@ glabel func_808BA018 /* 00138 808BA038 24C6AC80 */ addiu $a2, $a2, %lo(D_808BAC80) ## $a2 = 808BAC80 /* 0013C 808BA03C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 00140 808BA040 240700F6 */ addiu $a3, $zero, 0x00F6 ## $a3 = 000000F6 -/* 00144 808BA044 0C031AB1 */ jal func_800C6AC4 +/* 00144 808BA044 0C031AB1 */ jal Graph_OpenDisp /* 00148 808BA048 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0014C 808BA04C 0C024F46 */ jal func_80093D18 /* 00150 808BA050 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -117,7 +117,7 @@ glabel func_808BA018 /* 002DC 808BA1DC 24C6ACC8 */ addiu $a2, $a2, %lo(D_808BACC8) ## $a2 = 808BACC8 /* 002E0 808BA1E0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 002E4 808BA1E4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 002E8 808BA1E8 0C031AD5 */ jal func_800C6B54 +/* 002E8 808BA1E8 0C031AD5 */ jal Graph_CloseDisp /* 002EC 808BA1EC 2407011C */ addiu $a3, $zero, 0x011C ## $a3 = 0000011C /* 002F0 808BA1F0 8FBF0024 */ lw $ra, 0x0024($sp) /* 002F4 808BA1F4 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s index 4fd76326b6..96e0cd908f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s @@ -9,7 +9,7 @@ glabel func_808BA2CC /* 003E8 808BA2E8 24C6ACE0 */ addiu $a2, $a2, %lo(D_808BACE0) ## $a2 = 808BACE0 /* 003EC 808BA2EC 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFE4 /* 003F0 808BA2F0 2407015E */ addiu $a3, $zero, 0x015E ## $a3 = 0000015E -/* 003F4 808BA2F4 0C031AB1 */ jal func_800C6AC4 +/* 003F4 808BA2F4 0C031AB1 */ jal Graph_OpenDisp /* 003F8 808BA2F8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003FC 808BA2FC 3C01438A */ lui $at, 0x438A ## $at = 438A0000 /* 00400 808BA300 44817000 */ mtc1 $at, $f14 ## $f14 = 276.00 @@ -631,7 +631,7 @@ glabel func_808BA2CC /* 00D28 808BAC28 24C6AD40 */ addiu $a2, $a2, %lo(D_808BAD40) ## $a2 = 808BAD40 /* 00D2C 808BAC2C 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFE4 /* 00D30 808BAC30 240701BB */ addiu $a3, $zero, 0x01BB ## $a3 = 000001BB -/* 00D34 808BAC34 0C031AD5 */ jal func_800C6B54 +/* 00D34 808BAC34 0C031AD5 */ jal Graph_CloseDisp /* 00D38 808BAC38 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 00D3C 808BAC3C 8FBF003C */ lw $ra, 0x003C($sp) /* 00D40 808BAC40 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s index 105fa52095..7f77628d95 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s @@ -10,7 +10,7 @@ glabel BgTreemouth_Draw /* 0073C 808BCC3C A7A90042 */ sh $t1, 0x0042($sp) /* 00740 808BCC40 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 00744 808BCC44 2407037D */ addiu $a3, $zero, 0x037D ## $a3 = 0000037D -/* 00748 808BCC48 0C031AB1 */ jal func_800C6AC4 +/* 00748 808BCC48 0C031AB1 */ jal Graph_OpenDisp /* 0074C 808BCC4C AFA5003C */ sw $a1, 0x003C($sp) /* 00750 808BCC50 8FAF004C */ lw $t7, 0x004C($sp) /* 00754 808BCC54 0C024F46 */ jal func_80093D18 @@ -128,7 +128,7 @@ glabel BgTreemouth_Draw /* 008F8 808BCDF8 24C6DA08 */ addiu $a2, $a2, %lo(D_808BDA08) ## $a2 = 808BDA08 /* 008FC 808BCDFC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 00900 808BCE00 240703A9 */ addiu $a3, $zero, 0x03A9 ## $a3 = 000003A9 -/* 00904 808BCE04 0C031AD5 */ jal func_800C6B54 +/* 00904 808BCE04 0C031AD5 */ jal Graph_CloseDisp /* 00908 808BCE08 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 0090C 808BCE0C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00910 808BCE10 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s index f40308bb14..6202f3d67f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s @@ -9,7 +9,7 @@ glabel BgVbSima_Draw /* 005E0 808BE340 24C6E420 */ addiu $a2, $a2, %lo(D_808BE420) ## $a2 = 808BE420 /* 005E4 808BE344 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 005E8 808BE348 2407011D */ addiu $a3, $zero, 0x011D ## $a3 = 0000011D -/* 005EC 808BE34C 0C031AB1 */ jal func_800C6AC4 +/* 005EC 808BE34C 0C031AB1 */ jal Graph_OpenDisp /* 005F0 808BE350 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 005F4 808BE354 8FAF0044 */ lw $t7, 0x0044($sp) /* 005F8 808BE358 0C024F46 */ jal func_80093D18 @@ -42,7 +42,7 @@ glabel BgVbSima_Draw /* 00664 808BE3C4 24C6E448 */ addiu $a2, $a2, %lo(D_808BE448) ## $a2 = 808BE448 /* 00668 808BE3C8 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 0066C 808BE3CC 24070128 */ addiu $a3, $zero, 0x0128 ## $a3 = 00000128 -/* 00670 808BE3D0 0C031AD5 */ jal func_800C6B54 +/* 00670 808BE3D0 0C031AD5 */ jal Graph_CloseDisp /* 00674 808BE3D4 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00678 808BE3D8 8FBF001C */ lw $ra, 0x001C($sp) /* 0067C 808BE3DC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s index d8a3cf19aa..6aad1498ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s @@ -24,7 +24,7 @@ glabel BgYdanHasi_Draw /* 005DC 808BEADC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 005E0 808BEAE0 24C6EC30 */ addiu $a2, $a2, %lo(D_808BEC30) ## $a2 = FFFFEC30 /* 005E4 808BEAE4 24070241 */ addiu $a3, $zero, 0x0241 ## $a3 = 00000241 -/* 005E8 808BEAE8 0C031AB1 */ jal func_800C6AC4 +/* 005E8 808BEAE8 0C031AB1 */ jal Graph_OpenDisp /* 005EC 808BEAEC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 005F0 808BEAF0 0C024F61 */ jal func_80093D84 /* 005F4 808BEAF4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -84,7 +84,7 @@ glabel BgYdanHasi_Draw /* 006CC 808BEBCC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 006D0 808BEBD0 24C6EC58 */ addiu $a2, $a2, %lo(D_808BEC58) ## $a2 = 808BEC58 /* 006D4 808BEBD4 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 -/* 006D8 808BEBD8 0C031AD5 */ jal func_800C6B54 +/* 006D8 808BEBD8 0C031AD5 */ jal Graph_CloseDisp /* 006DC 808BEBDC 24070255 */ addiu $a3, $zero, 0x0255 ## $a3 = 00000255 /* 006E0 808BEBE0 8FBF003C */ lw $ra, 0x003C($sp) .L808BEBE4: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s index 738fab1d71..e578d1cadb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s @@ -14,7 +14,7 @@ glabel BgYdanSp_Draw /* 011E8 808C05F8 24C609F0 */ addiu $a2, $a2, %lo(D_808C09F0) ## $a2 = 808C09F0 /* 011EC 808C05FC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFA4 /* 011F0 808C0600 2407030D */ addiu $a3, $zero, 0x030D ## $a3 = 0000030D -/* 011F4 808C0604 0C031AB1 */ jal func_800C6AC4 +/* 011F4 808C0604 0C031AB1 */ jal Graph_OpenDisp /* 011F8 808C0608 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 011FC 808C060C 0C024F61 */ jal func_80093D84 /* 01200 808C0610 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -203,7 +203,7 @@ glabel BgYdanSp_Draw /* 014C8 808C08D8 24C60A54 */ addiu $a2, $a2, %lo(D_808C0A54) ## $a2 = 808C0A54 /* 014CC 808C08DC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFA4 /* 014D0 808C08E0 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 014D4 808C08E4 0C031AD5 */ jal func_800C6B54 +/* 014D4 808C08E4 0C031AD5 */ jal Graph_CloseDisp /* 014D8 808C08E8 24070358 */ addiu $a3, $zero, 0x0358 ## $a3 = 00000358 /* 014DC 808C08EC 8FBF0034 */ lw $ra, 0x0034($sp) /* 014E0 808C08F0 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s index 71c388ccbb..28cdfc4e76 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s @@ -11,7 +11,7 @@ glabel BossDodongo_Draw /* 03B04 808C4C94 24C6A5DC */ addiu $a2, $a2, %lo(D_808CA5DC) ## $a2 = 808CA5DC /* 03B08 808C4C98 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 03B0C 808C4C9C 24070F52 */ addiu $a3, $zero, 0x0F52 ## $a3 = 00000F52 -/* 03B10 808C4CA0 0C031AB1 */ jal func_800C6AC4 +/* 03B10 808C4CA0 0C031AB1 */ jal Graph_OpenDisp /* 03B14 808C4CA4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 03B18 808C4CA8 0C024F46 */ jal func_80093D18 /* 03B1C 808C4CAC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -192,7 +192,7 @@ glabel BossDodongo_Draw /* 03DA8 808C4F38 24C6A5F0 */ addiu $a2, $a2, %lo(D_808CA5F0) ## $a2 = 808CA5F0 /* 03DAC 808C4F3C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 03DB0 808C4F40 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 03DB4 808C4F44 0C031AD5 */ jal func_800C6B54 +/* 03DB4 808C4F44 0C031AD5 */ jal Graph_CloseDisp /* 03DB8 808C4F48 24070F8D */ addiu $a3, $zero, 0x0F8D ## $a3 = 00000F8D /* 03DBC 808C4F4C 0C231B7A */ jal func_808C6DE8 /* 03DC0 808C4F50 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s index 603700c16f..4a2c10c947 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s @@ -20,7 +20,7 @@ glabel func_808C4940 /* 037F4 808C4984 8FBF0014 */ lw $ra, 0x0014($sp) /* 037F8 808C4988 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 037FC 808C498C 24070ECB */ addiu $a3, $zero, 0x0ECB ## $a3 = 00000ECB -/* 03800 808C4990 0C031AB1 */ jal func_800C6AC4 +/* 03800 808C4990 0C031AB1 */ jal Graph_OpenDisp /* 03804 808C4994 AFA50040 */ sw $a1, 0x0040($sp) /* 03808 808C4998 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0380C 808C499C 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 @@ -144,7 +144,7 @@ glabel func_808C4940 /* 039D8 808C4B68 24C6A5C8 */ addiu $a2, $a2, %lo(D_808CA5C8) ## $a2 = 808CA5C8 /* 039DC 808C4B6C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 039E0 808C4B70 24070EF2 */ addiu $a3, $zero, 0x0EF2 ## $a3 = 00000EF2 -/* 039E4 808C4B74 0C031AD5 */ jal func_800C6B54 +/* 039E4 808C4B74 0C031AD5 */ jal Graph_CloseDisp /* 039E8 808C4B78 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 039EC 808C4B7C 8FBF0014 */ lw $ra, 0x0014($sp) .L808C4B80: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s index f660aa1f6c..e4cfcf4951 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s @@ -21,7 +21,7 @@ glabel func_808C6DE8 /* 05CA4 808C6E34 24C6A604 */ addiu $a2, $a2, %lo(D_808CA604) ## $a2 = 808CA604 /* 05CA8 808C6E38 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 05CAC 808C6E3C 2407146C */ addiu $a3, $zero, 0x146C ## $a3 = 0000146C -/* 05CB0 808C6E40 0C031AB1 */ jal func_800C6AC4 +/* 05CB0 808C6E40 0C031AB1 */ jal Graph_OpenDisp /* 05CB4 808C6E44 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 05CB8 808C6E48 0C024F61 */ jal func_80093D84 /* 05CBC 808C6E4C 8EE40000 */ lw $a0, 0x0000($s7) ## 00000000 @@ -113,7 +113,7 @@ glabel func_808C6DE8 /* 05E08 808C6F98 24C6A62C */ addiu $a2, $a2, %lo(D_808CA62C) ## $a2 = 808CA62C /* 05E0C 808C6F9C 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 05E10 808C6FA0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05E14 808C6FA4 0C031AD5 */ jal func_800C6B54 +/* 05E14 808C6FA4 0C031AD5 */ jal Graph_CloseDisp /* 05E18 808C6FA8 2407148A */ addiu $a3, $zero, 0x148A ## $a3 = 0000148A /* 05E1C 808C6FAC 8FBF0044 */ lw $ra, 0x0044($sp) /* 05E20 808C6FB0 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s index 5740781405..1b1d4a9656 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s @@ -19,7 +19,7 @@ glabel BossFd_Draw /* 0521C 808CFFDC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 05220 808CFFE0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 05224 808CFFE4 24071079 */ addiu $a3, $zero, 0x1079 ## $a3 = 00001079 -/* 05228 808CFFE8 0C031AB1 */ jal func_800C6AC4 +/* 05228 808CFFE8 0C031AB1 */ jal Graph_OpenDisp /* 0522C 808CFFEC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 05230 808CFFF0 0C024F46 */ jal func_80093D18 /* 05234 808CFFF4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -50,7 +50,7 @@ glabel BossFd_Draw /* 05294 808D0054 24C61D7C */ addiu $a2, $a2, %lo(D_808D1D7C) ## $a2 = 808D1D7C /* 05298 808D0058 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 0529C 808D005C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 052A0 808D0060 0C031AD5 */ jal func_800C6B54 +/* 052A0 808D0060 0C031AD5 */ jal Graph_CloseDisp /* 052A4 808D0064 24071093 */ addiu $a3, $zero, 0x1093 ## $a3 = 00001093 .L808D0068: /* 052A8 808D0068 3C04808D */ lui $a0, %hi(D_808D1D8C) ## $a0 = 808D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s index 3dfd98afe4..7d226b1eca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s @@ -20,7 +20,7 @@ glabel func_808CF898 /* 04B20 808CF8E0 24C61CEC */ addiu $a2, $a2, %lo(D_808D1CEC) ## $a2 = 808D1CEC /* 04B24 808CF8E4 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFDC /* 04B28 808CF8E8 24070FB7 */ addiu $a3, $zero, 0x0FB7 ## $a3 = 00000FB7 -/* 04B2C 808CF8EC 0C031AB1 */ jal func_800C6AC4 +/* 04B2C 808CF8EC 0C031AB1 */ jal Graph_OpenDisp /* 04B30 808CF8F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04B34 808CF8F4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04B38 808CF8F8 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 @@ -448,7 +448,7 @@ glabel func_808CF898 /* 05194 808CFF54 24C61D4C */ addiu $a2, $a2, %lo(D_808D1D4C) ## $a2 = 808D1D4C /* 05198 808CFF58 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFDC /* 0519C 808CFF5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 051A0 808CFF60 0C031AD5 */ jal func_800C6B54 +/* 051A0 808CFF60 0C031AD5 */ jal Graph_CloseDisp /* 051A4 808CFF64 24071066 */ addiu $a3, $zero, 0x1066 ## $a3 = 00001066 /* 051A8 808CFF68 8FBF0044 */ lw $ra, 0x0044($sp) /* 051AC 808CFF6C D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s index 6fb5bb6549..b8e7628149 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s @@ -92,7 +92,7 @@ glabel func_808D02DC /* 05674 808D0434 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFF24 /* 05678 808D0438 24071143 */ addiu $a3, $zero, 0x1143 ## $a3 = 00001143 /* 0567C 808D043C 8F050000 */ lw $a1, 0x0000($t8) ## 808D1B74 -/* 05680 808D0440 0C031AB1 */ jal func_800C6AC4 +/* 05680 808D0440 0C031AB1 */ jal Graph_OpenDisp /* 05684 808D0444 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 /* 05688 808D0448 866E021E */ lh $t6, 0x021E($s3) ## 0000021E /* 0568C 808D044C 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 @@ -295,7 +295,7 @@ glabel func_808D02DC /* 05988 808D0748 24C61DCC */ addiu $a2, $a2, %lo(D_808D1DCC) ## $a2 = 808D1DCC /* 0598C 808D074C 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFF24 /* 05990 808D0750 24071183 */ addiu $a3, $zero, 0x1183 ## $a3 = 00001183 -/* 05994 808D0754 0C031AD5 */ jal func_800C6B54 +/* 05994 808D0754 0C031AD5 */ jal Graph_CloseDisp /* 05998 808D0758 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 0599C 808D075C 8FBF006C */ lw $ra, 0x006C($sp) /* 059A0 808D0760 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s index 7156e35179..76bd5055f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s @@ -24,7 +24,7 @@ glabel func_808D08F8 /* 05B8C 808D094C 24C61DDC */ addiu $a2, $a2, %lo(D_808D1DDC) ## $a2 = 808D1DDC /* 05B90 808D0950 27A40158 */ addiu $a0, $sp, 0x0158 ## $a0 = FFFFFFE0 /* 05B94 808D0954 240711ED */ addiu $a3, $zero, 0x11ED ## $a3 = 000011ED -/* 05B98 808D0958 0C031AB1 */ jal func_800C6AC4 +/* 05B98 808D0958 0C031AB1 */ jal Graph_OpenDisp /* 05B9C 808D095C 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 05BA0 808D0960 866E021E */ lh $t6, 0x021E($s3) ## 0000021E /* 05BA4 808D0964 51C0001A */ beql $t6, $zero, .L808D09D0 @@ -865,7 +865,7 @@ glabel func_808D08F8 /* 06834 808D15F4 24C61E38 */ addiu $a2, $a2, %lo(D_808D1E38) ## $a2 = 808D1E38 /* 06838 808D15F8 27A40158 */ addiu $a0, $sp, 0x0158 ## $a0 = FFFFFFE0 /* 0683C 808D15FC 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 06840 808D1600 0C031AD5 */ jal func_800C6B54 +/* 06840 808D1600 0C031AD5 */ jal Graph_CloseDisp /* 06844 808D1604 2407137B */ addiu $a3, $zero, 0x137B ## $a3 = 0000137B /* 06848 808D1608 8FBF0074 */ lw $ra, 0x0074($sp) /* 0684C 808D160C D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s index a951249713..746abe660e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s @@ -11,7 +11,7 @@ glabel BossFd2_Draw /* 03704 808D5D74 24C66444 */ addiu $a2, $a2, %lo(D_808D6444) ## $a2 = 808D6444 /* 03708 808D5D78 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 0370C 808D5D7C 24070A39 */ addiu $a3, $zero, 0x0A39 ## $a3 = 00000A39 -/* 03710 808D5D80 0C031AB1 */ jal func_800C6AC4 +/* 03710 808D5D80 0C031AB1 */ jal Graph_OpenDisp /* 03714 808D5D84 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 03718 808D5D88 3C04808D */ lui $a0, %hi(D_808D6454) ## $a0 = 808D0000 /* 0371C 808D5D8C 0C00084C */ jal osSyncPrintf @@ -144,7 +144,7 @@ glabel BossFd2_Draw /* 0390C 808D5F7C 24C66468 */ addiu $a2, $a2, %lo(D_808D6468) ## $a2 = 808D6468 /* 03910 808D5F80 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 03914 808D5F84 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 03918 808D5F88 0C031AD5 */ jal func_800C6B54 +/* 03918 808D5F88 0C031AD5 */ jal Graph_CloseDisp /* 0391C 808D5F8C 24070A80 */ addiu $a3, $zero, 0x0A80 ## $a3 = 00000A80 /* 03920 808D5F90 8FBF0044 */ lw $ra, 0x0044($sp) /* 03924 808D5F94 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s index 7197e513d3..79384fbc1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s @@ -93,7 +93,7 @@ glabel func_808D4F94 /* 02A74 808D50E4 AFA90060 */ sw $t1, 0x0060($sp) /* 02A78 808D50E8 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 02A7C 808D50EC 24070875 */ addiu $a3, $zero, 0x0875 ## $a3 = 00000875 -/* 02A80 808D50F0 0C031AB1 */ jal func_800C6AC4 +/* 02A80 808D50F0 0C031AB1 */ jal Graph_OpenDisp /* 02A84 808D50F4 AFA5005C */ sw $a1, 0x005C($sp) /* 02A88 808D50F8 8FA8005C */ lw $t0, 0x005C($sp) /* 02A8C 808D50FC 8FA90060 */ lw $t1, 0x0060($sp) @@ -121,7 +121,7 @@ glabel func_808D4F94 /* 02AE4 808D5154 0301C825 */ or $t9, $t8, $at ## $t9 = FFFFFF00 /* 02AE8 808D5158 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 02AEC 808D515C 8FAA0068 */ lw $t2, 0x0068($sp) -/* 02AF0 808D5160 0C031AD5 */ jal func_800C6B54 +/* 02AF0 808D5160 0C031AD5 */ jal Graph_CloseDisp /* 02AF4 808D5164 8D450000 */ lw $a1, 0x0000($t2) ## 00000008 /* 02AF8 808D5168 10000025 */ beq $zero, $zero, .L808D5200 /* 02AFC 808D516C 00000000 */ nop @@ -132,7 +132,7 @@ glabel func_808D4F94 /* 02B0C 808D517C AFA90060 */ sw $t1, 0x0060($sp) /* 02B10 808D5180 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFC8 /* 02B14 808D5184 2407087E */ addiu $a3, $zero, 0x087E ## $a3 = 0000087E -/* 02B18 808D5188 0C031AB1 */ jal func_800C6AC4 +/* 02B18 808D5188 0C031AB1 */ jal Graph_OpenDisp /* 02B1C 808D518C AFA50040 */ sw $a1, 0x0040($sp) /* 02B20 808D5190 8FA80040 */ lw $t0, 0x0040($sp) /* 02B24 808D5194 8FA90060 */ lw $t1, 0x0060($sp) @@ -160,7 +160,7 @@ glabel func_808D4F94 /* 02B7C 808D51EC 01816825 */ or $t5, $t4, $at ## $t5 = FFFFFF00 /* 02B80 808D51F0 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 /* 02B84 808D51F4 8FAE0068 */ lw $t6, 0x0068($sp) -/* 02B88 808D51F8 0C031AD5 */ jal func_800C6B54 +/* 02B88 808D51F8 0C031AD5 */ jal Graph_CloseDisp /* 02B8C 808D51FC 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 .L808D5200: /* 02B90 808D5200 1A000004 */ blez $s0, .L808D5214 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s index 6abeeab293..79c12d3c97 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s @@ -74,7 +74,7 @@ glabel func_808D52CC /* 02D70 808D53E0 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFF38 /* 02D74 808D53E4 24070955 */ addiu $a3, $zero, 0x0955 ## $a3 = 00000955 /* 02D78 808D53E8 8DA50000 */ lw $a1, 0x0000($t5) ## 808D6294 -/* 02D7C 808D53EC 0C031AB1 */ jal func_800C6AC4 +/* 02D7C 808D53EC 0C031AB1 */ jal Graph_OpenDisp /* 02D80 808D53F0 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 /* 02D84 808D53F4 0C034213 */ jal Matrix_Push /* 02D88 808D53F8 00000000 */ nop @@ -389,7 +389,7 @@ glabel func_808D52CC /* 03214 808D5884 24C66414 */ addiu $a2, $a2, %lo(D_808D6414) ## $a2 = 808D6414 /* 03218 808D5888 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFF38 /* 0321C 808D588C 240709C7 */ addiu $a3, $zero, 0x09C7 ## $a3 = 000009C7 -/* 03220 808D5890 0C031AD5 */ jal func_800C6B54 +/* 03220 808D5890 0C031AD5 */ jal Graph_CloseDisp /* 03224 808D5894 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 03228 808D5898 8FBF006C */ lw $ra, 0x006C($sp) /* 0322C 808D589C D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s index c156a1a8ed..e2c1b5df41 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s @@ -21,7 +21,7 @@ glabel func_808D58E0 /* 032BC 808D592C 24C66424 */ addiu $a2, $a2, %lo(D_808D6424) ## $a2 = 808D6424 /* 032C0 808D5930 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 032C4 808D5934 240709D3 */ addiu $a3, $zero, 0x09D3 ## $a3 = 000009D3 -/* 032C8 808D5938 0C031AB1 */ jal func_800C6AC4 +/* 032C8 808D5938 0C031AB1 */ jal Graph_OpenDisp /* 032CC 808D593C 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 032D0 808D5940 3C0145B2 */ lui $at, 0x45B2 ## $at = 45B20000 /* 032D4 808D5944 4481F000 */ mtc1 $at, $f30 ## $f30 = 5696.00 @@ -280,7 +280,7 @@ glabel func_808D58E0 /* 03694 808D5D04 24C66434 */ addiu $a2, $a2, %lo(D_808D6434) ## $a2 = 808D6434 /* 03698 808D5D08 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 0369C 808D5D0C 24070A29 */ addiu $a3, $zero, 0x0A29 ## $a3 = 00000A29 -/* 036A0 808D5D10 0C031AD5 */ jal func_800C6B54 +/* 036A0 808D5D10 0C031AD5 */ jal Graph_CloseDisp /* 036A4 808D5D14 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 036A8 808D5D18 8FBF006C */ lw $ra, 0x006C($sp) /* 036AC 808D5D1C D7B40028 */ ldc1 $f20, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s index 8713f53b68..f86d9664e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s @@ -16,7 +16,7 @@ glabel BossGanon_Draw /* 0A49C 808E0D0C 24C67C58 */ addiu $a2, $a2, %lo(D_808F7C58) ## $a2 = 808F7C58 /* 0A4A0 808E0D10 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0A4A4 808E0D14 240723B2 */ addiu $a3, $zero, 0x23B2 ## $a3 = 000023B2 -/* 0A4A8 808E0D18 0C031AB1 */ jal func_800C6AC4 +/* 0A4A8 808E0D18 0C031AB1 */ jal Graph_OpenDisp /* 0A4AC 808E0D1C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0A4B0 808E0D20 0C024F46 */ jal func_80093D18 /* 0A4B4 808E0D24 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -150,7 +150,7 @@ glabel BossGanon_Draw /* 0A6B0 808E0F20 24C67C6C */ addiu $a2, $a2, %lo(D_808F7C6C) ## $a2 = 808F7C6C /* 0A6B4 808E0F24 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0A6B8 808E0F28 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0A6BC 808E0F2C 0C031AD5 */ jal func_800C6B54 +/* 0A6BC 808E0F2C 0C031AD5 */ jal Graph_CloseDisp /* 0A6C0 808E0F30 240724B1 */ addiu $a3, $zero, 0x24B1 ## $a3 = 000024B1 /* 0A6C4 808E0F34 8FBF0034 */ lw $ra, 0x0034($sp) /* 0A6C8 808E0F38 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s index e9c02e796d..8092c79ae1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s @@ -52,7 +52,7 @@ glabel func_808DE988 /* 081D4 808DEA44 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 081D8 808DEA48 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 081DC 808DEA4C 24071C17 */ addiu $a3, $zero, 0x1C17 ## $a3 = 00001C17 -/* 081E0 808DEA50 0C031AB1 */ jal func_800C6AC4 +/* 081E0 808DEA50 0C031AB1 */ jal Graph_OpenDisp /* 081E4 808DEA54 AFA5004C */ sw $a1, 0x004C($sp) /* 081E8 808DEA58 8FA30068 */ lw $v1, 0x0068($sp) /* 081EC 808DEA5C 3C04808E */ lui $a0, %hi(D_808E4DB8) ## $a0 = 808E0000 @@ -101,7 +101,7 @@ glabel func_808DE988 /* 08298 808DEB08 24C67A78 */ addiu $a2, $a2, %lo(D_808F7A78) ## $a2 = 808F7A78 /* 0829C 808DEB0C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 082A0 808DEB10 24071C1E */ addiu $a3, $zero, 0x1C1E ## $a3 = 00001C1E -/* 082A4 808DEB14 0C031AD5 */ jal func_800C6B54 +/* 082A4 808DEB14 0C031AD5 */ jal Graph_CloseDisp /* 082A8 808DEB18 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 /* 082AC 808DEB1C 10000081 */ beq $zero, $zero, .L808DED24 /* 082B0 808DEB20 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s index 121ff0c452..bd7cacba9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s @@ -18,7 +18,7 @@ glabel func_808DEE70 /* 08640 808DEEB0 24C67A8C */ addiu $a2, $a2, %lo(D_808F7A8C) ## $a2 = 808F7A8C /* 08644 808DEEB4 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFE0 /* 08648 808DEEB8 24071CB6 */ addiu $a3, $zero, 0x1CB6 ## $a3 = 00001CB6 -/* 0864C 808DEEBC 0C031AB1 */ jal func_800C6AC4 +/* 0864C 808DEEBC 0C031AB1 */ jal Graph_OpenDisp /* 08650 808DEEC0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08654 808DEEC4 868F02E8 */ lh $t7, 0x02E8($s4) ## 000002E8 /* 08658 808DEEC8 8FB900CC */ lw $t9, 0x00CC($sp) @@ -245,7 +245,7 @@ glabel func_808DEE70 /* 089A4 808DF214 24C67AC8 */ addiu $a2, $a2, %lo(D_808F7AC8) ## $a2 = 808F7AC8 /* 089A8 808DF218 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFE0 /* 089AC 808DF21C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 089B0 808DF220 0C031AD5 */ jal func_800C6B54 +/* 089B0 808DF220 0C031AD5 */ jal Graph_CloseDisp /* 089B4 808DF224 24071D29 */ addiu $a3, $zero, 0x1D29 ## $a3 = 00001D29 /* 089B8 808DF228 8FBF0064 */ lw $ra, 0x0064($sp) /* 089BC 808DF22C D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s index 472ac366ce..fa8ef1d87a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s @@ -10,7 +10,7 @@ glabel func_808DF25C /* 08A0C 808DF27C 24C67ADC */ addiu $a2, $a2, %lo(D_808F7ADC) ## $a2 = 808F7ADC /* 08A10 808DF280 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 08A14 808DF284 24071D34 */ addiu $a3, $zero, 0x1D34 ## $a3 = 00001D34 -/* 08A18 808DF288 0C031AB1 */ jal func_800C6AC4 +/* 08A18 808DF288 0C031AB1 */ jal Graph_OpenDisp /* 08A1C 808DF28C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 08A20 808DF290 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 08A24 808DF294 C6260254 */ lwc1 $f6, 0x0254($s1) ## 00000254 @@ -160,7 +160,7 @@ glabel func_808DF25C /* 08C58 808DF4C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 08C5C 808DF4CC 24071D6E */ addiu $a3, $zero, 0x1D6E ## $a3 = 00001D6E /* 08C60 808DF4D0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 08C64 808DF4D4 0C031AD5 */ jal func_800C6B54 +/* 08C64 808DF4D4 0C031AD5 */ jal Graph_CloseDisp /* 08C68 808DF4D8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 08C6C 808DF4DC 8FBF001C */ lw $ra, 0x001C($sp) .L808DF4E0: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s index 269c6a839c..4be67cdd82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s @@ -12,7 +12,7 @@ glabel func_808DF4F0 /* 08CA8 808DF518 24C67B2C */ addiu $a2, $a2, %lo(D_808F7B2C) ## $a2 = 808F7B2C /* 08CAC 808DF51C 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFDC /* 08CB0 808DF520 24071D7C */ addiu $a3, $zero, 0x1D7C ## $a3 = 00001D7C -/* 08CB4 808DF524 0C031AB1 */ jal func_800C6AC4 +/* 08CB4 808DF524 0C031AB1 */ jal Graph_OpenDisp /* 08CB8 808DF528 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08CBC 808DF52C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 08CC0 808DF530 C6460284 */ lwc1 $f6, 0x0284($s2) ## 00000284 @@ -432,7 +432,7 @@ glabel func_808DF4F0 /* 09330 808DFBA0 24C67B90 */ addiu $a2, $a2, %lo(D_808F7B90) ## $a2 = 808F7B90 /* 09334 808DFBA4 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFDC /* 09338 808DFBA8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0933C 808DFBAC 0C031AD5 */ jal func_800C6B54 +/* 0933C 808DFBAC 0C031AD5 */ jal Graph_CloseDisp /* 09340 808DFBB0 24071E29 */ addiu $a3, $zero, 0x1E29 ## $a3 = 00001E29 /* 09344 808DFBB4 8FBF004C */ lw $ra, 0x004C($sp) .L808DFBB8: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s index 71f2a0db8b..3d04f07f63 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s @@ -15,7 +15,7 @@ glabel func_808DFBD0 /* 09394 808DFC04 8FBF001C */ lw $ra, 0x001C($sp) /* 09398 808DFC08 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0939C 808DFC0C 24071E34 */ addiu $a3, $zero, 0x1E34 ## $a3 = 00001E34 -/* 093A0 808DFC10 0C031AB1 */ jal func_800C6AC4 +/* 093A0 808DFC10 0C031AB1 */ jal Graph_OpenDisp /* 093A4 808DFC14 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 093A8 808DFC18 0C034213 */ jal Matrix_Push /* 093AC 808DFC1C 00000000 */ nop @@ -257,7 +257,7 @@ glabel func_808DFBD0 /* 09730 808DFFA0 24C67BCC */ addiu $a2, $a2, %lo(D_808F7BCC) ## $a2 = 808F7BCC /* 09734 808DFFA4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 09738 808DFFA8 24071E66 */ addiu $a3, $zero, 0x1E66 ## $a3 = 00001E66 -/* 0973C 808DFFAC 0C031AD5 */ jal func_800C6B54 +/* 0973C 808DFFAC 0C031AD5 */ jal Graph_CloseDisp /* 09740 808DFFB0 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 09744 808DFFB4 8FBF001C */ lw $ra, 0x001C($sp) .L808DFFB8: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s index 9ae5b4686a..1bfc323ee1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s @@ -14,7 +14,7 @@ glabel func_808DFFC8 /* 09788 808DFFF8 8FBF003C */ lw $ra, 0x003C($sp) /* 0978C 808DFFFC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 09790 808E0000 24071E70 */ addiu $a3, $zero, 0x1E70 ## $a3 = 00001E70 -/* 09794 808E0004 0C031AB1 */ jal func_800C6AC4 +/* 09794 808E0004 0C031AB1 */ jal Graph_OpenDisp /* 09798 808E0008 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0979C 808E000C 0C034213 */ jal Matrix_Push /* 097A0 808E0010 00000000 */ nop @@ -157,7 +157,7 @@ glabel func_808DFFC8 /* 099BC 808E022C 24C67C08 */ addiu $a2, $a2, %lo(D_808F7C08) ## $a2 = 808F7C08 /* 099C0 808E0230 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 099C4 808E0234 24071EA4 */ addiu $a3, $zero, 0x1EA4 ## $a3 = 00001EA4 -/* 099C8 808E0238 0C031AD5 */ jal func_800C6B54 +/* 099C8 808E0238 0C031AD5 */ jal Graph_CloseDisp /* 099CC 808E023C 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 099D0 808E0240 8FBF003C */ lw $ra, 0x003C($sp) .L808E0244: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s index bcb933af10..c02e2eaa8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s @@ -10,7 +10,7 @@ glabel func_808E0A3C /* 0A1EC 808E0A5C 24C67C1C */ addiu $a2, $a2, %lo(D_808F7C1C) ## $a2 = 808F7C1C /* 0A1F0 808E0A60 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 0A1F4 808E0A64 240720B4 */ addiu $a3, $zero, 0x20B4 ## $a3 = 000020B4 -/* 0A1F8 808E0A68 0C031AB1 */ jal func_800C6AC4 +/* 0A1F8 808E0A68 0C031AB1 */ jal Graph_OpenDisp /* 0A1FC 808E0A6C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0A200 808E0A70 8FAF0080 */ lw $t7, 0x0080($sp) /* 0A204 808E0A74 0C024F46 */ jal func_80093D18 @@ -161,7 +161,7 @@ glabel func_808E0A3C /* 0A440 808E0CB0 24C67C44 */ addiu $a2, $a2, %lo(D_808F7C44) ## $a2 = 808F7C44 /* 0A444 808E0CB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0A448 808E0CB8 240720EA */ addiu $a3, $zero, 0x20EA ## $a3 = 000020EA -/* 0A44C 808E0CBC 0C031AD5 */ jal func_800C6B54 +/* 0A44C 808E0CBC 0C031AD5 */ jal Graph_CloseDisp /* 0A450 808E0CC0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 0A454 808E0CC4 8FBF001C */ lw $ra, 0x001C($sp) /* 0A458 808E0CC8 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s index 7807f1ffea..47b33cab36 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s @@ -13,7 +13,7 @@ glabel func_808E1B54 /* 0B310 808E1B80 24C67C80 */ addiu $a2, $a2, %lo(D_808F7C80) ## $a2 = 808F7C80 /* 0B314 808E1B84 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 0B318 808E1B88 24072679 */ addiu $a3, $zero, 0x2679 ## $a3 = 00002679 -/* 0B31C 808E1B8C 0C031AB1 */ jal func_800C6AC4 +/* 0B31C 808E1B8C 0C031AB1 */ jal Graph_OpenDisp /* 0B320 808E1B90 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0B324 808E1B94 0C024F61 */ jal func_80093D84 /* 0B328 808E1B98 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -210,7 +210,7 @@ glabel func_808E1B54 /* 0B610 808E1E80 24C67CD0 */ addiu $a2, $a2, %lo(D_808F7CD0) ## $a2 = 808F7CD0 /* 0B614 808E1E84 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 0B618 808E1E88 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 0B61C 808E1E8C 0C031AD5 */ jal func_800C6B54 +/* 0B61C 808E1E8C 0C031AD5 */ jal Graph_CloseDisp /* 0B620 808E1E90 240726B7 */ addiu $a3, $zero, 0x26B7 ## $a3 = 000026B7 /* 0B624 808E1E94 8FBF002C */ lw $ra, 0x002C($sp) /* 0B628 808E1E98 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s index 7043e1e591..fd6e5f910d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s @@ -23,7 +23,7 @@ glabel func_808E229C /* 0BA80 808E22F0 24C67CE4 */ addiu $a2, $a2, %lo(D_808F7CE4) ## $a2 = 808F7CE4 /* 0BA84 808E22F4 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFDC /* 0BA88 808E22F8 24072761 */ addiu $a3, $zero, 0x2761 ## $a3 = 00002761 -/* 0BA8C 808E22FC 0C031AB1 */ jal func_800C6AC4 +/* 0BA8C 808E22FC 0C031AB1 */ jal Graph_OpenDisp /* 0BA90 808E2300 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 0BA94 808E2304 0C024F61 */ jal func_80093D84 /* 0BA98 808E2308 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -152,7 +152,7 @@ glabel func_808E229C /* 0BC78 808E24E8 24C67D0C */ addiu $a2, $a2, %lo(D_808F7D0C) ## $a2 = 808F7D0C /* 0BC7C 808E24EC 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFDC /* 0BC80 808E24F0 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 0BC84 808E24F4 0C031AD5 */ jal func_800C6B54 +/* 0BC84 808E24F4 0C031AD5 */ jal Graph_CloseDisp /* 0BC88 808E24F8 24072781 */ addiu $a3, $zero, 0x2781 ## $a3 = 00002781 /* 0BC8C 808E24FC 8FBF006C */ lw $ra, 0x006C($sp) /* 0BC90 808E2500 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s index f453bda179..a2212ec951 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s @@ -23,7 +23,7 @@ glabel func_808E324C /* 0CA2C 808E329C 24C67D20 */ addiu $a2, $a2, %lo(D_808F7D20) ## $a2 = 808F7D20 /* 0CA30 808E32A0 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 0CA34 808E32A4 240728F9 */ addiu $a3, $zero, 0x28F9 ## $a3 = 000028F9 -/* 0CA38 808E32A8 0C031AB1 */ jal func_800C6AC4 +/* 0CA38 808E32A8 0C031AB1 */ jal Graph_OpenDisp /* 0CA3C 808E32AC 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 0CA40 808E32B0 8FB80094 */ lw $t8, 0x0094($sp) /* 0CA44 808E32B4 0C024F61 */ jal func_80093D84 @@ -188,7 +188,7 @@ glabel func_808E324C /* 0CCB0 808E3520 24C67D5C */ addiu $a2, $a2, %lo(D_808F7D5C) ## $a2 = 808F7D5C /* 0CCB4 808E3524 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 0CCB8 808E3528 2407292D */ addiu $a3, $zero, 0x292D ## $a3 = 0000292D -/* 0CCBC 808E352C 0C031AD5 */ jal func_800C6B54 +/* 0CCBC 808E352C 0C031AD5 */ jal Graph_CloseDisp /* 0CCC0 808E3530 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 0CCC4 808E3534 8FBF003C */ lw $ra, 0x003C($sp) /* 0CCC8 808E3538 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s index e87116be03..bcd3a793b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s @@ -22,7 +22,7 @@ glabel func_808E3D84 /* 0D564 808E3DD4 27A40150 */ addiu $a0, $sp, 0x0150 ## $a0 = FFFFFFD8 /* 0D568 808E3DD8 24072A71 */ addiu $a3, $zero, 0x2A71 ## $a3 = 00002A71 /* 0D56C 808E3DDC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D570 808E3DE0 0C031AB1 */ jal func_800C6AC4 +/* 0D570 808E3DE0 0C031AB1 */ jal Graph_OpenDisp /* 0D574 808E3DE4 AFB10164 */ sw $s1, 0x0164($sp) /* 0D578 808E3DE8 8FAE0178 */ lw $t6, 0x0178($sp) /* 0D57C 808E3DEC 0C024F61 */ jal func_80093D84 @@ -926,7 +926,7 @@ glabel func_808E3D84 /* 0E320 808E4B90 24C67E38 */ addiu $a2, $a2, %lo(D_808F7E38) ## $a2 = 808F7E38 /* 0E324 808E4B94 27A40150 */ addiu $a0, $sp, 0x0150 ## $a0 = FFFFFFD8 /* 0E328 808E4B98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0E32C 808E4B9C 0C031AD5 */ jal func_800C6B54 +/* 0E32C 808E4B9C 0C031AD5 */ jal Graph_CloseDisp /* 0E330 808E4BA0 24072BF7 */ addiu $a3, $zero, 0x2BF7 ## $a3 = 00002BF7 /* 0E334 808E4BA4 8FBF005C */ lw $ra, 0x005C($sp) /* 0E338 808E4BA8 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s index 8a0493ce38..c566cbe021 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s @@ -15,7 +15,7 @@ glabel BossGanon2_Draw /* 089E0 80905920 24C6D9BC */ addiu $a2, $a2, %lo(D_8090D9BC) ## $a2 = 8090D9BC /* 089E4 80905924 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 089E8 80905928 240716D0 */ addiu $a3, $zero, 0x16D0 ## $a3 = 000016D0 -/* 089EC 8090592C 0C031AB1 */ jal func_800C6AC4 +/* 089EC 8090592C 0C031AB1 */ jal Graph_OpenDisp /* 089F0 80905930 AFA50068 */ sw $a1, 0x0068($sp) /* 089F4 80905934 0C024F46 */ jal func_80093D18 /* 089F8 80905938 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -303,7 +303,7 @@ glabel BossGanon2_Draw /* 08E38 80905D78 24C6D9E4 */ addiu $a2, $a2, %lo(D_8090D9E4) ## $a2 = 8090D9E4 /* 08E3C 80905D7C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 08E40 80905D80 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 08E44 80905D84 0C031AD5 */ jal func_800C6B54 +/* 08E44 80905D84 0C031AD5 */ jal Graph_CloseDisp /* 08E48 80905D88 2407175F */ addiu $a3, $zero, 0x175F ## $a3 = 0000175F /* 08E4C 80905D8C 0C24183A */ jal func_809060E8 /* 08E50 80905D90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s index 5e43b032f2..ba5afa8c27 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s @@ -31,7 +31,7 @@ glabel func_808FD108 /* 00238 808FD178 AFA20048 */ sw $v0, 0x0048($sp) /* 0023C 808FD17C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00240 808FD180 24070316 */ addiu $a3, $zero, 0x0316 ## $a3 = 00000316 -/* 00244 808FD184 0C031AB1 */ jal func_800C6AC4 +/* 00244 808FD184 0C031AB1 */ jal Graph_OpenDisp /* 00248 808FD188 AFA50044 */ sw $a1, 0x0044($sp) /* 0024C 808FD18C 8FA80044 */ lw $t0, 0x0044($sp) /* 00250 808FD190 8FA90048 */ lw $t1, 0x0048($sp) @@ -59,7 +59,7 @@ glabel func_808FD108 /* 002A8 808FD1E8 8C8F17B4 */ lw $t7, 0x17B4($a0) ## 000017B4 /* 002AC 808FD1EC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 002B0 808FD1F0 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 002B4 808FD1F4 0C031AD5 */ jal func_800C6B54 +/* 002B4 808FD1F4 0C031AD5 */ jal Graph_CloseDisp /* 002B8 808FD1F8 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 .L808FD1FC: /* 002BC 808FD1FC 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s index bb0813352e..d0ae4fccb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s @@ -9,7 +9,7 @@ glabel func_80903F38 /* 07014 80903F54 24C6D714 */ addiu $a2, $a2, %lo(D_8090D714) ## $a2 = 8090D714 /* 07018 80903F58 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFEC /* 0701C 80903F5C 240713DB */ addiu $a3, $zero, 0x13DB ## $a3 = 000013DB -/* 07020 80903F60 0C031AB1 */ jal func_800C6AC4 +/* 07020 80903F60 0C031AB1 */ jal Graph_OpenDisp /* 07024 80903F64 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 07028 80903F68 8FA20070 */ lw $v0, 0x0070($sp) /* 0702C 80903F6C 904F0312 */ lbu $t7, 0x0312($v0) ## 00000312 @@ -110,7 +110,7 @@ glabel func_80903F38 /* 071A0 809040E0 24C6D73C */ addiu $a2, $a2, %lo(D_8090D73C) ## $a2 = 8090D73C /* 071A4 809040E4 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFEC /* 071A8 809040E8 24071402 */ addiu $a3, $zero, 0x1402 ## $a3 = 00001402 -/* 071AC 809040EC 0C031AD5 */ jal func_800C6B54 +/* 071AC 809040EC 0C031AD5 */ jal Graph_CloseDisp /* 071B0 809040F0 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 071B4 809040F4 8FBF003C */ lw $ra, 0x003C($sp) /* 071B8 809040F8 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s index 32ca0b7224..15a65b20b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s @@ -14,7 +14,7 @@ glabel func_80904108 /* 071F8 80904138 8FBF003C */ lw $ra, 0x003C($sp) /* 071FC 8090413C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 07200 80904140 2407140B */ addiu $a3, $zero, 0x140B ## $a3 = 0000140B -/* 07204 80904144 0C031AB1 */ jal func_800C6AC4 +/* 07204 80904144 0C031AB1 */ jal Graph_OpenDisp /* 07208 80904148 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0720C 8090414C 0C034213 */ jal Matrix_Push /* 07210 80904150 00000000 */ nop @@ -134,7 +134,7 @@ glabel func_80904108 /* 073D8 80904318 24C6D778 */ addiu $a2, $a2, %lo(D_8090D778) ## $a2 = 8090D778 /* 073DC 8090431C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 073E0 80904320 24071442 */ addiu $a3, $zero, 0x1442 ## $a3 = 00001442 -/* 073E4 80904324 0C031AD5 */ jal func_800C6B54 +/* 073E4 80904324 0C031AD5 */ jal Graph_CloseDisp /* 073E8 80904328 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 073EC 8090432C 8FBF003C */ lw $ra, 0x003C($sp) .L80904330: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s index 26b9098f22..2ad0635301 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s @@ -21,7 +21,7 @@ glabel func_80904340 /* 0744C 8090438C 24C6D78C */ addiu $a2, $a2, %lo(D_8090D78C) ## $a2 = 8090D78C /* 07450 80904390 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFD8 /* 07454 80904394 2407144C */ addiu $a3, $zero, 0x144C ## $a3 = 0000144C -/* 07458 80904398 0C031AB1 */ jal func_800C6AC4 +/* 07458 80904398 0C031AB1 */ jal Graph_OpenDisp /* 0745C 8090439C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 07460 809043A0 0C034213 */ jal Matrix_Push /* 07464 809043A4 00000000 */ nop @@ -186,7 +186,7 @@ glabel func_80904340 /* 076B8 809045F8 24C6D7B4 */ addiu $a2, $a2, %lo(D_8090D7B4) ## $a2 = 8090D7B4 /* 076BC 809045FC 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFD8 /* 076C0 80904600 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 076C4 80904604 0C031AD5 */ jal func_800C6B54 +/* 076C4 80904604 0C031AD5 */ jal Graph_CloseDisp /* 076C8 80904608 24071487 */ addiu $a3, $zero, 0x1487 ## $a3 = 00001487 /* 076CC 8090460C 8FBF0064 */ lw $ra, 0x0064($sp) /* 076D0 80904610 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s index 317ec13234..a8499a1284 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s @@ -14,7 +14,7 @@ glabel func_8090464C /* 0773C 8090467C 8FBF001C */ lw $ra, 0x001C($sp) /* 07740 80904680 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 07744 80904684 24071490 */ addiu $a3, $zero, 0x1490 ## $a3 = 00001490 -/* 07748 80904688 0C031AB1 */ jal func_800C6AC4 +/* 07748 80904688 0C031AB1 */ jal Graph_OpenDisp /* 0774C 8090468C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 07750 80904690 0C034213 */ jal Matrix_Push /* 07754 80904694 00000000 */ nop @@ -107,7 +107,7 @@ glabel func_8090464C /* 078B0 809047F0 24C6D7F0 */ addiu $a2, $a2, %lo(D_8090D7F0) ## $a2 = 8090D7F0 /* 078B4 809047F4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 078B8 809047F8 240714AD */ addiu $a3, $zero, 0x14AD ## $a3 = 000014AD -/* 078BC 809047FC 0C031AD5 */ jal func_800C6B54 +/* 078BC 809047FC 0C031AD5 */ jal Graph_CloseDisp /* 078C0 80904800 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 078C4 80904804 8FBF001C */ lw $ra, 0x001C($sp) .L80904808: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s index daa140f9c2..37296454be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s @@ -11,7 +11,7 @@ glabel func_80904818 /* 078FC 8090483C 24C6D804 */ addiu $a2, $a2, %lo(D_8090D804) ## $a2 = 8090D804 /* 07900 80904840 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 07904 80904844 240714EB */ addiu $a3, $zero, 0x14EB ## $a3 = 000014EB -/* 07908 80904848 0C031AB1 */ jal func_800C6AC4 +/* 07908 80904848 0C031AB1 */ jal Graph_OpenDisp /* 0790C 8090484C AFA5003C */ sw $a1, 0x003C($sp) /* 07910 80904850 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 07914 80904854 1601000B */ bne $s0, $at, .L80904884 @@ -95,7 +95,7 @@ glabel func_80904818 /* 07A38 80904978 3C068091 */ lui $a2, %hi(D_8090D818) ## $a2 = 80910000 /* 07A3C 8090497C 24C6D818 */ addiu $a2, $a2, %lo(D_8090D818) ## $a2 = 8090D818 /* 07A40 80904980 24071537 */ addiu $a3, $zero, 0x1537 ## $a3 = 00001537 -/* 07A44 80904984 0C031AD5 */ jal func_800C6B54 +/* 07A44 80904984 0C031AD5 */ jal Graph_CloseDisp /* 07A48 80904988 8D250000 */ lw $a1, 0x0000($t1) ## FB000000 /* 07A4C 8090498C 8FBF001C */ lw $ra, 0x001C($sp) /* 07A50 80904990 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s index e075ceb016..5c1ed7efb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s @@ -11,7 +11,7 @@ glabel func_809049A0 /* 07A84 809049C4 24C6D82C */ addiu $a2, $a2, %lo(D_8090D82C) ## $a2 = 8090D82C /* 07A88 809049C8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 /* 07A8C 809049CC 24071553 */ addiu $a3, $zero, 0x1553 ## $a3 = 00001553 -/* 07A90 809049D0 0C031AB1 */ jal func_800C6AC4 +/* 07A90 809049D0 0C031AB1 */ jal Graph_OpenDisp /* 07A94 809049D4 AFA50048 */ sw $a1, 0x0048($sp) /* 07A98 809049D8 3C018091 */ lui $at, %hi(D_8090DD3C) ## $at = 80910000 /* 07A9C 809049DC C424DD3C */ lwc1 $f4, %lo(D_8090DD3C)($at) @@ -258,7 +258,7 @@ glabel func_809049A0 /* 07E20 80904D60 24C6D868 */ addiu $a2, $a2, %lo(D_8090D868) ## $a2 = 8090D868 /* 07E24 80904D64 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 /* 07E28 80904D68 240715BE */ addiu $a3, $zero, 0x15BE ## $a3 = 000015BE -/* 07E2C 80904D6C 0C031AD5 */ jal func_800C6B54 +/* 07E2C 80904D6C 0C031AD5 */ jal Graph_CloseDisp /* 07E30 80904D70 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 07E34 80904D74 8FBF001C */ lw $ra, 0x001C($sp) /* 07E38 80904D78 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s index 9c9d67ade5..435fdd5be9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s @@ -18,7 +18,7 @@ glabel func_80904D88 /* 07E88 80904DC8 24C6D87C */ addiu $a2, $a2, %lo(D_8090D87C) ## $a2 = 8090D87C /* 07E8C 80904DCC 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 07E90 80904DD0 240715C7 */ addiu $a3, $zero, 0x15C7 ## $a3 = 000015C7 -/* 07E94 80904DD4 0C031AB1 */ jal func_800C6AC4 +/* 07E94 80904DD4 0C031AB1 */ jal Graph_OpenDisp /* 07E98 80904DD8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 07E9C 80904DDC 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 07EA0 80904DE0 C664030C */ lwc1 $f4, 0x030C($s3) ## 0000030C @@ -133,7 +133,7 @@ glabel func_80904D88 /* 08040 80904F80 24C6D8A4 */ addiu $a2, $a2, %lo(D_8090D8A4) ## $a2 = 8090D8A4 /* 08044 80904F84 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 08048 80904F88 240715F6 */ addiu $a3, $zero, 0x15F6 ## $a3 = 000015F6 -/* 0804C 80904F8C 0C031AD5 */ jal func_800C6B54 +/* 0804C 80904F8C 0C031AD5 */ jal Graph_CloseDisp /* 08050 80904F90 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 08054 80904F94 8FBF0044 */ lw $ra, 0x0044($sp) /* 08058 80904F98 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s index 3b567fc25c..7ffb0102cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s @@ -9,7 +9,7 @@ glabel func_80904FC8 /* 080A4 80904FE4 24C6D8B8 */ addiu $a2, $a2, %lo(D_8090D8B8) ## $a2 = 8090D8B8 /* 080A8 80904FE8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE8 /* 080AC 80904FEC 24071600 */ addiu $a3, $zero, 0x1600 ## $a3 = 00001600 -/* 080B0 80904FF0 0C031AB1 */ jal func_800C6AC4 +/* 080B0 80904FF0 0C031AB1 */ jal Graph_OpenDisp /* 080B4 80904FF4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 080B8 80904FF8 8FAF0060 */ lw $t7, 0x0060($sp) /* 080BC 80904FFC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -150,7 +150,7 @@ glabel func_80904FC8 /* 082D4 80905214 24C6D8F4 */ addiu $a2, $a2, %lo(D_8090D8F4) ## $a2 = 8090D8F4 /* 082D8 80905218 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE8 /* 082DC 8090521C 24071623 */ addiu $a3, $zero, 0x1623 ## $a3 = 00001623 -/* 082E0 80905220 0C031AD5 */ jal func_800C6B54 +/* 082E0 80905220 0C031AD5 */ jal Graph_CloseDisp /* 082E4 80905224 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 082E8 80905228 8FBF001C */ lw $ra, 0x001C($sp) /* 082EC 8090522C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s index 2268184614..c5eafec94c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s @@ -23,7 +23,7 @@ glabel func_8090523C /* 08350 80905290 24C6D908 */ addiu $a2, $a2, %lo(D_8090D908) ## $a2 = 8090D908 /* 08354 80905294 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 08358 80905298 2407162B */ addiu $a3, $zero, 0x162B ## $a3 = 0000162B -/* 0835C 8090529C 0C031AB1 */ jal func_800C6AC4 +/* 0835C 8090529C 0C031AB1 */ jal Graph_OpenDisp /* 08360 809052A0 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 08364 809052A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 08368 809052A8 C606038C */ lwc1 $f6, 0x038C($s0) ## 0000038C @@ -163,7 +163,7 @@ glabel func_8090523C /* 0856C 809054AC 24C6D930 */ addiu $a2, $a2, %lo(D_8090D930) ## $a2 = 8090D930 /* 08570 809054B0 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 08574 809054B4 2407165D */ addiu $a3, $zero, 0x165D ## $a3 = 0000165D -/* 08578 809054B8 0C031AD5 */ jal func_800C6B54 +/* 08578 809054B8 0C031AD5 */ jal Graph_CloseDisp /* 0857C 809054BC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 08580 809054C0 8FBF006C */ lw $ra, 0x006C($sp) /* 08584 809054C4 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s index 0a3fcd49bf..02b21098db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s @@ -31,7 +31,7 @@ glabel func_80905508 /* 08638 80905578 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 0863C 8090557C 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 08640 80905580 24071675 */ addiu $a3, $zero, 0x1675 ## $a3 = 00001675 -/* 08644 80905584 0C031AB1 */ jal func_800C6AC4 +/* 08644 80905584 0C031AB1 */ jal Graph_OpenDisp /* 08648 80905588 AFA50034 */ sw $a1, 0x0034($sp) /* 0864C 8090558C 8FA80034 */ lw $t0, 0x0034($sp) /* 08650 80905590 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 @@ -76,7 +76,7 @@ glabel func_80905508 /* 086EC 8090562C 24C6D96C */ addiu $a2, $a2, %lo(D_8090D96C) ## $a2 = 8090D96C /* 086F0 80905630 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 086F4 80905634 2407167A */ addiu $a3, $zero, 0x167A ## $a3 = 0000167A -/* 086F8 80905638 0C031AD5 */ jal func_800C6B54 +/* 086F8 80905638 0C031AD5 */ jal Graph_CloseDisp /* 086FC 8090563C 8DA50000 */ lw $a1, 0x0000($t5) ## 00000008 /* 08700 80905640 10000009 */ beq $zero, $zero, .L80905668 /* 08704 80905644 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s index 818319f897..6541d11d2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s @@ -14,7 +14,7 @@ glabel func_80905674 /* 08764 809056A4 8FBF003C */ lw $ra, 0x003C($sp) /* 08768 809056A8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0876C 809056AC 2407168C */ addiu $a3, $zero, 0x168C ## $a3 = 0000168C -/* 08770 809056B0 0C031AB1 */ jal func_800C6AC4 +/* 08770 809056B0 0C031AB1 */ jal Graph_OpenDisp /* 08774 809056B4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 08778 809056B8 0C034213 */ jal Matrix_Push /* 0877C 809056BC 00000000 */ nop @@ -151,7 +151,7 @@ glabel func_80905674 /* 08988 809058C8 24C6D9A8 */ addiu $a2, $a2, %lo(D_8090D9A8) ## $a2 = 8090D9A8 /* 0898C 809058CC 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 08990 809058D0 240716B9 */ addiu $a3, $zero, 0x16B9 ## $a3 = 000016B9 -/* 08994 809058D4 0C031AD5 */ jal func_800C6B54 +/* 08994 809058D4 0C031AD5 */ jal Graph_CloseDisp /* 08998 809058D8 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 0899C 809058DC 8FBF003C */ lw $ra, 0x003C($sp) .L809058E0: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s index 264499e04f..eadbfa1bf4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s @@ -24,7 +24,7 @@ glabel func_809060E8 /* 09200 80906140 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 09204 80906144 24C6D9F8 */ addiu $a2, $a2, %lo(D_8090D9F8) ## $a2 = 8090D9F8 /* 09208 80906148 240717C6 */ addiu $a3, $zero, 0x17C6 ## $a3 = 000017C6 -/* 0920C 8090614C 0C031AB1 */ jal func_800C6AC4 +/* 0920C 8090614C 0C031AB1 */ jal Graph_OpenDisp /* 09210 80906150 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 09214 80906154 0C024F46 */ jal func_80093D18 /* 09218 80906158 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -266,7 +266,7 @@ glabel func_809060E8 /* 095A8 809064E8 24C6DA48 */ addiu $a2, $a2, %lo(D_8090DA48) ## $a2 = 8090DA48 /* 095AC 809064EC 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 095B0 809064F0 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 095B4 809064F4 0C031AD5 */ jal func_800C6B54 +/* 095B4 809064F4 0C031AD5 */ jal Graph_CloseDisp /* 095B8 809064F8 24071829 */ addiu $a3, $zero, 0x1829 ## $a3 = 00001829 /* 095BC 809064FC 8FBF005C */ lw $ra, 0x005C($sp) /* 095C0 80906500 D7B40020 */ ldc1 $f20, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s index cfa5a826b5..d9305d13c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s @@ -10,7 +10,7 @@ glabel func_80906AB0 /* 09B90 80906AD0 24C6DA5C */ addiu $a2, $a2, %lo(D_8090DA5C) ## $a2 = 8090DA5C /* 09B94 80906AD4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 09B98 80906AD8 2407191E */ addiu $a3, $zero, 0x191E ## $a3 = 0000191E -/* 09B9C 80906ADC 0C031AB1 */ jal func_800C6AC4 +/* 09B9C 80906ADC 0C031AB1 */ jal Graph_OpenDisp /* 09BA0 80906AE0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 09BA4 80906AE4 8FAF0080 */ lw $t7, 0x0080($sp) /* 09BA8 80906AE8 0C024F46 */ jal func_80093D18 @@ -156,7 +156,7 @@ glabel func_80906AB0 /* 09DD0 80906D10 24C6DA84 */ addiu $a2, $a2, %lo(D_8090DA84) ## $a2 = 8090DA84 /* 09DD4 80906D14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 09DD8 80906D18 2407194F */ addiu $a3, $zero, 0x194F ## $a3 = 0000194F -/* 09DDC 80906D1C 0C031AD5 */ jal func_800C6B54 +/* 09DDC 80906D1C 0C031AD5 */ jal Graph_CloseDisp /* 09DE0 80906D20 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 09DE4 80906D24 8FBF001C */ lw $ra, 0x001C($sp) /* 09DE8 80906D28 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s index f2705daf86..5ce1b151bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s @@ -10,7 +10,7 @@ glabel BossGanondrof_Draw /* 04224 80914864 24C65370 */ addiu $a2, $a2, %lo(D_80915370) ## $a2 = 80915370 /* 04228 80914868 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0422C 8091486C 24070E84 */ addiu $a3, $zero, 0x0E84 ## $a3 = 00000E84 -/* 04230 80914870 0C031AB1 */ jal func_800C6AC4 +/* 04230 80914870 0C031AB1 */ jal Graph_OpenDisp /* 04234 80914874 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04238 80914878 3C048091 */ lui $a0, %hi(D_80915388) ## $a0 = 80910000 /* 0423C 8091487C 24845388 */ addiu $a0, $a0, %lo(D_80915388) ## $a0 = 80915388 @@ -289,7 +289,7 @@ glabel BossGanondrof_Draw /* 0462C 80914C6C 24C653E4 */ addiu $a2, $a2, %lo(D_809153E4) ## $a2 = 809153E4 /* 04630 80914C70 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 04634 80914C74 24070EE6 */ addiu $a3, $zero, 0x0EE6 ## $a3 = 00000EE6 -/* 04638 80914C78 0C031AD5 */ jal func_800C6B54 +/* 04638 80914C78 0C031AD5 */ jal Graph_CloseDisp /* 0463C 80914C7C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 04640 80914C80 3C048091 */ lui $a0, %hi(D_809153FC) ## $a0 = 80910000 /* 04644 80914C84 248453FC */ addiu $a0, $a0, %lo(D_809153FC) ## $a0 = 809153FC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s index 485dd89450..753badb511 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s @@ -9,7 +9,7 @@ glabel BossGoma_Draw /* 0529C 8091ACAC 24C6B4B4 */ addiu $a2, $a2, %lo(D_8091B4B4) ## $a2 = 8091B4B4 /* 052A0 8091ACB0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 052A4 8091ACB4 2407137F */ addiu $a3, $zero, 0x137F ## $a3 = 0000137F -/* 052A8 8091ACB8 0C031AB1 */ jal func_800C6AC4 +/* 052A8 8091ACB8 0C031AB1 */ jal Graph_OpenDisp /* 052AC 8091ACBC AFA50048 */ sw $a1, 0x0048($sp) /* 052B0 8091ACC0 0C024F46 */ jal func_80093D18 /* 052B4 8091ACC4 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 @@ -65,7 +65,7 @@ glabel BossGoma_Draw /* 05370 8091AD80 24C6B4C8 */ addiu $a2, $a2, %lo(D_8091B4C8) ## $a2 = 8091B4C8 /* 05374 8091AD84 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 05378 8091AD88 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 0537C 8091AD8C 0C031AD5 */ jal func_800C6B54 +/* 0537C 8091AD8C 0C031AD5 */ jal Graph_CloseDisp /* 05380 8091AD90 24071394 */ addiu $a3, $zero, 0x1394 ## $a3 = 00001394 /* 05384 8091AD94 8FBF0024 */ lw $ra, 0x0024($sp) /* 05388 8091AD98 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s index 90ef96c371..f27677b0c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s @@ -11,7 +11,7 @@ glabel func_8091A560 /* 04B74 8091A584 24C6B464 */ addiu $a2, $a2, %lo(D_8091B464) ## $a2 = 8091B464 /* 04B78 8091A588 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 04B7C 8091A58C 2407124D */ addiu $a3, $zero, 0x124D ## $a3 = 0000124D -/* 04B80 8091A590 0C031AB1 */ jal func_800C6AC4 +/* 04B80 8091A590 0C031AB1 */ jal Graph_OpenDisp /* 04B84 8091A594 AFA5005C */ sw $a1, 0x005C($sp) /* 04B88 8091A598 8FA9005C */ lw $t1, 0x005C($sp) /* 04B8C 8091A59C 8FA70074 */ lw $a3, 0x0074($sp) @@ -301,7 +301,7 @@ glabel L8091A9B8 /* 04FB0 8091A9C0 24C6B4A0 */ addiu $a2, $a2, %lo(D_8091B4A0) ## $a2 = 8091B4A0 /* 04FB4 8091A9C4 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 04FB8 8091A9C8 240712FA */ addiu $a3, $zero, 0x12FA ## $a3 = 000012FA -/* 04FBC 8091A9CC 0C031AD5 */ jal func_800C6B54 +/* 04FBC 8091A9CC 0C031AD5 */ jal Graph_CloseDisp /* 04FC0 8091A9D0 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 04FC4 8091A9D4 8FBF0014 */ lw $ra, 0x0014($sp) /* 04FC8 8091A9D8 8FA20060 */ lw $v0, 0x0060($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s index fcc6d30795..63e56368d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s @@ -10,7 +10,7 @@ glabel BossMo_Draw /* 09028 80924B28 24C66AD0 */ addiu $a2, $a2, %lo(D_80926AD0) ## $a2 = 80926AD0 /* 0902C 80924B2C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 09030 80924B30 24071B2E */ addiu $a3, $zero, 0x1B2E ## $a3 = 00001B2E -/* 09034 80924B34 0C031AB1 */ jal func_800C6AC4 +/* 09034 80924B34 0C031AB1 */ jal Graph_OpenDisp /* 09038 80924B38 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0903C 80924B3C 8FAF0084 */ lw $t7, 0x0084($sp) /* 09040 80924B40 0C024F46 */ jal func_80093D18 @@ -148,7 +148,7 @@ glabel BossMo_Draw /* 09248 80924D48 24C66AE0 */ addiu $a2, $a2, %lo(D_80926AE0) ## $a2 = 80926AE0 /* 0924C 80924D4C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 09250 80924D50 24071B6F */ addiu $a3, $zero, 0x1B6F ## $a3 = 00001B6F -/* 09254 80924D54 0C031AD5 */ jal func_800C6B54 +/* 09254 80924D54 0C031AD5 */ jal Graph_CloseDisp /* 09258 80924D58 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0925C 80924D5C 8FBF003C */ lw $ra, 0x003C($sp) /* 09260 80924D60 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s index ea0a67fec5..95ed9dd3ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s @@ -26,7 +26,7 @@ glabel func_80923870 /* 07DCC 809238CC 24C66A10 */ addiu $a2, $a2, %lo(D_80926A10) ## $a2 = 80926A10 /* 07DD0 809238D0 27A400FC */ addiu $a0, $sp, 0x00FC ## $a0 = FFFFFFCC /* 07DD4 809238D4 240718DE */ addiu $a3, $zero, 0x18DE ## $a3 = 000018DE -/* 07DD8 809238D8 0C031AB1 */ jal func_800C6AC4 +/* 07DD8 809238D8 0C031AB1 */ jal Graph_OpenDisp /* 07DDC 809238DC 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 07DE0 809238E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 07DE4 809238E4 02C11021 */ addu $v0, $s6, $at @@ -475,7 +475,7 @@ glabel func_80923870 /* 08488 80923F88 24C66A40 */ addiu $a2, $a2, %lo(D_80926A40) ## $a2 = 80926A40 /* 0848C 80923F8C 27A400FC */ addiu $a0, $sp, 0x00FC ## $a0 = FFFFFFCC /* 08490 80923F90 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 08494 80923F94 0C031AD5 */ jal func_800C6B54 +/* 08494 80923F94 0C031AD5 */ jal Graph_CloseDisp /* 08498 80923F98 240719AB */ addiu $a3, $zero, 0x19AB ## $a3 = 000019AB /* 0849C 80923F9C 8FBF005C */ lw $ra, 0x005C($sp) /* 084A0 80923FA0 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s index b8f8ce6c12..3c03ceeb2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s @@ -9,7 +9,7 @@ glabel func_80923FDC /* 084F8 80923FF8 24C66A50 */ addiu $a2, $a2, %lo(D_80926A50) ## $a2 = 80926A50 /* 084FC 80923FFC 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 08500 80924000 240719B6 */ addiu $a3, $zero, 0x19B6 ## $a3 = 000019B6 -/* 08504 80924004 0C031AB1 */ jal func_800C6AC4 +/* 08504 80924004 0C031AB1 */ jal Graph_OpenDisp /* 08508 80924008 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0850C 8092400C 0C034213 */ jal Matrix_Push /* 08510 80924010 00000000 */ nop @@ -139,7 +139,7 @@ glabel func_80923FDC /* 08700 80924200 24C66A70 */ addiu $a2, $a2, %lo(D_80926A70) ## $a2 = 80926A70 /* 08704 80924204 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 08708 80924208 24071A18 */ addiu $a3, $zero, 0x1A18 ## $a3 = 00001A18 -/* 0870C 8092420C 0C031AD5 */ jal func_800C6B54 +/* 0870C 8092420C 0C031AD5 */ jal Graph_CloseDisp /* 08710 80924210 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 08714 80924214 8FBF003C */ lw $ra, 0x003C($sp) /* 08718 80924218 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s index 995995c659..60879b752d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s @@ -10,7 +10,7 @@ glabel func_80924228 /* 08748 80924248 24C66A80 */ addiu $a2, $a2, %lo(D_80926A80) ## $a2 = 80926A80 /* 0874C 8092424C 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFE4 /* 08750 80924250 24071A20 */ addiu $a3, $zero, 0x1A20 ## $a3 = 00001A20 -/* 08754 80924254 0C031AB1 */ jal func_800C6AC4 +/* 08754 80924254 0C031AB1 */ jal Graph_OpenDisp /* 08758 80924258 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0875C 8092425C 8FAF00EC */ lw $t7, 0x00EC($sp) /* 08760 80924260 C6280028 */ lwc1 $f8, 0x0028($s1) ## 00000028 @@ -565,7 +565,7 @@ glabel func_80924228 /* 08FCC 80924ACC 24C66AC0 */ addiu $a2, $a2, %lo(D_80926AC0) ## $a2 = 80926AC0 /* 08FD0 80924AD0 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFE4 /* 08FD4 80924AD4 24071B21 */ addiu $a3, $zero, 0x1B21 ## $a3 = 00001B21 -/* 08FD8 80924AD8 0C031AD5 */ jal func_800C6B54 +/* 08FD8 80924AD8 0C031AD5 */ jal Graph_CloseDisp /* 08FDC 80924ADC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 08FE0 80924AE0 8FA500EC */ lw $a1, 0x00EC($sp) /* 08FE4 80924AE4 3C040001 */ lui $a0, 0x0001 ## $a0 = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s index 3ce53f16a5..da754329ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s @@ -21,7 +21,7 @@ glabel func_80925480 /* 099CC 809254CC 24C66AF0 */ addiu $a2, $a2, %lo(D_80926AF0) ## $a2 = 80926AF0 /* 099D0 809254D0 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFDC /* 099D4 809254D4 24071C60 */ addiu $a3, $zero, 0x1C60 ## $a3 = 00001C60 -/* 099D8 809254D8 0C031AB1 */ jal func_800C6AC4 +/* 099D8 809254D8 0C031AB1 */ jal Graph_OpenDisp /* 099DC 809254DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 099E0 809254E0 0C034213 */ jal Matrix_Push /* 099E4 809254E4 00000000 */ nop @@ -485,7 +485,7 @@ glabel func_80925480 /* 0A0CC 80925BCC 24C66B50 */ addiu $a2, $a2, %lo(D_80926B50) ## $a2 = 80926B50 /* 0A0D0 80925BD0 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFDC /* 0A0D4 80925BD4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A0D8 80925BD8 0C031AD5 */ jal func_800C6B54 +/* 0A0D8 80925BD8 0C031AD5 */ jal Graph_CloseDisp /* 0A0DC 80925BDC 24071D3A */ addiu $a3, $zero, 0x1D3A ## $a3 = 00001D3A /* 0A0E0 80925BE0 8FBF004C */ lw $ra, 0x004C($sp) /* 0A0E4 80925BE4 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s index 8d0fa18c79..7d4892e71c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s @@ -19,7 +19,7 @@ glabel BossSst_Draw /* 080DC 809346AC 24C678F0 */ addiu $a2, $a2, %lo(D_809378F0) ## $a2 = 809378F0 /* 080E0 809346B0 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE8 /* 080E4 809346B4 240719A3 */ addiu $a3, $zero, 0x19A3 ## $a3 = 000019A3 -/* 080E8 809346B8 0C031AB1 */ jal func_800C6AC4 +/* 080E8 809346B8 0C031AB1 */ jal Graph_OpenDisp /* 080EC 809346BC 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 080F0 809346C0 8FAF00CC */ lw $t7, 0x00CC($sp) /* 080F4 809346C4 0C024F46 */ jal func_80093D18 @@ -237,7 +237,7 @@ glabel BossSst_Draw /* 0841C 809349EC 24C67900 */ addiu $a2, $a2, %lo(D_80937900) ## $a2 = 80937900 /* 08420 809349F0 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE8 /* 08424 809349F4 240719FE */ addiu $a3, $zero, 0x19FE ## $a3 = 000019FE -/* 08428 809349F8 0C031AD5 */ jal func_800C6B54 +/* 08428 809349F8 0C031AD5 */ jal Graph_CloseDisp /* 0842C 809349FC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 08430 80934A00 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 08434 80934A04 0C24D8E7 */ jal func_8093639C diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s index 41af913e68..cb0b51b956 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s @@ -10,7 +10,7 @@ glabel func_809352DC /* 08D2C 809352FC 24C67910 */ addiu $a2, $a2, %lo(D_80937910) ## $a2 = 80937910 /* 08D30 80935300 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 08D34 80935304 24071A9A */ addiu $a3, $zero, 0x1A9A ## $a3 = 00001A9A -/* 08D38 80935308 0C031AB1 */ jal func_800C6AC4 +/* 08D38 80935308 0C031AB1 */ jal Graph_OpenDisp /* 08D3C 8093530C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 08D40 80935310 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 /* 08D44 80935314 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 @@ -283,7 +283,7 @@ glabel func_809352DC /* 09144 80935714 24C67930 */ addiu $a2, $a2, %lo(D_80937930) ## $a2 = 80937930 /* 09148 80935718 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 0914C 8093571C 24071B1D */ addiu $a3, $zero, 0x1B1D ## $a3 = 00001B1D -/* 09150 80935720 0C031AD5 */ jal func_800C6B54 +/* 09150 80935720 0C031AD5 */ jal Graph_CloseDisp /* 09154 80935724 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 09158 80935728 8FA400A4 */ lw $a0, 0x00A4($sp) /* 0915C 8093572C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s index 1b5bded81f..9582c4f400 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s @@ -21,7 +21,7 @@ glabel func_8093639C /* 09E18 809363E8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 09E1C 809363EC 24C67940 */ addiu $a2, $a2, %lo(D_80937940) ## $a2 = 80937940 /* 09E20 809363F0 24071C86 */ addiu $a3, $zero, 0x1C86 ## $a3 = 00001C86 -/* 09E24 809363F4 0C031AB1 */ jal func_800C6AC4 +/* 09E24 809363F4 0C031AB1 */ jal Graph_OpenDisp /* 09E28 809363F8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 09E2C 809363FC 8FB800F4 */ lw $t8, 0x00F4($sp) /* 09E30 80936400 0C024F61 */ jal func_80093D84 @@ -376,7 +376,7 @@ glabel func_8093639C /* 0A36C 8093693C 24C67980 */ addiu $a2, $a2, %lo(D_80937980) ## $a2 = 80937980 /* 0A370 80936940 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFDC /* 0A374 80936944 24071D09 */ addiu $a3, $zero, 0x1D09 ## $a3 = 00001D09 -/* 0A378 80936948 0C031AD5 */ jal func_800C6B54 +/* 0A378 80936948 0C031AD5 */ jal Graph_CloseDisp /* 0A37C 8093694C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 .L80936950: /* 0A380 80936950 8FBF006C */ lw $ra, 0x006C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s index 83fafa62c2..6c9456c068 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s @@ -13,7 +13,7 @@ glabel BossTw_Draw /* 0A5D0 809432A0 24C6AC28 */ addiu $a2, $a2, %lo(D_8094AC28) ## $a2 = 8094AC28 /* 0A5D4 809432A4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 0A5D8 809432A8 24071B23 */ addiu $a3, $zero, 0x1B23 ## $a3 = 00001B23 -/* 0A5DC 809432AC 0C031AB1 */ jal func_800C6AC4 +/* 0A5DC 809432AC 0C031AB1 */ jal Graph_OpenDisp /* 0A5E0 809432B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0A5E4 809432B4 920F0564 */ lbu $t7, 0x0564($s0) ## 00000564 /* 0A5E8 809432B8 3C05DB06 */ lui $a1, 0xDB06 ## $a1 = DB060000 @@ -450,7 +450,7 @@ glabel BossTw_Draw /* 0AC54 80943924 24C6AC38 */ addiu $a2, $a2, %lo(D_8094AC38) ## $a2 = 8094AC38 /* 0AC58 80943928 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 0AC5C 8094392C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0AC60 80943930 0C031AD5 */ jal func_800C6B54 +/* 0AC60 80943930 0C031AD5 */ jal Graph_CloseDisp /* 0AC64 80943934 24071BD3 */ addiu $a3, $zero, 0x1BD3 ## $a3 = 00001BD3 /* 0AC68 80943938 8FBF0044 */ lw $ra, 0x0044($sp) /* 0AC6C 8094393C 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s index 8be6781ee3..2d8e62d1bb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s @@ -12,7 +12,7 @@ glabel func_80941788 /* 08AE0 809417B0 24C6AA88 */ addiu $a2, $a2, %lo(D_8094AA88) ## $a2 = 8094AA88 /* 08AE4 809417B4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 08AE8 809417B8 24071818 */ addiu $a3, $zero, 0x1818 ## $a3 = 00001818 -/* 08AEC 809417BC 0C031AB1 */ jal func_800C6AC4 +/* 08AEC 809417BC 0C031AB1 */ jal Graph_OpenDisp /* 08AF0 809417C0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 08AF4 809417C4 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E /* 08AF8 809417C8 1221004C */ beq $s1, $at, .L809418FC @@ -267,7 +267,7 @@ glabel func_80941788 /* 08EC8 80941B98 24C6AAB8 */ addiu $a2, $a2, %lo(D_8094AAB8) ## $a2 = 8094AAB8 /* 08ECC 80941B9C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 08ED0 80941BA0 2407185C */ addiu $a3, $zero, 0x185C ## $a3 = 0000185C -/* 08ED4 80941BA4 0C031AD5 */ jal func_800C6B54 +/* 08ED4 80941BA4 0C031AD5 */ jal Graph_CloseDisp /* 08ED8 80941BA8 8D450000 */ lw $a1, 0x0000($t2) ## 00000008 /* 08EDC 80941BAC 8FBF001C */ lw $ra, 0x001C($sp) /* 08EE0 80941BB0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s index ad608eeeed..97e25af564 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s @@ -9,7 +9,7 @@ glabel func_80941BC0 /* 08F0C 80941BDC 24C6AAC8 */ addiu $a2, $a2, %lo(D_8094AAC8) ## $a2 = 8094AAC8 /* 08F10 80941BE0 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE8 /* 08F14 80941BE4 240718C5 */ addiu $a3, $zero, 0x18C5 ## $a3 = 000018C5 -/* 08F18 80941BE8 0C031AB1 */ jal func_800C6AC4 +/* 08F18 80941BE8 0C031AB1 */ jal Graph_OpenDisp /* 08F1C 80941BEC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 08F20 80941BF0 0C034213 */ jal Matrix_Push /* 08F24 80941BF4 00000000 */ nop @@ -366,7 +366,7 @@ glabel func_80941BC0 /* 09488 80942158 24C6AB08 */ addiu $a2, $a2, %lo(D_8094AB08) ## $a2 = 8094AB08 /* 0948C 8094215C 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE8 /* 09490 80942160 2407193D */ addiu $a3, $zero, 0x193D ## $a3 = 0000193D -/* 09494 80942164 0C031AD5 */ jal func_800C6B54 +/* 09494 80942164 0C031AD5 */ jal Graph_CloseDisp /* 09498 80942168 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 0949C 8094216C 8FBF003C */ lw $ra, 0x003C($sp) /* 094A0 80942170 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s index 9df7085713..57ba77df40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s @@ -9,7 +9,7 @@ glabel func_80942180 /* 094CC 8094219C 24C6AB18 */ addiu $a2, $a2, %lo(D_8094AB18) ## $a2 = 8094AB18 /* 094D0 809421A0 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFE8 /* 094D4 809421A4 24071944 */ addiu $a3, $zero, 0x1944 ## $a3 = 00001944 -/* 094D8 809421A8 0C031AB1 */ jal func_800C6AC4 +/* 094D8 809421A8 0C031AB1 */ jal Graph_OpenDisp /* 094DC 809421AC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 094E0 809421B0 0C034213 */ jal Matrix_Push /* 094E4 809421B4 00000000 */ nop @@ -340,7 +340,7 @@ glabel func_80942180 /* 099F8 809426C8 24C6AB58 */ addiu $a2, $a2, %lo(D_8094AB58) ## $a2 = 8094AB58 /* 099FC 809426CC 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFE8 /* 09A00 809426D0 240719B3 */ addiu $a3, $zero, 0x19B3 ## $a3 = 000019B3 -/* 09A04 809426D4 0C031AD5 */ jal func_800C6B54 +/* 09A04 809426D4 0C031AD5 */ jal Graph_CloseDisp /* 09A08 809426D8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 09A0C 809426DC 8FBF003C */ lw $ra, 0x003C($sp) /* 09A10 809426E0 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s index 376ab2c8d3..053a99f75a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s @@ -15,7 +15,7 @@ glabel func_809426F0 /* 09A54 80942724 24C6AB68 */ addiu $a2, $a2, %lo(D_8094AB68) ## $a2 = 8094AB68 /* 09A58 80942728 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 09A5C 8094272C 240719BB */ addiu $a3, $zero, 0x19BB ## $a3 = 000019BB -/* 09A60 80942730 0C031AB1 */ jal func_800C6AC4 +/* 09A60 80942730 0C031AB1 */ jal Graph_OpenDisp /* 09A64 80942734 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 09A68 80942738 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 09A6C 8094273C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -344,7 +344,7 @@ glabel func_809426F0 /* 09F64 80942C34 24C6AB98 */ addiu $a2, $a2, %lo(D_8094AB98) ## $a2 = 8094AB98 /* 09F68 80942C38 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 09F6C 80942C3C 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 09F70 80942C40 0C031AD5 */ jal func_800C6B54 +/* 09F70 80942C40 0C031AD5 */ jal Graph_CloseDisp /* 09F74 80942C44 24071A64 */ addiu $a3, $zero, 0x1A64 ## $a3 = 00001A64 /* 09F78 80942C48 8FBF005C */ lw $ra, 0x005C($sp) /* 09F7C 80942C4C D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s index 7dd9998b25..2bc831ba21 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s @@ -10,7 +10,7 @@ glabel func_80942C70 /* 09FC0 80942C90 24C6ABA8 */ addiu $a2, $a2, %lo(D_8094ABA8) ## $a2 = 8094ABA8 /* 09FC4 80942C94 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 09FC8 80942C98 24071A6D */ addiu $a3, $zero, 0x1A6D ## $a3 = 00001A6D -/* 09FCC 80942C9C 0C031AB1 */ jal func_800C6AC4 +/* 09FCC 80942C9C 0C031AB1 */ jal Graph_OpenDisp /* 09FD0 80942CA0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 09FD4 80942CA4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 09FD8 80942CA8 C606052C */ lwc1 $f6, 0x052C($s0) ## 0000052C @@ -234,7 +234,7 @@ glabel func_80942C70 /* 0A330 80943000 24C6ABD8 */ addiu $a2, $a2, %lo(D_8094ABD8) ## $a2 = 8094ABD8 /* 0A334 80943004 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 0A338 80943008 24071ADE */ addiu $a3, $zero, 0x1ADE ## $a3 = 00001ADE -/* 0A33C 8094300C 0C031AD5 */ jal func_800C6B54 +/* 0A33C 8094300C 0C031AD5 */ jal Graph_CloseDisp /* 0A340 80943010 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 0A344 80943014 8FBF0024 */ lw $ra, 0x0024($sp) /* 0A348 80943018 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s index 0327a34865..6b12be105c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s @@ -10,7 +10,7 @@ glabel func_80943028 /* 0A378 80943048 24C6ABE8 */ addiu $a2, $a2, %lo(D_8094ABE8) ## $a2 = 8094ABE8 /* 0A37C 8094304C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 0A380 80943050 24071AE5 */ addiu $a3, $zero, 0x1AE5 ## $a3 = 00001AE5 -/* 0A384 80943054 0C031AB1 */ jal func_800C6AC4 +/* 0A384 80943054 0C031AB1 */ jal Graph_OpenDisp /* 0A388 80943058 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0A38C 8094305C 0C034213 */ jal Matrix_Push /* 0A390 80943060 00000000 */ nop @@ -139,7 +139,7 @@ glabel func_80943028 /* 0A57C 8094324C 24C6AC18 */ addiu $a2, $a2, %lo(D_8094AC18) ## $a2 = 8094AC18 /* 0A580 80943250 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 0A584 80943254 24071B15 */ addiu $a3, $zero, 0x1B15 ## $a3 = 00001B15 -/* 0A588 80943258 0C031AD5 */ jal func_800C6B54 +/* 0A588 80943258 0C031AD5 */ jal Graph_CloseDisp /* 0A58C 8094325C 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 0A590 80943260 8FBF001C */ lw $ra, 0x001C($sp) /* 0A594 80943264 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s index caf578c73b..3d75ee9df6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s @@ -10,7 +10,7 @@ glabel func_80943950 /* 0ACA0 80943970 24C6AC48 */ addiu $a2, $a2, %lo(D_8094AC48) ## $a2 = 8094AC48 /* 0ACA4 80943974 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 0ACA8 80943978 24071BE3 */ addiu $a3, $zero, 0x1BE3 ## $a3 = 00001BE3 -/* 0ACAC 8094397C 0C031AB1 */ jal func_800C6AC4 +/* 0ACAC 8094397C 0C031AB1 */ jal Graph_OpenDisp /* 0ACB0 80943980 AFA50070 */ sw $a1, 0x0070($sp) /* 0ACB4 80943984 8FAF007C */ lw $t7, 0x007C($sp) /* 0ACB8 80943988 8FA80070 */ lw $t0, 0x0070($sp) @@ -277,7 +277,7 @@ glabel L80943D38 /* 0B09C 80943D6C 8FAF0078 */ lw $t7, 0x0078($sp) .L80943D70: /* 0B0A0 80943D70 24071C53 */ addiu $a3, $zero, 0x1C53 ## $a3 = 00001C53 -/* 0B0A4 80943D74 0C031AD5 */ jal func_800C6B54 +/* 0B0A4 80943D74 0C031AD5 */ jal Graph_CloseDisp /* 0B0A8 80943D78 8DE50000 */ lw $a1, 0x0000($t7) ## 0602D940 /* 0B0AC 80943D7C 8FBF0034 */ lw $ra, 0x0034($sp) /* 0B0B0 80943D80 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s index a2ee065867..379a324b1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s @@ -10,7 +10,7 @@ glabel func_80943D90 /* 0B0E0 80943DB0 24C6AC68 */ addiu $a2, $a2, %lo(D_8094AC68) ## $a2 = 8094AC68 /* 0B0E4 80943DB4 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 0B0E8 80943DB8 24071C5E */ addiu $a3, $zero, 0x1C5E ## $a3 = 00001C5E -/* 0B0EC 80943DBC 0C031AB1 */ jal func_800C6AC4 +/* 0B0EC 80943DBC 0C031AB1 */ jal Graph_OpenDisp /* 0B0F0 80943DC0 AFA50038 */ sw $a1, 0x0038($sp) /* 0B0F4 80943DC4 8FAF0044 */ lw $t7, 0x0044($sp) /* 0B0F8 80943DC8 25F8FFF1 */ addiu $t8, $t7, 0xFFF1 ## $t8 = FFFFFFF1 @@ -94,7 +94,7 @@ glabel L80943EDC /* 0B214 80943EE4 24C6AC88 */ addiu $a2, $a2, %lo(D_8094AC88) ## $a2 = 8094AC88 /* 0B218 80943EE8 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 0B21C 80943EEC 24071C85 */ addiu $a3, $zero, 0x1C85 ## $a3 = 00001C85 -/* 0B220 80943EF0 0C031AD5 */ jal func_800C6B54 +/* 0B220 80943EF0 0C031AD5 */ jal Graph_CloseDisp /* 0B224 80943EF4 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 0B228 80943EF8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0B22C 80943EFC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s index 05aed9b25b..d1cae216c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s @@ -11,7 +11,7 @@ glabel func_80943F08 /* 0B25C 80943F2C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0B260 80943F30 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFE0 /* 0B264 80943F34 24071C8F */ addiu $a3, $zero, 0x1C8F ## $a3 = 00001C8F -/* 0B268 80943F38 0C031AB1 */ jal func_800C6AC4 +/* 0B268 80943F38 0C031AB1 */ jal Graph_OpenDisp /* 0B26C 80943F3C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0B270 80943F40 0C034213 */ jal Matrix_Push /* 0B274 80943F44 00000000 */ nop @@ -574,7 +574,7 @@ glabel func_80943F08 /* 0BAC4 80944794 24C6ACC8 */ addiu $a2, $a2, %lo(D_8094ACC8) ## $a2 = 8094ACC8 /* 0BAC8 80944798 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFE0 /* 0BACC 8094479C 24071D6B */ addiu $a3, $zero, 0x1D6B ## $a3 = 00001D6B -/* 0BAD0 809447A0 0C031AD5 */ jal func_800C6B54 +/* 0BAD0 809447A0 0C031AD5 */ jal Graph_CloseDisp /* 0BAD4 809447A4 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0BAD8 809447A8 8FBF003C */ lw $ra, 0x003C($sp) /* 0BADC 809447AC 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s index fa90a08a72..4697a276c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s @@ -9,7 +9,7 @@ glabel func_809447BC /* 0BB08 809447D8 24C6ACD8 */ addiu $a2, $a2, %lo(D_8094ACD8) ## $a2 = 8094ACD8 /* 0BB0C 809447DC 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 0BB10 809447E0 24071D7A */ addiu $a3, $zero, 0x1D7A ## $a3 = 00001D7A -/* 0BB14 809447E4 0C031AB1 */ jal func_800C6AC4 +/* 0BB14 809447E4 0C031AB1 */ jal Graph_OpenDisp /* 0BB18 809447E8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0BB1C 809447EC 8FAF009C */ lw $t7, 0x009C($sp) /* 0BB20 809447F0 0C024F61 */ jal func_80093D84 @@ -285,7 +285,7 @@ glabel func_809447BC /* 0BF58 80944C28 24C6AD28 */ addiu $a2, $a2, %lo(D_8094AD28) ## $a2 = 8094AD28 /* 0BF5C 80944C2C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 0BF60 80944C30 24071DD3 */ addiu $a3, $zero, 0x1DD3 ## $a3 = 00001DD3 -/* 0BF64 80944C34 0C031AD5 */ jal func_800C6B54 +/* 0BF64 80944C34 0C031AD5 */ jal Graph_CloseDisp /* 0BF68 80944C38 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 0BF6C 80944C3C 8FBF003C */ lw $ra, 0x003C($sp) /* 0BF70 80944C40 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s index ef5bb37067..ea4439383e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s @@ -9,7 +9,7 @@ glabel func_80944C50 /* 0BF9C 80944C6C 24C6AD38 */ addiu $a2, $a2, %lo(D_8094AD38) ## $a2 = 8094AD38 /* 0BFA0 80944C70 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 0BFA4 80944C74 24071DDD */ addiu $a3, $zero, 0x1DDD ## $a3 = 00001DDD -/* 0BFA8 80944C78 0C031AB1 */ jal func_800C6AC4 +/* 0BFA8 80944C78 0C031AB1 */ jal Graph_OpenDisp /* 0BFAC 80944C7C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0BFB0 80944C80 0C034213 */ jal Matrix_Push /* 0BFB4 80944C84 00000000 */ nop @@ -263,7 +263,7 @@ glabel func_80944C50 /* 0C38C 8094505C 24C6AD78 */ addiu $a2, $a2, %lo(D_8094AD78) ## $a2 = 8094AD78 /* 0C390 80945060 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 0C394 80945064 24071E34 */ addiu $a3, $zero, 0x1E34 ## $a3 = 00001E34 -/* 0C398 80945068 0C031AD5 */ jal func_800C6B54 +/* 0C398 80945068 0C031AD5 */ jal Graph_CloseDisp /* 0C39C 8094506C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 0C3A0 80945070 8FBF003C */ lw $ra, 0x003C($sp) /* 0C3A4 80945074 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s index b1a56fae3e..2e2a69a3a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s @@ -11,7 +11,7 @@ glabel func_80945084 /* 0C3D8 809450A8 24C6AD88 */ addiu $a2, $a2, %lo(D_8094AD88) ## $a2 = 8094AD88 /* 0C3DC 809450AC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0C3E0 809450B0 24071E44 */ addiu $a3, $zero, 0x1E44 ## $a3 = 00001E44 -/* 0C3E4 809450B4 0C031AB1 */ jal func_800C6AC4 +/* 0C3E4 809450B4 0C031AB1 */ jal Graph_OpenDisp /* 0C3E8 809450B8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0C3EC 809450BC 920E0564 */ lbu $t6, 0x0564($s0) ## 00000564 /* 0C3F0 809450C0 11C000A7 */ beq $t6, $zero, .L80945360 @@ -223,7 +223,7 @@ glabel func_80945084 /* 0C6F0 809453C0 24C6AD98 */ addiu $a2, $a2, %lo(D_8094AD98) ## $a2 = 8094AD98 /* 0C6F4 809453C4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0C6F8 809453C8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0C6FC 809453CC 0C031AD5 */ jal func_800C6B54 +/* 0C6FC 809453CC 0C031AD5 */ jal Graph_CloseDisp /* 0C700 809453D0 24071E7C */ addiu $a3, $zero, 0x1E7C ## $a3 = 00001E7C /* 0C704 809453D4 8FBF0034 */ lw $ra, 0x0034($sp) /* 0C708 809453D8 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s index 9613d1dab8..bbc12c3aeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s @@ -19,7 +19,7 @@ glabel func_80946C7C /* 0DFF0 80946CC0 24C6ADA8 */ addiu $a2, $a2, %lo(D_8094ADA8) ## $a2 = 8094ADA8 /* 0DFF4 80946CC4 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 0DFF8 80946CC8 24072272 */ addiu $a3, $zero, 0x2272 ## $a3 = 00002272 -/* 0DFFC 80946CCC 0C031AB1 */ jal func_800C6AC4 +/* 0DFFC 80946CCC 0C031AB1 */ jal Graph_OpenDisp /* 0E000 80946CD0 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0E004 80946CD4 0C024F61 */ jal func_80093D84 /* 0E008 80946CD8 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -357,7 +357,7 @@ glabel func_80946C7C /* 0E524 809471F4 24C6ADD8 */ addiu $a2, $a2, %lo(D_8094ADD8) ## $a2 = 8094ADD8 /* 0E528 809471F8 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 0E52C 809471FC 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 0E530 80947200 0C031AD5 */ jal func_800C6B54 +/* 0E530 80947200 0C031AD5 */ jal Graph_CloseDisp /* 0E534 80947204 24072335 */ addiu $a3, $zero, 0x2335 ## $a3 = 00002335 /* 0E538 80947208 8FBF006C */ lw $ra, 0x006C($sp) /* 0E53C 8094720C D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s index d095e73fc8..be43965bde 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s @@ -19,7 +19,7 @@ glabel func_80947240 /* 0E5B4 80947284 24C6ADE8 */ addiu $a2, $a2, %lo(D_8094ADE8) ## $a2 = 8094ADE8 /* 0E5B8 80947288 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 0E5BC 8094728C 24072344 */ addiu $a3, $zero, 0x2344 ## $a3 = 00002344 -/* 0E5C0 80947290 0C031AB1 */ jal func_800C6AC4 +/* 0E5C0 80947290 0C031AB1 */ jal Graph_OpenDisp /* 0E5C4 80947294 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0E5C8 80947298 0C024F61 */ jal func_80093D84 /* 0E5CC 8094729C 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -347,7 +347,7 @@ glabel func_80947240 /* 0EAC4 80947794 24C6AE18 */ addiu $a2, $a2, %lo(D_8094AE18) ## $a2 = 8094AE18 /* 0EAC8 80947798 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 0EACC 8094779C 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 0EAD0 809477A0 0C031AD5 */ jal func_800C6B54 +/* 0EAD0 809477A0 0C031AD5 */ jal Graph_CloseDisp /* 0EAD4 809477A4 24072397 */ addiu $a3, $zero, 0x2397 ## $a3 = 00002397 /* 0EAD8 809477A8 8FBF006C */ lw $ra, 0x006C($sp) /* 0EADC 809477AC D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s index 512e62cfb5..4436e344dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s @@ -30,7 +30,7 @@ glabel func_80948668 /* 0FA08 809486D8 27A4015C */ addiu $a0, $sp, 0x015C ## $a0 = FFFFFFCC /* 0FA0C 809486DC 24072578 */ addiu $a3, $zero, 0x2578 ## $a3 = 00002578 /* 0FA10 809486E0 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 0FA14 809486E4 0C031AB1 */ jal func_800C6AC4 +/* 0FA14 809486E4 0C031AB1 */ jal Graph_OpenDisp /* 0FA18 809486E8 AFB50174 */ sw $s5, 0x0174($sp) /* 0FA1C 809486EC 8FAF0190 */ lw $t7, 0x0190($sp) /* 0FA20 809486F0 0C024F61 */ jal func_80093D84 @@ -955,7 +955,7 @@ glabel func_80948668 /* 10804 809494D4 24C6AE98 */ addiu $a2, $a2, %lo(D_8094AE98) ## $a2 = 8094AE98 /* 10808 809494D8 27A4015C */ addiu $a0, $sp, 0x015C ## $a0 = FFFFFFCC /* 1080C 809494DC 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 10810 809494E0 0C031AD5 */ jal func_800C6B54 +/* 10810 809494E0 0C031AD5 */ jal Graph_CloseDisp /* 10814 809494E4 240726C0 */ addiu $a3, $zero, 0x26C0 ## $a3 = 000026C0 /* 10818 809494E8 8FBF008C */ lw $ra, 0x008C($sp) /* 1081C 809494EC D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s index e1a5bd3b49..ec6e5c51b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s @@ -67,7 +67,7 @@ glabel BossVa_Draw /* 0A00C 809592CC 24C6C470 */ addiu $a2, $a2, %lo(D_8095C470) ## $a2 = 8095C470 /* 0A010 809592D0 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFF8C /* 0A014 809592D4 240711BE */ addiu $a3, $zero, 0x11BE ## $a3 = 000011BE -/* 0A018 809592D8 0C031AB1 */ jal func_800C6AC4 +/* 0A018 809592D8 0C031AB1 */ jal Graph_OpenDisp /* 0A01C 809592DC AFA5006C */ sw $a1, 0x006C($sp) /* 0A020 809592E0 0C024F46 */ jal func_80093D18 /* 0A024 809592E4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -407,7 +407,7 @@ glabel L8095978C /* 0A50C 809597CC 24C6C480 */ addiu $a2, $a2, %lo(D_8095C480) ## $a2 = 8095C480 /* 0A510 809597D0 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFF8C /* 0A514 809597D4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0A518 809597D8 0C031AD5 */ jal func_800C6B54 +/* 0A518 809597D8 0C031AD5 */ jal Graph_CloseDisp /* 0A51C 809597DC 24071241 */ addiu $a3, $zero, 0x1241 ## $a3 = 00001241 /* 0A520 809597E0 8FBF003C */ lw $ra, 0x003C($sp) /* 0A524 809597E4 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s index fcd2fb3db2..90f862a366 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s @@ -10,7 +10,7 @@ glabel func_80957F60 /* 08CC0 80957F80 24C6C3B0 */ addiu $a2, $a2, %lo(D_8095C3B0) ## $a2 = 8095C3B0 /* 08CC4 80957F84 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 08CC8 80957F88 2407103C */ addiu $a3, $zero, 0x103C ## $a3 = 0000103C -/* 08CCC 80957F8C 0C031AB1 */ jal func_800C6AC4 +/* 08CCC 80957F8C 0C031AB1 */ jal Graph_OpenDisp /* 08CD0 80957F90 AFA5005C */ sw $a1, 0x005C($sp) /* 08CD4 80957F94 8FA2006C */ lw $v0, 0x006C($sp) /* 08CD8 80957F98 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 @@ -123,7 +123,7 @@ glabel func_80957F60 /* 08E68 80958128 24C6C3C0 */ addiu $a2, $a2, %lo(D_8095C3C0) ## $a2 = 8095C3C0 /* 08E6C 8095812C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 08E70 80958130 24071057 */ addiu $a3, $zero, 0x1057 ## $a3 = 00001057 -/* 08E74 80958134 0C031AD5 */ jal func_800C6B54 +/* 08E74 80958134 0C031AD5 */ jal Graph_CloseDisp /* 08E78 80958138 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 08E7C 8095813C 8FBF0034 */ lw $ra, 0x0034($sp) /* 08E80 80958140 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s index 70b1e381d3..37c7014029 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s @@ -20,7 +20,7 @@ glabel func_80958150 /* 08ED8 80958198 24071060 */ addiu $a3, $zero, 0x1060 ## $a3 = 00001060 /* 08EDC 8095819C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 08EE0 809581A0 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 -/* 08EE4 809581A4 0C031AB1 */ jal func_800C6AC4 +/* 08EE4 809581A4 0C031AB1 */ jal Graph_OpenDisp /* 08EE8 809581A8 AFA50070 */ sw $a1, 0x0070($sp) /* 08EEC 809581AC 8FAA008C */ lw $t2, 0x008C($sp) /* 08EF0 809581B0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 @@ -357,7 +357,7 @@ glabel func_80958150 /* 093C0 80958680 24C6C420 */ addiu $a2, $a2, %lo(D_8095C420) ## $a2 = 8095C420 /* 093C4 80958684 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 /* 093C8 80958688 240710A8 */ addiu $a3, $zero, 0x10A8 ## $a3 = 000010A8 -/* 093CC 8095868C 0C031AD5 */ jal func_800C6B54 +/* 093CC 8095868C 0C031AD5 */ jal Graph_CloseDisp /* 093D0 80958690 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 093D4 80958694 8FBF0034 */ lw $ra, 0x0034($sp) /* 093D8 80958698 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s index 468f52a489..f4e66d6725 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s @@ -12,7 +12,7 @@ glabel func_80958FFC /* 09D64 80959024 24C6C430 */ addiu $a2, $a2, %lo(D_8095C430) ## $a2 = 8095C430 /* 09D68 80959028 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 09D6C 8095902C 2407118E */ addiu $a3, $zero, 0x118E ## $a3 = 0000118E -/* 09D70 80959030 0C031AB1 */ jal func_800C6AC4 +/* 09D70 80959030 0C031AB1 */ jal Graph_OpenDisp /* 09D74 80959034 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 09D78 80959038 8FA20074 */ lw $v0, 0x0074($sp) /* 09D7C 8095903C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 @@ -110,7 +110,7 @@ glabel func_80958FFC /* 09EE0 809591A0 24C6C460 */ addiu $a2, $a2, %lo(D_8095C460) ## $a2 = 8095C460 /* 09EE4 809591A4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 09EE8 809591A8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 09EEC 809591AC 0C031AD5 */ jal func_800C6B54 +/* 09EEC 809591AC 0C031AD5 */ jal Graph_CloseDisp /* 09EF0 809591B0 240711A5 */ addiu $a3, $zero, 0x11A5 ## $a3 = 000011A5 /* 09EF4 809591B4 8FBF003C */ lw $ra, 0x003C($sp) /* 09EF8 809591B8 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s index b6d1d61a30..46863bea17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s @@ -25,7 +25,7 @@ glabel func_8095A188 /* 0AF24 8095A1E4 24C6C490 */ addiu $a2, $a2, %lo(D_8095C490) ## $a2 = 8095C490 /* 0AF28 8095A1E8 27A40120 */ addiu $a0, $sp, 0x0120 ## $a0 = FFFFFFD8 /* 0AF2C 8095A1EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0AF30 8095A1F0 0C031AB1 */ jal func_800C6AC4 +/* 0AF30 8095A1F0 0C031AB1 */ jal Graph_OpenDisp /* 0AF34 8095A1F4 24071359 */ addiu $a3, $zero, 0x1359 ## $a3 = 00001359 /* 0AF38 8095A1F8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0AF3C 8095A1FC 3C178096 */ lui $s7, %hi(D_8095C4A0) ## $s7 = 80960000 @@ -950,7 +950,7 @@ glabel func_8095A188 /* 0BD20 8095AFE0 24C6C520 */ addiu $a2, $a2, %lo(D_8095C520) ## $a2 = 8095C520 /* 0BD24 8095AFE4 27A40120 */ addiu $a0, $sp, 0x0120 ## $a0 = FFFFFFD8 /* 0BD28 8095AFE8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0BD2C 8095AFEC 0C031AD5 */ jal func_800C6B54 +/* 0BD2C 8095AFEC 0C031AD5 */ jal Graph_CloseDisp /* 0BD30 8095AFF0 2407145F */ addiu $a3, $zero, 0x145F ## $a3 = 0000145F /* 0BD34 8095AFF4 8FBF0044 */ lw $ra, 0x0044($sp) /* 0BD38 8095AFF8 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s index ee75efcad0..f887101345 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s @@ -25,7 +25,7 @@ glabel func_8095BD24 /* 0CAC0 8095BD80 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFA0 /* 0CAC4 8095BD84 240715E0 */ addiu $a3, $zero, 0x15E0 ## $a3 = 000015E0 /* 0CAC8 8095BD88 4600B506 */ mov.s $f20, $f22 -/* 0CACC 8095BD8C 0C031AB1 */ jal func_800C6AC4 +/* 0CACC 8095BD8C 0C031AB1 */ jal Graph_OpenDisp /* 0CAD0 8095BD90 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 0CAD4 8095BD94 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 0CAD8 8095BD98 44817000 */ mtc1 $at, $f14 ## $f14 = 80.00 @@ -116,7 +116,7 @@ glabel func_8095BD24 /* 0CC24 8095BEE4 24C6C550 */ addiu $a2, $a2, %lo(D_8095C550) ## $a2 = 8095C550 /* 0CC28 8095BEE8 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFA0 /* 0CC2C 8095BEEC 240715FD */ addiu $a3, $zero, 0x15FD ## $a3 = 000015FD -/* 0CC30 8095BEF0 0C031AD5 */ jal func_800C6B54 +/* 0CC30 8095BEF0 0C031AD5 */ jal Graph_CloseDisp /* 0CC34 8095BEF4 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0CC38 8095BEF8 8FBF005C */ lw $ra, 0x005C($sp) /* 0CC3C 8095BEFC D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s index e618542659..ae25d37cf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s @@ -18,7 +18,7 @@ glabel func_80967FFC /* 016EC 8096803C 24C69448 */ addiu $a2, $a2, %lo(D_80969448) ## $a2 = 80969448 /* 016F0 80968040 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFE0 /* 016F4 80968044 2407042E */ addiu $a3, $zero, 0x042E ## $a3 = 0000042E -/* 016F8 80968048 0C031AB1 */ jal func_800C6AC4 +/* 016F8 80968048 0C031AB1 */ jal Graph_OpenDisp /* 016FC 8096804C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01700 80968050 8FAF00DC */ lw $t7, 0x00DC($sp) /* 01704 80968054 0C024F61 */ jal func_80093D84 @@ -153,7 +153,7 @@ glabel func_80967FFC /* 01900 80968250 24C69468 */ addiu $a2, $a2, %lo(D_80969468) ## $a2 = 80969468 /* 01904 80968254 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFE0 /* 01908 80968258 24070467 */ addiu $a3, $zero, 0x0467 ## $a3 = 00000467 -/* 0190C 8096825C 0C031AD5 */ jal func_800C6B54 +/* 0190C 8096825C 0C031AD5 */ jal Graph_CloseDisp /* 01910 80968260 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 01914 80968264 8FBF0064 */ lw $ra, 0x0064($sp) /* 01918 80968268 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s index c405c7ddc4..439ccce760 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s @@ -30,7 +30,7 @@ glabel func_80968298 /* 019B8 80968308 AFA8009C */ sw $t0, 0x009C($sp) /* 019BC 8096830C 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFCC /* 019C0 80968310 24070479 */ addiu $a3, $zero, 0x0479 ## $a3 = 00000479 -/* 019C4 80968314 0C031AB1 */ jal func_800C6AC4 +/* 019C4 80968314 0C031AB1 */ jal Graph_OpenDisp /* 019C8 80968318 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 019CC 8096831C 8FAD00B0 */ lw $t5, 0x00B0($sp) /* 019D0 80968320 3C01437F */ lui $at, 0x437F ## $at = 437F0000 @@ -235,7 +235,7 @@ glabel func_80968298 /* 01CE4 80968634 24C694A8 */ addiu $a2, $a2, %lo(D_809694A8) ## $a2 = 809694A8 /* 01CE8 80968638 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFCC /* 01CEC 8096863C 240704AE */ addiu $a3, $zero, 0x04AE ## $a3 = 000004AE -/* 01CF0 80968640 0C031AD5 */ jal func_800C6B54 +/* 01CF0 80968640 0C031AD5 */ jal Graph_CloseDisp /* 01CF4 80968644 8DA50000 */ lw $a1, 0x0000($t5) ## 00000008 /* 01CF8 80968648 8FBF003C */ lw $ra, 0x003C($sp) /* 01CFC 8096864C 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s index ccf6107ee7..2ee42f03ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s @@ -9,7 +9,7 @@ glabel func_8096865C /* 01D28 80968678 24C694B8 */ addiu $a2, $a2, %lo(D_809694B8) ## $a2 = 809694B8 /* 01D2C 8096867C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 01D30 80968680 240704B8 */ addiu $a3, $zero, 0x04B8 ## $a3 = 000004B8 -/* 01D34 80968684 0C031AB1 */ jal func_800C6AC4 +/* 01D34 80968684 0C031AB1 */ jal Graph_OpenDisp /* 01D38 80968688 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01D3C 8096868C 8FA20060 */ lw $v0, 0x0060($sp) /* 01D40 80968690 944F028C */ lhu $t7, 0x028C($v0) ## 0000028C @@ -149,7 +149,7 @@ glabel func_8096865C /* 01F4C 8096889C 24C694E8 */ addiu $a2, $a2, %lo(D_809694E8) ## $a2 = 809694E8 /* 01F50 809688A0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 01F54 809688A4 240704DA */ addiu $a3, $zero, 0x04DA ## $a3 = 000004DA -/* 01F58 809688A8 0C031AD5 */ jal func_800C6B54 +/* 01F58 809688A8 0C031AD5 */ jal Graph_CloseDisp /* 01F5C 809688AC 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 01F60 809688B0 8FBF001C */ lw $ra, 0x001C($sp) /* 01F64 809688B4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s index 76a5b86967..dda5a250e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s @@ -32,7 +32,7 @@ glabel func_809688C4 /* 01FE8 80968938 8FBF0044 */ lw $ra, 0x0044($sp) /* 01FEC 8096893C 8EE50000 */ lw $a1, 0x0000($s7) ## 00000000 /* 01FF0 80968940 240704FD */ addiu $a3, $zero, 0x04FD ## $a3 = 000004FD -/* 01FF4 80968944 0C031AB1 */ jal func_800C6AC4 +/* 01FF4 80968944 0C031AB1 */ jal Graph_OpenDisp /* 01FF8 80968948 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01FFC 8096894C 0C024F61 */ jal func_80093D84 /* 02000 80968950 8EE40000 */ lw $a0, 0x0000($s7) ## 00000000 @@ -157,7 +157,7 @@ glabel func_809688C4 /* 021D8 80968B28 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFDC /* 021DC 80968B2C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 021E0 80968B30 8EE50000 */ lw $a1, 0x0000($s7) ## 00000000 -/* 021E4 80968B34 0C031AD5 */ jal func_800C6B54 +/* 021E4 80968B34 0C031AD5 */ jal Graph_CloseDisp /* 021E8 80968B38 24070519 */ addiu $a3, $zero, 0x0519 ## $a3 = 00000519 /* 021EC 80968B3C 8FBF0044 */ lw $ra, 0x0044($sp) .L80968B40: diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s index 141d5ee8ca..2213d785f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s @@ -12,7 +12,7 @@ glabel func_80968B70 /* 02248 80968B98 24C69528 */ addiu $a2, $a2, %lo(D_80969528) ## $a2 = 80969528 /* 0224C 80968B9C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 /* 02250 80968BA0 24070524 */ addiu $a3, $zero, 0x0524 ## $a3 = 00000524 -/* 02254 80968BA4 0C031AB1 */ jal func_800C6AC4 +/* 02254 80968BA4 0C031AB1 */ jal Graph_OpenDisp /* 02258 80968BA8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0225C 80968BAC 8FB8008C */ lw $t8, 0x008C($sp) /* 02260 80968BB0 0C024F61 */ jal func_80093D84 @@ -275,7 +275,7 @@ glabel func_80968B70 /* 02638 80968F88 AC580004 */ sw $t8, 0x0004($v0) ## FFFFFF0A /* 0263C 80968F8C 8FAC008C */ lw $t4, 0x008C($sp) /* 02640 80968F90 24070558 */ addiu $a3, $zero, 0x0558 ## $a3 = 00000558 -/* 02644 80968F94 0C031AD5 */ jal func_800C6B54 +/* 02644 80968F94 0C031AD5 */ jal Graph_CloseDisp /* 02648 80968F98 8D850000 */ lw $a1, 0x0000($t4) ## FFFFFF0E /* 0264C 80968F9C 8FBF003C */ lw $ra, 0x003C($sp) /* 02650 80968FA0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s index f03d8cf498..b45525d656 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s @@ -18,7 +18,7 @@ glabel func_80968FB0 /* 0269C 80968FEC 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 026A0 80968FF0 AFA20060 */ sw $v0, 0x0060($sp) /* 026A4 80968FF4 2407056A */ addiu $a3, $zero, 0x056A ## $a3 = 0000056A -/* 026A8 80968FF8 0C031AB1 */ jal func_800C6AC4 +/* 026A8 80968FF8 0C031AB1 */ jal Graph_OpenDisp /* 026AC 80968FFC AFA50050 */ sw $a1, 0x0050($sp) /* 026B0 80969000 8FB8006C */ lw $t8, 0x006C($sp) /* 026B4 80969004 0C024F61 */ jal func_80093D84 @@ -125,7 +125,7 @@ glabel func_80968FB0 /* 02848 80969198 24C69578 */ addiu $a2, $a2, %lo(D_80969578) ## $a2 = 80969578 /* 0284C 8096919C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFD8 /* 02850 809691A0 24070583 */ addiu $a3, $zero, 0x0583 ## $a3 = 00000583 -/* 02854 809691A4 0C031AD5 */ jal func_800C6B54 +/* 02854 809691A4 0C031AD5 */ jal Graph_CloseDisp /* 02858 809691A8 8F250000 */ lw $a1, 0x0000($t9) ## 0C184B50 /* 0285C 809691AC 8FBF0014 */ lw $ra, 0x0014($sp) /* 02860 809691B0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s index 8fcb2ef9cc..0c540f1eeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s @@ -21,7 +21,7 @@ glabel func_8096B840 /* 01DBC 8096B88C 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) /* 01DC0 8096B890 AFA90064 */ sw $t1, 0x0064($sp) /* 01DC4 8096B894 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01DC8 8096B898 0C031AB1 */ jal func_800C6AC4 +/* 01DC8 8096B898 0C031AB1 */ jal Graph_OpenDisp /* 01DCC 8096B89C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01DD0 8096B8A0 8FAB0084 */ lw $t3, 0x0084($sp) /* 01DD4 8096B8A4 0C024F61 */ jal func_80093D84 @@ -115,7 +115,7 @@ glabel func_8096B840 /* 01F34 8096BA04 24C6CFF4 */ addiu $a2, $a2, %lo(D_8096CFF4) ## $a2 = 8096CFF4 /* 01F38 8096BA08 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 01F3C 8096BA0C 24070130 */ addiu $a3, $zero, 0x0130 ## $a3 = 00000130 -/* 01F40 8096BA10 0C031AD5 */ jal func_800C6B54 +/* 01F40 8096BA10 0C031AD5 */ jal Graph_CloseDisp /* 01F44 8096BA14 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 01F48 8096BA18 8FBF002C */ lw $ra, 0x002C($sp) /* 01F4C 8096BA1C 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s index 958a629db6..ad626ee3ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s @@ -20,7 +20,7 @@ glabel func_8096BF60 /* 024D8 8096BFA8 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) /* 024DC 8096BFAC AFA9005C */ sw $t1, 0x005C($sp) /* 024E0 8096BFB0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 024E4 8096BFB4 0C031AB1 */ jal func_800C6AC4 +/* 024E4 8096BFB4 0C031AB1 */ jal Graph_OpenDisp /* 024E8 8096BFB8 AFA50054 */ sw $a1, 0x0054($sp) /* 024EC 8096BFBC 8FAB007C */ lw $t3, 0x007C($sp) /* 024F0 8096BFC0 0C024F46 */ jal func_80093D18 @@ -111,7 +111,7 @@ glabel func_8096BF60 /* 02644 8096C114 24C6D0A0 */ addiu $a2, $a2, %lo(D_8096D0A0) ## $a2 = 8096D0A0 /* 02648 8096C118 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFCC /* 0264C 8096C11C 2407027E */ addiu $a3, $zero, 0x027E ## $a3 = 0000027E -/* 02650 8096C120 0C031AD5 */ jal func_800C6B54 +/* 02650 8096C120 0C031AD5 */ jal Graph_CloseDisp /* 02654 8096C124 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 02658 8096C128 8FBF0024 */ lw $ra, 0x0024($sp) /* 0265C 8096C12C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s index 39abcbdf6f..57c0773a22 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s @@ -11,7 +11,7 @@ glabel func_8096D8C4 /* 00438 8096D8E8 24C6066C */ addiu $a2, $a2, %lo(D_8097066C) ## $a2 = 8097066C /* 0043C 8096D8EC 24070235 */ addiu $a3, $zero, 0x0235 ## $a3 = 00000235 /* 00440 8096D8F0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 -/* 00444 8096D8F4 0C031AB1 */ jal func_800C6AC4 +/* 00444 8096D8F4 0C031AB1 */ jal Graph_OpenDisp /* 00448 8096D8F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0044C 8096D8FC 0C024F46 */ jal func_80093D18 /* 00450 8096D900 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -105,7 +105,7 @@ glabel func_8096D8C4 /* 005A8 8096DA58 24C6067C */ addiu $a2, $a2, %lo(D_8097067C) ## $a2 = 8097067C /* 005AC 8096DA5C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 005B0 8096DA60 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005B4 8096DA64 0C031AD5 */ jal func_800C6B54 +/* 005B4 8096DA64 0C031AD5 */ jal Graph_CloseDisp /* 005B8 8096DA68 24070253 */ addiu $a3, $zero, 0x0253 ## $a3 = 00000253 /* 005BC 8096DA6C 8FBF002C */ lw $ra, 0x002C($sp) /* 005C0 8096DA70 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s index e00047df2f..fdce3ac9a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s @@ -11,7 +11,7 @@ glabel func_8096DA80 /* 005F4 8096DAA4 24C6068C */ addiu $a2, $a2, %lo(D_8097068C) ## $a2 = 8097068C /* 005F8 8096DAA8 24070261 */ addiu $a3, $zero, 0x0261 ## $a3 = 00000261 /* 005FC 8096DAAC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 -/* 00600 8096DAB0 0C031AB1 */ jal func_800C6AC4 +/* 00600 8096DAB0 0C031AB1 */ jal Graph_OpenDisp /* 00604 8096DAB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00608 8096DAB8 0C024F46 */ jal func_80093D18 /* 0060C 8096DABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -159,7 +159,7 @@ glabel func_8096DA80 /* 00834 8096DCE4 24C6069C */ addiu $a2, $a2, %lo(D_8097069C) ## $a2 = 8097069C /* 00838 8096DCE8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 0083C 8096DCEC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00840 8096DCF0 0C031AD5 */ jal func_800C6B54 +/* 00840 8096DCF0 0C031AD5 */ jal Graph_CloseDisp /* 00844 8096DCF4 24070286 */ addiu $a3, $zero, 0x0286 ## $a3 = 00000286 /* 00848 8096DCF8 8FBF002C */ lw $ra, 0x002C($sp) /* 0084C 8096DCFC 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s index 6e77a7a8eb..2c181eb88e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s @@ -10,7 +10,7 @@ glabel func_8096DD0C /* 0087C 8096DD2C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00880 8096DD30 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 00884 8096DD34 24070296 */ addiu $a3, $zero, 0x0296 ## $a3 = 00000296 -/* 00888 8096DD38 0C031AB1 */ jal func_800C6AC4 +/* 00888 8096DD38 0C031AB1 */ jal Graph_OpenDisp /* 0088C 8096DD3C AFA50038 */ sw $a1, 0x0038($sp) /* 00890 8096DD40 8FA50038 */ lw $a1, 0x0038($sp) /* 00894 8096DD44 8FA6004C */ lw $a2, 0x004C($sp) @@ -37,7 +37,7 @@ glabel func_8096DD0C /* 008E8 8096DD98 24C606BC */ addiu $a2, $a2, %lo(D_809706BC) ## $a2 = 809706BC /* 008EC 8096DD9C 01816821 */ addu $t5, $t4, $at /* 008F0 8096DDA0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 008F4 8096DDA4 0C031AD5 */ jal func_800C6B54 +/* 008F4 8096DDA4 0C031AD5 */ jal Graph_CloseDisp /* 008F8 8096DDA8 AC2D6FC0 */ sw $t5, 0x6FC0($at) ## 80166FC0 /* 008FC 8096DDAC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00900 8096DDB0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s index 7769564500..04b9822dbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s @@ -12,7 +12,7 @@ glabel func_809746F8 /* 037D0 80974720 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 037D4 80974724 240709EF */ addiu $a3, $zero, 0x09EF ## $a3 = 000009EF /* 037D8 80974728 AFA8008C */ sw $t0, 0x008C($sp) -/* 037DC 8097472C 0C031AB1 */ jal func_800C6AC4 +/* 037DC 8097472C 0C031AB1 */ jal Graph_OpenDisp /* 037E0 80974730 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 037E4 80974734 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 037E8 80974738 8FA5009C */ lw $a1, 0x009C($sp) @@ -289,7 +289,7 @@ glabel func_809746F8 /* 03C08 80974B58 24C66988 */ addiu $a2, $a2, %lo(D_80976988) ## $a2 = 80976988 /* 03C0C 80974B5C 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 03C10 80974B60 24070A3C */ addiu $a3, $zero, 0x0A3C ## $a3 = 00000A3C -/* 03C14 80974B64 0C031AD5 */ jal func_800C6B54 +/* 03C14 80974B64 0C031AD5 */ jal Graph_CloseDisp /* 03C18 80974B68 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 /* 03C1C 80974B6C 8FBF003C */ lw $ra, 0x003C($sp) /* 03C20 80974B70 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s index 8d423b54b9..a94e5561b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s @@ -16,7 +16,7 @@ glabel func_80974B80 /* 03C68 80974BB8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 03C6C 80974BBC 24070A4A */ addiu $a3, $zero, 0x0A4A ## $a3 = 00000A4A /* 03C70 80974BC0 AFA80088 */ sw $t0, 0x0088($sp) -/* 03C74 80974BC4 0C031AB1 */ jal func_800C6AC4 +/* 03C74 80974BC4 0C031AB1 */ jal Graph_OpenDisp /* 03C78 80974BC8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 03C7C 80974BCC 8FA80088 */ lw $t0, 0x0088($sp) /* 03C80 80974BD0 5100000D */ beql $t0, $zero, .L80974C08 @@ -199,7 +199,7 @@ glabel func_80974B80 /* 03F3C 80974E8C 24C669EC */ addiu $a2, $a2, %lo(D_809769EC) ## $a2 = 809769EC /* 03F40 80974E90 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 03F44 80974E94 24070A80 */ addiu $a3, $zero, 0x0A80 ## $a3 = 00000A80 -/* 03F48 80974E98 0C031AD5 */ jal func_800C6B54 +/* 03F48 80974E98 0C031AD5 */ jal Graph_CloseDisp /* 03F4C 80974E9C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 03F50 80974EA0 8FBF003C */ lw $ra, 0x003C($sp) /* 03F54 80974EA4 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s index f6d40648d9..1c75e99dfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s @@ -15,7 +15,7 @@ glabel func_80974EB4 /* 03F98 80974EE8 24C66A00 */ addiu $a2, $a2, %lo(D_80976A00) ## $a2 = 80976A00 /* 03F9C 80974EEC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 03FA0 80974EF0 24070A8D */ addiu $a3, $zero, 0x0A8D ## $a3 = 00000A8D -/* 03FA4 80974EF4 0C031AB1 */ jal func_800C6AC4 +/* 03FA4 80974EF4 0C031AB1 */ jal Graph_OpenDisp /* 03FA8 80974EF8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 03FAC 80974EFC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 03FB0 80974F00 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -104,7 +104,7 @@ glabel func_80974EB4 /* 040FC 8097504C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 04100 80975050 24C66A28 */ addiu $a2, $a2, %lo(D_80976A28) ## $a2 = 80976A28 /* 04104 80975054 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 -/* 04108 80975058 0C031AD5 */ jal func_800C6B54 +/* 04108 80975058 0C031AD5 */ jal Graph_CloseDisp /* 0410C 8097505C 24070AA3 */ addiu $a3, $zero, 0x0AA3 ## $a3 = 00000AA3 /* 04110 80975060 8FBF003C */ lw $ra, 0x003C($sp) /* 04114 80975064 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s index a670f61be1..07e9c601cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s @@ -14,7 +14,7 @@ glabel func_80975074 /* 04154 809750A4 24C66A3C */ addiu $a2, $a2, %lo(D_80976A3C) ## $a2 = 80976A3C /* 04158 809750A8 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 /* 0415C 809750AC 24070AB1 */ addiu $a3, $zero, 0x0AB1 ## $a3 = 00000AB1 -/* 04160 809750B0 0C031AB1 */ jal func_800C6AC4 +/* 04160 809750B0 0C031AB1 */ jal Graph_OpenDisp /* 04164 809750B4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 04168 809750B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0416C 809750BC 8FA5008C */ lw $a1, 0x008C($sp) @@ -261,7 +261,7 @@ glabel func_80975074 /* 0451C 8097546C 24C66A78 */ addiu $a2, $a2, %lo(D_80976A78) ## $a2 = 80976A78 /* 04520 80975470 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 /* 04524 80975474 24070B0D */ addiu $a3, $zero, 0x0B0D ## $a3 = 00000B0D -/* 04528 80975478 0C031AD5 */ jal func_800C6B54 +/* 04528 80975478 0C031AD5 */ jal Graph_CloseDisp /* 0452C 8097547C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 04530 80975480 8FBF003C */ lw $ra, 0x003C($sp) /* 04534 80975484 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s index eb3c83c767..a74b4d262a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s @@ -10,7 +10,7 @@ glabel func_80975494 /* 04564 809754B4 24C66A8C */ addiu $a2, $a2, %lo(D_80976A8C) ## $a2 = 80976A8C /* 04568 809754B8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 0456C 809754BC 24070B1A */ addiu $a3, $zero, 0x0B1A ## $a3 = 00000B1A -/* 04570 809754C0 0C031AB1 */ jal func_800C6AC4 +/* 04570 809754C0 0C031AB1 */ jal Graph_OpenDisp /* 04574 809754C4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 04578 809754C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0457C 809754CC 8FA5006C */ lw $a1, 0x006C($sp) @@ -157,7 +157,7 @@ glabel func_80975494 /* 047A4 809756F4 24C66AC8 */ addiu $a2, $a2, %lo(D_80976AC8) ## $a2 = 80976AC8 /* 047A8 809756F8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 047AC 809756FC 24070B41 */ addiu $a3, $zero, 0x0B41 ## $a3 = 00000B41 -/* 047B0 80975700 0C031AD5 */ jal func_800C6B54 +/* 047B0 80975700 0C031AD5 */ jal Graph_CloseDisp /* 047B4 80975704 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 047B8 80975708 8FBF001C */ lw $ra, 0x001C($sp) /* 047BC 8097570C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s index 4d349786a3..acb0753975 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s @@ -10,7 +10,7 @@ glabel func_8097571C /* 047EC 8097573C 24C66ADC */ addiu $a2, $a2, %lo(D_80976ADC) ## $a2 = 80976ADC /* 047F0 80975740 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 047F4 80975744 24070B4C */ addiu $a3, $zero, 0x0B4C ## $a3 = 00000B4C -/* 047F8 80975748 0C031AB1 */ jal func_800C6AC4 +/* 047F8 80975748 0C031AB1 */ jal Graph_OpenDisp /* 047FC 8097574C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04800 80975750 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 04804 80975754 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -80,7 +80,7 @@ glabel func_8097571C /* 04904 80975854 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 04908 80975858 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 0490C 8097585C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 04910 80975860 0C031AD5 */ jal func_800C6B54 +/* 04910 80975860 0C031AD5 */ jal Graph_CloseDisp /* 04914 80975864 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 04918 80975868 8FBF001C */ lw $ra, 0x001C($sp) /* 0491C 8097586C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s index 4f682d5dc5..d58bf4ea09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s @@ -14,7 +14,7 @@ glabel func_8097587C /* 0495C 809758AC 24C66B18 */ addiu $a2, $a2, %lo(D_80976B18) ## $a2 = 80976B18 /* 04960 809758B0 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 04964 809758B4 24070B69 */ addiu $a3, $zero, 0x0B69 ## $a3 = 00000B69 -/* 04968 809758B8 0C031AB1 */ jal func_800C6AC4 +/* 04968 809758B8 0C031AB1 */ jal Graph_OpenDisp /* 0496C 809758BC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04970 809758C0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 04974 809758C4 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -104,7 +104,7 @@ glabel func_8097587C /* 04AC4 80975A14 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 04AC8 80975A18 24C66B40 */ addiu $a2, $a2, %lo(D_80976B40) ## $a2 = 80976B40 /* 04ACC 80975A1C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 04AD0 80975A20 0C031AD5 */ jal func_800C6B54 +/* 04AD0 80975A20 0C031AD5 */ jal Graph_CloseDisp /* 04AD4 80975A24 24070B7E */ addiu $a3, $zero, 0x0B7E ## $a3 = 00000B7E /* 04AD8 80975A28 8FBF003C */ lw $ra, 0x003C($sp) /* 04ADC 80975A2C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s index 91f44678ef..4d06009cc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s @@ -12,7 +12,7 @@ glabel func_80975A3C /* 04B14 80975A64 24C66B54 */ addiu $a2, $a2, %lo(D_80976B54) ## $a2 = 80976B54 /* 04B18 80975A68 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 04B1C 80975A6C 24070B8C */ addiu $a3, $zero, 0x0B8C ## $a3 = 00000B8C -/* 04B20 80975A70 0C031AB1 */ jal func_800C6AC4 +/* 04B20 80975A70 0C031AB1 */ jal Graph_OpenDisp /* 04B24 80975A74 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04B28 80975A78 0C024F61 */ jal func_80093D84 /* 04B2C 80975A7C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -94,7 +94,7 @@ glabel func_80975A3C /* 04C5C 80975BAC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 04C60 80975BB0 24C66B7C */ addiu $a2, $a2, %lo(D_80976B7C) ## $a2 = 80976B7C /* 04C64 80975BB4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 04C68 80975BB8 0C031AD5 */ jal func_800C6B54 +/* 04C68 80975BB8 0C031AD5 */ jal Graph_CloseDisp /* 04C6C 80975BBC 24070BA2 */ addiu $a3, $zero, 0x0BA2 ## $a3 = 00000BA2 /* 04C70 80975BC0 8FBF003C */ lw $ra, 0x003C($sp) /* 04C74 80975BC4 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s index 0fa3750a8f..ad109ca26e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s @@ -28,7 +28,7 @@ glabel func_80975BD4 /* 04CEC 80975C3C AFA300AC */ sw $v1, 0x00AC($sp) /* 04CF0 80975C40 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFDC /* 04CF4 80975C44 24070BB2 */ addiu $a3, $zero, 0x0BB2 ## $a3 = 00000BB2 -/* 04CF8 80975C48 0C031AB1 */ jal func_800C6AC4 +/* 04CF8 80975C48 0C031AB1 */ jal Graph_OpenDisp /* 04CFC 80975C4C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04D00 80975C50 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 04D04 80975C54 8DCEE660 */ lw $t6, -0x19A0($t6) ## 8015E660 @@ -379,7 +379,7 @@ glabel func_80975BD4 /* 0524C 8097619C 24C66BF4 */ addiu $a2, $a2, %lo(D_80976BF4) ## $a2 = 80976BF4 /* 05250 809761A0 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFDC /* 05254 809761A4 24070C28 */ addiu $a3, $zero, 0x0C28 ## $a3 = 00000C28 -/* 05258 809761A8 0C031AD5 */ jal func_800C6B54 +/* 05258 809761A8 0C031AD5 */ jal Graph_CloseDisp /* 0525C 809761AC 8DE50000 */ lw $a1, 0x0000($t7) ## FFFFA0FF /* 05260 809761B0 8FBF003C */ lw $ra, 0x003C($sp) /* 05264 809761B4 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s index cff7280999..d44c232cec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s @@ -15,7 +15,7 @@ glabel func_80976254 /* 05338 80976288 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 0533C 8097628C 24070C52 */ addiu $a3, $zero, 0x0C52 ## $a3 = 00000C52 /* 05340 80976290 AFA9006C */ sw $t1, 0x006C($sp) -/* 05344 80976294 0C031AB1 */ jal func_800C6AC4 +/* 05344 80976294 0C031AB1 */ jal Graph_OpenDisp /* 05348 80976298 AFA50068 */ sw $a1, 0x0068($sp) /* 0534C 8097629C 0C024F61 */ jal func_80093D84 /* 05350 809762A0 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 @@ -90,7 +90,7 @@ glabel func_80976254 /* 05464 809763B4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 05468 809763B8 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 0546C 809763BC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 05470 809763C0 0C031AD5 */ jal func_800C6B54 +/* 05470 809763C0 0C031AD5 */ jal Graph_CloseDisp /* 05474 809763C4 24070C64 */ addiu $a3, $zero, 0x0C64 ## $a3 = 00000C64 /* 05478 809763C8 8FAD0080 */ lw $t5, 0x0080($sp) /* 0547C 809763CC 8FB8007C */ lw $t8, 0x007C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s index ba124ff3b1..71945e6082 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s @@ -29,7 +29,7 @@ glabel func_80976404 /* 0551C 8097646C 24C66C30 */ addiu $a2, $a2, %lo(D_80976C30) ## $a2 = 80976C30 /* 05520 80976470 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 /* 05524 80976474 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05528 80976478 0C031AB1 */ jal func_800C6AC4 +/* 05528 80976478 0C031AB1 */ jal Graph_OpenDisp /* 0552C 8097647C 24070C81 */ addiu $a3, $zero, 0x0C81 ## $a3 = 00000C81 /* 05530 80976480 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 05534 80976484 0C024DDD */ jal Gfx_CallSetupDL @@ -55,7 +55,7 @@ glabel func_80976404 /* 05584 809764D4 24C66C44 */ addiu $a2, $a2, %lo(D_80976C44) ## $a2 = 80976C44 /* 05588 809764D8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 /* 0558C 809764DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05590 809764E0 0C031AD5 */ jal func_800C6B54 +/* 05590 809764E0 0C031AD5 */ jal Graph_CloseDisp /* 05594 809764E4 24070C90 */ addiu $a3, $zero, 0x0C90 ## $a3 = 00000C90 .L809764E8: /* 05598 809764E8 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s index 7d16e58de7..87887e3635 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s @@ -13,7 +13,7 @@ glabel func_80977950 /* 005E8 80977978 24C67D20 */ addiu $a2, $a2, %lo(D_80977D20) ## $a2 = 80977D20 /* 005EC 8097797C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 /* 005F0 80977980 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005F4 80977984 0C031AB1 */ jal func_800C6AC4 +/* 005F4 80977984 0C031AB1 */ jal Graph_OpenDisp /* 005F8 80977988 240701CC */ addiu $a3, $zero, 0x01CC ## $a3 = 000001CC /* 005FC 8097798C 0C034213 */ jal Matrix_Push /* 00600 80977990 00000000 */ nop @@ -169,7 +169,7 @@ glabel func_80977950 /* 00858 80977BE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0085C 80977BEC 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 00860 80977BF0 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 00864 80977BF4 0C031AD5 */ jal func_800C6B54 +/* 00864 80977BF4 0C031AD5 */ jal Graph_CloseDisp /* 00868 80977BF8 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 /* 0086C 80977BFC 8FBF003C */ lw $ra, 0x003C($sp) /* 00870 80977C00 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s index b94396e279..433ac02395 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s @@ -14,7 +14,7 @@ glabel func_80979030 /* 00730 80979060 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00734 80979064 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 00738 80979068 2407048B */ addiu $a3, $zero, 0x048B ## $a3 = 0000048B -/* 0073C 8097906C 0C031AB1 */ jal func_800C6AC4 +/* 0073C 8097906C 0C031AB1 */ jal Graph_OpenDisp /* 00740 80979070 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00744 80979074 0C024F46 */ jal func_80093D18 /* 00748 80979078 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -51,7 +51,7 @@ glabel func_80979030 /* 007C4 809790F4 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 007C8 809790F8 24070491 */ addiu $a3, $zero, 0x0491 ## $a3 = 00000491 /* 007CC 809790FC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 007D0 80979100 0C031AD5 */ jal func_800C6B54 +/* 007D0 80979100 0C031AD5 */ jal Graph_CloseDisp /* 007D4 80979104 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 .L80979108: /* 007D8 80979108 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s index 932a94bc18..e045f71316 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s @@ -20,7 +20,7 @@ glabel func_8097911C /* 00830 80979160 24C6C020 */ addiu $a2, $a2, %lo(D_8097C020) ## $a2 = 8097C020 /* 00834 80979164 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFD4 /* 00838 80979168 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0083C 8097916C 0C031AB1 */ jal func_800C6AC4 +/* 0083C 8097916C 0C031AB1 */ jal Graph_OpenDisp /* 00840 80979170 240704A3 */ addiu $a3, $zero, 0x04A3 ## $a3 = 000004A3 /* 00844 80979174 0C034213 */ jal Matrix_Push /* 00848 80979178 00000000 */ nop @@ -65,7 +65,7 @@ glabel func_8097911C /* 008E4 80979214 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 008E8 80979218 240704B1 */ addiu $a3, $zero, 0x04B1 ## $a3 = 000004B1 /* 008EC 8097921C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 008F0 80979220 0C031AD5 */ jal func_800C6B54 +/* 008F0 80979220 0C031AD5 */ jal Graph_CloseDisp /* 008F4 80979224 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 008F8 80979228 8FBF001C */ lw $ra, 0x001C($sp) /* 008FC 8097922C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s index cefa66856c..acd797c0a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s @@ -44,7 +44,7 @@ glabel func_8097F508 /* 01F38 8097F5A8 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFA0 /* 01F3C 8097F5AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01F40 8097F5B0 240701CA */ addiu $a3, $zero, 0x01CA ## $a3 = 000001CA -/* 01F44 8097F5B4 0C031AB1 */ jal func_800C6AC4 +/* 01F44 8097F5B4 0C031AB1 */ jal Graph_OpenDisp /* 01F48 8097F5B8 E7A40098 */ swc1 $f4, 0x0098($sp) /* 01F4C 8097F5BC 0C01DE0D */ jal Math_Coss ## coss? @@ -254,7 +254,7 @@ glabel func_8097F508 /* 0226C 8097F8DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02270 8097F8E0 2407022D */ addiu $a3, $zero, 0x022D ## $a3 = 0000022D /* 02274 8097F8E4 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 02278 8097F8E8 0C031AD5 */ jal func_800C6B54 +/* 02278 8097F8E8 0C031AD5 */ jal Graph_CloseDisp /* 0227C 8097F8EC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 02280 8097F8F0 8FBF004C */ lw $ra, 0x004C($sp) /* 02284 8097F8F4 8FB00048 */ lw $s0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s index a8c43f28e4..238673cffa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s @@ -9,7 +9,7 @@ glabel func_8097FF9C /* 02948 8097FFB8 24C627C8 */ addiu $a2, $a2, %lo(D_809827C8) ## $a2 = 809827C8 /* 0294C 8097FFBC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 02950 8097FFC0 240701D6 */ addiu $a3, $zero, 0x01D6 ## $a3 = 000001D6 -/* 02954 8097FFC4 0C031AB1 */ jal func_800C6AC4 +/* 02954 8097FFC4 0C031AB1 */ jal Graph_OpenDisp /* 02958 8097FFC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0295C 8097FFCC 0C024F46 */ jal func_80093D18 /* 02960 8097FFD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -85,7 +85,7 @@ glabel func_8097FF9C /* 02A78 809800E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02A7C 809800EC 240701E9 */ addiu $a3, $zero, 0x01E9 ## $a3 = 000001E9 /* 02A80 809800F0 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 02A84 809800F4 0C031AD5 */ jal func_800C6B54 +/* 02A84 809800F4 0C031AD5 */ jal Graph_CloseDisp /* 02A88 809800F8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 02A8C 809800FC 8FBF004C */ lw $ra, 0x004C($sp) /* 02A90 80980100 8FB00048 */ lw $s0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s index f68aa822a6..5a99b1969b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s @@ -9,7 +9,7 @@ glabel func_80980E24 /* 037D0 80980E40 24C62810 */ addiu $a2, $a2, %lo(D_80982810) ## $a2 = 80982810 /* 037D4 80980E44 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 037D8 80980E48 24070402 */ addiu $a3, $zero, 0x0402 ## $a3 = 00000402 -/* 037DC 80980E4C 0C031AB1 */ jal func_800C6AC4 +/* 037DC 80980E4C 0C031AB1 */ jal Graph_OpenDisp /* 037E0 80980E50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 037E4 80980E54 0C024F46 */ jal func_80093D18 /* 037E8 80980E58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -47,7 +47,7 @@ glabel func_80980E24 /* 03868 80980ED8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0386C 80980EDC 24070408 */ addiu $a3, $zero, 0x0408 ## $a3 = 00000408 /* 03870 80980EE0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 03874 80980EE4 0C031AD5 */ jal func_800C6B54 +/* 03874 80980EE4 0C031AD5 */ jal Graph_CloseDisp /* 03878 80980EE8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 0387C 80980EEC 8FBF001C */ lw $ra, 0x001C($sp) /* 03880 80980EF0 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s index 18e1702b1e..d10932bd0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s @@ -46,7 +46,7 @@ glabel func_809811AC /* 03BE4 80981254 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFA8 /* 03BE8 80981258 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03BEC 8098125C 240700D9 */ addiu $a3, $zero, 0x00D9 ## $a3 = 000000D9 -/* 03BF0 80981260 0C031AB1 */ jal func_800C6AC4 +/* 03BF0 80981260 0C031AB1 */ jal Graph_OpenDisp /* 03BF4 80981264 E7A40044 */ swc1 $f4, 0x0044($sp) /* 03BF8 80981268 0C01DE0D */ jal Math_Coss ## coss? @@ -136,7 +136,7 @@ glabel func_809811AC /* 03D34 809813A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03D38 809813A8 240700F6 */ addiu $a3, $zero, 0x00F6 ## $a3 = 000000F6 /* 03D3C 809813AC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03D40 809813B0 0C031AD5 */ jal func_800C6B54 +/* 03D40 809813B0 0C031AD5 */ jal Graph_CloseDisp /* 03D44 809813B4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 03D48 809813B8 8FBF001C */ lw $ra, 0x001C($sp) .L809813BC: diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s index 65f9fdf63d..4abb9b7b4d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s @@ -42,7 +42,7 @@ glabel func_80981694 /* 040BC 8098172C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFB0 /* 040C0 80981730 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 040C4 80981734 240700D4 */ addiu $a3, $zero, 0x00D4 ## $a3 = 000000D4 -/* 040C8 80981738 0C031AB1 */ jal func_800C6AC4 +/* 040C8 80981738 0C031AB1 */ jal Graph_OpenDisp /* 040CC 8098173C E7A40044 */ swc1 $f4, 0x0044($sp) /* 040D0 80981740 0C01DE0D */ jal Math_Coss ## coss? @@ -132,7 +132,7 @@ glabel func_80981694 /* 0420C 8098187C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04210 80981880 240700F1 */ addiu $a3, $zero, 0x00F1 ## $a3 = 000000F1 /* 04214 80981884 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 04218 80981888 0C031AD5 */ jal func_800C6B54 +/* 04218 80981888 0C031AD5 */ jal Graph_CloseDisp /* 0421C 8098188C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 04220 80981890 8FBF001C */ lw $ra, 0x001C($sp) /* 04224 80981894 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s index 05f1649ffb..aeb06984b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s @@ -41,7 +41,7 @@ glabel func_80981AA0 /* 044C4 80981B34 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 044C8 80981B38 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 044CC 80981B3C 24070114 */ addiu $a3, $zero, 0x0114 ## $a3 = 00000114 -/* 044D0 80981B40 0C031AB1 */ jal func_800C6AC4 +/* 044D0 80981B40 0C031AB1 */ jal Graph_OpenDisp /* 044D4 80981B44 E7A40048 */ swc1 $f4, 0x0048($sp) /* 044D8 80981B48 0C01DE0D */ jal Math_Coss ## coss? @@ -124,7 +124,7 @@ glabel func_80981AA0 /* 045FC 80981C6C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04600 80981C70 24070133 */ addiu $a3, $zero, 0x0133 ## $a3 = 00000133 /* 04604 80981C74 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 04608 80981C78 0C031AD5 */ jal func_800C6B54 +/* 04608 80981C78 0C031AD5 */ jal Graph_CloseDisp /* 0460C 80981C7C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 04610 80981C80 8FBF001C */ lw $ra, 0x001C($sp) /* 04614 80981C84 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s index 1338b6db53..aa198722df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s @@ -40,7 +40,7 @@ glabel func_80981E84 /* 048A4 80981F14 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFB4 /* 048A8 80981F18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 048AC 80981F1C 24070088 */ addiu $a3, $zero, 0x0088 ## $a3 = 00000088 -/* 048B0 80981F20 0C031AB1 */ jal func_800C6AC4 +/* 048B0 80981F20 0C031AB1 */ jal Graph_OpenDisp /* 048B4 80981F24 E7A40040 */ swc1 $f4, 0x0040($sp) /* 048B8 80981F28 0C01DE0D */ jal Math_Coss ## coss? @@ -115,7 +115,7 @@ glabel func_80981E84 /* 049BC 8098202C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 049C0 80982030 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 /* 049C4 80982034 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 049C8 80982038 0C031AD5 */ jal func_800C6B54 +/* 049C8 80982038 0C031AD5 */ jal Graph_CloseDisp /* 049CC 8098203C AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 /* 049D0 80982040 8FBF001C */ lw $ra, 0x001C($sp) /* 049D4 80982044 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s index 7c8d244906..02480d7163 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s @@ -41,7 +41,7 @@ glabel func_80982244 /* 04C68 809822D8 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFB4 /* 04C6C 809822DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04C70 809822E0 24070089 */ addiu $a3, $zero, 0x0089 ## $a3 = 00000089 -/* 04C74 809822E4 0C031AB1 */ jal func_800C6AC4 +/* 04C74 809822E4 0C031AB1 */ jal Graph_OpenDisp /* 04C78 809822E8 E7A40040 */ swc1 $f4, 0x0040($sp) /* 04C7C 809822EC 0C01DE0D */ jal Math_Coss ## coss? @@ -116,7 +116,7 @@ glabel func_80982244 /* 04D80 809823F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04D84 809823F4 240700A3 */ addiu $a3, $zero, 0x00A3 ## $a3 = 000000A3 /* 04D88 809823F8 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 04D8C 809823FC 0C031AD5 */ jal func_800C6B54 +/* 04D8C 809823FC 0C031AD5 */ jal Graph_CloseDisp /* 04D90 80982400 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 /* 04D94 80982404 8FBF001C */ lw $ra, 0x001C($sp) /* 04D98 80982408 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s index e92a5aa303..38193e6bad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s @@ -11,7 +11,7 @@ glabel func_80983B58 /* 0087C 80983B7C 24C647E4 */ addiu $a2, $a2, %lo(D_809847E4) ## $a2 = 809847E4 /* 00880 80983B80 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00884 80983B84 24070181 */ addiu $a3, $zero, 0x0181 ## $a3 = 00000181 -/* 00888 80983B88 0C031AB1 */ jal func_800C6AC4 +/* 00888 80983B88 0C031AB1 */ jal Graph_OpenDisp /* 0088C 80983B8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00890 80983B90 8FAF005C */ lw $t7, 0x005C($sp) /* 00894 80983B94 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -76,7 +76,7 @@ glabel func_80983B58 /* 00974 80983C74 24C6482C */ addiu $a2, $a2, %lo(D_8098482C) ## $a2 = 8098482C /* 00978 80983C78 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0097C 80983C7C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00980 80983C80 0C031AD5 */ jal func_800C6B54 +/* 00980 80983C80 0C031AD5 */ jal Graph_CloseDisp /* 00984 80983C84 24070194 */ addiu $a3, $zero, 0x0194 ## $a3 = 00000194 /* 00988 80983C88 8FBF001C */ lw $ra, 0x001C($sp) /* 0098C 80983C8C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s index e109e332f6..5ad0031535 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s @@ -9,7 +9,7 @@ glabel func_80983C9C /* 009B8 80983CB8 24C64844 */ addiu $a2, $a2, %lo(D_80984844) ## $a2 = 80984844 /* 009BC 80983CBC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 009C0 80983CC0 240701A6 */ addiu $a3, $zero, 0x01A6 ## $a3 = 000001A6 -/* 009C4 80983CC4 0C031AB1 */ jal func_800C6AC4 +/* 009C4 80983CC4 0C031AB1 */ jal Graph_OpenDisp /* 009C8 80983CC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 009CC 80983CCC 8FA40068 */ lw $a0, 0x0068($sp) /* 009D0 80983CD0 8FA5006C */ lw $a1, 0x006C($sp) @@ -92,7 +92,7 @@ glabel func_80983C9C /* 00B00 80983E00 24C6485C */ addiu $a2, $a2, %lo(D_8098485C) ## $a2 = 8098485C /* 00B04 80983E04 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00B08 80983E08 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B0C 80983E0C 0C031AD5 */ jal func_800C6B54 +/* 00B0C 80983E0C 0C031AD5 */ jal Graph_CloseDisp /* 00B10 80983E10 240701BC */ addiu $a3, $zero, 0x01BC ## $a3 = 000001BC /* 00B14 80983E14 8FBF002C */ lw $ra, 0x002C($sp) /* 00B18 80983E18 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s index 81128aefa8..6d19671ac7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s @@ -14,7 +14,7 @@ glabel func_809841F4 /* 00F24 80984224 24C648AC */ addiu $a2, $a2, %lo(D_809848AC) ## $a2 = 809848AC /* 00F28 80984228 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 00F2C 8098422C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00F30 80984230 0C031AB1 */ jal func_800C6AC4 +/* 00F30 80984230 0C031AB1 */ jal Graph_OpenDisp /* 00F34 80984234 2407010C */ addiu $a3, $zero, 0x010C ## $a3 = 0000010C /* 00F38 80984238 8FAE006C */ lw $t6, 0x006C($sp) /* 00F3C 8098423C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -135,7 +135,7 @@ glabel func_809841F4 /* 010F4 809843F4 24C64924 */ addiu $a2, $a2, %lo(D_80984924) ## $a2 = 80984924 /* 010F8 809843F8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 010FC 809843FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01100 80984400 0C031AD5 */ jal func_800C6B54 +/* 01100 80984400 0C031AD5 */ jal Graph_CloseDisp /* 01104 80984404 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C /* 01108 80984408 8FBF001C */ lw $ra, 0x001C($sp) /* 0110C 8098440C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s index a736f7adf3..a4af6e2ef6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s @@ -9,7 +9,7 @@ glabel func_8098441C /* 01138 80984438 24C6493C */ addiu $a2, $a2, %lo(D_8098493C) ## $a2 = 8098493C /* 0113C 8098443C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 01140 80984440 2407013E */ addiu $a3, $zero, 0x013E ## $a3 = 0000013E -/* 01144 80984444 0C031AB1 */ jal func_800C6AC4 +/* 01144 80984444 0C031AB1 */ jal Graph_OpenDisp /* 01148 80984448 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0114C 8098444C 8FA40068 */ lw $a0, 0x0068($sp) /* 01150 80984450 8FA5006C */ lw $a1, 0x006C($sp) @@ -94,7 +94,7 @@ glabel func_8098441C /* 0128C 8098458C 24C64954 */ addiu $a2, $a2, %lo(D_80984954) ## $a2 = 80984954 /* 01290 80984590 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 01294 80984594 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01298 80984598 0C031AD5 */ jal func_800C6B54 +/* 01298 80984598 0C031AD5 */ jal Graph_CloseDisp /* 0129C 8098459C 24070155 */ addiu $a3, $zero, 0x0155 ## $a3 = 00000155 /* 012A0 809845A0 8FBF002C */ lw $ra, 0x002C($sp) /* 012A4 809845A4 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s index 1d28409eb2..eb07fca595 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s @@ -15,7 +15,7 @@ glabel func_80985CE8 /* 0113C 80985D1C AFB80068 */ sw $t8, 0x0068($sp) /* 01140 80985D20 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01144 80985D24 24070119 */ addiu $a3, $zero, 0x0119 ## $a3 = 00000119 -/* 01148 80985D28 0C031AB1 */ jal func_800C6AC4 +/* 01148 80985D28 0C031AB1 */ jal Graph_OpenDisp /* 0114C 80985D2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01150 80985D30 8FA9007C */ lw $t1, 0x007C($sp) /* 01154 80985D34 0C024F61 */ jal func_80093D84 @@ -86,7 +86,7 @@ glabel func_80985CE8 /* 01258 80985E38 24C68834 */ addiu $a2, $a2, %lo(D_80988834) ## $a2 = 80988834 /* 0125C 80985E3C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 01260 80985E40 24070134 */ addiu $a3, $zero, 0x0134 ## $a3 = 00000134 -/* 01264 80985E44 0C031AD5 */ jal func_800C6B54 +/* 01264 80985E44 0C031AD5 */ jal Graph_CloseDisp /* 01268 80985E48 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 0126C 80985E4C 8FBF002C */ lw $ra, 0x002C($sp) /* 01270 80985E50 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s index c815c5b443..8c65be0a47 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s @@ -14,7 +14,7 @@ glabel func_80987658 /* 02AA8 80987688 AFB80060 */ sw $t8, 0x0060($sp) /* 02AAC 8098768C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02AB0 80987690 24070388 */ addiu $a3, $zero, 0x0388 ## $a3 = 00000388 -/* 02AB4 80987694 0C031AB1 */ jal func_800C6AC4 +/* 02AB4 80987694 0C031AB1 */ jal Graph_OpenDisp /* 02AB8 80987698 AFA50058 */ sw $a1, 0x0058($sp) /* 02ABC 8098769C 8FA90074 */ lw $t1, 0x0074($sp) /* 02AC0 809876A0 0C024F46 */ jal func_80093D18 @@ -86,7 +86,7 @@ glabel func_80987658 /* 02BC8 809877A8 24C68990 */ addiu $a2, $a2, %lo(D_80988990) ## $a2 = 80988990 /* 02BCC 809877AC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 02BD0 809877B0 2407039D */ addiu $a3, $zero, 0x039D ## $a3 = 0000039D -/* 02BD4 809877B4 0C031AD5 */ jal func_800C6B54 +/* 02BD4 809877B4 0C031AD5 */ jal Graph_CloseDisp /* 02BD8 809877B8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02BDC 809877BC 8FBF0024 */ lw $ra, 0x0024($sp) /* 02BE0 809877C0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s index 91d50a131d..1f0c1e4232 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s @@ -23,7 +23,7 @@ glabel func_80989D24 /* 00EF8 80989D78 24C6C898 */ addiu $a2, $a2, %lo(D_8098C898) ## $a2 = 8098C898 /* 00EFC 80989D7C 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC0 /* 00F00 80989D80 240704A2 */ addiu $a3, $zero, 0x04A2 ## $a3 = 000004A2 -/* 00F04 80989D84 0C031AB1 */ jal func_800C6AC4 +/* 00F04 80989D84 0C031AB1 */ jal Graph_OpenDisp /* 00F08 80989D88 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 00F0C 80989D8C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 00F10 80989D90 4481F000 */ mtc1 $at, $f30 ## $f30 = 300.00 @@ -407,7 +407,7 @@ glabel func_80989D24 /* 01490 8098A310 24C6C8C0 */ addiu $a2, $a2, %lo(D_8098C8C0) ## $a2 = 8098C8C0 /* 01494 8098A314 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC0 /* 01498 8098A318 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 0149C 8098A31C 0C031AD5 */ jal func_800C6B54 +/* 0149C 8098A31C 0C031AD5 */ jal Graph_CloseDisp /* 014A0 8098A320 2407054E */ addiu $a3, $zero, 0x054E ## $a3 = 0000054E /* 014A4 8098A324 8FBF006C */ lw $ra, 0x006C($sp) /* 014A8 8098A328 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s index 5fac8f8ee0..82a596eec9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s @@ -10,7 +10,7 @@ glabel func_8098A36C /* 0150C 8098A38C 24C6C8D4 */ addiu $a2, $a2, %lo(D_8098C8D4) ## $a2 = 8098C8D4 /* 01510 8098A390 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 01514 8098A394 24070560 */ addiu $a3, $zero, 0x0560 ## $a3 = 00000560 -/* 01518 8098A398 0C031AB1 */ jal func_800C6AC4 +/* 01518 8098A398 0C031AB1 */ jal Graph_OpenDisp /* 0151C 8098A39C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01520 8098A3A0 8FAF0054 */ lw $t7, 0x0054($sp) /* 01524 8098A3A4 0C024F46 */ jal func_80093D18 @@ -89,7 +89,7 @@ glabel func_8098A36C /* 01648 8098A4C8 24C6C8FC */ addiu $a2, $a2, %lo(D_8098C8FC) ## $a2 = 8098C8FC /* 0164C 8098A4CC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 01650 8098A4D0 24070581 */ addiu $a3, $zero, 0x0581 ## $a3 = 00000581 -/* 01654 8098A4D4 0C031AD5 */ jal func_800C6B54 +/* 01654 8098A4D4 0C031AD5 */ jal Graph_CloseDisp /* 01658 8098A4D8 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 0165C 8098A4DC 8FBF001C */ lw $ra, 0x001C($sp) /* 01660 8098A4E0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s index 42a79cfb70..06fb720700 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s @@ -23,7 +23,7 @@ glabel func_8098A4F0 /* 016C4 8098A544 24C6C910 */ addiu $a2, $a2, %lo(D_8098C910) ## $a2 = 8098C910 /* 016C8 8098A548 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFD4 /* 016CC 8098A54C 24070591 */ addiu $a3, $zero, 0x0591 ## $a3 = 00000591 -/* 016D0 8098A550 0C031AB1 */ jal func_800C6AC4 +/* 016D0 8098A550 0C031AB1 */ jal Graph_OpenDisp /* 016D4 8098A554 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 016D8 8098A558 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 /* 016DC 8098A55C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 @@ -200,7 +200,7 @@ glabel func_8098A4F0 /* 01978 8098A7F8 24C6C938 */ addiu $a2, $a2, %lo(D_8098C938) ## $a2 = 8098C938 /* 0197C 8098A7FC 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFD4 /* 01980 8098A800 8E650000 */ lw $a1, 0x0000($s3) ## 00000000 -/* 01984 8098A804 0C031AD5 */ jal func_800C6B54 +/* 01984 8098A804 0C031AD5 */ jal Graph_CloseDisp /* 01988 8098A808 240705C2 */ addiu $a3, $zero, 0x05C2 ## $a3 = 000005C2 /* 0198C 8098A80C 8FBF006C */ lw $ra, 0x006C($sp) /* 01990 8098A810 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s index e9510db0ff..ccd0a944f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s @@ -10,7 +10,7 @@ glabel func_8098A854 /* 019F4 8098A874 24C6C94C */ addiu $a2, $a2, %lo(D_8098C94C) ## $a2 = 8098C94C /* 019F8 8098A878 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 019FC 8098A87C 240705CF */ addiu $a3, $zero, 0x05CF ## $a3 = 000005CF -/* 01A00 8098A880 0C031AB1 */ jal func_800C6AC4 +/* 01A00 8098A880 0C031AB1 */ jal Graph_OpenDisp /* 01A04 8098A884 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01A08 8098A888 0C024F46 */ jal func_80093D18 /* 01A0C 8098A88C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -76,7 +76,7 @@ glabel func_8098A854 /* 01AFC 8098A97C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01B00 8098A980 24C6C988 */ addiu $a2, $a2, %lo(D_8098C988) ## $a2 = 8098C988 /* 01B04 8098A984 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01B08 8098A988 0C031AD5 */ jal func_800C6B54 +/* 01B08 8098A988 0C031AD5 */ jal Graph_CloseDisp /* 01B0C 8098A98C 240705DD */ addiu $a3, $zero, 0x05DD ## $a3 = 000005DD /* 01B10 8098A990 8FBF001C */ lw $ra, 0x001C($sp) /* 01B14 8098A994 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s index f74046e7b2..fff600d55c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s @@ -10,7 +10,7 @@ glabel func_8098A9A4 /* 01B44 8098A9C4 24C6C99C */ addiu $a2, $a2, %lo(D_8098C99C) ## $a2 = 8098C99C /* 01B48 8098A9C8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01B4C 8098A9CC 240705EA */ addiu $a3, $zero, 0x05EA ## $a3 = 000005EA -/* 01B50 8098A9D0 0C031AB1 */ jal func_800C6AC4 +/* 01B50 8098A9D0 0C031AB1 */ jal Graph_OpenDisp /* 01B54 8098A9D4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01B58 8098A9D8 922E1D6C */ lbu $t6, 0x1D6C($s1) ## 00001D6C /* 01B5C 8098A9DC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 @@ -67,7 +67,7 @@ glabel func_8098A9A4 /* 01C20 8098AAA0 24C6C9C4 */ addiu $a2, $a2, %lo(D_8098C9C4) ## $a2 = 8098C9C4 /* 01C24 8098AAA4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01C28 8098AAA8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01C2C 8098AAAC 0C031AD5 */ jal func_800C6B54 +/* 01C2C 8098AAAC 0C031AD5 */ jal Graph_CloseDisp /* 01C30 8098AAB0 240705FE */ addiu $a3, $zero, 0x05FE ## $a3 = 000005FE /* 01C34 8098AAB4 8FBF0024 */ lw $ra, 0x0024($sp) /* 01C38 8098AAB8 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s index 30b1fa528c..4a4f84a4ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s @@ -26,7 +26,7 @@ glabel func_8098ABC0 /* 01DA0 8098AC20 24C6C9D8 */ addiu $a2, $a2, %lo(D_8098C9D8) ## $a2 = 8098C9D8 /* 01DA4 8098AC24 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFA8 /* 01DA8 8098AC28 24070720 */ addiu $a3, $zero, 0x0720 ## $a3 = 00000720 -/* 01DAC 8098AC2C 0C031AB1 */ jal func_800C6AC4 +/* 01DAC 8098AC2C 0C031AB1 */ jal Graph_OpenDisp /* 01DB0 8098AC30 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 01DB4 8098AC34 9222014D */ lbu $v0, 0x014D($s1) ## 0000014D /* 01DB8 8098AC38 27B600D8 */ addiu $s6, $sp, 0x00D8 ## $s6 = FFFFFFE0 @@ -501,7 +501,7 @@ glabel func_8098ABC0 /* 02480 8098B300 24C6CA00 */ addiu $a2, $a2, %lo(D_8098CA00) ## $a2 = 8098CA00 /* 02484 8098B304 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFA8 /* 02488 8098B308 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0248C 8098B30C 0C031AD5 */ jal func_800C6B54 +/* 0248C 8098B30C 0C031AD5 */ jal Graph_CloseDisp /* 02490 8098B310 240707E3 */ addiu $a3, $zero, 0x07E3 ## $a3 = 000007E3 /* 02494 8098B314 8FBF006C */ lw $ra, 0x006C($sp) /* 02498 8098B318 D7B40020 */ ldc1 $f20, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s index 53dca9ed25..d1be365878 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s @@ -23,7 +23,7 @@ glabel func_8098B354 /* 02528 8098B3A8 24C6CA14 */ addiu $a2, $a2, %lo(D_8098CA14) ## $a2 = 8098CA14 /* 0252C 8098B3AC 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFB0 /* 02530 8098B3B0 24070982 */ addiu $a3, $zero, 0x0982 ## $a3 = 00000982 -/* 02534 8098B3B4 0C031AB1 */ jal func_800C6AC4 +/* 02534 8098B3B4 0C031AB1 */ jal Graph_OpenDisp /* 02538 8098B3B8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 0253C 8098B3BC 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D /* 02540 8098B3C0 3C178099 */ lui $s7, %hi(D_8098C4F0) ## $s7 = 80990000 @@ -370,7 +370,7 @@ glabel func_8098B354 /* 02A30 8098B8B0 24C6CA3C */ addiu $a2, $a2, %lo(D_8098CA3C) ## $a2 = 8098CA3C /* 02A34 8098B8B4 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFB0 /* 02A38 8098B8B8 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 02A3C 8098B8BC 0C031AD5 */ jal func_800C6B54 +/* 02A3C 8098B8BC 0C031AD5 */ jal Graph_CloseDisp /* 02A40 8098B8C0 24070A13 */ addiu $a3, $zero, 0x0A13 ## $a3 = 00000A13 /* 02A44 8098B8C4 8FBF0074 */ lw $ra, 0x0074($sp) /* 02A48 8098B8C8 D7B40020 */ ldc1 $f20, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s index 9740ca0328..2c477e598d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s @@ -16,7 +16,7 @@ glabel DemoKekkai_Draw /* 00F88 8098DF58 3319FFFF */ andi $t9, $t8, 0xFFFF ## $t9 = 00000000 /* 00F8C 8098DF5C AFB9006C */ sw $t9, 0x006C($sp) /* 00F90 8098DF60 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00F94 8098DF64 0C031AB1 */ jal func_800C6AC4 +/* 00F94 8098DF64 0C031AB1 */ jal Graph_OpenDisp /* 00F98 8098DF68 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00F9C 8098DF6C 0C024F61 */ jal func_80093D84 /* 00FA0 8098DF70 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -83,7 +83,7 @@ glabel DemoKekkai_Draw /* 01094 8098E064 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01098 8098E068 24C6E27C */ addiu $a2, $a2, %lo(D_8098E27C) ## $a2 = 8098E27C /* 0109C 8098E06C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 010A0 8098E070 0C031AD5 */ jal func_800C6B54 +/* 010A0 8098E070 0C031AD5 */ jal Graph_CloseDisp /* 010A4 8098E074 240702D2 */ addiu $a3, $zero, 0x02D2 ## $a3 = 000002D2 /* 010A8 8098E078 8FBF003C */ lw $ra, 0x003C($sp) /* 010AC 8098E07C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s index d010d8a8b4..e37c3a4791 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s @@ -108,7 +108,7 @@ glabel func_8098D9C0 /* 00B90 8098DB60 AFA900AC */ sw $t1, 0x00AC($sp) /* 00B94 8098DB64 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 00B98 8098DB68 24070278 */ addiu $a3, $zero, 0x0278 ## $a3 = 00000278 -/* 00B9C 8098DB6C 0C031AB1 */ jal func_800C6AC4 +/* 00B9C 8098DB6C 0C031AB1 */ jal Graph_OpenDisp /* 00BA0 8098DB70 00A08025 */ or $s0, $a1, $zero ## $s0 = FFFFFFF6 /* 00BA4 8098DB74 8FAB0124 */ lw $t3, 0x0124($sp) /* 00BA8 8098DB78 0C024F61 */ jal func_80093D84 @@ -338,7 +338,7 @@ glabel func_8098D9C0 /* 00F28 8098DEF8 24C6E240 */ addiu $a2, $a2, %lo(D_8098E240) ## $a2 = 8098E240 /* 00F2C 8098DEFC 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFF68 /* 00F30 8098DF00 240702B8 */ addiu $a3, $zero, 0x02B8 ## $a3 = 000002B8 -/* 00F34 8098DF04 0C031AD5 */ jal func_800C6B54 +/* 00F34 8098DF04 0C031AD5 */ jal Graph_CloseDisp /* 00F38 8098DF08 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 .L8098DF0C: /* 00F3C 8098DF0C 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s index 51110e9dce..a2b133c9e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s @@ -21,7 +21,7 @@ glabel func_8098F1C0 /* 00DAC 8098F20C 8D4A00F4 */ lw $t2, %lo(D_809900F4)($t2) /* 00DB0 8098F210 AFAA006C */ sw $t2, 0x006C($sp) /* 00DB4 8098F214 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00DB8 8098F218 0C031AB1 */ jal func_800C6AC4 +/* 00DB8 8098F218 0C031AB1 */ jal Graph_OpenDisp /* 00DBC 8098F21C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00DC0 8098F220 8FAC008C */ lw $t4, 0x008C($sp) /* 00DC4 8098F224 0C024F61 */ jal func_80093D84 @@ -108,7 +108,7 @@ glabel func_8098F1C0 /* 00F08 8098F368 24C60E04 */ addiu $a2, $a2, %lo(D_80990E04) ## $a2 = 80990E04 /* 00F0C 8098F36C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 00F10 8098F370 24070145 */ addiu $a3, $zero, 0x0145 ## $a3 = 00000145 -/* 00F14 8098F374 0C031AD5 */ jal func_800C6B54 +/* 00F14 8098F374 0C031AD5 */ jal Graph_CloseDisp /* 00F18 8098F378 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00F1C 8098F37C 8FBF002C */ lw $ra, 0x002C($sp) /* 00F20 8098F380 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s index 2627bdcd53..809ab48bdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s @@ -20,7 +20,7 @@ glabel func_8098FEB4 /* 01A9C 8098FEFC 8D6B00F4 */ lw $t3, %lo(D_809900F4)($t3) /* 01AA0 8098FF00 AFAB0064 */ sw $t3, 0x0064($sp) /* 01AA4 8098FF04 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01AA8 8098FF08 0C031AB1 */ jal func_800C6AC4 +/* 01AA8 8098FF08 0C031AB1 */ jal Graph_OpenDisp /* 01AAC 8098FF0C AFA5005C */ sw $a1, 0x005C($sp) /* 01AB0 8098FF10 8FAD0084 */ lw $t5, 0x0084($sp) /* 01AB4 8098FF14 0C024F46 */ jal func_80093D18 @@ -106,7 +106,7 @@ glabel func_8098FEB4 /* 01BF4 80990054 24C60EEC */ addiu $a2, $a2, %lo(D_80990EEC) ## $a2 = 80990EEC /* 01BF8 80990058 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 01BFC 8099005C 24070272 */ addiu $a3, $zero, 0x0272 ## $a3 = 00000272 -/* 01C00 80990060 0C031AD5 */ jal func_800C6B54 +/* 01C00 80990060 0C031AD5 */ jal Graph_CloseDisp /* 01C04 80990064 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 01C08 80990068 8FBF0024 */ lw $ra, 0x0024($sp) /* 01C0C 8099006C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s index f0d840f473..b32f3b3bed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s @@ -11,7 +11,7 @@ glabel DemoShd_Draw /* 0020C 8099143C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00210 80991440 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 00214 80991444 240702D6 */ addiu $a3, $zero, 0x02D6 ## $a3 = 000002D6 -/* 00218 80991448 0C031AB1 */ jal func_800C6AC4 +/* 00218 80991448 0C031AB1 */ jal Graph_OpenDisp /* 0021C 8099144C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00220 80991450 8FB90084 */ lw $t9, 0x0084($sp) /* 00224 80991454 0C024F61 */ jal func_80093D84 @@ -137,7 +137,7 @@ glabel DemoShd_Draw /* 003FC 8099162C 24C63620 */ addiu $a2, $a2, %lo(D_80993620) ## $a2 = 80993620 /* 00400 80991630 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 00404 80991634 240702FA */ addiu $a3, $zero, 0x02FA ## $a3 = 000002FA -/* 00408 80991638 0C031AD5 */ jal func_800C6B54 +/* 00408 80991638 0C031AD5 */ jal Graph_CloseDisp /* 0040C 8099163C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 00410 80991640 8FBF003C */ lw $ra, 0x003C($sp) /* 00414 80991644 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s index 315603eee5..a4f31c8593 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s @@ -9,7 +9,7 @@ glabel DemoTreLgt_Draw /* 0060C 80993CCC 24C63E2C */ addiu $a2, $a2, %lo(D_80993E2C) ## $a2 = 80993E2C /* 00610 80993CD0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00614 80993CD4 240701CD */ addiu $a3, $zero, 0x01CD ## $a3 = 000001CD -/* 00618 80993CD8 0C031AB1 */ jal func_800C6AC4 +/* 00618 80993CD8 0C031AB1 */ jal Graph_OpenDisp /* 0061C 80993CDC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00620 80993CE0 8FAF0058 */ lw $t7, 0x0058($sp) /* 00624 80993CE4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -39,7 +39,7 @@ glabel DemoTreLgt_Draw /* 00684 80993D44 24C63E40 */ addiu $a2, $a2, %lo(D_80993E40) ## $a2 = 80993E40 /* 00688 80993D48 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0068C 80993D4C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00690 80993D50 0C031AD5 */ jal func_800C6B54 +/* 00690 80993D50 0C031AD5 */ jal Graph_CloseDisp /* 00694 80993D54 240701DC */ addiu $a3, $zero, 0x01DC ## $a3 = 000001DC /* 00698 80993D58 8FBF002C */ lw $ra, 0x002C($sp) .L80993D5C: diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s index 72feaa45c8..0ab821536c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s @@ -11,7 +11,7 @@ glabel func_80993B2C /* 00490 80993B50 24C63E04 */ addiu $a2, $a2, %lo(D_80993E04) ## $a2 = 80993E04 /* 00494 80993B54 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 00498 80993B58 240701A7 */ addiu $a3, $zero, 0x01A7 ## $a3 = 000001A7 -/* 0049C 80993B5C 0C031AB1 */ jal func_800C6AC4 +/* 0049C 80993B5C 0C031AB1 */ jal Graph_OpenDisp /* 004A0 80993B60 AFA50064 */ sw $a1, 0x0064($sp) /* 004A4 80993B64 8FA90064 */ lw $t1, 0x0064($sp) /* 004A8 80993B68 8FAA0070 */ lw $t2, 0x0070($sp) @@ -93,7 +93,7 @@ glabel func_80993B2C /* 005C8 80993C88 24C63E18 */ addiu $a2, $a2, %lo(D_80993E18) ## $a2 = 80993E18 /* 005CC 80993C8C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 005D0 80993C90 240701C0 */ addiu $a3, $zero, 0x01C0 ## $a3 = 000001C0 -/* 005D4 80993C94 0C031AD5 */ jal func_800C6B54 +/* 005D4 80993C94 0C031AD5 */ jal Graph_CloseDisp /* 005D8 80993C98 8DE50000 */ lw $a1, 0x0000($t7) ## FFFFB400 /* 005DC 80993C9C 8FBF003C */ lw $ra, 0x003C($sp) /* 005E0 80993CA0 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s index a1e309b4f6..141c450749 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s @@ -10,7 +10,7 @@ glabel DoorGerudo_Draw /* 00488 80994A68 24C64B80 */ addiu $a2, $a2, %lo(D_80994B80) ## $a2 = 80994B80 /* 0048C 80994A6C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00490 80994A70 24070169 */ addiu $a3, $zero, 0x0169 ## $a3 = 00000169 -/* 00494 80994A74 0C031AB1 */ jal func_800C6AC4 +/* 00494 80994A74 0C031AB1 */ jal Graph_OpenDisp /* 00498 80994A78 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0049C 80994A7C 0C024F46 */ jal func_80093D18 /* 004A0 80994A80 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -57,7 +57,7 @@ glabel DoorGerudo_Draw /* 00540 80994B20 24C64BA8 */ addiu $a2, $a2, %lo(D_80994BA8) ## $a2 = 80994BA8 /* 00544 80994B24 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00548 80994B28 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0054C 80994B2C 0C031AD5 */ jal func_800C6B54 +/* 0054C 80994B2C 0C031AD5 */ jal Graph_CloseDisp /* 00550 80994B30 24070179 */ addiu $a3, $zero, 0x0179 ## $a3 = 00000179 /* 00554 80994B34 8FBF001C */ lw $ra, 0x001C($sp) /* 00558 80994B38 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s index 114e303e08..d0ed2764f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s @@ -10,7 +10,7 @@ glabel func_80995E40 /* 01210 80995E60 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01214 80995E64 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 01218 80995E68 24070373 */ addiu $a3, $zero, 0x0373 ## $a3 = 00000373 -/* 0121C 80995E6C 0C031AB1 */ jal func_800C6AC4 +/* 0121C 80995E6C 0C031AB1 */ jal Graph_OpenDisp /* 01220 80995E70 AFA50034 */ sw $a1, 0x0034($sp) /* 01224 80995E74 8FA80034 */ lw $t0, 0x0034($sp) /* 01228 80995E78 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -26,7 +26,7 @@ glabel func_80995E40 /* 01250 80995EA0 24070375 */ addiu $a3, $zero, 0x0375 ## $a3 = 00000375 /* 01254 80995EA4 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 01258 80995EA8 8FAB0044 */ lw $t3, 0x0044($sp) -/* 0125C 80995EAC 0C031AD5 */ jal func_800C6B54 +/* 0125C 80995EAC 0C031AD5 */ jal Graph_CloseDisp /* 01260 80995EB0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 01264 80995EB4 8FBF0014 */ lw $ra, 0x0014($sp) /* 01268 80995EB8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s index 3e84c82869..7c44e975b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s @@ -31,7 +31,7 @@ glabel DoorShutter_Draw /* 018B0 80997B50 24C6832C */ addiu $a2, $a2, %lo(D_8099832C) ## $a2 = 8099832C /* 018B4 80997B54 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFDC /* 018B8 80997B58 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 -/* 018BC 80997B5C 0C031AB1 */ jal func_800C6AC4 +/* 018BC 80997B5C 0C031AB1 */ jal Graph_OpenDisp /* 018C0 80997B60 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 018C4 80997B64 8FAC0084 */ lw $t4, 0x0084($sp) /* 018C8 80997B68 0C024F46 */ jal func_80093D18 @@ -356,7 +356,7 @@ glabel DoorShutter_Draw /* 01D74 80998014 24C6837C */ addiu $a2, $a2, %lo(D_8099837C) ## $a2 = 8099837C /* 01D78 80998018 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFDC /* 01D7C 8099801C 24070857 */ addiu $a3, $zero, 0x0857 ## $a3 = 00000857 -/* 01D80 80998020 0C031AD5 */ jal func_800C6B54 +/* 01D80 80998020 0C031AD5 */ jal Graph_CloseDisp /* 01D84 80998024 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 01D88 80998028 8FBF001C */ lw $ra, 0x001C($sp) .L8099802C: diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s index 4fe71dea24..e9611694ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s @@ -10,7 +10,7 @@ glabel func_8099B140 /* 029E0 8099B160 24C6C61C */ addiu $a2, $a2, %lo(D_8099C61C) ## $a2 = 8099C61C /* 029E4 8099B164 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 029E8 8099B168 2407081E */ addiu $a3, $zero, 0x081E ## $a3 = 0000081E -/* 029EC 8099B16C 0C031AB1 */ jal func_800C6AC4 +/* 029EC 8099B16C 0C031AB1 */ jal Graph_OpenDisp /* 029F0 8099B170 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 029F4 8099B174 8FAF005C */ lw $t7, 0x005C($sp) /* 029F8 8099B178 0C024F61 */ jal func_80093D84 @@ -123,7 +123,7 @@ glabel func_8099B140 /* 02B8C 8099B30C 24C6C630 */ addiu $a2, $a2, %lo(D_8099C630) ## $a2 = 8099C630 /* 02B90 8099B310 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02B94 8099B314 24070832 */ addiu $a3, $zero, 0x0832 ## $a3 = 00000832 -/* 02B98 8099B318 0C031AD5 */ jal func_800C6B54 +/* 02B98 8099B318 0C031AD5 */ jal Graph_CloseDisp /* 02B9C 8099B31C 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 02BA0 8099B320 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s index c09ba4467c..2311613805 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s @@ -56,7 +56,7 @@ glabel func_8099B33C /* 02C88 8099B408 46128102 */ mul.s $f4, $f16, $f18 /* 02C8C 8099B40C E7A40064 */ swc1 $f4, 0x0064($sp) /* 02C90 8099B410 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02C94 8099B414 0C031AB1 */ jal func_800C6AC4 +/* 02C94 8099B414 0C031AB1 */ jal Graph_OpenDisp /* 02C98 8099B418 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 02C9C 8099B41C 0C024F61 */ jal func_80093D84 /* 02CA0 8099B420 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -170,7 +170,7 @@ glabel func_8099B33C /* 02E38 8099B5B8 24C6C658 */ addiu $a2, $a2, %lo(D_8099C658) ## $a2 = 8099C658 /* 02E3C 8099B5BC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 02E40 8099B5C0 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02E44 8099B5C4 0C031AD5 */ jal func_800C6B54 +/* 02E44 8099B5C4 0C031AD5 */ jal Graph_CloseDisp /* 02E48 8099B5C8 24070868 */ addiu $a3, $zero, 0x0868 ## $a3 = 00000868 /* 02E4C 8099B5CC 0C02927F */ jal SkelAnime_FrameUpdateMatrix diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s index 674c492fa9..b4e007b54c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s @@ -41,7 +41,7 @@ glabel func_8099B5EC /* 02EF8 8099B678 24C6C66C */ addiu $a2, $a2, %lo(D_8099C66C) ## $a2 = 8099C66C /* 02EFC 8099B67C 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 02F00 8099B680 2407087D */ addiu $a3, $zero, 0x087D ## $a3 = 0000087D -/* 02F04 8099B684 0C031AB1 */ jal func_800C6AC4 +/* 02F04 8099B684 0C031AB1 */ jal Graph_OpenDisp /* 02F08 8099B688 AFA500D8 */ sw $a1, 0x00D8($sp) /* 02F0C 8099B68C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 02F10 8099B690 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 @@ -1008,7 +1008,7 @@ glabel func_8099B5EC /* 03D48 8099C4C8 24C6C6BC */ addiu $a2, $a2, %lo(D_8099C6BC) ## $a2 = 8099C6BC /* 03D4C 8099C4CC 27A400C8 */ addiu $a0, $sp, 0x00C8 ## $a0 = FFFFFFD0 /* 03D50 8099C4D0 24070924 */ addiu $a3, $zero, 0x0924 ## $a3 = 00000924 -/* 03D54 8099C4D4 0C031AD5 */ jal func_800C6B54 +/* 03D54 8099C4D4 0C031AD5 */ jal Graph_CloseDisp /* 03D58 8099C4D8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 03D5C 8099C4DC 8FBF003C */ lw $ra, 0x003C($sp) /* 03D60 8099C4E0 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s index b0ab4d0e9f..7442e88901 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s @@ -10,7 +10,7 @@ glabel EfcErupc_Draw /* 00320 8099CFD0 24C6D790 */ addiu $a2, $a2, %lo(D_8099D790) ## $a2 = 8099D790 /* 00324 8099CFD4 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 00328 8099CFD8 2407011A */ addiu $a3, $zero, 0x011A ## $a3 = 0000011A -/* 0032C 8099CFDC 0C031AB1 */ jal func_800C6AC4 +/* 0032C 8099CFDC 0C031AB1 */ jal Graph_OpenDisp /* 00330 8099CFE0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00334 8099CFE4 0C024F61 */ jal func_80093D84 /* 00338 8099CFE8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -216,7 +216,7 @@ glabel EfcErupc_Draw /* 00650 8099D300 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00654 8099D304 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 .L8099D308: -/* 00658 8099D308 0C031AD5 */ jal func_800C6B54 +/* 00658 8099D308 0C031AD5 */ jal Graph_CloseDisp /* 0065C 8099D30C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00660 8099D310 8FA40090 */ lw $a0, 0x0090($sp) /* 00664 8099D314 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s index 116def9cd3..005f436d43 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s @@ -18,7 +18,7 @@ glabel func_8099D334 /* 006C4 8099D374 24C6D7E0 */ addiu $a2, $a2, %lo(D_8099D7E0) ## $a2 = 8099D7E0 /* 006C8 8099D378 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 006CC 8099D37C 24070170 */ addiu $a3, $zero, 0x0170 ## $a3 = 00000170 -/* 006D0 8099D380 0C031AB1 */ jal func_800C6AC4 +/* 006D0 8099D380 0C031AB1 */ jal Graph_OpenDisp /* 006D4 8099D384 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 006D8 8099D388 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 006DC 8099D38C 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 @@ -112,7 +112,7 @@ glabel func_8099D334 /* 00834 8099D4E4 24C6D808 */ addiu $a2, $a2, %lo(D_8099D808) ## $a2 = 8099D808 /* 00838 8099D4E8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 0083C 8099D4EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00840 8099D4F0 0C031AD5 */ jal func_800C6B54 +/* 00840 8099D4F0 0C031AD5 */ jal Graph_CloseDisp /* 00844 8099D4F4 2407018F */ addiu $a3, $zero, 0x018F ## $a3 = 0000018F /* 00848 8099D4F8 8FBF0044 */ lw $ra, 0x0044($sp) /* 0084C 8099D4FC D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s index 50c27f7d34..b3a513a768 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s @@ -19,7 +19,7 @@ glabel func_8099E4F4 /* 00C68 8099E538 24C6EB80 */ addiu $a2, $a2, %lo(D_8099EB80) ## $a2 = 8099EB80 /* 00C6C 8099E53C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFD0 /* 00C70 8099E540 240701A9 */ addiu $a3, $zero, 0x01A9 ## $a3 = 000001A9 -/* 00C74 8099E544 0C031AB1 */ jal func_800C6AC4 +/* 00C74 8099E544 0C031AB1 */ jal Graph_OpenDisp /* 00C78 8099E548 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00C7C 8099E54C 0C024F46 */ jal func_80093D18 /* 00C80 8099E550 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 @@ -149,7 +149,7 @@ glabel func_8099E4F4 /* 00E68 8099E738 24C6EBA0 */ addiu $a2, $a2, %lo(D_8099EBA0) ## $a2 = 8099EBA0 /* 00E6C 8099E73C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFD0 /* 00E70 8099E740 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 00E74 8099E744 0C031AD5 */ jal func_800C6B54 +/* 00E74 8099E744 0C031AD5 */ jal Graph_CloseDisp /* 00E78 8099E748 240701CA */ addiu $a3, $zero, 0x01CA ## $a3 = 000001CA /* 00E7C 8099E74C 8FBF004C */ lw $ra, 0x004C($sp) /* 00E80 8099E750 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s index 7c281d0e5d..049dfaa0f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s @@ -24,7 +24,7 @@ glabel func_8099E784 /* 00F0C 8099E7DC 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFCC /* 00F10 8099E7E0 240701D8 */ addiu $a3, $zero, 0x01D8 ## $a3 = 000001D8 /* 00F14 8099E7E4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00F18 8099E7E8 0C031AB1 */ jal func_800C6AC4 +/* 00F18 8099E7E8 0C031AB1 */ jal Graph_OpenDisp /* 00F1C 8099E7EC AFAE00B0 */ sw $t6, 0x00B0($sp) /* 00F20 8099E7F0 0C024F46 */ jal func_80093D18 /* 00F24 8099E7F4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 @@ -217,7 +217,7 @@ glabel func_8099E784 /* 011F4 8099EAC4 24C6EBD0 */ addiu $a2, $a2, %lo(D_8099EBD0) ## $a2 = 8099EBD0 /* 011F8 8099EAC8 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFCC /* 011FC 8099EACC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01200 8099EAD0 0C031AD5 */ jal func_800C6B54 +/* 01200 8099EAD0 0C031AD5 */ jal Graph_CloseDisp /* 01204 8099EAD4 24070203 */ addiu $a3, $zero, 0x0203 ## $a3 = 00000203 /* 01208 8099EAD8 8FBF0064 */ lw $ra, 0x0064($sp) /* 0120C 8099EADC D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s index 7325cfc82d..c7ee7ec60b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s @@ -8,7 +8,7 @@ glabel ElfMsg_Draw /* 00588 809AD0A8 24C6D5C0 */ addiu $a2, $a2, %lo(D_809AD5C0) ## $a2 = 809AD5C0 /* 0058C 809AD0AC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00590 809AD0B0 240701B4 */ addiu $a3, $zero, 0x01B4 ## $a3 = 000001B4 -/* 00594 809AD0B4 0C031AB1 */ jal func_800C6AC4 +/* 00594 809AD0B4 0C031AB1 */ jal Graph_OpenDisp /* 00598 809AD0B8 AFA50044 */ sw $a1, 0x0044($sp) /* 0059C 809AD0BC 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 005A0 809AD0C0 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 @@ -107,7 +107,7 @@ glabel ElfMsg_Draw .L809AD228: /* 00708 809AD228 8FA9004C */ lw $t1, 0x004C($sp) /* 0070C 809AD22C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC -/* 00710 809AD230 0C031AD5 */ jal func_800C6B54 +/* 00710 809AD230 0C031AD5 */ jal Graph_CloseDisp /* 00714 809AD234 8D250000 */ lw $a1, 0x0000($t1) ## 00000008 /* 00718 809AD238 8FBF0014 */ lw $ra, 0x0014($sp) .L809AD23C: diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s index b28b99a59c..1e228e07d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s @@ -9,7 +9,7 @@ glabel ElfMsg2_Draw /* 003F8 809ADAF8 24C6DDE4 */ addiu $a2, $a2, %lo(D_809ADDE4) ## $a2 = 809ADDE4 /* 003FC 809ADAFC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00400 809ADB00 24070163 */ addiu $a3, $zero, 0x0163 ## $a3 = 00000163 -/* 00404 809ADB04 0C031AB1 */ jal func_800C6AC4 +/* 00404 809ADB04 0C031AB1 */ jal Graph_OpenDisp /* 00408 809ADB08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0040C 809ADB0C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00410 809ADB10 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 @@ -67,7 +67,7 @@ glabel ElfMsg2_Draw /* 004E0 809ADBE0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 004E4 809ADBE4 24C6DE04 */ addiu $a2, $a2, %lo(D_809ADE04) ## $a2 = 809ADE04 /* 004E8 809ADBE8 2407016F */ addiu $a3, $zero, 0x016F ## $a3 = 0000016F -/* 004EC 809ADBEC 0C031AD5 */ jal func_800C6B54 +/* 004EC 809ADBEC 0C031AD5 */ jal Graph_CloseDisp /* 004F0 809ADBF0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 004F4 809ADBF4 8FBF001C */ lw $ra, 0x001C($sp) .L809ADBF8: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s index 426398a30f..0833e5b411 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s @@ -10,7 +10,7 @@ glabel EnAm_Draw /* 01EE4 809AFE04 24C60160 */ addiu $a2, $a2, %lo(D_809B0160) ## $a2 = 809B0160 /* 01EE8 809AFE08 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 01EEC 809AFE0C 2407062C */ addiu $a3, $zero, 0x062C ## $a3 = 0000062C -/* 01EF0 809AFE10 0C031AB1 */ jal func_800C6AC4 +/* 01EF0 809AFE10 0C031AB1 */ jal Graph_OpenDisp /* 01EF4 809AFE14 AFA50060 */ sw $a1, 0x0060($sp) /* 01EF8 809AFE18 0C024F46 */ jal func_80093D18 /* 01EFC 809AFE1C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -88,7 +88,7 @@ glabel EnAm_Draw /* 02014 809AFF34 24C60170 */ addiu $a2, $a2, %lo(D_809B0170) ## $a2 = 809B0170 /* 02018 809AFF38 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 0201C 809AFF3C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02020 809AFF40 0C031AD5 */ jal func_800C6B54 +/* 02020 809AFF40 0C031AD5 */ jal Graph_CloseDisp /* 02024 809AFF44 24070645 */ addiu $a3, $zero, 0x0645 ## $a3 = 00000645 /* 02028 809AFF48 8FBF003C */ lw $ra, 0x003C($sp) /* 0202C 809AFF4C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s index 18bc4e75a2..14f2fa84a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s @@ -9,7 +9,7 @@ glabel EnAni_Draw /* 00AC0 809B0E30 24C60F90 */ addiu $a2, $a2, %lo(D_809B0F90) ## $a2 = 809B0F90 /* 00AC4 809B0E34 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00AC8 809B0E38 240702CF */ addiu $a3, $zero, 0x02CF ## $a3 = 000002CF -/* 00ACC 809B0E3C 0C031AB1 */ jal func_800C6AC4 +/* 00ACC 809B0E3C 0C031AB1 */ jal Graph_OpenDisp /* 00AD0 809B0E40 AFA5004C */ sw $a1, 0x004C($sp) /* 00AD4 809B0E44 8FAF005C */ lw $t7, 0x005C($sp) /* 00AD8 809B0E48 0C0250F2 */ jal func_800943C8 @@ -56,7 +56,7 @@ glabel EnAni_Draw /* 00B7C 809B0EEC 24C60FA0 */ addiu $a2, $a2, %lo(D_809B0FA0) ## $a2 = 809B0FA0 /* 00B80 809B0EF0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00B84 809B0EF4 240702E0 */ addiu $a3, $zero, 0x02E0 ## $a3 = 000002E0 -/* 00B88 809B0EF8 0C031AD5 */ jal func_800C6B54 +/* 00B88 809B0EF8 0C031AD5 */ jal Graph_CloseDisp /* 00B8C 809B0EFC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 00B90 809B0F00 8FBF002C */ lw $ra, 0x002C($sp) /* 00B94 809B0F04 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s index 337f7de874..3ff41c1f56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s @@ -21,7 +21,7 @@ glabel func_809B2150 /* 0107C 809B219C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 01080 809B21A0 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 01084 809B21A4 24070355 */ addiu $a3, $zero, 0x0355 ## $a3 = 00000355 -/* 01088 809B21A8 0C031AB1 */ jal func_800C6AC4 +/* 01088 809B21A8 0C031AB1 */ jal Graph_OpenDisp /* 0108C 809B21AC AFA50034 */ sw $a1, 0x0034($sp) /* 01090 809B21B0 8FA80034 */ lw $t0, 0x0034($sp) /* 01094 809B21B4 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 @@ -58,7 +58,7 @@ glabel func_809B2150 /* 01110 809B2230 24C623FC */ addiu $a2, $a2, %lo(D_809B23FC) ## $a2 = 809B23FC /* 01114 809B2234 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 01118 809B2238 24070364 */ addiu $a3, $zero, 0x0364 ## $a3 = 00000364 -/* 0111C 809B223C 0C031AD5 */ jal func_800C6B54 +/* 0111C 809B223C 0C031AD5 */ jal Graph_CloseDisp /* 01120 809B2240 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 .L809B2244: /* 01124 809B2244 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s index 07f493f836..70e485fdc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s @@ -23,7 +23,7 @@ glabel EnAnubiceFire_Draw /* 009A0 809B2F40 24C63290 */ addiu $a2, $a2, %lo(D_809B3290) ## $a2 = 809B3290 /* 009A4 809B2F44 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 009A8 809B2F48 240701F7 */ addiu $a3, $zero, 0x01F7 ## $a3 = 000001F7 -/* 009AC 809B2F4C 0C031AB1 */ jal func_800C6AC4 +/* 009AC 809B2F4C 0C031AB1 */ jal Graph_OpenDisp /* 009B0 809B2F50 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 009B4 809B2F54 0C024F61 */ jal func_80093D84 /* 009B8 809B2F58 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -161,7 +161,7 @@ glabel EnAnubiceFire_Draw /* 00BB8 809B3158 24C632C0 */ addiu $a2, $a2, %lo(D_809B32C0) ## $a2 = 809B32C0 /* 00BBC 809B315C 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 00BC0 809B3160 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 00BC4 809B3164 0C031AD5 */ jal func_800C6B54 +/* 00BC4 809B3164 0C031AD5 */ jal Graph_CloseDisp /* 00BC8 809B3168 2407022C */ addiu $a3, $zero, 0x022C ## $a3 = 0000022C /* 00BCC 809B316C 8FBF006C */ lw $ra, 0x006C($sp) /* 00BD0 809B3170 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s index e281af7ce5..9458dcc57e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s @@ -101,7 +101,7 @@ glabel EnArrow_Draw /* 011BC 809B4ADC 44C9F800 */ ctc1 $t1, $31 /* 011C0 809B4AE0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 011C4 809B4AE4 24070542 */ addiu $a3, $zero, 0x0542 ## $a3 = 00000542 -/* 011C8 809B4AE8 0C031AB1 */ jal func_800C6AC4 +/* 011C8 809B4AE8 0C031AB1 */ jal Graph_OpenDisp /* 011CC 809B4AEC AFA50064 */ sw $a1, 0x0064($sp) /* 011D0 809B4AF0 8FAC007C */ lw $t4, 0x007C($sp) /* 011D4 809B4AF4 0C024F05 */ jal func_80093C14 @@ -242,7 +242,7 @@ glabel EnArrow_Draw /* 013DC 809B4CFC 24C64F10 */ addiu $a2, $a2, %lo(D_809B4F10) ## $a2 = 809B4F10 /* 013E0 809B4D00 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFDC /* 013E4 809B4D04 24070565 */ addiu $a3, $zero, 0x0565 ## $a3 = 00000565 -/* 013E8 809B4D08 0C031AD5 */ jal func_800C6B54 +/* 013E8 809B4D08 0C031AD5 */ jal Graph_CloseDisp /* 013EC 809B4D0C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 013F0 809B4D10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L809B4D14: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s index 909896701a..8bc6af3c9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s @@ -31,7 +31,7 @@ glabel EnBa_Draw /* 01948 809B7C98 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0194C 809B7C9C 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFD0 /* 01950 809B7CA0 240703A5 */ addiu $a3, $zero, 0x03A5 ## $a3 = 000003A5 -/* 01954 809B7CA4 0C031AB1 */ jal func_800C6AC4 +/* 01954 809B7CA4 0C031AB1 */ jal Graph_OpenDisp /* 01958 809B7CA8 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 /* 0195C 809B7CAC 8FAB00C4 */ lw $t3, 0x00C4($sp) /* 01960 809B7CB0 0C024F46 */ jal func_80093D18 @@ -263,7 +263,7 @@ glabel EnBa_Draw /* 01CD0 809B8020 24C68170 */ addiu $a2, $a2, %lo(D_809B8170) ## $a2 = 809B8170 /* 01CD4 809B8024 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFD0 /* 01CD8 809B8028 240703E3 */ addiu $a3, $zero, 0x03E3 ## $a3 = 000003E3 -/* 01CDC 809B802C 0C031AD5 */ jal func_800C6B54 +/* 01CDC 809B802C 0C031AD5 */ jal Graph_CloseDisp /* 01CE0 809B8030 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 01CE4 809B8034 8FBF005C */ lw $ra, 0x005C($sp) /* 01CE8 809B8038 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s index 7d4dcf54fa..2424ea2b47 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s @@ -28,7 +28,7 @@ glabel EnBb_Draw /* 032CC 809BB5AC 8DE50000 */ lw $a1, 0x0000($t7) ## 809BBC18 /* 032D0 809BB5B0 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFB4 /* 032D4 809BB5B4 240707FC */ addiu $a3, $zero, 0x07FC ## $a3 = 000007FC -/* 032D8 809BB5B8 0C031AB1 */ jal func_800C6AC4 +/* 032D8 809BB5B8 0C031AB1 */ jal Graph_OpenDisp /* 032DC 809BB5BC AFA5008C */ sw $a1, 0x008C($sp) /* 032E0 809BB5C0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 032E4 809BB5C4 44810000 */ mtc1 $at, $f0 ## $f0 = 80.00 @@ -335,7 +335,7 @@ glabel EnBb_Draw /* 0376C 809BBA4C 24C6BC50 */ addiu $a2, $a2, %lo(D_809BBC50) ## $a2 = 809BBC50 /* 03770 809BBA50 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFB4 /* 03774 809BBA54 2407084F */ addiu $a3, $zero, 0x084F ## $a3 = 0000084F -/* 03778 809BBA58 0C031AD5 */ jal func_800C6B54 +/* 03778 809BBA58 0C031AD5 */ jal Graph_CloseDisp /* 0377C 809BBA5C 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 03780 809BBA60 8FBF003C */ lw $ra, 0x003C($sp) /* 03784 809BBA64 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s index f76a876e92..f47a9f2ae8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s @@ -9,7 +9,7 @@ glabel func_809BC8C8 /* 008B4 809BC8E4 24C6CB38 */ addiu $a2, $a2, %lo(D_809BCB38) ## $a2 = 809BCB38 /* 008B8 809BC8E8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 008BC 809BC8EC 24070264 */ addiu $a3, $zero, 0x0264 ## $a3 = 00000264 -/* 008C0 809BC8F0 0C031AB1 */ jal func_800C6AC4 +/* 008C0 809BC8F0 0C031AB1 */ jal Graph_OpenDisp /* 008C4 809BC8F4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 008C8 809BC8F8 8FAF0060 */ lw $t7, 0x0060($sp) /* 008CC 809BC8FC 8FA40064 */ lw $a0, 0x0064($sp) @@ -119,7 +119,7 @@ glabel func_809BC8C8 /* 00A6C 809BCA9C 24C6CB60 */ addiu $a2, $a2, %lo(D_809BCB60) ## $a2 = 809BCB60 /* 00A70 809BCAA0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 00A74 809BCAA4 2407028B */ addiu $a3, $zero, 0x028B ## $a3 = 0000028B -/* 00A78 809BCAA8 0C031AD5 */ jal func_800C6B54 +/* 00A78 809BCAA8 0C031AD5 */ jal Graph_CloseDisp /* 00A7C 809BCAAC 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 00A80 809BCAB0 8FBF001C */ lw $ra, 0x001C($sp) /* 00A84 809BCAB4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s index 511a181ecf..5d20bb462d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s @@ -9,7 +9,7 @@ glabel EnBigokuta_Draw /* 02468 809BF0C8 24C6F500 */ addiu $a2, $a2, %lo(D_809BF500) ## $a2 = 809BF500 /* 0246C 809BF0CC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 02470 809BF0D0 240707E1 */ addiu $a3, $zero, 0x07E1 ## $a3 = 000007E1 -/* 02474 809BF0D4 0C031AB1 */ jal func_800C6AC4 +/* 02474 809BF0D4 0C031AB1 */ jal Graph_OpenDisp /* 02478 809BF0D8 AFA50068 */ sw $a1, 0x0068($sp) /* 0247C 809BF0DC 8E0F0190 */ lw $t7, 0x0190($s0) ## 00000190 /* 02480 809BF0E0 3C05809C */ lui $a1, %hi(func_809BE26C) ## $a1 = 809C0000 @@ -192,7 +192,7 @@ glabel EnBigokuta_Draw /* 02710 809BF370 24C6F514 */ addiu $a2, $a2, %lo(D_809BF514) ## $a2 = 809BF514 /* 02714 809BF374 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 02718 809BF378 2407081C */ addiu $a3, $zero, 0x081C ## $a3 = 0000081C -/* 0271C 809BF37C 0C031AD5 */ jal func_800C6B54 +/* 0271C 809BF37C 0C031AD5 */ jal Graph_CloseDisp /* 02720 809BF380 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 02724 809BF384 8FBF002C */ lw $ra, 0x002C($sp) /* 02728 809BF388 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s index b9ba826a0f..8a236dccb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s @@ -23,7 +23,7 @@ glabel func_809BEBBC /* 01FAC 809BEC0C AFA2001C */ sw $v0, 0x001C($sp) /* 01FB0 809BEC10 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 01FB4 809BEC14 2407077A */ addiu $a3, $zero, 0x077A ## $a3 = 0000077A -/* 01FB8 809BEC18 0C031AB1 */ jal func_800C6AC4 +/* 01FB8 809BEC18 0C031AB1 */ jal Graph_OpenDisp /* 01FBC 809BEC1C AFA50054 */ sw $a1, 0x0054($sp) /* 01FC0 809BEC20 8FA3007C */ lw $v1, 0x007C($sp) /* 01FC4 809BEC24 8FA2001C */ lw $v0, 0x001C($sp) @@ -166,7 +166,7 @@ glabel func_809BEBBC /* 021B8 809BEE18 8FAE0068 */ lw $t6, 0x0068($sp) /* 021BC 809BEE1C 44D8F800 */ ctc1 $t8, $31 /* 021C0 809BEE20 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 021C4 809BEE24 0C031AD5 */ jal func_800C6B54 +/* 021C4 809BEE24 0C031AD5 */ jal Graph_CloseDisp /* 021C8 809BEE28 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 /* 021CC 809BEE2C 1000009B */ beq $zero, $zero, .L809BF09C /* 021D0 809BEE30 8FBF0014 */ lw $ra, 0x0014($sp) @@ -179,7 +179,7 @@ glabel func_809BEBBC /* 021E8 809BEE48 24C6F4D8 */ addiu $a2, $a2, %lo(D_809BF4D8) ## $a2 = 809BF4D8 /* 021EC 809BEE4C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFC0 /* 021F0 809BEE50 2407079E */ addiu $a3, $zero, 0x079E ## $a3 = 0000079E -/* 021F4 809BEE54 0C031AB1 */ jal func_800C6AC4 +/* 021F4 809BEE54 0C031AB1 */ jal Graph_OpenDisp /* 021F8 809BEE58 AFA50038 */ sw $a1, 0x0038($sp) /* 021FC 809BEE5C 8FA3007C */ lw $v1, 0x007C($sp) /* 02200 809BEE60 3C18809C */ lui $t8, %hi(func_809BE26C) ## $t8 = 809C0000 @@ -261,7 +261,7 @@ glabel func_809BEBBC /* 02320 809BEF80 24C6F4EC */ addiu $a2, $a2, %lo(D_809BF4EC) ## $a2 = 809BF4EC /* 02324 809BEF84 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFC0 /* 02328 809BEF88 240707B4 */ addiu $a3, $zero, 0x07B4 ## $a3 = 000007B4 -/* 0232C 809BEF8C 0C031AD5 */ jal func_800C6B54 +/* 0232C 809BEF8C 0C031AD5 */ jal Graph_CloseDisp /* 02330 809BEF90 8D850000 */ lw $a1, 0x0000($t4) ## E7000000 /* 02334 809BEF94 10000041 */ beq $zero, $zero, .L809BF09C /* 02338 809BEF98 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s index 54080b3118..f3436ebfc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s @@ -10,7 +10,7 @@ glabel EnBili_Draw /* 01C18 809C14B8 24C61710 */ addiu $a2, $a2, %lo(D_809C1710) ## $a2 = 809C1710 /* 01C1C 809C14BC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01C20 809C14C0 240705F1 */ addiu $a3, $zero, 0x05F1 ## $a3 = 000005F1 -/* 01C24 809C14C4 0C031AB1 */ jal func_800C6AC4 +/* 01C24 809C14C4 0C031AB1 */ jal Graph_OpenDisp /* 01C28 809C14C8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01C2C 809C14CC 8FAF005C */ lw $t7, 0x005C($sp) /* 01C30 809C14D0 0C024F61 */ jal func_80093D84 @@ -94,7 +94,7 @@ glabel EnBili_Draw /* 01D54 809C15F4 24C61720 */ addiu $a2, $a2, %lo(D_809C1720) ## $a2 = 809C1720 /* 01D58 809C15F8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01D5C 809C15FC 24070610 */ addiu $a3, $zero, 0x0610 ## $a3 = 00000610 -/* 01D60 809C1600 0C031AD5 */ jal func_800C6B54 +/* 01D60 809C1600 0C031AD5 */ jal Graph_CloseDisp /* 01D64 809C1604 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 01D68 809C1608 8FBF002C */ lw $ra, 0x002C($sp) /* 01D6C 809C160C 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s index 907beadf05..993bc6cb58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s @@ -10,7 +10,7 @@ glabel EnBlkobj_Draw /* 003B8 809C2418 24C625D8 */ addiu $a2, $a2, %lo(D_809C25D8) ## $a2 = 809C25D8 /* 003BC 809C241C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFDC /* 003C0 809C2420 2407015D */ addiu $a3, $zero, 0x015D ## $a3 = 0000015D -/* 003C4 809C2424 0C031AB1 */ jal func_800C6AC4 +/* 003C4 809C2424 0C031AB1 */ jal Graph_OpenDisp /* 003C8 809C2428 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003CC 809C242C 0C024F61 */ jal func_80093D84 /* 003D0 809C2430 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -81,7 +81,7 @@ glabel EnBlkobj_Draw /* 004CC 809C252C 24C62600 */ addiu $a2, $a2, %lo(D_809C2600) ## $a2 = 809C2600 /* 004D0 809C2530 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFDC /* 004D4 809C2534 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 004D8 809C2538 0C031AD5 */ jal func_800C6B54 +/* 004D8 809C2538 0C031AD5 */ jal Graph_CloseDisp /* 004DC 809C253C 24070177 */ addiu $a3, $zero, 0x0177 ## $a3 = 00000177 /* 004E0 809C2540 8FBF003C */ lw $ra, 0x003C($sp) /* 004E4 809C2544 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s index 34d7782dc5..64f12f9b20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s @@ -9,7 +9,7 @@ glabel func_809C2324 /* 002E0 809C2340 24C625B0 */ addiu $a2, $a2, %lo(D_809C25B0) ## $a2 = 809C25B0 /* 002E4 809C2344 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 002E8 809C2348 24070142 */ addiu $a3, $zero, 0x0142 ## $a3 = 00000142 -/* 002EC 809C234C 0C031AB1 */ jal func_800C6AC4 +/* 002EC 809C234C 0C031AB1 */ jal Graph_OpenDisp /* 002F0 809C2350 AFA50038 */ sw $a1, 0x0038($sp) /* 002F4 809C2354 8FA50048 */ lw $a1, 0x0048($sp) /* 002F8 809C2358 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -48,7 +48,7 @@ glabel func_809C2324 /* 00374 809C23D4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 00378 809C23D8 8FAE0040 */ lw $t6, 0x0040($sp) /* 0037C 809C23DC 2407014A */ addiu $a3, $zero, 0x014A ## $a3 = 0000014A -/* 00380 809C23E0 0C031AD5 */ jal func_800C6B54 +/* 00380 809C23E0 0C031AD5 */ jal Graph_CloseDisp /* 00384 809C23E4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00388 809C23E8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0038C 809C23EC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s index 925fdaec89..c9c8363621 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s @@ -9,7 +9,7 @@ glabel EnBom_Draw /* 00B64 809C3234 24C634D0 */ addiu $a2, $a2, %lo(D_809C34D0) ## $a2 = 809C34D0 /* 00B68 809C3238 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 00B6C 809C323C 24070391 */ addiu $a3, $zero, 0x0391 ## $a3 = 00000391 -/* 00B70 809C3240 0C031AB1 */ jal func_800C6AC4 +/* 00B70 809C3240 0C031AB1 */ jal Graph_OpenDisp /* 00B74 809C3244 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00B78 809C3248 8FAF0060 */ lw $t7, 0x0060($sp) /* 00B7C 809C324C 8FB90064 */ lw $t9, 0x0064($sp) @@ -118,7 +118,7 @@ glabel EnBom_Draw /* 00D14 809C33E4 24C63500 */ addiu $a2, $a2, %lo(D_809C3500) ## $a2 = 809C3500 /* 00D18 809C33E8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 00D1C 809C33EC 240703B7 */ addiu $a3, $zero, 0x03B7 ## $a3 = 000003B7 -/* 00D20 809C33F0 0C031AD5 */ jal func_800C6B54 +/* 00D20 809C33F0 0C031AD5 */ jal Graph_CloseDisp /* 00D24 809C33F4 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00D28 809C33F8 8FBF001C */ lw $ra, 0x001C($sp) /* 00D2C 809C33FC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s index e64d8391de..89cdb840f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s @@ -9,7 +9,7 @@ glabel EnBomBowlMan_Draw /* 012D8 809C4908 24C64C44 */ addiu $a2, $a2, %lo(D_809C4C44) ## $a2 = 809C4C44 /* 012DC 809C490C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 012E0 809C4910 2407038B */ addiu $a3, $zero, 0x038B ## $a3 = 0000038B -/* 012E4 809C4914 0C031AB1 */ jal func_800C6AC4 +/* 012E4 809C4914 0C031AB1 */ jal Graph_OpenDisp /* 012E8 809C4918 AFA50048 */ sw $a1, 0x0048($sp) /* 012EC 809C491C 8FAF0054 */ lw $t7, 0x0054($sp) /* 012F0 809C4920 0C024F46 */ jal func_80093D18 @@ -54,7 +54,7 @@ glabel EnBomBowlMan_Draw /* 0138C 809C49BC 24C64C5C */ addiu $a2, $a2, %lo(D_809C4C5C) ## $a2 = 809C4C5C /* 01390 809C49C0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01394 809C49C4 2407039B */ addiu $a3, $zero, 0x039B ## $a3 = 0000039B -/* 01398 809C49C8 0C031AD5 */ jal func_800C6B54 +/* 01398 809C49C8 0C031AD5 */ jal Graph_CloseDisp /* 0139C 809C49CC 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 013A0 809C49D0 8FBF002C */ lw $ra, 0x002C($sp) /* 013A4 809C49D4 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s index f1094e8564..8735d78050 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s @@ -10,7 +10,7 @@ glabel EnBomChu_Draw /* 01184 809C69B4 24C66DA0 */ addiu $a2, $a2, %lo(D_809C6DA0) ## $a2 = 809C6DA0 /* 01188 809C69B8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 /* 0118C 809C69BC 24070399 */ addiu $a3, $zero, 0x0399 ## $a3 = 00000399 -/* 01190 809C69C0 0C031AB1 */ jal func_800C6AC4 +/* 01190 809C69C0 0C031AB1 */ jal Graph_OpenDisp /* 01194 809C69C4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01198 809C69C8 8FAF005C */ lw $t7, 0x005C($sp) /* 0119C 809C69CC 0C024F46 */ jal func_80093D18 @@ -225,7 +225,7 @@ glabel EnBomChu_Draw /* 014AC 809C6CDC 24C66DC8 */ addiu $a2, $a2, %lo(D_809C6DC8) ## $a2 = 809C6DC8 /* 014B0 809C6CE0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 /* 014B4 809C6CE4 240703C1 */ addiu $a3, $zero, 0x03C1 ## $a3 = 000003C1 -/* 014B8 809C6CE8 0C031AD5 */ jal func_800C6B54 +/* 014B8 809C6CE8 0C031AD5 */ jal Graph_CloseDisp /* 014BC 809C6CEC 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 014C0 809C6CF0 8FBF001C */ lw $ra, 0x001C($sp) /* 014C4 809C6CF4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s index d973a224f4..c5f302ef1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s @@ -9,7 +9,7 @@ glabel EnBombf_Draw /* 01070 809C7FD0 24C68310 */ addiu $a2, $a2, %lo(D_809C8310) ## $a2 = 809C8310 /* 01074 809C7FD4 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 01078 809C7FD8 2407040A */ addiu $a3, $zero, 0x040A ## $a3 = 0000040A -/* 0107C 809C7FDC 0C031AB1 */ jal func_800C6AC4 +/* 0107C 809C7FDC 0C031AB1 */ jal Graph_OpenDisp /* 01080 809C7FE0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01084 809C7FE4 8FA20068 */ lw $v0, 0x0068($sp) /* 01088 809C7FE8 8FB8006C */ lw $t8, 0x006C($sp) @@ -157,7 +157,7 @@ glabel EnBombf_Draw /* 012B4 809C8214 24C68340 */ addiu $a2, $a2, %lo(D_809C8340) ## $a2 = 809C8340 /* 012B8 809C8218 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 012BC 809C821C 24070427 */ addiu $a3, $zero, 0x0427 ## $a3 = 00000427 -/* 012C0 809C8220 0C031AD5 */ jal func_800C6B54 +/* 012C0 809C8220 0C031AD5 */ jal Graph_CloseDisp /* 012C4 809C8224 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 012C8 809C8228 8FBF001C */ lw $ra, 0x001C($sp) /* 012CC 809C822C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s index d98c03e7a8..182eadc644 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s @@ -10,7 +10,7 @@ glabel EnBox_Draw /* 017F0 809CA5B0 24C6A8D0 */ addiu $a2, $a2, %lo(D_809CA8D0) ## $a2 = 809CA8D0 /* 017F4 809CA5B4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 017F8 809CA5B8 2407062D */ addiu $a3, $zero, 0x062D ## $a3 = 0000062D -/* 017FC 809CA5BC 0C031AB1 */ jal func_800C6AC4 +/* 017FC 809CA5BC 0C031AB1 */ jal Graph_OpenDisp /* 01800 809CA5C0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01804 809CA5C4 922301F7 */ lbu $v1, 0x01F7($s1) ## 000001F7 /* 01808 809CA5C8 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -150,7 +150,7 @@ glabel EnBox_Draw /* 019F8 809CA7B8 24C6A8E0 */ addiu $a2, $a2, %lo(D_809CA8E0) ## $a2 = 809CA8E0 /* 019FC 809CA7BC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 01A00 809CA7C0 24070667 */ addiu $a3, $zero, 0x0667 ## $a3 = 00000667 -/* 01A04 809CA7C4 0C031AD5 */ jal func_800C6B54 +/* 01A04 809CA7C4 0C031AD5 */ jal Graph_CloseDisp /* 01A08 809CA7C8 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 01A0C 809CA7CC 8FBF002C */ lw $ra, 0x002C($sp) /* 01A10 809CA7D0 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s index 6e3590b622..a6c8f1e021 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s @@ -10,7 +10,7 @@ glabel EnBubble_Draw /* 00FF0 809CCBF0 24C6CEB0 */ addiu $a2, $a2, %lo(D_809CCEB0) ## $a2 = 809CCEB0 /* 00FF4 809CCBF4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00FF8 809CCBF8 24070497 */ addiu $a3, $zero, 0x0497 ## $a3 = 00000497 -/* 00FFC 809CCBFC 0C031AB1 */ jal func_800C6AC4 +/* 00FFC 809CCBFC 0C031AB1 */ jal Graph_OpenDisp /* 01000 809CCC00 AFA5004C */ sw $a1, 0x004C($sp) /* 01004 809CCC04 3C0E809D */ lui $t6, %hi(func_809CCAA8) ## $t6 = 809D0000 /* 01008 809CCC08 25CECAA8 */ addiu $t6, $t6, %lo(func_809CCAA8) ## $t6 = 809CCAA8 @@ -124,7 +124,7 @@ glabel EnBubble_Draw /* 011A4 809CCDA4 24C6CED8 */ addiu $a2, $a2, %lo(D_809CCED8) ## $a2 = 809CCED8 /* 011A8 809CCDA8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 011AC 809CCDAC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 011B0 809CCDB0 0C031AD5 */ jal func_800C6B54 +/* 011B0 809CCDB0 0C031AD5 */ jal Graph_CloseDisp /* 011B4 809CCDB4 240704CA */ addiu $a3, $zero, 0x04CA ## $a3 = 000004CA /* 011B8 809CCDB8 8FAE0030 */ lw $t6, 0x0030($sp) /* 011BC 809CCDBC 8E0F014C */ lw $t7, 0x014C($s0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s index 927475ce17..ae24d2e12e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s @@ -9,7 +9,7 @@ glabel func_809CD144 /* 000F0 809CD160 24C6E420 */ addiu $a2, $a2, %lo(D_809CE420) ## $a2 = 809CE420 /* 000F4 809CD164 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFD4 /* 000F8 809CD168 24070127 */ addiu $a3, $zero, 0x0127 ## $a3 = 00000127 -/* 000FC 809CD16C 0C031AB1 */ jal func_800C6AC4 +/* 000FC 809CD16C 0C031AB1 */ jal Graph_OpenDisp /* 00100 809CD170 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00104 809CD174 8FAF006C */ lw $t7, 0x006C($sp) /* 00108 809CD178 0C024F05 */ jal func_80093C14 @@ -154,7 +154,7 @@ glabel func_809CD144 /* 00324 809CD394 24C6E440 */ addiu $a2, $a2, %lo(D_809CE440) ## $a2 = 809CE440 /* 00328 809CD398 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFD4 /* 0032C 809CD39C 24070146 */ addiu $a3, $zero, 0x0146 ## $a3 = 00000146 -/* 00330 809CD3A0 0C031AD5 */ jal func_800C6B54 +/* 00330 809CD3A0 0C031AD5 */ jal Graph_CloseDisp /* 00334 809CD3A4 8DA50000 */ lw $a1, 0x0000($t5) ## C8C8D2FF /* 00338 809CD3A8 8FBF001C */ lw $ra, 0x001C($sp) /* 0033C 809CD3AC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s index 3ad76956a0..4eb251b90b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s @@ -20,7 +20,7 @@ glabel EnBw_Draw /* 028A0 809D0F80 24C61570 */ addiu $a2, $a2, %lo(D_809D1570) ## $a2 = 809D1570 /* 028A4 809D0F84 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC8 /* 028A8 809D0F88 2407058F */ addiu $a3, $zero, 0x058F ## $a3 = 0000058F -/* 028AC 809D0F8C 0C031AB1 */ jal func_800C6AC4 +/* 028AC 809D0F8C 0C031AB1 */ jal Graph_OpenDisp /* 028B0 809D0F90 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 028B4 809D0F94 9209022F */ lbu $t1, 0x022F($s0) ## 0000022F /* 028B8 809D0F98 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -313,7 +313,7 @@ glabel EnBw_Draw /* 02D24 809D1404 24C61590 */ addiu $a2, $a2, %lo(D_809D1590) ## $a2 = 809D1590 /* 02D28 809D1408 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC8 /* 02D2C 809D140C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02D30 809D1410 0C031AD5 */ jal func_800C6B54 +/* 02D30 809D1410 0C031AD5 */ jal Graph_CloseDisp /* 02D34 809D1414 240705F1 */ addiu $a3, $zero, 0x05F1 ## $a3 = 000005F1 /* 02D38 809D1418 8FBF0044 */ lw $ra, 0x0044($sp) /* 02D3C 809D141C 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s index cefbc78868..cd62b81815 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s @@ -24,7 +24,7 @@ glabel EnBx_Draw /* 00670 809D2150 24C62570 */ addiu $a2, $a2, %lo(D_809D2570) ## $a2 = 809D2570 /* 00674 809D2154 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFDC /* 00678 809D2158 240701D0 */ addiu $a3, $zero, 0x01D0 ## $a3 = 000001D0 -/* 0067C 809D215C 0C031AB1 */ jal func_800C6AC4 +/* 0067C 809D215C 0C031AB1 */ jal Graph_OpenDisp /* 00680 809D2160 00A0B825 */ or $s7, $a1, $zero ## $s7 = 00000000 /* 00684 809D2164 8FB800B4 */ lw $t8, 0x00B4($sp) /* 00688 809D2168 0C024F46 */ jal func_80093D18 @@ -210,7 +210,7 @@ glabel EnBx_Draw /* 00944 809D2424 24C625A0 */ addiu $a2, $a2, %lo(D_809D25A0) ## $a2 = 809D25A0 /* 00948 809D2428 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFDC /* 0094C 809D242C 240701FF */ addiu $a3, $zero, 0x01FF ## $a3 = 000001FF -/* 00950 809D2430 0C031AD5 */ jal func_800C6B54 +/* 00950 809D2430 0C031AD5 */ jal Graph_CloseDisp /* 00954 809D2434 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00958 809D2438 8FBF0064 */ lw $ra, 0x0064($sp) /* 0095C 809D243C D7B40030 */ ldc1 $f20, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s index 515a94e800..6ac950b7a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s @@ -10,7 +10,7 @@ glabel EnClearTag_Draw /* 01470 809D4A20 24C6BFC0 */ addiu $a2, $a2, %lo(D_809DBFC0) ## $a2 = 809DBFC0 /* 01474 809D4A24 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 01478 809D4A28 240703D7 */ addiu $a3, $zero, 0x03D7 ## $a3 = 000003D7 -/* 0147C 809D4A2C 0C031AB1 */ jal func_800C6AC4 +/* 0147C 809D4A2C 0C031AB1 */ jal Graph_OpenDisp /* 01480 809D4A30 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01484 809D4A34 9224014D */ lbu $a0, 0x014D($s1) ## 0000014D /* 01488 809D4A38 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 @@ -387,7 +387,7 @@ glabel EnClearTag_Draw /* 01A2C 809D4FDC 24C6C038 */ addiu $a2, $a2, %lo(D_809DC038) ## $a2 = 809DC038 /* 01A30 809D4FE0 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 01A34 809D4FE4 2407045F */ addiu $a3, $zero, 0x045F ## $a3 = 0000045F -/* 01A38 809D4FE8 0C031AD5 */ jal func_800C6B54 +/* 01A38 809D4FE8 0C031AD5 */ jal Graph_CloseDisp /* 01A3C 809D4FEC 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 01A40 809D4FF0 8FBF001C */ lw $ra, 0x001C($sp) /* 01A44 809D4FF4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s index 83bfab3064..e4871106e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s @@ -23,7 +23,7 @@ glabel func_809D53CC /* 01E70 809D5420 27A400E8 */ addiu $a0, $sp, 0x00E8 ## $a0 = FFFFFFD8 /* 01E74 809D5424 24070508 */ addiu $a3, $zero, 0x0508 ## $a3 = 00000508 /* 01E78 809D5428 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01E7C 809D542C 0C031AB1 */ jal func_800C6AC4 +/* 01E7C 809D542C 0C031AB1 */ jal Graph_OpenDisp /* 01E80 809D5430 AFB100FC */ sw $s1, 0x00FC($sp) /* 01E84 809D5434 0C024F46 */ jal func_80093D18 /* 01E88 809D5438 8EE40000 */ lw $a0, 0x0000($s7) ## 00000000 @@ -524,7 +524,7 @@ glabel func_809D53CC /* 02608 809D5BB8 24C6C0C4 */ addiu $a2, $a2, %lo(D_809DC0C4) ## $a2 = 809DC0C4 /* 0260C 809D5BBC 27A400E8 */ addiu $a0, $sp, 0x00E8 ## $a0 = FFFFFFD8 /* 02610 809D5BC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02614 809D5BC4 0C031AD5 */ jal func_800C6B54 +/* 02614 809D5BC4 0C031AD5 */ jal Graph_CloseDisp /* 02618 809D5BC8 240705C5 */ addiu $a3, $zero, 0x05C5 ## $a3 = 000005C5 /* 0261C 809D5BCC 8FBF006C */ lw $ra, 0x006C($sp) /* 02620 809D5BD0 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s index aa2da68f2f..34a6065bc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s @@ -11,7 +11,7 @@ glabel EnCs_Draw /* 00D08 809E25B8 24C62980 */ addiu $a2, $a2, %lo(D_809E2980) ## $a2 = 809E2980 /* 00D0C 809E25BC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 00D10 809E25C0 240703C8 */ addiu $a3, $zero, 0x03C8 ## $a3 = 000003C8 -/* 00D14 809E25C4 0C031AB1 */ jal func_800C6AC4 +/* 00D14 809E25C4 0C031AB1 */ jal Graph_OpenDisp /* 00D18 809E25C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00D1C 809E25CC 0C024F46 */ jal func_80093D18 /* 00D20 809E25D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -117,7 +117,7 @@ glabel EnCs_Draw /* 00EA8 809E2758 24C629A0 */ addiu $a2, $a2, %lo(D_809E29A0) ## $a2 = 809E29A0 /* 00EAC 809E275C 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 00EB0 809E2760 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00EB4 809E2764 0C031AD5 */ jal func_800C6B54 +/* 00EB4 809E2764 0C031AD5 */ jal Graph_CloseDisp /* 00EB8 809E2768 240703F7 */ addiu $a3, $zero, 0x03F7 ## $a3 = 000003F7 /* 00EBC 809E276C 8FBF0034 */ lw $ra, 0x0034($sp) /* 00EC0 809E2770 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s index c98c07bf4c..ecbbaa987b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s @@ -8,7 +8,7 @@ glabel EnDaiku_Draw /* 01290 809E3DC0 24C64170 */ addiu $a2, $a2, %lo(D_809E4170) ## $a2 = 809E4170 /* 01294 809E3DC4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01298 809E3DC8 240704CB */ addiu $a3, $zero, 0x04CB ## $a3 = 000004CB -/* 0129C 809E3DCC 0C031AB1 */ jal func_800C6AC4 +/* 0129C 809E3DCC 0C031AB1 */ jal Graph_OpenDisp /* 012A0 809E3DD0 AFA50050 */ sw $a1, 0x0050($sp) /* 012A4 809E3DD4 8FAF005C */ lw $t7, 0x005C($sp) /* 012A8 809E3DD8 0C024F46 */ jal func_80093D18 @@ -81,7 +81,7 @@ glabel EnDaiku_Draw /* 013A4 809E3ED4 24C64180 */ addiu $a2, $a2, %lo(D_809E4180) ## $a2 = 809E4180 /* 013A8 809E3ED8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 013AC 809E3EDC 240704E7 */ addiu $a3, $zero, 0x04E7 ## $a3 = 000004E7 -/* 013B0 809E3EE0 0C031AD5 */ jal func_800C6B54 +/* 013B0 809E3EE0 0C031AD5 */ jal Graph_CloseDisp /* 013B4 809E3EE4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 013B8 809E3EE8 8FBF0024 */ lw $ra, 0x0024($sp) /* 013BC 809E3EEC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s index 2101224a72..333e54a449 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s @@ -10,7 +10,7 @@ glabel func_809E3F7C /* 0146C 809E3F9C 24C64190 */ addiu $a2, $a2, %lo(D_809E4190) ## $a2 = 809E4190 /* 01470 809E3FA0 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 01474 809E3FA4 2407052B */ addiu $a3, $zero, 0x052B ## $a3 = 0000052B -/* 01478 809E3FA8 0C031AB1 */ jal func_800C6AC4 +/* 01478 809E3FA8 0C031AB1 */ jal Graph_OpenDisp /* 0147C 809E3FAC AFA50030 */ sw $a1, 0x0030($sp) /* 01480 809E3FB0 8FAF003C */ lw $t7, 0x003C($sp) /* 01484 809E3FB4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -40,7 +40,7 @@ glabel func_809E3F7C /* 014E0 809E4010 24C641A0 */ addiu $a2, $a2, %lo(D_809E41A0) ## $a2 = 809E41A0 /* 014E4 809E4014 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 014E8 809E4018 24070532 */ addiu $a3, $zero, 0x0532 ## $a3 = 00000532 -/* 014EC 809E401C 0C031AD5 */ jal func_800C6B54 +/* 014EC 809E401C 0C031AD5 */ jal Graph_CloseDisp /* 014F0 809E4020 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 014F4 809E4024 8FBF0014 */ lw $ra, 0x0014($sp) /* 014F8 809E4028 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s index 1ada9a4868..1102d5e16a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s @@ -8,7 +8,7 @@ glabel EnDaikuKakariko_Draw /* 01038 809E5358 24C655E0 */ addiu $a2, $a2, %lo(D_809E55E0) ## $a2 = 809E55E0 /* 0103C 809E535C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01040 809E5360 24070464 */ addiu $a3, $zero, 0x0464 ## $a3 = 00000464 -/* 01044 809E5364 0C031AB1 */ jal func_800C6AC4 +/* 01044 809E5364 0C031AB1 */ jal Graph_OpenDisp /* 01048 809E5368 AFA50050 */ sw $a1, 0x0050($sp) /* 0104C 809E536C 8FAF005C */ lw $t7, 0x005C($sp) /* 01050 809E5370 0C024F46 */ jal func_80093D18 @@ -81,7 +81,7 @@ glabel EnDaikuKakariko_Draw /* 0114C 809E546C 24C655FC */ addiu $a2, $a2, %lo(D_809E55FC) ## $a2 = 809E55FC /* 01150 809E5470 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01154 809E5474 2407047F */ addiu $a3, $zero, 0x047F ## $a3 = 0000047F -/* 01158 809E5478 0C031AD5 */ jal func_800C6B54 +/* 01158 809E5478 0C031AD5 */ jal Graph_CloseDisp /* 0115C 809E547C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 01160 809E5480 8FBF0024 */ lw $ra, 0x0024($sp) /* 01164 809E5484 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s index 31568ef00f..8b8f496c50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s @@ -10,7 +10,7 @@ glabel func_809E5288 /* 00F88 809E52A8 24C655A8 */ addiu $a2, $a2, %lo(D_809E55A8) ## $a2 = 809E55A8 /* 00F8C 809E52AC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 00F90 809E52B0 24070450 */ addiu $a3, $zero, 0x0450 ## $a3 = 00000450 -/* 00F94 809E52B4 0C031AB1 */ jal func_800C6AC4 +/* 00F94 809E52B4 0C031AB1 */ jal Graph_OpenDisp /* 00F98 809E52B8 AFA50030 */ sw $a1, 0x0030($sp) /* 00F9C 809E52BC 8FAF003C */ lw $t7, 0x003C($sp) /* 00FA0 809E52C0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -40,7 +40,7 @@ glabel func_809E5288 /* 00FFC 809E531C 24C655C4 */ addiu $a2, $a2, %lo(D_809E55C4) ## $a2 = 809E55C4 /* 01000 809E5320 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 01004 809E5324 24070459 */ addiu $a3, $zero, 0x0459 ## $a3 = 00000459 -/* 01008 809E5328 0C031AD5 */ jal func_800C6B54 +/* 01008 809E5328 0C031AD5 */ jal Graph_CloseDisp /* 0100C 809E532C 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 01010 809E5330 8FBF0014 */ lw $ra, 0x0014($sp) /* 01014 809E5334 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s index f7cc2ebb6d..6ba2e5193c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s @@ -10,7 +10,7 @@ glabel EnDekubaba_Draw /* 03498 809E8C68 24C69130 */ addiu $a2, $a2, %lo(D_809E9130) ## $a2 = 809E9130 /* 0349C 809E8C6C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 034A0 809E8C70 24070AC0 */ addiu $a3, $zero, 0x0AC0 ## $a3 = 00000AC0 -/* 034A4 809E8C74 0C031AB1 */ jal func_800C6AC4 +/* 034A4 809E8C74 0C031AB1 */ jal Graph_OpenDisp /* 034A8 809E8C78 AFA5004C */ sw $a1, 0x004C($sp) /* 034AC 809E8C7C 0C024F46 */ jal func_80093D18 /* 034B0 809E8C80 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -148,7 +148,7 @@ glabel EnDekubaba_Draw /* 036A4 809E8E74 24C6916C */ addiu $a2, $a2, %lo(D_809E916C) ## $a2 = 809E916C /* 036A8 809E8E78 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 036AC 809E8E7C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 036B0 809E8E80 0C031AD5 */ jal func_800C6B54 +/* 036B0 809E8E80 0C031AD5 */ jal Graph_CloseDisp /* 036B4 809E8E84 24070AF4 */ addiu $a3, $zero, 0x0AF4 ## $a3 = 00000AF4 /* 036B8 809E8E88 8FBF0024 */ lw $ra, 0x0024($sp) /* 036BC 809E8E8C 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s index 1653c8645c..80c9a10a56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s @@ -10,7 +10,7 @@ glabel func_809E858C /* 02DDC 809E85AC 24C69040 */ addiu $a2, $a2, %lo(D_809E9040) ## $a2 = 809E9040 /* 02DE0 809E85B0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02DE4 809E85B4 2407098D */ addiu $a3, $zero, 0x098D ## $a3 = 0000098D -/* 02DE8 809E85B8 0C031AB1 */ jal func_800C6AC4 +/* 02DE8 809E85B8 0C031AB1 */ jal Graph_OpenDisp /* 02DEC 809E85BC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 02DF0 809E85C0 3C01809F */ lui $at, %hi(D_809E91C8) ## $at = 809F0000 /* 02DF4 809E85C4 C42491C8 */ lwc1 $f4, %lo(D_809E91C8)($at) @@ -68,7 +68,7 @@ glabel func_809E858C /* 02EC0 809E8690 24C69068 */ addiu $a2, $a2, %lo(D_809E9068) ## $a2 = 809E9068 /* 02EC4 809E8694 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02EC8 809E8698 240709A4 */ addiu $a3, $zero, 0x09A4 ## $a3 = 000009A4 -/* 02ECC 809E869C 0C031AD5 */ jal func_800C6B54 +/* 02ECC 809E869C 0C031AD5 */ jal Graph_CloseDisp /* 02ED0 809E86A0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 02ED4 809E86A4 8FBF001C */ lw $ra, 0x001C($sp) /* 02ED8 809E86A8 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s index 9f16711e4a..4b882d9963 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s @@ -21,7 +21,7 @@ glabel func_809E86B8 /* 02F34 809E8704 24C6907C */ addiu $a2, $a2, %lo(D_809E907C) ## $a2 = 809E907C /* 02F38 809E8708 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFF98 /* 02F3C 809E870C 240709B7 */ addiu $a3, $zero, 0x09B7 ## $a3 = 000009B7 -/* 02F40 809E8710 0C031AB1 */ jal func_800C6AC4 +/* 02F40 809E8710 0C031AB1 */ jal Graph_OpenDisp /* 02F44 809E8714 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 02F48 809E8718 8E1801C0 */ lw $t8, 0x01C0($s0) ## 000001C0 /* 02F4C 809E871C 3C0F809E */ lui $t7, %hi(func_809E7BB0) ## $t7 = 809E0000 @@ -196,7 +196,7 @@ glabel func_809E86B8 /* 031C0 809E8990 24C690A4 */ addiu $a2, $a2, %lo(D_809E90A4) ## $a2 = 809E90A4 /* 031C4 809E8994 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFF98 /* 031C8 809E8998 24070A09 */ addiu $a3, $zero, 0x0A09 ## $a3 = 00000A09 -/* 031CC 809E899C 0C031AD5 */ jal func_800C6B54 +/* 031CC 809E899C 0C031AD5 */ jal Graph_CloseDisp /* 031D0 809E89A0 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 031D4 809E89A4 8FBF005C */ lw $ra, 0x005C($sp) /* 031D8 809E89A8 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s index d57a0516d6..e1f65580d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s @@ -9,7 +9,7 @@ glabel func_809E89E4 /* 03230 809E8A00 24C690B8 */ addiu $a2, $a2, %lo(D_809E90B8) ## $a2 = 809E90B8 /* 03234 809E8A04 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 03238 809E8A08 24070A13 */ addiu $a3, $zero, 0x0A13 ## $a3 = 00000A13 -/* 0323C 809E8A0C 0C031AB1 */ jal func_800C6AC4 +/* 0323C 809E8A0C 0C031AB1 */ jal Graph_OpenDisp /* 03240 809E8A10 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 03244 809E8A14 8FA20040 */ lw $v0, 0x0040($sp) /* 03248 809E8A18 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -53,7 +53,7 @@ glabel func_809E89E4 /* 032E0 809E8AB0 24C690E0 */ addiu $a2, $a2, %lo(D_809E90E0) ## $a2 = 809E90E0 /* 032E4 809E8AB4 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 032E8 809E8AB8 24070A24 */ addiu $a3, $zero, 0x0A24 ## $a3 = 00000A24 -/* 032EC 809E8ABC 0C031AD5 */ jal func_800C6B54 +/* 032EC 809E8ABC 0C031AD5 */ jal Graph_CloseDisp /* 032F0 809E8AC0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 032F4 809E8AC4 8FBF001C */ lw $ra, 0x001C($sp) /* 032F8 809E8AC8 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s index 74dd082fbe..8e5a510e51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s @@ -10,7 +10,7 @@ glabel func_809E8AD8 /* 03328 809E8AF8 24C690F4 */ addiu $a2, $a2, %lo(D_809E90F4) ## $a2 = 809E90F4 /* 0332C 809E8AFC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 03330 809E8B00 24070A84 */ addiu $a3, $zero, 0x0A84 ## $a3 = 00000A84 -/* 03334 809E8B04 0C031AB1 */ jal func_800C6AC4 +/* 03334 809E8B04 0C031AB1 */ jal Graph_OpenDisp /* 03338 809E8B08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0333C 809E8B0C 8FAF0094 */ lw $t7, 0x0094($sp) /* 03340 809E8B10 0C025011 */ jal func_80094044 @@ -69,7 +69,7 @@ glabel func_809E8AD8 /* 03414 809E8BE4 24C6911C */ addiu $a2, $a2, %lo(D_809E911C) ## $a2 = 809E911C /* 03418 809E8BE8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 0341C 809E8BEC 24070A9B */ addiu $a3, $zero, 0x0A9B ## $a3 = 00000A9B -/* 03420 809E8BF0 0C031AD5 */ jal func_800C6B54 +/* 03420 809E8BF0 0C031AD5 */ jal Graph_CloseDisp /* 03424 809E8BF4 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 03428 809E8BF8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0342C 809E8BFC 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s index e10a65bec4..79a4026813 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s @@ -11,7 +11,7 @@ glabel EnDh_Draw /* 01514 809EC254 24C6C680 */ addiu $a2, $a2, %lo(D_809EC680) ## $a2 = 809EC680 /* 01518 809EC258 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 0151C 809EC25C 2407044B */ addiu $a3, $zero, 0x044B ## $a3 = 0000044B -/* 01520 809EC260 0C031AB1 */ jal func_800C6AC4 +/* 01520 809EC260 0C031AB1 */ jal Graph_OpenDisp /* 01524 809EC264 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01528 809EC268 922E025A */ lbu $t6, 0x025A($s1) ## 0000025A /* 0152C 809EC26C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -217,7 +217,7 @@ glabel EnDh_Draw /* 01834 809EC574 24C6C6A0 */ addiu $a2, $a2, %lo(D_809EC6A0) ## $a2 = 809EC6A0 /* 01838 809EC578 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 0183C 809EC57C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 01840 809EC580 0C031AD5 */ jal func_800C6B54 +/* 01840 809EC580 0C031AD5 */ jal Graph_CloseDisp /* 01844 809EC584 2407048E */ addiu $a3, $zero, 0x048E ## $a3 = 0000048E /* 01848 809EC588 8FBF0044 */ lw $ra, 0x0044($sp) /* 0184C 809EC58C 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s index 2d70da7185..db6920e41e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s @@ -11,7 +11,7 @@ glabel EnDivingGame_Draw /* 016F8 809EEF68 24C6F17C */ addiu $a2, $a2, %lo(D_809EF17C) ## $a2 = 809EF17C /* 016FC 809EEF6C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 01700 809EEF70 240704BC */ addiu $a3, $zero, 0x04BC ## $a3 = 000004BC -/* 01704 809EEF74 0C031AB1 */ jal func_800C6AC4 +/* 01704 809EEF74 0C031AB1 */ jal Graph_OpenDisp /* 01708 809EEF78 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0170C 809EEF7C 0C024F46 */ jal func_80093D18 /* 01710 809EEF80 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -71,7 +71,7 @@ glabel EnDivingGame_Draw /* 017E8 809EF058 24C6F194 */ addiu $a2, $a2, %lo(D_809EF194) ## $a2 = 809EF194 /* 017EC 809EF05C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 017F0 809EF060 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 017F4 809EF064 0C031AD5 */ jal func_800C6B54 +/* 017F4 809EF064 0C031AD5 */ jal Graph_CloseDisp /* 017F8 809EF068 240704D0 */ addiu $a3, $zero, 0x04D0 ## $a3 = 000004D0 /* 017FC 809EF06C 8FBF0034 */ lw $ra, 0x0034($sp) /* 01800 809EF070 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s index bb7845b3b3..c9da3734ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s @@ -11,7 +11,7 @@ glabel EnDntJiji_Draw /* 01344 809F2E24 24C630B8 */ addiu $a2, $a2, %lo(D_809F30B8) ## $a2 = 809F30B8 /* 01348 809F2E28 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 0134C 809F2E2C 240703FB */ addiu $a3, $zero, 0x03FB ## $a3 = 000003FB -/* 01350 809F2E30 0C031AB1 */ jal func_800C6AC4 +/* 01350 809F2E30 0C031AB1 */ jal Graph_OpenDisp /* 01354 809F2E34 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01358 809F2E38 0C024F46 */ jal func_80093D18 /* 0135C 809F2E3C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -87,7 +87,7 @@ glabel EnDntJiji_Draw /* 01470 809F2F50 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 01474 809F2F54 24C630E0 */ addiu $a2, $a2, %lo(D_809F30E0) ## $a2 = 809F30E0 /* 01478 809F2F58 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 0147C 809F2F5C 0C031AD5 */ jal func_800C6B54 +/* 0147C 809F2F5C 0C031AD5 */ jal Graph_CloseDisp /* 01480 809F2F60 24070413 */ addiu $a3, $zero, 0x0413 ## $a3 = 00000413 /* 01484 809F2F64 8FBF002C */ lw $ra, 0x002C($sp) /* 01488 809F2F68 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s index 2717672810..d4b3b63ca0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s @@ -22,7 +22,7 @@ glabel func_809F58E4 /* 02670 809F5930 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02674 809F5934 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 02678 809F5938 240706C5 */ addiu $a3, $zero, 0x06C5 ## $a3 = 000006C5 -/* 0267C 809F593C 0C031AB1 */ jal func_800C6AC4 +/* 0267C 809F593C 0C031AB1 */ jal Graph_OpenDisp /* 02680 809F5940 AFA50038 */ sw $a1, 0x0038($sp) /* 02684 809F5944 8FA80038 */ lw $t0, 0x0038($sp) /* 02688 809F5948 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 @@ -57,7 +57,7 @@ glabel func_809F58E4 /* 026FC 809F59BC 35F900FF */ ori $t9, $t7, 0x00FF ## $t9 = E70000FF /* 02700 809F59C0 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 02704 809F59C4 8FA90040 */ lw $t1, 0x0040($sp) -/* 02708 809F59C8 0C031AD5 */ jal func_800C6B54 +/* 02708 809F59C8 0C031AD5 */ jal Graph_CloseDisp /* 0270C 809F59CC 8D250000 */ lw $a1, 0x0000($t1) ## FB000000 /* 02710 809F59D0 8FBF0014 */ lw $ra, 0x0014($sp) .L809F59D4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s index d2a5d699c0..3267b8f258 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s @@ -20,7 +20,7 @@ glabel func_809F5A6C /* 027F4 809F5AB4 24C65FBC */ addiu $a2, $a2, %lo(D_809F5FBC) ## $a2 = 809F5FBC /* 027F8 809F5AB8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 027FC 809F5ABC 240706FE */ addiu $a3, $zero, 0x06FE ## $a3 = 000006FE -/* 02800 809F5AC0 0C031AB1 */ jal func_800C6AC4 +/* 02800 809F5AC0 0C031AB1 */ jal Graph_OpenDisp /* 02804 809F5AC4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 02808 809F5AC8 0C024F46 */ jal func_80093D18 /* 0280C 809F5ACC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -122,7 +122,7 @@ glabel func_809F5A6C /* 02988 809F5C48 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 0298C 809F5C4C 24C65FE4 */ addiu $a2, $a2, %lo(D_809F5FE4) ## $a2 = 809F5FE4 /* 02990 809F5C50 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02994 809F5C54 0C031AD5 */ jal func_800C6B54 +/* 02994 809F5C54 0C031AD5 */ jal Graph_CloseDisp /* 02998 809F5C58 24070719 */ addiu $a3, $zero, 0x0719 ## $a3 = 00000719 /* 0299C 809F5C5C 8E2E0214 */ lw $t6, 0x0214($s1) ## 00000214 /* 029A0 809F5C60 3C0C809F */ lui $t4, %hi(func_809F49A4) ## $t4 = 809F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s index 13b177b92d..b6c5d47437 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s @@ -11,7 +11,7 @@ glabel func_809F5C98 /* 029FC 809F5CBC 24C65FF8 */ addiu $a2, $a2, %lo(D_809F5FF8) ## $a2 = 809F5FF8 /* 02A00 809F5CC0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02A04 809F5CC4 24070729 */ addiu $a3, $zero, 0x0729 ## $a3 = 00000729 -/* 02A08 809F5CC8 0C031AB1 */ jal func_800C6AC4 +/* 02A08 809F5CC8 0C031AB1 */ jal Graph_OpenDisp /* 02A0C 809F5CCC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 02A10 809F5CD0 0C024F46 */ jal func_80093D18 /* 02A14 809F5CD4 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -61,7 +61,7 @@ glabel func_809F5C98 /* 02AC0 809F5D80 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 02AC4 809F5D84 24C66020 */ addiu $a2, $a2, %lo(D_809F6020) ## $a2 = 809F6020 /* 02AC8 809F5D88 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 02ACC 809F5D8C 0C031AD5 */ jal func_800C6B54 +/* 02ACC 809F5D8C 0C031AD5 */ jal Graph_CloseDisp /* 02AD0 809F5D90 2407073B */ addiu $a3, $zero, 0x073B ## $a3 = 0000073B /* 02AD4 809F5D94 8FBF002C */ lw $ra, 0x002C($sp) /* 02AD8 809F5D98 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s index fb824dffb0..b25b9b31ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s @@ -12,7 +12,7 @@ glabel EnDoor_Draw /* 00BC4 809FCD94 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00BC8 809FCD98 24C6CF10 */ addiu $a2, $a2, %lo(D_809FCF10) ## $a2 = 809FCF10 /* 00BCC 809FCD9C 2407038E */ addiu $a3, $zero, 0x038E ## $a3 = 0000038E -/* 00BD0 809FCDA0 0C031AB1 */ jal func_800C6AC4 +/* 00BD0 809FCDA0 0C031AB1 */ jal Graph_OpenDisp /* 00BD4 809FCDA4 AFA50048 */ sw $a1, 0x0048($sp) /* 00BD8 809FCDA8 8FB90054 */ lw $t9, 0x0054($sp) /* 00BDC 809FCDAC 0C024F46 */ jal func_80093D18 @@ -63,7 +63,7 @@ glabel EnDoor_Draw /* 00C7C 809FCE4C 24C6CF20 */ addiu $a2, $a2, %lo(D_809FCF20) ## $a2 = 809FCF20 /* 00C80 809FCE50 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00C84 809FCE54 240703AD */ addiu $a3, $zero, 0x03AD ## $a3 = 000003AD -/* 00C88 809FCE58 0C031AD5 */ jal func_800C6B54 +/* 00C88 809FCE58 0C031AD5 */ jal Graph_CloseDisp /* 00C8C 809FCE5C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 .L809FCE60: /* 00C90 809FCE60 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s index c7ac77b0e0..d931778fe4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s @@ -9,7 +9,7 @@ glabel EnDu_Draw /* 01460 809FF090 24C6F440 */ addiu $a2, $a2, %lo(D_809FF440) ## $a2 = 809FF440 /* 01464 809FF094 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01468 809FF098 240705BE */ addiu $a3, $zero, 0x05BE ## $a3 = 000005BE -/* 0146C 809FF09C 0C031AB1 */ jal func_800C6AC4 +/* 0146C 809FF09C 0C031AB1 */ jal Graph_OpenDisp /* 01470 809FF0A0 AFA50048 */ sw $a1, 0x0048($sp) /* 01474 809FF0A4 8FA80048 */ lw $t0, 0x0048($sp) /* 01478 809FF0A8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -92,7 +92,7 @@ glabel EnDu_Draw /* 015AC 809FF1DC 24C6F450 */ addiu $a2, $a2, %lo(D_809FF450) ## $a2 = 809FF450 /* 015B0 809FF1E0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 015B4 809FF1E4 240705CF */ addiu $a3, $zero, 0x05CF ## $a3 = 000005CF -/* 015B8 809FF1E8 0C031AD5 */ jal func_800C6B54 +/* 015B8 809FF1E8 0C031AD5 */ jal Graph_CloseDisp /* 015BC 809FF1EC 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 015C0 809FF1F0 8FBF0024 */ lw $ra, 0x0024($sp) /* 015C4 809FF1F4 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s index 560c517b4b..5bf53d7157 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s @@ -57,7 +57,7 @@ glabel EnDyExtra_Draw /* 00348 809FFA38 24C6FCA4 */ addiu $a2, $a2, %lo(D_809FFCA4) ## $a2 = 809FFCA4 /* 0034C 809FFA3C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFD4 /* 00350 809FFA40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00354 809FFA44 0C031AB1 */ jal func_800C6AC4 +/* 00354 809FFA44 0C031AB1 */ jal Graph_OpenDisp /* 00358 809FFA48 24070126 */ addiu $a3, $zero, 0x0126 ## $a3 = 00000126 /* 0035C 809FFA4C 8FAE0094 */ lw $t6, 0x0094($sp) /* 00360 809FFA50 0C024F61 */ jal func_80093D84 @@ -167,7 +167,7 @@ glabel EnDyExtra_Draw /* 00500 809FFBF0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFD4 /* 00504 809FFBF4 24070145 */ addiu $a3, $zero, 0x0145 ## $a3 = 00000145 /* 00508 809FFBF8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0050C 809FFBFC 0C031AD5 */ jal func_800C6B54 +/* 0050C 809FFBFC 0C031AD5 */ jal Graph_CloseDisp /* 00510 809FFC00 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00514 809FFC04 8FBF003C */ lw $ra, 0x003C($sp) /* 00518 809FFC08 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s index b361328423..453110af7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s @@ -11,7 +11,7 @@ glabel EnEiyer_Draw /* 01860 80A01800 24C619D0 */ addiu $a2, $a2, %lo(D_80A019D0) ## $a2 = 80A019D0 /* 01864 80A01804 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 01868 80A01808 240705D6 */ addiu $a3, $zero, 0x05D6 ## $a3 = 000005D6 -/* 0186C 80A0180C 0C031AB1 */ jal func_800C6AC4 +/* 0186C 80A0180C 0C031AB1 */ jal Graph_OpenDisp /* 01870 80A01810 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01874 80A01814 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 /* 01878 80A01818 3C0E80A0 */ lui $t6, %hi(func_80A012F4) ## $t6 = 80A00000 @@ -85,7 +85,7 @@ glabel EnEiyer_Draw /* 01980 80A01920 24C619E0 */ addiu $a2, $a2, %lo(D_80A019E0) ## $a2 = 80A019E0 /* 01984 80A01924 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 01988 80A01928 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0198C 80A0192C 0C031AD5 */ jal func_800C6B54 +/* 0198C 80A0192C 0C031AD5 */ jal Graph_CloseDisp /* 01990 80A01930 24070605 */ addiu $a3, $zero, 0x0605 ## $a3 = 00000605 /* 01994 80A01934 8FBF0034 */ lw $ra, 0x0034($sp) /* 01998 80A01938 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s index 17112aaac0..991313f8d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s @@ -40,7 +40,7 @@ glabel EnElf_Draw /* 03CB8 80A058E8 AFA20068 */ sw $v0, 0x0068($sp) /* 03CBC 80A058EC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 03CC0 80A058F0 24070AAA */ addiu $a3, $zero, 0x0AAA ## $a3 = 00000AAA -/* 03CC4 80A058F4 0C031AB1 */ jal func_800C6AC4 +/* 03CC4 80A058F4 0C031AB1 */ jal Graph_OpenDisp /* 03CC8 80A058F8 AFA50060 */ sw $a1, 0x0060($sp) /* 03CCC 80A058FC 8FAE0084 */ lw $t6, 0x0084($sp) /* 03CD0 80A05900 0C0252D6 */ jal func_80094B58 @@ -453,7 +453,7 @@ glabel EnElf_Draw /* 042B8 80A05EE8 8FAC0084 */ lw $t4, 0x0084($sp) /* 042BC 80A05EEC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 042C0 80A05EF0 24070AE9 */ addiu $a3, $zero, 0x0AE9 ## $a3 = 00000AE9 -/* 042C4 80A05EF4 0C031AD5 */ jal func_800C6B54 +/* 042C4 80A05EF4 0C031AD5 */ jal Graph_CloseDisp /* 042C8 80A05EF8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 .L80A05EFC: /* 042CC 80A05EFC 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s index 3d68b2c61b..cbe8a60c38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s @@ -18,7 +18,7 @@ glabel func_80A0891C /* 00FCC 80A0895C 24C68D10 */ addiu $a2, $a2, %lo(D_80A08D10) ## $a2 = 80A08D10 /* 00FD0 80A08960 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 00FD4 80A08964 24070282 */ addiu $a3, $zero, 0x0282 ## $a3 = 00000282 -/* 00FD8 80A08968 0C031AB1 */ jal func_800C6AC4 +/* 00FD8 80A08968 0C031AB1 */ jal Graph_OpenDisp /* 00FDC 80A0896C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 00FE0 80A08970 8FA40094 */ lw $a0, 0x0094($sp) /* 00FE4 80A08974 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -129,7 +129,7 @@ glabel func_80A0891C /* 01178 80A08B08 24C68D38 */ addiu $a2, $a2, %lo(D_80A08D38) ## $a2 = 80A08D38 /* 0117C 80A08B0C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 01180 80A08B10 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01184 80A08B14 0C031AD5 */ jal func_800C6B54 +/* 01184 80A08B14 0C031AD5 */ jal Graph_CloseDisp /* 01188 80A08B18 240702A6 */ addiu $a3, $zero, 0x02A6 ## $a3 = 000002A6 /* 0118C 80A08B1C 8FBF0044 */ lw $ra, 0x0044($sp) /* 01190 80A08B20 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s index 81638479bb..46da0eff81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s @@ -10,7 +10,7 @@ glabel func_80A09C40 /* 00DC0 80A09C60 24C6A048 */ addiu $a2, $a2, %lo(D_80A0A048) ## $a2 = 80A0A048 /* 00DC4 80A09C64 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00DC8 80A09C68 24070370 */ addiu $a3, $zero, 0x0370 ## $a3 = 00000370 -/* 00DCC 80A09C6C 0C031AB1 */ jal func_800C6AC4 +/* 00DCC 80A09C6C 0C031AB1 */ jal Graph_OpenDisp /* 00DD0 80A09C70 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00DD4 80A09C74 8FAF004C */ lw $t7, 0x004C($sp) /* 00DD8 80A09C78 0C025183 */ jal func_8009460C @@ -67,7 +67,7 @@ glabel func_80A09C40 /* 00EA4 80A09D44 24C6A070 */ addiu $a2, $a2, %lo(D_80A0A070) ## $a2 = 80A0A070 /* 00EA8 80A09D48 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00EAC 80A09D4C 2407037D */ addiu $a3, $zero, 0x037D ## $a3 = 0000037D -/* 00EB0 80A09D50 0C031AD5 */ jal func_800C6B54 +/* 00EB0 80A09D50 0C031AD5 */ jal Graph_CloseDisp /* 00EB4 80A09D54 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00EB8 80A09D58 8FBF001C */ lw $ra, 0x001C($sp) /* 00EBC 80A09D5C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s index b5ed3756f2..048ed6a0dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s @@ -12,7 +12,7 @@ glabel EnExRuppy_Draw /* 00DF4 80A0B204 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00DF8 80A0B208 24C6B4D0 */ addiu $a2, $a2, %lo(D_80A0B4D0) ## $a2 = 80A0B4D0 /* 00DFC 80A0B20C 24070306 */ addiu $a3, $zero, 0x0306 ## $a3 = 00000306 -/* 00E00 80A0B210 0C031AB1 */ jal func_800C6AC4 +/* 00E00 80A0B210 0C031AB1 */ jal Graph_OpenDisp /* 00E04 80A0B214 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00E08 80A0B218 0C024F46 */ jal func_80093D18 /* 00E0C 80A0B21C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -71,7 +71,7 @@ glabel EnExRuppy_Draw /* 00EE0 80A0B2F0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00EE4 80A0B2F4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 00EE8 80A0B2F8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00EEC 80A0B2FC 0C031AD5 */ jal func_800C6B54 +/* 00EEC 80A0B2FC 0C031AD5 */ jal Graph_CloseDisp /* 00EF0 80A0B300 24070310 */ addiu $a3, $zero, 0x0310 ## $a3 = 00000310 .L80A0B304: /* 00EF4 80A0B304 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s index 21ebf65876..40cc359669 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s @@ -31,7 +31,7 @@ glabel EnFd_Draw /* 019D0 80A0D090 240706D7 */ addiu $a3, $zero, 0x06D7 ## $a3 = 000006D7 /* 019D4 80A0D094 AFAD007C */ sw $t5, 0x007C($sp) /* 019D8 80A0D098 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 019DC 80A0D09C 0C031AB1 */ jal func_800C6AC4 +/* 019DC 80A0D09C 0C031AB1 */ jal Graph_OpenDisp /* 019E0 80A0D0A0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 019E4 80A0D0A4 0C034213 */ jal Matrix_Push /* 019E8 80A0D0A8 00000000 */ nop @@ -256,7 +256,7 @@ glabel EnFd_Draw /* 01D24 80A0D3E4 24C6E130 */ addiu $a2, $a2, %lo(D_80A0E130) ## $a2 = 80A0E130 /* 01D28 80A0D3E8 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFC4 /* 01D2C 80A0D3EC 2407071E */ addiu $a3, $zero, 0x071E ## $a3 = 0000071E -/* 01D30 80A0D3F0 0C031AD5 */ jal func_800C6B54 +/* 01D30 80A0D3F0 0C031AD5 */ jal Graph_CloseDisp /* 01D34 80A0D3F4 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 01D38 80A0D3F8 8FBF003C */ lw $ra, 0x003C($sp) /* 01D3C 80A0D3FC 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s index ad8df0459b..95bd2fe9cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s @@ -22,7 +22,7 @@ glabel func_80A0D730 /* 020C0 80A0D780 24C6E140 */ addiu $a2, $a2, %lo(D_80A0E140) ## $a2 = 80A0E140 /* 020C4 80A0D784 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFE0 /* 020C8 80A0D788 240707B1 */ addiu $a3, $zero, 0x07B1 ## $a3 = 000007B1 -/* 020CC 80A0D78C 0C031AB1 */ jal func_800C6AC4 +/* 020CC 80A0D78C 0C031AB1 */ jal Graph_OpenDisp /* 020D0 80A0D790 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 020D4 80A0D794 8FAF00B4 */ lw $t7, 0x00B4($sp) /* 020D8 80A0D798 0000F025 */ or $s8, $zero, $zero ## $s8 = 00000000 @@ -253,7 +253,7 @@ glabel func_80A0D730 /* 02430 80A0DAF0 24C6E160 */ addiu $a2, $a2, %lo(D_80A0E160) ## $a2 = 80A0E160 /* 02434 80A0DAF4 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFE0 /* 02438 80A0DAF8 240707E4 */ addiu $a3, $zero, 0x07E4 ## $a3 = 000007E4 -/* 0243C 80A0DAFC 0C031AD5 */ jal func_800C6B54 +/* 0243C 80A0DAFC 0C031AD5 */ jal Graph_CloseDisp /* 02440 80A0DB00 8D650000 */ lw $a1, 0x0000($t3) ## DB060020 /* 02444 80A0DB04 8FBF005C */ lw $ra, 0x005C($sp) /* 02448 80A0DB08 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s index c118a8181b..9bd00d8301 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s @@ -20,7 +20,7 @@ glabel func_80A0DB44 /* 024CC 80A0DB8C 24C6E170 */ addiu $a2, $a2, %lo(D_80A0E170) ## $a2 = 80A0E170 /* 024D0 80A0DB90 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 024D4 80A0DB94 240707F2 */ addiu $a3, $zero, 0x07F2 ## $a3 = 000007F2 -/* 024D8 80A0DB98 0C031AB1 */ jal func_800C6AC4 +/* 024D8 80A0DB98 0C031AB1 */ jal Graph_OpenDisp /* 024DC 80A0DB9C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 024E0 80A0DBA0 0000F025 */ or $s8, $zero, $zero ## $s8 = 00000000 /* 024E4 80A0DBA4 0C024F61 */ jal func_80093D84 @@ -164,7 +164,7 @@ glabel func_80A0DB44 /* 026F0 80A0DDB0 24C6E190 */ addiu $a2, $a2, %lo(D_80A0E190) ## $a2 = 80A0E190 /* 026F4 80A0DDB4 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 026F8 80A0DDB8 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 026FC 80A0DDBC 0C031AD5 */ jal func_800C6B54 +/* 026FC 80A0DDBC 0C031AD5 */ jal Graph_CloseDisp /* 02700 80A0DDC0 24070817 */ addiu $a3, $zero, 0x0817 ## $a3 = 00000817 /* 02704 80A0DDC4 8FBF004C */ lw $ra, 0x004C($sp) /* 02708 80A0DDC8 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s index 8c5a3f5400..c1ec608501 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s @@ -42,7 +42,7 @@ glabel EnFdFire_Draw /* 007D0 80A0EC80 24C6F0F0 */ addiu $a2, $a2, %lo(D_80A0F0F0) ## $a2 = 80A0F0F0 /* 007D4 80A0EC84 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFAC /* 007D8 80A0EC88 2407023C */ addiu $a3, $zero, 0x023C ## $a3 = 0000023C -/* 007DC 80A0EC8C 0C031AB1 */ jal func_800C6AC4 +/* 007DC 80A0EC8C 0C031AB1 */ jal Graph_OpenDisp /* 007E0 80A0EC90 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 007E4 80A0EC94 8FA200C0 */ lw $v0, 0x00C0($sp) /* 007E8 80A0EC98 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -263,7 +263,7 @@ glabel EnFdFire_Draw /* 00B30 80A0EFE0 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 00B34 80A0EFE4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 00B38 80A0EFE8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00B3C 80A0EFEC 0C031AD5 */ jal func_800C6B54 +/* 00B3C 80A0EFEC 0C031AD5 */ jal Graph_CloseDisp /* 00B40 80A0EFF0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00B44 80A0EFF4 8FBF003C */ lw $ra, 0x003C($sp) /* 00B48 80A0EFF8 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s index efa5014689..dd3c14a543 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s @@ -9,7 +9,7 @@ glabel EnFhgFire_Draw /* 01EF4 80A11154 24C61920 */ addiu $a2, $a2, %lo(D_80A11920) ## $a2 = 80A11920 /* 01EF8 80A11158 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFE4 /* 01EFC 80A1115C 240706BB */ addiu $a3, $zero, 0x06BB ## $a3 = 000006BB -/* 01F00 80A11160 0C031AB1 */ jal func_800C6AC4 +/* 01F00 80A11160 0C031AB1 */ jal Graph_OpenDisp /* 01F04 80A11164 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01F08 80A11168 8FA800B8 */ lw $t0, 0x00B8($sp) /* 01F0C 80A1116C 24010024 */ addiu $at, $zero, 0x0024 ## $at = 00000024 @@ -402,7 +402,7 @@ glabel EnFhgFire_Draw /* 024E0 80A11740 24C619B0 */ addiu $a2, $a2, %lo(D_80A119B0) ## $a2 = 80A119B0 /* 024E4 80A11744 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFE4 /* 024E8 80A11748 2407076C */ addiu $a3, $zero, 0x076C ## $a3 = 0000076C -/* 024EC 80A1174C 0C031AD5 */ jal func_800C6B54 +/* 024EC 80A1174C 0C031AD5 */ jal Graph_CloseDisp /* 024F0 80A11750 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 024F4 80A11754 8FBF003C */ lw $ra, 0x003C($sp) /* 024F8 80A11758 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s index 089002e554..a7f072247d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s @@ -10,7 +10,7 @@ glabel EnFireRock_Draw /* 00ED0 80A12AF0 24C62E58 */ addiu $a2, $a2, %lo(D_80A12E58) ## $a2 = 80A12E58 /* 00ED4 80A12AF4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00ED8 80A12AF8 240702EB */ addiu $a3, $zero, 0x02EB ## $a3 = 000002EB -/* 00EDC 80A12AFC 0C031AB1 */ jal func_800C6AC4 +/* 00EDC 80A12AFC 0C031AB1 */ jal Graph_OpenDisp /* 00EE0 80A12B00 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00EE4 80A12B04 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00EE8 80A12B08 C6060170 */ lwc1 $f6, 0x0170($s0) ## 00000170 @@ -97,7 +97,7 @@ glabel EnFireRock_Draw /* 0102C 80A12C4C 24C62E80 */ addiu $a2, $a2, %lo(D_80A12E80) ## $a2 = 80A12E80 /* 01030 80A12C50 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 01034 80A12C54 24070305 */ addiu $a3, $zero, 0x0305 ## $a3 = 00000305 -/* 01038 80A12C58 0C031AD5 */ jal func_800C6B54 +/* 01038 80A12C58 0C031AD5 */ jal Graph_CloseDisp /* 0103C 80A12C5C 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 01040 80A12C60 8FBF001C */ lw $ra, 0x001C($sp) /* 01044 80A12C64 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s index 69175567f1..409b2280ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s @@ -9,7 +9,7 @@ glabel EnFirefly_Draw /* 01CEC 80A14D5C 24C64FE0 */ addiu $a2, $a2, %lo(D_80A14FE0) ## $a2 = 80A14FE0 /* 01CF0 80A14D60 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01CF4 80A14D64 240706C5 */ addiu $a3, $zero, 0x06C5 ## $a3 = 000006C5 -/* 01CF8 80A14D68 0C031AB1 */ jal func_800C6AC4 +/* 01CF8 80A14D68 0C031AB1 */ jal Graph_OpenDisp /* 01CFC 80A14D6C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01D00 80A14D70 8FAF005C */ lw $t7, 0x005C($sp) /* 01D04 80A14D74 0C024F46 */ jal func_80093D18 @@ -52,7 +52,7 @@ glabel EnFirefly_Draw /* 01D90 80A14E00 24C64FF4 */ addiu $a2, $a2, %lo(D_80A14FF4) ## $a2 = 80A14FF4 /* 01D94 80A14E04 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01D98 80A14E08 240706E3 */ addiu $a3, $zero, 0x06E3 ## $a3 = 000006E3 -/* 01D9C 80A14E0C 0C031AD5 */ jal func_800C6B54 +/* 01D9C 80A14E0C 0C031AD5 */ jal Graph_CloseDisp /* 01DA0 80A14E10 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 01DA4 80A14E14 8FBF002C */ lw $ra, 0x002C($sp) /* 01DA8 80A14E18 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s index 84ff55c883..0f68ef79a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s @@ -9,7 +9,7 @@ glabel func_80A14E28 /* 01DD4 80A14E44 24C65008 */ addiu $a2, $a2, %lo(D_80A15008) ## $a2 = 80A15008 /* 01DD8 80A14E48 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01DDC 80A14E4C 240706EF */ addiu $a3, $zero, 0x06EF ## $a3 = 000006EF -/* 01DE0 80A14E50 0C031AB1 */ jal func_800C6AC4 +/* 01DE0 80A14E50 0C031AB1 */ jal Graph_OpenDisp /* 01DE4 80A14E54 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01DE8 80A14E58 8FAF005C */ lw $t7, 0x005C($sp) /* 01DEC 80A14E5C 0C024F61 */ jal func_80093D84 @@ -52,7 +52,7 @@ glabel func_80A14E28 /* 01E78 80A14EE8 24C6501C */ addiu $a2, $a2, %lo(D_80A1501C) ## $a2 = 80A1501C /* 01E7C 80A14EEC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01E80 80A14EF0 2407070D */ addiu $a3, $zero, 0x070D ## $a3 = 0000070D -/* 01E84 80A14EF4 0C031AD5 */ jal func_800C6B54 +/* 01E84 80A14EF4 0C031AD5 */ jal Graph_CloseDisp /* 01E88 80A14EF8 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 01E8C 80A14EFC 8FBF002C */ lw $ra, 0x002C($sp) /* 01E90 80A14F00 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s index 870db11dfd..847f966ee4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s @@ -10,7 +10,7 @@ glabel EnFloormas_Draw /* 02D64 80A1A274 24C6A514 */ addiu $a2, $a2, %lo(D_80A1A514) ## $a2 = 80A1A514 /* 02D68 80A1A278 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02D6C 80A1A27C 2407090E */ addiu $a3, $zero, 0x090E ## $a3 = 0000090E -/* 02D70 80A1A280 0C031AB1 */ jal func_800C6AC4 +/* 02D70 80A1A280 0C031AB1 */ jal Graph_OpenDisp /* 02D74 80A1A284 AFA50048 */ sw $a1, 0x0048($sp) /* 02D78 80A1A288 0C024F46 */ jal func_80093D18 /* 02D7C 80A1A28C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -57,7 +57,7 @@ glabel EnFloormas_Draw /* 02E18 80A1A328 24C6A528 */ addiu $a2, $a2, %lo(D_80A1A528) ## $a2 = 80A1A528 /* 02E1C 80A1A32C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02E20 80A1A330 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02E24 80A1A334 0C031AD5 */ jal func_800C6B54 +/* 02E24 80A1A334 0C031AD5 */ jal Graph_CloseDisp /* 02E28 80A1A338 24070924 */ addiu $a3, $zero, 0x0924 ## $a3 = 00000924 /* 02E2C 80A1A33C 8FBF002C */ lw $ra, 0x002C($sp) /* 02E30 80A1A340 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s index 72b038cfa5..85ef34e18c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s @@ -10,7 +10,7 @@ glabel func_80A1A350 /* 02E60 80A1A370 24C6A53C */ addiu $a2, $a2, %lo(D_80A1A53C) ## $a2 = 80A1A53C /* 02E64 80A1A374 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02E68 80A1A378 24070930 */ addiu $a3, $zero, 0x0930 ## $a3 = 00000930 -/* 02E6C 80A1A37C 0C031AB1 */ jal func_800C6AC4 +/* 02E6C 80A1A37C 0C031AB1 */ jal Graph_OpenDisp /* 02E70 80A1A380 AFA50048 */ sw $a1, 0x0048($sp) /* 02E74 80A1A384 0C024F61 */ jal func_80093D84 /* 02E78 80A1A388 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -57,7 +57,7 @@ glabel func_80A1A350 /* 02F14 80A1A424 24C6A550 */ addiu $a2, $a2, %lo(D_80A1A550) ## $a2 = 80A1A550 /* 02F18 80A1A428 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02F1C 80A1A42C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02F20 80A1A430 0C031AD5 */ jal func_800C6B54 +/* 02F20 80A1A430 0C031AD5 */ jal Graph_CloseDisp /* 02F24 80A1A434 24070946 */ addiu $a3, $zero, 0x0946 ## $a3 = 00000946 /* 02F28 80A1A438 8FBF002C */ lw $ra, 0x002C($sp) /* 02F2C 80A1A43C 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s index 6ebae3c342..d693bc8bd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s @@ -17,7 +17,7 @@ glabel func_80A1CC2C /* 022C4 80A1CC64 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 022C8 80A1CC68 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 022CC 80A1CC6C 240706C7 */ addiu $a3, $zero, 0x06C7 ## $a3 = 000006C7 -/* 022D0 80A1CC70 0C031AB1 */ jal func_800C6AC4 +/* 022D0 80A1CC70 0C031AB1 */ jal Graph_OpenDisp /* 022D4 80A1CC74 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 022D8 80A1CC78 0C034213 */ jal Matrix_Push /* 022DC 80A1CC7C 00000000 */ nop @@ -55,7 +55,7 @@ glabel func_80A1CC2C /* 0235C 80A1CCFC 24C6D258 */ addiu $a2, $a2, %lo(D_80A1D258) ## $a2 = 80A1D258 /* 02360 80A1CD00 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02364 80A1CD04 240706CD */ addiu $a3, $zero, 0x06CD ## $a3 = 000006CD -/* 02368 80A1CD08 0C031AD5 */ jal func_800C6B54 +/* 02368 80A1CD08 0C031AD5 */ jal Graph_CloseDisp /* 0236C 80A1CD0C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 02370 80A1CD10 8FBF001C */ lw $ra, 0x001C($sp) .L80A1CD14: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s index 15041a8148..53b0ef39a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s @@ -12,7 +12,7 @@ glabel func_80A1CD24 /* 023AC 80A1CD4C 24C6D268 */ addiu $a2, $a2, %lo(D_80A1D268) ## $a2 = 80A1D268 /* 023B0 80A1CD50 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 023B4 80A1CD54 240706DA */ addiu $a3, $zero, 0x06DA ## $a3 = 000006DA -/* 023B8 80A1CD58 0C031AB1 */ jal func_800C6AC4 +/* 023B8 80A1CD58 0C031AB1 */ jal Graph_OpenDisp /* 023BC 80A1CD5C AFA50058 */ sw $a1, 0x0058($sp) /* 023C0 80A1CD60 8FB9006C */ lw $t9, 0x006C($sp) /* 023C4 80A1CD64 0C024F46 */ jal func_80093D18 @@ -175,7 +175,7 @@ glabel func_80A1CD24 /* 02624 80A1CFC4 24C6D278 */ addiu $a2, $a2, %lo(D_80A1D278) ## $a2 = 80A1D278 /* 02628 80A1CFC8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 0262C 80A1CFCC 24070718 */ addiu $a3, $zero, 0x0718 ## $a3 = 00000718 -/* 02630 80A1CFD0 0C031AD5 */ jal func_800C6B54 +/* 02630 80A1CFD0 0C031AD5 */ jal Graph_CloseDisp /* 02634 80A1CFD4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 02638 80A1CFD8 8FBF002C */ lw $ra, 0x002C($sp) /* 0263C 80A1CFDC 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s index 36543956e4..f75d47450e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s @@ -9,7 +9,7 @@ glabel EnFu_Draw /* 00AB8 80A1E2C8 24C6E470 */ addiu $a2, $a2, %lo(D_80A1E470) ## $a2 = 80A1E470 /* 00ABC 80A1E2CC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00AC0 80A1E2D0 24070305 */ addiu $a3, $zero, 0x0305 ## $a3 = 00000305 -/* 00AC4 80A1E2D4 0C031AB1 */ jal func_800C6AC4 +/* 00AC4 80A1E2D4 0C031AB1 */ jal Graph_OpenDisp /* 00AC8 80A1E2D8 AFA5004C */ sw $a1, 0x004C($sp) /* 00ACC 80A1E2DC 8FAF005C */ lw $t7, 0x005C($sp) /* 00AD0 80A1E2E0 0C0250F2 */ jal func_800943C8 @@ -77,7 +77,7 @@ glabel EnFu_Draw /* 00BC8 80A1E3D8 24C6E480 */ addiu $a2, $a2, %lo(D_80A1E480) ## $a2 = 80A1E480 /* 00BCC 80A1E3DC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00BD0 80A1E3E0 24070317 */ addiu $a3, $zero, 0x0317 ## $a3 = 00000317 -/* 00BD4 80A1E3E4 0C031AD5 */ jal func_800C6B54 +/* 00BD4 80A1E3E4 0C031AD5 */ jal Graph_CloseDisp /* 00BD8 80A1E3E8 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 00BDC 80A1E3EC 8FBF002C */ lw $ra, 0x002C($sp) /* 00BE0 80A1E3F0 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s index a8101143a9..018ae3a484 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s @@ -20,7 +20,7 @@ glabel func_80A1F814 /* 012BC 80A1F85C 24C6FC40 */ addiu $a2, $a2, %lo(D_80A1FC40) ## $a2 = 80A1FC40 /* 012C0 80A1F860 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 012C4 80A1F864 240704A7 */ addiu $a3, $zero, 0x04A7 ## $a3 = 000004A7 -/* 012C8 80A1F868 0C031AB1 */ jal func_800C6AC4 +/* 012C8 80A1F868 0C031AB1 */ jal Graph_OpenDisp /* 012CC 80A1F86C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 012D0 80A1F870 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 /* 012D4 80A1F874 0C024F61 */ jal func_80093D84 @@ -192,7 +192,7 @@ glabel func_80A1F814 /* 01550 80A1FAF0 24C6FC60 */ addiu $a2, $a2, %lo(D_80A1FC60) ## $a2 = 80A1FC60 /* 01554 80A1FAF4 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 01558 80A1FAF8 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 0155C 80A1FAFC 0C031AD5 */ jal func_800C6B54 +/* 0155C 80A1FAFC 0C031AD5 */ jal Graph_CloseDisp /* 01560 80A1FB00 240704DB */ addiu $a3, $zero, 0x04DB ## $a3 = 000004DB /* 01564 80A1FB04 8FBF0054 */ lw $ra, 0x0054($sp) /* 01568 80A1FB08 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s index 9920bfad8a..7bed7467a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s @@ -15,7 +15,7 @@ glabel EnFz_Draw /* 014C0 80A21280 24C61C60 */ addiu $a2, $a2, %lo(D_80A21C60) ## $a2 = 80A21C60 /* 014C4 80A21284 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 014C8 80A21288 2407048F */ addiu $a3, $zero, 0x048F ## $a3 = 0000048F -/* 014CC 80A2128C 0C031AB1 */ jal func_800C6AC4 +/* 014CC 80A2128C 0C031AB1 */ jal Graph_OpenDisp /* 014D0 80A21290 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 014D4 80A21294 8FAA0080 */ lw $t2, 0x0080($sp) /* 014D8 80A21298 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 @@ -123,7 +123,7 @@ glabel EnFz_Draw /* 01668 80A21428 24C61C80 */ addiu $a2, $a2, %lo(D_80A21C80) ## $a2 = 80A21C80 /* 0166C 80A2142C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 01670 80A21430 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01674 80A21434 0C031AD5 */ jal func_800C6B54 +/* 01674 80A21434 0C031AD5 */ jal Graph_CloseDisp /* 01678 80A21438 240704B0 */ addiu $a3, $zero, 0x04B0 ## $a3 = 000004B0 /* 0167C 80A2143C 8FA40080 */ lw $a0, 0x0080($sp) /* 01680 80A21440 0C28862A */ jal func_80A218A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s index e50839e289..a8eab1ef6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s @@ -19,7 +19,7 @@ glabel func_80A218A8 /* 01B2C 80A218EC 24C61C90 */ addiu $a2, $a2, %lo(D_80A21C90) ## $a2 = 80A21C90 /* 01B30 80A218F0 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 01B34 80A218F4 24070568 */ addiu $a3, $zero, 0x0568 ## $a3 = 00000568 -/* 01B38 80A218F8 0C031AB1 */ jal func_800C6AC4 +/* 01B38 80A218F8 0C031AB1 */ jal Graph_OpenDisp /* 01B3C 80A218FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01B40 80A21900 8FAF00C4 */ lw $t7, 0x00C4($sp) /* 01B44 80A21904 0C024F61 */ jal func_80093D84 @@ -165,7 +165,7 @@ glabel func_80A218A8 /* 01D68 80A21B28 24C61CB0 */ addiu $a2, $a2, %lo(D_80A21CB0) ## $a2 = 80A21CB0 /* 01D6C 80A21B2C 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 01D70 80A21B30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01D74 80A21B34 0C031AD5 */ jal func_800C6B54 +/* 01D74 80A21B34 0C031AD5 */ jal Graph_CloseDisp /* 01D78 80A21B38 24070596 */ addiu $a3, $zero, 0x0596 ## $a3 = 00000596 /* 01D7C 80A21B3C 8FBF0064 */ lw $ra, 0x0064($sp) /* 01D80 80A21B40 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s index 07da995226..e7c6697cc2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s @@ -10,7 +10,7 @@ glabel func_80A22FDC /* 0113C 80A22FFC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 01140 80A23000 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01144 80A23004 24070396 */ addiu $a3, $zero, 0x0396 ## $a3 = 00000396 -/* 01148 80A23008 0C031AB1 */ jal func_800C6AC4 +/* 01148 80A23008 0C031AB1 */ jal Graph_OpenDisp /* 0114C 80A2300C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01150 80A23010 8FB8004C */ lw $t8, 0x004C($sp) /* 01154 80A23014 0C024F46 */ jal func_80093D18 @@ -43,7 +43,7 @@ glabel func_80A22FDC /* 011C0 80A23080 24C63A78 */ addiu $a2, $a2, %lo(D_80A23A78) ## $a2 = 80A23A78 /* 011C4 80A23084 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 011C8 80A23088 240703A0 */ addiu $a3, $zero, 0x03A0 ## $a3 = 000003A0 -/* 011CC 80A2308C 0C031AD5 */ jal func_800C6B54 +/* 011CC 80A2308C 0C031AD5 */ jal Graph_CloseDisp /* 011D0 80A23090 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 .L80A23094: /* 011D4 80A23094 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s index 897da94461..76a0fff28d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s @@ -12,7 +12,7 @@ glabel func_80A230A8 /* 01210 80A230D0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01214 80A230D4 24C63A8C */ addiu $a2, $a2, %lo(D_80A23A8C) ## $a2 = 80A23A8C /* 01218 80A230D8 240703B7 */ addiu $a3, $zero, 0x03B7 ## $a3 = 000003B7 -/* 0121C 80A230DC 0C031AB1 */ jal func_800C6AC4 +/* 0121C 80A230DC 0C031AB1 */ jal Graph_OpenDisp /* 01220 80A230E0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01224 80A230E4 0C024F46 */ jal func_80093D18 /* 01228 80A230E8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -71,7 +71,7 @@ glabel func_80A230A8 /* 012FC 80A231BC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 01300 80A231C0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 01304 80A231C4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01308 80A231C8 0C031AD5 */ jal func_800C6B54 +/* 01308 80A231C8 0C031AD5 */ jal Graph_CloseDisp /* 0130C 80A231CC 240703C1 */ addiu $a3, $zero, 0x03C1 ## $a3 = 000003C1 .L80A231D0: /* 01310 80A231D0 8FAE0050 */ lw $t6, 0x0050($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s index ecf986f110..5de63cfc96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s @@ -20,7 +20,7 @@ glabel func_80A234D4 /* 0165C 80A2351C 24C63AC8 */ addiu $a2, $a2, %lo(D_80A23AC8) ## $a2 = 80A23AC8 /* 01660 80A23520 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 01664 80A23524 24070431 */ addiu $a3, $zero, 0x0431 ## $a3 = 00000431 -/* 01668 80A23528 0C031AB1 */ jal func_800C6AC4 +/* 01668 80A23528 0C031AB1 */ jal Graph_OpenDisp /* 0166C 80A2352C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01670 80A23530 0C024F46 */ jal func_80093D18 /* 01674 80A23534 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -115,7 +115,7 @@ glabel func_80A234D4 /* 017CC 80A2368C 24C63AF0 */ addiu $a2, $a2, %lo(D_80A23AF0) ## $a2 = 80A23AF0 /* 017D0 80A23690 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 017D4 80A23694 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 017D8 80A23698 0C031AD5 */ jal func_800C6B54 +/* 017D8 80A23698 0C031AD5 */ jal Graph_CloseDisp /* 017DC 80A2369C 24070447 */ addiu $a3, $zero, 0x0447 ## $a3 = 00000447 /* 017E0 80A236A0 8FBF004C */ lw $ra, 0x004C($sp) /* 017E4 80A236A4 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s index d65f78adf8..5993bf9020 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s @@ -9,7 +9,7 @@ glabel func_80A24884 /* 00B40 80A248A0 24C67E80 */ addiu $a2, $a2, %lo(D_80A27E80) ## $a2 = 80A27E80 /* 00B44 80A248A4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00B48 80A248A8 24070234 */ addiu $a3, $zero, 0x0234 ## $a3 = 00000234 -/* 00B4C 80A248AC 0C031AB1 */ jal func_800C6AC4 +/* 00B4C 80A248AC 0C031AB1 */ jal Graph_OpenDisp /* 00B50 80A248B0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00B54 80A248B4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00B58 80A248B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -76,7 +76,7 @@ glabel func_80A24884 /* 00C44 80A249A4 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 00C48 80A249A8 8FAB0050 */ lw $t3, 0x0050($sp) /* 00C4C 80A249AC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 00C50 80A249B0 0C031AD5 */ jal func_800C6B54 +/* 00C50 80A249B0 0C031AD5 */ jal Graph_CloseDisp /* 00C54 80A249B4 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 00C58 80A249B8 8FBF001C */ lw $ra, 0x001C($sp) /* 00C5C 80A249BC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s index ccfcc85e3a..a2153701de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s @@ -10,7 +10,7 @@ glabel EnGb_Draw /* 00D4C 80A2FECC 24C607A0 */ addiu $a2, $a2, %lo(D_80A307A0) ## $a2 = 80A307A0 /* 00D50 80A2FED0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00D54 80A2FED4 240702FB */ addiu $a3, $zero, 0x02FB ## $a3 = 000002FB -/* 00D58 80A2FED8 0C031AB1 */ jal func_800C6AC4 +/* 00D58 80A2FED8 0C031AB1 */ jal Graph_OpenDisp /* 00D5C 80A2FEDC AFA5004C */ sw $a1, 0x004C($sp) /* 00D60 80A2FEE0 0C024F46 */ jal func_80093D18 /* 00D64 80A2FEE4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -77,7 +77,7 @@ glabel EnGb_Draw /* 00E54 80A2FFD4 24C607B0 */ addiu $a2, $a2, %lo(D_80A307B0) ## $a2 = 80A307B0 /* 00E58 80A2FFD8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00E5C 80A2FFDC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00E60 80A2FFE0 0C031AD5 */ jal func_800C6B54 +/* 00E60 80A2FFE0 0C031AD5 */ jal Graph_CloseDisp /* 00E64 80A2FFE4 2407031C */ addiu $a3, $zero, 0x031C ## $a3 = 0000031C /* 00E68 80A2FFE8 8FBF002C */ lw $ra, 0x002C($sp) /* 00E6C 80A2FFEC 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s index 52333a4a8b..32a538a615 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s @@ -19,7 +19,7 @@ glabel func_80A30350 /* 01214 80A30394 24C607C0 */ addiu $a2, $a2, %lo(D_80A307C0) ## $a2 = 80A307C0 /* 01218 80A30398 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 0121C 80A3039C 24070392 */ addiu $a3, $zero, 0x0392 ## $a3 = 00000392 -/* 01220 80A303A0 0C031AB1 */ jal func_800C6AC4 +/* 01220 80A303A0 0C031AB1 */ jal Graph_OpenDisp /* 01224 80A303A4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01228 80A303A8 0C024F61 */ jal func_80093D84 /* 0122C 80A303AC 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -172,7 +172,7 @@ glabel func_80A30350 /* 01470 80A305F0 24C607E0 */ addiu $a2, $a2, %lo(D_80A307E0) ## $a2 = 80A307E0 /* 01474 80A305F4 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 01478 80A305F8 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 0147C 80A305FC 0C031AD5 */ jal func_800C6B54 +/* 0147C 80A305FC 0C031AD5 */ jal Graph_CloseDisp /* 01480 80A30600 240703C2 */ addiu $a3, $zero, 0x03C2 ## $a3 = 000003C2 /* 01484 80A30604 8FBF006C */ lw $ra, 0x006C($sp) /* 01488 80A30608 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s index e8c7dc8b42..fd73636131 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s @@ -9,7 +9,7 @@ glabel EnGe1_Draw /* 01CF4 80A32664 24C628A8 */ addiu $a2, $a2, %lo(D_80A328A8) ## $a2 = 80A328A8 /* 01CF8 80A32668 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01CFC 80A3266C 240705A2 */ addiu $a3, $zero, 0x05A2 ## $a3 = 000005A2 -/* 01D00 80A32670 0C031AB1 */ jal func_800C6AC4 +/* 01D00 80A32670 0C031AB1 */ jal Graph_OpenDisp /* 01D04 80A32674 AFA5004C */ sw $a1, 0x004C($sp) /* 01D08 80A32678 8FAF005C */ lw $t7, 0x005C($sp) /* 01D0C 80A3267C 0C0250F2 */ jal func_800943C8 @@ -56,7 +56,7 @@ glabel EnGe1_Draw /* 01DB0 80A32720 24C628B8 */ addiu $a2, $a2, %lo(D_80A328B8) ## $a2 = 80A328B8 /* 01DB4 80A32724 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01DB8 80A32728 240705B3 */ addiu $a3, $zero, 0x05B3 ## $a3 = 000005B3 -/* 01DBC 80A3272C 0C031AD5 */ jal func_800C6B54 +/* 01DBC 80A3272C 0C031AD5 */ jal Graph_CloseDisp /* 01DC0 80A32730 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 01DC4 80A32734 8FBF002C */ lw $ra, 0x002C($sp) /* 01DC8 80A32738 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s index 6619f26c94..e8bd523143 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s @@ -10,7 +10,7 @@ glabel func_80A32598 /* 01C48 80A325B8 24C62888 */ addiu $a2, $a2, %lo(D_80A32888) ## $a2 = 80A32888 /* 01C4C 80A325BC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 01C50 80A325C0 2407058B */ addiu $a3, $zero, 0x058B ## $a3 = 0000058B -/* 01C54 80A325C4 0C031AB1 */ jal func_800C6AC4 +/* 01C54 80A325C4 0C031AB1 */ jal Graph_OpenDisp /* 01C58 80A325C8 AFA50030 */ sw $a1, 0x0030($sp) /* 01C5C 80A325CC 8FAF003C */ lw $t7, 0x003C($sp) /* 01C60 80A325D0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -38,7 +38,7 @@ glabel func_80A32598 /* 01CB4 80A32624 24C62898 */ addiu $a2, $a2, %lo(D_80A32898) ## $a2 = 80A32898 /* 01CB8 80A32628 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 01CBC 80A3262C 24070593 */ addiu $a3, $zero, 0x0593 ## $a3 = 00000593 -/* 01CC0 80A32630 0C031AD5 */ jal func_800C6B54 +/* 01CC0 80A32630 0C031AD5 */ jal Graph_CloseDisp /* 01CC4 80A32634 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01CC8 80A32638 8FBF0014 */ lw $ra, 0x0014($sp) /* 01CCC 80A3263C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s index 06a51a35e7..231337257a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s @@ -10,7 +10,7 @@ glabel EnGe2_Draw /* 01630 80A34200 24C6441C */ addiu $a2, $a2, %lo(D_80A3441C) ## $a2 = 80A3441C /* 01634 80A34204 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01638 80A34208 240704FA */ addiu $a3, $zero, 0x04FA ## $a3 = 000004FA -/* 0163C 80A3420C 0C031AB1 */ jal func_800C6AC4 +/* 0163C 80A3420C 0C031AB1 */ jal Graph_OpenDisp /* 01640 80A34210 AFA5004C */ sw $a1, 0x004C($sp) /* 01644 80A34214 0C0250F2 */ jal func_800943C8 /* 01648 80A34218 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -59,7 +59,7 @@ glabel EnGe2_Draw /* 016F4 80A342C4 24C6442C */ addiu $a2, $a2, %lo(D_80A3442C) ## $a2 = 80A3442C /* 016F8 80A342C8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 016FC 80A342CC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01700 80A342D0 0C031AD5 */ jal func_800C6B54 +/* 01700 80A342D0 0C031AD5 */ jal Graph_CloseDisp /* 01704 80A342D4 2407050B */ addiu $a3, $zero, 0x050B ## $a3 = 0000050B /* 01708 80A342D8 8FBF002C */ lw $ra, 0x002C($sp) /* 0170C 80A342DC 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s index 08e1dbf351..b9f32ca1fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s @@ -10,7 +10,7 @@ glabel EnGe3_Draw /* 00A60 80A35080 24C65200 */ addiu $a2, $a2, %lo(D_80A35200) ## $a2 = 80A35200 /* 00A64 80A35084 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00A68 80A35088 24070266 */ addiu $a3, $zero, 0x0266 ## $a3 = 00000266 -/* 00A6C 80A3508C 0C031AB1 */ jal func_800C6AC4 +/* 00A6C 80A3508C 0C031AB1 */ jal Graph_OpenDisp /* 00A70 80A35090 AFA5004C */ sw $a1, 0x004C($sp) /* 00A74 80A35094 0C0250F2 */ jal func_800943C8 /* 00A78 80A35098 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -59,7 +59,7 @@ glabel EnGe3_Draw /* 00B24 80A35144 24C65210 */ addiu $a2, $a2, %lo(D_80A35210) ## $a2 = 80A35210 /* 00B28 80A35148 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00B2C 80A3514C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00B30 80A35150 0C031AD5 */ jal func_800C6B54 +/* 00B30 80A35150 0C031AD5 */ jal Graph_CloseDisp /* 00B34 80A35154 24070277 */ addiu $a3, $zero, 0x0277 ## $a3 = 00000277 /* 00B38 80A35158 8FBF002C */ lw $ra, 0x002C($sp) /* 00B3C 80A3515C 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s index 61ffd4d864..37a7935393 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s @@ -31,7 +31,7 @@ glabel func_80A34E58 /* 008A0 80A34EC0 24C651E0 */ addiu $a2, $a2, %lo(D_80A351E0) ## $a2 = 80A351E0 /* 008A4 80A34EC4 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 008A8 80A34EC8 24070223 */ addiu $a3, $zero, 0x0223 ## $a3 = 00000223 -/* 008AC 80A34ECC 0C031AB1 */ jal func_800C6AC4 +/* 008AC 80A34ECC 0C031AB1 */ jal Graph_OpenDisp /* 008B0 80A34ED0 AFA50050 */ sw $a1, 0x0050($sp) /* 008B4 80A34ED4 8FA2005C */ lw $v0, 0x005C($sp) /* 008B8 80A34ED8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 @@ -107,7 +107,7 @@ glabel func_80A34E58 /* 009BC 80A34FDC 3C0680A3 */ lui $a2, %hi(D_80A351F0) ## $a2 = 80A30000 /* 009C0 80A34FE0 24C651F0 */ addiu $a2, $a2, %lo(D_80A351F0) ## $a2 = 80A351F0 /* 009C4 80A34FE4 24070236 */ addiu $a3, $zero, 0x0236 ## $a3 = 00000236 -/* 009C8 80A34FE8 0C031AD5 */ jal func_800C6B54 +/* 009C8 80A34FE8 0C031AD5 */ jal Graph_CloseDisp /* 009CC 80A34FEC 8D650000 */ lw $a1, 0x0000($t3) ## 8CAAE6FF /* 009D0 80A34FF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A34FF4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s index fbbd4f9452..333cc67312 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s @@ -13,7 +13,7 @@ glabel EnGeldB_Draw /* 047B4 80A39AC4 24C6A200 */ addiu $a2, $a2, %lo(D_80A3A200) ## $a2 = 80A3A200 /* 047B8 80A39AC8 27A400BC */ addiu $a0, $sp, 0x00BC ## $a0 = FFFFFFE4 /* 047BC 80A39ACC 24070A70 */ addiu $a3, $zero, 0x0A70 ## $a3 = 00000A70 -/* 047C0 80A39AD0 0C031AB1 */ jal func_800C6AC4 +/* 047C0 80A39AD0 0C031AB1 */ jal Graph_OpenDisp /* 047C4 80A39AD4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 047C8 80A39AD8 868F0312 */ lh $t7, 0x0312($s4) ## 00000312 /* 047CC 80A39ADC 26900188 */ addiu $s0, $s4, 0x0188 ## $s0 = 00000188 @@ -232,7 +232,7 @@ glabel EnGeldB_Draw /* 04AE8 80A39DF8 24C6A210 */ addiu $a2, $a2, %lo(D_80A3A210) ## $a2 = 80A3A210 /* 04AEC 80A39DFC 27A400BC */ addiu $a0, $sp, 0x00BC ## $a0 = FFFFFFE4 /* 04AF0 80A39E00 24070AB8 */ addiu $a3, $zero, 0x0AB8 ## $a3 = 00000AB8 -/* 04AF4 80A39E04 0C031AD5 */ jal func_800C6B54 +/* 04AF4 80A39E04 0C031AD5 */ jal Graph_CloseDisp /* 04AF8 80A39E08 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 04AFC 80A39E0C 8FBF004C */ lw $ra, 0x004C($sp) /* 04B00 80A39E10 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s index b2166457d3..70a51ab755 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s @@ -10,7 +10,7 @@ glabel func_80A39688 /* 04398 80A396A8 24C6A1E0 */ addiu $a2, $a2, %lo(D_80A3A1E0) ## $a2 = 80A3A1E0 /* 0439C 80A396AC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 043A0 80A396B0 240709CB */ addiu $a3, $zero, 0x09CB ## $a3 = 000009CB -/* 043A4 80A396B4 0C031AB1 */ jal func_800C6AC4 +/* 043A4 80A396B4 0C031AB1 */ jal Graph_OpenDisp /* 043A8 80A396B8 AFA50048 */ sw $a1, 0x0048($sp) /* 043AC 80A396BC 8FA20054 */ lw $v0, 0x0054($sp) /* 043B0 80A396C0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 @@ -100,7 +100,7 @@ glabel func_80A39688 /* 044EC 80A397FC 3C0680A4 */ lui $a2, %hi(D_80A3A1F0) ## $a2 = 80A40000 /* 044F0 80A39800 24C6A1F0 */ addiu $a2, $a2, %lo(D_80A3A1F0) ## $a2 = 80A3A1F0 /* 044F4 80A39804 240709E1 */ addiu $a3, $zero, 0x09E1 ## $a3 = 000009E1 -/* 044F8 80A39808 0C031AD5 */ jal func_800C6B54 +/* 044F8 80A39808 0C031AD5 */ jal Graph_CloseDisp /* 044FC 80A3980C 8DE50000 */ lw $a1, 0x0000($t7) ## 8CAAE6FF /* 04500 80A39810 8FBF0014 */ lw $ra, 0x0014($sp) /* 04504 80A39814 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s index 8d76068fcc..c8af896d90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s @@ -9,7 +9,7 @@ glabel func_80A3E1EC /* 00B28 80A3E208 24C6E40C */ addiu $a2, $a2, %lo(D_80A3E40C) ## $a2 = 80A3E40C /* 00B2C 80A3E20C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00B30 80A3E210 24070265 */ addiu $a3, $zero, 0x0265 ## $a3 = 00000265 -/* 00B34 80A3E214 0C031AB1 */ jal func_800C6AC4 +/* 00B34 80A3E214 0C031AB1 */ jal Graph_OpenDisp /* 00B38 80A3E218 AFA5004C */ sw $a1, 0x004C($sp) /* 00B3C 80A3E21C 8FAF005C */ lw $t7, 0x005C($sp) /* 00B40 80A3E220 0C024F46 */ jal func_80093D18 @@ -70,7 +70,7 @@ glabel func_80A3E1EC /* 00C1C 80A3E2FC 24C6E41C */ addiu $a2, $a2, %lo(D_80A3E41C) ## $a2 = 80A3E41C /* 00C20 80A3E300 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00C24 80A3E304 24070275 */ addiu $a3, $zero, 0x0275 ## $a3 = 00000275 -/* 00C28 80A3E308 0C031AD5 */ jal func_800C6B54 +/* 00C28 80A3E308 0C031AD5 */ jal Graph_CloseDisp /* 00C2C 80A3E30C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00C30 80A3E310 0C28F824 */ jal func_80A3E090 /* 00C34 80A3E314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s index 9a2b76bdb9..6789a632e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s @@ -10,7 +10,7 @@ glabel EnGo_Draw /* 02EE8 80A41458 24C61C60 */ addiu $a2, $a2, %lo(D_80A41C60) ## $a2 = 80A41C60 /* 02EEC 80A4145C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02EF0 80A41460 240709AF */ addiu $a3, $zero, 0x09AF ## $a3 = 000009AF -/* 02EF4 80A41464 0C031AB1 */ jal func_800C6AC4 +/* 02EF4 80A41464 0C031AB1 */ jal Graph_OpenDisp /* 02EF8 80A41468 AFA50050 */ sw $a1, 0x0050($sp) /* 02EFC 80A4146C 0C2905AA */ jal func_80A416A8 /* 02F00 80A41470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -108,7 +108,7 @@ glabel EnGo_Draw /* 03060 80A415D0 24C61C70 */ addiu $a2, $a2, %lo(D_80A41C70) ## $a2 = 80A41C70 /* 03064 80A415D4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 03068 80A415D8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0306C 80A415DC 0C031AD5 */ jal func_800C6B54 +/* 0306C 80A415DC 0C031AD5 */ jal Graph_CloseDisp /* 03070 80A415E0 240709DD */ addiu $a3, $zero, 0x09DD ## $a3 = 000009DD /* 03074 80A415E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03078 80A415E8 0C2905ED */ jal func_80A417B4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s index fcbc45c31b..bba33c0bff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s @@ -19,7 +19,7 @@ glabel func_80A40F58 /* 02A2C 80A40F9C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 02A30 80A40FA0 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 02A34 80A40FA4 24070910 */ addiu $a3, $zero, 0x0910 ## $a3 = 00000910 -/* 02A38 80A40FA8 0C031AB1 */ jal func_800C6AC4 +/* 02A38 80A40FA8 0C031AB1 */ jal Graph_OpenDisp /* 02A3C 80A40FAC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 02A40 80A40FB0 0C034213 */ jal Matrix_Push /* 02A44 80A40FB4 00000000 */ nop @@ -60,7 +60,7 @@ glabel func_80A40F58 /* 02AD0 80A41040 24C61C20 */ addiu $a2, $a2, %lo(D_80A41C20) ## $a2 = 80A41C20 /* 02AD4 80A41044 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 02AD8 80A41048 24070925 */ addiu $a3, $zero, 0x0925 ## $a3 = 00000925 -/* 02ADC 80A4104C 0C031AD5 */ jal func_800C6B54 +/* 02ADC 80A4104C 0C031AD5 */ jal Graph_CloseDisp /* 02AE0 80A41050 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 02AE4 80A41054 8FBF001C */ lw $ra, 0x001C($sp) /* 02AE8 80A41058 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s index 566e96524e..706878eafc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s @@ -19,7 +19,7 @@ glabel func_80A41068 /* 02B3C 80A410AC 24C61C30 */ addiu $a2, $a2, %lo(D_80A41C30) ## $a2 = 80A41C30 /* 02B40 80A410B0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 02B44 80A410B4 24070933 */ addiu $a3, $zero, 0x0933 ## $a3 = 00000933 -/* 02B48 80A410B8 0C031AB1 */ jal func_800C6AC4 +/* 02B48 80A410B8 0C031AB1 */ jal Graph_OpenDisp /* 02B4C 80A410BC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 02B50 80A410C0 0C034213 */ jal Matrix_Push /* 02B54 80A410C4 00000000 */ nop @@ -80,7 +80,7 @@ glabel func_80A41068 /* 02C30 80A411A0 24C61C50 */ addiu $a2, $a2, %lo(D_80A41C50) ## $a2 = 80A41C50 /* 02C34 80A411A4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 02C38 80A411A8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02C3C 80A411AC 0C031AD5 */ jal func_800C6B54 +/* 02C3C 80A411AC 0C031AD5 */ jal Graph_CloseDisp /* 02C40 80A411B0 2407094F */ addiu $a3, $zero, 0x094F ## $a3 = 0000094F /* 02C44 80A411B4 8FBF001C */ lw $ra, 0x001C($sp) /* 02C48 80A411B8 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s index 336218ddab..cb4e7c9753 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s @@ -20,7 +20,7 @@ glabel func_80A417B4 /* 0328C 80A417FC 24C61C80 */ addiu $a2, $a2, %lo(D_80A41C80) ## $a2 = 80A41C80 /* 03290 80A41800 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 03294 80A41804 24070A42 */ addiu $a3, $zero, 0x0A42 ## $a3 = 00000A42 -/* 03298 80A41808 0C031AB1 */ jal func_800C6AC4 +/* 03298 80A41808 0C031AB1 */ jal Graph_OpenDisp /* 0329C 80A4180C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 032A0 80A41810 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 /* 032A4 80A41814 0C024F61 */ jal func_80093D84 @@ -192,7 +192,7 @@ glabel func_80A417B4 /* 03520 80A41A90 24C61CA0 */ addiu $a2, $a2, %lo(D_80A41CA0) ## $a2 = 80A41CA0 /* 03524 80A41A94 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 03528 80A41A98 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 0352C 80A41A9C 0C031AD5 */ jal func_800C6B54 +/* 0352C 80A41A9C 0C031AD5 */ jal Graph_CloseDisp /* 03530 80A41AA0 24070A76 */ addiu $a3, $zero, 0x0A76 ## $a3 = 00000A76 /* 03534 80A41AA4 8FBF0054 */ lw $ra, 0x0054($sp) /* 03538 80A41AA8 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s index 77caa3f4d1..564aa35454 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s @@ -73,7 +73,7 @@ glabel EnGo2_Draw /* 05270 80A47FA0 24C6862C */ addiu $a2, $a2, %lo(D_80A4862C) ## $a2 = 80A4862C /* 05274 80A47FA4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFD0 /* 05278 80A47FA8 24070BF7 */ addiu $a3, $zero, 0x0BF7 ## $a3 = 00000BF7 -/* 0527C 80A47FAC 0C031AB1 */ jal func_800C6AC4 +/* 0527C 80A47FAC 0C031AB1 */ jal Graph_OpenDisp /* 05280 80A47FB0 AFA50050 */ sw $a1, 0x0050($sp) /* 05284 80A47FB4 8FA90074 */ lw $t1, 0x0074($sp) /* 05288 80A47FB8 0C024F46 */ jal func_80093D18 @@ -139,7 +139,7 @@ glabel EnGo2_Draw /* 05378 80A480A8 24C6863C */ addiu $a2, $a2, %lo(D_80A4863C) ## $a2 = 80A4863C /* 0537C 80A480AC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFD0 /* 05380 80A480B0 24070C09 */ addiu $a3, $zero, 0x0C09 ## $a3 = 00000C09 -/* 05384 80A480B4 0C031AD5 */ jal func_800C6B54 +/* 05384 80A480B4 0C031AD5 */ jal Graph_CloseDisp /* 05388 80A480B8 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0538C 80A480BC 8FBF002C */ lw $ra, 0x002C($sp) .L80A480C0: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s index 504935f633..df578038a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s @@ -20,7 +20,7 @@ glabel func_80A42EE0 /* 001F8 80A42F28 24C68590 */ addiu $a2, $a2, %lo(D_80A48590) ## $a2 = 80A48590 /* 001FC 80A42F2C 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 00200 80A42F30 2407006F */ addiu $a3, $zero, 0x006F ## $a3 = 0000006F -/* 00204 80A42F34 0C031AB1 */ jal func_800C6AC4 +/* 00204 80A42F34 0C031AB1 */ jal Graph_OpenDisp /* 00208 80A42F38 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0020C 80A42F3C 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 /* 00210 80A42F40 0C024F61 */ jal func_80093D84 @@ -192,7 +192,7 @@ glabel func_80A42EE0 /* 0048C 80A431BC 24C685B8 */ addiu $a2, $a2, %lo(D_80A485B8) ## $a2 = 80A485B8 /* 00490 80A431C0 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 00494 80A431C4 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 00498 80A431C8 0C031AD5 */ jal func_800C6B54 +/* 00498 80A431C8 0C031AD5 */ jal Graph_CloseDisp /* 0049C 80A431CC 24070097 */ addiu $a3, $zero, 0x0097 ## $a3 = 00000097 /* 004A0 80A431D0 8FBF0054 */ lw $ra, 0x0054($sp) /* 004A4 80A431D4 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s index a2963690e2..b24b401f5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s @@ -19,7 +19,7 @@ glabel func_80A479B0 /* 04CC4 80A479F4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 04CC8 80A479F8 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 04CCC 80A479FC 24070B41 */ addiu $a3, $zero, 0x0B41 ## $a3 = 00000B41 -/* 04CD0 80A47A00 0C031AB1 */ jal func_800C6AC4 +/* 04CD0 80A47A00 0C031AB1 */ jal Graph_OpenDisp /* 04CD4 80A47A04 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04CD8 80A47A08 8FA90054 */ lw $t1, 0x0054($sp) /* 04CDC 80A47A0C 0C024F46 */ jal func_80093D18 @@ -52,7 +52,7 @@ glabel func_80A479B0 /* 04D48 80A47A78 24C685EC */ addiu $a2, $a2, %lo(D_80A485EC) ## $a2 = 80A485EC /* 04D4C 80A47A7C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 04D50 80A47A80 24070B49 */ addiu $a3, $zero, 0x0B49 ## $a3 = 00000B49 -/* 04D54 80A47A84 0C031AD5 */ jal func_800C6B54 +/* 04D54 80A47A84 0C031AD5 */ jal Graph_CloseDisp /* 04D58 80A47A88 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 04D5C 80A47A8C 8FA50050 */ lw $a1, 0x0050($sp) /* 04D60 80A47A90 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s index 66682b911b..6bf083e5be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s @@ -19,7 +19,7 @@ glabel func_80A47AB0 /* 04DC4 80A47AF4 24C685FC */ addiu $a2, $a2, %lo(D_80A485FC) ## $a2 = 80A485FC /* 04DC8 80A47AF8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 /* 04DCC 80A47AFC 24070B62 */ addiu $a3, $zero, 0x0B62 ## $a3 = 00000B62 -/* 04DD0 80A47B00 0C031AB1 */ jal func_800C6AC4 +/* 04DD0 80A47B00 0C031AB1 */ jal Graph_OpenDisp /* 04DD4 80A47B04 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04DD8 80A47B08 0C024F46 */ jal func_80093D18 /* 04DDC 80A47B0C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -81,7 +81,7 @@ glabel func_80A47AB0 /* 04EB4 80A47BE4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 04EB8 80A47BE8 24C6861C */ addiu $a2, $a2, %lo(D_80A4861C) ## $a2 = 80A4861C /* 04EBC 80A47BEC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 -/* 04EC0 80A47BF0 0C031AD5 */ jal func_800C6B54 +/* 04EC0 80A47BF0 0C031AD5 */ jal Graph_CloseDisp /* 04EC4 80A47BF4 24070B72 */ addiu $a3, $zero, 0x0B72 ## $a3 = 00000B72 /* 04EC8 80A47BF8 8FA50058 */ lw $a1, 0x0058($sp) /* 04ECC 80A47BFC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFF0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s index 9437cd0761..585bee92dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s @@ -10,7 +10,7 @@ glabel EnGoma_Draw /* 02038 80A4AEF8 24C6B8A0 */ addiu $a2, $a2, %lo(D_80A4B8A0) ## $a2 = 80A4B8A0 /* 0203C 80A4AEFC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 02040 80A4AF00 240707F8 */ addiu $a3, $zero, 0x07F8 ## $a3 = 000007F8 -/* 02044 80A4AF04 0C031AB1 */ jal func_800C6AC4 +/* 02044 80A4AF04 0C031AB1 */ jal Graph_OpenDisp /* 02048 80A4AF08 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0204C 80A4AF0C 8FAF007C */ lw $t7, 0x007C($sp) /* 02050 80A4AF10 0C024F46 */ jal func_80093D18 @@ -309,7 +309,7 @@ glabel EnGoma_Draw /* 024C4 80A4B384 24C6B8E0 */ addiu $a2, $a2, %lo(D_80A4B8E0) ## $a2 = 80A4B8E0 /* 024C8 80A4B388 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 024CC 80A4B38C 24070847 */ addiu $a3, $zero, 0x0847 ## $a3 = 00000847 -/* 024D0 80A4B390 0C031AD5 */ jal func_800C6B54 +/* 024D0 80A4B390 0C031AD5 */ jal Graph_CloseDisp /* 024D4 80A4B394 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 024D8 80A4B398 8FBF0024 */ lw $ra, 0x0024($sp) /* 024DC 80A4B39C 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s index 487e83eea6..14df92ce63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s @@ -10,7 +10,7 @@ glabel func_80A4ACC0 /* 01E20 80A4ACE0 24C6B880 */ addiu $a2, $a2, %lo(D_80A4B880) ## $a2 = 80A4B880 /* 01E24 80A4ACE4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 01E28 80A4ACE8 240707B8 */ addiu $a3, $zero, 0x07B8 ## $a3 = 000007B8 -/* 01E2C 80A4ACEC 0C031AB1 */ jal func_800C6AC4 +/* 01E2C 80A4ACEC 0C031AB1 */ jal Graph_OpenDisp /* 01E30 80A4ACF0 AFA50040 */ sw $a1, 0x0040($sp) /* 01E34 80A4ACF4 8FA80040 */ lw $t0, 0x0040($sp) /* 01E38 80A4ACF8 8FA4005C */ lw $a0, 0x005C($sp) @@ -102,7 +102,7 @@ glabel func_80A4ACC0 /* 01F78 80A4AE38 24C6B890 */ addiu $a2, $a2, %lo(D_80A4B890) ## $a2 = 80A4B890 /* 01F7C 80A4AE3C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 01F80 80A4AE40 240707DB */ addiu $a3, $zero, 0x07DB ## $a3 = 000007DB -/* 01F84 80A4AE44 0C031AD5 */ jal func_800C6B54 +/* 01F84 80A4AE44 0C031AD5 */ jal Graph_CloseDisp /* 01F88 80A4AE48 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 01F8C 80A4AE4C 8FBF0014 */ lw $ra, 0x0014($sp) /* 01F90 80A4AE50 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s index cb238d3480..b5fa3e4ead 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s @@ -13,7 +13,7 @@ glabel EnGs_Draw /* 01694 80A4F9B4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01698 80A4F9B8 24C6FE50 */ addiu $a2, $a2, %lo(D_80A4FE50) ## $a2 = 80A4FE50 /* 0169C 80A4F9BC 24070416 */ addiu $a3, $zero, 0x0416 ## $a3 = 00000416 -/* 016A0 80A4F9C0 0C031AB1 */ jal func_800C6AC4 +/* 016A0 80A4F9C0 0C031AB1 */ jal Graph_OpenDisp /* 016A4 80A4F9C4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 016A8 80A4F9C8 8FA20094 */ lw $v0, 0x0094($sp) /* 016AC 80A4F9CC 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 @@ -250,7 +250,7 @@ glabel EnGs_Draw /* 01A38 80A4FD58 24C6FE80 */ addiu $a2, $a2, %lo(D_80A4FE80) ## $a2 = 80A4FE80 /* 01A3C 80A4FD5C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 01A40 80A4FD60 2407044D */ addiu $a3, $zero, 0x044D ## $a3 = 0000044D -/* 01A44 80A4FD64 0C031AD5 */ jal func_800C6B54 +/* 01A44 80A4FD64 0C031AD5 */ jal Graph_CloseDisp /* 01A48 80A4FD68 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 .L80A4FD6C: /* 01A4C 80A4FD6C 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s index 1d8ebf0355..2c9f44013d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s @@ -11,7 +11,7 @@ glabel func_80A50774 /* 00578 80A50798 24C60C04 */ addiu $a2, $a2, %lo(D_80A50C04) ## $a2 = 80A50C04 /* 0057C 80A5079C 24070160 */ addiu $a3, $zero, 0x0160 ## $a3 = 00000160 /* 00580 80A507A0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 -/* 00584 80A507A4 0C031AB1 */ jal func_800C6AC4 +/* 00584 80A507A4 0C031AB1 */ jal Graph_OpenDisp /* 00588 80A507A8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 0058C 80A507AC 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 00590 80A507B0 16010030 */ bne $s0, $at, .L80A50874 @@ -150,7 +150,7 @@ glabel func_80A50774 /* 0078C 80A509AC 24C60C14 */ addiu $a2, $a2, %lo(D_80A50C14) ## $a2 = 80A50C14 /* 00790 80A509B0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 /* 00794 80A509B4 24070184 */ addiu $a3, $zero, 0x0184 ## $a3 = 00000184 -/* 00798 80A509B8 0C031AD5 */ jal func_800C6B54 +/* 00798 80A509B8 0C031AD5 */ jal Graph_CloseDisp /* 0079C 80A509BC 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 007A0 80A509C0 8FBF001C */ lw $ra, 0x001C($sp) /* 007A4 80A509C4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s index 69adb0928d..ecef4ab653 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s @@ -11,7 +11,7 @@ glabel func_80A509D4 /* 007D8 80A509F8 24C60C24 */ addiu $a2, $a2, %lo(D_80A50C24) ## $a2 = 80A50C24 /* 007DC 80A509FC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 007E0 80A50A00 24070194 */ addiu $a3, $zero, 0x0194 ## $a3 = 00000194 -/* 007E4 80A50A04 0C031AB1 */ jal func_800C6AC4 +/* 007E4 80A50A04 0C031AB1 */ jal Graph_OpenDisp /* 007E8 80A50A08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 007EC 80A50A0C 0C024F46 */ jal func_80093D18 /* 007F0 80A50A10 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -85,7 +85,7 @@ glabel func_80A509D4 /* 00900 80A50B20 24C60C34 */ addiu $a2, $a2, %lo(D_80A50C34) ## $a2 = 80A50C34 /* 00904 80A50B24 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 00908 80A50B28 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0090C 80A50B2C 0C031AD5 */ jal func_800C6B54 +/* 0090C 80A50B2C 0C031AD5 */ jal Graph_CloseDisp /* 00910 80A50B30 240701A5 */ addiu $a3, $zero, 0x01A5 ## $a3 = 000001A5 /* 00914 80A50B34 8FBF0034 */ lw $ra, 0x0034($sp) /* 00918 80A50B38 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s index 0f98506f6c..071d43eb20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s @@ -11,7 +11,7 @@ glabel EnHeishi2_Draw /* 01EB0 80A54D50 24C65294 */ addiu $a2, $a2, %lo(D_80A55294) ## $a2 = 80A55294 /* 01EB4 80A54D54 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 01EB8 80A54D58 24070700 */ addiu $a3, $zero, 0x0700 ## $a3 = 00000700 -/* 01EBC 80A54D5C 0C031AB1 */ jal func_800C6AC4 +/* 01EBC 80A54D5C 0C031AB1 */ jal Graph_OpenDisp /* 01EC0 80A54D60 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01EC4 80A54D64 0C024F46 */ jal func_80093D18 /* 01EC8 80A54D68 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -106,7 +106,7 @@ glabel EnHeishi2_Draw /* 02020 80A54EC0 24C652BC */ addiu $a2, $a2, %lo(D_80A552BC) ## $a2 = 80A552BC /* 02024 80A54EC4 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 02028 80A54EC8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0202C 80A54ECC 0C031AD5 */ jal func_800C6B54 +/* 0202C 80A54ECC 0C031AD5 */ jal Graph_CloseDisp /* 02030 80A54ED0 2407072A */ addiu $a3, $zero, 0x072A ## $a3 = 0000072A /* 02034 80A54ED4 8FBF002C */ lw $ra, 0x002C($sp) /* 02038 80A54ED8 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s index 8332bf1d91..0bbd4449ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s @@ -8,7 +8,7 @@ glabel func_80A54C6C /* 01DE4 80A54C84 24C65258 */ addiu $a2, $a2, %lo(D_80A55258) ## $a2 = 80A55258 /* 01DE8 80A54C88 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 01DEC 80A54C8C 240706EC */ addiu $a3, $zero, 0x06EC ## $a3 = 000006EC -/* 01DF0 80A54C90 0C031AB1 */ jal func_800C6AC4 +/* 01DF0 80A54C90 0C031AB1 */ jal Graph_OpenDisp /* 01DF4 80A54C94 AFA50034 */ sw $a1, 0x0034($sp) /* 01DF8 80A54C98 8FA80034 */ lw $t0, 0x0034($sp) /* 01DFC 80A54C9C 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 @@ -41,7 +41,7 @@ glabel func_80A54C6C /* 01E68 80A54D08 24C65280 */ addiu $a2, $a2, %lo(D_80A55280) ## $a2 = 80A55280 /* 01E6C 80A54D0C 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 01E70 80A54D10 240706F1 */ addiu $a3, $zero, 0x06F1 ## $a3 = 000006F1 -/* 01E74 80A54D14 0C031AD5 */ jal func_800C6B54 +/* 01E74 80A54D14 0C031AD5 */ jal Graph_CloseDisp /* 01E78 80A54D18 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01E7C 80A54D1C 8FBF0014 */ lw $ra, 0x0014($sp) /* 01E80 80A54D20 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s index 26ab2934b3..8c34c2b9e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s @@ -10,7 +10,7 @@ glabel EnHoll_Draw /* 00CD0 80A598E0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 /* 00CD4 80A598E4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00CD8 80A598E8 24070325 */ addiu $a3, $zero, 0x0325 ## $a3 = 00000325 -/* 00CDC 80A598EC 0C031AB1 */ jal func_800C6AC4 +/* 00CDC 80A598EC 0C031AB1 */ jal Graph_OpenDisp /* 00CE0 80A598F0 AFA50038 */ sw $a1, 0x0038($sp) /* 00CE4 80A598F4 8FB90048 */ lw $t9, 0x0048($sp) /* 00CE8 80A598F8 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -85,7 +85,7 @@ glabel EnHoll_Draw .L80A59A00: /* 00DF0 80A59A00 8FAF004C */ lw $t7, 0x004C($sp) /* 00DF4 80A59A04 2407033F */ addiu $a3, $zero, 0x033F ## $a3 = 0000033F -/* 00DF8 80A59A08 0C031AD5 */ jal func_800C6B54 +/* 00DF8 80A59A08 0C031AD5 */ jal Graph_CloseDisp /* 00DFC 80A59A0C 8DE50000 */ lw $a1, 0x0000($t7) ## FA000000 .L80A59A10: /* 00E00 80A59A10 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s index bf449836ad..ebba739994 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s @@ -9,7 +9,7 @@ glabel func_80A5ABFC /* 00FE8 80A5AC18 24C6B0A8 */ addiu $a2, $a2, %lo(D_80A5B0A8) ## $a2 = 80A5B0A8 /* 00FEC 80A5AC1C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00FF0 80A5AC20 240703D6 */ addiu $a3, $zero, 0x03D6 ## $a3 = 000003D6 -/* 00FF4 80A5AC24 0C031AB1 */ jal func_800C6AC4 +/* 00FF4 80A5AC24 0C031AB1 */ jal Graph_OpenDisp /* 00FF8 80A5AC28 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00FFC 80A5AC2C 8FAF004C */ lw $t7, 0x004C($sp) /* 01000 80A5AC30 0C024F46 */ jal func_80093D18 @@ -67,7 +67,7 @@ glabel func_80A5ABFC /* 010D0 80A5AD00 24C6B0D0 */ addiu $a2, $a2, %lo(D_80A5B0D0) ## $a2 = 80A5B0D0 /* 010D4 80A5AD04 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 010D8 80A5AD08 240703DF */ addiu $a3, $zero, 0x03DF ## $a3 = 000003DF -/* 010DC 80A5AD0C 0C031AD5 */ jal func_800C6B54 +/* 010DC 80A5AD0C 0C031AD5 */ jal Graph_CloseDisp /* 010E0 80A5AD10 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 010E4 80A5AD14 8FBF001C */ lw $ra, 0x001C($sp) /* 010E8 80A5AD18 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s index 50c7239388..64faed945f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s @@ -11,7 +11,7 @@ glabel func_80A5AD28 /* 0111C 80A5AD4C 24C6B0E4 */ addiu $a2, $a2, %lo(D_80A5B0E4) ## $a2 = 80A5B0E4 /* 01120 80A5AD50 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 01124 80A5AD54 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 01128 80A5AD58 0C031AB1 */ jal func_800C6AC4 +/* 01128 80A5AD58 0C031AB1 */ jal Graph_OpenDisp /* 0112C 80A5AD5C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01130 80A5AD60 0C024F61 */ jal func_80093D84 /* 01134 80A5AD64 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -108,7 +108,7 @@ glabel func_80A5AD28 /* 012A0 80A5AED0 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 012A4 80A5AED4 24C6B10C */ addiu $a2, $a2, %lo(D_80A5B10C) ## $a2 = 80A5B10C /* 012A8 80A5AED8 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 -/* 012AC 80A5AEDC 0C031AD5 */ jal func_800C6B54 +/* 012AC 80A5AEDC 0C031AD5 */ jal Graph_CloseDisp /* 012B0 80A5AEE0 24070404 */ addiu $a3, $zero, 0x0404 ## $a3 = 00000404 /* 012B4 80A5AEE4 8FBF0044 */ lw $ra, 0x0044($sp) /* 012B8 80A5AEE8 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s index b0399fb0c2..b4c98c6498 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s @@ -13,7 +13,7 @@ glabel func_80A65C00 /* 0A93C 80A65C2C 24C6682C */ addiu $a2, $a2, %lo(D_80A6682C) ## $a2 = 80A6682C /* 0A940 80A65C30 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0A944 80A65C34 24072186 */ addiu $a3, $zero, 0x2186 ## $a3 = 00002186 -/* 0A948 80A65C38 0C031AB1 */ jal func_800C6AC4 +/* 0A948 80A65C38 0C031AB1 */ jal Graph_OpenDisp /* 0A94C 80A65C3C AFA50044 */ sw $a1, 0x0044($sp) /* 0A950 80A65C40 8FA60058 */ lw $a2, 0x0058($sp) /* 0A954 80A65C44 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D @@ -77,7 +77,7 @@ glabel func_80A65C00 /* 0AA2C 80A65D1C 24C6683C */ addiu $a2, $a2, %lo(D_80A6683C) ## $a2 = 80A6683C /* 0AA30 80A65D20 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0AA34 80A65D24 24072199 */ addiu $a3, $zero, 0x2199 ## $a3 = 00002199 -/* 0AA38 80A65D28 0C031AD5 */ jal func_800C6B54 +/* 0AA38 80A65D28 0C031AD5 */ jal Graph_CloseDisp /* 0AA3C 80A65D2C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 0AA40 80A65D30 8FBF0024 */ lw $ra, 0x0024($sp) /* 0AA44 80A65D34 8FA20048 */ lw $v0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s index 1e98df1715..fd8139cd7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s @@ -10,7 +10,7 @@ glabel func_80A6AD84 /* 019D4 80A6ADA4 24C6AFB0 */ addiu $a2, $a2, %lo(D_80A6AFB0) ## $a2 = 80A6AFB0 /* 019D8 80A6ADA8 240705BB */ addiu $a3, $zero, 0x05BB ## $a3 = 000005BB /* 019DC 80A6ADAC 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 -/* 019E0 80A6ADB0 0C031AB1 */ jal func_800C6AC4 +/* 019E0 80A6ADB0 0C031AB1 */ jal Graph_OpenDisp /* 019E4 80A6ADB4 AFA50038 */ sw $a1, 0x0038($sp) /* 019E8 80A6ADB8 8FAF0048 */ lw $t7, 0x0048($sp) /* 019EC 80A6ADBC 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D @@ -50,7 +50,7 @@ glabel func_80A6AD84 /* 01A70 80A6AE40 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 01A74 80A6AE44 24C6AFCC */ addiu $a2, $a2, %lo(D_80A6AFCC) ## $a2 = 80A6AFCC /* 01A78 80A6AE48 240705C7 */ addiu $a3, $zero, 0x05C7 ## $a3 = 000005C7 -/* 01A7C 80A6AE4C 0C031AD5 */ jal func_800C6B54 +/* 01A7C 80A6AE4C 0C031AD5 */ jal Graph_CloseDisp /* 01A80 80A6AE50 8D450000 */ lw $a1, 0x0000($t2) ## DB060020 /* 01A84 80A6AE54 8FBF0014 */ lw $ra, 0x0014($sp) /* 01A88 80A6AE58 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s index 6015202e0c..26cd1b7377 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s @@ -10,7 +10,7 @@ glabel EnHorseNormal_Draw /* 01C3C 80A6CE8C 24C6D560 */ addiu $a2, $a2, %lo(D_80A6D560) ## $a2 = 80A6D560 /* 01C40 80A6CE90 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFE4 /* 01C44 80A6CE94 240708B0 */ addiu $a3, $zero, 0x08B0 ## $a3 = 000008B0 -/* 01C48 80A6CE98 0C031AB1 */ jal func_800C6AC4 +/* 01C48 80A6CE98 0C031AB1 */ jal Graph_OpenDisp /* 01C4C 80A6CE9C AFA500C4 */ sw $a1, 0x00C4($sp) /* 01C50 80A6CEA0 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 /* 01C54 80A6CEA4 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 @@ -313,7 +313,7 @@ glabel EnHorseNormal_Draw /* 020D8 80A6D328 24C6D590 */ addiu $a2, $a2, %lo(D_80A6D590) ## $a2 = 80A6D590 /* 020DC 80A6D32C 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFE4 /* 020E0 80A6D330 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 020E4 80A6D334 0C031AD5 */ jal func_800C6B54 +/* 020E4 80A6D334 0C031AD5 */ jal Graph_CloseDisp /* 020E8 80A6D338 24070923 */ addiu $a3, $zero, 0x0923 ## $a3 = 00000923 .L80A6D33C: /* 020EC 80A6D33C 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s index 7d8218e606..0078357746 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s @@ -9,7 +9,7 @@ glabel EnHy_Draw /* 02694 80A71C44 24C62850 */ addiu $a2, $a2, %lo(D_80A72850) ## $a2 = 80A72850 /* 02698 80A71C48 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 0269C 80A71C4C 2407090E */ addiu $a3, $zero, 0x090E ## $a3 = 0000090E -/* 026A0 80A71C50 0C031AB1 */ jal func_800C6AC4 +/* 026A0 80A71C50 0C031AB1 */ jal Graph_OpenDisp /* 026A4 80A71C54 AFA50054 */ sw $a1, 0x0054($sp) /* 026A8 80A71C58 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 /* 026AC 80A71C5C 3C0F80A7 */ lui $t7, %hi(func_80A70E34) ## $t7 = 80A70000 @@ -156,7 +156,7 @@ glabel L80A71E38 /* 028C0 80A71E70 24C62860 */ addiu $a2, $a2, %lo(D_80A72860) ## $a2 = 80A72860 /* 028C4 80A71E74 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 028C8 80A71E78 24070954 */ addiu $a3, $zero, 0x0954 ## $a3 = 00000954 -/* 028CC 80A71E7C 0C031AD5 */ jal func_800C6B54 +/* 028CC 80A71E7C 0C031AD5 */ jal Graph_CloseDisp /* 028D0 80A71E80 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 028D4 80A71E84 8FBF002C */ lw $ra, 0x002C($sp) /* 028D8 80A71E88 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s index 2f02135ce0..5fbb6d5021 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s @@ -10,7 +10,7 @@ glabel func_80A716B8 /* 02128 80A716D8 24C62810 */ addiu $a2, $a2, %lo(D_80A72810) ## $a2 = 80A72810 /* 0212C 80A716DC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFD4 /* 02130 80A716E0 2407087A */ addiu $a3, $zero, 0x087A ## $a3 = 0000087A -/* 02134 80A716E4 0C031AB1 */ jal func_800C6AC4 +/* 02134 80A716E4 0C031AB1 */ jal Graph_OpenDisp /* 02138 80A716E8 AFA5003C */ sw $a1, 0x003C($sp) /* 0213C 80A716EC 8FA9005C */ lw $t1, 0x005C($sp) /* 02140 80A716F0 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F @@ -235,7 +235,7 @@ glabel func_80A716B8 /* 0248C 80A71A3C 24C62820 */ addiu $a2, $a2, %lo(D_80A72820) ## $a2 = 80A72820 /* 02490 80A71A40 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFD4 /* 02494 80A71A44 240708B4 */ addiu $a3, $zero, 0x08B4 ## $a3 = 000008B4 -/* 02498 80A71A48 0C031AD5 */ jal func_800C6B54 +/* 02498 80A71A48 0C031AD5 */ jal Graph_CloseDisp /* 0249C 80A71A4C 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 024A0 80A71A50 8FBF0014 */ lw $ra, 0x0014($sp) /* 024A4 80A71A54 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s index ff9667213e..b3f64e3652 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s @@ -20,7 +20,7 @@ glabel func_80A71A64 /* 024FC 80A71AAC 240708CF */ addiu $a3, $zero, 0x08CF ## $a3 = 000008CF /* 02500 80A71AB0 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 02504 80A71AB4 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFD8 -/* 02508 80A71AB8 0C031AB1 */ jal func_800C6AC4 +/* 02508 80A71AB8 0C031AB1 */ jal Graph_OpenDisp /* 0250C 80A71ABC AFA50038 */ sw $a1, 0x0038($sp) /* 02510 80A71AC0 8FA40054 */ lw $a0, 0x0054($sp) /* 02514 80A71AC4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 @@ -82,7 +82,7 @@ glabel func_80A71A64 /* 025E8 80A71B98 24C62840 */ addiu $a2, $a2, %lo(D_80A72840) ## $a2 = 80A72840 /* 025EC 80A71B9C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFD8 /* 025F0 80A71BA0 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 025F4 80A71BA4 0C031AD5 */ jal func_800C6B54 +/* 025F4 80A71BA4 0C031AD5 */ jal Graph_CloseDisp /* 025F8 80A71BA8 240708E9 */ addiu $a3, $zero, 0x08E9 ## $a3 = 000008E9 /* 025FC 80A71BAC 8FBF0014 */ lw $ra, 0x0014($sp) /* 02600 80A71BB0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s index 11b117665a..3924af5f81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s @@ -10,7 +10,7 @@ glabel EnIceHono_Draw /* 00E3C 80A73E2C 24C640D8 */ addiu $a2, $a2, %lo(D_80A740D8) ## $a2 = 80A740D8 /* 00E40 80A73E30 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 00E44 80A73E34 240702B7 */ addiu $a3, $zero, 0x02B7 ## $a3 = 000002B7 -/* 00E48 80A73E38 0C031AB1 */ jal func_800C6AC4 +/* 00E48 80A73E38 0C031AB1 */ jal Graph_OpenDisp /* 00E4C 80A73E3C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00E50 80A73E40 0C024F61 */ jal func_80093D84 /* 00E54 80A73E44 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -113,7 +113,7 @@ glabel EnIceHono_Draw /* 00FD8 80A73FC8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00FDC 80A73FCC 24C64100 */ addiu $a2, $a2, %lo(D_80A74100) ## $a2 = 80A74100 /* 00FE0 80A73FD0 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00FE4 80A73FD4 0C031AD5 */ jal func_800C6B54 +/* 00FE4 80A73FD4 0C031AD5 */ jal Graph_CloseDisp /* 00FE8 80A73FD8 240702D2 */ addiu $a3, $zero, 0x02D2 ## $a3 = 000002D2 /* 00FEC 80A73FDC 8FBF003C */ lw $ra, 0x003C($sp) /* 00FF0 80A73FE0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s index cc0f981716..ea03c6de4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s @@ -16,7 +16,7 @@ glabel func_80A76330 /* 02058 80A76368 24C68650 */ addiu $a2, $a2, %lo(D_80A78650) ## $a2 = 80A78650 /* 0205C 80A7636C 27A400D0 */ addiu $a0, $sp, 0x00D0 ## $a0 = FFFFFFD0 /* 02060 80A76370 240704B1 */ addiu $a3, $zero, 0x04B1 ## $a3 = 000004B1 -/* 02064 80A76374 0C031AB1 */ jal func_800C6AC4 +/* 02064 80A76374 0C031AB1 */ jal Graph_OpenDisp /* 02068 80A76378 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 /* 0206C 80A7637C 8FB40110 */ lw $s4, 0x0110($sp) /* 02070 80A76380 8FA50104 */ lw $a1, 0x0104($sp) @@ -283,7 +283,7 @@ glabel func_80A76330 /* 02450 80A76760 24C686E0 */ addiu $a2, $a2, %lo(D_80A786E0) ## $a2 = 80A786E0 /* 02454 80A76764 27A400D0 */ addiu $a0, $sp, 0x00D0 ## $a0 = FFFFFFD0 /* 02458 80A76768 2407050E */ addiu $a3, $zero, 0x050E ## $a3 = 0000050E -/* 0245C 80A7676C 0C031AD5 */ jal func_800C6B54 +/* 0245C 80A7676C 0C031AD5 */ jal Graph_CloseDisp /* 02460 80A76770 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 02464 80A76774 8FBF003C */ lw $ra, 0x003C($sp) /* 02468 80A76778 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s index 855fe988aa..18240cf459 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s @@ -10,7 +10,7 @@ glabel func_80A76798 /* 024A8 80A767B8 24C686F8 */ addiu $a2, $a2, %lo(D_80A786F8) ## $a2 = 80A786F8 /* 024AC 80A767BC 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE8 /* 024B0 80A767C0 2407051D */ addiu $a3, $zero, 0x051D ## $a3 = 0000051D -/* 024B4 80A767C4 0C031AB1 */ jal func_800C6AC4 +/* 024B4 80A767C4 0C031AB1 */ jal Graph_OpenDisp /* 024B8 80A767C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 024BC 80A767CC 0C024F46 */ jal func_80093D18 /* 024C0 80A767D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -275,7 +275,7 @@ glabel func_80A76798 /* 028BC 80A76BCC 24C68710 */ addiu $a2, $a2, %lo(D_80A78710) ## $a2 = 80A78710 /* 028C0 80A76BD0 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE8 /* 028C4 80A76BD4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 028C8 80A76BD8 0C031AD5 */ jal func_800C6B54 +/* 028C8 80A76BD8 0C031AD5 */ jal Graph_CloseDisp /* 028CC 80A76BDC 24070547 */ addiu $a3, $zero, 0x0547 ## $a3 = 00000547 /* 028D0 80A76BE0 8FBF002C */ lw $ra, 0x002C($sp) /* 028D4 80A76BE4 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s index c863c16048..5a22b303eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s @@ -11,7 +11,7 @@ glabel func_80A7759C /* 032B0 80A775C0 24C68728 */ addiu $a2, $a2, %lo(D_80A78728) ## $a2 = 80A78728 /* 032B4 80A775C4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 032B8 80A775C8 240700CF */ addiu $a3, $zero, 0x00CF ## $a3 = 000000CF -/* 032BC 80A775CC 0C031AB1 */ jal func_800C6AC4 +/* 032BC 80A775CC 0C031AB1 */ jal Graph_OpenDisp /* 032C0 80A775D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 032C4 80A775D4 8FAF0074 */ lw $t7, 0x0074($sp) /* 032C8 80A775D8 25F8FFF3 */ addiu $t8, $t7, 0xFFF3 ## $t8 = FFFFFFF3 @@ -169,7 +169,7 @@ glabel L80A77818 /* 0350C 80A7781C 24C687B8 */ addiu $a2, $a2, %lo(D_80A787B8) ## $a2 = 80A787B8 /* 03510 80A77820 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 03514 80A77824 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03518 80A77828 0C031AD5 */ jal func_800C6B54 +/* 03518 80A77828 0C031AD5 */ jal Graph_CloseDisp /* 0351C 80A7782C 24070130 */ addiu $a3, $zero, 0x0130 ## $a3 = 00000130 /* 03520 80A77830 8FBF001C */ lw $ra, 0x001C($sp) /* 03524 80A77834 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s index ef8cbdf336..0ead1a561b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s @@ -9,7 +9,7 @@ glabel func_80A77844 /* 03550 80A77860 24C687D0 */ addiu $a2, $a2, %lo(D_80A787D0) ## $a2 = 80A787D0 /* 03554 80A77864 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 03558 80A77868 24070142 */ addiu $a3, $zero, 0x0142 ## $a3 = 00000142 -/* 0355C 80A7786C 0C031AB1 */ jal func_800C6AC4 +/* 0355C 80A7786C 0C031AB1 */ jal Graph_OpenDisp /* 03560 80A77870 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03564 80A77874 8FA40068 */ lw $a0, 0x0068($sp) /* 03568 80A77878 8FA5006C */ lw $a1, 0x006C($sp) @@ -94,7 +94,7 @@ glabel func_80A77844 /* 036A4 80A779B4 24C687E8 */ addiu $a2, $a2, %lo(D_80A787E8) ## $a2 = 80A787E8 /* 036A8 80A779B8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 036AC 80A779BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 036B0 80A779C0 0C031AD5 */ jal func_800C6B54 +/* 036B0 80A779C0 0C031AD5 */ jal Graph_CloseDisp /* 036B4 80A779C4 24070159 */ addiu $a3, $zero, 0x0159 ## $a3 = 00000159 /* 036B8 80A779C8 8FBF002C */ lw $ra, 0x002C($sp) /* 036BC 80A779CC 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s index 743a6d0987..fafa5e9764 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s @@ -11,7 +11,7 @@ glabel func_80A77C7C /* 03990 80A77CA0 24C6887C */ addiu $a2, $a2, %lo(D_80A7887C) ## $a2 = 80A7887C /* 03994 80A77CA4 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 03998 80A77CA8 2407023B */ addiu $a3, $zero, 0x023B ## $a3 = 0000023B -/* 0399C 80A77CAC 0C031AB1 */ jal func_800C6AC4 +/* 0399C 80A77CAC 0C031AB1 */ jal Graph_OpenDisp /* 039A0 80A77CB0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 039A4 80A77CB4 8FAF006C */ lw $t7, 0x006C($sp) /* 039A8 80A77CB8 25F8FFF4 */ addiu $t8, $t7, 0xFFF4 ## $t8 = FFFFFFF4 @@ -148,7 +148,7 @@ glabel L80A77EA4 /* 03B98 80A77EA8 24C68924 */ addiu $a2, $a2, %lo(D_80A78924) ## $a2 = 80A78924 /* 03B9C 80A77EAC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 03BA0 80A77EB0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03BA4 80A77EB4 0C031AD5 */ jal func_800C6B54 +/* 03BA4 80A77EB4 0C031AD5 */ jal Graph_CloseDisp /* 03BA8 80A77EB8 2407025C */ addiu $a3, $zero, 0x025C ## $a3 = 0000025C /* 03BAC 80A77EBC 8FBF001C */ lw $ra, 0x001C($sp) /* 03BB0 80A77EC0 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s index 3383a3f640..dc66424527 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s @@ -9,7 +9,7 @@ glabel func_80A77EDC /* 03BE8 80A77EF8 24C68940 */ addiu $a2, $a2, %lo(D_80A78940) ## $a2 = 80A78940 /* 03BEC 80A77EFC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 03BF0 80A77F00 24070276 */ addiu $a3, $zero, 0x0276 ## $a3 = 00000276 -/* 03BF4 80A77F04 0C031AB1 */ jal func_800C6AC4 +/* 03BF4 80A77F04 0C031AB1 */ jal Graph_OpenDisp /* 03BF8 80A77F08 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03BFC 80A77F0C 8FA40068 */ lw $a0, 0x0068($sp) /* 03C00 80A77F10 8FA5006C */ lw $a1, 0x006C($sp) @@ -94,7 +94,7 @@ glabel func_80A77EDC /* 03D3C 80A7804C 24C6895C */ addiu $a2, $a2, %lo(D_80A7895C) ## $a2 = 80A7895C /* 03D40 80A78050 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 03D44 80A78054 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03D48 80A78058 0C031AD5 */ jal func_800C6B54 +/* 03D48 80A78058 0C031AD5 */ jal Graph_CloseDisp /* 03D4C 80A7805C 2407028D */ addiu $a3, $zero, 0x028D ## $a3 = 0000028D /* 03D50 80A78060 8FBF002C */ lw $ra, 0x002C($sp) /* 03D54 80A78064 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s index 551ae6a6ae..42ca6aaf64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s @@ -9,7 +9,7 @@ glabel EnIn_Draw /* 02720 80A7B6D0 24C6BA0C */ addiu $a2, $a2, %lo(D_80A7BA0C) ## $a2 = 80A7BA0C /* 02724 80A7B6D4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02728 80A7B6D8 24070950 */ addiu $a3, $zero, 0x0950 ## $a3 = 00000950 -/* 0272C 80A7B6DC 0C031AB1 */ jal func_800C6AC4 +/* 0272C 80A7B6DC 0C031AB1 */ jal Graph_OpenDisp /* 02730 80A7B6E0 AFA50050 */ sw $a1, 0x0050($sp) /* 02734 80A7B6E4 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 /* 02738 80A7B6E8 3C0F80A8 */ lui $t7, %hi(func_80A79FB0) ## $t7 = 80A80000 @@ -81,7 +81,7 @@ glabel EnIn_Draw /* 0283C 80A7B7EC 24C6BA1C */ addiu $a2, $a2, %lo(D_80A7BA1C) ## $a2 = 80A7BA1C /* 02840 80A7B7F0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02844 80A7B7F4 24070970 */ addiu $a3, $zero, 0x0970 ## $a3 = 00000970 -/* 02848 80A7B7F8 0C031AD5 */ jal func_800C6B54 +/* 02848 80A7B7F8 0C031AD5 */ jal Graph_CloseDisp /* 0284C 80A7B7FC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 02850 80A7B800 8FBF002C */ lw $ra, 0x002C($sp) /* 02854 80A7B804 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s index f6feb83fcf..d6df5f2e86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s @@ -20,7 +20,7 @@ glabel func_80A7B570 /* 02608 80A7B5B8 2407091F */ addiu $a3, $zero, 0x091F ## $a3 = 0000091F /* 0260C 80A7B5BC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 02610 80A7B5C0 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 02614 80A7B5C4 0C031AB1 */ jal func_800C6AC4 +/* 02614 80A7B5C4 0C031AB1 */ jal Graph_OpenDisp /* 02618 80A7B5C8 AFA50034 */ sw $a1, 0x0034($sp) /* 0261C 80A7B5CC 8FA7004C */ lw $a3, 0x004C($sp) /* 02620 80A7B5D0 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 @@ -77,7 +77,7 @@ glabel func_80A7B570 /* 026E0 80A7B690 3C0680A8 */ lui $a2, %hi(D_80A7B9FC) ## $a2 = 80A80000 /* 026E4 80A7B694 24C6B9FC */ addiu $a2, $a2, %lo(D_80A7B9FC) ## $a2 = 80A7B9FC /* 026E8 80A7B698 2407093D */ addiu $a3, $zero, 0x093D ## $a3 = 0000093D -/* 026EC 80A7B69C 0C031AD5 */ jal func_800C6B54 +/* 026EC 80A7B69C 0C031AD5 */ jal Graph_CloseDisp /* 026F0 80A7B6A0 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 026F4 80A7B6A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 026F8 80A7B6A8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s index caa0a7803c..014f49b59f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s @@ -9,7 +9,7 @@ glabel func_80A7F8CC /* 01488 80A7F8E8 24C67428 */ addiu $a2, $a2, %lo(D_80A87428) ## $a2 = 80A87428 /* 0148C 80A7F8EC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 01490 80A7F8F0 2407041A */ addiu $a3, $zero, 0x041A ## $a3 = 0000041A -/* 01494 80A7F8F4 0C031AB1 */ jal func_800C6AC4 +/* 01494 80A7F8F4 0C031AB1 */ jal Graph_OpenDisp /* 01498 80A7F8F8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0149C 80A7F8FC 8FAF004C */ lw $t7, 0x004C($sp) /* 014A0 80A7F900 0C024F46 */ jal func_80093D18 @@ -49,7 +49,7 @@ glabel func_80A7F8CC /* 01528 80A7F988 24C67448 */ addiu $a2, $a2, %lo(D_80A87448) ## $a2 = 80A87448 /* 0152C 80A7F98C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 01530 80A7F990 24070426 */ addiu $a3, $zero, 0x0426 ## $a3 = 00000426 -/* 01534 80A7F994 0C031AD5 */ jal func_800C6B54 +/* 01534 80A7F994 0C031AD5 */ jal Graph_CloseDisp /* 01538 80A7F998 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 0153C 80A7F99C 8FBF001C */ lw $ra, 0x001C($sp) /* 01540 80A7F9A0 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s index d373fb2883..8b620c7243 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s @@ -9,7 +9,7 @@ glabel EnJj_Draw /* 0081C 80A8801C 24C68D10 */ addiu $a2, $a2, %lo(D_80A88D10) ## $a2 = 80A88D10 /* 00820 80A88020 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00824 80A88024 2407036F */ addiu $a3, $zero, 0x036F ## $a3 = 0000036F -/* 00828 80A88028 0C031AB1 */ jal func_800C6AC4 +/* 00828 80A88028 0C031AB1 */ jal Graph_OpenDisp /* 0082C 80A8802C AFA5004C */ sw $a1, 0x004C($sp) /* 00830 80A88030 8FAF005C */ lw $t7, 0x005C($sp) /* 00834 80A88034 0C0250F2 */ jal func_800943C8 @@ -73,7 +73,7 @@ glabel EnJj_Draw /* 00918 80A88118 24C68D20 */ addiu $a2, $a2, %lo(D_80A88D20) ## $a2 = 80A88D20 /* 0091C 80A8811C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00920 80A88120 24070382 */ addiu $a3, $zero, 0x0382 ## $a3 = 00000382 -/* 00924 80A88124 0C031AD5 */ jal func_800C6B54 +/* 00924 80A88124 0C031AD5 */ jal Graph_CloseDisp /* 00928 80A88128 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 0092C 80A8812C 8FBF002C */ lw $ra, 0x002C($sp) /* 00930 80A88130 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s index 68c6a1e336..434c48609a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s @@ -12,7 +12,7 @@ glabel EnJsjutan_Draw /* 00EA0 80A8A640 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 00EA4 80A8A644 240702BD */ addiu $a3, $zero, 0x02BD ## $a3 = 000002BD /* 00EA8 80A8A648 AFA20078 */ sw $v0, 0x0078($sp) -/* 00EAC 80A8A64C 0C031AB1 */ jal func_800C6AC4 +/* 00EAC 80A8A64C 0C031AB1 */ jal Graph_OpenDisp /* 00EB0 80A8A650 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00EB4 80A8A654 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00EB8 80A8A658 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -281,7 +281,7 @@ glabel EnJsjutan_Draw /* 012A4 80A8AA44 24070337 */ addiu $a3, $zero, 0x0337 ## $a3 = 00000337 /* 012A8 80A8AA48 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 012AC 80A8AA4C 8FAE008C */ lw $t6, 0x008C($sp) -/* 012B0 80A8AA50 0C031AD5 */ jal func_800C6B54 +/* 012B0 80A8AA50 0C031AD5 */ jal Graph_CloseDisp /* 012B4 80A8AA54 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 012B8 80A8AA58 8FBF001C */ lw $ra, 0x001C($sp) /* 012BC 80A8AA5C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s index 81c3db2e50..858fb158ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s @@ -16,7 +16,7 @@ glabel EnKanban_Draw /* 01C1C 80A93BBC 24C6504C */ addiu $a2, $a2, %lo(D_80A9504C) ## $a2 = 80A9504C /* 01C20 80A93BC0 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFD8 /* 01C24 80A93BC4 2407067B */ addiu $a3, $zero, 0x067B ## $a3 = 0000067B -/* 01C28 80A93BC8 0C031AB1 */ jal func_800C6AC4 +/* 01C28 80A93BC8 0C031AB1 */ jal Graph_OpenDisp /* 01C2C 80A93BCC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01C30 80A93BD0 8FB800A4 */ lw $t8, 0x00A4($sp) /* 01C34 80A93BD4 0C024F46 */ jal func_80093D18 @@ -583,7 +583,7 @@ glabel EnKanban_Draw /* 0249C 80A9443C 24C650B0 */ addiu $a2, $a2, %lo(D_80A950B0) ## $a2 = 80A950B0 /* 024A0 80A94440 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFD8 /* 024A4 80A94444 24070741 */ addiu $a3, $zero, 0x0741 ## $a3 = 00000741 -/* 024A8 80A94448 0C031AD5 */ jal func_800C6B54 +/* 024A8 80A94448 0C031AD5 */ jal Graph_CloseDisp /* 024AC 80A9444C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 024B0 80A94450 8FBF001C */ lw $ra, 0x001C($sp) /* 024B4 80A94454 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s index 32a464bdda..7a7bb35df0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s @@ -14,7 +14,7 @@ glabel EnKarebaba_Draw /* 01258 80A965A8 24C66ACC */ addiu $a2, $a2, %lo(D_80A96ACC) ## $a2 = 80A96ACC /* 0125C 80A965AC 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 01260 80A965B0 24070420 */ addiu $a3, $zero, 0x0420 ## $a3 = 00000420 -/* 01264 80A965B4 0C031AB1 */ jal func_800C6AC4 +/* 01264 80A965B4 0C031AB1 */ jal Graph_OpenDisp /* 01268 80A965B8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0126C 80A965BC 0C024F46 */ jal func_80093D18 /* 01270 80A965C0 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -274,7 +274,7 @@ glabel EnKarebaba_Draw /* 0162C 80A9697C 24C66B30 */ addiu $a2, $a2, %lo(D_80A96B30) ## $a2 = 80A96B30 /* 01630 80A96980 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 01634 80A96984 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 01638 80A96988 0C031AD5 */ jal func_800C6B54 +/* 01638 80A96988 0C031AD5 */ jal Graph_CloseDisp /* 0163C 80A9698C 2407048B */ addiu $a3, $zero, 0x048B ## $a3 = 0000048B /* 01640 80A96990 8E6801F4 */ lw $t0, 0x01F4($s3) ## 000001F4 /* 01644 80A96994 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s index b6dd1a329d..5990545c31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s @@ -9,7 +9,7 @@ glabel func_80A9644C /* 01118 80A96468 24C66A90 */ addiu $a2, $a2, %lo(D_80A96A90) ## $a2 = 80A96A90 /* 0111C 80A9646C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFAC /* 01120 80A96470 240703F5 */ addiu $a3, $zero, 0x03F5 ## $a3 = 000003F5 -/* 01124 80A96474 0C031AB1 */ jal func_800C6AC4 +/* 01124 80A96474 0C031AB1 */ jal Graph_OpenDisp /* 01128 80A96478 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0112C 80A9647C 8FAF0094 */ lw $t7, 0x0094($sp) /* 01130 80A96480 0C025011 */ jal func_80094044 @@ -67,7 +67,7 @@ glabel func_80A9644C /* 01200 80A96550 24C66AB8 */ addiu $a2, $a2, %lo(D_80A96AB8) ## $a2 = 80A96AB8 /* 01204 80A96554 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFAC /* 01208 80A96558 2407040A */ addiu $a3, $zero, 0x040A ## $a3 = 0000040A -/* 0120C 80A9655C 0C031AD5 */ jal func_800C6B54 +/* 0120C 80A9655C 0C031AD5 */ jal Graph_CloseDisp /* 01210 80A96560 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 01214 80A96564 8FBF0024 */ lw $ra, 0x0024($sp) /* 01218 80A96568 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s index 0b65e32f7c..a6d4d4cbc0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s @@ -69,7 +69,7 @@ glabel EnKo_Draw /* 03050 80A99E00 A20900C8 */ sb $t1, 0x00C8($s0) ## 000000C8 /* 03054 80A99E04 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 03058 80A99E08 44C8F800 */ ctc1 $t0, $31 -/* 0305C 80A99E0C 0C031AB1 */ jal func_800C6AC4 +/* 0305C 80A99E0C 0C031AB1 */ jal Graph_OpenDisp /* 03060 80A99E10 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 03064 80A99E14 C6000220 */ lwc1 $f0, 0x0220($s0) ## 00000220 /* 03068 80A99E18 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -250,7 +250,7 @@ glabel EnKo_Draw /* 03304 80A9A0B4 24C6A7AC */ addiu $a2, $a2, %lo(D_80A9A7AC) ## $a2 = 80A9A7AC /* 03308 80A9A0B8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 0330C 80A9A0BC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 03310 80A9A0C0 0C031AD5 */ jal func_800C6B54 +/* 03310 80A9A0C0 0C031AD5 */ jal Graph_CloseDisp /* 03314 80A9A0C4 24070858 */ addiu $a3, $zero, 0x0858 ## $a3 = 00000858 /* 03318 80A9A0C8 8FBF002C */ lw $ra, 0x002C($sp) /* 0331C 80A9A0CC 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s index fada77405a..a664a1ae99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s @@ -9,7 +9,7 @@ glabel EnKz_Draw /* 0126C 80A9D7BC 24C6D970 */ addiu $a2, $a2, %lo(D_80A9D970) ## $a2 = 80A9D970 /* 01270 80A9D7C0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01274 80A9D7C4 240704EB */ addiu $a3, $zero, 0x04EB ## $a3 = 000004EB -/* 01278 80A9D7C8 0C031AB1 */ jal func_800C6AC4 +/* 01278 80A9D7C8 0C031AB1 */ jal Graph_OpenDisp /* 0127C 80A9D7CC AFA50048 */ sw $a1, 0x0048($sp) /* 01280 80A9D7D0 8FA80048 */ lw $t0, 0x0048($sp) /* 01284 80A9D7D4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -56,7 +56,7 @@ glabel EnKz_Draw /* 01328 80A9D878 24C6D980 */ addiu $a2, $a2, %lo(D_80A9D980) ## $a2 = 80A9D980 /* 0132C 80A9D87C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01330 80A9D880 24070501 */ addiu $a3, $zero, 0x0501 ## $a3 = 00000501 -/* 01334 80A9D884 0C031AD5 */ jal func_800C6B54 +/* 01334 80A9D884 0C031AD5 */ jal Graph_CloseDisp /* 01338 80A9D888 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 0133C 80A9D88C 8FBF002C */ lw $ra, 0x002C($sp) /* 01340 80A9D890 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s index 5421d9843b..838fe722bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s @@ -16,7 +16,7 @@ glabel EnLight_Draw /* 009A4 80A9E4E4 AFA80084 */ sw $t0, 0x0084($sp) /* 009A8 80A9E4E8 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 009AC 80A9E4EC 240701B9 */ addiu $a3, $zero, 0x01B9 ## $a3 = 000001B9 -/* 009B0 80A9E4F0 0C031AB1 */ jal func_800C6AC4 +/* 009B0 80A9E4F0 0C031AB1 */ jal Graph_OpenDisp /* 009B4 80A9E4F4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 009B8 80A9E4F8 8FAC0094 */ lw $t4, 0x0094($sp) /* 009BC 80A9E4FC 0C024F61 */ jal func_80093D84 @@ -214,7 +214,7 @@ glabel EnLight_Draw /* 00CB0 80A9E7F0 240701EB */ addiu $a3, $zero, 0x01EB ## $a3 = 000001EB /* 00CB4 80A9E7F4 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00CB8 80A9E7F8 8FAB0094 */ lw $t3, 0x0094($sp) -/* 00CBC 80A9E7FC 0C031AD5 */ jal func_800C6B54 +/* 00CBC 80A9E7FC 0C031AD5 */ jal Graph_CloseDisp /* 00CC0 80A9E800 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 00CC4 80A9E804 8FBF003C */ lw $ra, 0x003C($sp) /* 00CC8 80A9E808 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s index 7d2931c2d2..44f949da20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s @@ -11,7 +11,7 @@ glabel EnMThunder_Draw /* 00D2C 80A9FD0C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D30 80A9FD10 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFD8 /* 00D34 80A9FD14 2407034C */ addiu $a3, $zero, 0x034C ## $a3 = 0000034C -/* 00D38 80A9FD18 0C031AB1 */ jal func_800C6AC4 +/* 00D38 80A9FD18 0C031AB1 */ jal Graph_OpenDisp /* 00D3C 80A9FD1C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00D40 80A9FD20 8FB800B4 */ lw $t8, 0x00B4($sp) /* 00D44 80A9FD24 0C024F61 */ jal func_80093D84 @@ -463,7 +463,7 @@ glabel EnMThunder_Draw /* 013F4 80AA03D4 24C604CC */ addiu $a2, $a2, %lo(D_80AA04CC) ## $a2 = 80AA04CC /* 013F8 80AA03D8 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFD8 /* 013FC 80AA03DC 24070407 */ addiu $a3, $zero, 0x0407 ## $a3 = 00000407 -/* 01400 80AA03E0 0C031AD5 */ jal func_800C6B54 +/* 01400 80AA03E0 0C031AD5 */ jal Graph_CloseDisp /* 01404 80AA03E4 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 01408 80AA03E8 8FBF003C */ lw $ra, 0x003C($sp) /* 0140C 80AA03EC 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s index dcaeb34325..6478377b84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s @@ -11,7 +11,7 @@ glabel EnMa1_Draw /* 00E38 80AA14C8 24C616E0 */ addiu $a2, $a2, %lo(D_80AA16E0) ## $a2 = 80AA16E0 /* 00E3C 80AA14CC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00E40 80AA14D0 240704CA */ addiu $a3, $zero, 0x04CA ## $a3 = 000004CA -/* 00E44 80AA14D4 0C031AB1 */ jal func_800C6AC4 +/* 00E44 80AA14D4 0C031AB1 */ jal Graph_OpenDisp /* 00E48 80AA14D8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00E4C 80AA14DC 864E07A0 */ lh $t6, 0x07A0($s2) ## 000007A0 /* 00E50 80AA14E0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 @@ -87,7 +87,7 @@ glabel EnMa1_Draw /* 00F64 80AA15F4 24C616F0 */ addiu $a2, $a2, %lo(D_80AA16F0) ## $a2 = 80AA16F0 /* 00F68 80AA15F8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00F6C 80AA15FC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00F70 80AA1600 0C031AD5 */ jal func_800C6B54 +/* 00F70 80AA1600 0C031AD5 */ jal Graph_CloseDisp /* 00F74 80AA1604 240704ED */ addiu $a3, $zero, 0x04ED ## $a3 = 000004ED /* 00F78 80AA1608 8FBF0034 */ lw $ra, 0x0034($sp) /* 00F7C 80AA160C 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s index b578dfe044..9bf7f8d77b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s @@ -11,7 +11,7 @@ glabel EnMa2_Draw /* 00D00 80AA26A0 24C628F0 */ addiu $a2, $a2, %lo(D_80AA28F0) ## $a2 = 80AA28F0 /* 00D04 80AA26A4 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00D08 80AA26A8 240703BB */ addiu $a3, $zero, 0x03BB ## $a3 = 000003BB -/* 00D0C 80AA26AC 0C031AB1 */ jal func_800C6AC4 +/* 00D0C 80AA26AC 0C031AB1 */ jal Graph_OpenDisp /* 00D10 80AA26B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00D14 80AA26B4 864E07A0 */ lh $t6, 0x07A0($s2) ## 000007A0 /* 00D18 80AA26B8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 @@ -87,7 +87,7 @@ glabel EnMa2_Draw /* 00E2C 80AA27CC 24C62900 */ addiu $a2, $a2, %lo(D_80AA2900) ## $a2 = 80AA2900 /* 00E30 80AA27D0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00E34 80AA27D4 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00E38 80AA27D8 0C031AD5 */ jal func_800C6B54 +/* 00E38 80AA27D8 0C031AD5 */ jal Graph_CloseDisp /* 00E3C 80AA27DC 240703DE */ addiu $a3, $zero, 0x03DE ## $a3 = 000003DE /* 00E40 80AA27E0 8FBF0034 */ lw $ra, 0x0034($sp) /* 00E44 80AA27E4 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s index 4f64c378e2..02fcb5a1a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s @@ -20,7 +20,7 @@ glabel func_80AA2590 /* 00C38 80AA25D8 24070388 */ addiu $a3, $zero, 0x0388 ## $a3 = 00000388 /* 00C3C 80AA25DC 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 00C40 80AA25E0 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 00C44 80AA25E4 0C031AB1 */ jal func_800C6AC4 +/* 00C44 80AA25E4 0C031AB1 */ jal Graph_OpenDisp /* 00C48 80AA25E8 AFA50034 */ sw $a1, 0x0034($sp) /* 00C4C 80AA25EC 8FA9004C */ lw $t1, 0x004C($sp) /* 00C50 80AA25F0 8FA50058 */ lw $a1, 0x0058($sp) @@ -55,7 +55,7 @@ glabel func_80AA2590 .L80AA265C: /* 00CBC 80AA265C 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 00CC0 80AA2660 2407039F */ addiu $a3, $zero, 0x039F ## $a3 = 0000039F -/* 00CC4 80AA2664 0C031AD5 */ jal func_800C6B54 +/* 00CC4 80AA2664 0C031AD5 */ jal Graph_CloseDisp /* 00CC8 80AA2668 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 00CCC 80AA266C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00CD0 80AA2670 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s index 58f01c55ba..2ce05b92f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s @@ -11,7 +11,7 @@ glabel EnMa3_Draw /* 00BF0 80AA3690 24C638E0 */ addiu $a2, $a2, %lo(D_80AA38E0) ## $a2 = 80AA38E0 /* 00BF4 80AA3694 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00BF8 80AA3698 240703D2 */ addiu $a3, $zero, 0x03D2 ## $a3 = 000003D2 -/* 00BFC 80AA369C 0C031AB1 */ jal func_800C6AC4 +/* 00BFC 80AA369C 0C031AB1 */ jal Graph_OpenDisp /* 00C00 80AA36A0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00C04 80AA36A4 864E07A0 */ lh $t6, 0x07A0($s2) ## 000007A0 /* 00C08 80AA36A8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 @@ -87,7 +87,7 @@ glabel EnMa3_Draw /* 00D1C 80AA37BC 24C638F0 */ addiu $a2, $a2, %lo(D_80AA38F0) ## $a2 = 80AA38F0 /* 00D20 80AA37C0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00D24 80AA37C4 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00D28 80AA37C8 0C031AD5 */ jal func_800C6B54 +/* 00D28 80AA37C8 0C031AD5 */ jal Graph_CloseDisp /* 00D2C 80AA37CC 240703F5 */ addiu $a3, $zero, 0x03F5 ## $a3 = 000003F5 /* 00D30 80AA37D0 8FBF0034 */ lw $ra, 0x0034($sp) /* 00D34 80AA37D4 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s index 340c9951bf..a2da6cdd70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s @@ -20,7 +20,7 @@ glabel func_80AA3580 /* 00B28 80AA35C8 2407039F */ addiu $a3, $zero, 0x039F ## $a3 = 0000039F /* 00B2C 80AA35CC 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 00B30 80AA35D0 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 00B34 80AA35D4 0C031AB1 */ jal func_800C6AC4 +/* 00B34 80AA35D4 0C031AB1 */ jal Graph_OpenDisp /* 00B38 80AA35D8 AFA50034 */ sw $a1, 0x0034($sp) /* 00B3C 80AA35DC 8FA9004C */ lw $t1, 0x004C($sp) /* 00B40 80AA35E0 8FA50058 */ lw $a1, 0x0058($sp) @@ -55,7 +55,7 @@ glabel func_80AA3580 .L80AA364C: /* 00BAC 80AA364C 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 00BB0 80AA3650 240703B6 */ addiu $a3, $zero, 0x03B6 ## $a3 = 000003B6 -/* 00BB4 80AA3654 0C031AD5 */ jal func_800C6B54 +/* 00BB4 80AA3654 0C031AD5 */ jal Graph_CloseDisp /* 00BB8 80AA3658 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 00BBC 80AA365C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00BC0 80AA3660 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s index 65371202a6..b923e14b8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s @@ -9,10 +9,10 @@ glabel EnMag_Draw /* 022F0 80AA5DF0 24C65F10 */ addiu $a2, $a2, %lo(D_80AA5F10) ## $a2 = 80AA5F10 /* 022F4 80AA5DF4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 022F8 80AA5DF8 2407047F */ addiu $a3, $zero, 0x047F ## $a3 = 0000047F -/* 022FC 80AA5DFC 0C031AB1 */ jal func_800C6AC4 +/* 022FC 80AA5DFC 0C031AB1 */ jal Graph_OpenDisp /* 02300 80AA5E00 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 02304 80AA5E04 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 -/* 02308 80AA5E08 0C031B08 */ jal func_800C6C20 +/* 02308 80AA5E08 0C031B08 */ jal Graph_GfxPlusOne /* 0230C 80AA5E0C AFA40044 */ sw $a0, 0x0044($sp) /* 02310 80AA5E10 AFA20048 */ sw $v0, 0x0048($sp) /* 02314 80AA5E14 8E0302B0 */ lw $v1, 0x02B0($s0) ## 000002B0 @@ -33,7 +33,7 @@ glabel EnMag_Draw /* 02350 80AA5E50 AD000004 */ sw $zero, 0x0004($t0) ## 00000004 /* 02354 80AA5E54 AD0A0000 */ sw $t2, 0x0000($t0) ## 00000000 /* 02358 80AA5E58 8FA50048 */ lw $a1, 0x0048($sp) -/* 0235C 80AA5E5C 0C031B0A */ jal func_800C6C28 +/* 0235C 80AA5E5C 0C031B0A */ jal Graph_BranchDlist /* 02360 80AA5E60 8FA40044 */ lw $a0, 0x0044($sp) /* 02364 80AA5E64 8FAB0048 */ lw $t3, 0x0048($sp) /* 02368 80AA5E68 3C0680AA */ lui $a2, %hi(D_80AA5F20) ## $a2 = 80AA0000 @@ -42,7 +42,7 @@ glabel EnMag_Draw /* 02374 80AA5E74 8FAC0054 */ lw $t4, 0x0054($sp) /* 02378 80AA5E78 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 0237C 80AA5E7C 24070489 */ addiu $a3, $zero, 0x0489 ## $a3 = 00000489 -/* 02380 80AA5E80 0C031AD5 */ jal func_800C6B54 +/* 02380 80AA5E80 0C031AD5 */ jal Graph_CloseDisp /* 02384 80AA5E84 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 02388 80AA5E88 8FBF001C */ lw $ra, 0x001C($sp) /* 0238C 80AA5E8C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s index 48ddbb3da2..ca569ee448 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s @@ -9,7 +9,7 @@ glabel EnMd_Draw /* 01F2C 80AAC17C 24C6C4B0 */ addiu $a2, $a2, %lo(D_80AAC4B0) ## $a2 = 80AAC4B0 /* 01F30 80AAC180 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01F34 80AAC184 24070500 */ addiu $a3, $zero, 0x0500 ## $a3 = 00000500 -/* 01F38 80AAC188 0C031AB1 */ jal func_800C6AC4 +/* 01F38 80AAC188 0C031AB1 */ jal Graph_OpenDisp /* 01F3C 80AAC18C AFA50048 */ sw $a1, 0x0048($sp) /* 01F40 80AAC190 86020210 */ lh $v0, 0x0210($s0) ## 00000210 /* 01F44 80AAC194 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -94,7 +94,7 @@ glabel EnMd_Draw /* 02074 80AAC2C4 24C6C4C0 */ addiu $a2, $a2, %lo(D_80AAC4C0) ## $a2 = 80AAC4C0 /* 02078 80AAC2C8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 0207C 80AAC2CC 24070525 */ addiu $a3, $zero, 0x0525 ## $a3 = 00000525 -/* 02080 80AAC2D0 0C031AD5 */ jal func_800C6B54 +/* 02080 80AAC2D0 0C031AD5 */ jal Graph_CloseDisp /* 02084 80AAC2D4 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 02088 80AAC2D8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0208C 80AAC2DC 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s index dd1fe2866b..8bdd0f8b64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s @@ -10,7 +10,7 @@ glabel EnMm_Draw /* 00F5C 80AAE6CC 24C6EC00 */ addiu $a2, $a2, %lo(D_80AAEC00) ## $a2 = 80AAEC00 /* 00F60 80AAE6D0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 00F64 80AAE6D4 24070429 */ addiu $a3, $zero, 0x0429 ## $a3 = 00000429 -/* 00F68 80AAE6D8 0C031AB1 */ jal func_800C6AC4 +/* 00F68 80AAE6D8 0C031AB1 */ jal Graph_OpenDisp /* 00F6C 80AAE6DC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00F70 80AAE6E0 0C024F46 */ jal func_80093D18 /* 00F74 80AAE6E4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -175,7 +175,7 @@ glabel EnMm_Draw /* 011E4 80AAE954 24C6EC40 */ addiu $a2, $a2, %lo(D_80AAEC40) ## $a2 = 80AAEC40 /* 011E8 80AAE958 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 011EC 80AAE95C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 011F0 80AAE960 0C031AD5 */ jal func_800C6B54 +/* 011F0 80AAE960 0C031AD5 */ jal Graph_CloseDisp /* 011F4 80AAE964 24070475 */ addiu $a3, $zero, 0x0475 ## $a3 = 00000475 /* 011F8 80AAE968 8FBF002C */ lw $ra, 0x002C($sp) /* 011FC 80AAE96C 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s index fe7598ec10..de139c4516 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s @@ -9,7 +9,7 @@ glabel EnMm2_Draw /* 00AA4 80AAF8F4 24C6FBE8 */ addiu $a2, $a2, %lo(D_80AAFBE8) ## $a2 = 80AAFBE8 /* 00AA8 80AAF8F8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00AAC 80AAF8FC 2407027A */ addiu $a3, $zero, 0x027A ## $a3 = 0000027A -/* 00AB0 80AAF900 0C031AB1 */ jal func_800C6AC4 +/* 00AB0 80AAF900 0C031AB1 */ jal Graph_OpenDisp /* 00AB4 80AAF904 AFA50048 */ sw $a1, 0x0048($sp) /* 00AB8 80AAF908 8FAF0054 */ lw $t7, 0x0054($sp) /* 00ABC 80AAF90C 0C024F46 */ jal func_80093D18 @@ -56,7 +56,7 @@ glabel EnMm2_Draw /* 00B60 80AAF9B0 24C6FBF8 */ addiu $a2, $a2, %lo(D_80AAFBF8) ## $a2 = 80AAFBF8 /* 00B64 80AAF9B4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00B68 80AAF9B8 2407028E */ addiu $a3, $zero, 0x028E ## $a3 = 0000028E -/* 00B6C 80AAF9BC 0C031AD5 */ jal func_800C6B54 +/* 00B6C 80AAF9BC 0C031AD5 */ jal Graph_CloseDisp /* 00B70 80AAF9C0 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 00B74 80AAF9C4 8FBF002C */ lw $ra, 0x002C($sp) /* 00B78 80AAF9C8 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s index d59f000feb..b19a69086f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s @@ -41,7 +41,7 @@ glabel EnMu_Draw /* 0068C 80AB0AAC A12C0004 */ sb $t4, 0x0004($t1) ## FFFFFFD0 /* 00690 80AB0AB0 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 /* 00694 80AB0AB4 24070202 */ addiu $a3, $zero, 0x0202 ## $a3 = 00000202 -/* 00698 80AB0AB8 0C031AB1 */ jal func_800C6AC4 +/* 00698 80AB0AB8 0C031AB1 */ jal Graph_OpenDisp /* 0069C 80AB0ABC 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 006A0 80AB0AC0 3C01C496 */ lui $at, 0xC496 ## $at = C4960000 /* 006A4 80AB0AC4 44816000 */ mtc1 $at, $f12 ## $f12 = -1200.00 @@ -95,7 +95,7 @@ glabel EnMu_Draw /* 00760 80AB0B80 24C60C80 */ addiu $a2, $a2, %lo(D_80AB0C80) ## $a2 = 80AB0C80 /* 00764 80AB0B84 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFB4 /* 00768 80AB0B88 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 0076C 80AB0B8C 0C031AD5 */ jal func_800C6B54 +/* 0076C 80AB0B8C 0C031AD5 */ jal Graph_CloseDisp /* 00770 80AB0B90 24070216 */ addiu $a3, $zero, 0x0216 ## $a3 = 00000216 /* 00774 80AB0B94 8FBF004C */ lw $ra, 0x004C($sp) /* 00778 80AB0B98 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s index 6201d6ebe9..e6c794eead 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s @@ -15,7 +15,7 @@ glabel func_80AB1E2C /* 010D0 80AB1E60 AFB80068 */ sw $t8, 0x0068($sp) /* 010D4 80AB1E64 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 010D8 80AB1E68 24070107 */ addiu $a3, $zero, 0x0107 ## $a3 = 00000107 -/* 010DC 80AB1E6C 0C031AB1 */ jal func_800C6AC4 +/* 010DC 80AB1E6C 0C031AB1 */ jal Graph_OpenDisp /* 010E0 80AB1E70 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 010E4 80AB1E74 8FA9007C */ lw $t1, 0x007C($sp) /* 010E8 80AB1E78 0C024F61 */ jal func_80093D84 @@ -86,7 +86,7 @@ glabel func_80AB1E2C /* 011EC 80AB1F7C 24C65030 */ addiu $a2, $a2, %lo(D_80AB5030) ## $a2 = 80AB5030 /* 011F0 80AB1F80 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 011F4 80AB1F84 24070122 */ addiu $a3, $zero, 0x0122 ## $a3 = 00000122 -/* 011F8 80AB1F88 0C031AD5 */ jal func_800C6B54 +/* 011F8 80AB1F88 0C031AD5 */ jal Graph_CloseDisp /* 011FC 80AB1F8C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 01200 80AB1F90 8FBF002C */ lw $ra, 0x002C($sp) /* 01204 80AB1F94 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s index a8fe5ce658..fd6ef202a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s @@ -8,7 +8,7 @@ glabel func_80AB2E70 /* 020F8 80AB2E88 24C650C4 */ addiu $a2, $a2, %lo(D_80AB50C4) ## $a2 = 80AB50C4 /* 020FC 80AB2E8C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 02100 80AB2E90 2407023C */ addiu $a3, $zero, 0x023C ## $a3 = 0000023C -/* 02104 80AB2E94 0C031AB1 */ jal func_800C6AC4 +/* 02104 80AB2E94 0C031AB1 */ jal Graph_OpenDisp /* 02108 80AB2E98 AFA50054 */ sw $a1, 0x0054($sp) /* 0210C 80AB2E9C 8FAF0064 */ lw $t7, 0x0064($sp) /* 02110 80AB2EA0 0C024F46 */ jal func_80093D18 @@ -77,7 +77,7 @@ glabel func_80AB2E70 /* 0220C 80AB2F9C 24C650E0 */ addiu $a2, $a2, %lo(D_80AB50E0) ## $a2 = 80AB50E0 /* 02210 80AB2FA0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 02214 80AB2FA4 24070251 */ addiu $a3, $zero, 0x0251 ## $a3 = 00000251 -/* 02218 80AB2FA8 0C031AD5 */ jal func_800C6B54 +/* 02218 80AB2FA8 0C031AD5 */ jal Graph_CloseDisp /* 0221C 80AB2FAC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 02220 80AB2FB0 8FBF0024 */ lw $ra, 0x0024($sp) /* 02224 80AB2FB4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s index 3db4ea8ca9..b05619c44e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s @@ -14,7 +14,7 @@ glabel func_80AB2FE4 /* 02284 80AB3014 AFB80060 */ sw $t8, 0x0060($sp) /* 02288 80AB3018 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0228C 80AB301C 2407026F */ addiu $a3, $zero, 0x026F ## $a3 = 0000026F -/* 02290 80AB3020 0C031AB1 */ jal func_800C6AC4 +/* 02290 80AB3020 0C031AB1 */ jal Graph_OpenDisp /* 02294 80AB3024 AFA50058 */ sw $a1, 0x0058($sp) /* 02298 80AB3028 8FA90074 */ lw $t1, 0x0074($sp) /* 0229C 80AB302C 0C024F46 */ jal func_80093D18 @@ -84,7 +84,7 @@ glabel func_80AB2FE4 /* 0239C 80AB312C 24C65118 */ addiu $a2, $a2, %lo(D_80AB5118) ## $a2 = 80AB5118 /* 023A0 80AB3130 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 023A4 80AB3134 24070284 */ addiu $a3, $zero, 0x0284 ## $a3 = 00000284 -/* 023A8 80AB3138 0C031AD5 */ jal func_800C6B54 +/* 023A8 80AB3138 0C031AD5 */ jal Graph_CloseDisp /* 023AC 80AB313C 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 023B0 80AB3140 8FBF0024 */ lw $ra, 0x0024($sp) /* 023B4 80AB3144 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s index b5971356f0..d89282db17 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s @@ -14,7 +14,7 @@ glabel func_80AB410C /* 033AC 80AB413C AFB80060 */ sw $t8, 0x0060($sp) /* 033B0 80AB4140 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 033B4 80AB4144 240703E0 */ addiu $a3, $zero, 0x03E0 ## $a3 = 000003E0 -/* 033B8 80AB4148 0C031AB1 */ jal func_800C6AC4 +/* 033B8 80AB4148 0C031AB1 */ jal Graph_OpenDisp /* 033BC 80AB414C AFA50058 */ sw $a1, 0x0058($sp) /* 033C0 80AB4150 8FA90074 */ lw $t1, 0x0074($sp) /* 033C4 80AB4154 0C024F46 */ jal func_80093D18 @@ -86,7 +86,7 @@ glabel func_80AB410C /* 034CC 80AB425C 24C651B8 */ addiu $a2, $a2, %lo(D_80AB51B8) ## $a2 = 80AB51B8 /* 034D0 80AB4260 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 034D4 80AB4264 240703F5 */ addiu $a3, $zero, 0x03F5 ## $a3 = 000003F5 -/* 034D8 80AB4268 0C031AD5 */ jal func_800C6B54 +/* 034D8 80AB4268 0C031AD5 */ jal Graph_CloseDisp /* 034DC 80AB426C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 034E0 80AB4270 8FBF0024 */ lw $ra, 0x0024($sp) /* 034E4 80AB4274 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s index ec24e0bb07..46b0b487a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s @@ -21,7 +21,7 @@ glabel func_80AB840C /* 02CD8 80AB8458 24C68A20 */ addiu $a2, $a2, %lo(D_80AB8A20) ## $a2 = 80AB8A20 /* 02CDC 80AB845C 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 02CE0 80AB8460 24070769 */ addiu $a3, $zero, 0x0769 ## $a3 = 00000769 -/* 02CE4 80AB8464 0C031AB1 */ jal func_800C6AC4 +/* 02CE4 80AB8464 0C031AB1 */ jal Graph_OpenDisp /* 02CE8 80AB8468 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 02CEC 80AB846C 0C024F61 */ jal func_80093D84 /* 02CF0 80AB8470 8EE40000 */ lw $a0, 0x0000($s7) ## 00000000 @@ -101,7 +101,7 @@ glabel func_80AB840C /* 02E0C 80AB858C 24C68A40 */ addiu $a2, $a2, %lo(D_80AB8A40) ## $a2 = 80AB8A40 /* 02E10 80AB8590 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 02E14 80AB8594 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 02E18 80AB8598 0C031AD5 */ jal func_800C6B54 +/* 02E18 80AB8598 0C031AD5 */ jal Graph_CloseDisp /* 02E1C 80AB859C 2407077F */ addiu $a3, $zero, 0x077F ## $a3 = 0000077F /* 02E20 80AB85A0 8FBF0054 */ lw $ra, 0x0054($sp) /* 02E24 80AB85A4 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s index b3a7eb0b91..1d32e60590 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s @@ -19,7 +19,7 @@ glabel EnNiwGirl_Draw /* 0090C 80AB988C 24C69AEC */ addiu $a2, $a2, %lo(D_80AB9AEC) ## $a2 = 80AB9AEC /* 00910 80AB9890 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 /* 00914 80AB9894 2407023D */ addiu $a3, $zero, 0x023D ## $a3 = 0000023D -/* 00918 80AB9898 0C031AB1 */ jal func_800C6AC4 +/* 00918 80AB9898 0C031AB1 */ jal Graph_OpenDisp /* 0091C 80AB989C AFA50048 */ sw $a1, 0x0048($sp) /* 00920 80AB98A0 0C024F46 */ jal func_80093D18 /* 00924 80AB98A4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -67,7 +67,7 @@ glabel EnNiwGirl_Draw /* 009CC 80AB994C 24C69B00 */ addiu $a2, $a2, %lo(D_80AB9B00) ## $a2 = 80AB9B00 /* 009D0 80AB9950 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 /* 009D4 80AB9954 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 009D8 80AB9958 0C031AD5 */ jal func_800C6B54 +/* 009D8 80AB9958 0C031AD5 */ jal Graph_CloseDisp /* 009DC 80AB995C 24070250 */ addiu $a3, $zero, 0x0250 ## $a3 = 00000250 /* 009E0 80AB9960 8FBF002C */ lw $ra, 0x002C($sp) /* 009E4 80AB9964 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s index f8383e4f3a..053447f3a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s @@ -10,7 +10,7 @@ glabel func_80ABB228 /* 01608 80ABB248 24C6B71C */ addiu $a2, $a2, %lo(D_80ABB71C) ## $a2 = 80ABB71C /* 0160C 80ABB24C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 01610 80ABB250 24070543 */ addiu $a3, $zero, 0x0543 ## $a3 = 00000543 -/* 01614 80ABB254 0C031AB1 */ jal func_800C6AC4 +/* 01614 80ABB254 0C031AB1 */ jal Graph_OpenDisp /* 01618 80ABB258 AFA50054 */ sw $a1, 0x0054($sp) /* 0161C 80ABB25C 860E027E */ lh $t6, 0x027E($s0) ## 0000027E /* 01620 80ABB260 8FA80054 */ lw $t0, 0x0054($sp) @@ -77,7 +77,7 @@ glabel func_80ABB228 /* 01710 80ABB350 24C6B730 */ addiu $a2, $a2, %lo(D_80ABB730) ## $a2 = 80ABB730 /* 01714 80ABB354 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 01718 80ABB358 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0171C 80ABB35C 0C031AD5 */ jal func_800C6B54 +/* 0171C 80ABB35C 0C031AD5 */ jal Graph_CloseDisp /* 01720 80ABB360 2407055A */ addiu $a3, $zero, 0x055A ## $a3 = 0000055A /* 01724 80ABB364 8FBF002C */ lw $ra, 0x002C($sp) /* 01728 80ABB368 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s index 19e48285b3..0c5ee42bf2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s @@ -18,7 +18,7 @@ glabel func_80ABC460 /* 003C0 80ABC4A0 24C6CAC0 */ addiu $a2, $a2, %lo(D_80ABCAC0) ## $a2 = 80ABCAC0 /* 003C4 80ABC4A4 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFF98 /* 003C8 80ABC4A8 2407013C */ addiu $a3, $zero, 0x013C ## $a3 = 0000013C -/* 003CC 80ABC4AC 0C031AB1 */ jal func_800C6AC4 +/* 003CC 80ABC4AC 0C031AB1 */ jal Graph_OpenDisp /* 003D0 80ABC4B0 AFA500A8 */ sw $a1, 0x00A8($sp) /* 003D4 80ABC4B4 0C024F20 */ jal func_80093C80 /* 003D8 80ABC4B8 8FA40104 */ lw $a0, 0x0104($sp) @@ -230,7 +230,7 @@ glabel func_80ABC460 /* 006F4 80ABC7D4 24C6CAF0 */ addiu $a2, $a2, %lo(D_80ABCAF0) ## $a2 = 80ABCAF0 /* 006F8 80ABC7D8 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFF98 /* 006FC 80ABC7DC 2407018B */ addiu $a3, $zero, 0x018B ## $a3 = 0000018B -/* 00700 80ABC7E0 0C031AD5 */ jal func_800C6B54 +/* 00700 80ABC7E0 0C031AD5 */ jal Graph_CloseDisp /* 00704 80ABC7E4 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 00708 80ABC7E8 8FBF004C */ lw $ra, 0x004C($sp) /* 0070C 80ABC7EC D7B40020 */ ldc1 $f20, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s index 3f595742f4..b3b532d5ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s @@ -10,7 +10,7 @@ glabel EnNy_Draw /* 01194 80ABDD44 24C6E444 */ addiu $a2, $a2, %lo(D_80ABE444) ## $a2 = 80ABE444 /* 01198 80ABDD48 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 0119C 80ABDD4C 24070345 */ addiu $a3, $zero, 0x0345 ## $a3 = 00000345 -/* 011A0 80ABDD50 0C031AB1 */ jal func_800C6AC4 +/* 011A0 80ABDD50 0C031AB1 */ jal Graph_OpenDisp /* 011A4 80ABDD54 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 011A8 80ABDD58 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 011AC 80ABDD5C 0C018A29 */ jal func_800628A4 @@ -141,7 +141,7 @@ glabel EnNy_Draw /* 0139C 80ABDF4C 24C6E474 */ addiu $a2, $a2, %lo(D_80ABE474) ## $a2 = 80ABE474 /* 013A0 80ABDF50 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 013A4 80ABDF54 24070368 */ addiu $a3, $zero, 0x0368 ## $a3 = 00000368 -/* 013A8 80ABDF58 0C031AD5 */ jal func_800C6B54 +/* 013A8 80ABDF58 0C031AD5 */ jal Graph_CloseDisp /* 013AC 80ABDF5C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 013B0 80ABDF60 862301CA */ lh $v1, 0x01CA($s1) ## 000001CA /* 013B4 80ABDF64 10600031 */ beq $v1, $zero, .L80ABE02C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s index 23b36db792..d5573badc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s @@ -20,7 +20,7 @@ glabel func_80ABE040 /* 014D8 80ABE088 24C6E484 */ addiu $a2, $a2, %lo(D_80ABE484) ## $a2 = 80ABE484 /* 014DC 80ABE08C 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 014E0 80ABE090 24070384 */ addiu $a3, $zero, 0x0384 ## $a3 = 00000384 -/* 014E4 80ABE094 0C031AB1 */ jal func_800C6AC4 +/* 014E4 80ABE094 0C031AB1 */ jal Graph_OpenDisp /* 014E8 80ABE098 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 014EC 80ABE09C 8FAF00C4 */ lw $t7, 0x00C4($sp) /* 014F0 80ABE0A0 0C024F46 */ jal func_80093D18 @@ -113,7 +113,7 @@ glabel func_80ABE040 /* 01644 80ABE1F4 24C6E4A4 */ addiu $a2, $a2, %lo(D_80ABE4A4) ## $a2 = 80ABE4A4 /* 01648 80ABE1F8 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 0164C 80ABE1FC 24070397 */ addiu $a3, $zero, 0x0397 ## $a3 = 00000397 -/* 01650 80ABE200 0C031AD5 */ jal func_800C6B54 +/* 01650 80ABE200 0C031AD5 */ jal Graph_CloseDisp /* 01654 80ABE204 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 01658 80ABE208 868201CA */ lh $v0, 0x01CA($s4) ## 000001CA /* 0165C 80ABE20C 1040002F */ beq $v0, $zero, .L80ABE2CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s index 775e9350db..255b3644b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s @@ -27,7 +27,7 @@ glabel EnOkuta_Draw .L80AC2734: /* 020D4 80AC2734 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 020D8 80AC2738 24070675 */ addiu $a3, $zero, 0x0675 ## $a3 = 00000675 -/* 020DC 80AC273C 0C031AB1 */ jal func_800C6AC4 +/* 020DC 80AC273C 0C031AB1 */ jal Graph_OpenDisp /* 020E0 80AC2740 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 020E4 80AC2744 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 020E8 80AC2748 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 @@ -68,7 +68,7 @@ glabel EnOkuta_Draw /* 02174 80AC27D4 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 02178 80AC27D8 24C628F0 */ addiu $a2, $a2, %lo(D_80AC28F0) ## $a2 = 80AC28F0 /* 0217C 80AC27DC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 02180 80AC27E0 0C031AD5 */ jal func_800C6B54 +/* 02180 80AC27E0 0C031AD5 */ jal Graph_CloseDisp /* 02184 80AC27E4 2407067E */ addiu $a3, $zero, 0x067E ## $a3 = 0000067E /* 02188 80AC27E8 8FBF002C */ lw $ra, 0x002C($sp) .L80AC27EC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s index fad30e0d52..6d53c46ed6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s @@ -10,7 +10,7 @@ glabel func_80AC7528 /* 048A8 80AC7548 24C6939C */ addiu $a2, $a2, %lo(D_80AC939C) ## $a2 = 80AC939C /* 048AC 80AC754C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 048B0 80AC7550 24071060 */ addiu $a3, $zero, 0x1060 ## $a3 = 00001060 -/* 048B4 80AC7554 0C031AB1 */ jal func_800C6AC4 +/* 048B4 80AC7554 0C031AB1 */ jal Graph_OpenDisp /* 048B8 80AC7558 AFA5005C */ sw $a1, 0x005C($sp) /* 048BC 80AC755C 93AF008F */ lbu $t7, 0x008F($sp) /* 048C0 80AC7560 8FA8005C */ lw $t0, 0x005C($sp) @@ -163,7 +163,7 @@ glabel func_80AC7528 /* 04B08 80AC77A8 24C693AC */ addiu $a2, $a2, %lo(D_80AC93AC) ## $a2 = 80AC93AC /* 04B0C 80AC77AC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 04B10 80AC77B0 24071077 */ addiu $a3, $zero, 0x1077 ## $a3 = 00001077 -/* 04B14 80AC77B4 0C031AD5 */ jal func_800C6B54 +/* 04B14 80AC77B4 0C031AD5 */ jal Graph_CloseDisp /* 04B18 80AC77B8 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 04B1C 80AC77BC 8FBF0014 */ lw $ra, 0x0014($sp) /* 04B20 80AC77C0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s index c23f51eef5..17cab5fea4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s @@ -10,7 +10,7 @@ glabel func_80AC77CC /* 04B4C 80AC77EC 24C693BC */ addiu $a2, $a2, %lo(D_80AC93BC) ## $a2 = 80AC93BC /* 04B50 80AC77F0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFC8 /* 04B54 80AC77F4 24071084 */ addiu $a3, $zero, 0x1084 ## $a3 = 00001084 -/* 04B58 80AC77F8 0C031AB1 */ jal func_800C6AC4 +/* 04B58 80AC77F8 0C031AB1 */ jal Graph_OpenDisp /* 04B5C 80AC77FC AFA50048 */ sw $a1, 0x0048($sp) /* 04B60 80AC7800 8FA80048 */ lw $t0, 0x0048($sp) /* 04B64 80AC7804 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 @@ -120,7 +120,7 @@ glabel func_80AC77CC /* 04D04 80AC79A4 01CD6025 */ or $t4, $t6, $t5 ## $t4 = 00000000 /* 04D08 80AC79A8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 04D0C 80AC79AC 8FAF0070 */ lw $t7, 0x0070($sp) -/* 04D10 80AC79B0 0C031AD5 */ jal func_800C6B54 +/* 04D10 80AC79B0 0C031AD5 */ jal Graph_CloseDisp /* 04D14 80AC79B4 8DE50000 */ lw $a1, 0x0000($t7) ## F1000000 /* 04D18 80AC79B8 8FBF0014 */ lw $ra, 0x0014($sp) /* 04D1C 80AC79BC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s index beff7c3314..6c1e7643fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s @@ -13,7 +13,7 @@ glabel func_80AC79C8 /* 04D54 80AC79F4 AFAF0098 */ sw $t7, 0x0098($sp) /* 04D58 80AC79F8 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 04D5C 80AC79FC 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 -/* 04D60 80AC7A00 0C031AB1 */ jal func_800C6AC4 +/* 04D60 80AC7A00 0C031AB1 */ jal Graph_OpenDisp /* 04D64 80AC7A04 AFA50094 */ sw $a1, 0x0094($sp) /* 04D68 80AC7A08 8FB9009C */ lw $t9, 0x009C($sp) /* 04D6C 80AC7A0C 8FA80094 */ lw $t0, 0x0094($sp) @@ -246,7 +246,7 @@ glabel func_80AC79C8 /* 050E4 80AC7D84 24C693EC */ addiu $a2, $a2, %lo(D_80AC93EC) ## $a2 = 80AC93EC /* 050E8 80AC7D88 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 050EC 80AC7D8C 240710CC */ addiu $a3, $zero, 0x10CC ## $a3 = 000010CC -/* 050F0 80AC7D90 0C031AD5 */ jal func_800C6B54 +/* 050F0 80AC7D90 0C031AD5 */ jal Graph_CloseDisp /* 050F4 80AC7D94 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 050F8 80AC7D98 8FBF003C */ lw $ra, 0x003C($sp) /* 050FC 80AC7D9C 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s index f8645e2974..a0c8d5c377 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s @@ -10,7 +10,7 @@ glabel func_80AC7DAC /* 0512C 80AC7DCC 24C693FC */ addiu $a2, $a2, %lo(D_80AC93FC) ## $a2 = 80AC93FC /* 05130 80AC7DD0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05134 80AC7DD4 240710E0 */ addiu $a3, $zero, 0x10E0 ## $a3 = 000010E0 -/* 05138 80AC7DD8 0C031AB1 */ jal func_800C6AC4 +/* 05138 80AC7DD8 0C031AB1 */ jal Graph_OpenDisp /* 0513C 80AC7DDC AFA5004C */ sw $a1, 0x004C($sp) /* 05140 80AC7DE0 0C024F46 */ jal func_80093D18 /* 05144 80AC7DE4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -65,7 +65,7 @@ glabel func_80AC7DAC /* 05208 80AC7EA8 24C6940C */ addiu $a2, $a2, %lo(D_80AC940C) ## $a2 = 80AC940C /* 0520C 80AC7EAC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05210 80AC7EB0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05214 80AC7EB4 0C031AD5 */ jal func_800C6B54 +/* 05214 80AC7EB4 0C031AD5 */ jal Graph_CloseDisp /* 05218 80AC7EB8 240710F4 */ addiu $a3, $zero, 0x10F4 ## $a3 = 000010F4 /* 0521C 80AC7EBC 8FBF002C */ lw $ra, 0x002C($sp) /* 05220 80AC7EC0 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s index 7d9a38b545..e5f66c07ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s @@ -10,7 +10,7 @@ glabel func_80AC7ED0 /* 05250 80AC7EF0 24C6941C */ addiu $a2, $a2, %lo(D_80AC941C) ## $a2 = 80AC941C /* 05254 80AC7EF4 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 05258 80AC7EF8 24071102 */ addiu $a3, $zero, 0x1102 ## $a3 = 00001102 -/* 0525C 80AC7EFC 0C031AB1 */ jal func_800C6AC4 +/* 0525C 80AC7EFC 0C031AB1 */ jal Graph_OpenDisp /* 05260 80AC7F00 AFA50034 */ sw $a1, 0x0034($sp) /* 05264 80AC7F04 8FAF0044 */ lw $t7, 0x0044($sp) /* 05268 80AC7F08 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -76,7 +76,7 @@ glabel func_80AC7ED0 /* 05354 80AC7FF4 24C6942C */ addiu $a2, $a2, %lo(D_80AC942C) ## $a2 = 80AC942C /* 05358 80AC7FF8 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 0535C 80AC7FFC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 05360 80AC8000 0C031AD5 */ jal func_800C6B54 +/* 05360 80AC8000 0C031AD5 */ jal Graph_CloseDisp /* 05364 80AC8004 24071116 */ addiu $a3, $zero, 0x1116 ## $a3 = 00001116 /* 05368 80AC8008 8FBF0014 */ lw $ra, 0x0014($sp) /* 0536C 80AC800C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s index c243d203be..09ce0bbaa6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s @@ -11,7 +11,7 @@ glabel func_80AC80B4 /* 05438 80AC80D8 24C6943C */ addiu $a2, $a2, %lo(D_80AC943C) ## $a2 = 80AC943C /* 0543C 80AC80DC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05440 80AC80E0 24071139 */ addiu $a3, $zero, 0x1139 ## $a3 = 00001139 -/* 05444 80AC80E4 0C031AB1 */ jal func_800C6AC4 +/* 05444 80AC80E4 0C031AB1 */ jal Graph_OpenDisp /* 05448 80AC80E8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0544C 80AC80EC 0C024F46 */ jal func_80093D18 /* 05450 80AC80F0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -91,7 +91,7 @@ glabel func_80AC80B4 /* 05578 80AC8218 24C6944C */ addiu $a2, $a2, %lo(D_80AC944C) ## $a2 = 80AC944C /* 0557C 80AC821C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05580 80AC8220 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 05584 80AC8224 0C031AD5 */ jal func_800C6B54 +/* 05584 80AC8224 0C031AD5 */ jal Graph_CloseDisp /* 05588 80AC8228 24071152 */ addiu $a3, $zero, 0x1152 ## $a3 = 00001152 /* 0558C 80AC822C 8FBF0034 */ lw $ra, 0x0034($sp) /* 05590 80AC8230 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s index a8a445139b..ad1ff194c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s @@ -10,7 +10,7 @@ glabel func_80AC8244 /* 055C4 80AC8264 24C6945C */ addiu $a2, $a2, %lo(D_80AC945C) ## $a2 = 80AC945C /* 055C8 80AC8268 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 055CC 80AC826C 24071167 */ addiu $a3, $zero, 0x1167 ## $a3 = 00001167 -/* 055D0 80AC8270 0C031AB1 */ jal func_800C6AC4 +/* 055D0 80AC8270 0C031AB1 */ jal Graph_OpenDisp /* 055D4 80AC8274 AFA5004C */ sw $a1, 0x004C($sp) /* 055D8 80AC8278 0C024F46 */ jal func_80093D18 /* 055DC 80AC827C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -81,7 +81,7 @@ glabel func_80AC8244 /* 056E0 80AC8380 24C6946C */ addiu $a2, $a2, %lo(D_80AC946C) ## $a2 = 80AC946C /* 056E4 80AC8384 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 056E8 80AC8388 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 056EC 80AC838C 0C031AD5 */ jal func_800C6B54 +/* 056EC 80AC838C 0C031AD5 */ jal Graph_CloseDisp /* 056F0 80AC8390 2407117C */ addiu $a3, $zero, 0x117C ## $a3 = 0000117C /* 056F4 80AC8394 8FBF002C */ lw $ra, 0x002C($sp) /* 056F8 80AC8398 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s index 45f1ecd22b..be05723e94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s @@ -11,7 +11,7 @@ glabel func_80AC83DC /* 05760 80AC8400 24C6947C */ addiu $a2, $a2, %lo(D_80AC947C) ## $a2 = 80AC947C /* 05764 80AC8404 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05768 80AC8408 2407119A */ addiu $a3, $zero, 0x119A ## $a3 = 0000119A -/* 0576C 80AC840C 0C031AB1 */ jal func_800C6AC4 +/* 0576C 80AC840C 0C031AB1 */ jal Graph_OpenDisp /* 05770 80AC8410 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 05774 80AC8414 0C024F46 */ jal func_80093D18 /* 05778 80AC8418 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -83,7 +83,7 @@ glabel func_80AC83DC /* 05880 80AC8520 24C6948C */ addiu $a2, $a2, %lo(D_80AC948C) ## $a2 = 80AC948C /* 05884 80AC8524 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05888 80AC8528 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0588C 80AC852C 0C031AD5 */ jal func_800C6B54 +/* 0588C 80AC852C 0C031AD5 */ jal Graph_CloseDisp /* 05890 80AC8530 240711B3 */ addiu $a3, $zero, 0x11B3 ## $a3 = 000011B3 /* 05894 80AC8534 8FBF0034 */ lw $ra, 0x0034($sp) /* 05898 80AC8538 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s index af5a2ab9da..5b2751f157 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s @@ -10,7 +10,7 @@ glabel func_80AC854C /* 058CC 80AC856C 24C6949C */ addiu $a2, $a2, %lo(D_80AC949C) ## $a2 = 80AC949C /* 058D0 80AC8570 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 058D4 80AC8574 240711C0 */ addiu $a3, $zero, 0x11C0 ## $a3 = 000011C0 -/* 058D8 80AC8578 0C031AB1 */ jal func_800C6AC4 +/* 058D8 80AC8578 0C031AB1 */ jal Graph_OpenDisp /* 058DC 80AC857C AFA5004C */ sw $a1, 0x004C($sp) /* 058E0 80AC8580 0C024F46 */ jal func_80093D18 /* 058E4 80AC8584 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -63,7 +63,7 @@ glabel func_80AC854C /* 059A0 80AC8640 24C694AC */ addiu $a2, $a2, %lo(D_80AC94AC) ## $a2 = 80AC94AC /* 059A4 80AC8644 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 059A8 80AC8648 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 059AC 80AC864C 0C031AD5 */ jal func_800C6B54 +/* 059AC 80AC864C 0C031AD5 */ jal Graph_CloseDisp /* 059B0 80AC8650 240711D4 */ addiu $a3, $zero, 0x11D4 ## $a3 = 000011D4 /* 059B4 80AC8654 8FBF002C */ lw $ra, 0x002C($sp) /* 059B8 80AC8658 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s index 505ac6b48e..d20d212195 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s @@ -10,7 +10,7 @@ glabel func_80AC8668 /* 059E8 80AC8688 24C694BC */ addiu $a2, $a2, %lo(D_80AC94BC) ## $a2 = 80AC94BC /* 059EC 80AC868C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 059F0 80AC8690 240711E2 */ addiu $a3, $zero, 0x11E2 ## $a3 = 000011E2 -/* 059F4 80AC8694 0C031AB1 */ jal func_800C6AC4 +/* 059F4 80AC8694 0C031AB1 */ jal Graph_OpenDisp /* 059F8 80AC8698 AFA5004C */ sw $a1, 0x004C($sp) /* 059FC 80AC869C 0C024F46 */ jal func_80093D18 /* 05A00 80AC86A0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -63,7 +63,7 @@ glabel func_80AC8668 /* 05ABC 80AC875C 24C694CC */ addiu $a2, $a2, %lo(D_80AC94CC) ## $a2 = 80AC94CC /* 05AC0 80AC8760 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05AC4 80AC8764 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05AC8 80AC8768 0C031AD5 */ jal func_800C6B54 +/* 05AC8 80AC8768 0C031AD5 */ jal Graph_CloseDisp /* 05ACC 80AC876C 240711F6 */ addiu $a3, $zero, 0x11F6 ## $a3 = 000011F6 /* 05AD0 80AC8770 8FBF002C */ lw $ra, 0x002C($sp) /* 05AD4 80AC8774 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s index 657bd298fb..30beaca3ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s @@ -10,7 +10,7 @@ glabel func_80AC8784 /* 05B04 80AC87A4 24C694DC */ addiu $a2, $a2, %lo(D_80AC94DC) ## $a2 = 80AC94DC /* 05B08 80AC87A8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05B0C 80AC87AC 24071203 */ addiu $a3, $zero, 0x1203 ## $a3 = 00001203 -/* 05B10 80AC87B0 0C031AB1 */ jal func_800C6AC4 +/* 05B10 80AC87B0 0C031AB1 */ jal Graph_OpenDisp /* 05B14 80AC87B4 AFA5004C */ sw $a1, 0x004C($sp) /* 05B18 80AC87B8 0C024F46 */ jal func_80093D18 /* 05B1C 80AC87BC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -63,7 +63,7 @@ glabel func_80AC8784 /* 05BD8 80AC8878 24C694EC */ addiu $a2, $a2, %lo(D_80AC94EC) ## $a2 = 80AC94EC /* 05BDC 80AC887C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05BE0 80AC8880 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05BE4 80AC8884 0C031AD5 */ jal func_800C6B54 +/* 05BE4 80AC8884 0C031AD5 */ jal Graph_CloseDisp /* 05BE8 80AC8888 24071217 */ addiu $a3, $zero, 0x1217 ## $a3 = 00001217 /* 05BEC 80AC888C 8FBF002C */ lw $ra, 0x002C($sp) /* 05BF0 80AC8890 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s index 79d6df8f3e..bf126c5d84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s @@ -8,7 +8,7 @@ glabel EnOwl_Draw /* 030B0 80ACCFD0 24C6D7DC */ addiu $a2, $a2, %lo(D_80ACD7DC) ## $a2 = 80ACD7DC /* 030B4 80ACCFD4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 030B8 80ACCFD8 240708C7 */ addiu $a3, $zero, 0x08C7 ## $a3 = 000008C7 -/* 030BC 80ACCFDC 0C031AB1 */ jal func_800C6AC4 +/* 030BC 80ACCFDC 0C031AB1 */ jal Graph_OpenDisp /* 030C0 80ACCFE0 AFA50044 */ sw $a1, 0x0044($sp) /* 030C4 80ACCFE4 8FAF0054 */ lw $t7, 0x0054($sp) /* 030C8 80ACCFE8 0C0250F2 */ jal func_800943C8 @@ -57,7 +57,7 @@ glabel EnOwl_Draw /* 03174 80ACD094 24C6D7EC */ addiu $a2, $a2, %lo(D_80ACD7EC) ## $a2 = 80ACD7EC /* 03178 80ACD098 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0317C 80ACD09C 240708D8 */ addiu $a3, $zero, 0x08D8 ## $a3 = 000008D8 -/* 03180 80ACD0A0 0C031AD5 */ jal func_800C6B54 +/* 03180 80ACD0A0 0C031AD5 */ jal Graph_CloseDisp /* 03184 80ACD0A4 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 03188 80ACD0A8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0318C 80ACD0AC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s index a4283c438a..b2b949c7c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s @@ -9,7 +9,7 @@ glabel EnPart_Draw /* 00DC8 80ACEB98 24C6F210 */ addiu $a2, $a2, %lo(D_80ACF210) ## $a2 = 80ACF210 /* 00DCC 80ACEB9C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 00DD0 80ACEBA0 24070287 */ addiu $a3, $zero, 0x0287 ## $a3 = 00000287 -/* 00DD4 80ACEBA4 0C031AB1 */ jal func_800C6AC4 +/* 00DD4 80ACEBA4 0C031AB1 */ jal Graph_OpenDisp /* 00DD8 80ACEBA8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00DDC 80ACEBAC 8FAF0098 */ lw $t7, 0x0098($sp) /* 00DE0 80ACEBB0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 @@ -388,7 +388,7 @@ glabel EnPart_Draw /* 01394 80ACF164 24C6F230 */ addiu $a2, $a2, %lo(D_80ACF230) ## $a2 = 80ACF230 /* 01398 80ACF168 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 0139C 80ACF16C 240702BC */ addiu $a3, $zero, 0x02BC ## $a3 = 000002BC -/* 013A0 80ACF170 0C031AD5 */ jal func_800C6B54 +/* 013A0 80ACF170 0C031AD5 */ jal Graph_CloseDisp /* 013A4 80ACF174 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 013A8 80ACF178 8FBF002C */ lw $ra, 0x002C($sp) /* 013AC 80ACF17C 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s index 024daa45c4..e3b151d91f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s @@ -34,7 +34,7 @@ glabel func_80AD2224 /* 02DF8 80AD2298 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 02DFC 80AD229C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02E00 80AD22A0 2407079A */ addiu $a3, $zero, 0x079A ## $a3 = 0000079A -/* 02E04 80AD22A4 0C031AB1 */ jal func_800C6AC4 +/* 02E04 80AD22A4 0C031AB1 */ jal Graph_OpenDisp /* 02E08 80AD22A8 AFA50040 */ sw $a1, 0x0040($sp) /* 02E0C 80AD22AC 0C034213 */ jal Matrix_Push /* 02E10 80AD22B0 00000000 */ nop @@ -125,7 +125,7 @@ glabel func_80AD2224 /* 02F64 80AD2404 24C628B8 */ addiu $a2, $a2, %lo(D_80AD28B8) ## $a2 = 80AD28B8 /* 02F68 80AD2408 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02F6C 80AD240C 240707AB */ addiu $a3, $zero, 0x07AB ## $a3 = 000007AB -/* 02F70 80AD2410 0C031AD5 */ jal func_800C6B54 +/* 02F70 80AD2410 0C031AD5 */ jal Graph_CloseDisp /* 02F74 80AD2414 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 02F78 80AD2418 10000002 */ beq $zero, $zero, .L80AD2424 /* 02F7C 80AD241C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s index 6407ea478b..111cac9f9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s @@ -33,7 +33,7 @@ glabel func_80AD2438 /* 03010 80AD24B0 E7A40038 */ swc1 $f4, 0x0038($sp) /* 03014 80AD24B4 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 03018 80AD24B8 240707BD */ addiu $a3, $zero, 0x07BD ## $a3 = 000007BD -/* 0301C 80AD24BC 0C031AB1 */ jal func_800C6AC4 +/* 0301C 80AD24BC 0C031AB1 */ jal Graph_OpenDisp /* 03020 80AD24C0 AFA50034 */ sw $a1, 0x0034($sp) /* 03024 80AD24C4 0C034213 */ jal Matrix_Push /* 03028 80AD24C8 00000000 */ nop @@ -120,7 +120,7 @@ glabel func_80AD2438 /* 03164 80AD2604 24C628F4 */ addiu $a2, $a2, %lo(D_80AD28F4) ## $a2 = 80AD28F4 /* 03168 80AD2608 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 0316C 80AD260C 240707CA */ addiu $a3, $zero, 0x07CA ## $a3 = 000007CA -/* 03170 80AD2610 0C031AD5 */ jal func_800C6B54 +/* 03170 80AD2610 0C031AD5 */ jal Graph_CloseDisp /* 03174 80AD2614 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 .L80AD2618: /* 03178 80AD2618 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s index 1f8ef6cbd8..d85ab43d04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s @@ -11,7 +11,7 @@ glabel EnPoDesert_Draw /* 00B68 80AD3818 24C63A04 */ addiu $a2, $a2, %lo(D_80AD3A04) ## $a2 = 80AD3A04 /* 00B6C 80AD381C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 00B70 80AD3820 2407022F */ addiu $a3, $zero, 0x022F ## $a3 = 0000022F -/* 00B74 80AD3824 0C031AB1 */ jal func_800C6AC4 +/* 00B74 80AD3824 0C031AB1 */ jal Graph_OpenDisp /* 00B78 80AD3828 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00B7C 80AD382C 0C024F61 */ jal func_80093D84 /* 00B80 80AD3830 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -89,7 +89,7 @@ glabel EnPoDesert_Draw /* 00C98 80AD3948 24C63A18 */ addiu $a2, $a2, %lo(D_80AD3A18) ## $a2 = 80AD3A18 /* 00C9C 80AD394C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 00CA0 80AD3950 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 -/* 00CA4 80AD3954 0C031AD5 */ jal func_800C6B54 +/* 00CA4 80AD3954 0C031AD5 */ jal Graph_CloseDisp /* 00CA8 80AD3958 24070255 */ addiu $a3, $zero, 0x0255 ## $a3 = 00000255 /* 00CAC 80AD395C 8FBF0034 */ lw $ra, 0x0034($sp) /* 00CB0 80AD3960 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s index ddcfeffbd3..ebaf3f5595 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s @@ -21,7 +21,7 @@ glabel EnPoField_Draw /* 02E30 80AD6930 AFA80078 */ sw $t0, 0x0078($sp) /* 02E34 80AD6934 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 02E38 80AD6938 240707B8 */ addiu $a3, $zero, 0x07B8 ## $a3 = 000007B8 -/* 02E3C 80AD693C 0C031AB1 */ jal func_800C6AC4 +/* 02E3C 80AD693C 0C031AB1 */ jal Graph_OpenDisp /* 02E40 80AD6940 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 02E44 80AD6944 0C024F46 */ jal func_80093D18 /* 02E48 80AD6948 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -187,7 +187,7 @@ glabel EnPoField_Draw /* 030BC 80AD6BBC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 030C0 80AD6BC0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 030C4 80AD6BC4 24C671D8 */ addiu $a2, $a2, %lo(D_80AD71D8) ## $a2 = 80AD71D8 -/* 030C8 80AD6BC8 0C031AD5 */ jal func_800C6B54 +/* 030C8 80AD6BC8 0C031AD5 */ jal Graph_CloseDisp /* 030CC 80AD6BCC 240707F7 */ addiu $a3, $zero, 0x07F7 ## $a3 = 000007F7 .L80AD6BD0: /* 030D0 80AD6BD0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s index 17f04da5d1..afb40b981c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s @@ -13,7 +13,7 @@ glabel func_80AD5E8C /* 023B8 80AD5EB8 3C0680AD */ lui $a2, %hi(D_80AD7160) ## $a2 = 80AD0000 /* 023BC 80AD5EBC 24C67160 */ addiu $a2, $a2, %lo(D_80AD7160) ## $a2 = 80AD7160 /* 023C0 80AD5EC0 24070685 */ addiu $a3, $zero, 0x0685 ## $a3 = 00000685 -/* 023C4 80AD5EC4 0C031AB1 */ jal func_800C6AC4 +/* 023C4 80AD5EC4 0C031AB1 */ jal Graph_OpenDisp /* 023C8 80AD5EC8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 023CC 80AD5ECC 0C024F61 */ jal func_80093D84 /* 023D0 80AD5ED0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -192,7 +192,7 @@ glabel func_80AD5E8C /* 02670 80AD6170 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 02674 80AD6174 24C67188 */ addiu $a2, $a2, %lo(D_80AD7188) ## $a2 = 80AD7188 /* 02678 80AD6178 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 -/* 0267C 80AD617C 0C031AD5 */ jal func_800C6B54 +/* 0267C 80AD617C 0C031AD5 */ jal Graph_CloseDisp /* 02680 80AD6180 240706B0 */ addiu $a3, $zero, 0x06B0 ## $a3 = 000006B0 .L80AD6184: /* 02684 80AD6184 8FBF0044 */ lw $ra, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s index 75057f40c9..57d619439d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s @@ -17,7 +17,7 @@ glabel func_80AD6C4C /* 03188 80AD6C88 AFA80094 */ sw $t0, 0x0094($sp) /* 0318C 80AD6C8C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE0 /* 03190 80AD6C90 2407081D */ addiu $a3, $zero, 0x081D ## $a3 = 0000081D -/* 03194 80AD6C94 0C031AB1 */ jal func_800C6AC4 +/* 03194 80AD6C94 0C031AB1 */ jal Graph_OpenDisp /* 03198 80AD6C98 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0319C 80AD6C9C 8E290190 */ lw $t1, 0x0190($s1) ## 00000190 /* 031A0 80AD6CA0 3C1980AD */ lui $t9, %hi(func_80AD53F0) ## $t9 = 80AD0000 @@ -251,7 +251,7 @@ glabel func_80AD6C4C /* 03524 80AD7024 24C67228 */ addiu $a2, $a2, %lo(D_80AD7228) ## $a2 = 80AD7228 /* 03528 80AD7028 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE0 /* 0352C 80AD702C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 03530 80AD7030 0C031AD5 */ jal func_800C6B54 +/* 03530 80AD7030 0C031AD5 */ jal Graph_CloseDisp /* 03534 80AD7034 24070865 */ addiu $a3, $zero, 0x0865 ## $a3 = 00000865 /* 03538 80AD7038 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0353C 80AD703C 0C2B57A3 */ jal func_80AD5E8C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s index 664e8e65b1..38d1048012 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s @@ -9,7 +9,7 @@ glabel EnPoRelay_Draw /* 01414 80AD8B54 24C68DC4 */ addiu $a2, $a2, %lo(D_80AD8DC4) ## $a2 = 80AD8DC4 /* 01418 80AD8B58 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 0141C 80AD8B5C 240703AC */ addiu $a3, $zero, 0x03AC ## $a3 = 000003AC -/* 01420 80AD8B60 0C031AB1 */ jal func_800C6AC4 +/* 01420 80AD8B60 0C031AB1 */ jal Graph_OpenDisp /* 01424 80AD8B64 AFA50048 */ sw $a1, 0x0048($sp) /* 01428 80AD8B68 8FAF0054 */ lw $t7, 0x0054($sp) /* 0142C 80AD8B6C 0C024F46 */ jal func_80093D18 @@ -54,7 +54,7 @@ glabel EnPoRelay_Draw /* 014C8 80AD8C08 24C68DD8 */ addiu $a2, $a2, %lo(D_80AD8DD8) ## $a2 = 80AD8DD8 /* 014CC 80AD8C0C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 014D0 80AD8C10 240703BA */ addiu $a3, $zero, 0x03BA ## $a3 = 000003BA -/* 014D4 80AD8C14 0C031AD5 */ jal func_800C6B54 +/* 014D4 80AD8C14 0C031AD5 */ jal Graph_CloseDisp /* 014D8 80AD8C18 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 014DC 80AD8C1C 8FBF002C */ lw $ra, 0x002C($sp) /* 014E0 80AD8C20 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s index d2713c3e50..c4b1d277f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s @@ -11,7 +11,7 @@ glabel func_80AD88D0 /* 011B4 80AD88F4 24C68D60 */ addiu $a2, $a2, %lo(D_80AD8D60) ## $a2 = 80AD8D60 /* 011B8 80AD88F8 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD8 /* 011BC 80AD88FC 24070375 */ addiu $a3, $zero, 0x0375 ## $a3 = 00000375 -/* 011C0 80AD8900 0C031AB1 */ jal func_800C6AC4 +/* 011C0 80AD8900 0C031AB1 */ jal Graph_OpenDisp /* 011C4 80AD8904 AFA50068 */ sw $a1, 0x0068($sp) /* 011C8 80AD8908 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -73,7 +73,7 @@ glabel func_80AD88D0 /* 012A8 80AD89E8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 012AC 80AD89EC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 012B0 80AD89F0 8FAA0080 */ lw $t2, 0x0080($sp) -/* 012B4 80AD89F4 0C031AD5 */ jal func_800C6B54 +/* 012B4 80AD89F4 0C031AD5 */ jal Graph_CloseDisp /* 012B8 80AD89F8 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 012BC 80AD89FC 3C0480AE */ lui $a0, %hi(D_80AD8D48) ## $a0 = 80AE0000 /* 012C0 80AD8A00 24848D48 */ addiu $a0, $a0, %lo(D_80AD8D48) ## $a0 = 80AD8D48 @@ -117,7 +117,7 @@ glabel func_80AD88D0 /* 01350 80AD8A90 24C68D88 */ addiu $a2, $a2, %lo(D_80AD8D88) ## $a2 = 80AD8D88 /* 01354 80AD8A94 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFB8 /* 01358 80AD8A98 24070394 */ addiu $a3, $zero, 0x0394 ## $a3 = 00000394 -/* 0135C 80AD8A9C 0C031AB1 */ jal func_800C6AC4 +/* 0135C 80AD8A9C 0C031AB1 */ jal Graph_OpenDisp /* 01360 80AD8AA0 AFA50048 */ sw $a1, 0x0048($sp) /* 01364 80AD8AA4 8FA80048 */ lw $t0, 0x0048($sp) /* 01368 80AD8AA8 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 @@ -150,7 +150,7 @@ glabel func_80AD88D0 /* 013D4 80AD8B14 24C68DB0 */ addiu $a2, $a2, %lo(D_80AD8DB0) ## $a2 = 80AD8DB0 /* 013D8 80AD8B18 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFB8 /* 013DC 80AD8B1C 2407039A */ addiu $a3, $zero, 0x039A ## $a3 = 0000039A -/* 013E0 80AD8B20 0C031AD5 */ jal func_800C6B54 +/* 013E0 80AD8B20 0C031AD5 */ jal Graph_CloseDisp /* 013E4 80AD8B24 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 .L80AD8B28: /* 013E8 80AD8B28 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s index c5f3175bbe..eb7683730e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s @@ -28,7 +28,7 @@ glabel EnPoSisters_Draw /* 0411C 80ADD0AC 24C6D828 */ addiu $a2, $a2, %lo(D_80ADD828) ## $a2 = 80ADD828 /* 04120 80ADD0B0 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFCC /* 04124 80ADD0B4 24070BAD */ addiu $a3, $zero, 0x0BAD ## $a3 = 00000BAD -/* 04128 80ADD0B8 0C031AB1 */ jal func_800C6AC4 +/* 04128 80ADD0B8 0C031AB1 */ jal Graph_OpenDisp /* 0412C 80ADD0BC 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 04130 80ADD0C0 0C2B7157 */ jal func_80ADC55C /* 04134 80ADD0C4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 @@ -432,7 +432,7 @@ glabel EnPoSisters_Draw /* 04710 80ADD6A0 24C6D870 */ addiu $a2, $a2, %lo(D_80ADD870) ## $a2 = 80ADD870 /* 04714 80ADD6A4 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFCC /* 04718 80ADD6A8 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 0471C 80ADD6AC 0C031AD5 */ jal func_800C6B54 +/* 0471C 80ADD6AC 0C031AD5 */ jal Graph_CloseDisp /* 04720 80ADD6B0 24070C43 */ addiu $a3, $zero, 0x0C43 ## $a3 = 00000C43 /* 04724 80ADD6B4 8FBF006C */ lw $ra, 0x006C($sp) /* 04728 80ADD6B8 D7B40030 */ ldc1 $f20, 0x0030($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s index 0f45b74ffd..ba42bf1c04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s @@ -10,7 +10,7 @@ glabel func_80AE0EE4 /* 031B4 80AE0F04 24C61B90 */ addiu $a2, $a2, %lo(D_80AE1B90) ## $a2 = 80AE1B90 /* 031B8 80AE0F08 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 031BC 80AE0F0C 24070A45 */ addiu $a3, $zero, 0x0A45 ## $a3 = 00000A45 -/* 031C0 80AE0F10 0C031AB1 */ jal func_800C6AC4 +/* 031C0 80AE0F10 0C031AB1 */ jal Graph_OpenDisp /* 031C4 80AE0F14 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 031C8 80AE0F18 0C2B819F */ jal func_80AE067C /* 031CC 80AE0F1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -148,7 +148,7 @@ glabel func_80AE0EE4 /* 033D0 80AE1120 8D28001C */ lw $t0, 0x001C($t1) ## 0000001C /* 033D4 80AE1124 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 033D8 80AE1128 8FAC0074 */ lw $t4, 0x0074($sp) -/* 033DC 80AE112C 0C031AD5 */ jal func_800C6B54 +/* 033DC 80AE112C 0C031AD5 */ jal Graph_CloseDisp /* 033E0 80AE1130 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 033E4 80AE1134 8FBF002C */ lw $ra, 0x002C($sp) /* 033E8 80AE1138 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s index 4de1c68009..987af49547 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s @@ -10,7 +10,7 @@ glabel func_80AE1148 /* 03418 80AE1168 24C61BC0 */ addiu $a2, $a2, %lo(D_80AE1BC0) ## $a2 = 80AE1BC0 /* 0341C 80AE116C 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 03420 80AE1170 24070A86 */ addiu $a3, $zero, 0x0A86 ## $a3 = 00000A86 -/* 03424 80AE1174 0C031AB1 */ jal func_800C6AC4 +/* 03424 80AE1174 0C031AB1 */ jal Graph_OpenDisp /* 03428 80AE1178 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0342C 80AE117C 0C2B819F */ jal func_80AE067C /* 03430 80AE1180 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -299,7 +299,7 @@ glabel func_80AE1148 /* 03888 80AE15D8 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 0388C 80AE15DC 8FAE009C */ lw $t6, 0x009C($sp) /* 03890 80AE15E0 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 -/* 03894 80AE15E4 0C031AD5 */ jal func_800C6B54 +/* 03894 80AE15E4 0C031AD5 */ jal Graph_CloseDisp /* 03898 80AE15E8 8DC50000 */ lw $a1, 0x0000($t6) ## FB000000 /* 0389C 80AE15EC 8FBF002C */ lw $ra, 0x002C($sp) /* 038A0 80AE15F0 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s index 2efd1ffc41..13db36b70b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s @@ -10,7 +10,7 @@ glabel func_80AE1654 /* 03924 80AE1674 24C61BF0 */ addiu $a2, $a2, %lo(D_80AE1BF0) ## $a2 = 80AE1BF0 /* 03928 80AE1678 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 0392C 80AE167C 24070B11 */ addiu $a3, $zero, 0x0B11 ## $a3 = 00000B11 -/* 03930 80AE1680 0C031AB1 */ jal func_800C6AC4 +/* 03930 80AE1680 0C031AB1 */ jal Graph_OpenDisp /* 03934 80AE1684 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 03938 80AE1688 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 /* 0393C 80AE168C 3C0F80AE */ lui $t7, %hi(func_80ADF994) ## $t7 = 80AE0000 @@ -250,7 +250,7 @@ glabel func_80AE1654 /* 03CD0 80AE1A20 24C61C20 */ addiu $a2, $a2, %lo(D_80AE1C20) ## $a2 = 80AE1C20 /* 03CD4 80AE1A24 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 03CD8 80AE1A28 24070B64 */ addiu $a3, $zero, 0x0B64 ## $a3 = 00000B64 -/* 03CDC 80AE1A2C 0C031AD5 */ jal func_800C6B54 +/* 03CDC 80AE1A2C 0C031AD5 */ jal Graph_CloseDisp /* 03CE0 80AE1A30 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 03CE4 80AE1A34 8FBF003C */ lw $ra, 0x003C($sp) /* 03CE8 80AE1A38 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s index 8a5d18026e..8584ca5402 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s @@ -18,7 +18,7 @@ glabel EnRd_Draw /* 022A8 80AE46A8 ADD80008 */ sw $t8, 0x0008($t6) ## FFFFFFF4 /* 022AC 80AE46AC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 022B0 80AE46B0 2407068F */ addiu $a3, $zero, 0x068F ## $a3 = 0000068F -/* 022B4 80AE46B4 0C031AB1 */ jal func_800C6AC4 +/* 022B4 80AE46B4 0C031AB1 */ jal Graph_OpenDisp /* 022B8 80AE46B8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 022BC 80AE46BC 86190314 */ lh $t9, 0x0314($s0) ## 00000314 /* 022C0 80AE46C0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -135,7 +135,7 @@ glabel EnRd_Draw /* 02474 80AE4874 24C64980 */ addiu $a2, $a2, %lo(D_80AE4980) ## $a2 = 80AE4980 /* 02478 80AE4878 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 0247C 80AE487C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02480 80AE4880 0C031AD5 */ jal func_800C6B54 +/* 02480 80AE4880 0C031AD5 */ jal Graph_CloseDisp /* 02484 80AE4884 240706C7 */ addiu $a3, $zero, 0x06C7 ## $a3 = 000006C7 /* 02488 80AE4888 8FBF0034 */ lw $ra, 0x0034($sp) /* 0248C 80AE488C 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s index 4f6e71c2ea..53fd5464ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s @@ -10,7 +10,7 @@ glabel EnReeba_Draw /* 01714 80AE63E4 24C6665C */ addiu $a2, $a2, %lo(D_80AE665C) ## $a2 = 80AE665C /* 01718 80AE63E8 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 0171C 80AE63EC 24070426 */ addiu $a3, $zero, 0x0426 ## $a3 = 00000426 -/* 01720 80AE63F0 0C031AB1 */ jal func_800C6AC4 +/* 01720 80AE63F0 0C031AB1 */ jal Graph_OpenDisp /* 01724 80AE63F4 AFA5007C */ sw $a1, 0x007C($sp) /* 01728 80AE63F8 0C024F46 */ jal func_80093D18 /* 0172C 80AE63FC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -49,7 +49,7 @@ glabel EnReeba_Draw /* 017A4 80AE6474 24C6666C */ addiu $a2, $a2, %lo(D_80AE666C) ## $a2 = 80AE666C /* 017A8 80AE6478 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 017AC 80AE647C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 017B0 80AE6480 0C031AD5 */ jal func_800C6B54 +/* 017B0 80AE6480 0C031AD5 */ jal Graph_CloseDisp /* 017B4 80AE6484 24070440 */ addiu $a3, $zero, 0x0440 ## $a3 = 00000440 /* 017B8 80AE6488 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 017BC 80AE648C 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s index 6b56a2e16a..0ffe717b41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s @@ -15,7 +15,7 @@ glabel func_80AE7D94 /* 00B18 80AE7DC8 AFB80068 */ sw $t8, 0x0068($sp) /* 00B1C 80AE7DCC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00B20 80AE7DD0 24070130 */ addiu $a3, $zero, 0x0130 ## $a3 = 00000130 -/* 00B24 80AE7DD4 0C031AB1 */ jal func_800C6AC4 +/* 00B24 80AE7DD4 0C031AB1 */ jal Graph_OpenDisp /* 00B28 80AE7DD8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00B2C 80AE7DDC 8FA9007C */ lw $t1, 0x007C($sp) /* 00B30 80AE7DE0 0C024F61 */ jal func_80093D84 @@ -86,7 +86,7 @@ glabel func_80AE7D94 /* 00C34 80AE7EE4 24C68220 */ addiu $a2, $a2, %lo(D_80AE8220) ## $a2 = 80AE8220 /* 00C38 80AE7EE8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 00C3C 80AE7EEC 2407014B */ addiu $a3, $zero, 0x014B ## $a3 = 0000014B -/* 00C40 80AE7EF0 0C031AD5 */ jal func_800C6B54 +/* 00C40 80AE7EF0 0C031AD5 */ jal Graph_CloseDisp /* 00C44 80AE7EF4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00C48 80AE7EF8 8FBF002C */ lw $ra, 0x002C($sp) /* 00C4C 80AE7EFC 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s index 6a39a058a7..4e9dbd4070 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s @@ -14,7 +14,7 @@ glabel func_80AE7FDC /* 00D5C 80AE800C AFB80060 */ sw $t8, 0x0060($sp) /* 00D60 80AE8010 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D64 80AE8014 240701A0 */ addiu $a3, $zero, 0x01A0 ## $a3 = 000001A0 -/* 00D68 80AE8018 0C031AB1 */ jal func_800C6AC4 +/* 00D68 80AE8018 0C031AB1 */ jal Graph_OpenDisp /* 00D6C 80AE801C AFA50058 */ sw $a1, 0x0058($sp) /* 00D70 80AE8020 8FA90074 */ lw $t1, 0x0074($sp) /* 00D74 80AE8024 0C024F46 */ jal func_80093D18 @@ -82,7 +82,7 @@ glabel func_80AE7FDC /* 00E6C 80AE811C 24C6828C */ addiu $a2, $a2, %lo(D_80AE828C) ## $a2 = 80AE828C /* 00E70 80AE8120 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 00E74 80AE8124 240701B5 */ addiu $a3, $zero, 0x01B5 ## $a3 = 000001B5 -/* 00E78 80AE8128 0C031AD5 */ jal func_800C6B54 +/* 00E78 80AE8128 0C031AD5 */ jal Graph_CloseDisp /* 00E7C 80AE812C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00E80 80AE8130 8FBF0024 */ lw $ra, 0x0024($sp) /* 00E84 80AE8134 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s index 46299baf3c..bfe291bbde 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s @@ -21,7 +21,7 @@ glabel EnRr_Draw /* 01DDC 80AEA21C 24C6A838 */ addiu $a2, $a2, %lo(D_80AEA838) ## $a2 = 80AEA838 /* 01DE0 80AEA220 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFD0 /* 01DE4 80AEA224 240705C6 */ addiu $a3, $zero, 0x05C6 ## $a3 = 000005C6 -/* 01DE8 80AEA228 0C031AB1 */ jal func_800C6AC4 +/* 01DE8 80AEA228 0C031AB1 */ jal Graph_OpenDisp /* 01DEC 80AEA22C AFA500A8 */ sw $a1, 0x00A8($sp) /* 01DF0 80AEA230 8FB800CC */ lw $t8, 0x00CC($sp) /* 01DF4 80AEA234 0C024F61 */ jal func_80093D84 @@ -180,7 +180,7 @@ glabel EnRr_Draw /* 02054 80AEA494 24C6A868 */ addiu $a2, $a2, %lo(D_80AEA868) ## $a2 = 80AEA868 /* 02058 80AEA498 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFD0 /* 0205C 80AEA49C 2407060F */ addiu $a3, $zero, 0x060F ## $a3 = 0000060F -/* 02060 80AEA4A0 0C031AD5 */ jal func_800C6B54 +/* 02060 80AEA4A0 0C031AD5 */ jal Graph_CloseDisp /* 02064 80AEA4A4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02068 80AEA4A8 866201F2 */ lh $v0, 0x01F2($s3) ## 000001F2 /* 0206C 80AEA4AC 1040004F */ beq $v0, $zero, .L80AEA5EC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s index 287701edfc..ecf640a3f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s @@ -21,7 +21,7 @@ glabel func_80AF0400 /* 0583C 80AF044C 8D4A0870 */ lw $t2, %lo(D_80AF0870)($t2) /* 05840 80AF0450 AFAA006C */ sw $t2, 0x006C($sp) /* 05844 80AF0454 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05848 80AF0458 0C031AB1 */ jal func_800C6AC4 +/* 05848 80AF0458 0C031AB1 */ jal Graph_OpenDisp /* 0584C 80AF045C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 05850 80AF0460 8FAC008C */ lw $t4, 0x008C($sp) /* 05854 80AF0464 0C024F46 */ jal func_80093D18 @@ -109,7 +109,7 @@ glabel func_80AF0400 /* 0599C 80AF05AC 24C61B64 */ addiu $a2, $a2, %lo(D_80AF1B64) ## $a2 = 80AF1B64 /* 059A0 80AF05B0 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 059A4 80AF05B4 2407051D */ addiu $a3, $zero, 0x051D ## $a3 = 0000051D -/* 059A8 80AF05B8 0C031AD5 */ jal func_800C6B54 +/* 059A8 80AF05B8 0C031AD5 */ jal Graph_CloseDisp /* 059AC 80AF05BC 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 059B0 80AF05C0 8FBF002C */ lw $ra, 0x002C($sp) /* 059B4 80AF05C4 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s index 6489c7fbf8..d7e8655a49 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s @@ -22,7 +22,7 @@ glabel func_80AF05D4 /* 05A14 80AF0624 2407052C */ addiu $a3, $zero, 0x052C ## $a3 = 0000052C /* 05A18 80AF0628 AFB9006C */ sw $t9, 0x006C($sp) /* 05A1C 80AF062C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05A20 80AF0630 0C031AB1 */ jal func_800C6AC4 +/* 05A20 80AF0630 0C031AB1 */ jal Graph_OpenDisp /* 05A24 80AF0634 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 05A28 80AF0638 8FAB008C */ lw $t3, 0x008C($sp) /* 05A2C 80AF063C 0C024F61 */ jal func_80093D84 @@ -108,7 +108,7 @@ glabel func_80AF05D4 /* 05B6C 80AF077C 24C61B84 */ addiu $a2, $a2, %lo(D_80AF1B84) ## $a2 = 80AF1B84 /* 05B70 80AF0780 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 05B74 80AF0784 24070549 */ addiu $a3, $zero, 0x0549 ## $a3 = 00000549 -/* 05B78 80AF0788 0C031AD5 */ jal func_800C6B54 +/* 05B78 80AF0788 0C031AD5 */ jal Graph_CloseDisp /* 05B7C 80AF078C 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 05B80 80AF0790 8FBF002C */ lw $ra, 0x002C($sp) /* 05B84 80AF0794 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s index 76e34f00c5..b3e6eb2022 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s @@ -9,7 +9,7 @@ glabel EnSa_Draw /* 01A24 80AF6F84 24C67490 */ addiu $a2, $a2, %lo(D_80AF7490) ## $a2 = 80AF7490 /* 01A28 80AF6F88 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE8 /* 01A2C 80AF6F8C 240705A4 */ addiu $a3, $zero, 0x05A4 ## $a3 = 000005A4 -/* 01A30 80AF6F90 0C031AB1 */ jal func_800C6AC4 +/* 01A30 80AF6F90 0C031AB1 */ jal Graph_OpenDisp /* 01A34 80AF6F94 AFA50058 */ sw $a1, 0x0058($sp) /* 01A38 80AF6F98 86020218 */ lh $v0, 0x0218($s0) ## 00000218 /* 01A3C 80AF6F9C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -176,7 +176,7 @@ glabel EnSa_Draw /* 01CB4 80AF7214 24C674A0 */ addiu $a2, $a2, %lo(D_80AF74A0) ## $a2 = 80AF74A0 /* 01CB8 80AF7218 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE8 /* 01CBC 80AF721C 240705D9 */ addiu $a3, $zero, 0x05D9 ## $a3 = 000005D9 -/* 01CC0 80AF7220 0C031AD5 */ jal func_800C6B54 +/* 01CC0 80AF7220 0C031AD5 */ jal Graph_CloseDisp /* 01CC4 80AF7224 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01CC8 80AF7228 8FBF0024 */ lw $ra, 0x0024($sp) /* 01CCC 80AF722C 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s index f8c66978a4..001ac6a916 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s @@ -15,7 +15,7 @@ glabel func_80AF9C70 /* 00E84 80AF9CA4 24C6A498 */ addiu $a2, $a2, %lo(D_80AFA498) ## $a2 = 80AFA498 /* 00E88 80AF9CA8 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFD8 /* 00E8C 80AF9CAC 2407033A */ addiu $a3, $zero, 0x033A ## $a3 = 0000033A -/* 00E90 80AF9CB0 0C031AB1 */ jal func_800C6AC4 +/* 00E90 80AF9CB0 0C031AB1 */ jal Graph_OpenDisp /* 00E94 80AF9CB4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 00E98 80AF9CB8 3C0480B0 */ lui $a0, %hi(D_80AFA4A8) ## $a0 = 80B00000 /* 00E9C 80AF9CBC 0C00084C */ jal osSyncPrintf @@ -262,7 +262,7 @@ glabel func_80AF9C70 /* 01250 80AFA070 24C6A4E0 */ addiu $a2, $a2, %lo(D_80AFA4E0) ## $a2 = 80AFA4E0 /* 01254 80AFA074 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFD8 /* 01258 80AFA078 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 0125C 80AFA07C 0C031AD5 */ jal func_800C6B54 +/* 0125C 80AFA07C 0C031AD5 */ jal Graph_CloseDisp /* 01260 80AFA080 24070372 */ addiu $a3, $zero, 0x0372 ## $a3 = 00000372 /* 01264 80AFA084 8FBF0034 */ lw $ra, 0x0034($sp) /* 01268 80AFA088 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s index 2a11dbcfa6..13b6c1c8ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s @@ -16,7 +16,7 @@ glabel func_80AFB290 /* 00BA8 80AFB2C8 240702AA */ addiu $a3, $zero, 0x02AA ## $a3 = 000002AA /* 00BAC 80AFB2CC 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 00BB0 80AFB2D0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFD8 -/* 00BB4 80AFB2D4 0C031AB1 */ jal func_800C6AC4 +/* 00BB4 80AFB2D4 0C031AB1 */ jal Graph_OpenDisp /* 00BB8 80AFB2D8 AFA50038 */ sw $a1, 0x0038($sp) /* 00BBC 80AFB2DC 8FA80060 */ lw $t0, 0x0060($sp) /* 00BC0 80AFB2E0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -116,7 +116,7 @@ glabel func_80AFB290 /* 00D28 80AFB448 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 00D2C 80AFB44C 8FB80050 */ lw $t8, 0x0050($sp) /* 00D30 80AFB450 240702CD */ addiu $a3, $zero, 0x02CD ## $a3 = 000002CD -/* 00D34 80AFB454 0C031AD5 */ jal func_800C6B54 +/* 00D34 80AFB454 0C031AD5 */ jal Graph_CloseDisp /* 00D38 80AFB458 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 .L80AFB45C: /* 00D3C 80AFB45C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s index 8fe29c8986..77ae5ff297 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s @@ -14,7 +14,7 @@ glabel EnSiofuki_Draw /* 00A48 80AFC5C8 24C6C820 */ addiu $a2, $a2, %lo(D_80AFC820) ## $a2 = 80AFC820 /* 00A4C 80AFC5CC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFDC /* 00A50 80AFC5D0 2407028E */ addiu $a3, $zero, 0x028E ## $a3 = 0000028E -/* 00A54 80AFC5D4 0C031AB1 */ jal func_800C6AC4 +/* 00A54 80AFC5D4 0C031AB1 */ jal Graph_OpenDisp /* 00A58 80AFC5D8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00A5C 80AFC5DC 8FB80084 */ lw $t8, 0x0084($sp) /* 00A60 80AFC5E0 0C024F61 */ jal func_80093D84 @@ -90,7 +90,7 @@ glabel EnSiofuki_Draw /* 00B78 80AFC6F8 24C6C848 */ addiu $a2, $a2, %lo(D_80AFC848) ## $a2 = 80AFC848 /* 00B7C 80AFC6FC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFDC /* 00B80 80AFC700 240702A2 */ addiu $a3, $zero, 0x02A2 ## $a3 = 000002A2 -/* 00B84 80AFC704 0C031AD5 */ jal func_800C6B54 +/* 00B84 80AFC704 0C031AD5 */ jal Graph_CloseDisp /* 00B88 80AFC708 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 00B8C 80AFC70C 922F019C */ lbu $t7, 0x019C($s1) ## 0000019C /* 00B90 80AFC710 31EE0001 */ andi $t6, $t7, 0x0001 ## $t6 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s index 598143c42f..69fc5e3eca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s @@ -15,7 +15,7 @@ glabel func_80AFDD30 /* 013C4 80AFDD64 3C0680B0 */ lui $a2, %hi(D_80AFE0E0) ## $a2 = 80B00000 /* 013C8 80AFDD68 24C6E0E0 */ addiu $a2, $a2, %lo(D_80AFE0E0) ## $a2 = 80AFE0E0 /* 013CC 80AFDD6C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 -/* 013D0 80AFDD70 0C031AB1 */ jal func_800C6AC4 +/* 013D0 80AFDD70 0C031AB1 */ jal Graph_OpenDisp /* 013D4 80AFDD74 AFA50038 */ sw $a1, 0x0038($sp) /* 013D8 80AFDD78 8FA20048 */ lw $v0, 0x0048($sp) /* 013DC 80AFDD7C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -110,7 +110,7 @@ glabel func_80AFDD30 /* 0152C 80AFDECC 24C6E0F0 */ addiu $a2, $a2, %lo(D_80AFE0F0) ## $a2 = 80AFE0F0 /* 01530 80AFDED0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 /* 01534 80AFDED4 240703D2 */ addiu $a3, $zero, 0x03D2 ## $a3 = 000003D2 -/* 01538 80AFDED8 0C031AD5 */ jal func_800C6B54 +/* 01538 80AFDED8 0C031AD5 */ jal Graph_CloseDisp /* 0153C 80AFDEDC 8F050000 */ lw $a1, 0x0000($t8) ## 00000008 /* 01540 80AFDEE0 1000000C */ beq $zero, $zero, .L80AFDF14 /* 01544 80AFDEE4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s index d2b7afb6df..00b6646f51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s @@ -10,7 +10,7 @@ glabel EnSkj_Draw /* 032A0 80B01550 24C61860 */ addiu $a2, $a2, %lo(D_80B01860) ## $a2 = 80B01860 /* 032A4 80B01554 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 032A8 80B01558 240709AB */ addiu $a3, $zero, 0x09AB ## $a3 = 000009AB -/* 032AC 80B0155C 0C031AB1 */ jal func_800C6AC4 +/* 032AC 80B0155C 0C031AB1 */ jal Graph_OpenDisp /* 032B0 80B01560 AFA5004C */ sw $a1, 0x004C($sp) /* 032B4 80B01564 0C024F46 */ jal func_80093D18 /* 032B8 80B01568 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -62,7 +62,7 @@ glabel EnSkj_Draw /* 03368 80B01618 24C61870 */ addiu $a2, $a2, %lo(D_80B01870) ## $a2 = 80B01870 /* 0336C 80B0161C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 03370 80B01620 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 03374 80B01624 0C031AD5 */ jal func_800C6B54 +/* 03374 80B01624 0C031AD5 */ jal Graph_CloseDisp /* 03378 80B01628 240709BF */ addiu $a3, $zero, 0x09BF ## $a3 = 000009BF /* 0337C 80B0162C 8FBF002C */ lw $ra, 0x002C($sp) /* 03380 80B01630 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s index 843af339ad..05f0d91996 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s @@ -11,7 +11,7 @@ glabel func_80B01360 /* 030D4 80B01384 24C61830 */ addiu $a2, $a2, %lo(D_80B01830) ## $a2 = 80B01830 /* 030D8 80B01388 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 030DC 80B0138C 24070971 */ addiu $a3, $zero, 0x0971 ## $a3 = 00000971 -/* 030E0 80B01390 0C031AB1 */ jal func_800C6AC4 +/* 030E0 80B01390 0C031AB1 */ jal Graph_OpenDisp /* 030E4 80B01394 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 030E8 80B01398 8FAF0044 */ lw $t7, 0x0044($sp) /* 030EC 80B0139C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B @@ -62,7 +62,7 @@ glabel func_80B01360 /* 0319C 80B0144C 24C61850 */ addiu $a2, $a2, %lo(D_80B01850) ## $a2 = 80B01850 /* 031A0 80B01450 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 031A4 80B01454 24070985 */ addiu $a3, $zero, 0x0985 ## $a3 = 00000985 -/* 031A8 80B01458 0C031AD5 */ jal func_800C6B54 +/* 031A8 80B01458 0C031AD5 */ jal Graph_CloseDisp /* 031AC 80B0145C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 031B0 80B01460 8FBF001C */ lw $ra, 0x001C($sp) /* 031B4 80B01464 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s index ba1a9366fb..71335a4301 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s @@ -9,7 +9,7 @@ glabel EnSkjneedle_Draw /* 001F8 80B020A8 24C621C0 */ addiu $a2, $a2, %lo(D_80B021C0) ## $a2 = 80B021C0 /* 001FC 80B020AC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00200 80B020B0 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 -/* 00204 80B020B4 0C031AB1 */ jal func_800C6AC4 +/* 00204 80B020B4 0C031AB1 */ jal Graph_OpenDisp /* 00208 80B020B8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0020C 80B020BC 8FAF004C */ lw $t7, 0x004C($sp) /* 00210 80B020C0 0C024F46 */ jal func_80093D18 @@ -42,7 +42,7 @@ glabel EnSkjneedle_Draw /* 0027C 80B0212C 24C621F0 */ addiu $a2, $a2, %lo(D_80B021F0) ## $a2 = 80B021F0 /* 00280 80B02130 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00284 80B02134 240700D2 */ addiu $a3, $zero, 0x00D2 ## $a3 = 000000D2 -/* 00288 80B02138 0C031AD5 */ jal func_800C6B54 +/* 00288 80B02138 0C031AD5 */ jal Graph_CloseDisp /* 0028C 80B0213C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00290 80B02140 8FBF001C */ lw $ra, 0x001C($sp) /* 00294 80B02144 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s index 844f6a65c2..6c48c107a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s @@ -13,7 +13,7 @@ glabel EnSsh_Draw /* 02074 80B042E4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02078 80B042E8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0207C 80B042EC 2407091D */ addiu $a3, $zero, 0x091D ## $a3 = 0000091D -/* 02080 80B042F0 0C031AB1 */ jal func_800C6AC4 +/* 02080 80B042F0 0C031AB1 */ jal Graph_OpenDisp /* 02084 80B042F4 AFA50044 */ sw $a1, 0x0044($sp) /* 02088 80B042F8 8FA80044 */ lw $t0, 0x0044($sp) /* 0208C 80B042FC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -45,7 +45,7 @@ glabel EnSsh_Draw /* 020F4 80B04364 8FB90054 */ lw $t9, 0x0054($sp) /* 020F8 80B04368 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 020FC 80B0436C 24070920 */ addiu $a3, $zero, 0x0920 ## $a3 = 00000920 -/* 02100 80B04370 0C031AD5 */ jal func_800C6B54 +/* 02100 80B04370 0C031AD5 */ jal Graph_CloseDisp /* 02104 80B04374 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 02108 80B04378 3C0980B0 */ lui $t1, %hi(func_80B04280) ## $t1 = 80B00000 /* 0210C 80B0437C 25294280 */ addiu $t1, $t1, %lo(func_80B04280) ## $t1 = 80B04280 diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s index 0c9dec0034..f6b51d0685 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s @@ -10,7 +10,7 @@ glabel func_80B06D88 /* 02518 80B06DA8 24C67200 */ addiu $a2, $a2, %lo(D_80B07200) ## $a2 = 80B07200 /* 0251C 80B06DAC 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 02520 80B06DB0 240708D4 */ addiu $a3, $zero, 0x08D4 ## $a3 = 000008D4 -/* 02524 80B06DB4 0C031AB1 */ jal func_800C6AC4 +/* 02524 80B06DB4 0C031AB1 */ jal Graph_OpenDisp /* 02528 80B06DB8 AFA50038 */ sw $a1, 0x0038($sp) /* 0252C 80B06DBC 8FA20044 */ lw $v0, 0x0044($sp) /* 02530 80B06DC0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -69,7 +69,7 @@ glabel func_80B06D88 /* 025F4 80B06E84 24C67210 */ addiu $a2, $a2, %lo(D_80B07210) ## $a2 = 80B07210 /* 025F8 80B06E88 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 025FC 80B06E8C 240708F7 */ addiu $a3, $zero, 0x08F7 ## $a3 = 000008F7 -/* 02600 80B06E90 0C031AD5 */ jal func_800C6B54 +/* 02600 80B06E90 0C031AD5 */ jal Graph_CloseDisp /* 02604 80B06E94 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02608 80B06E98 8FBF0014 */ lw $ra, 0x0014($sp) /* 0260C 80B06E9C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s index 5588f93b05..5e75098157 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s @@ -21,7 +21,7 @@ glabel func_80B0813C /* 00C48 80B08188 8FBF0014 */ lw $ra, 0x0014($sp) /* 00C4C 80B0818C 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 00C50 80B08190 2407081F */ addiu $a3, $zero, 0x081F ## $a3 = 0000081F -/* 00C54 80B08194 0C031AB1 */ jal func_800C6AC4 +/* 00C54 80B08194 0C031AB1 */ jal Graph_OpenDisp /* 00C58 80B08198 AFA50030 */ sw $a1, 0x0030($sp) /* 00C5C 80B0819C 8FA80030 */ lw $t0, 0x0030($sp) /* 00C60 80B081A0 3C0A80B1 */ lui $t2, %hi(D_80B0A3C0) ## $t2 = 80B10000 @@ -37,7 +37,7 @@ glabel func_80B0813C /* 00C88 80B081C8 24C6B560 */ addiu $a2, $a2, %lo(D_80B0B560) ## $a2 = 80B0B560 /* 00C8C 80B081CC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 00C90 80B081D0 24070821 */ addiu $a3, $zero, 0x0821 ## $a3 = 00000821 -/* 00C94 80B081D4 0C031AD5 */ jal func_800C6B54 +/* 00C94 80B081D4 0C031AD5 */ jal Graph_CloseDisp /* 00C98 80B081D8 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 .L80B081DC: /* 00C9C 80B081DC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s index b70a5c7f0b..26a5caee96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s @@ -11,7 +11,7 @@ glabel func_80B08258 /* 00D3C 80B0827C 24C6B570 */ addiu $a2, $a2, %lo(D_80B0B570) ## $a2 = 80B0B570 /* 00D40 80B08280 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 00D44 80B08284 24070855 */ addiu $a3, $zero, 0x0855 ## $a3 = 00000855 -/* 00D48 80B08288 0C031AB1 */ jal func_800C6AC4 +/* 00D48 80B08288 0C031AB1 */ jal Graph_OpenDisp /* 00D4C 80B0828C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00D50 80B08290 924E02A4 */ lbu $t6, 0x02A4($s2) ## 000002A4 /* 00D54 80B08294 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 @@ -102,7 +102,7 @@ glabel func_80B08258 /* 00EA0 80B083E0 24C6B580 */ addiu $a2, $a2, %lo(D_80B0B580) ## $a2 = 80B0B580 /* 00EA4 80B083E4 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 00EA8 80B083E8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00EAC 80B083EC 0C031AD5 */ jal func_800C6B54 +/* 00EAC 80B083EC 0C031AD5 */ jal Graph_CloseDisp /* 00EB0 80B083F0 24070880 */ addiu $a3, $zero, 0x0880 ## $a3 = 00000880 /* 00EB4 80B083F4 8FBF0034 */ lw $ra, 0x0034($sp) /* 00EB8 80B083F8 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s index 922fae8bd9..c3451fd3d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s @@ -14,7 +14,7 @@ glabel EnStream_Draw /* 003DC 80B0BB7C 24C6BCD0 */ addiu $a2, $a2, %lo(D_80B0BCD0) ## $a2 = 80B0BCD0 /* 003E0 80B0BB80 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 003E4 80B0BB84 24070127 */ addiu $a3, $zero, 0x0127 ## $a3 = 00000127 -/* 003E8 80B0BB88 0C031AB1 */ jal func_800C6AC4 +/* 003E8 80B0BB88 0C031AB1 */ jal Graph_OpenDisp /* 003EC 80B0BB8C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003F0 80B0BB90 0C024F61 */ jal func_80093D84 /* 003F4 80B0BB94 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -76,7 +76,7 @@ glabel EnStream_Draw /* 004D4 80B0BC74 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 004D8 80B0BC78 24C6BCF8 */ addiu $a2, $a2, %lo(D_80B0BCF8) ## $a2 = 80B0BCF8 /* 004DC 80B0BC7C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 -/* 004E0 80B0BC80 0C031AD5 */ jal func_800C6B54 +/* 004E0 80B0BC80 0C031AD5 */ jal Graph_CloseDisp /* 004E4 80B0BC84 24070136 */ addiu $a3, $zero, 0x0136 ## $a3 = 00000136 /* 004E8 80B0BC88 8FBF003C */ lw $ra, 0x003C($sp) /* 004EC 80B0BC8C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s index 7afa4af965..7238bb3b2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s @@ -67,7 +67,7 @@ glabel func_80B0EAC4 /* 02E18 80B0EBC8 8D050000 */ lw $a1, 0x0000($t0) ## FFFFFFE8 /* 02E1C 80B0EBCC 24070824 */ addiu $a3, $zero, 0x0824 ## $a3 = 00000824 /* 02E20 80B0EBD0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFA0 -/* 02E24 80B0EBD4 0C031AB1 */ jal func_800C6AC4 +/* 02E24 80B0EBD4 0C031AB1 */ jal Graph_OpenDisp /* 02E28 80B0EBD8 AFA50038 */ sw $a1, 0x0038($sp) /* 02E2C 80B0EBDC 8FB1009C */ lw $s1, 0x009C($sp) /* 02E30 80B0EBE0 8FA6008C */ lw $a2, 0x008C($sp) @@ -191,7 +191,7 @@ glabel L80B0ECB8 /* 02FC8 80B0ED78 24C6F1B0 */ addiu $a2, $a2, %lo(D_80B0F1B0) ## $a2 = 80B0F1B0 /* 02FCC 80B0ED7C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFA0 /* 02FD0 80B0ED80 24070861 */ addiu $a3, $zero, 0x0861 ## $a3 = 00000861 -/* 02FD4 80B0ED84 0C031AD5 */ jal func_800C6B54 +/* 02FD4 80B0ED84 0C031AD5 */ jal Graph_CloseDisp /* 02FD8 80B0ED88 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 02FDC 80B0ED8C 8FBF001C */ lw $ra, 0x001C($sp) /* 02FE0 80B0ED90 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s index 05c97a1d25..bff0ec7e14 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s @@ -10,7 +10,7 @@ glabel func_80B0EDB8 /* 03028 80B0EDD8 24C6F1C0 */ addiu $a2, $a2, %lo(D_80B0F1C0) ## $a2 = 80B0F1C0 /* 0302C 80B0EDDC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 03030 80B0EDE0 24070885 */ addiu $a3, $zero, 0x0885 ## $a3 = 00000885 -/* 03034 80B0EDE4 0C031AB1 */ jal func_800C6AC4 +/* 03034 80B0EDE4 0C031AB1 */ jal Graph_OpenDisp /* 03038 80B0EDE8 AFA50040 */ sw $a1, 0x0040($sp) /* 0303C 80B0EDEC 87A30056 */ lh $v1, 0x0056($sp) /* 03040 80B0EDF0 3C0180B1 */ lui $at, %hi(D_80B0F2B4) ## $at = 80B10000 @@ -53,7 +53,7 @@ glabel func_80B0EDB8 /* 030D0 80B0EE80 8FAE0048 */ lw $t6, 0x0048($sp) /* 030D4 80B0EE84 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 030D8 80B0EE88 24070895 */ addiu $a3, $zero, 0x0895 ## $a3 = 00000895 -/* 030DC 80B0EE8C 0C031AD5 */ jal func_800C6B54 +/* 030DC 80B0EE8C 0C031AD5 */ jal Graph_CloseDisp /* 030E0 80B0EE90 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 030E4 80B0EE94 8FBF0024 */ lw $ra, 0x0024($sp) /* 030E8 80B0EE98 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s index cdaccef836..209980c5b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s @@ -7,7 +7,7 @@ glabel func_80B0EEA4 /* 03108 80B0EEB8 24C6F1E0 */ addiu $a2, $a2, %lo(D_80B0F1E0) ## $a2 = 80B0F1E0 /* 0310C 80B0EEBC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 03110 80B0EEC0 2407089D */ addiu $a3, $zero, 0x089D ## $a3 = 0000089D -/* 03114 80B0EEC4 0C031AB1 */ jal func_800C6AC4 +/* 03114 80B0EEC4 0C031AB1 */ jal Graph_OpenDisp /* 03118 80B0EEC8 AFA50030 */ sw $a1, 0x0030($sp) /* 0311C 80B0EECC 8FAF0030 */ lw $t7, 0x0030($sp) /* 03120 80B0EED0 8FA40038 */ lw $a0, 0x0038($sp) @@ -20,7 +20,7 @@ glabel func_80B0EEA4 /* 0313C 80B0EEEC 8FB90038 */ lw $t9, 0x0038($sp) /* 03140 80B0EEF0 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 03144 80B0EEF4 2407089F */ addiu $a3, $zero, 0x089F ## $a3 = 0000089F -/* 03148 80B0EEF8 0C031AD5 */ jal func_800C6B54 +/* 03148 80B0EEF8 0C031AD5 */ jal Graph_CloseDisp /* 0314C 80B0EEFC 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 03150 80B0EF00 8FBF0014 */ lw $ra, 0x0014($sp) /* 03154 80B0EF04 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s index 7dc1d24eb4..a0c70ba106 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s @@ -21,7 +21,7 @@ glabel func_80B13464 /* 01BC0 80B134B0 24C63740 */ addiu $a2, $a2, %lo(D_80B13740) ## $a2 = 80B13740 /* 01BC4 80B134B4 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 01BC8 80B134B8 240704D2 */ addiu $a3, $zero, 0x04D2 ## $a3 = 000004D2 -/* 01BCC 80B134BC 0C031AB1 */ jal func_800C6AC4 +/* 01BCC 80B134BC 0C031AB1 */ jal Graph_OpenDisp /* 01BD0 80B134C0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01BD4 80B134C4 0C024F61 */ jal func_80093D84 /* 01BD8 80B134C8 8EE40000 */ lw $a0, 0x0000($s7) ## 00000000 @@ -101,7 +101,7 @@ glabel func_80B13464 /* 01CF4 80B135E4 24C63770 */ addiu $a2, $a2, %lo(D_80B13770) ## $a2 = 80B13770 /* 01CF8 80B135E8 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 01CFC 80B135EC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01D00 80B135F0 0C031AD5 */ jal func_800C6B54 +/* 01D00 80B135F0 0C031AD5 */ jal Graph_CloseDisp /* 01D04 80B135F4 240704E9 */ addiu $a3, $zero, 0x04E9 ## $a3 = 000004E9 /* 01D08 80B135F8 8FBF0054 */ lw $ra, 0x0054($sp) /* 01D0C 80B135FC D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s index 90cf9c8025..c940d3535a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s @@ -9,7 +9,7 @@ glabel EnTa_Draw /* 0325C 80B16CFC 24C66F2C */ addiu $a2, $a2, %lo(D_80B16F2C) ## $a2 = 80B16F2C /* 03260 80B16D00 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 03264 80B16D04 2407094D */ addiu $a3, $zero, 0x094D ## $a3 = 0000094D -/* 03268 80B16D08 0C031AB1 */ jal func_800C6AC4 +/* 03268 80B16D08 0C031AB1 */ jal Graph_OpenDisp /* 0326C 80B16D0C AFA5004C */ sw $a1, 0x004C($sp) /* 03270 80B16D10 8FAF005C */ lw $t7, 0x005C($sp) /* 03274 80B16D14 0C0250F2 */ jal func_800943C8 @@ -74,7 +74,7 @@ glabel EnTa_Draw /* 03360 80B16E00 24C66F3C */ addiu $a2, $a2, %lo(D_80B16F3C) ## $a2 = 80B16F3C /* 03364 80B16E04 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 03368 80B16E08 24070960 */ addiu $a3, $zero, 0x0960 ## $a3 = 00000960 -/* 0336C 80B16E0C 0C031AD5 */ jal func_800C6B54 +/* 0336C 80B16E0C 0C031AD5 */ jal Graph_CloseDisp /* 03370 80B16E10 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 03374 80B16E14 8FBF002C */ lw $ra, 0x002C($sp) /* 03378 80B16E18 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s index 1689009bba..19351aea24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s @@ -9,7 +9,7 @@ glabel EnTakaraMan_Draw /* 0076C 80B17CCC 24C67E40 */ addiu $a2, $a2, %lo(D_80B17E40) ## $a2 = 80B17E40 /* 00770 80B17CD0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00774 80B17CD4 24070210 */ addiu $a3, $zero, 0x0210 ## $a3 = 00000210 -/* 00778 80B17CD8 0C031AB1 */ jal func_800C6AC4 +/* 00778 80B17CD8 0C031AB1 */ jal Graph_OpenDisp /* 0077C 80B17CDC AFA50048 */ sw $a1, 0x0048($sp) /* 00780 80B17CE0 8FAF0054 */ lw $t7, 0x0054($sp) /* 00784 80B17CE4 0C024F46 */ jal func_80093D18 @@ -54,7 +54,7 @@ glabel EnTakaraMan_Draw /* 00820 80B17D80 24C67E58 */ addiu $a2, $a2, %lo(D_80B17E58) ## $a2 = 80B17E58 /* 00824 80B17D84 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00828 80B17D88 24070220 */ addiu $a3, $zero, 0x0220 ## $a3 = 00000220 -/* 0082C 80B17D8C 0C031AD5 */ jal func_800C6B54 +/* 0082C 80B17D8C 0C031AD5 */ jal Graph_CloseDisp /* 00830 80B17D90 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 00834 80B17D94 8FBF002C */ lw $ra, 0x002C($sp) /* 00838 80B17D98 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s index c654163396..d55dc98fbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s @@ -30,7 +30,7 @@ glabel func_80863AB8 /* 044D4 80863B24 24C64700 */ addiu $a2, $a2, %lo(D_80864700) ## $a2 = 80864700 /* 044D8 80863B28 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 044DC 80863B2C 24070DFE */ addiu $a3, $zero, 0x0DFE ## $a3 = 00000DFE -/* 044E0 80863B30 0C031AB1 */ jal func_800C6AC4 +/* 044E0 80863B30 0C031AB1 */ jal Graph_OpenDisp /* 044E4 80863B34 AFA5003C */ sw $a1, 0x003C($sp) /* 044E8 80863B38 8FA8003C */ lw $t0, 0x003C($sp) /* 044EC 80863B3C 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 @@ -118,7 +118,7 @@ glabel func_80863AB8 /* 04620 80863C70 24C64710 */ addiu $a2, $a2, %lo(D_80864710) ## $a2 = 80864710 /* 04624 80863C74 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 04628 80863C78 24070E03 */ addiu $a3, $zero, 0x0E03 ## $a3 = 00000E03 -/* 0462C 80863C7C 0C031AD5 */ jal func_800C6B54 +/* 0462C 80863C7C 0C031AD5 */ jal Graph_CloseDisp /* 04630 80863C80 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 .L80863C84: /* 04634 80863C84 8FA3005C */ lw $v1, 0x005C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s index 9fbd2d0c9c..cb51bed364 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s @@ -10,7 +10,7 @@ glabel EnTg_Draw /* 004A4 80B18804 24C68980 */ addiu $a2, $a2, %lo(D_80B18980) ## $a2 = 80B18980 /* 004A8 80B18808 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 004AC 80B1880C 240701CE */ addiu $a3, $zero, 0x01CE ## $a3 = 000001CE -/* 004B0 80B18810 0C031AB1 */ jal func_800C6AC4 +/* 004B0 80B18810 0C031AB1 */ jal Graph_OpenDisp /* 004B4 80B18814 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 004B8 80B18818 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 004BC 80B1881C 3C06C40C */ lui $a2, 0xC40C ## $a2 = C40C0000 @@ -64,7 +64,7 @@ glabel EnTg_Draw /* 0057C 80B188DC 24C68990 */ addiu $a2, $a2, %lo(D_80B18990) ## $a2 = 80B18990 /* 00580 80B188E0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 00584 80B188E4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00588 80B188E8 0C031AD5 */ jal func_800C6B54 +/* 00588 80B188E8 0C031AD5 */ jal Graph_CloseDisp /* 0058C 80B188EC 240701E0 */ addiu $a3, $zero, 0x01E0 ## $a3 = 000001E0 /* 00590 80B188F0 8FBF002C */ lw $ra, 0x002C($sp) /* 00594 80B188F4 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s index adbfc33ce3..02188533e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s @@ -9,7 +9,7 @@ glabel EnTite_Draw /* 02804 80B1B284 24C6B724 */ addiu $a2, $a2, %lo(D_80B1B724) ## $a2 = 80B1B724 /* 02808 80B1B288 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE8 /* 0280C 80B1B28C 240706A8 */ addiu $a3, $zero, 0x06A8 ## $a3 = 000006A8 -/* 02810 80B1B290 0C031AB1 */ jal func_800C6AC4 +/* 02810 80B1B290 0C031AB1 */ jal Graph_OpenDisp /* 02814 80B1B294 AFA50080 */ sw $a1, 0x0080($sp) /* 02818 80B1B298 8FAF008C */ lw $t7, 0x008C($sp) /* 0281C 80B1B29C 0C024F46 */ jal func_80093D18 @@ -151,7 +151,7 @@ glabel EnTite_Draw /* 02A30 80B1B4B0 24C6B734 */ addiu $a2, $a2, %lo(D_80B1B734) ## $a2 = 80B1B734 /* 02A34 80B1B4B4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE8 /* 02A38 80B1B4B8 240706C7 */ addiu $a3, $zero, 0x06C7 ## $a3 = 000006C7 -/* 02A3C 80B1B4BC 0C031AD5 */ jal func_800C6B54 +/* 02A3C 80B1B4BC 0C031AD5 */ jal Graph_CloseDisp /* 02A40 80B1B4C0 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 02A44 80B1B4C4 921802E3 */ lbu $t8, 0x02E3($s0) ## 000002E3 /* 02A48 80B1B4C8 53000032 */ beql $t8, $zero, .L80B1B594 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s index 2e6b237106..c0fa50664d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s @@ -11,7 +11,7 @@ glabel EnTorch2_Draw /* 01E9C 80B1F81C 24C6FA30 */ addiu $a2, $a2, %lo(D_80B1FA30) ## $a2 = 80B1FA30 /* 01EA0 80B1F820 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 01EA4 80B1F824 2407041A */ addiu $a3, $zero, 0x041A ## $a3 = 0000041A -/* 01EA8 80B1F828 0C031AB1 */ jal func_800C6AC4 +/* 01EA8 80B1F828 0C031AB1 */ jal Graph_OpenDisp /* 01EAC 80B1F82C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01EB0 80B1F830 0C024F20 */ jal func_80093C80 /* 01EB4 80B1F834 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 @@ -111,7 +111,7 @@ glabel EnTorch2_Draw /* 02024 80B1F9A4 24C6FA44 */ addiu $a2, $a2, %lo(D_80B1FA44) ## $a2 = 80B1FA44 /* 02028 80B1F9A8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 0202C 80B1F9AC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02030 80B1F9B0 0C031AD5 */ jal func_800C6B54 +/* 02030 80B1F9B0 0C031AD5 */ jal Graph_CloseDisp /* 02034 80B1F9B4 2407045A */ addiu $a3, $zero, 0x045A ## $a3 = 0000045A /* 02038 80B1F9B8 8FBF0034 */ lw $ra, 0x0034($sp) /* 0203C 80B1F9BC 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s index 9dbfaf5f22..95e120de03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s @@ -8,7 +8,7 @@ glabel EnTp_Draw /* 019E4 80B227C4 24C62B40 */ addiu $a2, $a2, %lo(D_80B22B40) ## $a2 = 80B22B40 /* 019E8 80B227C8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 019EC 80B227CC 240705AB */ addiu $a3, $zero, 0x05AB ## $a3 = 000005AB -/* 019F0 80B227D0 0C031AB1 */ jal func_800C6AC4 +/* 019F0 80B227D0 0C031AB1 */ jal Graph_OpenDisp /* 019F4 80B227D4 AFA50054 */ sw $a1, 0x0054($sp) /* 019F8 80B227D8 8FAF0060 */ lw $t7, 0x0060($sp) /* 019FC 80B227DC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 @@ -160,7 +160,7 @@ glabel EnTp_Draw /* 01C38 80B22A18 24C62B70 */ addiu $a2, $a2, %lo(D_80B22B70) ## $a2 = 80B22B70 /* 01C3C 80B22A1C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 01C40 80B22A20 240705D7 */ addiu $a3, $zero, 0x05D7 ## $a3 = 000005D7 -/* 01C44 80B22A24 0C031AD5 */ jal func_800C6B54 +/* 01C44 80B22A24 0C031AD5 */ jal Graph_CloseDisp /* 01C48 80B22A28 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01C4C 80B22A2C 8FA30060 */ lw $v1, 0x0060($sp) /* 01C50 80B22A30 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s index 1d89391cf3..194127a0f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s @@ -25,7 +25,7 @@ glabel EnTr_Draw /* 01208 80B23EF8 AE0900C0 */ sw $t1, 0x00C0($s0) ## 000000C0 /* 0120C 80B23EFC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01210 80B23F00 24070348 */ addiu $a3, $zero, 0x0348 ## $a3 = 00000348 -/* 01214 80B23F04 0C031AB1 */ jal func_800C6AC4 +/* 01214 80B23F04 0C031AB1 */ jal Graph_OpenDisp /* 01218 80B23F08 AFA5004C */ sw $a1, 0x004C($sp) /* 0121C 80B23F0C 0C0250F2 */ jal func_800943C8 /* 01220 80B23F10 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -72,7 +72,7 @@ glabel EnTr_Draw /* 012C4 80B23FB4 24C64424 */ addiu $a2, $a2, %lo(D_80B24424) ## $a2 = 80B24424 /* 012C8 80B23FB8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 012CC 80B23FBC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 012D0 80B23FC0 0C031AD5 */ jal func_800C6B54 +/* 012D0 80B23FC0 0C031AD5 */ jal Graph_CloseDisp /* 012D4 80B23FC4 24070356 */ addiu $a3, $zero, 0x0356 ## $a3 = 00000356 .L80B23FC8: /* 012D8 80B23FC8 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s index e05ed983f3..63b07db2f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s @@ -11,7 +11,7 @@ glabel EnVali_Draw /* 0208C 80B2873C 24C68A30 */ addiu $a2, $a2, %lo(D_80B28A30) ## $a2 = 80B28A30 /* 02090 80B28740 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 02094 80B28744 240705E1 */ addiu $a3, $zero, 0x05E1 ## $a3 = 000005E1 -/* 02098 80B28748 0C031AB1 */ jal func_800C6AC4 +/* 02098 80B28748 0C031AB1 */ jal Graph_OpenDisp /* 0209C 80B2874C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 020A0 80B28750 0C024F61 */ jal func_80093D84 /* 020A4 80B28754 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -83,7 +83,7 @@ glabel EnVali_Draw /* 021A4 80B28854 24C68A40 */ addiu $a2, $a2, %lo(D_80B28A40) ## $a2 = 80B28A40 /* 021A8 80B28858 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 021AC 80B2885C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 -/* 021B0 80B28860 0C031AD5 */ jal func_800C6B54 +/* 021B0 80B28860 0C031AD5 */ jal Graph_CloseDisp /* 021B4 80B28864 24070602 */ addiu $a3, $zero, 0x0602 ## $a3 = 00000602 /* 021B8 80B28868 8FBF0034 */ lw $ra, 0x0034($sp) /* 021BC 80B2886C 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s index b08e3dd293..5d49df369d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s @@ -19,7 +19,7 @@ glabel func_80B28344 /* 01CD8 80B28388 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFF94 /* 01CDC 80B2838C 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 01CE0 80B28390 24070594 */ addiu $a3, $zero, 0x0594 ## $a3 = 00000594 -/* 01CE4 80B28394 0C031AB1 */ jal func_800C6AC4 +/* 01CE4 80B28394 0C031AB1 */ jal Graph_OpenDisp /* 01CE8 80B28398 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01CEC 80B2839C 0C034236 */ jal Matrix_Get /* 01CF0 80B283A0 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC0 @@ -239,7 +239,7 @@ glabel func_80B28344 /* 02040 80B286F0 24C68A20 */ addiu $a2, $a2, %lo(D_80B28A20) ## $a2 = 80B28A20 /* 02044 80B286F4 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFF94 /* 02048 80B286F8 240705C5 */ addiu $a3, $zero, 0x05C5 ## $a3 = 000005C5 -/* 0204C 80B286FC 0C031AD5 */ jal func_800C6B54 +/* 0204C 80B286FC 0C031AD5 */ jal Graph_CloseDisp /* 02050 80B28700 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 02054 80B28704 8FBF001C */ lw $ra, 0x001C($sp) /* 02058 80B28708 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s index 2c73088bca..e2cf50a7fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s @@ -9,7 +9,7 @@ glabel EnVbBall_Draw /* 00DFC 80B29D9C 24C6A090 */ addiu $a2, $a2, %lo(D_80B2A090) ## $a2 = 80B2A090 /* 00E00 80B29DA0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00E04 80B29DA4 2407025C */ addiu $a3, $zero, 0x025C ## $a3 = 0000025C -/* 00E08 80B29DA8 0C031AB1 */ jal func_800C6AC4 +/* 00E08 80B29DA8 0C031AB1 */ jal Graph_OpenDisp /* 00E0C 80B29DAC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00E10 80B29DB0 8FAF005C */ lw $t7, 0x005C($sp) /* 00E14 80B29DB4 0C024F46 */ jal func_80093D18 @@ -145,7 +145,7 @@ glabel EnVbBall_Draw /* 01014 80B29FB4 24C6A0CC */ addiu $a2, $a2, %lo(D_80B2A0CC) ## $a2 = 80B2A0CC /* 01018 80B29FB8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0101C 80B29FBC 24070278 */ addiu $a3, $zero, 0x0278 ## $a3 = 00000278 -/* 01020 80B29FC0 0C031AD5 */ jal func_800C6B54 +/* 01020 80B29FC0 0C031AD5 */ jal Graph_CloseDisp /* 01024 80B29FC4 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 01028 80B29FC8 8FBF001C */ lw $ra, 0x001C($sp) /* 0102C 80B29FCC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s index 287e0149fd..7b6875ddc1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s @@ -9,7 +9,7 @@ glabel EnViewer_Draw /* 02094 80B2C294 24C6D120 */ addiu $a2, $a2, %lo(D_80B2D120) ## $a2 = 80B2D120 /* 02098 80B2C298 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0209C 80B2C29C 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE0 -/* 020A0 80B2C2A0 0C031AB1 */ jal func_800C6AC4 +/* 020A0 80B2C2A0 0C031AB1 */ jal Graph_OpenDisp /* 020A4 80B2C2A4 240706E0 */ addiu $a3, $zero, 0x06E0 ## $a3 = 000006E0 /* 020A8 80B2C2A8 922E01E6 */ lbu $t6, 0x01E6($s1) ## 000001E6 /* 020AC 80B2C2AC 11C0002F */ beq $t6, $zero, .L80B2C36C @@ -68,7 +68,7 @@ glabel EnViewer_Draw /* 02170 80B2C370 24C6D134 */ addiu $a2, $a2, %lo(D_80B2D134) ## $a2 = 80B2D134 /* 02174 80B2C374 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE0 /* 02178 80B2C378 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 0217C 80B2C37C 0C031AD5 */ jal func_800C6B54 +/* 0217C 80B2C37C 0C031AD5 */ jal Graph_CloseDisp /* 02180 80B2C380 240706F8 */ addiu $a3, $zero, 0x06F8 ## $a3 = 000006F8 /* 02184 80B2C384 8FBF001C */ lw $ra, 0x001C($sp) /* 02188 80B2C388 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s index 4655a1380c..22948729c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s @@ -12,7 +12,7 @@ glabel func_80B2B364 /* 0118C 80B2B38C 24C6D044 */ addiu $a2, $a2, %lo(D_80B2D044) ## $a2 = 80B2D044 /* 01190 80B2B390 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 01194 80B2B394 24070555 */ addiu $a3, $zero, 0x0555 ## $a3 = 00000555 -/* 01198 80B2B398 0C031AB1 */ jal func_800C6AC4 +/* 01198 80B2B398 0C031AB1 */ jal Graph_OpenDisp /* 0119C 80B2B39C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 011A0 80B2B3A0 8FAF0040 */ lw $t7, 0x0040($sp) /* 011A4 80B2B3A4 0C024F61 */ jal func_80093D84 @@ -57,7 +57,7 @@ glabel func_80B2B364 /* 01240 80B2B440 24C6D06C */ addiu $a2, $a2, %lo(D_80B2D06C) ## $a2 = 80B2D06C /* 01244 80B2B444 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 01248 80B2B448 2407055C */ addiu $a3, $zero, 0x055C ## $a3 = 0000055C -/* 0124C 80B2B44C 0C031AD5 */ jal func_800C6B54 +/* 0124C 80B2B44C 0C031AD5 */ jal Graph_CloseDisp /* 01250 80B2B450 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 .L80B2B454: /* 01254 80B2B454 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s index d72e45251d..c449c98177 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s @@ -10,7 +10,7 @@ glabel func_80B2B4A8 /* 012C8 80B2B4C8 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 012CC 80B2B4CC A7A00076 */ sh $zero, 0x0076($sp) /* 012D0 80B2B4D0 2407057D */ addiu $a3, $zero, 0x057D ## $a3 = 0000057D -/* 012D4 80B2B4D4 0C031AB1 */ jal func_800C6AC4 +/* 012D4 80B2B4D4 0C031AB1 */ jal Graph_OpenDisp /* 012D8 80B2B4D8 AFA50070 */ sw $a1, 0x0070($sp) /* 012DC 80B2B4DC 8607001C */ lh $a3, 0x001C($s0) ## 0000001C /* 012E0 80B2B4E0 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 @@ -283,7 +283,7 @@ glabel func_80B2B4A8 /* 016D4 80B2B8D4 24C6D094 */ addiu $a2, $a2, %lo(D_80B2D094) ## $a2 = 80B2D094 /* 016D8 80B2B8D8 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 016DC 80B2B8DC 240705E7 */ addiu $a3, $zero, 0x05E7 ## $a3 = 000005E7 -/* 016E0 80B2B8E0 0C031AD5 */ jal func_800C6B54 +/* 016E0 80B2B8E0 0C031AD5 */ jal Graph_CloseDisp /* 016E4 80B2B8E4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 016E8 80B2B8E8 8FBF002C */ lw $ra, 0x002C($sp) /* 016EC 80B2B8EC 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s index bd2bd95282..321766a40b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s @@ -14,7 +14,7 @@ glabel func_80B2B9A4 /* 017D4 80B2B9D4 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 017D8 80B2B9D8 24C6D0A8 */ addiu $a2, $a2, %lo(D_80B2D0A8) ## $a2 = 80B2D0A8 /* 017DC 80B2B9DC 24070620 */ addiu $a3, $zero, 0x0620 ## $a3 = 00000620 -/* 017E0 80B2B9E0 0C031AB1 */ jal func_800C6AC4 +/* 017E0 80B2B9E0 0C031AB1 */ jal Graph_OpenDisp /* 017E4 80B2B9E4 AFA50030 */ sw $a1, 0x0030($sp) /* 017E8 80B2B9E8 8FA80030 */ lw $t0, 0x0030($sp) /* 017EC 80B2B9EC 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 @@ -30,7 +30,7 @@ glabel func_80B2B9A4 /* 01814 80B2BA14 24C6D0BC */ addiu $a2, $a2, %lo(D_80B2D0BC) ## $a2 = 80B2D0BC /* 01818 80B2BA18 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 0181C 80B2BA1C 24070622 */ addiu $a3, $zero, 0x0622 ## $a3 = 00000622 -/* 01820 80B2BA20 0C031AD5 */ jal func_800C6B54 +/* 01820 80B2BA20 0C031AD5 */ jal Graph_CloseDisp /* 01824 80B2BA24 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 .L80B2BA28: /* 01828 80B2BA28 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s index 0cc3b826c5..4280820fc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s @@ -8,7 +8,7 @@ glabel func_80B2BA38 /* 01850 80B2BA50 24C6D0D0 */ addiu $a2, $a2, %lo(D_80B2D0D0) ## $a2 = 80B2D0D0 /* 01854 80B2BA54 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFEC /* 01858 80B2BA58 2407062F */ addiu $a3, $zero, 0x062F ## $a3 = 0000062F -/* 0185C 80B2BA5C 0C031AB1 */ jal func_800C6AC4 +/* 0185C 80B2BA5C 0C031AB1 */ jal Graph_OpenDisp /* 01860 80B2BA60 AFA5009C */ sw $a1, 0x009C($sp) /* 01864 80B2BA64 8FAC00A4 */ lw $t4, 0x00A4($sp) /* 01868 80B2BA68 24010051 */ addiu $at, $zero, 0x0051 ## $at = 00000051 @@ -442,7 +442,7 @@ glabel func_80B2BA38 /* 01EE8 80B2C0E8 24C6D0E4 */ addiu $a2, $a2, %lo(D_80B2D0E4) ## $a2 = 80B2D0E4 /* 01EEC 80B2C0EC 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFEC /* 01EF0 80B2C0F0 2407069A */ addiu $a3, $zero, 0x069A ## $a3 = 0000069A -/* 01EF4 80B2C0F4 0C031AD5 */ jal func_800C6B54 +/* 01EF4 80B2C0F4 0C031AD5 */ jal Graph_CloseDisp /* 01EF8 80B2C0F8 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 01EFC 80B2C0FC 8FBF0024 */ lw $ra, 0x0024($sp) /* 01F00 80B2C100 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s index 02ec5fa5ce..6b2ae12995 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s @@ -8,7 +8,7 @@ glabel func_80B2C130 /* 01F48 80B2C148 24C6D0F8 */ addiu $a2, $a2, %lo(D_80B2D0F8) ## $a2 = 80B2D0F8 /* 01F4C 80B2C14C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC /* 01F50 80B2C150 240706B5 */ addiu $a3, $zero, 0x06B5 ## $a3 = 000006B5 -/* 01F54 80B2C154 0C031AB1 */ jal func_800C6AC4 +/* 01F54 80B2C154 0C031AB1 */ jal Graph_OpenDisp /* 01F58 80B2C158 AFA50054 */ sw $a1, 0x0054($sp) /* 01F5C 80B2C15C 8FA30054 */ lw $v1, 0x0054($sp) /* 01F60 80B2C160 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 @@ -75,7 +75,7 @@ glabel func_80B2C130 /* 02054 80B2C254 24C6D10C */ addiu $a2, $a2, %lo(D_80B2D10C) ## $a2 = 80B2D10C /* 02058 80B2C258 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC /* 0205C 80B2C25C 240706CC */ addiu $a3, $zero, 0x06CC ## $a3 = 000006CC -/* 02060 80B2C260 0C031AD5 */ jal func_800C6B54 +/* 02060 80B2C260 0C031AD5 */ jal Graph_CloseDisp /* 02064 80B2C264 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 02068 80B2C268 8FBF0024 */ lw $ra, 0x0024($sp) /* 0206C 80B2C26C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s index 95ee51fb8d..aa6a9e33fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s @@ -21,7 +21,7 @@ glabel func_80B2C8AC /* 026F8 80B2C8F8 24C6D148 */ addiu $a2, $a2, %lo(D_80B2D148) ## $a2 = 80B2D148 /* 026FC 80B2C8FC 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFE4 /* 02700 80B2C900 24070795 */ addiu $a3, $zero, 0x0795 ## $a3 = 00000795 -/* 02704 80B2C904 0C031AB1 */ jal func_800C6AC4 +/* 02704 80B2C904 0C031AB1 */ jal Graph_OpenDisp /* 02708 80B2C908 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0270C 80B2C90C 3C0180B3 */ lui $at, %hi(D_80B2D1BC) ## $at = 80B30000 /* 02710 80B2C910 C43AD1BC */ lwc1 $f26, %lo(D_80B2D1BC)($at) @@ -207,7 +207,7 @@ glabel func_80B2C8AC /* 029C8 80B2CBC8 24C6D170 */ addiu $a2, $a2, %lo(D_80B2D170) ## $a2 = 80B2D170 /* 029CC 80B2CBCC 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFE4 /* 029D0 80B2CBD0 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 029D4 80B2CBD4 0C031AD5 */ jal func_800C6B54 +/* 029D4 80B2CBD4 0C031AD5 */ jal Graph_CloseDisp /* 029D8 80B2CBD8 240707F2 */ addiu $a3, $zero, 0x07F2 ## $a3 = 000007F2 /* 029DC 80B2CBDC 8FBF007C */ lw $ra, 0x007C($sp) /* 029E0 80B2CBE0 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s index 2686f2c953..41d345f81d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s @@ -11,7 +11,7 @@ glabel EnVm_Draw /* 011DC 80B2E63C 24C6EBBC */ addiu $a2, $a2, %lo(D_80B2EBBC) ## $a2 = 80B2EBBC /* 011E0 80B2E640 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 011E4 80B2E644 240703F6 */ addiu $a3, $zero, 0x03F6 ## $a3 = 000003F6 -/* 011E8 80B2E648 0C031AB1 */ jal func_800C6AC4 +/* 011E8 80B2E648 0C031AB1 */ jal Graph_OpenDisp /* 011EC 80B2E64C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 011F0 80B2E650 0C024F46 */ jal func_80093D18 /* 011F4 80B2E654 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -242,7 +242,7 @@ glabel EnVm_Draw /* 01570 80B2E9D0 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 01574 80B2E9D4 24C6EBFC */ addiu $a2, $a2, %lo(D_80B2EBFC) ## $a2 = 80B2EBFC /* 01578 80B2E9D8 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 -/* 0157C 80B2E9DC 0C031AD5 */ jal func_800C6B54 +/* 0157C 80B2E9DC 0C031AD5 */ jal Graph_CloseDisp /* 01580 80B2E9E0 2407042C */ addiu $a3, $zero, 0x042C ## $a3 = 0000042C /* 01584 80B2E9E4 8FBF002C */ lw $ra, 0x002C($sp) /* 01588 80B2E9E8 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s index be49e7f95c..9375f13ed0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s @@ -11,7 +11,7 @@ glabel EnWeiyer_Draw /* 01694 80B33924 24C63AF0 */ addiu $a2, $a2, %lo(D_80B33AF0) ## $a2 = 80B33AF0 /* 01698 80B33928 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 0169C 80B3392C 240704A9 */ addiu $a3, $zero, 0x04A9 ## $a3 = 000004A9 -/* 016A0 80B33930 0C031AB1 */ jal func_800C6AC4 +/* 016A0 80B33930 0C031AB1 */ jal Graph_OpenDisp /* 016A4 80B33934 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 016A8 80B33938 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 /* 016AC 80B3393C 3C0E80B3 */ lui $t6, %hi(func_80B33338) ## $t6 = 80B30000 @@ -85,7 +85,7 @@ glabel EnWeiyer_Draw /* 017B4 80B33A44 24C63B04 */ addiu $a2, $a2, %lo(D_80B33B04) ## $a2 = 80B33B04 /* 017B8 80B33A48 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 017BC 80B33A4C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 017C0 80B33A50 0C031AD5 */ jal func_800C6B54 +/* 017C0 80B33A50 0C031AD5 */ jal Graph_CloseDisp /* 017C4 80B33A54 240704D8 */ addiu $a3, $zero, 0x04D8 ## $a3 = 000004D8 /* 017C8 80B33A58 8FBF0034 */ lw $ra, 0x0034($sp) /* 017CC 80B33A5C 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s index d9d00fdc10..6bc341c99d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s @@ -9,7 +9,7 @@ glabel EnWf_Draw /* 039A8 80B37658 24C67B54 */ addiu $a2, $a2, %lo(D_80B37B54) ## $a2 = 80B37B54 /* 039AC 80B3765C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 039B0 80B37660 2407086D */ addiu $a3, $zero, 0x086D ## $a3 = 0000086D -/* 039B4 80B37664 0C031AB1 */ jal func_800C6AC4 +/* 039B4 80B37664 0C031AB1 */ jal Graph_OpenDisp /* 039B8 80B37668 AFA50050 */ sw $a1, 0x0050($sp) /* 039BC 80B3766C 8E0F02D4 */ lw $t7, 0x02D4($s0) ## 000002D4 /* 039C0 80B37670 8FA80050 */ lw $t0, 0x0050($sp) @@ -122,7 +122,7 @@ glabel EnWf_Draw /* 03B58 80B37808 24C67B64 */ addiu $a2, $a2, %lo(D_80B37B64) ## $a2 = 80B37B64 /* 03B5C 80B3780C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 03B60 80B37810 2407088E */ addiu $a3, $zero, 0x088E ## $a3 = 0000088E -/* 03B64 80B37814 0C031AD5 */ jal func_800C6B54 +/* 03B64 80B37814 0C031AD5 */ jal Graph_CloseDisp /* 03B68 80B37818 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 03B6C 80B3781C 8FBF002C */ lw $ra, 0x002C($sp) /* 03B70 80B37820 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s index df5d2f393b..9fcdf50d18 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s @@ -9,7 +9,7 @@ glabel EnWood02_Draw /* 00CC0 80B3BC30 24C6BFA0 */ addiu $a2, $a2, %lo(D_80B3BFA0) ## $a2 = 80B3BFA0 /* 00CC4 80B3BC34 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC /* 00CC8 80B3BC38 24070307 */ addiu $a3, $zero, 0x0307 ## $a3 = 00000307 -/* 00CCC 80B3BC3C 0C031AB1 */ jal func_800C6AC4 +/* 00CCC 80B3BC3C 0C031AB1 */ jal Graph_OpenDisp /* 00CD0 80B3BC40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00CD4 80B3BC44 8FAF0060 */ lw $t7, 0x0060($sp) /* 00CD8 80B3BC48 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 @@ -182,7 +182,7 @@ glabel EnWood02_Draw /* 00F48 80B3BEB8 24C6BFDC */ addiu $a2, $a2, %lo(D_80B3BFDC) ## $a2 = 80B3BFDC /* 00F4C 80B3BEBC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC /* 00F50 80B3BEC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00F54 80B3BEC4 0C031AD5 */ jal func_800C6B54 +/* 00F54 80B3BEC4 0C031AD5 */ jal Graph_CloseDisp /* 00F58 80B3BEC8 24070348 */ addiu $a3, $zero, 0x0348 ## $a3 = 00000348 /* 00F5C 80B3BECC 8FBF001C */ lw $ra, 0x001C($sp) /* 00F60 80B3BED0 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s index 5990e6a7a1..e7baf5820c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s @@ -15,7 +15,7 @@ glabel func_80B3E908 /* 0275C 80B3E93C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 02760 80B3E940 240705A4 */ addiu $a3, $zero, 0x05A4 ## $a3 = 000005A4 /* 02764 80B3E944 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02768 80B3E948 0C031AB1 */ jal func_800C6AC4 +/* 02768 80B3E948 0C031AB1 */ jal Graph_OpenDisp /* 0276C 80B3E94C AFA80070 */ sw $t0, 0x0070($sp) /* 02770 80B3E950 8FA80070 */ lw $t0, 0x0070($sp) /* 02774 80B3E954 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -85,7 +85,7 @@ glabel func_80B3E908 /* 02874 80B3EA54 24C62028 */ addiu $a2, $a2, %lo(D_80B42028) ## $a2 = 80B42028 /* 02878 80B3EA58 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 0287C 80B3EA5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02880 80B3EA60 0C031AD5 */ jal func_800C6B54 +/* 02880 80B3EA60 0C031AD5 */ jal Graph_CloseDisp /* 02884 80B3EA64 240705D9 */ addiu $a3, $zero, 0x05D9 ## $a3 = 000005D9 /* 02888 80B3EA68 8FBF002C */ lw $ra, 0x002C($sp) /* 0288C 80B3EA6C 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s index ec8041639f..2d4fef32b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s @@ -15,7 +15,7 @@ glabel func_80B3EA7C /* 028D0 80B3EAB0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 028D4 80B3EAB4 240705E7 */ addiu $a3, $zero, 0x05E7 ## $a3 = 000005E7 /* 028D8 80B3EAB8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 028DC 80B3EABC 0C031AB1 */ jal func_800C6AC4 +/* 028DC 80B3EABC 0C031AB1 */ jal Graph_OpenDisp /* 028E0 80B3EAC0 AFA80070 */ sw $t0, 0x0070($sp) /* 028E4 80B3EAC4 8FA80070 */ lw $t0, 0x0070($sp) /* 028E8 80B3EAC8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -85,7 +85,7 @@ glabel func_80B3EA7C /* 029E8 80B3EBC8 24C62058 */ addiu $a2, $a2, %lo(D_80B42058) ## $a2 = 80B42058 /* 029EC 80B3EBCC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 029F0 80B3EBD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 029F4 80B3EBD4 0C031AD5 */ jal func_800C6B54 +/* 029F4 80B3EBD4 0C031AD5 */ jal Graph_CloseDisp /* 029F8 80B3EBD8 2407061C */ addiu $a3, $zero, 0x061C ## $a3 = 0000061C /* 029FC 80B3EBDC 8FBF002C */ lw $ra, 0x002C($sp) /* 02A00 80B3EBE0 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s index 6a22bd70ad..2f682498e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s @@ -16,7 +16,7 @@ glabel func_80B402C4 /* 0411C 80B402FC 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 04120 80B40300 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 /* 04124 80B40304 24070235 */ addiu $a3, $zero, 0x0235 ## $a3 = 00000235 -/* 04128 80B40308 0C031AB1 */ jal func_800C6AC4 +/* 04128 80B40308 0C031AB1 */ jal Graph_OpenDisp /* 0412C 80B4030C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04130 80B40310 8E3902BC */ lw $t9, 0x02BC($s1) ## 000002BC /* 04134 80B40314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -173,7 +173,7 @@ glabel func_80B402C4 /* 04388 80B40568 24C620A0 */ addiu $a2, $a2, %lo(D_80B420A0) ## $a2 = 80B420A0 /* 0438C 80B4056C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 /* 04390 80B40570 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04394 80B40574 0C031AD5 */ jal func_800C6B54 +/* 04394 80B40574 0C031AD5 */ jal Graph_CloseDisp /* 04398 80B40578 2407029C */ addiu $a3, $zero, 0x029C ## $a3 = 0000029C /* 0439C 80B4057C 8FBF002C */ lw $ra, 0x002C($sp) /* 043A0 80B40580 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s index 4235b035ae..c79de6b28f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s @@ -9,7 +9,7 @@ glabel func_80B414AC /* 052E8 80B414C8 24C620F0 */ addiu $a2, $a2, %lo(D_80B420F0) ## $a2 = 80B420F0 /* 052EC 80B414CC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 052F0 80B414D0 24070347 */ addiu $a3, $zero, 0x0347 ## $a3 = 00000347 -/* 052F4 80B414D4 0C031AB1 */ jal func_800C6AC4 +/* 052F4 80B414D4 0C031AB1 */ jal Graph_OpenDisp /* 052F8 80B414D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 052FC 80B414DC 0C024F46 */ jal func_80093D18 /* 05300 80B414E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -59,7 +59,7 @@ glabel func_80B414AC /* 053B0 80B41590 24C62108 */ addiu $a2, $a2, %lo(D_80B42108) ## $a2 = 80B42108 /* 053B4 80B41594 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 053B8 80B41598 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 053BC 80B4159C 0C031AD5 */ jal func_800C6B54 +/* 053BC 80B4159C 0C031AD5 */ jal Graph_CloseDisp /* 053C0 80B415A0 24070356 */ addiu $a3, $zero, 0x0356 ## $a3 = 00000356 /* 053C4 80B415A4 8FBF002C */ lw $ra, 0x002C($sp) /* 053C8 80B415A8 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s index fcff30de40..02eebba934 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s @@ -15,7 +15,7 @@ glabel func_80B41BA4 /* 059F8 80B41BD8 AFB80068 */ sw $t8, 0x0068($sp) /* 059FC 80B41BDC 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 05A00 80B41BE0 2407048C */ addiu $a3, $zero, 0x048C ## $a3 = 0000048C -/* 05A04 80B41BE4 0C031AB1 */ jal func_800C6AC4 +/* 05A04 80B41BE4 0C031AB1 */ jal Graph_OpenDisp /* 05A08 80B41BE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 05A0C 80B41BEC 8FA40078 */ lw $a0, 0x0078($sp) /* 05A10 80B41BF0 8FA5007C */ lw $a1, 0x007C($sp) @@ -72,7 +72,7 @@ glabel func_80B41BA4 /* 05ADC 80B41CBC 24C621B0 */ addiu $a2, $a2, %lo(D_80B421B0) ## $a2 = 80B421B0 /* 05AE0 80B41CC0 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD0 /* 05AE4 80B41CC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05AE8 80B41CC8 0C031AD5 */ jal func_800C6B54 +/* 05AE8 80B41CC8 0C031AD5 */ jal Graph_CloseDisp /* 05AEC 80B41CCC 240704B7 */ addiu $a3, $zero, 0x04B7 ## $a3 = 000004B7 /* 05AF0 80B41CD0 8FBF002C */ lw $ra, 0x002C($sp) /* 05AF4 80B41CD4 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s index e0d4604bdb..65e5a63538 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s @@ -9,7 +9,7 @@ glabel EnYukabyun_Draw /* 0043C 80B43DFC 24C63F70 */ addiu $a2, $a2, %lo(D_80B43F70) ## $a2 = 80B43F70 /* 00440 80B43E00 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00444 80B43E04 2407016E */ addiu $a3, $zero, 0x016E ## $a3 = 0000016E -/* 00448 80B43E08 0C031AB1 */ jal func_800C6AC4 +/* 00448 80B43E08 0C031AB1 */ jal Graph_OpenDisp /* 0044C 80B43E0C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00450 80B43E10 8FAF004C */ lw $t7, 0x004C($sp) /* 00454 80B43E14 0C024F46 */ jal func_80093D18 @@ -67,7 +67,7 @@ glabel EnYukabyun_Draw /* 00524 80B43EE4 24C63F98 */ addiu $a2, $a2, %lo(D_80B43F98) ## $a2 = 80B43F98 /* 00528 80B43EE8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 0052C 80B43EEC 2407017A */ addiu $a3, $zero, 0x017A ## $a3 = 0000017A -/* 00530 80B43EF0 0C031AD5 */ jal func_800C6B54 +/* 00530 80B43EF0 0C031AD5 */ jal Graph_CloseDisp /* 00534 80B43EF4 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 00538 80B43EF8 8FBF001C */ lw $ra, 0x001C($sp) /* 0053C 80B43EFC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s index 8fcda63aa5..efc084377c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s @@ -10,7 +10,7 @@ glabel EnZf_Draw /* 058A8 80B498F8 24C6A310 */ addiu $a2, $a2, %lo(D_80B4A310) ## $a2 = 80B4A310 /* 058AC 80B498FC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 058B0 80B49900 24070DCD */ addiu $a3, $zero, 0x0DCD ## $a3 = 00000DCD -/* 058B4 80B49904 0C031AB1 */ jal func_800C6AC4 +/* 058B4 80B49904 0C031AB1 */ jal Graph_OpenDisp /* 058B8 80B49908 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 058BC 80B4990C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 058C0 80B49910 8FA50084 */ lw $a1, 0x0084($sp) @@ -157,7 +157,7 @@ glabel EnZf_Draw /* 05AE8 80B49B38 24C6A320 */ addiu $a2, $a2, %lo(D_80B4A320) ## $a2 = 80B4A320 /* 05AEC 80B49B3C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 05AF0 80B49B40 24070E11 */ addiu $a3, $zero, 0x0E11 ## $a3 = 00000E11 -/* 05AF4 80B49B44 0C031AD5 */ jal func_800C6B54 +/* 05AF4 80B49B44 0C031AD5 */ jal Graph_CloseDisp /* 05AF8 80B49B48 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 05AFC 80B49B4C 8FBF003C */ lw $ra, 0x003C($sp) /* 05B00 80B49B50 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s index 783e04ef71..c9effa979d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s @@ -9,7 +9,7 @@ glabel EnZl1_Draw /* 01938 80B4C478 24C6E720 */ addiu $a2, $a2, %lo(D_80B4E720) ## $a2 = 80B4E720 /* 0193C 80B4C47C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01940 80B4C480 240707DB */ addiu $a3, $zero, 0x07DB ## $a3 = 000007DB -/* 01944 80B4C484 0C031AB1 */ jal func_800C6AC4 +/* 01944 80B4C484 0C031AB1 */ jal Graph_OpenDisp /* 01948 80B4C488 AFA50050 */ sw $a1, 0x0050($sp) /* 0194C 80B4C48C 8FA80050 */ lw $t0, 0x0050($sp) /* 01950 80B4C490 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -85,7 +85,7 @@ glabel EnZl1_Draw /* 01A68 80B4C5A8 24C6E730 */ addiu $a2, $a2, %lo(D_80B4E730) ## $a2 = 80B4E730 /* 01A6C 80B4C5AC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01A70 80B4C5B0 240707FE */ addiu $a3, $zero, 0x07FE ## $a3 = 000007FE -/* 01A74 80B4C5B4 0C031AD5 */ jal func_800C6B54 +/* 01A74 80B4C5B4 0C031AD5 */ jal Graph_CloseDisp /* 01A78 80B4C5B8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01A7C 80B4C5BC 8FBF002C */ lw $ra, 0x002C($sp) /* 01A80 80B4C5C0 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s index 569c8ba316..eb513a72eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s @@ -28,7 +28,7 @@ glabel func_80B523C8 /* 03AA0 80B52430 AFAD0064 */ sw $t5, 0x0064($sp) /* 03AA4 80B52434 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 03AA8 80B52438 24070657 */ addiu $a3, $zero, 0x0657 ## $a3 = 00000657 -/* 03AAC 80B5243C 0C031AB1 */ jal func_800C6AC4 +/* 03AAC 80B5243C 0C031AB1 */ jal Graph_OpenDisp /* 03AB0 80B52440 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 03AB4 80B52444 8FAF008C */ lw $t7, 0x008C($sp) /* 03AB8 80B52448 0C024F46 */ jal func_80093D18 @@ -123,7 +123,7 @@ glabel func_80B523C8 /* 03C1C 80B525AC 24C62B48 */ addiu $a2, $a2, %lo(D_80B52B48) ## $a2 = 80B52B48 /* 03C20 80B525B0 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 /* 03C24 80B525B4 24070670 */ addiu $a3, $zero, 0x0670 ## $a3 = 00000670 -/* 03C28 80B525B8 0C031AD5 */ jal func_800C6B54 +/* 03C28 80B525B8 0C031AD5 */ jal Graph_CloseDisp /* 03C2C 80B525BC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 03C30 80B525C0 8FBF002C */ lw $ra, 0x002C($sp) /* 03C34 80B525C4 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s index 62050f19a1..1ccacd7d02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s @@ -22,7 +22,7 @@ glabel func_80B525D4 /* 03C94 80B52624 2407067F */ addiu $a3, $zero, 0x067F ## $a3 = 0000067F /* 03C98 80B52628 AFB9006C */ sw $t9, 0x006C($sp) /* 03C9C 80B5262C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03CA0 80B52630 0C031AB1 */ jal func_800C6AC4 +/* 03CA0 80B52630 0C031AB1 */ jal Graph_OpenDisp /* 03CA4 80B52634 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 03CA8 80B52638 8FAB008C */ lw $t3, 0x008C($sp) /* 03CAC 80B5263C 0C024F61 */ jal func_80093D84 @@ -110,7 +110,7 @@ glabel func_80B525D4 /* 03DF4 80B52784 24C62B68 */ addiu $a2, $a2, %lo(D_80B52B68) ## $a2 = 80B52B68 /* 03DF8 80B52788 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 03DFC 80B5278C 2407069C */ addiu $a3, $zero, 0x069C ## $a3 = 0000069C -/* 03E00 80B52790 0C031AD5 */ jal func_800C6B54 +/* 03E00 80B52790 0C031AD5 */ jal Graph_CloseDisp /* 03E04 80B52794 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 03E08 80B52798 8FBF002C */ lw $ra, 0x002C($sp) /* 03E0C 80B5279C 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s index 354cd27b51..e7f9d00cb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s @@ -21,7 +21,7 @@ glabel func_80B59FF4 /* 06C90 80B5A040 8D4AA45C */ lw $t2, %lo(D_80B5A45C)($t2) /* 06C94 80B5A044 AFAA006C */ sw $t2, 0x006C($sp) /* 06C98 80B5A048 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 06C9C 80B5A04C 0C031AB1 */ jal func_800C6AC4 +/* 06C9C 80B5A04C 0C031AB1 */ jal Graph_OpenDisp /* 06CA0 80B5A050 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 06CA4 80B5A054 8FAC008C */ lw $t4, 0x008C($sp) /* 06CA8 80B5A058 0C024F46 */ jal func_80093D18 @@ -111,7 +111,7 @@ glabel func_80B59FF4 /* 06DF8 80B5A1A8 24C6AA5C */ addiu $a2, $a2, %lo(D_80B5AA5C) ## $a2 = 80B5AA5C /* 06DFC 80B5A1AC 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 06E00 80B5A1B0 2407088E */ addiu $a3, $zero, 0x088E ## $a3 = 0000088E -/* 06E04 80B5A1B4 0C031AD5 */ jal func_800C6B54 +/* 06E04 80B5A1B4 0C031AD5 */ jal Graph_CloseDisp /* 06E08 80B5A1B8 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 06E0C 80B5A1BC 8FBF002C */ lw $ra, 0x002C($sp) /* 06E10 80B5A1C0 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s index 6dcefcad7f..6df1d31a90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s @@ -22,7 +22,7 @@ glabel func_80B5A1D0 /* 06E70 80B5A220 2407089D */ addiu $a3, $zero, 0x089D ## $a3 = 0000089D /* 06E74 80B5A224 AFB9006C */ sw $t9, 0x006C($sp) /* 06E78 80B5A228 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 06E7C 80B5A22C 0C031AB1 */ jal func_800C6AC4 +/* 06E7C 80B5A22C 0C031AB1 */ jal Graph_OpenDisp /* 06E80 80B5A230 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 06E84 80B5A234 8FAB008C */ lw $t3, 0x008C($sp) /* 06E88 80B5A238 0C024F61 */ jal func_80093D84 @@ -110,7 +110,7 @@ glabel func_80B5A1D0 /* 06FD0 80B5A380 24C6AA7C */ addiu $a2, $a2, %lo(D_80B5AA7C) ## $a2 = 80B5AA7C /* 06FD4 80B5A384 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 06FD8 80B5A388 240708BA */ addiu $a3, $zero, 0x08BA ## $a3 = 000008BA -/* 06FDC 80B5A38C 0C031AD5 */ jal func_800C6B54 +/* 06FDC 80B5A38C 0C031AD5 */ jal Graph_CloseDisp /* 06FE0 80B5A390 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 06FE4 80B5A394 8FBF002C */ lw $ra, 0x002C($sp) /* 06FE8 80B5A398 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s index d1a4ecc2c9..6c7323fde1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s @@ -38,7 +38,7 @@ glabel EnZl4_Draw /* 02E2C 80B5E5DC 8DC50000 */ lw $a1, 0x0000($t6) ## FFFFFFEC /* 02E30 80B5E5E0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFBC /* 02E34 80B5E5E4 240707DC */ addiu $a3, $zero, 0x07DC ## $a3 = 000007DC -/* 02E38 80B5E5E8 0C031AB1 */ jal func_800C6AC4 +/* 02E38 80B5E5E8 0C031AB1 */ jal Graph_OpenDisp /* 02E3C 80B5E5EC AFA50054 */ sw $a1, 0x0054($sp) /* 02E40 80B5E5F0 8FA80054 */ lw $t0, 0x0054($sp) /* 02E44 80B5E5F4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -124,7 +124,7 @@ glabel EnZl4_Draw /* 02F84 80B5E734 24C6FB90 */ addiu $a2, $a2, %lo(D_80B5FB90) ## $a2 = 80B5FB90 /* 02F88 80B5E738 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFBC /* 02F8C 80B5E73C 240707FB */ addiu $a3, $zero, 0x07FB ## $a3 = 000007FB -/* 02F90 80B5E740 0C031AD5 */ jal func_800C6B54 +/* 02F90 80B5E740 0C031AD5 */ jal Graph_CloseDisp /* 02F94 80B5E744 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 02F98 80B5E748 8FBF002C */ lw $ra, 0x002C($sp) /* 02F9C 80B5E74C 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s index 7e0c86b554..a6d779cfc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s @@ -37,7 +37,7 @@ glabel EnZo_Draw /* 020AC 80B622CC 8FBF0024 */ lw $ra, 0x0024($sp) /* 020B0 80B622D0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 020B4 80B622D4 240703F0 */ addiu $a3, $zero, 0x03F0 ## $a3 = 000003F0 -/* 020B8 80B622D8 0C031AB1 */ jal func_800C6AC4 +/* 020B8 80B622D8 0C031AB1 */ jal Graph_OpenDisp /* 020BC 80B622DC AFA50044 */ sw $a1, 0x0044($sp) /* 020C0 80B622E0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 020C4 80B622E4 44814000 */ mtc1 $at, $f8 ## $f8 = 255.00 @@ -125,7 +125,7 @@ glabel EnZo_Draw /* 02204 80B62424 24C62684 */ addiu $a2, $a2, %lo(D_80B62684) ## $a2 = 80B62684 /* 02208 80B62428 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFDC /* 0220C 80B6242C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02210 80B62430 0C031AD5 */ jal func_800C6B54 +/* 02210 80B62430 0C031AD5 */ jal Graph_CloseDisp /* 02214 80B62434 24070401 */ addiu $a3, $zero, 0x0401 ## $a3 = 00000401 /* 02218 80B62438 8FBF0024 */ lw $ra, 0x0024($sp) .L80B6243C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s index 567eeb404b..2fa3923af2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s @@ -18,7 +18,7 @@ glabel func_80B60874 /* 00694 80B608B4 24C625C0 */ addiu $a2, $a2, %lo(D_80B625C0) ## $a2 = 80B625C0 /* 00698 80B608B8 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 0069C 80B608BC 240700D9 */ addiu $a3, $zero, 0x00D9 ## $a3 = 000000D9 -/* 006A0 80B608C0 0C031AB1 */ jal func_800C6AC4 +/* 006A0 80B608C0 0C031AB1 */ jal Graph_OpenDisp /* 006A4 80B608C4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 006A8 80B608C8 8FAF008C */ lw $t7, 0x008C($sp) /* 006AC 80B608CC 0000B025 */ or $s6, $zero, $zero ## $s6 = 00000000 @@ -110,7 +110,7 @@ glabel func_80B60874 /* 007F8 80B60A18 24C625E8 */ addiu $a2, $a2, %lo(D_80B625E8) ## $a2 = 80B625E8 /* 007FC 80B60A1C 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 00800 80B60A20 240700F8 */ addiu $a3, $zero, 0x00F8 ## $a3 = 000000F8 -/* 00804 80B60A24 0C031AD5 */ jal func_800C6B54 +/* 00804 80B60A24 0C031AD5 */ jal Graph_CloseDisp /* 00808 80B60A28 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 0080C 80B60A2C 8FBF0044 */ lw $ra, 0x0044($sp) /* 00810 80B60A30 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s index 34e286639b..1bce4298b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s @@ -18,7 +18,7 @@ glabel func_80B60A60 /* 00880 80B60AA0 24C625FC */ addiu $a2, $a2, %lo(D_80B625FC) ## $a2 = 80B625FC /* 00884 80B60AA4 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 00888 80B60AA8 24070104 */ addiu $a3, $zero, 0x0104 ## $a3 = 00000104 -/* 0088C 80B60AAC 0C031AB1 */ jal func_800C6AC4 +/* 0088C 80B60AAC 0C031AB1 */ jal Graph_OpenDisp /* 00890 80B60AB0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00894 80B60AB4 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 /* 00898 80B60AB8 0C024F61 */ jal func_80093D84 @@ -108,7 +108,7 @@ glabel func_80B60A60 /* 009DC 80B60BFC 24C62624 */ addiu $a2, $a2, %lo(D_80B62624) ## $a2 = 80B62624 /* 009E0 80B60C00 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 009E4 80B60C04 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 009E8 80B60C08 0C031AD5 */ jal func_800C6B54 +/* 009E8 80B60C08 0C031AD5 */ jal Graph_CloseDisp /* 009EC 80B60C0C 2407011E */ addiu $a3, $zero, 0x011E ## $a3 = 0000011E /* 009F0 80B60C10 8FBF0044 */ lw $ra, 0x0044($sp) /* 009F4 80B60C14 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s index 39a9d42ae2..f9ea03a2da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s @@ -18,7 +18,7 @@ glabel func_80B60C44 /* 00A64 80B60C84 24C62638 */ addiu $a2, $a2, %lo(D_80B62638) ## $a2 = 80B62638 /* 00A68 80B60C88 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 00A6C 80B60C8C 2407012A */ addiu $a3, $zero, 0x012A ## $a3 = 0000012A -/* 00A70 80B60C90 0C031AB1 */ jal func_800C6AC4 +/* 00A70 80B60C90 0C031AB1 */ jal Graph_OpenDisp /* 00A74 80B60C94 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00A78 80B60C98 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 /* 00A7C 80B60C9C 0C024F61 */ jal func_80093D84 @@ -111,7 +111,7 @@ glabel func_80B60C44 /* 00BCC 80B60DEC 24C62660 */ addiu $a2, $a2, %lo(D_80B62660) ## $a2 = 80B62660 /* 00BD0 80B60DF0 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 00BD4 80B60DF4 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 00BD8 80B60DF8 0C031AD5 */ jal func_800C6B54 +/* 00BD8 80B60DF8 0C031AD5 */ jal Graph_CloseDisp /* 00BDC 80B60DFC 2407014B */ addiu $a3, $zero, 0x014B ## $a3 = 0000014B /* 00BE0 80B60E00 8FBF0044 */ lw $ra, 0x0044($sp) /* 00BE4 80B60E04 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s index 493854cc36..d8aeaa3a7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s @@ -13,7 +13,7 @@ glabel EnfHG_Draw /* 02510 80B64ED0 24C65378 */ addiu $a2, $a2, %lo(D_80B65378) ## $a2 = 80B65378 /* 02514 80B64ED4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 02518 80B64ED8 24070987 */ addiu $a3, $zero, 0x0987 ## $a3 = 00000987 -/* 0251C 80B64EDC 0C031AB1 */ jal func_800C6AC4 +/* 0251C 80B64EDC 0C031AB1 */ jal Graph_OpenDisp /* 02520 80B64EE0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 02524 80B64EE4 0C024F46 */ jal func_80093D18 /* 02528 80B64EE8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -182,7 +182,7 @@ glabel EnfHG_Draw /* 02784 80B65144 24C65388 */ addiu $a2, $a2, %lo(D_80B65388) ## $a2 = 80B65388 /* 02788 80B65148 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 0278C 80B6514C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 -/* 02790 80B65150 0C031AD5 */ jal func_800C6B54 +/* 02790 80B65150 0C031AD5 */ jal Graph_CloseDisp /* 02794 80B65154 240709B0 */ addiu $a3, $zero, 0x09B0 ## $a3 = 000009B0 /* 02798 80B65158 8FBF0034 */ lw $ra, 0x0034($sp) /* 0279C 80B6515C 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s index 19bda11c78..67dd3c334b 100644 --- a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s @@ -12,7 +12,7 @@ glabel EndTitle_Draw /* 00070 80B65790 24070193 */ addiu $a3, $zero, 0x0193 ## $a3 = 00000193 /* 00074 80B65794 AFB800F0 */ sw $t8, 0x00F0($sp) /* 00078 80B65798 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0007C 80B6579C 0C031AB1 */ jal func_800C6AC4 +/* 0007C 80B6579C 0C031AB1 */ jal Graph_OpenDisp /* 00080 80B657A0 AFA500EC */ sw $a1, 0x00EC($sp) /* 00084 80B657A4 8FB90104 */ lw $t9, 0x0104($sp) /* 00088 80B657A8 0C024F61 */ jal func_80093D84 @@ -73,7 +73,7 @@ glabel EndTitle_Draw /* 00164 80B65884 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00168 80B65888 8FAF0104 */ lw $t7, 0x0104($sp) /* 0016C 80B6588C 240701A1 */ addiu $a3, $zero, 0x01A1 ## $a3 = 000001A1 -/* 00170 80B65890 0C031AD5 */ jal func_800C6B54 +/* 00170 80B65890 0C031AD5 */ jal Graph_CloseDisp /* 00174 80B65894 8DE50000 */ lw $a1, 0x0000($t7) ## 00000008 /* 00178 80B65898 8FB90104 */ lw $t9, 0x0104($sp) /* 0017C 80B6589C 3C0680B7 */ lui $a2, %hi(D_80B6988C) ## $a2 = 80B70000 @@ -81,7 +81,7 @@ glabel EndTitle_Draw /* 00184 80B658A4 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 00188 80B658A8 27A400C0 */ addiu $a0, $sp, 0x00C0 ## $a0 = FFFFFFC0 /* 0018C 80B658AC 240701A3 */ addiu $a3, $zero, 0x01A3 ## $a3 = 000001A3 -/* 00190 80B658B0 0C031AB1 */ jal func_800C6AC4 +/* 00190 80B658B0 0C031AB1 */ jal Graph_OpenDisp /* 00194 80B658B4 AFA500D0 */ sw $a1, 0x00D0($sp) /* 00198 80B658B8 8FA400F4 */ lw $a0, 0x00F4($sp) /* 0019C 80B658BC 8FA300D0 */ lw $v1, 0x00D0($sp) @@ -398,7 +398,7 @@ glabel EndTitle_Draw /* 00664 80B65D84 AC5F0004 */ sw $ra, 0x0004($v0) ## 00000004 /* 00668 80B65D88 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 0066C 80B65D8C 8FAF0104 */ lw $t7, 0x0104($sp) -/* 00670 80B65D90 0C031AD5 */ jal func_800C6B54 +/* 00670 80B65D90 0C031AD5 */ jal Graph_CloseDisp /* 00674 80B65D94 8DE50000 */ lw $a1, 0x0000($t7) ## E4360300 /* 00678 80B65D98 8FBF0014 */ lw $ra, 0x0014($sp) /* 0067C 80B65D9C 27BD0100 */ addiu $sp, $sp, 0x0100 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s b/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s index 5a14344e9d..8f1362b4e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s @@ -20,7 +20,7 @@ glabel func_80B65DA8 /* 006C8 80B65DE8 24C698B4 */ addiu $a2, $a2, %lo(D_80B698B4) ## $a2 = 80B698B4 /* 006CC 80B65DEC 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 006D0 80B65DF0 24070252 */ addiu $a3, $zero, 0x0252 ## $a3 = 00000252 -/* 006D4 80B65DF4 0C031AB1 */ jal func_800C6AC4 +/* 006D4 80B65DF4 0C031AB1 */ jal Graph_OpenDisp /* 006D8 80B65DF8 AFA50038 */ sw $a1, 0x0038($sp) /* 006DC 80B65DFC 8FA80038 */ lw $t0, 0x0038($sp) /* 006E0 80B65E00 0C024FCD */ jal func_80093F34 @@ -48,7 +48,7 @@ glabel func_80B65DA8 /* 00738 80B65E58 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 0073C 80B65E5C 8FB9004C */ lw $t9, 0x004C($sp) /* 00740 80B65E60 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258 -/* 00744 80B65E64 0C031AD5 */ jal func_800C6B54 +/* 00744 80B65E64 0C031AD5 */ jal Graph_CloseDisp /* 00748 80B65E68 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 0074C 80B65E6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00750 80B65E70 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s index d7caa85ec4..7907673e59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s @@ -20,7 +20,7 @@ glabel func_80B6B674 /* 01D1C 80B6B6BC 24C6B000 */ addiu $a2, $a2, %lo(D_80B7B000) ## $a2 = 80B7B000 /* 01D20 80B6B6C0 27A40110 */ addiu $a0, $sp, 0x0110 ## $a0 = FFFFFFD8 /* 01D24 80B6B6C4 240708DF */ addiu $a3, $zero, 0x08DF ## $a3 = 000008DF -/* 01D28 80B6B6C8 0C031AB1 */ jal func_800C6AC4 +/* 01D28 80B6B6C8 0C031AB1 */ jal Graph_OpenDisp /* 01D2C 80B6B6CC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01D30 80B6B6D0 0C034213 */ jal Matrix_Push /* 01D34 80B6B6D4 00000000 */ nop @@ -697,7 +697,7 @@ glabel func_80B6B674 /* 0274C 80B6C0EC 24C6B090 */ addiu $a2, $a2, %lo(D_80B7B090) ## $a2 = 80B7B090 /* 02750 80B6C0F0 27A40110 */ addiu $a0, $sp, 0x0110 ## $a0 = FFFFFFD8 /* 02754 80B6C0F4 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 02758 80B6C0F8 0C031AD5 */ jal func_800C6B54 +/* 02758 80B6C0F8 0C031AD5 */ jal Graph_CloseDisp /* 0275C 80B6C0FC 24070A05 */ addiu $a3, $zero, 0x0A05 ## $a3 = 00000A05 /* 02760 80B6C100 8FBF0064 */ lw $ra, 0x0064($sp) /* 02764 80B6C104 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s index 2562720158..55b4f4ffae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s @@ -9,7 +9,7 @@ glabel func_80B6C134 /* 027B0 80B6C150 24C6B0A0 */ addiu $a2, $a2, %lo(D_80B7B0A0) ## $a2 = 80B7B0A0 /* 027B4 80B6C154 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 027B8 80B6C158 24070A0C */ addiu $a3, $zero, 0x0A0C ## $a3 = 00000A0C -/* 027BC 80B6C15C 0C031AB1 */ jal func_800C6AC4 +/* 027BC 80B6C15C 0C031AB1 */ jal Graph_OpenDisp /* 027C0 80B6C160 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 027C4 80B6C164 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 027C8 80B6C168 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -102,7 +102,7 @@ glabel func_80B6C134 /* 02924 80B6C2C4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 02928 80B6C2C8 24C6B0C0 */ addiu $a2, $a2, %lo(D_80B7B0C0) ## $a2 = 80B7B0C0 /* 0292C 80B6C2CC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 02930 80B6C2D0 0C031AD5 */ jal func_800C6B54 +/* 02930 80B6C2D0 0C031AD5 */ jal Graph_CloseDisp /* 02934 80B6C2D4 24070A35 */ addiu $a3, $zero, 0x0A35 ## $a3 = 00000A35 /* 02938 80B6C2D8 8FBF003C */ lw $ra, 0x003C($sp) /* 0293C 80B6C2DC 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s index 818e7205c7..21d9b1bde1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s @@ -22,7 +22,7 @@ glabel func_80B6CAF8 /* 031A8 80B6CB48 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFB4 /* 031AC 80B6CB4C AFAA0090 */ sw $t2, 0x0090($sp) /* 031B0 80B6CB50 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 031B4 80B6CB54 0C031AB1 */ jal func_800C6AC4 +/* 031B4 80B6CB54 0C031AB1 */ jal Graph_OpenDisp /* 031B8 80B6CB58 AFA5008C */ sw $a1, 0x008C($sp) /* 031BC 80B6CB5C 0C034213 */ jal Matrix_Push /* 031C0 80B6CB60 00000000 */ nop @@ -348,7 +348,7 @@ glabel func_80B6CAF8 /* 03690 80B6D030 24C6B110 */ addiu $a2, $a2, %lo(D_80B7B110) ## $a2 = 80B7B110 /* 03694 80B6D034 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFB4 /* 03698 80B6D038 24070C1A */ addiu $a3, $zero, 0x0C1A ## $a3 = 00000C1A -/* 0369C 80B6D03C 0C031AD5 */ jal func_800C6B54 +/* 0369C 80B6D03C 0C031AD5 */ jal Graph_CloseDisp /* 036A0 80B6D040 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 036A4 80B6D044 8FBF0014 */ lw $ra, 0x0014($sp) /* 036A8 80B6D048 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s index a2518275a9..af68aaa698 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s @@ -17,7 +17,7 @@ glabel func_80B6D354 /* 039F0 80B6D390 24C6B120 */ addiu $a2, $a2, %lo(D_80B7B120) ## $a2 = 80B7B120 /* 039F4 80B6D394 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 039F8 80B6D398 24070C89 */ addiu $a3, $zero, 0x0C89 ## $a3 = 00000C89 -/* 039FC 80B6D39C 0C031AB1 */ jal func_800C6AC4 +/* 039FC 80B6D39C 0C031AB1 */ jal Graph_OpenDisp /* 03A00 80B6D3A0 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 03A04 80B6D3A4 0C2DB415 */ jal func_80B6D054 /* 03A08 80B6D3A8 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 @@ -195,7 +195,7 @@ glabel func_80B6D354 /* 03CA0 80B6D640 24C6B150 */ addiu $a2, $a2, %lo(D_80B7B150) ## $a2 = 80B7B150 /* 03CA4 80B6D644 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 03CA8 80B6D648 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 03CAC 80B6D64C 0C031AD5 */ jal func_800C6B54 +/* 03CAC 80B6D64C 0C031AD5 */ jal Graph_CloseDisp /* 03CB0 80B6D650 24070CC7 */ addiu $a3, $zero, 0x0CC7 ## $a3 = 00000CC7 /* 03CB4 80B6D654 8FBF0044 */ lw $ra, 0x0044($sp) /* 03CB8 80B6D658 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s index 1b9ba20820..6da0cfbc91 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s @@ -19,7 +19,7 @@ glabel func_80B6D688 /* 03D2C 80B6D6CC AFB000E8 */ sw $s0, 0x00E8($sp) /* 03D30 80B6D6D0 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFB0 /* 03D34 80B6D6D4 24070CD7 */ addiu $a3, $zero, 0x0CD7 ## $a3 = 00000CD7 -/* 03D38 80B6D6D8 0C031AB1 */ jal func_800C6AC4 +/* 03D38 80B6D6D8 0C031AB1 */ jal Graph_OpenDisp /* 03D3C 80B6D6DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 03D40 80B6D6E0 8FB900E8 */ lw $t9, 0x00E8($sp) /* 03D44 80B6D6E4 0C024F46 */ jal func_80093D18 @@ -560,7 +560,7 @@ glabel func_80B6D688 /* 04568 80B6DF08 24C6B1B0 */ addiu $a2, $a2, %lo(D_80B7B1B0) ## $a2 = 80B7B1B0 /* 0456C 80B6DF0C 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFB0 /* 04570 80B6DF10 24070DAC */ addiu $a3, $zero, 0x0DAC ## $a3 = 00000DAC -/* 04574 80B6DF14 0C031AD5 */ jal func_800C6B54 +/* 04574 80B6DF14 0C031AD5 */ jal Graph_CloseDisp /* 04578 80B6DF18 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0457C 80B6DF1C 8FBF001C */ lw $ra, 0x001C($sp) /* 04580 80B6DF20 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s index 78c1786883..78470b5944 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s @@ -12,7 +12,7 @@ glabel func_80B6DF30 /* 045B8 80B6DF58 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFD0 /* 045BC 80B6DF5C 24C6B1C0 */ addiu $a2, $a2, %lo(D_80B7B1C0) ## $a2 = 80B7B1C0 /* 045C0 80B6DF60 24070E10 */ addiu $a3, $zero, 0x0E10 ## $a3 = 00000E10 -/* 045C4 80B6DF64 0C031AB1 */ jal func_800C6AC4 +/* 045C4 80B6DF64 0C031AB1 */ jal Graph_OpenDisp /* 045C8 80B6DF68 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 045CC 80B6DF6C 3C0380B8 */ lui $v1, %hi(D_80B7FDA8) ## $v1 = 80B80000 /* 045D0 80B6DF70 2463FDA8 */ addiu $v1, $v1, %lo(D_80B7FDA8) ## $v1 = 80B7FDA8 @@ -723,7 +723,7 @@ glabel func_80B6DF30 /* 05018 80B6E9B8 24C6B1E0 */ addiu $a2, $a2, %lo(D_80B7B1E0) ## $a2 = 80B7B1E0 /* 0501C 80B6E9BC 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFD0 /* 05020 80B6E9C0 24070EFE */ addiu $a3, $zero, 0x0EFE ## $a3 = 00000EFE -/* 05024 80B6E9C4 0C031AD5 */ jal func_800C6B54 +/* 05024 80B6E9C4 0C031AD5 */ jal Graph_CloseDisp /* 05028 80B6E9C8 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 0502C 80B6E9CC 8FBF0024 */ lw $ra, 0x0024($sp) /* 05030 80B6E9D0 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s index c505db9050..0149b21e48 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s @@ -19,7 +19,7 @@ glabel func_80B76474 /* 0CB18 80B764B8 24C6B200 */ addiu $a2, $a2, %lo(D_80B7B200) ## $a2 = 80B7B200 /* 0CB1C 80B764BC 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 0CB20 80B764C0 24071E18 */ addiu $a3, $zero, 0x1E18 ## $a3 = 00001E18 -/* 0CB24 80B764C4 0C031AB1 */ jal func_800C6AC4 +/* 0CB24 80B764C4 0C031AB1 */ jal Graph_OpenDisp /* 0CB28 80B764C8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0CB2C 80B764CC 0C034213 */ jal Matrix_Push /* 0CB30 80B764D0 00000000 */ nop @@ -291,7 +291,7 @@ glabel func_80B76474 /* 0CF18 80B768B8 24C6B250 */ addiu $a2, $a2, %lo(D_80B7B250) ## $a2 = 80B7B250 /* 0CF1C 80B768BC 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 0CF20 80B768C0 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 0CF24 80B768C4 0C031AD5 */ jal func_800C6B54 +/* 0CF24 80B768C4 0C031AD5 */ jal Graph_CloseDisp /* 0CF28 80B768C8 24071E7D */ addiu $a3, $zero, 0x1E7D ## $a3 = 00001E7D /* 0CF2C 80B768CC 8FBF003C */ lw $ra, 0x003C($sp) /* 0CF30 80B768D0 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s index 38558d5792..24d25acf66 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s @@ -34,7 +34,7 @@ glabel func_80B771CC /* 0D8A4 80B77244 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 0D8A8 80B77248 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 0D8AC 80B7724C 24071F70 */ addiu $a3, $zero, 0x1F70 ## $a3 = 00001F70 -/* 0D8B0 80B77250 0C031AB1 */ jal func_800C6AC4 +/* 0D8B0 80B77250 0C031AB1 */ jal Graph_OpenDisp /* 0D8B4 80B77254 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0D8B8 80B77258 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0D8BC 80B7725C 4481C000 */ mtc1 $at, $f24 ## $f24 = 32768.00 @@ -129,7 +129,7 @@ glabel func_80B771CC /* 0DA14 80B773B4 24C6B280 */ addiu $a2, $a2, %lo(D_80B7B280) ## $a2 = 80B7B280 /* 0DA18 80B773B8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 0DA1C 80B773BC 24071FA3 */ addiu $a3, $zero, 0x1FA3 ## $a3 = 00001FA3 -/* 0DA20 80B773C0 0C031AD5 */ jal func_800C6B54 +/* 0DA20 80B773C0 0C031AD5 */ jal Graph_CloseDisp /* 0DA24 80B773C4 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 0DA28 80B773C8 8FBF0054 */ lw $ra, 0x0054($sp) /* 0DA2C 80B773CC D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s index a3c387ccb8..b1dcc36e21 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s @@ -11,7 +11,7 @@ glabel func_80B7A140 /* 107C4 80B7A164 24C6B2E4 */ addiu $a2, $a2, %lo(D_80B7B2E4) ## $a2 = 80B7B2E4 /* 107C8 80B7A168 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 107CC 80B7A16C 240723AE */ addiu $a3, $zero, 0x23AE ## $a3 = 000023AE -/* 107D0 80B7A170 0C031AB1 */ jal func_800C6AC4 +/* 107D0 80B7A170 0C031AB1 */ jal Graph_OpenDisp /* 107D4 80B7A174 AFA50034 */ sw $a1, 0x0034($sp) /* 107D8 80B7A178 3C0480B8 */ lui $a0, %hi(D_80B7A89C) ## $a0 = 80B80000 /* 107DC 80B7A17C 3C0580B8 */ lui $a1, %hi(D_80B7E090) ## $a1 = 80B80000 @@ -73,7 +73,7 @@ glabel func_80B7A140 /* 108B4 80B7A254 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 108B8 80B7A258 24C6B2F4 */ addiu $a2, $a2, %lo(D_80B7B2F4) ## $a2 = 80B7B2F4 /* 108BC 80B7A25C 240723B6 */ addiu $a3, $zero, 0x23B6 ## $a3 = 000023B6 -/* 108C0 80B7A260 0C031AD5 */ jal func_800C6B54 +/* 108C0 80B7A260 0C031AD5 */ jal Graph_CloseDisp /* 108C4 80B7A264 8DE50000 */ lw $a1, 0x0000($t7) ## 00000008 .L80B7A268: /* 108C8 80B7A268 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s index 28b56cd950..7d0e13d8e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s @@ -9,7 +9,7 @@ glabel func_80B7A278 /* 108F4 80B7A294 24C6B304 */ addiu $a2, $a2, %lo(D_80B7B304) ## $a2 = 80B7B304 /* 108F8 80B7A298 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 108FC 80B7A29C 240723C4 */ addiu $a3, $zero, 0x23C4 ## $a3 = 000023C4 -/* 10900 80B7A2A0 0C031AB1 */ jal func_800C6AC4 +/* 10900 80B7A2A0 0C031AB1 */ jal Graph_OpenDisp /* 10904 80B7A2A4 AFA50058 */ sw $a1, 0x0058($sp) /* 10908 80B7A2A8 0C024F46 */ jal func_80093D18 /* 1090C 80B7A2AC 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 @@ -239,7 +239,7 @@ glabel func_80B7A278 /* 10C60 80B7A600 24C6B334 */ addiu $a2, $a2, %lo(D_80B7B334) ## $a2 = 80B7B334 /* 10C64 80B7A604 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 10C68 80B7A608 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 10C6C 80B7A60C 0C031AD5 */ jal func_800C6B54 +/* 10C6C 80B7A60C 0C031AD5 */ jal Graph_CloseDisp /* 10C70 80B7A610 24072459 */ addiu $a3, $zero, 0x2459 ## $a3 = 00002459 /* 10C74 80B7A614 8FBF002C */ lw $ra, 0x002C($sp) /* 10C78 80B7A618 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s index 956a4da8c8..7ed62631da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s @@ -11,7 +11,7 @@ glabel ItemBHeart_Draw /* 00228 80B85378 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0022C 80B8537C A3A00057 */ sb $zero, 0x0057($sp) /* 00230 80B85380 240701FA */ addiu $a3, $zero, 0x01FA ## $a3 = 000001FA -/* 00234 80B85384 0C031AB1 */ jal func_800C6AC4 +/* 00234 80B85384 0C031AB1 */ jal Graph_OpenDisp /* 00238 80B85388 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0023C 80B8538C 8FA50064 */ lw $a1, 0x0064($sp) /* 00240 80B85390 93A80057 */ lbu $t0, 0x0057($sp) @@ -108,7 +108,7 @@ glabel ItemBHeart_Draw /* 00398 80B854E8 24C6557C */ addiu $a2, $a2, %lo(D_80B8557C) ## $a2 = 80B8557C /* 0039C 80B854EC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 003A0 80B854F0 24070231 */ addiu $a3, $zero, 0x0231 ## $a3 = 00000231 -/* 003A4 80B854F4 0C031AD5 */ jal func_800C6B54 +/* 003A4 80B854F4 0C031AD5 */ jal Graph_CloseDisp /* 003A8 80B854F8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 003AC 80B854FC 8FBF001C */ lw $ra, 0x001C($sp) /* 003B0 80B85500 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s index 86c7a6d925..4fbc48c622 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s @@ -11,7 +11,7 @@ glabel ItemShield_Draw /* 0079C 80B870BC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 007A0 80B870C0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 007A4 80B870C4 240701C9 */ addiu $a3, $zero, 0x01C9 ## $a3 = 000001C9 -/* 007A8 80B870C8 0C031AB1 */ jal func_800C6AC4 +/* 007A8 80B870C8 0C031AB1 */ jal Graph_OpenDisp /* 007AC 80B870CC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 007B0 80B870D0 8FB9004C */ lw $t9, 0x004C($sp) /* 007B4 80B870D4 0C024F46 */ jal func_80093D18 @@ -56,7 +56,7 @@ glabel ItemShield_Draw /* 00850 80B87170 24C672C0 */ addiu $a2, $a2, %lo(D_80B872C0) ## $a2 = 80B872C0 /* 00854 80B87174 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00858 80B87178 240701D1 */ addiu $a3, $zero, 0x01D1 ## $a3 = 000001D1 -/* 0085C 80B8717C 0C031AD5 */ jal func_800C6B54 +/* 0085C 80B8717C 0C031AD5 */ jal Graph_CloseDisp /* 00860 80B87180 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 .L80B87184: /* 00864 80B87184 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s index 568c4159c0..7184387f23 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s @@ -154,7 +154,7 @@ glabel MagicDark_Draw /* 00B28 80B87EF8 46122401 */ sub.s $f16, $f4, $f18 /* 00B2C 80B87EFC E7B00080 */ swc1 $f16, 0x0080($sp) /* 00B30 80B87F00 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00B34 80B87F04 0C031AB1 */ jal func_800C6AC4 +/* 00B34 80B87F04 0C031AB1 */ jal Graph_OpenDisp /* 00B38 80B87F08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00B3C 80B87F0C 0C024F61 */ jal func_80093D84 /* 00B40 80B87F10 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -254,7 +254,7 @@ glabel MagicDark_Draw /* 00CB8 80B88088 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD0 /* 00CBC 80B8808C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00CC0 80B88090 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00CC4 80B88094 0C031AD5 */ jal func_800C6B54 +/* 00CC4 80B88094 0C031AD5 */ jal Graph_CloseDisp /* 00CC8 80B88098 24070283 */ addiu $a3, $zero, 0x0283 ## $a3 = 00000283 /* 00CCC 80B8809C 8FBF0024 */ lw $ra, 0x0024($sp) .L80B880A0: diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s index 6122827023..9ea551c072 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s @@ -15,7 +15,7 @@ glabel func_80B87A18 /* 0067C 80B87A4C 24C68B20 */ addiu $a2, $a2, %lo(D_80B88B20) ## $a2 = 80B88B20 /* 00680 80B87A50 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00684 80B87A54 2407020D */ addiu $a3, $zero, 0x020D ## $a3 = 0000020D -/* 00688 80B87A58 0C031AB1 */ jal func_800C6AC4 +/* 00688 80B87A58 0C031AB1 */ jal Graph_OpenDisp /* 0068C 80B87A5C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00690 80B87A60 0C024F61 */ jal func_80093D84 /* 00694 80B87A64 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -164,7 +164,7 @@ glabel func_80B87A18 /* 008C0 80B87C90 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 008C4 80B87C94 24C68B48 */ addiu $a2, $a2, %lo(D_80B88B48) ## $a2 = 80B88B48 /* 008C8 80B87C98 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 -/* 008CC 80B87C9C 0C031AD5 */ jal func_800C6B54 +/* 008CC 80B87C9C 0C031AD5 */ jal Graph_CloseDisp /* 008D0 80B87CA0 2407023A */ addiu $a3, $zero, 0x023A ## $a3 = 0000023A /* 008D4 80B87CA4 8FBF0044 */ lw $ra, 0x0044($sp) /* 008D8 80B87CA8 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s index c316563034..1fbe31da3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s @@ -15,7 +15,7 @@ glabel MagicFire_Draw /* 00538 80B892A8 8FBF0034 */ lw $ra, 0x0034($sp) /* 0053C 80B892AC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00540 80B892B0 240702AA */ addiu $a3, $zero, 0x02AA ## $a3 = 000002AA -/* 00544 80B892B4 0C031AB1 */ jal func_800C6AC4 +/* 00544 80B892B4 0C031AB1 */ jal Graph_OpenDisp /* 00548 80B892B8 AFA500A4 */ sw $a1, 0x00A4($sp) /* 0054C 80B892BC 8FA300A4 */ lw $v1, 0x00A4($sp) /* 00550 80B892C0 0C024DF0 */ jal func_800937C0 @@ -356,7 +356,7 @@ glabel MagicFire_Draw /* 00A74 80B897E4 24C6AFE8 */ addiu $a2, $a2, %lo(D_80B8AFE8) ## $a2 = 80B8AFE8 /* 00A78 80B897E8 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFD4 /* 00A7C 80B897EC 240702EE */ addiu $a3, $zero, 0x02EE ## $a3 = 000002EE -/* 00A80 80B897F0 0C031AD5 */ jal func_800C6B54 +/* 00A80 80B897F0 0C031AD5 */ jal Graph_CloseDisp /* 00A84 80B897F4 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 00A88 80B897F8 8FAE00C0 */ lw $t6, 0x00C0($sp) /* 00A8C 80B897FC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s index b50ef7c4fc..a7bdc30a98 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s @@ -9,7 +9,7 @@ glabel MagicWind_Draw /* 006C8 80B8B7C8 24C6CE98 */ addiu $a2, $a2, %lo(D_80B8CE98) ## $a2 = 80B8CE98 /* 006CC 80B8B7CC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 006D0 80B8B7D0 24070295 */ addiu $a3, $zero, 0x0295 ## $a3 = 00000295 -/* 006D4 80B8B7D4 0C031AB1 */ jal func_800C6AC4 +/* 006D4 80B8B7D4 0C031AB1 */ jal Graph_OpenDisp /* 006D8 80B8B7D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 006DC 80B8B7DC 8FB80050 */ lw $t8, 0x0050($sp) /* 006E0 80B8B7E0 3C0F80B9 */ lui $t7, %hi(func_80B8B3C8) ## $t7 = 80B90000 @@ -36,7 +36,7 @@ glabel MagicWind_Draw /* 00730 80B8B830 24C6CEAC */ addiu $a2, $a2, %lo(D_80B8CEAC) ## $a2 = 80B8CEAC /* 00734 80B8B834 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00738 80B8B838 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0073C 80B8B83C 0C031AD5 */ jal func_800C6B54 +/* 0073C 80B8B83C 0C031AD5 */ jal Graph_CloseDisp /* 00740 80B8B840 240702A1 */ addiu $a3, $zero, 0x02A1 ## $a3 = 000002A1 /* 00744 80B8B844 8FBF002C */ lw $ra, 0x002C($sp) /* 00748 80B8B848 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s index 0226ba8976..42ac349964 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s @@ -11,7 +11,7 @@ glabel func_80B8B5F4 /* 00518 80B8B618 24C6CE70 */ addiu $a2, $a2, %lo(D_80B8CE70) ## $a2 = 80B8CE70 /* 0051C 80B8B61C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 00520 80B8B620 24070267 */ addiu $a3, $zero, 0x0267 ## $a3 = 00000267 -/* 00524 80B8B624 0C031AB1 */ jal func_800C6AC4 +/* 00524 80B8B624 0C031AB1 */ jal Graph_OpenDisp /* 00528 80B8B628 AFA50060 */ sw $a1, 0x0060($sp) /* 0052C 80B8B62C 8FA20070 */ lw $v0, 0x0070($sp) /* 00530 80B8B630 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -104,7 +104,7 @@ glabel func_80B8B5F4 /* 00684 80B8B784 24C6CE84 */ addiu $a2, $a2, %lo(D_80B8CE84) ## $a2 = 80B8CE84 /* 00688 80B8B788 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 0068C 80B8B78C 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 00690 80B8B790 0C031AD5 */ jal func_800C6B54 +/* 00690 80B8B790 0C031AD5 */ jal Graph_CloseDisp /* 00694 80B8B794 24070286 */ addiu $a3, $zero, 0x0286 ## $a3 = 00000286 /* 00698 80B8B798 8FBF003C */ lw $ra, 0x003C($sp) /* 0069C 80B8B79C 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s index 33085529ea..60639b518a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s @@ -37,7 +37,7 @@ glabel MirRay_Draw /* 01120 80B8E170 8FBF0034 */ lw $ra, 0x0034($sp) /* 01124 80B8E174 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 /* 01128 80B8E178 240703C6 */ addiu $a3, $zero, 0x03C6 ## $a3 = 000003C6 -/* 0112C 80B8E17C 0C031AB1 */ jal func_800C6AC4 +/* 0112C 80B8E17C 0C031AB1 */ jal Graph_OpenDisp /* 01130 80B8E180 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 01134 80B8E184 0C024F61 */ jal func_80093D84 /* 01138 80B8E188 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -193,7 +193,7 @@ glabel MirRay_Draw /* 0137C 80B8E3CC 24C6E914 */ addiu $a2, $a2, %lo(D_80B8E914) ## $a2 = 80B8E914 /* 01380 80B8E3D0 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 /* 01384 80B8E3D4 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFDE4 -/* 01388 80B8E3D8 0C031AD5 */ jal func_800C6B54 +/* 01388 80B8E3D8 0C031AD5 */ jal Graph_CloseDisp /* 0138C 80B8E3DC 24070403 */ addiu $a3, $zero, 0x0403 ## $a3 = 00000403 .L80B8E3E0: /* 01390 80B8E3E0 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s index 7ad636d6bd..9a54689e57 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s @@ -10,7 +10,7 @@ glabel ObjDekujr_Draw /* 00454 80B92874 24C62A40 */ addiu $a2, $a2, %lo(D_80B92A40) ## $a2 = 80B92A40 /* 00458 80B92878 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 0045C 80B9287C 24070172 */ addiu $a3, $zero, 0x0172 ## $a3 = 00000172 -/* 00460 80B92880 0C031AB1 */ jal func_800C6AC4 +/* 00460 80B92880 0C031AB1 */ jal Graph_OpenDisp /* 00464 80B92884 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00468 80B92888 0C024F46 */ jal func_80093D18 /* 0046C 80B9288C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -91,7 +91,7 @@ glabel ObjDekujr_Draw /* 00598 80B929B8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 0059C 80B929BC 24C62A7C */ addiu $a2, $a2, %lo(D_80B92A7C) ## $a2 = 80B92A7C /* 005A0 80B929C0 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 005A4 80B929C4 0C031AD5 */ jal func_800C6B54 +/* 005A4 80B929C4 0C031AD5 */ jal Graph_CloseDisp /* 005A8 80B929C8 24070199 */ addiu $a3, $zero, 0x0199 ## $a3 = 00000199 /* 005AC 80B929CC 8FBF003C */ lw $ra, 0x003C($sp) /* 005B0 80B929D0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s index 42abff5783..f9b8b405c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s @@ -9,7 +9,7 @@ glabel ObjHamishi_Draw /* 006D4 80B93664 24C637B0 */ addiu $a2, $a2, %lo(D_80B937B0) ## $a2 = 80B937B0 /* 006D8 80B93668 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 006DC 80B9366C 2407018F */ addiu $a3, $zero, 0x018F ## $a3 = 0000018F -/* 006E0 80B93670 0C031AB1 */ jal func_800C6AC4 +/* 006E0 80B93670 0C031AB1 */ jal Graph_OpenDisp /* 006E4 80B93674 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 006E8 80B93678 8FAF004C */ lw $t7, 0x004C($sp) /* 006EC 80B9367C 0C024F46 */ jal func_80093D18 @@ -50,7 +50,7 @@ glabel ObjHamishi_Draw /* 00778 80B93708 24C637D8 */ addiu $a2, $a2, %lo(D_80B937D8) ## $a2 = 80B937D8 /* 0077C 80B9370C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00780 80B93710 2407019B */ addiu $a3, $zero, 0x019B ## $a3 = 0000019B -/* 00784 80B93714 0C031AD5 */ jal func_800C6B54 +/* 00784 80B93714 0C031AD5 */ jal Graph_CloseDisp /* 00788 80B93718 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 0078C 80B9371C 8FBF001C */ lw $ra, 0x001C($sp) /* 00790 80B93720 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s index d70667a1a0..ee7e796aef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s @@ -10,7 +10,7 @@ glabel ObjHsblock_Draw /* 00410 80B93F70 24C64154 */ addiu $a2, $a2, %lo(D_80B94154) ## $a2 = 80B94154 /* 00414 80B93F74 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00418 80B93F78 2407016D */ addiu $a3, $zero, 0x016D ## $a3 = 0000016D -/* 0041C 80B93F7C 0C031AB1 */ jal func_800C6AC4 +/* 0041C 80B93F7C 0C031AB1 */ jal Graph_OpenDisp /* 00420 80B93F80 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00424 80B93F84 0C024F46 */ jal func_80093D18 /* 00428 80B93F88 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -78,7 +78,7 @@ glabel ObjHsblock_Draw /* 00518 80B94078 010A4021 */ addu $t0, $t0, $t2 /* 0051C 80B9407C 8D0840EC */ lw $t0, %lo(D_80B940EC)($t0) /* 00520 80B94080 AC480004 */ sw $t0, 0x0004($v0) ## 80160004 -/* 00524 80B94084 0C031AD5 */ jal func_800C6B54 +/* 00524 80B94084 0C031AD5 */ jal Graph_CloseDisp /* 00528 80B94088 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 0052C 80B9408C 8FBF001C */ lw $ra, 0x001C($sp) /* 00530 80B94090 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s index 10fb6ffa8e..3c64a5e6b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s @@ -10,7 +10,7 @@ glabel ObjIcePoly_Draw /* 0073C 80B9499C 24C64BB0 */ addiu $a2, $a2, %lo(D_80B94BB0) ## $a2 = 80B94BB0 /* 00740 80B949A0 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 00744 80B949A4 240701A5 */ addiu $a3, $zero, 0x01A5 ## $a3 = 000001A5 -/* 00748 80B949A8 0C031AB1 */ jal func_800C6AC4 +/* 00748 80B949A8 0C031AB1 */ jal Graph_OpenDisp /* 0074C 80B949AC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00750 80B949B0 0C024F61 */ jal func_80093D84 /* 00754 80B949B4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -91,7 +91,7 @@ glabel ObjIcePoly_Draw /* 00880 80B94AE0 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 00884 80B94AE4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 00888 80B94AE8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0088C 80B94AEC 0C031AD5 */ jal func_800C6B54 +/* 0088C 80B94AEC 0C031AD5 */ jal Graph_CloseDisp /* 00890 80B94AF0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00894 80B94AF4 8FBF003C */ lw $ra, 0x003C($sp) /* 00898 80B94AF8 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s index b9b7930ef2..509ac1780d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s @@ -10,7 +10,7 @@ glabel func_80B977D0 /* 00C50 80B977F0 24C68008 */ addiu $a2, $a2, %lo(D_80B98008) ## $a2 = 80B98008 /* 00C54 80B977F4 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 00C58 80B977F8 24070329 */ addiu $a3, $zero, 0x0329 ## $a3 = 00000329 -/* 00C5C 80B977FC 0C031AB1 */ jal func_800C6AC4 +/* 00C5C 80B977FC 0C031AB1 */ jal Graph_OpenDisp /* 00C60 80B97800 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00C64 80B97804 8FAF007C */ lw $t7, 0x007C($sp) /* 00C68 80B97808 0C024F46 */ jal func_80093D18 @@ -219,7 +219,7 @@ glabel func_80B977D0 /* 00F88 80B97B28 24C68068 */ addiu $a2, $a2, %lo(D_80B98068) ## $a2 = 80B98068 /* 00F8C 80B97B2C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 00F90 80B97B30 2407036E */ addiu $a3, $zero, 0x036E ## $a3 = 0000036E -/* 00F94 80B97B34 0C031AD5 */ jal func_800C6B54 +/* 00F94 80B97B34 0C031AD5 */ jal Graph_CloseDisp /* 00F98 80B97B38 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00F9C 80B97B3C 8FBF001C */ lw $ra, 0x001C($sp) /* 00FA0 80B97B40 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s index 43a783cfa1..24616b8785 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s @@ -10,7 +10,7 @@ glabel func_80B97B50 /* 00FD0 80B97B70 24C68080 */ addiu $a2, $a2, %lo(D_80B98080) ## $a2 = 80B98080 /* 00FD4 80B97B74 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 00FD8 80B97B78 2407037A */ addiu $a3, $zero, 0x037A ## $a3 = 0000037A -/* 00FDC 80B97B7C 0C031AB1 */ jal func_800C6AC4 +/* 00FDC 80B97B7C 0C031AB1 */ jal Graph_OpenDisp /* 00FE0 80B97B80 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00FE4 80B97B84 8FAF007C */ lw $t7, 0x007C($sp) /* 00FE8 80B97B88 0C024F61 */ jal func_80093D84 @@ -186,7 +186,7 @@ glabel func_80B97B50 /* 01290 80B97E30 24C680E0 */ addiu $a2, $a2, %lo(D_80B980E0) ## $a2 = 80B980E0 /* 01294 80B97E34 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 01298 80B97E38 240703B5 */ addiu $a3, $zero, 0x03B5 ## $a3 = 000003B5 -/* 0129C 80B97E3C 0C031AD5 */ jal func_800C6B54 +/* 0129C 80B97E3C 0C031AD5 */ jal Graph_CloseDisp /* 012A0 80B97E40 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 012A4 80B97E44 8FBF001C */ lw $ra, 0x001C($sp) /* 012A8 80B97E48 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s index f95e716824..cea8ab7e2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s @@ -9,7 +9,7 @@ glabel ObjOshihiki_Draw /* 01600 80B9C780 24C6CC5C */ addiu $a2, $a2, %lo(D_80B9CC5C) ## $a2 = 80B9CC5C /* 01604 80B9C784 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01608 80B9C788 24070509 */ addiu $a3, $zero, 0x0509 ## $a3 = 00000509 -/* 0160C 80B9C78C 0C031AB1 */ jal func_800C6AC4 +/* 0160C 80B9C78C 0C031AB1 */ jal Graph_OpenDisp /* 01610 80B9C790 AFA5004C */ sw $a1, 0x004C($sp) /* 01614 80B9C794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01618 80B9C798 0C2E6FC2 */ jal func_80B9BF08 @@ -137,7 +137,7 @@ glabel L80B9C8F8 /* 017EC 80B9C96C 24C6CC84 */ addiu $a2, $a2, %lo(D_80B9CC84) ## $a2 = 80B9CC84 /* 017F0 80B9C970 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 017F4 80B9C974 24070536 */ addiu $a3, $zero, 0x0536 ## $a3 = 00000536 -/* 017F8 80B9C978 0C031AD5 */ jal func_800C6B54 +/* 017F8 80B9C978 0C031AD5 */ jal Graph_CloseDisp /* 017FC 80B9C97C 8D650000 */ lw $a1, 0x0000($t3) ## 00000008 /* 01800 80B9C980 8FBF001C */ lw $ra, 0x001C($sp) /* 01804 80B9C984 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s index 9f45cac913..819a3b69c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s @@ -13,7 +13,7 @@ glabel func_80B9E7B4 /* 015D0 80B9E7E0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 015D4 80B9E7E4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 015D8 80B9E7E8 240705B3 */ addiu $a3, $zero, 0x05B3 ## $a3 = 000005B3 -/* 015DC 80B9E7EC 0C031AB1 */ jal func_800C6AC4 +/* 015DC 80B9E7EC 0C031AB1 */ jal Graph_OpenDisp /* 015E0 80B9E7F0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 015E4 80B9E7F4 8FA90054 */ lw $t1, 0x0054($sp) /* 015E8 80B9E7F8 0C024F46 */ jal func_80093D18 @@ -76,7 +76,7 @@ glabel func_80B9E7B4 /* 016CC 80B9E8DC 8FAC0054 */ lw $t4, 0x0054($sp) /* 016D0 80B9E8E0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 016D4 80B9E8E4 240705BF */ addiu $a3, $zero, 0x05BF ## $a3 = 000005BF -/* 016D8 80B9E8E8 0C031AD5 */ jal func_800C6B54 +/* 016D8 80B9E8E8 0C031AD5 */ jal Graph_CloseDisp /* 016DC 80B9E8EC 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 016E0 80B9E8F0 8FBF001C */ lw $ra, 0x001C($sp) /* 016E4 80B9E8F4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s index fafc1e6c5a..039b2f1d12 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s @@ -16,7 +16,7 @@ glabel func_80B9E904 /* 0172C 80B9E93C 24C6EEF0 */ addiu $a2, $a2, %lo(D_80B9EEF0) ## $a2 = 80B9EEF0 /* 01730 80B9E940 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE0 /* 01734 80B9E944 240705D6 */ addiu $a3, $zero, 0x05D6 ## $a3 = 000005D6 -/* 01738 80B9E948 0C031AB1 */ jal func_800C6AC4 +/* 01738 80B9E948 0C031AB1 */ jal Graph_OpenDisp /* 0173C 80B9E94C AFA50090 */ sw $a1, 0x0090($sp) /* 01740 80B9E950 0C024F61 */ jal func_80093D84 /* 01744 80B9E954 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -54,14 +54,14 @@ glabel func_80B9E904 /* 017C4 80B9E9D4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 017C8 80B9E9D8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 017CC 80B9E9DC AFA90048 */ sw $t1, 0x0048($sp) -/* 017D0 80B9E9E0 0C031AD5 */ jal func_800C6B54 +/* 017D0 80B9E9E0 0C031AD5 */ jal Graph_CloseDisp /* 017D4 80B9E9E4 AFA8004C */ sw $t0, 0x004C($sp) /* 017D8 80B9E9E8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 017DC 80B9E9EC 3C0680BA */ lui $a2, %hi(D_80B9EF2C) ## $a2 = 80BA0000 /* 017E0 80B9E9F0 24C6EF2C */ addiu $a2, $a2, %lo(D_80B9EF2C) ## $a2 = 80B9EF2C /* 017E4 80B9E9F4 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFC4 /* 017E8 80B9E9F8 240705E3 */ addiu $a3, $zero, 0x05E3 ## $a3 = 000005E3 -/* 017EC 80B9E9FC 0C031AB1 */ jal func_800C6AC4 +/* 017EC 80B9E9FC 0C031AB1 */ jal Graph_OpenDisp /* 017F0 80B9EA00 AFA50074 */ sw $a1, 0x0074($sp) /* 017F4 80B9EA04 0C024F46 */ jal func_80093D18 /* 017F8 80B9EA08 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -167,7 +167,7 @@ glabel func_80B9E904 /* 01984 80B9EB94 8DADEDD4 */ lw $t5, %lo(D_80B9EDD4)($t5) /* 01988 80B9EB98 240705FD */ addiu $a3, $zero, 0x05FD ## $a3 = 000005FD /* 0198C 80B9EB9C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 01990 80B9EBA0 0C031AD5 */ jal func_800C6B54 +/* 01990 80B9EBA0 0C031AD5 */ jal Graph_CloseDisp /* 01994 80B9EBA4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01998 80B9EBA8 8FBF003C */ lw $ra, 0x003C($sp) /* 0199C 80B9EBAC 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s index eb6a59c79e..f6a3f6a81b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s @@ -21,7 +21,7 @@ glabel ObjSyokudai_Draw /* 00880 80B9FB30 24C6FE90 */ addiu $a2, $a2, %lo(D_80B9FE90) ## $a2 = 80B9FE90 /* 00884 80B9FB34 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00888 80B9FB38 240702C3 */ addiu $a3, $zero, 0x02C3 ## $a3 = 000002C3 -/* 0088C 80B9FB3C 0C031AB1 */ jal func_800C6AC4 +/* 0088C 80B9FB3C 0C031AB1 */ jal Graph_OpenDisp /* 00890 80B9FB40 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00894 80B9FB44 0C024F46 */ jal func_80093D18 /* 00898 80B9FB48 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -189,7 +189,7 @@ glabel ObjSyokudai_Draw /* 00B14 80B9FDC4 24C6FECC */ addiu $a2, $a2, %lo(D_80B9FECC) ## $a2 = 80B9FECC /* 00B18 80B9FDC8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00B1C 80B9FDCC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00B20 80B9FDD0 0C031AD5 */ jal func_800C6B54 +/* 00B20 80B9FDD0 0C031AD5 */ jal Graph_CloseDisp /* 00B24 80B9FDD4 240702ED */ addiu $a3, $zero, 0x02ED ## $a3 = 000002ED /* 00B28 80B9FDD8 8FBF0044 */ lw $ra, 0x0044($sp) /* 00B2C 80B9FDDC 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s index a88443055a..975f2dad59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s @@ -19,7 +19,7 @@ glabel ObjTimeblock_Draw /* 00A3C 80BA09DC AFAA0044 */ sw $t2, 0x0044($sp) /* 00A40 80BA09E0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00A44 80BA09E4 240702FA */ addiu $a3, $zero, 0x02FA ## $a3 = 000002FA -/* 00A48 80BA09E8 0C031AB1 */ jal func_800C6AC4 +/* 00A48 80BA09E8 0C031AB1 */ jal Graph_OpenDisp /* 00A4C 80BA09EC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00A50 80BA09F0 8FAC004C */ lw $t4, 0x004C($sp) /* 00A54 80BA09F4 0C024F46 */ jal func_80093D18 @@ -68,7 +68,7 @@ glabel ObjTimeblock_Draw /* 00B00 80BA0AA0 8FAD004C */ lw $t5, 0x004C($sp) /* 00B04 80BA0AA4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00B08 80BA0AA8 24070304 */ addiu $a3, $zero, 0x0304 ## $a3 = 00000304 -/* 00B0C 80BA0AAC 0C031AD5 */ jal func_800C6B54 +/* 00B0C 80BA0AAC 0C031AD5 */ jal Graph_CloseDisp /* 00B10 80BA0AB0 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 .L80BA0AB4: /* 00B14 80BA0AB4 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s index a6a2afa772..ab8acd4de1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s @@ -17,7 +17,7 @@ glabel ObjWarp2block_Draw /* 00940 80BA2730 24C6294C */ addiu $a2, $a2, %lo(D_80BA294C) ## $a2 = 80BA294C /* 00944 80BA2734 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00948 80BA2738 24070248 */ addiu $a3, $zero, 0x0248 ## $a3 = 00000248 -/* 0094C 80BA273C 0C031AB1 */ jal func_800C6AC4 +/* 0094C 80BA273C 0C031AB1 */ jal Graph_OpenDisp /* 00950 80BA2740 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00954 80BA2744 8FAB004C */ lw $t3, 0x004C($sp) /* 00958 80BA2748 0C024F46 */ jal func_80093D18 @@ -66,7 +66,7 @@ glabel ObjWarp2block_Draw /* 00A04 80BA27F4 8FAC004C */ lw $t4, 0x004C($sp) /* 00A08 80BA27F8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00A0C 80BA27FC 24070252 */ addiu $a3, $zero, 0x0252 ## $a3 = 00000252 -/* 00A10 80BA2800 0C031AD5 */ jal func_800C6B54 +/* 00A10 80BA2800 0C031AD5 */ jal Graph_CloseDisp /* 00A14 80BA2804 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00A18 80BA2808 8FBF001C */ lw $ra, 0x001C($sp) /* 00A1C 80BA280C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s index fd18930c0b..b515f4cfd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s @@ -40,7 +40,7 @@ glabel func_80BA3C94 /* 0128C 80BA3D2C 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFC4 /* 01290 80BA3D30 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01294 80BA3D34 24070327 */ addiu $a3, $zero, 0x0327 ## $a3 = 00000327 -/* 01298 80BA3D38 0C031AB1 */ jal func_800C6AC4 +/* 01298 80BA3D38 0C031AB1 */ jal Graph_OpenDisp /* 0129C 80BA3D3C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 012A0 80BA3D40 8E4402D0 */ lw $a0, 0x02D0($s2) ## 000002D0 /* 012A4 80BA3D44 0C024DDD */ jal Gfx_CallSetupDL @@ -301,7 +301,7 @@ glabel func_80BA3C94 /* 01668 80BA4108 24C65A70 */ addiu $a2, $a2, %lo(D_80BA5A70) ## $a2 = 80BA5A70 /* 0166C 80BA410C 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFC4 /* 01670 80BA4110 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 01674 80BA4114 0C031AD5 */ jal func_800C6B54 +/* 01674 80BA4114 0C031AD5 */ jal Graph_CloseDisp /* 01678 80BA4118 2407039A */ addiu $a3, $zero, 0x039A ## $a3 = 0000039A .L80BA411C: /* 0167C 80BA411C 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s index 7ad836ee56..5bfa61b792 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s @@ -43,7 +43,7 @@ glabel func_80BA414C /* 01750 80BA41F0 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFF9C /* 01754 80BA41F4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01758 80BA41F8 240703BE */ addiu $a3, $zero, 0x03BE ## $a3 = 000003BE -/* 0175C 80BA41FC 0C031AB1 */ jal func_800C6AC4 +/* 0175C 80BA41FC 0C031AB1 */ jal Graph_OpenDisp /* 01760 80BA4200 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 01764 80BA4204 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01768 80BA4208 02611821 */ addu $v1, $s3, $at @@ -505,7 +505,7 @@ glabel func_80BA414C /* 01E24 80BA48C4 24C65AB8 */ addiu $a2, $a2, %lo(D_80BA5AB8) ## $a2 = 80BA5AB8 /* 01E28 80BA48C8 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFF9C /* 01E2C 80BA48CC 8E650000 */ lw $a1, 0x0000($s3) ## 00000000 -/* 01E30 80BA48D0 0C031AD5 */ jal func_800C6B54 +/* 01E30 80BA48D0 0C031AD5 */ jal Graph_CloseDisp /* 01E34 80BA48D4 24070467 */ addiu $a3, $zero, 0x0467 ## $a3 = 00000467 .L80BA48D8: /* 01E38 80BA48D8 8FBF005C */ lw $ra, 0x005C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s index 1ac143cbab..3a222b5c5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s @@ -9,7 +9,7 @@ glabel func_80BA49BC /* 01F38 80BA49D8 24C65AD0 */ addiu $a2, $a2, %lo(D_80BA5AD0) ## $a2 = 80BA5AD0 /* 01F3C 80BA49DC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 01F40 80BA49E0 2407049E */ addiu $a3, $zero, 0x049E ## $a3 = 0000049E -/* 01F44 80BA49E4 0C031AB1 */ jal func_800C6AC4 +/* 01F44 80BA49E4 0C031AB1 */ jal Graph_OpenDisp /* 01F48 80BA49E8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01F4C 80BA49EC 8FAF0060 */ lw $t7, 0x0060($sp) /* 01F50 80BA49F0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -137,7 +137,7 @@ glabel func_80BA49BC /* 02134 80BA4BD4 24C65B00 */ addiu $a2, $a2, %lo(D_80BA5B00) ## $a2 = 80BA5B00 /* 02138 80BA4BD8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 0213C 80BA4BDC 240704D1 */ addiu $a3, $zero, 0x04D1 ## $a3 = 000004D1 -/* 02140 80BA4BE0 0C031AD5 */ jal func_800C6B54 +/* 02140 80BA4BE0 0C031AD5 */ jal Graph_CloseDisp /* 02144 80BA4BE4 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 02148 80BA4BE8 8FBF001C */ lw $ra, 0x001C($sp) /* 0214C 80BA4BEC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s index 97aef1ec48..3dea9ad426 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s @@ -10,7 +10,7 @@ glabel func_80BA4D7C /* 022FC 80BA4D9C 24C65B34 */ addiu $a2, $a2, %lo(D_80BA5B34) ## $a2 = 80BA5B34 /* 02300 80BA4DA0 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFC8 /* 02304 80BA4DA4 2407052C */ addiu $a3, $zero, 0x052C ## $a3 = 0000052C -/* 02308 80BA4DA8 0C031AB1 */ jal func_800C6AC4 +/* 02308 80BA4DA8 0C031AB1 */ jal Graph_OpenDisp /* 0230C 80BA4DAC AFA50058 */ sw $a1, 0x0058($sp) /* 02310 80BA4DB0 922E1D6C */ lbu $t6, 0x1D6C($s1) ## 00001D6C /* 02314 80BA4DB4 8FA80058 */ lw $t0, 0x0058($sp) @@ -360,7 +360,7 @@ glabel func_80BA4D7C /* 0283C 80BA52DC 24C65B64 */ addiu $a2, $a2, %lo(D_80BA5B64) ## $a2 = 80BA5B64 /* 02840 80BA52E0 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFC8 /* 02844 80BA52E4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02848 80BA52E8 0C031AD5 */ jal func_800C6B54 +/* 02848 80BA52E8 0C031AD5 */ jal Graph_CloseDisp /* 0284C 80BA52EC 24070598 */ addiu $a3, $zero, 0x0598 ## $a3 = 00000598 /* 02850 80BA52F0 8FBF001C */ lw $ra, 0x001C($sp) /* 02854 80BA52F4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s index e3883c6606..79051775bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s @@ -95,7 +95,7 @@ glabel func_80BA54AC /* 02B80 80BA5620 24C65B98 */ addiu $a2, $a2, %lo(D_80BA5B98) ## $a2 = 80BA5B98 /* 02B84 80BA5624 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFF68 /* 02B88 80BA5628 24070603 */ addiu $a3, $zero, 0x0603 ## $a3 = 00000603 -/* 02B8C 80BA562C 0C031AB1 */ jal func_800C6AC4 +/* 02B8C 80BA562C 0C031AB1 */ jal Graph_OpenDisp /* 02B90 80BA5630 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 02B94 80BA5634 92CE1659 */ lbu $t6, 0x1659($s6) ## 00001659 /* 02B98 80BA5638 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 @@ -252,7 +252,7 @@ glabel func_80BA54AC /* 02DE8 80BA5888 24C65BC8 */ addiu $a2, $a2, %lo(D_80BA5BC8) ## $a2 = 80BA5BC8 /* 02DEC 80BA588C 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFF68 /* 02DF0 80BA5890 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 02DF4 80BA5894 0C031AD5 */ jal func_800C6B54 +/* 02DF4 80BA5894 0C031AD5 */ jal Graph_CloseDisp /* 02DF8 80BA5898 24070647 */ addiu $a3, $zero, 0x0647 ## $a3 = 00000647 /* 02DFC 80BA589C 8FBF0074 */ lw $ra, 0x0074($sp) /* 02E00 80BA58A0 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s index 69324745d9..f72399bb7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s @@ -13,7 +13,7 @@ glabel OceffSpot_Draw /* 006A0 80BA6710 24C66F94 */ addiu $a2, $a2, %lo(D_80BA6F94) ## $a2 = 80BA6F94 /* 006A4 80BA6714 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 006A8 80BA6718 240701D2 */ addiu $a3, $zero, 0x01D2 ## $a3 = 000001D2 -/* 006AC 80BA671C 0C031AB1 */ jal func_800C6AC4 +/* 006AC 80BA671C 0C031AB1 */ jal Graph_OpenDisp /* 006B0 80BA6720 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 006B4 80BA6724 0C024F61 */ jal func_80093D84 /* 006B8 80BA6728 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -78,7 +78,7 @@ glabel OceffSpot_Draw /* 007A4 80BA6814 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 007A8 80BA6818 24C66FBC */ addiu $a2, $a2, %lo(D_80BA6FBC) ## $a2 = 80BA6FBC /* 007AC 80BA681C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 -/* 007B0 80BA6820 0C031AD5 */ jal func_800C6B54 +/* 007B0 80BA6820 0C031AD5 */ jal Graph_CloseDisp /* 007B4 80BA6824 240701E5 */ addiu $a3, $zero, 0x01E5 ## $a3 = 000001E5 /* 007B8 80BA6828 8FBF003C */ lw $ra, 0x003C($sp) /* 007BC 80BA682C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s index fc7c51539f..1a8262642e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s @@ -13,7 +13,7 @@ glabel OceffStorm_Draw /* 00580 80BA7660 24C68C48 */ addiu $a2, $a2, %lo(D_80BA8C48) ## $a2 = 80BA8C48 /* 00584 80BA7664 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 /* 00588 80BA7668 240701E6 */ addiu $a3, $zero, 0x01E6 ## $a3 = 000001E6 -/* 0058C 80BA766C 0C031AB1 */ jal func_800C6AC4 +/* 0058C 80BA766C 0C031AB1 */ jal Graph_OpenDisp /* 00590 80BA7670 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00594 80BA7674 0C024F61 */ jal func_80093D84 /* 00598 80BA7678 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -129,7 +129,7 @@ glabel OceffStorm_Draw /* 00750 80BA7830 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00754 80BA7834 24C68C70 */ addiu $a2, $a2, %lo(D_80BA8C70) ## $a2 = 80BA8C70 /* 00758 80BA7838 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 -/* 0075C 80BA783C 0C031AD5 */ jal func_800C6B54 +/* 0075C 80BA783C 0C031AD5 */ jal Graph_CloseDisp /* 00760 80BA7840 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 00764 80BA7844 8FA40088 */ lw $a0, 0x0088($sp) /* 00768 80BA7848 0C2E9D14 */ jal func_80BA7450 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s index 3e33e2d3c7..1baa1bd308 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s @@ -11,7 +11,7 @@ glabel func_80BA7450 /* 00394 80BA7474 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00398 80BA7478 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 0039C 80BA747C 240701C1 */ addiu $a3, $zero, 0x01C1 ## $a3 = 000001C1 -/* 003A0 80BA7480 0C031AB1 */ jal func_800C6AC4 +/* 003A0 80BA7480 0C031AB1 */ jal Graph_OpenDisp /* 003A4 80BA7484 AFA50074 */ sw $a1, 0x0074($sp) /* 003A8 80BA7488 8FA30074 */ lw $v1, 0x0074($sp) /* 003AC 80BA748C 3C0BE700 */ lui $t3, 0xE700 ## $t3 = E7000000 @@ -114,7 +114,7 @@ glabel func_80BA7450 /* 00530 80BA7610 24C68C34 */ addiu $a2, $a2, %lo(D_80BA8C34) ## $a2 = 80BA8C34 /* 00534 80BA7614 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 00538 80BA7618 240701DD */ addiu $a3, $zero, 0x01DD ## $a3 = 000001DD -/* 0053C 80BA761C 0C031AD5 */ jal func_800C6B54 +/* 0053C 80BA761C 0C031AD5 */ jal Graph_CloseDisp /* 00540 80BA7620 8D850000 */ lw $a1, 0x0000($t4) ## 00000008 /* 00544 80BA7624 8FBF0034 */ lw $ra, 0x0034($sp) /* 00548 80BA7628 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s index b03542b2dc..290c68e384 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s @@ -30,7 +30,7 @@ glabel OceffWipe_Draw /* 0018C 80BA8F1C 24C69AE0 */ addiu $a2, $a2, %lo(D_80BA9AE0) ## $a2 = 80BA9AE0 /* 00190 80BA8F20 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFB8 /* 00194 80BA8F24 2407015A */ addiu $a3, $zero, 0x015A ## $a3 = 0000015A -/* 00198 80BA8F28 0C031AB1 */ jal func_800C6AC4 +/* 00198 80BA8F28 0C031AB1 */ jal Graph_OpenDisp /* 0019C 80BA8F2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 001A0 80BA8F30 8FAA00B8 */ lw $t2, 0x00B8($sp) /* 001A4 80BA8F34 8542014C */ lh $v0, 0x014C($t2) ## 0000014C @@ -258,7 +258,7 @@ glabel OceffWipe_Draw /* 004FC 80BA928C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00500 80BA9290 24C69B08 */ addiu $a2, $a2, %lo(D_80BA9B08) ## $a2 = 80BA9B08 /* 00504 80BA9294 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFB8 -/* 00508 80BA9298 0C031AD5 */ jal func_800C6B54 +/* 00508 80BA9298 0C031AD5 */ jal Graph_CloseDisp /* 0050C 80BA929C 2407018E */ addiu $a3, $zero, 0x018E ## $a3 = 0000018E /* 00510 80BA92A0 8FBF003C */ lw $ra, 0x003C($sp) /* 00514 80BA92A4 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s index 8c62a32046..7d83f0a0aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s @@ -90,7 +90,7 @@ glabel OceffWipe2_Draw /* 00268 80BA9E18 24C6B2C0 */ addiu $a2, $a2, %lo(D_80BAB2C0) ## $a2 = 80BAB2C0 /* 0026C 80BA9E1C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 /* 00270 80BA9E20 24070186 */ addiu $a3, $zero, 0x0186 ## $a3 = 00000186 -/* 00274 80BA9E24 0C031AB1 */ jal func_800C6AC4 +/* 00274 80BA9E24 0C031AB1 */ jal Graph_OpenDisp /* 00278 80BA9E28 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0027C 80BA9E2C 0C024F61 */ jal func_80093D84 /* 00280 80BA9E30 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -204,7 +204,7 @@ glabel OceffWipe2_Draw /* 00430 80BA9FE0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00434 80BA9FE4 24C6B2E8 */ addiu $a2, $a2, %lo(D_80BAB2E8) ## $a2 = 80BAB2E8 /* 00438 80BA9FE8 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 -/* 0043C 80BA9FEC 0C031AD5 */ jal func_800C6B54 +/* 0043C 80BA9FEC 0C031AD5 */ jal Graph_CloseDisp /* 00440 80BA9FF0 240701A1 */ addiu $a3, $zero, 0x01A1 ## $a3 = 000001A1 /* 00444 80BA9FF4 8FBF003C */ lw $ra, 0x003C($sp) /* 00448 80BA9FF8 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s index 220c46dcc5..1ab877daae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s @@ -90,7 +90,7 @@ glabel OceffWipe3_Draw /* 00268 80BAB658 24C6CAE0 */ addiu $a2, $a2, %lo(D_80BACAE0) ## $a2 = 80BACAE0 /* 0026C 80BAB65C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 /* 00270 80BAB660 24070157 */ addiu $a3, $zero, 0x0157 ## $a3 = 00000157 -/* 00274 80BAB664 0C031AB1 */ jal func_800C6AC4 +/* 00274 80BAB664 0C031AB1 */ jal Graph_OpenDisp /* 00278 80BAB668 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0027C 80BAB66C 0C024F61 */ jal func_80093D84 /* 00280 80BAB670 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -206,7 +206,7 @@ glabel OceffWipe3_Draw /* 00438 80BAB828 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 0043C 80BAB82C 24C6CB08 */ addiu $a2, $a2, %lo(D_80BACB08) ## $a2 = 80BACB08 /* 00440 80BAB830 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 -/* 00444 80BAB834 0C031AD5 */ jal func_800C6B54 +/* 00444 80BAB834 0C031AD5 */ jal Graph_CloseDisp /* 00448 80BAB838 24070172 */ addiu $a3, $zero, 0x0172 ## $a3 = 00000172 /* 0044C 80BAB83C 8FBF003C */ lw $ra, 0x003C($sp) /* 00450 80BAB840 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s index 35839fb805..5aafb02f1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s @@ -88,7 +88,7 @@ glabel OceffWipe4_Draw /* 00238 80BACE48 24C6DB80 */ addiu $a2, $a2, %lo(D_80BADB80) ## $a2 = 80BADB80 /* 0023C 80BACE4C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 /* 00240 80BACE50 2407013A */ addiu $a3, $zero, 0x013A ## $a3 = 0000013A -/* 00244 80BACE54 0C031AB1 */ jal func_800C6AC4 +/* 00244 80BACE54 0C031AB1 */ jal Graph_OpenDisp /* 00248 80BACE58 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0024C 80BACE5C 0C024F61 */ jal func_80093D84 /* 00250 80BACE60 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -207,7 +207,7 @@ glabel OceffWipe4_Draw /* 0040C 80BAD01C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00410 80BAD020 24C6DBA8 */ addiu $a2, $a2, %lo(D_80BADBA8) ## $a2 = 80BADBA8 /* 00414 80BAD024 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 -/* 00418 80BAD028 0C031AD5 */ jal func_800C6B54 +/* 00418 80BAD028 0C031AD5 */ jal Graph_CloseDisp /* 0041C 80BAD02C 24070158 */ addiu $a3, $zero, 0x0158 ## $a3 = 00000158 /* 00420 80BAD030 8FBF003C */ lw $ra, 0x003C($sp) /* 00424 80BAD034 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s index a30e661109..7cf839034c 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s @@ -15,7 +15,7 @@ glabel func_80813820 /* 00034 80813854 AFB00020 */ sw $s0, 0x0020($sp) /* 00038 80813858 24C6F420 */ addiu $a2, $a2, %lo(D_8082F420) ## $a2 = 8082F420 /* 0003C 8081385C 27A401F4 */ addiu $a0, $sp, 0x01F4 ## $a0 = FFFFFFC4 -/* 00040 80813860 0C031AB1 */ jal func_800C6AC4 +/* 00040 80813860 0C031AB1 */ jal Graph_OpenDisp /* 00044 80813864 240700F8 */ addiu $a3, $zero, 0x00F8 ## $a3 = 000000F8 /* 00048 80813868 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0004C 8081386C 34210760 */ ori $at, $at, 0x0760 ## $at = 00010760 @@ -2485,7 +2485,7 @@ glabel func_80813820 /* 02464 80815C84 24C6F4A0 */ addiu $a2, $a2, %lo(D_8082F4A0) ## $a2 = 8082F4A0 /* 02468 80815C88 27A401F4 */ addiu $a0, $sp, 0x01F4 ## $a0 = FFFFFFC4 /* 0246C 80815C8C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02470 80815C90 0C031AD5 */ jal func_800C6B54 +/* 02470 80815C90 0C031AD5 */ jal Graph_CloseDisp /* 02474 80815C94 2407035F */ addiu $a3, $zero, 0x035F ## $a3 = 0000035F /* 02478 80815C98 8FBF0044 */ lw $ra, 0x0044($sp) /* 0247C 80815C9C 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s index 075bad78d9..415bc4e40f 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s @@ -10,7 +10,7 @@ glabel func_80815FD4 /* 027D4 80815FF4 24C6F594 */ addiu $a2, $a2, %lo(D_8082F594) ## $a2 = 8082F594 /* 027D8 80815FF8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC /* 027DC 80815FFC 240700D0 */ addiu $a3, $zero, 0x00D0 ## $a3 = 000000D0 -/* 027E0 80816000 0C031AB1 */ jal func_800C6AC4 +/* 027E0 80816000 0C031AB1 */ jal Graph_OpenDisp /* 027E4 80816004 AFA50054 */ sw $a1, 0x0054($sp) /* 027E8 80816008 8FA30054 */ lw $v1, 0x0054($sp) /* 027EC 8081600C 8FA50060 */ lw $a1, 0x0060($sp) @@ -111,7 +111,7 @@ glabel func_80815FD4 /* 02968 80816188 24C6F5AC */ addiu $a2, $a2, %lo(D_8082F5AC) ## $a2 = 8082F5AC /* 0296C 8081618C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC /* 02970 80816190 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 02974 80816194 0C031AD5 */ jal func_800C6B54 +/* 02974 80816194 0C031AD5 */ jal Graph_CloseDisp /* 02978 80816198 8D050000 */ lw $a1, 0x0000($t0) ## 00000008 /* 0297C 8081619C 8FBF0014 */ lw $ra, 0x0014($sp) /* 02980 808161A0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s index e8ef45baaf..834f25c612 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s @@ -20,7 +20,7 @@ glabel func_808161AC /* 029D4 808161F4 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFC4 /* 029D8 808161F8 24C6F5C4 */ addiu $a2, $a2, %lo(D_8082F5C4) ## $a2 = 8082F5C4 /* 029DC 808161FC 24070192 */ addiu $a3, $zero, 0x0192 ## $a3 = 00000192 -/* 029E0 80816200 0C031AB1 */ jal func_800C6AC4 +/* 029E0 80816200 0C031AB1 */ jal Graph_OpenDisp /* 029E4 80816204 AFA500C4 */ sw $a1, 0x00C4($sp) /* 029E8 80816208 8FA200F0 */ lw $v0, 0x00F0($sp) /* 029EC 8081620C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -86,7 +86,7 @@ glabel func_808161AC /* 02ADC 808162FC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 02AE0 80816300 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02AE4 80816304 8CB002C0 */ lw $s0, 0x02C0($a1) ## 000002C0 -/* 02AE8 80816308 0C031B08 */ jal func_800C6C20 +/* 02AE8 80816308 0C031B08 */ jal Graph_GfxPlusOne /* 02AEC 8081630C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02AF0 80816310 8FA500C4 */ lw $a1, 0x00C4($sp) /* 02AF4 80816314 AFA200E4 */ sw $v0, 0x00E4($sp) @@ -106,7 +106,7 @@ glabel func_808161AC /* 02B2C 8081634C AFAC00E4 */ sw $t4, 0x00E4($sp) /* 02B30 80816350 AD600004 */ sw $zero, 0x0004($t3) ## 00000004 /* 02B34 80816354 AD6D0000 */ sw $t5, 0x0000($t3) ## 00000000 -/* 02B38 80816358 0C031B0A */ jal func_800C6C28 +/* 02B38 80816358 0C031B0A */ jal Graph_BranchDlist /* 02B3C 8081635C 8FA500E4 */ lw $a1, 0x00E4($sp) /* 02B40 80816360 8FAE00E4 */ lw $t6, 0x00E4($sp) /* 02B44 80816364 8FA800C4 */ lw $t0, 0x00C4($sp) @@ -1891,7 +1891,7 @@ glabel func_808161AC /* 044F0 80817D10 8FAA00F0 */ lw $t2, 0x00F0($sp) .L80817D14: /* 044F4 80817D14 2407035D */ addiu $a3, $zero, 0x035D ## $a3 = 0000035D -/* 044F8 80817D18 0C031AD5 */ jal func_800C6B54 +/* 044F8 80817D18 0C031AD5 */ jal Graph_CloseDisp /* 044FC 80817D1C 8D450000 */ lw $a1, 0x0000($t2) ## F682A21C /* 04500 80817D20 8FBF003C */ lw $ra, 0x003C($sp) /* 04504 80817D24 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s index 76ce01b96c..ea644a0dc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s @@ -10,7 +10,7 @@ glabel func_80817D50 /* 04550 80817D70 24C6F600 */ addiu $a2, $a2, %lo(D_8082F600) ## $a2 = 8082F600 /* 04554 80817D74 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFC8 /* 04558 80817D78 24070044 */ addiu $a3, $zero, 0x0044 ## $a3 = 00000044 -/* 0455C 80817D7C 0C031AB1 */ jal func_800C6AC4 +/* 0455C 80817D7C 0C031AB1 */ jal Graph_OpenDisp /* 04560 80817D80 AFA500B0 */ sw $a1, 0x00B0($sp) /* 04564 80817D84 8FA800B0 */ lw $t0, 0x00B0($sp) /* 04568 80817D88 8FAA00E0 */ lw $t2, 0x00E0($sp) @@ -279,7 +279,7 @@ glabel func_80817D50 /* 04958 80818178 24C6F61C */ addiu $a2, $a2, %lo(D_8082F61C) ## $a2 = 8082F61C /* 0495C 8081817C 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFC8 /* 04960 80818180 2407007A */ addiu $a3, $zero, 0x007A ## $a3 = 0000007A -/* 04964 80818184 0C031AD5 */ jal func_800C6B54 +/* 04964 80818184 0C031AD5 */ jal Graph_CloseDisp /* 04968 80818188 8F250000 */ lw $a1, 0x0000($t9) ## F2000000 /* 0496C 8081818C 8FBF0014 */ lw $ra, 0x0014($sp) /* 04970 80818190 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s index 431ed3deb9..f67f66a983 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s @@ -16,7 +16,7 @@ glabel func_80818340 /* 04B58 80818378 24C6F638 */ addiu $a2, $a2, %lo(D_8082F638) ## $a2 = 8082F638 /* 04B5C 8081837C 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFC4 /* 04B60 80818380 240700DB */ addiu $a3, $zero, 0x00DB ## $a3 = 000000DB -/* 04B64 80818384 0C031AB1 */ jal func_800C6AC4 +/* 04B64 80818384 0C031AB1 */ jal Graph_OpenDisp /* 04B68 80818388 AFA500AC */ sw $a1, 0x00AC($sp) /* 04B6C 8081838C 8FA500AC */ lw $a1, 0x00AC($sp) /* 04B70 80818390 3C17E700 */ lui $s7, 0xE700 ## $s7 = E7000000 @@ -1443,7 +1443,7 @@ glabel func_80818340 /* 0603C 8081985C 24C6F6E8 */ addiu $a2, $a2, %lo(D_8082F6E8) ## $a2 = 8082F6E8 /* 06040 80819860 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFC4 /* 06044 80819864 24070261 */ addiu $a3, $zero, 0x0261 ## $a3 = 00000261 -/* 06048 80819868 0C031AD5 */ jal func_800C6B54 +/* 06048 80819868 0C031AD5 */ jal Graph_CloseDisp /* 0604C 8081986C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 06050 80819870 8FBF0044 */ lw $ra, 0x0044($sp) /* 06054 80819874 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s index 11b6a6d506..cb90ef91d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s @@ -7,7 +7,7 @@ glabel func_808198A0 /* 06094 808198B4 24C6F710 */ addiu $a2, $a2, %lo(D_8082F710) ## $a2 = 8082F710 /* 06098 808198B8 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 0609C 808198BC AFA5009C */ sw $a1, 0x009C($sp) -/* 060A0 808198C0 0C031AB1 */ jal func_800C6AC4 +/* 060A0 808198C0 0C031AB1 */ jal Graph_OpenDisp /* 060A4 808198C4 24070045 */ addiu $a3, $zero, 0x0045 ## $a3 = 00000045 /* 060A8 808198C8 87A900A2 */ lh $t1, 0x00A2($sp) /* 060AC 808198CC 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 @@ -357,7 +357,7 @@ glabel func_808198A0 /* 065D0 80819DF0 24180602 */ addiu $t8, $zero, 0x0602 ## $t8 = 00000602 /* 065D4 80819DF4 24C6F724 */ addiu $a2, $a2, %lo(D_8082F724) ## $a2 = 8082F724 /* 065D8 80819DF8 AC580004 */ sw $t8, 0x0004($v0) ## 80127200 -/* 065DC 80819DFC 0C031AD5 */ jal func_800C6B54 +/* 065DC 80819DFC 0C031AD5 */ jal Graph_CloseDisp /* 065E0 80819E00 AC4F0000 */ sw $t7, 0x0000($v0) ## 801271FC /* 065E4 80819E04 8FBF0014 */ lw $ra, 0x0014($sp) /* 065E8 80819E08 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s index e9d24490d6..f4601c7842 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s @@ -13,7 +13,7 @@ glabel func_80819E6C /* 06678 80819E98 24C6F738 */ addiu $a2, $a2, %lo(D_8082F738) ## $a2 = 8082F738 /* 0667C 80819E9C 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFD0 /* 06680 80819EA0 240700EA */ addiu $a3, $zero, 0x00EA ## $a3 = 000000EA -/* 06684 80819EA4 0C031AB1 */ jal func_800C6AC4 +/* 06684 80819EA4 0C031AB1 */ jal Graph_OpenDisp /* 06688 80819EA8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 0668C 80819EAC 8FAF00B8 */ lw $t7, 0x00B8($sp) /* 06690 80819EB0 0C02526A */ jal func_800949A8 @@ -1012,7 +1012,7 @@ glabel func_80819E6C /* 074EC 8081AD0C 24C6F7D8 */ addiu $a2, $a2, %lo(D_8082F7D8) ## $a2 = 8082F7D8 /* 074F0 8081AD10 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFD0 /* 074F4 8081AD14 24070204 */ addiu $a3, $zero, 0x0204 ## $a3 = 00000204 -/* 074F8 8081AD18 0C031AD5 */ jal func_800C6B54 +/* 074F8 8081AD18 0C031AD5 */ jal Graph_CloseDisp /* 074FC 8081AD1C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 07500 8081AD20 8FBF0034 */ lw $ra, 0x0034($sp) /* 07504 8081AD24 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s index 63a49523d0..6fd379fdb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s @@ -9,7 +9,7 @@ glabel func_8081BB10 /* 0830C 8081BB2C AFB10024 */ sw $s1, 0x0024($sp) /* 08310 8081BB30 24C6F9C0 */ addiu $a2, $a2, %lo(D_8082F9C0) ## $a2 = 8082F9C0 /* 08314 8081BB34 27A401C4 */ addiu $a0, $sp, 0x01C4 ## $a0 = FFFFFFD4 -/* 08318 8081BB38 0C031AB1 */ jal func_800C6AC4 +/* 08318 8081BB38 0C031AB1 */ jal Graph_OpenDisp /* 0831C 8081BB3C 2407007B */ addiu $a3, $zero, 0x007B ## $a3 = 0000007B /* 08320 8081BB40 8FB101F0 */ lw $s1, 0x01F0($sp) /* 08324 8081BB44 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -1617,7 +1617,7 @@ glabel func_8081BB10 /* 09B4C 8081D36C ACD80004 */ sw $t8, 0x0004($a2) ## 80830004 /* 09B50 8081D370 ACC90000 */ sw $t1, 0x0000($a2) ## 80830000 /* 09B54 8081D374 3C068083 */ lui $a2, %hi(D_8082FA10) ## $a2 = 80830000 -/* 09B58 8081D378 0C031AD5 */ jal func_800C6B54 +/* 09B58 8081D378 0C031AD5 */ jal Graph_CloseDisp /* 09B5C 8081D37C 24C6FA10 */ addiu $a2, $a2, %lo(D_8082FA10) ## $a2 = 8082FA10 /* 09B60 8081D380 8FBF002C */ lw $ra, 0x002C($sp) /* 09B64 8081D384 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s index ebf2d7cdde..4964535d51 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s @@ -19,7 +19,7 @@ glabel func_8081D398 /* 09BBC 8081D3DC 24C6FA28 */ addiu $a2, $a2, %lo(D_8082FA28) ## $a2 = 8082FA28 /* 09BC0 8081D3E0 AFB60284 */ sw $s6, 0x0284($sp) /* 09BC4 8081D3E4 27A40260 */ addiu $a0, $sp, 0x0260 ## $a0 = FFFFFFD8 -/* 09BC8 8081D3E8 0C031AB1 */ jal func_800C6AC4 +/* 09BC8 8081D3E8 0C031AB1 */ jal Graph_OpenDisp /* 09BCC 8081D3EC 2407022C */ addiu $a3, $zero, 0x022C ## $a3 = 0000022C /* 09BD0 8081D3F0 96CE01D4 */ lhu $t6, 0x01D4($s6) ## 000001D4 /* 09BD4 8081D3F4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 @@ -1897,7 +1897,7 @@ glabel func_8081D398 /* 0B78C 8081EFAC ACC00004 */ sw $zero, 0x0004($a2) ## 00000004 /* 0B790 8081EFB0 ACC30000 */ sw $v1, 0x0000($a2) ## 00000000 /* 0B794 8081EFB4 3C068083 */ lui $a2, %hi(D_8082FA40) ## $a2 = 80830000 -/* 0B798 8081EFB8 0C031AD5 */ jal func_800C6B54 +/* 0B798 8081EFB8 0C031AD5 */ jal Graph_CloseDisp /* 0B79C 8081EFBC 24C6FA40 */ addiu $a2, $a2, %lo(D_8082FA40) ## $a2 = 8082FA40 /* 0B7A0 8081EFC0 8FBF005C */ lw $ra, 0x005C($sp) /* 0B7A4 8081EFC4 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s index e32ba5fba6..6930a45a26 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s @@ -10,10 +10,10 @@ glabel func_8081F1F0 /* 0B9F0 8081F210 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 /* 0B9F4 8081F214 240701F0 */ addiu $a3, $zero, 0x01F0 ## $a3 = 000001F0 /* 0B9F8 8081F218 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0B9FC 8081F21C 0C031AB1 */ jal func_800C6AC4 +/* 0B9FC 8081F21C 0C031AB1 */ jal Graph_OpenDisp /* 0BA00 8081F220 AFAF004C */ sw $t7, 0x004C($sp) /* 0BA04 8081F224 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 -/* 0BA08 8081F228 0C031B08 */ jal func_800C6C20 +/* 0BA08 8081F228 0C031B08 */ jal Graph_GfxPlusOne /* 0BA0C 8081F22C AFA40050 */ sw $a0, 0x0050($sp) /* 0BA10 8081F230 AFA20054 */ sw $v0, 0x0054($sp) /* 0BA14 8081F234 8E0301BC */ lw $v1, 0x01BC($s0) ## 000001BC @@ -45,7 +45,7 @@ glabel func_8081F1F0 /* 0BA7C 8081F29C AD200004 */ sw $zero, 0x0004($t1) ## 00000004 /* 0BA80 8081F2A0 AD2B0000 */ sw $t3, 0x0000($t1) ## 00000000 /* 0BA84 8081F2A4 8FA50054 */ lw $a1, 0x0054($sp) -/* 0BA88 8081F2A8 0C031B0A */ jal func_800C6C28 +/* 0BA88 8081F2A8 0C031B0A */ jal Graph_BranchDlist /* 0BA8C 8081F2AC 8FA40050 */ lw $a0, 0x0050($sp) /* 0BA90 8081F2B0 8FAC0054 */ lw $t4, 0x0054($sp) /* 0BA94 8081F2B4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 @@ -59,7 +59,7 @@ glabel func_8081F1F0 /* 0BAB4 8081F2D4 35AE0001 */ ori $t6, $t5, 0x0001 ## $t6 = 00000001 /* 0BAB8 8081F2D8 A46E0116 */ sh $t6, 0x0116($v1) ## 80160116 /* 0BABC 8081F2DC 8FAF0058 */ lw $t7, 0x0058($sp) -/* 0BAC0 8081F2E0 0C031AD5 */ jal func_800C6B54 +/* 0BAC0 8081F2E0 0C031AD5 */ jal Graph_CloseDisp /* 0BAC4 8081F2E4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 0BAC8 8081F2E8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0BACC 8081F2EC 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s index c25e0c4431..8e8218851d 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s @@ -10,7 +10,7 @@ glabel func_8081F87C /* 0C07C 8081F89C 24C6FA98 */ addiu $a2, $a2, %lo(D_8082FA98) ## $a2 = 8082FA98 /* 0C080 8081F8A0 240702EC */ addiu $a3, $zero, 0x02EC ## $a3 = 000002EC /* 0C084 8081F8A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C088 8081F8A8 0C031AB1 */ jal func_800C6AC4 +/* 0C088 8081F8A8 0C031AB1 */ jal Graph_OpenDisp /* 0C08C 8081F8AC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFEC /* 0C090 8081F8B0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0C094 8081F8B4 3C0FFD18 */ lui $t7, 0xFD18 ## $t7 = FD180000 @@ -144,7 +144,7 @@ glabel func_8081F87C /* 0C274 8081FA94 24C6FAB4 */ addiu $a2, $a2, %lo(D_8082FAB4) ## $a2 = 8082FAB4 /* 0C278 8081FA98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0C27C 8081FA9C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0C280 8081FAA0 0C031AD5 */ jal func_800C6B54 +/* 0C280 8081FAA0 0C031AD5 */ jal Graph_CloseDisp /* 0C284 8081FAA4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0C288 8081FAA8 8FBF001C */ lw $ra, 0x001C($sp) /* 0C28C 8081FAAC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s index eb66040fde..e7548fe89c 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s @@ -8,7 +8,7 @@ glabel func_8081FE30 /* 0C628 8081FE48 24C6FAEC */ addiu $a2, $a2, %lo(D_8082FAEC) ## $a2 = 8082FAEC /* 0C62C 8081FE4C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 0C630 8081FE50 240703BB */ addiu $a3, $zero, 0x03BB ## $a3 = 000003BB -/* 0C634 8081FE54 0C031AB1 */ jal func_800C6AC4 +/* 0C634 8081FE54 0C031AB1 */ jal Graph_OpenDisp /* 0C638 8081FE58 AFA50074 */ sw $a1, 0x0074($sp) /* 0C63C 8081FE5C 8FA50080 */ lw $a1, 0x0080($sp) /* 0C640 8081FE60 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -216,7 +216,7 @@ glabel func_8081FE30 /* 0C948 80820168 3C068083 */ lui $a2, %hi(D_8082FB08) ## $a2 = 80830000 /* 0C94C 8082016C 24C6FB08 */ addiu $a2, $a2, %lo(D_8082FB08) ## $a2 = 8082FB08 /* 0C950 80820170 240703D9 */ addiu $a3, $zero, 0x03D9 ## $a3 = 000003D9 -/* 0C954 80820174 0C031AD5 */ jal func_800C6B54 +/* 0C954 80820174 0C031AD5 */ jal Graph_CloseDisp /* 0C958 80820178 8F250000 */ lw $a1, 0x0000($t9) ## E7000000 /* 0C95C 8082017C 8FBF0014 */ lw $ra, 0x0014($sp) /* 0C960 80820180 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s index 12a004a41c..ffc9e04974 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s @@ -8,7 +8,7 @@ glabel func_80820434 /* 0CC2C 8082044C AFB10020 */ sw $s1, 0x0020($sp) /* 0CC30 80820450 24C6FB24 */ addiu $a2, $a2, %lo(D_8082FB24) ## $a2 = 8082FB24 /* 0CC34 80820454 27A400F8 */ addiu $a0, $sp, 0x00F8 ## $a0 = FFFFFFE0 -/* 0CC38 80820458 0C031AB1 */ jal func_800C6AC4 +/* 0CC38 80820458 0C031AB1 */ jal Graph_OpenDisp /* 0CC3C 8082045C 2407044C */ addiu $a3, $zero, 0x044C ## $a3 = 0000044C /* 0CC40 80820460 8FB10118 */ lw $s1, 0x0118($sp) /* 0CC44 80820464 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -1587,7 +1587,7 @@ glabel func_80820434 /* 0E3C8 80821BE8 24C6FC3C */ addiu $a2, $a2, %lo(D_8082FC3C) ## $a2 = 8082FC3C /* 0E3CC 80821BEC 27A400F8 */ addiu $a0, $sp, 0x00F8 ## $a0 = FFFFFFE0 /* 0E3D0 80821BF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0E3D4 80821BF4 0C031AD5 */ jal func_800C6B54 +/* 0E3D4 80821BF4 0C031AD5 */ jal Graph_CloseDisp /* 0E3D8 80821BF8 24070629 */ addiu $a3, $zero, 0x0629 ## $a3 = 00000629 /* 0E3DC 80821BFC 8FBF0024 */ lw $ra, 0x0024($sp) /* 0E3E0 80821C00 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s index 78cac2313b..f85e391df0 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s @@ -7,7 +7,7 @@ glabel func_80821C10 /* 0E404 80821C24 24C6FC58 */ addiu $a2, $a2, %lo(D_8082FC58) ## $a2 = 8082FC58 /* 0E408 80821C28 27A400E0 */ addiu $a0, $sp, 0x00E0 ## $a0 = FFFFFFD8 /* 0E40C 80821C2C 2407068C */ addiu $a3, $zero, 0x068C ## $a3 = 0000068C -/* 0E410 80821C30 0C031AB1 */ jal func_800C6AC4 +/* 0E410 80821C30 0C031AB1 */ jal Graph_OpenDisp /* 0E414 80821C34 AFA500F0 */ sw $a1, 0x00F0($sp) /* 0E418 80821C38 3C0D8083 */ lui $t5, %hi(D_8082AE04) ## $t5 = 80830000 /* 0E41C 80821C3C 85ADAE04 */ lh $t5, %lo(D_8082AE04)($t5) @@ -1667,7 +1667,7 @@ glabel func_80821C10 /* 0FD04 80823524 24C6FCC8 */ addiu $a2, $a2, %lo(D_8082FCC8) ## $a2 = 8082FCC8 /* 0FD08 80823528 27A400E0 */ addiu $a0, $sp, 0x00E0 ## $a0 = FFFFFFD8 /* 0FD0C 8082352C 240707F0 */ addiu $a3, $zero, 0x07F0 ## $a3 = 000007F0 -/* 0FD10 80823530 0C031AD5 */ jal func_800C6B54 +/* 0FD10 80823530 0C031AD5 */ jal Graph_CloseDisp /* 0FD14 80823534 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 0FD18 80823538 8FBF001C */ lw $ra, 0x001C($sp) /* 0FD1C 8082353C 27BD0108 */ addiu $sp, $sp, 0x0108 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s index 2718c46a0d..bcc96edc68 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s @@ -7,7 +7,7 @@ glabel func_80825C14 /* 12408 80825C28 24C6FD40 */ addiu $a2, $a2, %lo(D_8082FD40) ## $a2 = 8082FD40 /* 1240C 80825C2C 27A400C8 */ addiu $a0, $sp, 0x00C8 ## $a0 = FFFFFFE8 /* 12410 80825C30 24070C32 */ addiu $a3, $zero, 0x0C32 ## $a3 = 00000C32 -/* 12414 80825C34 0C031AB1 */ jal func_800C6AC4 +/* 12414 80825C34 0C031AB1 */ jal Graph_OpenDisp /* 12418 80825C38 AFA500DC */ sw $a1, 0x00DC($sp) /* 1241C 80825C3C 0C025131 */ jal func_800944C4 /* 12420 80825C40 8FA400DC */ lw $a0, 0x00DC($sp) @@ -418,7 +418,7 @@ glabel func_80825C14 /* 12A74 80826294 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 12A78 80826298 ACB902C0 */ sw $t9, 0x02C0($a1) ## 000002C0 /* 12A7C 8082629C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 12A80 808262A0 0C031AD5 */ jal func_800C6B54 +/* 12A80 808262A0 0C031AD5 */ jal Graph_CloseDisp /* 12A84 808262A4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 12A88 808262A8 8FBF0014 */ lw $ra, 0x0014($sp) /* 12A8C 808262AC 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s index c45709debc..849bb9fd4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s @@ -9,7 +9,7 @@ glabel func_808262B8 /* 12AB4 808262D4 24C6FD78 */ addiu $a2, $a2, %lo(D_8082FD78) ## $a2 = 8082FD78 /* 12AB8 808262D8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 12ABC 808262DC 24070C74 */ addiu $a3, $zero, 0x0C74 ## $a3 = 00000C74 -/* 12AC0 808262E0 0C031AB1 */ jal func_800C6AC4 +/* 12AC0 808262E0 0C031AB1 */ jal Graph_OpenDisp /* 12AC4 808262E4 AFA50058 */ sw $a1, 0x0058($sp) /* 12AC8 808262E8 26220014 */ addiu $v0, $s1, 0x0014 ## $v0 = 00000014 /* 12ACC 808262EC 804E0014 */ lb $t6, 0x0014($v0) ## 00000028 @@ -147,7 +147,7 @@ glabel func_808262B8 /* 12CC4 808264E4 24C6FD94 */ addiu $a2, $a2, %lo(D_8082FD94) ## $a2 = 8082FD94 /* 12CC8 808264E8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 12CCC 808264EC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 12CD0 808264F0 0C031AD5 */ jal func_800C6B54 +/* 12CD0 808264F0 0C031AD5 */ jal Graph_CloseDisp /* 12CD4 808264F4 24070CB6 */ addiu $a3, $zero, 0x0CB6 ## $a3 = 00000CB6 /* 12CD8 808264F8 8FBF001C */ lw $ra, 0x001C($sp) /* 12CDC 808264FC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s index 0544a45713..39026616fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s @@ -31,7 +31,7 @@ glabel func_808299A0 /* 161F4 80829A14 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFD8 /* 161F8 80829A18 240700B6 */ addiu $a3, $zero, 0x00B6 ## $a3 = 000000B6 /* 161FC 80829A1C 01C99821 */ addu $s3, $t6, $t1 -/* 16200 80829A20 0C031AB1 */ jal func_800C6AC4 +/* 16200 80829A20 0C031AB1 */ jal Graph_OpenDisp /* 16204 80829A24 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 16208 80829A28 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 1620C 80829A2C 3C178083 */ lui $s7, %hi(D_80830530) ## $s7 = 80830000 @@ -417,7 +417,7 @@ glabel L80829C28 /* 1679C 80829FBC 24C605A8 */ addiu $a2, $a2, %lo(D_808305A8) ## $a2 = 808305A8 /* 167A0 80829FC0 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFD8 /* 167A4 80829FC4 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 167A8 80829FC8 0C031AD5 */ jal func_800C6B54 +/* 167A8 80829FC8 0C031AD5 */ jal Graph_CloseDisp /* 167AC 80829FCC 2407011E */ addiu $a3, $zero, 0x011E ## $a3 = 0000011E /* 167B0 80829FD0 8FBF0054 */ lw $ra, 0x0054($sp) /* 167B4 80829FD4 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s index 21cfae6b8b..127eb08832 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s @@ -12,7 +12,7 @@ glabel func_8084A0E8 /* 17F00 8084A110 24C652A0 */ addiu $a2, $a2, %lo(D_808552A0) ## $a2 = 808552A0 /* 17F04 8084A114 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFEC /* 17F08 8084A118 24074B1C */ addiu $a3, $zero, 0x4B1C ## $a3 = 00004B1C -/* 17F0C 8084A11C 0C031AB1 */ jal func_800C6AC4 +/* 17F0C 8084A11C 0C031AB1 */ jal Graph_OpenDisp /* 17F10 8084A120 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 17F14 8084A124 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 17F18 8084A128 8FA5009C */ lw $a1, 0x009C($sp) @@ -312,7 +312,7 @@ glabel func_8084A0E8 /* 1838C 8084A59C 24C652E0 */ addiu $a2, $a2, %lo(D_808552E0) ## $a2 = 808552E0 /* 18390 8084A5A0 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFEC /* 18394 8084A5A4 24074B80 */ addiu $a3, $zero, 0x4B80 ## $a3 = 00004B80 -/* 18398 8084A5A8 0C031AD5 */ jal func_800C6B54 +/* 18398 8084A5A8 0C031AD5 */ jal Graph_CloseDisp /* 1839C 8084A5AC 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 /* 183A0 8084A5B0 8FBF003C */ lw $ra, 0x003C($sp) /* 183A4 8084A5B4 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s index 17f20e88c2..cc39cd76e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s @@ -9,7 +9,7 @@ glabel func_8084A5C4 /* 183D0 8084A5E0 24C652F0 */ addiu $a2, $a2, %lo(D_808552F0) ## $a2 = 808552F0 /* 183D4 8084A5E4 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFE4 /* 183D8 8084A5E8 24074B92 */ addiu $a3, $zero, 0x4B92 ## $a3 = 00004B92 -/* 183DC 8084A5EC 0C031AB1 */ jal func_800C6AC4 +/* 183DC 8084A5EC 0C031AB1 */ jal Graph_OpenDisp /* 183E0 8084A5F0 AFA500A4 */ sw $a1, 0x00A4($sp) /* 183E4 8084A5F4 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 /* 183E8 8084A5F8 3C198009 */ lui $t9, 0x8009 ## $t9 = 80090000 @@ -365,7 +365,7 @@ glabel func_8084A5C4 /* 1891C 8084AB2C 24C65310 */ addiu $a2, $a2, %lo(D_80855310) ## $a2 = 80855310 /* 18920 8084AB30 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFE4 /* 18924 8084AB34 24074C11 */ addiu $a3, $zero, 0x4C11 ## $a3 = 00004C11 -/* 18928 8084AB38 0C031AD5 */ jal func_800C6B54 +/* 18928 8084AB38 0C031AD5 */ jal Graph_CloseDisp /* 1892C 8084AB3C 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 18930 8084AB40 8FBF003C */ lw $ra, 0x003C($sp) /* 18934 8084AB44 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s index d7f8796e62..f39c252c1a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s @@ -11,7 +11,7 @@ glabel func_8099EF08 /* 0017C 8099EF2C 24C6F120 */ addiu $a2, $a2, %lo(D_8099F120) ## $a2 = 8099F120 /* 00180 8099EF30 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA0 /* 00184 8099EF34 240700AA */ addiu $a3, $zero, 0x00AA ## $a3 = 000000AA -/* 00188 8099EF38 0C031AB1 */ jal func_800C6AC4 +/* 00188 8099EF38 0C031AB1 */ jal Graph_OpenDisp /* 0018C 8099EF3C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00190 8099EF40 862F0052 */ lh $t7, 0x0052($s1) ## 00000052 /* 00194 8099EF44 3C01809A */ lui $at, %hi(D_8099F15C) ## $at = 809A0000 @@ -97,7 +97,7 @@ glabel func_8099EF08 /* 002D4 8099F084 8E2D0038 */ lw $t5, 0x0038($s1) ## 00000038 /* 002D8 8099F088 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 002DC 8099F08C 240700CC */ addiu $a3, $zero, 0x00CC ## $a3 = 000000CC -/* 002E0 8099F090 0C031AD5 */ jal func_800C6B54 +/* 002E0 8099F090 0C031AD5 */ jal Graph_CloseDisp /* 002E4 8099F094 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 002E8 8099F098 8FBF001C */ lw $ra, 0x001C($sp) /* 002EC 8099F09C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s index f2ce79afc1..a04cfb6698 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s @@ -10,7 +10,7 @@ glabel func_8099F274 /* 000E4 8099F294 24C6F5A0 */ addiu $a2, $a2, %lo(D_8099F5A0) ## $a2 = 8099F5A0 /* 000E8 8099F298 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFED8 /* 000EC 8099F29C 240700A8 */ addiu $a3, $zero, 0x00A8 ## $a3 = 000000A8 -/* 000F0 8099F2A0 0C031AB1 */ jal func_800C6AC4 +/* 000F0 8099F2A0 0C031AB1 */ jal Graph_OpenDisp /* 000F4 8099F2A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 000F8 8099F2A8 8FA20178 */ lw $v0, 0x0178($sp) /* 000FC 8099F2AC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -146,7 +146,7 @@ glabel func_8099F274 /* 00300 8099F4B0 24C6F5B4 */ addiu $a2, $a2, %lo(D_8099F5B4) ## $a2 = 8099F5B4 /* 00304 8099F4B4 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFED8 /* 00308 8099F4B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0030C 8099F4BC 0C031AD5 */ jal func_800C6B54 +/* 0030C 8099F4BC 0C031AD5 */ jal Graph_CloseDisp /* 00310 8099F4C0 240700D6 */ addiu $a3, $zero, 0x00D6 ## $a3 = 000000D6 /* 00314 8099F4C4 8FBF001C */ lw $ra, 0x001C($sp) /* 00318 8099F4C8 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s index b6950e83b8..b4236e0edd 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s @@ -11,7 +11,7 @@ glabel func_8099F748 /* 0011C 8099F76C 24C6FF20 */ addiu $a2, $a2, %lo(D_8099FF20) ## $a2 = 8099FF20 /* 00120 8099F770 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 00124 8099F774 2407012A */ addiu $a3, $zero, 0x012A ## $a3 = 0000012A -/* 00128 8099F778 0C031AB1 */ jal func_800C6AC4 +/* 00128 8099F778 0C031AB1 */ jal Graph_OpenDisp /* 0012C 8099F77C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00130 8099F780 860F0040 */ lh $t7, 0x0040($s0) ## 00000040 /* 00134 8099F784 3C01809A */ lui $at, %hi(D_8099FF84) ## $at = 809A0000 @@ -127,7 +127,7 @@ glabel func_8099F748 /* 002E8 8099F938 24C6FF34 */ addiu $a2, $a2, %lo(D_8099FF34) ## $a2 = 8099FF34 /* 002EC 8099F93C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 002F0 8099F940 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002F4 8099F944 0C031AD5 */ jal func_800C6B54 +/* 002F4 8099F944 0C031AD5 */ jal Graph_CloseDisp /* 002F8 8099F948 24070159 */ addiu $a3, $zero, 0x0159 ## $a3 = 00000159 /* 002FC 8099F94C 8FBF001C */ lw $ra, 0x001C($sp) /* 00300 8099F950 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s index b00d0fe954..402f5ce920 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s @@ -21,7 +21,7 @@ glabel func_8099F960 /* 0035C 8099F9AC 24C6FF48 */ addiu $a2, $a2, %lo(D_8099FF48) ## $a2 = 8099FF48 /* 00360 8099F9B0 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFE84 /* 00364 8099F9B4 24070182 */ addiu $a3, $zero, 0x0182 ## $a3 = 00000182 -/* 00368 8099F9B8 0C031AB1 */ jal func_800C6AC4 +/* 00368 8099F9B8 0C031AB1 */ jal Graph_OpenDisp /* 0036C 8099F9BC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 00370 8099F9C0 868F0040 */ lh $t7, 0x0040($s4) ## 00000040 /* 00374 8099F9C4 868E0054 */ lh $t6, 0x0054($s4) ## 00000054 @@ -205,7 +205,7 @@ glabel func_8099F960 /* 00634 8099FC84 24C6FF70 */ addiu $a2, $a2, %lo(D_8099FF70) ## $a2 = 8099FF70 /* 00638 8099FC88 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFE84 /* 0063C 8099FC8C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00640 8099FC90 0C031AD5 */ jal func_800C6B54 +/* 00640 8099FC90 0C031AD5 */ jal Graph_CloseDisp /* 00644 8099FC94 240701C8 */ addiu $a3, $zero, 0x01C8 ## $a3 = 000001C8 /* 00648 8099FC98 8FBF004C */ lw $ra, 0x004C($sp) /* 0064C 8099FC9C D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s index bfc273be8d..c8a8df9d6e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s @@ -18,7 +18,7 @@ glabel func_809A01CC /* 001CC 809A020C 2407009A */ addiu $a3, $zero, 0x009A ## $a3 = 0000009A /* 001D0 809A0210 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 001D4 809A0214 46083283 */ div.s $f10, $f6, $f8 -/* 001D8 809A0218 0C031AB1 */ jal func_800C6AC4 +/* 001D8 809A0218 0C031AB1 */ jal Graph_OpenDisp /* 001DC 809A021C E7AA0050 */ swc1 $f10, 0x0050($sp) /* 001E0 809A0220 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 001E4 809A0224 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 @@ -93,7 +93,7 @@ glabel func_809A01CC /* 002F8 809A0338 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 002FC 809A033C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00300 809A0340 240700B3 */ addiu $a3, $zero, 0x00B3 ## $a3 = 000000B3 -/* 00304 809A0344 0C031AD5 */ jal func_800C6B54 +/* 00304 809A0344 0C031AD5 */ jal Graph_CloseDisp /* 00308 809A0348 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0030C 809A034C 8FBF001C */ lw $ra, 0x001C($sp) /* 00310 809A0350 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s index 65d6cdd0c9..ae24c51cc4 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s @@ -20,7 +20,7 @@ glabel func_809A0698 /* 00190 809A06E0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFED8 /* 00194 809A06E4 24070114 */ addiu $a3, $zero, 0x0114 ## $a3 = 00000114 /* 00198 809A06E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0019C 809A06EC 0C031AB1 */ jal func_800C6AC4 +/* 0019C 809A06EC 0C031AB1 */ jal Graph_OpenDisp /* 001A0 809A06F0 AFA9005C */ sw $t1, 0x005C($sp) /* 001A4 809A06F4 8FA40168 */ lw $a0, 0x0168($sp) /* 001A8 809A06F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -151,7 +151,7 @@ glabel func_809A0698 /* 00394 809A08E4 24C60A28 */ addiu $a2, $a2, %lo(D_809A0A28) ## $a2 = 809A0A28 /* 00398 809A08E8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFED8 /* 0039C 809A08EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 003A0 809A08F0 0C031AD5 */ jal func_800C6B54 +/* 003A0 809A08F0 0C031AD5 */ jal Graph_CloseDisp /* 003A4 809A08F4 2407014A */ addiu $a3, $zero, 0x014A ## $a3 = 0000014A /* 003A8 809A08F8 8FBF001C */ lw $ra, 0x001C($sp) /* 003AC 809A08FC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s index e99d386497..ac2fc88868 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s @@ -11,7 +11,7 @@ glabel func_809A0BB8 /* 0013C 809A0BDC 24C60F50 */ addiu $a2, $a2, %lo(D_809A0F50) ## $a2 = 809A0F50 /* 00140 809A0BE0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFF20 /* 00144 809A0BE4 240700C9 */ addiu $a3, $zero, 0x00C9 ## $a3 = 000000C9 -/* 00148 809A0BE8 0C031AB1 */ jal func_800C6AC4 +/* 00148 809A0BE8 0C031AB1 */ jal Graph_OpenDisp /* 0014C 809A0BEC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00150 809A0BF0 860F0040 */ lh $t7, 0x0040($s0) ## 00000040 /* 00154 809A0BF4 3C01809A */ lui $at, %hi(D_809A0F80) ## $at = 809A0000 @@ -120,7 +120,7 @@ glabel func_809A0BB8 /* 002EC 809A0D8C 24C60F68 */ addiu $a2, $a2, %lo(D_809A0F68) ## $a2 = 809A0F68 /* 002F0 809A0D90 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFF20 /* 002F4 809A0D94 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002F8 809A0D98 0C031AD5 */ jal func_800C6B54 +/* 002F8 809A0D98 0C031AD5 */ jal Graph_CloseDisp /* 002FC 809A0D9C 240700F7 */ addiu $a3, $zero, 0x00F7 ## $a3 = 000000F7 /* 00300 809A0DA0 8FBF001C */ lw $ra, 0x001C($sp) /* 00304 809A0DA4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s index 1139cf20d2..48c4dfdc42 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s @@ -11,7 +11,7 @@ glabel func_809A12B4 /* 0002F8 809A12D8 24C6157C */ addiu $a2, %lo(D_809A157C) # addiu $a2, $a2, 0x157c /* 0002FC 809A12DC 27A40040 */ addiu $a0, $sp, 0x40 /* 000300 809A12E0 240700D6 */ li $a3, 214 -/* 000304 809A12E4 0C031AB1 */ jal func_800C6AC4 +/* 000304 809A12E4 0C031AB1 */ jal Graph_OpenDisp /* 000308 809A12E8 02202825 */ move $a1, $s1 /* 00030C 809A12EC 860F0040 */ lh $t7, 0x40($s0) /* 000310 809A12F0 3C01809A */ lui $at, %hi(D_809A15AC) # $at, 0x809a @@ -120,7 +120,7 @@ glabel func_809A12B4 /* 0004A8 809A1488 24C61594 */ addiu $a2, %lo(D_809A1594) # addiu $a2, $a2, 0x1594 /* 0004AC 809A148C 27A40040 */ addiu $a0, $sp, 0x40 /* 0004B0 809A1490 02202825 */ move $a1, $s1 -/* 0004B4 809A1494 0C031AD5 */ jal func_800C6B54 +/* 0004B4 809A1494 0C031AD5 */ jal Graph_CloseDisp /* 0004B8 809A1498 24070103 */ li $a3, 259 /* 0004BC 809A149C 8FBF001C */ lw $ra, 0x1c($sp) /* 0004C0 809A14A0 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s index 890b763027..5d8ead8528 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s @@ -11,7 +11,7 @@ glabel func_809A16F4 /* 00108 809A1718 24C61A80 */ addiu $a2, $a2, %lo(D_809A1A80) ## $a2 = 809A1A80 /* 0010C 809A171C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFF88 /* 00110 809A1720 2407009D */ addiu $a3, $zero, 0x009D ## $a3 = 0000009D -/* 00114 809A1724 0C031AB1 */ jal func_800C6AC4 +/* 00114 809A1724 0C031AB1 */ jal Graph_OpenDisp /* 00118 809A1728 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0011C 809A172C 860F0040 */ lh $t7, 0x0040($s0) ## 00000040 /* 00120 809A1730 3C01809A */ lui $at, %hi(D_809A1AC8) ## $at = 809A0000 @@ -193,7 +193,7 @@ glabel func_809A16F4 /* 003D0 809A19E0 24C61AB0 */ addiu $a2, $a2, %lo(D_809A1AB0) ## $a2 = 809A1AB0 /* 003D4 809A19E4 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFF88 /* 003D8 809A19E8 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 003DC 809A19EC 0C031AD5 */ jal func_800C6B54 +/* 003DC 809A19EC 0C031AD5 */ jal Graph_CloseDisp /* 003E0 809A19F0 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 003E4 809A19F4 8FBF002C */ lw $ra, 0x002C($sp) /* 003E8 809A19F8 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s index 305edb00a6..9716e3c9d7 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s @@ -11,7 +11,7 @@ glabel func_809A1F04 /* 00278 809A1F28 24C62220 */ addiu $a2, $a2, %lo(D_809A2220) ## $a2 = 809A2220 /* 0027C 809A1F2C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00280 809A1F30 240700C9 */ addiu $a3, $zero, 0x00C9 ## $a3 = 000000C9 -/* 00284 809A1F34 0C031AB1 */ jal func_800C6AC4 +/* 00284 809A1F34 0C031AB1 */ jal Graph_OpenDisp /* 00288 809A1F38 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0028C 809A1F3C 860F0052 */ lh $t7, 0x0052($s0) ## 00000052 /* 00290 809A1F40 3C01809A */ lui $at, %hi(D_809A2268) ## $at = 809A0000 @@ -155,7 +155,7 @@ glabel func_809A1F04 /* 004A8 809A2158 01ED4021 */ addu $t0, $t7, $t5 /* 004AC 809A215C 01015821 */ addu $t3, $t0, $at /* 004B0 809A2160 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 004B4 809A2164 0C031AD5 */ jal func_800C6B54 +/* 004B4 809A2164 0C031AD5 */ jal Graph_CloseDisp /* 004B8 809A2168 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 004BC 809A216C 8FBF001C */ lw $ra, 0x001C($sp) /* 004C0 809A2170 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s index ef29bea5f5..12fe3a765a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s @@ -11,7 +11,7 @@ glabel func_809A2480 /* 001D4 809A24A4 24C62A70 */ addiu $a2, $a2, %lo(D_809A2A70) ## $a2 = 809A2A70 /* 001D8 809A24A8 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFEDC /* 001DC 809A24AC 24070141 */ addiu $a3, $zero, 0x0141 ## $a3 = 00000141 -/* 001E0 809A24B0 0C031AB1 */ jal func_800C6AC4 +/* 001E0 809A24B0 0C031AB1 */ jal Graph_OpenDisp /* 001E4 809A24B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 001E8 809A24B8 862F0052 */ lh $t7, 0x0052($s1) ## 00000052 /* 001EC 809A24BC 3C01809A */ lui $at, %hi(D_809A2A98) ## $at = 809A0000 @@ -216,7 +216,7 @@ glabel func_809A2480 /* 004F8 809A27C8 24C62A84 */ addiu $a2, $a2, %lo(D_809A2A84) ## $a2 = 809A2A84 /* 004FC 809A27CC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFEDC /* 00500 809A27D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00504 809A27D4 0C031AD5 */ jal func_800C6B54 +/* 00504 809A27D4 0C031AD5 */ jal Graph_CloseDisp /* 00508 809A27D8 24070185 */ addiu $a3, $zero, 0x0185 ## $a3 = 00000185 /* 0050C 809A27DC 8FBF001C */ lw $ra, 0x001C($sp) /* 00510 809A27E0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s index d1bc657dc9..0ae4c32aaa 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s @@ -11,7 +11,7 @@ glabel func_809A2D28 /* 001EC 809A2D4C 24C63260 */ addiu $a2, $a2, %lo(D_809A3260) ## $a2 = 809A3260 /* 001F0 809A2D50 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 /* 001F4 809A2D54 240700A9 */ addiu $a3, $zero, 0x00A9 ## $a3 = 000000A9 -/* 001F8 809A2D58 0C031AB1 */ jal func_800C6AC4 +/* 001F8 809A2D58 0C031AB1 */ jal Graph_OpenDisp /* 001FC 809A2D5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00200 809A2D60 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 00204 809A2D64 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 @@ -206,7 +206,7 @@ glabel func_809A2D28 /* 004DC 809A303C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 004E0 809A3040 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 .L809A3044: -/* 004E4 809A3044 0C031AD5 */ jal func_800C6B54 +/* 004E4 809A3044 0C031AD5 */ jal Graph_CloseDisp /* 004E8 809A3048 240700D5 */ addiu $a3, $zero, 0x00D5 ## $a3 = 000000D5 /* 004EC 809A304C 8FBF003C */ lw $ra, 0x003C($sp) /* 004F0 809A3050 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s index 65baa834b1..9767eadfaf 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s @@ -22,7 +22,7 @@ glabel func_809A35DC /* 002FC 809A362C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00300 809A3630 E7AA008C */ swc1 $f10, 0x008C($sp) /* 00304 809A3634 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 -/* 00308 809A3638 0C031AB1 */ jal func_800C6AC4 +/* 00308 809A3638 0C031AB1 */ jal Graph_OpenDisp /* 0030C 809A363C AFB8007C */ sw $t8, 0x007C($sp) /* 00310 809A3640 86190056 */ lh $t9, 0x0056($s0) ## 00000056 /* 00314 809A3644 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -233,7 +233,7 @@ glabel func_809A35DC /* 00630 809A3960 24C63BFC */ addiu $a2, $a2, %lo(D_809A3BFC) ## $a2 = 809A3BFC /* 00634 809A3964 24070126 */ addiu $a3, $zero, 0x0126 ## $a3 = 00000126 /* 00638 809A3968 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0063C 809A396C 0C031AD5 */ jal func_800C6B54 +/* 0063C 809A396C 0C031AD5 */ jal Graph_CloseDisp /* 00640 809A3970 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 00644 809A3974 8FBF003C */ lw $ra, 0x003C($sp) /* 00648 809A3978 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s index 6140be2392..8464533861 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s @@ -28,7 +28,7 @@ glabel func_809A3E00 /* 0001A8 809A3E68 27A40040 */ addiu $a0, $sp, 0x40 /* 0001AC 809A3E6C 24C64080 */ addiu $a2, %lo(D_809A4080) # addiu $a2, $a2, 0x4080 /* 0001B0 809A3E70 00A08025 */ move $s0, $a1 -/* 0001B4 809A3E74 0C031AB1 */ jal func_800C6AC4 +/* 0001B4 809A3E74 0C031AB1 */ jal Graph_OpenDisp /* 0001B8 809A3E78 AFA80054 */ sw $t0, 0x54($sp) /* 0001BC 809A3E7C 8FA80054 */ lw $t0, 0x54($sp) /* 0001C0 809A3E80 3C018000 */ lui $at, 0x8000 @@ -117,7 +117,7 @@ glabel func_809A3E00 /* 00030C 809A3FCC AC590004 */ sw $t9, 4($v0) /* 000310 809A3FD0 8E450000 */ lw $a1, ($s2) /* 000314 809A3FD4 24C640A8 */ addiu $a2, %lo(D_809A40A8) # addiu $a2, $a2, 0x40a8 -/* 000318 809A3FD8 0C031AD5 */ jal func_800C6B54 +/* 000318 809A3FD8 0C031AD5 */ jal Graph_CloseDisp /* 00031C 809A3FDC 240700C2 */ li $a3, 194 /* 000320 809A3FE0 8FBF0024 */ lw $ra, 0x24($sp) /* 000324 809A3FE4 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s index 8cbdb723ab..5017f44e48 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s @@ -11,7 +11,7 @@ glabel func_809A41DC /* 000E0 809A4200 24C645A0 */ addiu $a2, $a2, %lo(D_809A45A0) ## $a2 = 809A45A0 /* 000E4 809A4204 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD8 /* 000E8 809A4208 24070095 */ addiu $a3, $zero, 0x0095 ## $a3 = 00000095 -/* 000EC 809A420C 0C031AB1 */ jal func_800C6AC4 +/* 000EC 809A420C 0C031AB1 */ jal Graph_OpenDisp /* 000F0 809A4210 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 000F4 809A4214 862F005C */ lh $t7, 0x005C($s1) ## 0000005C /* 000F8 809A4218 3C01809A */ lui $at, %hi(D_809A45DC) ## $at = 809A0000 @@ -188,7 +188,7 @@ glabel func_809A41DC /* 00398 809A44B8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 0039C 809A44BC 8E290038 */ lw $t1, 0x0038($s1) ## 00000038 /* 003A0 809A44C0 240700BA */ addiu $a3, $zero, 0x00BA ## $a3 = 000000BA -/* 003A4 809A44C4 0C031AD5 */ jal func_800C6B54 +/* 003A4 809A44C4 0C031AD5 */ jal Graph_CloseDisp /* 003A8 809A44C8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 003AC 809A44CC 8FBF003C */ lw $ra, 0x003C($sp) /* 003B0 809A44D0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s index 4c261424df..a51d195e71 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s @@ -27,7 +27,7 @@ glabel func_809A49B8 /* 003BC 809A4A1C 01284821 */ addu $t1, $t1, $t0 /* 003C0 809A4A20 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 003C4 809A4A24 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC -/* 003C8 809A4A28 0C031AB1 */ jal func_800C6AC4 +/* 003C8 809A4A28 0C031AB1 */ jal Graph_OpenDisp /* 003CC 809A4A2C AFA90050 */ sw $t1, 0x0050($sp) /* 003D0 809A4A30 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 003D4 809A4A34 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 @@ -132,7 +132,7 @@ glabel func_809A49B8 /* 00560 809A4BC0 8E2A0038 */ lw $t2, 0x0038($s1) ## 00000038 /* 00564 809A4BC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00568 809A4BC8 2407014A */ addiu $a3, $zero, 0x014A ## $a3 = 0000014A -/* 0056C 809A4BCC 0C031AD5 */ jal func_800C6B54 +/* 0056C 809A4BCC 0C031AD5 */ jal Graph_CloseDisp /* 00570 809A4BD0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00574 809A4BD4 8FBF001C */ lw $ra, 0x001C($sp) /* 00578 809A4BD8 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s index 95d597dd5e..083d12003b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s @@ -18,7 +18,7 @@ glabel func_809A4BE8 /* 005C8 809A4C28 2407015A */ addiu $a3, $zero, 0x015A ## $a3 = 0000015A /* 005CC 809A4C2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 005D0 809A4C30 46083283 */ div.s $f10, $f6, $f8 -/* 005D4 809A4C34 0C031AB1 */ jal func_800C6AC4 +/* 005D4 809A4C34 0C031AB1 */ jal Graph_OpenDisp /* 005D8 809A4C38 E7AA0054 */ swc1 $f10, 0x0054($sp) /* 005DC 809A4C3C C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 005E0 809A4C40 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 @@ -138,7 +138,7 @@ glabel func_809A4BE8 /* 007A0 809A4E00 8E2B0038 */ lw $t3, 0x0038($s1) ## 00000038 /* 007A4 809A4E04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 007A8 809A4E08 2407018F */ addiu $a3, $zero, 0x018F ## $a3 = 0000018F -/* 007AC 809A4E0C 0C031AD5 */ jal func_800C6B54 +/* 007AC 809A4E0C 0C031AD5 */ jal Graph_CloseDisp /* 007B0 809A4E10 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 007B4 809A4E14 8FBF001C */ lw $ra, 0x001C($sp) /* 007B8 809A4E18 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s index 8331efd668..c95cfa915c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s @@ -12,7 +12,7 @@ glabel func_809A5858 /* 00140 809A5880 24C65DE0 */ addiu $a2, $a2, %lo(D_809A5DE0) ## $a2 = 809A5DE0 /* 00144 809A5884 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC8 /* 00148 809A5888 240700B6 */ addiu $a3, $zero, 0x00B6 ## $a3 = 000000B6 -/* 0014C 809A588C 0C031AB1 */ jal func_800C6AC4 +/* 0014C 809A588C 0C031AB1 */ jal Graph_OpenDisp /* 00150 809A5890 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 00154 809A5894 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00158 809A5898 00000000 */ nop @@ -339,7 +339,7 @@ glabel func_809A5858 /* 00630 809A5D70 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00634 809A5D74 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 .L809A5D78: -/* 00638 809A5D78 0C031AD5 */ jal func_800C6B54 +/* 00638 809A5D78 0C031AD5 */ jal Graph_CloseDisp /* 0063C 809A5D7C 24070111 */ addiu $a3, $zero, 0x0111 ## $a3 = 00000111 /* 00640 809A5D80 8FBF0044 */ lw $ra, 0x0044($sp) /* 00644 809A5D84 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s index 7060ac61d0..b01c4feea2 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s @@ -27,7 +27,7 @@ glabel func_809A6568 /* 0022C 809A65CC 01284821 */ addu $t1, $t1, $t0 /* 00230 809A65D0 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 00234 809A65D4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC -/* 00238 809A65D8 0C031AB1 */ jal func_800C6AC4 +/* 00238 809A65D8 0C031AB1 */ jal Graph_OpenDisp /* 0023C 809A65DC AFA90050 */ sw $t1, 0x0050($sp) /* 00240 809A65E0 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 00244 809A65E4 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 @@ -144,7 +144,7 @@ glabel func_809A6568 /* 003F8 809A6798 8E290038 */ lw $t1, 0x0038($s1) ## 00000038 /* 003FC 809A679C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00400 809A67A0 24070137 */ addiu $a3, $zero, 0x0137 ## $a3 = 00000137 -/* 00404 809A67A4 0C031AD5 */ jal func_800C6B54 +/* 00404 809A67A4 0C031AD5 */ jal Graph_CloseDisp /* 00408 809A67A8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 0040C 809A67AC 8FBF001C */ lw $ra, 0x001C($sp) /* 00410 809A67B0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s index 83f5fd7d79..4a55aa565c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s @@ -11,7 +11,7 @@ glabel func_809A6AD8 /* 0019C 809A6AFC 24C66EA0 */ addiu $a2, $a2, %lo(D_809A6EA0) ## $a2 = 809A6EA0 /* 001A0 809A6B00 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFF18 /* 001A4 809A6B04 240700C7 */ addiu $a3, $zero, 0x00C7 ## $a3 = 000000C7 -/* 001A8 809A6B08 0C031AB1 */ jal func_800C6AC4 +/* 001A8 809A6B08 0C031AB1 */ jal Graph_OpenDisp /* 001AC 809A6B0C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 001B0 809A6B10 862F0042 */ lh $t7, 0x0042($s1) ## 00000042 /* 001B4 809A6B14 3C01809A */ lui $at, %hi(D_809A6ED0) ## $at = 809A0000 @@ -134,7 +134,7 @@ glabel func_809A6AD8 /* 00380 809A6CE0 24C66EB8 */ addiu $a2, $a2, %lo(D_809A6EB8) ## $a2 = 809A6EB8 /* 00384 809A6CE4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFF18 /* 00388 809A6CE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0038C 809A6CEC 0C031AD5 */ jal func_800C6B54 +/* 0038C 809A6CEC 0C031AD5 */ jal Graph_CloseDisp /* 00390 809A6CF0 240700F7 */ addiu $a3, $zero, 0x00F7 ## $a3 = 000000F7 /* 00394 809A6CF4 8FBF001C */ lw $ra, 0x001C($sp) /* 00398 809A6CF8 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s index 749dd1aa4f..a95d3883df 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s @@ -11,7 +11,7 @@ glabel func_809A70A0 /* 00194 809A70C4 24C674B0 */ addiu $a2, $a2, %lo(D_809A74B0) ## $a2 = 809A74B0 /* 00198 809A70C8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 0019C 809A70CC 240700D0 */ addiu $a3, $zero, 0x00D0 ## $a3 = 000000D0 -/* 001A0 809A70D0 0C031AB1 */ jal func_800C6AC4 +/* 001A0 809A70D0 0C031AB1 */ jal Graph_OpenDisp /* 001A4 809A70D4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 001A8 809A70D8 860F0052 */ lh $t7, 0x0052($s0) ## 00000052 /* 001AC 809A70DC 3C01809A */ lui $at, %hi(D_809A74D8) ## $at = 809A0000 @@ -129,7 +129,7 @@ glabel func_809A70A0 /* 00368 809A7298 24C674C4 */ addiu $a2, $a2, %lo(D_809A74C4) ## $a2 = 809A74C4 /* 0036C 809A729C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 00370 809A72A0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00374 809A72A4 0C031AD5 */ jal func_800C6B54 +/* 00374 809A72A4 0C031AD5 */ jal Graph_CloseDisp /* 00378 809A72A8 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF /* 0037C 809A72AC 8FBF001C */ lw $ra, 0x001C($sp) /* 00380 809A72B0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s index 91cfc99dfc..5a4ae0cab3 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s @@ -18,7 +18,7 @@ glabel func_809A7BFC /* 0024C 809A7C3C 240700D0 */ addiu $a3, $zero, 0x00D0 ## $a3 = 000000D0 /* 00250 809A7C40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00254 809A7C44 46083282 */ mul.s $f10, $f6, $f8 -/* 00258 809A7C48 0C031AB1 */ jal func_800C6AC4 +/* 00258 809A7C48 0C031AB1 */ jal Graph_OpenDisp /* 0025C 809A7C4C E7AA0044 */ swc1 $f10, 0x0044($sp) /* 00260 809A7C50 86380048 */ lh $t8, 0x0048($s1) ## 00000048 /* 00264 809A7C54 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF @@ -97,7 +97,7 @@ glabel func_809A7BFC /* 00384 809A7D74 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 00388 809A7D78 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0038C 809A7D7C 240700EC */ addiu $a3, $zero, 0x00EC ## $a3 = 000000EC -/* 00390 809A7D80 0C031AD5 */ jal func_800C6B54 +/* 00390 809A7D80 0C031AD5 */ jal Graph_CloseDisp /* 00394 809A7D84 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 00398 809A7D88 8FBF001C */ lw $ra, 0x001C($sp) /* 0039C 809A7D8C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s index 54179111da..2b69b97c4f 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s @@ -18,7 +18,7 @@ glabel func_809A7D9C /* 003EC 809A7DDC 240700FD */ addiu $a3, $zero, 0x00FD ## $a3 = 000000FD /* 003F0 809A7DE0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 003F4 809A7DE4 46083282 */ mul.s $f10, $f6, $f8 -/* 003F8 809A7DE8 0C031AB1 */ jal func_800C6AC4 +/* 003F8 809A7DE8 0C031AB1 */ jal Graph_OpenDisp /* 003FC 809A7DEC E7AA004C */ swc1 $f10, 0x004C($sp) /* 00400 809A7DF0 86380048 */ lh $t8, 0x0048($s1) ## 00000048 /* 00404 809A7DF4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF @@ -115,7 +115,7 @@ glabel func_809A7D9C /* 0056C 809A7F5C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 /* 00570 809A7F60 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00574 809A7F64 24070120 */ addiu $a3, $zero, 0x0120 ## $a3 = 00000120 -/* 00578 809A7F68 0C031AD5 */ jal func_800C6B54 +/* 00578 809A7F68 0C031AD5 */ jal Graph_CloseDisp /* 0057C 809A7F6C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 00580 809A7F70 8FBF001C */ lw $ra, 0x001C($sp) /* 00584 809A7F74 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s index 1c03aff20a..6e113d6690 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s @@ -11,7 +11,7 @@ glabel func_809A824C /* 00120 809A8270 24C68670 */ addiu $a2, $a2, %lo(D_809A8670) ## $a2 = 809A8670 /* 00124 809A8274 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 00128 809A8278 24070129 */ addiu $a3, $zero, 0x0129 ## $a3 = 00000129 -/* 0012C 809A827C 0C031AB1 */ jal func_800C6AC4 +/* 0012C 809A827C 0C031AB1 */ jal Graph_OpenDisp /* 00130 809A8280 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00134 809A8284 27A4011C */ addiu $a0, $sp, 0x011C ## $a0 = FFFFFFBC /* 00138 809A8288 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 @@ -135,7 +135,7 @@ glabel func_809A824C /* 0030C 809A845C 24C68688 */ addiu $a2, $a2, %lo(D_809A8688) ## $a2 = 809A8688 /* 00310 809A8460 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 00314 809A8464 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00318 809A8468 0C031AD5 */ jal func_800C6B54 +/* 00318 809A8468 0C031AD5 */ jal Graph_CloseDisp /* 0031C 809A846C 24070155 */ addiu $a3, $zero, 0x0155 ## $a3 = 00000155 /* 00320 809A8470 8FBF001C */ lw $ra, 0x001C($sp) /* 00324 809A8474 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s index 3b476ec5f6..30b66753c4 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s @@ -20,7 +20,7 @@ glabel func_809A8850 /* 00198 809A8898 E7AA007C */ swc1 $f10, 0x007C($sp) /* 0019C 809A889C 8C98009C */ lw $t8, 0x009C($a0) ## 0000009C /* 001A0 809A88A0 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 -/* 001A4 809A88A4 0C031AB1 */ jal func_800C6AC4 +/* 001A4 809A88A4 0C031AB1 */ jal Graph_OpenDisp /* 001A8 809A88A8 AFB80078 */ sw $t8, 0x0078($sp) /* 001AC 809A88AC 86020040 */ lh $v0, 0x0040($s0) ## 00000040 /* 001B0 809A88B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -150,7 +150,7 @@ glabel func_809A8850 /* 00398 809A8A98 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0039C 809A8A9C 240700D1 */ addiu $a3, $zero, 0x00D1 ## $a3 = 000000D1 /* 003A0 809A8AA0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 003A4 809A8AA4 0C031AD5 */ jal func_800C6B54 +/* 003A4 809A8AA4 0C031AD5 */ jal Graph_CloseDisp /* 003A8 809A8AA8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 003AC 809A8AAC 8FBF003C */ lw $ra, 0x003C($sp) /* 003B0 809A8AB0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s index 16eb2c686a..5531065677 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s @@ -19,7 +19,7 @@ glabel func_809A8D18 /* 0016C 809A8D5C AFAC0088 */ sw $t4, 0x0088($sp) /* 00170 809A8D60 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 00174 809A8D64 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 -/* 00178 809A8D68 0C031AB1 */ jal func_800C6AC4 +/* 00178 809A8D68 0C031AB1 */ jal Graph_OpenDisp /* 0017C 809A8D6C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00180 809A8D70 8FA40090 */ lw $a0, 0x0090($sp) /* 00184 809A8D74 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -195,7 +195,7 @@ glabel func_809A8D18 /* 00418 809A9008 24C69130 */ addiu $a2, $a2, %lo(D_809A9130) ## $a2 = 809A9130 /* 0041C 809A900C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 00420 809A9010 240700D2 */ addiu $a3, $zero, 0x00D2 ## $a3 = 000000D2 -/* 00424 809A9014 0C031AD5 */ jal func_800C6B54 +/* 00424 809A9014 0C031AD5 */ jal Graph_CloseDisp /* 00428 809A9018 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 0042C 809A901C 8FBF003C */ lw $ra, 0x003C($sp) /* 00430 809A9020 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s index eccec35f7e..7562fb8ac1 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s @@ -24,7 +24,7 @@ glabel func_809A9280 /* 00128 809A92D8 00000000 */ nop /* 0012C 809A92DC 46805420 */ cvt.s.w $f16, $f10 /* 00130 809A92E0 46008483 */ div.s $f18, $f16, $f0 -/* 00134 809A92E4 0C031AB1 */ jal func_800C6AC4 +/* 00134 809A92E4 0C031AB1 */ jal Graph_OpenDisp /* 00138 809A92E8 E7B20078 */ swc1 $f18, 0x0078($sp) /* 0013C 809A92EC C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 /* 00140 809A92F0 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 @@ -162,7 +162,7 @@ glabel func_809A9280 /* 00344 809A94F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00348 809A94F8 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC /* 0034C 809A94FC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00350 809A9500 0C031AD5 */ jal func_800C6B54 +/* 00350 809A9500 0C031AD5 */ jal Graph_CloseDisp /* 00354 809A9504 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 00358 809A9508 8FBF003C */ lw $ra, 0x003C($sp) /* 0035C 809A950C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s index 251415b720..4ceb856391 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s @@ -20,7 +20,7 @@ glabel func_809A9874 /* 0023C 809A98BC 84D80058 */ lh $t8, 0x0058($a2) ## 00000058 /* 00240 809A98C0 3C06809B */ lui $a2, %hi(D_809AA618) ## $a2 = 809B0000 /* 00244 809A98C4 24C6A618 */ addiu $a2, $a2, %lo(D_809AA618) ## $a2 = 809AA618 -/* 00248 809A98C8 0C031AB1 */ jal func_800C6AC4 +/* 00248 809A98C8 0C031AB1 */ jal Graph_OpenDisp /* 0024C 809A98CC AFB80058 */ sw $t8, 0x0058($sp) /* 00250 809A98D0 86390054 */ lh $t9, 0x0054($s1) ## 00000054 /* 00254 809A98D4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF @@ -204,7 +204,7 @@ glabel func_809A9874 /* 00500 809A9B80 24C6A654 */ addiu $a2, $a2, %lo(D_809AA654) ## $a2 = 809AA654 /* 00504 809A9B84 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00508 809A9B88 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0050C 809A9B8C 0C031AD5 */ jal func_800C6B54 +/* 0050C 809A9B8C 0C031AD5 */ jal Graph_CloseDisp /* 00510 809A9B90 2407012E */ addiu $a3, $zero, 0x012E ## $a3 = 0000012E /* 00514 809A9B94 8FBF001C */ lw $ra, 0x001C($sp) /* 00518 809A9B98 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s index 4f10cccfc2..f59f935405 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s @@ -18,7 +18,7 @@ glabel func_809AA9AC /* 001DC 809AA9EC E7AA01D8 */ swc1 $f10, 0x01D8($sp) /* 001E0 809AA9F0 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 /* 001E4 809AA9F4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFE5C -/* 001E8 809AA9F8 0C031AB1 */ jal func_800C6AC4 +/* 001E8 809AA9F8 0C031AB1 */ jal Graph_OpenDisp /* 001EC 809AA9FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 001F0 809AAA00 27A40194 */ addiu $a0, $sp, 0x0194 ## $a0 = FFFFFFB4 /* 001F4 809AAA04 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 @@ -138,7 +138,7 @@ glabel func_809AA9AC /* 003B8 809AABC8 24C6AE28 */ addiu $a2, $a2, %lo(D_809AAE28) ## $a2 = 809AAE28 /* 003BC 809AABCC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFE5C /* 003C0 809AABD0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 003C4 809AABD4 0C031AD5 */ jal func_800C6B54 +/* 003C4 809AABD4 0C031AD5 */ jal Graph_CloseDisp /* 003C8 809AABD8 2407012D */ addiu $a3, $zero, 0x012D ## $a3 = 0000012D /* 003CC 809AABDC 8FBF001C */ lw $ra, 0x001C($sp) /* 003D0 809AABE0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s index 02ffe4455a..fe09876c8b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s @@ -11,7 +11,7 @@ glabel func_809AB078 /* 001AC 809AB09C 24C6B560 */ addiu $a2, $a2, %lo(D_809AB560) ## $a2 = 809AB560 /* 001B0 809AB0A0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFE58 /* 001B4 809AB0A4 240700E9 */ addiu $a3, $zero, 0x00E9 ## $a3 = 000000E9 -/* 001B8 809AB0A8 0C031AB1 */ jal func_800C6AC4 +/* 001B8 809AB0A8 0C031AB1 */ jal Graph_OpenDisp /* 001BC 809AB0AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 001C0 809AB0B0 860F0052 */ lh $t7, 0x0052($s0) ## 00000052 /* 001C4 809AB0B4 86180056 */ lh $t8, 0x0056($s0) ## 00000056 @@ -170,7 +170,7 @@ glabel func_809AB078 /* 00420 809AB310 24C6B578 */ addiu $a2, $a2, %lo(D_809AB578) ## $a2 = 809AB578 /* 00424 809AB314 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFE58 /* 00428 809AB318 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0042C 809AB31C 0C031AD5 */ jal func_800C6B54 +/* 0042C 809AB31C 0C031AD5 */ jal Graph_CloseDisp /* 00430 809AB320 24070119 */ addiu $a3, $zero, 0x0119 ## $a3 = 00000119 /* 00434 809AB324 8FBF001C */ lw $ra, 0x001C($sp) /* 00438 809AB328 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s index 255e187d80..2dd91ebfbe 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s @@ -18,7 +18,7 @@ glabel func_809AB7EC /* 001FC 809AB82C 240700A3 */ addiu $a3, $zero, 0x00A3 ## $a3 = 000000A3 /* 00200 809AB830 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00204 809AB834 46083283 */ div.s $f10, $f6, $f8 -/* 00208 809AB838 0C031AB1 */ jal func_800C6AC4 +/* 00208 809AB838 0C031AB1 */ jal Graph_OpenDisp /* 0020C 809AB83C E7AA0050 */ swc1 $f10, 0x0050($sp) /* 00210 809AB840 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 /* 00214 809AB844 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 @@ -116,7 +116,7 @@ glabel func_809AB7EC /* 00384 809AB9B4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00388 809AB9B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0038C 809AB9BC 240700C6 */ addiu $a3, $zero, 0x00C6 ## $a3 = 000000C6 -/* 00390 809AB9C0 0C031AD5 */ jal func_800C6B54 +/* 00390 809AB9C0 0C031AD5 */ jal Graph_CloseDisp /* 00394 809AB9C4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 00398 809AB9C8 8FBF001C */ lw $ra, 0x001C($sp) /* 0039C 809AB9CC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s index 8c783c00b0..a832a74684 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s @@ -18,7 +18,7 @@ glabel func_809ABE0C /* 000EC 809ABE4C 2407009E */ addiu $a3, $zero, 0x009E ## $a3 = 0000009E /* 000F0 809ABE50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 000F4 809ABE54 46083283 */ div.s $f10, $f6, $f8 -/* 000F8 809ABE58 0C031AB1 */ jal func_800C6AC4 +/* 000F8 809ABE58 0C031AB1 */ jal Graph_OpenDisp /* 000FC 809ABE5C E7AA0050 */ swc1 $f10, 0x0050($sp) /* 00100 809ABE60 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 /* 00104 809ABE64 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 @@ -129,7 +129,7 @@ glabel func_809ABE0C /* 002A8 809AC008 24C6C0C0 */ addiu $a2, $a2, %lo(D_809AC0C0) ## $a2 = 809AC0C0 /* 002AC 809AC00C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 002B0 809AC010 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 002B4 809AC014 0C031AD5 */ jal func_800C6B54 +/* 002B4 809AC014 0C031AD5 */ jal Graph_CloseDisp /* 002B8 809AC018 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 002BC 809AC01C 8FBF001C */ lw $ra, 0x001C($sp) /* 002C0 809AC020 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s index 23d1c37714..5b53a4667b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s @@ -11,7 +11,7 @@ glabel func_809AC42C /* 00180 809AC450 24C6C640 */ addiu $a2, $a2, %lo(D_809AC640) ## $a2 = 809AC640 /* 00184 809AC454 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00188 809AC458 24070099 */ addiu $a3, $zero, 0x0099 ## $a3 = 00000099 -/* 0018C 809AC45C 0C031AB1 */ jal func_800C6AC4 +/* 0018C 809AC45C 0C031AB1 */ jal Graph_OpenDisp /* 00190 809AC460 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00194 809AC464 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 00198 809AC468 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 @@ -112,7 +112,7 @@ glabel func_809AC42C /* 0030C 809AC5DC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00310 809AC5E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00314 809AC5E4 240700BC */ addiu $a3, $zero, 0x00BC ## $a3 = 000000BC -/* 00318 809AC5E8 0C031AD5 */ jal func_800C6B54 +/* 00318 809AC5E8 0C031AD5 */ jal Graph_CloseDisp /* 0031C 809AC5EC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00320 809AC5F0 8FBF001C */ lw $ra, 0x001C($sp) /* 00324 809AC5F4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s index 46d7984133..fcce90603c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s @@ -18,7 +18,7 @@ glabel func_809AC78C /* 000CC 809AC7CC 24C6CA70 */ addiu $a2, $a2, %lo(D_809ACA70) ## $a2 = 809ACA70 /* 000D0 809AC7D0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD0 /* 000D4 809AC7D4 2407009A */ addiu $a3, $zero, 0x009A ## $a3 = 0000009A -/* 000D8 809AC7D8 0C031AB1 */ jal func_800C6AC4 +/* 000D8 809AC7D8 0C031AB1 */ jal Graph_OpenDisp /* 000DC 809AC7DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 000E0 809AC7E0 8FA40068 */ lw $a0, 0x0068($sp) /* 000E4 809AC7E4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -135,7 +135,7 @@ glabel func_809AC78C /* 00298 809AC998 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0029C 809AC99C 240700B7 */ addiu $a3, $zero, 0x00B7 ## $a3 = 000000B7 /* 002A0 809AC9A0 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 002A4 809AC9A4 0C031AD5 */ jal func_800C6B54 +/* 002A4 809AC9A4 0C031AD5 */ jal Graph_CloseDisp /* 002A8 809AC9A8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 002AC 809AC9AC 8FBF001C */ lw $ra, 0x001C($sp) /* 002B0 809AC9B0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s index 62a36e8683..e421c5599d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s @@ -9,7 +9,7 @@ glabel func_80806DB0 /* 0308C 80806DCC 24C62A90 */ addiu $a2, $a2, %lo(D_80812A90) ## $a2 = 80812A90 /* 03090 80806DD0 AFA50058 */ sw $a1, 0x0058($sp) /* 03094 80806DD4 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC -/* 03098 80806DD8 0C031AB1 */ jal func_800C6AC4 +/* 03098 80806DD8 0C031AB1 */ jal Graph_OpenDisp /* 0309C 80806DDC 2407006E */ addiu $a3, $zero, 0x006E ## $a3 = 0000006E /* 030A0 80806DE0 8FA50058 */ lw $a1, 0x0058($sp) /* 030A4 80806DE4 3C0FFD90 */ lui $t7, 0xFD90 ## $t7 = FD900000 @@ -90,7 +90,7 @@ glabel func_80806DB0 /* 031D0 80806F10 24C62AA8 */ addiu $a2, $a2, %lo(D_80812AA8) ## $a2 = 80812AA8 /* 031D4 80806F14 24070077 */ addiu $a3, $zero, 0x0077 ## $a3 = 00000077 /* 031D8 80806F18 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 031DC 80806F1C 0C031AD5 */ jal func_800C6B54 +/* 031DC 80806F1C 0C031AD5 */ jal Graph_CloseDisp /* 031E0 80806F20 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 031E4 80806F24 8FBF0014 */ lw $ra, 0x0014($sp) /* 031E8 80806F28 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s index 00d0be4742..aa197057d9 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s @@ -9,7 +9,7 @@ glabel func_8080723C /* 03518 80807258 24C62AC0 */ addiu $a2, $a2, %lo(D_80812AC0) ## $a2 = 80812AC0 /* 0351C 8080725C 27A400FC */ addiu $a0, $sp, 0x00FC ## $a0 = FFFFFFDC /* 03520 80807260 240700CD */ addiu $a3, $zero, 0x00CD ## $a3 = 000000CD -/* 03524 80807264 0C031AB1 */ jal func_800C6AC4 +/* 03524 80807264 0C031AB1 */ jal Graph_OpenDisp /* 03528 80807268 AFA5010C */ sw $a1, 0x010C($sp) /* 0352C 8080726C 8FA8010C */ lw $t0, 0x010C($sp) /* 03530 80807270 3C04E700 */ lui $a0, 0xE700 ## $a0 = E7000000 @@ -752,7 +752,7 @@ glabel func_8080723C /* 04068 80807DA8 27A400FC */ addiu $a0, $sp, 0x00FC ## $a0 = FFFFFFDC .L80807DAC: /* 0406C 80807DAC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 04070 80807DB0 0C031AD5 */ jal func_800C6B54 +/* 04070 80807DB0 0C031AD5 */ jal Graph_CloseDisp /* 04074 80807DB4 24070133 */ addiu $a3, $zero, 0x0133 ## $a3 = 00000133 /* 04078 80807DB8 8FBF001C */ lw $ra, 0x001C($sp) /* 0407C 80807DBC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s index a4cfa279f9..2bcafa3356 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s @@ -18,7 +18,7 @@ glabel func_80807DCC /* 040CC 80807E0C 24C62AF0 */ addiu $a2, $a2, %lo(D_80812AF0) ## $a2 = 80812AF0 /* 040D0 80807E10 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 040D4 80807E14 24070144 */ addiu $a3, $zero, 0x0144 ## $a3 = 00000144 -/* 040D8 80807E18 0C031AB1 */ jal func_800C6AC4 +/* 040D8 80807E18 0C031AB1 */ jal Graph_OpenDisp /* 040DC 80807E1C 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 /* 040E0 80807E20 0C02526A */ jal func_800949A8 /* 040E4 80807E24 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -128,7 +128,7 @@ glabel func_80807DCC /* 0427C 80807FBC 24C62B08 */ addiu $a2, $a2, %lo(D_80812B08) ## $a2 = 80812B08 /* 04280 80807FC0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 04284 80807FC4 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 04288 80807FC8 0C031AD5 */ jal func_800C6B54 +/* 04288 80807FC8 0C031AD5 */ jal Graph_CloseDisp /* 0428C 80807FCC 2407015B */ addiu $a3, $zero, 0x015B ## $a3 = 0000015B /* 04290 80807FD0 8FBF003C */ lw $ra, 0x003C($sp) /* 04294 80807FD4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s index 0e54d814cd..8f75010036 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s @@ -8,7 +8,7 @@ glabel func_80808000 /* 042D8 80808018 24C62B20 */ addiu $a2, $a2, %lo(D_80812B20) ## $a2 = 80812B20 /* 042DC 8080801C 27A400C8 */ addiu $a0, $sp, 0x00C8 ## $a0 = FFFFFFD8 /* 042E0 80808020 24070170 */ addiu $a3, $zero, 0x0170 ## $a3 = 00000170 -/* 042E4 80808024 0C031AB1 */ jal func_800C6AC4 +/* 042E4 80808024 0C031AB1 */ jal Graph_OpenDisp /* 042E8 80808028 AFA500D8 */ sw $a1, 0x00D8($sp) /* 042EC 8080802C 0C201BCD */ jal func_80806F34 /* 042F0 80808030 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -1040,7 +1040,7 @@ glabel func_80808000 /* 0521C 80808F5C 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 05220 80808F60 24C62B9C */ addiu $a2, $a2, %lo(D_80812B9C) ## $a2 = 80812B9C /* 05224 80808F64 27A400C8 */ addiu $a0, $sp, 0x00C8 ## $a0 = FFFFFFD8 -/* 05228 80808F68 0C031AD5 */ jal func_800C6B54 +/* 05228 80808F68 0C031AD5 */ jal Graph_CloseDisp /* 0522C 80808F6C 24070226 */ addiu $a3, $zero, 0x0226 ## $a3 = 00000226 /* 05230 80808F70 8FBF0024 */ lw $ra, 0x0024($sp) /* 05234 80808F74 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s index 8659622cfa..8751b2b88c 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s @@ -10,7 +10,7 @@ glabel func_808099C8 /* 05CA8 808099E8 24C62C68 */ addiu $a2, $a2, %lo(D_80812C68) ## $a2 = 80812C68 /* 05CAC 808099EC 27A40194 */ addiu $a0, $sp, 0x0194 ## $a0 = FFFFFFDC /* 05CB0 808099F0 24070350 */ addiu $a3, $zero, 0x0350 ## $a3 = 00000350 -/* 05CB4 808099F4 0C031AB1 */ jal func_800C6AC4 +/* 05CB4 808099F4 0C031AB1 */ jal Graph_OpenDisp /* 05CB8 808099F8 AFA501A4 */ sw $a1, 0x01A4($sp) /* 05CBC 808099FC 3C108081 */ lui $s0, %hi(D_808126FC) ## $s0 = 80810000 /* 05CC0 80809A00 861026FC */ lh $s0, %lo(D_808126FC)($s0) @@ -1434,7 +1434,7 @@ glabel func_808099C8 /* 071C4 8080AF04 24C62CC8 */ addiu $a2, $a2, %lo(D_80812CC8) ## $a2 = 80812CC8 /* 071C8 8080AF08 27A40194 */ addiu $a0, $sp, 0x0194 ## $a0 = FFFFFFDC /* 071CC 8080AF0C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 071D0 8080AF10 0C031AD5 */ jal func_800C6B54 +/* 071D0 8080AF10 0C031AD5 */ jal Graph_CloseDisp /* 071D4 8080AF14 24070410 */ addiu $a3, $zero, 0x0410 ## $a3 = 00000410 /* 071D8 8080AF18 8FBF0024 */ lw $ra, 0x0024($sp) /* 071DC 8080AF1C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s index 02e80615c6..e5d42011a3 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s @@ -18,7 +18,7 @@ glabel func_8080D8CC /* 09BCC 8080D90C 24C62E00 */ addiu $a2, $a2, %lo(D_80812E00) ## $a2 = 80812E00 /* 09BD0 8080D910 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFD4 /* 09BD4 8080D914 240706AD */ addiu $a3, $zero, 0x06AD ## $a3 = 000006AD -/* 09BD8 8080D918 0C031AB1 */ jal func_800C6AC4 +/* 09BD8 8080D918 0C031AB1 */ jal Graph_OpenDisp /* 09BDC 8080D91C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 09BE0 8080D920 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 09BE4 8080D924 3C16E700 */ lui $s6, 0xE700 ## $s6 = E7000000 @@ -490,7 +490,7 @@ glabel func_8080D8CC /* 0A2F8 8080E038 24C62E14 */ addiu $a2, $a2, %lo(D_80812E14) ## $a2 = 80812E14 /* 0A2FC 8080E03C 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFD4 /* 0A300 8080E040 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 0A304 8080E044 0C031AD5 */ jal func_800C6B54 +/* 0A304 8080E044 0C031AD5 */ jal Graph_CloseDisp /* 0A308 8080E048 24070705 */ addiu $a3, $zero, 0x0705 ## $a3 = 00000705 /* 0A30C 8080E04C 8FBF003C */ lw $ra, 0x003C($sp) /* 0A310 8080E050 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s index 8c3f99b262..580176a045 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s @@ -16,7 +16,7 @@ glabel func_8080E074 /* 0A36C 8080E0AC 24C62E28 */ addiu $a2, $a2, %lo(D_80812E28) ## $a2 = 80812E28 /* 0A370 8080E0B0 27A4027C */ addiu $a0, $sp, 0x027C ## $a0 = FFFFFFDC /* 0A374 8080E0B4 24070794 */ addiu $a3, $zero, 0x0794 ## $a3 = 00000794 -/* 0A378 8080E0B8 0C031AB1 */ jal func_800C6AC4 +/* 0A378 8080E0B8 0C031AB1 */ jal Graph_OpenDisp /* 0A37C 8080E0BC AFA5028C */ sw $a1, 0x028C($sp) /* 0A380 8080E0C0 8FA9028C */ lw $t1, 0x028C($sp) /* 0A384 8080E0C4 3C14E700 */ lui $s4, 0xE700 ## $s4 = E7000000 @@ -1347,7 +1347,7 @@ glabel func_8080E074 /* 0B7DC 8080F51C ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 /* 0B7E0 8080F520 3C068081 */ lui $a2, %hi(D_80812E3C) ## $a2 = 80810000 /* 0B7E4 8080F524 24C62E3C */ addiu $a2, $a2, %lo(D_80812E3C) ## $a2 = 80812E3C -/* 0B7E8 8080F528 0C031AD5 */ jal func_800C6B54 +/* 0B7E8 8080F528 0C031AD5 */ jal Graph_CloseDisp /* 0B7EC 8080F52C 8E650000 */ lw $a1, 0x0000($s3) ## 00000000 /* 0B7F0 8080F530 8FBF003C */ lw $ra, 0x003C($sp) /* 0B7F4 8080F534 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s index e54fc5faa3..e63b4a430f 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s @@ -9,7 +9,7 @@ glabel func_8080F560 /* 0B83C 8080F57C 24C62E50 */ addiu $a2, $a2, %lo(D_80812E50) ## $a2 = 80812E50 /* 0B840 8080F580 27A400EC */ addiu $a0, $sp, 0x00EC ## $a0 = FFFFFFDC /* 0B844 8080F584 240708AA */ addiu $a3, $zero, 0x08AA ## $a3 = 000008AA -/* 0B848 8080F588 0C031AB1 */ jal func_800C6AC4 +/* 0B848 8080F588 0C031AB1 */ jal Graph_OpenDisp /* 0B84C 8080F58C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0B850 8080F590 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0B854 8080F594 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 @@ -563,7 +563,7 @@ glabel func_8080F560 /* 0C0C4 8080FE04 24C62EA0 */ addiu $a2, $a2, %lo(D_80812EA0) ## $a2 = 80812EA0 /* 0C0C8 8080FE08 27A400EC */ addiu $a0, $sp, 0x00EC ## $a0 = FFFFFFDC /* 0C0CC 8080FE0C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0C0D0 8080FE10 0C031AD5 */ jal func_800C6B54 +/* 0C0D0 8080FE10 0C031AD5 */ jal Graph_CloseDisp /* 0C0D4 8080FE14 24070930 */ addiu $a3, $zero, 0x0930 ## $a3 = 00000930 /* 0C0D8 8080FE18 8FBF002C */ lw $ra, 0x002C($sp) /* 0C0DC 8080FE1C 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s index 5709fd7fed..0c65ea5444 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s @@ -9,7 +9,7 @@ glabel func_808109B8 /* 0CC94 808109D4 24C62EE4 */ addiu $a2, $a2, %lo(D_80812EE4) ## $a2 = 80812EE4 /* 0CC98 808109D8 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 0CC9C 808109DC 24070AC1 */ addiu $a3, $zero, 0x0AC1 ## $a3 = 00000AC1 -/* 0CCA0 808109E0 0C031AB1 */ jal func_800C6AC4 +/* 0CCA0 808109E0 0C031AB1 */ jal Graph_OpenDisp /* 0CCA4 808109E4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0CCA8 808109E8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0CCAC 808109EC 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 @@ -249,7 +249,7 @@ glabel func_808109B8 /* 0D044 80810D84 24C62F0C */ addiu $a2, $a2, %lo(D_80812F0C) ## $a2 = 80812F0C /* 0D048 80810D88 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 0D04C 80810D8C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0D050 80810D90 0C031AD5 */ jal func_800C6B54 +/* 0D050 80810D90 0C031AD5 */ jal Graph_CloseDisp /* 0D054 80810D94 24070B12 */ addiu $a3, $zero, 0x0B12 ## $a3 = 00000B12 /* 0D058 80810D98 8FBF002C */ lw $ra, 0x002C($sp) /* 0D05C 80810D9C 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s index 0122a4f2ff..1a07283c3b 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s @@ -8,7 +8,7 @@ glabel func_80810DAC /* 0D084 80810DC4 24C62F20 */ addiu $a2, $a2, %lo(D_80812F20) ## $a2 = 80812F20 /* 0D088 80810DC8 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFE4 /* 0D08C 80810DCC 24070B52 */ addiu $a3, $zero, 0x0B52 ## $a3 = 00000B52 -/* 0D090 80810DD0 0C031AB1 */ jal func_800C6AC4 +/* 0D090 80810DD0 0C031AB1 */ jal Graph_OpenDisp /* 0D094 80810DD4 AFA5008C */ sw $a1, 0x008C($sp) /* 0D098 80810DD8 8FA8008C */ lw $t0, 0x008C($sp) /* 0D09C 80810DDC 3C010002 */ lui $at, 0x0002 ## $at = 00020000 @@ -391,7 +391,7 @@ glabel func_80810DAC /* 0D640 80811380 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 0D644 80811384 24C62F34 */ addiu $a2, $a2, %lo(D_80812F34) ## $a2 = 80812F34 /* 0D648 80811388 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFE4 -/* 0D64C 8081138C 0C031AD5 */ jal func_800C6B54 +/* 0D64C 8081138C 0C031AD5 */ jal Graph_CloseDisp /* 0D650 80811390 24070BDB */ addiu $a3, $zero, 0x0BDB ## $a3 = 00000BDB /* 0D654 80811394 8FBF001C */ lw $ra, 0x001C($sp) /* 0D658 80811398 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s index 7266a07c2a..6c82a645ad 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s @@ -412,8 +412,4 @@ glabel func_808113A8 /* 0DCCC 80811A0C 8FB20020 */ lw $s2, 0x0020($sp) /* 0DCD0 80811A10 03E00008 */ jr $ra /* 0DCD4 80811A14 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -.L80811A18: -/* 0DCD8 80811A18 03E00008 */ jr $ra -/* 0DCDC 80811A1C AFA40000 */ sw $a0, 0x0000($sp) - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A18.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A18.s new file mode 100644 index 0000000000..ce602cccce --- /dev/null +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A18.s @@ -0,0 +1,3 @@ +glabel func_80811A18 +/* 0DCD8 80811A18 03E00008 */ jr $ra +/* 0DCDC 80811A1C AFA40000 */ sw $a0, 0x0000($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s index 3ae3180c96..aec526e62f 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s @@ -80,9 +80,9 @@ glabel func_80811A20 /* 0DDFC 80811B3C 0C02A89E */ jal func_800AA278 /* 0DE00 80811B40 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 0DE04 80811B44 3C0A8081 */ lui $t2, %hi(func_80810DAC) ## $t2 = 80810000 -/* 0DE08 80811B48 3C0B8081 */ lui $t3, %hi(.L80811A18) ## $t3 = 80810000 +/* 0DE08 80811B48 3C0B8081 */ lui $t3, %hi(func_80811A18) ## $t3 = 80810000 /* 0DE0C 80811B4C 254A0DAC */ addiu $t2, $t2, %lo(func_80810DAC) ## $t2 = 80810DAC -/* 0DE10 80811B50 256B1A18 */ addiu $t3, $t3, %lo(.L80811A18) ## $t3 = 80811A18 +/* 0DE10 80811B50 256B1A18 */ addiu $t3, $t3, %lo(func_80811A18) ## $t3 = 80811A18 /* 0DE14 80811B54 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 /* 0DE18 80811B58 AE0B0008 */ sw $t3, 0x0008($s0) ## 00000008 /* 0DE1C 80811B5C 0C2044EA */ jal func_808113A8 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s index 8c47a86d66..e32ec94d3a 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s @@ -12,7 +12,7 @@ glabel func_80801AAC /* 00F44 80801AD4 24C63530 */ addiu $a2, $a2, %lo(D_80803530) ## $a2 = 80803530 /* 00F48 80801AD8 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 00F4C 80801ADC 240703A2 */ addiu $a3, $zero, 0x03A2 ## $a3 = 000003A2 -/* 00F50 80801AE0 0C031AB1 */ jal func_800C6AC4 +/* 00F50 80801AE0 0C031AB1 */ jal Graph_OpenDisp /* 00F54 80801AE4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00F58 80801AE8 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00F5C 80801AEC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -70,7 +70,7 @@ glabel func_80801AAC /* 0102C 80801BBC 24C63540 */ addiu $a2, $a2, %lo(D_80803540) ## $a2 = 80803540 /* 01030 80801BC0 27C40054 */ addiu $a0, $s8, 0x0054 ## $a0 = FFFFFFE4 /* 01034 80801BC4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01038 80801BC8 0C031AD5 */ jal func_800C6B54 +/* 01038 80801BC8 0C031AD5 */ jal Graph_CloseDisp /* 0103C 80801BCC 240703C6 */ addiu $a3, $zero, 0x03C6 ## $a3 = 000003C6 /* 01040 80801BD0 8FDF0034 */ lw $ra, 0x0034($s8) ## FFFFFFC4 /* 01044 80801BD4 03C0E825 */ or $sp, $s8, $zero ## $sp = FFFFFF90 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s index c511b33ebd..460e4d438e 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s @@ -11,7 +11,7 @@ glabel func_80801BF0 /* 01084 80801C14 24C63550 */ addiu $a2, $a2, %lo(D_80803550) ## $a2 = 80803550 /* 01088 80801C18 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 0108C 80801C1C 240703D1 */ addiu $a3, $zero, 0x03D1 ## $a3 = 000003D1 -/* 01090 80801C20 0C031AB1 */ jal func_800C6AC4 +/* 01090 80801C20 0C031AB1 */ jal Graph_OpenDisp /* 01094 80801C24 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01098 80801C28 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 0109C 80801C2C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -59,7 +59,7 @@ glabel func_80801BF0 /* 01144 80801CD4 24C63560 */ addiu $a2, $a2, %lo(D_80803560) ## $a2 = 80803560 /* 01148 80801CD8 27C40054 */ addiu $a0, $s8, 0x0054 ## $a0 = FFFFFFE4 /* 0114C 80801CDC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01150 80801CE0 0C031AD5 */ jal func_800C6B54 +/* 01150 80801CE0 0C031AD5 */ jal Graph_CloseDisp /* 01154 80801CE4 240703EE */ addiu $a3, $zero, 0x03EE ## $a3 = 000003EE /* 01158 80801CE8 8FDF0034 */ lw $ra, 0x0034($s8) ## FFFFFFC4 /* 0115C 80801CEC 03C0E825 */ or $sp, $s8, $zero ## $sp = FFFFFF90 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s index 013444ecc1..81025a546f 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s @@ -9,7 +9,7 @@ glabel func_80801D04 /* 01190 80801D20 24C63570 */ addiu $a2, $a2, %lo(D_80803570) ## $a2 = 80803570 /* 01194 80801D24 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01198 80801D28 240703F5 */ addiu $a3, $zero, 0x03F5 ## $a3 = 000003F5 -/* 0119C 80801D2C 0C031AB1 */ jal func_800C6AC4 +/* 0119C 80801D2C 0C031AB1 */ jal Graph_OpenDisp /* 011A0 80801D30 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 011A4 80801D34 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 011A8 80801D38 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -50,7 +50,7 @@ glabel func_80801D04 /* 0122C 80801DBC 24C63580 */ addiu $a2, $a2, %lo(D_80803580) ## $a2 = 80803580 /* 01230 80801DC0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01234 80801DC4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01238 80801DC8 0C031AD5 */ jal func_800C6B54 +/* 01238 80801DC8 0C031AD5 */ jal Graph_CloseDisp /* 0123C 80801DCC 2407040D */ addiu $a3, $zero, 0x040D ## $a3 = 0000040D /* 01240 80801DD0 8FBF001C */ lw $ra, 0x001C($sp) /* 01244 80801DD4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/data/graph.bss.s b/data/graph.bss.s deleted file mode 100644 index 6d7d3f4256..0000000000 --- a/data/graph.bss.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .bss - -glabel D_801665D0 - .space 0x4 - -glabel D_801665D4 - .space 0x4 - -glabel D_801665D8 - .space 0x4 - -glabel D_801665DC - .space 0x4 - -glabel D_801665E0 - .space 0x10 - -glabel D_801665F0 - .space 0x58 - -glabel D_80166648 - .space 0x18 diff --git a/data/graph.data.s b/data/graph.data.s deleted file mode 100644 index 2fa2810cbf..0000000000 --- a/data/graph.data.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8012D230 - .incbin "baserom.z64", 0xBA43D0, 0x18 - -glabel D_8012D248 - .incbin "baserom.z64", 0xBA43E8, 0x18 - -glabel D_8012D260 - .incbin "baserom.z64", 0xBA4400, 0x4 - -glabel D_8012D264 - .incbin "baserom.z64", 0xBA4404, 0xC diff --git a/data/graph.rodata.s b/data/graph.rodata.s deleted file mode 100644 index fa805d3366..0000000000 --- a/data/graph.rodata.s +++ /dev/null @@ -1,256 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -.align 4 - -glabel D_80145180 - .asciz "vtx_cnt=%d\n" - .balign 4 - -glabel D_8014518C - .asciz "spvtx_cnt=%d\n" - .balign 4 - -glabel D_8014519C - .asciz "tri1_cnt=%d\n" - .balign 4 - -glabel D_801451AC - .asciz "tri2_cnt=%d\n" - .balign 4 - -glabel D_801451BC - .asciz "quad_cnt=%d\n" - .balign 4 - -glabel D_801451CC - .asciz "line_cnt=%d\n" - .balign 4 - -glabel D_801451DC - .asciz "sync_err=%d\n" - .balign 4 - -glabel D_801451EC - .asciz "loaducode_cnt=%d\n" - .balign 4 - -glabel D_80145200 - .asciz "dl_depth=%d\n" - .balign 4 - -glabel D_80145210 - .asciz "dl_cnt=%d\n" - .balign 4 - -glabel D_8014521C - .asciz "../graph.c" - .balign 4 - -glabel D_80145228 - .asciz "game_init_func = %08x\n" - .balign 4 - -glabel D_80145240 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80145248 - .asciz "RCPが帰ってきませんでした。" - .balign 4 - -glabel D_80145264 - .asciz "\x1b[m" - .balign 4 - -glabel D_80145268 - .asciz "RCP is HUNG UP!!" - .balign 4 - -glabel D_8014527C - .asciz "Oh! MY GOD!!" - .balign 4 - -glabel D_8014528C - .asciz "../graph.c" - .balign 4 - -glabel D_80145298 - .asciz "../graph.c" - .balign 4 - -glabel D_801452A4 - .asciz "../graph.c" - .balign 4 - -glabel D_801452B0 - .asciz "WORK_DISP 開始" - # EUC-JP: 開始 | Start - .balign 4 - -glabel D_801452C0 - .asciz "POLY_OPA_DISP 開始" - # EUC-JP: 開始 | Start - .balign 4 - -glabel D_801452D4 - .asciz "POLY_XLU_DISP 開始" - # EUC-JP: 開始 | Start - .balign 4 - -glabel D_801452E8 - .asciz "OVERLAY_DISP 開始" - # EUC-JP: 開始 | Start - .balign 4 - -glabel D_801452FC - .asciz "../graph.c" - .balign 4 - -glabel D_80145308 - .asciz "../graph.c" - .balign 4 - -glabel D_80145314 - .asciz "WORK_DISP 終了" - # EUC-JP: 終了 | End - .balign 4 - -glabel D_80145324 - .asciz "POLY_OPA_DISP 終了" - # EUC-JP: 終了 | End - .balign 4 - -glabel D_80145338 - .asciz "POLY_XLU_DISP 終了" - # EUC-JP: 終了 | End - .balign 4 - -glabel D_8014534C - .asciz "OVERLAY_DISP 終了" - # EUC-JP: 終了 | End - .balign 4 - -glabel D_80145360 - .asciz "../graph.c" - .balign 4 - -glabel D_8014536C - .asciz "../graph.c" - .balign 4 - -glabel D_80145378 - .asciz "../graph.c" - .balign 4 - -glabel D_80145384 - .asciz "do_count_fault" - .balign 4 - -glabel D_80145394 - .asciz "%c" - .balign 4 - -glabel D_80145398 - .asciz "\x1b[41;37mダイナミック領域先頭が破壊されています\n\x1b[m" - #ダイナミック領域先頭が破壊されています | Dynamic area head is destroyed - .balign 4 - -glabel D_801453CC - .asciz "../graph.c" - .balign 4 - -glabel D_801453D8 - .asciz "%c" - .balign 4 - -glabel D_801453DC - .asciz "\x1b[41;37mダイナミック領域末尾が破壊されています\n\x1b[m" - # EUC-JP: ダイナミック領域末尾が破壊されています | Dynamic region tail is destroyed - .balign 4 - -glabel D_80145410 - .asciz "../graph.c" - .balign 4 - -glabel D_8014541C - .asciz "%c" - .balign 4 - -glabel D_80145420 - .asciz "\x1b[41;37mゼルダ0は死んでしまった(graph_alloc is empty)\n\x1b[m" - # EUC-JP: ゼルダ0は死んでしまった | 'Zelda 0 is dead'? - .balign 4 - -glabel D_8014545C - .asciz "%c" - .balign 4 - -glabel D_80145460 - .asciz "\x1b[41;37mゼルダ1は死んでしまった(graph_alloc is empty)\n\x1b[m" - # EUC-JP: ゼルダ1は死んでしまった | 'Zelda 1 is dead'? - .balign 4 - -glabel D_8014549C - .asciz "%c" - .balign 4 - -glabel D_801454A0 - .asciz "\x1b[41;37mゼルダ4は死んでしまった(graph_alloc is empty)\n\x1b[m" - # EUC-JP: ゼルダ4は死んでしまった | 'Zelda 4 is dead'? - .balign 4 - -glabel D_801454DC - .asciz "\x1b[43;30mPRE-NMIによりリセットモードに移行します\n\x1b[m" - # EUC-JP: によりリセットモードに移行します | To reset mode - .balign 4 - -glabel D_80145510 - .asciz "グラフィックスレッド実行開始\n" - # EUC-JP: グラフィックスレッド実行開始 | Start graphic thread execution - .balign 4 - -glabel D_80145530 - .asciz "クラスサイズ＝%dバイト\n" - # EUC-JP: クラスサイズ＝%dバイト | Class size =%d bytes - .balign 4 - -glabel D_80145548 - .asciz "../graph.c" - .balign 4 - -glabel D_80145554 - .asciz "確保失敗\n" - # EUC-JP: 確保失敗 | Failure to secure - .balign 4 - -glabel D_80145560 - .asciz "CLASS SIZE= %d bytes" - .balign 4 - -glabel D_80145578 - .asciz "GAME CLASS MALLOC FAILED" - .balign 4 - -glabel D_80145594 - .asciz "../graph.c" - .balign 4 - -glabel D_801455A0 - .asciz "グラフィックスレッド実行終了\n" - # EUC-JP: グラフィックスレッド実行終了 | End of graphic thread execution - .balign 4 - -glabel D_801455C0 - .asciz "graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n" - .balign 4 - -glabel D_80145604 - .asciz "graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n" - .balign 4 diff --git a/data/z_game_dlftbls.data.s b/data/z_game_dlftbls.data.s deleted file mode 100644 index 2c2b63516f..0000000000 --- a/data/z_game_dlftbls.data.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8011F830 - .incbin "baserom.z64", 0xB969D0, 0x30 - -glabel D_8011F860 - .incbin "baserom.z64", 0xB96A00, 0x30 - -glabel D_8011F890 - .incbin "baserom.z64", 0xB96A30, 0x30 - -glabel D_8011F8C0 - .incbin "baserom.z64", 0xB96A60, 0x30 - -glabel D_8011F8F0 - .incbin "baserom.z64", 0xB96A90, 0x30 - -glabel D_8011F920 - .incbin "baserom.z64", 0xB96AC0, 0x30 diff --git a/include/functions.h b/include/functions.h index 96671cda1e..0be7323204 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1419,7 +1419,7 @@ s32 func_800BC56C(GlobalContext*, s16); // ? func_800BC5E0(?); void func_800BC88C(GlobalContext*); Gfx* func_800BC8A0(GlobalContext* globalCtx, Gfx* a1); -// ? func_800BC8EC(?); +void func_800BC8EC(GlobalContext*); UNK_TYPE func_800BCA64(UNK_ARGS); // ? func_800BD314(?); // ? func_800BED40(?); @@ -1529,22 +1529,23 @@ void* GameAlloc_Malloc(GameAlloc* this, u32 size); void GameAlloc_Free(GameAlloc* this, void* data); void GameAlloc_Cleanup(GameAlloc* this); void GameAlloc_Init(GameAlloc* this); -// ? func_800C5850(?); -// ? func_800C58BC(?); -// ? func_800C5AB0(?); -// ? func_800C5B14(?); -// ? func_800C5C2C(?); -// ? func_800C5D08(?); -// ? func_800C5D94(?); -// ? func_800C5DC0(?); -// ? func_800C61D8(?); +void Graph_FaultClient(); +void Graph_DisassembleUCode(void* arg0); +void Graph_UCodeFaultClient(void* arg0); +void* Graph_InitTHGA(GraphicsContext* gfxCtx); +GameStateOverlay* Graph_GetNextGameState(); +void Graph_Ct(GraphicsContext* gfxCtx); +void Graph_Dt(GraphicsContext* gfxCtx); +void Graph_TaskSet00(GraphicsContext* gfxCtx); +void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState); void Graph_ThreadEntry(void*); void* Graph_Alloc(GraphicsContext* gfxCtx, size_t size); -void func_800C6AC4(Gfx** a0, GraphicsContext* gfxCtx, char* file, s32 line); -void func_800C6B54(Gfx** a0, GraphicsContext* gfxCtx, char* file, s32 line); -Gfx* func_800C6C20(Gfx* a0); -Gfx* func_800C6C28(Gfx* a0, Gfx* dlist); // branch dlist -Gfx* func_800C6C3C(Gfx** a0, u32 size); +void* Graph_Alloc2(GraphicsContext* gfxCtx, size_t size); +void Graph_OpenDisp(Gfx** gfxArr, GraphicsContext* gfxCtx, const char* file, s32 line); +void Graph_CloseDisp(Gfx** gfxArr, GraphicsContext* gfxCtx, const char* file, s32 line); +Gfx* Graph_GfxPlusOne(Gfx* gfx); +Gfx* Graph_BranchDlist(Gfx* gfx, Gfx* dst); +void* Graph_DlistAlloc(Gfx** gfx, u32 size); ListAlloc* ListAlloc_Init(ListAlloc* this); void* ListAlloc_Alloc(ListAlloc* this, u32 size); void ListAlloc_Free(ListAlloc* this, void* data); @@ -2455,6 +2456,12 @@ void func_80110F68(GlobalContext* globalCtx); void func_80112098(GlobalContext* globalCtx); void Title_Init(TitleContext*); +void Title_Destroy(TitleContext* this); +void func_80801E44(GameState*); // Select_Init +void func_80801E0C(GameState*); // Select_Destroy void Opening_Init(OpeningContext* this); +void Opening_Destroy(OpeningContext* this); +void func_80811A20(GameState*); // FileChoose_Init +void func_80811A18(GameState*); // FileChoose_Destroy #endif diff --git a/include/sched.h b/include/sched.h index 656e55661e..2873a310d2 100644 --- a/include/sched.h +++ b/include/sched.h @@ -13,16 +13,6 @@ #define OS_SC_RCP_MASK 0x0003 #define OS_SC_TYPE_MASK 0x0007 -typedef struct OSScTask { - /* 0x00 */ struct OSScTask* next; - /* 0x04 */ u32 state; - /* 0x08 */ u32 flags; - /* 0x0C */ void* framebuffer; - /* 0x10 */ OSTask list; - /* 0x50 */ OSMesgQueue* msgQ; - /* 0x54 */ OSMesg msg; -} OSScTask; - typedef struct { /* 0x00 */ char unk_00[0x12]; /* 0x12 */ s8 unk_12; diff --git a/include/ultra64/gbi.h b/include/ultra64/gbi.h index 541ad155d1..f3f797e818 100644 --- a/include/ultra64/gbi.h +++ b/include/ultra64/gbi.h @@ -4482,6 +4482,16 @@ _DW({ \ #define gDPNoOpTag(pkt, tag) gDPParam(pkt, G_NOOP, tag) #define gsDPNoOpTag(tag) gsDPParam(G_NOOP, tag) +#define gDPNoOpHere(pkt, file, line) gDma1p(pkt, G_NOOP, file, line, 1) +#define gDPNoOpString(pkt, data, n) gDma1p(pkt, G_NOOP, data, n, 2) +#define gDPNoOpWord(pkt, data, n) gDma1p(pkt, G_NOOP, data, n, 3) +#define gDPNoOpFloat(pkt, data, n) gDma1p(pkt, G_NOOP, data, n, 4) +#define gDPNoOpQuiet(pkt) gDma1p(pkt, G_NOOP, 0, 0, 5) +#define gDPNoOpVerbose(pkt, n) gDma1p(pkt, G_NOOP, 0, n, 5) +#define gDPNoOpCallBack(pkt, callback) gDma1p(pkt, G_NOOP, callback, 0, 6) +#define gDPNoOpOpenDisp(pkt, file, line) gDma1p(pkt, G_NOOP, file, line, 7) +#define gDPNoOpCloseDisp(pkt, file, line) gDma1p(pkt, G_NOOP, file, line, 8) + #endif /* Private macro to wrap other macros in do {...} while (0) */ diff --git a/include/variables.h b/include/variables.h index 511f738f7c..4b7c8d30a7 100644 --- a/include/variables.h +++ b/include/variables.h @@ -137,6 +137,7 @@ extern u32 __osTimerCounter; extern OSPiHandle __CartRomHandle; extern DmaEntry gDmaDataTable[0x60C]; //extern ? D_800D7288; +extern u8 D_801120C0[]; //extern ? D_80115440; //extern ? D_80115760; //extern ? D_80115770; @@ -263,12 +264,7 @@ extern s32 D_8011D3AC; extern s16 D_8011E0B0; extern Color_RGBA8 D_8011E0B4[]; //extern ? D_8011E0D4; -//extern ? D_8011F830; -//extern ? D_8011F860; -//extern ? D_8011F890; -//extern ? D_8011F8C0; -//extern ? D_8011F8F0; -//extern ? D_8011F920; +extern GameStateOverlay gGameStateOverlayTable[6]; //extern ? D_8011FA60; //extern ? D_8011FA64; //extern ? D_8011FA68; @@ -3302,7 +3298,7 @@ extern char D_80146238[]; //extern ? D_80155500; //extern ? D_80155BF0; //extern ? D_80155C70; -//extern ? D_80155F50; +extern u8 D_80155F50[]; extern GlobalContext* D_80157DA0; //extern ? D_80157DA4; //extern ? D_80157DA8; @@ -3531,22 +3527,19 @@ extern u32 gSegments[]; //extern ? D_8016A514; //extern ? D_8016A518; //extern ? D_8016A51C; -//extern ? D_8016A520; -//extern ? D_8016A528; -//extern ? D_8016A530; -//extern ? D_8016A538; -//extern ? D_8016A540; -//extern ? D_8016A548; -//extern ? D_8016A550; -//extern ? D_8016A558; -//extern ? D_8016A55C; -//extern ? D_8016A560; -//extern ? D_8016A564; -//extern ? D_8016A568; -//extern ? D_8016A56C; +extern volatile OSTime D_8016A520; +extern volatile OSTime D_8016A528; +extern volatile OSTime D_8016A530; +extern volatile OSTime D_8016A538; +extern volatile OSTime D_8016A540; +extern volatile OSTime D_8016A548; +extern volatile OSTime D_8016A550; +extern volatile OSTime D_8016A558; +extern volatile OSTime D_8016A560; +extern volatile OSTime D_8016A568; //extern ? D_8016A570; //extern ? D_8016A574; -//extern ? D_8016A580; +extern volatile OSTime D_8016A580; //extern ? D_8016A588; //extern ? D_8016A590; //extern ? D_8016A594; diff --git a/include/z64.h b/include/z64.h index 3d2f713911..9d6c1876cf 100644 --- a/include/z64.h +++ b/include/z64.h @@ -235,16 +235,50 @@ typedef struct { /* 0x000C */ Gfx* d; } TwoHeadGfxArena; // size = 0x10 -typedef struct { - /* 0x0000 */ char unk_00[0x01B4]; +typedef struct OSScTask +{ + /* 0x00 */ struct OSScTask* next; + /* 0x04 */ u32 state; + /* 0x08 */ u32 flags; + /* 0x0C */ void* framebuffer; + /* 0x10 */ OSTask list; + /* 0x50 */ OSMesgQueue* msgQ; + /* 0x54 */ OSMesg msg; +} OSScTask; + +typedef struct GraphicsContex +{ + /* 0x0000 */ Gfx* polyOpaBuffer; + /* 0x0004 */ Gfx* polyXluBuffer; + /* 0x0008 */ char unk_008[8]; + /* 0x0010 */ Gfx* overlayBuffer; + /* 0x0014 */ u32 unk_014; + /* 0x0018 */ char unk_018[0x20]; + /* 0x0038 */ OSMesg msgBuff[8]; + /* 0x0058 */ OSMesgQueue* schedMsgQ; + /* 0x005C */ OSMesgQueue queue; + /* 0x0074 */ char unk_074[4]; + /* 0x0078 */ OSScTask task; // size of OSScTask might be wrong + /* 0x00D0 */ char unk_0D0[0xE0]; + /* 0x01B0 */ Gfx* workBuffer; /* 0x01B4 */ TwoHeadGfxArena work; - /* 0x01C4 */ char unk_1C4[0x00E4]; + /* 0x01C4 */ char unk_01C4[0xC0]; + /* 0x0284 */ OSViMode* viMode; + /* 0x0288 */ char unk_0288[0x20]; /* 0x02A8 */ TwoHeadGfxArena overlay; /* 0x02B8 */ TwoHeadGfxArena polyOpa; /* 0x02C8 */ TwoHeadGfxArena polyXlu; - /* 0x02D8 */ char unk_2D8[0x0004]; - /* 0x02DC */ UNK_TYPE unk_2DC; -} GraphicsContext; + /* 0x02D8 */ u32 gfxPoolIdx; + /* 0x02DC */ u16* curFrameBuffer; + /* 0x02E0 */ char unk_2E0[4]; + /* 0x02E4 */ u32 viFeatures; + /* 0x02E8 */ s32 fbIdx; + /* 0x02EC */ void (*callback)(struct GraphicsContex*, u32); + /* 0x02F0 */ u32 callbackParam; + /* 0x02F4 */ f32 xScale; + /* 0x02F8 */ f32 yScale; + /* 0x02FC */ char unk_2FC[4]; +} GraphicsContext; // size = 0x300 typedef struct { /* 0x00 */ union { @@ -1326,4 +1360,50 @@ typedef struct { /* 0x20 */ f32 unk_20; } UnkQuakeCalcStruct; // size = 0x24 +typedef struct +{ + /* 0x00 */ u32 idx; + /* 0x04 */ void* ptr; +} UcodeInfo; // size = 0x8 + +typedef struct +{ + /* 0x00 */ u32 segments[NUM_SEGMENTS]; + /* 0x40 */ u32 dl_stack[18]; + /* 0x88 */ u32 dl_depth; + /* 0x8C */ u32 dl_cnt; + /* 0x90 */ u32 vtx_cnt; + /* 0x94 */ u32 spvtx_cnt; + /* 0x98 */ u32 tri1_cnt; + /* 0x9C */ u32 tri2_cnt; + /* 0xA0 */ u32 quad_cnt; + /* 0xA4 */ u32 line_cnt; + /* 0xA8 */ u32 loaducode_cnt; + /* 0xAC */ u32 pipeSyncRequired; + /* 0xB0 */ u32 tileSyncRequired; + /* 0xB4 */ u32 loadSyncRequired; + /* 0xB8 */ u32 sync_err; + /* 0xBC */ u32 enableLog; + /* 0xC0 */ u32 ucodeInfoIdx; + /* 0xC4 */ u32 ucodeInfoCount; + /* 0xC8 */ UcodeInfo* ucodeInfo; + /* 0xCC */ u32 modeH; + /* 0xD0 */ u32 modeL; + /* 0xD4 */ u32 geometryMode; +} UcodeDisas; // size = 0xD8 + +typedef struct +{ + /* 0x00 */ u16* fb1; + /* 0x04 */ u16* swapbuffer; + /* 0x08 */ OSViMode* viMode; + /* 0x0C */ u32 features; + /* 0x10 */ u8 unk_10; + /* 0x11 */ u8 updateRate; + /* 0x12 */ u8 updateRate2; + /* 0x13 */ u8 unk_13; + /* 0x14 */ f32 xScale; + /* 0x18 */ f32 yScale; +} CfbInfo; // size = 0x1C + #endif diff --git a/spec b/spec index 16da9b7ffb..43e928ce01 100644 --- a/spec +++ b/spec @@ -318,7 +318,7 @@ beginseg include "build/src/code/code_8006C3A0.o" include "build/src/code/code_8006C510.o" include "build/src/code/z_fcurve_data_skelanime.o" - include "build/data/z_game_dlftbls.data.o" + include "build/src/code/z_game_dlftbls.o" include "build/src/code/z_horse.o" include "build/src/code/z_jpeg.o" include "build/data/z_jpeg.data.o" @@ -425,10 +425,7 @@ beginseg include "build/data/game.rodata.o" include "build/data/game.bss.o" include "build/src/code/gamealloc.o" - include "build/asm/graph.o" - include "build/data/graph.data.o" - include "build/data/graph.rodata.o" - include "build/data/graph.bss.o" + include "build/src/code/graph.o" include "build/src/code/listalloc.o" include "build/src/code/main.o" include "build/src/code/padmgr.o" diff --git a/src/code/graph.c b/src/code/graph.c new file mode 100644 index 0000000000..a26d9e9f1e --- /dev/null +++ b/src/code/graph.c @@ -0,0 +1,558 @@ +#include +#include +#include +#include +#include + +#define GFXPOOL_HEAD_MAGIC 0x1234 +#define GFXPOOL_TAIL_MAGIC 0x5678 + +OSTime sGraph_UpdateTime; +OSTime sGraphSetTaskTime; +FaultClient sGraphFaultClient; +CfbInfo sGraphCfbInfos[3]; +FaultClient sGraphUcodeFaultClient; + +UcodeInfo D_8012D230[3] = { + { 1, D_80155F50 }, + { 2, NULL }, + { 3, D_801120C0+0xFB0 }, // D_80113070 +}; + +UcodeInfo D_8012D248[3] = { + { 1, D_80155F50 }, + { 2, NULL }, + { 3, D_801120C0+0xFB0 }, // D_80113070 +}; + +void Graph_FaultClient() +{ + void* nextFb; + void* newFb; + + nextFb = osViGetNextFramebuffer(); + newFb = ((u32)SysCfb_GetFbPtr(0) != (u32)nextFb) + ? SysCfb_GetFbPtr(0) + : SysCfb_GetFbPtr(1); + + osViSwapBuffer(newFb); + Fault_WaitForInput(); + osViSwapBuffer(nextFb); +} + +void Graph_DisassembleUCode(void* arg0) +{ + UcodeDisas disassembler; + + if (HREG(80) == 7 && HREG(81) != 0) + { + func_800D7F5C(&disassembler); + disassembler.enableLog = HREG(83); + func_800DAC80(&disassembler, 3, D_8012D230); + func_800DAC90(&disassembler, D_80155F50); + func_800D8400(&disassembler, arg0); + HREG(93) = disassembler.dl_cnt; + HREG(84) = disassembler.tri2_cnt * 2 + disassembler.tri1_cnt + (disassembler.quad_cnt * 2) + disassembler.line_cnt; + HREG(85) = disassembler.vtx_cnt; + HREG(86) = disassembler.spvtx_cnt; + HREG(87) = disassembler.tri1_cnt; + HREG(88) = disassembler.tri2_cnt; + HREG(89) = disassembler.quad_cnt; + HREG(90) = disassembler.line_cnt; + HREG(91) = disassembler.sync_err; + HREG(92) = disassembler.loaducode_cnt; + if (HREG(82) == 1 || HREG(82) == 2) + { + osSyncPrintf("vtx_cnt=%d\n", disassembler.vtx_cnt); + osSyncPrintf("spvtx_cnt=%d\n", disassembler.spvtx_cnt); + osSyncPrintf("tri1_cnt=%d\n", disassembler.tri1_cnt); + osSyncPrintf("tri2_cnt=%d\n", disassembler.tri2_cnt); + osSyncPrintf("quad_cnt=%d\n", disassembler.quad_cnt); + osSyncPrintf("line_cnt=%d\n", disassembler.line_cnt); + osSyncPrintf("sync_err=%d\n", disassembler.sync_err); + osSyncPrintf("loaducode_cnt=%d\n", disassembler.loaducode_cnt); + osSyncPrintf("dl_depth=%d\n", disassembler.dl_depth); + osSyncPrintf("dl_cnt=%d\n", disassembler.dl_cnt); + } + func_800D7FC4(&disassembler); + } +} + +void Graph_UCodeFaultClient(void* arg0) +{ + UcodeDisas disassembler; + + func_800D7F5C(&disassembler); + disassembler.enableLog = true; + func_800DAC80(&disassembler, 3, D_8012D248); + func_800DAC90(&disassembler, D_80155F50); + func_800D8400(&disassembler, arg0); + func_800D7FC4(&disassembler); +} + +void* Graph_InitTHGA(GraphicsContext* gfxCtx) +{ + GfxPool* pool; + + pool = &gGfxPools[gfxCtx->gfxPoolIdx & 1]; + + pool->headMagic = GFXPOOL_HEAD_MAGIC; + pool->tailMagic = GFXPOOL_TAIL_MAGIC; + THGA_Ct(&gfxCtx->polyOpa, pool->polyOpaBuffer, sizeof(pool->polyOpaBuffer)); + THGA_Ct(&gfxCtx->polyXlu, pool->polyXluBuffer, sizeof(pool->polyXluBuffer)); + THGA_Ct(&gfxCtx->overlay, pool->overlayBuffer, sizeof(pool->overlayBuffer)); + THGA_Ct(&gfxCtx->work, pool->workBuffer, sizeof(pool->workBuffer)); + + gfxCtx->polyOpaBuffer = pool->polyOpaBuffer; + gfxCtx->polyXluBuffer = pool->polyXluBuffer; + gfxCtx->overlayBuffer = pool->overlayBuffer; + gfxCtx->workBuffer = pool->workBuffer; + + gfxCtx->curFrameBuffer = (u16*)SysCfb_GetFbPtr(gfxCtx->fbIdx % 2); + gfxCtx->unk_014 = 0; +} + +GameStateOverlay* Graph_GetNextGameState() +{ + void* game_init_func; + + game_init_func = func_800C546C(); + if (game_init_func == TitleSetup_Init) { + return &gGameStateOverlayTable[0]; + } + if (game_init_func == func_80801E44) { + return &gGameStateOverlayTable[1]; + } + if (game_init_func == Title_Init) { + return &gGameStateOverlayTable[2]; + } + if (game_init_func == func_800BCA64) { + return &gGameStateOverlayTable[3]; + } + if (game_init_func == Opening_Init) { + return &gGameStateOverlayTable[4]; + } + if (game_init_func == func_80811A20) { + return &gGameStateOverlayTable[5]; + } + + LogUtils_LogThreadId("../graph.c", 696); osSyncPrintf("game_init_func = %08x\n", game_init_func); + return NULL; +} + +void Graph_Ct(GraphicsContext* gfxCtx) +{ + bzero(gfxCtx, sizeof(GraphicsContext)); + gfxCtx->gfxPoolIdx = 0; + gfxCtx->fbIdx = 0; + gfxCtx->viMode = NULL; + gfxCtx->viFeatures = gViConfigFeatures; + gfxCtx->xScale = gViConfigXScale; + gfxCtx->yScale = gViConfigYScale; + osCreateMesgQueue(&gfxCtx->queue, gfxCtx->msgBuff, ARRAY_COUNT(gfxCtx->msgBuff)); + func_800D31F0(); + Fault_AddClient(&sGraphFaultClient, Graph_FaultClient, 0, 0); +} + +void Graph_Dt(GraphicsContext* gfxCtx) +{ + func_800D3210(); + Fault_RemoveClient(&sGraphFaultClient); +} + +// Close to matching, reordering at the end +#ifdef NON_MATCHING +void Graph_TaskSet00(GraphicsContext* gfxCtx) +{ + static u32 D_8012D260 = 0; + static s32 sGraphCfbInfoIdx = 0; + + OSTimer timer; + OSMesg msg; + OSMesgQueue* mq; + u32 temp; + OSTime time; + OSTask_t* task; + Gfx* gfxArr[3]; + OSScTask* scTask; + CfbInfo* cfb; + + mq = &gfxCtx->queue; + task = &gfxCtx->task.list.t; + scTask = &gfxCtx->task; + + D_8016A528 = osGetTime() - sGraphSetTaskTime - D_8016A558; + + osSetTimer(&timer, 140625000, 0, mq, 666); + + osRecvMesg(mq, &msg, OS_MESG_BLOCK); + osStopTimer(&timer); + if (msg == (OSMesg)666) + { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("RCPが帰ってきませんでした。"); // "RCP did not return." + osSyncPrintf(VT_RST); + LogUtils_LogHexDump(&HW_REG(SP_MEM_ADDR_REG, u32), 0x20); + LogUtils_LogHexDump(&DPC_START_REG, 0x20); + LogUtils_LogHexDump(gGfxSPTaskYieldBuffer, sizeof(gGfxSPTaskYieldBuffer)); + + SREG(6) = -1; + if (D_8012D260) + { + temp = D_8012D260; + HREG(80) = 7; + HREG(81) = 1; + HREG(82) = 2; + D_8012D260 = temp; + Graph_DisassembleUCode(temp); + } + Fault_AddHungupAndCrashImpl("RCP is HUNG UP!!", "Oh! MY GOD!!"); + } + osRecvMesg(mq, &msg, OS_MESG_NOBLOCK); + D_8012D260 = gfxCtx->workBuffer; + if (gfxCtx->callback) + gfxCtx->callback(gfxCtx, gfxCtx->callbackParam); + + time = osGetTime(); + if (D_8016A550) + { + D_8016A558 = (D_8016A558 + time) - D_8016A550; + D_8016A550 = time; + } + D_8016A520 = D_8016A558; + D_8016A558 = 0; + sGraphSetTaskTime = osGetTime(); + + task->type = M_GFXTASK; + task->flags = OS_SC_DRAM_DLIST; + task->ucode_boot = SysUcode_GetUCodeBoot(); + task->ucode_boot_size = SysUcode_GetUcodeBootSize(); + task->ucode = SysUcode_GetUcode(); + task->ucode_data = SysUcode_GetUcodeData(); + task->ucode_size = 0x1000; + task->ucode_data_size = 0x800; + task->dram_stack = gGfxSPTaskStack; + task->dram_stack_size = sizeof(gGfxSPTaskStack); + task->output_buff = gGfxSPTaskOutputBuffer; + task->output_buff_size = gGfxSPTaskYieldBuffer; // ?? + task->data_ptr = gfxCtx->workBuffer; + + Graph_OpenDisp(gfxArr, gfxCtx, "../graph.c", 828); + task->data_size = (u32)gfxCtx->work.p - (u32)gfxCtx->workBuffer; + Graph_CloseDisp(gfxArr, gfxCtx, "../graph.c", 830); + + task->yield_data_ptr = gGfxSPTaskYieldBuffer; + task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer); + + scTask->next = NULL; + scTask->flags = OS_SC_RCP_MASK | OS_SC_SWAPBUFFER | OS_SC_LAST_TASK; + if (SREG(33) & 1) + { + SREG(33) &= ~1; + scTask->flags &= ~OS_SC_SWAPBUFFER; + gfxCtx->fbIdx--; + } + + scTask->msg = NULL; + scTask->msgQ = mq; + + cfb = sGraphCfbInfos + sGraphCfbInfoIdx++; + cfb->fb1 = gfxCtx->curFrameBuffer; + cfb->swapbuffer = gfxCtx->curFrameBuffer; + cfb->viMode = gfxCtx->viMode; + cfb->features = gfxCtx->viFeatures; + cfb->xScale = gfxCtx->xScale; + cfb->yScale = gfxCtx->yScale; + cfb->unk_10 = 0; + cfb->updateRate = R_UPDATE_RATE; + + scTask->framebuffer = cfb; + sGraphCfbInfoIdx = sGraphCfbInfoIdx % ARRAY_COUNT(sGraphCfbInfos); + gfxCtx->schedMsgQ = &gSchedContext.cmdQ; + + osSendMesg(&gSchedContext.cmdQ, scTask, OS_MESG_BLOCK); + func_800C95F8(&gSchedContext); // osScKickEntryMsg +} +#else +u32 D_8012D260 = 0; +u32 sGraphCfbInfoIdx = 0; +#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_TaskSet00.s") +#endif + +// Very close to matching, stack usage +#ifdef NON_MATCHING +void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) +{ + u32 problem; // 0xC4 -> 0xD4 + Gfx* gfxArr[5]; // 0xB0 -> 0xC0 + Gfx* gfxArr2[9]; // 0x8C -> 0x9C + Gfx* gfxArr3[9]; // 0x68 -> 0x78 + u64 time; + GfxPool* pool; // 0x4C -> 0x6C + + gameState->unk_A0 = 0; + Graph_InitTHGA(gfxCtx); + + Graph_OpenDisp(gfxArr, gfxCtx, "../graph.c", 966); + gDPNoOpString(gfxCtx->work.p++, "WORK_DISP 開始", 0); + gDPNoOpString(gfxCtx->polyOpa.p++, "POLY_OPA_DISP 開始", 0); + gDPNoOpString(gfxCtx->polyXlu.p++, "POLY_XLU_DISP 開始", 0); + gDPNoOpString(gfxCtx->overlay.p++, "OVERLAY_DISP 開始", 0); + Graph_CloseDisp(gfxArr, gfxCtx, "../graph.c", 975); + + func_800C4A98(gameState); // Game_ReqPadData + func_800C4AC8(gameState); // Game_SetGameFrame + + Graph_OpenDisp(gfxArr2, gfxCtx, "../graph.c", 987); + gDPNoOpString(gfxCtx->work.p++, "WORK_DISP 終了", 0); + gDPNoOpString(gfxCtx->polyOpa.p++, "POLY_OPA_DISP 終了", 0); + gDPNoOpString(gfxCtx->polyXlu.p++, "POLY_XLU_DISP 終了", 0); + gDPNoOpString(gfxCtx->overlay.p++, "OVERLAY_DISP 終了", 0); + Graph_CloseDisp(gfxArr2, gfxCtx, "../graph.c", 996); + + Graph_OpenDisp(gfxArr3, gfxCtx, "../graph.c", 999); + gSPBranchList(gfxCtx->work.p++, gfxCtx->polyOpaBuffer); + gSPBranchList(gfxCtx->polyOpa.p++, gfxCtx->polyXluBuffer); + gSPBranchList(gfxCtx->polyXlu.p++, gfxCtx->overlayBuffer); + gDPPipeSync(gfxCtx->overlay.p++); + gDPFullSync(gfxCtx->overlay.p++); + gSPEndDisplayList(gfxCtx->overlay.p++); + Graph_CloseDisp(gfxArr3, gfxCtx, "../graph.c", 1028); + + if (HREG(80) == 10 && HREG(93) == 2) { + HREG(80) = 7; + HREG(81) = -1; + HREG(83) = HREG(92); + } + if (HREG(80) == 7 && HREG(81) != 0) { + if (HREG(82) == 3) { + Fault_AddClient(&sGraphUcodeFaultClient, Graph_UCodeFaultClient, gfxCtx->workBuffer, "do_count_fault"); + } + + Graph_DisassembleUCode(gfxCtx->workBuffer); + + if (HREG(82) == 3) { + Fault_RemoveClient(&sGraphUcodeFaultClient); + } + + if (HREG(81) < 0) { + LogUtils_LogHexDump(&HW_REG(SP_MEM_ADDR_REG, u32), 0x20); + LogUtils_LogHexDump(&DPC_START_REG, 0x20); + } + + if (HREG(81) < 0) { + HREG(81) = 0; + } + } + + problem = false; + pool = &gGfxPools[gfxCtx->gfxPoolIdx & 1]; + if (pool->headMagic != GFXPOOL_HEAD_MAGIC) { + // BUG (?) : devs might've forgotten "problem = true;" + osSyncPrintf("%c", 7); + // Dynamic area head is destroyed + osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域先頭が破壊されています\n" VT_RST); + Fault_AddHungupAndCrash("../graph.c", 1070); + } + if (pool->tailMagic != GFXPOOL_TAIL_MAGIC) { + problem = true; + osSyncPrintf("%c", 7); + // Dynamic region tail is destroyed + osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域末尾が破壊されています\n" VT_RST); + Fault_AddHungupAndCrash("../graph.c", 1076); + } + + if (THGA_IsCrash(&gfxCtx->polyOpa)) { + problem = true; + osSyncPrintf("%c", 7); + // Zelda 0 is dead + osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ0は死んでしまった(graph_alloc is empty)\n" VT_RST); + } + if (THGA_IsCrash(&gfxCtx->polyXlu)) { + problem = true; + osSyncPrintf("%c", 7); + // Zelda 1 is dead + osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ1は死んでしまった(graph_alloc is empty)\n" VT_RST); + } + if (THGA_IsCrash(&gfxCtx->overlay)) { + problem = true; + osSyncPrintf("%c", 7); + // Zelda 4 is dead + osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ4は死んでしまった(graph_alloc is empty)\n" VT_RST); + } + + if (!problem) { + Graph_TaskSet00(gfxCtx); + gfxCtx->gfxPoolIdx++; + gfxCtx->fbIdx++; + } + + func_800F3054(); + time = osGetTime(); + D_8016A538 = D_8016A568; + D_8016A530 = D_8016A560; + D_8016A540 = D_8016A580; + D_8016A568 = 0; + D_8016A560 = 0; + D_8016A580 = 0; + + if (sGraph_UpdateTime != 0) { + D_8016A548 = time - sGraph_UpdateTime; + } + sGraph_UpdateTime = time; + + if (D_8012DBC0 && (!~(gameState->input[0].padPressed | ~Z_TRIG)) && (!~(gameState->input[0].raw.pad | ~(L_TRIG | R_TRIG)))) { + gSaveContext.game_mode = 0; + SET_NEXT_GAMESTATE(gameState, func_80801E44, char[0x240]); // TODO : SelectContext + gameState->running = false; + } + + if (D_8012DBC0 && PreNmiBuff_IsResetting(gAppNmiBufferPtr) && !gameState->unk_A0) { + // To reset mode + osSyncPrintf(VT_COL(YELLOW, BLACK) "PRE-NMIによりリセットモードに移行します\n" VT_RST); + SET_NEXT_GAMESTATE(gameState, PreNMI_Init, PreNMIContext); + gameState->running = false; + } +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_Update.s") +#endif + +void Graph_ThreadEntry(void* arg0) +{ + GraphicsContext gfxCtx; + GameState* gameState; + u32 size; + GameStateOverlay* nextOvl; + GameStateOverlay* ovl; + char faultMsg[0x50]; + + nextOvl = &gGameStateOverlayTable[0]; + + // Start graphic thread execution + osSyncPrintf("グラフィックスレッド実行開始\n"); + Graph_Ct(&gfxCtx); + + while(nextOvl) + { + ovl = nextOvl; + Overlay_LoadGameState(ovl); + + size = ovl->instanceSize; + // Class size =%d bytes + osSyncPrintf("クラスサイズ＝%dバイト\n", size); + + gameState = SystemArena_MallocDebug(size, "../graph.c", 1196); + + if (!gameState) + { + // Failure to secure + osSyncPrintf("確保失敗\n"); + + sprintf(faultMsg, "CLASS SIZE= %d bytes", size); + Fault_AddHungupAndCrashImpl("GAME CLASS MALLOC FAILED", faultMsg); + } + func_800C5080(gameState, ovl->init, &gfxCtx); //Game_Ct + + while (func_800C547C(gameState)) //Game_IsGameStateRunning + { + Graph_Update(&gfxCtx, gameState); + } + + nextOvl = Graph_GetNextGameState(gameState); + func_800C5360(gameState); //Game_Dt + SystemArena_FreeDebug(gameState, "../graph.c", 1227); + Overlay_FreeGameState(ovl); + + } + Graph_Dt(&gfxCtx); + // End of graphic thread execution + osSyncPrintf("グラフィックスレッド実行終了\n"); + +} + +void* Graph_Alloc(GraphicsContext* gfxCtx, size_t size) +{ + TwoHeadGfxArena* thga = &gfxCtx->polyOpa; + + if (HREG(59) == 1) + { + osSyncPrintf("graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n", size, thga->size, + thga->bufp, thga->p, thga->d); + } + return THGA_AllocEnd(&gfxCtx->polyOpa, ALIGN16(size)); +} + +void* Graph_Alloc2(GraphicsContext* gfxCtx, size_t size) +{ + TwoHeadGfxArena* thga = &gfxCtx->polyOpa; + + if (HREG(59) == 1) + { + osSyncPrintf("graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n", size, thga->size, + thga->bufp, thga->p, thga->d); + } + return THGA_AllocEnd(&gfxCtx->polyOpa, ALIGN16(size)); +} + +void Graph_OpenDisp(Gfx** gfxArr, GraphicsContext* gfxCtx, const char* file, s32 line) +{ + if (HREG(80) == 7 && HREG(82) != 4) + { + gfxArr[0] = gfxCtx->polyOpa.p; + gfxArr[1] = gfxCtx->polyXlu.p; + gfxArr[2] = gfxCtx->overlay.p; + + gDPNoOpOpenDisp(gfxCtx->polyOpa.p++, file, line); + gDPNoOpOpenDisp(gfxCtx->polyXlu.p++, file, line); + gDPNoOpOpenDisp(gfxCtx->overlay.p++, file, line); + } +} + +void Graph_CloseDisp(Gfx** gfxArr, GraphicsContext* gfxCtx, const char* file, s32 line) +{ + if (HREG(80) == 7 && HREG(82) != 4) + { + if (gfxArr[0] + 1 == gfxCtx->polyOpa.p) + gfxCtx->polyOpa.p = gfxArr[0]; + else + gDPNoOpCloseDisp(gfxCtx->polyOpa.p++, file, line); + + if (gfxArr[1] + 1 == gfxCtx->polyXlu.p) + gfxCtx->polyXlu.p = gfxArr[1]; + else + gDPNoOpCloseDisp(gfxCtx->polyXlu.p++, file, line); + + if (gfxArr[2] + 1 == gfxCtx->overlay.p) + gfxCtx->overlay.p = gfxArr[2]; + else + gDPNoOpCloseDisp(gfxCtx->overlay.p++, file, line); + } +} + +Gfx* Graph_GfxPlusOne(Gfx* gfx) +{ + return gfx+1; +} + +Gfx* Graph_BranchDlist(Gfx* gfx, Gfx* dst) +{ + gSPBranchList(gfx, dst); + return dst; +} + +void* Graph_DlistAlloc(Gfx** gfx, u32 size) +{ + u8* ptr; + Gfx* dst; + + size = ((size + 7) & ~7), + + ptr = *gfx + 1; + + dst = (Gfx*)(ptr + size); + gSPBranchList(*gfx, dst); + + *gfx = dst; + return ptr; +} diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 2781bb5ae6..72fe340b46 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -21,7 +21,7 @@ void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* global if (temp1 >= -50.0f && temp1 < 500.0f) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1553); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1553); gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C); @@ -52,7 +52,7 @@ void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* global G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dlist); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1594); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1594); } } } @@ -76,7 +76,7 @@ void func_8002B66C(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3, f32 sp58; Gfx* gfxArr[7]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1661); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1661); gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0, 0, 0, (u32)(((arg3 * 0.00005f) > 1.0f ? 1.0f : (arg3 * 0.00005f)) * arg4) & 0xFF); @@ -92,7 +92,7 @@ void func_8002B66C(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3, G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, &D_04048180); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1693); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1693); } #ifdef NON_MATCHING @@ -139,7 +139,7 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa temp_s6 -= 2; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1741); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1741); gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C); actor->shape.unk_15 = 0; @@ -209,7 +209,7 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa actor->shape.unk_15 = ((spE0[0] + temp_f0) < (spE0[1] - temp_f0)) ? 2 : 1; } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1831); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1831); } } #else @@ -331,7 +331,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { actor = targetCtx->targetedActor; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2029); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2029); if (targetCtx->unk_48 != 0) { player = PLAYER; @@ -431,7 +431,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { gSPDisplayList(gfxCtx->polyXlu.p++, &D_0400CB70); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2158); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2158); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_8002C124.s") @@ -746,7 +746,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) { sp38 = spCC * 2; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2824); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2824); spB0 = spCC * spC8 * gSaveContext.language; spC8 = (spCC * spC8 > 0x1000) ? 0x1000 / spCC : spC8; @@ -777,7 +777,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) { G_TX_RENDERTILE, 0, 0, 1024, 1024); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2880); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2880); } } @@ -1333,9 +1333,9 @@ Hilite* func_8002EABC(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContex Hilite* hilite; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_actor.c", 4306); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_actor.c", 4306); gfxCtx->polyOpa.p = func_8002E830(object, eye, lightDir, gfxCtx, gfxCtx->polyOpa.p, &hilite); - func_800C6B54(gfxArr, gfxCtx, "../z_actor.c", 4313); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_actor.c", 4313); return hilite; } @@ -1344,9 +1344,9 @@ Hilite* func_8002EB44(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContex Hilite* hilite; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_actor.c", 4332); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_actor.c", 4332); gfxCtx->polyXlu.p = func_8002E830(object, eye, lightDir, gfxCtx, gfxCtx->polyXlu.p, &hilite); - func_800C6B54(gfxArr, gfxCtx, "../z_actor.c", 4339); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_actor.c", 4339); return hilite; } @@ -1375,13 +1375,13 @@ void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) { displayListHead = displayList; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4384); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4384); gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10); gSPEndDisplayList(displayListHead); gSPSegment(gfxCtx->polyOpa.p++, 0x07, displayList); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4394); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4394); } } @@ -1404,13 +1404,13 @@ void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) { displayListHead = displayList; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4429); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4429); gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10); gSPEndDisplayList(displayListHead); gSPSegment(gfxCtx->polyXlu.p++, 0x07, displayList); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4439); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4439); } } @@ -1830,7 +1830,7 @@ void func_8002FBAC(GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 5308); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 5308); if (gSaveContext.respawn[RESPAWN_MODE_TOP].data != 0) { if (LINK_IS_ADULT) { @@ -1962,7 +1962,7 @@ void func_8002FBAC(GlobalContext* globalCtx) { Lights_InitType0PositionalLight(&D_8015BC00, lightPos.x, lightPos.y, lightPos.z, 0xFF, 0xFF, 0xFF, 500.0f * spD4); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 5474); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 5474); } } #else @@ -2198,7 +2198,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6035); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6035); lightMapper = Lights_CreateMapper(&globalCtx->lightCtx, globalCtx->state.gfxCtx); @@ -2253,7 +2253,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { actor->shape.shadowDrawFunc(actor, lightMapper, globalCtx); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6119); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6119); Fault_RemoveClient(&faultClient); } @@ -2275,7 +2275,7 @@ void func_80030ED8(Actor* actor) { void func_80030FA8(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_actor.c", 6161); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_actor.c", 6161); gDPLoadTextureBlock(gfxCtx->polyXlu.p++, &D_0401E370, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); @@ -2284,7 +2284,7 @@ void func_80030FA8(GraphicsContext* gfxCtx) { gSPTextureRectangle(gfxCtx->polyXlu.p++, 0, 0, 1280, 960, G_TX_RENDERTILE, 2240, 1600, 576, 597); gDPPipeSync(gfxCtx->polyXlu.p++); - func_800C6B54(gfxArr, gfxCtx, "../z_actor.c", 6183); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_actor.c", 6183); } void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invisibleActors) { @@ -2295,10 +2295,10 @@ void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invi gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, gfxCtx, "../z_actor.c", 6197); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_actor.c", 6197); // Translates to: "MAGIC LENS START" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "魔法のメガネ START", 0, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ START", 0); gDPPipeSync(gfxCtx->polyXlu.p++); @@ -2326,21 +2326,21 @@ void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invi func_80030FA8(gfxCtx); // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY START" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "魔法のメガネ 見えないＡcｔｏｒ表示 START", nbInvisibleActors, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ 見えないＡcｔｏｒ表示 START", nbInvisibleActors); invisibleActor = &invisibleActors[0]; for (i = 0; i < nbInvisibleActors; i++) { // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "魔法のメガネ 見えないＡcｔｏｒ表示", i, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ 見えないＡcｔｏｒ表示", i); Actor_Draw(globalCtx, *(invisibleActor++)); } // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY END" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "魔法のメガネ 見えないＡcｔｏｒ表示 END", nbInvisibleActors, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ 見えないＡcｔｏｒ表示 END", nbInvisibleActors); if (globalCtx->roomCtx.curRoom.showInvisActors != 0) { // Translates to: "BLUE SPECTACLES (EXTERIOR)" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "青い眼鏡(外側)", 0, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "青い眼鏡(外側)", 0); gDPPipeSync(gfxCtx->polyXlu.p++); @@ -2354,13 +2354,13 @@ void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invi func_80030FA8(gfxCtx); // Translates to: "BLUE SPECTACLES (EXTERIOR)" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "青い眼鏡(外側)", 1, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "青い眼鏡(外側)", 1); } // Translates to: "MAGIC LENS END" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "魔法のメガネ END", 0, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ END", 0); - func_800C6B54(gfxArr, gfxCtx, "../z_actor.c", 6284); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_actor.c", 6284); } s32 func_800314B0(GlobalContext* globalCtx, Actor* actor) { @@ -2396,7 +2396,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { gfxCtx = globalCtx->state.gfxCtx; invisibleActorCounter = 0; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6336); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6336); actorListEntry = &actorCtx->actorList[0]; @@ -2406,8 +2406,8 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { overlayEntry = actor->overlayEntry; actorName = overlayEntry->name != NULL ? overlayEntry->name : ""; - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, actorName, i, 2); - gDma1p(gfxCtx->polyXlu.p++, G_NOOP, actorName, i, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, actorName, i); + gDPNoOpString(gfxCtx->polyXlu.p++, actorName, i); HREG(66) = i; @@ -2485,7 +2485,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { func_8005D62C(globalCtx, &globalCtx->sub_11E60); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6563); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6563); } void func_80031A28(GlobalContext* globalCtx, ActorContext* actorCtx) { @@ -3485,7 +3485,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8120); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8120); if (0) {} // Necessary to match @@ -3512,7 +3512,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, &D_04049210); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8155); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8155); } void func_80033DB8(GlobalContext* globalCtx, s16 arg1, s16 arg2) { @@ -3578,7 +3578,7 @@ void func_80033F54(GlobalContext* globalCtx, s32 arg1, s32 arg2) { var = entry->unk_10; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8265); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8265); Matrix_Translate(0.0f, entry->unk_08, 500.0f, MTXMODE_APPLY); Matrix_Get(&spB0); @@ -3615,7 +3615,7 @@ void func_80033F54(GlobalContext* globalCtx, s32 arg1, s32 arg2) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, entry->unk_18); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8319); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8319); } void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1) { @@ -3889,7 +3889,7 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_Lim GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8831); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8831); func_80093D18(globalCtx->state.gfxCtx); @@ -3901,7 +3901,7 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_Lim gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyOpa.p); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8860); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8860); } void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_LimbUpdateMatrix2 unkFunc1, @@ -3909,7 +3909,7 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_Lim GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8876); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8876); func_80093D84(globalCtx->state.gfxCtx); @@ -3920,7 +3920,7 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_Lim gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyXlu.p); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8904); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8904); } s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) { diff --git a/src/code/z_cheap_proc.c b/src/code/z_cheap_proc.c index 7e5bbb2758..740120df89 100644 --- a/src/code/z_cheap_proc.c +++ b/src/code/z_cheap_proc.c @@ -5,26 +5,26 @@ void Gfx_DrawDListOpa(GlobalContext* globalCtx, u32 dlist) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 214); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 214); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 216), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dlist); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219); } void Gfx_DrawDListXlu(GlobalContext* globalCtx, u32 dlist) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 228); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 228); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 230), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, dlist); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 233); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 233); } diff --git a/src/code/z_debug.c b/src/code/z_debug.c index e5bc9199f2..a4febc4c7f 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -223,10 +223,10 @@ void func_80063D7C(GraphicsContext* gfxCtx) { void* unk[2]; Gfx* dlFrame[4]; // stores state of GfxCtx next ptrs - func_800C6AC4(&dlFrame, gfxCtx, "../z_debug.c", 628); + Graph_OpenDisp(&dlFrame, gfxCtx, "../z_debug.c", 628); GfxPrint_Ctor(&gfxPrint); sp78 = gfxCtx->polyOpa.p; - tempRet = func_800C6C20(gfxCtx->polyOpa.p); + tempRet = Graph_GfxPlusOne(gfxCtx->polyOpa.p); gSPDisplayList(gfxCtx->overlay.p++, tempRet); GfxPrint_Open(&gfxPrint, tempRet); @@ -241,9 +241,9 @@ void func_80063D7C(GraphicsContext* gfxCtx) { D_8011E0B0 = 0; sp7C = GfxPrint_Close(&gfxPrint); gSPEndDisplayList(sp7C++); - func_800C6C28(sp78, sp7C); + Graph_BranchDlist(sp78, sp7C); gfxCtx->polyOpa.p = sp7C; if (0) {} - func_800C6B54(&dlFrame, gfxCtx, "../z_debug.c", 664); + Graph_CloseDisp(&dlFrame, gfxCtx, "../z_debug.c", 664); GfxPrint_Dtor(&gfxPrint); } diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index e96ccdc2fe..82765d9f65 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -74,7 +74,7 @@ static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, Glo GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 169); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 169); func_80094678(globalCtx->state.gfxCtx); @@ -92,14 +92,14 @@ static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, Glo G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_04004298); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 192); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 192); } static void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 211); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 211); func_8009435C(globalCtx->state.gfxCtx); gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a); @@ -113,5 +113,5 @@ static void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, Global G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, dlist); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 231); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 231); } diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 436dbfc15c..8cdd7e8f69 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1876,17 +1876,17 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) { if (BREG(0) != 0) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_demo.c", 4101); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_demo.c", 4101); prevDisplayList = gfxCtx->polyOpa.p; - displayList = func_800C6C20(gfxCtx->polyOpa.p); + displayList = Graph_GfxPlusOne(gfxCtx->polyOpa.p); gSPDisplayList(gfxCtx->overlay.p++, displayList); Cutscene_DrawDebugInfo(globalCtx, &displayList, csCtx); gSPEndDisplayList(displayList++); - func_800C6C28(prevDisplayList, displayList); + Graph_BranchDlist(prevDisplayList, displayList); gfxCtx->polyOpa.p = displayList; - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_demo.c", 4108); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_demo.c", 4108); } csCtx->frames++; diff --git a/src/code/z_draw.c b/src/code/z_draw.c index cb737b55c5..187b4226e3 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -171,35 +171,35 @@ static void func_800694E4(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 556); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 556); func_80093BA8(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 560), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 565); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 565); } static void func_800695C0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 572); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 572); gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 5); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 576), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 581); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 581); } static void func_8006969C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 588); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 588); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 592), @@ -219,14 +219,14 @@ static void func_8006969C(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); Matrix_Pull(); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 621); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 621); } static void func_80069880(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 628); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 628); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 632), @@ -249,14 +249,14 @@ static void func_80069880(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); Matrix_Pull(); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 663); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 663); } static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 670); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 670); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 674), @@ -278,14 +278,14 @@ static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); Matrix_Pull(); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 704); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 704); } static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 712); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 712); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -302,14 +302,14 @@ static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 735); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 735); } static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 742); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 742); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 746), @@ -325,14 +325,14 @@ static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 765); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 765); } static void func_8006A060(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 772); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 772); func_80093BA8(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 776), @@ -340,14 +340,14 @@ static void func_8006A060(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 783); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 783); } static void func_8006A158(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 811); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 811); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 815), @@ -359,14 +359,14 @@ static void func_8006A158(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 827); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 827); } static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 834); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 834); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -386,14 +386,14 @@ static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[4]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[5]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 861); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 861); } static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 868); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 868); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -404,14 +404,14 @@ static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 883); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 883); } static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 890); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 890); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -422,14 +422,14 @@ static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 906); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 906); } static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 913); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 913); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -440,14 +440,14 @@ static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 929); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 929); } static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 936); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 936); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -458,28 +458,28 @@ static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 952); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 952); } static void func_8006A9CC(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 959); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 959); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 963), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 968); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 968); } static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 975); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 975); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 979), @@ -491,27 +491,27 @@ static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 991); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 991); } static void func_8006ABEC(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 998); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 998); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1002), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1008); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1008); } static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1015); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1015); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1019), @@ -524,14 +524,14 @@ static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1032); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1032); } static void func_8006AE40(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1039); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1039); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1043), @@ -544,14 +544,14 @@ static void func_8006AE40(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1056); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1056); } static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1063); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1063); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -564,14 +564,14 @@ static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1081); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1081); } static void func_8006B124(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1088); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1088); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1092), @@ -581,14 +581,14 @@ static void func_8006B124(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[2]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[3]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1100); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1100); } static void func_8006B24C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1108); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1108); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1112), @@ -602,14 +602,14 @@ static void func_8006B24C(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1126); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1126); } static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1133); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1133); Matrix_Scale(0.7f, 0.7f, 0.7f, MTXMODE_APPLY); @@ -625,14 +625,14 @@ static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1154); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1154); } static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1162); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1162); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -646,14 +646,14 @@ static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1181); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1181); } static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1188); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1188); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1192), @@ -668,7 +668,7 @@ static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[4]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1207); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1207); } static void func_8006B870(GlobalContext* globalCtx, s16 drawId) { @@ -676,7 +676,7 @@ static void func_8006B870(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1214); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1214); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1218), @@ -690,5 +690,5 @@ static void func_8006B870(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[6]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[7]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1230); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1230); } diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 8861a309a0..4b91bba400 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -12,11 +12,11 @@ void func_80020F60(u32 unused, GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, D_80135180, 809); + Graph_OpenDisp(gfxArr, gfxCtx, D_80135180, 809); gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x26); - func_800C6B54(gfxArr, gfxCtx, D_80135194, 813); + Graph_CloseDisp(gfxArr, gfxCtx, D_80135194, 813); } #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80020FC0.s") diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 85cc0e9c27..5a23dedfc4 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -333,7 +333,7 @@ void En_A_Obj_Draw(ActorEnAObj* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_a_keep.c", 701); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_a_keep.c", 701); func_80093D18(globalCtx->state.gfxCtx); @@ -349,5 +349,5 @@ void En_A_Obj_Draw(ActorEnAObj* this, GlobalContext* globalCtx) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, D_80115484[type]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_a_keep.c", 715); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_a_keep.c", 715); } diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 348e983ba3..22bf17b0eb 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -769,7 +769,7 @@ void func_8001EF30(ActorEnItem00* this, GlobalContext* globalCtx) { s32 iconNb; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1546); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1546); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); @@ -789,7 +789,7 @@ void func_8001EF30(ActorEnItem00* this, GlobalContext* globalCtx) { gSPDisplayList(gfxCtx->polyOpa.p++, &D_04042440); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1568); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1568); } /** @@ -802,7 +802,7 @@ void func_8001F080(ActorEnItem00* this, GlobalContext* globalCtx) { iconNb = this->actor.params - 3; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1594); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1594); gfxCtx->polyOpa.p = func_800BC8A0(globalCtx, gfxCtx->polyOpa.p); @@ -820,7 +820,7 @@ void func_8001F080(ActorEnItem00* this, GlobalContext* globalCtx) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, &D_0403F070); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1611); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1611); } /** @@ -830,7 +830,7 @@ void func_8001F1F4(ActorEnItem00* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1623); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1623); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); @@ -844,7 +844,7 @@ void func_8001F1F4(ActorEnItem00* this, GlobalContext* globalCtx) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_0403BCD8); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1647); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1647); } /** @@ -854,7 +854,7 @@ void func_8001F334(ActorEnItem00* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1658); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1658); func_80093D84(globalCtx->state.gfxCtx); func_8002ED80(&this->actor, globalCtx, 0); @@ -862,7 +862,7 @@ void func_8001F334(ActorEnItem00* this, GlobalContext* globalCtx) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_0403B030); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1673); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1673); } /** diff --git a/src/code/z_game_dlftbls.c b/src/code/z_game_dlftbls.c new file mode 100644 index 0000000000..99fa15069b --- /dev/null +++ b/src/code/z_game_dlftbls.c @@ -0,0 +1,26 @@ +#include + +#define GAMESTATE_OVERLAY(name, init, destroy, size) \ + { \ + NULL, \ + (u32)_ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, \ + _ovl_##name##SegmentStart, _ovl_##name##SegmentEnd, \ + 0, init, destroy, 0, 0, 0, size \ + } +#define GAMESTATE_OVERLAY_INTERNAL(init, destroy, size) \ + { \ + NULL, \ + 0, 0, \ + NULL, NULL, \ + 0, init, destroy, 0, 0, 0, size \ + } + +GameStateOverlay gGameStateOverlayTable[] = +{ + GAMESTATE_OVERLAY_INTERNAL(TitleSetup_Init, TitleSetup_Destroy, sizeof(GameState)), + GAMESTATE_OVERLAY(select, func_80801E44, func_80801E0C, 0x240), // TODO : sizeof(SelectContext) + GAMESTATE_OVERLAY(title, Title_Init, Title_Destroy, sizeof(TitleContext)), + GAMESTATE_OVERLAY_INTERNAL(func_800BCA64, func_800BC8EC, sizeof(GlobalContext)), + GAMESTATE_OVERLAY(opening, Opening_Init, Opening_Destroy, sizeof(OpeningContext)), + GAMESTATE_OVERLAY(file_choose, func_80811A20, func_80811A18, 0x1CAE0), +}; \ No newline at end of file diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 27050cf24f..ea70e8ecee 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -208,7 +208,7 @@ void Interface_DrawHealth(GlobalContext* globalCtx) { s32 ddHeartCountMinusOne = gSaveContext.defense_hearts - 1; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_lifemeter.c", 353); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_lifemeter.c", 353); if (!(gSaveContext.health % 0x10)) { fullHeartCount--; @@ -379,7 +379,7 @@ void Interface_DrawHealth(GlobalContext* globalCtx) { } } - func_800C6B54(gfxArr, gfxCtx, "../z_lifemeter.c", 606); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_lifemeter.c", 606); } u32 Health_IsCritical(void); diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 2c93435917..31fd739649 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -101,7 +101,7 @@ void MapMark_Draw(GlobalContext* globalCtx) { mapMarkData = &sLoadedMarkDataTable[dungeonId][interfaceCtx->roomNum][0]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_map_mark.c", 303); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_map_mark.c", 303); while (1) { if (mapMarkData->markType == -1) { @@ -134,7 +134,7 @@ void MapMark_Draw(GlobalContext* globalCtx) { mapMarkData++; } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_map_mark.c", 339); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_map_mark.c", 339); } void MapMark_DrawConditionally(GlobalContext* globalCtx) { diff --git a/src/code/z_moji.c b/src/code/z_moji.c index 05a7a282c8..c9568b33f8 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -39,7 +39,7 @@ void func_8007B934(s32 arg0, s32 arg1) { void func_8007B9A4(GraphicsContext* gfxCtx, u8 arg1) { Gfx* gfxArr[7]; - func_800C6AC4(gfxArr, gfxCtx, "../z_moji.c", 86); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_moji.c", 86); if ((u32)gLetterTLUT & 0xF) { osSyncPrintf("moji_tlut --> %X\n", gLetterTLUT); @@ -54,14 +54,14 @@ void func_8007B9A4(GraphicsContext* gfxCtx, u8 arg1) { (D_80120124 + 8) << 2, G_TX_RENDERTILE, (u16)(arg1 & 4) * 64, (u16)(arg1 >> 3) * 256, 1024, 1024); - func_800C6B54(gfxArr, gfxCtx, "../z_moji.c", 123); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_moji.c", 123); } void func_8007BBA8(GraphicsContext* gfxCtx, u8* arg1) { s32 i; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_moji.c", 137); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_moji.c", 137); if ((u32)gFontFF & 0xF) { osSyncPrintf("font_ff --> %X\n", gFontFF); @@ -108,5 +108,5 @@ void func_8007BBA8(GraphicsContext* gfxCtx, u8* arg1) { } } - func_800C6B54(gfxArr, gfxCtx, "../z_moji.c", 181); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_moji.c", 181); } diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 73b02a892b..bd1cc13e0f 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -2585,7 +2585,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2650); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2650); if (gSaveContext.magic_level != 0) { if (gSaveContext.health_capacity > 0xA0) { @@ -2660,7 +2660,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { } } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2731); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2731); } void func_80088AA0(s16 arg0) { @@ -2702,7 +2702,7 @@ void func_80088B34(s16 arg0) { void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_parameter.c", 2820); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_parameter.c", 2820); gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, texture); gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, @@ -2716,7 +2716,7 @@ void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) { gSP1Quadrangle(gfxCtx->overlay.p++, 0, 2, 3, 1, 0); - func_800C6B54(gfxArr, gfxCtx, "../z_parameter.c", 2829); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_parameter.c", 2829); } u8* sCUpLabelTextures[] = { D_02002FC0, D_02002FC0, D_02002FC0 }; @@ -2737,7 +2737,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2900); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2900); // B Button Color & Texture // Also loads the Item Button Texture reused by other buttons afterwards @@ -2881,7 +2881,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { } } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3071); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3071); } #else void Interface_DrawItemButtons(GlobalContext* globalCtx); @@ -2893,7 +2893,7 @@ void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3079); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3079); gDPLoadTextureBlock(gfxCtx->overlay.p++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -2903,7 +2903,7 @@ void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 (R_ITEM_ICON_Y(button) + R_ITEM_ICON_WIDTH(button)) << 2, G_TX_RENDERTILE, 0, 0, R_ITEM_ICON_DD(button) * 2, R_ITEM_ICON_DD(button) * 2); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3094); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3094); } void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { @@ -2914,7 +2914,7 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { Gfx* gfxArr[3]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3105); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3105); item = gSaveContext.equips.button_items[button]; @@ -2964,7 +2964,7 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3158); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3158); } void Interface_DrawActionButton(GlobalContext* globalCtx) { @@ -2973,7 +2973,7 @@ void Interface_DrawActionButton(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3172); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3172); Matrix_Translate(0.0f, 0.0f, XREG(18) / 10.0f, MTXMODE_NEW); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); @@ -2991,7 +2991,7 @@ void Interface_DrawActionButton(GlobalContext* globalCtx) { gSP1Quadrangle(gfxCtx->overlay.p++, 0, 2, 3, 1, 0); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3187); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3187); } void Interface_InitVertices(GlobalContext* globalCtx) { @@ -3153,7 +3153,7 @@ void Interface_Draw(GlobalContext* globalCtx) { s32 pad; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3405); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3405); gSPSegment(gfxCtx->overlay.p++, 0x02, interfaceCtx->parameterSegment); gSPSegment(gfxCtx->overlay.p++, 0x07, interfaceCtx->do_actionSegment); @@ -3968,7 +3968,7 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPFillRectangle(gfxCtx->overlay.p++, 0, 0, gScreenWidth - 1, gScreenHeight - 1); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 4269); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 4269); } #else s16 D_8015FFE0; diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index a44fa72140..f29816dc10 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -30,7 +30,7 @@ void PreNMI_Draw(PreNMIContext* prenmiCtx) { osSyncPrintf(VT_COL(YELLOW, BLACK) "prenmi_draw\n" VT_RST); - func_800C6AC4(gfxArr, gfxCtx, "../z_prenmi.c", 96); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_prenmi.c", 96); gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); @@ -39,7 +39,7 @@ void PreNMI_Draw(PreNMIContext* prenmiCtx) { (GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1)); gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, SCREEN_WIDTH - 1, prenmiCtx->timer + 100); - func_800C6B54(gfxArr, gfxCtx, "../z_prenmi.c", 112); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_prenmi.c", 112); } void PreNMI_Main(PreNMIContext* prenmiCtx) { diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 9df3b257df..e3b71a460d 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -891,101 +891,101 @@ Gfx* func_80093808(Gfx* gfx) { void func_80093848(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1293); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1293); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3A]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1297); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1297); } void func_800938B4(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1309); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1309); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x39]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1313); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1313); } void func_80093920(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1325); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1325); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x32]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1329); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1329); } void func_8009398C(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1341); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1341); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x33]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1345); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1345); } void func_800939F8(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1357); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1357); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x34]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1361); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1361); } void func_80093A64(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1373); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1373); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x35]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1377); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1377); } void func_80093AD0(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1389); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1389); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x36]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1393); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1393); } void func_80093B3C(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1405); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1405); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x37]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1409); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1409); } void func_80093BA8(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1421); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1421); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1A]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1425); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1425); } void func_80093C14(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1439); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1439); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1443); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1443); } void func_80093C80(GlobalContext* globalCtx) { @@ -996,62 +996,62 @@ void func_80093C80(GlobalContext* globalCtx) { func_80093D18(gfxCtx); if (globalCtx->roomCtx.curRoom.unk_03 == 3) { - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1460); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1460); gDPSetColorDither(gfxCtx->polyOpa.p++, G_CD_DISABLE); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1462); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1462); } } void func_80093D18(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1475); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1475); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x19]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1479); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1479); } void func_80093D84(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1491); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1491); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1495); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1495); } void func_80093DF0(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1507); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1507); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1F]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1511); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1511); } void func_80093E5C(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1523); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1523); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x20]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1527); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1527); } void func_80093EC8(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1539); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1539); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x21]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1543); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1543); } Gfx* func_80093F34(Gfx* gfx) { @@ -1067,41 +1067,41 @@ Gfx* func_80093F58(Gfx* gfx) { void func_80093F7C(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1569); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1569); gfxCtx->polyOpa.p = func_80093F58(gfxCtx->polyOpa.p); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1573); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1573); } void func_80093FD8(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1585); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1585); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x23]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1589); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1589); } void func_80094044(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1601); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1601); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2C]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1605); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1605); } void func_800940B0(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1617); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1617); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x24]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1621); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1621); } Gfx* func_8009411C(Gfx* gfx) { @@ -1112,81 +1112,81 @@ Gfx* func_8009411C(Gfx* gfx) { void func_80094140(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1640); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1640); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1C]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1644); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1644); } void func_800941AC(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1651); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1651); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2B]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1655); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1655); } void func_80094218(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1670); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1670); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2D]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1674); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1674); } void func_80094284(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1681); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1681); gSPDisplayList(gfxCtx->overlay.p++, &sSetupDL[6 * 0x2E]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1685); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1685); } void func_800942F0(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1700); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1700); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x26]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1704); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1704); } void func_8009435C(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1722); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1722); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x04]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1726); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1726); } void func_800943C8(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1758); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1758); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x25]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1762); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1762); } void func_80094434(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1775); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1775); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x02]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1779); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1779); } Gfx* func_800944A0(Gfx* gfx) { @@ -1197,21 +1197,21 @@ Gfx* func_800944A0(Gfx* gfx) { void func_800944C4(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1799); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1799); gfxCtx->polyOpa.p = func_800944A0(gfxCtx->polyOpa.p); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1801); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1801); } void func_80094520(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1809); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1809); gfxCtx->overlay.p = func_800944A0(gfxCtx->overlay.p); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1811); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1811); } void func_8009457C(Gfx** gfxp) { @@ -1223,31 +1223,31 @@ void func_8009457C(Gfx** gfxp) { void func_800945A0(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1837); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1837); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x28]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1841); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1841); } void func_8009460C(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1853); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1853); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x29]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1857); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1857); } void func_80094678(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1869); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1869); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2F]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1873); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1873); } Gfx* func_800946E4(Gfx* gfx) { @@ -1309,82 +1309,82 @@ Gfx* func_80094968(Gfx* gfx) { void func_800949A8(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1953); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1953); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2A]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1957); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1957); } void func_80094A14(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1964); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1964); gSPDisplayList(gfxCtx->overlay.p++, &sSetupDL[6 * 0x2A]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1968); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1968); } void func_80094A80(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1992); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 1992); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x30]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1996); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 1996); } void func_80094AEC(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2008); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2008); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x31]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2012); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2012); } void func_80094B58(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2024); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2024); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x1B]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2028); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2028); } void func_80094BC4(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2040); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2040); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3C]); gDPSetColorDither(gfxCtx->polyXlu.p++, G_CD_DISABLE); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2043); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2043); } void func_80094C50(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2056); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2056); gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3D]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2058); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2058); } void func_80094CBC(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2086); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2086); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x38]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2090); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2090); } void func_80094D28(Gfx** gfxp) { @@ -1396,17 +1396,17 @@ void func_80094D28(Gfx** gfxp) { void func_80094D4C(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2112); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2112); gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3B]); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2116); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2116); } #ifdef NON_MATCHING // regalloc differences void Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height) { - Gfx* displayList = func_800C6C3C(gfxp, 3 * sizeof(Gfx)); + Gfx* displayList = Graph_DlistAlloc(gfxp, 3 * sizeof(Gfx)); gDPTileSync(displayList); gDPSetTileSize(displayList + 1, 0, x, y, (x + ((width - 1) << 2)), (y + ((height - 1) << 2))); @@ -1487,7 +1487,7 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { Gfx* gfxArr[5]; s32 ret; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2386); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2386); gSPDisplayList(gfxCtx->polyOpa.p++, sFillSetupDL); gSPDisplayList(gfxCtx->polyXlu.p++, sFillSetupDL); @@ -1499,10 +1499,10 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { gDPSetScissorFrac(gfxCtx->overlay.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, (s32)gScreenHeight * 4.0f); - gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); - gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); - gDPSetColorImage(gfxCtx->polyXlu.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); - gDPSetColorImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetColorImage(gfxCtx->polyXlu.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetColorImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); gDPSetDepthImage(gfxCtx->polyOpa.p++, gZBuffer); gDPSetDepthImage(gfxCtx->polyXlu.p++, gZBuffer); @@ -1559,7 +1559,7 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { gDPFillRectangle(gfxCtx->polyOpa.p++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_FILL); gDPSetRenderMode(gfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); gDPSetFillColor(gfxCtx->polyOpa.p++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1)); @@ -1577,19 +1577,19 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { } } - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2497); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2497); } void func_80095974(GraphicsContext* gfxCtx) { Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2503); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_rcp.c", 2503); gSPDisplayList(gfxCtx->polyOpa.p++, sFillSetupDL); gDPSetScissorFrac(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, (s32)gScreenHeight * 4.0f); gDPSetDepthImage(gfxCtx->polyOpa.p++, gZBuffer); - gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); - func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2513); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_rcp.c", 2513); } diff --git a/src/code/z_room.c b/src/code/z_room.c index 77eb175225..ac4e829c55 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -41,7 +41,7 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 193); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 193); if (flags & 1) { func_800342EC(&D_801270A0, globalCtx); @@ -71,7 +71,7 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) { polygonDlist++; } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 239); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 239); } #define SHAPE_SORT_MAX 64 @@ -110,7 +110,7 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { spB0 = NULL; spB4 = NULL; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(sp5C, globalCtx->state.gfxCtx, "../z_room.c", 287); + Graph_OpenDisp(sp5C, globalCtx->state.gfxCtx, "../z_room.c", 287); if (flags & 1) { func_800342EC(&D_801270A0, globalCtx); @@ -222,7 +222,7 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { iREG(88) = sp9C - 1; - func_800C6B54(sp5C, globalCtx->state.gfxCtx, "../z_room.c", 430); + Graph_CloseDisp(sp5C, globalCtx->state.gfxCtx, "../z_room.c", 430); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_room/func_80095D04.s") @@ -353,7 +353,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 628); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 628); camera = globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]; polygon1 = &room->mesh->polygon1; @@ -399,7 +399,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { gSPDisplayList(gfxCtx->polyXlu.p++, polygonDlist->xlu); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 691); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 691); } typedef struct { @@ -459,7 +459,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 752); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 752); camera = globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]; sp98 = (camera->unk_142 ^ 25) == 0; @@ -505,7 +505,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { gSPDisplayList(gfxCtx->polyXlu.p++, polygonDlist->xlu); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 819); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 819); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_room/func_80096B6C.s") diff --git a/src/code/z_sample.c b/src/code/z_sample.c index 3a7ca5885f..5c9d7d6ce5 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -18,7 +18,7 @@ void Sample_Draw(SampleContext* this) { Gfx* gfxArr[4]; Mtx* mtx; - func_800C6AC4(gfxArr, gfxCtx, "../z_sample.c", 62); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_sample.c", 62); gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL); gSPSegment(gfxCtx->polyOpa.p++, 0x01, this->staticSegment); @@ -41,7 +41,7 @@ void Sample_Draw(SampleContext* this) { PRIMITIVE); gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0xFF, 0xFF, 0x00, 0x00); - func_800C6B54(gfxArr, gfxCtx, "../z_sample.c", 111); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_sample.c", 111); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/Sample_Draw.s") diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 4ecf34556f..a4ff5a2246 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -684,12 +684,12 @@ void func_80099550(GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4725); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4725); gSPDisplayList(gfxCtx->polyOpa.p++, sDefaultDisplayList); gSPDisplayList(gfxCtx->polyXlu.p++, sDefaultDisplayList); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4735); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4735); } u32 D_8012A2F8[] = { 0x0200BA18, 0x0200CA18 }; @@ -703,7 +703,7 @@ void func_800995DC(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4763); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4763); gSPSegment(gfxCtx->polyXlu.p++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, @@ -716,7 +716,7 @@ void func_800995DC(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A2F8[gSaveContext.night_flag])); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4783); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4783); } // Scene Draw Config 28 @@ -726,7 +726,7 @@ void func_80099760(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4845); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4845); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -736,7 +736,7 @@ void func_80099760(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4859); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4859); } u32 D_8012A300[] = { 0x02012378, 0x02013378 }; @@ -753,7 +753,7 @@ void func_80099878(GlobalContext* globalCtx) { displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 6 * sizeof(Gfx)); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4905); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4905); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A300[gSaveContext.night_flag])); @@ -782,7 +782,7 @@ void func_80099878(GlobalContext* globalCtx) { gDPSetEnvColor(displayListHead++, 0xFF, 0xFF, 0xFF, globalCtx->unk_11D30[1]); gSPEndDisplayList(displayListHead); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4956); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4956); } // Scene Draw Config 30 @@ -795,7 +795,7 @@ void func_80099BD8(GlobalContext* globalCtx) { displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 18 * sizeof(Gfx)); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5069); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5069); temp = globalCtx->unk_11D30[0] / 255.0f; @@ -839,7 +839,7 @@ void func_80099BD8(GlobalContext* globalCtx) { gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->unk_11D30[1]); gSPEndDisplayList(displayListHead); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5145); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5145); if (gSaveContext.scene_setup_index == 5) { D_8015FCF0 = 1; @@ -859,7 +859,7 @@ void func_8009A45C(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5171); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5171); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -884,7 +884,7 @@ void func_8009A45C(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5212); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5212); } // Scene Draw Config 32 @@ -894,7 +894,7 @@ void func_8009A798(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5226); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5226); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -916,7 +916,7 @@ void func_8009A798(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5264); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5264); } // Scene Draw Config 33 @@ -926,7 +926,7 @@ void func_8009A9DC(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5278); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5278); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -942,7 +942,7 @@ void func_8009A9DC(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5301); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5301); } // Scene Draw Config 48 @@ -952,7 +952,7 @@ void func_8009AB98(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5317); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5317); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); @@ -963,7 +963,7 @@ void func_8009AB98(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5330); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5330); } // Scene Draw Config 39 @@ -973,7 +973,7 @@ void func_8009ACA8(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5346); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5346); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -987,7 +987,7 @@ void func_8009ACA8(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5367); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5367); } // Scene Draw Config 24 @@ -997,7 +997,7 @@ void func_8009AE30(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5384); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5384); gameplayFrames = globalCtx->gameplayFrames; @@ -1017,7 +1017,7 @@ void func_8009AE30(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5416); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5416); } u32 D_8012A328[] = { 0x0200BD20, 0x0200B920 }; @@ -1029,7 +1029,7 @@ void func_8009AFE0(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5490); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5490); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x09, @@ -1039,7 +1039,7 @@ void func_8009AFE0(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A328[gSaveContext.night_flag])); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5507); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5507); } u32 D_8012A330[] = { 0x02014C30, 0x02015830 }; @@ -1053,7 +1053,7 @@ void func_8009B0FC(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5535); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5535); if (1) {} // Necessary to match @@ -1116,7 +1116,7 @@ void func_8009B0FC(GlobalContext* globalCtx) { { s32 pad[2]; } // Necessary to match stack usage - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5644); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5644); } // Scene Draw Config 29 @@ -1126,7 +1126,7 @@ void func_8009B86C(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5791); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5791); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -1138,7 +1138,7 @@ void func_8009B86C(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x91); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5808); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5808); } // Scene Draw Config 34 @@ -1148,7 +1148,7 @@ void func_8009B9BC(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5822); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5822); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16)); @@ -1156,7 +1156,7 @@ void func_8009B9BC(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5836); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5836); } // Scene Draw Config 35 @@ -1166,7 +1166,7 @@ void func_8009BAA4(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5850); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5850); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -1184,7 +1184,7 @@ void func_8009BAA4(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5876); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5876); } // Scene Draw Config 36 @@ -1199,7 +1199,7 @@ void func_8009BC44(GlobalContext* globalCtx) { sp83 = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5894); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5894); gameplayFrames = globalCtx->gameplayFrames; @@ -1226,7 +1226,7 @@ void func_8009BC44(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, sp83, sp83, sp83, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5930); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5930); } // Screen Shake for Ganon's Tower Collapse @@ -1266,7 +1266,7 @@ void func_8009C0AC(GlobalContext* globalCtx) { sp7B = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5968); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5968); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -1289,7 +1289,7 @@ void func_8009C0AC(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, sp7B, sp7B, sp7B, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6004); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6004); if (Flags_GetSwitch(globalCtx, 0x37)) { if ((globalCtx->sceneNum == SCENE_GANON_DEMO) || (globalCtx->sceneNum == SCENE_GANON_FINAL) || @@ -1310,7 +1310,7 @@ void func_8009C3EC(GlobalContext* globalCtx) { if (0) {} // Necessary to match gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6042); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6042); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A338[gSaveContext.night_flag])); @@ -1329,7 +1329,7 @@ void func_8009C3EC(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6076); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6076); } // Scene Draw Config 42 @@ -1339,7 +1339,7 @@ void func_8009C608(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6151); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6151); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -1360,7 +1360,7 @@ void func_8009C608(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6187); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6187); } // Scene Draw Config 43 @@ -1370,7 +1370,7 @@ void func_8009C8B8(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6201); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6201); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -1387,7 +1387,7 @@ void func_8009C8B8(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6232); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6232); } // Scene Draw Config 47 @@ -1397,7 +1397,7 @@ void func_8009CAC0(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6249); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6249); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -1410,7 +1410,7 @@ void func_8009CAC0(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6264); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6264); } u32 D_8012A340[] = { 0x0200F8C0, 0x020100C0 }; @@ -1424,7 +1424,7 @@ void func_8009CC00(GlobalContext* globalCtx) { if (0) {} // Necessary to match gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6290); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6290); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A340[gSaveContext.night_flag])); @@ -1443,7 +1443,7 @@ void func_8009CC00(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6320); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6320); } Gfx* Gfx_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, @@ -1472,7 +1472,7 @@ void func_8009CF84(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6433); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6433); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -1487,7 +1487,7 @@ void func_8009CF84(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6449); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6449); } // Scene Draw Config 41 @@ -1497,7 +1497,7 @@ void func_8009D0E8(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6463); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6463); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -1515,7 +1515,7 @@ void func_8009D0E8(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6491); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6491); } u32 D_8012A348[] = { 0x02005210, 0x02005010 }; @@ -1527,7 +1527,7 @@ void func_8009D31C(GlobalContext* globalCtx) { s32 pad[2]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6515); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6515); gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A348[gSaveContext.night_flag])); @@ -1537,7 +1537,7 @@ void func_8009D31C(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6528); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6528); } u32 D_8012A350[] = { 0x02006550, 0x02003550 }; @@ -1550,7 +1550,7 @@ void func_8009D438(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6560); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6560); if (LINK_IS_ADULT) { var = 1; @@ -1567,7 +1567,7 @@ void func_8009D438(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6581); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6581); } // Scene Draw Config 46 @@ -1577,7 +1577,7 @@ void func_8009D5B4(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6595); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6595); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -1592,7 +1592,7 @@ void func_8009D5B4(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6615); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6615); } u32 D_8012A360[] = { 0x02014D90, 0x02014590 }; @@ -1606,7 +1606,7 @@ void func_8009D758(GlobalContext* globalCtx) { if (0) {} // Necessary to match gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6640); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6640); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A360[gSaveContext.night_flag])); @@ -1625,7 +1625,7 @@ void func_8009D758(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6671); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6671); } u32 D_8012A368[] = { 0x02018920, 0x02018020 }; @@ -1637,11 +1637,11 @@ void func_8009D974(GlobalContext* globalCtx) { s32 pad[2]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6752); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6752); gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A368[gSaveContext.night_flag])); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6762); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6762); } // Scene Draw Config 1 @@ -1654,7 +1654,7 @@ void func_8009DA30(GlobalContext* globalCtx) { displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 3 * sizeof(Gfx)); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6814); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6814); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -1690,7 +1690,7 @@ void func_8009DA30(GlobalContext* globalCtx) { gSPEndDisplayList(displayListHead); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6866); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6866); } u32 D_8012A370[] = { 0x02015B50, 0x02016B50 }; @@ -1702,7 +1702,7 @@ void func_8009DD5C(GlobalContext* globalCtx) { s32 pad[2]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6890); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6890); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A370[gSaveContext.night_flag])); @@ -1712,7 +1712,7 @@ void func_8009DD5C(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6903); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6903); } // Scene Draw Config 3 @@ -1722,7 +1722,7 @@ void func_8009DE78(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6917); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6917); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -1741,7 +1741,7 @@ void func_8009DE78(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6948); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6948); } // Scene Draw Config 4 @@ -1759,7 +1759,7 @@ void func_8009E0B8(GlobalContext* globalCtx) { displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 6 * sizeof(Gfx)); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6965); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6965); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x09, @@ -1798,7 +1798,7 @@ void func_8009E0B8(GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16, 1, 0, (s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16)); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7044); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7044); } // Scene Draw Config 5 @@ -1808,7 +1808,7 @@ void func_8009E54C(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7058); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7058); if ((gSaveContext.scene_setup_index > 3) || (LINK_IS_ADULT && !(gSaveContext.event_chk_inf[6] & 0x200))) { globalCtx->unk_11D30[0] = 87; @@ -1825,7 +1825,7 @@ void func_8009E54C(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0xFF, 0xFF, 0xFF, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7097); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7097); } u32 D_8012A378[] = { 0x02008F98, 0x02008FD8 }; @@ -1838,7 +1838,7 @@ void func_8009E730(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7123); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7123); gameplayFrames = globalCtx->gameplayFrames; var = 127 - (gameplayFrames * 1) % 128; @@ -1855,7 +1855,7 @@ void func_8009E730(GlobalContext* globalCtx) { { s32 pad[2]; } // Necessary to match stack usage - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7147); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7147); } // Scene Draw Config 7 @@ -1865,7 +1865,7 @@ void func_8009E8C0(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7161); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7161); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -1883,7 +1883,7 @@ void func_8009E8C0(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7192); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7192); } // Scene Draw Config 8 @@ -1893,7 +1893,7 @@ void func_8009EAD8(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7206); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7206); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -1921,7 +1921,7 @@ void func_8009EAD8(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7260); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7260); } // Scene Draw Config 9 @@ -1933,7 +1933,7 @@ void func_8009EE44(GlobalContext* globalCtx) { if (0) {} // Necessary to match gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7274); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7274); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -1957,7 +1957,7 @@ void func_8009EE44(GlobalContext* globalCtx) { globalCtx->unk_11D30[1]++; } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7309); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7309); } // Scene Draw Config 10 @@ -1967,7 +1967,7 @@ void func_8009F074(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7323); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7323); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -1979,7 +1979,7 @@ void func_8009F074(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7339); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7339); } u32 D_8012A380[] = { 0x02009678, 0x0200DE78 }; @@ -1991,11 +1991,11 @@ void func_8009F1B4(GlobalContext* globalCtx) { s32 pad[2]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7363); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7363); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.night_flag])); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7371); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7371); } // Scene Draw Config 12 @@ -2005,7 +2005,7 @@ void func_8009F270(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7385); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7385); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -2021,7 +2021,7 @@ void func_8009F270(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7409); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7409); } // Scene Draw Config 13 @@ -2031,7 +2031,7 @@ void func_8009F40C(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7423); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7423); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -2047,7 +2047,7 @@ void func_8009F40C(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7443); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7443); } // Scene Draw Config 14 @@ -2059,7 +2059,7 @@ void func_8009F5D4(GlobalContext* globalCtx) { displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 3 * sizeof(Gfx)); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7461); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7461); gSPSegment(gfxCtx->polyXlu.p++, 0x08, displayListHead); @@ -2087,7 +2087,7 @@ void func_8009F5D4(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7495); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7495); } // Scene Draw Config 15 @@ -2102,7 +2102,7 @@ void func_8009F7D4(GlobalContext* globalCtx) { sp6E = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7512); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7512); gameplayFrames = globalCtx->gameplayFrames; sp6F = (sp6F >> 1) + 192; @@ -2118,7 +2118,7 @@ void func_8009F7D4(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7530); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7530); } u32 D_8012A388[] = { 0x02009808, 0x02008FC8 }; @@ -2130,7 +2130,7 @@ void func_8009F9D0(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7555); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7555); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -2147,7 +2147,7 @@ void func_8009F9D0(GlobalContext* globalCtx) { { s32 pad[2]; } // Necessary to match stack usage - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7578); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7578); } u32 D_8012A390[] = { 0x020081E0, 0x0200FBE0 }; @@ -2159,7 +2159,7 @@ void func_8009FB74(GlobalContext* globalCtx) { s32 pad[2]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7602); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7602); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A390[gSaveContext.night_flag])); @@ -2169,7 +2169,7 @@ void func_8009FB74(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7615); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7615); } // Scene Draw Config 18 @@ -2179,7 +2179,7 @@ void func_8009FC90(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7630); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7630); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -2196,7 +2196,7 @@ void func_8009FC90(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x40); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7653); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7653); } f32 D_8012A398 = 0.0f; @@ -2213,7 +2213,7 @@ void func_8009FE58(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7712); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7712); gameplayFrames = globalCtx->gameplayFrames; if (globalCtx->sceneNum == SCENE_BDAN) { @@ -2278,7 +2278,7 @@ void func_8009FE58(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x0D, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_scene_table.c", 7809)); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7811); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7811); } #else s16 D_8012A39C = 538; @@ -2294,7 +2294,7 @@ void func_800A0334(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7825); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7825); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, @@ -2313,7 +2313,7 @@ void func_800A0334(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7852); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7852); } // Scene Draw Config 52 @@ -2333,7 +2333,7 @@ void func_800A059C(GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7893); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7893); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, @@ -2347,7 +2347,7 @@ void func_800A059C(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7910); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7910); } void (*sSceneDrawHandlers[])(GlobalContext*) = { @@ -2384,14 +2384,14 @@ void Scene_Draw(GlobalContext* globalCtx) { } gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 8104); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 8104); if (HREG(81) == 1) { gSPDisplayList(gfxCtx->polyOpa.p++, sDefaultDisplayList); gSPDisplayList(gfxCtx->polyXlu.p++, sDefaultDisplayList); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 8109); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 8109); if (HREG(82) == 1) { sSceneDrawHandlers[globalCtx->sceneConfig](globalCtx); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 05f23531c5..cc78b7c74a 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -39,7 +39,7 @@ void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* sk Gfx* gfx[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 773); + Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 773); Matrix_Push(); limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); limbIndex++; @@ -80,7 +80,7 @@ void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* sk appendDlistFunc, actor, dListIndex); } - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 821); + Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 821); } /* @@ -104,7 +104,7 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* acto return; } gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 849); + Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 849); Matrix_Push(); limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); @@ -133,7 +133,7 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* acto } Matrix_Pull(); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 894); + Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 894); } /* @@ -169,10 +169,10 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* if (dList[1] != NULL) { Matrix_ToMtx(*mtx, "../z_skelanime.c", 945); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 946); + Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 946); gSPMatrix(gfxCtx->polyOpa.p++, *mtx, G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 949); + Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 949); (*mtx)++; } else if (dList[0] != NULL) { Matrix_ToMtx(*mtx, "../z_skelanime.c", 954); @@ -221,7 +221,7 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* ac return; } gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1000); + Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1000); gSPSegment(gfxCtx->polyOpa.p++, 0xD, mtx); Matrix_Push(); @@ -258,7 +258,7 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* ac Matrix_Pull(); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1053); + Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1053); } /* @@ -276,7 +276,7 @@ void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skele gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1076); + Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1076); Matrix_Push(); limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); @@ -316,7 +316,7 @@ void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skele appendDlistFunc, actor); } - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1121); + Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1121); } void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, @@ -338,7 +338,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDr gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1148); + Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1148); Matrix_Push(); rootLimb = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); @@ -369,7 +369,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDr Matrix_Pull(); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1190); + Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1190); } void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, @@ -383,7 +383,7 @@ void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* ske Gfx* gfx[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1214); + Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1214); Matrix_Push(); limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); @@ -426,7 +426,7 @@ void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* ske appendDlistFunc, actor, limbMatricies); } - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1265); + Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1265); } void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, @@ -452,7 +452,7 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actor gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1294); + Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1294); gSPSegment(gfxCtx->polyOpa.p++, 0xD, mtx); @@ -494,7 +494,7 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actor } Matrix_Pull(); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1347); + Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1347); } /* diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 2a289272d6..4ae0e556a9 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -204,7 +204,7 @@ void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx) { if (1) {} tranform = (arrow->hitWall & 2) ? &this->actor : &arrow->actor; // clang-format off - gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 618); + gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 618); // clang-format on Matrix_Translate(tranform->posRot.pos.x, tranform->posRot.pos.y, tranform->posRot.pos.z, MTXMODE_NEW); Matrix_RotateY(tranform->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY); @@ -241,6 +241,6 @@ void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (stateFrames * 2) % 256, 0, 64, 32, 1, 255 - stateFrames % 256, 511 - (stateFrames * 10) % 512, 64, 64)); gSPDisplayList(gfxCtx->polyXlu.p++, vertexDL); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682); } } diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index f119387994..7aa9e23b32 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -204,7 +204,7 @@ void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx) { if (1) {} tranform = (arrow->hitWall & 2) ? &this->actor : &arrow->actor; // clang-format off - gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 610); + gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 610); // clang-format on Matrix_Translate(tranform->posRot.pos.x, tranform->posRot.pos.y, tranform->posRot.pos.z, MTXMODE_NEW); Matrix_RotateY(tranform->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY); @@ -241,6 +241,6 @@ void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 128, 32, 1, 511 - (stateFrames * 10) % 512, 511 - (stateFrames * 10) % 512, 4, 16)); gSPDisplayList(gfxCtx->polyXlu.p++, vertexDL); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676); } } diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 4a1826d422..455ebfb834 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -204,7 +204,7 @@ void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx) { if (1) {} tranform = (arrow->hitWall & 2) ? &this->actor : &arrow->actor; // clang-format off - gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_light.c", 598); + gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_light.c", 598); // clang-format on Matrix_Translate(tranform->posRot.pos.x, tranform->posRot.pos.y, tranform->posRot.pos.z, MTXMODE_NEW); Matrix_RotateY(tranform->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY); @@ -241,6 +241,6 @@ void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 4, 32, 1, 511 - (stateFrames * 10) % 512, 511 - (stateFrames * 30) % 512, 8, 16)); gSPDisplayList(gfxCtx->polyXlu.p++, vertexDL); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_light.c", 664); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_arrow_light.c", 664); } } diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index f3c3d96280..2b6db35f0a 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -128,12 +128,12 @@ static void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 323); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 323); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 328), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_06001CD0); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333); } diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index de85919322..1e49d57890 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -104,7 +104,7 @@ void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 260); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 260); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 8, @@ -120,5 +120,5 @@ void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx) { gSPDisplayList(gfxCtx->polyXlu.p++, &D_06000600); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285); } diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index 02693ebae5..4064914c65 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -100,7 +100,7 @@ static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) { Gfx* gfxArr[4]; s32 pad; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250); if (this->dyna.actor.params != 0) { objBankIndex = Object_GetIndex(&globalCtx->objectCtx, objectTbl[this->dyna.actor.params - 1]); if (objBankIndex >= 0) { @@ -115,5 +115,5 @@ static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) { gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 285), G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dlist); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 288); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 288); } diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index a2fc2c41d5..61945bc6f8 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -77,10 +77,10 @@ static void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 263); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 263); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 269), G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, &D_06000000); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 272); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 272); } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index 682e091ae6..f5277448fa 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -86,12 +86,12 @@ static void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 210); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 210); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 214), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_06000100); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 219); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 219); } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 6520fe9764..4bacbf60d7 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -77,12 +77,12 @@ static void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 162); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 162); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 166), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_06003B20); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 171); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 171); } diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 5d8800934d..072f4a158a 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -172,13 +172,13 @@ static void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, dlists[thisx->params]); if (thisx->params == 3) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 388); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 388); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 391), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyXlu.p++, &D_06008010); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396); } } diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index 759863cf32..32dc0bb77f 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -94,12 +94,12 @@ void BgSpot15Saku_Draw(BgSpot15Saku* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 259); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 259); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 263), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyXlu.p++, &D_060003C0); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268); } diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index adbe4abf33..05eee78a9a 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -282,7 +282,7 @@ static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx) { state = &globalCtx->state; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, state->gfxCtx, "../z_bg_toki_swd.c", 727); + Graph_OpenDisp(gfxArr, state->gfxCtx, "../z_bg_toki_swd.c", 727); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); @@ -293,5 +293,5 @@ static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_06001BD0); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776); } diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index 7d9e0fbb96..21bdae4b55 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -126,14 +126,14 @@ static void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) { tempgfxCtx = globalCtx->state.gfxCtx; gfxCtx = tempgfxCtx; - func_800C6AC4(gfxArr, gfxCtx, "../z_bg_zg.c", 311); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_bg_zg.c", 311); func_80093D18(gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_bg_zg.c", 315), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_06001080); - func_800C6B54(gfxArr, gfxCtx, "../z_bg_zg.c", 320); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_bg_zg.c", 320); } static void BgZg_Draw(BgZg* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 9bb0c4b88a..5bf1160c59 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -74,7 +74,7 @@ static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_demo_geff.c", 181); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_demo_geff.c", 181); func_80093D18(gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_demo_geff.c", 183), @@ -82,7 +82,7 @@ static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) { gSPDisplayList(gfxCtx->polyOpa.p++, dlist); gSPPopMatrix(gfxCtx->polyOpa.p++, G_MTX_MODELVIEW); - func_800C6B54(gfxArr, gfxCtx, "../z_demo_geff.c", 188); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_demo_geff.c", 188); } static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { @@ -91,7 +91,7 @@ static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_demo_geff.c", 204); + Graph_OpenDisp(gfxArr, gfxCtx, "../z_demo_geff.c", 204); gSPSegment(gfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[objBankIndex].segment); gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objBankIndex].segment); @@ -99,7 +99,7 @@ static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { // Necessary to match if (!globalCtx) {} - func_800C6B54(gfxArr, gfxCtx, "../z_demo_geff.c", 212); + Graph_CloseDisp(gfxArr, gfxCtx, "../z_demo_geff.c", 212); } static void func_80978030(DemoGeff* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 342791c51d..27230207e0 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -338,7 +338,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 732); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 732); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(srcSegment8)); @@ -347,7 +347,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) { SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, &this->actor); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 746); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 746); } void DemoGo_Draw(DemoGo* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 1baa96137f..46a7ed0744 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -168,10 +168,10 @@ static void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx) { Gfx** dList = &D_05001390; // required for stack placement? Gfx* gfxArr[3]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_door_ana.c", 440); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_door_ana.c", 440); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_ana.c", 446), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyXlu.p++, dList); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_door_ana.c", 449); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_door_ana.c", 449); } diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 6bc88ee3a8..f367115058 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -285,7 +285,7 @@ static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_boom.c", 567); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_boom.c", 567); Matrix_RotateY(this->actor.posRot.rot.y * 0.0000958738f, MTXMODE_APPLY); Matrix_RotateZ(0.7669904f, MTXMODE_APPLY); Matrix_RotateX(this->actor.posRot.rot.x * 0.0000958738f, MTXMODE_APPLY); @@ -303,5 +303,5 @@ static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_0400C808); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_boom.c", 604); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_boom.c", 604); } diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index ae3159cfca..37e26da4a5 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -468,7 +468,7 @@ static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 972); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 972); func_80093D18(globalCtx->state.gfxCtx); gDPPipeSync(gfxCtx->polyOpa.p++); @@ -477,5 +477,5 @@ static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) { SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, EnDog_Callback1, EnDog_Callback2, &this->actor); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 994); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 994); } diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index e1705ecd52..01829bdc5b 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -117,7 +117,7 @@ void EnGanonOrgan_Draw(EnGanonOrgan* this, GlobalContext* globalCtx) { dorf = (BossGanon*)this->actor.attachedA; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(&gfxArr, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 205); + Graph_OpenDisp(&gfxArr, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 205); osSyncPrintf("ORGAN DRAW 1\n"); func_80093D18(globalCtx->state.gfxCtx); if ((this->actor.params == 1) && (dorf->organFadeTimer != 0xff)) { @@ -134,5 +134,5 @@ void EnGanonOrgan_Draw(EnGanonOrgan* this, GlobalContext* globalCtx) { gSPDisplayList(gfxCtx->polyOpa.p++, &D_80A2CCA8); gSPDisplayList(gfxCtx->polyOpa.p++, &D_80A2EAB0); osSyncPrintf("ORGAN DRAW 2\n"); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 230); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 230); } diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 373ea40116..0a17d5e28b 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -138,7 +138,7 @@ static void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 327); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 327); func_80093D18(globalCtx->state.gfxCtx); Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); @@ -147,5 +147,5 @@ static void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dListTbl[this->actor.params]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 337); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 337); } diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index c48654cf1d..0884435ab2 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -472,7 +472,7 @@ static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); @@ -483,7 +483,7 @@ static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, NULL, gfxCtx->polyXlu.p); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); } static void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) { @@ -790,7 +790,7 @@ static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 642); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 642); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); @@ -800,7 +800,7 @@ static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, &this->actor); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663); } static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c index a765f6fb83..0c5d13d9e0 100644 --- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c +++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c @@ -65,11 +65,11 @@ static void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 290); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 290); displayListHead = displayList; gSPSegment(gfxCtx->polyOpa.p++, 0x0C, displayListHead); func_80093D18(globalCtx->state.gfxCtx); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 386); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 386); } diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index e812b30470..241e4152bc 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -72,12 +72,12 @@ static void func_80B17FC4(EnTana* this, GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 148); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 148); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 152), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, dListTbl[thisx->params]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 157); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 157); } static void func_80B1809C(EnTana* this, GlobalContext* globalCtx) { @@ -86,11 +86,11 @@ static void func_80B1809C(EnTana* this, GlobalContext* globalCtx) { Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 163); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 163); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(dListTbl2[thisx->params])); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 169), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, dListTbl[thisx->params]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 174); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_en_tana.c", 174); } diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 3352419c9a..c35ad9072c 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -108,12 +108,12 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { Gfx* pgdl[4]; /* - * This assignment always occurs before a call to func_800C6AC4 which + * This assignment always occurs before a call to Graph_OpenDisp which * makes me suspect that they're inside a macro where the function call - * is present only for debug builds. Same for func_800C6B54 most likely. + * is present only for debug builds. Same for Graph_CloseDisp most likely. */ gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114); + Graph_OpenDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114); gfxSetup = 0; @@ -154,7 +154,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { eff++; } - func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154); + Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154); } s32 EnTkEff_CreateDflt(EnTk* this, Vec3f* pos, u8 duration, f32 size, f32 growth, f32 yAccelMax) { @@ -697,11 +697,11 @@ void func_80B1D200(GlobalContext* globalCtx) { Gfx* pgdl[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188); + Graph_OpenDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188); gSPDisplayList(gfxCtx->polyOpa.p++, D_0600ACE0); - func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190); + Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190); } s32 func_80B1D278(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) { @@ -755,7 +755,7 @@ void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) { Matrix_Pull(); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1294); + Graph_OpenDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1294); func_80093D18(globalCtx->state.gfxCtx); @@ -764,5 +764,5 @@ void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) { SkelAnime_DrawSV(globalCtx, thisAgain->skelAnim.skeleton, thisAgain->skelAnim.actorDrawTbl, thisAgain->skelAnim.dListCount, func_80B1D278, func_80B1D2E4, &thisAgain->actor); - func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312); + Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312); } diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 7c5d8e6420..36f142913e 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -570,7 +570,7 @@ static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { } // clang-format off - gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1386); + gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisp(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1386); // clang-format on func_80094044(globalCtx->state.gfxCtx); @@ -591,7 +591,7 @@ static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1421), G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_04049210); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426); + Graph_CloseDisp(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426); } static s32 EnWallMas_UpdatePos(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, @@ -615,7 +615,7 @@ static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi if (limbIndex == 2) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1478); + Graph_OpenDisp(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1478); Matrix_Push(); Matrix_Translate(1600.0f, -700.0f, -1700.0f, MTXMODE_APPLY); Matrix_RotateY(DEGREE_60_RAD, MTXMODE_APPLY); @@ -626,7 +626,7 @@ static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi gSPDisplayList(gfxCtx->polyOpa.p++, D_06008688); Matrix_Pull(); - func_800C6B54(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495); + Graph_CloseDisp(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495); } } diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 8fc88f2d71..015c11b2f5 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -187,7 +187,7 @@ void ObjComb_Draw(ObjComb* this, GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_obj_comb.c", 369); + Graph_OpenDisp(gfxArr, globalCtx->state.gfxCtx, "../z_obj_comb.c", 369); func_80093D18(globalCtx->state.gfxCtx); Matrix_Translate(this->actor.posRot.pos.x, this->actor.posRot.pos.y + (118.0f * this->actor.scale.y), @@ -204,5 +204,5 @@ void ObjComb_Draw(ObjComb* this, GlobalContext* globalCtx) { gSPDisplayList(gfxCtx->polyOpa.p++, &D_050095B0); func_800628A4(0, &this->collider); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_obj_comb.c", 402); + Graph_CloseDisp(gfxArr, globalCtx->state.gfxCtx, "../z_obj_comb.c", 402); } diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index eae5fd28b9..d17fb10b10 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -138,4 +138,6 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A18.s") + #pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s") diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c index 416b45a2e7..61113886a6 100644 --- a/src/overlays/gamestates/ovl_opening/z_opening.c +++ b/src/overlays/gamestates/ovl_opening/z_opening.c @@ -26,7 +26,7 @@ static void Opening_Update(OpeningContext* this) { func_80803C5C(this); } -static void Opening_Destroy(OpeningContext* this) { +void Opening_Destroy(OpeningContext* this) { } void Opening_Init(OpeningContext* this) { diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index e417cbbd25..b1c097ccab 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -77,7 +77,7 @@ void Title_Draw(TitleContext* this) { GraphicsContext* gfxCtx = this->state.gfxCtx; Gfx* gfxArr[4]; - func_800C6AC4(&gfxArr, this->state.gfxCtx, "../z_title.c", 395); + Graph_OpenDisp(&gfxArr, this->state.gfxCtx, "../z_title.c", 395); v3.x = 69; v3.y = 69; @@ -124,7 +124,7 @@ void Title_Draw(TitleContext* this) { sTitleRotY += 300; - func_800C6B54(&gfxArr, this->state.gfxCtx, "../z_title.c", 483); + Graph_CloseDisp(&gfxArr, this->state.gfxCtx, "../z_title.c", 483); } void Title_Update(TitleContext* this) { @@ -134,7 +134,7 @@ void Title_Update(TitleContext* this) { u32 pad2; Gfx* gfx[2]; - func_800C6AC4(&gfxArr, this->state.gfxCtx, "../z_title.c", 494); + Graph_OpenDisp(&gfxArr, this->state.gfxCtx, "../z_title.c", 494); gSPSegment(gfxCtx->polyOpa.p++, 0, NULL); gSPSegment(gfxCtx->polyOpa.p++, 1, this->staticSegment); @@ -154,7 +154,7 @@ void Title_Update(TitleContext* this) { SET_NEXT_GAMESTATE(&this->state, Opening_Init, OpeningContext); } - func_800C6B54(&gfxArr, this->state.gfxCtx, "../z_title.c", 541); + Graph_CloseDisp(&gfxArr, this->state.gfxCtx, "../z_title.c", 541); } void Title_Destroy(TitleContext* this) {