diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-12-11 11:50:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-11 11:50:55 -0800 |
| commit | 92b82fc616a26c9aad8afb2147240b85d5facd53 (patch) | |
| tree | d78f9d27b33704a369b5604344c28aa3364d9740 /include/asm.inc.h | |
| parent | 12ac981dd7b55014889a7cf70ed053559d9b3a83 (diff) | |
| parent | b6387d8c43722676109dcf948503194ae44b7a7a (diff) | |
Merge pull request #121 from marijnvdwerf/decompile/trainer-card-2
Continue decompiling trainer_card
Diffstat (limited to 'include/asm.inc.h')
| -rw-r--r-- | include/asm.inc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 2f9b511b6..f533d8729 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -237,6 +237,7 @@ void objc_exclamation_mark_probably(struct Sprite *sprite); // asm/rom_80859BC.o u8 CreateTrainerSprite_BirchSpeech(u8, u16, u16, u8, void *); +void LoadTrainerGfx_TrainerCard(u8 gender, int, void *); u8 CreateBirchSprite(u8, u8, u8); void remove_some_task(void); void dp12_8087EA4(void); @@ -292,6 +293,7 @@ void DoNamingScreen(u8 r0, struct SaveBlock2 *r1, u16 r2, u16 r3, u8 s0, MainCal bool8 IsEnoughMoney(u32, u32); void sub_80B79B8(u32 *, u32); void sub_80B79E0(u32 *, u32); +void sub_80B7AEC(u32, u8 left, u8 top); void sub_80B7BEC(u32, u8, u8); void sub_80B7C14(u32, u8, u8); void RemoveMoneyLabelObject(u8, u8); @@ -360,6 +362,7 @@ void sub_80E6084(); // asm/easy_chat.o void sub_80E6764(void); +void sub_80EB3FC(u8 *, u16); u8 ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); u16 sub_80EB72C(u16); @@ -394,7 +397,6 @@ void sub_8106630(u32); // asm/rom6.o bool8 npc_before_player_of_type(u8); u8 oei_task_add(void); - void sub_810C994(void); void sub_810CA6C(s32); s16 sub_810CAE4(u8, struct Pokeblock *); |