hackern64/HackerOoT
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerOoT.git synced 2026-01-21 10:37:37 -08:00
Code Issues Packages Projects Releases Wiki Activity

Bomb Related Effect Overlays (#283)

Browse Source 
* fix colliderinit typo

* dead sound done

* deadsound documentation

* blast done

* progress

* spk init

* progress

* spark done

* ss bomb ok

* bomb done

* cleanup

* progress

* progress

* almost done with bomb2

* clean up gossip stone

* more

* cleanup and format

* remove unused asm file

* nonmatching reloc

* done i think

* mistakes

* fix headers

* idk how that got in here

* match bomb2

* asm file

* pr review
This commit is contained in:
fig02
2020-07-28 15:49:00 -04:00
committed by GitHub
parent c76c584006
commit 19c990b852
82 changed files with 822 additions and 2416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028DC4.s
View File

@@ -1,24 +0,0 @@
glabel func_80028DC4
/* A9FF64 80028DC4 27BDFFC0 */ addiu $sp, $sp, -0x40
/* A9FF68 80028DC8 AFBF0014 */ sw $ra, 0x14($sp)
/* A9FF6C 80028DCC AFA40040 */ sw $a0, 0x40($sp)
/* A9FF70 80028DD0 AFA60048 */ sw $a2, 0x48($sp)
/* A9FF74 80028DD4 AFA7004C */ sw $a3, 0x4c($sp)
/* A9FF78 80028DD8 0C01DF90 */ jal Math_Vec3f_Copy
/* A9FF7C 80028DDC 27A4001C */ addiu $a0, $sp, 0x1c
/* A9FF80 80028DE0 27A40028 */ addiu $a0, $sp, 0x28
/* A9FF84 80028DE4 0C01DF90 */ jal Math_Vec3f_Copy
/* A9FF88 80028DE8 8FA50048 */ lw $a1, 0x48($sp)
/* A9FF8C 80028DEC 27A40034 */ addiu $a0, $sp, 0x34
/* A9FF90 80028DF0 0C01DF90 */ jal Math_Vec3f_Copy
/* A9FF94 80028DF4 8FA5004C */ lw $a1, 0x4c($sp)
/* A9FF98 80028DF8 8FA40040 */ lw $a0, 0x40($sp)
/* A9FF9C 80028DFC 24050002 */ li $a1, 2
/* A9FFA0 80028E00 24060080 */ li $a2, 128
/* A9FFA4 80028E04 0C009DE6 */ jal EffectSs_Spawn
/* A9FFA8 80028E08 27A7001C */ addiu $a3, $sp, 0x1c
/* A9FFAC 80028E0C 8FBF0014 */ lw $ra, 0x14($sp)
/* A9FFB0 80028E10 27BD0040 */ addiu $sp, $sp, 0x40
/* A9FFB4 80028E14 03E00008 */ jr $ra
/* A9FFB8 80028E18 00000000 */ nop

28
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E1C.s
View File

@@ -1,28 +0,0 @@
glabel func_80028E1C
/* A9FFBC 80028E1C 27BDFFB8 */ addiu $sp, $sp, -0x48
/* A9FFC0 80028E20 AFBF0014 */ sw $ra, 0x14($sp)
/* A9FFC4 80028E24 AFA40048 */ sw $a0, 0x48($sp)
/* A9FFC8 80028E28 AFA60050 */ sw $a2, 0x50($sp)
/* A9FFCC 80028E2C AFA70054 */ sw $a3, 0x54($sp)
/* A9FFD0 80028E30 0C01DF90 */ jal Math_Vec3f_Copy
/* A9FFD4 80028E34 27A4001C */ addiu $a0, $sp, 0x1c
/* A9FFD8 80028E38 27A40028 */ addiu $a0, $sp, 0x28
/* A9FFDC 80028E3C 0C01DF90 */ jal Math_Vec3f_Copy
/* A9FFE0 80028E40 8FA50050 */ lw $a1, 0x50($sp)
/* A9FFE4 80028E44 27A40034 */ addiu $a0, $sp, 0x34
/* A9FFE8 80028E48 0C01DF90 */ jal Math_Vec3f_Copy
/* A9FFEC 80028E4C 8FA50054 */ lw $a1, 0x54($sp)
/* A9FFF0 80028E50 240E0064 */ li $t6, 100
/* A9FFF4 80028E54 A7AE0040 */ sh $t6, 0x40($sp)
/* A9FFF8 80028E58 A7A00042 */ sh $zero, 0x42($sp)
/* A9FFFC 80028E5C A3A00044 */ sb $zero, 0x44($sp)
/* AA0000 80028E60 8FA40048 */ lw $a0, 0x48($sp)
/* AA0004 80028E64 24050003 */ li $a1, 3
/* AA0008 80028E68 2406000A */ li $a2, 10
/* AA000C 80028E6C 0C009DE6 */ jal EffectSs_Spawn
/* AA0010 80028E70 27A7001C */ addiu $a3, $sp, 0x1c
/* AA0014 80028E74 8FBF0014 */ lw $ra, 0x14($sp)
/* AA0018 80028E78 27BD0048 */ addiu $sp, $sp, 0x48
/* AA001C 80028E7C 03E00008 */ jr $ra
/* AA0020 80028E80 00000000 */ nop

30
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028E84.s
View File

@@ -1,30 +0,0 @@
glabel func_80028E84
/* AA0024 80028E84 27BDFFB8 */ addiu $sp, $sp, -0x48
/* AA0028 80028E88 AFBF0014 */ sw $ra, 0x14($sp)
/* AA002C 80028E8C AFA40048 */ sw $a0, 0x48($sp)
/* AA0030 80028E90 AFA60050 */ sw $a2, 0x50($sp)
/* AA0034 80028E94 AFA70054 */ sw $a3, 0x54($sp)
/* AA0038 80028E98 0C01DF90 */ jal Math_Vec3f_Copy
/* AA003C 80028E9C 27A4001C */ addiu $a0, $sp, 0x1c
/* AA0040 80028EA0 27A40028 */ addiu $a0, $sp, 0x28
/* AA0044 80028EA4 0C01DF90 */ jal Math_Vec3f_Copy
/* AA0048 80028EA8 8FA50050 */ lw $a1, 0x50($sp)
/* AA004C 80028EAC 27A40034 */ addiu $a0, $sp, 0x34
/* AA0050 80028EB0 0C01DF90 */ jal Math_Vec3f_Copy
/* AA0054 80028EB4 8FA50054 */ lw $a1, 0x54($sp)
/* AA0058 80028EB8 87AE005A */ lh $t6, 0x5a($sp)
/* AA005C 80028EBC 87AF005E */ lh $t7, 0x5e($sp)
/* AA0060 80028EC0 24180001 */ li $t8, 1
/* AA0064 80028EC4 A3B80044 */ sb $t8, 0x44($sp)
/* AA0068 80028EC8 8FA40048 */ lw $a0, 0x48($sp)
/* AA006C 80028ECC 24050003 */ li $a1, 3
/* AA0070 80028ED0 2406000A */ li $a2, 10
/* AA0074 80028ED4 27A7001C */ addiu $a3, $sp, 0x1c
/* AA0078 80028ED8 A7AE0040 */ sh $t6, 0x40($sp)
/* AA007C 80028EDC 0C009DE6 */ jal EffectSs_Spawn
/* AA0080 80028EE0 A7AF0042 */ sh $t7, 0x42($sp)
/* AA0084 80028EE4 8FBF0014 */ lw $ra, 0x14($sp)
/* AA0088 80028EE8 27BD0048 */ addiu $sp, $sp, 0x48
/* AA008C 80028EEC 03E00008 */ jr $ra
/* AA0090 80028EF0 00000000 */ nop

38
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028EF4.s
View File

@@ -1,38 +0,0 @@
glabel func_80028EF4
/* AA0094 80028EF4 27BDFFB0 */ addiu $sp, $sp, -0x50
/* AA0098 80028EF8 AFBF0014 */ sw $ra, 0x14($sp)
/* AA009C 80028EFC AFA40050 */ sw $a0, 0x50($sp)
/* AA00A0 80028F00 AFA60058 */ sw $a2, 0x58($sp)
/* AA00A4 80028F04 AFA7005C */ sw $a3, 0x5c($sp)
/* AA00A8 80028F08 0C01DF90 */ jal Math_Vec3f_Copy
/* AA00AC 80028F0C 27A4001C */ addiu $a0, $sp, 0x1c
/* AA00B0 80028F10 27A40028 */ addiu $a0, $sp, 0x28
/* AA00B4 80028F14 0C01DF90 */ jal Math_Vec3f_Copy
/* AA00B8 80028F18 8FA50058 */ lw $a1, 0x58($sp)
/* AA00BC 80028F1C 27A40034 */ addiu $a0, $sp, 0x34
/* AA00C0 80028F20 0C01DF90 */ jal Math_Vec3f_Copy
/* AA00C4 80028F24 8FA5005C */ lw $a1, 0x5c($sp)
/* AA00C8 80028F28 27A40040 */ addiu $a0, $sp, 0x40
/* AA00CC 80028F2C 0C01E218 */ jal Color_RGBA8_Copy
/* AA00D0 80028F30 8FA50060 */ lw $a1, 0x60($sp)
/* AA00D4 80028F34 27A40044 */ addiu $a0, $sp, 0x44
/* AA00D8 80028F38 0C01E218 */ jal Color_RGBA8_Copy
/* AA00DC 80028F3C 8FA50064 */ lw $a1, 0x64($sp)
/* AA00E0 80028F40 87AE006A */ lh $t6, 0x6a($sp)
/* AA00E4 80028F44 87AF006E */ lh $t7, 0x6e($sp)
/* AA00E8 80028F48 87B80072 */ lh $t8, 0x72($sp)
/* AA00EC 80028F4C 87B90076 */ lh $t9, 0x76($sp)
/* AA00F0 80028F50 8FA40050 */ lw $a0, 0x50($sp)
/* AA00F4 80028F54 24050004 */ li $a1, 4
/* AA00F8 80028F58 24060080 */ li $a2, 128
/* AA00FC 80028F5C 27A7001C */ addiu $a3, $sp, 0x1c
/* AA0100 80028F60 A7AE0048 */ sh $t6, 0x48($sp)
/* AA0104 80028F64 A7AF004A */ sh $t7, 0x4a($sp)
/* AA0108 80028F68 A7B8004C */ sh $t8, 0x4c($sp)
/* AA010C 80028F6C 0C009DE6 */ jal EffectSs_Spawn
/* AA0110 80028F70 A7B9004E */ sh $t9, 0x4e($sp)
/* AA0114 80028F74 8FBF0014 */ lw $ra, 0x14($sp)
/* AA0118 80028F78 27BD0050 */ addiu $sp, $sp, 0x50
/* AA011C 80028F7C 03E00008 */ jr $ra
/* AA0120 80028F80 00000000 */ nop

23
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028F84.s
View File

@@ -1,23 +0,0 @@
glabel func_80028F84
/* AA0124 80028F84 27BDFFD0 */ addiu $sp, $sp, -0x30
/* AA0128 80028F88 87B80042 */ lh $t8, 0x42($sp)
/* AA012C 80028F8C 87B90046 */ lh $t9, 0x46($sp)
/* AA0130 80028F90 87A9004A */ lh $t1, 0x4a($sp)
/* AA0134 80028F94 3C0E8011 */ lui $t6, %hi(D_801158DC) # $t6, 0x8011
/* AA0138 80028F98 3C0F8011 */ lui $t7, %hi(D_801158E0) # $t7, 0x8011
/* AA013C 80028F9C AFBF002C */ sw $ra, 0x2c($sp)
/* AA0140 80028FA0 25EF58E0 */ addiu $t7, %lo(D_801158E0) # addiu $t7, $t7, 0x58e0
/* AA0144 80028FA4 25CE58DC */ addiu $t6, %lo(D_801158DC) # addiu $t6, $t6, 0x58dc
/* AA0148 80028FA8 24080023 */ li $t0, 35
/* AA014C 80028FAC AFA80020 */ sw $t0, 0x20($sp)
/* AA0150 80028FB0 AFAE0010 */ sw $t6, 0x10($sp)
/* AA0154 80028FB4 AFAF0014 */ sw $t7, 0x14($sp)
/* AA0158 80028FB8 AFB80018 */ sw $t8, 0x18($sp)
/* AA015C 80028FBC AFB9001C */ sw $t9, 0x1c($sp)
/* AA0160 80028FC0 0C00A3BD */ jal func_80028EF4
/* AA0164 80028FC4 AFA90024 */ sw $t1, 0x24($sp)
/* AA0168 80028FC8 8FBF002C */ lw $ra, 0x2c($sp)
/* AA016C 80028FCC 27BD0030 */ addiu $sp, $sp, 0x30
/* AA0170 80028FD0 03E00008 */ jr $ra
/* AA0174 80028FD4 00000000 */ nop

21
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80028FD8.s
View File

@@ -1,21 +0,0 @@
glabel func_80028FD8
/* AA0178 80028FD8 27BDFFD0 */ addiu $sp, $sp, -0x30
/* AA017C 80028FDC 8FAE0040 */ lw $t6, 0x40($sp)
/* AA0180 80028FE0 8FAF0044 */ lw $t7, 0x44($sp)
/* AA0184 80028FE4 87A9004A */ lh $t1, 0x4a($sp)
/* AA0188 80028FE8 AFBF002C */ sw $ra, 0x2c($sp)
/* AA018C 80028FEC 24180064 */ li $t8, 100
/* AA0190 80028FF0 24190177 */ li $t9, 375
/* AA0194 80028FF4 24080023 */ li $t0, 35
/* AA0198 80028FF8 AFA80020 */ sw $t0, 0x20($sp)
/* AA019C 80028FFC AFB9001C */ sw $t9, 0x1c($sp)
/* AA01A0 80029000 AFB80018 */ sw $t8, 0x18($sp)
/* AA01A4 80029004 AFAE0010 */ sw $t6, 0x10($sp)
/* AA01A8 80029008 AFAF0014 */ sw $t7, 0x14($sp)
/* AA01AC 8002900C 0C00A3BD */ jal func_80028EF4
/* AA01B0 80029010 AFA90024 */ sw $t1, 0x24($sp)
/* AA01B4 80029014 8FBF002C */ lw $ra, 0x2c($sp)
/* AA01B8 80029018 27BD0030 */ addiu $sp, $sp, 0x30
/* AA01BC 8002901C 03E00008 */ jr $ra
/* AA01C0 80029020 00000000 */ nop

17
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029024.s
View File

@@ -1,17 +0,0 @@
glabel func_80029024
/* AA01C4 80029024 27BDFFD8 */ addiu $sp, $sp, -0x28
/* AA01C8 80029028 3C0E8011 */ lui $t6, %hi(D_801158E4) # $t6, 0x8011
/* AA01CC 8002902C 3C0F8011 */ lui $t7, %hi(D_801158E8) # $t7, 0x8011
/* AA01D0 80029030 AFBF0024 */ sw $ra, 0x24($sp)
/* AA01D4 80029034 25EF58E8 */ addiu $t7, %lo(D_801158E8) # addiu $t7, $t7, 0x58e8
/* AA01D8 80029038 25CE58E4 */ addiu $t6, %lo(D_801158E4) # addiu $t6, $t6, 0x58e4
/* AA01DC 8002903C 2418000A */ li $t8, 10
/* AA01E0 80029040 AFB80018 */ sw $t8, 0x18($sp)
/* AA01E4 80029044 AFAE0010 */ sw $t6, 0x10($sp)
/* AA01E8 80029048 0C00A3F6 */ jal func_80028FD8
/* AA01EC 8002904C AFAF0014 */ sw $t7, 0x14($sp)
/* AA01F0 80029050 8FBF0024 */ lw $ra, 0x24($sp)
/* AA01F4 80029054 27BD0028 */ addiu $sp, $sp, 0x28
/* AA01F8 80029058 03E00008 */ jr $ra
/* AA01FC 8002905C 00000000 */ nop

38
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029060.s
View File

@@ -1,38 +0,0 @@
glabel func_80029060
/* AA0200 80029060 27BDFFB0 */ addiu $sp, $sp, -0x50
/* AA0204 80029064 AFBF0014 */ sw $ra, 0x14($sp)
/* AA0208 80029068 AFA40050 */ sw $a0, 0x50($sp)
/* AA020C 8002906C AFA50054 */ sw $a1, 0x54($sp)
/* AA0210 80029070 AFA7005C */ sw $a3, 0x5c($sp)
/* AA0214 80029074 00C02825 */ move $a1, $a2
/* AA0218 80029078 0C01DF90 */ jal Math_Vec3f_Copy
/* AA021C 8002907C 27A4001C */ addiu $a0, $sp, 0x1c
/* AA0220 80029080 27A40028 */ addiu $a0, $sp, 0x28
/* AA0224 80029084 0C01DF90 */ jal Math_Vec3f_Copy
/* AA0228 80029088 8FA5005C */ lw $a1, 0x5c($sp)
/* AA022C 8002908C 27A40034 */ addiu $a0, $sp, 0x34
/* AA0230 80029090 0C01DF90 */ jal Math_Vec3f_Copy
/* AA0234 80029094 8FA50060 */ lw $a1, 0x60($sp)
/* AA0238 80029098 27A40040 */ addiu $a0, $sp, 0x40
/* AA023C 8002909C 0C01E218 */ jal Color_RGBA8_Copy
/* AA0240 800290A0 8FA50064 */ lw $a1, 0x64($sp)
/* AA0244 800290A4 27A40044 */ addiu $a0, $sp, 0x44
/* AA0248 800290A8 0C01E218 */ jal Color_RGBA8_Copy
/* AA024C 800290AC 8FA50068 */ lw $a1, 0x68($sp)
/* AA0250 800290B0 8FAE0054 */ lw $t6, 0x54($sp)
/* AA0254 800290B4 87AF006E */ lh $t7, 0x6e($sp)
/* AA0258 800290B8 87B80072 */ lh $t8, 0x72($sp)
/* AA025C 800290BC A3A0004C */ sb $zero, 0x4c($sp)
/* AA0260 800290C0 8FA40050 */ lw $a0, 0x50($sp)
/* AA0264 800290C4 24050005 */ li $a1, 5
/* AA0268 800290C8 24060080 */ li $a2, 128
/* AA026C 800290CC 27A70018 */ addiu $a3, $sp, 0x18
/* AA0270 800290D0 AFAE0018 */ sw $t6, 0x18($sp)
/* AA0274 800290D4 A7AF0048 */ sh $t7, 0x48($sp)
/* AA0278 800290D8 0C009DE6 */ jal EffectSs_Spawn
/* AA027C 800290DC A7B8004A */ sh $t8, 0x4a($sp)
/* AA0280 800290E0 8FBF0014 */ lw $ra, 0x14($sp)
/* AA0284 800290E4 27BD0050 */ addiu $sp, $sp, 0x50
/* AA0288 800290E8 03E00008 */ jr $ra
/* AA028C 800290EC 00000000 */ nop

39
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800290F0.s
View File

@@ -1,39 +0,0 @@
glabel func_800290F0
/* AA0290 800290F0 27BDFFB0 */ addiu $sp, $sp, -0x50
/* AA0294 800290F4 AFBF0014 */ sw $ra, 0x14($sp)
/* AA0298 800290F8 AFA40050 */ sw $a0, 0x50($sp)
/* AA029C 800290FC AFA50054 */ sw $a1, 0x54($sp)
/* AA02A0 80029100 AFA7005C */ sw $a3, 0x5c($sp)
/* AA02A4 80029104 00C02825 */ move $a1, $a2
/* AA02A8 80029108 0C01DF90 */ jal Math_Vec3f_Copy
/* AA02AC 8002910C 27A4001C */ addiu $a0, $sp, 0x1c
/* AA02B0 80029110 27A40028 */ addiu $a0, $sp, 0x28
/* AA02B4 80029114 0C01DF90 */ jal Math_Vec3f_Copy
/* AA02B8 80029118 8FA5005C */ lw $a1, 0x5c($sp)
/* AA02BC 8002911C 27A40034 */ addiu $a0, $sp, 0x34
/* AA02C0 80029120 0C01DF90 */ jal Math_Vec3f_Copy
/* AA02C4 80029124 8FA50060 */ lw $a1, 0x60($sp)
/* AA02C8 80029128 27A40040 */ addiu $a0, $sp, 0x40
/* AA02CC 8002912C 0C01E218 */ jal Color_RGBA8_Copy
/* AA02D0 80029130 8FA50064 */ lw $a1, 0x64($sp)
/* AA02D4 80029134 27A40044 */ addiu $a0, $sp, 0x44
/* AA02D8 80029138 0C01E218 */ jal Color_RGBA8_Copy
/* AA02DC 8002913C 8FA50068 */ lw $a1, 0x68($sp)
/* AA02E0 80029140 8FAE0054 */ lw $t6, 0x54($sp)
/* AA02E4 80029144 87AF006E */ lh $t7, 0x6e($sp)
/* AA02E8 80029148 87B80072 */ lh $t8, 0x72($sp)
/* AA02EC 8002914C 24190001 */ li $t9, 1
/* AA02F0 80029150 A3B9004C */ sb $t9, 0x4c($sp)
/* AA02F4 80029154 8FA40050 */ lw $a0, 0x50($sp)
/* AA02F8 80029158 24050005 */ li $a1, 5
/* AA02FC 8002915C 24060080 */ li $a2, 128
/* AA0300 80029160 27A70018 */ addiu $a3, $sp, 0x18
/* AA0304 80029164 AFAE0018 */ sw $t6, 0x18($sp)
/* AA0308 80029168 A7AF0048 */ sh $t7, 0x48($sp)
/* AA030C 8002916C 0C009DE6 */ jal EffectSs_Spawn
/* AA0310 80029170 A7B8004A */ sh $t8, 0x4a($sp)
/* AA0314 80029174 8FBF0014 */ lw $ra, 0x14($sp)
/* AA0318 80029178 27BD0050 */ addiu $sp, $sp, 0x50
/* AA031C 8002917C 03E00008 */ jr $ra
/* AA0320 80029180 00000000 */ nop

23
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80029184.s
View File

@@ -1,23 +0,0 @@
glabel func_80029184
/* AA0324 80029184 27BDFFD0 */ addiu $sp, $sp, -0x30
/* AA0328 80029188 3C0E8011 */ lui $t6, %hi(D_801158EC) # $t6, 0x8011
/* AA032C 8002918C AFBF0024 */ sw $ra, 0x24($sp)
/* AA0330 80029190 25CE58EC */ addiu $t6, %lo(D_801158EC) # addiu $t6, $t6, 0x58ec
/* AA0334 80029194 8DD80000 */ lw $t8, ($t6)
/* AA0338 80029198 27A2002C */ addiu $v0, $sp, 0x2c
/* AA033C 8002919C 3C198011 */ lui $t9, %hi(D_801158F0) # $t9, 0x8011
/* AA0340 800291A0 273958F0 */ addiu $t9, %lo(D_801158F0) # addiu $t9, $t9, 0x58f0
/* AA0344 800291A4 AC580000 */ sw $t8, ($v0)
/* AA0348 800291A8 8F290000 */ lw $t1, ($t9)
/* AA034C 800291AC 27A30028 */ addiu $v1, $sp, 0x28
/* AA0350 800291B0 AC690000 */ sw $t1, ($v1)
/* AA0354 800291B4 8FAA0040 */ lw $t2, 0x40($sp)
/* AA0358 800291B8 AFA30018 */ sw $v1, 0x18($sp)
/* AA035C 800291BC AFA20014 */ sw $v0, 0x14($sp)
/* AA0360 800291C0 0C00A4B7 */ jal func_800292DC
/* AA0364 800291C4 AFAA0010 */ sw $t2, 0x10($sp)
/* AA0368 800291C8 8FBF0024 */ lw $ra, 0x24($sp)
/* AA036C 800291CC 27BD0030 */ addiu $sp, $sp, 0x30
/* AA0370 800291D0 03E00008 */ jr $ra
/* AA0374 800291D4 00000000 */ nop

67
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800291D8.s
View File

@@ -1,67 +0,0 @@
glabel func_800291D8
/* AA0378 800291D8 27BDFFC0 */ addiu $sp, $sp, -0x40
/* AA037C 800291DC 3C0E8011 */ lui $t6, %hi(D_801158F4) # $t6, 0x8011
/* AA0380 800291E0 3C0F8011 */ lui $t7, %hi(D_801158F8) # $t7, 0x8011
/* AA0384 800291E4 8DCE58F4 */ lw $t6, %lo(D_801158F4)($t6)
/* AA0388 800291E8 8DEF58F8 */ lw $t7, %lo(D_801158F8)($t7)
/* AA038C 800291EC AFBF002C */ sw $ra, 0x2c($sp)
/* AA0390 800291F0 AFA40040 */ sw $a0, 0x40($sp)
/* AA0394 800291F4 AFA50044 */ sw $a1, 0x44($sp)
/* AA0398 800291F8 AFA60048 */ sw $a2, 0x48($sp)
/* AA039C 800291FC AFA7004C */ sw $a3, 0x4c($sp)
/* AA03A0 80029200 AFAE003C */ sw $t6, 0x3c($sp)
/* AA03A4 80029204 0C03F66B */ jal Math_Rand_ZeroOne
/* AA03A8 80029208 AFAF0038 */ sw $t7, 0x38($sp)
/* AA03AC 8002920C 3C0141A0 */ li $at, 0x41A00000 # 0.000000
/* AA03B0 80029210 44812000 */ mtc1 $at, $f4
/* AA03B4 80029214 3C014120 */ li $at, 0x41200000 # 0.000000
/* AA03B8 80029218 44814000 */ mtc1 $at, $f8
/* AA03BC 8002921C 46040182 */ mul.s $f6, $f0, $f4
/* AA03C0 80029220 93B9003C */ lbu $t9, 0x3c($sp)
/* AA03C4 80029224 93A9003D */ lbu $t1, 0x3d($sp)
/* AA03C8 80029228 93AB003E */ lbu $t3, 0x3e($sp)
/* AA03CC 8002922C 93AD003F */ lbu $t5, 0x3f($sp)
/* AA03D0 80029230 93AF0038 */ lbu $t7, 0x38($sp)
/* AA03D4 80029234 8FA40040 */ lw $a0, 0x40($sp)
/* AA03D8 80029238 46083281 */ sub.s $f10, $f6, $f8
/* AA03DC 8002923C 8FA50044 */ lw $a1, 0x44($sp)
/* AA03E0 80029240 8FA60048 */ lw $a2, 0x48($sp)
/* AA03E4 80029244 8FA7004C */ lw $a3, 0x4c($sp)
/* AA03E8 80029248 4600540D */ trunc.w.s $f16, $f10
/* AA03EC 8002924C 44028000 */ mfc1 $v0, $f16
/* AA03F0 80029250 00000000 */ nop
/* AA03F4 80029254 03224021 */ addu $t0, $t9, $v0
/* AA03F8 80029258 93B90039 */ lbu $t9, 0x39($sp)
/* AA03FC 8002925C 01225021 */ addu $t2, $t1, $v0
/* AA0400 80029260 01626021 */ addu $t4, $t3, $v0
/* AA0404 80029264 93A9003A */ lbu $t1, 0x3a($sp)
/* AA0408 80029268 93AB003B */ lbu $t3, 0x3b($sp)
/* AA040C 8002926C A3A8003C */ sb $t0, 0x3c($sp)
/* AA0410 80029270 01A27021 */ addu $t6, $t5, $v0
/* AA0414 80029274 01E2C021 */ addu $t8, $t7, $v0
/* AA0418 80029278 A3B80038 */ sb $t8, 0x38($sp)
/* AA041C 8002927C 03224021 */ addu $t0, $t9, $v0
/* AA0420 80029280 87B9005A */ lh $t9, 0x5a($sp)
/* AA0424 80029284 87B80056 */ lh $t8, 0x56($sp)
/* AA0428 80029288 8FAD0050 */ lw $t5, 0x50($sp)
/* AA042C 8002928C A3AA003D */ sb $t2, 0x3d($sp)
/* AA0430 80029290 A3AC003E */ sb $t4, 0x3e($sp)
/* AA0434 80029294 A3AE003F */ sb $t6, 0x3f($sp)
/* AA0438 80029298 27AE003C */ addiu $t6, $sp, 0x3c
/* AA043C 8002929C 27AF0038 */ addiu $t7, $sp, 0x38
/* AA0440 800292A0 01225021 */ addu $t2, $t1, $v0
/* AA0444 800292A4 01626021 */ addu $t4, $t3, $v0
/* AA0448 800292A8 A3A80039 */ sb $t0, 0x39($sp)
/* AA044C 800292AC A3AA003A */ sb $t2, 0x3a($sp)
/* AA0450 800292B0 A3AC003B */ sb $t4, 0x3b($sp)
/* AA0454 800292B4 AFAF0018 */ sw $t7, 0x18($sp)
/* AA0458 800292B8 AFAE0014 */ sw $t6, 0x14($sp)
/* AA045C 800292BC AFB90020 */ sw $t9, 0x20($sp)
/* AA0460 800292C0 AFB8001C */ sw $t8, 0x1c($sp)
/* AA0464 800292C4 0C00A418 */ jal func_80029060
/* AA0468 800292C8 AFAD0010 */ sw $t5, 0x10($sp)
/* AA046C 800292CC 8FBF002C */ lw $ra, 0x2c($sp)
/* AA0470 800292D0 27BD0040 */ addiu $sp, $sp, 0x40
/* AA0474 800292D4 03E00008 */ jr $ra
/* AA0478 800292D8 00000000 */ nop

19
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_800292DC.s
View File

@@ -1,19 +0,0 @@
glabel func_800292DC
/* AA047C 800292DC 27BDFFD0 */ addiu $sp, $sp, -0x30
/* AA0480 800292E0 8FAE0040 */ lw $t6, 0x40($sp)
/* AA0484 800292E4 8FAF0044 */ lw $t7, 0x44($sp)
/* AA0488 800292E8 8FB80048 */ lw $t8, 0x48($sp)
/* AA048C 800292EC AFBF002C */ sw $ra, 0x2c($sp)
/* AA0490 800292F0 24190064 */ li $t9, 100
/* AA0494 800292F4 24080005 */ li $t0, 5
/* AA0498 800292F8 AFA80020 */ sw $t0, 0x20($sp)
/* AA049C 800292FC AFB9001C */ sw $t9, 0x1c($sp)
/* AA04A0 80029300 AFAE0010 */ sw $t6, 0x10($sp)
/* AA04A4 80029304 AFAF0014 */ sw $t7, 0x14($sp)
/* AA04A8 80029308 0C00A418 */ jal func_80029060
/* AA04AC 8002930C AFB80018 */ sw $t8, 0x18($sp)
/* AA04B0 80029310 8FBF002C */ lw $ra, 0x2c($sp)
/* AA04B4 80029314 27BD0030 */ addiu $sp, $sp, 0x30
/* AA04B8 80029318 03E00008 */ jr $ra
/* AA04BC 8002931C 00000000 */ nop

42
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A95C.s
View File

@@ -1,42 +0,0 @@
glabel func_8002A95C
/* AA1AFC 8002A95C 27BDFFB8 */ addiu $sp, $sp, -0x48
/* AA1B00 8002A960 AFBF0014 */ sw $ra, 0x14($sp)
/* AA1B04 8002A964 AFA40048 */ sw $a0, 0x48($sp)
/* AA1B08 8002A968 AFA60050 */ sw $a2, 0x50($sp)
/* AA1B0C 8002A96C AFA70054 */ sw $a3, 0x54($sp)
/* AA1B10 8002A970 0C01DF90 */ jal Math_Vec3f_Copy
/* AA1B14 8002A974 27A40018 */ addiu $a0, $sp, 0x18
/* AA1B18 8002A978 27A40024 */ addiu $a0, $sp, 0x24
/* AA1B1C 8002A97C 0C01DF90 */ jal Math_Vec3f_Copy
/* AA1B20 8002A980 8FA50050 */ lw $a1, 0x50($sp)
/* AA1B24 8002A984 27A40030 */ addiu $a0, $sp, 0x30
/* AA1B28 8002A988 0C01DF90 */ jal Math_Vec3f_Copy
/* AA1B2C 8002A98C 8FA50054 */ lw $a1, 0x54($sp)
/* AA1B30 8002A990 87A2005E */ lh $v0, 0x5e($sp)
/* AA1B34 8002A994 97AE005A */ lhu $t6, 0x5a($sp)
/* AA1B38 8002A998 87AF0062 */ lh $t7, 0x62($sp)
/* AA1B3C 8002A99C 8FB80064 */ lw $t8, 0x64($sp)
/* AA1B40 8002A9A0 A7A2003E */ sh $v0, 0x3e($sp)
/* AA1B44 8002A9A4 A7AE003C */ sh $t6, 0x3c($sp)
/* AA1B48 8002A9A8 A7AF0040 */ sh $t7, 0x40($sp)
/* AA1B4C 8002A9AC 14400008 */ bnez $v0, .L8002A9D0
/* AA1B50 8002A9B0 AFB80044 */ sw $t8, 0x44($sp)
/* AA1B54 8002A9B4 8FA40048 */ lw $a0, 0x48($sp)
/* AA1B58 8002A9B8 24050023 */ li $a1, 35
/* AA1B5C 8002A9BC 24060064 */ li $a2, 100
/* AA1B60 8002A9C0 0C009DE6 */ jal EffectSs_Spawn
/* AA1B64 8002A9C4 27A70018 */ addiu $a3, $sp, 0x18
/* AA1B68 8002A9C8 10000007 */ b .L8002A9E8
/* AA1B6C 8002A9CC 8FBF0014 */ lw $ra, 0x14($sp)
.L8002A9D0:
/* AA1B70 8002A9D0 8FA40048 */ lw $a0, 0x48($sp)
/* AA1B74 8002A9D4 24050023 */ li $a1, 35
/* AA1B78 8002A9D8 2406007F */ li $a2, 127
/* AA1B7C 8002A9DC 0C009DE6 */ jal EffectSs_Spawn
/* AA1B80 8002A9E0 27A70018 */ addiu $a3, $sp, 0x18
/* AA1B84 8002A9E4 8FBF0014 */ lw $ra, 0x14($sp)
.L8002A9E8:
/* AA1B88 8002A9E8 27BD0048 */ addiu $sp, $sp, 0x48
/* AA1B8C 8002A9EC 03E00008 */ jr $ra
/* AA1B90 8002A9F0 00000000 */ nop

22
asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A9F4.s
View File

@@ -1,22 +0,0 @@
glabel func_8002A9F4
/* AA1B94 8002A9F4 27BDFFD8 */ addiu $sp, $sp, -0x28
/* AA1B98 8002A9F8 AFA60030 */ sw $a2, 0x30($sp)
/* AA1B9C 8002A9FC AFA70034 */ sw $a3, 0x34($sp)
/* AA1BA0 8002AA00 87AF0036 */ lh $t7, 0x36($sp)
/* AA1BA4 8002AA04 97AE0032 */ lhu $t6, 0x32($sp)
/* AA1BA8 8002AA08 87B8003A */ lh $t8, 0x3a($sp)
/* AA1BAC 8002AA0C 8FB9003C */ lw $t9, 0x3c($sp)
/* AA1BB0 8002AA10 3C068011 */ lui $a2, %hi(D_801158C0) # $a2, 0x8011
/* AA1BB4 8002AA14 24C658C0 */ addiu $a2, %lo(D_801158C0) # addiu $a2, $a2, 0x58c0
/* AA1BB8 8002AA18 AFBF0024 */ sw $ra, 0x24($sp)
/* AA1BBC 8002AA1C 00C03825 */ move $a3, $a2
/* AA1BC0 8002AA20 AFAF0014 */ sw $t7, 0x14($sp)
/* AA1BC4 8002AA24 AFAE0010 */ sw $t6, 0x10($sp)
/* AA1BC8 8002AA28 AFB80018 */ sw $t8, 0x18($sp)
/* AA1BCC 8002AA2C 0C00AA57 */ jal func_8002A95C
/* AA1BD0 8002AA30 AFB9001C */ sw $t9, 0x1c($sp)
/* AA1BD4 8002AA34 8FBF0024 */ lw $ra, 0x24($sp)
/* AA1BD8 8002AA38 27BD0028 */ addiu $sp, $sp, 0x28
/* AA1BDC 8002AA3C 03E00008 */ jr $ra
/* AA1BE0 8002AA40 00000000 */ nop

2
asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s
View File

@@ -113,7 +113,7 @@ glabel func_8086F464
/* 004A0 8086F600 E7B00090 */ swc1 $f16, 0x0090($sp)
/* 004A4 8086F604 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFD8
/* 004A8 8086F608 02C03025 */ or $a2, $s6, $zero ## $a2 = FFFFFFE4
/* 004AC 8086F60C 0C00A3A1 */ jal func_80028E84
/* 004AC 8086F60C 0C00A3A1 */ jal EffectSsBomb2_SpawnLayered
/* 004B0 8086F610 02A03825 */ or $a3, $s5, $zero ## $a3 = FFFFFFF0
/* 004B4 8086F614 4406E000 */ mfc1 $a2, $f28
/* 004B8 8086F618 240D0032 */ addiu $t5, $zero, 0x0032 ## $t5 = 00000032

2
asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_80883144.s
View File

@@ -55,7 +55,7 @@ glabel func_80883144
/* 00C44 80883204 00C03825 */ or $a3, $a2, $zero ## $a3 = 8088361C
/* 00C48 80883208 8FA4003C */ lw $a0, 0x003C($sp)
/* 00C4C 8088320C E7B20034 */ swc1 $f18, 0x0034($sp)
/* 00C50 80883210 0C00A3A1 */ jal func_80028E84
/* 00C50 80883210 0C00A3A1 */ jal EffectSsBomb2_SpawnLayered
/* 00C54 80883214 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4
/* 00C58 80883218 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00C5C 8088321C 0C00BE0A */ jal Audio_PlayActorSound2

2
asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AC908.s
View File

@@ -56,7 +56,7 @@ glabel func_808AC908
/* 00374 808AC9D4 460A4400 */ add.s $f16, $f8, $f10
/* 00378 808AC9D8 8FA4003C */ lw $a0, 0x003C($sp)
/* 0037C 808AC9DC 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFF4
/* 00380 808AC9E0 0C00A3A1 */ jal func_80028E84
/* 00380 808AC9E0 0C00A3A1 */ jal EffectSsBomb2_SpawnLayered
/* 00384 808AC9E4 E7B00034 */ swc1 $f16, 0x0034($sp)
/* 00388 808AC9E8 3C0B808B */ lui $t3, %hi(func_808ACA08) ## $t3 = 808B0000
/* 0038C 808AC9EC 256BCA08 */ addiu $t3, $t3, %lo(func_808ACA08) ## $t3 = 808ACA08

2
asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809533F4.s
View File

@@ -388,7 +388,7 @@ glabel L80953868
/* 04644 80953904 A03868D2 */ sb $t8, %lo(D_809668D2)($at)
/* 04648 80953908 AFA80014 */ sw $t0, 0x0014($sp)
/* 0464C 8095390C AFB90010 */ sw $t9, 0x0010($sp)
/* 04650 80953910 0C00AA7D */ jal func_8002A9F4
/* 04650 80953910 0C00AA7D */ jal EffectSsDeadSound_SpawnStationary
/* 04654 80953914 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001
/* 04658 80953918 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002
/* 0465C 8095391C A2690194 */ sb $t1, 0x0194($s3) ## 00000194

2
asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097D9C4.s
View File

@@ -35,7 +35,7 @@ glabel func_8097D9C4
/* 003D8 8097DA48 440B4000 */ mfc1 $t3, $f8
/* 003DC 8097DA4C 8FA40040 */ lw $a0, 0x0040($sp)
/* 003E0 8097DA50 AFAD0014 */ sw $t5, 0x0014($sp)
/* 003E4 8097DA54 0C00A3A1 */ jal func_80028E84
/* 003E4 8097DA54 0C00A3A1 */ jal EffectSsBomb2_SpawnLayered
/* 003E8 8097DA58 AFAB0010 */ sw $t3, 0x0010($sp)
/* 003EC 8097DA5C 8FA40040 */ lw $a0, 0x0040($sp)
/* 003F0 8097DA60 0C25F5B5 */ jal func_8097D6D4

2
asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097DA78.s
View File

@@ -13,7 +13,7 @@ glabel func_8097DA78
/* 00434 8097DAA4 440F4000 */ mfc1 $t7, $f8
/* 00438 8097DAA8 44199000 */ mfc1 $t9, $f18
/* 0043C 8097DAAC AFAF0010 */ sw $t7, 0x0010($sp)
/* 00440 8097DAB0 0C00A3A1 */ jal func_80028E84
/* 00440 8097DAB0 0C00A3A1 */ jal EffectSsBomb2_SpawnLayered
/* 00444 8097DAB4 AFB90014 */ sw $t9, 0x0014($sp)
/* 00448 8097DAB8 8FBF001C */ lw $ra, 0x001C($sp)
/* 0044C 8097DABC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000

Some files were not shown because too many files have changed in this diff Show More