ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 23:23:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename pokenav match call files

Browse Source
This commit is contained in:
GriffinR 2021-11-15 01:23:27 -05:00
parent 14d78d7633
commit 4275cf4b90
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/pokenav.h
View File

@ -403,7 +403,7 @@ bool32 IsMenuHandlerLoopedTaskActive(void);
void FreeMenuHandlerSubstruct2(void); void FreeMenuHandlerSubstruct2(void);
void ResetBldCnt_(void); void ResetBldCnt_(void);
// pokenav_match_call_1.c // pokenav_match_call_list.c
bool32 PokenavCallback_Init_MatchCall(void); bool32 PokenavCallback_Init_MatchCall(void);
u32 GetMatchCallCallback(void); u32 GetMatchCallCallback(void);
void FreeMatchCallSubstruct1(void); void FreeMatchCallSubstruct1(void);
@ -424,7 +424,7 @@ int GetIndexDeltaOfNextCheckPageDown(int index);
int GetIndexDeltaOfNextCheckPageUp(int index); int GetIndexDeltaOfNextCheckPageUp(int index);
bool32 IsRematchEntryRegistered(int index); bool32 IsRematchEntryRegistered(int index);
// pokenav_match_call_2.c // pokenav_match_call_gfx.c
bool32 OpenMatchCall(void); bool32 OpenMatchCall(void);
void CreateMatchCallLoopedTask(s32 index); void CreateMatchCallLoopedTask(s32 index);
bool32 IsMatchCallLoopedTaskActive(void); bool32 IsMatchCallLoopedTaskActive(void);

8
ld_script.txt
View File

@ -313,8 +313,8 @@ SECTIONS {
src/pokenav_list.o(.text); src/pokenav_list.o(.text);
src/pokenav_menu_handler.o(.text); src/pokenav_menu_handler.o(.text);
src/pokenav_menu_handler_gfx.o(.text); src/pokenav_menu_handler_gfx.o(.text);
src/pokenav_match_call_1.o(.text); src/pokenav_match_call_list.o(.text);
src/pokenav_match_call_2.o(.text); src/pokenav_match_call_gfx.o(.text);
src/pokenav_region_map.o(.text); src/pokenav_region_map.o(.text);
src/pokenav_conditions.o(.text); src/pokenav_conditions.o(.text);
src/pokenav_conditions_gfx.o(.text); src/pokenav_conditions_gfx.o(.text);
@ -668,8 +668,8 @@ SECTIONS {
src/pokenav_list.o(.rodata); src/pokenav_list.o(.rodata);
src/pokenav_menu_handler.o(.rodata); src/pokenav_menu_handler.o(.rodata);
src/pokenav_menu_handler_gfx.o(.rodata); src/pokenav_menu_handler_gfx.o(.rodata);
src/pokenav_match_call_1.o(.rodata); src/pokenav_match_call_list.o(.rodata);
src/pokenav_match_call_2.o(.rodata); src/pokenav_match_call_gfx.o(.rodata);
src/pokenav_region_map.o(.rodata); src/pokenav_region_map.o(.rodata);
src/pokenav_conditions_gfx.o(.rodata); src/pokenav_conditions_gfx.o(.rodata);
src/pokenav_conditions_search_results.o(.rodata); src/pokenav_conditions_search_results.o(.rodata);

8
src/pokenav_match_call_2.c → src/pokenav_match_call_gfx.c
View File

@ -34,7 +34,7 @@ struct Pokenav_MatchCallGfx
bool32 (*isTaskActiveCB)(void); bool32 (*isTaskActiveCB)(void);
u32 loopTaskId; u32 loopTaskId;
u8 filler8[6]; u8 filler8[6];
bool8 unkE; bool8 skipHangUpSE;
bool8 newRematchRequest; bool8 newRematchRequest;
u16 locWindowId; u16 locWindowId;
u16 infoBoxWindowId; u16 infoBoxWindowId;
@ -606,7 +606,7 @@ static u32 DoMatchCallMessage(s32 state)
PrintCallingDots(gfx); PrintCallingDots(gfx);
PlaySE(SE_POKENAV_CALL); PlaySE(SE_POKENAV_CALL);
gfx->unkE = 0; gfx->skipHangUpSE = FALSE;
return LT_INC_AND_PAUSE; return LT_INC_AND_PAUSE;
case 2: case 2:
if (WaitForCallingDotsText(gfx)) if (WaitForCallingDotsText(gfx))
@ -632,7 +632,7 @@ static u32 DoTrainerCloseByMessage(s32 state)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
DrawMsgBoxForCloseByMsg(gfx); DrawMsgBoxForCloseByMsg(gfx);
PokenavList_ToggleVerticalArrows(TRUE); PokenavList_ToggleVerticalArrows(TRUE);
gfx->unkE = 1; gfx->skipHangUpSE = TRUE;
return LT_INC_AND_PAUSE; return LT_INC_AND_PAUSE;
case 1: case 1:
if (IsDma3ManagerBusyWithBgCopy2(gfx)) if (IsDma3ManagerBusyWithBgCopy2(gfx))
@ -657,7 +657,7 @@ static u32 CloseMatchCallMessage(s32 state)
switch (state) switch (state)
{ {
case 0: case 0:
if (!gfx->unkE) if (!gfx->skipHangUpSE)
PlaySE(SE_POKENAV_HANG_UP); PlaySE(SE_POKENAV_HANG_UP);
PlaySE(SE_SELECT); PlaySE(SE_SELECT);

0
src/pokenav_match_call_1.c → src/pokenav_match_call_list.c
View File