diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-05-15 16:59:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-15 18:59:55 -0500 |
| commit | f402e46cd3c8b7236673d6edbae77903a7cc0618 (patch) | |
| tree | 37a19f3ab35a73c29d4d6da565741beaf7bb547f /src/friend_rescue.c | |
| parent | f65dee5a143bd543c74c010d7252eb76893ee243 (diff) | |
Sese's April/May Dump (#37)
* splitting lots of pokemon square and labeling lots of other things
* actually commit this stuff
* more moving data and things
* more screen work
* split out some pokemon dungeon data
* lots of data work
* push more data work
* split kecleon, decomp another kanghaskhan func, and try to doc UpdateBGControl more
* lots of item work
* label more item things
* subtype -> category and doc types/category
Diffstat (limited to 'src/friend_rescue.c')
| -rw-r--r-- | src/friend_rescue.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/friend_rescue.c b/src/friend_rescue.c index d84c793..d89f5ea 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -1,12 +1,11 @@ #include "global.h" #include "friend_rescue.h" +#include "pokemon.h" #include "constants/species.h" extern void sub_80338C4(u32); extern s32 sub_80144A4(s32 *); extern void sub_802F2C0(); -extern void sub_808D8E0(u8 *, u32); -extern char * GetMonSpecies(u32); extern u8 sub_809539C(u32, u32); extern void sub_8095240(u8); extern u32 sub_802F298(); @@ -127,7 +126,7 @@ u32 CreateFriendRescueMenu(void) gUnknown_203B33C->unk530 = 0; gUnknown_203B33C->unk218 = -1; gUnknown_203B33C->unk538 = -1; - sub_808D8E0(gUnknown_202E5D8, SPECIES_PELIPPER); + CopyYellowSpeciesNametoBuffer(gUnknown_202E5D8, SPECIES_PELIPPER); monName = GetMonSpecies(SPECIES_PELIPPER); strcpy(gAvailablePokemonNames,monName); for(counter = 0; counter < 0x36; counter++){ |