Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/RSBE01_02/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ modules:
hash: fb2ff7f1b949ee36289fc8433a6becc83c9ecb68
splits: config/RSBE01_02/rels/st_emblem/splits.txt
symbols: config/RSBE01_02/rels/st_emblem/symbols.txt
force_active: [HomeBtnIcon]
force_active: [create__8stEmblemFv, HomeBtnIcon]
- object: files/module/st_madein.rel
hash: 8e6034b5a04ea2716eefa2af44f09042371fd994
splits: config/RSBE01_02/rels/st_madein/splits.txt
Expand Down
2 changes: 1 addition & 1 deletion config/RSBE01_02/rels/sora_melee/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19955,7 +19955,7 @@ fn_27_222C9C = .text:0x00222C9C; // type:function size:0x30C
testCollDataInit__5StageFP9gfArchiveP10grCollDataUl = .text:0x00222FA8; // type:function size:0x148
fn_27_2230F0 = .text:0x002230F0; // type:function size:0x50
testStageParamInit__5StageFP9gfArchivei = .text:0x00223140; // type:function size:0x1E0
stageParamChange__5StageF = .text:0x00223320; // type:function size:0x78
stageParamChange__5StageFi = .text:0x00223320; // type:function size:0x78
testStageDataInit__5StageFP9gfArchiveii = .text:0x00223398; // type:function size:0x84
getFighterStartPos__5StageFP5Vec3fi = .text:0x0022341C; // type:function size:0x38
fn_27_223454 = .text:0x00223454; // type:function size:0x4
Expand Down
2 changes: 1 addition & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -1744,7 +1744,7 @@ def NW4RObject(completed, name, **options):
"cflags": cflags_rel,
"host": False,
"objects": [
Object(NonMatching, "mo_stage/st_emblem/st_emblem.cpp"),
Object(Matching, "mo_stage/st_emblem/st_emblem.cpp"),
],
},
{
Expand Down
16 changes: 13 additions & 3 deletions include/Brawl/Include/gm/gm_global_mode_melee.h
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@ static_assert(sizeof(gmItSwitch) == 0x10, "Class is wrong size!");

class gmMeleeInitData {
public:
GameMode m_gameMode : 6;
char _0x0_0 : 2;
u8 m_gameMode : 6;
u8 _0x0_0 : 2;
GameRule m_gameRule : 3;
u8 m_numPlayers : 3;
u8 m_0x1_0 : 2;
Expand Down Expand Up @@ -302,8 +302,18 @@ class gmMeleeInitData {
bool m_0x7_2 : 1;
bool m_0x7_1 : 1;
bool m_isAmplifySongAttack : 1;
#ifdef MATCHING
union {
u8 m_eventFlags; // 0x08
struct {
bool m_playeMode : 1;
u8 m_eventId : 7;
};
};
#else
bool m_playeMode : 1; // 0x08
u8 m_eventId : 7; // 0x08
#endif
u8 m_scoreToWin; // custom
char _0xA[0x1]; // 0x0A
bool m_isTeams; // 0x0B
Expand Down Expand Up @@ -414,4 +424,4 @@ class gmGlobalModeMelee {
gmPlayerInitData m_playersInitData[MAX_PLAYERS]; // 0x98
char _1[4];
};
static_assert(sizeof(gmGlobalModeMelee) == 0x320, "Class is wrong size!");
static_assert(sizeof(gmGlobalModeMelee) == 0x320, "Class is wrong size!");
2 changes: 1 addition & 1 deletion include/Brawl/Include/st/stage.h
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ class Stage : public gfTask {
void testStageParamInit(gfArchive* archive, int fileIndex);
void testCollDataInit(gfArchive* archive, grCollData* collData, u32 index);
void setCollision(grCollision* coll);
void stageParamChange();
bool stageParamChange(int sceneNum);
void testStageDataInit(gfArchive* archive, int fileIndex, int unk2);
void initSoundParameters();
void setSoundParameters(stParam* stpm);
Expand Down
9 changes: 1 addition & 8 deletions include/Brawl/Include/st_emblem/st_emblem.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,14 @@ class stEmblem : public stMelee {
grCollision* unk738;
u8 m_isKemuriHigh;
float m_lampEffTimer;
u32 unk744;
s32 m_lampEffectIndex;
s32 quakeSnd;
u8 m_eventType;
StSeUtil::SeSeqInstance<2, 2> m_se_player;
StSeUtil::SeSeqInstance<2, 2> m_se_player2;
u8 unk800;
float unk804;
float unk808;
//s32 m_great_fox_engine_se;
//snd3DGenerator m_great_fox_sndgen;
//snd3DGenerator m_pleiades_sndgen;
//Vec3f m_slope_rotate;
//u8 m_corneria_phase;

static const int SCENE_ASTEROID = 0;
static const int SCENE_BATTLESHIP = 1;
Expand Down Expand Up @@ -117,6 +112,4 @@ SndID data_loc_11A0[] = {

static const size_t SndSeqTable1Size = sizeof(data_loc_0)/sizeof(data_loc_0[0]);
static const size_t SndSeqTable2Size = sizeof(data_loc_40)/sizeof(data_loc_40[0]);
//static const size_t SndSeqTable3Size = sizeof(data_loc_980)/sizeof(data_loc_980[0]);
//static const size_t SndSeqTable4Size = sizeof(data_loc_9C0)/sizeof(data_loc_9C0[0]);
static const size_t SndIDTableSize = sizeof(data_loc_11A0)/sizeof(data_loc_11A0[0]);
2 changes: 1 addition & 1 deletion include/RSBE01.lst
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ CC008000:WGPIPE
27,1,00222aa8:renderDebug__5StageFv
27,1,00221d48:__dt__5StageFv
27,1,00223140:testStageParamInit__5StageFP9gfArchivei
27,1,00223320:stageParamChange__5StageF
27,1,00223320:stageParamChange__5StageFi
27,1,00223398:testStageDataInit__5StageFP9gfArchiveii
27,1,00223A10:initSoundParameters__5StageFv
27,1,00223B6C:setSoundParameters__5StageFP7stParam
Expand Down
Loading
Loading