export configuration for ast_enmy_space (#168)

* Matchpoint

* remove header

* remove comments

* add ENMY_SPACE_ to every symbol

* missed one
This commit is contained in:
Alejandro Asenjo Nitti 2024-03-16 20:10:21 -03:00 committed by GitHub
parent c6f36f8b7c
commit 60a64d402f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 193 additions and 53 deletions

View File

@ -96,7 +96,10 @@
"ast_test.h": "c",
"ast_landmaster.h": "c",
"ast_blue_marine.h": "c",
"ast_training.h": "c"
"ast_training.h": "c",
"ast_sector_x.h": "c",
"ast_aquas.h": "c",
"ast_enmy_space.h": "c"
},
"C_Cpp_Runner.msvcBatchPath": ""
}

View File

@ -0,0 +1,159 @@
:config:
segments:
- [0x04, 0x922730]
header:
code:
- '#include "assets/ast_enmy_space.h"'
header:
- '#include "gfx.h"'
- '#include "sf64object.h"'
- '#include "structs.h"'
D_ENMY_SPACE_4000080:
{ type: SF64:ANIM, offset: 0x4000080, symbol: D_ENMY_SPACE_4000080 }
D_ENMY_SPACE_400014C:
{ type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C, pad: 8 }
D_ENMY_SPACE_4000170:
{ type: GFX, offset: 0x4000170, symbol: D_ENMY_SPACE_4000170 }
PAD_4000648:
{ type: BLOB, offset: 0x4000648, size: 0x8, symbol: PAD_4000648 }
D_ENMY_SPACE_4000650:
{ type: GFX, offset: 0x4000650, symbol: D_ENMY_SPACE_4000650 }
D_ENMY_SPACE_4000EC0:
{ type: GFX, offset: 0x4000EC0, symbol: D_ENMY_SPACE_4000EC0 }
D_ENMY_SPACE_4001108:
{ type: TEXTURE, format: RGBA16, offset: 0x4001108, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001108 }
PAD_4001308:
{ type: BLOB, offset: 0x4001308, size: 0x8, symbol: PAD_4001308 }
D_ENMY_SPACE_4001310:
{ type: GFX, offset: 0x4001310, symbol: D_ENMY_SPACE_4001310 }
D_ENMY_SPACE_4001A30:
{ type: TEXTURE, format: RGBA16, offset: 0x4001A30, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001A30 }
D_ENMY_SPACE_4001C30:
{ type: TEXTURE, format: RGBA16, offset: 0x04001C30, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001C30 }
D_ENMY_SPACE_4001E30:
{ type: TEXTURE, format: RGBA16, offset: 0x04001E30, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001E30 }
D_ENMY_SPACE_4002030:
{ type: TEXTURE, format: RGBA16, offset: 0x04002030, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4002030 }
D_ENMY_SPACE_4002230:
{ type: GFX, offset: 0x4002230, symbol: D_ENMY_SPACE_4002230 }
PAD_4002658:
{ type: BLOB, offset: 0x4002658, size: 0x8, symbol: PAD_4002658 }
D_ENMY_SPACE_4002C50:
{ type: TEXTURE, format: RGBA16, offset: 0x04002C50, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4002C50 }
D_ENMY_SPACE_4002E50:
{ type: TEXTURE, format: RGBA16, offset: 0x04002E50, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4002E50 }
D_ENMY_SPACE_4003050:
{ type: TEXTURE, format: RGBA16, offset: 0x04003050, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4003050 }
D_ENMY_SPACE_4003250:
{ type: TEXTURE, format: RGBA16, offset: 0x04003250, width: 4, height: 4, ctype: u16, symbol: D_ENMY_SPACE_4003250 }
D_ENMY_SPACE_4003270:
{ type: TEXTURE, format: RGBA16, offset: 0x04003270, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4003270 }
D_ENMY_SPACE_4003470:
{ type: TEXTURE, format: RGBA16, offset: 0x04003470, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4003470 }
D_ENMY_SPACE_4003670:
{ type: TEXTURE, format: RGBA16, offset: 0x04003670, width: 8, height: 8, ctype: u16, symbol: D_ENMY_SPACE_4003670 }
D_ENMY_SPACE_4003BD0:
{ type: GFX, offset: 0x4003BD0, symbol: D_ENMY_SPACE_4003BD0 }
D_ENMY_SPACE_40047E8:
{ type: TEXTURE, format: RGBA16, offset: 0x40047E8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_40047E8 }
D_ENMY_SPACE_4004FE8:
{ type: TEXTURE, format: RGBA16, offset: 0x4004FE8, width: 64, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4004FE8 }
D_ENMY_SPACE_4005FE8:
{ type: TEXTURE, format: RGBA16, offset: 0x4005FE8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4005FE8 }
D_ENMY_SPACE_40067E8:
{ type: TEXTURE, format: RGBA16, offset: 0x40067E8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_40067E8 }
D_ENMY_SPACE_40077E8:
{ type: TEXTURE, format: RGBA16, offset: 0x40077E8, width: 8, height: 8, ctype: u16, symbol: D_ENMY_SPACE_40077E8, pad: 8 }
D_ENMY_SPACE_4007870:
{ type: GFX, offset: 0x4007870, symbol: D_ENMY_SPACE_4007870 }
D_ENMY_SPACE_4006FE8:
{ type: TEXTURE, format: RGBA16, offset: 0x4006FE8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4006FE8 }
D_ENMY_SPACE_40084D0:
{ type: GFX, offset: 0x40084D0, symbol: D_ENMY_SPACE_40084D0 }
D_ENMY_SPACE_4008550:
{ type: TEXTURE, format: RGBA16, offset: 0x04008550, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4008550 }
D_ENMY_SPACE_4008D50:
{ type: GFX, offset: 0x4008D50, symbol: D_ENMY_SPACE_4008D50 }
PAD_4008F98:
{ type: BLOB, offset: 0x4008F98, size: 0x8, symbol: PAD_4008F98 }
D_ENMY_SPACE_4008FA0:
{ type: GFX, offset: 0x4008FA0, symbol: D_ENMY_SPACE_4008FA0 }
D_ENMY_SPACE_40096B8:
{ type: TEXTURE, format: RGBA16, offset: 0x040096B8, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_40096B8 }
D_ENMY_SPACE_40098B8:
{ type: TEXTURE, format: RGBA16, offset: 0x040098B8, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_40098B8 }
D_ENMY_SPACE_4009AB8:
{ type: TEXTURE, format: RGBA16, offset: 0x04009AB8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4009AB8 }
PAD_400A2B8:
{ type: BLOB, offset: 0x400A2B8, size: 0x8, symbol: PAD_400A2B8 }
D_ENMY_SPACE_400A30C:
{ type: SF64:ANIM, offset: 0x400A30C, symbol: D_ENMY_SPACE_400A30C }
D_ENMY_SPACE_400A398:
{ type: SF64:SKELETON, offset: 0x400A398, symbol: D_ENMY_SPACE_400A398 }
PAD_400A3AC:
{ type: BLOB, offset: 0x400A3AC, size: 0x4, symbol: PAD_400A3AC }
D_ENMY_SPACE_400A630:
{ type: GFX, offset: 0x400A630, symbol: D_ENMY_SPACE_400A630 }
PAD_400AAD8:
{ type: BLOB, offset: 0x400AAD8, size: 0x8, symbol: PAD_400AAD8 }
D_ENMY_SPACE_400AAE0:
{ type: GFX, offset: 0x400AAE0, symbol: D_ENMY_SPACE_400AAE0 }
PAD_400B388:
{ type: BLOB, offset: 0x400B388, size: 0x8, symbol: PAD_400B388 }
D_ENMY_SPACE_400B390:
{ type: GFX, offset: 0x400B390, symbol: D_ENMY_SPACE_400B390 }
PAD_400BD18:
{ type: BLOB, offset: 0x400BD18, size: 0x8, symbol: PAD_400BD18 }
D_ENMY_SPACE_400BD20:
{ type: GFX, offset: 0x400BD20, symbol: D_ENMY_SPACE_400BD20 }
# size = 0xC510

View File

@ -7,21 +7,14 @@
#include "sf64object.h"
#include "sf64player.h"
// ast_enmy_planet, ast_enmy_space
extern Animation D_4000080;
extern Limb* D_400014C[];
// ast_enmy_planet
extern Animation D_40001A4;
extern Limb* D_4000270[];
extern Gfx D_40018A0[];
extern Gfx D_4003BD0[];
extern Animation D_40057AC;
extern Limb* D_40058B8[];
extern Gfx D_40068F0[];
extern Gfx D_4007870[];
extern Gfx D_4007AF0[];
extern Animation D_400A30C;
extern Limb* D_400A398[];
extern Gfx D_400B390[];
/* ast_corneria, ast_meteo, ast_titania, ast_sector_x, ast_sector_z,
* ast_aquas, ast_area_6, ast_venom_1, ast_venom_2, ast_ve1_boss*,

View File

@ -1,8 +0,0 @@
#ifndef AST_ENMY_SPACE_H
#define AST_ENMY_SPACE_H
#include "gfx.h"
#include "sf64object.h"
#include "structs.h"
#endif

View File

@ -1034,14 +1034,10 @@ D_0302DE3C = 0x00302DE3C;
// fox_enmy2
D_6011F90 = 0x06011F90;
D_4000710 = 0x04000710;
D_400BD20 = 0x0400BD20;
D_4001310 = 0x04001310;
D_601F2A0 = 0x0601F2A0;
D_4000650 = 0x04000650;
D_6016190 = 0x06016190;
D_SX_6023500 = 0x06023500;
D_SX_6022DF0 = 0x06022DF0;
D_4008FA0 = 0x04008FA0;
D_SX_60285F0 = 0x060285F0;
D_SX_600AF70 = 0x0600AF70;
D_SX_6023E30 = 0x06023E30;
@ -1056,8 +1052,6 @@ D_6004D00 = 0x06004D00;
D_601A880 = 0x0601A880;
D_6015D60 = 0x06015D60;
D_SX_600B540 = 0x0600B540;
D_4000EC0 = 0x04000EC0;
D_4008D50 = 0x04008D50;
D_6022B10 = 0x06022B10;
D_60209F0 = 0x060209F0;
D_6019430 = 0x06019430;
@ -1076,9 +1070,6 @@ D_6004310 = 0x06004310;
D_4006E90 = 0x04006E90;
D_4009800 = 0x04009800;
D_40073C0 = 0x040073C0;
D_4000170 = 0x04000170;
D_40084D0 = 0x040084D0;
D_400A630 = 0x0400A630;
D_60282A0 = 0x060282A0;
D_SX_603298C = 0x0603298C;
@ -1463,23 +1454,17 @@ D_302E95C = 0x302E95C;
D_302EA4C = 0x302EA4C;
D_302EB3C = 0x302EB3C;
D_302EC20 = 0x302EC20;
D_4000080 = 0x4000080;
D_04000000 = 0x04000000;
D_400014C = 0x400014C;
D_40001A4 = 0x40001A4;
D_4000270 = 0x4000270;
D_40018A0 = 0x40018A0;
D_4003BD0 = 0x4003BD0;
D_40057AC = 0x40057AC;
D_40058B8 = 0x40058B8;
D_40068F0 = 0x40068F0;
D_4007870 = 0x4007870;
D_4007AF0 = 0x4007AF0;
D_4008CE0 = 0x4008CE0;
D_4008F70 = 0x4008F70;
D_400A30C = 0x400A30C;
D_400A398 = 0x400A398;
D_400AAE0 = 0x400AAE0;
D_400B390 = 0x400B390;
D_5000200 = 0x5000200;
D_5000300 = 0x5000300;
D_5000500 = 0x5000500;

View File

@ -8,6 +8,7 @@
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_great_fox.h"
#include "assets/ast_enmy_space.h"
extern Gfx D_60320E0[];
extern Gfx D_7010970[];
@ -2601,7 +2602,7 @@ void func_8004FEC0(Actor* actor) {
break;
case 20:
gSPDisplayList(gMasterDisp++, D_400AAE0);
gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_400AAE0);
break;
case 24:
@ -2624,7 +2625,7 @@ void func_8004FEC0(Actor* actor) {
break;
case 28:
gSPDisplayList(gMasterDisp++, D_400AAE0);
gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_400AAE0);
Matrix_Translate(gGfxMatrix, 0.f, 0.f, -60.0f, 1);
func_8005B1E8(actor, 2);
break;

View File

@ -16,6 +16,7 @@ WingInfo D_80161630;
#include "assets/ast_arwing.h"
#include "assets/ast_blue_marine.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_enmy_space.h"
char D_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $";
@ -534,9 +535,9 @@ void func_8005B388(Actor* actor) {
} else if (gLevelType == LEVELTYPE_PLANET) {
gSPDisplayList(gMasterDisp++, D_40018A0);
} else if (gPlayer[0].unk_204 == 2) {
gSPDisplayList(gMasterDisp++, D_4003BD0);
gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_4003BD0);
} else {
gSPDisplayList(gMasterDisp++, D_4007870);
gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_4007870);
}
func_8005ADAC(actor);
}
@ -568,7 +569,7 @@ void func_8005B848(Actor* actor) {
break;
case 1:
if (gCurrentLevel == LEVEL_AREA_6) {
gSPDisplayList(gMasterDisp++, D_400B390);
gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_400B390);
} else {
gSPDisplayList(gMasterDisp++, D_4007AF0);
}

View File

@ -13,6 +13,7 @@ s32 D_80161690;
#include "assets/ast_aquas.h"
#include "assets/ast_7_ti_1.h"
#include "assets/ast_andross.h"
#include "assets/ast_enmy_space.h"
void func_8006A7B0(u16* msg, s32 character) {
PRINTF("Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n");
@ -227,7 +228,7 @@ u8 D_800CFFB4[16] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2 };
f32 D_800CFFC4[16] = {
1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.99f, 0.98f, 0.94f, 0.88f, 0.8f, 1.0f,
};
Gfx* D_800D0004[3] = { D_4000170, D_40084D0, D_400A630 };
Gfx* D_800D0004[3] = { D_ENMY_SPACE_4000170, D_ENMY_SPACE_40084D0, D_ENMY_SPACE_400A630 };
void func_8006B0A0(Actor* actor) {
Vec3f sp34;
@ -869,20 +870,20 @@ UnkStruct_D003C D_800D003C[108] = {
{ D_6011F90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 },
{ D_4000710, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 0, 1, 1, 1.0f, 1 },
{ NULL, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 },
{ D_400BD20, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_4001310, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 },
{ D_400B390, D_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_ENMY_SPACE_400BD20, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_ENMY_SPACE_4001310, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 },
{ D_ENMY_SPACE_400B390, D_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_6018C00, D_800CBE8C, 2.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_601F2A0, D_800CBEFC, 7.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_400AAE0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_4000650, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 },
{ D_ENMY_SPACE_400AAE0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_ENMY_SPACE_4000650, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 },
{ D_6016190, D_60282A0, -2.0f, 2100.0f, 3000.0f, 0, 0, 7, 0, 0.0f, 5 },
{ D_SX_6023500, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_SX_6022DF0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 1, 1, 0, 0.0f, 1 },
{ NULL, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 },
{ NULL, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 },
{ D_4008FA0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_ENMY_SPACE_4008FA0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_SX_60285F0, D_SX_603298C, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_SX_600AF70, D_SX_6032904, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_SX_6023E30, D_SX_6032970, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
@ -913,8 +914,8 @@ UnkStruct_D003C D_800D003C[108] = {
{ D_6015D60, D_6034124, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 },
{ NULL, D_602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_SX_600B540, D_SX_60328E8, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_4000EC0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_4008D50, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_ENMY_SPACE_4000EC0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_ENMY_SPACE_4008D50, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ NULL, D_800CBF34, -1.0f, 2000.0f, 3000.0f, 0, 0, 3, 0, 0.0f, 1 },
{ D_60102C0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_601F3D0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
@ -3847,7 +3848,7 @@ void func_80074FF0(Actor* actor) {
if (gLevelType == LEVELTYPE_PLANET) {
gSPDisplayList(gMasterDisp++, D_40018A0);
} else {
gSPDisplayList(gMasterDisp++, D_4007870);
gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_4007870);
}
func_8005ADAC(actor);
break;
@ -3943,10 +3944,11 @@ void func_80074FF0(Actor* actor) {
break;
case 33:
Animation_GetFrameData(&D_400A30C, actor->unk_0B6, sp114);
Animation_GetFrameData(&D_ENMY_SPACE_400A30C, actor->unk_0B6, sp114);
Matrix_RotateY(gGfxMatrix, M_PI, 1);
Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1);
Animation_DrawSkeleton(1, D_400A398, sp114, func_80074BFC, NULL, actor, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_ENMY_SPACE_400A398, sp114, func_80074BFC, NULL, actor,
&gIdentityMatrix);
Math_SmoothStepToF(&actor->fwork[16], 0.0f, 0.3f, 2.0f, 0.0001f);
break;
@ -4069,8 +4071,8 @@ void func_80074FF0(Actor* actor) {
break;
case 106:
Animation_GetFrameData(&D_4000080, actor->unk_0B6, sp114);
Animation_DrawSkeleton(1, D_400014C, sp114, NULL, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_ENMY_SPACE_4000080, actor->unk_0B6, sp114);
Animation_DrawSkeleton(1, D_ENMY_SPACE_400014C, sp114, NULL, NULL, actor, &gIdentityMatrix);
break;
case 0xFFF:

View File

@ -72,8 +72,12 @@
- name: ast_enmy_space
exclusive_ram_id: segment_04
type: bin
type: code
dir: assets
start: 0x922730
vram: 0x04000000
subsegments:
- [0x922730, .data, ast_enmy_space/ast_enmy_space]
- name: ast_great_fox
exclusive_ram_id: segment_0E