dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Rename pokenav conditions files

Browse Source
This commit is contained in:
GriffinR
2021-11-12 11:07:52 -05:00
parent f5152094a9
commit 35aeff1b6d
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/pokenav.h
View File

@@ -436,7 +436,7 @@ bool32 IsRegionMapLoopedTaskActive(void);
void FreeRegionMapSubstruct1(void); void FreeRegionMapSubstruct1(void);
void FreeRegionMapSubstruct2(void); void FreeRegionMapSubstruct2(void);
// pokenav_conditions_1.c // pokenav_conditions.c
u32 PokenavCallback_Init_ConditionGraph_Party(void); u32 PokenavCallback_Init_ConditionGraph_Party(void);
u32 PokenavCallback_Init_ConditionGraph_Search(void); u32 PokenavCallback_Init_ConditionGraph_Search(void);
u32 GetConditionGraphMenuCallback(void); u32 GetConditionGraphMenuCallback(void);
@@ -455,14 +455,14 @@ u16 GetConditionMonDataBuffer(void);
void *GetConditionMonPicGfx(u8 id); void *GetConditionMonPicGfx(u8 id);
void *GetConditionMonPal(u8 id); void *GetConditionMonPal(u8 id);
// pokenav_conditions_2.c // pokenav_conditions_gfx.c
bool32 OpenConditionGraphMenu(void); bool32 OpenConditionGraphMenu(void);
void CreateConditionGraphMenuLoopedTask(s32); void CreateConditionGraphMenuLoopedTask(s32);
u32 IsConditionGraphMenuLoopedTaskActive(void); u32 IsConditionGraphMenuLoopedTaskActive(void);
void FreeConditionGraphMenuSubstruct2(void); void FreeConditionGraphMenuSubstruct2(void);
u8 GetMonMarkingsData(void); u8 GetMonMarkingsData(void);
// pokenav_conditions_3.c // pokenav_conditions_search_results.c
u32 PokenavCallback_Init_ConditionSearch(void); u32 PokenavCallback_Init_ConditionSearch(void);
u32 PokenavCallback_Init_ReturnToMonSearchList(void); u32 PokenavCallback_Init_ReturnToMonSearchList(void);
u32 GetConditionSearchResultsCallback(void); u32 GetConditionSearchResultsCallback(void);

10
ld_script.txt
View File

@@ -316,9 +316,9 @@ SECTIONS {
src/pokenav_match_call_1.o(.text); src/pokenav_match_call_1.o(.text);
src/pokenav_match_call_2.o(.text); src/pokenav_match_call_2.o(.text);
src/pokenav_region_map.o(.text); src/pokenav_region_map.o(.text);
src/pokenav_conditions_1.o(.text); src/pokenav_conditions.o(.text);
src/pokenav_conditions_2.o(.text); src/pokenav_conditions_gfx.o(.text);
src/pokenav_conditions_3.o(.text); src/pokenav_conditions_search_results.o(.text);
src/pokenav_ribbons_list.o(.text); src/pokenav_ribbons_list.o(.text);
src/pokenav_ribbons_summary.o(.text); src/pokenav_ribbons_summary.o(.text);
src/pokenav_match_call_data.o(.text); src/pokenav_match_call_data.o(.text);
@@ -671,8 +671,8 @@ SECTIONS {
src/pokenav_match_call_1.o(.rodata); src/pokenav_match_call_1.o(.rodata);
src/pokenav_match_call_2.o(.rodata); src/pokenav_match_call_2.o(.rodata);
src/pokenav_region_map.o(.rodata); src/pokenav_region_map.o(.rodata);
src/pokenav_conditions_2.o(.rodata); src/pokenav_conditions_gfx.o(.rodata);
src/pokenav_conditions_3.o(.rodata); src/pokenav_conditions_search_results.o(.rodata);
src/pokenav_ribbons_list.o(.rodata); src/pokenav_ribbons_list.o(.rodata);
src/pokenav_ribbons_summary.o(.rodata); src/pokenav_ribbons_summary.o(.rodata);
src/pokenav_match_call_data.o(.rodata); src/pokenav_match_call_data.o(.rodata);

0
src/pokenav_conditions_1.c → src/pokenav_conditions.c
View File

2
src/pokenav_conditions_2.c → src/pokenav_conditions_gfx.c
View File

@@ -139,7 +139,7 @@ struct Pokenav_ConditionMenuGfx
u8 filler2[0xFA3]; u8 filler2[0xFA3];
}; };
extern s8 GetConditionGraphMenuCurrentLoadIndex(void); // This function's declaration here is s8 vs. u8 in pokenav_conditions_1.c extern s8 GetConditionGraphMenuCurrentLoadIndex(void); // This function's declaration here is s8 vs. u8 in pokenav_conditions.c
static u32 LoopedTask_OpenConditionGraphMenu(s32); static u32 LoopedTask_OpenConditionGraphMenu(s32);
static u32 GetConditionGraphMenuLoopedTaskActive(void); static u32 GetConditionGraphMenuLoopedTaskActive(void);

0
src/pokenav_conditions_3.c → src/pokenav_conditions_search_results.c
View File

2
sym_bss.txt
View File

@@ -50,7 +50,7 @@
.include "src/multiboot.o" .include "src/multiboot.o"
.include "src/mirage_tower.o" .include "src/mirage_tower.o"
.include "src/berry_fix_program.o" .include "src/berry_fix_program.o"
.include "src/pokenav_conditions_2.o" .include "src/pokenav_conditions_gfx.o"
.include "src/pokenav_ribbons_summary.o" .include "src/pokenav_ribbons_summary.o"
.include "src/ereader_helpers.o" .include "src/ereader_helpers.o"
.include "src/faraway_island.o" .include "src/faraway_island.o"