Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-23 13:09:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

move some data to ground_main

Browse Source
This commit is contained in:
Seth Barberee 2022-12-21 10:37:16 -08:00
parent 887812281b
commit f66b3d6622
8 changed files with 3421 additions and 3434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/ground_effect.s
View File

@ -964,7 +964,7 @@ _080AD2A0:
beq _080AD2B6
adds r0, r4, 0
adds r0, 0x38
bl sub_809D92C
bl GroundScript_Cancel
orrs r5, r0
lsls r0, r5, 24
lsrs r5, r0, 24

2
asm/ground_lives.s
View File

@ -2590,7 +2590,7 @@ _080A8B84:
beq _080A8B9A
adds r0, r4, 0
adds r0, 0x38
bl sub_809D92C
bl GroundScript_Cancel
orrs r5, r0
lsls r0, r5, 24
lsrs r5, r0, 24

2
asm/ground_object.s
View File

@ -1104,7 +1104,7 @@ _080AC388:
beq _080AC39E
adds r0, r4, 0
adds r0, 0x38
bl sub_809D92C
bl GroundScript_Cancel
orrs r5, r0
lsls r0, r5, 24
lsrs r5, r0, 24

3419
data/data_8115EB8.s
View File

File diff suppressed because it is too large Load Diff

3403
data/data_8115F5C.s Normal file
View File

File diff suppressed because it is too large Load Diff

2
ld_script.txt
View File

@ -480,6 +480,8 @@ SECTIONS {
data/data_810AE24.o(.rodata);
src/position_util.o(.rodata);
data/data_8115EB8.o(.rodata);
src/ground_main.o(.rodata);
data/data_8115F5C.o(.rodata);
data/friend_area_dialogue.o(.rodata);
data/cutscenes.o(.rodata);
data/cutscenes_1.o(.rodata);

22
src/ground_main.c
View File

@ -16,11 +16,13 @@ extern u16 gUnknown_20398BE;
extern u8 gUnknown_203B49D;
extern u8 gUnknown_203B49C;
extern const char gUnknown_8115F5C;
extern const char gUnknown_8115F80;
extern const char gUnknown_8115FA4;
extern const char gUnknown_8115FC8;
extern const char gUnknown_8115FE8;
const char gUnknown_8115F5C[] = "GroundMain ground request %3d %3d";
const char gUnknown_8115F80[] = "GroundMain recue request %3d %3d";
const char gUnknown_8115FA4[] = "GroundMain user rescue request %3d";
const char gUnknown_8115FC8[] = "GroundMain game end request %3d";
const char gUnknown_8115FE8[] = "GroundMain game cancel request %3d";
static const char unused_text[] = "pksdir0";
static const char unused_text1[] = "pksdir0";
struct unkStruct_811BAF4
{
@ -189,7 +191,7 @@ bool8 GroundMainGroundRequest(s16 r0, u32 r1, u32 r2)
temp = r0; // force a asr shift
if(gUnknown_20398A8 == 0)
{
Log(0, &gUnknown_8115F5C, temp, r2);
Log(0, gUnknown_8115F5C, temp, r2);
gUnknown_20398A8 = 1;
gUnknown_20398AC = 1;
gUnknown_20398B0 = r2;
@ -240,7 +242,7 @@ bool8 GroundMainRescueRequest(s16 r0, u32 r1)
s32 r2 = r0, r5 = r2;
if(gUnknown_20398A8 == 0)
{
Log(0, &gUnknown_8115F80, r2, r1);
Log(0, gUnknown_8115F80, r2, r1);
if(gUnknown_203B49D != 0)
{
gUnknown_20398A8 = 7;
@ -273,7 +275,7 @@ u32 GroundMainUserRescueRequest(u32 r0)
{
if(gUnknown_203B49D != 0)
{
Log(0, &gUnknown_8115FA4, r0);
Log(0, gUnknown_8115FA4, r0);
gUnknown_20398A8 = 7;
gUnknown_20398AC = 1;
gUnknown_20398B0 = r0;
@ -288,7 +290,7 @@ u32 GroundMainGameEndRequest(u32 r0)
{
if(gUnknown_20398A8 == 0)
{
Log(0, &gUnknown_8115FC8, r0);
Log(0, gUnknown_8115FC8, r0);
gUnknown_20398A8 = 9;
gUnknown_20398AC = 1;
gUnknown_20398B0 = r0;
@ -302,7 +304,7 @@ u32 GroundMainGameCancelRequest(u32 r0)
{
if(gUnknown_20398A8 == 0)
{
Log(0, &gUnknown_8115FE8, r0);
Log(0, gUnknown_8115FE8, r0);
gUnknown_20398A8 = 10;
gUnknown_20398AC = 1;
gUnknown_20398B0 = r0;

3
src/ground_script.c
View File

@ -102,7 +102,6 @@ bool8 sub_809D754(struct GroundScript_ExecutePP_1 *param_1, struct DebugLocation
bool8 sub_809D770(struct GroundScript_ExecutePP_1 *param_1, struct DebugLocation *unused)
{
sub_809D568(&param_1->unk24);
sub_809D568(&param_1->unk84);
param_1->unk24.unk2 = 4;
@ -197,7 +196,7 @@ u8 sub_809D8EC(struct GroundScript_ExecutePP_1 *param_1, s16 param_2)
}
u8 sub_809D92C(struct GroundScript_ExecutePP_1 *r0)
u8 GroundScript_Cancel(struct GroundScript_ExecutePP_1 *r0)
{
return sub_809D770(r0, &gUnknown_81165C8);
}