forked from Ports/perfect_dark
Merge remote-tracking branch 'base/port' into port
This commit is contained in:
commit
5bb7cb47aa
2 files changed
+3
-6
No files matched your search
+1
-4
@@ -3993,10 +3993,7 @@ struct gamefile {
|
||||
};
|
||||
|
||||
struct mpchrconfig {
|
||||
/*0x00*/ char name[12]; // up to 10 visible chars plus line break plus null byte
|
||||
/*0x0c*/ u8 unk0c;
|
||||
/*0x0d*/ u8 unk0d;
|
||||
/*0x0e*/ u8 unk0e;
|
||||
/*0x00*/ char name[15];
|
||||
/*0x0f*/ u8 mpheadnum;
|
||||
/*0x10*/ u8 mpbodynum;
|
||||
/*0x11*/ u8 team;
|
||||
|
||||
@@ -2736,8 +2736,8 @@ bool mp3dec000427d8(struct asistream *stream, u32 gr)
|
||||
f32 *sp0c = stream->unk4664[0][0].unk00;
|
||||
s32 i = 0;
|
||||
|
||||
if (stream->window_switching[gr][0] && stream->window_switching[gr][2] == 2) {
|
||||
if (stream->window_switching[gr][4]) {
|
||||
if (stream->window_switching[gr][0] && stream->block_type[gr][0] == 2) {
|
||||
if (stream->mixed_block_flag[gr][0]) {
|
||||
while (i++ < 36) {
|
||||
*(sp10++) = *(sp0c++);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user