Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2025-04-01 08:21:35 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix ogSceneChallengeBase vtable

Browse Source
This commit is contained in:
Luke Street 2022-07-18 13:21:04 -04:00
parent 710e348061
commit 687a011fe7
3 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
asm/plugProjectOgawaU/ogSceneChallengeBase.s
View File

@ -1,27 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x8049E220 - 0x804EFC20
.balign 8
.global __vt__Q32og9newScreen13ChallengeBase
__vt__Q32og9newScreen13ChallengeBase:
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte isUseBackupSceneInfo__Q26Screen9SceneBaseFv
.4byte isDrawInDemo__Q26Screen9SceneBaseCFv
.4byte 0
.4byte 0
.4byte doUserCallBackFunc__Q26Screen9SceneBaseFPQ28Resource10MgrCommand
.4byte setPort__Q26Screen9SceneBaseFR8Graphics
.4byte doUpdateActive__Q26Screen9SceneBaseFv
.4byte doConfirmSetScene__Q26Screen9SceneBaseFRQ26Screen11SetSceneArg
.4byte doConfirmStartScene__Q26Screen9SceneBaseFPQ26Screen13StartSceneArg
.4byte doConfirmEndScene__Q26Screen9SceneBaseFRPQ26Screen11EndSceneArg
.4byte doStart__Q26Screen9SceneBaseFPQ26Screen13StartSceneArg
.4byte doEnd__Q26Screen9SceneBaseFPQ26Screen11EndSceneArg
.4byte setDefaultDispMember__Q26Screen9SceneBaseFv
.4byte doSetBackupScene__Q26Screen9SceneBaseFRQ26Screen11SetSceneArg
.4byte doGetFinishState__Q26Screen9SceneBaseFv
.4byte 0
.4byte 0

19
include/og/newScreen/ChallengeBase.h
View File

@ -18,26 +18,7 @@ struct ChallengeBase : public ::Screen::SceneBase {
~ChallengeBase();
void updateCountDown(f32, Screen::DispMemberDayEndCount*);
virtual SceneType getSceneType() = 0; // _08
virtual ScreenOwnerID getOwnerID() = 0; // _0C
virtual ScreenMemberID getMemberID() = 0; // _10
virtual bool isUseBackupSceneInfo(); // _14
virtual bool isDrawInDemo() const; // _18
virtual const char* getResName() const = 0; // _1C
virtual void doCreateObj(JKRArchive*) = 0; // _20
virtual void doUserCallBackFunc(Resource::MgrCommand*); // _24
virtual void setPort(Graphics&); // _28
virtual void doUpdateActive(); // _2C
virtual bool doConfirmSetScene(::Screen::SetSceneArg&); // _30
virtual bool doConfirmStartScene(::Screen::StartSceneArg*); // _34
virtual bool doConfirmEndScene(::Screen::EndSceneArg*&); // _38
virtual bool doStart(::Screen::StartSceneArg*); // _3C
virtual bool doEnd(::Screen::EndSceneArg*); // _40
virtual bool setDefaultDispMember(); // _44
virtual void doSetBackupScene(::Screen::SetSceneArg&); // _48
virtual int doGetFinishState(); // _4C
virtual void startCountDown() = 0; // _50
// virtual void endCountDown() = 0; /* speculation */ // _54
// _00 VTBL

1
obj_files.mk
View File

@ -936,7 +936,6 @@ OGAWA:=\
$(BUILD_DIR)/asm/plugProjectOgawaU/ogSceneWorldMapInfoWindow1.o\
$(BUILD_DIR)/asm/plugProjectOgawaU/ogTotalPokoScreen.o\
$(BUILD_DIR)/asm/plugProjectOgawaU/ogObjChallengeBase.o\
$(BUILD_DIR)/asm/plugProjectOgawaU/ogSceneChallengeBase.o\
$(BUILD_DIR)/src/plugProjectOgawaU/ogSceneChallengeBase.o\
$(BUILD_DIR)/asm/plugProjectOgawaU/ogCallBackPicture.o\
$(BUILD_DIR)/asm/plugProjectOgawaU/ogDrawAfter.o\