Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-23 17:24:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

move all data to src

Browse Source
This commit is contained in:
Seth Barberee
2025-06-30 08:58:45 -07:00
parent 01cd173c06
commit b36a8e43d2
3 changed files with 27 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
data/data_8115F5C_1.s
View File

@@ -1,94 +1,3 @@
.section .rodata
@ ground_effect.c
.global gUnknown_81185D8
gUnknown_81185D8: @ 81185D8
.string "../ground/ground_effect.c\0"
.global gUnknown_81185F2
gUnknown_81185F2: @ 81185F2
@ replacing .incbin "baserom.gba", 0x1185F2, 0x1E
.byte 0xff, 0xff, 0x00, 0x08, 0x01, 0x08, 0x00, 0x10, 0x00, 0x00
.global gUnknown_81185FC
gUnknown_81185FC: @ 81185FC
.string "GroundEffect_Select\0"
.align 2, 0
.global gUnknown_8118610
gUnknown_8118610: @ 8118610
.4byte gUnknown_81185D8
.4byte 0x106
.4byte gUnknown_81185FC
.global gUnknown_811861C
gUnknown_811861C: @ 811861C
.string "GroundEffect Select %3d %3d %3d"
.align 2,0
.global gUnknown_8118640
gUnknown_8118640: @ 8118640
.string "GroundEffect Cancel %3d"
.align 2,0
.global gUnknown_8118658
gUnknown_8118658: @ 8118658
.string "GroundEffect CancelBlank\0"
.align 2,0
.global gUnknown_8118674
gUnknown_8118674: @ 8118674
@ replacing .incbin "baserom.gba", 0x118674, 0x58
.string "GroundEffect Add id %3d kind %3d type %3d group %3d sector %3d\0"
.align 2, 0
.global gUnknown_81186B8
gUnknown_81186B8: @ 81186B8
.string "GroundEffect_Add\0"
.align 2, 0
.global gUnknown_81186CC
gUnknown_81186CC: @ 81186CC
@ replacing .incbin "baserom.gba", 0x1186CC, 0xC
.4byte gUnknown_81185D8
.byte 0x10, 0x02, 0x00, 0x00
.4byte gUnknown_81186B8
.global gUnknown_81186D8
gUnknown_81186D8: @ 81186D8
.string "GroundEffect Delete id %3d"
.align 2,0
.global gUnknown_81186F4
gUnknown_81186F4: @ 81186F4
.string "GroundEffect Execute %3d "
.align 2,0
.global GroundEffect_ExecuteScript_Text
GroundEffect_ExecuteScript_Text: @ ExecuteScript
.string "GroundEffect_ExecuteScript"
.align 2,0
.global gUnknown_811872C
gUnknown_811872C: @ 811872C
.4byte gUnknown_81185D8
.4byte 0x290
.4byte GroundEffect_ExecuteScript_Text
.global GroundEffect_Action_Text
GroundEffect_Action_Text: @ Action
.string "GroundEffect_Action\0"
.align 2,0
.global gUnknown_811874C
gUnknown_811874C: @ 811874C
.4byte gUnknown_81185D8
.4byte 0x560
.4byte GroundEffect_Action_Text
.global gUnknown_8118758
gUnknown_8118758: @ 8118758
.4byte gUnknown_81185D8
.4byte 0x56A
.4byte GroundEffect_Action_Text

1
ld_script.ld
View File

@@ -737,7 +737,6 @@ SECTIONS {
src/ground_lives.o(.rodata);
src/ground_object.o(.rodata);
src/ground_effect.o(.rodata);
data/data_8115F5C_1.o(.rodata);
src/ground_link.o(.rodata);
src/ground_event.o(.rodata);
src/unk_dungeon_load_maybe.o(.rodata);

55
src/ground_effect.c
View File

@@ -157,10 +157,11 @@ static const struct ScriptCommand gUnusedScript[] = {
WAIT(0x78),
JUMP_LABEL(0),
};
//ALIGNED(4) const u8 gUnknown_81185D8[] = "../ground/ground_effect.c";
const u8 gUnknown_81185D8[] = "../ground/ground_effect.c";
const s16 gUnknown_81185F2[] = { -1, 0x800, 0x801, 0x1000, 0};
void AllocGroundEffects()
void AllocGroundEffects(void)
{
s32 index;
GroundEffect* current;
@@ -209,8 +210,8 @@ void GroundEffect_Select(s32 scriptID, s32 group, s32 sector)
scriptID_s32 = (s16)scriptID;
group_s32 = (s16)group;
sector_s32 = (s8)sector;
scriptPtr = GetGroundScript(scriptID_s32, &gUnknown_8118610);
Log('\0',gUnknown_811861C, scriptID_s32, group_s32, sector_s32);
scriptPtr = GetGroundScript(scriptID_s32, DEBUG_LOC_PTR(gUnknown_81185D8, 0x106, "GroundEffect_Select"));
Log(0,"GroundEffect Select %3d %3d %3d", scriptID_s32, group_s32, sector_s32);
groupPtr = &scriptPtr->groups[group_s32];
sectorPtr = &groupPtr->sectors[sector_s32];
@@ -234,7 +235,7 @@ void GroundEffect_Cancel(s32 scriptID, s32 sector)
sector_s32 = (s8) sector;
Log('\0',gUnknown_8118640, scriptID_s32);
Log(0,"GroundEffect Cancel %3d", scriptID_s32);
index = 0;
ptr = &gGroundEffects[0];
@@ -246,13 +247,13 @@ void GroundEffect_Cancel(s32 scriptID, s32 sector)
}
}
void GroundEffect_CancelBlank()
void GroundEffect_CancelBlank(void)
{
s32 index;
GroundEffect *ptr;
PixelPos pos;
Log(0, gUnknown_8118658); // "GroundEffect CancelBlank"
Log(0, "GroundEffect CancelBlank");
index = 0;
ptr = &gGroundEffects[0];
@@ -270,8 +271,7 @@ void GroundEffect_CancelBlank()
}
}
// Unused
s32 GroundEffect_Find(s32 a0_) {
UNUSED s32 GroundEffect_Find(s32 a0_) {
s32 index;
s32 a0;
GroundEffect *ptr;
@@ -289,7 +289,6 @@ s32 GroundEffect_Find(s32 a0_) {
return -1;
}
// https://decomp.me/scratch/3VqaG - 99.68% matched (Seth)
s32 GroundEffect_Add(s32 _id, const GroundEffectData *effectData,s32 _group,s32 _sector)
{
struct GroundEffectTypeData *puVar4;
@@ -323,7 +322,7 @@ s32 GroundEffect_Add(s32 _id, const GroundEffectData *effectData,s32 _group,s32
}
parent = &gGroundEffects[id];
Log(0,gUnknown_8118674,id,effectData->kind,puVar4->type,group,sector);
Log(0,"GroundEffect Add id %3d kind %3d type %3d group %3d sector %3d",id,effectData->kind,puVar4->type,group,sector);
bVar10 = parent->kind == -1;
parent->id = id;
parent->kind = effectData->kind;
@@ -374,7 +373,7 @@ s32 GroundEffect_Add(s32 _id, const GroundEffectData *effectData,s32 _group,s32
GetCurrentDungeonBounds(&parent->unk28,&parent->unk30);
if (bVar10) {
parent->unk13E = 0x800;
parent->directionRelated = 1;
parent->directionRelated = TRUE;
parent->unk140 = 0;
sub_80A7688(&parent->unk144,id,parent->kind,parent->flags);
}
@@ -389,7 +388,7 @@ s32 GroundEffect_Add(s32 _id, const GroundEffectData *effectData,s32 _group,s32
return id;
}
SetPredefinedScript(&parent->action,0,script);
ExecutePredefinedScript(&parent->action,NULL,0,&gUnknown_81186CC);
ExecutePredefinedScript(&parent->action,NULL,0,DEBUG_LOC_PTR(gUnknown_81185D8, 0x210, "GroundEffect_Add"));
return id;
}
@@ -399,7 +398,7 @@ void GroundEffect_Delete(s32 _id)
s32 id = (s16)_id;
GroundEffect *parent = &gGroundEffects[id];
Log(0, gUnknown_81186D8, id);
Log(0, "GroundEffect Delete id %3d", id);
sub_80A7714(&parent->unk144);
InitAction2(&parent->action);
@@ -418,7 +417,7 @@ void sub_80AD0C8(s32 _id, s32 flags)
}
}
void sub_80AD10C(s32 index_, s32 flag)
static void sub_80AD10C(s32 index_, s32 flag)
{
s32 index = (s16)index_;
GroundEffect *parent = &gGroundEffects[index];
@@ -441,7 +440,7 @@ Action *sub_80AD158(s32 index_)
return NULL;
}
bool8 sub_80AD18C(s32 index_, ScriptInfoSmall *scriptInfo, s32 a2_)
UNUSED bool8 sub_80AD18C(s32 index_, ScriptInfoSmall *scriptInfo, s32 a2_)
{
s32 index = (s16)index_;
s32 a2 = (s16)a2_;
@@ -458,16 +457,16 @@ bool8 GroundEffect_ExecuteScript(s32 index_, void *a1, ScriptInfoSmall *script)
s32 index = (s16)index_;
GroundEffect *parent = &gGroundEffects[index];
Log(0, gUnknown_81186F4, index);
Log(0, "GroundEffect Execute %3d ", index);
if(parent->kind != -1)
{
GroundScript_ExecutePP(&parent->action, (ActionUnkIds *)a1, script, &gUnknown_811872C);
parent->directionRelated = 1;
return 1;
GroundScript_ExecutePP(&parent->action, (ActionUnkIds *)a1, script, DEBUG_LOC_PTR(gUnknown_81185D8, 0x290, "GroundEffect_ExecuteScript"));
parent->directionRelated = TRUE;
return TRUE;
}
else {
return 0;
return FALSE;
}
}
@@ -561,6 +560,7 @@ s16 sub_80AD3B4(s32 index_, PixelPos *pos)
return parent->kind;
}
// https://decomp.me/scratch/X0Sfx - 79.62% matched (Seth)
NAKED
s32 sub_80AD3E0(GroundEffect *r0, PixelPos *r1)
{
@@ -609,6 +609,7 @@ s32 sub_80AD3E0(GroundEffect *r0, PixelPos *r1)
"\tbx r1");
}
// https://decomp.me/scratch/MUVaT - 98.53% matched (Seth)
NAKED
s32 sub_80AD430(GroundEffect *r0, PixelPos *r1)
{
@@ -795,10 +796,10 @@ static void CallbackEffectSetEventIndex(void *livesPtr_, u16 a1) {
if(livesPtr->unk13E != (s16) r1)
{
livesPtr->unk13E = r1;
livesPtr->directionRelated = 1;
livesPtr->directionRelated = TRUE;
}
else if((livesPtr->unk13E & 0x1000))
livesPtr->directionRelated = 1;
livesPtr->directionRelated = TRUE;
}
static void CallbackEffectSetUnk_80AD670(void *objectPtr_, s32 a1_, s32 a2) {
@@ -870,8 +871,6 @@ static s32 CallbackEffectMoveRelative(void *livesPtr_, PixelPos *pos)
return sub_80AD430(livesPtr, pos);
}
extern DebugLocation gUnknown_811874C;
extern DebugLocation gUnknown_8118758;
extern s16 HandleAction(Action *action, DebugLocation *debug);
void GroundEffect_Action(void)
@@ -883,14 +882,14 @@ void GroundEffect_Action(void)
for (objectPtr = &gGroundEffects[0], i = 0; i < NUM_GROUND_EFFECTS; i = (s16)(i + 1), objectPtr++)
{
if (objectPtr->kind != -1) {
ret = HandleAction(&objectPtr->action, &gUnknown_811874C);
ret = HandleAction(&objectPtr->action, DEBUG_LOC_PTR(gUnknown_81185D8, 0x560, "GroundEffect_Action"));
switch(ret)
{
case 4:
GroundEffect_Delete(i);
continue;
case 0:
ExecutePredefinedScript(&objectPtr->action, NULL, 1, &gUnknown_8118758);
ExecutePredefinedScript(&objectPtr->action, NULL, 1, DEBUG_LOC_PTR(gUnknown_81185D8, 0x56A, "GroundEffect_Action"));
break;
}
@@ -918,7 +917,7 @@ void sub_80AD7AC(void)
s32 num = objectPtr->unk134.x + objectPtr->unk134.y;
if ((sub_80A66D4(&objectPtr->unk144))) {
objectPtr->directionRelated = 0;
objectPtr->directionRelated = FALSE;
sub_80A6EFC(&objectPtr->unk144,objectPtr->unk13E & 0x1f00,(s8)objectPtr->unk13E);
}
if (objectPtr->unk140 != 0) {