diff options
| -rw-r--r-- | ld_script.txt | 8 | ||||
| -rw-r--r-- | src/pokedex.c | 38 |
2 files changed, 23 insertions, 23 deletions
diff --git a/ld_script.txt b/ld_script.txt index 68a66397d..a4b61b9de 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -422,15 +422,15 @@ SECTIONS { data/data_83F5738.o(.rodata.83FB134); src/save.o(.rodata); data/data_83FECCC.o(.rodata); - src/intro.o(.rodata); + src/intro.o(.rodata); data/data_83FECCC.o(.rodata.battle_anim_special); src/diploma.o(.rodata); data/strings.o(.rodata); data/data_83FECCC.o(.rodata.841EE44); src/new_menu_helpers.o(.rodata); data/data_83FECCC.o(.rodata.841F4B4); - src/pokedex.o(.rodata); - data/data_83FECCC.o(.rodata.8451EBC); + src/pokedex.o(.rodata); + data/data_83FECCC.o(.rodata.8451EBC); src/list_menu.o(.rodata); data/data_83FECCC.o(.rodata.8452CF4); src/save_location.o(.rodata); @@ -549,7 +549,7 @@ SECTIONS { data/multiboot_pokemon_colosseum.o(.rodata); } =0 - . = 0x08D00000; + . = 0x08D00000; gfx_data : ALIGN(4) { diff --git a/src/pokedex.c b/src/pokedex.c index 42c9326e3..84ca59549 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -18,12 +18,12 @@ u16 GetPokedexHeightWeight(u16 dexNum, u8 data) { switch (data) { - case 0: // height - return gPokedexEntries[dexNum].height; - case 1: // weight - return gPokedexEntries[dexNum].weight; - default: - return 1; + case 0: // height + return gPokedexEntries[dexNum].height; + case 1: // weight + return gPokedexEntries[dexNum].weight; + default: + return 1; } } @@ -63,14 +63,14 @@ u16 GetKantoPokedexCount(u8 caseID) { switch (caseID) { - case FLAG_GET_SEEN: - if (GetSetPokedexFlag(i + 1, FLAG_GET_SEEN)) - count++; - break; - case FLAG_GET_CAUGHT: - if (GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT)) - count++; - break; + case FLAG_GET_SEEN: + if (GetSetPokedexFlag(i + 1, FLAG_GET_SEEN)) + count++; + break; + case FLAG_GET_CAUGHT: + if (GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT)) + count++; + break; } } return count; @@ -100,24 +100,24 @@ bool8 HasAllKantoMons(void) return TRUE; } -u16 HasAllMons(void) +bool16 HasAllMons(void) { u16 i; for (i = 0; i < NATIONAL_DEX_MEWTWO; i++) { if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT)) - return 0; + return FALSE; } for (i = NATIONAL_DEX_MEW; i < NATIONAL_DEX_TYRANITAR; i++) { if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT)) - return 0; + return FALSE; } for (i = NATIONAL_DEX_CELEBI; i < NATIONAL_DEX_RAYQUAZA; i++) { if (!GetSetPokedexFlag(i + 1, FLAG_GET_CAUGHT)) - return 0; + return FALSE; } - return 1; + return TRUE; } |