mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +00:00
Code Issues Projects Releases Wiki Activity

Make Gamestates use thisx for entry point functions (#437)

Browse source 
* fix colliderinit typo

* fix initchain

* reloc

* thisx

* sample

* review

* forgot sample main
This commit is contained in:
fig02 2020-10-11 21:52:50 -04:00 • committed by GitHub
parent b010db7c19
commit ed719f3da0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 74 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/overlays/gamestates/ovl_select/z_select.c
View file

@ -566,20 +566,23 @@ void Select_Draw(SelectContext* this) {
CLOSE_DISPS(gfxCtx, "../z_select.c", 1037);
}
void Select_Main(SelectContext* this) {
void Select_Main(GameState* thisx) {
SelectContext* this = (SelectContext*)thisx;
Select_UpdateMenu(this);
Select_Draw(this);
}
void Select_Destroy(SelectContext* this) {
void Select_Destroy(GameState* thisx) {
osSyncPrintf("%c", 7);
// "view_cleanup will hang, so it won't be called"
osSyncPrintf("*** view_cleanupはハングアップするので、呼ばない ***\n");
}
void Select_Init(SelectContext* this) {
void Select_Init(GameState* thisx) {
SelectContext* this = (SelectContext*)thisx;
u32 size;
s32 pad[2];
s32 pad;
this->state.main = Select_Main;
this->state.destroy = Select_Destroy;