Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-12 11:06:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

move some ground map data to src

Browse Source
This commit is contained in:
DizzyEggg
2025-10-23 13:02:56 +02:00
parent 32f1d3bd07
commit b82cc398e2
3 changed files with 17 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
data/data_8115F5C_2_1.s
View File

@@ -46,146 +46,4 @@ gUnknown_81173C0: @ 81173C0
.byte 0xd9, 0x00, 0x00, 0x00, 0x1d, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0x00, 0x00, 0x00, 0x1a, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde, 0x00, 0x00, 0x00, 0x35, 0x64, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GroundMap_FileText
GroundMap_FileText: @ 8117510
.string "../ground/ground_map.c\0"
.align 2,0
.global GroundMap_Reset_Text
GroundMap_Reset_Text: @ Reset
.string "GroundMap_Reset\0"
.align 2,0
.global gUnknown_8117538
gUnknown_8117538: @ 8117538
.4byte GroundMap_FileText
.byte 0xf8, 0x00, 0x00, 0x00
.4byte GroundMap_Reset_Text
.global GroundMap_GetStationScript_Text
GroundMap_GetStationScript_Text: @ GetStationScript
.string "GroundMap_GetStationScript\0"
.align 2,0
.global gUnknown_8117560
gUnknown_8117560: @ 8117560
.4byte GroundMap_FileText
.byte 0x38, 0x01, 0x00, 0x00
.4byte GroundMap_GetStationScript_Text
.global gUnknown_811756C
gUnknown_811756C: @ 811756C
.string "GroundMap ExecuteStation %3d %3d %3d\0"
.align 2,0
.global gUnknown_8117594
gUnknown_8117594: @ 8117594
.string "GroundMap ExecuteEvent %3d %d ==================\0"
.align 2,0
.global GroundMap_ExecuteEventText
GroundMap_ExecuteEventText: @ ExecuteEventText
.string "GroundMap_ExecuteEvent\0"
.align 2,0
.global gUnknown_81175E0
gUnknown_81175E0: @ 81175E0
.4byte GroundMap_FileText
.byte 0x7D, 0x01, 0x00, 0x00
.4byte GroundMap_ExecuteEventText
.global gUnknown_81175EC
gUnknown_81175EC: @ 81175EC
.string "GroundMap ExecuteStation %3d %3d %3d %d ==================\0"
.align 2,0
.global GroundMap_ExecuteStationText
GroundMap_ExecuteStationText: @ ExecuteStationText
.string "GroundMap_ExecuteStation\0"
.align 2,0
.global gUnknown_8117644
gUnknown_8117644: @ 8117644
.4byte GroundMap_FileText
.4byte 0x199
.4byte GroundMap_ExecuteStationText
.global gUnknown_8117650
gUnknown_8117650: @ 8117650
.string "GroundMap ExecuteEnter %3d ==================\0"
.align 2,0
.global GroundMap_ExecuteEnterText
GroundMap_ExecuteEnterText: @ ExecuteEnterText
.string "GroundMap_ExecuteEnter\0"
.align 2,0
.global gUnknown_8117698
gUnknown_8117698: @ 8117698
.4byte GroundMap_FileText
.4byte 0x1B3
.4byte GroundMap_ExecuteEnterText
.global gUnknown_81176A4
gUnknown_81176A4: @ 81176A4
.string "GroundMap Select %3d\0"
.align 2,0
.global GroundMap_SelectText
GroundMap_SelectText: @ SelectText
.string "GroundMap_Select\0"
.align 2,0
.global gUnknown_81176D0
gUnknown_81176D0: @ 81176D0
.4byte GroundMap_FileText
.4byte 0x249
.4byte GroundMap_SelectText
.global gUnknown_81176DC
gUnknown_81176DC: @ 81176DC
.string "select map type error %d %d\0"
.align 2,0
.global gUnknown_81176F8
gUnknown_81176F8: @ 81176F8
.4byte 0
.4byte 0
.global gUnknown_8117700
gUnknown_8117700: @ 8117700
.string "GroundMap SelectDungeon %3d\0"
.align 2,0
.global GroundMap_SelectDungeonText
GroundMap_SelectDungeonText: @ SelectDungeonText
.string "GroundMap_SelectDungeon\0"
.align 2,0
.global gUnknown_8117734
gUnknown_8117734: @ 8117734
.4byte GroundMap_FileText
.4byte 0x2C6
.4byte GroundMap_SelectDungeonText
.global gUnknown_8117740
gUnknown_8117740: @ 8117740
.string "map type error %d\0"
.align 2,0
.global gUnknown_8117754
gUnknown_8117754: @ 8117754
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global GroundMap_Action_Text
GroundMap_Action_Text: @ Action
.string "GroundMap_Action\0"
.align 2,0
.global gUnknown_8117770
gUnknown_8117770: @ 8117770
.4byte GroundMap_FileText
.byte 0x7f, 0x05, 0x00, 0x00
.4byte GroundMap_Action_Text

1
ld_script.ld
View File

@@ -735,6 +735,7 @@ SECTIONS {
src/ground_place.o(.rodata);
src/ground_bg.o(.rodata);
data/data_8115F5C_2_1.o(.rodata);
src/ground_map.o(.rodata);
src/ground_weather.o(.rodata);
src/ground_sprite.o(.rodata);
src/ground_sprite_data.o(.rodata);

53
src/ground_map.c
View File

@@ -28,27 +28,6 @@ struct MapToDungeonStruct
};
extern const struct MapToDungeonStruct gUnknown_81173C0[];
extern const DebugLocation gUnknown_8117538[];
extern const DebugLocation gUnknown_8117560;
extern const u8 gUnknown_811756C[];
extern const u8 gUnknown_8117594[];
extern const DebugLocation gUnknown_81175E0;
extern const u8 gUnknown_81175EC[];
extern const DebugLocation gUnknown_8117644;
extern const u8 gUnknown_8117650[];
extern const DebugLocation gUnknown_8117698;
extern const u8 gUnknown_81176A4[];
extern const DebugLocation gUnknown_81176D0;
extern const u8 gUnknown_81176DC[];
extern const PixelPos gUnknown_81176F8;
extern const u8 gUnknown_8117700[];
extern const DebugLocation gUnknown_8117734;
extern const u8 gUnknown_8117740[];
extern const PixelPos gUnknown_8117754;
extern const DebugLocation gUnknown_8117770;
extern const CallbackData gGroundScriptNullCallbacks;
extern u8 sub_80A46C0(GroundBg *, u32, s32, s32);
@@ -79,7 +58,7 @@ void GroundMap_Reset(void)
{
ClearScriptVarArray(NULL, MAP_LOCAL);
ClearScriptVarArray(NULL, MAP_LOCAL_DOOR);
ActionResetScriptData((Action *)gGroundMapAction, gUnknown_8117538);
ActionResetScriptData(&gGroundMapAction->action, DEBUG_LOC_PTR("../ground/ground_map.c", 0xF8, "GroundMap_Reset"));
if (gGroundMapDungeon_3001B70 != NULL) {
GroundBg_FreeAll(gGroundMapDungeon_3001B70);
@@ -113,8 +92,8 @@ void GroundMap_GetStationScript(ScriptInfoSmall *r0, s32 _groundScriptId, s32 _g
s32 sectorId = (s8) _sectorId;
ChangeScriptFile(groundScriptId);
scriptHeader = GetGroundScript(groundScriptId, &gUnknown_8117560);
Log(0, gUnknown_811756C, groundScriptId, groupId, sectorId);
scriptHeader = GetGroundScript(groundScriptId, DEBUG_LOC_PTR("../ground/ground_map.c", 0x138, "GroundMap_GetStationScript"));
Log(0, "GroundMap ExecuteStation %3d %3d %3d", groundScriptId, groupId, sectorId);
{
const struct GroundScriptGroup *groups = &scriptHeader->groups[groupId];
const struct GroundScriptSector *sectors = &groups->sectors[sectorId];
@@ -141,12 +120,12 @@ void GroundMap_ExecuteEvent(s16 scriptIndex, u32 param_2)
index_s32 = scriptIndex;
iVar2 = param_2;
Log(0, gUnknown_8117594, index_s32, iVar2); // "GroundMap ExecuteEvent %3d %d
Log(0, "GroundMap ExecuteEvent %3d %d ==================", index_s32, iVar2);
GetFunctionScript(NULL, &script, index_s32);
if (iVar2 != 0)
script.state = 5;
GroundScript_ExecutePP(&gGroundMapAction->action, 0, &script, &gUnknown_81175E0);
GroundScript_ExecutePP(&gGroundMapAction->action, 0, &script, DEBUG_LOC_PTR("../ground/ground_map.c", 0x17D, "GroundMap_ExecuteEvent"));
}
void GroundMap_ExecuteStation(s32 _map, s32 _group, s32 _sector, bool32 _setScriptState)
@@ -162,12 +141,12 @@ void GroundMap_ExecuteStation(s32 _map, s32 _group, s32 _sector, bool32 _setScri
sector = (s8)_sector;
setScriptState = (bool8)_setScriptState;
Log(0, gUnknown_81175EC, map, group, sector, setScriptState); // GroundMap ExecuteStation %3d %3d %3d %d
Log(0, "GroundMap ExecuteStation %3d %3d %3d %d ==================", map, group, sector, setScriptState);
GroundMap_GetStationScript(&script, map, group, sector);
if (setScriptState != 0)
script.state = 5;
GroundScript_ExecutePP(&gGroundMapAction->action, 0, &script, &gUnknown_8117644);
GroundScript_ExecutePP(&gGroundMapAction->action, 0, &script, DEBUG_LOC_PTR("../ground/ground_map.c", 0x199, "GroundMap_ExecuteStation"));
}
void GroundMap_ExecuteEnter(s16 param_1)
@@ -177,12 +156,12 @@ void GroundMap_ExecuteEnter(s16 param_1)
iVar1 = param_1;
Log(0, gUnknown_8117650, iVar1); // GroundMap ExecuteEnter %3d
Log(0, "GroundMap ExecuteEnter %3d ==================", iVar1);
GroundMap_GetFirstStationScript(&script, iVar1);
script.state = 2;
script.group = 0;
script.sector = 0;
GroundScript_ExecutePP(&gGroundMapAction->action, 0, &script, &gUnknown_8117698);
GroundScript_ExecutePP(&gGroundMapAction->action, 0, &script, DEBUG_LOC_PTR("../ground/ground_map.c", 0x1B3, "GroundMap_ExecuteEnter"));
}
UNUSED static bool8 sub_80A4D14(void)
@@ -228,7 +207,7 @@ void GroundMap_Select(s32 mapId_)
const GroundConversionStruct *ptr;
s32 mapId = (s16) mapId_;
Log(0, gUnknown_81176A4,mapId);
Log(0, "GroundMap Select %3d", mapId);
ClearScriptVarArray(NULL, MAP_LOCAL);
ClearScriptVarArray(NULL, MAP_LOCAL_DOOR);
sub_80A5EDC(0);
@@ -265,7 +244,7 @@ void GroundMap_Select(s32 mapId_)
return;
}
case -1:
FatalError(&gUnknown_81176D0,gUnknown_81176DC,mapId,ptr->unk0);
FatalError(DEBUG_LOC_PTR("../ground/ground_map.c", 0x249, "GroundMap_Select"),"select map type error %d %d",mapId,ptr->unk0);
break;
default:
GroundBg_Init(gGroundMapDungeon_3001B70, &gUnknown_8117324);
@@ -332,7 +311,7 @@ void GroundMap_Select(s32 mapId_)
GroundWeather_Select(ptr->unk6);
}
sub_80A56D8(&gUnknown_81176F8);
sub_80A56D8(&(const PixelPos) {0});
}
void GroundMap_SelectDungeon(s32 mapId_, const DungeonLocation *loc, u32 param_2)
@@ -340,7 +319,7 @@ void GroundMap_SelectDungeon(s32 mapId_, const DungeonLocation *loc, u32 param_2
const GroundConversionStruct *ptr;
s32 mapId = (s16) mapId_;
Log('\0', gUnknown_8117700, mapId);
Log('\0', "GroundMap SelectDungeon %3d", mapId);
ClearScriptVarArray(NULL, MAP_LOCAL);
ClearScriptVarArray(NULL, MAP_LOCAL_DOOR);
sub_80A5EDC('\0');
@@ -359,7 +338,7 @@ void GroundMap_SelectDungeon(s32 mapId_, const DungeonLocation *loc, u32 param_2
ptr = &gGroundMapConversionTable[mapId];
if (ptr->unk0 != 0xA && ptr->unk0 != 0xB) {
FatalError(&gUnknown_8117734, gUnknown_8117740, mapId);
FatalError(DEBUG_LOC_PTR("../ground/ground_map.c", 0x2C6, "GroundMap_SelectDungeon"), "map type error %d", mapId);
}
GroundBg_Init(gGroundMapDungeon_3001B70, &gUnknown_8117354);
@@ -373,7 +352,7 @@ void GroundMap_SelectDungeon(s32 mapId_, const DungeonLocation *loc, u32 param_2
gGroundMapAction->unkF8.y = 0;
gGroundMapAction->unk100 = gGroundMapAction->unk104 = gGroundMapAction->unk108 = gGroundMapAction->unk10C = 0;
sub_80A56D8(&gUnknown_8117754);
sub_80A56D8(&(const PixelPos) {0, 0});
}
NAKED
@@ -1218,7 +1197,7 @@ void sub_80A59A0(s32 param_1, PixelPos *param_2, u32 param_3)
void GroundMap_Action(void)
{
nullsub_123();
HandleAction(&gGroundMapAction->action, &gUnknown_8117770);
HandleAction(&gGroundMapAction->action, DEBUG_LOC_PTR("../ground/ground_map.c", 0x57F, "GroundMap_Action"));
}
void sub_80A59DC(void)