diff options
| -rw-r--r-- | include/pokenav.h | 4 | ||||
| -rw-r--r-- | ld_script.txt | 8 | ||||
| -rwxr-xr-x | src/pokenav_match_call_gfx.c (renamed from src/pokenav_match_call_2.c) | 8 | ||||
| -rwxr-xr-x | src/pokenav_match_call_list.c (renamed from src/pokenav_match_call_1.c) | 0 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/pokenav.h b/include/pokenav.h index 595198136..d3edb1422 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -403,7 +403,7 @@ bool32 IsMenuHandlerLoopedTaskActive(void); void FreeMenuHandlerSubstruct2(void); void ResetBldCnt_(void); -// pokenav_match_call_1.c +// pokenav_match_call_list.c bool32 PokenavCallback_Init_MatchCall(void); u32 GetMatchCallCallback(void); void FreeMatchCallSubstruct1(void); @@ -424,7 +424,7 @@ int GetIndexDeltaOfNextCheckPageDown(int index); int GetIndexDeltaOfNextCheckPageUp(int index); bool32 IsRematchEntryRegistered(int index); -// pokenav_match_call_2.c +// pokenav_match_call_gfx.c bool32 OpenMatchCall(void); void CreateMatchCallLoopedTask(s32 index); bool32 IsMatchCallLoopedTaskActive(void); diff --git a/ld_script.txt b/ld_script.txt index 5a312cba2..b9302e47b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -313,8 +313,8 @@ SECTIONS { src/pokenav_list.o(.text); src/pokenav_menu_handler.o(.text); src/pokenav_menu_handler_gfx.o(.text); - src/pokenav_match_call_1.o(.text); - src/pokenav_match_call_2.o(.text); + src/pokenav_match_call_list.o(.text); + src/pokenav_match_call_gfx.o(.text); src/pokenav_region_map.o(.text); src/pokenav_conditions.o(.text); src/pokenav_conditions_gfx.o(.text); @@ -668,8 +668,8 @@ SECTIONS { src/pokenav_list.o(.rodata); src/pokenav_menu_handler.o(.rodata); src/pokenav_menu_handler_gfx.o(.rodata); - src/pokenav_match_call_1.o(.rodata); - src/pokenav_match_call_2.o(.rodata); + src/pokenav_match_call_list.o(.rodata); + src/pokenav_match_call_gfx.o(.rodata); src/pokenav_region_map.o(.rodata); src/pokenav_conditions_gfx.o(.rodata); src/pokenav_conditions_search_results.o(.rodata); diff --git a/src/pokenav_match_call_2.c b/src/pokenav_match_call_gfx.c index d7e9476f9..056ab2f1d 100755 --- a/src/pokenav_match_call_2.c +++ b/src/pokenav_match_call_gfx.c @@ -34,7 +34,7 @@ struct Pokenav_MatchCallGfx bool32 (*isTaskActiveCB)(void); u32 loopTaskId; u8 filler8[6]; - bool8 unkE; + bool8 skipHangUpSE; bool8 newRematchRequest; u16 locWindowId; u16 infoBoxWindowId; @@ -606,7 +606,7 @@ static u32 DoMatchCallMessage(s32 state) PrintCallingDots(gfx); PlaySE(SE_POKENAV_CALL); - gfx->unkE = 0; + gfx->skipHangUpSE = FALSE; return LT_INC_AND_PAUSE; case 2: if (WaitForCallingDotsText(gfx)) @@ -632,7 +632,7 @@ static u32 DoTrainerCloseByMessage(s32 state) PlaySE(SE_SELECT); DrawMsgBoxForCloseByMsg(gfx); PokenavList_ToggleVerticalArrows(TRUE); - gfx->unkE = 1; + gfx->skipHangUpSE = TRUE; return LT_INC_AND_PAUSE; case 1: if (IsDma3ManagerBusyWithBgCopy2(gfx)) @@ -657,7 +657,7 @@ static u32 CloseMatchCallMessage(s32 state) switch (state) { case 0: - if (!gfx->unkE) + if (!gfx->skipHangUpSE) PlaySE(SE_POKENAV_HANG_UP); PlaySE(SE_SELECT); diff --git a/src/pokenav_match_call_1.c b/src/pokenav_match_call_list.c index d56cfdb62..d56cfdb62 100755 --- a/src/pokenav_match_call_1.c +++ b/src/pokenav_match_call_list.c |