mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-09-08 11:15:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename smoke and explosion files

Browse Source
This commit is contained in:
Ryan Dwyer
2021-01-02 12:35:50 +10:00
parent 69a3b2883c
commit 470cf27ac1
27 changed files with 164 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld/gamefiles.inc
+6 -5
View File
@@ -30,7 +30,8 @@
build/ROMID/game/game_012450.o (section); \
build/ROMID/game/game_0125a0.o (section); \
build/ROMID/game/game_012d50.o (section); \
build/ROMID/game/game_013010.o (section); \
build/ROMID/game/explosions/init.o (section); \
build/ROMID/game/smoke/init.o (section); \
build/ROMID/game/sparks/init.o (section); \
build/ROMID/game/weather/init.o (section); \
build/ROMID/game/game_013540.o (section); \
@@ -45,8 +46,8 @@
build/ROMID/game/game_0151f0.o (section); \
build/ROMID/game/game_015260.o (section); \
build/ROMID/game/game_015270.o (section); \
build/ROMID/game/game_015280.o (section); \
build/ROMID/game/game_015330.o (section); \
build/ROMID/game/explosions/free.o (section); \
build/ROMID/game/smoke/free.o (section); \
build/ROMID/game/game_0153f0.o (section); \
build/ROMID/game/game_015400.o (section); \
build/ROMID/game/game_015410.o (section); \
@@ -131,8 +132,8 @@
build/ROMID/game/game_127910.o (section); \
build/ROMID/game/game_128f30.o (section); \
build/ROMID/game/game_129210.o (section); \
build/ROMID/game/explosion.o (section); \
build/ROMID/game/smoke.o (section); \
build/ROMID/game/explosions/explosions.o (section); \
build/ROMID/game/smoke/smoke.o (section); \
build/ROMID/game/sparks/sparks.o (section); \
build/ROMID/game/weather/weather.o (section); \
build/ROMID/game/game_135c70.o (section); \
src/game/chr/chr.c
+2 -2
View File
@@ -27,8 +27,8 @@
#include "game/game_127910.h"
#include "game/game_128f30.h"
#include "game/game_129210.h"
#include "game/explosion.h"
#include "game/smoke.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/game_157db0.h"
#include "game/game_165670.h"
src/game/chr/chraction.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include "game/game_0b63b0.h"
#include "game/game_111600.h"
#include "game/game_127910.h"
#include "game/explosion.h"
#include "game/explosions/explosions.h"
#include "game/sparks/sparks.h"
#include "game/game_157db0.h"
#include "game/game_1655c0.h"
src/game/chr/chraicommands.c
+2 -2
View File
@@ -31,8 +31,8 @@
#include "game/game_0dcdb0.h"
#include "game/game_111600.h"
#include "game/game_127910.h"
#include "game/explosion.h"
#include "game/smoke.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/weather/weather.h"
#include "game/game_157db0.h"
#include "game/game_1655c0.h"
src/game/core.c
+9 -8
View File
@@ -28,7 +28,8 @@
#include "game/game_011110.h"
#include "game/game_012450.h"
#include "game/game_0125a0.h"
#include "game/game_013010.h"
#include "game/explosions/init.h"
#include "game/smoke/init.h"
#include "game/sparks/init.h"
#include "game/weather/init.h"
#include "game/game_013540.h"
@@ -42,8 +43,8 @@
#include "game/game_0151f0.h"
#include "game/game_015260.h"
#include "game/game_015270.h"
#include "game/game_015280.h"
#include "game/game_015330.h"
#include "game/explosions/free.h"
#include "game/smoke/free.h"
#include "game/game_0153f0.h"
#include "game/game_015400.h"
#include "game/game_015410.h"
@@ -73,7 +74,7 @@
#include "game/game_11f000.h"
#include "game/game_127910.h"
#include "game/game_129210.h"
#include "game/explosion.h"
#include "game/explosions/explosions.h"
#include "game/sparks/sparks.h"
#include "game/weather/weather.h"
#include "game/game_135c70.h"
@@ -366,8 +367,8 @@ void coreLoadStage(s32 stagenum)
stageChooseActiveHeads(stagenum);
setupParseObjects(stagenum);
tagsAllocatePtrs();
func0f013010();
func0f013130();
explosionsInit();
smokeInit();
sparksInit();
weatherInit();
coreStopAllMiscSfx();
@@ -2763,8 +2764,8 @@ void coreUnloadStage(void)
}
func0f014f10();
explosionsClearAll();
smokeClearAll();
explosionsFree();
smokeFree();
func0f015400();
func0f015410();
func0f015420();
src/game/dlights.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "game/game_092610.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/smoke.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/game_157db0.h"
#include "game/game_166e40.h"
src/game/explosion.c → src/game/explosions/explosions.c
+2 -2
View File
@@ -14,8 +14,8 @@
#include "game/game_091e10.h"
#include "game/game_092610.h"
#include "game/game_0b3350.h"
#include "game/explosion.h"
#include "game/smoke.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/game_157db0.h"
#include "game/game_1668e0.h"
#include "game/game_166e40.h"
src/game/game_015280.c → src/game/explosions/free.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "lib/lib_09660.h"
#include "types.h"
void explosionsClearAll(void)
void explosionsFree(void)
{
s32 i;
src/game/explosions/init.c
+93
View File
@@ -0,0 +1,93 @@
#include <ultra64.h>
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_01a3a0.h"
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "gvars/gvars.h"
#include "lib/lib_121e0.h"
#include "types.h"
GLOBAL_ASM(
glabel explosionsInit
/* f013010: 3c018008 */ lui $at,%hi(var8007e4a0)
/* f013014: ac20e4a0 */ sw $zero,%lo(var8007e4a0)($at)
/* f013018: 3c018008 */ lui $at,%hi(var8007e4a4)
/* f01301c: ac20e4a4 */ sw $zero,%lo(var8007e4a4)($at)
/* f013020: 3c013f80 */ lui $at,0x3f80
/* f013024: 44812000 */ mtc1 $at,$f4
/* f013028: 3c08800a */ lui $t0,%hi(g_NumExplosions)
/* f01302c: 3c018008 */ lui $at,%hi(var8007e4a8)
/* f013030: 25083434 */ addiu $t0,$t0,%lo(g_NumExplosions)
/* f013034: 240e0006 */ addiu $t6,$zero,0x6
/* f013038: e424e4a8 */ swc1 $f4,%lo(var8007e4a8)($at)
/* f01303c: ad0e0000 */ sw $t6,0x0($t0)
/* f013040: 3c0f800a */ lui $t7,%hi(g_Vars+0x4b4)
/* f013044: 8defa474 */ lw $t7,%lo(g_Vars+0x4b4)($t7)
/* f013048: 27bdffe8 */ addiu $sp,$sp,-24
/* f01304c: afbf0014 */ sw $ra,0x14($sp)
/* f013050: 29e1005a */ slti $at,$t7,0x5a
/* f013054: 14200002 */ bnez $at,.L0f013060
/* f013058: 3c05800a */ lui $a1,%hi(g_Explosions)
/* f01305c: ad000000 */ sw $zero,0x0($t0)
.L0f013060:
/* f013060: 8d020000 */ lw $v0,0x0($t0)
/* f013064: 24a53430 */ addiu $a1,$a1,%lo(g_Explosions)
/* f013068: 54400004 */ bnezl $v0,.L0f01307c
/* f01306c: 000220c0 */ sll $a0,$v0,0x3
/* f013070: 1000002b */ b .L0f013120
/* f013074: aca00000 */ sw $zero,0x0($a1)
/* f013078: 000220c0 */ sll $a0,$v0,0x3
.L0f01307c:
/* f01307c: 00822021 */ addu $a0,$a0,$v0
/* f013080: 00042100 */ sll $a0,$a0,0x4
/* f013084: 00822023 */ subu $a0,$a0,$v0
/* f013088: 000420c0 */ sll $a0,$a0,0x3
/* f01308c: 2484000f */ addiu $a0,$a0,0xf
/* f013090: 2401fff0 */ addiu $at,$zero,-16
/* f013094: 0081c024 */ and $t8,$a0,$at
/* f013098: 03002025 */ or $a0,$t8,$zero
/* f01309c: 0c0048f2 */ jal malloc
/* f0130a0: 24050004 */ addiu $a1,$zero,0x4
/* f0130a4: 3c08800a */ lui $t0,%hi(g_NumExplosions)
/* f0130a8: 25083434 */ addiu $t0,$t0,%lo(g_NumExplosions)
/* f0130ac: 8d190000 */ lw $t9,0x0($t0)
/* f0130b0: 3c05800a */ lui $a1,%hi(g_Explosions)
/* f0130b4: 24a53430 */ addiu $a1,$a1,%lo(g_Explosions)
/* f0130b8: aca20000 */ sw $v0,0x0($a1)
/* f0130bc: 1b200018 */ blez $t9,.L0f013120
/* f0130c0: 00002025 */ or $a0,$zero,$zero
/* f0130c4: 00003025 */ or $a2,$zero,$zero
/* f0130c8: 240303c0 */ addiu $v1,$zero,0x3c0
/* f0130cc: 8ca90000 */ lw $t1,0x0($a1)
.L0f0130d0:
/* f0130d0: 00001025 */ or $v0,$zero,$zero
/* f0130d4: 01265021 */ addu $t2,$t1,$a2
/* f0130d8: ad400000 */ sw $zero,0x0($t2)
.L0f0130dc:
/* f0130dc: 000460c0 */ sll $t4,$a0,0x3
/* f0130e0: 01846021 */ addu $t4,$t4,$a0
/* f0130e4: 8cab0000 */ lw $t3,0x0($a1)
/* f0130e8: 000c6100 */ sll $t4,$t4,0x4
/* f0130ec: 01846023 */ subu $t4,$t4,$a0
/* f0130f0: 000c60c0 */ sll $t4,$t4,0x3
/* f0130f4: 016c6821 */ addu $t5,$t3,$t4
/* f0130f8: 01a27021 */ addu $t6,$t5,$v0
/* f0130fc: 24420018 */ addiu $v0,$v0,0x18
/* f013100: 1443fff6 */ bne $v0,$v1,.L0f0130dc
/* f013104: a5c0001c */ sh $zero,0x1c($t6)
/* f013108: 8d0f0000 */ lw $t7,0x0($t0)
/* f01310c: 24840001 */ addiu $a0,$a0,0x1
/* f013110: 24c60478 */ addiu $a2,$a2,0x478
/* f013114: 008f082a */ slt $at,$a0,$t7
/* f013118: 5420ffed */ bnezl $at,.L0f0130d0
/* f01311c: 8ca90000 */ lw $t1,0x0($a1)
.L0f013120:
/* f013120: 8fbf0014 */ lw $ra,0x14($sp)
/* f013124: 27bd0018 */ addiu $sp,$sp,0x18
/* f013128: 03e00008 */ jr $ra
/* f01312c: 00000000 */ nop
);
src/game/game_0601b0.c
+2 -2
View File
@@ -22,8 +22,8 @@
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_127910.h"
#include "game/explosion.h"
#include "game/smoke.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/game_157db0.h"
#include "game/game_190260.h"
src/game/game_097ba0.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include "game/game_0d7070.h"
#include "game/game_111600.h"
#include "game/game_127910.h"
#include "game/smoke.h"
#include "game/smoke/smoke.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/core.h"
src/game/game_0b63b0.c
+1 -1
View File
@@ -34,7 +34,7 @@
#include "game/game_107fb0.h"
#include "game/game_111600.h"
#include "game/game_127910.h"
#include "game/explosion.h"
#include "game/explosions/explosions.h"
#include "game/bondview.h"
#include "game/game_1531a0.h"
#include "game/game_157db0.h"
src/game/propobj.c
+2 -2
View File
@@ -42,8 +42,8 @@
#include "game/game_127910.h"
#include "game/game_128f30.h"
#include "game/game_129210.h"
#include "game/explosion.h"
#include "game/smoke.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/game_150820.h"
#include "game/game_1531a0.h"
src/game/game_015330.c → src/game/smoke/free.c
+1 -1
View File
@@ -11,7 +11,7 @@
#include "gvars/gvars.h"
#include "types.h"
void smokeClearAll(void)
void smokeFree(void)
{
s32 i;
src/game/game_013010.c → src/game/smoke/init.c
+1 -82
View File
@@ -12,88 +12,7 @@
#include "types.h"
GLOBAL_ASM(
glabel func0f013010
/* f013010: 3c018008 */ lui $at,%hi(var8007e4a0)
/* f013014: ac20e4a0 */ sw $zero,%lo(var8007e4a0)($at)
/* f013018: 3c018008 */ lui $at,%hi(var8007e4a4)
/* f01301c: ac20e4a4 */ sw $zero,%lo(var8007e4a4)($at)
/* f013020: 3c013f80 */ lui $at,0x3f80
/* f013024: 44812000 */ mtc1 $at,$f4
/* f013028: 3c08800a */ lui $t0,%hi(g_NumExplosions)
/* f01302c: 3c018008 */ lui $at,%hi(var8007e4a8)
/* f013030: 25083434 */ addiu $t0,$t0,%lo(g_NumExplosions)
/* f013034: 240e0006 */ addiu $t6,$zero,0x6
/* f013038: e424e4a8 */ swc1 $f4,%lo(var8007e4a8)($at)
/* f01303c: ad0e0000 */ sw $t6,0x0($t0)
/* f013040: 3c0f800a */ lui $t7,%hi(g_Vars+0x4b4)
/* f013044: 8defa474 */ lw $t7,%lo(g_Vars+0x4b4)($t7)
/* f013048: 27bdffe8 */ addiu $sp,$sp,-24
/* f01304c: afbf0014 */ sw $ra,0x14($sp)
/* f013050: 29e1005a */ slti $at,$t7,0x5a
/* f013054: 14200002 */ bnez $at,.L0f013060
/* f013058: 3c05800a */ lui $a1,%hi(g_Explosions)
/* f01305c: ad000000 */ sw $zero,0x0($t0)
.L0f013060:
/* f013060: 8d020000 */ lw $v0,0x0($t0)
/* f013064: 24a53430 */ addiu $a1,$a1,%lo(g_Explosions)
/* f013068: 54400004 */ bnezl $v0,.L0f01307c
/* f01306c: 000220c0 */ sll $a0,$v0,0x3
/* f013070: 1000002b */ b .L0f013120
/* f013074: aca00000 */ sw $zero,0x0($a1)
/* f013078: 000220c0 */ sll $a0,$v0,0x3
.L0f01307c:
/* f01307c: 00822021 */ addu $a0,$a0,$v0
/* f013080: 00042100 */ sll $a0,$a0,0x4
/* f013084: 00822023 */ subu $a0,$a0,$v0
/* f013088: 000420c0 */ sll $a0,$a0,0x3
/* f01308c: 2484000f */ addiu $a0,$a0,0xf
/* f013090: 2401fff0 */ addiu $at,$zero,-16
/* f013094: 0081c024 */ and $t8,$a0,$at
/* f013098: 03002025 */ or $a0,$t8,$zero
/* f01309c: 0c0048f2 */ jal malloc
/* f0130a0: 24050004 */ addiu $a1,$zero,0x4
/* f0130a4: 3c08800a */ lui $t0,%hi(g_NumExplosions)
/* f0130a8: 25083434 */ addiu $t0,$t0,%lo(g_NumExplosions)
/* f0130ac: 8d190000 */ lw $t9,0x0($t0)
/* f0130b0: 3c05800a */ lui $a1,%hi(g_Explosions)
/* f0130b4: 24a53430 */ addiu $a1,$a1,%lo(g_Explosions)
/* f0130b8: aca20000 */ sw $v0,0x0($a1)
/* f0130bc: 1b200018 */ blez $t9,.L0f013120
/* f0130c0: 00002025 */ or $a0,$zero,$zero
/* f0130c4: 00003025 */ or $a2,$zero,$zero
/* f0130c8: 240303c0 */ addiu $v1,$zero,0x3c0
/* f0130cc: 8ca90000 */ lw $t1,0x0($a1)
.L0f0130d0:
/* f0130d0: 00001025 */ or $v0,$zero,$zero
/* f0130d4: 01265021 */ addu $t2,$t1,$a2
/* f0130d8: ad400000 */ sw $zero,0x0($t2)
.L0f0130dc:
/* f0130dc: 000460c0 */ sll $t4,$a0,0x3
/* f0130e0: 01846021 */ addu $t4,$t4,$a0
/* f0130e4: 8cab0000 */ lw $t3,0x0($a1)
/* f0130e8: 000c6100 */ sll $t4,$t4,0x4
/* f0130ec: 01846023 */ subu $t4,$t4,$a0
/* f0130f0: 000c60c0 */ sll $t4,$t4,0x3
/* f0130f4: 016c6821 */ addu $t5,$t3,$t4
/* f0130f8: 01a27021 */ addu $t6,$t5,$v0
/* f0130fc: 24420018 */ addiu $v0,$v0,0x18
/* f013100: 1443fff6 */ bne $v0,$v1,.L0f0130dc
/* f013104: a5c0001c */ sh $zero,0x1c($t6)
/* f013108: 8d0f0000 */ lw $t7,0x0($t0)
/* f01310c: 24840001 */ addiu $a0,$a0,0x1
/* f013110: 24c60478 */ addiu $a2,$a2,0x478
/* f013114: 008f082a */ slt $at,$a0,$t7
/* f013118: 5420ffed */ bnezl $at,.L0f0130d0
/* f01311c: 8ca90000 */ lw $t1,0x0($a1)
.L0f013120:
/* f013120: 8fbf0014 */ lw $ra,0x14($sp)
/* f013124: 27bd0018 */ addiu $sp,$sp,0x18
/* f013128: 03e00008 */ jr $ra
/* f01312c: 00000000 */ nop
);
GLOBAL_ASM(
glabel func0f013130
glabel smokeInit
/* f013130: 3c0e8009 */ lui $t6,%hi(g_Is4Mb)
/* f013134: 91ce0af0 */ lbu $t6,%lo(g_Is4Mb)($t6)
/* f013138: 27bdffe8 */ addiu $sp,$sp,-24
src/game/smoke.c → src/game/smoke/smoke.c
+1 -1
View File
@@ -10,7 +10,7 @@
#include "game/dlights.h"
#include "game/game_0601b0.h"
#include "game/game_0b3350.h"
#include "game/smoke.h"
#include "game/smoke/smoke.h"
#include "game/game_157db0.h"
#include "game/game_1668e0.h"
#include "game/game_166e40.h"
src/game/splat.c
+1 -1
View File
@@ -7,7 +7,7 @@
#include "game/data/data_01a3a0.h"
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/smoke.h"
#include "game/smoke/smoke.h"
#include "game/game_157db0.h"
#include "game/propobj.h"
#include "game/splat.h"
src/game/training.c
+1 -1
View File
@@ -21,7 +21,7 @@
#include "game/game_0f09f0.h"
#include "game/game_107fb0.h"
#include "game/game_111600.h"
#include "game/explosion.h"
#include "game/explosions/explosions.h"
#include "game/game_150820.h"
#include "game/game_1531a0.h"
#include "game/game_157db0.h"
src/include/game/explosion.h → src/include/game/explosions/explosions.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef IN_GAME_EXPLOSION_H
#define IN_GAME_EXPLOSION_H
#ifndef IN_GAME_EXPLOSIONS_EXPLOSIONS_H
#define IN_GAME_EXPLOSIONS_EXPLOSIONS_H
#include <ultra64.h>
#include "types.h"
src/include/game/explosions/free.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef IN_GAME_EXPLOSIONS_FREE_H
#define IN_GAME_EXPLOSIONS_FREE_H
#include <ultra64.h>
#include "types.h"
void explosionsFree(void);
#endif
src/include/game/explosions/init.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef _IN_GAME_EXPLOSIONS_INIT_H
#define _IN_GAME_EXPLOSIONS_INIT_H
#include <ultra64.h>
#include "types.h"
void explosionsInit(void);
#endif
src/include/game/game_013010.h
-9
View File
@@ -1,9 +0,0 @@
#ifndef _IN_GAME_GAME_013010_H
#define _IN_GAME_GAME_013010_H
#include <ultra64.h>
#include "types.h"
void func0f013010(void);
void func0f013130(void);
#endif
src/include/game/game_015280.h
-8
View File
@@ -1,8 +0,0 @@
#ifndef IN_GAME_GAME_015280_H
#define IN_GAME_GAME_015280_H
#include <ultra64.h>
#include "types.h"
u32 explosionsClearAll(void);
#endif
src/include/game/game_015330.h
-8
View File
@@ -1,8 +0,0 @@
#ifndef _IN_GAME_GAME_015330_H
#define _IN_GAME_GAME_015330_H
#include <ultra64.h>
#include "types.h"
void smokeClearAll(void);
#endif
src/include/game/smoke/free.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef _IN_GAME_SMOKE_FREE_H
#define _IN_GAME_SMOKE_FREE_H
#include <ultra64.h>
#include "types.h"
void smokeFree(void);
#endif
src/include/game/smoke/init.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef _IN_GAME_SMOKE_INIT_H
#define _IN_GAME_SMOKE_INIT_H
#include <ultra64.h>
#include "types.h"
void smokeInit(void);
#endif
src/include/game/smoke.h → src/include/game/smoke/smoke.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef _IN_GAME_SMOKE_H
#define _IN_GAME_SMOKE_H
#ifndef _IN_GAME_SMOKE_SMOKE_H
#define _IN_GAME_SMOKE_SMOKE_H
#include <ultra64.h>
#include "types.h"