diff options
| author | emilybrooks <emilybrooksemilybrooks@gmail.com> | 2023-09-20 10:07:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-20 10:07:50 -0700 |
| commit | ea9db85fde9f1b0059379c45e03cac380e567aad (patch) | |
| tree | 3cd910e4b6b2c5a83e0c8f9da1686fa5432a70db /src/code/m_submenu.c | |
| parent | 4ea0ce4f32b3255c2e91ccf36b8b36db80a03f87 (diff) | |
Matched 23 functions in m_scene (#98)
* ported over from private branch
* trying to find original names
* matched small functions
* matched func_800C5A08_jp
* small changes
* matched mSc_bank_regist_check
* matched mSc_regist_initial_exchange_bank
* more cleanup
* cleaned up compile errors
* renamed struct
* remove save struct
* named mSc_set_bank_status_after
Diffstat (limited to 'src/code/m_submenu.c')
| -rw-r--r-- | src/code/m_submenu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/m_submenu.c b/src/code/m_submenu.c index b40490c..c466fbc 100644 --- a/src/code/m_submenu.c +++ b/src/code/m_submenu.c @@ -8,7 +8,7 @@ #include "ovlmgr.h" #include "game.h" #include "sys_math3d.h" -#include "6E9650.h" +#include "m_scene.h" #include "6DE300.h" #include "6F5550.h" #include "libc/stddef.h" @@ -60,7 +60,7 @@ s32 SubmenuArea_IsPlayer(void) { #ifdef NON_MATCHING // regalloc void mSM_load_player_anime(Game_Play* game_play) { - Game_Play_unk_0110_unk_0000* var_s4; + ObjectStatus* var_s4; s32 var_s0; s32 var_s3; Player* temp_v0; @@ -71,8 +71,8 @@ void mSM_load_player_anime(Game_Play* game_play) { return; } - var_s4 = game_play->unk_0110.unk_0000; - var_s4 += mSc_bank_regist_check(var_s4, 9); + var_s4 = game_play->objectExchangeBank.status; + var_s4 += mSc_bank_regist_check(&game_play->objectExchangeBank, 9); for (var_s3 = 0; var_s3 < 2; var_s3++, var_s4++) { segment = var_s4->segment; @@ -506,7 +506,7 @@ void mSM_move_End(Submenu* submenu) { sp24 = mMsg_Get_base_window_p(); submenu->unk_00 = 0; - mSc_dmacopy_all_exchange_bank(sp28->unk_0110.unk_0000); + mSc_dmacopy_all_exchange_bank(&sp28->objectExchangeBank); SubmenuArea_DoUnlink(SubmenuArea_dlftbl, submenu); load_player(submenu); mSM_load_player_anime(sp28); |