diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2022-03-11 10:10:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-11 10:10:49 -0800 |
| commit | 30fea2d6f303e0e57b62032f56da86c8223ef1f7 (patch) | |
| tree | 9636ef46bb5f555874dc8ba16c82dc79bc563a12 /src/friend_area.c | |
| parent | ea1aa9c0c5c3a4167912d1078fffdd5e69cbbe98 (diff) | |
| parent | cf492fd141b33c21f369dfa7aabebf3c52cb8ec1 (diff) | |
Merge pull request #98 from AnonymousRandomPerson/master
Finished attack AI decomp
Diffstat (limited to 'src/friend_area.c')
| -rw-r--r-- | src/friend_area.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/friend_area.c b/src/friend_area.c index 15a527e..06cf101 100644 --- a/src/friend_area.c +++ b/src/friend_area.c @@ -2,6 +2,7 @@ #include "constants/friend_area.h" #include "friend_area.h" #include "pokemon.h" +#include "code_800D090.h" bool8 gBoughtFriendAreas[NUM_FRIEND_AREAS]; EWRAM_DATA bool8 *gFriendAreas; @@ -14,7 +15,6 @@ extern const char *gFriendAreaNames[]; extern const char gUnknown_81098A4; extern const char gUnknown_81098AC; -extern void ExpandPlaceholdersBuffer(u8 *buffer, const char *r2, ...); extern void sub_8090FEC(u32, u8 *r1, u32); const struct FriendAreaSettings gFriendAreaSettings[NUM_FRIEND_AREAS] = @@ -599,7 +599,7 @@ u32 GetFriendAreaPrice(u8 index) void sub_8092558(u8 *buffer, u8 index) { // colors the friend area name green and prints to buffer? - ExpandPlaceholdersBuffer(buffer, &gUnknown_81098A4, gFriendAreaNames[index]); + sprintf_2(buffer, &gUnknown_81098A4, gFriendAreaNames[index]); } void sub_8092578(u8 *buffer, u8 index, u8 r2) @@ -609,7 +609,7 @@ void sub_8092578(u8 *buffer, u8 index, u8 r2) if(r2) { sub_8090FEC(gFriendAreaSettings[index].price, priceBuffer, 1); - ExpandPlaceholdersBuffer(buffer, &gUnknown_81098AC, gFriendAreaNames[index], 96, priceBuffer); + sprintf_2(buffer, &gUnknown_81098AC, gFriendAreaNames[index], 96, priceBuffer); } else { |