Layout: Implement `PlayGuide[...]` & `RaceCountDownLayout` #271

GRAnimated · 2025-01-14T23:38:35Z

More from that old develop branch of mine. Also fills out Util/DemoUtil.h.

This change is

…deSkip`, `RaceCountDownLayout`

MonsterDruide1

(partial review)

Reviewed 5 of 14 files at r1, all commit messages.
Reviewable status: 5 of 14 files reviewed, 1 unresolved discussion (waiting on @GRAnimated)

src/Layout/PlayGuideCamera.h line 25 at r1 (raw file):

private:
    bool field_129 = false;
    const al::LiveActor* mActor = nullptr;

Suggestion:

const al::LiveActor* mPlayer = nullptr;

GRAnimated

Reviewable status: 5 of 14 files reviewed, 1 unresolved discussion (waiting on @MonsterDruide1)

src/Layout/PlayGuideCamera.h line 25 at r1 (raw file):

private:
    bool field_129 = false;
    const al::LiveActor* mActor = nullptr;

Done.

MonsterDruide1

Reviewed 7 of 14 files at r1, 1 of 2 files at r2, all commit messages.
Reviewable status: 13 of 14 files reviewed, 17 unresolved discussions (waiting on @GRAnimated)

src/Util/DemoUtil.h line 29 at r2 (raw file):

bool requestStartDemoNormal(al::LiveActor*, bool);
void addDemoActor(al::LiveActor*, bool);
bool requestEndDemoNormal(const al::LiveActor*);

Suggestion:

void requestEndDemoNormal(const al::LiveActor*);

src/Util/DemoUtil.h line 31 at r2 (raw file):

bool requestEndDemoNormal(const al::LiveActor*);
bool requestStartDemoNormal(const al::Scene*);
bool requestEndDemoNormal(const al::Scene*);

Wow, these are inconsistent.

Suggestion:

void requestEndDemoNormal(const al::Scene*);

src/Util/DemoUtil.h line 33 at r2 (raw file):

bool requestEndDemoNormal(const al::Scene*);
bool requestStartDemoNormalWithCinemaFrame(al::LiveActor*);
bool requestEndDemoNormalWithCinemaFrame(const al::LiveActor*);

Suggestion:

void requestEndDemoNormalWithCinemaFrame(const al::LiveActor*);

src/Util/DemoUtil.h line 62 at r2 (raw file):

bool requestEndDemoBossBattleEnd(const al::LiveActor*);
bool requestStartDemoShineGet(Shine*);
bool requestStartDemoAchievementShineGet(al::Scene*);

Okay, actually pretty consistent: requestEnds are void, requestStarts are bool.

Suggestion:

bool requestStartDemoWithPlayer(al::LiveActor*, bool);
void requestEndDemoWithPlayer(const al::LiveActor*);
bool requestStartDemoWithPlayer(const al::Scene*);
void requestEndDemoWithPlayer(const al::Scene*);
bool requestStartDemoWithPlayerCinemaFrame(al::LiveActor*, bool);
void requestEndDemoWithPlayerCinemaFrame(const al::LiveActor*);
bool requestStartDemoWithPlayerKeepCarry(al::LiveActor*, bool);
void requestEndDemoWithPlayerKeepCarry(const al::LiveActor*);
bool requestStartDemoWithPlayerUseCoin(al::LiveActor*, bool);
void requestEndDemoWithPlayerUseCoin(const al::LiveActor*);
bool requestStartDemoWithPlayerKeepBindTalk(al::LiveActor*, bool);
void requestEndDemoWithPlayerKeepBindTalk(const al::LiveActor*);
bool requestStartDemoKeepHackTalk(al::LiveActor*, bool);
void requestEndDemoKeepHackTalk(const al::LiveActor*);
bool requestStartDemoWithPlayerCinemaFrameTalk(al::LiveActor*, bool);
void requestEndDemoWithPlayerCinemaFrameTalk(const al::LiveActor*);
bool requestStartDemoWithPlayerKeepCarryTalk(al::LiveActor*, bool);
void requestEndDemoWithPlayerKeepCarryTalk(const al::LiveActor*);
bool requestStartDemoWithPlayerUseCoinTalk(al::LiveActor*, bool);
void requestEndDemoWithPlayerUseCoinTalk(const al::LiveActor*);
bool requestStartDemoNormalTalk(al::LiveActor*, bool);
void requestEndDemoNormalTalk(const al::LiveActor*);
bool requestStartDemoWarpToCheckpoint(const al::Scene*);
bool requestStartDemoBossBattleStart(al::LiveActor*);
void requestEndDemoBossBattleStart(const al::LiveActor*);
bool requestStartDemoBossBattleEnd(al::LiveActor*);
void requestEndDemoBossBattleEnd(const al::LiveActor*);
bool requestStartDemoShineGet(Shine*);
bool requestStartDemoAchievementShineGet(al::Scene*);

src/Util/DemoUtil.h line 68 at r2 (raw file):

bool requestStartDemoShineDotGet(Shine*);
bool requestEndDemoShineDotGet(const al::Scene*);
bool requestStartDemoShineMainGet(Shine*);

Suggestion:

void requestEndDemoShineGet(const al::Scene*);
void requestEndDemoShineGet(const al::LiveActor*);
bool requestStartDemoShineDotGet(Shine*);
void requestEndDemoShineDotGet(const al::Scene*);
bool requestStartDemoShineMainGet(Shine*);

src/Util/DemoUtil.h line 102 at r2 (raw file):

bool requestEndDemoJango(const al::LiveActor*);
bool requestStartDemoTitleLogo(const al::LiveActor*);
bool requestStartDemoGoToEnding(al::LiveActor*);

Suggestion:

void requestEndDemoShineMainGet(const al::LiveActor*);
void requestEndDemoShineMainGet(const al::Scene*);
bool requestStartDemoShineGrandGet(Shine*);
void requestEndDemoShineGrandGet(const al::LiveActor*);
void requestEndDemoShineGrandGet(const al::Scene*);
bool requestStartDemoShineAppear(al::LiveActor*);
void requestEndDemoShineAppear(const al::LiveActor*);
bool requestStartDemoShineAppear(const al::Scene*);
void requestEndDemoShineAppear(const al::Scene*);
bool requestStartDemoWarp(al::LiveActor*);
bool requestStartDemoWarp(const al::Scene*);
void requestEndDemoWarp(const al::LiveActor*);
void requestEndDemoWarp(const al::Scene*);
bool requestStartDemoHackStart(al::LiveActor*);
void requestEndDemoHackStart(const al::LiveActor*);
bool requestStartDemoAppearByBazookaElectric(al::LiveActor*);
void requestEndDemoAppearByBazookaElectric(const al::LiveActor*);
bool requestStartDemoLaunchBazookaElectric(al::LiveActor*);
void requestEndDemoLaunchBazookaElectric(const al::LiveActor*);
bool requestStartDemoSceneStartPlayerWalk(al::LiveActor*);
void requestEndDemoSceneStartPlayerWalk(const al::LiveActor*);
bool requestStartDemoGetLifeMaxUpItem(al::LiveActor*);
void requestEndDemoGetLifeMaxUpItem(const al::Scene*);
bool requestStartDemoBirdCarryMeat(al::LiveActor*);
void requestEndDemoBirdCarryMeat(const al::LiveActor*);
bool requestStartDemoBirdFindMeat(al::LiveActor*);
void requestEndDemoBirdFindMeat(const al::LiveActor*);
bool requestStartDemoGetTimeBalloon(al::LiveActor*);
void requestEndDemoGetTimeBalloon(const al::LiveActor*);
bool requestStartDemoJango(al::LiveActor*);
void requestEndDemoJango(const al::LiveActor*);
bool requestStartDemoTitleLogo(const al::LiveActor*);
bool requestStartDemoGoToEnding(al::LiveActor*);

src/Util/DemoUtil.h line 155 at r2 (raw file):

void addDemoSubActor(al::LiveActor*);
void registerShineTowerRocketToDemoDirector(ShineTowerRocket*);
void tryGetShineTowerRocketFromDemoDirector(al::LiveActor*);

Suggestion:

ShineTowerRocket* tryGetShineTowerRocketFromDemoDirector(al::LiveActor*);

src/Util/DemoUtil.h line 171 at r2 (raw file):

bool requestEndDemoRiseMapParts(const al::LiveActor*);
bool requestStartDemoPeachCastleCap(al::LiveActor*);
bool requestEndDemoPeachCastleCap(const al::LiveActor*);

Suggestion:

bool requestStartDemoWorldIntroCamera(const al::Scene*);
void requestEndDemoWorldIntroCamera(const al::Scene*);
bool requestStartDemoScenarioCamera(const al::Scene*);
void requestEndDemoScenarioCamera(const al::LiveActor*);
bool requestStartDemoAppearFromHome(const al::Scene*);
void requestEndDemoAppearFromHome(const al::LiveActor*);
bool requestStartDemoReturnToHome(const al::Scene*);
void requestEndDemoReturnToHome(const al::LiveActor*);
bool requestStartDemoRiseMapParts(const al::Scene*);
void requestEndDemoRiseMapParts(const al::LiveActor*);
bool requestStartDemoPeachCastleCap(al::LiveActor*);
void requestEndDemoPeachCastleCap(const al::LiveActor*);

src/Util/DemoUtil.h line 179 at r2 (raw file):

al::LiveActor* getRequestActor(const al::Scene*);
void requestValidateDemoSkip(IUseDemoSkip*, const al::LiveActor*);
void* getDemoSkipRequester(const al::Scene*);

Suggestion:

IUseDemoSkip* getDemoSkipRequester(const al::Scene*);

src/Util/DemoUtil.h line 193 at r2 (raw file):

void validateDemoCaption(const al::LiveActor*, CaptionInfoHolder*);
bool isActiveDemoWithCinemaCaption(const al::Scene*);
void tryAppearCinemaCaption(const al::Scene*, CinemaCaption*);

Suggestion:

bool tryAppearCinemaCaption(const al::Scene*, CinemaCaption*);

src/Util/DemoUtil.h line 199 at r2 (raw file):

bool isDemoFadeOpenEnd(const al::LiveActor*);
bool isDemoFadeWipeStateEnableOpenMenuOrSnapShotMode(const al::Scene*);
void tryCreateDemoHackFirstDirector(al::LiveActor*, s32, const al::ActorInitInfo&);

Suggestion:

DemoHackFirstDirector* tryCreateDemoHackFirstDirector(al::LiveActor*, s32, const al::ActorInitInfo&);

src/Layout/PlayGuideSkip.h line 13 at r2 (raw file):

    PlayGuideSkip(const char* name, const al::LayoutInitInfo& info);

    void kill();

Suggestion:

void kill() override;

src/Layout/PlayGuideCamera.h line 12 at r2 (raw file):

class PlayGuideCamera : public al::LayoutActor {
public:
    PlayGuideCamera(const char* name, const al::LayoutInitInfo& info, const al::LiveActor* actor);

Suggestion:

PlayGuideCamera(const char* name, const al::LayoutInitInfo& info, const al::LiveActor* player);

src/Layout/PlayGuideCamera.h line 24 at r2 (raw file):

private:
    bool field_129 = false;

Suggestion:

bool mIsShown = false;

src/Layout/RaceCountDownLayout.cpp line 71 at r2 (raw file):

    }

    if (al::isFirstStep(this) || al::getNerveStep(this) % 60)

Suggestion:

if (al::isFirstStep(this) || al::getNerveStep(this) % 60 != 0)

src/Layout/RaceCountDownLayout.cpp line 79 at r2 (raw file):

    toggleNumberLayouts(mCountLayout, mCount);

    if (mCount) {

Suggestion:

if (mCount != 0) {

src/Layout/PlayGuideCamera.cpp line 25 at r2 (raw file):

PlayGuideCamera::PlayGuideCamera(const char* name, const al::LayoutInitInfo& info,
                                 const al::LiveActor* actor)
    : al::LayoutActor(name), mPlayer(actor) {

Suggestion:

PlayGuideCamera::PlayGuideCamera(const char* name, const al::LayoutInitInfo& info,
                                 const al::LiveActor* player)
    : al::LayoutActor(name), mPlayer(player) {

GRAnimated

Reviewable status: 13 of 14 files reviewed, 17 unresolved discussions (waiting on @MonsterDruide1)

src/Util/DemoUtil.h line 31 at r2 (raw file):

Previously, MonsterDruide1 wrote…

Wow, these are inconsistent.

Done.

src/Util/DemoUtil.h line 62 at r2 (raw file):

Previously, MonsterDruide1 wrote…

Okay, actually pretty consistent: requestEnds are void, requestStarts are bool.

Done.

src/Layout/PlayGuideSkip.h line 13 at r2 (raw file):

    PlayGuideSkip(const char* name, const al::LayoutInitInfo& info);

    void kill();

Done.

src/Layout/PlayGuideCamera.cpp line 25 at r2 (raw file):

PlayGuideCamera::PlayGuideCamera(const char* name, const al::LayoutInitInfo& info,
                                 const al::LiveActor* actor)
    : al::LayoutActor(name), mPlayer(actor) {

Done.

src/Layout/RaceCountDownLayout.cpp line 71 at r2 (raw file):

    }

    if (al::isFirstStep(this) || al::getNerveStep(this) % 60)

Done.

src/Layout/RaceCountDownLayout.cpp line 79 at r2 (raw file):

    toggleNumberLayouts(mCountLayout, mCount);

    if (mCount) {

Done.

src/Util/DemoUtil.h line 29 at r2 (raw file):

bool requestStartDemoNormal(al::LiveActor*, bool);
void addDemoActor(al::LiveActor*, bool);
bool requestEndDemoNormal(const al::LiveActor*);

Done.

src/Util/DemoUtil.h line 33 at r2 (raw file):

bool requestEndDemoNormal(const al::Scene*);
bool requestStartDemoNormalWithCinemaFrame(al::LiveActor*);
bool requestEndDemoNormalWithCinemaFrame(const al::LiveActor*);

Done.

src/Util/DemoUtil.h line 68 at r2 (raw file):

bool requestStartDemoShineDotGet(Shine*);
bool requestEndDemoShineDotGet(const al::Scene*);
bool requestStartDemoShineMainGet(Shine*);

Done.

src/Util/DemoUtil.h line 102 at r2 (raw file):

bool requestEndDemoJango(const al::LiveActor*);
bool requestStartDemoTitleLogo(const al::LiveActor*);
bool requestStartDemoGoToEnding(al::LiveActor*);

Done.

src/Util/DemoUtil.h line 155 at r2 (raw file):

void addDemoSubActor(al::LiveActor*);
void registerShineTowerRocketToDemoDirector(ShineTowerRocket*);
void tryGetShineTowerRocketFromDemoDirector(al::LiveActor*);

Done.

src/Util/DemoUtil.h line 171 at r2 (raw file):

bool requestEndDemoRiseMapParts(const al::LiveActor*);
bool requestStartDemoPeachCastleCap(al::LiveActor*);
bool requestEndDemoPeachCastleCap(const al::LiveActor*);

Done.

src/Util/DemoUtil.h line 179 at r2 (raw file):

al::LiveActor* getRequestActor(const al::Scene*);
void requestValidateDemoSkip(IUseDemoSkip*, const al::LiveActor*);
void* getDemoSkipRequester(const al::Scene*);

Done.

src/Util/DemoUtil.h line 193 at r2 (raw file):

void validateDemoCaption(const al::LiveActor*, CaptionInfoHolder*);
bool isActiveDemoWithCinemaCaption(const al::Scene*);
void tryAppearCinemaCaption(const al::Scene*, CinemaCaption*);

Done.

src/Util/DemoUtil.h line 199 at r2 (raw file):

bool isDemoFadeOpenEnd(const al::LiveActor*);
bool isDemoFadeWipeStateEnableOpenMenuOrSnapShotMode(const al::Scene*);
void tryCreateDemoHackFirstDirector(al::LiveActor*, s32, const al::ActorInitInfo&);

Done.

src/Layout/PlayGuideCamera.h line 12 at r2 (raw file):

class PlayGuideCamera : public al::LayoutActor {
public:
    PlayGuideCamera(const char* name, const al::LayoutInitInfo& info, const al::LiveActor* actor);

Done.

src/Layout/PlayGuideCamera.h line 24 at r2 (raw file):

private:
    bool field_129 = false;

Done.

MonsterDruide1

Requires rebase.

Reviewed 5 of 5 files at r3, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @GRAnimated)

MonsterDruide1

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @GRAnimated)

-- commits line 0 at r3:
Requires rebase.

…layouts

GRAnimated

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @MonsterDruide1)

-- commits line at r3:

Previously, MonsterDruide1 wrote…

Requires rebase.

Done.

MonsterDruide1

Reviewed 2 of 2 files at r4, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @GRAnimated)

Implement PlayGuideBgm, PlayGuideCamera, PlayGuideMap, `PlayGui…

4bf80c2

…deSkip`, `RaceCountDownLayout`

MonsterDruide1 requested changes Jan 15, 2025

View reviewed changes

Rename mActor to mPlayer

0421620

GRAnimated commented Jan 15, 2025

View reviewed changes

MonsterDruide1 requested changes Jan 17, 2025

View reviewed changes

Fixes

52fd464

GRAnimated commented Jan 22, 2025

View reviewed changes

MonsterDruide1 approved these changes Jan 23, 2025

View reviewed changes

MonsterDruide1 requested changes Jan 25, 2025

View reviewed changes

Merge https://github.com/MonsterDruide1/OdysseyDecomp into PlayGuide-…

5db9eda

…layouts

GRAnimated commented Jan 27, 2025

View reviewed changes

MonsterDruide1 approved these changes Jan 27, 2025

View reviewed changes

MonsterDruide1 changed the title ~~Implement PlayGuide layouts & RaceCountDownLayout~~ Layout: Implement PlayGuide[...] & RaceCountDownLayout Jan 28, 2025

MonsterDruide1 merged commit 61dd856 into MonsterDruide1:master Jan 28, 2025
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Layout: Implement `PlayGuide[...]` & `RaceCountDownLayout` #271

Layout: Implement `PlayGuide[...]` & `RaceCountDownLayout` #271

GRAnimated commented Jan 14, 2025 •

edited by MonsterDruide1

Loading

MonsterDruide1 left a comment

GRAnimated left a comment

MonsterDruide1 left a comment

GRAnimated left a comment

MonsterDruide1 left a comment

MonsterDruide1 left a comment

GRAnimated left a comment

MonsterDruide1 left a comment

Layout: Implement PlayGuide[...] & RaceCountDownLayout #271

Layout: Implement PlayGuide[...] & RaceCountDownLayout #271

Conversation

GRAnimated commented Jan 14, 2025 • edited by MonsterDruide1 Loading

MonsterDruide1 left a comment

Choose a reason for hiding this comment

GRAnimated left a comment

Choose a reason for hiding this comment

MonsterDruide1 left a comment

Choose a reason for hiding this comment

GRAnimated left a comment

Choose a reason for hiding this comment

MonsterDruide1 left a comment

Choose a reason for hiding this comment

MonsterDruide1 left a comment

Choose a reason for hiding this comment

GRAnimated left a comment

Choose a reason for hiding this comment

MonsterDruide1 left a comment

Choose a reason for hiding this comment

Layout: Implement `PlayGuide[...]` & `RaceCountDownLayout` #271

Layout: Implement `PlayGuide[...]` & `RaceCountDownLayout` #271

GRAnimated commented Jan 14, 2025 •

edited by MonsterDruide1

Loading