mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-04 02:46:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

seven equals and problematic functions

Browse Source 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
This commit is contained in:
Anghelo
2021-01-26 18:18:12 -03:00
parent 4b9af9eee9
commit 3356fb91c4
8 changed files with 39 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A000.s
-33
View File
@@ -1,33 +0,0 @@
glabel func_8097A000
/* 016D0 8097A000 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 016D4 8097A004 AFBF0014 */ sw $ra, 0x0014($sp)
/* 016D8 8097A008 AFA5001C */ sw $a1, 0x001C($sp)
/* 016DC 8097A00C 0C00B638 */ jal Actor_MoveForward
/* 016E0 8097A010 AFA40018 */ sw $a0, 0x0018($sp)
/* 016E4 8097A014 3C028016 */ lui $v0, %hi(gGameInfo)
/* 016E8 8097A018 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 016EC 8097A01C 8FA40018 */ lw $a0, 0x0018($sp)
/* 016F0 8097A020 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 016F4 8097A024 848E016C */ lh $t6, 0x016C($a0) ## 0000016C
/* 016F8 8097A028 85F81478 */ lh $t8, 0x1478($t7) ## 00001478
/* 016FC 8097A02C 8488016E */ lh $t0, 0x016E($a0) ## 0000016E
/* 01700 8097A030 01D8C821 */ addu $t9, $t6, $t8
/* 01704 8097A034 A499016C */ sh $t9, 0x016C($a0) ## 0000016C
/* 01708 8097A038 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 0170C 8097A03C 848E0170 */ lh $t6, 0x0170($a0) ## 00000170
/* 01710 8097A040 852A147A */ lh $t2, 0x147A($t1) ## 0000147A
/* 01714 8097A044 254D03E8 */ addiu $t5, $t2, 0x03E8 ## $t5 = 000003E8
/* 01718 8097A048 010D7821 */ addu $t7, $t0, $t5
/* 0171C 8097A04C A48F016E */ sh $t7, 0x016E($a0) ## 0000016E
/* 01720 8097A050 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90
/* 01724 8097A054 8719147C */ lh $t9, 0x147C($t8) ## 0000147C
/* 01728 8097A058 272B0BB8 */ addiu $t3, $t9, 0x0BB8 ## $t3 = 00000BB8
/* 0172C 8097A05C 01CB6021 */ addu $t4, $t6, $t3
/* 01730 8097A060 A48C0170 */ sh $t4, 0x0170($a0) ## 00000170
/* 01734 8097A064 0C25E48F */ jal func_8097923C
/* 01738 8097A068 8FA5001C */ lw $a1, 0x001C($sp)
/* 0173C 8097A06C 8FBF0014 */ lw $ra, 0x0014($sp)
/* 01740 8097A070 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 01744 8097A074 03E00008 */ jr $ra
/* 01748 8097A078 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A238.s
-33
View File
@@ -1,33 +0,0 @@
glabel func_8097A238
/* 01908 8097A238 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 0190C 8097A23C AFBF0014 */ sw $ra, 0x0014($sp)
/* 01910 8097A240 AFA5001C */ sw $a1, 0x001C($sp)
/* 01914 8097A244 0C00B638 */ jal Actor_MoveForward
/* 01918 8097A248 AFA40018 */ sw $a0, 0x0018($sp)
/* 0191C 8097A24C 3C028016 */ lui $v0, %hi(gGameInfo)
/* 01920 8097A250 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 01924 8097A254 8FA40018 */ lw $a0, 0x0018($sp)
/* 01928 8097A258 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 0192C 8097A25C 848E016C */ lh $t6, 0x016C($a0) ## 0000016C
/* 01930 8097A260 85F81492 */ lh $t8, 0x1492($t7) ## 00001492
/* 01934 8097A264 8488016E */ lh $t0, 0x016E($a0) ## 0000016E
/* 01938 8097A268 01D8C821 */ addu $t9, $t6, $t8
/* 0193C 8097A26C A499016C */ sh $t9, 0x016C($a0) ## 0000016C
/* 01940 8097A270 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 01944 8097A274 848E0170 */ lh $t6, 0x0170($a0) ## 00000170
/* 01948 8097A278 852A1494 */ lh $t2, 0x1494($t1) ## 00001494
/* 0194C 8097A27C 254D03E8 */ addiu $t5, $t2, 0x03E8 ## $t5 = 000003E8
/* 01950 8097A280 010D7821 */ addu $t7, $t0, $t5
/* 01954 8097A284 A48F016E */ sh $t7, 0x016E($a0) ## 0000016E
/* 01958 8097A288 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90
/* 0195C 8097A28C 87191496 */ lh $t9, 0x1496($t8) ## 00001496
/* 01960 8097A290 272B0BB8 */ addiu $t3, $t9, 0x0BB8 ## $t3 = 00000BB8
/* 01964 8097A294 01CB6021 */ addu $t4, $t6, $t3
/* 01968 8097A298 A48C0170 */ sh $t4, 0x0170($a0) ## 00000170
/* 0196C 8097A29C 0C25E48F */ jal func_8097923C
/* 01970 8097A2A0 8FA5001C */ lw $a1, 0x001C($sp)
/* 01974 8097A2A4 8FBF0014 */ lw $ra, 0x0014($sp)
/* 01978 8097A2A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 0197C 8097A2AC 03E00008 */ jr $ra
/* 01980 8097A2B0 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s
-33
View File
@@ -1,33 +0,0 @@
glabel func_8097A474
/* 01B44 8097A474 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 01B48 8097A478 AFBF0014 */ sw $ra, 0x0014($sp)
/* 01B4C 8097A47C AFA5001C */ sw $a1, 0x001C($sp)
/* 01B50 8097A480 0C00B638 */ jal Actor_MoveForward
/* 01B54 8097A484 AFA40018 */ sw $a0, 0x0018($sp)
/* 01B58 8097A488 3C028016 */ lui $v0, %hi(gGameInfo)
/* 01B5C 8097A48C 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 01B60 8097A490 8FA40018 */ lw $a0, 0x0018($sp)
/* 01B64 8097A494 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 01B68 8097A498 848E016C */ lh $t6, 0x016C($a0) ## 0000016C
/* 01B6C 8097A49C 85F814AC */ lh $t8, 0x14AC($t7) ## 000014AC
/* 01B70 8097A4A0 8488016E */ lh $t0, 0x016E($a0) ## 0000016E
/* 01B74 8097A4A4 01D8C821 */ addu $t9, $t6, $t8
/* 01B78 8097A4A8 A499016C */ sh $t9, 0x016C($a0) ## 0000016C
/* 01B7C 8097A4AC 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 01B80 8097A4B0 848E0170 */ lh $t6, 0x0170($a0) ## 00000170
/* 01B84 8097A4B4 852A14AE */ lh $t2, 0x14AE($t1) ## 000014AE
/* 01B88 8097A4B8 254D03E8 */ addiu $t5, $t2, 0x03E8 ## $t5 = 000003E8
/* 01B8C 8097A4BC 010D7821 */ addu $t7, $t0, $t5
/* 01B90 8097A4C0 A48F016E */ sh $t7, 0x016E($a0) ## 0000016E
/* 01B94 8097A4C4 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90
/* 01B98 8097A4C8 871914B0 */ lh $t9, 0x14B0($t8) ## 000014B0
/* 01B9C 8097A4CC 272B0BB8 */ addiu $t3, $t9, 0x0BB8 ## $t3 = 00000BB8
/* 01BA0 8097A4D0 01CB6021 */ addu $t4, $t6, $t3
/* 01BA4 8097A4D4 A48C0170 */ sh $t4, 0x0170($a0) ## 00000170
/* 01BA8 8097A4D8 0C25E48F */ jal func_8097923C
/* 01BAC 8097A4DC 8FA5001C */ lw $a1, 0x001C($sp)
/* 01BB0 8097A4E0 8FBF0014 */ lw $ra, 0x0014($sp)
/* 01BB4 8097A4E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 01BB8 8097A4E8 03E00008 */ jr $ra
/* 01BBC 8097A4EC 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s
-33
View File
@@ -1,33 +0,0 @@
glabel func_8097A644
/* 01D14 8097A644 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 01D18 8097A648 AFBF0014 */ sw $ra, 0x0014($sp)
/* 01D1C 8097A64C AFA5001C */ sw $a1, 0x001C($sp)
/* 01D20 8097A650 0C00B638 */ jal Actor_MoveForward
/* 01D24 8097A654 AFA40018 */ sw $a0, 0x0018($sp)
/* 01D28 8097A658 3C028016 */ lui $v0, %hi(gGameInfo)
/* 01D2C 8097A65C 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 01D30 8097A660 8FA40018 */ lw $a0, 0x0018($sp)
/* 01D34 8097A664 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 01D38 8097A668 848E016C */ lh $t6, 0x016C($a0) ## 0000016C
/* 01D3C 8097A66C 85F814C6 */ lh $t8, 0x14C6($t7) ## 000014C6
/* 01D40 8097A670 8488016E */ lh $t0, 0x016E($a0) ## 0000016E
/* 01D44 8097A674 01D8C821 */ addu $t9, $t6, $t8
/* 01D48 8097A678 A499016C */ sh $t9, 0x016C($a0) ## 0000016C
/* 01D4C 8097A67C 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 01D50 8097A680 848E0170 */ lh $t6, 0x0170($a0) ## 00000170
/* 01D54 8097A684 852A14C8 */ lh $t2, 0x14C8($t1) ## 000014C8
/* 01D58 8097A688 254D03E8 */ addiu $t5, $t2, 0x03E8 ## $t5 = 000003E8
/* 01D5C 8097A68C 010D7821 */ addu $t7, $t0, $t5
/* 01D60 8097A690 A48F016E */ sh $t7, 0x016E($a0) ## 0000016E
/* 01D64 8097A694 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90
/* 01D68 8097A698 871914CA */ lh $t9, 0x14CA($t8) ## 000014CA
/* 01D6C 8097A69C 272B0BB8 */ addiu $t3, $t9, 0x0BB8 ## $t3 = 00000BB8
/* 01D70 8097A6A0 01CB6021 */ addu $t4, $t6, $t3
/* 01D74 8097A6A4 A48C0170 */ sh $t4, 0x0170($a0) ## 00000170
/* 01D78 8097A6A8 0C25E48F */ jal func_8097923C
/* 01D7C 8097A6AC 8FA5001C */ lw $a1, 0x001C($sp)
/* 01D80 8097A6B0 8FBF0014 */ lw $ra, 0x0014($sp)
/* 01D84 8097A6B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 01D88 8097A6B8 03E00008 */ jr $ra
/* 01D8C 8097A6BC 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s
-33
View File
@@ -1,33 +0,0 @@
glabel func_8097A814
/* 01EE4 8097A814 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 01EE8 8097A818 AFBF0014 */ sw $ra, 0x0014($sp)
/* 01EEC 8097A81C AFA5001C */ sw $a1, 0x001C($sp)
/* 01EF0 8097A820 0C00B638 */ jal Actor_MoveForward
/* 01EF4 8097A824 AFA40018 */ sw $a0, 0x0018($sp)
/* 01EF8 8097A828 3C028016 */ lui $v0, %hi(gGameInfo)
/* 01EFC 8097A82C 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 01F00 8097A830 8FA40018 */ lw $a0, 0x0018($sp)
/* 01F04 8097A834 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 01F08 8097A838 848E016C */ lh $t6, 0x016C($a0) ## 0000016C
/* 01F0C 8097A83C 85F814E0 */ lh $t8, 0x14E0($t7) ## 000014E0
/* 01F10 8097A840 8488016E */ lh $t0, 0x016E($a0) ## 0000016E
/* 01F14 8097A844 01D8C821 */ addu $t9, $t6, $t8
/* 01F18 8097A848 A499016C */ sh $t9, 0x016C($a0) ## 0000016C
/* 01F1C 8097A84C 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 01F20 8097A850 848E0170 */ lh $t6, 0x0170($a0) ## 00000170
/* 01F24 8097A854 852A14E2 */ lh $t2, 0x14E2($t1) ## 000014E2
/* 01F28 8097A858 254D03E8 */ addiu $t5, $t2, 0x03E8 ## $t5 = 000003E8
/* 01F2C 8097A85C 010D7821 */ addu $t7, $t0, $t5
/* 01F30 8097A860 A48F016E */ sh $t7, 0x016E($a0) ## 0000016E
/* 01F34 8097A864 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90
/* 01F38 8097A868 871914E4 */ lh $t9, 0x14E4($t8) ## 000014E4
/* 01F3C 8097A86C 272B0BB8 */ addiu $t3, $t9, 0x0BB8 ## $t3 = 00000BB8
/* 01F40 8097A870 01CB6021 */ addu $t4, $t6, $t3
/* 01F44 8097A874 A48C0170 */ sh $t4, 0x0170($a0) ## 00000170
/* 01F48 8097A878 0C25E48F */ jal func_8097923C
/* 01F4C 8097A87C 8FA5001C */ lw $a1, 0x001C($sp)
/* 01F50 8097A880 8FBF0014 */ lw $ra, 0x0014($sp)
/* 01F54 8097A884 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 01F58 8097A888 03E00008 */ jr $ra
/* 01F5C 8097A88C 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s
-33
View File
@@ -1,33 +0,0 @@
glabel func_8097A9E4
/* 020B4 8097A9E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 020B8 8097A9E8 AFBF0014 */ sw $ra, 0x0014($sp)
/* 020BC 8097A9EC AFA5001C */ sw $a1, 0x001C($sp)
/* 020C0 8097A9F0 0C00B638 */ jal Actor_MoveForward
/* 020C4 8097A9F4 AFA40018 */ sw $a0, 0x0018($sp)
/* 020C8 8097A9F8 3C028016 */ lui $v0, %hi(gGameInfo)
/* 020CC 8097A9FC 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 020D0 8097AA00 8FA40018 */ lw $a0, 0x0018($sp)
/* 020D4 8097AA04 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 020D8 8097AA08 848E016C */ lh $t6, 0x016C($a0) ## 0000016C
/* 020DC 8097AA0C 85F814FA */ lh $t8, 0x14FA($t7) ## 000014FA
/* 020E0 8097AA10 8488016E */ lh $t0, 0x016E($a0) ## 0000016E
/* 020E4 8097AA14 01D8C821 */ addu $t9, $t6, $t8
/* 020E8 8097AA18 A499016C */ sh $t9, 0x016C($a0) ## 0000016C
/* 020EC 8097AA1C 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 020F0 8097AA20 848E0170 */ lh $t6, 0x0170($a0) ## 00000170
/* 020F4 8097AA24 852A14FC */ lh $t2, 0x14FC($t1) ## 000014FC
/* 020F8 8097AA28 254D03E8 */ addiu $t5, $t2, 0x03E8 ## $t5 = 000003E8
/* 020FC 8097AA2C 010D7821 */ addu $t7, $t0, $t5
/* 02100 8097AA30 A48F016E */ sh $t7, 0x016E($a0) ## 0000016E
/* 02104 8097AA34 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90
/* 02108 8097AA38 871914FE */ lh $t9, 0x14FE($t8) ## 000014FE
/* 0210C 8097AA3C 272B0BB8 */ addiu $t3, $t9, 0x0BB8 ## $t3 = 00000BB8
/* 02110 8097AA40 01CB6021 */ addu $t4, $t6, $t3
/* 02114 8097AA44 A48C0170 */ sh $t4, 0x0170($a0) ## 00000170
/* 02118 8097AA48 0C25E48F */ jal func_8097923C
/* 0211C 8097AA4C 8FA5001C */ lw $a1, 0x001C($sp)
/* 02120 8097AA50 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02124 8097AA54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 02128 8097AA58 03E00008 */ jr $ra
/* 0212C 8097AA5C 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ABB4.s
-33
View File
@@ -1,33 +0,0 @@
glabel func_8097ABB4
/* 02284 8097ABB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02288 8097ABB8 AFBF0014 */ sw $ra, 0x0014($sp)
/* 0228C 8097ABBC AFA5001C */ sw $a1, 0x001C($sp)
/* 02290 8097ABC0 0C00B638 */ jal Actor_MoveForward
/* 02294 8097ABC4 AFA40018 */ sw $a0, 0x0018($sp)
/* 02298 8097ABC8 3C028016 */ lui $v0, %hi(gGameInfo)
/* 0229C 8097ABCC 2442FA90 */ addiu $v0, %lo(gGameInfo)
/* 022A0 8097ABD0 8FA40018 */ lw $a0, 0x0018($sp)
/* 022A4 8097ABD4 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90
/* 022A8 8097ABD8 848E016C */ lh $t6, 0x016C($a0) ## 0000016C
/* 022AC 8097ABDC 85F81472 */ lh $t8, 0x1472($t7) ## 00001472
/* 022B0 8097ABE0 8488016E */ lh $t0, 0x016E($a0) ## 0000016E
/* 022B4 8097ABE4 01D8C821 */ addu $t9, $t6, $t8
/* 022B8 8097ABE8 A499016C */ sh $t9, 0x016C($a0) ## 0000016C
/* 022BC 8097ABEC 8C490000 */ lw $t1, 0x0000($v0) ## 8015FA90
/* 022C0 8097ABF0 848E0170 */ lh $t6, 0x0170($a0) ## 00000170
/* 022C4 8097ABF4 852A1470 */ lh $t2, 0x1470($t1) ## 00001470
/* 022C8 8097ABF8 254D03E8 */ addiu $t5, $t2, 0x03E8 ## $t5 = 000003E8
/* 022CC 8097ABFC 010D7821 */ addu $t7, $t0, $t5
/* 022D0 8097AC00 A48F016E */ sh $t7, 0x016E($a0) ## 0000016E
/* 022D4 8097AC04 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90
/* 022D8 8097AC08 8719146E */ lh $t9, 0x146E($t8) ## 0000146E
/* 022DC 8097AC0C 272B0BB8 */ addiu $t3, $t9, 0x0BB8 ## $t3 = 00000BB8
/* 022E0 8097AC10 01CB6021 */ addu $t4, $t6, $t3
/* 022E4 8097AC14 A48C0170 */ sh $t4, 0x0170($a0) ## 00000170
/* 022E8 8097AC18 0C25E48F */ jal func_8097923C
/* 022EC 8097AC1C 8FA5001C */ lw $a1, 0x001C($sp)
/* 022F0 8097AC20 8FBF0014 */ lw $ra, 0x0014($sp)
/* 022F4 8097AC24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 022F8 8097AC28 03E00008 */ jr $ra
/* 022FC 8097AC2C 00000000 */ nop
src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
+39 -69
View File
@@ -801,29 +801,15 @@ void func_80979FD0(DemoGj* this, GlobalContext* globalCtx) {
func_80978FCC(this, globalCtx, 1, 2, &D_06001F70);
}
void func_8097A000(DemoGj* this, GlobalContext* globalCtx);
#ifdef NON_MATCHING
/*
void func_8097A000(DemoGj *this, GlobalContext *globalCtx) {
Actor_MoveForward(&this->dyna.actor);
this->unk_16C.x += gGameInfo->data[2610];
this->unk_16C.y += 0x3E8 + gGameInfo->data[2611];
this->unk_16C.z = 0xBB8 + gGameInfo->data[2612] + this->unk_16C.z;
this->unk_16C.x += (s16) (kREG(18));
this->unk_16C.y += (s16) (kREG(19) + 0x3E8);
this->unk_16C.z += (s16) (kREG(20) + 0xBB8);
func_8097923C(this, globalCtx);
}
*/
void func_8097A000(DemoGj *this, GlobalContext *globalCtx) {
Actor_MoveForward(&this->dyna.actor);
this->unk_16C.x = this->unk_16C.x + gGameInfo->data[2610];
this->unk_16C.y = this->unk_16C.y + (gGameInfo->data[2611] + 0x3E8);
this->unk_16C.z = this->unk_16C.z + (gGameInfo->data[2612] + 0xBB8);
func_8097923C(this, globalCtx);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A000.s")
#endif
void func_8097A07C(DemoGj* this, GlobalContext* globalCtx);
/*
@@ -874,18 +860,15 @@ void func_8097A208(DemoGj* this, GlobalContext* globalCtx) {
func_80978FCC(this, globalCtx, 2, 3, &D_06002448);
}
void func_8097A238(DemoGj* this, GlobalContext* globalCtx);
#ifdef NON_MATCHING
void func_8097A238(DemoGj *this, GlobalContext* globalCtx) {
void func_8097A238(DemoGj *this, GlobalContext *globalCtx) {
Actor_MoveForward(&this->dyna.actor);
this->unk_16C.x = this->unk_16C.x + gGameInfo->data[2623];
this->unk_16C.y = this->unk_16C.y + (gGameInfo->data[2624] + 0x3E8);
this->unk_16C.z = this->unk_16C.z + (gGameInfo->data[2625] + 0xBB8);
this->unk_16C.x += (s16) (kREG(31));
this->unk_16C.y += (s16) (kREG(32) + 0x3E8);
this->unk_16C.z += (s16) (kREG(33) + 0xBB8);
func_8097923C(this, globalCtx);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A238.s")
#endif
//s32 func_8097A2B4(void *arg0, GlobalContext* globalCtx);
void func_8097A2B4(void *arg0, GlobalContext* globalCtx);
@@ -942,18 +925,15 @@ void func_8097A444(DemoGj* this, GlobalContext* globalCtx) {
func_80978FCC(this, globalCtx, 3, 4, &D_06002850);
}
void func_8097A474(DemoGj* this, GlobalContext* globalCtx);
#ifdef NON_MATCHING
void func_8097A474(DemoGj* this, GlobalContext* globalCtx) {
void func_8097A474(DemoGj *this, GlobalContext *globalCtx) {
Actor_MoveForward(&this->dyna.actor);
this->unk_16C.x = this->unk_16C.x + gGameInfo->data[2636];
this->unk_16C.y = this->unk_16C.y + (gGameInfo->data[2637] + 0x3E8);
this->unk_16C.z = this->unk_16C.z + (gGameInfo->data[2638] + 0xBB8);
this->unk_16C.x += (s16) (kREG(44));
this->unk_16C.y += (s16) (kREG(45) + 0x3E8);
this->unk_16C.z += (s16) (kREG(46) + 0xBB8);
func_8097923C(this, globalCtx);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s")
#endif
void func_8097A4F0(DemoGj* this, GlobalContext* globalCtx) {
if (func_80979818(this, globalCtx) != 0) {
@@ -991,18 +971,15 @@ void func_8097A614(DemoGj* this, GlobalContext* globalCtx) {
func_80978FCC(this, globalCtx, 4, 5, &D_06002D28);
}
void func_8097A644(DemoGj* this, GlobalContext* globalCtx);
#ifdef NON_MATCHING
void func_8097A644(DemoGj* this, GlobalContext* globalCtx) {
void func_8097A644(DemoGj *this, GlobalContext *globalCtx) {
Actor_MoveForward(&this->dyna.actor);
this->unk_16C.x = this->unk_16C.x + gGameInfo->data[2649];
this->unk_16C.y = this->unk_16C.y + (gGameInfo->data[2650] + 0x3E8);
this->unk_16C.z = this->unk_16C.z + (gGameInfo->data[2651] + 0xBB8);
this->unk_16C.x += (s16) (kREG(57));
this->unk_16C.y += (s16) (kREG(58) + 0x3E8);
this->unk_16C.z += (s16) (kREG(59) + 0xBB8);
func_8097923C(this, globalCtx);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s")
#endif
void func_8097A6C0(DemoGj* this, GlobalContext* globalCtx) {
if (func_80979818(this, globalCtx) != 0) {
@@ -1040,18 +1017,15 @@ void func_8097A7E4(DemoGj* this, GlobalContext* globalCtx) {
func_80978FCC(this, globalCtx, 5, 6, &D_06002FE4);
}
void func_8097A814(DemoGj* this, GlobalContext* globalCtx);
#ifdef NON_MATCHING
void func_8097A814(DemoGj* this, GlobalContext* globalCtx) {
void func_8097A814(DemoGj *this, GlobalContext *globalCtx) {
Actor_MoveForward(&this->dyna.actor);
this->unk_16C.x = (s16) (this->unk_16C.x + gGameInfo->data[2662]);
this->unk_16C.y = (s16) (this->unk_16C.y+ (gGameInfo->data[2663] + 0x3E8));
this->unk_16C.z = (s16) (this->unk_16C.z + (gGameInfo->data[2664] + 0xBB8));
this->unk_16C.x += (s16) (kREG(70));
this->unk_16C.y += (s16) (kREG(71) + 0x3E8);
this->unk_16C.z += (s16) (kREG(72) + 0xBB8);
func_8097923C(this, globalCtx);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s")
#endif
void func_8097A890(DemoGj *this, GlobalContext *globalCtx) {
if (func_80979818(this, globalCtx) != 0) {
@@ -1089,17 +1063,15 @@ void func_8097A9B4(DemoGj *this, GlobalContext *globalCtx) {
func_80978FCC(this, globalCtx, 6, 7, &D_060033E0);
}
void func_8097A9E4(DemoGj *this, GlobalContext *globalCtx);
/*
void func_8097A9E4(DemoGj *this, GlobalContext *globalCtx) {
Actor_MoveForward(&this->dyna.actor);
this->unk_16C.x = this->unk_16C.x + gGameInfo->data[2675];
this->unk_16C.y = this->unk_16C.y + (gGameInfo->data[2676] + 0x3E8);
this->unk_16C.z = this->unk_16C.z + (gGameInfo->data[2677] + 0xBB8);
this->unk_16C.x += (s16) (kREG(83));
this->unk_16C.y += (s16) (kREG(84) + 0x3E8);
this->unk_16C.z += (s16) (kREG(85) + 0xBB8);
func_8097923C(this, globalCtx);
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s")
void func_8097AA60(DemoGj *this, GlobalContext *globalCtx) {
if (func_80979818(this, globalCtx) != 0) {
@@ -1137,17 +1109,15 @@ void func_8097AB84(DemoGj *this, GlobalContext *globalCtx) {
func_80978FCC(this, globalCtx, 7, 8, &D_06003AF0);
}
void func_8097ABB4(DemoGj *this, GlobalContext *globalCtx);
/*
void func_8097ABB4(DemoGj *this, GlobalContext *globalCtx) {
Actor_MoveForward(&this->dyna.actor);
this->unk_16C.x = this->unk_16C.x + gGameInfo->data[2607];
this->unk_16C.y = this->unk_16C.y + (gGameInfo->data[2606] + 0x3E8);
this->unk_16C.z = this->unk_16C.z + (gGameInfo->data[2605] + 0xBB8);
this->unk_16C.x += (s16) (kREG(15));
this->unk_16C.y += (s16) (kREG(14) + 0x3E8);
this->unk_16C.z += (s16) (kREG(13) + 0xBB8);
func_8097923C(this, globalCtx);
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ABB4.s")
void func_8097AC30(DemoGj *this, GlobalContext *globalCtx);
/*void func_8097AC30(DemoGj *this, GlobalContext *globalCtx) {